Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
refactor(frontend): migrate route permission guard to React (#20123)
boojack65b4935c62d6
diff --git a/frontend/src/components/IssueV1/components/IssueLabelSelector.vue b/frontend/src/components/IssueV1/components/IssueLabelSelector.vuedeleted file mode 100644index eded80a967..0000000000--- a/frontend/src/components/IssueV1/components/IssueLabelSelector.vue+++ /dev/null@@ -1,145 +0,0 @@-<template>- <NSelect- :multiple="true"- :options="options"- :disabled="disabled"- :size="size"- :to="renderMenuInsideParent ? false : undefined"- :consistent-menu-width="true"- :max-tag-count="maxTagCount"- :render-label="renderLabel"- :render-tag="renderTag"- :value="issueLabels"- @update:value="onLabelsUpdate"- >- <template #empty>- <NEmpty>- <template #extra>- <router-link- v-if="hasPermission"- :to="{- name: PROJECT_V1_ROUTE_SETTINGS,- params: {- projectId: getProjectName(project.name),- },- hash: '#issue-related',- }"- class="textinfolabel normal-link flex items-center gap-x-2"- >- {{ $t("project.settings.issue-related.labels.configure-labels") }}- <ExternalLinkIcon class="w-4 h-auto inline-block" />- </router-link>- </template>- </NEmpty>- </template>- </NSelect>-</template>--<script lang="ts">-export const getValidIssueLabels = (- selected: string[],- issueLabels: Label[]-) => {- const pool = new Set(issueLabels.map((label) => label.value));- return selected.filter((label) => pool.has(label));-};-</script>--<script setup lang="ts">-import { ExternalLinkIcon } from "lucide-vue-next";-import type { SelectOption } from "naive-ui";-import { NCheckbox, NEmpty, NSelect, NTag } from "naive-ui";-import type { SelectBaseOption } from "naive-ui/lib/select/src/interface";-import { computed, h } from "vue";-import { PROJECT_V1_ROUTE_SETTINGS } from "@/router/dashboard/projectV1";-import { getProjectName } from "@/store/modules/v1/common";-import type { Label, Project } from "@/types/proto-es/v1/project_service_pb";-import { hasProjectPermissionV2 } from "@/utils";--type IssueLabelOption = SelectOption & {- value: string;- color: string;-};--const props = withDefaults(- defineProps<{- disabled: boolean;- selected: string[];- project: Project;- size?: "small" | "medium" | "large";- maxTagCount?: number | "responsive";- renderMenuInsideParent?: boolean;- }>(),- {- size: "medium",- maxTagCount: "responsive",- renderMenuInsideParent: false,- }-);--const emit = defineEmits<{- (event: "update:selected", selected: string[]): void;-}>();--const hasPermission = computed(() => {- return hasProjectPermissionV2(props.project, "bb.projects.update");-});--const issueLabels = computed(() => {- return getValidIssueLabels(props.selected, props.project.issueLabels);-});--const options = computed(() => {- return props.project.issueLabels.map<IssueLabelOption>((label) => ({- label: label.value,- value: label.value,- color: label.color,- }));-});--const onLabelsUpdate = async (labels: string[]) => {- emit("update:selected", labels);-};--const renderLabel = (option: IssueLabelOption, selected: boolean) => {- const { color, value } = option;- return h("div", { class: "flex items-center gap-x-2" }, [- h(NCheckbox, { checked: selected, size: "small" }),- h("div", {- class: "w-4 h-4 rounded-sm cursor-pointer relative",- style: `background-color: ${color};`,- onClick: () => {},- }),- value,- ]);-};--const renderTag = ({- option,- handleClose,-}: {- option: SelectBaseOption;- handleClose: () => void;-}) => {- const { color, value } = option as IssueLabelOption;-- return h(- NTag,- {- size: props.size,- closable: !props.disabled,- onClose: handleClose,- },- {- default: () =>- h("div", { class: "flex items-center gap-x-2" }, [- h("div", {- class: "w-4 h-4 rounded-sm",- style: `background-color: ${color};`,- }),- value,- ]),- }- );-};-</script>diff --git a/frontend/src/components/IssueV1/components/Sidebar/IssueLabels.vue b/frontend/src/components/IssueV1/components/Sidebar/IssueLabels.vuedeleted file mode 100644index 8f5a64ba20..0000000000--- a/frontend/src/components/IssueV1/components/Sidebar/IssueLabels.vue+++ /dev/null@@ -1,40 +0,0 @@-<template>- <div class="flex flex-col gap-y-1">- <div class="flex items-center gap-x-1 textinfolabel">- <span>{{ $t("issue.labels") }}</span>- <RequiredStar v-if="project.forceIssueLabels" />- </div>- <IssueLabelSelector- :disabled="disabled"- :selected="value"- :project="project"- :size="'medium'"- @update:selected="onLablesUpdate"- />- </div>-</template>--<script setup lang="ts">-import IssueLabelSelector from "@/components/IssueV1/components/IssueLabelSelector.vue";-import RequiredStar from "@/components/RequiredStar.vue";-import type { Project } from "@/types/proto-es/v1/project_service_pb";--withDefaults(- defineProps<{- value: string[];- project: Project;- disabled?: boolean;- }>(),- {- disabled: false,- }-);--const emit = defineEmits<{- (e: "update:value", labels: string[]): void;-}>();--const onLablesUpdate = async (labels: string[]) => {- emit("update:value", labels);-};-</script>diff --git a/frontend/src/components/IssueV1/components/index.ts b/frontend/src/components/IssueV1/components/index.tsindex 1ed226ad59..2818c3f33d 100644--- a/frontend/src/components/IssueV1/components/index.ts+++ b/frontend/src/components/IssueV1/components/index.ts@@ -1,2 +1 @@-export { default as IssueLabelSelector } from "./IssueLabelSelector.vue";export { default as IssueStatusIcon } from "./IssueStatusIcon.vue";diff --git a/frontend/src/components/Permission/ComponentPermissionGuard.vue b/frontend/src/components/Permission/ComponentPermissionGuard.vuedeleted file mode 100644index fbe962a75e..0000000000--- a/frontend/src/components/Permission/ComponentPermissionGuard.vue+++ /dev/null@@ -1,99 +0,0 @@-<template>- <RequiredBasicPermissionAlert- v-if="missedBasicPermission.length > 0"- v-bind="$attrs"- :permissions="missedBasicPermission"- :title="$t('common.workspace-initialize-error')"- />- <template v-else>- <slot v-if="missedPermissions.length === 0" />- <NoPermissionPlaceholder- v-else- v-bind="$attrs"- :path="requestPath"- :resources="project ? [project.name] : []"- :permissions="missedPermissions"- >- <template #action>- <div v-if="allowRequestRole" class="mt-2">- <PermissionGuardWrapper- v-slot="slotProps"- :project="project"- :permissions="['bb.issues.create', 'bb.roles.list']"- >- <NButton- type="primary"- :disabled="slotProps.disabled || !hasRequestRoleFeature"- @click="showRequestRolePanel = true"- >- <template #icon>- <ShieldUserIcon v-if="hasRequestRoleFeature" class="w-4 h-4" />- <FeatureBadge v-else :clickable="false" :feature="PlanFeature.FEATURE_REQUEST_ROLE_WORKFLOW" />- </template>- {{ $t("issue.title.request-role") }}- </NButton>- </PermissionGuardWrapper>- </div>- </template>- </NoPermissionPlaceholder>- </template>-- <RoleGrantPanel- v-if="showRequestRolePanel && project"- :project-name="project.name"- :required-permissions="missedPermissions"- @close="showRequestRolePanel = false"- />-</template>---<script lang="tsx" setup>-import { ShieldUserIcon } from "lucide-vue-next";-import { NButton } from "naive-ui";-import { computed, ref } from "vue";-import { useRouter } from "vue-router";-import { FeatureBadge } from "@/components/FeatureGuard";-import NoPermissionPlaceholder from "@/components/Permission/NoPermissionPlaceholder.vue";-import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";-import RequiredBasicPermissionAlert from "@/components/Role/Setting/components/RequiredBasicPermissionAlert.vue";-import RoleGrantPanel from "@/components/RoleGrantPanel";-import { hasFeature } from "@/store";-import { BASIC_WORKSPACE_PERMISSIONS, type Permission } from "@/types";-import type { Project } from "@/types/proto-es/v1/project_service_pb";-import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";-import { hasProjectPermissionV2, hasWorkspacePermissionV2 } from "@/utils";--const props = defineProps<{- project?: Project;- permissions: Permission[];-}>();--const showRequestRolePanel = ref(false);-const router = useRouter();-const hasRequestRoleFeature = computed(() =>- hasFeature(PlanFeature.FEATURE_REQUEST_ROLE_WORKFLOW)-);--const allowRequestRole = computed(() => {- return props.project?.allowRequestRole;-});--const requestPath = computed(() => {- return router.currentRoute.value.fullPath;-});--const missedPermissions = computed(() => {- if (props.project) {- return props.permissions.filter(- (p) => !hasProjectPermissionV2(props.project!, p)- );- }- return props.permissions.filter((p) => !hasWorkspacePermissionV2(p));-});--const missedBasicPermission = computed(() => {- return BASIC_WORKSPACE_PERMISSIONS.filter(- (p) => !hasWorkspacePermissionV2(p)- );-});-</script>diff --git a/frontend/src/components/Permission/RoutePermissionGuard.vue b/frontend/src/components/Permission/RoutePermissionGuard.vuedeleted file mode 100644index a0e190e632..0000000000--- a/frontend/src/components/Permission/RoutePermissionGuard.vue+++ /dev/null@@ -1,32 +0,0 @@-<template>- <ComponentPermissionGuard :project="project" :permissions="requiredPermissions">- <slot />- </ComponentPermissionGuard>-</template>--<script lang="tsx" setup>-import { computed } from "vue";-import type { RouteRecordRaw } from "vue-router";-import { useRouter } from "vue-router";-import { getFlattenRoutes } from "@/components/v2/Sidebar/utils.ts";-import type { Project } from "@/types/proto-es/v1/project_service_pb";-import ComponentPermissionGuard from "./ComponentPermissionGuard.vue";--const props = defineProps<{- project?: Project;- routes: RouteRecordRaw[];-}>();--const router = useRouter();--const flattenRoutes = computed(() => {- return getFlattenRoutes(props.routes);-});--const requiredPermissions = computed(() => {- const routeConfig = flattenRoutes.value.find(- (workspaceRoute) => workspaceRoute.name === router.currentRoute.value.name- );- return routeConfig?.permissions ?? [];-});-</script>\ No newline at end of filediff --git a/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue b/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vuedeleted file mode 100644index 8da1c5c62d..0000000000--- a/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue+++ /dev/null@@ -1,262 +0,0 @@-<template>- <div class="w-full flex flex-col justify-start items-start gap-y-4">- <MembersBindingSelect- v-model:value="state.memberList"- :required="true"- :include-all-users="true"- :disabled="disableMemberChange"- :include-service-account="true"- :include-workload-identity="true"- />-- <div class="w-full flex flex-col gap-y-2">- <div class="flex items-center gap-x-1">- <span>{{ $t("settings.members.assign-role") }}</span>- <RequiredStar />- </div>- <BBAttention- v-if="requiredPermissions"- :type="'info'"- class="w-full"- >- <div>- {{ $t("project.members.roles-are-filtered-by-permissions") }}- <ul class="list-disc pl-4">- <li v-for="permission in requiredPermissions" :key="permission">- {{ permission }}- </li>- </ul>- </div>- </BBAttention>- <RoleSelect- v-model:value="state.role"- :include-workspace-roles="false"- :suffix="''"- :filter="filterRole"- :disabled="disableRoleChange"- />- </div>- <div v-if="selectedRole" class="w-full flex flex-col gap-y-2">- <div class="flex items-center gap-x-1">- <span>- {{ $t("common.permissions") }}- ({{- selectedRole.permissions.length- }})- </span>- </div>- <div class="max-h-[10em] overflow-auto border rounded-sm p-2">- <p- v-for="permission in selectedRole.permissions"- :key="permission"- class="text-sm leading-5"- >- {{ permission }}- </p>- </div>- </div>- <div class="w-full flex flex-col gap-y-2">- <div class="flex items-center gap-x-1">- <span>{{ $t("common.reason") }}</span>- <RequiredStar v-if="requireReason" />- </div>- <NInput- v-model:value="state.reason"- type="textarea"- rows="2"- :placeholder="`${$t('common.reason')} ${requireReason ? '' : `(${$t('common.optional')})`}`"- />- </div>- <div- v-if="- roleHasDatabaseLimitation(state.role)- "- class="w-full flex flex-col gap-y-2"- >- <div class="flex items-center gap-x-1">- <span>{{ $t("common.databases") }}</span>- <RequiredStar />- </div>- <QuerierDatabaseResourceForm- ref="databaseResourceFormRef"- :database-resources="databaseResourceList"- :project-name="projectName"- :required-feature="PlanFeature.FEATURE_IAM"- :include-cloumn="false"- />- </div>-- <div- v-if="roleHasEnvironmentLimitation(state.role)"- class="w-full flex flex-col gap-y-2"- >- <div>- <div class="flex items-center gap-x-1">- <span>{{ $t("common.environments") }}</span>- </div>- <span class="textinfolabel">- {{ $t("project.members.allow-ddl") }}- </span>- </div>- <EnvironmentSelect- :multiple="true"- v-model:value="state.environments"- />- </div>-- <div class="w-full flex flex-col gap-y-2">- <div class="flex items-center gap-x-1">- <span>{{ $t("common.expiration") }}</span>- <RequiredStar />- </div>- <ExpirationSelector- ref="expirationSelectorRef"- :role="state.role"- :use-cached-selection="!isEdit"- v-model:timestamp-in-ms="state.expirationTimestampInMS"- class="grid-cols-3 sm:grid-cols-4"- />- </div>- </div>-</template>--<script lang="ts" setup>-import { create } from "@bufbuild/protobuf";-import { NInput } from "naive-ui";-import { computed, reactive, ref } from "vue";-import { BBAttention } from "@/bbkit";-import ExpirationSelector from "@/components/ExpirationSelector.vue";-import MembersBindingSelect from "@/components/Member/MembersBindingSelect.vue";-import RequiredStar from "@/components/RequiredStar.vue";-import QuerierDatabaseResourceForm from "@/components/RoleGrantPanel/DatabaseResourceForm/index.vue";-import { EnvironmentSelect, RoleSelect } from "@/components/v2/Select";-import { useRoleStore } from "@/store";-import { type DatabaseResource } from "@/types";-import { type Binding, BindingSchema } from "@/types/proto-es/v1/iam_policy_pb";-import type { Role } from "@/types/proto-es/v1/role_service_pb";-import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";-import { buildConditionExpr, convertFromExpr } from "@/utils/issue/cel";-import {- roleHasDatabaseLimitation,- roleHasEnvironmentLimitation,-} from "../utils";--const props = defineProps<{- projectName: string;- binding: Binding;- isEdit?: boolean;- requireReason?: boolean;- disableRoleChange?: boolean;- disableMemberChange?: boolean;- requiredPermissions?: string[];- databaseResources?: DatabaseResource[];-}>();--interface LocalState {- memberList: string[];- role: string;- reason: string;- expirationTimestampInMS?: number;- environments: string[];-}--const filterRole = (role: Role) => {- if (props.requiredPermissions) {- return props.requiredPermissions.every((p) => role.permissions.includes(p));- }- return true;-};--const getInitialState = (): LocalState => {- const defaultState: LocalState = {- role: props.binding.role,- memberList: props.binding.members,- reason: props.binding.condition?.description ?? "",- environments: [],- };-- if (props.binding.parsedExpr) {- const conditionExpr = convertFromExpr(props.binding.parsedExpr);- if (conditionExpr.expiredTime) {- defaultState.expirationTimestampInMS = new Date(- conditionExpr.expiredTime- ).getTime();- }- defaultState.environments = conditionExpr.environments ?? [];- }-- return defaultState;-};--const state = reactive<LocalState>(getInitialState());--const databaseResourceList = computed(() => {- if (props.databaseResources !== undefined) {- return props.databaseResources;- }- if (props.binding.parsedExpr) {- const conditionExpr = convertFromExpr(props.binding.parsedExpr);- return conditionExpr.databaseResources;- }- return [];-});--const expirationSelectorRef = ref<InstanceType<typeof ExpirationSelector>>();-const databaseResourceFormRef =- ref<InstanceType<typeof QuerierDatabaseResourceForm>>();-const roleStore = useRoleStore();--const selectedRole = computed(() => roleStore.getRoleByName(state.role));--defineExpose({- reason: computed(() => state.reason),- getDatabaseResources: async () => {- const resources =- await databaseResourceFormRef.value?.getDatabaseResources();- return resources;- },- getBinding: async (title: string = ""): Promise<Binding> => {- const databaseResources =- await databaseResourceFormRef.value?.getDatabaseResources();- const condition = buildConditionExpr({- title,- role: state.role,- description: state.reason,- expirationTimestampInMS: state.expirationTimestampInMS,- databaseResources,- environments: roleHasEnvironmentLimitation(state.role)- ? state.environments- : undefined,- });-- return create(BindingSchema, {- members: state.memberList,- role: state.role,- condition,- });- },- expirationTimestampInMS: computed(() => state.expirationTimestampInMS),- allowConfirm: computed(() => {- if (!state.role) {- return false;- }- if (state.memberList.length <= 0) {- return false;- }- if (!expirationSelectorRef.value?.isValid) {- return false;- }- // Only check database form validity if it's rendered- if (- databaseResourceFormRef.value &&- !databaseResourceFormRef.value.isValid- ) {- return false;- }- if (props.requireReason && !state.reason.trim()) {- return false;- }- return true;- }),-});-</script>diff --git a/frontend/src/components/ProvideSQLEditorContext.test.ts b/frontend/src/components/ProvideSQLEditorContext.test.tsnew file mode 100644index 0000000000..51a3269d9c--- /dev/null+++ b/frontend/src/components/ProvideSQLEditorContext.test.ts@@ -0,0 +1,308 @@+import { mount } from "@vue/test-utils";+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";+import { defineComponent, h, nextTick, reactive } from "vue";++const mocks = vi.hoisted(() => ({+ route: {+ name: "sql-editor.project",+ fullPath: "/sql-editor/projects/prod",+ params: { project: "prod" },+ query: {},+ matched: [] as Array<{ meta: { requiredPermissionList?: () => string[] } }>,+ },+ routerReplace: vi.fn(),+ maybeSwitchProject: vi.fn(async (project: string) => {+ if (mocks.editorStore) {+ mocks.editorStore.project = project;+ }+ return true;+ }),+ editorStore: undefined as+ | {+ project: string;+ projectContextReady: boolean;+ allowViewALLProjects: boolean;+ storedLastViewedProject: string;+ setProject: (project: string) => void;+ }+ | undefined,+ reactGuardAllows: true,+}));++vi.mock("@vueuse/core", () => ({+ useLocalStorage: (_key: string, initial: unknown) => ({ value: initial }),+}));++vi.mock("vue-router", async (importOriginal) => {+ const actual = await importOriginal<typeof import("vue-router")>();+ return {+ ...actual,+ useRoute: () => mocks.route,+ useRouter: () => ({+ replace: mocks.routerReplace,+ }),+ };+});++vi.mock("@/react/ReactPageMount.vue", async () => {+ const { defineComponent, h, onMounted, ref } = await import("vue");+ return {+ default: defineComponent({+ name: "MockReactPageMount",+ props: {+ page: {+ type: String,+ required: true,+ },+ pageProps: {+ type: Object,+ default: undefined,+ },+ },+ setup(props) {+ const target = ref<HTMLDivElement | null>(null);+ onMounted(() => {+ props.pageProps?.onReady?.(+ mocks.reactGuardAllows ? target.value : null+ );+ });+ return () =>+ h("div", { "data-testid": "react-permission-shell" }, [+ h("div", {+ ref: target,+ "data-testid": "react-permission-target",+ class: props.pageProps?.targetClassName,+ }),+ !mocks.reactGuardAllows &&+ h("div", { "data-testid": "react-permission-denied" }),+ ]);+ },+ }),+ };+});++vi.mock("@/bbkit", async () => {+ const { defineComponent, h } = await import("vue");+ return {+ BBSpin: defineComponent({+ name: "MockBBSpin",+ setup() {+ return () => h("div", { "data-testid": "sql-editor-spinner" });+ },+ }),+ };+});++vi.mock("@/plugins/ai", async () => {+ const { defineComponent, h } = await import("vue");+ return {+ ProvideAIContext: defineComponent({+ name: "MockProvideAIContext",+ setup(_, { slots }) {+ return () =>+ h("div", { "data-testid": "provide-ai-context" }, slots.default?.());+ },+ }),+ };+});++vi.mock("@/composables/useEmitteryEventListener", () => ({+ useEmitteryEventListener: vi.fn(),+}));++vi.mock("@/composables/useRouteChangeGuard", () => ({+ useRouteChangeGuard: vi.fn(),+}));++vi.mock("@/plugins/i18n", () => ({+ t: (key: string) => key,+}));++vi.mock("vue-i18n", () => ({+ useI18n: () => ({+ t: (key: string) => key,+ }),+}));++vi.mock("@/router/sqlEditor", () => ({+ SQL_EDITOR_DATABASE_MODULE: "sql-editor.database",+ SQL_EDITOR_HOME_MODULE: "sql-editor.home",+ SQL_EDITOR_INSTANCE_MODULE: "sql-editor.instance",+ SQL_EDITOR_PROJECT_MODULE: "sql-editor.project",+ SQL_EDITOR_WORKSHEET_MODULE: "sql-editor.worksheet",+}));++vi.mock("@/store/modules/sqlEditor/legacy/migration", () => ({+ migrateLegacyCache: vi.fn(async () => undefined),+}));++vi.mock("@/views/sql-editor/context", async () => {+ const { ref } = await import("vue");+ return {+ ASIDE_PANEL_TABS: ["WORKSHEET", "CONNECTION"],+ useSQLEditorContext: () => ({+ asidePanelTab: ref("WORKSHEET"),+ events: {},+ maybeSwitchProject: mocks.maybeSwitchProject,+ }),+ };+});++vi.mock("@/types", () => ({+ DEFAULT_SQL_EDITOR_TAB_MODE: "READONLY",+ BASIC_WORKSPACE_PERMISSIONS: [],+ isValidDatabaseName: (name?: string) => name?.startsWith("instances/"),+ isValidInstanceName: (name?: string) => name?.startsWith("instances/"),+ isValidProjectName: (name?: string) => name?.startsWith("projects/"),+}));++vi.mock("@/utils", () => ({+ emptySQLEditorConnection: () => ({}),+ extractDatabaseResourceName: (name: string) => ({+ instance: name.split("/databases/")[0],+ databaseName: name.split("/databases/")[1] ?? "",+ }),+ extractInstanceResourceName: (name: string) => name.split("/").pop() ?? name,+ extractProjectResourceName: (name: string) => name.split("/").pop() ?? name,+ extractWorksheetConnection: vi.fn(async () => ({})),+ extractWorksheetID: (name: string) => name.split("/").pop() ?? name,+ getDefaultPagination: () => 100,+ getSheetStatement: () => "",+ isWorksheetReadableV1: () => true,+ STORAGE_KEY_SQL_EDITOR_SIDEBAR_TAB: "bb.sql-editor.sidebar-tab",+ suggestedTabTitleForSQLEditorConnection: () => "tab",+}));++vi.mock("@/store", () => ({+ pushNotification: vi.fn(),+ usePermissionStore: () => ({+ currentPermissions: new Set<string>(["bb.test"]),+ currentPermissionsInProjectV1: () => new Set<string>(["bb.test"]),+ }),+ useActuatorV1Store: () => ({+ serverInfo: { defaultProject: "projects/default" },+ }),+ useDatabaseV1Store: () => ({+ getOrFetchDatabaseByName: vi.fn(async (name: string) => ({+ name,+ project: "projects/prod",+ })),+ }),+ useProjectV1Store: () => ({+ fetchProjectList: vi.fn(async () => ({+ projects: [{ name: "projects/prod" }],+ })),+ getProjectByName: (name: string) => ({+ name,+ allowRequestRole: true,+ }),+ }),+ useSQLEditorStore: () => mocks.editorStore,+ useSQLEditorTabStore: () => ({+ openTabList: [],+ currentTab: undefined,+ getTabByWorksheet: vi.fn(),+ updateTab: vi.fn(),+ addTab: vi.fn(),+ initProject: vi.fn(async () => undefined),+ }),+ useWorkSheetStore: () => ({+ getOrFetchWorksheetByName: vi.fn(async () => undefined),+ getWorksheetByName: vi.fn(() => undefined),+ }),+}));++import ProvideSQLEditorContext from "./ProvideSQLEditorContext.vue";++const mountContext = () =>+ mount(ProvideSQLEditorContext, {+ attachTo: document.body,+ global: {+ stubs: {+ RouterView: defineComponent({+ name: "MockRouterView",+ setup() {+ return () =>+ h("div", { "data-testid": "sql-editor-route-content" });+ },+ }),+ },+ },+ });++beforeEach(() => {+ document.body.innerHTML = '<ul id="sql-editor-debug"></ul>';+ mocks.routerReplace.mockClear();+ mocks.maybeSwitchProject.mockClear();+ mocks.reactGuardAllows = true;+ mocks.route.name = "sql-editor.project";+ mocks.route.fullPath = "/sql-editor/projects/prod";+ mocks.route.params = { project: "prod" };+ mocks.route.query = {};+ mocks.editorStore = reactive({+ project: "projects/prod",+ projectContextReady: false,+ allowViewALLProjects: true,+ storedLastViewedProject: "projects/prod",+ setProject(project: string) {+ this.project = project;+ },+ });+});++afterEach(() => {+ document.body.innerHTML = "";+});++describe("ProvideSQLEditorContext permission shell bridge", () => {+ test("renders the loading state until project context is ready", () => {+ mountContext();++ expect(+ document.body.querySelector("[data-testid='sql-editor-spinner']")+ ).not.toBeNull();+ expect(+ document.body.querySelector("[data-testid='sql-editor-route-content']")+ ).toBeNull();+ });++ test("teleports SQL Editor route content into the React permission target", async () => {+ mountContext();+ await nextTick();++ mocks.editorStore!.projectContextReady = true;+ await nextTick();+ await nextTick();++ const target = document.body.querySelector(+ "[data-testid='react-permission-target']"+ );+ const content = document.body.querySelector(+ "[data-testid='sql-editor-route-content']"+ );++ expect(target?.contains(content)).toBe(true);+ expect(target?.className).toContain("h-full");+ expect(target?.className).toContain("flex");+ expect(+ document.body.querySelector("[data-testid='provide-ai-context']")+ ).not.toBeNull();+ });++ test("withholds SQL Editor route content when the React guard denies access", async () => {+ mocks.reactGuardAllows = false;+ mountContext();+ await nextTick();++ mocks.editorStore!.projectContextReady = true;+ await nextTick();+ await nextTick();++ expect(+ document.body.querySelector("[data-testid='react-permission-denied']")+ ).not.toBeNull();+ expect(+ document.body.querySelector("[data-testid='sql-editor-route-content']")+ ).toBeNull();+ });+});diff --git a/frontend/src/components/ProvideSQLEditorContext.vue b/frontend/src/components/ProvideSQLEditorContext.vueindex b70a0559c5..e2bee47cf2 100644--- a/frontend/src/components/ProvideSQLEditorContext.vue+++ b/frontend/src/components/ProvideSQLEditorContext.vue@@ -12,16 +12,25 @@</teleport><Suspense>- <RoutePermissionGuard- v-if="editorStore.projectContextReady"- class="m-6"- :project="project"- :routes="sqlEditorRoutes"- >- <ProvideAIContext>- <router-view />- </ProvideAIContext>- </RoutePermissionGuard>+ <template v-if="editorStore.projectContextReady">+ <ReactPageMount+ page="RoutePermissionGuardShell"+ :page-props="{+ project,+ className: 'm-6',+ targetClassName: 'h-full min-h-0 flex flex-col',+ onReady: handlePermissionReady,+ }"+ />+ <teleport+ v-if="routePermitted && routePermissionTarget"+ :to="routePermissionTarget"+ >+ <ProvideAIContext>+ <router-view />+ </ProvideAIContext>+ </teleport>+ </template><div v-else class="flex items-center justify-center h-screen"><BBSpin /></div>@@ -31,15 +40,16 @@<script lang="ts" setup>import { useLocalStorage } from "@vueuse/core";import { debounce, head, omit } from "lodash-es";-import { computed, nextTick, onMounted, watch } from "vue";+import { computed, nextTick, onMounted, shallowRef, watch } from "vue";import { useI18n } from "vue-i18n";import { useRoute, useRouter } from "vue-router";import { BBSpin } from "@/bbkit";-import RoutePermissionGuard from "@/components/Permission/RoutePermissionGuard.vue";import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";import { useRouteChangeGuard } from "@/composables/useRouteChangeGuard";+import { useRoutePermitted } from "@/composables/useRoutePermitted";import { ProvideAIContext } from "@/plugins/ai";-import sqlEditorRoutes, {+import ReactPageMount from "@/react/ReactPageMount.vue";+import {SQL_EDITOR_DATABASE_MODULE,SQL_EDITOR_HOME_MODULE,SQL_EDITOR_INSTANCE_MODULE,@@ -90,12 +100,17 @@ const databaseStore = useDatabaseV1Store();const editorStore = useSQLEditorStore();const worksheetStore = useWorkSheetStore();const tabStore = useSQLEditorTabStore();+const routePermissionTarget = shallowRef<HTMLElement | null>(null);const {asidePanelTab,events: editorEvents,maybeSwitchProject,} = useSQLEditorContext();+const handlePermissionReady = (target: HTMLElement | null) => {+ routePermissionTarget.value = target;+};+useRouteChangeGuard(computed(() => {return (@@ -154,6 +169,7 @@ const project = computed(() => {}return proj;});+const routePermitted = useRoutePermitted(project);const switchWorksheet = async (sheetName: string) => {const openedSheetTab = tabStore.getTabByWorksheet(sheetName);diff --git a/frontend/src/components/RoleGrantPanel/RoleGrantPanel.vue b/frontend/src/components/RoleGrantPanel/RoleGrantPanel.vuedeleted file mode 100644index 5a19e07e51..0000000000--- a/frontend/src/components/RoleGrantPanel/RoleGrantPanel.vue+++ /dev/null@@ -1,186 +0,0 @@-<template>- <Drawer- :show="true"- width="auto"- :placement="placement"- @update:show="(show: boolean) => !show && $emit('close')"- >- <DrawerContent- :title="$t('issue.title.request-role')"- :closable="true"- class="w-200 max-w-[100vw] relative"- >- <div class="w-full mx-auto flex flex-col gap-y-4">- <AddProjectMemberForm- ref="formRef"- class="w-full"- :project-name="projectName"- :binding="binding"- :disable-member-change="true"- :require-reason="project.enforceIssueTitle"- :database-resources="databaseResources"- :required-permissions="requiredPermissions"- />- <IssueLabels :project="project" v-model:value="labels" />- </div>- <template #footer>- <div class="flex items-center justify-end gap-x-2">- <NButton quaternary @click="$emit('close')">- {{ $t("common.cancel") }}- </NButton>- <NButton- type="primary"- :disabled="!allowCreate"- @click="doCreateIssue"- >- {{ $t("common.submit") }}- </NButton>- </div>- </template>- </DrawerContent>- </Drawer>-</template>--<script lang="ts" setup>-import { create } from "@bufbuild/protobuf";-import { DurationSchema } from "@bufbuild/protobuf/wkt";-import dayjs from "dayjs";-import { uniq } from "lodash-es";-import { NButton } from "naive-ui";-import { computed, ref } from "vue";-import { useI18n } from "vue-i18n";-import { useRouter } from "vue-router";-import IssueLabels from "@/components/IssueV1/components/Sidebar/IssueLabels.vue";-import AddProjectMemberForm from "@/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue";-import { Drawer, DrawerContent } from "@/components/v2";-import { issueServiceClientConnect } from "@/connect";-import { PROJECT_V1_ROUTE_ISSUE_DETAIL } from "@/router/dashboard/projectV1";-import { useCurrentUserV1, useProjectV1Store } from "@/store";-import type { DatabaseResource } from "@/types";-import { getUserEmailInBinding } from "@/types";-import { BindingSchema } from "@/types/proto-es/v1/iam_policy_pb";-import {- CreateIssueRequestSchema,- IssueSchema,- Issue_Type as NewIssue_Type,- RoleGrantSchema,-} from "@/types/proto-es/v1/issue_service_pb";-import {- displayRoleTitle,- extractIssueUID,- extractProjectResourceName,- formatIssueTitle,-} from "@/utils";--const props = withDefaults(- defineProps<{- projectName: string;- role?: string;- databaseResources?: DatabaseResource[];- requiredPermissions?: string[];- placement?: "left" | "right";- }>(),- {- databaseResources: () => [],- role: undefined,- placement: "right",- }-);--const emit = defineEmits<{- (event: "close"): void;-}>();--const { t } = useI18n();-const currentUser = useCurrentUserV1();-const projectStore = useProjectV1Store();-const router = useRouter();--const binding = computed(() => {- return create(BindingSchema, {- role: props.role,- members: [getUserEmailInBinding(currentUser.value.email)],- });-});--const formRef = ref<InstanceType<typeof AddProjectMemberForm>>();-const labels = ref<string[]>([]);--const project = computed(() =>- projectStore.getProjectByName(props.projectName)-);--const allowCreate = computed(() => {- if (!formRef.value?.allowConfirm) {- return false;- }- if (project.value.forceIssueLabels && labels.value.length === 0) {- return false;- }- return true;-});--const doCreateIssue = async () => {- if (!allowCreate.value) {- return;- }-- const binding = await formRef.value?.getBinding();- if (!binding) {- return;- }-- const roleGrant = create(RoleGrantSchema, {- role: binding.role,- user: `users/${currentUser.value.email}`,- condition: binding.condition,- expiration: formRef.value?.expirationTimestampInMS- ? create(DurationSchema, {- seconds: BigInt(- dayjs(formRef.value.expirationTimestampInMS).unix() - dayjs().unix()- ),- })- : undefined,- });-- const databaseResources = await formRef.value?.getDatabaseResources();-- const newIssue = create(IssueSchema, {- title: project.value.enforceIssueTitle- ? `[${t("issue.title.request-role")}] ${formRef.value?.reason}`- : formatIssueTitle(- t("issue.title.request-specific-role", {- role: displayRoleTitle(binding.role),- }),- uniq(- databaseResources?.map(- (databaseResource: DatabaseResource) =>- databaseResource.databaseFullName- )- )- ),- description: binding.condition?.description,- type: NewIssue_Type.ROLE_GRANT,- roleGrant,- labels: labels.value,- });-- const request = create(CreateIssueRequestSchema, {- parent: props.projectName,- issue: newIssue,- });- const response = await issueServiceClientConnect.createIssue(request);-- const route = router.resolve({- name: PROJECT_V1_ROUTE_ISSUE_DETAIL,- params: {- projectId: extractProjectResourceName(response.name),- issueId: extractIssueUID(response.name),- },- });-- window.open(route.fullPath, "_blank");-- emit("close");-};-</script>diff --git a/frontend/src/components/RoleGrantPanel/index.ts b/frontend/src/components/RoleGrantPanel/index.tsdeleted file mode 100644index 11dda2e3fd..0000000000--- a/frontend/src/components/RoleGrantPanel/index.ts+++ /dev/null@@ -1,3 +0,0 @@-import RoleGrantPanel from "./RoleGrantPanel.vue";--export default RoleGrantPanel;diff --git a/frontend/src/composables/useRoutePermitted.ts b/frontend/src/composables/useRoutePermitted.tsnew file mode 100644index 0000000000..a118f728fb--- /dev/null+++ b/frontend/src/composables/useRoutePermitted.ts@@ -0,0 +1,46 @@+import {+ type ComputedRef,+ computed,+ type MaybeRefOrGetter,+ toValue,+} from "vue";+import { useRoute } from "vue-router";+import { usePermissionStore } from "@/store";+import { BASIC_WORKSPACE_PERMISSIONS, type Permission } from "@/types";+import type { Project } from "@/types/proto-es/v1/project_service_pb";++// Mirrors useComponentPermissionState in the React shell. Runs in Vue+// reactive context so the parent layout can gate `<router-view>` mount+// synchronously on route change — otherwise an unauthorized route's+// component can mount and fire setup-time requests in the window between+// the route change and the React shell's async onReady(null).+export function useRoutePermitted(+ project?: MaybeRefOrGetter<Project | undefined>+): ComputedRef<boolean> {+ const route = useRoute();+ const permissionStore = usePermissionStore();++ return computed(() => {+ const workspacePermissions = permissionStore.currentPermissions;+ if (+ !BASIC_WORKSPACE_PERMISSIONS.every((p) => workspacePermissions.has(p))+ ) {+ return false;+ }++ const required = route.matched.flatMap(+ (record) => (record.meta.requiredPermissionList?.() ?? []) as Permission[]+ );+ if (required.length === 0) {+ return true;+ }++ const resolvedProject = project ? toValue(project) : undefined;+ const projectPermissions = resolvedProject+ ? permissionStore.currentPermissionsInProjectV1(resolvedProject)+ : null;+ return required.every(+ (p) => workspacePermissions.has(p) || !!projectPermissions?.has(p)+ );+ });+}diff --git a/frontend/src/layouts/BodyLayout.vue b/frontend/src/layouts/BodyLayout.vueindex 5a7a7f6ab8..0e5d17a663 100644--- a/frontend/src/layouts/BodyLayout.vue+++ b/frontend/src/layouts/BodyLayout.vue@@ -14,17 +14,21 @@</teleport><teleport v-if="contentTarget" :to="contentTarget">- <RoutePermissionGuard- class="m-4"- :routes="[- ...workspaceRoutes,- ...workspaceSettingRoutes,- ...environmentV1Routes,- ...instanceRoutes,- ]"- >- <router-view name="content" />- </RoutePermissionGuard>+ <ReactPageMount+ page="RoutePermissionGuardShell"+ :page-props="{+ className: 'm-4',+ targetClassName: 'h-full min-h-0',+ onReady: handlePermissionReady,+ }"+ />+ </teleport>++ <teleport+ v-if="routePermitted && routePermissionTarget"+ :to="routePermissionTarget"+ >+ <router-view name="content" /></teleport><teleport v-if="quickstartTarget" :to="quickstartTarget">@@ -44,17 +48,13 @@ import { useWindowSize } from "@vueuse/core";import { computed, onMounted, onUnmounted, ref, shallowRef } from "vue";import { useRoute, useRouter } from "vue-router";import AgentWindowMount from "@/components/AgentWindowMount.vue";-import RoutePermissionGuard from "@/components/Permission/RoutePermissionGuard.vue";import Quickstart from "@/components/Quickstart.vue";import ReleaseRemindModal from "@/components/ReleaseRemindModal.vue";+import { useRoutePermitted } from "@/composables/useRoutePermitted";import { t } from "@/plugins/i18n";import type { DashboardShellTargets } from "@/react/dashboard-shell";import ReactPageMount from "@/react/ReactPageMount.vue";-import environmentV1Routes from "@/router/dashboard/environmentV1";-import instanceRoutes from "@/router/dashboard/instance";-import workspaceRoutes from "@/router/dashboard/workspace";import { WORKSPACE_ROOT_MODULE } from "@/router/dashboard/workspaceRoutes";-import workspaceSettingRoutes from "@/router/dashboard/workspaceSetting";import {pushNotification,useActuatorV1Store,@@ -81,6 +81,8 @@ const shellTargets = shallowRef<DashboardShellTargets>({});const mainContainerRef = ref<HTMLDivElement>();const showReleaseModal = ref(false);+const routePermissionTarget = shallowRef<HTMLDivElement | null>(null);+const routePermitted = useRoutePermitted();const isRootPath = computed(() => {return router.currentRoute.value.name === WORKSPACE_ROOT_MODULE;@@ -100,6 +102,10 @@ const handleReady = (targets: DashboardShellTargets) => {mainContainerRef.value = targets.mainContainer ?? undefined;};+const handlePermissionReady = (target: HTMLDivElement | null) => {+ routePermissionTarget.value = target;+};+actuatorStore.tryToRemindRelease().then((openRemindModal) => {if (subscriptionStore.currentPlan === PlanType.ENTERPRISE &&diff --git a/frontend/src/layouts/ProjectV1Layout.vue b/frontend/src/layouts/ProjectV1Layout.vueindex f3e8370d32..3ab9c2736e 100644--- a/frontend/src/layouts/ProjectV1Layout.vue+++ b/frontend/src/layouts/ProjectV1Layout.vue@@ -10,17 +10,25 @@</BBAttention></div>- <RoutePermissionGuard- class="m-4"- :project="project"- :routes="projectRoutes"+ <ReactPageMount+ page="RoutePermissionGuardShell"+ :page-props="{+ project,+ className: 'm-4',+ targetClassName: 'h-full min-h-0',+ onReady: handlePermissionReady,+ }"+ />+ <teleport+ v-if="routePermitted && routePermissionTarget"+ :to="routePermissionTarget"><router-view:project-id="projectId":allow-edit="allowEdit"v-bind="$attrs"/>- </RoutePermissionGuard>+ </teleport></template><divv-else@@ -35,16 +43,15 @@<script lang="tsx" setup>import { type ConnectError } from "@connectrpc/connect";import { NSpin } from "naive-ui";-import { computed, watch, watchEffect } from "vue";+import { computed, shallowRef, watch, watchEffect } from "vue";import { useRoute, useRouter } from "vue-router";import { BBAttention } from "@/bbkit";import ArchiveBanner from "@/components/ArchiveBanner.vue";import IAMRemindModal from "@/components/IAMRemindModal.vue";-import RoutePermissionGuard from "@/components/Permission/RoutePermissionGuard.vue";import { useRecentProjects } from "@/components/Project/useRecentProjects";-import projectRoutes, {- PROJECT_V1_ROUTE_DETAIL,-} from "@/router/dashboard/projectV1";+import { useRoutePermitted } from "@/composables/useRoutePermitted";+import ReactPageMount from "@/react/ReactPageMount.vue";+import { PROJECT_V1_ROUTE_DETAIL } from "@/router/dashboard/projectV1";import { WORKSPACE_ROUTE_LANDING } from "@/router/dashboard/workspaceRoutes";import { useRecentVisit } from "@/router/useRecentVisit";import {@@ -69,6 +76,11 @@ const router = useRouter();const recentProjects = useRecentProjects();const projectStore = useProjectV1Store();const { remove: removeVisit } = useRecentVisit();+const routePermissionTarget = shallowRef<HTMLDivElement | null>(null);++const handlePermissionReady = (target: HTMLDivElement | null) => {+ routePermissionTarget.value = target;+};const projectName = computed(() => `${projectNamePrefix}${props.projectId}`);@@ -122,6 +134,7 @@ watchEffect(async () => {const { project, ready } = useProjectByName(projectName);const { ready: iamReady } = useProjectIamPolicy(projectName);+const routePermitted = useRoutePermitted(project);const initialized = computed(() =>diff --git a/frontend/src/layouts/layout-bridge.test.ts b/frontend/src/layouts/layout-bridge.test.tsindex 80217042ac..8f888f37ca 100644--- a/frontend/src/layouts/layout-bridge.test.ts+++ b/frontend/src/layouts/layout-bridge.test.ts@@ -39,11 +39,16 @@ vi.mock("@/react/ReactPageMount.vue", async () => {const content = ref<HTMLDivElement | null>(null);const quickstart = ref<HTMLDivElement | null>(null);const mainContainer = ref<HTMLDivElement | null>(null);+ const permissionTarget = ref<HTMLDivElement | null>(null);onMounted(() => {if (props.page === "DashboardFrameShell") {return;}+ if (props.page === "RoutePermissionGuardShell") {+ props.pageProps?.onReady?.(permissionTarget.value);+ return;+ }props.pageProps?.onReady?.({desktopSidebar:@@ -61,53 +66,39 @@ vi.mock("@/react/ReactPageMount.vue", async () => {});return () =>- h("div", { "data-testid": "mock-shell" }, [- h("div", {- ref: desktopSidebar,- "data-testid": "shell-desktop-sidebar",- }),- h("div", {- ref: mobileSidebar,- "data-testid": "shell-mobile-sidebar",- }),- h(- "div",- {- id: "bb-layout-main",- ref: mainContainer,- },- [+ props.page === "RoutePermissionGuardShell"+ ? h("div", {+ ref: permissionTarget,+ "data-testid": "permission-guard",+ class: props.pageProps?.targetClassName,+ })+ : h("div", { "data-testid": "mock-shell" }, [h("div", {- ref: content,- "data-testid": "shell-content",+ ref: desktopSidebar,+ "data-testid": "shell-desktop-sidebar",}),- ]- ),- h("div", {- ref: quickstart,- "data-testid": "shell-quickstart",- }),- ]);- },- }),- };-});--vi.mock("@/components/Permission/RoutePermissionGuard.vue", async () => {- const { defineComponent, h } = await import("vue");- return {- default: defineComponent({- name: "MockRoutePermissionGuard",- setup(_, { slots, attrs }) {- return () =>- h(- "div",- {- "data-testid": "permission-guard",- class: attrs.class,- },- slots.default?.()- );+ h("div", {+ ref: mobileSidebar,+ "data-testid": "shell-mobile-sidebar",+ }),+ h(+ "div",+ {+ id: "bb-layout-main",+ ref: mainContainer,+ },+ [+ h("div", {+ ref: content,+ "data-testid": "shell-content",+ }),+ ]+ ),+ h("div", {+ ref: quickstart,+ "data-testid": "shell-quickstart",+ }),+ ]);},}),};@@ -154,22 +145,6 @@ vi.mock("@/plugins/i18n", () => ({t: (key: string) => key,}));-vi.mock("@/router/dashboard/environmentV1", () => ({- default: [],-}));--vi.mock("@/router/dashboard/instance", () => ({- default: [],-}));--vi.mock("@/router/dashboard/workspace", () => ({- default: [],-}));--vi.mock("@/router/dashboard/workspaceSetting", () => ({- default: [],-}));-vi.mock("@/router/dashboard/workspaceRoutes", () => ({WORKSPACE_ROOT_MODULE: "workspace.root",}));@@ -182,6 +157,8 @@ vi.mock("@/store", () => ({}),usePermissionStore: () => ({currentRolesInWorkspace: new Set<string>(),+ currentPermissions: new Set<string>(["bb.test"]),+ currentPermissionsInProjectV1: () => new Set<string>(["bb.test"]),}),useSubscriptionV1Store: () => ({currentPlan: 0,@@ -192,6 +169,7 @@ vi.mock("@/types", () => ({PresetRoleType: {WORKSPACE_ADMIN: "WORKSPACE_ADMIN",},+ BASIC_WORKSPACE_PERMISSIONS: [],}));vi.mock("@/types/proto-es/v1/subscription_service_pb", () => ({diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.jsonindex 7915546d80..ac8550d517 100644--- a/frontend/src/locales/en-US.json+++ b/frontend/src/locales/en-US.json@@ -472,7 +472,6 @@"warning": "Warning","webhooks": "Webhooks","wecom": "WeCom",- "workspace-initialize-error": "Failed to initialize the workspace","write-only": "write only","you": "you"},@@ -1519,7 +1518,6 @@"description": "Project members determine the permission to operate database and issues inside the project. Project Owner, Workspace Admin and Workspace DBA all have full project permissions.","never-expires": "Never","role-never-expires": "This role never expires.",- "roles-are-filtered-by-permissions": "Roles are filtered by the permissions","workspace-level-roles": "Workspace level roles"},"overview": {diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.jsonindex 0942e42924..a7b88a23ce 100644--- a/frontend/src/locales/es-ES.json+++ b/frontend/src/locales/es-ES.json@@ -472,7 +472,6 @@"warning": "Advertencia","webhooks": "Webhooks","wecom": "WeCom",- "workspace-initialize-error": "Error al inicializar el espacio de trabajo","write-only": "solo escritura","you": "tu"},@@ -1519,7 +1518,6 @@"description": "Los miembros del proyecto determinan el permiso para operar la base de datos y los problemas dentro del proyecto. El propietario del proyecto, el administrador del espacio de trabajo y el DBA del espacio de trabajo tienen permisos completos para el proyecto.","never-expires": "Nunca caduca","role-never-expires": "Este rol nunca expira.",- "roles-are-filtered-by-permissions": "Roles are filtered by the permissions","workspace-level-roles": "Roles a nivel de espacio de trabajo"},"overview": {diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.jsonindex 54708d110b..9fe40ffbc2 100644--- a/frontend/src/locales/ja-JP.json+++ b/frontend/src/locales/ja-JP.json@@ -472,7 +472,6 @@"warning": "警告する","webhooks": "Webhook","wecom": "WeCom",- "workspace-initialize-error": "ワークスペースの初期化に失敗しました","write-only": "書き込み専用","you": "あなた"},@@ -1519,7 +1518,6 @@"description": "プロジェクトメンバーのロールにより、プロジェクト内のデータベースとイシューを操作するための権限が決まります。プロジェクト所有者、ワークスペース管理者、および DBA はすべて、プロジェクトに対する完全な権限を持っています。","never-expires": "有効期限が切れることはありません","role-never-expires": "このロールには有効期限はありません。",- "roles-are-filtered-by-permissions": "Roles are filtered by the permissions","workspace-level-roles": "ワークスペースレベルのロール"},"overview": {diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.jsonindex 095701b36e..5bb8cb61e5 100644--- a/frontend/src/locales/vi-VN.json+++ b/frontend/src/locales/vi-VN.json@@ -472,7 +472,6 @@"warning": "Cảnh báo","webhooks": "Webhooks","wecom": "WeCom",- "workspace-initialize-error": "Không thể khởi tạo không gian làm việc","write-only": "chỉ ghi","you": "bạn"},@@ -1519,7 +1518,6 @@"description": "Thành viên dự án xác định quyền để vận hành cơ sở dữ liệu và các vấn đề bên trong dự án. Chủ sở hữu dự án, Quản trị viên không gian làm việc và DBA không gian làm việc đều có toàn quyền dự án.","never-expires": "Không bao giờ","role-never-expires": "Vai trò này không bao giờ hết hạn.",- "roles-are-filtered-by-permissions": "Roles are filtered by the permissions","workspace-level-roles": "Vai trò cấp độ không gian làm việc"},"overview": {diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.jsonindex 9271b6f646..e5ce81a742 100644--- a/frontend/src/locales/zh-CN.json+++ b/frontend/src/locales/zh-CN.json@@ -472,7 +472,6 @@"warning": "警告","webhooks": "Webhook","wecom": "企业微信",- "workspace-initialize-error": "工作空间初始化失败","write-only": "仅写入","you": "您"},@@ -1519,7 +1518,6 @@"description": "项目成员角色决定了操作项目中的数据库和工单的权限。项目的所有者,工作空间管理员和 DBA 都具有项目所有的权限。","never-expires": "永不过期","role-never-expires": "此角色没有过期时间。",- "roles-are-filtered-by-permissions": "角色已按权限筛选","workspace-level-roles": "工作空间级别角色"},"overview": {diff --git a/frontend/src/react/components/ComponentPermissionGuard.tsx b/frontend/src/react/components/ComponentPermissionGuard.tsxindex 21bc9ae171..a26d950e16 100644--- a/frontend/src/react/components/ComponentPermissionGuard.tsx+++ b/frontend/src/react/components/ComponentPermissionGuard.tsx@@ -1,15 +1,90 @@-import { ShieldAlert } from "lucide-react";-import type { ReactNode } from "react";+import { ShieldAlert, ShieldUser } from "lucide-react";+import { lazy, type ReactNode, Suspense, useMemo, useState } from "react";import { useTranslation } from "react-i18next";-import type { Permission } from "@/types";+import { FeatureBadge } from "@/react/components/FeatureBadge";+import { PermissionGuard } from "@/react/components/PermissionGuard";+import { Button } from "@/react/components/ui/button";+import { useVueState } from "@/react/hooks/useVueState";+import { REQUEST_ROLE_REQUIRED_PERMISSIONS } from "@/react/pages/settings/requestRoleButton";+import { usePermissionStore, useSubscriptionV1Store } from "@/store";+import { BASIC_WORKSPACE_PERMISSIONS, type Permission } from "@/types";import type { Project } from "@/types/proto-es/v1/project_service_pb";-import { hasProjectPermissionV2, hasWorkspacePermissionV2 } from "@/utils";+import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";++const RequestRoleSheet = lazy(async () => {+ const module = await import("@/react/pages/settings/RequestRoleSheet");+ return { default: module.RequestRoleSheet };+});interface ComponentPermissionGuardProps {readonly permissions: Permission[];readonly project?: Project;readonly children: ReactNode;readonly className?: string;+ readonly path?: string;+ readonly resources?: string[];+ readonly checkBasicWorkspacePermissions?: boolean;+ readonly enableRequestRole?: boolean;+}++interface ComponentPermissionState {+ missedBasicPermissions: Permission[];+ missedPermissions: Permission[];+ permitted: boolean;+}++export function useComponentPermissionState({+ permissions,+ project,+ checkBasicWorkspacePermissions = false,+}: Readonly<+ Pick<+ ComponentPermissionGuardProps,+ "permissions" | "project" | "checkBasicWorkspacePermissions"+ >+>): ComponentPermissionState {+ const permissionStore = usePermissionStore();+ const workspacePermissionKey = useVueState(() =>+ [...permissionStore.currentPermissions].sort().join("\n")+ );+ const projectPermissionKey = useVueState(() =>+ project+ ? [...permissionStore.currentPermissionsInProjectV1(project)]+ .sort()+ .join("\n")+ : ""+ );++ return useMemo(() => {+ const workspacePermissions = new Set(+ workspacePermissionKey.split("\n").filter(Boolean) as Permission[]+ );+ const projectPermissions = new Set(+ projectPermissionKey.split("\n").filter(Boolean) as Permission[]+ );+ const missedBasicPermissions = checkBasicWorkspacePermissions+ ? BASIC_WORKSPACE_PERMISSIONS.filter((p) => !workspacePermissions.has(p))+ : [];++ const missedPermissions = permissions.filter((p) =>+ project+ ? !workspacePermissions.has(p) && !projectPermissions.has(p)+ : !workspacePermissions.has(p)+ );++ return {+ missedBasicPermissions,+ missedPermissions,+ permitted:+ missedBasicPermissions.length === 0 && missedPermissions.length === 0,+ };+ }, [+ checkBasicWorkspacePermissions,+ permissions,+ project,+ projectPermissionKey,+ workspacePermissionKey,+ ]);}/**@@ -24,24 +99,47 @@ export function ComponentPermissionGuard({project,children,className,+ path,+ resources = [],+ checkBasicWorkspacePermissions = false,+ enableRequestRole = false,}: ComponentPermissionGuardProps) {const { t } = useTranslation();- const missed = project- ? permissions.filter((p) => !hasProjectPermissionV2(project, p))- : permissions.filter((p) => !hasWorkspacePermissionV2(p));+ const [showRequestRoleSheet, setShowRequestRoleSheet] = useState(false);+ const subscriptionStore = useSubscriptionV1Store();+ const hasRequestRoleFeature = useVueState(() =>+ subscriptionStore.hasFeature(PlanFeature.FEATURE_REQUEST_ROLE_WORKFLOW)+ );+ const { missedBasicPermissions, missedPermissions, permitted } =+ useComponentPermissionState({+ permissions,+ project,+ checkBasicWorkspacePermissions,+ });- if (missed.length === 0) {+ if (permitted) {return <>{children}</>;}+ const missed =+ missedBasicPermissions.length > 0+ ? missedBasicPermissions+ : missedPermissions;+ const showRequestRole =+ enableRequestRole &&+ missedBasicPermissions.length === 0 &&+ !!project &&+ project.allowRequestRole &&+ missedPermissions.length > 0;+return (<div className={className}><divrole="alert"className="relative w-full rounded-xs border border-error/30 bg-error/5 text-error px-4 py-3 text-sm flex gap-x-3">- <ShieldAlert className="h-5 w-5 shrink-0 mt-0.5" />- <div className="flex flex-col gap-2">+ <ShieldAlert className="size-5 shrink-0 mt-0.5" />+ <div className="flex flex-col gap-3"><h5 className="font-medium leading-tight">{project? t("common.missing-required-permission-for-resource", {@@ -57,8 +155,53 @@ export function ComponentPermissionGuard({))}</ul></div>+ {(path || resources.length > 0) && (+ <div className="text-error/80">+ {path && <div>{path}</div>}+ {resources.map((resource) => (+ <div key={resource}>{resource}</div>+ ))}+ </div>+ )}+ {showRequestRole && (+ <div>+ <PermissionGuard+ permissions={[...REQUEST_ROLE_REQUIRED_PERMISSIONS]}+ project={project}+ >+ {({ disabled }) => (+ <Button+ variant="outline"+ size="sm"+ disabled={disabled || !hasRequestRoleFeature}+ onClick={() => setShowRequestRoleSheet(true)}+ >+ {hasRequestRoleFeature ? (+ <ShieldUser className="size-4" />+ ) : (+ <FeatureBadge+ feature={PlanFeature.FEATURE_REQUEST_ROLE_WORKFLOW}+ clickable={false}+ />+ )}+ {t("issue.title.request-role")}+ </Button>+ )}+ </PermissionGuard>+ </div>+ )}</div></div>+ {project && showRequestRoleSheet && (+ <Suspense fallback={null}>+ <RequestRoleSheet+ open={showRequestRoleSheet}+ project={project}+ requiredPermissions={missedPermissions}+ onClose={() => setShowRequestRoleSheet(false)}+ />+ </Suspense>+ )}</div>);}diff --git a/frontend/src/react/components/DashboardBodyShell.tsx b/frontend/src/react/components/DashboardBodyShell.tsxindex 09dedab485..3900b0fb26 100644--- a/frontend/src/react/components/DashboardBodyShell.tsx+++ b/frontend/src/react/components/DashboardBodyShell.tsx@@ -146,7 +146,7 @@ export function DashboardBodyShell({variant === "workspace" ? "md:min-w-0" : "min-w-0")}>- <div ref={contentRef} />+ <div ref={contentRef} className="h-full" /></div></div></div>diff --git a/frontend/src/react/components/RoleSelect.tsx b/frontend/src/react/components/RoleSelect.tsxindex 71997a418f..efe2e5beab 100644--- a/frontend/src/react/components/RoleSelect.tsx+++ b/frontend/src/react/components/RoleSelect.tsx@@ -9,6 +9,7 @@ import {PRESET_ROLES,PRESET_WORKSPACE_ROLES,} from "@/types/iam";+import type { Role } from "@/types/proto-es/v1/role_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import { displayRoleDescription, displayRoleTitle } from "@/utils";@@ -19,6 +20,7 @@ interface RoleSelectProps {scope?: "project";multiple?: boolean;placeholder?: string;+ filterRole?: (role: Role) => boolean;}export function RoleSelect({@@ -28,6 +30,7 @@ export function RoleSelect({scope,multiple = true,placeholder,+ filterRole,}: RoleSelectProps) {const { t } = useTranslation();const roleStore = useRoleStore();@@ -39,14 +42,23 @@ export function RoleSelect({const groups: ComboboxGroup[] = useMemo(() => {const isCustomRole = (name: string) => !PRESET_ROLES.includes(name);+ const visibleRole = (name: string) => {+ if (!filterRole) {+ return true;+ }+ const role = roleStore.getRoleByName(name);+ return role ? filterRole(role) : false;+ };- const workspace = PRESET_WORKSPACE_ROLES.map((name) => ({- value: name,- label: displayRoleTitle(name),- description: displayRoleDescription(name),- }));+ const workspace = PRESET_WORKSPACE_ROLES.filter(visibleRole).map(+ (name) => ({+ value: name,+ label: displayRoleTitle(name),+ description: displayRoleDescription(name),+ })+ );- const project = PRESET_PROJECT_ROLES.map((name) => ({+ const project = PRESET_PROJECT_ROLES.filter(visibleRole).map((name) => ({value: name,label: displayRoleTitle(name),description: displayRoleDescription(name),@@ -54,6 +66,7 @@ export function RoleSelect({const custom = roleList.filter((r) => !PRESET_ROLES.includes(r.name))+ .filter((r) => !filterRole || filterRole(r)).map((r) => ({value: r.name,label: displayRoleTitle(r.name),@@ -83,7 +96,7 @@ export function RoleSelect({if (custom.length > 0)result.push({ label: t("role.custom-roles.self"), options: custom });return result;- }, [roleList, hasCustomRoleFeature, scope, t]);+ }, [filterRole, roleList, roleStore, hasCustomRoleFeature, scope, t]);const defaultPlaceholder = multiple? t("settings.members.select-role", { count: 2 })diff --git a/frontend/src/react/components/RoutePermissionGuardShell.test.tsx b/frontend/src/react/components/RoutePermissionGuardShell.test.tsxnew file mode 100644index 0000000000..7ce7b162ee--- /dev/null+++ b/frontend/src/react/components/RoutePermissionGuardShell.test.tsx@@ -0,0 +1,202 @@+import type { ComponentProps } from "react";+import { act } from "react";+import { createRoot } from "react-dom/client";+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";+import type { Permission } from "@/types";++(+ globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }+).IS_REACT_ACT_ENVIRONMENT = true;++const mocks = vi.hoisted(() => ({+ route: {+ name: "workspace.settings",+ fullPath: "/settings",+ params: {},+ query: {},+ requiredPermissions: [] as Permission[],+ },+ workspacePermissions: new Set<Permission>(),+ projectPermissions: new Set<Permission>(),+ hasFeature: vi.fn(() => true),+}));++vi.mock("@/react/router", () => ({+ useCurrentRoute: () => mocks.route,+}));++vi.mock("@/react/components/ComponentPermissionGuard", () => {+ const basicPermissions: Permission[] = [+ "bb.roles.list",+ "bb.workspaces.getIamPolicy",+ "bb.settings.getWorkspaceProfile",+ ];+ const getState = ({+ permissions,+ project,+ checkBasicWorkspacePermissions,+ }: {+ permissions: Permission[];+ project?: unknown;+ checkBasicWorkspacePermissions?: boolean;+ }) => {+ const missedBasicPermissions = checkBasicWorkspacePermissions+ ? basicPermissions.filter((p) => !mocks.workspacePermissions.has(p))+ : [];+ const missedPermissions = permissions.filter((p) =>+ project+ ? !mocks.workspacePermissions.has(p) && !mocks.projectPermissions.has(p)+ : !mocks.workspacePermissions.has(p)+ );+ return {+ missedBasicPermissions,+ missedPermissions,+ permitted:+ missedBasicPermissions.length === 0 && missedPermissions.length === 0,+ };+ };+ return {+ useComponentPermissionState: getState,+ ComponentPermissionGuard: ({+ permissions,+ project,+ checkBasicWorkspacePermissions,+ path,+ className,+ }: {+ permissions: Permission[];+ project?: unknown;+ checkBasicWorkspacePermissions?: boolean;+ path?: string;+ className?: string;+ }) => {+ const { missedBasicPermissions, missedPermissions } = getState({+ permissions,+ project,+ checkBasicWorkspacePermissions,+ });+ const missed =+ missedBasicPermissions.length > 0+ ? missedBasicPermissions+ : missedPermissions;+ return (+ <div role="alert" className={className}>+ <span>{path}</span>+ {missed.map((permission) => (+ <span key={permission}>{permission}</span>+ ))}+ </div>+ );+ },+ };+});++vi.mock("react-i18next", () => ({+ useTranslation: () => ({ t: (key: string) => key }),+}));++import { RoutePermissionGuardShell } from "./RoutePermissionGuardShell";++const BASIC_PERMISSIONS: Permission[] = [+ "bb.roles.list",+ "bb.workspaces.getIamPolicy",+ "bb.settings.getWorkspaceProfile",+];++let container: HTMLDivElement;+let root: ReturnType<typeof createRoot>;++beforeEach(() => {+ mocks.route.requiredPermissions = [];+ mocks.route.fullPath = "/settings";+ mocks.workspacePermissions = new Set(BASIC_PERMISSIONS);+ mocks.projectPermissions = new Set();+ mocks.hasFeature.mockReturnValue(true);+ container = document.createElement("div");+ document.body.appendChild(container);+ root = createRoot(container);+});++afterEach(() => {+ act(() => {+ root.unmount();+ });+ document.body.removeChild(container);+});++const renderShell = async (+ props: Partial<ComponentProps<typeof RoutePermissionGuardShell>> = {}+) => {+ const onReady = vi.fn();+ await act(async () => {+ root.render(<RoutePermissionGuardShell onReady={onReady} {...props} />);+ });+ return onReady;+};++describe("RoutePermissionGuardShell", () => {+ test("exposes a content target when route permissions pass", async () => {+ mocks.route.requiredPermissions = ["bb.settings.get"];+ mocks.workspacePermissions.add("bb.settings.get");++ const onReady = await renderShell({ targetClassName: "h-full min-h-0" });++ expect(onReady).toHaveBeenLastCalledWith(expect.any(HTMLDivElement));+ expect(container.querySelector("[role='alert']")).toBeNull();+ expect(container.firstElementChild?.className).toBe("h-full min-h-0");+ });++ test("withholds the content target and renders an alert when permissions fail", async () => {+ mocks.route.requiredPermissions = ["bb.settings.set"];++ const onReady = await renderShell();++ expect(onReady).toHaveBeenLastCalledWith(null);+ expect(container.querySelector("[role='alert']")).not.toBeNull();+ expect(container.textContent).toContain("bb.settings.set");+ });++ test("checks basic workspace permissions before route permissions", async () => {+ mocks.workspacePermissions = new Set();+ mocks.route.requiredPermissions = ["bb.settings.set"];++ await renderShell();++ expect(container.textContent).toContain("bb.roles.list");+ expect(container.textContent).not.toContain("bb.settings.set");+ });++ test("does not re-emit on route changes when permission state is unchanged", async () => {+ mocks.route.requiredPermissions = ["bb.settings.get"];+ mocks.workspacePermissions.add("bb.settings.get");++ const onReady = vi.fn();+ await act(async () => {+ root.render(<RoutePermissionGuardShell onReady={onReady} />);+ });+ const initialCalls = onReady.mock.calls.length;+ expect(onReady).toHaveBeenLastCalledWith(expect.any(HTMLDivElement));++ mocks.route.fullPath = "/settings?next=foo";+ await act(async () => {+ root.render(<RoutePermissionGuardShell onReady={onReady} />);+ });++ expect(onReady).toHaveBeenCalledTimes(initialCalls);+ });++ test("uses project permissions when a project is provided", async () => {+ mocks.route.requiredPermissions = ["bb.databases.get"];+ mocks.projectPermissions = new Set(["bb.databases.get"]);++ const onReady = await renderShell({+ project: {+ name: "projects/prod",+ allowRequestRole: true,+ } as never,+ });++ expect(onReady).toHaveBeenLastCalledWith(expect.any(HTMLDivElement));+ expect(container.querySelector("[role='alert']")).toBeNull();+ });+});diff --git a/frontend/src/react/components/RoutePermissionGuardShell.tsx b/frontend/src/react/components/RoutePermissionGuardShell.tsxnew file mode 100644index 0000000000..83a65850c2--- /dev/null+++ b/frontend/src/react/components/RoutePermissionGuardShell.tsx@@ -0,0 +1,55 @@+import { useEffect, useRef } from "react";+import {+ ComponentPermissionGuard,+ useComponentPermissionState,+} from "@/react/components/ComponentPermissionGuard";+import { useCurrentRoute } from "@/react/router";+import type { Project } from "@/types/proto-es/v1/project_service_pb";++export interface RoutePermissionGuardShellProps {+ project?: Project;+ className?: string;+ targetClassName?: string;+ onReady?: (target: HTMLDivElement | null) => void;+}++export function RoutePermissionGuardShell({+ project,+ className,+ targetClassName,+ onReady,+}: RoutePermissionGuardShellProps) {+ const route = useCurrentRoute();+ const targetRef = useRef<HTMLDivElement>(null);+ const permissions = route.requiredPermissions;+ const { permitted } = useComponentPermissionState({+ permissions,+ project,+ checkBasicWorkspacePermissions: true,+ });++ useEffect(() => {+ onReady?.(permitted ? targetRef.current : null);+ }, [onReady, permitted]);++ useEffect(() => {+ return () => onReady?.(null);+ }, [onReady]);++ if (!permitted) {+ return (+ <ComponentPermissionGuard+ permissions={permissions}+ project={project}+ className={className}+ path={route.fullPath}+ checkBasicWorkspacePermissions+ enableRequestRole+ >+ <div />+ </ComponentPermissionGuard>+ );+ }++ return <div ref={targetRef} className={targetClassName} />;+}diff --git a/frontend/src/react/no-legacy-vue-deps.test.ts b/frontend/src/react/no-legacy-vue-deps.test.tsindex 31c4127079..8e7b5bc99f 100644--- a/frontend/src/react/no-legacy-vue-deps.test.ts+++ b/frontend/src/react/no-legacy-vue-deps.test.ts@@ -7,6 +7,11 @@ const sources = import.meta.glob("../router/dashboard/projectV1.ts","../router/dashboard/workspace.ts","../router/dashboard/workspaceSetting.ts",+ "../layouts/BodyLayout.vue",+ "../layouts/ProjectV1Layout.vue",+ "../layouts/SQLEditorLayout.vue",+ "../components/ProvideSQLEditorContext.vue",+ "./components/RoutePermissionGuardShell.tsx",],{query: "?raw",@@ -41,4 +46,26 @@ describe("React Project and Settings legacy Vue dependencies", () => {}expect(violations).toEqual([]);});++ test("console and SQL Editor shell do not re-import legacy Vue permission chain", () => {+ const bannedImports = [+ "@/components/Permission/RoutePermissionGuard.vue",+ "@/components/Permission/ComponentPermissionGuard.vue",+ "@/components/RoleGrantPanel",+ "./RoleGrantPanel.vue",+ "@/components/FeatureGuard",+ "@/components/IssueV1/components/Sidebar/IssueLabels",+ "./IssueLabelSelector.vue",+ "@/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue",+ ];+ const violations: string[] = [];+ for (const [file, source] of Object.entries(sources)) {+ for (const bannedImport of bannedImports) {+ if (source.includes(bannedImport)) {+ violations.push(`${file}: ${bannedImport}`);+ }+ }+ }+ expect(violations).toEqual([]);+ });});diff --git a/frontend/src/react/pages/settings/RequestRoleSheet.test.tsx b/frontend/src/react/pages/settings/RequestRoleSheet.test.tsxindex 17ff0bf3f4..c417e431c6 100644--- a/frontend/src/react/pages/settings/RequestRoleSheet.test.tsx+++ b/frontend/src/react/pages/settings/RequestRoleSheet.test.tsx@@ -6,6 +6,7 @@ import type {import { act, createElement } from "react";import { createRoot } from "react-dom/client";import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";+import type { Permission } from "@/types";(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }@@ -216,6 +217,15 @@ vi.mock("@/connect", () => ({vi.mock("@/store", () => ({useCurrentUserV1: () => ({ value: mocks.currentUser }),+ useRoleStore: () => ({+ getRoleByName: (name: string) => ({+ name,+ permissions:+ name === "roles/projectOwner"+ ? ["bb.projects.get", "bb.databases.get"]+ : [],+ }),+ }),useSettingV1Store: () => stableSettingStore,pushNotification: (...args: unknown[]) => mocks.pushNotification(...args),}));@@ -260,7 +270,10 @@ async function flush(): Promise<void> {});}-async function renderSheet(enforceIssueTitle: boolean): Promise<void> {+async function renderSheet(+ enforceIssueTitle: boolean,+ requiredPermissions?: Permission[]+): Promise<void> {const project = {...PROJECT_BASE,enforceIssueTitle,@@ -270,6 +283,7 @@ async function renderSheet(enforceIssueTitle: boolean): Promise<void> {createElement(RequestRoleSheet, {open: true,project,+ requiredPermissions,onClose: () => {},}));@@ -371,4 +385,17 @@ describe("RequestRoleSheet — enforceIssueTitle (BYT-9310)", () => {// code drops the formatIssueTitle() call, this assertion fails.expect(req.issue.title).toBe("FMT(issue.title.request-specific-role)");});++ it("blocks stale role submissions when the selected role misses required permissions", async () => {+ await renderSheet(false, ["bb.databases.get"]);+ await selectRole("roles/nonMatching");+ await flush();++ expect(getSubmitButton().disabled).toBe(true);++ await selectRole("roles/projectOwner");+ await flush();++ expect(getSubmitButton().disabled).toBe(false);+ });});diff --git a/frontend/src/react/pages/settings/RequestRoleSheet.tsx b/frontend/src/react/pages/settings/RequestRoleSheet.tsxindex 6ce9b08462..2ad3cf4444 100644--- a/frontend/src/react/pages/settings/RequestRoleSheet.tsx+++ b/frontend/src/react/pages/settings/RequestRoleSheet.tsx@@ -40,7 +40,13 @@ import { Textarea } from "@/react/components/ui/textarea";import { useVueState } from "@/react/hooks/useVueState";import { router } from "@/router";import { PROJECT_V1_ROUTE_ISSUE_DETAIL } from "@/router/dashboard/projectV1";-import { pushNotification, useCurrentUserV1, useSettingV1Store } from "@/store";+import {+ pushNotification,+ useCurrentUserV1,+ useRoleStore,+ useSettingV1Store,+} from "@/store";+import type { Permission } from "@/types";import { type DatabaseResource, PresetRoleType } from "@/types";import { ExprSchema as ConditionExprSchema } from "@/types/proto-es/google/type/expr_pb";import {@@ -50,6 +56,7 @@ import {RoleGrantSchema,} from "@/types/proto-es/v1/issue_service_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";+import type { Role } from "@/types/proto-es/v1/role_service_pb";import {batchConvertParsedExprToCELString,displayRoleTitle,@@ -73,9 +80,12 @@ import type { DatabaseMode } from "./types";export interface RequestRoleSheetProps {open: boolean;project: Project;+ requiredPermissions?: Permission[];onClose: () => void;}+const EMPTY_REQUIRED_PERMISSIONS: Permission[] = [];+// i18n key lookup for the three DatabaseMode radio labels. Kept as a flat// function to avoid nested ternaries in the render tree.const databaseModeLabelKey = (mode: DatabaseMode): string => {@@ -106,6 +116,7 @@ export function RequestRoleSheet(props: Readonly<RequestRoleSheetProps>) {function RequestRoleForm({project,+ requiredPermissions = EMPTY_REQUIRED_PERMISSIONS,onClose,}: Readonly<Omit<RequestRoleSheetProps, "open">>) {const { t } = useTranslation();@@ -137,6 +148,27 @@ function RequestRoleForm({const [submitting, setSubmitting] = useState(false);const settingStore = useSettingV1Store();+ const roleStore = useRoleStore();+ const selectedRole = useVueState(() =>+ role ? roleStore.getRoleByName(role) : undefined+ );+ const requiredPermissionList = useMemo(+ () => [...new Set(requiredPermissions)],+ [requiredPermissions]+ );+ const roleMatchesRequiredPermissions = (candidate: Role | undefined) => {+ if (requiredPermissionList.length === 0) {+ return true;+ }+ if (!candidate) {+ return false;+ }+ return requiredPermissionList.every((permission) =>+ candidate.permissions.includes(permission)+ );+ };+ const selectedRoleMatchesRequiredPermissions =+ roleMatchesRequiredPermissions(selectedRole);// Workspace-configured maximum role expiration, in days. Matches the old// Vue ExpirationSelector: PROJECT_OWNER grants are exempted (project@@ -239,6 +271,7 @@ function RequestRoleForm({!expirationExceedsMax &&!labelsMisconfigured &&databaseScopeComplete &&+ selectedRoleMatchesRequiredPermissions &&(!project.forceIssueLabels || labels.length > 0);const handleSubmit = async () => {@@ -402,6 +435,18 @@ function RequestRoleForm({</AlertDescription></Alert>)}+ {requiredPermissionList.length > 0 && (+ <Alert>+ <AlertTitle>{t("common.required-permission")}</AlertTitle>+ <AlertDescription>+ <ul className="list-disc pl-4">+ {requiredPermissionList.map((permission) => (+ <li key={permission}>{permission}</li>+ ))}+ </ul>+ </AlertDescription>+ </Alert>+ )}<div className="flex flex-col gap-y-1"><label className="text-sm font-medium">{t("common.role.self")}@@ -420,7 +465,15 @@ function RequestRoleForm({setExprGroup(wrapAsGroup(emptySimpleExpr()));setEnvironments([]);}}+ filterRole={roleMatchesRequiredPermissions}/>+ {!!role && !selectedRoleMatchesRequiredPermissions && (+ <p className="text-xs text-error">+ {t("common.missing-required-permission", {+ permissions: requiredPermissionList.join(", "),+ })}+ </p>+ )}</div><div className="flex flex-col gap-y-1"><label className="text-sm font-medium">diff --git a/frontend/src/react/router/index.ts b/frontend/src/react/router/index.tsindex 1b5c7a7366..d76c638fba 100644--- a/frontend/src/react/router/index.ts+++ b/frontend/src/react/router/index.ts@@ -41,6 +41,7 @@ import {SQL_EDITOR_HOME_MODULE,SQL_EDITOR_PROJECT_MODULE,} from "@/router/sqlEditor";+import type { Permission } from "@/types";export {AUTH_SIGNIN_MODULE,@@ -82,6 +83,7 @@ export type ReactRoute = {fullPath: string;params: Record<string, string | string[] | undefined>;query: Record<string, unknown>;+ requiredPermissions: Permission[];};export type ReactResolvedRoute = {@@ -91,6 +93,10 @@ export type ReactResolvedRoute = {let cachedRoute: ReactRoute | undefined;+function dedupePermissions(permissions: Permission[]): Permission[] {+ return [...new Set(permissions)];+}+function snapshotRoute(): ReactRoute {const route = router.currentRoute.value;if (cachedRoute?.fullPath === route.fullPath) {@@ -101,6 +107,12 @@ function snapshotRoute(): ReactRoute {fullPath: route.fullPath,params: route.params as Record<string, string | string[] | undefined>,query: route.query as Record<string, unknown>,+ requiredPermissions: dedupePermissions(+ route.matched.flatMap(+ (record) =>+ (record.meta.requiredPermissionList?.() ?? []) as Permission[]+ )+ ),};return cachedRoute;}