Skip to content

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

chore: permission guard for actions/buttons (#18767)

ecmadao3030f81bf9fe
diff --git a/frontend/src/components/Instance/InstanceSyncButton.vue b/frontend/src/components/Instance/InstanceSyncButton.vue
index 560bbcfea3..453dbdaeb3 100644
--- a/frontend/src/components/Instance/InstanceSyncButton.vue
+++ b/frontend/src/components/Instance/InstanceSyncButton.vue
@@ -3,27 +3,32 @@
:trigger="'click'"
:options="syncInstnceOptions"
:render-label="renderDropdownLabel"
- :disabled="!allowSyncInstance || disabled || syncingSchema"
+ :disabled="disabled || syncingSchema"
@select="syncSchema"
>
- <NButton
- icon-placement="right"
- :loading="syncingSchema"
- :quaternary="quaternary"
- :disabled="!allowSyncInstance || disabled"
- :size="size"
- :type="type"
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :permissions="['bb.instances.sync']"
>
- <template #icon>
- <ChevronDownIcon class="w-4" />
- </template>
- <template v-if="syncingSchema">
- {{ $t("instance.syncing") }}
- </template>
- <template v-else>
- {{ $t("instance.sync.self") }}
- </template>
- </NButton>
+ <NButton
+ icon-placement="right"
+ :loading="syncingSchema"
+ :quaternary="quaternary"
+ :disabled="slotProps.disabled || disabled"
+ :size="size"
+ :type="type"
+ >
+ <template #icon>
+ <ChevronDownIcon class="w-4" />
+ </template>
+ <template v-if="syncingSchema">
+ {{ $t("instance.syncing") }}
+ </template>
+ <template v-else>
+ {{ $t("instance.sync.self") }}
+ </template>
+ </NButton>
+ </PermissionGuardWrapper>
</NDropdown>
</template>
@@ -34,8 +39,8 @@ import type { DropdownOption } from "naive-ui";
import { NButton, NDropdown, NTooltip } from "naive-ui";
import { computed, ref } from "vue";
import { useI18n } from "vue-i18n";
+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";
import { pushNotification } from "@/store";
-import { hasWorkspacePermissionV2 } from "@/utils";
withDefaults(
defineProps<{
@@ -92,10 +97,6 @@ const syncInstnceOptions = computed((): DropdownOption[] => {
];
});
-const allowSyncInstance = computed(() => {
- return hasWorkspacePermissionV2("bb.instances.sync");
-});
-
const syncSchema = async (option: SyncInstanceOption) => {
try {
syncingSchema.value = true;
diff --git a/frontend/src/components/Permission/PermissionGuardWrapper.vue b/frontend/src/components/Permission/PermissionGuardWrapper.vue
index 7f8f0fbc61..28291d2e9f 100644
--- a/frontend/src/components/Permission/PermissionGuardWrapper.vue
+++ b/frontend/src/components/Permission/PermissionGuardWrapper.vue
@@ -6,7 +6,7 @@
<div class="flex flex-col gap-1">
{{ project ? $t("common.missing-required-permission-for-resource", { resource: project.name }) : $t("common.missing-required-permission") }}
<ul class="list-disc pl-4">
- <li v-for="permission in permissions" :key="permission">
+ <li v-for="permission in missedPermissions" :key="permission">
{{ permission }}
</li>
</ul>
diff --git a/frontend/src/components/ProjectDatabasesPanel.vue b/frontend/src/components/ProjectDatabasesPanel.vue
index 6fc057463b..ecaef58424 100644
--- a/frontend/src/components/ProjectDatabasesPanel.vue
+++ b/frontend/src/components/ProjectDatabasesPanel.vue
@@ -10,16 +10,22 @@
:placeholder="$t('database.filter-database')"
:scope-options="scopeOptions"
/>
- <NButton
- v-if="allowToCreateDB"
- type="primary"
- @click="state.showCreateDrawer = true"
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :project="project"
+ :permissions="['bb.instances.list', 'bb.issues.create', 'bb.plans.create']"
>
- <template #icon>
- <PlusIcon class="h-4 w-4" />
- </template>
- {{ $t("quick-action.new-db") }}
- </NButton>
+ <NButton
+ type="primary"
+ :disabled="slotProps.disabled"
+ @click="state.showCreateDrawer = true"
+ >
+ <template #icon>
+ <PlusIcon class="h-4 w-4" />
+ </template>
+ {{ $t("quick-action.new-db") }}
+ </NButton>
+ </PermissionGuardWrapper>
</div>
<DatabaseOperations
:project-name="project.name"
@@ -51,6 +57,7 @@ import { PlusIcon } from "lucide-vue-next";
import { NButton } from "naive-ui";
import { computed, reactive, ref, watch } from "vue";
import { CreateDatabasePrepPanel } from "@/components/CreateDatabasePrepForm";
+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";
import { Drawer } from "@/components/v2";
import { PagedDatabaseTable } from "@/components/v2/Model/DatabaseV1Table";
import { useDatabaseV1Store } from "@/store";
@@ -67,8 +74,6 @@ import {
extractProjectResourceName,
getValueFromSearchParams,
getValuesFromSearchParams,
- hasProjectPermissionV2,
- hasWorkspacePermissionV2,
} from "@/utils";
import AdvancedSearch from "./AdvancedSearch";
import { useCommonSearchScopeOptions } from "./AdvancedSearch/useCommonSearchScopeOptions";
@@ -116,13 +121,6 @@ watch(
const pagedDatabaseTableRef = ref<InstanceType<typeof PagedDatabaseTable>>();
-const allowToCreateDB = computed(() => {
- return (
- hasWorkspacePermissionV2("bb.instances.list") &&
- hasProjectPermissionV2(props.project, "bb.issues.create")
- );
-});
-
const scopeOptions = useCommonSearchScopeOptions([
...CommonFilterScopeIdList,
"label",
diff --git a/frontend/src/components/ProjectMember/ProjectMemberPanel.vue b/frontend/src/components/ProjectMember/ProjectMemberPanel.vue
index 648d1b7a50..348050c931 100644
--- a/frontend/src/components/ProjectMember/ProjectMemberPanel.vue
+++ b/frontend/src/components/ProjectMember/ProjectMemberPanel.vue
@@ -14,25 +14,33 @@
v-model:value="state.searchText"
:placeholder="$t('settings.members.search-member')"
/>
- <NButton
- v-if="state.selectedTab === 'users' && allowEdit"
- :disabled="state.selectedMembers.length === 0"
- @click="handleRevokeSelectedMembers"
- >
- {{ $t("settings.members.revoke-access") }}
- </NButton>
- <NButton
- v-if="allowEdit"
- type="primary"
- @click="state.showAddMemberPanel = true"
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :project="project"
+ :permissions="['bb.projects.setIamPolicy']"
>
- <template #icon>
- <heroicons-outline:user-add class="w-4 h-4" />
- </template>
- {{ $t("settings.members.grant-access") }}
- </NButton>
+ <div class="flex gap-x-2">
+ <NButton
+ v-if="state.selectedTab === 'users'"
+ :disabled="slotProps.disabled || state.selectedMembers.length === 0"
+ @click="handleRevokeSelectedMembers"
+ >
+ {{ $t("settings.members.revoke-access") }}
+ </NButton>
+ <NButton
+ type="primary"
+ :disabled="slotProps.disabled"
+ @click="state.showAddMemberPanel = true"
+ >
+ <template #icon>
+ <heroicons-outline:user-add class="w-4 h-4" />
+ </template>
+ {{ $t("settings.members.grant-access") }}
+ </NButton>
+ </div>
+ </PermissionGuardWrapper>
<NButton
- v-else-if="shouldShowRequestRoleButton"
+ v-if="shouldShowRequestRoleButton"
type="primary"
@click="state.showRequestRolePanel = true"
>
@@ -111,6 +119,7 @@ import MemberDataTable from "@/components/Member/MemberDataTable/index.vue";
import MemberDataTableByRole from "@/components/Member/MemberDataTableByRole.vue";
import type { MemberBinding } from "@/components/Member/types";
import { getMemberBindings } from "@/components/Member/utils";
+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";
import {
extractUserId,
pushNotification,
@@ -147,7 +156,6 @@ interface LocalState {
const props = defineProps<{
project: Project;
- allowEdit: boolean;
}>();
const { t } = useI18n();
diff --git a/frontend/src/components/SensitiveData/ClassificationView.vue b/frontend/src/components/SensitiveData/ClassificationView.vue
index ad1bf2f5b0..d15f25b344 100644
--- a/frontend/src/components/SensitiveData/ClassificationView.vue
+++ b/frontend/src/components/SensitiveData/ClassificationView.vue
@@ -19,37 +19,42 @@
</span>
</div>
- <div class="flex items-center justify-end gap-x-2">
- <BBButtonConfirm
- :tertiary="true"
- :text="false"
- :type="'DELETE'"
- :ok-text="$t('common.delete')"
- :require-confirm="true"
- :hide-icon="true"
- :button-text="$t('common.clear')"
- :disabled="!allowEdit || !hasClassificationFeature"
- @confirm="clearSetting"
- />
- <NButton
- type="primary"
- :disabled="!allowEdit || !hasClassificationFeature"
- @click="onUpload"
- >
- <template #icon>
- <UploadIcon class="h-4 w-4" />
- </template>
- {{ $t("settings.sensitive-data.classification.upload") }}
- </NButton>
- <input
- ref="uploader"
- type="file"
- accept=".json"
- class="sr-only hidden"
- :disabled="!allowEdit || !hasClassificationFeature"
- @input="onFileChange"
- />
- </div>
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :permissions="['bb.settings.set']"
+ >
+ <div class="flex items-center justify-end gap-x-2">
+ <BBButtonConfirm
+ :tertiary="true"
+ :text="false"
+ :type="'DELETE'"
+ :ok-text="$t('common.delete')"
+ :require-confirm="true"
+ :hide-icon="true"
+ :button-text="$t('common.clear')"
+ :disabled="slotProps.disabled || !hasClassificationFeature"
+ @confirm="clearSetting"
+ />
+ <NButton
+ type="primary"
+ :disabled="slotProps.disabled || !hasClassificationFeature"
+ @click="onUpload"
+ >
+ <template #icon>
+ <UploadIcon class="h-4 w-4" />
+ </template>
+ {{ $t("settings.sensitive-data.classification.upload") }}
+ </NButton>
+ <input
+ ref="uploader"
+ type="file"
+ accept=".json"
+ class="sr-only hidden"
+ :disabled="slotProps.disabled || !hasClassificationFeature"
+ @input="onFileChange"
+ />
+ </div>
+ </PermissionGuardWrapper>
</div>
<div
@@ -87,6 +92,7 @@ import { v4 as uuidv4 } from "uuid";
import { computed, reactive, ref, watchEffect } from "vue";
import { useI18n } from "vue-i18n";
import { BBButtonConfirm } from "@/bbkit";
+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";
import { featureToRef, pushNotification, useSettingV1Store } from "@/store";
import type {
DataClassificationSetting_DataClassificationConfig_Level as ClassificationLevel,
diff --git a/frontend/src/components/SensitiveData/SemanticTypesView.vue b/frontend/src/components/SensitiveData/SemanticTypesView.vue
index 618864a296..f56a357fdd 100644
--- a/frontend/src/components/SensitiveData/SemanticTypesView.vue
+++ b/frontend/src/components/SensitiveData/SemanticTypesView.vue
@@ -1,22 +1,29 @@
<template>
<div class="w-full flex flex-col gap-y-4">
- <div class="flex items-center justify-end gap-x-2">
- <NButton
- :disabled="!hasPermission || !hasSensitiveDataFeature"
- @click="state.showTemplateDrawer = true"
+ <div class="flex justify-end">
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :permissions="['bb.policies.update']"
>
- {{ $t("settings.sensitive-data.semantic-types.use-predefined-type") }}
- </NButton>
- <NButton
- type="primary"
- :disabled="!hasPermission || !hasSensitiveDataFeature"
- @click="onAdd"
- >
- <template #icon>
- <PlusIcon class="h-4 w-4" />
- </template>
- {{ $t("common.add") }}
- </NButton>
+ <div class="flex items-center gap-x-2">
+ <NButton
+ :disabled="slotProps.disabled || !hasSensitiveDataFeature"
+ @click="state.showTemplateDrawer = true"
+ >
+ {{ $t("settings.sensitive-data.semantic-types.use-predefined-type") }}
+ </NButton>
+ <NButton
+ type="primary"
+ :disabled="slotProps.disabled || !hasSensitiveDataFeature"
+ @click="onAdd"
+ >
+ <template #icon>
+ <PlusIcon class="h-4 w-4" />
+ </template>
+ {{ $t("common.add") }}
+ </NButton>
+ </div>
+ </PermissionGuardWrapper>
</div>
<div class="textinfolabel">
{{ $t("settings.sensitive-data.semantic-types.label") }}
@@ -43,6 +50,7 @@ import { NButton } from "naive-ui";
import { v4 as uuidv4 } from "uuid";
import { computed, onMounted, reactive } from "vue";
import { useI18n } from "vue-i18n";
+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";
import { featureToRef, pushNotification, useSettingV1Store } from "@/store";
import type { SemanticTypeSetting_SemanticType } from "@/types/proto-es/v1/setting_service_pb";
import {
diff --git a/frontend/src/components/v2/Form/MissingExternalURLAttention.vue b/frontend/src/components/v2/Form/MissingExternalURLAttention.vue
index 23b46ca240..b95372a93b 100644
--- a/frontend/src/components/v2/Form/MissingExternalURLAttention.vue
+++ b/frontend/src/components/v2/Form/MissingExternalURLAttention.vue
@@ -11,7 +11,11 @@
"
>
<template #action>
- <NButton type="primary" @click="configureSetting">
+ <NButton
+ v-if="hasWorkspacePermissionV2('bb.settings.set')"
+ type="primary"
+ @click="configureSetting"
+ >
{{ $t("common.configure-now") }}
</NButton>
</template>
@@ -25,6 +29,7 @@ import { useRouter } from "vue-router";
import { BBAttention } from "@/bbkit";
import { SETTING_ROUTE_WORKSPACE_GENERAL } from "@/router/dashboard/workspaceSetting";
import { useActuatorV1Store } from "@/store";
+import { hasWorkspacePermissionV2 } from "@/utils";
const router = useRouter();
const externalUrl = computed(
diff --git a/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseOperations.vue b/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseOperations.vue
index f3f9ccfe4f..59d41f2568 100644
--- a/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseOperations.vue
+++ b/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseOperations.vue
@@ -11,27 +11,33 @@
}}</span>
<div class="flex items-center">
<template v-for="action in actions" :key="action.text">
- <NTooltip
- :disabled="!action.disabled || !action.tooltip(action.text)"
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :project="selectedProject"
+ :permissions="action.requiredPermissions"
>
- <template #trigger>
- <NButton
- quaternary
- size="small"
- type="primary"
- :disabled="action.disabled"
- @click="action.click"
- >
- <template #icon>
- <component :is="action.icon" class="h-4 w-4" />
- </template>
- <span class="text-sm">{{ action.text }}</span>
- </NButton>
- </template>
- <span class="w-56 text-sm">
- {{ action.tooltip(action.text.toLowerCase()) }}
- </span>
- </NTooltip>
+ <NTooltip
+ :disabled="slotProps.disabled || !action.disabled || !getDisabledTooltip(action.text)"
+ >
+ <template #trigger>
+ <NButton
+ quaternary
+ size="small"
+ type="primary"
+ :disabled="slotProps.disabled || action.disabled"
+ @click="action.click"
+ >
+ <template #icon>
+ <component :is="action.icon" class="h-4 w-4" />
+ </template>
+ <span class="text-sm">{{ action.text }}</span>
+ </NButton>
+ </template>
+ <span class="w-56 text-sm">
+ {{ getDisabledTooltip(action.text) }}
+ </span>
+ </NTooltip>
+ </PermissionGuardWrapper>
</template>
</div>
</div>
@@ -114,6 +120,7 @@ import { useRouter } from "vue-router";
import { BBAlert } from "@/bbkit";
import EditEnvironmentDrawer from "@/components/EditEnvironmentDrawer.vue";
import LabelEditorDrawer from "@/components/LabelEditorDrawer.vue";
+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";
import { preCreateIssue } from "@/components/Plan/logic/issue";
import { TransferDatabaseForm } from "@/components/TransferDatabaseForm";
import TransferOutDatabaseForm from "@/components/TransferOutDatabaseForm";
@@ -131,27 +138,21 @@ import {
useGracefulRequest,
useProjectV1Store,
} from "@/store";
-import type { ComposedDatabase } from "@/types";
-import { DEFAULT_PROJECT_NAME } from "@/types";
+import type { ComposedDatabase, Permission } from "@/types";
+import { DEFAULT_PROJECT_NAME, isValidProjectName } from "@/types";
import {
BatchUpdateDatabasesRequestSchema,
DatabaseSchema$,
UpdateDatabaseRequestSchema,
} from "@/types/proto-es/v1/database_service_pb";
-import {
- extractProjectResourceName,
- generateIssueTitle,
- hasPermissionToCreateChangeDatabaseIssue,
- hasPermissionToCreateDataExportIssue,
- hasProjectPermissionV2,
-} from "@/utils";
+import { extractProjectResourceName, generateIssueTitle } from "@/utils";
interface DatabaseAction {
icon: VNode;
text: string;
disabled: boolean;
click: () => void;
- tooltip: (action: string) => string;
+ requiredPermissions: Permission[];
}
interface LocalState {
@@ -201,12 +202,12 @@ const assignedDatabases = computed(() => {
const getDisabledTooltip = (action: string) => {
if (selectedProjectNames.value.size > 1) {
return t("database.batch-action-disabled", {
- action,
+ action: action.toLowerCase(),
});
}
if (selectedProjectNames.value.has(DEFAULT_PROJECT_NAME)) {
return t("database.batch-action-disabled-for-unassigned", {
- action,
+ action: action.toLowerCase(),
});
}
return "";
@@ -222,29 +223,11 @@ const selectedProjectName = computed(() => {
return [...selectedProjectNames.value][0];
});
-const allowTransferInProject = computed(() => {
- const project = projectStore.getProjectByName(props.projectName);
- return hasProjectPermissionV2(project, "bb.projects.update");
-});
-
-const allowExportData = computed(() => {
- return props.databases.every((db) => {
- return hasPermissionToCreateDataExportIssue(db);
- });
-});
-
-const allowUpdateDatabase = computed(() => {
- return props.databases.every((db) => {
- const project = db.projectEntity;
- return hasProjectPermissionV2(project, "bb.databases.update");
- });
-});
-
-const allowSyncDatabases = computed(() => {
- return props.databases.every((db) => {
- const project = db.projectEntity;
- return hasProjectPermissionV2(project, "bb.databases.sync");
- });
+const selectedProject = computed(() => {
+ if (!isValidProjectName(selectedProjectName.value)) {
+ return;
+ }
+ return projectStore.getProjectByName(selectedProjectName.value);
});
const selectedDatabaseNameList = computed(() => {
@@ -416,12 +399,6 @@ const isInDefaultProject = computed(
() => props.projectName === DEFAULT_PROJECT_NAME
);
-const allowChangeDatabase = computed(() => {
- return props.databases.every((db) =>
- hasPermissionToCreateChangeDatabaseIssue(db)
- );
-});
-
const actions = computed((): DatabaseAction[] => {
const resp: DatabaseAction[] = [];
for (const operation of operations.value) {
@@ -432,7 +409,6 @@ const actions = computed((): DatabaseAction[] => {
icon: h(PencilIcon),
text: t("database.change-database"),
disabled:
- !allowChangeDatabase.value ||
!selectedProjectName.value ||
selectedDatabaseNameList.value.length < 1 ||
selectedProjectNames.value.has(DEFAULT_PROJECT_NAME),
@@ -442,14 +418,11 @@ const actions = computed((): DatabaseAction[] => {
selectedDatabaseNameList.value
);
},
- tooltip: (action) => {
- if (!allowChangeDatabase.value) {
- return t("database.batch-action-permission-denied", {
- action,
- });
- }
- return getDisabledTooltip(action);
- },
+ requiredPermissions: [
+ "bb.issues.create",
+ "bb.plans.create",
+ "bb.rollouts.create",
+ ],
});
}
break;
@@ -459,19 +432,15 @@ const actions = computed((): DatabaseAction[] => {
icon: h(DownloadIcon),
text: t("custom-approval.risk-rule.risk.namespace.data_export"),
disabled:
- !allowExportData.value ||
!selectedProjectName.value ||
props.databases.length < 1 ||
selectedProjectNames.value.has(DEFAULT_PROJECT_NAME),
click: () => generateMultiDb("bb.issue.database.data.export"),
- tooltip: (action) => {
- if (!allowExportData.value) {
- return t("database.batch-action-permission-denied", {
- action,
- });
- }
- return "";
- },
+ requiredPermissions: [
+ "bb.issues.create",
+ "bb.plans.create",
+ "bb.rollouts.create",
+ ],
});
}
break;
@@ -479,41 +448,27 @@ const actions = computed((): DatabaseAction[] => {
resp.push({
icon: h(RefreshCcwIcon),
text: t("database.sync-schema-button"),
- disabled: !allowSyncDatabases.value || props.databases.length < 1,
+ disabled: props.databases.length < 1,
click: syncSchema,
- tooltip: (action) => getDisabledTooltip(action),
+ requiredPermissions: ["bb.databases.sync"],
});
break;
case "EDIT-LABELS":
resp.push({
icon: h(TagIcon),
text: t("database.edit-labels"),
- disabled: !allowUpdateDatabase.value || props.databases.length < 1,
+ disabled: props.databases.length < 1,
click: () => (state.showLabelEditorDrawer = true),
- tooltip: (action) => {
- if (!allowUpdateDatabase.value) {
- return t("database.batch-action-permission-denied", {
- action,
- });
- }
- return getDisabledTooltip(action);
- },
+ requiredPermissions: ["bb.databases.update"],
});
break;
case "EDIT-ENVIRONMENT":
resp.push({
icon: h(SquareStackIcon),
text: t("database.edit-environment"),
- disabled: !allowUpdateDatabase.value || props.databases.length < 1,
+ disabled: props.databases.length < 1,
click: () => (state.showEditEnvironmentDrawer = true),
- tooltip: (action) => {
- if (!allowUpdateDatabase.value) {
- return t("database.batch-action-permission-denied", {
- action,
- });
- }
- return getDisabledTooltip(action);
- },
+ requiredPermissions: ["bb.databases.update"],
});
break;
case "TRANSFER-IN": {
@@ -521,16 +476,9 @@ const actions = computed((): DatabaseAction[] => {
resp.push({
icon: h(ChevronsDownIcon),
text: t("quick-action.transfer-in-db"),
- disabled: !allowTransferInProject.value,
+ disabled: false,
click: () => (state.transferOutDatabaseType = "TRANSFER-IN"),
- tooltip: (action) => {
- if (!allowTransferInProject.value) {
- return t("database.batch-action-permission-denied", {
- action,
- });
- }
- return getDisabledTooltip(action);
- },
+ requiredPermissions: ["bb.projects.update"],
});
}
break;
@@ -542,24 +490,15 @@ const actions = computed((): DatabaseAction[] => {
text: t("database.transfer-project"),
disabled: props.databases.length < 1,
click: () => (state.transferOutDatabaseType = "TRANSFER-OUT"),
- tooltip: (action) => {
- return getDisabledTooltip(action);
- },
+ requiredPermissions: [],
});
} else if (!isInDefaultProject.value) {
resp.push({
icon: h(UnlinkIcon),
text: t("database.unassign"),
- disabled: !allowUpdateDatabase.value || props.databases.length < 1,
+ disabled: props.databases.length < 1,
click: () => (state.showUnassignAlert = true),
- tooltip: (action) => {
- if (!allowUpdateDatabase.value) {
- return t("database.batch-action-permission-denied", {
- action,
- });
- }
- return getDisabledTooltip(action);
- },
+ requiredPermissions: ["bb.databases.update"],
});
}
break;
diff --git a/frontend/src/components/v2/Model/Instance/InstanceV1Table/InstanceOperations.vue b/frontend/src/components/v2/Model/Instance/InstanceV1Table/InstanceOperations.vue
index cd6538a9cd..effaccff1a 100644
--- a/frontend/src/components/v2/Model/Instance/InstanceV1Table/InstanceOperations.vue
+++ b/frontend/src/components/v2/Model/Instance/InstanceV1Table/InstanceOperations.vue
@@ -11,14 +11,19 @@
}}
</span>
<div class="flex items-center">
- <template v-for="action in actions" :key="action.text">
+ <PermissionGuardWrapper
+ v-for="action in actions"
+ :key="action.text"
+ v-slot="slotProps"
+ :permissions="action.requiredPermissions"
+ >
<component :is="action.render()" v-if="action.render" />
<NButton
v-else
quaternary
size="small"
type="primary"
- :disabled="action.disabled"
+ :disabled="slotProps.disabled || action.disabled"
@click="action.click"
>
<template v-if="action.icon" #icon>
@@ -26,7 +31,7 @@
</template>
<span class="text-sm">{{ action.text }}</span>
</NButton>
- </template>
+ </PermissionGuardWrapper>
</div>
</div>
<InstanceAssignment
@@ -53,15 +58,16 @@ import { useI18n } from "vue-i18n";
import EditEnvironmentDrawer from "@/components/EditEnvironmentDrawer.vue";
import InstanceSyncButton from "@/components/Instance/InstanceSyncButton.vue";
import InstanceAssignment from "@/components/InstanceAssignment.vue";
+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";
import {
pushNotification,
useInstanceV1Store,
useSubscriptionV1Store,
} from "@/store";
+import type { Permission } from "@/types";
import type { Instance } from "@/types/proto-es/v1/instance_service_pb";
import { UpdateInstanceRequestSchema } from "@/types/proto-es/v1/instance_service_pb";
import { PlanType } from "@/types/proto-es/v1/subscription_service_pb";
-import { hasWorkspacePermissionV2 } from "@/utils";
interface Action {
icon?: VNode;
@@ -69,6 +75,7 @@ interface Action {
text: string;
disabled?: boolean;
click?: () => void;
+ requiredPermissions: Permission[];
}
interface LocalState {
@@ -113,25 +120,26 @@ const actions = computed((): Action[] => {
/>
),
text: "",
+ requiredPermissions: ["bb.instances.sync"],
},
- ];
-
- if (hasWorkspacePermissionV2("bb.instances.update")) {
- list.push({
+ {
icon: h(SquareStackIcon),
text: t("database.edit-environment"),
disabled: props.instanceList.length < 1,
click: () => (state.showEditEnvironmentDrawer = true),
- });
+ requiredPermissions: ["bb.instances.update"],
+ },
+ ];
- if (canAssignLicense.value) {
- list.push({
- icon: h(GraduationCapIcon),
- text: t("subscription.instance-assignment.assign-license"),
- click: () => (state.showAssignLicenseDrawer = true),
- });
- }
+ if (canAssignLicense.value) {
+ list.push({
+ icon: h(GraduationCapIcon),
+ text: t("subscription.instance-assignment.assign-license"),
+ click: () => (state.showAssignLicenseDrawer = true),
+ requiredPermissions: ["bb.instances.update", "bb.settings.get"],
+ });
}
+
return list;
});
diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.json
index 6d87544e34..18be80cb01 100644
--- a/frontend/src/locales/en-US.json
+++ b/frontend/src/locales/en-US.json
@@ -1686,7 +1686,6 @@
"mixed-values-for-label": "This selected label have mixed values",
"mixed-label-values-warning": "Some of the selected resources have mixed values for the same key. Only edit these key-value pairs if you intend to change them.",
"table-detail": "Table detail",
- "batch-action-permission-denied": "Don't have permission to {action} for databases",
"batch-action-disabled": "Can not {action} for the databases from different projects",
"batch-action-disabled-for-unassigned": "Can not {action} for unassigned database",
"successfully-transferred-databases": "Successfully transferred databases",
@@ -2796,8 +2795,7 @@
"delete-group": "Delete the database group {name}"
},
"export-center": {
- "self": "Export Center",
- "permission-denied": "Permission denied"
+ "self": "Export Center"
},
"schema-designer": {
"use-tips": "Click a table to start."
diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.json
index 016aebf074..d854a69037 100644
--- a/frontend/src/locales/es-ES.json
+++ b/frontend/src/locales/es-ES.json
@@ -1686,7 +1686,6 @@
"mixed-values-for-label": "Esta etiqueta seleccionada tiene valores mixtos.",
"mixed-label-values-warning": "Algunos de los recursos seleccionados tienen valores mixtos para la misma clave. Solo edite estos pares clave-valor si tiene la intención de cambiarlos.",
"table-detail": "Detalle de la tabla",
- "batch-action-permission-denied": "No tengo permiso para {action} para bases de datos",
"batch-action-disabled": "No se puede {action} para las bases de datos de diferentes proyectos",
"batch-action-disabled-for-unassigned": "No se puede {action} para una base de datos no asignada",
"successfully-transferred-databases": "Bases de datos transferidas exitosamente",
@@ -2796,8 +2795,7 @@
"delete-group": "Eliminar el grupo de bases de datos {name}"
},
"export-center": {
- "self": "centro de exportacion",
- "permission-denied": "Permiso denegado"
+ "self": "centro de exportacion"
},
"schema-designer": {
"use-tips": "Selecciona las tablas a diseñar"
diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.json
index 8738e27548..921ad0e804 100644
--- a/frontend/src/locales/ja-JP.json
+++ b/frontend/src/locales/ja-JP.json
@@ -1686,7 +1686,6 @@
"mixed-values-for-label": "タグの値が異なります",
"mixed-label-values-warning": "選択されたリソースの一部は、同じキーに対して異なる値を持っています。これらのキーと値のペアを変更する場合にのみ編集してください。",
"table-detail": "テーブルの詳細",
- "batch-action-permission-denied": "データベース {action} に対する権限がありません",
"batch-action-disabled": "異なるプロジェクトのデータベース {action} を比較できません",
"batch-action-disabled-for-unassigned": "未割り当てのデータベース {action} にアクセスできません",
"successfully-transferred-databases": "データベースの移行が完了しました",
@@ -2796,8 +2795,7 @@
"delete-group": "データベースグループを削除する"
},
"export-center": {
- "self": "エクスポートセンター",
- "permission-denied": "この操作を実行する権限がありません"
+ "self": "エクスポートセンター"
},
"schema-designer": {
"use-tips": "デザインするテーブルを選択してください"
diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.json
index 1ede1af450..ba8e86a6cb 100644
--- a/frontend/src/locales/vi-VN.json
+++ b/frontend/src/locales/vi-VN.json
@@ -1686,7 +1686,6 @@
"mixed-values-for-label": "Nhãn đã chọn này có các giá trị hỗn hợp",
"mixed-label-values-warning": "Một số tài nguyên đã chọn có các giá trị khác nhau cho cùng một khóa. Chỉ chỉnh sửa các cặp khóa-giá trị này nếu bạn muốn thay đổi chúng.",
"table-detail": "Chi tiết bảng",
- "batch-action-permission-denied": "Không có quyền {action} đối với cơ sở dữ liệu",
"batch-action-disabled": "Không thể {action} đối với các cơ sở dữ liệu từ các dự án khác nhau",
"batch-action-disabled-for-unassigned": "Không thể {action} đối với cơ sở dữ liệu chưa được gán",
"successfully-transferred-databases": "Đã chuyển thành công cơ sở dữ liệu",
@@ -2796,8 +2795,7 @@
"delete-group": "Xóa nhóm cơ sở dữ liệu {name}"
},
"export-center": {
- "self": "Trung tâm xuất",
- "permission-denied": "Quyền bị từ chối"
+ "self": "Trung tâm xuất"
},
"schema-designer": {
"use-tips": "Nhấp vào một bảng để bắt đầu."
diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.json
index eb98f04fd1..117de59b25 100644
--- a/frontend/src/locales/zh-CN.json
+++ b/frontend/src/locales/zh-CN.json
@@ -1686,7 +1686,6 @@
"mixed-values-for-label": "该标签拥有不同的值",
"mixed-label-values-warning": "部分标签拥有不同的值,编辑标签将会批量应用。仅在您打算更改时再编辑这些键值对。",
"table-detail": "表详情",
- "batch-action-permission-denied": "没有权限对数据库{action}",
"batch-action-disabled": "无法对来自不同项目的数据库{action}",
"batch-action-disabled-for-unassigned": "无法对未分配的数据库{action}",
"successfully-transferred-databases": "数据库转移完成",
@@ -2796,8 +2795,7 @@
"delete-group": "删除数据库组 {name}"
},
"export-center": {
- "self": "导出中心",
- "permission-denied": "您没有权限执行此操作"
+ "self": "导出中心"
},
"schema-designer": {
"use-tips": "选择需要设计的表"
diff --git a/frontend/src/utils/iam/permission-utils.ts b/frontend/src/utils/iam/permission-utils.ts
index a6feb25c9e..9cd8448392 100644
--- a/frontend/src/utils/iam/permission-utils.ts
+++ b/frontend/src/utils/iam/permission-utils.ts
@@ -25,23 +25,3 @@ export const hasPermissionToCreateChangeDatabaseIssue = (
database.projectEntity
);
};
-
-export const hasPermissionToCreateDataExportIssueInProject = (
- project: Project
-) => {
- return (
- hasProjectPermissionV2(project, "bb.issues.create") &&
- hasProjectPermissionV2(project, "bb.plans.create") &&
- hasProjectPermissionV2(project, "bb.rollouts.create")
- );
-};
-
-export const hasPermissionToCreateDataExportIssue = (
- database: ComposedDatabase
-) => {
- return hasPermissionToCreateDataExportIssueInProject(database.projectEntity);
-};
-
-export const hasPermissionToCreatePlanInProject = (project: Project) => {
- return hasProjectPermissionV2(project, "bb.plans.create");
-};
diff --git a/frontend/src/views/DatabaseDashboard.vue b/frontend/src/views/DatabaseDashboard.vue
index 512a218bb6..f85f99d110 100644
--- a/frontend/src/views/DatabaseDashboard.vue
+++ b/frontend/src/views/DatabaseDashboard.vue
@@ -11,7 +11,7 @@
/>
<PermissionGuardWrapper
v-slot="slotProps"
- :permissions="['bb.instances.list', 'bb.issues.create', 'bb.settings.get']"
+ :permissions="['bb.instances.list', 'bb.issues.create', 'bb.plans.create']"
>
<NButton
type="primary"
diff --git a/frontend/src/views/EnvironmentDashboard.vue b/frontend/src/views/EnvironmentDashboard.vue
index 5ec986b208..a141c96502 100644
--- a/frontend/src/views/EnvironmentDashboard.vue
+++ b/frontend/src/views/EnvironmentDashboard.vue
@@ -23,31 +23,32 @@
/>
</NTabPane>
<template #suffix>
- <div class="flex items-center justify-end gap-x-2 px-2 pb-1">
- <NButton
- v-if="
- hasWorkspacePermissionV2('bb.settings.get') &&
- hasWorkspacePermissionV2('bb.settings.set')
- "
- :disabled="environmentList.length <= 1"
- @click="startReorder"
- >
- <template #icon>
- <ListOrderedIcon class="h-4 w-4" />
- </template>
- {{ t("common.reorder") }}
- </NButton>
- <NButton
- v-if="hasWorkspacePermissionV2('bb.settings.set')"
- type="primary"
- @click="createEnvironment"
- >
- <template #icon>
- <PlusIcon class="h-4 w-4" />
- </template>
- {{ t("environment.create") }}
- </NButton>
- </div>
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :permissions="['bb.settings.set']"
+ >
+ <div class="flex items-center justify-end gap-x-2 px-2 pb-1">
+ <NButton
+ :disabled="slotProps.disabled || environmentList.length <= 1"
+ @click="startReorder"
+ >
+ <template #icon>
+ <ListOrderedIcon class="h-4 w-4" />
+ </template>
+ {{ t("common.reorder") }}
+ </NButton>
+ <NButton
+ type="primary"
+ :disabled="slotProps.disabled"
+ @click="createEnvironment"
+ >
+ <template #icon>
+ <PlusIcon class="h-4 w-4" />
+ </template>
+ {{ t("environment.create") }}
+ </NButton>
+ </div>
+ </PermissionGuardWrapper>
</template>
</NTabs>
</div>
@@ -120,6 +121,7 @@ import {
Form as EnvironmentFormBody,
Buttons as EnvironmentFormButtons,
} from "@/components/EnvironmentForm";
+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";
import { Drawer, DrawerContent, EnvironmentV1Name } from "@/components/v2";
import { useRouteChangeGuard } from "@/composables/useRouteChangeGuard";
import {
@@ -138,7 +140,7 @@ import type { Policy } from "@/types/proto-es/v1/org_policy_service_pb";
import { PolicyResourceType } from "@/types/proto-es/v1/org_policy_service_pb";
import { EnvironmentSetting_EnvironmentSchema } from "@/types/proto-es/v1/setting_service_pb";
import type { Environment } from "@/types/v1/environment";
-import { hasWorkspacePermissionV2, type VueClass } from "@/utils";
+import { type VueClass } from "@/utils";
import EnvironmentDetail from "@/views/EnvironmentDetail.vue";
const DEFAULT_NEW_ROLLOUT_POLICY: Policy = getEmptyRolloutPolicy(
diff --git a/frontend/src/views/ExportCenter/index.vue b/frontend/src/views/ExportCenter/index.vue
index 793a168be5..bb377eb49c 100644
--- a/frontend/src/views/ExportCenter/index.vue
+++ b/frontend/src/views/ExportCenter/index.vue
@@ -10,21 +10,22 @@
:override-scope-id-list="overrideSearchScopeIdList"
>
<template #searchbox-suffix>
- <NTooltip :disabled="allowExportData">
- <template #trigger>
- <NButton
- type="primary"
- :disabled="!allowExportData"
- @click="state.showRequestExportPanel = true"
- >
- <template #icon>
- <DownloadIcon class="h-4 w-4" />
- </template>
- {{ $t("quick-action.request-export-data") }}
- </NButton>
- </template>
- {{ $t("export-center.permission-denied") }}
- </NTooltip>
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :project="specificProject"
+ :permissions="['bb.issues.create', 'bb.plans.create', 'bb.rollouts.create']"
+ >
+ <NButton
+ type="primary"
+ :disabled="slotProps.disabled"
+ @click="state.showRequestExportPanel = true"
+ >
+ <template #icon>
+ <DownloadIcon class="h-4 w-4" />
+ </template>
+ {{ $t("quick-action.request-export-data") }}
+ </NButton>
+ </PermissionGuardWrapper>
</template>
</IssueSearch>
</div>
@@ -61,12 +62,13 @@
<script lang="ts" setup>
import { DownloadIcon } from "lucide-vue-next";
-import { NButton, NTooltip } from "naive-ui";
+import { NButton } from "naive-ui";
import { computed, reactive, ref, watch } from "vue";
import type { ComponentExposed } from "vue-component-type-helpers";
import DataExportPrepForm from "@/components/DataExportPrepForm";
import IssueSearch from "@/components/IssueV1/components/IssueSearch/IssueSearch.vue";
import IssueTableV1 from "@/components/IssueV1/components/IssueTableV1.vue";
+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";
import { Drawer } from "@/components/v2";
import PagedTable from "@/components/v2/Model/PagedTable.vue";
import {
@@ -80,7 +82,6 @@ import { Issue_Type, IssueStatus } from "@/types/proto-es/v1/issue_service_pb";
import {
buildIssueFilterBySearchParams,
extractProjectResourceName,
- hasPermissionToCreateDataExportIssueInProject,
type SearchParams,
type SearchScope,
type SearchScopeId,
@@ -191,8 +192,4 @@ watch(
() => issuePagedTable.value?.refresh()
);
useRefreshIssueList(() => issuePagedTable.value?.refresh());
-
-const allowExportData = computed(() => {
- return hasPermissionToCreateDataExportIssueInProject(specificProject.value);
-});
</script>
diff --git a/frontend/src/views/InstanceDetail.vue b/frontend/src/views/InstanceDetail.vue
index 534fcc8009..3707791242 100644
--- a/frontend/src/views/InstanceDetail.vue
+++ b/frontend/src/views/InstanceDetail.vue
@@ -18,21 +18,26 @@
<NTabs :value="state.selectedTab" @update:value="onTabChange">
<template #suffix>
- <div class="flex items-center gap-x-2">
+ <div v-if="instance.state === State.ACTIVE" class="flex items-center gap-x-2">
<InstanceSyncButton
- v-if="instance.state === State.ACTIVE"
@sync-schema="syncSchema"
/>
- <NButton
+ <PermissionGuardWrapper
v-if="allowCreateDatabase"
- type="primary"
- @click.prevent="createDatabase"
+ v-slot="slotProps"
+ :permissions="['bb.issues.create', 'bb.plans.create']"
>
- <template #icon>
- <PlusIcon class="h-4 w-4" />
- </template>
- {{ $t("instance.new-database") }}
- </NButton>
+ <NButton
+ type="primary"
+ :disabled="slotProps.disabled"
+ @click.prevent="createDatabase"
+ >
+ <template #icon>
+ <PlusIcon class="h-4 w-4" />
+ </template>
+ {{ $t("instance.new-database") }}
+ </NButton>
+ </PermissionGuardWrapper>
</div>
</template>
<NTabPane name="overview" :tab="$t('common.overview')">
@@ -110,6 +115,7 @@ import {
Form as InstanceFormBody,
Buttons as InstanceFormButtons,
} from "@/components/InstanceForm/";
+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";
import { Drawer, InstanceRoleTable } from "@/components/v2";
import {
DatabaseOperations,
@@ -273,10 +279,7 @@ const instanceRoleList = computed(() => {
});
const allowCreateDatabase = computed(() => {
- return (
- instance.value.state === State.ACTIVE &&
- instanceV1HasCreateDatabase(instance.value)
- );
+ return instanceV1HasCreateDatabase(instance.value);
});
const syncSchema = async (enableFullSync: boolean) => {
diff --git a/frontend/src/views/SettingWorkspaceAuditLog.vue b/frontend/src/views/SettingWorkspaceAuditLog.vue
index ca77154699..c424c34ee1 100644
--- a/frontend/src/views/SettingWorkspaceAuditLog.vue
+++ b/frontend/src/views/SettingWorkspaceAuditLog.vue
@@ -3,23 +3,19 @@
<FeatureAttention :feature="PlanFeature.FEATURE_AUDIT_LOG" />
<AuditLogSearch v-model:params="state.params">
<template #searchbox-suffix>
- <PermissionGuardWrapper
- v-slot="slotProps"
- :permissions="['bb.auditLogs.export']"
- >
- <DataExportButton
- size="medium"
- :support-formats="[
- ExportFormat.CSV,
- ExportFormat.JSON,
- ExportFormat.XLSX,
- ]"
- :tooltip="disableExportTip"
- :view-mode="'DROPDOWN'"
- :disabled="slotProps.disabled || !hasAuditLogFeature || !!disableExportTip"
- @export="(params) => pagedAuditLogDataTableRef?.handleExport(params)"
- />
- </PermissionGuardWrapper>
+ <DataExportButton
+ v-if="hasWorkspacePermissionV2('bb.auditLogs.export')"
+ size="medium"
+ :support-formats="[
+ ExportFormat.CSV,
+ ExportFormat.JSON,
+ ExportFormat.XLSX,
+ ]"
+ :tooltip="disableExportTip"
+ :view-mode="'DROPDOWN'"
+ :disabled="!hasAuditLogFeature || !!disableExportTip"
+ @export="(params) => pagedAuditLogDataTableRef?.handleExport(params)"
+ />
</template>
</AuditLogSearch>
@@ -43,13 +39,12 @@ import { buildAuditLogFilter } from "@/components/AuditLog/AuditLogSearch/utils"
import PagedAuditLogDataTable from "@/components/AuditLog/PagedAuditLogDataTable.vue";
import DataExportButton from "@/components/DataExportButton.vue";
import { FeatureAttention } from "@/components/FeatureGuard";
-import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";
import { featureToRef } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import { type AuditLogFilter } from "@/types";
import { ExportFormat } from "@/types/proto-es/v1/common_pb";
import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
-import { type SearchParams } from "@/utils";
+import { hasWorkspacePermissionV2, type SearchParams } from "@/utils";
interface LocalState {
params: SearchParams;
diff --git a/frontend/src/views/SettingWorkspaceMembers.vue b/frontend/src/views/SettingWorkspaceMembers.vue
index 0758256ea3..063828ca6b 100644
--- a/frontend/src/views/SettingWorkspaceMembers.vue
+++ b/frontend/src/views/SettingWorkspaceMembers.vue
@@ -44,21 +44,30 @@
v-model:value="state.searchText"
:placeholder="$t('settings.members.search-member')"
/>
- <div v-if="allowEdit" class="flex justify-end gap-x-2">
- <NButton
- v-if="state.selectedTab === 'MEMBERS'"
- :disabled="state.selectedMembers.length === 0"
- @click="handleRevokeSelectedMembers"
- >
- {{ $t("settings.members.revoke-access") }}
- </NButton>
- <NButton type="primary" @click="state.showAddMemberPanel = true">
- <template #icon>
- <heroicons-outline:user-add class="w-4 h-4" />
- </template>
- {{ $t("settings.members.grant-access") }}
- </NButton>
- </div>
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :permissions="['bb.workspaces.setIamPolicy']"
+ >
+ <div class="flex justify-end gap-x-2">
+ <NButton
+ v-if="state.selectedTab === 'MEMBERS'"
+ :disabled="slotProps.disabled || state.selectedMembers.length === 0"
+ @click="handleRevokeSelectedMembers"
+ >
+ {{ $t("settings.members.revoke-access") }}
+ </NButton>
+ <NButton
+ type="primary"
+ :disabled="slotProps.disabled"
+ @click="state.showAddMemberPanel = true"
+ >
+ <template #icon>
+ <heroicons-outline:user-add class="w-4 h-4" />
+ </template>
+ {{ $t("settings.members.grant-access") }}
+ </NButton>
+ </div>
+ </PermissionGuardWrapper>
</div>
</template>
</NTabs>
@@ -85,6 +94,7 @@ import MemberDataTable from "@/components/Member/MemberDataTable/index.vue";
import MemberDataTableByRole from "@/components/Member/MemberDataTableByRole.vue";
import type { MemberBinding } from "@/components/Member/types";
import { getMemberBindings } from "@/components/Member/utils";
+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";
import { SearchBox } from "@/components/v2";
import {
pushNotification,
diff --git a/frontend/src/views/SettingWorkspaceSSO.vue b/frontend/src/views/SettingWorkspaceSSO.vue
index fdf9b4fb35..0f4ab01eb1 100644
--- a/frontend/src/views/SettingWorkspaceSSO.vue
+++ b/frontend/src/views/SettingWorkspaceSSO.vue
@@ -7,20 +7,25 @@
/>
</div>
<div class="w-full flex flex-row justify-end items-center">
- <NButton
- type="primary"
- :disabled="!allowCreateSSO"
- @click="handleCreateSSO"
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :permissions="['bb.identityProviders.create']"
>
- <template #icon>
- <PlusIcon class="h-4 w-4" />
- <FeatureBadge
- :feature="PlanFeature.FEATURE_GOOGLE_AND_GITHUB_SSO"
- class="text-white"
- />
- </template>
- {{ $t("settings.sso.create") }}
- </NButton>
+ <NButton
+ type="primary"
+ :disabled="slotProps.disabled"
+ @click="handleCreateSSO"
+ >
+ <template #icon>
+ <PlusIcon class="h-4 w-4" />
+ <FeatureBadge
+ :feature="PlanFeature.FEATURE_GOOGLE_AND_GITHUB_SSO"
+ class="text-white"
+ />
+ </template>
+ {{ $t("settings.sso.create") }}
+ </NButton>
+ </PermissionGuardWrapper>
</div>
<IdentityProviderTable
:identity-provider-list="identityProviderList"
@@ -53,12 +58,12 @@ import {
IdentityProviderTable,
} from "@/components/IdentityProvider";
import LearnMoreLink from "@/components/LearnMoreLink.vue";
+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";
import { WORKSPACE_ROUTE_IDENTITY_PROVIDER_DETAIL } from "@/router/dashboard/workspaceRoutes";
import { featureToRef, getIdentityProviderResourceId } from "@/store";
import { useIdentityProviderStore } from "@/store/modules/idp";
import type { IdentityProvider } from "@/types/proto-es/v1/idp_service_pb";
import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
-import { hasWorkspacePermissionV2 } from "@/utils";
interface LocalState {
isLoading: boolean;
@@ -79,10 +84,6 @@ const identityProviderList = computed(() => {
return identityProviderStore.identityProviderList;
});
-const allowCreateSSO = computed(() => {
- return hasWorkspacePermissionV2("bb.identityProviders.create");
-});
-
onMounted(async () => {
await identityProviderStore.fetchIdentityProviderList();
state.isLoading = false;
diff --git a/frontend/src/views/SettingWorkspaceUsers.vue b/frontend/src/views/SettingWorkspaceUsers.vue
index 692bf625af..416d3a12c7 100644
--- a/frontend/src/views/SettingWorkspaceUsers.vue
+++ b/frontend/src/views/SettingWorkspaceUsers.vue
@@ -68,66 +68,81 @@
<div class="flex items-center gap-x-2">
<SearchBox v-model:value="state.activeUserFilterText" />
- <NButton
- v-if="allowGetSCIMSetting && allowCreateUser"
- class="capitalize"
- :disabled="!hasDirectorySyncFeature"
- @click="
- () => {
- state.showAadSyncDrawer = true;
- }
- "
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :permissions="['bb.settings.get']"
>
- <template #icon>
- <SettingsIcon class="h-5 w-5" />
- <FeatureBadge :feature="PlanFeature.FEATURE_DIRECTORY_SYNC" />
- </template>
- {{ $t(`settings.members.entra-sync.self`) }}
- </NButton>
-
- <NPopover
- v-if="allowCreateGroup"
- :disabled="workspaceProfileSetting.domains.length > 0"
+ <NButton
+ class="capitalize"
+ :disabled="!hasDirectorySyncFeature || slotProps.disabled"
+ @click="
+ () => {
+ state.showAadSyncDrawer = true;
+ }
+ "
+ >
+ <template #icon>
+ <SettingsIcon class="h-5 w-5" />
+ <FeatureBadge :feature="PlanFeature.FEATURE_DIRECTORY_SYNC" />
+ </template>
+ {{ $t(`settings.members.entra-sync.self`) }}
+ </NButton>
+ </PermissionGuardWrapper>
+
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :permissions="['bb.groups.create']"
>
- <template #trigger>
- <NButton
- :disabled="
- workspaceProfileSetting.domains.length === 0 ||
- !hasUserGroupFeature
- "
- @click="handleCreateGroup"
- >
- <template #icon>
- <PlusIcon class="h-5 w-5" />
- <FeatureBadge :feature="PlanFeature.FEATURE_USER_GROUPS" />
- </template>
- {{ $t(`settings.members.groups.add-group`) }}
- </NButton>
- </template>
- <p>
- {{ $t("settings.members.groups.workspace-domain-required") }}
- <router-link
- :to="{
- name: SETTING_ROUTE_WORKSPACE_GENERAL,
- hash: '#domain-restriction',
- }"
- class="normal-link"
- >
- {{ $t("common.configure") }}
- </router-link>
- </p>
- </NPopover>
- <NButton
- v-if="allowCreateUser"
- type="primary"
- class="capitalize"
- @click="handleCreateUser"
+ <NPopover
+ :disabled="slotProps.disabled || workspaceProfileSetting.domains.length > 0"
+ >
+ <template #trigger>
+ <NButton
+ :disabled="
+ slotProps.disabled ||
+ workspaceProfileSetting.domains.length === 0 ||
+ !hasUserGroupFeature
+ "
+ @click="handleCreateGroup"
+ >
+ <template #icon>
+ <PlusIcon class="h-5 w-5" />
+ <FeatureBadge :feature="PlanFeature.FEATURE_USER_GROUPS" />
+ </template>
+ {{ $t(`settings.members.groups.add-group`) }}
+ </NButton>
+ </template>
+ <p>
+ {{ $t("settings.members.groups.workspace-domain-required") }}
+ <router-link
+ :to="{
+ name: SETTING_ROUTE_WORKSPACE_GENERAL,
+ hash: '#domain-restriction',
+ }"
+ class="normal-link"
+ >
+ {{ $t("common.configure") }}
+ </router-link>
+ </p>
+ </NPopover>
+ </PermissionGuardWrapper>
+
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :permissions="['bb.users.create']"
>
- <template #icon>
- <PlusIcon class="h-5 w-5" />
- </template>
- {{ $t(`settings.members.add-user`) }}
- </NButton>
+ <NButton
+ type="primary"
+ class="capitalize"
+ :disabled="slotProps.disabled"
+ @click="handleCreateUser"
+ >
+ <template #icon>
+ <PlusIcon class="h-5 w-5" />
+ </template>
+ {{ $t(`settings.members.add-user`) }}
+ </NButton>
+ </PermissionGuardWrapper>
</div>
</template>
</NTabs>
@@ -205,6 +220,7 @@ import { useI18n } from "vue-i18n";
import { RouterLink, useRoute, useRouter } from "vue-router";
import { BBAttention } from "@/bbkit";
import { FeatureBadge } from "@/components/FeatureGuard";
+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";
import AADSyncDrawer from "@/components/User/Settings/AADSyncDrawer.vue";
import CreateGroupDrawer from "@/components/User/Settings/CreateGroupDrawer.vue";
import CreateUserDrawer from "@/components/User/Settings/CreateUserDrawer.vue";
@@ -229,7 +245,6 @@ import type { Group } from "@/types/proto-es/v1/group_service_pb";
import { WorkspaceProfileSettingSchema } from "@/types/proto-es/v1/setting_service_pb";
import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
import { type User } from "@/types/proto-es/v1/user_service_pb";
-import { hasWorkspacePermissionV2 } from "@/utils";
const tabList = ["USERS", "GROUPS"] as const;
type MemberTab = (typeof tabList)[number];
@@ -373,18 +388,6 @@ const hasDirectorySyncFeature = featureToRef(
const hasUserGroupFeature = featureToRef(PlanFeature.FEATURE_USER_GROUPS);
-const allowGetSCIMSetting = computed(() =>
- hasWorkspacePermissionV2("bb.settings.get")
-);
-
-const allowCreateGroup = computed(() =>
- hasWorkspacePermissionV2("bb.groups.create")
-);
-
-const allowCreateUser = computed(() => {
- return hasWorkspacePermissionV2("bb.users.create");
-});
-
onMounted(async () => {
if (!uiStateStore.getIntroStateByKey("member.visit")) {
uiStateStore.saveIntroStateByKey({
diff --git a/frontend/src/views/project/ProjectAuditLogDashboard.vue b/frontend/src/views/project/ProjectAuditLogDashboard.vue
index 24884705c7..83584951db 100644
--- a/frontend/src/views/project/ProjectAuditLogDashboard.vue
+++ b/frontend/src/views/project/ProjectAuditLogDashboard.vue
@@ -3,24 +3,19 @@
<FeatureAttention :feature="PlanFeature.FEATURE_AUDIT_LOG" />
<AuditLogSearch v-model:params="state.params">
<template #searchbox-suffix>
- <PermissionGuardWrapper
- v-slot="slotProps"
- :project="project"
- :permissions="['bb.auditLogs.export']"
- >
- <DataExportButton
- size="medium"
- :support-formats="[
- ExportFormat.CSV,
- ExportFormat.JSON,
- ExportFormat.XLSX,
- ]"
- :tooltip="disableExportTip"
- :view-mode="'DROPDOWN'"
- :disabled="slotProps.disabled || !hasAuditLogFeature || !!disableExportTip"
- @export="(params) => pagedAuditLogDataTableRef?.handleExport(params)"
- />
- </PermissionGuardWrapper>
+ <DataExportButton
+ v-if="hasProjectPermissionV2(project, 'bb.auditLogs.export')"
+ size="medium"
+ :support-formats="[
+ ExportFormat.CSV,
+ ExportFormat.JSON,
+ ExportFormat.XLSX,
+ ]"
+ :tooltip="disableExportTip"
+ :view-mode="'DROPDOWN'"
+ :disabled="!hasAuditLogFeature || !!disableExportTip"
+ @export="(params) => pagedAuditLogDataTableRef?.handleExport(params)"
+ />
</template>
</AuditLogSearch>
@@ -44,13 +39,13 @@ import { buildAuditLogFilter } from "@/components/AuditLog/AuditLogSearch/utils"
import PagedAuditLogDataTable from "@/components/AuditLog/PagedAuditLogDataTable.vue";
import DataExportButton from "@/components/DataExportButton.vue";
import { FeatureAttention } from "@/components/FeatureGuard";
-import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";
import { featureToRef, useProjectByName } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import type { AuditLogFilter } from "@/types";
import { ExportFormat } from "@/types/proto-es/v1/common_pb";
import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
import type { SearchParams, SearchScope } from "@/utils";
+import { hasProjectPermissionV2 } from "@/utils";
interface LocalState {
params: SearchParams;
diff --git a/frontend/src/views/project/ProjectDatabaseGroupDetail.vue b/frontend/src/views/project/ProjectDatabaseGroupDetail.vue
index fe8b74c5d7..ee82e37948 100644
--- a/frontend/src/views/project/ProjectDatabaseGroupDetail.vue
+++ b/frontend/src/views/project/ProjectDatabaseGroupDetail.vue
@@ -13,28 +13,46 @@
v-if="hasDatabaseGroupFeature && !state.editing"
class="flex flex-row justify-end items-center flex-wrap shrink gap-x-2 gap-y-2"
>
- <NTooltip
- v-if="hasPermissionToCreateIssue"
- :disabled="hasMatchedDatabases"
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :project="project"
+ :permissions="[
+ 'bb.issues.create',
+ 'bb.plans.create',
+ 'bb.rollouts.create',
+ ]"
>
- <template #trigger>
- <NButton
- :disabled="!hasMatchedDatabases"
- @click="() => {
- preCreateIssue(project.name, [databaseGroupResourceName])
- }"
- >
- {{ $t("database.change-database") }}
- </NButton>
- </template>
- {{ $t("database-group.no-matched-databases") }}
- </NTooltip>
- <NButton v-if="allowEdit" type="primary" @click="state.editing = true">
- <template #icon>
- <EditIcon class="w-4 h-4" />
- </template>
- {{ $t("common.configure") }}
- </NButton>
+ <NTooltip
+ :disabled="slotProps.disabled || hasMatchedDatabases"
+ >
+ <template #trigger>
+ <NButton
+ :disabled="slotProps.disabled || !hasMatchedDatabases"
+ @click="() => {
+ preCreateIssue(project.name, [databaseGroupResourceName])
+ }"
+ >
+ {{ $t("database.change-database") }}
+ </NButton>
+ </template>
+ {{ $t("database-group.no-matched-databases") }}
+ </NTooltip>
+ </PermissionGuardWrapper>
+
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :project="project"
+ :permissions="[
+ 'bb.databaseGroups.update',
+ ]"
+ >
+ <NButton type="primary" :disabled="slotProps.disabled" @click="state.editing = true">
+ <template #icon>
+ <EditIcon class="w-4 h-4" />
+ </template>
+ {{ $t("common.configure") }}
+ </NButton>
+ </PermissionGuardWrapper>
</div>
<DatabaseGroupForm
@@ -52,6 +70,7 @@ import { NButton, NTooltip } from "naive-ui";
import { computed, reactive, watchEffect } from "vue";
import DatabaseGroupForm from "@/components/DatabaseGroup/DatabaseGroupForm.vue";
import FeatureAttention from "@/components/FeatureGuard/FeatureAttention.vue";
+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";
import { preCreateIssue } from "@/components/Plan/logic/issue";
import { useBodyLayoutContext } from "@/layouts/common";
import { featureToRef, useDBGroupStore, useProjectByName } from "@/store";
@@ -61,7 +80,6 @@ import {
} from "@/store/modules/v1/common";
import { DatabaseGroupView } from "@/types/proto-es/v1/database_group_service_pb";
import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
-import { hasPermissionToCreateChangeDatabaseIssueInProject } from "@/utils";
interface LocalState {
editing: boolean;
@@ -89,10 +107,6 @@ const databaseGroup = computed(() => {
return dbGroupStore.getDBGroupByName(databaseGroupResourceName.value);
});
-const hasPermissionToCreateIssue = computed(() => {
- return hasPermissionToCreateChangeDatabaseIssueInProject(project.value);
-});
-
const hasMatchedDatabases = computed(
() => (databaseGroup.value?.matchedDatabases.length ?? 0) > 0
);
diff --git a/frontend/src/views/project/ProjectPlanDashboard.vue b/frontend/src/views/project/ProjectPlanDashboard.vue
index b7c78202bf..c336a70b10 100644
--- a/frontend/src/views/project/ProjectPlanDashboard.vue
+++ b/frontend/src/views/project/ProjectPlanDashboard.vue
@@ -9,16 +9,22 @@
class="flex-1"
:scope-options="scopeOptions"
/>
- <NButton
- v-if="allowToCreatePlan"
- type="primary"
- @click="showAddSpecDrawer = true"
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :project="project"
+ :permissions="['bb.plans.create']"
>
- <template #icon>
- <PlusIcon class="w-4 h-4" />
- </template>
- {{ $t("plan.new-plan") }}
- </NButton>
+ <NButton
+ type="primary"
+ :disabled="slotProps.disabled"
+ @click="showAddSpecDrawer = true"
+ >
+ <template #icon>
+ <PlusIcon class="w-4 h-4" />
+ </template>
+ {{ $t("plan.new-plan") }}
+ </NButton>
+ </PermissionGuardWrapper>
</div>
</div>
@@ -60,6 +66,7 @@ import type {
import { useCommonSearchScopeOptions } from "@/components/AdvancedSearch/useCommonSearchScopeOptions";
import SystemBotTag from "@/components/misc/SystemBotTag.vue";
import YouTag from "@/components/misc/YouTag.vue";
+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";
import { getLocalSheetByName, targetsForSpec } from "@/components/Plan";
import AddSpecDrawer from "@/components/Plan/components/AddSpecDrawer.vue";
import PlanDataTable from "@/components/Plan/components/PlanDataTable";
@@ -85,7 +92,6 @@ import {
extractProjectResourceName,
generateIssueTitle,
getDefaultPagination,
- hasPermissionToCreatePlanInProject,
type SearchParams,
type SearchScope,
type SearchScopeId,
@@ -278,11 +284,6 @@ watch(
() => planPagedTable.value?.refresh()
);
-const allowToCreatePlan = computed(() => {
- // Check if user has permission to create plan in specific project.
- return hasPermissionToCreatePlanInProject(project.value);
-});
-
const handleSpecCreated = async (spec: Plan_Spec) => {
const template = "bb.issue.database.update";
const targets = targetsForSpec(spec);