From 74bcebef47a94b28117bd89d14f9b6719ad4bbb8 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Sun, 2 Feb 2025 22:06:23 +0100
Subject: [PATCH] WIP
Signed-off-by: Martin Weise <martin.weise@tuwien.ac.at>
---
.../main/java/at/tuwien/service/impl/DatabaseServiceImpl.java | 2 ++
dbrepo-ui/composables/table-service.ts | 2 +-
dbrepo-ui/nuxt.config.ts | 2 ++
.../pages/database/[database_id]/table/[table_id]/info.vue | 2 +-
helm/dbrepo/templates/ui-secret.yaml | 2 +-
5 files changed, 7 insertions(+), 3 deletions(-)
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 17ba0bd60b..8b4c73fb2f 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 45268d6295..5f29074524 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 92403e293a..28505257a2 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 89e2714115..687358f029 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 bab14fce20..3e1a6c6388 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"
--
GitLab