diff --git a/.gitlab/agents/dev/values.yaml b/.gitlab/agents/dev/values.yaml index d12cc8ef0127b81847091766e73848a7fd55f6af..63d94522bf07fa33111430ff6021be96847f19ae 100644 --- a/.gitlab/agents/dev/values.yaml +++ b/.gitlab/agents/dev/values.yaml @@ -132,7 +132,7 @@ metricdb: ui: enabled: true image: - name: registry.datalab.tuwien.ac.at/dbrepo/ui:1.6.3rc7 + name: registry.datalab.tuwien.ac.at/dbrepo/ui:1.6.3rc8 public: api: client: https://s155.datalab.tuwien.ac.at diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java index 47ec3e6b3a871b89c9de553bbaaf70134cd9dfdc..fd91fb5655ad563ee0b4f8503dbdb5b60db6fea9 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java @@ -569,7 +569,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest { /* test */ final DatabaseDto database = findById_generic(DATABASE_1_ID, DATABASE_1, USER_LOCAL_ADMIN_PRINCIPAL); - assertEquals(2, database.getTables().size()); + assertEquals(4, database.getTables().size()); assertEquals(2, database.getViews().size()); assertNotEquals(0, database.getAccesses().size()); } diff --git a/dbrepo-ui/layouts/default.vue b/dbrepo-ui/layouts/default.vue index 5df3b8cda396890d76e03b37f76719d72b185376..813d416cff72920b054d19ae1fbdcb1b0110366b 100644 --- a/dbrepo-ui/layouts/default.vue +++ b/dbrepo-ui/layouts/default.vue @@ -100,8 +100,9 @@ class="mr-2" color="secondary" variant="flat" + :loading="loadingLogin" :prepend-icon="$vuetify.display.mdAndUp ? 'mdi-login' : null" - @click="login()"> + @click="loadingLogin=true;login()"> {{ $t('navigation.login') }} </v-btn> <v-btn @@ -152,7 +153,6 @@ </template> <script setup> -import { ref } from 'vue' import { useCacheStore } from '@/stores/cache.js' const { loggedIn, user, login, logout } = useOidcAuth() @@ -160,7 +160,6 @@ const cacheStore = useCacheStore() cacheStore.setUser(loggedIn ? user.value?.userInfo : null) cacheStore.setRoles(loggedIn ? user.value?.claims?.realm_access?.roles : []) const runtimeConfig = useRuntimeConfig() -const config = ref(runtimeConfig) useServerHead({ title: runtimeConfig.public.title, meta: [ @@ -185,6 +184,7 @@ export default { model: null, query: null, loading: true, + loadingLogin: true, databaseError: null, accessError: null, searchResults: [], diff --git a/helm/dbrepo/templates/ui-secret.yaml b/helm/dbrepo/templates/ui-secret.yaml index 3afb602785767d106ba56d548f7a364ab46e3d04..a84ac8f5cef024c88fa41ce085f494cca396df9f 100644 --- a/helm/dbrepo/templates/ui-secret.yaml +++ b/helm/dbrepo/templates/ui-secret.yaml @@ -23,6 +23,7 @@ stringData: NUXT_PUBLIC_UPLOAD_CLIENT: "{{ .Values.ui.public.upload.client | default $uploadEndpoint }}" NUXT_PUBLIC_BROKER_CONNECTIONS: "{{ include "dbrepo.broker.connections" . }}" NUXT_OIDC_PROVIDERS_KEYCLOAK_AUTHORIZATION_URL: "{{ .Values.gateway }}/realms/dbrepo/protocol/openid-connect/auth" + 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_LOGOUT_REDIRECT_URI: "{{ .Values.gateway }}"