Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
fix: prepare necessary data (#18857)
ecmadaofe8d04ad5af1
diff --git a/frontend/src/AuthContext.vue b/frontend/src/AuthContext.vueindex 726e8a0188..1af661673f 100644--- a/frontend/src/AuthContext.vue+++ b/frontend/src/AuthContext.vue@@ -1,5 +1,8 @@<template>- <slot></slot>+ <slot v-if="ready"></slot>+ <div v-else class="flex items-center justify-center h-screen">+ <BBSpin />+ </div><template v-if="!isAuthRoute && authStore.isLoggedIn"><!-- Do not show the modal when the user is in auth related pages. --><SigninModal v-if="authStore.unauthenticatedOccurred" />@@ -10,6 +13,7 @@<script setup lang="ts">import { computed, onMounted, onUnmounted, ref, watch } from "vue";import { useRouter } from "vue-router";+import { BBSpin } from "@/bbkit";import { isAuthRelatedRoute } from "@/utils/auth";import InactiveRemindModal from "@/views/auth/InactiveRemindModal.vue";import SigninModal from "@/views/auth/SigninModal.vue";@@ -35,6 +39,7 @@ const currentUser = useCurrentUserV1();const workspaceStore = useWorkspaceV1Store();const roleStore = useRoleStore();const groupStore = useGroupStore();+const ready = ref(false);const authCheckIntervalId = ref<NodeJS.Timeout>();@@ -95,15 +100,21 @@ watch(() => authStore.isLoggedIn,async () => {if (!authStore.isLoggedIn || !currentUser.value) {+ ready.value = true;return;}- await Promise.all([- workspaceStore.fetchIamPolicy(),- roleStore.fetchRoleList(),- // we only care about the groups for the current user.- groupStore.batchGetOrFetchGroups(currentUser.value.groups),- ]);+ ready.value = false;+ try {+ await Promise.all([+ workspaceStore.fetchIamPolicy(),+ roleStore.fetchRoleList(),+ // we only care about the groups for the current user.+ groupStore.batchGetOrFetchGroups(currentUser.value.groups),+ ]);+ } finally {+ ready.value = true;+ }},{immediate: true,diff --git a/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseOperations.vue b/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseOperations.vueindex a964f3dfbc..4ebcadec9b 100644--- a/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseOperations.vue+++ b/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseOperations.vue@@ -465,7 +465,10 @@ const actions = computed((): DatabaseAction[] => {text: t("database.edit-environment"),disabled: props.databases.length < 1,click: () => (state.showEditEnvironmentDrawer = true),- requiredPermissions: ["bb.databases.update", "bb.settings.get"],+ requiredPermissions: [+ "bb.databases.update",+ "bb.settings.getEnvironment",+ ],});break;case "TRANSFER-IN": {@@ -487,7 +490,7 @@ const actions = computed((): DatabaseAction[] => {text: t("database.transfer-project"),disabled: props.databases.length < 1,click: () => (state.transferOutDatabaseType = "TRANSFER-OUT"),- requiredPermissions: [],+ requiredPermissions: ["bb.databases.update"],});} else if (!isInDefaultProject.value) {resp.push({diff --git a/frontend/src/components/v2/ResourceOccupiedModal/useResourceByName.ts b/frontend/src/components/v2/ResourceOccupiedModal/useResourceByName.tsindex 6c7d767da2..61c2b24a6f 100644--- a/frontend/src/components/v2/ResourceOccupiedModal/useResourceByName.ts+++ b/frontend/src/components/v2/ResourceOccupiedModal/useResourceByName.ts@@ -80,7 +80,7 @@ export const useResourceByName = ({}return;case "environment":- if (hasWorkspacePermissionV2("bb.settings.get")) {+ if (hasWorkspacePermissionV2("bb.settings.getEnvironment")) {environmentV1Store.getEnvironmentByName(resource.value);}return;diff --git a/frontend/src/components/v2/Select/EnvironmentSelect.vue b/frontend/src/components/v2/Select/EnvironmentSelect.vueindex cab3bf0433..0d9f94810a 100644--- a/frontend/src/components/v2/Select/EnvironmentSelect.vue+++ b/frontend/src/components/v2/Select/EnvironmentSelect.vue@@ -63,7 +63,7 @@ defineEmits<{const environmentV1Store = useEnvironmentV1Store();const hasPermission = computed(() =>- hasWorkspacePermissionV2("bb.settings.get")+ hasWorkspacePermissionV2("bb.settings.getEnvironment"));const rawEnvironmentList = computed(() => {diff --git a/frontend/src/components/v2/Select/RoleSelect.vue b/frontend/src/components/v2/Select/RoleSelect.vueindex 400cdf65d2..10a904dd92 100644--- a/frontend/src/components/v2/Select/RoleSelect.vue+++ b/frontend/src/components/v2/Select/RoleSelect.vue@@ -142,6 +142,9 @@ const renderTag = ({option: SelectBaseOption;handleClose: () => void;}) => {+ if (!props.multiple) {+ return option.label as string;+ }return (<NTag closable={!props.disabled} onClose={handleClose}>{option.label as string}diff --git a/frontend/src/router/dashboard/environmentV1.ts b/frontend/src/router/dashboard/environmentV1.tsindex 781f47e7d4..e0842a6672 100644--- a/frontend/src/router/dashboard/environmentV1.ts+++ b/frontend/src/router/dashboard/environmentV1.ts@@ -15,7 +15,7 @@ const environmentV1Routes: RouteRecordRaw[] = [props: { content: true },meta: {title: () => t("common.environment"),- requiredPermissionList: () => ["bb.settings.get", "bb.policies.get"],+ requiredPermissionList: () => ["bb.settings.getEnvironment"],},},];