Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

chore: resource is not required to show the button (#19180)

ecmadaoc5e1d07aa4fa
diff --git a/frontend/src/components/Permission/ComponentPermissionGuard.vue b/frontend/src/components/Permission/ComponentPermissionGuard.vue
index 482c1b4c82..72f5f61144 100644
--- a/frontend/src/components/Permission/ComponentPermissionGuard.vue
+++ b/frontend/src/components/Permission/ComponentPermissionGuard.vue
@@ -16,15 +16,23 @@
>
<template #action>
<div v-if="allowRequestRole" class="mt-2">
- <NButton
- type="primary"
- @click="showRequestRolePanel = true"
+ <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>
- <heroicons-outline:user-add class="w-4 h-4" />
+ <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>
@@ -40,11 +48,14 @@
<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 GrantRequestPanel from "@/components/GrantRequestPanel";
import NoPermissionPlaceholder from "@/components/Permission/NoPermissionPlaceholder.vue";
+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";
import RequiredBasicPermissionAlert from "@/components/Role/Setting/components/RequiredBasicPermissionAlert.vue";
import { hasFeature } from "@/store";
import { BASIC_WORKSPACE_PERMISSIONS, type Permission } from "@/types";
@@ -59,13 +70,12 @@ const props = defineProps<{
const showRequestRolePanel = ref(false);
const router = useRouter();
+const hasRequestRoleFeature = computed(() =>
+ hasFeature(PlanFeature.FEATURE_REQUEST_ROLE_WORKFLOW)
+);
+
const allowRequestRole = computed(() => {
- return (
- props.project?.allowRequestRole &&
- hasFeature(PlanFeature.FEATURE_REQUEST_ROLE_WORKFLOW) &&
- hasProjectPermissionV2(props.project, "bb.issues.create") &&
- hasWorkspacePermissionV2("bb.roles.list")
- );
+ return props.project?.allowRequestRole;
});
const requestPath = computed(() => {
diff --git a/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue b/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue
index 7135e5eaba..ca87da01c9 100644
--- a/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue
+++ b/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue
@@ -74,15 +74,7 @@
</div>
<div
v-if="
- state.role !== PresetRoleType.PROJECT_OWNER &&
- checkRoleContainsAnyPermission(
- state.role,
- 'bb.sql.select',
- 'bb.sql.ddl',
- 'bb.sql.dml',
- 'bb.sql.explain',
- 'bb.sql.info'
- )
+ roleHasDatabaseLimitation(state.role)
"
class="w-full flex flex-col gap-y-2"
>
@@ -125,12 +117,12 @@ import MembersBindingSelect from "@/components/Member/MembersBindingSelect.vue";
import RequiredStar from "@/components/RequiredStar.vue";
import { RoleSelect } from "@/components/v2/Select";
import { useRoleStore } from "@/store";
-import { type DatabaseResource, PresetRoleType } from "@/types";
+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 { checkRoleContainsAnyPermission } from "@/utils";
import { buildConditionExpr } from "@/utils/issue/cel";
+import { roleHasDatabaseLimitation } from "../utils";
const props = withDefaults(
defineProps<{
diff --git a/frontend/src/components/ProjectMember/ProjectMemberPanel.vue b/frontend/src/components/ProjectMember/ProjectMemberPanel.vue
index 7a6c18c45d..bf3671cf65 100644
--- a/frontend/src/components/ProjectMember/ProjectMemberPanel.vue
+++ b/frontend/src/components/ProjectMember/ProjectMemberPanel.vue
@@ -43,7 +43,7 @@
v-if="shouldShowRequestRoleButton"
v-slot="slotProps"
:project="project"
- :permissions="['bb.issues.create']"
+ :permissions="['bb.issues.create', 'bb.roles.list']"
>
<NButton
type="primary"
@@ -150,11 +150,7 @@ import {
} 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,
- isBindingPolicyExpired,
-} from "@/utils";
+import { hasProjectPermissionV2, isBindingPolicyExpired } from "@/utils";
import GrantRequestPanel from "../GrantRequestPanel";
import { SearchBox } from "../v2";
import AddProjectMembersPanel from "./AddProjectMember/AddProjectMembersPanel.vue";
@@ -229,11 +225,7 @@ const hasRequestRoleFeature = computed(() =>
);
const shouldShowRequestRoleButton = computed(() => {
- return (
- props.project.allowRequestRole &&
- hasWorkspacePermissionV2("bb.roles.list") &&
- hasMissingPermission.value
- );
+ return props.project.allowRequestRole && hasMissingPermission.value;
});
const workspaceRoles = computed(() => new Set(PRESET_WORKSPACE_ROLES));
diff --git a/frontend/src/components/ProjectMember/ProjectMemberRolePanel/index.vue b/frontend/src/components/ProjectMember/ProjectMemberRolePanel/index.vue
index 1710b19846..8fbf9608af 100644
--- a/frontend/src/components/ProjectMember/ProjectMemberRolePanel/index.vue
+++ b/frontend/src/components/ProjectMember/ProjectMemberRolePanel/index.vue
@@ -158,7 +158,6 @@ import type { Binding } from "@/types/proto-es/v1/iam_policy_pb";
import { BindingSchema } from "@/types/proto-es/v1/iam_policy_pb";
import type { Project } from "@/types/proto-es/v1/project_service_pb";
import {
- checkRoleContainsAnyPermission,
displayRoleTitle,
extractDatabaseResourceName,
getInstanceResource,
@@ -166,6 +165,7 @@ import {
} from "@/utils";
import { buildConditionExpr, convertFromExpr } from "@/utils/issue/cel";
import AddProjectMembersPanel from "../AddProjectMember/AddProjectMembersPanel.vue";
+import { roleHasDatabaseLimitation } from "../utils";
import EditProjectRolePanel from "./EditProjectRolePanel.vue";
import RoleDescription from "./RoleDescription.vue";
import RoleExpiredTip from "./RoleExpiredTip.vue";
@@ -229,13 +229,6 @@ const allowRevokeMember = computed(() => {
return hasProjectPermissionV2(props.project, "bb.projects.setIamPolicy");
});
-const isRoleShouldShowDatabaseRelatedColumns = (role: string) => {
- return (
- role !== PresetRoleType.PROJECT_OWNER &&
- checkRoleContainsAnyPermission(role, "bb.sql.select")
- );
-};
-
const getDataTableColumns = (
role: string
): DataTableColumn<SingleBinding>[] => {
@@ -251,7 +244,7 @@ const getDataTableColumns = (
},
];
- if (isRoleShouldShowDatabaseRelatedColumns(role)) {
+ if (roleHasDatabaseLimitation(role)) {
columns.push(
{
title: t("common.database"),
diff --git a/frontend/src/components/ProjectMember/utils.ts b/frontend/src/components/ProjectMember/utils.ts
index d755644c0b..99dcc944f9 100644
--- a/frontend/src/components/ProjectMember/utils.ts
+++ b/frontend/src/components/ProjectMember/utils.ts
@@ -1,5 +1,6 @@
+import { PresetRoleType } from "@/types";
import type { Binding } from "@/types/proto-es/v1/iam_policy_pb";
-import { displayRoleTitle } from "@/utils";
+import { checkRoleContainsAnyPermission, displayRoleTitle } from "@/utils";
export const getBindingIdentifier = (binding: Binding): string => {
const identifier = [displayRoleTitle(binding.role)];
@@ -8,3 +9,17 @@ export const getBindingIdentifier = (binding: Binding): string => {
}
return identifier.join(".");
};
+
+export const roleHasDatabaseLimitation = (role: string) => {
+ return (
+ role !== PresetRoleType.PROJECT_OWNER &&
+ checkRoleContainsAnyPermission(
+ role,
+ "bb.sql.select",
+ "bb.sql.ddl",
+ "bb.sql.dml",
+ "bb.sql.explain",
+ "bb.sql.info"
+ )
+ );
+};
diff --git a/frontend/src/components/Role/Setting/components/RolePanel.vue b/frontend/src/components/Role/Setting/components/RolePanel.vue
index 10e54f6af2..206ac5f5c8 100644
--- a/frontend/src/components/Role/Setting/components/RolePanel.vue
+++ b/frontend/src/components/Role/Setting/components/RolePanel.vue
@@ -21,6 +21,7 @@
:placeholder="$t('role.setting.title-placeholder')"
:status="state.role.title?.length === 0 ? 'error' : undefined"
:maxlength="200"
+ :disabled="isBuiltinRole"
/>
</div>
<div class="-mt-2">
@@ -47,6 +48,7 @@
:autosize="{ minRows: 2, maxRows: 4 }"
:placeholder="$t('role.setting.description-placeholder')"
:maxlength="1000"
+ :disabled="isBuiltinRole"
/>
</div>
</div>
@@ -58,6 +60,7 @@
<span class="ml-0.5 text-error">*</span>
</div>
<NButton
+ v-if="!isBuiltinRole"
size="small"
@click="state.showImportPermissionFromRoleModal = true"
>
@@ -66,7 +69,7 @@
</NButton>
</div>
<RequiredBasicPermissionAlert
- v-if="missedBasicPermission.length > 0"
+ v-if="missedBasicPermission.length > 0 && !isBuiltinRole"
:permissions="missedBasicPermission"
:title="$t('common.missing-required-permission')"
>
@@ -88,6 +91,7 @@
source-filterable
source-filter-placeholder="Search"
:options="permissionOptions"
+ :disabled="isBuiltinRole"
/>
</div>
</div>
@@ -100,7 +104,7 @@
</div>
<template #footer>
- <div class="flex items-center justify-end gap-x-2">
+ <div v-if="!isBuiltinRole" class="flex items-center justify-end gap-x-2">
<NButton @click="$emit('close')">{{ $t("common.cancel") }}</NButton>
<PermissionGuardWrapper
v-slot="slotProps"
@@ -150,7 +154,7 @@ import { BASIC_WORKSPACE_PERMISSIONS, PERMISSIONS } from "@/types";
import type { Role } from "@/types/proto-es/v1/role_service_pb";
import { RoleSchema } from "@/types/proto-es/v1/role_service_pb";
import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
-import { extractRoleResourceName } from "@/utils";
+import { extractRoleResourceName, isCustomRole } from "@/utils";
import { useCustomRoleSettingContext } from "../context";
import ImportPermissionFromRoleModal from "./ImportPermissionFromRoleModal.vue";
import RequiredBasicPermissionAlert from "./RequiredBasicPermissionAlert.vue";
@@ -211,6 +215,8 @@ const permissionOptions = computed(() => {
}));
});
+const isBuiltinRole = computed(() => !isCustomRole(state.role.name));
+
const allowSave = computed(() => {
if (!state.dirty) return false;
if (state.role.title?.length === 0) return false;
diff --git a/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/TreeNode/DatabaseNode.vue b/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/TreeNode/DatabaseNode.vue
index e5a9a77133..cc1a5634ca 100644
--- a/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/TreeNode/DatabaseNode.vue
+++ b/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/TreeNode/DatabaseNode.vue
@@ -26,6 +26,7 @@
</span>
<RequestQueryButton
v-if="showRequestQueryButton"
+ :text="true"
:database-resources="[
{
databaseFullName: database.name,
diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/RequestQueryButton.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/RequestQueryButton.vue
index a5cf784362..eb0a708136 100644
--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/RequestQueryButton.vue
+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/RequestQueryButton.vue
@@ -1,12 +1,28 @@
<template>
<div v-if="available">
- <NButton text type="primary" :size="size" @click="onClick">
- {{ $t("sql-editor.request-query") }}
- </NButton>
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :project="project"
+ :permissions="['bb.issues.create']"
+ >
+ <NButton
+ type="primary"
+ :text="text"
+ :size="size"
+ :disabled="slotProps.disabled || !hasRequestRoleFeature"
+ @click="onClick"
+ >
+ <template #icon>
+ <ShieldUserIcon v-if="hasRequestRoleFeature" class="w-4 h-4" />
+ <FeatureBadge v-else :clickable="false" :feature="PlanFeature.FEATURE_REQUEST_ROLE_WORKFLOW" />
+ </template>
+ {{ $t("sql-editor.request-query") }}
+ </NButton>
+ </PermissionGuardWrapper>
<GrantRequestPanel
v-if="showPanel"
- :project-name="database.project"
+ :project-name="project.name"
:database-resources="databaseResources"
:placement="'right'"
:role="PresetRoleType.SQL_EDITOR_USER"
@@ -16,21 +32,21 @@
</template>
<script setup lang="ts">
+import { ShieldUserIcon } from "lucide-vue-next";
import { NButton } from "naive-ui";
import { computed, ref } from "vue";
+import { FeatureBadge } from "@/components/FeatureGuard";
import GrantRequestPanel from "@/components/GrantRequestPanel";
-import { useDatabaseV1ByName } from "@/store";
-import {
- type DatabaseResource,
- isValidDatabaseName,
- PresetRoleType,
-} from "@/types";
-import { getDatabaseProject, hasProjectPermissionV2 } from "@/utils";
+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";
+import { hasFeature, useProjectV1Store, useSQLEditorStore } from "@/store";
+import { type DatabaseResource, PresetRoleType } from "@/types";
+import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
-const props = withDefaults(
+withDefaults(
defineProps<{
databaseResources: DatabaseResource[];
size?: "tiny" | "medium";
+ text: boolean;
}>(),
{
size: "medium",
@@ -38,29 +54,18 @@ const props = withDefaults(
);
const showPanel = ref(false);
+const editorStore = useSQLEditorStore();
+const projectStore = useProjectV1Store();
+const hasRequestRoleFeature = computed(() =>
+ hasFeature(PlanFeature.FEATURE_REQUEST_ROLE_WORKFLOW)
+);
-const primaryDatabase = computed(() => {
- return props.databaseResources[0];
-});
-
-const { database } = useDatabaseV1ByName(
- computed(() => primaryDatabase.value?.databaseFullName ?? "")
+const project = computed(() =>
+ projectStore.getProjectByName(editorStore.project)
);
const available = computed(() => {
- if (props.databaseResources.length === 0) {
- return false;
- }
-
- if (!isValidDatabaseName(database.value.name)) {
- return false;
- }
-
- const project = getDatabaseProject(database.value);
- return (
- project.allowRequestRole &&
- hasProjectPermissionV2(project, "bb.issues.create")
- );
+ return project.value.allowRequestRole;
});
const onClick = (e: MouseEvent) => {
diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vue
index d49b0e4b86..96f2ea8c96 100644
--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vue
+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vue
@@ -15,7 +15,8 @@
>
<template #suffix>
<RequestQueryButton
- v-if="showRequestQueryButton"
+ v-if="isPermissionDenied"
+ :text="false"
:database-resources="missingResources"
/>
</template>
@@ -67,7 +68,8 @@
>
<template #suffix>
<RequestQueryButton
- v-if="showRequestQueryButton"
+ v-if="isPermissionDenied"
+ :text="false"
:database-resources="missingResources"
/>
</template>
@@ -127,7 +129,8 @@
>
<template #suffix>
<RequestQueryButton
- v-if="showRequestQueryButton"
+ v-if="isPermissionDenied"
+ :text="false"
:database-resources="missingResources"
/>
<SyncDatabaseButton
@@ -242,6 +245,15 @@ const detail: SQLResultViewContext["detail"] = ref(undefined);
provideBinaryFormatContext(computed(() => props.contextId));
+const isPermissionDenied = computed(() => {
+ for (const result of props.resultSet?.results ?? []) {
+ if (result.detailedError.case === "permissionDenied") {
+ return true;
+ }
+ }
+ return false;
+});
+
const missingResources = computed((): DatabaseResource[] => {
const resources: DatabaseResource[] = [];
for (const result of props.resultSet?.results ?? []) {
@@ -260,10 +272,6 @@ const missingResources = computed((): DatabaseResource[] => {
return resources;
});
-const showRequestQueryButton = computed(() => {
- return missingResources.value.length > 0;
-});
-
const viewMode = computed((): ViewMode => {
const { resultSet } = props;
if (!resultSet) {