Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
refactor: migrate WATERMARK setting to WORKSPACE_PROFILE (#18313)
Danny Xu3cbec26246bb
diff --git a/backend/api/v1/actuator_service.go b/backend/api/v1/actuator_service.goindex a455c56d6f..cab3f29780 100644--- a/backend/api/v1/actuator_service.go+++ b/backend/api/v1/actuator_service.go@@ -245,14 +245,6 @@ func (s *ActuatorService) getUsedFeatures(ctx context.Context) ([]v1pb.PlanFeatufeatures = append(features, v1pb.PlanFeature_FEATURE_CUSTOM_LOGO)}- watermark, err := s.store.GetSettingV2(ctx, storepb.SettingName_WATERMARK)- if err != nil {- return nil, errors.Wrapf(err, "failed to get watermark setting")- }- if watermark != nil && watermark.Value == "1" {- features = append(features, v1pb.PlanFeature_FEATURE_WATERMARK)- }-setting, err := s.store.GetWorkspaceGeneralSetting(ctx)if err != nil {return nil, errors.Wrapf(err, "failed to get workspace general setting")@@ -269,6 +261,9 @@ func (s *ActuatorService) getUsedFeatures(ctx context.Context) ([]v1pb.PlanFeatuif setting.GetAnnouncement().GetText() != "" {features = append(features, v1pb.PlanFeature_FEATURE_DASHBOARD_ANNOUNCEMENT)}+ if setting.Watermark {+ features = append(features, v1pb.PlanFeature_FEATURE_WATERMARK)+ }// environment tierenvironments, err := s.store.GetEnvironment(ctx)diff --git a/backend/api/v1/setting_service.go b/backend/api/v1/setting_service.goindex bf18238cb3..d52a5b079a 100644--- a/backend/api/v1/setting_service.go+++ b/backend/api/v1/setting_service.go@@ -268,6 +268,13 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req}resetAuditLogStdout = trueoldSetting.EnableAuditLogStdout = payload.EnableAuditLogStdout+ case "value.workspace_profile.watermark":+ if payload.Watermark {+ if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_WATERMARK); err != nil {+ return nil, connect.NewError(connect.CodePermissionDenied, err)+ }+ }+ oldSetting.Watermark = payload.Watermarkdefault:return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid update mask path %v", path))}@@ -454,11 +461,6 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Reqreturn nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to marshal setting for %s with error: %v", apiSettingName, err))}storeSettingValue = string(bytes)- case storepb.SettingName_WATERMARK:- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_WATERMARK); err != nil {- return nil, connect.NewError(connect.CodePermissionDenied, err)- }- storeSettingValue = request.Msg.Setting.Value.GetStringValue()case storepb.SettingName_SCIM:scimToken, err := common.RandomString(32)if err != nil {diff --git a/backend/api/v1/setting_service_converter.go b/backend/api/v1/setting_service_converter.goindex cd297db32c..8435f10359 100644--- a/backend/api/v1/setting_service_converter.go+++ b/backend/api/v1/setting_service_converter.go@@ -187,8 +187,6 @@ func convertStoreSettingNameToV1(storeName storepb.SettingName) v1pb.Setting_Setreturn v1pb.Setting_WORKSPACE_APPROVALcase storepb.SettingName_APP_IM:return v1pb.Setting_APP_IM- case storepb.SettingName_WATERMARK:- return v1pb.Setting_WATERMARKcase storepb.SettingName_AI:return v1pb.Setting_AIcase storepb.SettingName_DATA_CLASSIFICATION:@@ -222,8 +220,6 @@ func convertV1SettingNameToStore(v1Name v1pb.Setting_SettingName) storepb.Settinreturn storepb.SettingName_WORKSPACE_APPROVALcase v1pb.Setting_APP_IM:return storepb.SettingName_APP_IM- case v1pb.Setting_WATERMARK:- return storepb.SettingName_WATERMARKcase v1pb.Setting_AI:return storepb.SettingName_AIcase v1pb.Setting_DATA_CLASSIFICATION:@@ -299,6 +295,7 @@ func convertWorkspaceProfileSetting(v1Setting *v1pb.WorkspaceProfileSetting) *stDisallowPasswordSignin: v1Setting.DisallowPasswordSignin,EnableMetricCollection: v1Setting.EnableMetricCollection,EnableAuditLogStdout: v1Setting.EnableAuditLogStdout,+ Watermark: v1Setting.Watermark,}// Convert announcement if present@@ -342,6 +339,7 @@ func convertToWorkspaceProfileSetting(storeSetting *storepb.WorkspaceProfileSettDisallowPasswordSignin: storeSetting.DisallowPasswordSignin,EnableMetricCollection: storeSetting.EnableMetricCollection,EnableAuditLogStdout: storeSetting.EnableAuditLogStdout,+ Watermark: storeSetting.Watermark,}if storeSetting.Announcement != nil {diff --git a/backend/generated-go/store/setting.pb.go b/backend/generated-go/store/setting.pb.goindex 489fbbeeb7..0096c35e15 100644--- a/backend/generated-go/store/setting.pb.go+++ b/backend/generated-go/store/setting.pb.go@@ -34,7 +34,6 @@ const (SettingName_WORKSPACE_APPROVAL SettingName = 5SettingName_ENTERPRISE_LICENSE SettingName = 7SettingName_APP_IM SettingName = 8- SettingName_WATERMARK SettingName = 9SettingName_AI SettingName = 10SettingName_DATA_CLASSIFICATION SettingName = 14SettingName_SEMANTIC_TYPES SettingName = 15@@ -54,7 +53,6 @@ var (5: "WORKSPACE_APPROVAL",7: "ENTERPRISE_LICENSE",8: "APP_IM",- 9: "WATERMARK",10: "AI",14: "DATA_CLASSIFICATION",15: "SEMANTIC_TYPES",@@ -71,7 +69,6 @@ var ("WORKSPACE_APPROVAL": 5,"ENTERPRISE_LICENSE": 7,"APP_IM": 8,- "WATERMARK": 9,"AI": 10,"DATA_CLASSIFICATION": 14,"SEMANTIC_TYPES": 15,@@ -401,8 +398,11 @@ type WorkspaceProfileSetting struct {// Whether to enable audit logging to stdout in structured JSON format.// Requires TEAM or ENTERPRISE license.EnableAuditLogStdout bool `protobuf:"varint,15,opt,name=enable_audit_log_stdout,json=enableAuditLogStdout,proto3" json:"enable_audit_log_stdout,omitempty"`- unknownFields protoimpl.UnknownFields- sizeCache protoimpl.SizeCache+ // Whether to display watermark on pages.+ // Requires ENTERPRISE license.+ Watermark bool `protobuf:"varint,16,opt,name=watermark,proto3" json:"watermark,omitempty"`+ unknownFields protoimpl.UnknownFields+ sizeCache protoimpl.SizeCache}func (x *WorkspaceProfileSetting) Reset() {@@ -526,6 +526,13 @@ func (x *WorkspaceProfileSetting) GetEnableAuditLogStdout() bool {return false}+func (x *WorkspaceProfileSetting) GetWatermark() bool {+ if x != nil {+ return x.Watermark+ }+ return false+}+type Announcement struct {state protoimpl.MessageState `protogen:"open.v1"`// The alert level of the announcement.@@ -2322,7 +2329,7 @@ var File_store_setting_proto protoreflect.FileDescriptorconst file_store_setting_proto_rawDesc = "" +"\n" +- "\x13store/setting.proto\x12\x0ebytebase.store\x1a\x1egoogle/protobuf/duration.proto\x1a\x16google/type/expr.proto\x1a\x14store/approval.proto\x1a\x1bstore/project_webhook.proto\"\x85\x06\n" ++ "\x13store/setting.proto\x12\x0ebytebase.store\x1a\x1egoogle/protobuf/duration.proto\x1a\x16google/type/expr.proto\x1a\x14store/approval.proto\x1a\x1bstore/project_webhook.proto\"\xa3\x06\n" +"\x17WorkspaceProfileSetting\x12!\n" +"\fexternal_url\x18\x01 \x01(\tR\vexternalUrl\x12'\n" +"\x0fdisallow_signup\x18\x02 \x01(\bR\x0edisallowSignup\x12\x1f\n" +@@ -2338,7 +2345,8 @@ const file_store_setting_proto_rawDesc = "" +"\x18disallow_password_signin\x18\f \x01(\bR\x16disallowPasswordSignin\x128\n" +"\x18enable_metric_collection\x18\r \x01(\bR\x16enableMetricCollection\x12S\n" +"\x18inactive_session_timeout\x18\x0e \x01(\v2\x19.google.protobuf.DurationR\x16inactiveSessionTimeout\x125\n" +- "\x17enable_audit_log_stdout\x18\x0f \x01(\bR\x14enableAuditLogStdout\"\xe9\x01\n" ++ "\x17enable_audit_log_stdout\x18\x0f \x01(\bR\x14enableAuditLogStdout\x12\x1c\n" ++ "\twatermark\x18\x10 \x01(\bR\twatermark\"\xe9\x01\n" +"\fAnnouncement\x12=\n" +"\x05level\x18\x01 \x01(\x0e2'.bytebase.store.Announcement.AlertLevelR\x05level\x12\x12\n" +"\x04text\x18\x02 \x01(\tR\x04text\x12\x12\n" +@@ -2486,7 +2494,7 @@ const file_store_setting_proto_rawDesc = "" +"\x05color\x18\x04 \x01(\tR\x05color\x1a7\n" +"\tTagsEntry\x12\x10\n" +"\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" +- "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01*\xbf\x02\n" ++ "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01*\x9e\x02\n" +"\vSettingName\x12\x1c\n" +"\x18SETTING_NAME_UNSPECIFIED\x10\x00\x12\x0f\n" +"\vAUTH_SECRET\x10\x01\x12\x11\n" +@@ -2496,15 +2504,14 @@ const file_store_setting_proto_rawDesc = "" +"\x12WORKSPACE_APPROVAL\x10\x05\x12\x16\n" +"\x12ENTERPRISE_LICENSE\x10\a\x12\n" +"\n" +- "\x06APP_IM\x10\b\x12\r\n" +- "\tWATERMARK\x10\t\x12\x06\n" ++ "\x06APP_IM\x10\b\x12\x06\n" +"\x02AI\x10\n" +"\x12\x17\n" +"\x13DATA_CLASSIFICATION\x10\x0e\x12\x12\n" +"\x0eSEMANTIC_TYPES\x10\x0f\x12\b\n" +"\x04SCIM\x10\x11\x12\x18\n" +"\x14PASSWORD_RESTRICTION\x10\x12\x12\x0f\n" +- "\vENVIRONMENT\x10\x13\"\x04\b\x10\x10\x10\"\x04\b\x06\x10\x06\"\x04\b\r\x10\r*T\n" ++ "\vENVIRONMENT\x10\x13*T\n" +"\x12DatabaseChangeMode\x12$\n" +" DATABASE_CHANGE_MODE_UNSPECIFIED\x10\x00\x12\f\n" +"\bPIPELINE\x10\x01\x12\n" +diff --git a/backend/generated-go/store/setting_equal.pb.go b/backend/generated-go/store/setting_equal.pb.goindex e4a822f720..c2f64c4ecb 100644--- a/backend/generated-go/store/setting_equal.pb.go+++ b/backend/generated-go/store/setting_equal.pb.go@@ -59,6 +59,9 @@ func (x *WorkspaceProfileSetting) Equal(y *WorkspaceProfileSetting) bool {if x.EnableAuditLogStdout != y.EnableAuditLogStdout {return false}+ if x.Watermark != y.Watermark {+ return false+ }return true}diff --git a/backend/generated-go/v1/setting_service.pb.go b/backend/generated-go/v1/setting_service.pb.goindex c515af5921..c2d6e3aff4 100644--- a/backend/generated-go/v1/setting_service.pb.go+++ b/backend/generated-go/v1/setting_service.pb.go@@ -85,7 +85,6 @@ const (Setting_WORKSPACE_PROFILE Setting_SettingName = 4Setting_WORKSPACE_APPROVAL Setting_SettingName = 5Setting_APP_IM Setting_SettingName = 8- Setting_WATERMARK Setting_SettingName = 9Setting_AI Setting_SettingName = 10Setting_DATA_CLASSIFICATION Setting_SettingName = 14Setting_SEMANTIC_TYPES Setting_SettingName = 15@@ -102,7 +101,6 @@ var (4: "WORKSPACE_PROFILE",5: "WORKSPACE_APPROVAL",8: "APP_IM",- 9: "WATERMARK",10: "AI",14: "DATA_CLASSIFICATION",15: "SEMANTIC_TYPES",@@ -116,7 +114,6 @@ var ("WORKSPACE_PROFILE": 4,"WORKSPACE_APPROVAL": 5,"APP_IM": 8,- "WATERMARK": 9,"AI": 10,"DATA_CLASSIFICATION": 14,"SEMANTIC_TYPES": 15,@@ -951,8 +948,11 @@ type WorkspaceProfileSetting struct {// Whether to enable audit logging to stdout in structured JSON format.// Requires TEAM or ENTERPRISE license.EnableAuditLogStdout bool `protobuf:"varint,15,opt,name=enable_audit_log_stdout,json=enableAuditLogStdout,proto3" json:"enable_audit_log_stdout,omitempty"`- unknownFields protoimpl.UnknownFields- sizeCache protoimpl.SizeCache+ // Whether to display watermark on pages.+ // Requires ENTERPRISE license.+ Watermark bool `protobuf:"varint,16,opt,name=watermark,proto3" json:"watermark,omitempty"`+ unknownFields protoimpl.UnknownFields+ sizeCache protoimpl.SizeCache}func (x *WorkspaceProfileSetting) Reset() {@@ -1076,6 +1076,13 @@ func (x *WorkspaceProfileSetting) GetEnableAuditLogStdout() bool {return false}+func (x *WorkspaceProfileSetting) GetWatermark() bool {+ if x != nil {+ return x.Watermark+ }+ return false+}+type Announcement struct {state protoimpl.MessageState `protogen:"open.v1"`// The alert level of announcement@@ -2879,18 +2886,17 @@ const file_v1_setting_service_proto_rawDesc = "" +"\rvalidate_only\x18\x02 \x01(\bR\fvalidateOnly\x12#\n" +"\rallow_missing\x18\x03 \x01(\bR\fallowMissing\x12;\n" +"\vupdate_mask\x18\x04 \x01(\v2\x1a.google.protobuf.FieldMaskR\n" +- "updateMask\"\xfc\x02\n" ++ "updateMask\"\xed\x02\n" +"\aSetting\x12\x17\n" +"\x04name\x18\x01 \x01(\tB\x03\xe0A\bR\x04name\x124\n" +- "\x05value\x18\x02 \x01(\v2\x19.bytebase.v1.SettingValueB\x03\xe0A\x02R\x05value\"\xf2\x01\n" ++ "\x05value\x18\x02 \x01(\v2\x19.bytebase.v1.SettingValueB\x03\xe0A\x02R\x05value\"\xe3\x01\n" +"\vSettingName\x12\x1c\n" +"\x18SETTING_NAME_UNSPECIFIED\x10\x00\x12\x11\n" +"\rBRANDING_LOGO\x10\x02\x12\x15\n" +"\x11WORKSPACE_PROFILE\x10\x04\x12\x16\n" +"\x12WORKSPACE_APPROVAL\x10\x05\x12\n" +"\n" +- "\x06APP_IM\x10\b\x12\r\n" +- "\tWATERMARK\x10\t\x12\x06\n" ++ "\x06APP_IM\x10\b\x12\x06\n" +"\x02AI\x10\n" +"\x12\x17\n" +"\x13DATA_CLASSIFICATION\x10\x0e\x12\x12\n" +@@ -2945,7 +2951,7 @@ const file_v1_setting_service_proto_rawDesc = "" +"\x04lark\x18\x05 \x01(\v2\x1e.bytebase.v1.AppIMSetting.LarkH\x00R\x04lark\x12@\n" +"\bdingtalk\x18\x06 \x01(\v2\".bytebase.v1.AppIMSetting.DingTalkH\x00R\bdingtalk\x127\n" +"\x05teams\x18\a \x01(\v2\x1f.bytebase.v1.AppIMSetting.TeamsH\x00R\x05teamsB\t\n" +- "\apayload\"\xff\x05\n" ++ "\apayload\"\x9d\x06\n" +"\x17WorkspaceProfileSetting\x12!\n" +"\fexternal_url\x18\x01 \x01(\tR\vexternalUrl\x12'\n" +"\x0fdisallow_signup\x18\x02 \x01(\bR\x0edisallowSignup\x12\x1f\n" +@@ -2961,7 +2967,8 @@ const file_v1_setting_service_proto_rawDesc = "" +"\x18disallow_password_signin\x18\f \x01(\bR\x16disallowPasswordSignin\x128\n" +"\x18enable_metric_collection\x18\r \x01(\bR\x16enableMetricCollection\x12S\n" +"\x18inactive_session_timeout\x18\x0e \x01(\v2\x19.google.protobuf.DurationR\x16inactiveSessionTimeout\x125\n" +- "\x17enable_audit_log_stdout\x18\x0f \x01(\bR\x14enableAuditLogStdout\"\xc2\x01\n" ++ "\x17enable_audit_log_stdout\x18\x0f \x01(\bR\x14enableAuditLogStdout\x12\x1c\n" ++ "\twatermark\x18\x10 \x01(\bR\twatermark\"\xc2\x01\n" +"\fAnnouncement\x12:\n" +"\x05level\x18\x01 \x01(\x0e2$.bytebase.v1.Announcement.AlertLevelR\x05level\x12\x12\n" +"\x04text\x18\x02 \x01(\tR\x04text\x12\x12\n" +diff --git a/backend/generated-go/v1/setting_service_equal.pb.go b/backend/generated-go/v1/setting_service_equal.pb.goindex 79a6ff1213..de69b9fcb8 100644--- a/backend/generated-go/v1/setting_service_equal.pb.go+++ b/backend/generated-go/v1/setting_service_equal.pb.go@@ -347,6 +347,9 @@ func (x *WorkspaceProfileSetting) Equal(y *WorkspaceProfileSetting) bool {if x.EnableAuditLogStdout != y.EnableAuditLogStdout {return false}+ if x.Watermark != y.Watermark {+ return false+ }return true}diff --git a/backend/migrator/migration/3.13/0009##move_watermark_to_workspace_profile.sql b/backend/migrator/migration/3.13/0009##move_watermark_to_workspace_profile.sqlnew file mode 100644index 0000000000..568b28fb73--- /dev/null+++ b/backend/migrator/migration/3.13/0009##move_watermark_to_workspace_profile.sql@@ -0,0 +1,16 @@+-- Migrate WATERMARK setting into WORKSPACE_PROFILE+-- Only set watermark to true if the value is exactly "1", otherwise rely on proto3 default (false)+UPDATE setting+SET value = jsonb_set(+ COALESCE(value::jsonb, '{}'::jsonb),+ '{watermark}',+ 'true'::jsonb,+ true+)::text+WHERE name = 'WORKSPACE_PROFILE'+AND EXISTS (+ SELECT 1 FROM setting WHERE name = 'WATERMARK' AND value = '1'+);++-- Delete the old WATERMARK setting+DELETE FROM setting WHERE name = 'WATERMARK';diff --git a/backend/migrator/migration/LATEST.sql b/backend/migrator/migration/LATEST.sqlindex 8a907479b5..28286bae95 100644--- a/backend/migrator/migration/LATEST.sql+++ b/backend/migrator/migration/LATEST.sql@@ -34,7 +34,7 @@ CREATE TABLE principal (CREATE TABLE setting (id serial PRIMARY KEY,-- name: AUTH_SECRET, BRANDING_LOGO, WORKSPACE_ID, WORKSPACE_PROFILE, WORKSPACE_APPROVAL,- -- ENTERPRISE_LICENSE, APP_IM, WATERMARK, AI,+ -- ENTERPRISE_LICENSE, APP_IM, AI,-- DATA_CLASSIFICATION, SEMANTIC_TYPES, SCIM, PASSWORD_RESTRICTION, ENVIRONMENT-- Enum: SettingName (proto/store/store/setting.proto)name text NOT NULL,@@ -552,7 +552,6 @@ ALTER SEQUENCE project_id_seq RESTART WITH 101;INSERT INTO setting (name, value) VALUES ('BRANDING_LOGO', '');INSERT INTO setting (name, value) VALUES ('ENTERPRISE_LICENSE', '');INSERT INTO setting (name, value) VALUES ('APP_IM', '{}');-INSERT INTO setting (name, value) VALUES ('WATERMARK', '0');INSERT INTO setting (name, value) VALUES ('DATA_CLASSIFICATION', '{}');INSERT INTO setting (name, value) VALUES ('WORKSPACE_APPROVAL', '{"rules":[{"template":{"flow":{"roles":["roles/projectOwner"]},"title":"Fallback Rule","description":"Requires project owner approval when no other rules match."},"condition":{"expression":"true"}}]}');INSERT INTO setting (name, value) VALUES ('PASSWORD_RESTRICTION', '{"minLength":8}');diff --git a/backend/migrator/migrator_test.go b/backend/migrator/migrator_test.goindex 6ad0650572..47c5d59f6e 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.13.8"), *files[len(files)-1].version)+ require.Equal(t, semver.MustParse("3.13.9"), *files[len(files)-1].version)}func TestVersionUnique(t *testing.T) {diff --git a/frontend/src/components/GeneralSetting/SecuritySetting.vue b/frontend/src/components/GeneralSetting/SecuritySetting.vueindex 44ee700dfe..42134e7e5f 100644--- a/frontend/src/components/GeneralSetting/SecuritySetting.vue+++ b/frontend/src/components/GeneralSetting/SecuritySetting.vue@@ -46,13 +46,10 @@<script lang="ts" setup>import { create } from "@bufbuild/protobuf";+import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";import { computed, ref } from "vue";import { Switch } from "@/components/v2";import { featureToRef, useSettingV1Store } from "@/store";-import {- Setting_SettingName,- SettingValueSchema as SettingSettingValueSchema,-} from "@/types/proto-es/v1/setting_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import { FeatureBadge } from "../FeatureGuard";import DomainRestrictionSetting from "./DomainRestrictionSetting.vue";@@ -81,13 +78,7 @@ const settingRefList = computed(() => []);const initEnableWatermark = computed(() => {- const watermarkSetting = settingV1Store.getSettingByName(- Setting_SettingName.WATERMARK- );- if (watermarkSetting?.value?.value?.case === "stringValue") {- return watermarkSetting.value.value.value === "1";- }- return false;+ return settingV1Store.workspaceProfileSetting?.watermark ?? false;});const enableWatermark = ref(initEnableWatermark.value);@@ -100,14 +91,12 @@ const isDirty = computed(() => {});const handleWatermarkToggle = async () => {- const value = enableWatermark.value ? "1" : "0";- await settingV1Store.upsertSetting({- name: Setting_SettingName.WATERMARK,- value: create(SettingSettingValueSchema, {- value: {- case: "stringValue",- value: value,- },+ await settingV1Store.updateWorkspaceProfile({+ payload: {+ watermark: enableWatermark.value,+ },+ updateMask: create(FieldMaskSchema, {+ paths: ["value.workspace_profile.watermark"],}),});};diff --git a/frontend/src/components/misc/Watermark.vue b/frontend/src/components/misc/Watermark.vueindex 802374c729..8a746e75d3 100644--- a/frontend/src/components/misc/Watermark.vue+++ b/frontend/src/components/misc/Watermark.vue@@ -43,7 +43,6 @@ import {} from "@/store";import { useSettingV1Store } from "@/store/modules/v1/setting";import { UNKNOWN_USER_NAME } from "@/types";-import { Setting_SettingName } from "@/types/proto-es/v1/setting_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";const GAP = 320;@@ -57,9 +56,7 @@ const version = computed("-" +useActuatorV1Store().gitCommitBE.substring(0, 7));-const setting = computed(() =>- useSettingV1Store().getSettingByName(Setting_SettingName.WATERMARK)-);+const settingStore = useSettingV1Store();const hasWatermarkFeature = featureToRef(PlanFeature.FEATURE_WATERMARK);const lines = computed(() => {@@ -67,11 +64,7 @@ const lines = computed(() => {const uid = extractUserId(user.name);if (user.name === UNKNOWN_USER_NAME) return [];if (!hasWatermarkFeature.value) return [];- if (- setting.value?.value?.value?.case !== "stringValue" ||- setting.value.value.value.value !== "1"- )- return [];+ if (!settingStore.workspaceProfileSetting?.watermark) return [];const lines: string[] = [];lines.push(`${user.title} (${uid})`);diff --git a/frontend/src/types/proto-es/v1/setting_service_pb.d.ts b/frontend/src/types/proto-es/v1/setting_service_pb.d.tsindex 64d0e5b818..eac54c469f 100644--- a/frontend/src/types/proto-es/v1/setting_service_pb.d.ts+++ b/frontend/src/types/proto-es/v1/setting_service_pb.d.ts@@ -178,11 +178,6 @@ export enum Setting_SettingName {*/APP_IM = 8,- /**- * @generated from enum value: WATERMARK = 9;- */- WATERMARK = 9,-/*** @generated from enum value: AI = 10;*/@@ -609,6 +604,14 @@ export declare type WorkspaceProfileSetting = Message<"bytebase.v1.WorkspaceProf* @generated from field: bool enable_audit_log_stdout = 15;*/enableAuditLogStdout: boolean;++ /**+ * Whether to display watermark on pages.+ * Requires ENTERPRISE license.+ *+ * @generated from field: bool watermark = 16;+ */+ watermark: boolean;};/**diff --git a/frontend/src/types/proto-es/v1/setting_service_pb.js b/frontend/src/types/proto-es/v1/setting_service_pb.jsindex e8b329ddb8..7417702031 100644--- a/frontend/src/types/proto-es/v1/setting_service_pb.js+++ b/frontend/src/types/proto-es/v1/setting_service_pb.js@@ -17,7 +17,7 @@ import { file_v1_project_service } from "./project_service_pb";* Describes the file v1/setting_service.proto.*/export const file_v1_setting_service = /*@__PURE__*/- fileDesc("Chh2MS9zZXR0aW5nX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIhUKE0xpc3RTZXR0aW5nc1JlcXVlc3QiPgoUTGlzdFNldHRpbmdzUmVzcG9uc2USJgoIc2V0dGluZ3MYASADKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIj8KEUdldFNldHRpbmdSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1NldHRpbmciOwoSR2V0U2V0dGluZ1Jlc3BvbnNlEiUKB3NldHRpbmcYASABKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIqEBChRVcGRhdGVTZXR0aW5nUmVxdWVzdBIqCgdzZXR0aW5nGAEgASgLMhQuYnl0ZWJhc2UudjEuU2V0dGluZ0ID4EECEhUKDXZhbGlkYXRlX29ubHkYAiABKAgSFQoNYWxsb3dfbWlzc2luZxgDIAEoCBIvCgt1cGRhdGVfbWFzaxgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2si7wIKB1NldHRpbmcSEQoEbmFtZRgBIAEoCUID4EEIEi0KBXZhbHVlGAIgASgLMhkuYnl0ZWJhc2UudjEuU2V0dGluZ1ZhbHVlQgPgQQIi8gEKC1NldHRpbmdOYW1lEhwKGFNFVFRJTkdfTkFNRV9VTlNQRUNJRklFRBAAEhEKDUJSQU5ESU5HX0xPR08QAhIVChFXT1JLU1BBQ0VfUFJPRklMRRAEEhYKEldPUktTUEFDRV9BUFBST1ZBTBAFEgoKBkFQUF9JTRAIEg0KCVdBVEVSTUFSSxAJEgYKAkFJEAoSFwoTREFUQV9DTEFTU0lGSUNBVElPThAOEhIKDlNFTUFOVElDX1RZUEVTEA8SCAoEU0NJTRAREhgKFFBBU1NXT1JEX1JFU1RSSUNUSU9OEBISDwoLRU5WSVJPTk1FTlQQEzot6kEqChRieXRlYmFzZS5jb20vU2V0dGluZxISc2V0dGluZ3Mve3NldHRpbmd9IrcECgxTZXR0aW5nVmFsdWUSFgoMc3RyaW5nX3ZhbHVlGAEgASgJSAASKwoGYXBwX2ltGAMgASgLMhkuYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nSAASQQoRd29ya3NwYWNlX3Byb2ZpbGUYBSABKAsyJC5ieXRlYmFzZS52MS5Xb3Jrc3BhY2VQcm9maWxlU2V0dGluZ0gAEkMKEndvcmtzcGFjZV9hcHByb3ZhbBgGIAEoCzIlLmJ5dGViYXNlLnYxLldvcmtzcGFjZUFwcHJvdmFsU2V0dGluZ0gAEkUKE2RhdGFfY2xhc3NpZmljYXRpb24YCiABKAsyJi5ieXRlYmFzZS52MS5EYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nSAASOQoNc2VtYW50aWNfdHlwZRgLIAEoCzIgLmJ5dGViYXNlLnYxLlNlbWFudGljVHlwZVNldHRpbmdIABIoCgRzY2ltGA4gASgLMhguYnl0ZWJhc2UudjEuU0NJTVNldHRpbmdIABJHChRwYXNzd29yZF9yZXN0cmljdGlvbhgPIAEoCzInLmJ5dGViYXNlLnYxLlBhc3N3b3JkUmVzdHJpY3Rpb25TZXR0aW5nSAASJAoCYWkYECABKAsyFi5ieXRlYmFzZS52MS5BSVNldHRpbmdIABI2CgtlbnZpcm9ubWVudBgRIAEoCzIfLmJ5dGViYXNlLnYxLkVudmlyb25tZW50U2V0dGluZ0gAQgcKBXZhbHVlIr0GCgxBcHBJTVNldHRpbmcSNQoIc2V0dGluZ3MYASADKAsyIy5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuSU1TZXR0aW5nGhsKBVNsYWNrEhIKBXRva2VuGAEgASgJQgPgQQQaNgoGRmVpc2h1EhMKBmFwcF9pZBgBIAEoCUID4EEEEhcKCmFwcF9zZWNyZXQYAiABKAlCA+BBBBpJCgVXZWNvbRIUCgdjb3JwX2lkGAEgASgJQgPgQQQSFQoIYWdlbnRfaWQYAiABKAlCA+BBBBITCgZzZWNyZXQYAyABKAlCA+BBBBo0CgRMYXJrEhMKBmFwcF9pZBgBIAEoCUID4EEEEhcKCmFwcF9zZWNyZXQYAiABKAlCA+BBBBpXCghEaW5nVGFsaxIWCgljbGllbnRfaWQYASABKAlCA+BBBBIaCg1jbGllbnRfc2VjcmV0GAIgASgJQgPgQQQSFwoKcm9ib3RfY29kZRgDIAEoCUID4EEEGlMKBVRlYW1zEhYKCXRlbmFudF9pZBgBIAEoCUID4EEEEhYKCWNsaWVudF9pZBgCIAEoCUID4EEEEhoKDWNsaWVudF9zZWNyZXQYAyABKAlCA+BBBBrxAgoJSU1TZXR0aW5nEicKBHR5cGUYASABKA4yGS5ieXRlYmFzZS52MS5XZWJob29rLlR5cGUSMAoFc2xhY2sYAiABKAsyHy5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuU2xhY2tIABIyCgZmZWlzaHUYAyABKAsyIC5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuRmVpc2h1SAASMAoFd2Vjb20YBCABKAsyHy5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuV2Vjb21IABIuCgRsYXJrGAUgASgLMh4uYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLkxhcmtIABI2CghkaW5ndGFsaxgGIAEoCzIiLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5EaW5nVGFsa0gAEjAKBXRlYW1zGAcgASgLMh8uYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLlRlYW1zSABCCQoHcGF5bG9hZCKQBAoXV29ya3NwYWNlUHJvZmlsZVNldHRpbmcSFAoMZXh0ZXJuYWxfdXJsGAEgASgJEhcKD2Rpc2FsbG93X3NpZ251cBgCIAEoCBITCgtyZXF1aXJlXzJmYRgDIAEoCBIxCg50b2tlbl9kdXJhdGlvbhgGIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIvCgxhbm5vdW5jZW1lbnQYByABKAsyGS5ieXRlYmFzZS52MS5Bbm5vdW5jZW1lbnQSOgoXbWF4aW11bV9yb2xlX2V4cGlyYXRpb24YCCABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SDwoHZG9tYWlucxgJIAMoCRIfChdlbmZvcmNlX2lkZW50aXR5X2RvbWFpbhgKIAEoCBI9ChRkYXRhYmFzZV9jaGFuZ2VfbW9kZRgLIAEoDjIfLmJ5dGViYXNlLnYxLkRhdGFiYXNlQ2hhbmdlTW9kZRIgChhkaXNhbGxvd19wYXNzd29yZF9zaWduaW4YDCABKAgSIAoYZW5hYmxlX21ldHJpY19jb2xsZWN0aW9uGA0gASgIEjsKGGluYWN0aXZlX3Nlc3Npb25fdGltZW91dBgOIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIfChdlbmFibGVfYXVkaXRfbG9nX3N0ZG91dBgPIAEoCCKvAQoMQW5ub3VuY2VtZW50EjMKBWxldmVsGAEgASgOMiQuYnl0ZWJhc2UudjEuQW5ub3VuY2VtZW50LkFsZXJ0TGV2ZWwSDAoEdGV4dBgCIAEoCRIMCgRsaW5rGAMgASgJIk4KCkFsZXJ0TGV2ZWwSGwoXQUxFUlRfTEVWRUxfVU5TUEVDSUZJRUQQABIICgRJTkZPEAESCwoHV0FSTklORxACEgwKCENSSVRJQ0FMEAMi5wIKGFdvcmtzcGFjZUFwcHJvdmFsU2V0dGluZxI5CgVydWxlcxgBIAMoCzIqLmJ5dGViYXNlLnYxLldvcmtzcGFjZUFwcHJvdmFsU2V0dGluZy5SdWxlGo8CCgRSdWxlEi8KCHRlbXBsYXRlGAEgASgLMh0uYnl0ZWJhc2UudjEuQXBwcm92YWxUZW1wbGF0ZRIkCgljb25kaXRpb24YAiABKAsyES5nb29nbGUudHlwZS5FeHByEkEKBnNvdXJjZRgDIAEoDjIxLmJ5dGViYXNlLnYxLldvcmtzcGFjZUFwcHJvdmFsU2V0dGluZy5SdWxlLlNvdXJjZSJtCgZTb3VyY2USFgoSU09VUkNFX1VOU1BFQ0lGSUVEEAASEwoPQ0hBTkdFX0RBVEFCQVNFEAESEwoPQ1JFQVRFX0RBVEFCQVNFEAISDwoLRVhQT1JUX0RBVEEQAxIQCgxSRVFVRVNUX1JPTEUQBCKYBQoZRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZxJQCgdjb25maWdzGAEgAygLMj8uYnl0ZWJhc2UudjEuRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZy5EYXRhQ2xhc3NpZmljYXRpb25Db25maWcaqAQKGERhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZxIKCgJpZBgBIAEoCRINCgV0aXRsZRgCIAEoCRJVCgZsZXZlbHMYAyADKAsyRS5ieXRlYmFzZS52MS5EYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nLkRhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZy5MZXZlbBJrCg5jbGFzc2lmaWNhdGlvbhgEIAMoCzJTLmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcuRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnLkNsYXNzaWZpY2F0aW9uRW50cnkaNwoFTGV2ZWwSCgoCaWQYASABKAkSDQoFdGl0bGUYAiABKAkSEwoLZGVzY3JpcHRpb24YAyABKAkaaAoSRGF0YUNsYXNzaWZpY2F0aW9uEgoKAmlkGAEgASgJEg0KBXRpdGxlGAIgASgJEhMKC2Rlc2NyaXB0aW9uGAMgASgJEhUKCGxldmVsX2lkGAQgASgJSACIAQFCCwoJX2xldmVsX2lkGokBChNDbGFzc2lmaWNhdGlvbkVudHJ5EgsKA2tleRgBIAEoCRJhCgV2YWx1ZRgCIAEoCzJSLmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcuRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnLkRhdGFDbGFzc2lmaWNhdGlvbjoCOAEizAEKE1NlbWFudGljVHlwZVNldHRpbmcSPAoFdHlwZXMYASADKAsyLS5ieXRlYmFzZS52MS5TZW1hbnRpY1R5cGVTZXR0aW5nLlNlbWFudGljVHlwZRp3CgxTZW1hbnRpY1R5cGUSCgoCaWQYASABKAkSDQoFdGl0bGUYAiABKAkSEwoLZGVzY3JpcHRpb24YAyABKAkSKQoJYWxnb3JpdGhtGAYgASgLMhYuYnl0ZWJhc2UudjEuQWxnb3JpdGhtEgwKBGljb24YByABKAki/wQKCUFsZ29yaXRobRI0CglmdWxsX21hc2sYBSABKAsyHy5ieXRlYmFzZS52MS5BbGdvcml0aG0uRnVsbE1hc2tIABI2CgpyYW5nZV9tYXNrGAYgASgLMiAuYnl0ZWJhc2UudjEuQWxnb3JpdGhtLlJhbmdlTWFza0gAEjIKCG1kNV9tYXNrGAcgASgLMh4uYnl0ZWJhc2UudjEuQWxnb3JpdGhtLk1ENU1hc2tIABJBChBpbm5lcl9vdXRlcl9tYXNrGAggASgLMiUuYnl0ZWJhc2UudjEuQWxnb3JpdGhtLklubmVyT3V0ZXJNYXNrSAAaIAoIRnVsbE1hc2sSFAoMc3Vic3RpdHV0aW9uGAEgASgJGn4KCVJhbmdlTWFzaxI2CgZzbGljZXMYASADKAsyJi5ieXRlYmFzZS52MS5BbGdvcml0aG0uUmFuZ2VNYXNrLlNsaWNlGjkKBVNsaWNlEg0KBXN0YXJ0GAEgASgFEgsKA2VuZBgCIAEoBRIUCgxzdWJzdGl0dXRpb24YAyABKAkaFwoHTUQ1TWFzaxIMCgRzYWx0GAEgASgJGskBCg5Jbm5lck91dGVyTWFzaxISCgpwcmVmaXhfbGVuGAEgASgFEhIKCnN1ZmZpeF9sZW4YAiABKAUSPAoEdHlwZRgDIAEoDjIuLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5Jbm5lck91dGVyTWFzay5NYXNrVHlwZRIUCgxzdWJzdGl0dXRpb24YBCABKAkiOwoITWFza1R5cGUSGQoVTUFTS19UWVBFX1VOU1BFQ0lGSUVEEAASCQoFSU5ORVIQARIJCgVPVVRFUhACQgYKBG1hc2siHAoLU0NJTVNldHRpbmcSDQoFdG9rZW4YASABKAkiiwIKGlBhc3N3b3JkUmVzdHJpY3Rpb25TZXR0aW5nEhIKCm1pbl9sZW5ndGgYASABKAUSFgoOcmVxdWlyZV9udW1iZXIYAiABKAgSFgoOcmVxdWlyZV9sZXR0ZXIYAyABKAgSIAoYcmVxdWlyZV91cHBlcmNhc2VfbGV0dGVyGAQgASgIEiEKGXJlcXVpcmVfc3BlY2lhbF9jaGFyYWN0ZXIYBSABKAgSLgomcmVxdWlyZV9yZXNldF9wYXNzd29yZF9mb3JfZmlyc3RfbG9naW4YBiABKAgSNAoRcGFzc3dvcmRfcm90YXRpb24YByABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24i7wEKCUFJU2V0dGluZxIPCgdlbmFibGVkGAEgASgIEjEKCHByb3ZpZGVyGAIgASgOMh8uYnl0ZWJhc2UudjEuQUlTZXR0aW5nLlByb3ZpZGVyEhAKCGVuZHBvaW50GAMgASgJEg8KB2FwaV9rZXkYBCABKAkSDQoFbW9kZWwYBSABKAkSDwoHdmVyc2lvbhgGIAEoCSJbCghQcm92aWRlchIYChRQUk9WSURFUl9VTlNQRUNJRklFRBAAEgsKB09QRU5fQUkQARIKCgZDTEFVREUQAhIKCgZHRU1JTkkQAxIQCgxBWlVSRV9PUEVOQUkQBCKWAgoSRW52aXJvbm1lbnRTZXR0aW5nEkEKDGVudmlyb25tZW50cxgBIAMoCzIrLmJ5dGViYXNlLnYxLkVudmlyb25tZW50U2V0dGluZy5FbnZpcm9ubWVudBq8AQoLRW52aXJvbm1lbnQSEQoEbmFtZRgBIAEoCUID4EEDEgoKAmlkGAIgASgJEg0KBXRpdGxlGAMgASgJEkMKBHRhZ3MYBCADKAsyNS5ieXRlYmFzZS52MS5FbnZpcm9ubWVudFNldHRpbmcuRW52aXJvbm1lbnQuVGFnc0VudHJ5Eg0KBWNvbG9yGAUgASgJGisKCVRhZ3NFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBKlQKEkRhdGFiYXNlQ2hhbmdlTW9kZRIkCiBEQVRBQkFTRV9DSEFOR0VfTU9ERV9VTlNQRUNJRklFRBAAEgwKCFBJUEVMSU5FEAESCgoGRURJVE9SEAIyrgMKDlNldHRpbmdTZXJ2aWNlEoQBCgxMaXN0U2V0dGluZ3MSIC5ieXRlYmFzZS52MS5MaXN0U2V0dGluZ3NSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuTGlzdFNldHRpbmdzUmVzcG9uc2UiL9pBAIrqMBBiYi5zZXR0aW5ncy5saXN0kOowAYLT5JMCDhIML3YxL3NldHRpbmdzEn8KCkdldFNldHRpbmcSHi5ieXRlYmFzZS52MS5HZXRTZXR0aW5nUmVxdWVzdBoULmJ5dGViYXNlLnYxLlNldHRpbmciO9pBBG5hbWWK6jAPYmIuc2V0dGluZ3MuZ2V0kOowAYLT5JMCFxIVL3YxL3tuYW1lPXNldHRpbmdzLyp9EpMBCg1VcGRhdGVTZXR0aW5nEiEuYnl0ZWJhc2UudjEuVXBkYXRlU2V0dGluZ1JlcXVlc3QaFC5ieXRlYmFzZS52MS5TZXR0aW5nIkmK6jAPYmIuc2V0dGluZ3Muc2V0kOowAZjqMAGC0+STAig6B3NldHRpbmcyHS92MS97c2V0dGluZy5uYW1lPXNldHRpbmdzLyp9QqkBCg9jb20uYnl0ZWJhc2UudjFCE1NldHRpbmdTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [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_type_expr, file_v1_annotation, file_v1_issue_service, file_v1_project_service]);+ fileDesc("Chh2MS9zZXR0aW5nX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIhUKE0xpc3RTZXR0aW5nc1JlcXVlc3QiPgoUTGlzdFNldHRpbmdzUmVzcG9uc2USJgoIc2V0dGluZ3MYASADKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIj8KEUdldFNldHRpbmdSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1NldHRpbmciOwoSR2V0U2V0dGluZ1Jlc3BvbnNlEiUKB3NldHRpbmcYASABKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIqEBChRVcGRhdGVTZXR0aW5nUmVxdWVzdBIqCgdzZXR0aW5nGAEgASgLMhQuYnl0ZWJhc2UudjEuU2V0dGluZ0ID4EECEhUKDXZhbGlkYXRlX29ubHkYAiABKAgSFQoNYWxsb3dfbWlzc2luZxgDIAEoCBIvCgt1cGRhdGVfbWFzaxgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2si4AIKB1NldHRpbmcSEQoEbmFtZRgBIAEoCUID4EEIEi0KBXZhbHVlGAIgASgLMhkuYnl0ZWJhc2UudjEuU2V0dGluZ1ZhbHVlQgPgQQIi4wEKC1NldHRpbmdOYW1lEhwKGFNFVFRJTkdfTkFNRV9VTlNQRUNJRklFRBAAEhEKDUJSQU5ESU5HX0xPR08QAhIVChFXT1JLU1BBQ0VfUFJPRklMRRAEEhYKEldPUktTUEFDRV9BUFBST1ZBTBAFEgoKBkFQUF9JTRAIEgYKAkFJEAoSFwoTREFUQV9DTEFTU0lGSUNBVElPThAOEhIKDlNFTUFOVElDX1RZUEVTEA8SCAoEU0NJTRAREhgKFFBBU1NXT1JEX1JFU1RSSUNUSU9OEBISDwoLRU5WSVJPTk1FTlQQEzot6kEqChRieXRlYmFzZS5jb20vU2V0dGluZxISc2V0dGluZ3Mve3NldHRpbmd9IrcECgxTZXR0aW5nVmFsdWUSFgoMc3RyaW5nX3ZhbHVlGAEgASgJSAASKwoGYXBwX2ltGAMgASgLMhkuYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nSAASQQoRd29ya3NwYWNlX3Byb2ZpbGUYBSABKAsyJC5ieXRlYmFzZS52MS5Xb3Jrc3BhY2VQcm9maWxlU2V0dGluZ0gAEkMKEndvcmtzcGFjZV9hcHByb3ZhbBgGIAEoCzIlLmJ5dGViYXNlLnYxLldvcmtzcGFjZUFwcHJvdmFsU2V0dGluZ0gAEkUKE2RhdGFfY2xhc3NpZmljYXRpb24YCiABKAsyJi5ieXRlYmFzZS52MS5EYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nSAASOQoNc2VtYW50aWNfdHlwZRgLIAEoCzIgLmJ5dGViYXNlLnYxLlNlbWFudGljVHlwZVNldHRpbmdIABIoCgRzY2ltGA4gASgLMhguYnl0ZWJhc2UudjEuU0NJTVNldHRpbmdIABJHChRwYXNzd29yZF9yZXN0cmljdGlvbhgPIAEoCzInLmJ5dGViYXNlLnYxLlBhc3N3b3JkUmVzdHJpY3Rpb25TZXR0aW5nSAASJAoCYWkYECABKAsyFi5ieXRlYmFzZS52MS5BSVNldHRpbmdIABI2CgtlbnZpcm9ubWVudBgRIAEoCzIfLmJ5dGViYXNlLnYxLkVudmlyb25tZW50U2V0dGluZ0gAQgcKBXZhbHVlIr0GCgxBcHBJTVNldHRpbmcSNQoIc2V0dGluZ3MYASADKAsyIy5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuSU1TZXR0aW5nGhsKBVNsYWNrEhIKBXRva2VuGAEgASgJQgPgQQQaNgoGRmVpc2h1EhMKBmFwcF9pZBgBIAEoCUID4EEEEhcKCmFwcF9zZWNyZXQYAiABKAlCA+BBBBpJCgVXZWNvbRIUCgdjb3JwX2lkGAEgASgJQgPgQQQSFQoIYWdlbnRfaWQYAiABKAlCA+BBBBITCgZzZWNyZXQYAyABKAlCA+BBBBo0CgRMYXJrEhMKBmFwcF9pZBgBIAEoCUID4EEEEhcKCmFwcF9zZWNyZXQYAiABKAlCA+BBBBpXCghEaW5nVGFsaxIWCgljbGllbnRfaWQYASABKAlCA+BBBBIaCg1jbGllbnRfc2VjcmV0GAIgASgJQgPgQQQSFwoKcm9ib3RfY29kZRgDIAEoCUID4EEEGlMKBVRlYW1zEhYKCXRlbmFudF9pZBgBIAEoCUID4EEEEhYKCWNsaWVudF9pZBgCIAEoCUID4EEEEhoKDWNsaWVudF9zZWNyZXQYAyABKAlCA+BBBBrxAgoJSU1TZXR0aW5nEicKBHR5cGUYASABKA4yGS5ieXRlYmFzZS52MS5XZWJob29rLlR5cGUSMAoFc2xhY2sYAiABKAsyHy5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuU2xhY2tIABIyCgZmZWlzaHUYAyABKAsyIC5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuRmVpc2h1SAASMAoFd2Vjb20YBCABKAsyHy5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuV2Vjb21IABIuCgRsYXJrGAUgASgLMh4uYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLkxhcmtIABI2CghkaW5ndGFsaxgGIAEoCzIiLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5EaW5nVGFsa0gAEjAKBXRlYW1zGAcgASgLMh8uYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLlRlYW1zSABCCQoHcGF5bG9hZCKjBAoXV29ya3NwYWNlUHJvZmlsZVNldHRpbmcSFAoMZXh0ZXJuYWxfdXJsGAEgASgJEhcKD2Rpc2FsbG93X3NpZ251cBgCIAEoCBITCgtyZXF1aXJlXzJmYRgDIAEoCBIxCg50b2tlbl9kdXJhdGlvbhgGIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIvCgxhbm5vdW5jZW1lbnQYByABKAsyGS5ieXRlYmFzZS52MS5Bbm5vdW5jZW1lbnQSOgoXbWF4aW11bV9yb2xlX2V4cGlyYXRpb24YCCABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SDwoHZG9tYWlucxgJIAMoCRIfChdlbmZvcmNlX2lkZW50aXR5X2RvbWFpbhgKIAEoCBI9ChRkYXRhYmFzZV9jaGFuZ2VfbW9kZRgLIAEoDjIfLmJ5dGViYXNlLnYxLkRhdGFiYXNlQ2hhbmdlTW9kZRIgChhkaXNhbGxvd19wYXNzd29yZF9zaWduaW4YDCABKAgSIAoYZW5hYmxlX21ldHJpY19jb2xsZWN0aW9uGA0gASgIEjsKGGluYWN0aXZlX3Nlc3Npb25fdGltZW91dBgOIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIfChdlbmFibGVfYXVkaXRfbG9nX3N0ZG91dBgPIAEoCBIRCgl3YXRlcm1hcmsYECABKAgirwEKDEFubm91bmNlbWVudBIzCgVsZXZlbBgBIAEoDjIkLmJ5dGViYXNlLnYxLkFubm91bmNlbWVudC5BbGVydExldmVsEgwKBHRleHQYAiABKAkSDAoEbGluaxgDIAEoCSJOCgpBbGVydExldmVsEhsKF0FMRVJUX0xFVkVMX1VOU1BFQ0lGSUVEEAASCAoESU5GTxABEgsKB1dBUk5JTkcQAhIMCghDUklUSUNBTBADIucCChhXb3Jrc3BhY2VBcHByb3ZhbFNldHRpbmcSOQoFcnVsZXMYASADKAsyKi5ieXRlYmFzZS52MS5Xb3Jrc3BhY2VBcHByb3ZhbFNldHRpbmcuUnVsZRqPAgoEUnVsZRIvCgh0ZW1wbGF0ZRgBIAEoCzIdLmJ5dGViYXNlLnYxLkFwcHJvdmFsVGVtcGxhdGUSJAoJY29uZGl0aW9uGAIgASgLMhEuZ29vZ2xlLnR5cGUuRXhwchJBCgZzb3VyY2UYAyABKA4yMS5ieXRlYmFzZS52MS5Xb3Jrc3BhY2VBcHByb3ZhbFNldHRpbmcuUnVsZS5Tb3VyY2UibQoGU291cmNlEhYKElNPVVJDRV9VTlNQRUNJRklFRBAAEhMKD0NIQU5HRV9EQVRBQkFTRRABEhMKD0NSRUFURV9EQVRBQkFTRRACEg8KC0VYUE9SVF9EQVRBEAMSEAoMUkVRVUVTVF9ST0xFEAQimAUKGURhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcSUAoHY29uZmlncxgBIAMoCzI/LmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcuRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnGqgEChhEYXRhQ2xhc3NpZmljYXRpb25Db25maWcSCgoCaWQYASABKAkSDQoFdGl0bGUYAiABKAkSVQoGbGV2ZWxzGAMgAygLMkUuYnl0ZWJhc2UudjEuRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZy5EYXRhQ2xhc3NpZmljYXRpb25Db25maWcuTGV2ZWwSawoOY2xhc3NpZmljYXRpb24YBCADKAsyUy5ieXRlYmFzZS52MS5EYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nLkRhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZy5DbGFzc2lmaWNhdGlvbkVudHJ5GjcKBUxldmVsEgoKAmlkGAEgASgJEg0KBXRpdGxlGAIgASgJEhMKC2Rlc2NyaXB0aW9uGAMgASgJGmgKEkRhdGFDbGFzc2lmaWNhdGlvbhIKCgJpZBgBIAEoCRINCgV0aXRsZRgCIAEoCRITCgtkZXNjcmlwdGlvbhgDIAEoCRIVCghsZXZlbF9pZBgEIAEoCUgAiAEBQgsKCV9sZXZlbF9pZBqJAQoTQ2xhc3NpZmljYXRpb25FbnRyeRILCgNrZXkYASABKAkSYQoFdmFsdWUYAiABKAsyUi5ieXRlYmFzZS52MS5EYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nLkRhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZy5EYXRhQ2xhc3NpZmljYXRpb246AjgBIswBChNTZW1hbnRpY1R5cGVTZXR0aW5nEjwKBXR5cGVzGAEgAygLMi0uYnl0ZWJhc2UudjEuU2VtYW50aWNUeXBlU2V0dGluZy5TZW1hbnRpY1R5cGUadwoMU2VtYW50aWNUeXBlEgoKAmlkGAEgASgJEg0KBXRpdGxlGAIgASgJEhMKC2Rlc2NyaXB0aW9uGAMgASgJEikKCWFsZ29yaXRobRgGIAEoCzIWLmJ5dGViYXNlLnYxLkFsZ29yaXRobRIMCgRpY29uGAcgASgJIv8ECglBbGdvcml0aG0SNAoJZnVsbF9tYXNrGAUgASgLMh8uYnl0ZWJhc2UudjEuQWxnb3JpdGhtLkZ1bGxNYXNrSAASNgoKcmFuZ2VfbWFzaxgGIAEoCzIgLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5SYW5nZU1hc2tIABIyCghtZDVfbWFzaxgHIAEoCzIeLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5NRDVNYXNrSAASQQoQaW5uZXJfb3V0ZXJfbWFzaxgIIAEoCzIlLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5Jbm5lck91dGVyTWFza0gAGiAKCEZ1bGxNYXNrEhQKDHN1YnN0aXR1dGlvbhgBIAEoCRp+CglSYW5nZU1hc2sSNgoGc2xpY2VzGAEgAygLMiYuYnl0ZWJhc2UudjEuQWxnb3JpdGhtLlJhbmdlTWFzay5TbGljZRo5CgVTbGljZRINCgVzdGFydBgBIAEoBRILCgNlbmQYAiABKAUSFAoMc3Vic3RpdHV0aW9uGAMgASgJGhcKB01ENU1hc2sSDAoEc2FsdBgBIAEoCRrJAQoOSW5uZXJPdXRlck1hc2sSEgoKcHJlZml4X2xlbhgBIAEoBRISCgpzdWZmaXhfbGVuGAIgASgFEjwKBHR5cGUYAyABKA4yLi5ieXRlYmFzZS52MS5BbGdvcml0aG0uSW5uZXJPdXRlck1hc2suTWFza1R5cGUSFAoMc3Vic3RpdHV0aW9uGAQgASgJIjsKCE1hc2tUeXBlEhkKFU1BU0tfVFlQRV9VTlNQRUNJRklFRBAAEgkKBUlOTkVSEAESCQoFT1VURVIQAkIGCgRtYXNrIhwKC1NDSU1TZXR0aW5nEg0KBXRva2VuGAEgASgJIosCChpQYXNzd29yZFJlc3RyaWN0aW9uU2V0dGluZxISCgptaW5fbGVuZ3RoGAEgASgFEhYKDnJlcXVpcmVfbnVtYmVyGAIgASgIEhYKDnJlcXVpcmVfbGV0dGVyGAMgASgIEiAKGHJlcXVpcmVfdXBwZXJjYXNlX2xldHRlchgEIAEoCBIhChlyZXF1aXJlX3NwZWNpYWxfY2hhcmFjdGVyGAUgASgIEi4KJnJlcXVpcmVfcmVzZXRfcGFzc3dvcmRfZm9yX2ZpcnN0X2xvZ2luGAYgASgIEjQKEXBhc3N3b3JkX3JvdGF0aW9uGAcgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uIu8BCglBSVNldHRpbmcSDwoHZW5hYmxlZBgBIAEoCBIxCghwcm92aWRlchgCIAEoDjIfLmJ5dGViYXNlLnYxLkFJU2V0dGluZy5Qcm92aWRlchIQCghlbmRwb2ludBgDIAEoCRIPCgdhcGlfa2V5GAQgASgJEg0KBW1vZGVsGAUgASgJEg8KB3ZlcnNpb24YBiABKAkiWwoIUHJvdmlkZXISGAoUUFJPVklERVJfVU5TUEVDSUZJRUQQABILCgdPUEVOX0FJEAESCgoGQ0xBVURFEAISCgoGR0VNSU5JEAMSEAoMQVpVUkVfT1BFTkFJEAQilgIKEkVudmlyb25tZW50U2V0dGluZxJBCgxlbnZpcm9ubWVudHMYASADKAsyKy5ieXRlYmFzZS52MS5FbnZpcm9ubWVudFNldHRpbmcuRW52aXJvbm1lbnQavAEKC0Vudmlyb25tZW50EhEKBG5hbWUYASABKAlCA+BBAxIKCgJpZBgCIAEoCRINCgV0aXRsZRgDIAEoCRJDCgR0YWdzGAQgAygLMjUuYnl0ZWJhc2UudjEuRW52aXJvbm1lbnRTZXR0aW5nLkVudmlyb25tZW50LlRhZ3NFbnRyeRINCgVjb2xvchgFIAEoCRorCglUYWdzRW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgJOgI4ASpUChJEYXRhYmFzZUNoYW5nZU1vZGUSJAogREFUQUJBU0VfQ0hBTkdFX01PREVfVU5TUEVDSUZJRUQQABIMCghQSVBFTElORRABEgoKBkVESVRPUhACMq4DCg5TZXR0aW5nU2VydmljZRKEAQoMTGlzdFNldHRpbmdzEiAuYnl0ZWJhc2UudjEuTGlzdFNldHRpbmdzUmVxdWVzdBohLmJ5dGViYXNlLnYxLkxpc3RTZXR0aW5nc1Jlc3BvbnNlIi/aQQCK6jAQYmIuc2V0dGluZ3MubGlzdJDqMAGC0+STAg4SDC92MS9zZXR0aW5ncxJ/CgpHZXRTZXR0aW5nEh4uYnl0ZWJhc2UudjEuR2V0U2V0dGluZ1JlcXVlc3QaFC5ieXRlYmFzZS52MS5TZXR0aW5nIjvaQQRuYW1liuowD2JiLnNldHRpbmdzLmdldJDqMAGC0+STAhcSFS92MS97bmFtZT1zZXR0aW5ncy8qfRKTAQoNVXBkYXRlU2V0dGluZxIhLmJ5dGViYXNlLnYxLlVwZGF0ZVNldHRpbmdSZXF1ZXN0GhQuYnl0ZWJhc2UudjEuU2V0dGluZyJJiuowD2JiLnNldHRpbmdzLnNldJDqMAGY6jABgtPkkwIoOgdzZXR0aW5nMh0vdjEve3NldHRpbmcubmFtZT1zZXR0aW5ncy8qfUKpAQoPY29tLmJ5dGViYXNlLnYxQhNTZXR0aW5nU2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [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_type_expr, file_v1_annotation, file_v1_issue_service, file_v1_project_service]);/*** Describes the message bytebase.v1.ListSettingsRequest.diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yamlindex fc3f90b335..78b66775d3 100644--- a/proto/gen/grpc-doc/openapi.yaml+++ b/proto/gen/grpc-doc/openapi.yaml@@ -13970,6 +13970,11 @@ components:description: |-Whether to enable audit logging to stdout in structured JSON format.Requires TEAM or ENTERPRISE license.+ watermark:+ type: boolean+ description: |-+ Whether to display watermark on pages.+ Requires ENTERPRISE license.tags:- name: ActuatorServicedescription: ActuatorService manages system health and operational information.diff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.mdindex 97162297d5..126fd02eef 100644--- a/proto/gen/grpc-doc/store/README.md+++ b/proto/gen/grpc-doc/store/README.md@@ -4637,6 +4637,7 @@ ISSUE_CREATE represents creating an issue. || enable_metric_collection | [bool](#bool) | | Whether to enable metric collection for the workspace. || inactive_session_timeout | [google.protobuf.Duration](#google-protobuf-Duration) | | The session expiration time if not activity detected for the user. Value <= 0 means no limit. || enable_audit_log_stdout | [bool](#bool) | | Whether to enable audit logging to stdout in structured JSON format. Requires TEAM or ENTERPRISE license. |+| watermark | [bool](#bool) | | Whether to display watermark on pages. Requires ENTERPRISE license. |@@ -4715,7 +4716,6 @@ We support three levels of AlertLevel: INFO, WARNING, and ERROR.| WORKSPACE_APPROVAL | 5 | || ENTERPRISE_LICENSE | 7 | || APP_IM | 8 | |-| WATERMARK | 9 | || AI | 10 | || DATA_CLASSIFICATION | 14 | || SEMANTIC_TYPES | 15 | |diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.htmlindex 3aff110109..3e5b818bf4 100644--- a/proto/gen/grpc-doc/store/index.html+++ b/proto/gen/grpc-doc/store/index.html@@ -12219,6 +12219,14 @@ are /[a-z][0-9]-/. </p></td>Requires TEAM or ENTERPRISE license. </p></td></tr>+ <tr>+ <td>watermark</td>+ <td><a href="#bool">bool</a></td>+ <td></td>+ <td><p>Whether to display watermark on pages.+Requires ENTERPRISE license. </p></td>+ </tr>+</tbody></table>@@ -12419,12 +12427,6 @@ Default to this mode.</p></td><td><p></p></td></tr>- <tr>- <td>WATERMARK</td>- <td>9</td>- <td><p></p></td>- </tr>-<tr><td>AI</td><td>10</td>diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.mdindex 87edc8648e..b93430d382 100644--- a/proto/gen/grpc-doc/v1/README.md+++ b/proto/gen/grpc-doc/v1/README.md@@ -2822,6 +2822,7 @@ For examples: resource.environment_id == "prod" && statement.aff| enable_metric_collection | [bool](#bool) | | Whether to enable metric collection for the workspace. || inactive_session_timeout | [google.protobuf.Duration](#google-protobuf-Duration) | | The session expiration time if not activity detected for the user. Value <= 0 means no limit. || enable_audit_log_stdout | [bool](#bool) | | Whether to enable audit logging to stdout in structured JSON format. Requires TEAM or ENTERPRISE license. |+| watermark | [bool](#bool) | | Whether to display watermark on pages. Requires ENTERPRISE license. |@@ -2897,7 +2898,6 @@ We support three levels of AlertLevel: INFO, WARNING, and ERROR.| WORKSPACE_PROFILE | 4 | || WORKSPACE_APPROVAL | 5 | || APP_IM | 8 | |-| WATERMARK | 9 | || AI | 10 | || DATA_CLASSIFICATION | 14 | || SEMANTIC_TYPES | 15 | |diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.htmlindex b78e637ff2..0e382bf48e 100644--- a/proto/gen/grpc-doc/v1/index.html+++ b/proto/gen/grpc-doc/v1/index.html@@ -8293,6 +8293,14 @@ resource.table_name.matches("sensitive_.*") && resource.db_enginRequires TEAM or ENTERPRISE license. </p></td></tr>+ <tr>+ <td>watermark</td>+ <td><a href="#bool">bool</a></td>+ <td></td>+ <td><p>Whether to display watermark on pages.+Requires ENTERPRISE license. </p></td>+ </tr>+</tbody></table>@@ -8475,12 +8483,6 @@ Default to this mode.</p></td><td><p></p></td></tr>- <tr>- <td>WATERMARK</td>- <td>9</td>- <td><p></p></td>- </tr>-<tr><td>AI</td><td>10</td>diff --git a/proto/store/store/setting.proto b/proto/store/store/setting.protoindex efe72eea9d..2fdb953735 100644--- a/proto/store/store/setting.proto+++ b/proto/store/store/setting.proto@@ -10,10 +10,6 @@ import "store/project_webhook.proto";option go_package = "generated-go/store";enum SettingName {- reserved 16;- reserved 6; // was WORKSPACE_EXTERNAL_APPROVAL- reserved 13; // was SCHEMA_TEMPLATE-SETTING_NAME_UNSPECIFIED = 0;AUTH_SECRET = 1;BRANDING_LOGO = 2;@@ -22,7 +18,6 @@ enum SettingName {WORKSPACE_APPROVAL = 5;ENTERPRISE_LICENSE = 7;APP_IM = 8;- WATERMARK = 9;AI = 10;DATA_CLASSIFICATION = 14;SEMANTIC_TYPES = 15;@@ -71,6 +66,10 @@ message WorkspaceProfileSetting {// Whether to enable audit logging to stdout in structured JSON format.// Requires TEAM or ENTERPRISE license.bool enable_audit_log_stdout = 15;++ // Whether to display watermark on pages.+ // Requires ENTERPRISE license.+ bool watermark = 16;}message Announcement {diff --git a/proto/v1/v1/setting_service.proto b/proto/v1/v1/setting_service.protoindex bc13651f2c..ec25a71ad5 100644--- a/proto/v1/v1/setting_service.proto+++ b/proto/v1/v1/setting_service.proto@@ -96,7 +96,6 @@ message Setting {WORKSPACE_PROFILE = 4;WORKSPACE_APPROVAL = 5;APP_IM = 8;- WATERMARK = 9;AI = 10;DATA_CLASSIFICATION = 14;SEMANTIC_TYPES = 15;@@ -217,6 +216,10 @@ message WorkspaceProfileSetting {// Whether to enable audit logging to stdout in structured JSON format.// Requires TEAM or ENTERPRISE license.bool enable_audit_log_stdout = 15;++ // Whether to display watermark on pages.+ // Requires ENTERPRISE license.+ bool watermark = 16;}message Announcement {