diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceImpl.java index 17ba0bd60beba0281c605bfbf32e7439fc0a0fbc..8b4c73fb2f063cfc779fa001b7982675d74cf447 100644 --- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceImpl.java +++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceImpl.java @@ -216,6 +216,8 @@ public class DatabaseServiceImpl implements DatabaseService { } log.debug("fetched unknown table from data service: {}.{}", database.getInternalName(), table.getInternalName()); final Table tableEntity = metadataMapper.tableDtoToTable(table); + tableEntity.setIsPublic(database.getIsPublic()); + tableEntity.setIsSchemaPublic(database.getIsSchemaPublic()); tableEntity.setDatabase(database); tableEntity.getColumns() .forEach(column -> { diff --git a/dbrepo-ui/composables/table-service.ts b/dbrepo-ui/composables/table-service.ts index 45268d6295fc0ba55fdf268936a1614b350033e3..5f290745245b46a8ce395a489f62aa9171800d5a 100644 --- a/dbrepo-ui/composables/table-service.ts +++ b/dbrepo-ui/composables/table-service.ts @@ -255,7 +255,7 @@ export const useTableService = (): any => { if (!table || !user) { return false } - return table.owner.id === user.id + return table.owner.id === user.uid } function tableNameToInternalName(name: string) { diff --git a/dbrepo-ui/nuxt.config.ts b/dbrepo-ui/nuxt.config.ts index 92403e293add93828152c681f3b5203677ba09ab..28505257a22a2db405519a39599f0caaeaac1179 100644 --- a/dbrepo-ui/nuxt.config.ts +++ b/dbrepo-ui/nuxt.config.ts @@ -15,6 +15,8 @@ if (process.env.NODE_ENV === 'development') { } } process.env.NUXT_PUBLIC_API_SERVER = api + process.env.NUXT_OIDC_PROVIDERS_KEYCLOAK_REDIRECT_URI = api + ':3001/auth/keycloak/callback' + process.env.NUXT_OIDC_PROVIDERS_KEYCLOAK_LOGOUT_REDIRECT_URI = api + ':3001' } /** diff --git a/dbrepo-ui/pages/database/[database_id]/table/[table_id]/info.vue b/dbrepo-ui/pages/database/[database_id]/table/[table_id]/info.vue index 89e2714115efb943e3524020637b2d2518377d56..687358f0290177012dc89f36e23666d6dd6d48d0 100644 --- a/dbrepo-ui/pages/database/[database_id]/table/[table_id]/info.vue +++ b/dbrepo-ui/pages/database/[database_id]/table/[table_id]/info.vue @@ -15,7 +15,7 @@ </v-card-text> </v-card> <v-divider - v-if="canViewInfo" /> + v-if="identifier" /> <v-card v-if="canViewInfo" variant="flat" diff --git a/helm/dbrepo/templates/ui-secret.yaml b/helm/dbrepo/templates/ui-secret.yaml index bab14fce203692208d86a75310c5c4dd93fc80c3..3e1a6c6388da782610819d07c93bbfb9dfa3af87 100644 --- a/helm/dbrepo/templates/ui-secret.yaml +++ b/helm/dbrepo/templates/ui-secret.yaml @@ -22,7 +22,7 @@ stringData: NUXT_PUBLIC_PID_DEFAULT_PUBLISHER: "{{ .Values.ui.public.pid.default.publisher }}" NUXT_PUBLIC_UPLOAD_CLIENT: "{{ .Values.ui.public.upload.client | default $uploadEndpoint }}" NUXT_PUBLIC_BROKER_CONNECTIONS: "{{ include "dbrepo.broker.connections" . }}" - NUXT_OIDC_PROVIDERS_KEYCLOAK_BASE_URL: "{{ .Values.gateway }}/api/auth/realms/dbrepo" + NUXT_OIDC_PROVIDERS_KEYCLOAK_BASE_URL: "{{ .Values.gateway }}/realms/dbrepo" NUXT_OIDC_PROVIDERS_KEYCLOAK_CLIENT_ID: "{{ .Values.authservice.client.id }}" NUXT_OIDC_PROVIDERS_KEYCLOAK_CLIENT_SECRET: "{{ .Values.authservice.client.secret }}" NUXT_OIDC_PROVIDERS_KEYCLOAK_REDIRECT_URI: "{{ .Values.gateway }}/auth/keycloak/callback"