Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
feat: permission guard (#18759)
ecmadao848f1ff58374
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yamlindex 8e4e665ba1..e4165843c2 100644--- a/backend/api/mcp/gen/openapi.yaml+++ b/backend/api/mcp/gen/openapi.yaml@@ -12562,6 +12562,30 @@ components:title: PackageMetadataadditionalProperties: falsedescription: PackageMetadata is the metadata for packages.+ bytebase.v1.PermissionDeniedDetail:+ type: object+ properties:+ method:+ type: string+ title: method+ description: The API method that was called.+ requiredPermissions:+ type: array+ items:+ type: string+ title: required_permissions+ description: The permissions required but not granted to the user.+ resources:+ type: array+ items:+ type: string+ title: resources+ description: The resources the user was trying to access.+ title: PermissionDeniedDetail+ additionalProperties: false+ description: |-+ PermissionDeniedDetail provides structured information about permission failures.+ Used as error detail when returning CodePermissionDenied errors.bytebase.v1.Plan:type: objectproperties:diff --git a/backend/api/v1/acl.go b/backend/api/v1/acl.goindex 9e2dda625e..e1746a0e8b 100644--- a/backend/api/v1/acl.go+++ b/backend/api/v1/acl.go@@ -148,7 +148,15 @@ func (in *ACLInterceptor) doACLCheck(ctx context.Context, request any, fullMethoreturn connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission for method %q, extra %v, err: %v", fullMethod, extra, err))}if !ok {- return connect.NewError(connect.CodePermissionDenied, errors.Errorf("permission denied for method %q, user does not have permission %q, extra %v", fullMethod, authContext.Permission, extra))+ err := connect.NewError(connect.CodePermissionDenied, errors.Errorf("permission denied for method %q, user does not have permission %q, extra %v", fullMethod, authContext.Permission, extra))+ if detail, detailErr := connect.NewErrorDetail(&v1pb.PermissionDeniedDetail{+ Method: fullMethod,+ RequiredPermissions: []string{string(authContext.Permission)},+ Resources: extra,+ }); detailErr == nil {+ err.AddDetail(detail)+ }+ return err}// Check allow_missing secondary permission if applicable@@ -170,7 +178,15 @@ func (in *ACLInterceptor) doACLCheck(ctx context.Context, request any, fullMethoreturn connect.NewError(connect.CodeInternal, errors.Errorf("failed to check create permission %q, extra %v, err: %v", createPerm, extra, err))}if !ok {- return connect.NewError(connect.CodePermissionDenied, errors.Errorf("permission denied: allow_missing=true requires both %s and %s, extra %v", authContext.Permission, createPerm, extra))+ err := connect.NewError(connect.CodePermissionDenied, errors.Errorf("permission denied: allow_missing=true requires both %s and %s, extra %v", authContext.Permission, createPerm, extra))+ if detail, detailErr := connect.NewErrorDetail(&v1pb.PermissionDeniedDetail{+ Method: fullMethod,+ RequiredPermissions: []string{string(authContext.Permission), createPerm},+ Resources: extra,+ }); detailErr == nil {+ err.AddDetail(detail)+ }+ return err}}@@ -213,11 +229,16 @@ func doIAMPermissionCheck(ctx context.Context, iamManager *iam.Manager, fullMethif len(projectIDs) > 0 {ok, err := iamManager.CheckPermission(ctx, authContext.Permission, user, projectIDs...)if err != nil {- return false, projectIDs, err+ return false, nil, err}- if !ok {- return false, projectIDs, nil+ if ok {+ return true, nil, nil+ }+ projectResources := []string{}+ for _, id := range projectIDs {+ projectResources = append(projectResources, common.FormatProject(id))}+ return false, projectResources, nil}return true, nil, nil}diff --git a/backend/api/v1/auth_service.go b/backend/api/v1/auth_service.goindex a5707f452d..8c4dc8fec1 100644--- a/backend/api/v1/auth_service.go+++ b/backend/api/v1/auth_service.go@@ -820,7 +820,7 @@ func (s *AuthService) ExchangeToken(ctx context.Context, req *connect.Request[v1errors.Errorf("email %q is not a workload identity", request.Email))}if user.MemberDeleted {- return nil, connect.NewError(connect.CodePermissionDenied,+ return nil, connect.NewError(connect.CodeUnauthenticated,errors.New("workload identity has been deactivated"))}diff --git a/backend/component/iam/acl.yaml b/backend/component/iam/acl.yamlindex 3162771a3e..e22227552e 100644--- a/backend/component/iam/acl.yaml+++ b/backend/component/iam/acl.yaml@@ -238,7 +238,6 @@ roles:- bb.groups.get- bb.groups.list- bb.users.get- - bb.users.list- bb.workspaces.getIamPolicy- name: roles/projectOwnertitle: Project ownerdiff --git a/backend/generated-go/v1/common.pb.go b/backend/generated-go/v1/common.pb.goindex 25c9026c6a..4933cc64e5 100644--- a/backend/generated-go/v1/common.pb.go+++ b/backend/generated-go/v1/common.pb.go@@ -604,6 +604,71 @@ func (x *Range) GetEnd() int32 {return 0}+// PermissionDeniedDetail provides structured information about permission failures.+// Used as error detail when returning CodePermissionDenied errors.+type PermissionDeniedDetail struct {+ state protoimpl.MessageState `protogen:"open.v1"`+ // The API method that was called.+ Method string `protobuf:"bytes,1,opt,name=method,proto3" json:"method,omitempty"`+ // The permissions required but not granted to the user.+ RequiredPermissions []string `protobuf:"bytes,2,rep,name=required_permissions,json=requiredPermissions,proto3" json:"required_permissions,omitempty"`+ // The resources the user was trying to access.+ Resources []string `protobuf:"bytes,3,rep,name=resources,proto3" json:"resources,omitempty"`+ unknownFields protoimpl.UnknownFields+ sizeCache protoimpl.SizeCache+}++func (x *PermissionDeniedDetail) Reset() {+ *x = PermissionDeniedDetail{}+ mi := &file_v1_common_proto_msgTypes[2]+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))+ ms.StoreMessageInfo(mi)+}++func (x *PermissionDeniedDetail) String() string {+ return protoimpl.X.MessageStringOf(x)+}++func (*PermissionDeniedDetail) ProtoMessage() {}++func (x *PermissionDeniedDetail) ProtoReflect() protoreflect.Message {+ mi := &file_v1_common_proto_msgTypes[2]+ if x != nil {+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))+ if ms.LoadMessageInfo() == nil {+ ms.StoreMessageInfo(mi)+ }+ return ms+ }+ return mi.MessageOf(x)+}++// Deprecated: Use PermissionDeniedDetail.ProtoReflect.Descriptor instead.+func (*PermissionDeniedDetail) Descriptor() ([]byte, []int) {+ return file_v1_common_proto_rawDescGZIP(), []int{2}+}++func (x *PermissionDeniedDetail) GetMethod() string {+ if x != nil {+ return x.Method+ }+ return ""+}++func (x *PermissionDeniedDetail) GetRequiredPermissions() []string {+ if x != nil {+ return x.RequiredPermissions+ }+ return nil+}++func (x *PermissionDeniedDetail) GetResources() []string {+ if x != nil {+ return x.Resources+ }+ return nil+}+var File_v1_common_proto protoreflect.FileDescriptorconst file_v1_common_proto_rawDesc = "" +@@ -614,7 +679,11 @@ const file_v1_common_proto_rawDesc = "" +"\x06column\x18\x02 \x01(\x05R\x06column\"/\n" +"\x05Range\x12\x14\n" +"\x05start\x18\x01 \x01(\x05R\x05start\x12\x10\n" +- "\x03end\x18\x02 \x01(\x05R\x03end*7\n" ++ "\x03end\x18\x02 \x01(\x05R\x03end\"\x81\x01\n" ++ "\x16PermissionDeniedDetail\x12\x16\n" ++ "\x06method\x18\x01 \x01(\tR\x06method\x121\n" ++ "\x14required_permissions\x18\x02 \x03(\tR\x13requiredPermissions\x12\x1c\n" ++ "\tresources\x18\x03 \x03(\tR\tresources*7\n" +"\x05State\x12\x15\n" +"\x11STATE_UNSPECIFIED\x10\x00\x12\n" +"\n" +@@ -696,16 +765,17 @@ func file_v1_common_proto_rawDescGZIP() []byte {}var file_v1_common_proto_enumTypes = make([]protoimpl.EnumInfo, 6)-var file_v1_common_proto_msgTypes = make([]protoimpl.MessageInfo, 2)+var file_v1_common_proto_msgTypes = make([]protoimpl.MessageInfo, 3)var file_v1_common_proto_goTypes = []any{- (State)(0), // 0: bytebase.v1.State- (Engine)(0), // 1: bytebase.v1.Engine- (VCSType)(0), // 2: bytebase.v1.VCSType- (ExportFormat)(0), // 3: bytebase.v1.ExportFormat- (RiskLevel)(0), // 4: bytebase.v1.RiskLevel- (WebhookType)(0), // 5: bytebase.v1.WebhookType- (*Position)(nil), // 6: bytebase.v1.Position- (*Range)(nil), // 7: bytebase.v1.Range+ (State)(0), // 0: bytebase.v1.State+ (Engine)(0), // 1: bytebase.v1.Engine+ (VCSType)(0), // 2: bytebase.v1.VCSType+ (ExportFormat)(0), // 3: bytebase.v1.ExportFormat+ (RiskLevel)(0), // 4: bytebase.v1.RiskLevel+ (WebhookType)(0), // 5: bytebase.v1.WebhookType+ (*Position)(nil), // 6: bytebase.v1.Position+ (*Range)(nil), // 7: bytebase.v1.Range+ (*PermissionDeniedDetail)(nil), // 8: bytebase.v1.PermissionDeniedDetail}var file_v1_common_proto_depIdxs = []int32{0, // [0:0] is the sub-list for method output_type@@ -726,7 +796,7 @@ func file_v1_common_proto_init() {GoPackagePath: reflect.TypeOf(x{}).PkgPath(),RawDescriptor: unsafe.Slice(unsafe.StringData(file_v1_common_proto_rawDesc), len(file_v1_common_proto_rawDesc)),NumEnums: 6,- NumMessages: 2,+ NumMessages: 3,NumExtensions: 0,NumServices: 0,},diff --git a/backend/generated-go/v1/common_equal.pb.go b/backend/generated-go/v1/common_equal.pb.goindex 75cc5d9bdb..3a8c42088f 100644--- a/backend/generated-go/v1/common_equal.pb.go+++ b/backend/generated-go/v1/common_equal.pb.go@@ -34,3 +34,32 @@ func (x *Range) Equal(y *Range) bool {}return true}++func (x *PermissionDeniedDetail) Equal(y *PermissionDeniedDetail) bool {+ if x == y {+ return true+ }+ if x == nil || y == nil {+ return x == nil && y == nil+ }+ if x.Method != y.Method {+ return false+ }+ if len(x.RequiredPermissions) != len(y.RequiredPermissions) {+ return false+ }+ for i := 0; i < len(x.RequiredPermissions); i++ {+ if x.RequiredPermissions[i] != y.RequiredPermissions[i] {+ return false+ }+ }+ if len(x.Resources) != len(y.Resources) {+ return false+ }+ for i := 0; i < len(x.Resources); i++ {+ if x.Resources[i] != y.Resources[i] {+ return false+ }+ }+ return true+}diff --git a/frontend/src/components/Changelog/ChangelogDetail.vue b/frontend/src/components/Changelog/ChangelogDetail.vueindex 0c92bec4e1..b719a75def 100644--- a/frontend/src/components/Changelog/ChangelogDetail.vue+++ b/frontend/src/components/Changelog/ChangelogDetail.vue@@ -1,6 +1,5 @@<template><div class="focus:outline-hidden" tabindex="0" v-bind="$attrs">- <NoPermissionPlaceholder v-if="!hasPermission" class="py-6" /><divv-if="state.loading"class="flex items-center justify-center py-2 text-gray-400 text-sm"@@ -114,13 +113,8 @@ import {Changelog_Type,ChangelogView,} from "@/types/proto-es/v1/database_service_pb";-import {- getStatementSize,- hasProjectPermissionV2,- wrapRefAsPromise,-} from "@/utils";+import { getStatementSize, wrapRefAsPromise } from "@/utils";import { getChangelogChangeType } from "@/utils/v1/changelog";-import NoPermissionPlaceholder from "../misc/NoPermissionPlaceholder.vue";import ChangelogStatusIcon from "./ChangelogStatusIcon.vue";interface LocalState {@@ -143,10 +137,6 @@ const state = reactive<LocalState>({const { database, ready } = useDatabaseV1ByName(props.database);-const hasPermission = computed(() =>- hasProjectPermissionV2(database.value.projectEntity, "bb.changelogs.get")-);-const changelogName = computed(() => {return `${props.database}/changelogs/${props.changelogId}`;});diff --git a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/CustomApproval.vue b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/CustomApproval.vueindex b0ca201d36..ba2c224c6d 100644--- a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/CustomApproval.vue+++ b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/CustomApproval.vue@@ -1,9 +1,23 @@<template>- <div class="w-full">- <RulesPanel />+ <div class="w-full flex flex-col gap-y-6">+ <RulesSection+ v-for="source in supportedSourceList"+ :key="source"+ :source="source"+ /></div></template><script lang="ts" setup>-import RulesPanel from "./RulesPanel";+import { computed } from "vue";+import { WorkspaceApprovalSetting_Rule_Source } from "@/types/proto-es/v1/setting_service_pb";+import RulesSection from "./RulesPanel/RulesSection.vue";++const supportedSourceList = computed(() => [+ WorkspaceApprovalSetting_Rule_Source.CHANGE_DATABASE,+ WorkspaceApprovalSetting_Rule_Source.CREATE_DATABASE,+ WorkspaceApprovalSetting_Rule_Source.EXPORT_DATA,+ WorkspaceApprovalSetting_Rule_Source.REQUEST_ROLE,+ WorkspaceApprovalSetting_Rule_Source.SOURCE_UNSPECIFIED,+]);</script>diff --git a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RuleEditModal.vue b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RuleEditModal.vueindex 6a061b0d48..610cd99ba7 100644--- a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RuleEditModal.vue+++ b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RuleEditModal.vue@@ -100,7 +100,7 @@</div><StepsTable:flow="state.flow"- :editable="true"+ :editable="allowAdmin"@update="handleUpdate"/></div>@@ -114,7 +114,7 @@</NButton><NButtontype="primary"- :disabled="!allowSave"+ :disabled="!allowSave || !allowAdmin"@click="handleSave">{{ mode === "create" ? $t("common.create") : $t("common.update") }}diff --git a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RulesPanel.vue b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RulesPanel.vuedeleted file mode 100644index d9faacb3e2..0000000000--- a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RulesPanel.vue+++ /dev/null@@ -1,23 +0,0 @@-<template>- <div class="w-full flex flex-col gap-y-6">- <RulesSection- v-for="source in supportedSourceList"- :key="source"- :source="source"- />- </div>-</template>--<script lang="ts" setup>-import { computed } from "vue";-import { WorkspaceApprovalSetting_Rule_Source } from "@/types/proto-es/v1/setting_service_pb";-import RulesSection from "./RulesSection.vue";--const supportedSourceList = computed(() => [- WorkspaceApprovalSetting_Rule_Source.CHANGE_DATABASE,- WorkspaceApprovalSetting_Rule_Source.CREATE_DATABASE,- WorkspaceApprovalSetting_Rule_Source.EXPORT_DATA,- WorkspaceApprovalSetting_Rule_Source.REQUEST_ROLE,- WorkspaceApprovalSetting_Rule_Source.SOURCE_UNSPECIFIED,-]);-</script>diff --git a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RulesSection.vue b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RulesSection.vueindex 3ab3614ca3..d64b2d188a 100644--- a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RulesSection.vue+++ b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RulesSection.vue@@ -4,12 +4,17 @@<div class="font-medium text-base">{{ sourceDisplayText }}</div>- <NButton size="small" @click="handleAddRule">- <template #icon>- <PlusIcon class="w-4" />- </template>- {{ $t("custom-approval.approval-flow.add-rule") }}- </NButton>+ <PermissionGuardWrapper+ v-slot="slotProps"+ :permissions="['bb.settings.set']"+ >+ <NButton size="small" :disabled="slotProps.disabled" @click="handleAddRule">+ <template #icon>+ <PlusIcon class="w-4" />+ </template>+ {{ $t("custom-approval.approval-flow.add-rule") }}+ </NButton>+ </PermissionGuardWrapper></div><div class="rules-table border border-gray-200 rounded-sm text-sm">@@ -57,6 +62,7 @@<PencilIcon class="w-3" /></MiniActionButton><NPopconfirm+ v-if="allowAdmin":positive-text="$t('common.confirm')":negative-text="$t('common.cancel')"@positive-click="handleDeleteRule(rule)"@@ -104,6 +110,7 @@ import { NButton, NPopconfirm } from "naive-ui";import { computed, ref, watch } from "vue";import { useI18n } from "vue-i18n";import Draggable from "vuedraggable";+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";import { MiniActionButton } from "@/components/v2";import { pushNotification, useWorkspaceApprovalSettingStore } from "@/store";import type { LocalApprovalRule } from "@/types";@@ -124,6 +131,7 @@ const isFallback = computed(const { t } = useI18n();const store = useWorkspaceApprovalSettingStore();const context = useCustomApprovalContext();+const { allowAdmin } = context;const showModal = ref(false);const modalMode = ref<"create" | "edit">("create");diff --git a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/index.ts b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/index.tsdeleted file mode 100644index 21f2756508..0000000000--- a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/index.ts+++ /dev/null@@ -1,3 +0,0 @@-import RulesPanel from "./RulesPanel.vue";--export default RulesPanel;diff --git a/frontend/src/components/GeneralSetting/MaximumRoleExpirationSetting.vue b/frontend/src/components/GeneralSetting/MaximumRoleExpirationSetting.vueindex f265accf5f..7582f63696 100644--- a/frontend/src/components/GeneralSetting/MaximumRoleExpirationSetting.vue+++ b/frontend/src/components/GeneralSetting/MaximumRoleExpirationSetting.vue@@ -20,7 +20,11 @@{{ $t("settings.general.workspace.maximum-role-expiration.days") }}</template></NInputNumber>- <NCheckbox v-model:checked="state.neverExpire" style="margin-right: 12px">+ <NCheckbox+ :disabled="!allowEdit"+ v-model:checked="state.neverExpire"+ style="margin-right: 12px"+ >{{$t("settings.general.workspace.maximum-role-expiration.never-expires")}}diff --git a/frontend/src/components/GeneralSetting/PasswordRestrictionSetting.vue b/frontend/src/components/GeneralSetting/PasswordRestrictionSetting.vueindex 2386e1e8f1..53a123bc31 100644--- a/frontend/src/components/GeneralSetting/PasswordRestrictionSetting.vue+++ b/frontend/src/components/GeneralSetting/PasswordRestrictionSetting.vue@@ -10,7 +10,7 @@<div class="flex items-center"><NInputNumber:value="state.minLength"- :readonly="!allowEdit"+ :disabled="!allowEdit"class="w-24 mr-2":min="1":placeholder="'Minimum length'"@@ -34,7 +34,7 @@</div><NCheckbox:checked="state.requireNumber"- :readonly="!allowEdit"+ :disabled="!allowEdit"@update:checked="(val) => {onUpdate({ requireNumber: val });@@ -47,7 +47,7 @@</NCheckbox><NCheckbox:checked="state.requireLetter"- :readonly="!allowEdit"+ :disabled="!allowEdit"@update:checked="(val) => {onUpdate({ requireLetter: val });@@ -60,7 +60,7 @@</NCheckbox><NCheckbox:checked="state.requireUppercaseLetter"- :readonly="!allowEdit"+ :disabled="!allowEdit"@update:checked="(val) => {onUpdate({ requireUppercaseLetter: val });@@ -75,7 +75,7 @@</NCheckbox><NCheckbox:checked="state.requireSpecialCharacter"- :readonly="!allowEdit"+ :disabled="!allowEdit"@update:checked="(val) => {onUpdate({ requireSpecialCharacter: val });@@ -90,7 +90,7 @@</NCheckbox><NCheckbox:checked="state.requireResetPasswordForFirstLogin"- :readonly="!allowEdit"+ :disabled="!allowEdit"@update:checked="(val) => {onUpdate({ requireResetPasswordForFirstLogin: val });@@ -105,7 +105,7 @@</NCheckbox><NCheckbox:checked="!!state.passwordRotation"- :readonly="!allowEdit"+ :disabled="!allowEdit"class="flex! items-center!"@update:checked="(checked) => {@@ -131,7 +131,7 @@<NInputNumberv-if="state.passwordRotation":value="Number(state.passwordRotation.seconds) / (24 * 60 * 60)"- :readonly="!allowEdit"+ :disabled="!allowEdit":min="1"class="w-24 mx-2":size="'small'"diff --git a/frontend/src/components/IssueV1/logic/initialize/index.ts b/frontend/src/components/IssueV1/logic/initialize/index.tsindex 61e9596373..d8e2ff5458 100644--- a/frontend/src/components/IssueV1/logic/initialize/index.ts+++ b/frontend/src/components/IssueV1/logic/initialize/index.ts@@ -12,6 +12,7 @@ import { IssueStatus } from "@/types/proto-es/v1/issue_service_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";import { uidFromSlug, hasProjectPermissionV2 } from "@/utils";import { createIssueSkeleton } from "./create";+import { WORKSPACE_ROUTE_404 } from "@/router/dashboard/workspaceRoutes";export * from "./create";@@ -59,7 +60,7 @@ export function useInitializeIssue([uid],([uid]) => {if (uid === String(UNKNOWN_ID) && redirectNotFound) {- router.push({ name: "error.404" });+ router.push({ name: WORKSPACE_ROUTE_404 });return;}const url = route.fullPath;diff --git a/frontend/src/components/Permission/PermissionGuardWrapper.vue b/frontend/src/components/Permission/PermissionGuardWrapper.vuenew file mode 100644index 0000000000..7f8f0fbc61--- /dev/null+++ b/frontend/src/components/Permission/PermissionGuardWrapper.vue@@ -0,0 +1,37 @@+<template>+ <NTooltip :disabled="missedPermissions.length === 0">+ <template #trigger>+ <slot :disabled="missedPermissions.length > 0" />+ </template>+ <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">+ {{ permission }}+ </li>+ </ul>+ </div>+ </NTooltip>+</template>++<script lang="tsx" setup>+import { NTooltip } from "naive-ui";+import { computed } from "vue";+import type { Permission } from "@/types";+import type { Project } from "@/types/proto-es/v1/project_service_pb";+import { hasProjectPermissionV2, hasWorkspacePermissionV2 } from "@/utils";++const props = defineProps<{+ project?: Project;+ permissions: Permission[];+}>();++const missedPermissions = computed(() => {+ if (props.project) {+ return props.permissions.filter(+ (p) => !hasProjectPermissionV2(props.project!, p)+ );+ }+ return props.permissions.filter((p) => !hasWorkspacePermissionV2(p));+});+</script>\ No newline at end of filediff --git a/frontend/src/components/Permission/RoutePermissionGuard.vue b/frontend/src/components/Permission/RoutePermissionGuard.vuenew file mode 100644index 0000000000..759d558c59--- /dev/null+++ b/frontend/src/components/Permission/RoutePermissionGuard.vue@@ -0,0 +1,46 @@+<template>+ <slot v-if="missedPermissions.length === 0" />+ <NoPermissionPlaceholder+ v-else+ v-bind="$attrs"+ :resources="project ? [project.name] : []"+ :permissions="missedPermissions"+ />+</template>++<script lang="tsx" setup>+import { computed } from "vue";+import type { RouteRecordRaw } from "vue-router";+import { useRouter } from "vue-router";+import NoPermissionPlaceholder from "@/components/misc/NoPermissionPlaceholder.vue";+import { getFlattenRoutes } from "@/components/v2/Sidebar/utils.ts";+import type { Project } from "@/types/proto-es/v1/project_service_pb";+import { hasProjectPermissionV2, hasWorkspacePermissionV2 } from "@/utils";++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 ?? [];+});++const missedPermissions = computed(() => {+ if (props.project) {+ return requiredPermissions.value.filter(+ (p) => !hasProjectPermissionV2(props.project!, p)+ );+ }+ return requiredPermissions.value.filter((p) => !hasWorkspacePermissionV2(p));+});+</script>\ No newline at end of filediff --git a/frontend/src/components/Plan/logic/initialize/index.ts b/frontend/src/components/Plan/logic/initialize/index.tsindex 6bc29f19c4..7c41d99146 100644--- a/frontend/src/components/Plan/logic/initialize/index.ts+++ b/frontend/src/components/Plan/logic/initialize/index.ts@@ -19,6 +19,10 @@ import type { Rollout, TaskRun } from "@/types/proto-es/v1/rollout_service_pb";import { getRolloutFromPlan, extractPlanNameFromRolloutName } from "@/utils";import { emptyPlan } from "@/types/v1/issue/plan";import { createPlanSkeleton } from "./create";+import {+ WORKSPACE_ROUTE_403,+ WORKSPACE_ROUTE_404,+} from "@/router/dashboard/workspaceRoutes";export * from "./create";@@ -207,7 +211,7 @@ export function useInitializePlan([uid, () => unref(projectId)],async ([uid, projectId]) => {if (uid === String(UNKNOWN_ID)) {- router.push({ name: "error.404" });+ router.push({ name: WORKSPACE_ROUTE_404 });return;}const url = route.fullPath;@@ -227,9 +231,9 @@ export function useInitializePlan(// Check Connect error type and handle accordinglyif (error instanceof ConnectError) {if (error.code === Code.NotFound) {- router.push({ name: "error.404" });+ router.push({ name: WORKSPACE_ROUTE_404 });} else if (error.code === Code.PermissionDenied) {- router.push({ name: "error.403" });+ router.push({ name: WORKSPACE_ROUTE_403 });}isInitializing.value = false;return;diff --git a/frontend/src/components/Project/useProjectSidebar.ts b/frontend/src/components/Project/useProjectSidebar.tsindex 069d156f74..1ddf1f55ed 100644--- a/frontend/src/components/Project/useProjectSidebar.ts+++ b/frontend/src/components/Project/useProjectSidebar.ts@@ -12,10 +12,9 @@ import {import { computed, h, type MaybeRef, unref } from "vue";import { useRoute } from "vue-router";import type { SidebarItem } from "@/components/v2/Sidebar/type";-import { getFlattenRoutes } from "@/components/v2/Sidebar/utils.ts";import { useIssueLayoutVersion } from "@/composables/useIssueLayoutVersion";import { t } from "@/plugins/i18n";-import projectV1Routes, {+import {PROJECT_V1_ROUTE_AUDIT_LOGS,PROJECT_V1_ROUTE_DATABASE_GROUPS,PROJECT_V1_ROUTE_DATABASES,@@ -32,7 +31,6 @@ import projectV1Routes, {} from "@/router/dashboard/projectV1";import { DEFAULT_PROJECT_NAME } from "@/types";import type { Project } from "@/types/proto-es/v1/project_service_pb";-import { hasProjectPermissionV2 } from "@/utils";interface ProjectSidebarItem extends SidebarItem {title: string;@@ -49,28 +47,6 @@ export const useProjectSidebar = (project: MaybeRef<Project>) => {return unref(project).name === DEFAULT_PROJECT_NAME;});- const flattenProjectV1Routes = computed(() => {- return getFlattenRoutes(projectV1Routes);- });-- const filterProjectSidebarByPermissions = (- sidebarList: ProjectSidebarItem[]- ): ProjectSidebarItem[] => {- return sidebarList- .filter((item) => {- const routeConfig = flattenProjectV1Routes.value.find(- (projectV1Route) => projectV1Route.name === item.path- );- return (routeConfig?.permissions ?? []).every((permission) =>- hasProjectPermissionV2(unref(project), permission)- );- })- .map((item) => ({- ...item,- children: filterProjectSidebarByPermissions(item.children ?? []),- }));- };-const projectSidebarItemList = computed((): ProjectSidebarItem[] => {const cicdRoutes: ProjectSidebarItem[] = enabledNewLayout.value? [@@ -205,7 +181,7 @@ export const useProjectSidebar = (project: MaybeRef<Project>) => {},];- return filterProjectSidebarByPermissions(sidebarList);+ return sidebarList;});const flattenNavigationItems = computed(() => {diff --git a/frontend/src/components/ProjectWebhookPanel.vue b/frontend/src/components/ProjectWebhookPanel.vuedeleted file mode 100644index 9784476c07..0000000000--- a/frontend/src/components/ProjectWebhookPanel.vue+++ /dev/null@@ -1,123 +0,0 @@-<template>- <div class="flex flex-col gap-y-4">- <div v-if="allowEdit" class="flex items-center justify-end">- <NButton type="primary" @click.prevent="addProjectWebhook">- <template #icon>- <PlusIcon class="h-4 w-4" />- </template>- {{ $t("project.webhook.add-a-webhook") }}- </NButton>- </div>- <NDataTable- :data="project.webhooks"- :columns="columnList"- :striped="true"- :row-key="(webhook: Webhook) => webhook.name"- :bordered="true"- />- </div>-</template>--<script lang="tsx" setup>-import { PlusIcon } from "lucide-vue-next";-import type { DataTableColumn } from "naive-ui";-import { NButton, NDataTable, NTag } from "naive-ui";-import { computed, h } from "vue";-import { useI18n } from "vue-i18n";-import { useRouter } from "vue-router";-import WebhookTypeIcon from "@/components/Project/WebhookTypeIcon.vue";-import {- PROJECT_V1_ROUTE_WEBHOOK_CREATE,- PROJECT_V1_ROUTE_WEBHOOK_DETAIL,-} from "@/router/dashboard/projectV1";-import { projectWebhookV1ActivityItemList } from "@/types";-import type { Project, Webhook } from "@/types/proto-es/v1/project_service_pb";-import { Activity_Type } from "@/types/proto-es/v1/project_service_pb";-import { projectWebhookV1Slug } from "@/utils";--defineProps<{- project: Project;- allowEdit: boolean;-}>();-const router = useRouter();-const { t } = useI18n();--const addProjectWebhook = () => {- router.push({- name: PROJECT_V1_ROUTE_WEBHOOK_CREATE,- });-};--const columnList = computed((): DataTableColumn<Webhook>[] => {- return [- {- key: "title",- title: t("common.name"),- width: "15rem",- resizable: true,- render: (webhook) =>- h("div", { class: "flex items-center gap-x-2" }, [- h(WebhookTypeIcon, { type: webhook.type, class: "w-5 h-5" }),- webhook.title,- ]),- },- {- key: "url",- title: "URL",- resizable: true,- ellipsis: true,- render: (webhook) => webhook.url,- },- {- key: "triggering",- title: t("project.webhook.triggering-activity"),- resizable: true,- render: (webhook) => {- const wellknownActivityItemList = projectWebhookV1ActivityItemList();- const list = webhook.notificationTypes.map((activity) => {- const item = wellknownActivityItemList.find(- (item) => item.activity === activity- );- if (item) {- return item.title;- }- return Activity_Type[activity] || `ACTIVITY_${activity}`;- });-- return (- <div class="flex flex-wrap gap-2">- {list.map((title) => (- <NTag size="small">{title}</NTag>- ))}- </div>- );- },- },- {- key: "actions",- title: "",- width: "5rem",- render: (webhook) =>- h(- "div",- { class: "flex justify-end" },- h(- NButton,- {- size: "small",- onClick: () => {- router.push({- name: PROJECT_V1_ROUTE_WEBHOOK_DETAIL,- params: {- projectWebhookSlug: projectWebhookV1Slug(webhook),- },- });- },- },- { default: () => t("common.view") }- )- ),- },- ];-});-</script>diff --git a/frontend/src/components/Role/Setting/RoleSetting.vue b/frontend/src/components/Role/RoleSetting.vuesimilarity index 79%rename from frontend/src/components/Role/Setting/RoleSetting.vuerename to frontend/src/components/Role/RoleSetting.vueindex 0f1a035785..9ebcadd328 100644--- a/frontend/src/components/Role/Setting/RoleSetting.vue+++ b/frontend/src/components/Role/RoleSetting.vue@@ -7,21 +7,26 @@/></div><div class="w-full flex flex-row justify-end items-center">- <NButton- type="primary"- class="capitalize"- :disabled="!allowCreateRole"- @click="addRole"+ <PermissionGuardWrapper+ v-slot="slotProps"+ :permissions="['bb.roles.create']">- <template #icon>- <PlusIcon class="h-4 w-4" />- <FeatureBadge- :feature="PlanFeature.FEATURE_CUSTOM_ROLES"- class="mr-1 text-white"- />- </template>- {{ $t("role.setting.add") }}- </NButton>+ <NButton+ type="primary"+ class="capitalize"+ :disabled="slotProps.disabled"+ @click="addRole"+ >+ <template #icon>+ <PlusIcon class="h-4 w-4" />+ <FeatureBadge+ :feature="PlanFeature.FEATURE_CUSTOM_ROLES"+ class="mr-1 text-white"+ />+ </template>+ {{ $t("role.setting.add") }}+ </NButton>+ </PermissionGuardWrapper></div><RoleDataTable:role-list="filteredRoleList"@@ -59,14 +64,14 @@ import { computed, onMounted, reactive, ref } from "vue";import { BBSpin } from "@/bbkit";import { FeatureBadge, FeatureModal } from "@/components/FeatureGuard";import LearnMoreLink from "@/components/LearnMoreLink.vue";+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";import { featureToRef, useRoleStore } from "@/store";import { PRESET_ROLES } 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 { hasWorkspacePermissionV2 } from "@/utils";-import { RoleDataTable, RolePanel } from "./components";-import { provideCustomRoleSettingContext } from "./context";+import { RoleDataTable, RolePanel } from "./Setting/components";+import { provideCustomRoleSettingContext } from "./Setting/context";type LocalState = {ready: boolean;@@ -94,10 +99,6 @@ const state = reactive<LocalState>({const hasCustomRoleFeature = featureToRef(PlanFeature.FEATURE_CUSTOM_ROLES);const showFeatureModal = ref(false);-const allowCreateRole = computed(() => {- return hasWorkspacePermissionV2("bb.roles.create");-});-const filteredRoleList = computed(() => {const sortedRoles = sortBy(roleStore.roleList, (role) => {return PRESET_ROLES.includes(role.name)diff --git a/frontend/src/components/Role/Setting/components/ImportPermissionFromRoleModal.vue b/frontend/src/components/Role/Setting/components/ImportPermissionFromRoleModal.vueindex 8a1df4bd70..711d32c346 100644--- a/frontend/src/components/Role/Setting/components/ImportPermissionFromRoleModal.vue+++ b/frontend/src/components/Role/Setting/components/ImportPermissionFromRoleModal.vue@@ -3,11 +3,7 @@<div class="w-96 mb-2 flex flex-col gap-y-2"><div><p class="textlabel mb-1">{{ $t("role.select-role") }}</p>- <NSelect- v-model:value="state.selectedRole"- :options="availableRoleOptions"- :placeholder="$t('role.select-role')"- />+ <RoleSelect v-model:value="state.selectedRole" :multiple="false" /></div><template v-if="selectedRole"><p class="textinfolabel">@@ -47,11 +43,12 @@</template><script lang="ts" setup>-import { NButton, NSelect } from "naive-ui";+import { NButton } from "naive-ui";import { computed, reactive } from "vue";import { BBModal } from "@/bbkit";+import { RoleSelect } from "@/components/v2/Select";import { useRoleStore } from "@/store";-import { displayRoleDescription, displayRoleTitle } from "@/utils";+import { displayRoleDescription } from "@/utils";interface LocalState {selectedRole?: string;@@ -65,14 +62,6 @@ const emit = defineEmits<{const roleStore = useRoleStore();const state = reactive<LocalState>({});-const availableRoleOptions = computed(() => {- const roles = roleStore.roleList.map((role) => role.name);- return roles.map((role) => ({- label: displayRoleTitle(role),- value: role,- }));-});-const selectedRole = computed(() => {return roleStore.roleList.find((role) => role.name === state.selectedRole);});diff --git a/frontend/src/components/Role/Setting/index.ts b/frontend/src/components/Role/Setting/index.tsdeleted file mode 100644index 58f4c5dde2..0000000000--- a/frontend/src/components/Role/Setting/index.ts+++ /dev/null@@ -1,3 +0,0 @@-import RoleSetting from "./RoleSetting.vue";--export { RoleSetting };diff --git a/frontend/src/components/Role/index.ts b/frontend/src/components/Role/index.tsdeleted file mode 100644index a7aa92ab3e..0000000000--- a/frontend/src/components/Role/index.ts+++ /dev/null@@ -1 +0,0 @@-export * from "./Setting";diff --git a/frontend/src/components/SQLReview/components/SQLReviewPolicyDataTable.vue b/frontend/src/components/SQLReview/components/SQLReviewPolicyDataTable.vueindex 951bd3f48b..b5a7b6f1bb 100644--- a/frontend/src/components/SQLReview/components/SQLReviewPolicyDataTable.vue+++ b/frontend/src/components/SQLReview/components/SQLReviewPolicyDataTable.vue@@ -13,7 +13,7 @@<script setup lang="tsx">import { CheckIcon, PencilIcon, Trash2Icon, XIcon } from "lucide-vue-next";import type { DataTableColumn } from "naive-ui";-import { NCheckbox, NDataTable, NPopconfirm } from "naive-ui";+import { NCheckbox, NDataTable, NPopconfirm, NTag } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import { MiniActionButton } from "@/components/v2";@@ -52,6 +52,7 @@ const columns = computed({title: t("common.name"),key: "name",+ width: 200,resizable: true,render: (review: SQLReviewPolicy) => {return <div innerHTML={highlight(review.name)}></div>;@@ -61,18 +62,20 @@ const columns = computed(title: t("common.resource"),key: "resource",resizable: true,+ width: 250,render: (review: SQLReviewPolicy) => {return (- <div>+ <div class="flex flex-wrap gap-2">{review.resources.length === 0 && <span>-</span>}{review.resources.map((resource) => {return (- <Resource- key={resource}- resource={resource}- showPrefix={true}- link={true}- />+ <NTag key={resource} size="small" type="primary">+ <Resource+ resource={resource}+ showPrefix={true}+ link={true}+ />+ </NTag>);})}</div>@@ -109,7 +112,7 @@ const columns = computed({title: t("common.operations"),key: "operations",- width: "15rem",+ width: "10rem",hide: !props.allowEdit,render: (review: SQLReviewPolicy) => {return (diff --git a/frontend/src/components/SQLReview/components/SQLReviewPolicyTable.vue b/frontend/src/components/SQLReview/components/SQLReviewPolicyTable.vueindex 8b2633fcc3..ffee847c2d 100644--- a/frontend/src/components/SQLReview/components/SQLReviewPolicyTable.vue+++ b/frontend/src/components/SQLReview/components/SQLReviewPolicyTable.vue@@ -11,19 +11,21 @@</div><div- class="flex flex-col lg:hidden border px-2 pb-4 divide-y divide-block-border"+ class="flex flex-col lg:hidden border px-2 divide-y divide-block-border"><divv-for="(review, i) in reviewList":key="`${i}-${review.id}`"- class="pt-4"+ class="py-4"><div class="text-md">{{ review.name }}</div>- <div class="flex flex-wrap gap-y-2 gap-x-2">+ <div class="flex flex-wrap mt-2 gap-2"><NTagv-for="resource in review.resources"+ size="small"+ type="primary":key="resource"><Resource :show-prefix="true" :resource="resource" />diff --git a/frontend/src/components/SensitiveData/ClassificationView.vue b/frontend/src/components/SensitiveData/ClassificationView.vueindex dda7b310ba..ad1bf2f5b0 100644--- a/frontend/src/components/SensitiveData/ClassificationView.vue+++ b/frontend/src/components/SensitiveData/ClassificationView.vue@@ -28,6 +28,7 @@:require-confirm="true":hide-icon="true":button-text="$t('common.clear')"+ :disabled="!allowEdit || !hasClassificationFeature"@confirm="clearSetting"/><NButtondiff --git a/frontend/src/components/SensitiveData/GlobalMaskingRulesView.vue b/frontend/src/components/SensitiveData/GlobalMaskingRulesView.vueindex 32fe961cc0..0301ac40c2 100644--- a/frontend/src/components/SensitiveData/GlobalMaskingRulesView.vue+++ b/frontend/src/components/SensitiveData/GlobalMaskingRulesView.vue@@ -21,32 +21,38 @@{{ $t("common.confirm") }}</NButton></div>- <div v-else class="flex items-center gap-x-2">- <NButton- class="capitalize"- :disabled="- !hasPermission ||- !hasSensitiveDataFeature ||- state.maskingRuleItemList.length <= 1- "- @click="state.reorderRules = true"- >- <template #icon>- <ListOrderedIcon class="h-4 w-4" />- </template>- {{ $t("settings.sensitive-data.global-rules.re-order") }}- </NButton>- <NButton- type="primary"- :disabled="!hasPermission || !hasSensitiveDataFeature"- @click="addNewRule"- >- <template #icon>- <PlusIcon class="h-4 w-4" />- </template>- {{ $t("common.add") }}- </NButton>- </div>+ <PermissionGuardWrapper+ v-else+ v-slot="slotProps"+ :permissions="['bb.policies.update']"+ >+ <div class="flex items-center gap-x-2">+ <NButton+ class="capitalize"+ :disabled="+ slotProps.disabled ||+ !hasSensitiveDataFeature ||+ state.maskingRuleItemList.length <= 1+ "+ @click="state.reorderRules = true"+ >+ <template #icon>+ <ListOrderedIcon class="h-4 w-4" />+ </template>+ {{ $t("settings.sensitive-data.global-rules.re-order") }}+ </NButton>+ <NButton+ type="primary"+ :disabled="slotProps.disabled || !hasSensitiveDataFeature"+ @click="addNewRule"+ >+ <template #icon>+ <PlusIcon class="h-4 w-4" />+ </template>+ {{ $t("common.add") }}+ </NButton>+ </div>+ </PermissionGuardWrapper></div><div class="textinfolabel">{{ $t("settings.sensitive-data.global-rules.description") }}@@ -125,6 +131,7 @@ import { v4 as uuidv4 } from "uuid";import { computed, nextTick, onMounted, reactive, ref } from "vue";import { useI18n } from "vue-i18n";import { type OptionConfig } from "@/components/ExprEditor/context";+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";import type { ResourceSelectOption } from "@/components/v2/Select/RemoteResourceSelector/types";import { useBodyLayoutContext } from "@/layouts/common";import type { Factor } from "@/plugins/cel";diff --git a/frontend/src/components/misc/NoPermissionPlaceholder.vue b/frontend/src/components/misc/NoPermissionPlaceholder.vueindex e5418952a0..46f79bc269 100644--- a/frontend/src/components/misc/NoPermissionPlaceholder.vue+++ b/frontend/src/components/misc/NoPermissionPlaceholder.vue@@ -1,25 +1,43 @@<template>- <NEmpty- :description="description ?? $t('common.missing-required-permission')"- v-bind="$attrs"- >- <template #icon>- <ShieldAlertIcon class="w-full h-auto" stroke-width="1.25" />- </template>- <template #extra>- <slot name="extra" />- </template>- </NEmpty>+ <div>+ <NAlert+ type="error"+ :title="description ?? $t('common.missing-required-permission')"+ >+ <template #icon>+ <ShieldAlertIcon />+ </template>+ <div class="flex flex-col gap-2">+ <div v-if="resources && resources.length > 0">+ {{ $t("common.resources") }}+ <ul class="list-disc pl-4">+ <li v-for="resource in resources" :key="resource">+ {{ resource }}+ </li>+ </ul>+ </div>+ <div v-if="permissions && permissions.length > 0">+ {{ $t("common.required-permission") }}+ <ul class="list-disc pl-4">+ <li v-for="permission in permissions" :key="permission">+ {{ permission }}+ </li>+ </ul>+ </div>+ <slot name="action" />+ </div>+ </NAlert>+ </div></template><script lang="ts" setup>import { ShieldAlertIcon } from "lucide-vue-next";-import { NEmpty } from "naive-ui";+import { NAlert } from "naive-ui";+import type { Permission } from "@/types";-defineProps({- description: {- type: String,- required: false,- },-});+defineProps<{+ description?: string;+ resources?: string[];+ permissions?: Permission[];+}>();</script>diff --git a/frontend/src/components/v2/Select/RemoteResourceSelector/index.vue b/frontend/src/components/v2/Select/RemoteResourceSelector/index.vueindex 28d11b6cfc..30bc25f96f 100644--- a/frontend/src/components/v2/Select/RemoteResourceSelector/index.vue+++ b/frontend/src/components/v2/Select/RemoteResourceSelector/index.vue@@ -103,7 +103,7 @@ const rawOptions = ref([]) as Ref<ResourceSelectOption<T>[]>;const appendDataToRawList = (data: ResourceSelectOption<T>[]) => {for (const item of data) {if (!rawOptions.value.find((raw) => raw.value === item.value)) {- rawOptions.value.push(item);+ rawOptions.value.unshift(item);}}};diff --git a/frontend/src/components/v2/Select/UserSelect.vue b/frontend/src/components/v2/Select/UserSelect.vueindex d64fa21ae0..6d7e3d1eb4 100644--- a/frontend/src/components/v2/Select/UserSelect.vue+++ b/frontend/src/components/v2/Select/UserSelect.vue@@ -84,7 +84,7 @@ const getOption = (user: User): ResourceSelectOption<User> => ({const additionalOptions = computedAsync(async () => {const options: ResourceSelectOption<User>[] = [];if (props.includeAllUsers) {- options.unshift(getOption(allUsersUser()));+ options.push(getOption(allUsersUser()));}let userEmails: string[] = [];diff --git a/frontend/src/grpcweb/middlewares/authInterceptorMiddleware.ts b/frontend/src/grpcweb/middlewares/authInterceptorMiddleware.tsindex 5ae38b9327..32f158dfeb 100644--- a/frontend/src/grpcweb/middlewares/authInterceptorMiddleware.ts+++ b/frontend/src/grpcweb/middlewares/authInterceptorMiddleware.ts@@ -1,20 +1,20 @@import { Code, ConnectError, type Interceptor } from "@connectrpc/connect";import { t } from "@/plugins/i18n";import { router } from "@/router";+import { WORKSPACE_ROUTE_403 } from "@/router/dashboard/workspaceRoutes";import { pushNotification, useAuthStore } from "@/store";+import { PermissionDeniedDetailSchema } from "@/types/proto-es/v1/common_pb";import { ignoredCodesContextKey, silentContextKey } from "../context-key";import { refreshTokens } from "../refreshToken";-export type IgnoreErrorsOptions = {- /**- * If set to true, will NOT show redirect to other pages(e.g., 403, sign in page).- */- silent?: boolean;-- /**- * If set, will NOT handle specified status codes is this array.- */- ignoredCodes?: Code[];+const extractPermissionDeniedDetail = (error: unknown) => {+ if (error instanceof ConnectError) {+ const details = error.findDetails(PermissionDeniedDetailSchema);+ if (details.length > 0) {+ return details[0];+ }+ }+ return undefined;};export const authInterceptor: Interceptor = (next) => async (req) => {@@ -79,7 +79,17 @@ export const authInterceptor: Interceptor = (next) => async (req) => {throw retryError;}} else if (code === Code.PermissionDenied) {- router.push({ name: "error.403" });+ const errorDetail = extractPermissionDeniedDetail(error);+ router.push({+ name: WORKSPACE_ROUTE_403,+ query: errorDetail+ ? {+ method: errorDetail.method,+ permissions: errorDetail.requiredPermissions.join(","),+ resources: errorDetail.resources.join(","),+ }+ : undefined,+ });}}}diff --git a/frontend/src/layouts/BodyLayout.vue b/frontend/src/layouts/BodyLayout.vueindex 74c8cef428..9723ddbcdf 100644--- a/frontend/src/layouts/BodyLayout.vue+++ b/frontend/src/layouts/BodyLayout.vue@@ -111,9 +111,19 @@class="md:min-w-0 flex-1 overflow-y-auto py-4":class="mainContainerClasses">- <!-- Start main area-->- <router-view name="content" />- <!-- End main area -->+ <RoutePermissionGuard+ class="mx-4"+ :routes="[+ ...workspaceRoutes,+ ...workspaceSettingRoutes,+ ...environmentV1Routes,+ ...instanceRoutes,+ ]"+ >+ <!-- Start main area-->+ <router-view name="content" />+ <!-- End main area -->+ </RoutePermissionGuard></div></div></div>@@ -131,9 +141,14 @@import { useMounted, useWindowSize } from "@vueuse/core";import { computed, onMounted, onUnmounted, reactive, ref } from "vue";import { useRoute, useRouter } from "vue-router";+import RoutePermissionGuard from "@/components/Permission/RoutePermissionGuard.vue";import ReleaseRemindModal from "@/components/ReleaseRemindModal.vue";import { t } from "@/plugins/i18n";+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,diff --git a/frontend/src/layouts/InstanceLayout.vue b/frontend/src/layouts/InstanceLayout.vueindex 0c7f67d117..0dd339ff44 100644--- a/frontend/src/layouts/InstanceLayout.vue+++ b/frontend/src/layouts/InstanceLayout.vue@@ -1,17 +1,14 @@<template><Suspense><template #default>- <template v-if="hasPermission">- <div- v-if="!isValidInstanceName(instance.name)"- class="flex items-center gap-x-2 m-4"- >- <BBSpin :size="20" />- Loading instance...- </div>- <router-view v-else :instance-id="instanceId" />- </template>- <NoPermissionPlaceholder v-else class="py-6" />+ <div+ v-if="!isValidInstanceName(instance.name)"+ class="flex items-center gap-x-2 m-4"+ >+ <BBSpin :size="20" />+ Loading instance...+ </div>+ <router-view v-else :instance-id="instanceId" /></template><template #fallback><span>Loading instance...</span>@@ -21,38 +18,18 @@<script lang="ts" setup>import { computed, watchEffect } from "vue";-import { useRouter } from "vue-router";import { BBSpin } from "@/bbkit";-import NoPermissionPlaceholder from "@/components/misc/NoPermissionPlaceholder.vue";import { useInstanceV1Store } from "@/store";import { instanceNamePrefix } from "@/store/modules/v1/common";import { isValidInstanceName } from "@/types";-import { hasWorkspacePermissionV2 } from "@/utils";const props = defineProps<{instanceId: string;}>();-const router = useRouter();const instanceStore = useInstanceV1Store();-const requiredPermissions = computed(() => {- const getPermissionListFunc =- router.currentRoute.value.meta.requiredPermissionList;- return getPermissionListFunc ? getPermissionListFunc() : [];-});--const hasPermission = computed(() => {- return requiredPermissions.value.every((permission) =>- hasWorkspacePermissionV2(permission)- );-});-watchEffect(async () => {- if (!hasPermission.value) {- return;- }-await instanceStore.getOrFetchInstanceByName(`${instanceNamePrefix}${props.instanceId}`);diff --git a/frontend/src/layouts/ProjectV1Layout.vue b/frontend/src/layouts/ProjectV1Layout.vueindex 297f3bafaf..7439b1fa68 100644--- a/frontend/src/layouts/ProjectV1Layout.vue+++ b/frontend/src/layouts/ProjectV1Layout.vue@@ -10,14 +10,16 @@</BBAttention></template>- <router-view- v-if="hasPermission"- :project-id="projectId"- :allow-edit="allowEdit"- v-bind="$attrs"- />-- <NoPermissionPlaceholder v-else class="py-6" />+ <RoutePermissionGuard+ :project="project"+ :routes="projectRoutes"+ >+ <router-view+ :project-id="projectId"+ :allow-edit="allowEdit"+ v-bind="$attrs"+ />+ </RoutePermissionGuard></template><divv-else@@ -30,16 +32,18 @@</template><script lang="tsx" setup>-import type { ConnectError } from "@connectrpc/connect";+import { type ConnectError } from "@connectrpc/connect";import { NSpin } from "naive-ui";import { computed, watchEffect } from "vue";import { useRouter } from "vue-router";import { BBAttention } from "@/bbkit";import ArchiveBanner from "@/components/ArchiveBanner.vue";import IAMRemindModal from "@/components/IAMRemindModal.vue";-import NoPermissionPlaceholder from "@/components/misc/NoPermissionPlaceholder.vue";+import RoutePermissionGuard from "@/components/Permission/RoutePermissionGuard.vue";import { useRecentProjects } from "@/components/Project/useRecentProjects";-import { PROJECT_V1_ROUTE_DETAIL } from "@/router/dashboard/projectV1";+import projectRoutes, {+ PROJECT_V1_ROUTE_DETAIL,+} from "@/router/dashboard/projectV1";import { WORKSPACE_ROUTE_LANDING } from "@/router/dashboard/workspaceRoutes";import { useRecentVisit } from "@/router/useRecentVisit";import {@@ -68,7 +72,8 @@ const projectName = computed(() => `${projectNamePrefix}${props.projectId}`);watchEffect(async () => {try {const project = await projectStore.getOrFetchProjectByName(- projectName.value+ projectName.value,+ false);recentProjects.setRecentProject(project.name);} catch (err) {@@ -105,20 +110,6 @@ const isDefaultProject = computed((): boolean => {return project.value.name === DEFAULT_PROJECT_NAME;});-const requiredPermissions = computed(() => {- const getPermissionListFunc =- router.currentRoute.value.meta.requiredPermissionList;- const permissions = getPermissionListFunc ? getPermissionListFunc() : [];- permissions.push("bb.projects.get");- return permissions;-});--const hasPermission = computed(() => {- return requiredPermissions.value.every((permission) =>- hasProjectPermissionV2(project.value, permission)- );-});-const allowEdit = computed(() => {if (project.value.state === State.DELETED) {return false;diff --git a/frontend/src/layouts/SQLEditorLayout.vue b/frontend/src/layouts/SQLEditorLayout.vueindex bbae7b0f0a..f0dca2edf4 100644--- a/frontend/src/layouts/SQLEditorLayout.vue+++ b/frontend/src/layouts/SQLEditorLayout.vue@@ -1,22 +1,26 @@<template>- <div class="relative h-screen overflow-hidden flex flex-col">- <ul- id="sql-editor-debug"- class="hidden text-xs font-mono max-h-[33vh] max-w-[40vw] overflow-auto fixed bottom-0 right-0 p-2 bg-white/50 border border-gray-400 z-999999"- ></ul>+ <RoutePermissionGuard class="m-6" :routes="sqlEditorRoutes">+ <div class="relative h-screen overflow-hidden flex flex-col">+ <ul+ id="sql-editor-debug"+ class="hidden text-xs font-mono max-h-[33vh] max-w-[40vw] overflow-auto fixed bottom-0 right-0 p-2 bg-white/50 border border-gray-400 z-999999"+ ></ul>- <BannersWrapper />- <template v-if="ready">- <ProvideSQLEditorContext />- </template>- </div>+ <BannersWrapper />+ <template v-if="ready">+ <ProvideSQLEditorContext />+ </template>+ </div>+ </RoutePermissionGuard></template><script lang="ts" setup>import { onMounted, ref } from "vue";import { useRouter } from "vue-router";import BannersWrapper from "@/components/BannersWrapper.vue";+import RoutePermissionGuard from "@/components/Permission/RoutePermissionGuard.vue";import ProvideSQLEditorContext from "@/components/ProvideSQLEditorContext.vue";+import sqlEditorRoutes from "@/router/sqlEditor";import {useEnvironmentV1Store,usePolicyV1Store,diff --git a/frontend/src/layouts/SettingLayout.vue b/frontend/src/layouts/SettingLayout.vueindex 1ef59e549d..42b92a9ad6 100644--- a/frontend/src/layouts/SettingLayout.vue+++ b/frontend/src/layouts/SettingLayout.vue@@ -1,30 +1,13 @@<template><div class="px-4 min-h-full">- <router-view v-if="hasPermission" :allow-edit="allowEdit" v-bind="$attrs" />- <NoPermissionPlaceholder v-else class="py-6" />+ <router-view :allow-edit="allowEdit" v-bind="$attrs" /></div></template><script lang="ts" setup>import { computed } from "vue";-import { useRouter } from "vue-router";-import NoPermissionPlaceholder from "@/components/misc/NoPermissionPlaceholder.vue";import { hasWorkspacePermissionV2 } from "@/utils";-const router = useRouter();--const requiredPermissions = computed(() => {- const getPermissionListFunc =- router.currentRoute.value.meta.requiredPermissionList;- return getPermissionListFunc ? getPermissionListFunc() : [];-});--const hasPermission = computed(() => {- return requiredPermissions.value.every((permission) =>- hasWorkspacePermissionV2(permission)- );-});-const allowEdit = computed((): boolean => {return hasWorkspacePermissionV2("bb.settings.set");});diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.jsonindex 1ff723c274..d689959026 100644--- a/frontend/src/locales/en-US.json+++ b/frontend/src/locales/en-US.json@@ -208,6 +208,8 @@"force-verb": "Force {verb}","untitled": "Untitled","missing-required-permission": "Missing required permissions",+ "missing-required-permission-for-resource": "Missing required permissions for resource {resource}",+ "required-permission": "Required permissions","resource-not-found": "Resource not found","continue-anyway": "Continue anyway","permissions": "Permissions",diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.jsonindex 2b35f8be37..d67b14324f 100644--- a/frontend/src/locales/es-ES.json+++ b/frontend/src/locales/es-ES.json@@ -208,6 +208,8 @@"force-verb": "forzar {verbo}","untitled": "Intitulado","missing-required-permission": "Faltan permisos requeridos",+ "missing-required-permission-for-resource": "Faltan permisos requeridos para el recurso {resource}",+ "required-permission": "Permisos necesarios","resource-not-found": "Recurso no encontrado","continue-anyway": "De todas maneras, continúe","permissions": "Permisos",diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.jsonindex d4cc2d6661..b5fd160634 100644--- a/frontend/src/locales/ja-JP.json+++ b/frontend/src/locales/ja-JP.json@@ -208,6 +208,8 @@"force-verb": "フォース{verb}","untitled": "名前のない","missing-required-permission": "必要な権限がありません",+ "missing-required-permission-for-resource": "リソース {resource} に必要な権限がありません",+ "required-permission": "必要な権限","resource-not-found": "リソースが見つかりません","continue-anyway": "まだ続けたい","permissions": "権限",diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.jsonindex 0b00e68614..56006baffe 100644--- a/frontend/src/locales/vi-VN.json+++ b/frontend/src/locales/vi-VN.json@@ -208,6 +208,8 @@"force-verb": "Buộc {verb}","untitled": "Không tiêu đề","missing-required-permission": "Thiếu quyền cần thiết",+ "missing-required-permission-for-resource": "Thiếu quyền cần thiết cho tài nguyên {resource}",+ "required-permission": "Quyền hạn cần thiết","resource-not-found": "Không tìm thấy tài nguyên","continue-anyway": "Tiếp tục","permissions": "Quyền",diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.jsonindex 99811d9ccc..f03f331b8c 100644--- a/frontend/src/locales/zh-CN.json+++ b/frontend/src/locales/zh-CN.json@@ -208,6 +208,8 @@"force-verb": "强制{verb}","untitled": "未命名","missing-required-permission": "缺少必需的权限",+ "missing-required-permission-for-resource": "缺少资源 {resource} 的必需权限",+ "required-permission": "所需权限","resource-not-found": "未找到请求的资源","continue-anyway": "仍要继续","permissions": "权限",diff --git a/frontend/src/router/dashboard/environmentV1.ts b/frontend/src/router/dashboard/environmentV1.tsindex be727f98ba..781f47e7d4 100644--- a/frontend/src/router/dashboard/environmentV1.ts+++ b/frontend/src/router/dashboard/environmentV1.ts@@ -1,6 +1,5 @@import type { RouteRecordRaw } from "vue-router";import { t } from "@/plugins/i18n";-import DashboardSidebar from "@/views/DashboardSidebar.vue";import { ENVIRONMENT_V1_ROUTE_DASHBOARD } from "./workspaceRoutes";export const ENVIRONMENT_V1_ROUTE_DETAIL = `${ENVIRONMENT_V1_ROUTE_DASHBOARD}.detail`;@@ -11,11 +10,12 @@ const environmentV1Routes: RouteRecordRaw[] = [name: ENVIRONMENT_V1_ROUTE_DETAIL,components: {content: () => import("@/views/EnvironmentDetail.vue"),- leftSidebar: DashboardSidebar,+ leftSidebar: () => import("@/views/DashboardSidebar.vue"),},props: { content: true },meta: {title: () => t("common.environment"),+ requiredPermissionList: () => ["bb.settings.get", "bb.policies.get"],},},];diff --git a/frontend/src/router/dashboard/instance.ts b/frontend/src/router/dashboard/instance.tsindex 6ca926f5fc..90ac807465 100644--- a/frontend/src/router/dashboard/instance.ts+++ b/frontend/src/router/dashboard/instance.ts@@ -1,7 +1,6 @@import type { RouteRecordRaw } from "vue-router";import InstanceLayout from "@/layouts/InstanceLayout.vue";import { t } from "@/plugins/i18n";-import DashboardSidebar from "@/views/DashboardSidebar.vue";import { INSTANCE_ROUTE_DASHBOARD } from "./workspaceRoutes";export const INSTANCE_ROUTE_DETAIL = `${INSTANCE_ROUTE_DASHBOARD}.detail`;@@ -12,7 +11,7 @@ const instanceRoutes: RouteRecordRaw[] = [path: "instances/:instanceId",components: {content: InstanceLayout,- leftSidebar: DashboardSidebar,+ leftSidebar: () => import("@/views/DashboardSidebar.vue"),},meta: {title: () => t("common.instance"),diff --git a/frontend/src/router/dashboard/projectV1.ts b/frontend/src/router/dashboard/projectV1.tsindex 28dd0f6f45..97bf3f40eb 100644--- a/frontend/src/router/dashboard/projectV1.ts+++ b/frontend/src/router/dashboard/projectV1.ts@@ -43,7 +43,11 @@ const issueRoutes: RouteRecordRaw[] = [{path: "plans/:planId",meta: {- requiredPermissionList: () => ["bb.plans.get"],+ requiredPermissionList: () => [+ "bb.plans.get",+ "bb.planCheckRuns.get",+ "bb.taskRuns.list",+ ],},props: true,children: [@@ -96,7 +100,7 @@ const rolloutRoutes: RouteRecordRaw[] = [import("@/components/RolloutV1/components/RolloutView.vue"),props: true,meta: {- requiredPermissionList: () => ["bb.rollouts.get"],+ requiredPermissionList: () => ["bb.rollouts.get", "bb.taskRuns.list"],},},{@@ -106,7 +110,7 @@ const rolloutRoutes: RouteRecordRaw[] = [import("@/components/RolloutV1/components/RolloutView.vue"),props: true,meta: {- requiredPermissionList: () => ["bb.rollouts.get"],+ requiredPermissionList: () => ["bb.rollouts.get", "bb.taskRuns.list"],},},{@@ -116,7 +120,7 @@ const rolloutRoutes: RouteRecordRaw[] = [import("@/components/RolloutV1/components/TaskView.vue"),props: true,meta: {- requiredPermissionList: () => ["bb.rollouts.get"],+ requiredPermissionList: () => ["bb.rollouts.get", "bb.taskRuns.list"],},},],@@ -195,12 +199,18 @@ const projectV1Routes: RouteRecordRaw[] = [component: () =>import("@/views/project/ProjectDatabaseGroupDashboard.vue"),props: true,+ meta: {+ requiredPermissionList: () => ["bb.databaseGroups.list"],+ },},{path: "create",name: PROJECT_V1_ROUTE_DATABASE_GROUPS_CREATE,meta: {- requiredPermissionList: () => ["bb.databaseGroups.create"],+ requiredPermissionList: () => [+ "bb.databaseGroups.create",+ "bb.databases.list",+ ],},component: () =>import("@/views/project/ProjectDatabaseGroupCreate.vue"),@@ -212,6 +222,12 @@ const projectV1Routes: RouteRecordRaw[] = [component: () =>import("@/views/project/ProjectDatabaseGroupDetail.vue"),props: true,+ meta: {+ requiredPermissionList: () => [+ "bb.databaseGroups.get",+ "bb.databases.list",+ ],+ },},],},@@ -268,7 +284,13 @@ const projectV1Routes: RouteRecordRaw[] = [name: PROJECT_V1_ROUTE_SYNC_SCHEMA,meta: {title: () => t("database.sync-schema.title"),- requiredPermissionList: () => ["bb.databases.sync"],+ requiredPermissionList: () => [+ "bb.databases.sync",+ "bb.databases.list",+ "bb.databases.get",+ "bb.databases.getSchema",+ "bb.changelogs.get",+ ],},component: () =>import("@/views/project/ProjectSyncDatabasePanelV1.vue"),@@ -321,7 +343,11 @@ const projectV1Routes: RouteRecordRaw[] = [name: PROJECT_V1_ROUTE_MEMBERS,meta: {title: () => t("common.members"),- requiredPermissionList: () => ["bb.projects.getIamPolicy"],+ requiredPermissionList: () => [+ "bb.projects.getIamPolicy",+ "bb.users.list",+ "bb.groups.list",+ ],},component: () => import("@/views/project/ProjectMemberDashboard.vue"),props: true,@@ -331,6 +357,7 @@ const projectV1Routes: RouteRecordRaw[] = [name: PROJECT_V1_ROUTE_SETTINGS,meta: {title: () => t("common.settings"),+ requiredPermissionList: () => ["bb.policies.list"],},component: () => import("@/views/project/ProjectSettingPanel.vue"),props: true,diff --git a/frontend/src/router/dashboard/workspace.ts b/frontend/src/router/dashboard/workspace.tsindex c162f47141..082c1e3908 100644--- a/frontend/src/router/dashboard/workspace.ts+++ b/frontend/src/router/dashboard/workspace.ts@@ -7,6 +7,8 @@ import {INSTANCE_ROUTE_DASHBOARD,PROJECT_V1_ROUTE_DASHBOARD,WORKSPACE_ROOT_MODULE,+ WORKSPACE_ROUTE_403,+ WORKSPACE_ROUTE_404,WORKSPACE_ROUTE_AUDIT_LOG,WORKSPACE_ROUTE_CUSTOM_APPROVAL,WORKSPACE_ROUTE_DATA_CLASSIFICATION,@@ -88,7 +90,7 @@ const workspaceRoutes: RouteRecordRaw[] = [name: ENVIRONMENT_V1_ROUTE_DASHBOARD,meta: {title: () => t("common.environments"),- requiredPermissionList: () => ["bb.settings.get"],+ requiredPermissionList: () => ["bb.settings.get", "bb.policies.get"],},components: {content: () => import("@/views/EnvironmentDashboard.vue"),@@ -107,7 +109,7 @@ const workspaceRoutes: RouteRecordRaw[] = [},{path: "403",- name: "error.403",+ name: WORKSPACE_ROUTE_403,components: {content: () => import("@/views/Page403.vue"),leftSidebar: () => import("@/views/DashboardSidebar.vue"),@@ -119,7 +121,7 @@ const workspaceRoutes: RouteRecordRaw[] = [},{path: "404",- name: "error.404",+ name: WORKSPACE_ROUTE_404,components: {content: () => import("@/views/Page404.vue"),leftSidebar: () => import("@/views/DashboardSidebar.vue"),@@ -180,6 +182,7 @@ const workspaceRoutes: RouteRecordRaw[] = [path: "idps",meta: {title: () => t("settings.sidebar.sso"),+ requiredPermissionList: () => ["bb.identityProviders.get"],},components: {content: () => import("@/layouts/SettingLayout.vue"),@@ -193,17 +196,11 @@ const workspaceRoutes: RouteRecordRaw[] = [{path: "",name: WORKSPACE_ROUTE_IDENTITY_PROVIDERS,- meta: {- requiredPermissionList: () => ["bb.settings.get"],- },component: () => import("@/views/SettingWorkspaceSSO.vue"),},{path: ":idpId",name: WORKSPACE_ROUTE_IDENTITY_PROVIDER_DETAIL,- meta: {- requiredPermissionList: () => ["bb.identityProviders.get"],- },component: () => import("@/views/SettingWorkspaceSSODetail.vue"),props: true,},@@ -222,7 +219,6 @@ const workspaceRoutes: RouteRecordRaw[] = [name: WORKSPACE_ROUTE_RISK_CENTER,meta: {title: () => t("custom-approval.risk.self"),- requiredPermissionList: () => ["bb.settings.get"],},component: () => import("@/views/SettingWorkspaceRiskCenter.vue"),props: true,@@ -273,10 +269,7 @@ const workspaceRoutes: RouteRecordRaw[] = [name: WORKSPACE_ROUTE_AUDIT_LOG,meta: {title: () => t("settings.sidebar.audit-log"),- requiredPermissionList: () => [- "bb.settings.get",- "bb.auditLogs.search",- ],+ requiredPermissionList: () => ["bb.auditLogs.search"],},component: () => import("@/views/SettingWorkspaceAuditLog.vue"),props: true,@@ -286,6 +279,7 @@ const workspaceRoutes: RouteRecordRaw[] = [name: WORKSPACE_ROUTE_USERS,meta: {title: () => t("settings.sidebar.users-and-groups"),+ requiredPermissionList: () => ["bb.users.list", "bb.groups.list"],},component: () => import("@/views/SettingWorkspaceUsers.vue"),props: true,@@ -295,7 +289,11 @@ const workspaceRoutes: RouteRecordRaw[] = [name: WORKSPACE_ROUTE_MEMBERS,meta: {title: () => t("settings.sidebar.members"),- requiredPermissionList: () => ["bb.policies.get"],+ requiredPermissionList: () => [+ "bb.workspaces.getIamPolicy",+ "bb.users.list",+ "bb.groups.list",+ ],},component: () => import("@/views/SettingWorkspaceMembers.vue"),props: true,@@ -315,7 +313,7 @@ const workspaceRoutes: RouteRecordRaw[] = [name: WORKSPACE_ROUTE_IM,meta: {title: () => t("settings.sidebar.im-integration"),- requiredPermissionList: () => ["bb.settings.get", "bb.settings.set"],+ requiredPermissionList: () => ["bb.settings.get"],},component: () => import("@/views/SettingWorkspaceIM.vue"),props: true,@@ -325,6 +323,7 @@ const workspaceRoutes: RouteRecordRaw[] = [name: WORKSPACE_ROUTE_MCP,meta: {title: () => t("settings.sidebar.mcp"),+ requiredPermissionList: () => ["bb.settings.get"],},component: () => import("@/views/SettingWorkspaceMCP.vue"),props: true,diff --git a/frontend/src/router/dashboard/workspaceRoutes.ts b/frontend/src/router/dashboard/workspaceRoutes.tsindex 19c9653d48..6102db4780 100644--- a/frontend/src/router/dashboard/workspaceRoutes.ts+++ b/frontend/src/router/dashboard/workspaceRoutes.ts@@ -30,3 +30,6 @@ export const WORKSPACE_ROUTE_IDENTITY_PROVIDER_DETAIL = `${WORKSPACE_ROUTE_IDENTexport const WORKSPACE_ROUTE_IM = "workspace.im";export const WORKSPACE_ROUTE_MCP = "workspace.mcp";++export const WORKSPACE_ROUTE_403 = "error.403";+export const WORKSPACE_ROUTE_404 = "error.404";diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.tsindex 7fea807003..dbf0f62293 100644--- a/frontend/src/router/index.ts+++ b/frontend/src/router/index.ts@@ -32,6 +32,8 @@ import {INSTANCE_ROUTE_DASHBOARD,PROJECT_V1_ROUTE_DASHBOARD,WORKSPACE_ROOT_MODULE,+ WORKSPACE_ROUTE_403,+ WORKSPACE_ROUTE_404,} from "./dashboard/workspaceRoutes";import { SETTING_ROUTE } from "./dashboard/workspaceSetting";import setupRoutes, { SETUP_MODULE } from "./setup";@@ -75,11 +77,7 @@ router.beforeEach((to, from, next) => {}// Error pages can be accessed directly- if (- to.name === "error.403" ||- to.name === "error.404" ||- to.name === "error.500"- ) {+ if (to.name === WORKSPACE_ROUTE_403 || to.name === WORKSPACE_ROUTE_404) {next();return;}@@ -262,7 +260,7 @@ router.beforeEach((to, from, next) => {});next({- name: "error.404",+ name: WORKSPACE_ROUTE_404,replace: false,});});diff --git a/frontend/src/router/sqlEditor.ts b/frontend/src/router/sqlEditor.tsindex 23ca837d83..617054f792 100644--- a/frontend/src/router/sqlEditor.ts+++ b/frontend/src/router/sqlEditor.ts@@ -12,6 +12,13 @@ const sqlEditorRoutes: RouteRecordRaw[] = [path: "/sql-editor",name: "sql-editor",component: SQLEditorLayout,+ meta: {+ requiredPermissionList: () => [+ "bb.projects.get",+ "bb.databases.list",+ "bb.projects.getIamPolicy",+ ],+ },children: [{path: "",diff --git a/frontend/src/store/modules/v1/common.ts b/frontend/src/store/modules/v1/common.tsindex e0bfeb643a..dad4effc48 100644--- a/frontend/src/store/modules/v1/common.ts+++ b/frontend/src/store/modules/v1/common.ts@@ -1,5 +1,5 @@-import type { ResourceId } from "@/types";-import { UNKNOWN_ID } from "@/types";+import { UNKNOWN_ID } from "@/types/const";+import type { ResourceId } from "@/types/id";export const workspaceNamePrefix = "workspaces/";export const userNamePrefix = "users/";diff --git a/frontend/src/types/approvalFlow.ts b/frontend/src/types/approvalFlow.tsindex 6c01afa99a..566abe8698 100644--- a/frontend/src/types/approvalFlow.ts+++ b/frontend/src/types/approvalFlow.ts@@ -1,5 +1,5 @@import { t } from "@/plugins/i18n";-import { displayRoleTitle } from "@/utils";+import { displayRoleTitle } from "@/utils/role";import { PresetRoleType } from "./iam";export type BuiltinApprovalFlow = {diff --git a/frontend/src/types/proto-es/v1/common_pb.d.ts b/frontend/src/types/proto-es/v1/common_pb.d.tsindex df62c80cde..f8977938ee 100644--- a/frontend/src/types/proto-es/v1/common_pb.d.ts+++ b/frontend/src/types/proto-es/v1/common_pb.d.ts@@ -88,6 +88,41 @@ export declare type Range = Message<"bytebase.v1.Range"> & {*/export declare const RangeSchema: GenMessage<Range>;+/**+ * PermissionDeniedDetail provides structured information about permission failures.+ * Used as error detail when returning CodePermissionDenied errors.+ *+ * @generated from message bytebase.v1.PermissionDeniedDetail+ */+export declare type PermissionDeniedDetail = Message<"bytebase.v1.PermissionDeniedDetail"> & {+ /**+ * The API method that was called.+ *+ * @generated from field: string method = 1;+ */+ method: string;++ /**+ * The permissions required but not granted to the user.+ *+ * @generated from field: repeated string required_permissions = 2;+ */+ requiredPermissions: string[];++ /**+ * The resources the user was trying to access.+ *+ * @generated from field: repeated string resources = 3;+ */+ resources: string[];+};++/**+ * Describes the message bytebase.v1.PermissionDeniedDetail.+ * Use `create(PermissionDeniedDetailSchema)` to create a new message.+ */+export declare const PermissionDeniedDetailSchema: GenMessage<PermissionDeniedDetail>;+/*** Resource lifecycle state.*diff --git a/frontend/src/types/proto-es/v1/common_pb.js b/frontend/src/types/proto-es/v1/common_pb.jsindex bd5775ff00..b58407070b 100644--- a/frontend/src/types/proto-es/v1/common_pb.js+++ b/frontend/src/types/proto-es/v1/common_pb.js@@ -8,7 +8,7 @@ import { enumDesc, fileDesc, messageDesc, tsEnum } from "@bufbuild/protobuf/code* Describes the file v1/common.proto.*/export const file_v1_common = /*@__PURE__*/- fileDesc("Cg92MS9jb21tb24ucHJvdG8SC2J5dGViYXNlLnYxIigKCFBvc2l0aW9uEgwKBGxpbmUYASABKAUSDgoGY29sdW1uGAIgASgFIiMKBVJhbmdlEg0KBXN0YXJ0GAEgASgFEgsKA2VuZBgCIAEoBSo3CgVTdGF0ZRIVChFTVEFURV9VTlNQRUNJRklFRBAAEgoKBkFDVElWRRABEgsKB0RFTEVURUQQAirwAgoGRW5naW5lEhYKEkVOR0lORV9VTlNQRUNJRklFRBAAEg4KCkNMSUNLSE9VU0UQARIJCgVNWVNRTBACEgwKCFBPU1RHUkVTEAMSDQoJU05PV0ZMQUtFEAQSCgoGU1FMSVRFEAUSCAoEVElEQhAGEgsKB01PTkdPREIQBxIJCgVSRURJUxAIEgoKBk9SQUNMRRAJEgsKB1NQQU5ORVIQChIJCgVNU1NRTBALEgwKCFJFRFNISUZUEAwSCwoHTUFSSUFEQhANEg0KCU9DRUFOQkFTRRAOEg0KCVNUQVJST0NLUxAPEgkKBURPUklTEBASCAoESElWRRAREhEKDUVMQVNUSUNTRUFSQ0gQEhIMCghCSUdRVUVSWRATEgwKCERZTkFNT0RCEBQSDgoKREFUQUJSSUNLUxAVEg8KC0NPQ0tST0FDSERCEBYSDAoIQ09TTU9TREIQFxIJCgVUUklOTxAYEg0KCUNBU1NBTkRSQRAZKlwKB1ZDU1R5cGUSGAoUVkNTX1RZUEVfVU5TUEVDSUZJRUQQABIKCgZHSVRIVUIQARIKCgZHSVRMQUIQAhINCglCSVRCVUNLRVQQAxIQCgxBWlVSRV9ERVZPUFMQBCpMCgxFeHBvcnRGb3JtYXQSFgoSRk9STUFUX1VOU1BFQ0lGSUVEEAASBwoDQ1NWEAESCAoESlNPThACEgcKA1NRTBADEggKBFhMU1gQBCpICglSaXNrTGV2ZWwSGgoWUklTS19MRVZFTF9VTlNQRUNJRklFRBAAEgcKA0xPVxABEgwKCE1PREVSQVRFEAISCAoESElHSBADKn0KC1dlYmhvb2tUeXBlEhwKGFdFQkhPT0tfVFlQRV9VTlNQRUNJRklFRBAAEgkKBVNMQUNLEAESCwoHRElTQ09SRBACEgkKBVRFQU1TEAMSDAoIRElOR1RBTEsQBBIKCgZGRUlTSFUQBRIJCgVXRUNPTRAGEggKBExBUksQB0KhAQoPY29tLmJ5dGViYXNlLnYxQgtDb21tb25Qcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM");+ fileDesc("Cg92MS9jb21tb24ucHJvdG8SC2J5dGViYXNlLnYxIigKCFBvc2l0aW9uEgwKBGxpbmUYASABKAUSDgoGY29sdW1uGAIgASgFIiMKBVJhbmdlEg0KBXN0YXJ0GAEgASgFEgsKA2VuZBgCIAEoBSJZChZQZXJtaXNzaW9uRGVuaWVkRGV0YWlsEg4KBm1ldGhvZBgBIAEoCRIcChRyZXF1aXJlZF9wZXJtaXNzaW9ucxgCIAMoCRIRCglyZXNvdXJjZXMYAyADKAkqNwoFU3RhdGUSFQoRU1RBVEVfVU5TUEVDSUZJRUQQABIKCgZBQ1RJVkUQARILCgdERUxFVEVEEAIq8AIKBkVuZ2luZRIWChJFTkdJTkVfVU5TUEVDSUZJRUQQABIOCgpDTElDS0hPVVNFEAESCQoFTVlTUUwQAhIMCghQT1NUR1JFUxADEg0KCVNOT1dGTEFLRRAEEgoKBlNRTElURRAFEggKBFRJREIQBhILCgdNT05HT0RCEAcSCQoFUkVESVMQCBIKCgZPUkFDTEUQCRILCgdTUEFOTkVSEAoSCQoFTVNTUUwQCxIMCghSRURTSElGVBAMEgsKB01BUklBREIQDRINCglPQ0VBTkJBU0UQDhINCglTVEFSUk9DS1MQDxIJCgVET1JJUxAQEggKBEhJVkUQERIRCg1FTEFTVElDU0VBUkNIEBISDAoIQklHUVVFUlkQExIMCghEWU5BTU9EQhAUEg4KCkRBVEFCUklDS1MQFRIPCgtDT0NLUk9BQ0hEQhAWEgwKCENPU01PU0RCEBcSCQoFVFJJTk8QGBINCglDQVNTQU5EUkEQGSpcCgdWQ1NUeXBlEhgKFFZDU19UWVBFX1VOU1BFQ0lGSUVEEAASCgoGR0lUSFVCEAESCgoGR0lUTEFCEAISDQoJQklUQlVDS0VUEAMSEAoMQVpVUkVfREVWT1BTEAQqTAoMRXhwb3J0Rm9ybWF0EhYKEkZPUk1BVF9VTlNQRUNJRklFRBAAEgcKA0NTVhABEggKBEpTT04QAhIHCgNTUUwQAxIICgRYTFNYEAQqSAoJUmlza0xldmVsEhoKFlJJU0tfTEVWRUxfVU5TUEVDSUZJRUQQABIHCgNMT1cQARIMCghNT0RFUkFURRACEggKBEhJR0gQAyp9CgtXZWJob29rVHlwZRIcChhXRUJIT09LX1RZUEVfVU5TUEVDSUZJRUQQABIJCgVTTEFDSxABEgsKB0RJU0NPUkQQAhIJCgVURUFNUxADEgwKCERJTkdUQUxLEAQSCgoGRkVJU0hVEAUSCQoFV0VDT00QBhIICgRMQVJLEAdCoQEKD2NvbS5ieXRlYmFzZS52MUILQ29tbW9uUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z");/*** Describes the message bytebase.v1.Position.@@ -24,6 +24,13 @@ export const PositionSchema = /*@__PURE__*/export const RangeSchema = /*@__PURE__*/messageDesc(file_v1_common, 1);+/**+ * Describes the message bytebase.v1.PermissionDeniedDetail.+ * Use `create(PermissionDeniedDetailSchema)` to create a new message.+ */+export const PermissionDeniedDetailSchema = /*@__PURE__*/+ messageDesc(file_v1_common, 2);+/*** Describes the enum bytebase.v1.State.*/diff --git a/frontend/src/utils/role.ts b/frontend/src/utils/role.tsindex 3520ee1048..07c20423b1 100644--- a/frontend/src/utils/role.ts+++ b/frontend/src/utils/role.ts@@ -1,6 +1,7 @@import { t } from "@/plugins/i18n";import { useRoleStore } from "@/store";-import { type Permission, PresetRoleType } from "@/types";+import type { Permission } from "@/types/iam";+import { PresetRoleType } from "@/types/iam";export const checkRoleContainsAnyPermission = (roleName: string,diff --git a/frontend/src/utils/useDashboardSidebar.ts b/frontend/src/utils/useDashboardSidebar.tsindex 8a425bd157..ebfeb51642 100644--- a/frontend/src/utils/useDashboardSidebar.ts+++ b/frontend/src/utils/useDashboardSidebar.ts@@ -13,9 +13,7 @@ import {import { computed, h } from "vue";import { useRoute } from "vue-router";import type { SidebarItem } from "@/components/v2/Sidebar/type";-import { getFlattenRoutes } from "@/components/v2/Sidebar/utils.ts";import { t } from "@/plugins/i18n";-import workspaceRoutes from "@/router/dashboard/workspace";import {DATABASE_ROUTE_DASHBOARD,ENVIRONMENT_V1_ROUTE_DASHBOARD,@@ -42,8 +40,6 @@ import {SETTING_ROUTE_WORKSPACE_GENERAL,SETTING_ROUTE_WORKSPACE_SUBSCRIPTION,} from "@/router/dashboard/workspaceSetting";-import { usePermissionStore } from "@/store";-import { hasWorkspacePermissionV2 } from "@/utils";export interface DashboardSidebarItem extends SidebarItem {navigationId?: string;@@ -54,7 +50,6 @@ export interface DashboardSidebarItem extends SidebarItem {export const useDashboardSidebar = () => {const route = useRoute();- const permissionStore = usePermissionStore();const getItemClass = (item: SidebarItem): string[] => {const { name: current } = route;@@ -76,36 +71,6 @@ export const useDashboardSidebar = () => {return classes;};- const filterSidebarByPermissions = (- sidebarList: DashboardSidebarItem[]- ): DashboardSidebarItem[] => {- return sidebarList- .filter((item) => {- const routeConfig = flattenRoutes.value.find(- (workspaceRoute) => workspaceRoute.name === item.name- );- return (routeConfig?.permissions ?? []).every((permission) =>- hasWorkspacePermissionV2(permission)- );- })- .map((item) => ({- ...item,- expand:- item.expand ||- (item.children ?? [])- .reduce((classList, child) => {- classList.push(...getItemClass(child));- return classList;- }, [] as string[])- .includes("router-link-active"),- children: filterSidebarByPermissions(item.children ?? []),- }));- };-- const flattenRoutes = computed(() => {- return getFlattenRoutes(workspaceRoutes);- });-const dashboardSidebarItemList = computed((): DashboardSidebarItem[] => {const sidebarList: DashboardSidebarItem[] = [{@@ -166,7 +131,6 @@ export const useDashboardSidebar = () => {title: t("settings.sidebar.members"),name: WORKSPACE_ROUTE_MEMBERS,type: "route",- hide: permissionStore.onlyWorkspaceMember,},{title: t("settings.sidebar.custom-roles"),@@ -250,7 +214,6 @@ export const useDashboardSidebar = () => {title: t("common.settings"),icon: () => h(SettingsIcon),type: "div",- hide: !hasWorkspacePermissionV2("bb.settings.get"),children: [{title: t("settings.sidebar.general"),@@ -271,7 +234,7 @@ export const useDashboardSidebar = () => {},];- return filterSidebarByPermissions(sidebarList);+ return sidebarList;});return {diff --git a/frontend/src/views/DatabaseDashboard.vue b/frontend/src/views/DatabaseDashboard.vueindex 39e559dc41..512a218bb6 100644--- a/frontend/src/views/DatabaseDashboard.vue+++ b/frontend/src/views/DatabaseDashboard.vue@@ -9,16 +9,21 @@:placeholder="$t('database.filter-database')":scope-options="scopeOptions"/>- <NButton- v-if="allowToCreateDB"- type="primary"- @click="state.showCreateDrawer = true"+ <PermissionGuardWrapper+ v-slot="slotProps"+ :permissions="['bb.instances.list', 'bb.issues.create', 'bb.settings.get']">- <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><div>@@ -57,6 +62,7 @@ import { computed, onMounted, reactive, ref } from "vue";import AdvancedSearch from "@/components/AdvancedSearch";import { useCommonSearchScopeOptions } from "@/components/AdvancedSearch/useCommonSearchScopeOptions";import { CreateDatabasePrepPanel } from "@/components/CreateDatabasePrepForm";+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";import { Drawer } from "@/components/v2";import {DatabaseOperations,@@ -77,7 +83,6 @@ import {extractProjectResourceName,getValueFromSearchParams,getValuesFromSearchParams,- hasWorkspacePermissionV2,} from "@/utils";interface LocalState {@@ -114,13 +119,6 @@ const state = reactive<LocalState>({params: defaultSearchParams(),});-const allowToCreateDB = computed(() => {- return (- hasWorkspacePermissionV2("bb.instances.list") &&- hasWorkspacePermissionV2("bb.issues.create")- );-});-const scopeOptions = useCommonSearchScopeOptions([...CommonFilterScopeIdList,"project",diff --git a/frontend/src/views/InstanceDashboard.vue b/frontend/src/views/InstanceDashboard.vueindex eca4f3b5ce..495066451e 100644--- a/frontend/src/views/InstanceDashboard.vue+++ b/frontend/src/views/InstanceDashboard.vue@@ -13,16 +13,21 @@:placeholder="$t('instance.filter-instance-name')":scope-options="scopeOptions"/>- <NButton- v-if="hasWorkspacePermissionV2('bb.instances.create')"- type="primary"- @click="showCreateInstanceDrawer"+ <PermissionGuardWrapper+ v-slot="slotProps"+ :permissions="['bb.instances.create']">- <template #icon>- <PlusIcon class="h-4 w-4" />- </template>- {{ $t("quick-action.add-instance") }}- </NButton>+ <NButton+ type="primary"+ :disabled="slotProps.disabled"+ @click="showCreateInstanceDrawer"+ >+ <template #icon>+ <PlusIcon class="h-4 w-4" />+ </template>+ {{ $t("quick-action.add-instance") }}+ </NButton>+ </PermissionGuardWrapper></div><div><InstanceOperations@@ -82,6 +87,7 @@ import {Form as InstanceFormBody,Buttons as InstanceFormButtons,} from "@/components/InstanceForm/";+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";import {Drawer,DrawerContent,@@ -101,7 +107,6 @@ import type { Instance } from "@/types/proto-es/v1/instance_service_pb";import {getValueFromSearchParams,getValuesFromSearchParams,- hasWorkspacePermissionV2,type SearchParams,} from "@/utils";diff --git a/frontend/src/views/Page403.vue b/frontend/src/views/Page403.vueindex 5144808463..6877478c10 100644--- a/frontend/src/views/Page403.vue+++ b/frontend/src/views/Page403.vue@@ -1,30 +1,48 @@<template>- <div class="w-full px-4 grid place-items-center py-24">- <img- class="w-16 h-auto opacity-80"- src="@/assets/logo-icon.svg"- alt="Bytebase"- />- <p class="mt-4 text-balance text-center">- {{ $t("common.missing-required-permission") }}- </p>- <div class="mt-12">- <NButton size="small" @click.prevent="goHome">- <template #icon><ChevronLeftIcon /></template>- {{ $t("error-page.go-back-home") }}- </NButton>- </div>- </div>+ <NoPermissionPlaceholder+ class="mx-6 my-2"+ :resources="resources"+ :permissions="permissions"+ >+ <template #action>+ <div class="mt-2">+ <NButton size="small" @click.prevent="goHome">+ <template #icon><ChevronLeftIcon /></template>+ {{ $t("error-page.go-back-home") }}+ </NButton>+ </div>+ </template>+ </NoPermissionPlaceholder></template><script lang="ts" setup>import { ChevronLeftIcon } from "lucide-vue-next";import { NButton } from "naive-ui";-import { useRouter } from "vue-router";+import { computed } from "vue";+import { useRoute, useRouter } from "vue-router";+import NoPermissionPlaceholder from "@/components/misc/NoPermissionPlaceholder.vue";import { WORKSPACE_ROOT_MODULE } from "@/router/dashboard/workspaceRoutes";+import type { Permission } from "@/types";+const route = useRoute();const router = useRouter();+const permissions = computed<Permission[]>(() => {+ const permQuery = route.query.permissions;+ if (typeof permQuery === "string" && permQuery) {+ return permQuery.split(",").filter((r) => r) as Permission[];+ }+ return [];+});++const resources = computed(() => {+ const resources = route.query.resources;+ if (typeof resources === "string") {+ return resources.split(",").filter((r) => r);+ }+ return [];+});+const goHome = () => {router.push({ name: WORKSPACE_ROOT_MODULE });};diff --git a/frontend/src/views/ProjectDashboard.vue b/frontend/src/views/ProjectDashboard.vueindex 644efa92a1..c20b0f65c0 100644--- a/frontend/src/views/ProjectDashboard.vue+++ b/frontend/src/views/ProjectDashboard.vue@@ -7,16 +7,21 @@:autofocus="false":placeholder="$t('project.filter-projects')"/>- <NButton- v-if="hasWorkspacePermissionV2('bb.projects.create')"- type="primary"- @click="state.showCreateDrawer = true"+ <PermissionGuardWrapper+ v-slot="slotProps"+ :permissions="['bb.projects.create']">- <template #icon>- <PlusIcon class="h-4 w-4" />- </template>- {{ $t("quick-action.new-project") }}- </NButton>+ <NButton+ type="primary"+ :disabled="slotProps.disabled"+ @click="state.showCreateDrawer = true"+ >+ <template #icon>+ <PlusIcon class="h-4 w-4" />+ </template>+ {{ $t("quick-action.new-project") }}+ </NButton>+ </PermissionGuardWrapper></div><div><ProjectOperations@@ -60,6 +65,7 @@ import { useRouter } from "vue-router";import AdvancedSearch, {useCommonSearchScopeOptions,} from "@/components/AdvancedSearch";+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";import ProjectCreatePanel from "@/components/Project/ProjectCreatePanel.vue";import { Drawer, PagedProjectTable } from "@/components/v2";import ProjectOperations from "@/components/v2/Model/Project/ProjectOperations.vue";diff --git a/frontend/src/views/SettingWorkspaceAuditLog.vue b/frontend/src/views/SettingWorkspaceAuditLog.vueindex 9123ffbe40..ca77154699 100644--- a/frontend/src/views/SettingWorkspaceAuditLog.vue+++ b/frontend/src/views/SettingWorkspaceAuditLog.vue@@ -3,18 +3,23 @@<FeatureAttention :feature="PlanFeature.FEATURE_AUDIT_LOG" /><AuditLogSearch v-model:params="state.params"><template #searchbox-suffix>- <DataExportButton- size="medium"- :support-formats="[- ExportFormat.CSV,- ExportFormat.JSON,- ExportFormat.XLSX,- ]"- :tooltip="disableExportTip"- :view-mode="'DROPDOWN'"- :disabled="!hasAuditLogFeature || !!disableExportTip"- @export="(params) => pagedAuditLogDataTableRef?.handleExport(params)"- />+ <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></template></AuditLogSearch>@@ -38,6 +43,7 @@ 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";diff --git a/frontend/src/views/SettingWorkspaceIM.vue b/frontend/src/views/SettingWorkspaceIM.vueindex c261f79d90..30869bc895 100644--- a/frontend/src/views/SettingWorkspaceIM.vue+++ b/frontend/src/views/SettingWorkspaceIM.vue@@ -12,16 +12,22 @@class="py-12 border rounded-sm"><template #extra>- <NButton+ <PermissionGuardWrapperv-if="availableImSettings.length > 0"- type="primary"- @click="() => onAddIM(availableImSettings[0].value)"+ v-slot="slotProps"+ :permissions="['bb.settings.set']">- <template #icon>- <PlusIcon class="h-4 w-4" />- </template>- {{ $t("settings.im.add-im-integration") }}- </NButton>+ <NButton+ type="primary"+ :disabled="slotProps.disabled"+ @click="() => onAddIM(availableImSettings[0].value)"+ >+ <template #icon>+ <PlusIcon class="h-4 w-4" />+ </template>+ {{ $t("settings.im.add-im-integration") }}+ </NButton>+ </PermissionGuardWrapper></template></NEmpty><div v-else class="flex flex-col gap-y-4">@@ -45,7 +51,7 @@<div class="textlabel">Token</div><BBTextFieldclass="mt-2"- :disabled="!props.allowEdit"+ :disabled="!allowEdit":placeholder="t('common.sensitive-placeholder')"v-model:value="(item.payload.value as AppIMSetting_Slack).token"/>@@ -58,7 +64,7 @@<div class="textlabel">App ID</div><BBTextFieldclass="mt-2"- :disabled="!props.allowEdit"+ :disabled="!allowEdit":placeholder="t('common.sensitive-placeholder')"v-model:value="(item.payload.value as AppIMSetting_Feishu).appId"/>@@ -67,7 +73,7 @@<div class="textlabel">App Secret</div><BBTextFieldclass="mt-2"- :disabled="!props.allowEdit"+ :disabled="!allowEdit":placeholder="t('common.sensitive-placeholder')"v-model:value="(item.payload.value as AppIMSetting_Feishu).appSecret"/>@@ -81,7 +87,7 @@<div class="textlabel">Corp ID</div><BBTextFieldclass="mt-2"- :disabled="!props.allowEdit"+ :disabled="!allowEdit":placeholder="t('common.sensitive-placeholder')"v-model:value="(item.payload.value as AppIMSetting_Wecom).corpId"/>@@ -90,7 +96,7 @@<div class="textlabel">Agent ID</div><BBTextFieldclass="mt-2"- :disabled="!props.allowEdit"+ :disabled="!allowEdit":placeholder="t('common.sensitive-placeholder')"v-model:value="(item.payload.value as AppIMSetting_Wecom).agentId"/>@@ -99,7 +105,7 @@<div class="textlabel">Secret</div><BBTextFieldclass="mt-2"- :disabled="!props.allowEdit"+ :disabled="!allowEdit":placeholder="t('common.sensitive-placeholder')"v-model:value="(item.payload.value as AppIMSetting_Wecom).secret"/>@@ -113,7 +119,7 @@<div class="textlabel">App ID</div><BBTextFieldclass="mt-2"- :disabled="!props.allowEdit"+ :disabled="!allowEdit":placeholder="t('common.sensitive-placeholder')"v-model:value="(item.payload.value as AppIMSetting_Lark).appId"/>@@ -122,7 +128,7 @@<div class="textlabel">App Secret</div><BBTextFieldclass="mt-2"- :disabled="!props.allowEdit"+ :disabled="!allowEdit":placeholder="t('common.sensitive-placeholder')"v-model:value="(item.payload.value as AppIMSetting_Lark).appSecret"/>@@ -136,7 +142,7 @@<div class="textlabel">Client ID</div><BBTextFieldclass="mt-2"- :disabled="!props.allowEdit"+ :disabled="!allowEdit":placeholder="t('common.sensitive-placeholder')"v-model:value="(item.payload.value as AppIMSetting_DingTalk).clientId"/>@@ -145,7 +151,7 @@<div class="textlabel">Client Secret</div><BBTextFieldclass="mt-2"- :disabled="!props.allowEdit"+ :disabled="!allowEdit":placeholder="t('common.sensitive-placeholder')"v-model:value="(item.payload.value as AppIMSetting_DingTalk).clientSecret"/>@@ -154,7 +160,7 @@<div class="textlabel">Robot Code</div><BBTextFieldclass="mt-2"- :disabled="!props.allowEdit"+ :disabled="!allowEdit":placeholder="t('common.sensitive-placeholder')"v-model:value="(item.payload.value as AppIMSetting_DingTalk).robotCode"/>@@ -168,7 +174,7 @@<div class="textlabel">Tenant ID</div><BBTextFieldclass="mt-2"- :disabled="!props.allowEdit"+ :disabled="!allowEdit":placeholder="t('common.sensitive-placeholder')"v-model:value="(item.payload.value as AppIMSetting_Teams).tenantId"/>@@ -177,7 +183,7 @@<div class="textlabel">Client ID</div><BBTextFieldclass="mt-2"- :disabled="!props.allowEdit"+ :disabled="!allowEdit":placeholder="t('common.sensitive-placeholder')"v-model:value="(item.payload.value as AppIMSetting_Teams).clientId"/>@@ -186,7 +192,7 @@<div class="textlabel">Client Secret</div><BBTextFieldclass="mt-2"- :disabled="!props.allowEdit"+ :disabled="!allowEdit":placeholder="t('common.sensitive-placeholder')"v-model:value="(item.payload.value as AppIMSetting_Teams).clientSecret"/>@@ -197,7 +203,7 @@<div class="flex items-center justify-between mt-4 gap-x-2"><div><NPopconfirm- v-if="isConfigured(item.type)"+ v-if="isConfigured(item.type) && allowEdit":positive-button-props="{type: 'error',}"@@ -228,7 +234,7 @@</NButton><NButtontype="primary"- :disabled="!!state.pendingSaveType"+ :disabled="!!state.pendingSaveType || !allowEdit":loading="state.pendingSaveType === item.type"@click="() => onSaveIM(i, item.type)">@@ -238,18 +244,23 @@</div></div>- <div class="flex justify-end">- <NButton- v-if="availableImSettings.length > 0"- type="primary"- secondary- @click="() => onAddIM(availableImSettings[0].value)"+ <div v-if="availableImSettings.length > 0" class="flex justify-end">+ <PermissionGuardWrapper+ v-slot="slotProps"+ :permissions="['bb.settings.set']">- <template #icon>- <PlusIcon class="h-4 w-4" />- </template>- {{ $t("settings.im.add-another-im") }}- </NButton>+ <NButton+ type="primary"+ secondary+ :disabled="slotProps.disabled"+ @click="() => onAddIM(availableImSettings[0].value)"+ >+ <template #icon>+ <PlusIcon class="h-4 w-4" />+ </template>+ {{ $t("settings.im.add-another-im") }}+ </NButton>+ </PermissionGuardWrapper></div></div></div>@@ -265,6 +276,7 @@ import { computed, reactive, watch } from "vue";import { useI18n } from "vue-i18n";import BBTextField from "@/bbkit/BBTextField.vue";import LearnMoreLink from "@/components/LearnMoreLink.vue";+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";import WebhookTypeIcon from "@/components/Project/WebhookTypeIcon.vue";import { pushNotification, useSettingV1Store } from "@/store";import { WebhookType } from "@/types/proto-es/v1/common_pb";@@ -303,7 +315,7 @@ type IMSettingPayloadValue =| AppIMSetting_Teams| undefined;-const props = defineProps<{+defineProps<{allowEdit: boolean;}>();diff --git a/frontend/src/views/SettingWorkspaceMembers.vue b/frontend/src/views/SettingWorkspaceMembers.vueindex 8b28b70d03..0758256ea3 100644--- a/frontend/src/views/SettingWorkspaceMembers.vue+++ b/frontend/src/views/SettingWorkspaceMembers.vue@@ -1,10 +1,6 @@<template><div class="w-full mx-auto flex flex-col gap-y-4 pb-4">- <NoPermissionPlaceholder- v-if="permissionStore.onlyWorkspaceMember"- class="py-6"- />- <NTabs v-else v-model:value="state.selectedTab" type="line" animated>+ <NTabs v-model:value="state.selectedTab" type="line" animated><NTabPane name="MEMBERS"><template #tab><p class="text-base font-medium leading-7 text-main">@@ -89,12 +85,10 @@ 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 NoPermissionPlaceholder from "@/components/misc/NoPermissionPlaceholder.vue";import { SearchBox } from "@/components/v2";import {pushNotification,useCurrentUserV1,- usePermissionStore,useWorkspaceV1Store,} from "@/store";import { userBindingPrefix } from "@/types";@@ -119,7 +113,6 @@ const { t } = useI18n();const dialog = useDialog();const currentUserV1 = useCurrentUserV1();const workspaceStore = useWorkspaceV1Store();-const permissionStore = usePermissionStore();const state = reactive<LocalState>({searchText: "",diff --git a/frontend/src/views/SettingWorkspaceRole.vue b/frontend/src/views/SettingWorkspaceRole.vueindex 7bb6ab9cb0..c0ccb61bc0 100644--- a/frontend/src/views/SettingWorkspaceRole.vue+++ b/frontend/src/views/SettingWorkspaceRole.vue@@ -5,5 +5,5 @@</template><script lang="ts" setup>-import { RoleSetting } from "@/components/Role";+import RoleSetting from "@/components/Role/RoleSetting.vue";</script>diff --git a/frontend/src/views/SettingWorkspaceSubscription.vue b/frontend/src/views/SettingWorkspaceSubscription.vueindex e0b1d72211..2c38f7b85a 100644--- a/frontend/src/views/SettingWorkspaceSubscription.vue+++ b/frontend/src/views/SettingWorkspaceSubscription.vue@@ -102,7 +102,6 @@</div><divv-if="- allowEdit &&subscriptionStore.isSelfHostLicense &&!actuatorStore.isSaaSMode"@@ -119,7 +118,7 @@<LearnMoreLink url="https://www.bytebase.com/pricing?source=console" /><div class="ml-1 inline-block"><RequireEnterpriseButton- v-if="subscriptionStore.showTrial"+ v-if="subscriptionStore.showTrial && allowEdit"texttype="primary"size="small"@@ -132,13 +131,14 @@<NInputv-model:value="state.license"type="textarea"+ :disabled="!allowEdit":placeholder="$t('common.sensitive-placeholder')"/><div class="ml-auto mt-3"><NButtontype="primary"class="capitalize"- :disabled="disabled"+ :disabled="disabled || !allowEdit"@click="uploadLicense">{{ $t("subscription.upload-license") }}diff --git a/frontend/src/views/Setup/Setup.vue b/frontend/src/views/Setup/Setup.vueindex 4f8ad36c0a..7a477fa0cc 100644--- a/frontend/src/views/Setup/Setup.vue+++ b/frontend/src/views/Setup/Setup.vue@@ -11,6 +11,7 @@ import {useRouter,} from "vue-router";import MaskSpinner from "@/components/misc/MaskSpinner.vue";+import { WORKSPACE_ROUTE_403 } from "@/router/dashboard/workspaceRoutes";import { useRoleStore, useWorkspaceV1Store } from "@/store";import { hasWorkspacePermissionV2 } from "@/utils";import AuthFooter from "@/views/auth/AuthFooter.vue";@@ -45,7 +46,7 @@ onMounted(async () => {if (!checkPermissions(route)) {ready.value = false;router.push({- name: "error.403",+ name: WORKSPACE_ROUTE_403,});return;}diff --git a/frontend/src/views/project/ProjectAuditLogDashboard.vue b/frontend/src/views/project/ProjectAuditLogDashboard.vueindex e501fdc2da..24884705c7 100644--- a/frontend/src/views/project/ProjectAuditLogDashboard.vue+++ b/frontend/src/views/project/ProjectAuditLogDashboard.vue@@ -3,18 +3,24 @@<FeatureAttention :feature="PlanFeature.FEATURE_AUDIT_LOG" /><AuditLogSearch v-model:params="state.params"><template #searchbox-suffix>- <DataExportButton- size="medium"- :support-formats="[- ExportFormat.CSV,- ExportFormat.JSON,- ExportFormat.XLSX,- ]"- :tooltip="disableExportTip"- :view-mode="'DROPDOWN'"- :disabled="!hasAuditLogFeature || !!disableExportTip"- @export="(params) => pagedAuditLogDataTableRef?.handleExport(params)"- />+ <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></template></AuditLogSearch>@@ -38,7 +44,8 @@ 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 { featureToRef } from "@/store";+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";@@ -84,6 +91,10 @@ watch(() => (state.params = defaultSearchParams()));+const { project } = useProjectByName(+ computed(() => `${projectNamePrefix}${props.projectId}`)+);+const { t } = useI18n();const hasAuditLogFeature = featureToRef(PlanFeature.FEATURE_AUDIT_LOG);const pagedAuditLogDataTableRef =diff --git a/frontend/src/views/project/ProjectDatabaseGroupDashboard.vue b/frontend/src/views/project/ProjectDatabaseGroupDashboard.vueindex 7b3450c492..77312112ca 100644--- a/frontend/src/views/project/ProjectDatabaseGroupDashboard.vue+++ b/frontend/src/views/project/ProjectDatabaseGroupDashboard.vue@@ -8,30 +8,36 @@style="max-width: 100%":placeholder="$t('common.filter-by-name')"/>- <NButton- v-if="allowCreate"- type="primary"- @click="- () => {- if (!hasDBGroupFeature) {- state.showFeatureModal = true;- return;- }- router.push({- name: PROJECT_V1_ROUTE_DATABASE_GROUPS_CREATE,- });- }- "+ <PermissionGuardWrapper+ v-slot="slotProps"+ :project="project"+ :permissions="['bb.databaseGroups.create']">- <template #icon>- <PlusIcon class="w-4" />- <FeatureBadge- :feature="PlanFeature.FEATURE_DATABASE_GROUPS"- class="text-white"- />- </template>- {{ $t("database-group.create") }}- </NButton>+ <NButton+ type="primary"+ :disabled="slotProps.disabled"+ @click="+ () => {+ if (!hasDBGroupFeature) {+ state.showFeatureModal = true;+ return;+ }+ router.push({+ name: PROJECT_V1_ROUTE_DATABASE_GROUPS_CREATE,+ });+ }+ "+ >+ <template #icon>+ <PlusIcon class="w-4" />+ <FeatureBadge+ :feature="PlanFeature.FEATURE_DATABASE_GROUPS"+ class="text-white"+ />+ </template>+ {{ $t("database-group.create") }}+ </NButton>+ </PermissionGuardWrapper></div><ProjectDatabaseGroupPanel :project="project" :filter="state.searchText" /></div>@@ -54,12 +60,12 @@ import {FeatureBadge,FeatureModal,} from "@/components/FeatureGuard";+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";import { SearchBox } from "@/components/v2";import { PROJECT_V1_ROUTE_DATABASE_GROUPS_CREATE } from "@/router/dashboard/projectV1";import { hasFeature, useProjectByName } from "@/store";import { projectNamePrefix } from "@/store/modules/v1/common";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";-import { hasProjectPermissionV2 } from "@/utils";interface LocalState {showFeatureModal: boolean;@@ -79,10 +85,6 @@ const state = reactive<LocalState>({searchText: "",});-const allowCreate = computed(() =>- hasProjectPermissionV2(project.value, "bb.databaseGroups.create")-);-const hasDBGroupFeature = computed(() =>hasFeature(PlanFeature.FEATURE_DATABASE_GROUPS));diff --git a/frontend/src/views/project/ProjectMaskingExemption.vue b/frontend/src/views/project/ProjectMaskingExemption.vueindex 8fdc4b0516..02e1f7d240 100644--- a/frontend/src/views/project/ProjectMaskingExemption.vue+++ b/frontend/src/views/project/ProjectMaskingExemption.vue@@ -1,9 +1,10 @@<template><div class="flex flex-col gap-y-4"><div- class="flex flex-col lg:flex-row gap-y-4 justify-between items-end lg:items-center gap-x-2"+ class="flex flex-row justify-between items-center gap-x-2"><DatabaseSelect+ class="hidden sm:block"style="max-width: max-content":placeholder="$t('database.select')":project-name="project.name"@@ -18,30 +19,36 @@style="max-width: 100%":placeholder="$t('settings.members.search-member')"/>- <NButton- v-if="allowCreate"- type="primary"- @click="- () => {- if (!hasSensitiveDataFeature) {- state.showFeatureModal = true;- return;- }- router.push({- name: PROJECT_V1_ROUTE_MASKING_EXEMPTION_CREATE,- });- }- "+ <PermissionGuardWrapper+ v-slot="slotProps"+ :project="project"+ :permissions="['bb.policies.create', 'bb.databases.list']">- <template #icon>- <ShieldCheckIcon class="w-4" />- <FeatureBadge- :feature="PlanFeature.FEATURE_DATA_MASKING"- class="text-white"- />- </template>- {{ $t("project.masking-exemption.grant-exemption") }}- </NButton>+ <NButton+ type="primary"+ :disabled="slotProps.disabled"+ @click="+ () => {+ if (!hasSensitiveDataFeature) {+ state.showFeatureModal = true;+ return;+ }+ router.push({+ name: PROJECT_V1_ROUTE_MASKING_EXEMPTION_CREATE,+ });+ }+ "+ >+ <template #icon>+ <ShieldCheckIcon class="w-4" />+ <FeatureBadge+ :feature="PlanFeature.FEATURE_DATA_MASKING"+ class="text-white"+ />+ </template>+ {{ $t("project.masking-exemption.grant-exemption") }}+ </NButton>+ </PermissionGuardWrapper></div></div><MaskingExceptionUserTable@@ -66,6 +73,7 @@ import { NButton } from "naive-ui";import { computed, reactive } from "vue";import { useRouter } from "vue-router";import { FeatureBadge, FeatureModal } from "@/components/FeatureGuard";+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";import MaskingExceptionUserTable from "@/components/SensitiveData/MaskingExceptionUserTable.vue";import { type AccessUser } from "@/components/SensitiveData/types";import { DatabaseSelect, SearchBox } from "@/components/v2";@@ -73,7 +81,6 @@ import { PROJECT_V1_ROUTE_MASKING_EXEMPTION_CREATE } from "@/router/dashboard/primport { hasFeature, useProjectByName } from "@/store";import { projectNamePrefix } from "@/store/modules/v1/common";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";-import { hasProjectPermissionV2 } from "@/utils";interface LocalState {searchText: string;@@ -99,13 +106,6 @@ const hasSensitiveDataFeature = computed(() => {return hasFeature(PlanFeature.FEATURE_DATA_MASKING);});-const allowCreate = computed(() => {- return (- hasProjectPermissionV2(project.value, "bb.databases.list") &&- hasProjectPermissionV2(project.value, "bb.policies.create")- );-});-const filterAccessUser = (user: AccessUser): boolean => {if (state.searchText.trim() &&diff --git a/frontend/src/views/project/ProjectWebhookDashboard.vue b/frontend/src/views/project/ProjectWebhookDashboard.vueindex 7be428e9df..36733e44eb 100644--- a/frontend/src/views/project/ProjectWebhookDashboard.vue+++ b/frontend/src/views/project/ProjectWebhookDashboard.vue@@ -1,19 +1,141 @@<template>- <ProjectWebhookPanel :project="project" :allow-edit="allowEdit" />+ <div class="flex flex-col gap-y-4">+ <div class="flex items-center justify-end">+ <PermissionGuardWrapper+ v-slot="slotProps"+ :project="project"+ :permissions="['bb.projects.update']"+ >+ <NButton+ type="primary"+ :disabled="slotProps.disabled"+ @click.prevent="addProjectWebhook"+ >+ <template #icon>+ <PlusIcon class="h-4 w-4" />+ </template>+ {{ $t("project.webhook.add-a-webhook") }}+ </NButton>+ </PermissionGuardWrapper>+ </div>+ <NDataTable+ :data="project.webhooks"+ :columns="columnList"+ :striped="true"+ :row-key="(webhook: Webhook) => webhook.name"+ :bordered="true"+ />+ </div></template>-<script setup lang="ts">-import { computed } from "vue";-import ProjectWebhookPanel from "@/components/ProjectWebhookPanel.vue";+<script setup lang="tsx">+import { PlusIcon } from "lucide-vue-next";+import type { DataTableColumn } from "naive-ui";+import { NButton, NDataTable, NTag } from "naive-ui";+import { computed, h } from "vue";+import { useI18n } from "vue-i18n";+import { useRouter } from "vue-router";+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";+import WebhookTypeIcon from "@/components/Project/WebhookTypeIcon.vue";+import {+ PROJECT_V1_ROUTE_WEBHOOK_CREATE,+ PROJECT_V1_ROUTE_WEBHOOK_DETAIL,+} from "@/router/dashboard/projectV1";import { useProjectByName } from "@/store";import { projectNamePrefix } from "@/store/modules/v1/common";+import { projectWebhookV1ActivityItemList } from "@/types";+import type { Webhook } from "@/types/proto-es/v1/project_service_pb";+import { Activity_Type } from "@/types/proto-es/v1/project_service_pb";+import { projectWebhookV1Slug } from "@/utils";const props = defineProps<{projectId: string;allowEdit: boolean;}>();+const router = useRouter();+const { t } = useI18n();+const { project } = useProjectByName(computed(() => `${projectNamePrefix}${props.projectId}`));++const addProjectWebhook = () => {+ router.push({+ name: PROJECT_V1_ROUTE_WEBHOOK_CREATE,+ });+};++const columnList = computed((): DataTableColumn<Webhook>[] => {+ return [+ {+ key: "title",+ title: t("common.name"),+ width: "15rem",+ resizable: true,+ render: (webhook) =>+ h("div", { class: "flex items-center gap-x-2" }, [+ h(WebhookTypeIcon, { type: webhook.type, class: "w-5 h-5" }),+ webhook.title,+ ]),+ },+ {+ key: "url",+ title: "URL",+ resizable: true,+ ellipsis: true,+ render: (webhook) => webhook.url,+ },+ {+ key: "triggering",+ title: t("project.webhook.triggering-activity"),+ resizable: true,+ render: (webhook) => {+ const wellknownActivityItemList = projectWebhookV1ActivityItemList();+ const list = webhook.notificationTypes.map((activity) => {+ const item = wellknownActivityItemList.find(+ (item) => item.activity === activity+ );+ if (item) {+ return item.title;+ }+ return Activity_Type[activity] || `ACTIVITY_${activity}`;+ });++ return (+ <div class="flex flex-wrap gap-2">+ {list.map((title) => (+ <NTag size="small">{title}</NTag>+ ))}+ </div>+ );+ },+ },+ {+ key: "actions",+ title: "",+ width: "5rem",+ render: (webhook) =>+ h(+ "div",+ { class: "flex justify-end" },+ h(+ NButton,+ {+ size: "small",+ onClick: () => {+ router.push({+ name: PROJECT_V1_ROUTE_WEBHOOK_DETAIL,+ params: {+ projectWebhookSlug: projectWebhookV1Slug(webhook),+ },+ });+ },+ },+ { default: () => t("common.view") }+ )+ ),+ },+ ];+});</script>diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.mdindex 8df6818db8..9abac2c80c 100644--- a/proto/gen/grpc-doc/v1/README.md+++ b/proto/gen/grpc-doc/v1/README.md@@ -12,6 +12,7 @@- [File-level Extensions](#v1_annotation-proto-extensions)- [v1/common.proto](#v1_common-proto)+ - [PermissionDeniedDetail](#bytebase-v1-PermissionDeniedDetail)- [Position](#bytebase-v1-Position)- [Range](#bytebase-v1-Range)@@ -718,6 +719,24 @@ Authorization method for RPC calls.+<a name="bytebase-v1-PermissionDeniedDetail"></a>++### PermissionDeniedDetail+PermissionDeniedDetail provides structured information about permission failures.+Used as error detail when returning CodePermissionDenied errors.+++| Field | Type | Label | Description |+| ----- | ---- | ----- | ----------- |+| method | [string](#string) | | The API method that was called. |+| required_permissions | [string](#string) | repeated | The permissions required but not granted to the user. |+| resources | [string](#string) | repeated | The resources the user was trying to access. |++++++<a name="bytebase-v1-Position"></a>### Positiondiff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.htmlindex 5937f2f044..76f84d1982 100644--- a/proto/gen/grpc-doc/v1/index.html+++ b/proto/gen/grpc-doc/v1/index.html@@ -209,6 +209,10 @@<a href="#v1%2fcommon.proto">v1/common.proto</a><ul>+ <li>+ <a href="#bytebase.v1.PermissionDeniedDetail"><span class="badge">M</span>PermissionDeniedDetail</a>+ </li>+<li><a href="#bytebase.v1.Position"><span class="badge">M</span>Position</a></li>@@ -2816,6 +2820,44 @@<p></p>+ <h3 id="bytebase.v1.PermissionDeniedDetail">PermissionDeniedDetail</h3>+ <p>PermissionDeniedDetail provides structured information about permission failures.</p><p>Used as error detail when returning CodePermissionDenied errors.</p>+++ <table class="field-table">+ <thead>+ <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>+ </thead>+ <tbody>++ <tr>+ <td>method</td>+ <td><a href="#string">string</a></td>+ <td></td>+ <td><p>The API method that was called. </p></td>+ </tr>++ <tr>+ <td>required_permissions</td>+ <td><a href="#string">string</a></td>+ <td>repeated</td>+ <td><p>The permissions required but not granted to the user. </p></td>+ </tr>++ <tr>+ <td>resources</td>+ <td><a href="#string">string</a></td>+ <td>repeated</td>+ <td><p>The resources the user was trying to access. </p></td>+ </tr>++ </tbody>+ </table>+++++<h3 id="bytebase.v1.Position">Position</h3><p>Position in a text expressed as one-based line and one-based column.</p><p>We use 1-based numbering to match the majority of industry standards:</p><p>- Monaco Editor uses 1-based (https://microsoft.github.io/monaco-editor/typedoc/interfaces/IPosition.html)</p><p>- GitHub Actions uses 1-based (https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#setting-an-error-message)</p><p>- Most text editors display 1-based positions to users</p><p>Note: LSP uses 0-based (https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#position),</p><p>but we follow the canonical user-facing standards.</p><p>Handling unknown positions:</p><p>- If the entire position is unknown, leave this field as nil/undefined</p><p>- If only line is known, set line and leave column as 0 (e.g., line=5, column=0)</p><p>- If only column is known (rare), set column and leave line as 0</p><p>Frontends should check for nil/undefined/zero values and handle them appropriately.</p>diff --git a/proto/v1/v1/common.proto b/proto/v1/v1/common.protoindex c68e98f075..a48d1f3d25 100644--- a/proto/v1/v1/common.proto+++ b/proto/v1/v1/common.proto@@ -168,3 +168,14 @@ enum WebhookType {// Lark integration.LARK = 7;}++// PermissionDeniedDetail provides structured information about permission failures.+// Used as error detail when returning CodePermissionDenied errors.+message PermissionDeniedDetail {+ // The API method that was called.+ string method = 1;+ // The permissions required but not granted to the user.+ repeated string required_permissions = 2;+ // The resources the user was trying to access.+ repeated string resources = 3;+}