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: add id field to ApprovalTemplate and implement built-in flow system (#17689)
Danny Xuaf2b4acbe661
diff --git a/backend/api/v1/issue_service_convert.go b/backend/api/v1/issue_service_convert.goindex 2516200753..bbeacc349a 100644--- a/backend/api/v1/issue_service_convert.go+++ b/backend/api/v1/issue_service_convert.go@@ -242,6 +242,7 @@ func convertToIssueRiskLevel(riskLevel storepb.RiskLevel) v1pb.RiskLevel {func convertToApprovalTemplate(template *storepb.ApprovalTemplate) *v1pb.ApprovalTemplate {return &v1pb.ApprovalTemplate{+ Id: template.Id,Flow: convertToApprovalFlow(template.Flow),Title: template.Title,Description: template.Description,diff --git a/backend/api/v1/setting_service.go b/backend/api/v1/setting_service.goindex 080a4d8523..95306fed63 100644--- a/backend/api/v1/setting_service.go+++ b/backend/api/v1/setting_service.go@@ -291,6 +291,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Reqpayload.Rules = append(payload.Rules, &storepb.WorkspaceApprovalSetting_Rule{Condition: rule.Condition,Template: &storepb.ApprovalTemplate{+ Id: rule.Template.Id,Flow: flow,Title: rule.Template.Title,Description: rule.Template.Description,diff --git a/backend/generated-go/store/approval.pb.go b/backend/generated-go/store/approval.pb.goindex 2bf6073ea0..b0fa79756a 100644--- a/backend/generated-go/store/approval.pb.go+++ b/backend/generated-go/store/approval.pb.go@@ -154,10 +154,14 @@ func (x *IssuePayloadApproval) GetRiskLevel() RiskLevel {}type ApprovalTemplate struct {- state protoimpl.MessageState `protogen:"open.v1"`- Flow *ApprovalFlow `protobuf:"bytes,1,opt,name=flow,proto3" json:"flow,omitempty"`- Title string `protobuf:"bytes,2,opt,name=title,proto3" json:"title,omitempty"`- Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`+ state protoimpl.MessageState `protogen:"open.v1"`+ // The unique identifier for the approval template.+ // For built-in templates, use "bb." prefix (e.g., "bb.project-owner", "bb.workspace-dba").+ // For custom templates, use a UUID or other unique identifier.+ Id string `protobuf:"bytes,4,opt,name=id,proto3" json:"id,omitempty"`+ Flow *ApprovalFlow `protobuf:"bytes,1,opt,name=flow,proto3" json:"flow,omitempty"`+ Title string `protobuf:"bytes,2,opt,name=title,proto3" json:"title,omitempty"`+ Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache}@@ -192,6 +196,13 @@ func (*ApprovalTemplate) Descriptor() ([]byte, []int) {return file_store_approval_proto_rawDescGZIP(), []int{1}}+func (x *ApprovalTemplate) GetId() string {+ if x != nil {+ return x.Id+ }+ return ""+}+func (x *ApprovalTemplate) GetFlow() *ApprovalFlow {if x != nil {return x.Flow@@ -330,8 +341,9 @@ const file_store_approval_proto_rawDesc = "" +"\x12STATUS_UNSPECIFIED\x10\x00\x12\v\n" +"\aPENDING\x10\x01\x12\f\n" +"\bAPPROVED\x10\x02\x12\f\n" +- "\bREJECTED\x10\x03\"|\n" +- "\x10ApprovalTemplate\x120\n" ++ "\bREJECTED\x10\x03\"\x8c\x01\n" ++ "\x10ApprovalTemplate\x12\x0e\n" ++ "\x02id\x18\x04 \x01(\tR\x02id\x120\n" +"\x04flow\x18\x01 \x01(\v2\x1c.bytebase.store.ApprovalFlowR\x04flow\x12\x14\n" +"\x05title\x18\x02 \x01(\tR\x05title\x12 \n" +"\vdescription\x18\x03 \x01(\tR\vdescription\"$\n" +diff --git a/backend/generated-go/store/approval_equal.pb.go b/backend/generated-go/store/approval_equal.pb.goindex 95c04d2a67..24ab61d434 100644--- a/backend/generated-go/store/approval_equal.pb.go+++ b/backend/generated-go/store/approval_equal.pb.go@@ -56,6 +56,9 @@ func (x *ApprovalTemplate) Equal(y *ApprovalTemplate) bool {if x == nil || y == nil {return x == nil && y == nil}+ if x.Id != y.Id {+ return false+ }if !x.Flow.Equal(y.Flow) {return false}diff --git a/backend/generated-go/v1/issue_service.pb.go b/backend/generated-go/v1/issue_service.pb.goindex a4bc1f7741..a389ffea9d 100644--- a/backend/generated-go/v1/issue_service.pb.go+++ b/backend/generated-go/v1/issue_service.pb.go@@ -1404,10 +1404,14 @@ func (x *GrantRequest) GetExpiration() *durationpb.Duration {}type ApprovalTemplate struct {- state protoimpl.MessageState `protogen:"open.v1"`- Flow *ApprovalFlow `protobuf:"bytes,1,opt,name=flow,proto3" json:"flow,omitempty"`- Title string `protobuf:"bytes,2,opt,name=title,proto3" json:"title,omitempty"`- Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`+ state protoimpl.MessageState `protogen:"open.v1"`+ // The unique identifier for the approval template.+ // For built-in templates, use "bb." prefix (e.g., "bb.project-owner", "bb.workspace-dba").+ // For custom templates, use a UUID or other unique identifier.+ Id string `protobuf:"bytes,4,opt,name=id,proto3" json:"id,omitempty"`+ Flow *ApprovalFlow `protobuf:"bytes,1,opt,name=flow,proto3" json:"flow,omitempty"`+ Title string `protobuf:"bytes,2,opt,name=title,proto3" json:"title,omitempty"`+ Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache}@@ -1442,6 +1446,13 @@ func (*ApprovalTemplate) Descriptor() ([]byte, []int) {return file_v1_issue_service_proto_rawDescGZIP(), []int{14}}+func (x *ApprovalTemplate) GetId() string {+ if x != nil {+ return x.Id+ }+ return ""+}+func (x *ApprovalTemplate) GetFlow() *ApprovalFlow {if x != nil {return x.Flow@@ -2493,8 +2504,9 @@ const file_v1_issue_service_proto_rawDesc = "" +"\tcondition\x18\x03 \x01(\v2\x11.google.type.ExprR\tcondition\x129\n" +"\n" +"expiration\x18\x04 \x01(\v2\x19.google.protobuf.DurationR\n" +- "expiration\"y\n" +- "\x10ApprovalTemplate\x12-\n" ++ "expiration\"\x89\x01\n" ++ "\x10ApprovalTemplate\x12\x0e\n" ++ "\x02id\x18\x04 \x01(\tR\x02id\x12-\n" +"\x04flow\x18\x01 \x01(\v2\x19.bytebase.v1.ApprovalFlowR\x04flow\x12\x14\n" +"\x05title\x18\x02 \x01(\tR\x05title\x12 \n" +"\vdescription\x18\x03 \x01(\tR\vdescription\"$\n" +diff --git a/backend/generated-go/v1/issue_service_equal.pb.go b/backend/generated-go/v1/issue_service_equal.pb.goindex 2a7815893b..802cdc45ef 100644--- a/backend/generated-go/v1/issue_service_equal.pb.go+++ b/backend/generated-go/v1/issue_service_equal.pb.go@@ -379,6 +379,9 @@ func (x *ApprovalTemplate) Equal(y *ApprovalTemplate) bool {if x == nil || y == nil {return x == nil && y == nil}+ if x.Id != y.Id {+ return false+ }if !x.Flow.Equal(y.Flow) {return false}diff --git a/backend/migrator/migration/3.11/0012##add_approval_template_id.sql b/backend/migrator/migration/3.11/0012##add_approval_template_id.sqlnew file mode 100644index 0000000000..0fb5fd65bc--- /dev/null+++ b/backend/migrator/migration/3.11/0012##add_approval_template_id.sql@@ -0,0 +1,151 @@+-- Add id field to ApprovalTemplate and identify built-in vs custom flows+--+-- This migration adds the 'id' field to all approval templates and assigns appropriate IDs:+-- - Built-in flows get "bb.*" prefix (e.g., "bb.project-owner", "bb.workspace-dba")+-- - Custom flows get a generated UUID+--+-- Detection logic for built-in flows:+-- Built-in flows are identified by their role combinations:+-- - bb.project-owner: [roles/projectOwner]+-- - bb.workspace-dba: [roles/workspaceDBA]+-- - bb.workspace-admin: [roles/workspaceAdmin]+-- - bb.project-owner-workspace-dba: [roles/projectOwner, roles/workspaceDBA]+-- - bb.project-owner-workspace-dba-workspace-admin: [roles/projectOwner, roles/workspaceDBA, roles/workspaceAdmin]+--+-- This migration also cleans up, trims, and merges approval templates:+-- - Step 1: Removes unused templates (empty/null conditions) upfront+-- - Step 2: Adds IDs to remaining templates+-- - Step 3: Deduplicates templates with the same ID+-- - Step 4: Merges conditions for duplicate templates using OR logic+--+-- Affected data:+-- 1. setting table: WorkspaceApprovalSetting stored as text (JSON)+-- 2. issue table: Issue.payload JSONB containing approvalTemplate+--+-- Note: Since protojson.Marshal produces camelCased keys, we work with:+-- - "approvalTemplate" and "flow.roles"++-- Helper function to detect built-in flow ID based on roles array+CREATE OR REPLACE FUNCTION detect_builtin_flow_id(roles jsonb)+RETURNS text AS $$+DECLARE+ roles_array text[];+ sorted_roles text;+BEGIN+ -- Extract roles as plain text (without quotes) and sort them+ SELECT array_agg(value ORDER BY value)+ INTO roles_array+ FROM jsonb_array_elements_text(roles);++ sorted_roles := array_to_string(roles_array, ',');++ -- Match against known built-in flow patterns+ CASE sorted_roles+ WHEN 'roles/projectOwner' THEN+ RETURN 'bb.project-owner';+ WHEN 'roles/workspaceDBA' THEN+ RETURN 'bb.workspace-dba';+ WHEN 'roles/workspaceAdmin' THEN+ RETURN 'bb.workspace-admin';+ WHEN 'roles/projectOwner,roles/workspaceDBA' THEN+ RETURN 'bb.project-owner-workspace-dba';+ WHEN 'roles/projectOwner,roles/workspaceAdmin,roles/workspaceDBA' THEN+ RETURN 'bb.project-owner-workspace-dba-workspace-admin';+ ELSE+ -- Not a built-in flow, return NULL to indicate custom flow+ RETURN NULL;+ END CASE;+END;+$$ LANGUAGE plpgsql IMMUTABLE;++-- Update workspace approval settings in the setting table+UPDATE setting+SET value = (+ WITH+ -- Step 1: Filter out rules with empty or null conditions (unused templates)+ rules_with_valid_conditions AS (+ SELECT rule+ FROM jsonb_array_elements((value::jsonb)->'rules') AS rule+ WHERE rule->'condition' IS NOT NULL+ AND rule->'condition'::text != 'null'+ AND rule->'condition'->>'expression' IS NOT NULL+ AND rule->'condition'->>'expression' != ''+ ),+ -- Step 2: Add IDs to all remaining templates+ rules_with_ids AS (+ SELECT+ rule->'condition' AS condition,+ jsonb_build_object(+ 'id', COALESCE(+ detect_builtin_flow_id(rule->'template'->'flow'->'roles'),+ COALESCE(rule->'template'->>'id', gen_random_uuid()::text)+ ),+ 'flow', rule->'template'->'flow',+ 'title', rule->'template'->'title',+ 'description', rule->'template'->'description'+ ) AS template+ FROM rules_with_valid_conditions+ ),+ -- Step 3: Find unique templates by deduplicating on template ID+ unique_templates AS (+ SELECT DISTINCT ON (template->>'id')+ template->>'id' AS template_id,+ template+ FROM rules_with_ids+ ),+ -- Step 4: Group conditions by template_id and merge expressions with OR logic+ merged_conditions AS (+ SELECT+ template->>'id' AS template_id,+ -- Merge multiple conditions for the same template using OR logic+ -- If there's only one condition, use it as-is+ -- If there are multiple, join with || without extra parentheses+ CASE+ WHEN COUNT(*) = 1 THEN+ MAX(condition->>'expression')+ ELSE+ string_agg(condition->>'expression', ' || ' ORDER BY condition->>'expression')+ END AS merged_expression+ FROM rules_with_ids+ GROUP BY template->>'id'+ ),+ -- Step 5: Build final rules array with merged conditions+ final_rules AS (+ SELECT jsonb_build_object(+ 'condition', jsonb_build_object(+ 'expression', m.merged_expression+ ),+ 'template', t.template+ ) AS rule+ FROM merged_conditions m+ JOIN unique_templates t ON m.template_id = t.template_id+ )+ SELECT jsonb_build_object(+ 'rules',+ COALESCE((SELECT jsonb_agg(rule) FROM final_rules), '[]'::jsonb)+ )::text+)+WHERE name = 'WORKSPACE_APPROVAL'+ AND value::jsonb->'rules' IS NOT NULL;++-- Update issue approval template in the issue table+UPDATE issue+SET payload = jsonb_set(+ payload,+ '{approval,approvalTemplate}',+ jsonb_build_object(+ 'id', COALESCE(+ detect_builtin_flow_id((payload->'approval'->'approvalTemplate'->'flow'->'roles')::jsonb),+ -- If not a built-in flow, preserve existing ID or generate new UUID+ COALESCE(payload->'approval'->'approvalTemplate'->>'id', gen_random_uuid()::text)+ ),+ 'flow', payload->'approval'->'approvalTemplate'->'flow',+ 'title', payload->'approval'->'approvalTemplate'->'title',+ 'description', payload->'approval'->'approvalTemplate'->'description'+ )+)+WHERE payload->'approval'->'approvalTemplate' IS NOT NULL+ AND payload->'approval'->'approvalTemplate'->'flow'->'roles' IS NOT NULL;++-- Clean up: Drop the helper function+DROP FUNCTION IF EXISTS detect_builtin_flow_id(jsonb);diff --git a/backend/migrator/migrator_test.go b/backend/migrator/migrator_test.goindex b8ded3d6da..113e976828 100644--- a/backend/migrator/migrator_test.go+++ b/backend/migrator/migrator_test.go@@ -12,7 +12,7 @@ import (func TestLatestVersion(t *testing.T) {files, err := getSortedVersionedFiles()require.NoError(t, err)- require.Equal(t, semver.MustParse("3.11.11"), *files[len(files)-1].version)+ require.Equal(t, semver.MustParse("3.11.12"), *files[len(files)-1].version)}func TestVersionUnique(t *testing.T) {diff --git a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/FlowsPanel/FlowTable.vue b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/FlowsPanel/FlowTable.vueindex 546dbbb32b..0ce02a58d7 100644--- a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/FlowsPanel/FlowTable.vue+++ b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/FlowsPanel/FlowTable.vue@@ -1,12 +1,44 @@<template>- <NDataTable- size="small"- :columns="columns"- :data="store.config.rules"- :striped="true"- :bordered="true"- :row-key="(rule: LocalApprovalRule) => rule.uid"- />+ <div class="space-y-6">+ <!-- Built-in Flows Section -->+ <div class="space-y-2">+ <div class="flex items-center justify-between">+ <h3 class="text-base font-medium">+ {{ $t("custom-approval.approval-flow.built-in") }}+ </h3>+ <span class="text-sm text-control-light">+ {{ $t("common.read-only") }}+ </span>+ </div>+ <NDataTable+ size="small"+ :columns="builtinColumns"+ :data="builtinFlows"+ :striped="true"+ :bordered="true"+ :row-key="(flow: BuiltinApprovalFlow) => flow.id"+ />+ </div>++ <!-- Custom Flows Section -->+ <div class="space-y-2">+ <h3 class="text-base font-medium">+ {{ $t("custom-approval.approval-flow.custom") }}+ </h3>+ <NDataTable+ v-if="customRules.length > 0"+ size="small"+ :columns="customColumns"+ :data="customRules"+ :striped="true"+ :bordered="true"+ :row-key="(rule: LocalApprovalRule) => rule.template.id"+ />+ <div v-else class="text-sm text-control-light py-4 text-center">+ {{ $t("custom-approval.approval-flow.no-custom-flows") }}+ </div>+ </div>+ </div><BBModalv-if="state.viewFlow"@@ -20,6 +52,7 @@</template><script lang="tsx" setup>+import { create as createProto } from "@bufbuild/protobuf";import { NButton, NDataTable } from "naive-ui";import type { DataTableColumn } from "naive-ui";import { computed, reactive } from "vue";@@ -27,8 +60,14 @@ import { useI18n } from "vue-i18n";import { BBModal } from "@/bbkit";import { SpinnerButton } from "@/components/v2/Form";import { pushNotification, useWorkspaceApprovalSettingStore } from "@/store";-import type { LocalApprovalRule } from "@/types";+import {+ type LocalApprovalRule,+ BUILTIN_APPROVAL_FLOWS,+ type BuiltinApprovalFlow,+ isBuiltinFlowId,+} from "@/types";import type { ApprovalFlow } from "@/types/proto-es/v1/issue_service_pb";+import { ApprovalFlowSchema } from "@/types/proto-es/v1/issue_service_pb";import { StepsTable } from "../common";import { useCustomApprovalContext } from "../context";@@ -44,7 +83,86 @@ const store = useWorkspaceApprovalSettingStore();const context = useCustomApprovalContext();const { hasFeature, showFeatureModal, allowAdmin, dialog } = context;-const columns = computed((): DataTableColumn<LocalApprovalRule>[] => {+const builtinFlows = computed(() => [...BUILTIN_APPROVAL_FLOWS]);++const customRules = computed(() => {+ return store.config.rules.filter(+ (rule) => !isBuiltinFlowId(rule.template.id)+ );+});++// Helper: View flow details in modal+const viewFlow = (flow: ApprovalFlow) => {+ state.viewFlow = flow;+};++// Helper: Convert BuiltinApprovalFlow to ApprovalFlow proto for viewing+const viewBuiltinFlow = (builtinFlow: BuiltinApprovalFlow) => {+ state.viewFlow = createProto(ApprovalFlowSchema, {+ roles: [...builtinFlow.roles],+ });+};++// Helper: Render approval nodes button+const renderNodesButton = (rolesCount: number, onClick: () => void) => (+ <NButton+ quaternary+ size="small"+ type="info"+ class="!rounded !w-[var(--n-height)] !p-0"+ onClick={onClick}+ >+ {rolesCount}+ </NButton>+);++// Shared column definitions+const createNameColumn = <T extends { title: string }>(+ key: string = "name"+): DataTableColumn<T> => ({+ title: t("common.name"),+ key,+ render: (item) => <div class="whitespace-nowrap">{item.title}</div>,+});++const createDescriptionColumn = <T extends { description: string }>(+ key: string = "description"+): DataTableColumn<T> => ({+ title: t("common.description"),+ key,+ render: (item) => item.description,+});++// Columns for built-in flows (read-only)+const builtinColumns = computed((): DataTableColumn<BuiltinApprovalFlow>[] => {+ return [+ createNameColumn<BuiltinApprovalFlow>(),+ {+ title: t("custom-approval.approval-flow.approval-nodes"),+ key: "nodes",+ width: 120,+ align: "center",+ render: (flow) =>+ renderNodesButton(flow.roles.length, () => viewBuiltinFlow(flow)),+ },+ createDescriptionColumn<BuiltinApprovalFlow>(),+ {+ title: t("common.operations"),+ key: "operations",+ width: 200,+ render: (flow) => (+ <div class="flex gap-x-2">+ <NButton size="small" onClick={() => viewBuiltinFlow(flow)}>+ {t("common.view")}+ </NButton>+ </div>+ ),+ },+ ];+});++// Columns for custom flows (editable)+const customColumns = computed((): DataTableColumn<LocalApprovalRule>[] => {return [{title: t("common.name"),@@ -58,17 +176,10 @@ const columns = computed((): DataTableColumn<LocalApprovalRule>[] => {key: "nodes",width: 120,align: "center",- render: (rule) => (- <NButton- quaternary- size="small"- type="info"- class="!rounded !w-[var(--n-height)] !p-0"- onClick={() => (state.viewFlow = rule.template.flow)}- >- {rule.template.flow?.roles.length}- </NButton>- ),+ render: (rule) =>+ renderNodesButton(rule.template.flow?.roles.length ?? 0, () =>+ viewFlow(rule.template.flow!)+ ),},{title: t("common.description"),diff --git a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RuleSelect.vue b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RuleSelect.vueindex 9c8752baf1..f2d9680506 100644--- a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RuleSelect.vue+++ b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RuleSelect.vue@@ -37,6 +37,7 @@ import { computed, useAttrs } from "vue";import { useI18n } from "vue-i18n";import { SpinnerSelect } from "@/components/v2/Form";import { useWorkspaceApprovalSettingStore } from "@/store";+import { BUILTIN_APPROVAL_FLOWS, isBuiltinFlowId } from "@/types";import type { VueClass, VueStyle } from "@/utils";import { useCustomApprovalContext } from "../context";@@ -69,18 +70,57 @@ const selectAttrs = computed(() => ({}));const options = computed(() => {- const ruleOptions = store.config.rules.map<SelectOption>((rule) => ({- label: rule.template.title,- value: rule.uid,+ // Custom flow options (filter out built-in flows that are in the database)+ const customRuleOptions = store.config.rules+ .filter((rule) => !isBuiltinFlowId(rule.template.id))+ .map<SelectOption>((rule) => ({+ label: rule.template.title,+ value: rule.template.id,+ }));++ // Built-in flow options - only show most commonly used ones+ const commonBuiltinFlows = [+ "bb.project-owner",+ "bb.workspace-dba",+ "bb.project-owner-workspace-dba",+ ];++ const builtinOptions = BUILTIN_APPROVAL_FLOWS.filter((flow) =>+ commonBuiltinFlows.includes(flow.id)+ ).map<SelectOption>((flow) => ({+ label: flow.title,+ value: flow.id,}));- return [++ const options: SelectOption[] = [{ value: "", label: t("custom-approval.approval-flow.skip") },- ...ruleOptions,];++ // Add custom flows group FIRST (most likely to be selected)+ if (customRuleOptions.length > 0) {+ options.push({+ type: "group",+ label: t("custom-approval.approval-flow.custom"),+ key: "custom-group",+ children: customRuleOptions,+ } as SelectOption);+ }++ // Add built-in flows group SECOND (less commonly used)+ if (builtinOptions.length > 0) {+ options.push({+ type: "group",+ label: t("custom-approval.approval-flow.built-in"),+ key: "builtin-group",+ children: builtinOptions,+ } as SelectOption);+ }++ return options;});const selectedRule = computed(() => {- return store.config.rules.find((rule) => rule.uid === props.value);+ return store.config.rules.find((rule) => rule.template.id === props.value);});const toApprovalFlow = () => {diff --git a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RulesSection.vue b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RulesSection.vueindex ce67c3a81d..7f0c9a06ed 100644--- a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RulesSection.vue+++ b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RulesSection.vue@@ -34,7 +34,7 @@ import RuleSelect from "./RuleSelect.vue";type Row = {level: number;- rule: string | undefined; // LocalApprovalRule.uid+ rule: string | undefined; // ApprovalTemplate.id};const props = defineProps<{diff --git a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/logic/utils.ts b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/logic/utils.tsindex 83e4c47040..98be58afe3 100644--- a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/logic/utils.ts+++ b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/logic/utils.ts@@ -5,8 +5,8 @@ import { ApprovalTemplateSchema } from "@/types/proto-es/v1/issue_service_pb";export const emptyLocalApprovalRule = (): LocalApprovalRule => {return {- uid: uuidv4(),template: createProto(ApprovalTemplateSchema, {+ id: uuidv4(),flow: {roles: [],},diff --git a/frontend/src/locales/dynamic/en-US.json b/frontend/src/locales/dynamic/en-US.jsonindex 130303c250..966b88d913 100644--- a/frontend/src/locales/dynamic/en-US.json+++ b/frontend/src/locales/dynamic/en-US.json@@ -1,21 +1,11 @@{"custom-approval": {- "approval-flow": {- "node": {- "group": {- "WORKSPACE_OWNER": "Workspace Admin",- "WORKSPACE_DBA": "DBA",- "PROJECT_OWNER": "Project Owner",- "PROJECT_MEMBER": "Project Developer"- }- },- "presets": {- "owner-dba": "The system defines the approval process, first the project Owner approves, then the DBA approves.",- "owner": "The system defines the approval process and only needs the project Owner to approve it.",- "dba": "The system defines the approval process and only needs DBA approval.",- "admin": "The system defines the approval process and only needs Administrator approval.",- "owner-dba-admin": "The system defines the approval process, first the project Owner approves, then the DBA approves, and finally the Administrator approves."- }+ "approval-flow-builtin": {+ "project-owner": "The system defines the approval process and only needs the project Owner to approve it.",+ "workspace-dba": "The system defines the approval process and only needs DBA approval.",+ "workspace-admin": "The system defines the approval process and only needs Administrator approval.",+ "project-owner-workspace-dba": "The system defines the approval process, first the project Owner approves, then the DBA approves.",+ "project-owner-workspace-dba-workspace-admin": "The system defines the approval process, first the project Owner approves, then the DBA approves, and finally the Administrator approves."},"risk-rule": {"template": {diff --git a/frontend/src/locales/dynamic/es-ES.json b/frontend/src/locales/dynamic/es-ES.jsonindex bfc5017440..6b679de057 100644--- a/frontend/src/locales/dynamic/es-ES.json+++ b/frontend/src/locales/dynamic/es-ES.json@@ -1,21 +1,11 @@{"custom-approval": {- "approval-flow": {- "node": {- "group": {- "WORKSPACE_OWNER": "Administrador del espacio de trabajo",- "WORKSPACE_DBA": "DBA",- "PROJECT_OWNER": "Propietario del proyecto",- "PROJECT_MEMBER": "Desarrollador del proyecto"- }- },- "presets": {- "owner-dba": "El sistema define el proceso de aprobación, primero aprueba el dueño del proyecto, luego el DBA lo aprueba.",- "owner": "El sistema define el proceso de aprobación y solo necesita la aprobación del dueño del proyecto.",- "dba": "El sistema define el proceso de aprobación y solo necesita la aprobación del DBA.",- "admin": "El sistema define el proceso de aprobación y solo necesita la aprobación del administrador.",- "owner-dba-admin": "El sistema define el proceso de aprobación, primero aprueba el dueño del proyecto, luego el DBA lo aprueba y finalmente el administrador lo aprueba."- }+ "approval-flow-builtin": {+ "project-owner": "El sistema define el proceso de aprobación y solo necesita la aprobación del dueño del proyecto.",+ "workspace-dba": "El sistema define el proceso de aprobación y solo necesita la aprobación del DBA.",+ "workspace-admin": "El sistema define el proceso de aprobación y solo necesita la aprobación del administrador.",+ "project-owner-workspace-dba": "El sistema define el proceso de aprobación, primero aprueba el dueño del proyecto, luego el DBA lo aprueba.",+ "project-owner-workspace-dba-workspace-admin": "El sistema define el proceso de aprobación, primero aprueba el dueño del proyecto, luego el DBA lo aprueba y finalmente el administrador lo aprueba."},"risk-rule": {"template": {diff --git a/frontend/src/locales/dynamic/ja-JP.json b/frontend/src/locales/dynamic/ja-JP.jsonindex 8b89ba2be6..ea432cc379 100644--- a/frontend/src/locales/dynamic/ja-JP.json+++ b/frontend/src/locales/dynamic/ja-JP.json@@ -1,21 +1,11 @@{"custom-approval": {- "approval-flow": {- "node": {- "group": {- "WORKSPACE_OWNER": "ワークスペース管理者",- "WORKSPACE_DBA": "DBA",- "PROJECT_OWNER": "プロジェクトオーナー",- "PROJECT_MEMBER": "プロジェクト開発者"- }- },- "presets": {- "owner-dba": "システム定義のプロセス。承認は最初にプロジェクト所有者によって行われ、次に DBA によって行われます。",- "owner": "システム定義のプロセス。プロジェクト所有者の承認のみが必要です。",- "dba": "システム定義のプロセス。 DBA の承認のみが必要です。",- "admin": "システム定義のプロセス。管理者の承認のみが必要です。",- "owner-dba-admin": "システム定義のプロセス。承認は、最初にプロジェクト所有者によって行われ、次に DBA、最後に管理者によって行われます。"- }+ "approval-flow-builtin": {+ "project-owner": "システム定義のプロセス。プロジェクト所有者の承認のみが必要です。",+ "workspace-dba": "システム定義のプロセス。 DBA の承認のみが必要です。",+ "workspace-admin": "システム定義のプロセス。管理者の承認のみが必要です。",+ "project-owner-workspace-dba": "システム定義のプロセス。承認は最初にプロジェクト所有者によって行われ、次に DBA によって行われます。",+ "project-owner-workspace-dba-workspace-admin": "システム定義のプロセス。承認は、最初にプロジェクト所有者によって行われ、次に DBA、最後に管理者によって行われます。"},"risk-rule": {"template": {diff --git a/frontend/src/locales/dynamic/vi-VN.json b/frontend/src/locales/dynamic/vi-VN.jsonindex 9ee3bf1c6c..1cba510ae6 100644--- a/frontend/src/locales/dynamic/vi-VN.json+++ b/frontend/src/locales/dynamic/vi-VN.json@@ -1,21 +1,11 @@{"custom-approval": {- "approval-flow": {- "node": {- "group": {- "WORKSPACE_OWNER": "Quản trị viên không gian làm việc",- "WORKSPACE_DBA": "DBA",- "PROJECT_OWNER": "Chủ sở hữu dự án",- "PROJECT_MEMBER": "Nhà phát triển dự án"- }- },- "presets": {- "owner-dba": "Hệ thống xác định quy trình phê duyệt, đầu tiên là Chủ sở hữu dự án phê duyệt, sau đó là DBA phê duyệt.",- "owner": "Hệ thống xác định quy trình phê duyệt và chỉ cần Chủ sở hữu dự án phê duyệt.",- "dba": "Hệ thống xác định quy trình phê duyệt và chỉ cần DBA phê duyệt.",- "admin": "Hệ thống xác định quy trình phê duyệt và chỉ cần Quản trị viên phê duyệt.",- "owner-dba-admin": "Hệ thống xác định quy trình phê duyệt, đầu tiên là Chủ sở hữu dự án phê duyệt, sau đó là DBA phê duyệt, và cuối cùng là Quản trị viên phê duyệt."- }+ "approval-flow-builtin": {+ "project-owner": "Hệ thống xác định quy trình phê duyệt và chỉ cần Chủ sở hữu dự án phê duyệt.",+ "workspace-dba": "Hệ thống xác định quy trình phê duyệt và chỉ cần DBA phê duyệt.",+ "workspace-admin": "Hệ thống xác định quy trình phê duyệt và chỉ cần Quản trị viên phê duyệt.",+ "project-owner-workspace-dba": "Hệ thống xác định quy trình phê duyệt, đầu tiên là Chủ sở hữu dự án phê duyệt, sau đó là DBA phê duyệt.",+ "project-owner-workspace-dba-workspace-admin": "Hệ thống xác định quy trình phê duyệt, đầu tiên là Chủ sở hữu dự án phê duyệt, sau đó là DBA phê duyệt, và cuối cùng là Quản trị viên phê duyệt."},"risk-rule": {"template": {diff --git a/frontend/src/locales/dynamic/zh-CN.json b/frontend/src/locales/dynamic/zh-CN.jsonindex 076fd7c71e..28788901ef 100644--- a/frontend/src/locales/dynamic/zh-CN.json+++ b/frontend/src/locales/dynamic/zh-CN.json@@ -1,21 +1,11 @@{"custom-approval": {- "approval-flow": {- "node": {- "group": {- "WORKSPACE_OWNER": "工作空间管理员",- "WORKSPACE_DBA": "DBA",- "PROJECT_OWNER": "项目所有者",- "PROJECT_MEMBER": "项目开发者"- }- },- "presets": {- "owner-dba": "系统定义的流程。先由项目所有者审批,再由 DBA 审批。",- "owner": "系统定义的流程。只需要项目所有者审批。",- "dba": "系统定义的流程。只需要 DBA 审批。",- "admin": "系统定义的流程。只需要管理员审批。",- "owner-dba-admin": "系统定义的流程。先由项目所有者审批,再由 DBA 审批,最后由管理员审批。"- }+ "approval-flow-builtin": {+ "project-owner": "系统定义的流程。只需要项目所有者审批。",+ "workspace-dba": "系统定义的流程。只需要 DBA 审批。",+ "workspace-admin": "系统定义的流程。只需要管理员审批。",+ "project-owner-workspace-dba": "系统定义的流程。先由项目所有者审批,再由 DBA 审批。",+ "project-owner-workspace-dba-workspace-admin": "系统定义的流程。先由项目所有者审批,再由 DBA 审批,最后由管理员审批。"},"risk-rule": {"template": {diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.jsonindex 0c4490f985..cb9a50d321 100644--- a/frontend/src/locales/en-US.json+++ b/frontend/src/locales/en-US.json@@ -2610,6 +2610,9 @@"select": "Select approval flow","create-approval-flow": "Create approval flow","edit-approval-flow": "Edit approval flow",+ "built-in": "Built-in Flows",+ "custom": "Custom Flows",+ "no-custom-flows": "No custom approval flows created yet. Click 'Create Flow' to add one.","node": {"nodes": "Approval nodes","description": "Only one approval is required on this node when there are multiple approvers.",diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.jsonindex 6e18224849..563158bfac 100644--- a/frontend/src/locales/es-ES.json+++ b/frontend/src/locales/es-ES.json@@ -2610,6 +2610,9 @@"select": "Seleccionar flujo de aprobación","create-approval-flow": "Crear flujo de aprobación","edit-approval-flow": "Editar flujo de aprobación",+ "built-in": "Flujos Integrados",+ "custom": "Flujos Personalizados",+ "no-custom-flows": "Aún no se han creado flujos de aprobación personalizados. Haga clic en 'Crear Flujo' para agregar uno.","node": {"nodes": "Nodos de aprobación","description": "Solo se requiere una aprobación en este nodo cuando hay múltiples aprobadores.",diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.jsonindex e90fb1b744..0ef8d83ebf 100644--- a/frontend/src/locales/ja-JP.json+++ b/frontend/src/locales/ja-JP.json@@ -2610,6 +2610,9 @@"select": "承認フローの選択","create-approval-flow": "承認フローの作成","edit-approval-flow": "承認フローの編集",+ "built-in": "組み込み承認フロー",+ "custom": "カスタム承認フロー",+ "no-custom-flows": "カスタム承認フローがまだ作成されていません。「承認フローを作成」をクリックして追加してください。","node": {"nodes": "承認ノード","description": "ノードに複数の承認者がいる場合、必要な承認は 1 つだけです。",diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.jsonindex 0b269ca3b0..342575d644 100644--- a/frontend/src/locales/vi-VN.json+++ b/frontend/src/locales/vi-VN.json@@ -2610,6 +2610,9 @@"select": "Chọn quy trình phê duyệt","create-approval-flow": "Tạo quy trình phê duyệt","edit-approval-flow": "Chỉnh sửa quy trình phê duyệt",+ "built-in": "Quy trình Tích hợp sẵn",+ "custom": "Quy trình Tùy chỉnh",+ "no-custom-flows": "Chưa có quy trình phê duyệt tùy chỉnh nào được tạo. Nhấp vào 'Tạo Quy trình' để thêm.","node": {"nodes": "Nút phê duyệt","description": "Chỉ cần một phê duyệt trên nút này khi có nhiều người phê duyệt.",diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.jsonindex 83ab1710c8..f2781de8f9 100644--- a/frontend/src/locales/zh-CN.json+++ b/frontend/src/locales/zh-CN.json@@ -2610,6 +2610,9 @@"select": "选择审批流","create-approval-flow": "创建审批流","edit-approval-flow": "编辑审批流",+ "built-in": "内置审批流",+ "custom": "自定义审批流",+ "no-custom-flows": "尚未创建自定义审批流。点击\"创建审批流\"添加。","node": {"nodes": "审批节点","description": "当一个节点上有多个审批人时,只需要一次审批通过。",diff --git a/frontend/src/store/modules/workspaceApprovalSetting.ts b/frontend/src/store/modules/workspaceApprovalSetting.tsindex 4521c6ac78..4ef1a304fe 100644--- a/frontend/src/store/modules/workspaceApprovalSetting.ts+++ b/frontend/src/store/modules/workspaceApprovalSetting.ts@@ -1,9 +1,20 @@import { create } from "@bufbuild/protobuf";import { cloneDeep } from "lodash-es";import { defineStore } from "pinia";+import { v4 as uuidv4 } from "uuid";import { ref } from "vue";import { settingServiceClientConnect } from "@/grpcweb";-import { type LocalApprovalConfig, type LocalApprovalRule } from "@/types";+import {+ type LocalApprovalConfig,+ type LocalApprovalRule,+ getBuiltinFlow,+ isBuiltinFlowId,+} from "@/types";+import type { ApprovalTemplate } from "@/types/proto-es/v1/issue_service_pb";+import {+ ApprovalFlowSchema,+ ApprovalTemplateSchema,+} from "@/types/proto-es/v1/issue_service_pb";import type { Risk_Source } from "@/types/proto-es/v1/risk_service_pb";import type { Setting } from "@/types/proto-es/v1/setting_service_pb";import {@@ -16,7 +27,6 @@ import {import {resolveLocalApprovalConfig,buildWorkspaceApprovalSetting,- seedWorkspaceApprovalSetting,} from "@/utils";import { useGracefulRequest } from "./utils";@@ -34,9 +44,6 @@ export const useWorkspaceApprovalSettingStore = defineStore(const setConfigSetting = async (setting: Setting) => {if (setting.value?.value?.case === "workspaceApprovalSettingValue") {const _config = setting.value.value.value;- if (_config.rules.length === 0) {- _config.rules.push(...seedWorkspaceApprovalSetting());- }config.value = await resolveLocalApprovalConfig(_config);}};@@ -89,34 +96,98 @@ export const useWorkspaceApprovalSettingStore = defineStore() => {await useBackupAndUpdateConfig(async () => {const { rules } = config.value;++ // Ensure new rule has an id (for custom rules, generate UUID if not provided)+ if (!newRule.template.id) {+ newRule.template.id = uuidv4();+ }+if (oldRule) {const index = rules.indexOf(oldRule);if (index >= 0) {rules[index] = newRule;- await updateConfig();}} else {rules.unshift(newRule);- await updateConfig();}++ // Note: No explicit cleanup needed here.+ // buildWorkspaceApprovalSetting will save:+ // - All custom templates (even if unused)+ // - Only used built-in templates+ await updateConfig();});};const deleteRule = async (rule: LocalApprovalRule) => {await useBackupAndUpdateConfig(async () => {const { rules, parsed, unrecognized } = config.value;- config.value.parsed = parsed.filter((item) => item.rule !== rule.uid);++ // Remove this template from parsed and unrecognized+ config.value.parsed = parsed.filter(+ (item) => item.rule !== rule.template.id+ );config.value.unrecognized = unrecognized.filter(- (item) => item.rule !== rule.uid+ (item) => item.rule !== rule.template.id);++ // Remove the template from rulesconst index = rules.indexOf(rule);if (index >= 0) {rules.splice(index, 1);}++ // Note: No explicit cleanup needed here.+ // buildWorkspaceApprovalSetting will save:+ // - All custom templates (even if unused)+ // - Only used built-in templatesawait updateConfig();});};+ // Helper: Ensure a template exists in the local cache for a given flow ID+ // This is used for UI display and editing. The actual save is handled by buildWorkspaceApprovalSetting.+ const getOrCreateTemplate = (flowId: string): LocalApprovalRule => {+ const { rules } = config.value;++ // Check if template already exists+ const existingRule = rules.find((rule) => rule.template.id === flowId);+ if (existingRule) {+ return existingRule;+ }++ // Template doesn't exist, create it+ let template: ApprovalTemplate;++ if (isBuiltinFlowId(flowId)) {+ // Built-in flow: get from constants+ const builtinFlow = getBuiltinFlow(flowId);+ if (!builtinFlow) {+ throw new Error(`Unknown built-in flow: ${flowId}`);+ }+ template = create(ApprovalTemplateSchema, {+ id: builtinFlow.id,+ title: builtinFlow.title,+ description: builtinFlow.description,+ flow: create(ApprovalFlowSchema, {+ roles: [...builtinFlow.roles],+ }),+ });+ } else {+ // Custom flow: should already exist, but create a placeholder if not+ template = create(ApprovalTemplateSchema, {+ id: flowId,+ title: "Custom Flow",+ description: "",+ flow: create(ApprovalFlowSchema, { roles: [] }),+ });+ }++ const newRule: LocalApprovalRule = { template };+ rules.push(newRule);+ return newRule;+ };+const updateRuleFlow = async (source: Risk_Source,level: number,@@ -127,6 +198,13 @@ export const useWorkspaceApprovalSettingStore = defineStore(const index = parsed.findIndex((item) => item.source == source && item.level === level);++ // Ensure template exists in local cache (for UI display)+ if (rule) {+ getOrCreateTemplate(rule);+ }++ // Update or remove the parsed ruleif (index >= 0) {if (rule) {parsed[index].rule = rule;@@ -142,6 +220,11 @@ export const useWorkspaceApprovalSettingStore = defineStore(});}}++ // Note: No explicit cleanup needed here.+ // buildWorkspaceApprovalSetting will save:+ // - All custom templates (even if unused)+ // - Only used built-in templatesawait updateConfig();});};diff --git a/frontend/src/types/approvalFlow.ts b/frontend/src/types/approvalFlow.tsnew file mode 100644index 0000000000..6c01afa99a--- /dev/null+++ b/frontend/src/types/approvalFlow.ts@@ -0,0 +1,82 @@+import { t } from "@/plugins/i18n";+import { displayRoleTitle } from "@/utils";+import { PresetRoleType } from "./iam";++export type BuiltinApprovalFlow = {+ id: string;+ title: string;+ description: string;+ roles: string[];+ readonly: true;+};++type BuiltinApprovalFlowDefinition = {+ id: string;+ descriptionKey: string;+ roles: string[];+};++// Built-in approval flow definitions+// Titles and descriptions use i18n keys for localization+const BUILTIN_FLOW_DEFINITIONS: readonly BuiltinApprovalFlowDefinition[] = [+ {+ id: "bb.project-owner",+ descriptionKey:+ "dynamic.custom-approval.approval-flow-builtin.project-owner",+ roles: [PresetRoleType.PROJECT_OWNER],+ },+ {+ id: "bb.workspace-dba",+ descriptionKey:+ "dynamic.custom-approval.approval-flow-builtin.workspace-dba",+ roles: [PresetRoleType.WORKSPACE_DBA],+ },+ {+ id: "bb.workspace-admin",+ descriptionKey:+ "dynamic.custom-approval.approval-flow-builtin.workspace-admin",+ roles: [PresetRoleType.WORKSPACE_ADMIN],+ },+ {+ id: "bb.project-owner-workspace-dba",+ descriptionKey:+ "dynamic.custom-approval.approval-flow-builtin.project-owner-workspace-dba",+ roles: [PresetRoleType.PROJECT_OWNER, PresetRoleType.WORKSPACE_DBA],+ },+ {+ id: "bb.project-owner-workspace-dba-workspace-admin",+ descriptionKey:+ "dynamic.custom-approval.approval-flow-builtin.project-owner-workspace-dba-workspace-admin",+ roles: [+ PresetRoleType.PROJECT_OWNER,+ PresetRoleType.WORKSPACE_DBA,+ PresetRoleType.WORKSPACE_ADMIN,+ ],+ },+] as const;++// Generate title from roles (e.g., "Project Owner -> Workspace DBA")+const generateTitle = (roles: string[]): string => {+ return roles.map((role) => displayRoleTitle(role)).join(" -> ");+};++// Built-in approval flow templates+// These are materialized into the database only when actually used by rules+export const BUILTIN_APPROVAL_FLOWS: readonly BuiltinApprovalFlow[] =+ BUILTIN_FLOW_DEFINITIONS.map((def) => ({+ id: def.id,+ title: generateTitle(def.roles),+ description: t(def.descriptionKey),+ roles: def.roles,+ readonly: true as const,+ }));++export const BUILTIN_FLOW_ID_PREFIX = "bb.";++export const isBuiltinFlowId = (id: string): boolean => {+ return id.startsWith(BUILTIN_FLOW_ID_PREFIX);+};++export const getBuiltinFlow = (id: string): BuiltinApprovalFlow | undefined => {+ return BUILTIN_APPROVAL_FLOWS.find((flow) => flow.id === id);+};diff --git a/frontend/src/types/index.ts b/frontend/src/types/index.tsindex 3b6be0794a..939c1b1ba7 100644--- a/frontend/src/types/index.ts+++ b/frontend/src/types/index.ts@@ -1,5 +1,6 @@export * from "./actuator";export * from "./appProfile";+export * from "./approvalFlow";export * from "./auditLog";export * from "./changelog";export * from "./common";diff --git a/frontend/src/types/proto-es/v1/issue_service_pb.d.ts b/frontend/src/types/proto-es/v1/issue_service_pb.d.tsindex 6e2b4fbde3..1a13539569 100644--- a/frontend/src/types/proto-es/v1/issue_service_pb.d.ts+++ b/frontend/src/types/proto-es/v1/issue_service_pb.d.ts@@ -720,6 +720,15 @@ export declare const GrantRequestSchema: GenMessage<GrantRequest>;* @generated from message bytebase.v1.ApprovalTemplate*/export declare type ApprovalTemplate = Message<"bytebase.v1.ApprovalTemplate"> & {+ /**+ * The unique identifier for the approval template.+ * For built-in templates, use "bb." prefix (e.g., "bb.project-owner", "bb.workspace-dba").+ * For custom templates, use a UUID or other unique identifier.+ *+ * @generated from field: string id = 4;+ */+ id: string;+/*** @generated from field: bytebase.v1.ApprovalFlow flow = 1;*/diff --git a/frontend/src/types/proto-es/v1/issue_service_pb.js b/frontend/src/types/proto-es/v1/issue_service_pb.jsindex c763e81aad..c7ef041fce 100644--- a/frontend/src/types/proto-es/v1/issue_service_pb.js+++ b/frontend/src/types/proto-es/v1/issue_service_pb.js@@ -16,7 +16,7 @@ import { file_v1_common } from "./common_pb";* Describes the file v1/issue_service.proto.*/export const file_v1_issue_service = /*@__PURE__*/- fileDesc("ChZ2MS9pc3N1ZV9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSJKCg9HZXRJc3N1ZVJlcXVlc3QSKAoEbmFtZRgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSDQoFZm9yY2UYAiABKAgiagoSQ3JlYXRlSXNzdWVSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBImCgVpc3N1ZRgCIAEoCzISLmJ5dGViYXNlLnYxLklzc3VlQgPgQQIihwEKEUxpc3RJc3N1ZXNSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIRCglwYWdlX3NpemUYAiABKAUSEgoKcGFnZV90b2tlbhgDIAEoCRIOCgZmaWx0ZXIYBCABKAkSDQoFcXVlcnkYBSABKAkiUQoSTGlzdElzc3Vlc1Jlc3BvbnNlEiIKBmlzc3VlcxgBIAMoCzISLmJ5dGViYXNlLnYxLklzc3VlEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJwChNTZWFyY2hJc3N1ZXNSZXF1ZXN0EhMKBnBhcmVudBgBIAEoCUID4EECEhEKCXBhZ2Vfc2l6ZRgCIAEoBRISCgpwYWdlX3Rva2VuGAMgASgJEg4KBmZpbHRlchgEIAEoCRINCgVxdWVyeRgFIAEoCSJTChRTZWFyY2hJc3N1ZXNSZXNwb25zZRIiCgZpc3N1ZXMYASADKAsyEi5ieXRlYmFzZS52MS5Jc3N1ZRIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkioAEKElVwZGF0ZUlzc3VlUmVxdWVzdBI9CgVpc3N1ZRgBIAEoCzISLmJ5dGViYXNlLnYxLklzc3VlQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRI0Cgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2tCA+BBAhIVCg1hbGxvd19taXNzaW5nGAMgASgIIpgBCh5CYXRjaFVwZGF0ZUlzc3Vlc1N0YXR1c1JlcXVlc3QSLAoGcGFyZW50GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0Eg4KBmlzc3VlcxgCIAMoCRIoCgZzdGF0dXMYAyABKA4yGC5ieXRlYmFzZS52MS5Jc3N1ZVN0YXR1cxIOCgZyZWFzb24YBCABKAkiIQofQmF0Y2hVcGRhdGVJc3N1ZXNTdGF0dXNSZXNwb25zZSJQChNBcHByb3ZlSXNzdWVSZXF1ZXN0EigKBG5hbWUYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL0lzc3VlEg8KB2NvbW1lbnQYAiABKAkiTwoSUmVqZWN0SXNzdWVSZXF1ZXN0EigKBG5hbWUYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL0lzc3VlEg8KB2NvbW1lbnQYAiABKAkiUAoTUmVxdWVzdElzc3VlUmVxdWVzdBIoCgRuYW1lGAEgASgJQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIPCgdjb21tZW50GAIgASgJIs4JCgVJc3N1ZRIMCgRuYW1lGAEgASgJEg0KBXRpdGxlGAMgASgJEhMKC2Rlc2NyaXB0aW9uGAQgASgJEiUKBHR5cGUYBSABKA4yFy5ieXRlYmFzZS52MS5Jc3N1ZS5UeXBlEigKBnN0YXR1cxgGIAEoDjIYLmJ5dGViYXNlLnYxLklzc3VlU3RhdHVzEi4KCWFwcHJvdmVycxgJIAMoCzIbLmJ5dGViYXNlLnYxLklzc3VlLkFwcHJvdmVyEjgKEWFwcHJvdmFsX3RlbXBsYXRlGAogASgLMh0uYnl0ZWJhc2UudjEuQXBwcm92YWxUZW1wbGF0ZRIUCgdjcmVhdG9yGA4gASgJQgPgQQMSNAoLY3JlYXRlX3RpbWUYDyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSNAoLdXBkYXRlX3RpbWUYECABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSDAoEcGxhbhgRIAEoCRIPCgdyb2xsb3V0GBIgASgJEjAKDWdyYW50X3JlcXVlc3QYEyABKAsyGS5ieXRlYmFzZS52MS5HcmFudFJlcXVlc3QSEQoJcmVsZWFzZXJzGBQgAygJEioKCnJpc2tfbGV2ZWwYFSABKA4yFi5ieXRlYmFzZS52MS5SaXNrTGV2ZWwSQgoRdGFza19zdGF0dXNfY291bnQYFiADKAsyJy5ieXRlYmFzZS52MS5Jc3N1ZS5UYXNrU3RhdHVzQ291bnRFbnRyeRIOCgZsYWJlbHMYFyADKAkSPwoPYXBwcm92YWxfc3RhdHVzGBggASgOMiEuYnl0ZWJhc2UudjEuSXNzdWUuQXBwcm92YWxTdGF0dXNCA+BBAxIiChVhcHByb3ZhbF9zdGF0dXNfZXJyb3IYGSABKAlCA+BBAxqcAQoIQXBwcm92ZXISMgoGc3RhdHVzGAEgASgOMiIuYnl0ZWJhc2UudjEuSXNzdWUuQXBwcm92ZXIuU3RhdHVzEhEKCXByaW5jaXBhbBgCIAEoCSJJCgZTdGF0dXMSFgoSU1RBVFVTX1VOU1BFQ0lGSUVEEAASCwoHUEVORElORxABEgwKCEFQUFJPVkVEEAISDAoIUkVKRUNURUQQAxo2ChRUYXNrU3RhdHVzQ291bnRFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAU6AjgBIlkKBFR5cGUSFAoQVFlQRV9VTlNQRUNJRklFRBAAEhMKD0RBVEFCQVNFX0NIQU5HRRABEhEKDUdSQU5UX1JFUVVFU1QQAhITCg9EQVRBQkFTRV9FWFBPUlQQAyKAAQoOQXBwcm92YWxTdGF0dXMSHwobQVBQUk9WQUxfU1RBVFVTX1VOU1BFQ0lGSUVEEAASDAoIQ0hFQ0tJTkcQARILCgdQRU5ESU5HEAISDAoIQVBQUk9WRUQQAxIMCghSRUpFQ1RFRBAEEgsKB1NLSVBQRUQQBRIJCgVFUlJPUhAGOjrqQTcKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIhcHJvamVjdHMve3Byb2plY3R9L2lzc3Vlcy97aXNzdWV9SgQIAhADSgQIBxAISgQICBAJSgQICxAMSgQIDBANIn8KDEdyYW50UmVxdWVzdBIMCgRyb2xlGAEgASgJEgwKBHVzZXIYAiABKAkSJAoJY29uZGl0aW9uGAMgASgLMhEuZ29vZ2xlLnR5cGUuRXhwchItCgpleHBpcmF0aW9uGAQgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uIl8KEEFwcHJvdmFsVGVtcGxhdGUSJwoEZmxvdxgBIAEoCzIZLmJ5dGViYXNlLnYxLkFwcHJvdmFsRmxvdxINCgV0aXRsZRgCIAEoCRITCgtkZXNjcmlwdGlvbhgDIAEoCSIdCgxBcHByb3ZhbEZsb3cSDQoFcm9sZXMYASADKAkibQoYTGlzdElzc3VlQ29tbWVudHNSZXF1ZXN0EioKBnBhcmVudBgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSEQoJcGFnZV9zaXplGAIgASgFEhIKCnBhZ2VfdG9rZW4YAyABKAkiZwoZTGlzdElzc3VlQ29tbWVudHNSZXNwb25zZRIxCg5pc3N1ZV9jb21tZW50cxgBIAMoCzIZLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudBIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkieQoZQ3JlYXRlSXNzdWVDb21tZW50UmVxdWVzdBIqCgZwYXJlbnQYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL0lzc3VlEjAKDWlzc3VlX2NvbW1lbnQYAiABKAsyGS5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQixgEKGVVwZGF0ZUlzc3VlQ29tbWVudFJlcXVlc3QSKgoGcGFyZW50GAEgASgJQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIwCg1pc3N1ZV9jb21tZW50GAIgASgLMhkuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50EjQKC3VwZGF0ZV9tYXNrGAMgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFza0ID4EECEhUKDWFsbG93X21pc3NpbmcYBCABKAgirgwKDElzc3VlQ29tbWVudBIMCgRuYW1lGAEgASgJEg8KB2NvbW1lbnQYAiABKAkSDwoHcGF5bG9hZBgDIAEoCRI0CgtjcmVhdGVfdGltZRgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0Cgt1cGRhdGVfdGltZRgFIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxIUCgdjcmVhdG9yGAcgASgJQgPgQQMSNgoIYXBwcm92YWwYCCABKAsyIi5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQuQXBwcm92YWxIABI9Cgxpc3N1ZV91cGRhdGUYCSABKAsyJS5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQuSXNzdWVVcGRhdGVIABI3CglzdGFnZV9lbmQYCiABKAsyIi5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQuU3RhZ2VFbmRIABI7Cgt0YXNrX3VwZGF0ZRgLIAEoCzIkLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudC5UYXNrVXBkYXRlSAASRgoRdGFza19wcmlvcl9iYWNrdXAYDCABKAsyKS5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQuVGFza1ByaW9yQmFja3VwSAAakAEKCEFwcHJvdmFsEjkKBnN0YXR1cxgBIAEoDjIpLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudC5BcHByb3ZhbC5TdGF0dXMiSQoGU3RhdHVzEhYKElNUQVRVU19VTlNQRUNJRklFRBAAEgsKB1BFTkRJTkcQARIMCghBUFBST1ZFRBACEgwKCFJFSkVDVEVEEAMa9QIKC0lzc3VlVXBkYXRlEhcKCmZyb21fdGl0bGUYASABKAlIAIgBARIVCgh0b190aXRsZRgCIAEoCUgBiAEBEh0KEGZyb21fZGVzY3JpcHRpb24YAyABKAlIAogBARIbCg50b19kZXNjcmlwdGlvbhgEIAEoCUgDiAEBEjIKC2Zyb21fc3RhdHVzGAUgASgOMhguYnl0ZWJhc2UudjEuSXNzdWVTdGF0dXNIBIgBARIwCgl0b19zdGF0dXMYBiABKA4yGC5ieXRlYmFzZS52MS5Jc3N1ZVN0YXR1c0gFiAEBEhMKC2Zyb21fbGFiZWxzGAkgAygJEhEKCXRvX2xhYmVscxgKIAMoCUINCgtfZnJvbV90aXRsZUILCglfdG9fdGl0bGVCEwoRX2Zyb21fZGVzY3JpcHRpb25CEQoPX3RvX2Rlc2NyaXB0aW9uQg4KDF9mcm9tX3N0YXR1c0IMCgpfdG9fc3RhdHVzSgQIBxAISgQICBAJGhkKCFN0YWdlRW5kEg0KBXN0YWdlGAEgASgJGqcCCgpUYXNrVXBkYXRlEg0KBXRhc2tzGAEgAygJEhcKCmZyb21fc2hlZXQYAiABKAlIAIgBARIVCgh0b19zaGVldBgDIAEoCUgBiAEBEkMKCXRvX3N0YXR1cxgGIAEoDjIrLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudC5UYXNrVXBkYXRlLlN0YXR1c0gCiAEBImsKBlN0YXR1cxIWChJTVEFUVVNfVU5TUEVDSUZJRUQQABILCgdQRU5ESU5HEAESCwoHUlVOTklORxACEggKBERPTkUQAxIKCgZGQUlMRUQQBBILCgdTS0lQUEVEEAUSDAoIQ0FOQ0VMRUQQBkINCgtfZnJvbV9zaGVldEILCglfdG9fc2hlZXRCDAoKX3RvX3N0YXR1cxrXAQoPVGFza1ByaW9yQmFja3VwEgwKBHRhc2sYASABKAkSPwoGdGFibGVzGAIgAygLMi8uYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50LlRhc2tQcmlvckJhY2t1cC5UYWJsZRIaCg1vcmlnaW5hbF9saW5lGAMgASgFSACIAQESEAoIZGF0YWJhc2UYBCABKAkSDQoFZXJyb3IYBSABKAkaJgoFVGFibGUSDgoGc2NoZW1hGAEgASgJEg0KBXRhYmxlGAIgASgJQhAKDl9vcmlnaW5hbF9saW5lQgcKBWV2ZW50SgQIBhAHKk0KC0lzc3VlU3RhdHVzEhwKGElTU1VFX1NUQVRVU19VTlNQRUNJRklFRBAAEggKBE9QRU4QARIICgRET05FEAISDAoIQ0FOQ0VMRUQQAzLYDwoMSXNzdWVTZXJ2aWNlEoABCghHZXRJc3N1ZRIcLmJ5dGViYXNlLnYxLkdldElzc3VlUmVxdWVzdBoSLmJ5dGViYXNlLnYxLklzc3VlIkLaQQRuYW1liuowDWJiLmlzc3Vlcy5nZXSQ6jABgtPkkwIgEh4vdjEve25hbWU9cHJvamVjdHMvKi9pc3N1ZXMvKn0SnAEKC0NyZWF0ZUlzc3VlEh8uYnl0ZWJhc2UudjEuQ3JlYXRlSXNzdWVSZXF1ZXN0GhIuYnl0ZWJhc2UudjEuSXNzdWUiWNpBDHBhcmVudCxpc3N1ZYrqMBBiYi5pc3N1ZXMuY3JlYXRlkOowAZjqMAGC0+STAic6BWlzc3VlIh4vdjEve3BhcmVudD1wcm9qZWN0cy8qfS9pc3N1ZXMSlAEKCkxpc3RJc3N1ZXMSHi5ieXRlYmFzZS52MS5MaXN0SXNzdWVzUmVxdWVzdBofLmJ5dGViYXNlLnYxLkxpc3RJc3N1ZXNSZXNwb25zZSJF2kEGcGFyZW50iuowDmJiLmlzc3Vlcy5saXN0kOowAYLT5JMCIBIeL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vaXNzdWVzEpoBCgxTZWFyY2hJc3N1ZXMSIC5ieXRlYmFzZS52MS5TZWFyY2hJc3N1ZXNSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuU2VhcmNoSXNzdWVzUmVzcG9uc2UiRYrqMA1iYi5pc3N1ZXMuZ2V0kOowAoLT5JMCKjoBKiIlL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vaXNzdWVzOnNlYXJjaBKnAQoLVXBkYXRlSXNzdWUSHy5ieXRlYmFzZS52MS5VcGRhdGVJc3N1ZVJlcXVlc3QaEi5ieXRlYmFzZS52MS5Jc3N1ZSJj2kERaXNzdWUsdXBkYXRlX21hc2uK6jAQYmIuaXNzdWVzLnVwZGF0ZZDqMAGY6jABgtPkkwItOgVpc3N1ZTIkL3YxL3tpc3N1ZS5uYW1lPXByb2plY3RzLyovaXNzdWVzLyp9EsABChFMaXN0SXNzdWVDb21tZW50cxIlLmJ5dGViYXNlLnYxLkxpc3RJc3N1ZUNvbW1lbnRzUmVxdWVzdBomLmJ5dGViYXNlLnYxLkxpc3RJc3N1ZUNvbW1lbnRzUmVzcG9uc2UiXNpBBnBhcmVudIrqMBViYi5pc3N1ZUNvbW1lbnRzLmxpc3SQ6jABgtPkkwIwEi4vdjEve3BhcmVudD1wcm9qZWN0cy8qL2lzc3Vlcy8qfS9pc3N1ZUNvbW1lbnRzEtIBChJDcmVhdGVJc3N1ZUNvbW1lbnQSJi5ieXRlYmFzZS52MS5DcmVhdGVJc3N1ZUNvbW1lbnRSZXF1ZXN0GhkuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50InnaQRRwYXJlbnQsaXNzdWVfY29tbWVudIrqMBdiYi5pc3N1ZUNvbW1lbnRzLmNyZWF0ZZDqMAGY6jABgtPkkwI5Og1pc3N1ZV9jb21tZW50IigvdjEve3BhcmVudD1wcm9qZWN0cy8qL2lzc3Vlcy8qfTpjb21tZW50Et8BChJVcGRhdGVJc3N1ZUNvbW1lbnQSJi5ieXRlYmFzZS52MS5VcGRhdGVJc3N1ZUNvbW1lbnRSZXF1ZXN0GhkuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50IoUB2kEgcGFyZW50LGlzc3VlX2NvbW1lbnQsdXBkYXRlX21hc2uK6jAXYmIuaXNzdWVDb21tZW50cy51cGRhdGWQ6jABmOowAYLT5JMCOToNaXNzdWVfY29tbWVudDIoL3YxL3twYXJlbnQ9cHJvamVjdHMvKi9pc3N1ZXMvKn06Y29tbWVudBLNAQoXQmF0Y2hVcGRhdGVJc3N1ZXNTdGF0dXMSKy5ieXRlYmFzZS52MS5CYXRjaFVwZGF0ZUlzc3Vlc1N0YXR1c1JlcXVlc3QaLC5ieXRlYmFzZS52MS5CYXRjaFVwZGF0ZUlzc3Vlc1N0YXR1c1Jlc3BvbnNlIleK6jAQYmIuaXNzdWVzLnVwZGF0ZZDqMAGY6jABgtPkkwI1OgEqIjAvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9pc3N1ZXM6YmF0Y2hVcGRhdGVTdGF0dXMSfwoMQXBwcm92ZUlzc3VlEiAuYnl0ZWJhc2UudjEuQXBwcm92ZUlzc3VlUmVxdWVzdBoSLmJ5dGViYXNlLnYxLklzc3VlIjmQ6jACmOowAYLT5JMCKzoBKiImL3YxL3tuYW1lPXByb2plY3RzLyovaXNzdWVzLyp9OmFwcHJvdmUSfAoLUmVqZWN0SXNzdWUSHy5ieXRlYmFzZS52MS5SZWplY3RJc3N1ZVJlcXVlc3QaEi5ieXRlYmFzZS52MS5Jc3N1ZSI4kOowApjqMAGC0+STAio6ASoiJS92MS97bmFtZT1wcm9qZWN0cy8qL2lzc3Vlcy8qfTpyZWplY3QSfwoMUmVxdWVzdElzc3VlEiAuYnl0ZWJhc2UudjEuUmVxdWVzdElzc3VlUmVxdWVzdBoSLmJ5dGViYXNlLnYxLklzc3VlIjmQ6jACmOowAYLT5JMCKzoBKiImL3YxL3tuYW1lPXByb2plY3RzLyovaXNzdWVzLyp9OnJlcXVlc3RCNlo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_google_type_expr, file_v1_annotation, file_v1_common]);+ fileDesc("ChZ2MS9pc3N1ZV9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSJKCg9HZXRJc3N1ZVJlcXVlc3QSKAoEbmFtZRgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSDQoFZm9yY2UYAiABKAgiagoSQ3JlYXRlSXNzdWVSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBImCgVpc3N1ZRgCIAEoCzISLmJ5dGViYXNlLnYxLklzc3VlQgPgQQIihwEKEUxpc3RJc3N1ZXNSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIRCglwYWdlX3NpemUYAiABKAUSEgoKcGFnZV90b2tlbhgDIAEoCRIOCgZmaWx0ZXIYBCABKAkSDQoFcXVlcnkYBSABKAkiUQoSTGlzdElzc3Vlc1Jlc3BvbnNlEiIKBmlzc3VlcxgBIAMoCzISLmJ5dGViYXNlLnYxLklzc3VlEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJwChNTZWFyY2hJc3N1ZXNSZXF1ZXN0EhMKBnBhcmVudBgBIAEoCUID4EECEhEKCXBhZ2Vfc2l6ZRgCIAEoBRISCgpwYWdlX3Rva2VuGAMgASgJEg4KBmZpbHRlchgEIAEoCRINCgVxdWVyeRgFIAEoCSJTChRTZWFyY2hJc3N1ZXNSZXNwb25zZRIiCgZpc3N1ZXMYASADKAsyEi5ieXRlYmFzZS52MS5Jc3N1ZRIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkioAEKElVwZGF0ZUlzc3VlUmVxdWVzdBI9CgVpc3N1ZRgBIAEoCzISLmJ5dGViYXNlLnYxLklzc3VlQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRI0Cgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2tCA+BBAhIVCg1hbGxvd19taXNzaW5nGAMgASgIIpgBCh5CYXRjaFVwZGF0ZUlzc3Vlc1N0YXR1c1JlcXVlc3QSLAoGcGFyZW50GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0Eg4KBmlzc3VlcxgCIAMoCRIoCgZzdGF0dXMYAyABKA4yGC5ieXRlYmFzZS52MS5Jc3N1ZVN0YXR1cxIOCgZyZWFzb24YBCABKAkiIQofQmF0Y2hVcGRhdGVJc3N1ZXNTdGF0dXNSZXNwb25zZSJQChNBcHByb3ZlSXNzdWVSZXF1ZXN0EigKBG5hbWUYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL0lzc3VlEg8KB2NvbW1lbnQYAiABKAkiTwoSUmVqZWN0SXNzdWVSZXF1ZXN0EigKBG5hbWUYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL0lzc3VlEg8KB2NvbW1lbnQYAiABKAkiUAoTUmVxdWVzdElzc3VlUmVxdWVzdBIoCgRuYW1lGAEgASgJQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIPCgdjb21tZW50GAIgASgJIs4JCgVJc3N1ZRIMCgRuYW1lGAEgASgJEg0KBXRpdGxlGAMgASgJEhMKC2Rlc2NyaXB0aW9uGAQgASgJEiUKBHR5cGUYBSABKA4yFy5ieXRlYmFzZS52MS5Jc3N1ZS5UeXBlEigKBnN0YXR1cxgGIAEoDjIYLmJ5dGViYXNlLnYxLklzc3VlU3RhdHVzEi4KCWFwcHJvdmVycxgJIAMoCzIbLmJ5dGViYXNlLnYxLklzc3VlLkFwcHJvdmVyEjgKEWFwcHJvdmFsX3RlbXBsYXRlGAogASgLMh0uYnl0ZWJhc2UudjEuQXBwcm92YWxUZW1wbGF0ZRIUCgdjcmVhdG9yGA4gASgJQgPgQQMSNAoLY3JlYXRlX3RpbWUYDyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSNAoLdXBkYXRlX3RpbWUYECABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSDAoEcGxhbhgRIAEoCRIPCgdyb2xsb3V0GBIgASgJEjAKDWdyYW50X3JlcXVlc3QYEyABKAsyGS5ieXRlYmFzZS52MS5HcmFudFJlcXVlc3QSEQoJcmVsZWFzZXJzGBQgAygJEioKCnJpc2tfbGV2ZWwYFSABKA4yFi5ieXRlYmFzZS52MS5SaXNrTGV2ZWwSQgoRdGFza19zdGF0dXNfY291bnQYFiADKAsyJy5ieXRlYmFzZS52MS5Jc3N1ZS5UYXNrU3RhdHVzQ291bnRFbnRyeRIOCgZsYWJlbHMYFyADKAkSPwoPYXBwcm92YWxfc3RhdHVzGBggASgOMiEuYnl0ZWJhc2UudjEuSXNzdWUuQXBwcm92YWxTdGF0dXNCA+BBAxIiChVhcHByb3ZhbF9zdGF0dXNfZXJyb3IYGSABKAlCA+BBAxqcAQoIQXBwcm92ZXISMgoGc3RhdHVzGAEgASgOMiIuYnl0ZWJhc2UudjEuSXNzdWUuQXBwcm92ZXIuU3RhdHVzEhEKCXByaW5jaXBhbBgCIAEoCSJJCgZTdGF0dXMSFgoSU1RBVFVTX1VOU1BFQ0lGSUVEEAASCwoHUEVORElORxABEgwKCEFQUFJPVkVEEAISDAoIUkVKRUNURUQQAxo2ChRUYXNrU3RhdHVzQ291bnRFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAU6AjgBIlkKBFR5cGUSFAoQVFlQRV9VTlNQRUNJRklFRBAAEhMKD0RBVEFCQVNFX0NIQU5HRRABEhEKDUdSQU5UX1JFUVVFU1QQAhITCg9EQVRBQkFTRV9FWFBPUlQQAyKAAQoOQXBwcm92YWxTdGF0dXMSHwobQVBQUk9WQUxfU1RBVFVTX1VOU1BFQ0lGSUVEEAASDAoIQ0hFQ0tJTkcQARILCgdQRU5ESU5HEAISDAoIQVBQUk9WRUQQAxIMCghSRUpFQ1RFRBAEEgsKB1NLSVBQRUQQBRIJCgVFUlJPUhAGOjrqQTcKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIhcHJvamVjdHMve3Byb2plY3R9L2lzc3Vlcy97aXNzdWV9SgQIAhADSgQIBxAISgQICBAJSgQICxAMSgQIDBANIn8KDEdyYW50UmVxdWVzdBIMCgRyb2xlGAEgASgJEgwKBHVzZXIYAiABKAkSJAoJY29uZGl0aW9uGAMgASgLMhEuZ29vZ2xlLnR5cGUuRXhwchItCgpleHBpcmF0aW9uGAQgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uImsKEEFwcHJvdmFsVGVtcGxhdGUSCgoCaWQYBCABKAkSJwoEZmxvdxgBIAEoCzIZLmJ5dGViYXNlLnYxLkFwcHJvdmFsRmxvdxINCgV0aXRsZRgCIAEoCRITCgtkZXNjcmlwdGlvbhgDIAEoCSIdCgxBcHByb3ZhbEZsb3cSDQoFcm9sZXMYASADKAkibQoYTGlzdElzc3VlQ29tbWVudHNSZXF1ZXN0EioKBnBhcmVudBgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSEQoJcGFnZV9zaXplGAIgASgFEhIKCnBhZ2VfdG9rZW4YAyABKAkiZwoZTGlzdElzc3VlQ29tbWVudHNSZXNwb25zZRIxCg5pc3N1ZV9jb21tZW50cxgBIAMoCzIZLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudBIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkieQoZQ3JlYXRlSXNzdWVDb21tZW50UmVxdWVzdBIqCgZwYXJlbnQYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL0lzc3VlEjAKDWlzc3VlX2NvbW1lbnQYAiABKAsyGS5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQixgEKGVVwZGF0ZUlzc3VlQ29tbWVudFJlcXVlc3QSKgoGcGFyZW50GAEgASgJQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIwCg1pc3N1ZV9jb21tZW50GAIgASgLMhkuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50EjQKC3VwZGF0ZV9tYXNrGAMgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFza0ID4EECEhUKDWFsbG93X21pc3NpbmcYBCABKAgirgwKDElzc3VlQ29tbWVudBIMCgRuYW1lGAEgASgJEg8KB2NvbW1lbnQYAiABKAkSDwoHcGF5bG9hZBgDIAEoCRI0CgtjcmVhdGVfdGltZRgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0Cgt1cGRhdGVfdGltZRgFIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxIUCgdjcmVhdG9yGAcgASgJQgPgQQMSNgoIYXBwcm92YWwYCCABKAsyIi5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQuQXBwcm92YWxIABI9Cgxpc3N1ZV91cGRhdGUYCSABKAsyJS5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQuSXNzdWVVcGRhdGVIABI3CglzdGFnZV9lbmQYCiABKAsyIi5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQuU3RhZ2VFbmRIABI7Cgt0YXNrX3VwZGF0ZRgLIAEoCzIkLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudC5UYXNrVXBkYXRlSAASRgoRdGFza19wcmlvcl9iYWNrdXAYDCABKAsyKS5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQuVGFza1ByaW9yQmFja3VwSAAakAEKCEFwcHJvdmFsEjkKBnN0YXR1cxgBIAEoDjIpLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudC5BcHByb3ZhbC5TdGF0dXMiSQoGU3RhdHVzEhYKElNUQVRVU19VTlNQRUNJRklFRBAAEgsKB1BFTkRJTkcQARIMCghBUFBST1ZFRBACEgwKCFJFSkVDVEVEEAMa9QIKC0lzc3VlVXBkYXRlEhcKCmZyb21fdGl0bGUYASABKAlIAIgBARIVCgh0b190aXRsZRgCIAEoCUgBiAEBEh0KEGZyb21fZGVzY3JpcHRpb24YAyABKAlIAogBARIbCg50b19kZXNjcmlwdGlvbhgEIAEoCUgDiAEBEjIKC2Zyb21fc3RhdHVzGAUgASgOMhguYnl0ZWJhc2UudjEuSXNzdWVTdGF0dXNIBIgBARIwCgl0b19zdGF0dXMYBiABKA4yGC5ieXRlYmFzZS52MS5Jc3N1ZVN0YXR1c0gFiAEBEhMKC2Zyb21fbGFiZWxzGAkgAygJEhEKCXRvX2xhYmVscxgKIAMoCUINCgtfZnJvbV90aXRsZUILCglfdG9fdGl0bGVCEwoRX2Zyb21fZGVzY3JpcHRpb25CEQoPX3RvX2Rlc2NyaXB0aW9uQg4KDF9mcm9tX3N0YXR1c0IMCgpfdG9fc3RhdHVzSgQIBxAISgQICBAJGhkKCFN0YWdlRW5kEg0KBXN0YWdlGAEgASgJGqcCCgpUYXNrVXBkYXRlEg0KBXRhc2tzGAEgAygJEhcKCmZyb21fc2hlZXQYAiABKAlIAIgBARIVCgh0b19zaGVldBgDIAEoCUgBiAEBEkMKCXRvX3N0YXR1cxgGIAEoDjIrLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudC5UYXNrVXBkYXRlLlN0YXR1c0gCiAEBImsKBlN0YXR1cxIWChJTVEFUVVNfVU5TUEVDSUZJRUQQABILCgdQRU5ESU5HEAESCwoHUlVOTklORxACEggKBERPTkUQAxIKCgZGQUlMRUQQBBILCgdTS0lQUEVEEAUSDAoIQ0FOQ0VMRUQQBkINCgtfZnJvbV9zaGVldEILCglfdG9fc2hlZXRCDAoKX3RvX3N0YXR1cxrXAQoPVGFza1ByaW9yQmFja3VwEgwKBHRhc2sYASABKAkSPwoGdGFibGVzGAIgAygLMi8uYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50LlRhc2tQcmlvckJhY2t1cC5UYWJsZRIaCg1vcmlnaW5hbF9saW5lGAMgASgFSACIAQESEAoIZGF0YWJhc2UYBCABKAkSDQoFZXJyb3IYBSABKAkaJgoFVGFibGUSDgoGc2NoZW1hGAEgASgJEg0KBXRhYmxlGAIgASgJQhAKDl9vcmlnaW5hbF9saW5lQgcKBWV2ZW50SgQIBhAHKk0KC0lzc3VlU3RhdHVzEhwKGElTU1VFX1NUQVRVU19VTlNQRUNJRklFRBAAEggKBE9QRU4QARIICgRET05FEAISDAoIQ0FOQ0VMRUQQAzLYDwoMSXNzdWVTZXJ2aWNlEoABCghHZXRJc3N1ZRIcLmJ5dGViYXNlLnYxLkdldElzc3VlUmVxdWVzdBoSLmJ5dGViYXNlLnYxLklzc3VlIkLaQQRuYW1liuowDWJiLmlzc3Vlcy5nZXSQ6jABgtPkkwIgEh4vdjEve25hbWU9cHJvamVjdHMvKi9pc3N1ZXMvKn0SnAEKC0NyZWF0ZUlzc3VlEh8uYnl0ZWJhc2UudjEuQ3JlYXRlSXNzdWVSZXF1ZXN0GhIuYnl0ZWJhc2UudjEuSXNzdWUiWNpBDHBhcmVudCxpc3N1ZYrqMBBiYi5pc3N1ZXMuY3JlYXRlkOowAZjqMAGC0+STAic6BWlzc3VlIh4vdjEve3BhcmVudD1wcm9qZWN0cy8qfS9pc3N1ZXMSlAEKCkxpc3RJc3N1ZXMSHi5ieXRlYmFzZS52MS5MaXN0SXNzdWVzUmVxdWVzdBofLmJ5dGViYXNlLnYxLkxpc3RJc3N1ZXNSZXNwb25zZSJF2kEGcGFyZW50iuowDmJiLmlzc3Vlcy5saXN0kOowAYLT5JMCIBIeL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vaXNzdWVzEpoBCgxTZWFyY2hJc3N1ZXMSIC5ieXRlYmFzZS52MS5TZWFyY2hJc3N1ZXNSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuU2VhcmNoSXNzdWVzUmVzcG9uc2UiRYrqMA1iYi5pc3N1ZXMuZ2V0kOowAoLT5JMCKjoBKiIlL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vaXNzdWVzOnNlYXJjaBKnAQoLVXBkYXRlSXNzdWUSHy5ieXRlYmFzZS52MS5VcGRhdGVJc3N1ZVJlcXVlc3QaEi5ieXRlYmFzZS52MS5Jc3N1ZSJj2kERaXNzdWUsdXBkYXRlX21hc2uK6jAQYmIuaXNzdWVzLnVwZGF0ZZDqMAGY6jABgtPkkwItOgVpc3N1ZTIkL3YxL3tpc3N1ZS5uYW1lPXByb2plY3RzLyovaXNzdWVzLyp9EsABChFMaXN0SXNzdWVDb21tZW50cxIlLmJ5dGViYXNlLnYxLkxpc3RJc3N1ZUNvbW1lbnRzUmVxdWVzdBomLmJ5dGViYXNlLnYxLkxpc3RJc3N1ZUNvbW1lbnRzUmVzcG9uc2UiXNpBBnBhcmVudIrqMBViYi5pc3N1ZUNvbW1lbnRzLmxpc3SQ6jABgtPkkwIwEi4vdjEve3BhcmVudD1wcm9qZWN0cy8qL2lzc3Vlcy8qfS9pc3N1ZUNvbW1lbnRzEtIBChJDcmVhdGVJc3N1ZUNvbW1lbnQSJi5ieXRlYmFzZS52MS5DcmVhdGVJc3N1ZUNvbW1lbnRSZXF1ZXN0GhkuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50InnaQRRwYXJlbnQsaXNzdWVfY29tbWVudIrqMBdiYi5pc3N1ZUNvbW1lbnRzLmNyZWF0ZZDqMAGY6jABgtPkkwI5Og1pc3N1ZV9jb21tZW50IigvdjEve3BhcmVudD1wcm9qZWN0cy8qL2lzc3Vlcy8qfTpjb21tZW50Et8BChJVcGRhdGVJc3N1ZUNvbW1lbnQSJi5ieXRlYmFzZS52MS5VcGRhdGVJc3N1ZUNvbW1lbnRSZXF1ZXN0GhkuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50IoUB2kEgcGFyZW50LGlzc3VlX2NvbW1lbnQsdXBkYXRlX21hc2uK6jAXYmIuaXNzdWVDb21tZW50cy51cGRhdGWQ6jABmOowAYLT5JMCOToNaXNzdWVfY29tbWVudDIoL3YxL3twYXJlbnQ9cHJvamVjdHMvKi9pc3N1ZXMvKn06Y29tbWVudBLNAQoXQmF0Y2hVcGRhdGVJc3N1ZXNTdGF0dXMSKy5ieXRlYmFzZS52MS5CYXRjaFVwZGF0ZUlzc3Vlc1N0YXR1c1JlcXVlc3QaLC5ieXRlYmFzZS52MS5CYXRjaFVwZGF0ZUlzc3Vlc1N0YXR1c1Jlc3BvbnNlIleK6jAQYmIuaXNzdWVzLnVwZGF0ZZDqMAGY6jABgtPkkwI1OgEqIjAvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9pc3N1ZXM6YmF0Y2hVcGRhdGVTdGF0dXMSfwoMQXBwcm92ZUlzc3VlEiAuYnl0ZWJhc2UudjEuQXBwcm92ZUlzc3VlUmVxdWVzdBoSLmJ5dGViYXNlLnYxLklzc3VlIjmQ6jACmOowAYLT5JMCKzoBKiImL3YxL3tuYW1lPXByb2plY3RzLyovaXNzdWVzLyp9OmFwcHJvdmUSfAoLUmVqZWN0SXNzdWUSHy5ieXRlYmFzZS52MS5SZWplY3RJc3N1ZVJlcXVlc3QaEi5ieXRlYmFzZS52MS5Jc3N1ZSI4kOowApjqMAGC0+STAio6ASoiJS92MS97bmFtZT1wcm9qZWN0cy8qL2lzc3Vlcy8qfTpyZWplY3QSfwoMUmVxdWVzdElzc3VlEiAuYnl0ZWJhc2UudjEuUmVxdWVzdElzc3VlUmVxdWVzdBoSLmJ5dGViYXNlLnYxLklzc3VlIjmQ6jACmOowAYLT5JMCKzoBKiImL3YxL3tuYW1lPXByb2plY3RzLyovaXNzdWVzLyp9OnJlcXVlc3RCNlo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_google_type_expr, file_v1_annotation, file_v1_common]);/*** Describes the message bytebase.v1.GetIssueRequest.diff --git a/frontend/src/types/workspaceApprovalSetting.ts b/frontend/src/types/workspaceApprovalSetting.tsindex c80bee5ff4..e8cd9b67d6 100644--- a/frontend/src/types/workspaceApprovalSetting.ts+++ b/frontend/src/types/workspaceApprovalSetting.ts@@ -4,7 +4,8 @@ import type { ApprovalTemplate } from "@/types/proto-es/v1/issue_service_pb";import type { Risk_Source } from "@/types/proto-es/v1/risk_service_pb";export type LocalApprovalRule = {- uid: string;+ // Use template.id as the identifier instead of generating ephemeral uid+ // This allows proper identification of built-in vs custom flowsexpr?: SimpleExpr;template: ApprovalTemplate;};@@ -12,12 +13,12 @@ export type LocalApprovalRule = {export type ParsedApprovalRule = {source: Risk_Source;level: RiskLevel;- rule: string; // LocalApprovalRule.uid+ rule: string; // ApprovalTemplate.id};export type UnrecognizedApprovalRule = {expr?: SimpleExpr;- rule: string; // LocalApprovalRule.uid+ rule: string; // ApprovalTemplate.id};export type LocalApprovalConfig = {diff --git a/frontend/src/utils/workspaceApprovalSetting.ts b/frontend/src/utils/workspaceApprovalSetting.tsindex 9c99d1f4a0..9812603d30 100644--- a/frontend/src/utils/workspaceApprovalSetting.ts+++ b/frontend/src/utils/workspaceApprovalSetting.ts@@ -9,11 +9,11 @@ import {isConditionGroupExpr,resolveCELExpr,} from "@/plugins/cel";-import { t } from "@/plugins/i18n";import type { ParsedApprovalRule, UnrecognizedApprovalRule } from "@/types";-import { DEFAULT_RISK_LEVEL, PresetRoleType } from "@/types";+import { DEFAULT_RISK_LEVEL } from "@/types";import type { LocalApprovalConfig, LocalApprovalRule } from "@/types";import { PresetRiskLevelList, useSupportedSourceList } from "@/types";+import { getBuiltinFlow, isBuiltinFlowId } from "@/types";import type { Expr as CELExpr } from "@/types/proto-es/google/api/expr/v1alpha1/syntax_pb";import { ExprSchema as CELExprSchema } from "@/types/proto-es/google/api/expr/v1alpha1/syntax_pb";import type { Expr as _Expr } from "@/types/proto-es/google/type/expr_pb";@@ -70,15 +70,21 @@ export const resolveLocalApprovalConfig = async (for (let i = 0; i < config.rules.length; i++) {const rule = config.rules[i];+ const template = cloneDeep(rule.template!);++ // Ensure template has an id, generate UUID if missing (for legacy data)+ if (!template.id) {+ template.id = uuidv4();+ }+const localRule: LocalApprovalRule = {- uid: uuidv4(),expr: resolveCELExpr(createProto(CELExprSchema, {})),- template: cloneDeep(rule.template!),+ template,};- ruleMap.set(localRule.uid, localRule);+ ruleMap.set(template.id, localRule);if (rule.condition?.expression) {expressions.push(rule.condition.expression);- ruleIdList.push(localRule.uid);+ ruleIdList.push(template.id);}}@@ -104,7 +110,7 @@ const resolveApprovalConfigRules = (rules: LocalApprovalRule[]) => {const unrecognized: UnrecognizedApprovalRule[] = [];const fail = (expr: SimpleExpr | undefined, rule: LocalApprovalRule) => {- unrecognized.push({ expr, rule: rule.uid });+ unrecognized.push({ expr, rule: rule.template.id });};const resolveLogicAndExpr = (expr: SimpleExpr, rule: LocalApprovalRule) => {@@ -121,7 +127,7 @@ const resolveApprovalConfigRules = (rules: LocalApprovalRule[]) => {parsed.push({source,level,- rule: rule.uid,+ rule: rule.template.id,});};@@ -169,32 +175,81 @@ export const buildWorkspaceApprovalSetting = async (const parsedMap = toMap(parsed);- const approvalRuleMap: Map<number, ApprovalRule> = new Map();+ // Get unique template IDs that are actually used (have parsed rules)+ const usedTemplateIds = new Set(parsed.map((p) => p.rule));++ // Build a map of template ID -> template for quick lookup+ const templateMap = new Map<string, _ProtoEsApprovalTemplate>();+ for (const rule of rules) {+ if (rule.template.id) {+ templateMap.set(rule.template.id, rule.template);+ }+ }++ // Determine which templates to save:+ // 1. All custom templates (even if unused - they are user-created)+ // 2. Only used built-in templates (just-in-time materialization)+ const templatesToSave = new Set<string>();++ // Add all custom templates+ for (const rule of rules) {+ if (rule.template.id && !isBuiltinFlowId(rule.template.id)) {+ templatesToSave.add(rule.template.id);+ }+ }++ // Add used built-in templates+ for (const templateId of usedTemplateIds) {+ templatesToSave.add(templateId);+ }++ const approvalRuleMap: Map<string, ApprovalRule> = new Map();const exprList: CELExpr[] = [];- const ruleIndexList: number[] = [];+ const templateIdList: string[] = [];++ // Process each template to save+ for (const templateId of templatesToSave) {+ // Get template from cache, or materialize built-in template+ let template = templateMap.get(templateId);- for (let i = 0; i < rules.length; i++) {- const rule = rules[i];- const { uid, template } = rule;+ if (!template && isBuiltinFlowId(templateId)) {+ // Built-in template not in cache - materialize it+ const builtinFlow = getBuiltinFlow(templateId);+ if (builtinFlow) {+ template = createProto(_ProtoEsApprovalTemplateSchema, {+ id: builtinFlow.id,+ title: builtinFlow.title,+ description: builtinFlow.description,+ flow: createProto(_ProtoEsApprovalFlowSchema, {+ roles: [...builtinFlow.roles],+ }),+ });+ }+ }++ if (!template) {+ console.warn(`Template ${templateId} not found, skipping`);+ continue;+ }const approvalRule = createProto(ApprovalRuleSchema, {template: template,condition: createProto(ExprSchema, { expression: "" }),});- approvalRuleMap.set(i, approvalRule);+ approvalRuleMap.set(templateId, approvalRule);- const parsed = parsedMap.get(uid) ?? [];+ const parsed = parsedMap.get(templateId) ?? [];const parsedExpr = await buildParsedExpression(parsed);if (parsedExpr) {exprList.push(parsedExpr);- ruleIndexList.push(i);+ templateIdList.push(templateId);}}const expressionList = await batchConvertParsedExprToCELString(exprList);for (let i = 0; i < expressionList.length; i++) {- const ruleIndex = ruleIndexList[i];- approvalRuleMap.get(ruleIndex)!.condition = createProto(ExprSchema, {+ const templateId = templateIdList[i];+ approvalRuleMap.get(templateId)!.condition = createProto(ExprSchema, {expression: expressionList[i],});}@@ -305,61 +360,3 @@ const buildParsedExpression = async (parsed: ParsedApprovalRule[]) => {const expr = await buildCELExpr(listedOrExpr);return expr;};--// Create seed (SYSTEM preset) approval flows-export const seedWorkspaceApprovalSetting = () => {- const generateRule = (- title: string,- description: string,- roles: string[]- ): ApprovalRule => {- return createProto(ApprovalRuleSchema, {- template: {- title,- description,- flow: {- roles,- },- },- });- };- type Preset = {- title?: string;- description: string;- roles: string[];- };- const presets: Preset[] = [- {- description: "owner-dba",- roles: [PresetRoleType.PROJECT_OWNER, PresetRoleType.WORKSPACE_DBA],- },- {- description: "owner",- roles: [PresetRoleType.PROJECT_OWNER],- },- {- description: "dba",- roles: [PresetRoleType.WORKSPACE_DBA],- },- {- description: "admin",- roles: [PresetRoleType.WORKSPACE_ADMIN],- },- {- description: "owner-dba-admin",- roles: [- PresetRoleType.PROJECT_OWNER,- PresetRoleType.WORKSPACE_DBA,- PresetRoleType.WORKSPACE_ADMIN,- ],- },- ];- return presets.map((preset) => {- const title =- preset.title ??- preset.roles.map((role) => approvalNodeRoleText(role)).join(" -> ");- const keypath = `dynamic.custom-approval.approval-flow.presets.${preset.description}`;- const description = t(keypath);- return generateRule(title, description, preset.roles);- });-};diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yamlindex 69ec557076..d4ddbdd37f 100644--- a/proto/gen/grpc-doc/openapi.yaml+++ b/proto/gen/grpc-doc/openapi.yaml@@ -8459,6 +8459,12 @@ components:ApprovalTemplate:type: objectproperties:+ id:+ type: string+ description: |-+ The unique identifier for the approval template.+ For built-in templates, use "bb." prefix (e.g., "bb.project-owner", "bb.workspace-dba").+ For custom templates, use a UUID or other unique identifier.flow:$ref: '#/components/schemas/ApprovalFlow'title:diff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.mdindex 8ed89b077b..2cb9824b5c 100644--- a/proto/gen/grpc-doc/store/README.md+++ b/proto/gen/grpc-doc/store/README.md@@ -589,6 +589,7 @@ offset.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |+| id | [string](#string) | | The unique identifier for the approval template. For built-in templates, use "bb." prefix (e.g., "bb.project-owner", "bb.workspace-dba"). For custom templates, use a UUID or other unique identifier. || flow | [ApprovalFlow](#bytebase-store-ApprovalFlow) | | || title | [string](#string) | | || description | [string](#string) | | |diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.htmlindex 36dff61be8..6bfbf887aa 100644--- a/proto/gen/grpc-doc/store/index.html+++ b/proto/gen/grpc-doc/store/index.html@@ -2142,6 +2142,15 @@ TODO: use range instead. </p></td></thead><tbody>+ <tr>+ <td>id</td>+ <td><a href="#string">string</a></td>+ <td></td>+ <td><p>The unique identifier for the approval template.+For built-in templates, use "bb." prefix (e.g., "bb.project-owner", "bb.workspace-dba").+For custom templates, use a UUID or other unique identifier. </p></td>+ </tr>+<tr><td>flow</td><td><a href="#bytebase.store.ApprovalFlow">ApprovalFlow</a></td>diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.mdindex 2fdab9e3d5..03e6d878b7 100644--- a/proto/gen/grpc-doc/v1/README.md+++ b/proto/gen/grpc-doc/v1/README.md@@ -3417,6 +3417,7 @@ LIST, HASH (https://www.postgresql.org/docs/current/ddl-partitioning.html)| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |+| id | [string](#string) | | The unique identifier for the approval template. For built-in templates, use "bb." prefix (e.g., "bb.project-owner", "bb.workspace-dba"). For custom templates, use a UUID or other unique identifier. || flow | [ApprovalFlow](#bytebase-v1-ApprovalFlow) | | || title | [string](#string) | | || description | [string](#string) | | |diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.htmlindex 5951c51f61..250503d4f8 100644--- a/proto/gen/grpc-doc/v1/index.html+++ b/proto/gen/grpc-doc/v1/index.html@@ -10467,6 +10467,15 @@ The API will default to the BASIC view.</p></td></thead><tbody>+ <tr>+ <td>id</td>+ <td><a href="#string">string</a></td>+ <td></td>+ <td><p>The unique identifier for the approval template.+For built-in templates, use "bb." prefix (e.g., "bb.project-owner", "bb.workspace-dba").+For custom templates, use a UUID or other unique identifier. </p></td>+ </tr>+<tr><td>flow</td><td><a href="#bytebase.v1.ApprovalFlow">ApprovalFlow</a></td>diff --git a/proto/store/store/approval.proto b/proto/store/store/approval.protoindex 0f3a1703b4..74fb38e291 100644--- a/proto/store/store/approval.proto+++ b/proto/store/store/approval.proto@@ -36,6 +36,10 @@ message IssuePayloadApproval {}message ApprovalTemplate {+ // The unique identifier for the approval template.+ // For built-in templates, use "bb." prefix (e.g., "bb.project-owner", "bb.workspace-dba").+ // For custom templates, use a UUID or other unique identifier.+ string id = 4;ApprovalFlow flow = 1;string title = 2;string description = 3;diff --git a/proto/v1/v1/issue_service.proto b/proto/v1/v1/issue_service.protoindex 3fa8c82e7f..87ec180fa0 100644--- a/proto/v1/v1/issue_service.proto+++ b/proto/v1/v1/issue_service.proto@@ -457,6 +457,10 @@ enum IssueStatus {}message ApprovalTemplate {+ // The unique identifier for the approval template.+ // For built-in templates, use "bb." prefix (e.g., "bb.project-owner", "bb.workspace-dba").+ // For custom templates, use a UUID or other unique identifier.+ string id = 4;ApprovalFlow flow = 1;string title = 2;string description = 3;