Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
chore: simplify frontend code for sa and wi panel (#19164)
ecmadao8a27652fd30c
diff --git a/frontend/src/components/User/Settings/ServiceAccountPanel.vue b/frontend/src/components/User/Settings/ServiceAccountPanel.vueindex c1f889ef37..2486d6215a 100644--- a/frontend/src/components/User/Settings/ServiceAccountPanel.vue+++ b/frontend/src/components/User/Settings/ServiceAccountPanel.vue@@ -82,7 +82,7 @@<CreateServiceAccountDrawerv-if="state.showCreateDrawer":service-account="state.editingServiceAccount"- :project="projectId ? project.name : undefined"+ :project="project?.name"@close="() => {state.showCreateDrawer = false;@@ -103,21 +103,16 @@ import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrappimport CreateServiceAccountDrawer from "@/components/User/Settings/CreateServiceAccountDrawer.vue";import UserDataTable from "@/components/User/Settings/UserDataTable/index.vue";import PagedTable from "@/components/v2/Model/PagedTable.vue";-import { useActuatorV1Store, useProjectByName } from "@/store";+import { useActuatorV1Store, useCurrentProjectV1 } from "@/store";import {serviceAccountToUser,useServiceAccountStore,} from "@/store/modules/serviceAccount";-import { projectNamePrefix } from "@/store/modules/v1/common";-import { DEFAULT_PROJECT_NAME, unknownUser } from "@/types";+import { isValidProjectName, unknownUser } from "@/types";import { State } from "@/types/proto-es/v1/common_pb";import type { User } from "@/types/proto-es/v1/user_service_pb";import { UserType } from "@/types/proto-es/v1/user_service_pb";-const props = defineProps<{- projectId?: string;-}>();-type LocalState = {showInactiveList: boolean;showCreateDrawer: boolean;@@ -136,38 +131,32 @@ const serviceAccountPagedTable =const deletedServiceAccountPagedTable =ref<ComponentExposed<typeof PagedTable<User>>>();-const { project } = useProjectByName(- computed(() =>- props.projectId ? `${projectNamePrefix}${props.projectId}` : ""- )+const { project: currentProject } = useCurrentProjectV1();+const project = computed(() =>+ isValidProjectName(currentProject.value.name)+ ? currentProject.value+ : undefined);-const showCount = computed(() => !props.projectId);+const showCount = computed(() => !project.value);-const sessionKey = computed(() =>- props.projectId- ? `bb.paged-service-account-table.project.${props.projectId}.active`- : "bb.paged-service-account-table.active"+const sessionKey = computed(+ () =>+ `bb.paged-service-account-table${project.value ? `.${project.value.name}` : ""}.active`);-const deletedSessionKey = computed(() =>- props.projectId- ? `bb.paged-service-account-table.project.${props.projectId}.deleted`- : "bb.paged-service-account-table.deleted"+const deletedSessionKey = computed(+ () =>+ `bb.paged-service-account-table${project.value ? `.${project.value.name}` : ""}.deleted`);-const parent = computed(() =>- props.projectId ? `${projectNamePrefix}${props.projectId}` : "workspaces/-"-);+const parent = computed(() => project.value?.name ?? "workspaces/-");const allowEdit = computed(() => {- if (project.value.name === DEFAULT_PROJECT_NAME) {- return false;- }- if (project.value.state === State.DELETED) {- return false;+ if (!project.value) {+ return true;}- return true;+ return project.value.state === State.ACTIVE;});const fetchServiceAccountList = async ({diff --git a/frontend/src/components/User/Settings/WorkloadIdentityPanel.vue b/frontend/src/components/User/Settings/WorkloadIdentityPanel.vueindex 74842c8945..98e6a00272 100644--- a/frontend/src/components/User/Settings/WorkloadIdentityPanel.vue+++ b/frontend/src/components/User/Settings/WorkloadIdentityPanel.vue@@ -84,7 +84,7 @@<CreateWorkloadIdentityDrawerv-if="state.showCreateDrawer":workload-identity="state.editingWorkloadIdentity"- :project="project.name"+ :project="project?.name"@close="() => {state.showCreateDrawer = false;@@ -105,21 +105,16 @@ import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrappimport CreateWorkloadIdentityDrawer from "@/components/User/Settings/CreateWorkloadIdentityDrawer.vue";import UserDataTable from "@/components/User/Settings/UserDataTable/index.vue";import PagedTable from "@/components/v2/Model/PagedTable.vue";-import { useActuatorV1Store, useProjectByName } from "@/store";-import { projectNamePrefix } from "@/store/modules/v1/common";+import { useActuatorV1Store, useCurrentProjectV1 } from "@/store";import {useWorkloadIdentityStore,workloadIdentityToUser,} from "@/store/modules/workloadIdentity";-import { DEFAULT_PROJECT_NAME, unknownUser } from "@/types";+import { isValidProjectName, unknownUser } from "@/types";import { State } from "@/types/proto-es/v1/common_pb";import type { User } from "@/types/proto-es/v1/user_service_pb";import { UserType } from "@/types/proto-es/v1/user_service_pb";-const props = defineProps<{- projectId?: string;-}>();-type LocalState = {showInactiveList: boolean;showCreateDrawer: boolean;@@ -138,38 +133,32 @@ const workloadIdentityPagedTable =const deletedWorkloadIdentityPagedTable =ref<ComponentExposed<typeof PagedTable<User>>>();-const { project } = useProjectByName(- computed(() =>- props.projectId ? `${projectNamePrefix}${props.projectId}` : ""- )+const { project: currentProject } = useCurrentProjectV1();+const project = computed(() =>+ isValidProjectName(currentProject.value.name)+ ? currentProject.value+ : undefined);-const showCount = computed(() => !props.projectId);+const showCount = computed(() => !project.value);-const sessionKey = computed(() =>- props.projectId- ? `bb.paged-workload-identity-table.project.${props.projectId}.active`- : "bb.paged-workload-identity-table.active"+const sessionKey = computed(+ () =>+ `bb.paged-workload-identity-table${project.value ? `.${project.value.name}` : ""}.active`);-const deletedSessionKey = computed(() =>- props.projectId- ? `bb.paged-workload-identity-table.project.${props.projectId}.deleted`- : "bb.paged-workload-identity-table.deleted"+const deletedSessionKey = computed(+ () =>+ `bb.paged-workload-identity-table${project.value ? `.${project.value.name}` : ""}.deleted`);-const parent = computed(() =>- props.projectId ? `${projectNamePrefix}${props.projectId}` : "workspaces/-"-);+const parent = computed(() => project.value?.name ?? "workspaces/-");const allowEdit = computed(() => {- if (project.value.name === DEFAULT_PROJECT_NAME) {- return false;- }- if (project.value.state === State.DELETED) {- return false;+ if (!project.value) {+ return true;}- return true;+ return project.value.state === State.ACTIVE;});const fetchWorkloadIdentityList = async ({diff --git a/frontend/src/router/dashboard/projectV1.ts b/frontend/src/router/dashboard/projectV1.tsindex 5d3e6c3e67..c699aaef6f 100644--- a/frontend/src/router/dashboard/projectV1.ts+++ b/frontend/src/router/dashboard/projectV1.ts@@ -339,7 +339,7 @@ const projectV1Routes: RouteRecordRaw[] = [requiredPermissionList: () => ["bb.serviceAccounts.list"],},component: () =>- import("@/views/project/ProjectServiceAccountDashboard.vue"),+ import("@/components/User/Settings/ServiceAccountPanel.vue"),props: true,},{@@ -350,7 +350,7 @@ const projectV1Routes: RouteRecordRaw[] = [requiredPermissionList: () => ["bb.workloadIdentities.list"],},component: () =>- import("@/views/project/ProjectWorkloadIdentityDashboard.vue"),+ import("@/components/User/Settings/WorkloadIdentityPanel.vue"),props: true,},{diff --git a/frontend/src/router/dashboard/workspace.ts b/frontend/src/router/dashboard/workspace.tsindex 77a3f1ebb5..ffaa256c43 100644--- a/frontend/src/router/dashboard/workspace.ts+++ b/frontend/src/router/dashboard/workspace.ts@@ -297,7 +297,8 @@ const workspaceRoutes: RouteRecordRaw[] = [title: () => t("settings.members.service-accounts"),requiredPermissionList: () => ["bb.serviceAccounts.list"],},- component: () => import("@/views/SettingWorkspaceServiceAccounts.vue"),+ component: () =>+ import("@/components/User/Settings/ServiceAccountPanel.vue"),props: true,},{@@ -308,7 +309,7 @@ const workspaceRoutes: RouteRecordRaw[] = [requiredPermissionList: () => ["bb.workloadIdentities.list"],},component: () =>- import("@/views/SettingWorkspaceWorkloadIdentities.vue"),+ import("@/components/User/Settings/WorkloadIdentityPanel.vue"),props: true,},{diff --git a/frontend/src/views/SettingWorkspaceServiceAccounts.vue b/frontend/src/views/SettingWorkspaceServiceAccounts.vuedeleted file mode 100644index 70fa566243..0000000000--- a/frontend/src/views/SettingWorkspaceServiceAccounts.vue+++ /dev/null@@ -1,7 +0,0 @@-<template>- <ServiceAccountPanel />-</template>--<script setup lang="ts">-import ServiceAccountPanel from "@/components/User/Settings/ServiceAccountPanel.vue";-</script>diff --git a/frontend/src/views/SettingWorkspaceWorkloadIdentities.vue b/frontend/src/views/SettingWorkspaceWorkloadIdentities.vuedeleted file mode 100644index b406ab2fdb..0000000000--- a/frontend/src/views/SettingWorkspaceWorkloadIdentities.vue+++ /dev/null@@ -1,7 +0,0 @@-<template>- <WorkloadIdentityPanel />-</template>--<script setup lang="ts">-import WorkloadIdentityPanel from "@/components/User/Settings/WorkloadIdentityPanel.vue";-</script>diff --git a/frontend/src/views/project/ProjectServiceAccountDashboard.vue b/frontend/src/views/project/ProjectServiceAccountDashboard.vuedeleted file mode 100644index 061eb4fa3a..0000000000--- a/frontend/src/views/project/ProjectServiceAccountDashboard.vue+++ /dev/null@@ -1,11 +0,0 @@-<template>- <ServiceAccountPanel :project-id="projectId" />-</template>--<script setup lang="ts">-import ServiceAccountPanel from "@/components/User/Settings/ServiceAccountPanel.vue";--defineProps<{- projectId: string;-}>();-</script>diff --git a/frontend/src/views/project/ProjectWorkloadIdentityDashboard.vue b/frontend/src/views/project/ProjectWorkloadIdentityDashboard.vuedeleted file mode 100644index fd20f43331..0000000000--- a/frontend/src/views/project/ProjectWorkloadIdentityDashboard.vue+++ /dev/null@@ -1,11 +0,0 @@-<template>- <WorkloadIdentityPanel :project-id="projectId" />-</template>--<script setup lang="ts">-import WorkloadIdentityPanel from "@/components/User/Settings/WorkloadIdentityPanel.vue";--defineProps<{- projectId: string;-}>();-</script>