Skip to content

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

refactor: migrate BRANDING_LOGO to WorkspaceProfileSetting (#18342)

Danny Xu97b46bb89124
diff --git a/backend/api/v1/actuator_service.go b/backend/api/v1/actuator_service.go
index cab3f29780..15b281dee5 100644
--- a/backend/api/v1/actuator_service.go
+++ b/backend/api/v1/actuator_service.go
@@ -103,16 +103,13 @@ func (s *ActuatorService) GetResourcePackage(
ctx context.Context,
_ *connect.Request[v1pb.GetResourcePackageRequest],
) (*connect.Response[v1pb.ResourcePackage], error) {
- brandingSetting, err := s.store.GetSettingV2(ctx, storepb.SettingName_BRANDING_LOGO)
+ workspaceProfileSetting, err := s.store.GetWorkspaceGeneralSetting(ctx)
if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find workspace branding"))
- }
- if brandingSetting == nil {
- return nil, errors.Errorf("cannot find setting %v", storepb.SettingName_BRANDING_LOGO)
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find workspace profile setting"))
}
pkg := &v1pb.ResourcePackage{
- Logo: []byte(brandingSetting.Value),
+ Logo: []byte(workspaceProfileSetting.BrandingLogo),
}
return connect.NewResponse(pkg), nil
}
@@ -236,15 +233,6 @@ func (s *ActuatorService) getUsedFeatures(ctx context.Context) ([]v1pb.PlanFeatu
features = append(features, v1pb.PlanFeature_FEATURE_ENTERPRISE_SSO)
}
- // setting
- brandingLogo, err := s.store.GetSettingV2(ctx, storepb.SettingName_BRANDING_LOGO)
- if err != nil {
- return nil, errors.Wrapf(err, "failed to get branding logo setting")
- }
- if brandingLogo != nil && brandingLogo.Value != "" {
- features = append(features, v1pb.PlanFeature_FEATURE_CUSTOM_LOGO)
- }
-
setting, err := s.store.GetWorkspaceGeneralSetting(ctx)
if err != nil {
return nil, errors.Wrapf(err, "failed to get workspace general setting")
@@ -264,6 +252,9 @@ func (s *ActuatorService) getUsedFeatures(ctx context.Context) ([]v1pb.PlanFeatu
if setting.Watermark {
features = append(features, v1pb.PlanFeature_FEATURE_WATERMARK)
}
+ if setting.BrandingLogo != "" {
+ features = append(features, v1pb.PlanFeature_FEATURE_CUSTOM_LOGO)
+ }
// environment tier
environments, err := s.store.GetEnvironment(ctx)
diff --git a/backend/api/v1/setting_service.go b/backend/api/v1/setting_service.go
index f8994be1b3..5831635e33 100644
--- a/backend/api/v1/setting_service.go
+++ b/backend/api/v1/setting_service.go
@@ -286,6 +286,11 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
payload.DirectorySyncToken = uuid.New().String()
}
oldSetting.DirectorySyncToken = payload.DirectorySyncToken
+ case "value.workspace_profile.branding_logo":
+ if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_CUSTOM_LOGO); err != nil {
+ return nil, connect.NewError(connect.CodePermissionDenied, err)
+ }
+ oldSetting.BrandingLogo = payload.BrandingLogo
default:
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid update mask path %v", path))
}
@@ -342,12 +347,6 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to marshal setting for %s with error: %v", apiSettingName, err))
}
storeSettingValue = string(bytes)
- case storepb.SettingName_BRANDING_LOGO:
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_CUSTOM_LOGO); err != nil {
- return nil, connect.NewError(connect.CodePermissionDenied, err)
- }
- storeSettingValue = request.Msg.Setting.Value.GetStringValue()
-
case storepb.SettingName_APP_IM:
payload, err := convertAppIMSetting(request.Msg.Setting.Value.GetAppIm())
if err != nil {
@@ -549,7 +548,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
}
storeSettingValue = string(bytes)
default:
- storeSettingValue = request.Msg.Setting.Value.GetStringValue()
+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("unsupported setting %v", apiSettingName))
}
if request.Msg.ValidateOnly {
diff --git a/backend/api/v1/setting_service_converter.go b/backend/api/v1/setting_service_converter.go
index 01a1e9ebc5..2ba633b9e4 100644
--- a/backend/api/v1/setting_service_converter.go
+++ b/backend/api/v1/setting_service_converter.go
@@ -135,14 +135,7 @@ func convertToSettingMessage(setting *store.SettingMessage, profile *config.Prof
},
}, nil
default:
- return &v1pb.Setting{
- Name: settingName,
- Value: &v1pb.SettingValue{
- Value: &v1pb.SettingValue_StringValue{
- StringValue: setting.Value,
- },
- },
- }, nil
+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("unsupported setting %v", setting.Name))
}
}
@@ -166,8 +159,6 @@ func convertStoreSettingNameToV1(storeName storepb.SettingName) v1pb.Setting_Set
switch storeName {
case storepb.SettingName_SETTING_NAME_UNSPECIFIED:
return v1pb.Setting_SETTING_NAME_UNSPECIFIED
- case storepb.SettingName_BRANDING_LOGO:
- return v1pb.Setting_BRANDING_LOGO
case storepb.SettingName_WORKSPACE_PROFILE:
return v1pb.Setting_WORKSPACE_PROFILE
case storepb.SettingName_WORKSPACE_APPROVAL:
@@ -197,8 +188,6 @@ func convertV1SettingNameToStore(v1Name v1pb.Setting_SettingName) storepb.Settin
switch v1Name {
case v1pb.Setting_SETTING_NAME_UNSPECIFIED:
return storepb.SettingName_SETTING_NAME_UNSPECIFIED
- case v1pb.Setting_BRANDING_LOGO:
- return storepb.SettingName_BRANDING_LOGO
case v1pb.Setting_WORKSPACE_PROFILE:
return storepb.SettingName_WORKSPACE_PROFILE
case v1pb.Setting_WORKSPACE_APPROVAL:
@@ -280,6 +269,7 @@ func convertWorkspaceProfileSetting(v1Setting *v1pb.WorkspaceProfileSetting) *st
EnableAuditLogStdout: v1Setting.EnableAuditLogStdout,
Watermark: v1Setting.Watermark,
DirectorySyncToken: v1Setting.DirectorySyncToken,
+ BrandingLogo: v1Setting.BrandingLogo,
}
// Convert announcement if present
@@ -325,6 +315,7 @@ func convertToWorkspaceProfileSetting(storeSetting *storepb.WorkspaceProfileSett
EnableAuditLogStdout: storeSetting.EnableAuditLogStdout,
Watermark: storeSetting.Watermark,
DirectorySyncToken: storeSetting.DirectorySyncToken,
+ BrandingLogo: storeSetting.BrandingLogo,
}
if storeSetting.Announcement != nil {
diff --git a/backend/generated-go/store/setting.pb.go b/backend/generated-go/store/setting.pb.go
index 4ca5b525e3..f1ed1ccbc1 100644
--- a/backend/generated-go/store/setting.pb.go
+++ b/backend/generated-go/store/setting.pb.go
@@ -28,7 +28,6 @@ type SettingName int32
const (
SettingName_SETTING_NAME_UNSPECIFIED SettingName = 0
SettingName_AUTH_SECRET SettingName = 1
- SettingName_BRANDING_LOGO SettingName = 2
SettingName_WORKSPACE_ID SettingName = 3
SettingName_WORKSPACE_PROFILE SettingName = 4
SettingName_WORKSPACE_APPROVAL SettingName = 5
@@ -46,7 +45,6 @@ var (
SettingName_name = map[int32]string{
0: "SETTING_NAME_UNSPECIFIED",
1: "AUTH_SECRET",
- 2: "BRANDING_LOGO",
3: "WORKSPACE_ID",
4: "WORKSPACE_PROFILE",
5: "WORKSPACE_APPROVAL",
@@ -61,7 +59,6 @@ var (
SettingName_value = map[string]int32{
"SETTING_NAME_UNSPECIFIED": 0,
"AUTH_SECRET": 1,
- "BRANDING_LOGO": 2,
"WORKSPACE_ID": 3,
"WORKSPACE_PROFILE": 4,
"WORKSPACE_APPROVAL": 5,
@@ -400,8 +397,10 @@ type WorkspaceProfileSetting struct {
Watermark bool `protobuf:"varint,16,opt,name=watermark,proto3" json:"watermark,omitempty"`
// The token for directory sync authentication.
DirectorySyncToken string `protobuf:"bytes,17,opt,name=directory_sync_token,json=directorySyncToken,proto3" json:"directory_sync_token,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
+ // The branding logo as a data URI (e.g. data:image/png;base64,...).
+ BrandingLogo string `protobuf:"bytes,18,opt,name=branding_logo,json=brandingLogo,proto3" json:"branding_logo,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
}
func (x *WorkspaceProfileSetting) Reset() {
@@ -539,6 +538,13 @@ func (x *WorkspaceProfileSetting) GetDirectorySyncToken() string {
return ""
}
+func (x *WorkspaceProfileSetting) GetBrandingLogo() string {
+ if x != nil {
+ return x.BrandingLogo
+ }
+ return ""
+}
+
type Announcement struct {
state protoimpl.MessageState `protogen:"open.v1"`
// The alert level of the announcement.
@@ -2291,7 +2297,7 @@ var File_store_setting_proto protoreflect.FileDescriptor
const 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\"\xd5\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\"\xfa\x06\n" +
"\x17WorkspaceProfileSetting\x12!\n" +
"\fexternal_url\x18\x01 \x01(\tR\vexternalUrl\x12'\n" +
"\x0fdisallow_signup\x18\x02 \x01(\bR\x0edisallowSignup\x12\x1f\n" +
@@ -2309,7 +2315,8 @@ const file_store_setting_proto_rawDesc = "" +
"\x18inactive_session_timeout\x18\x0e \x01(\v2\x19.google.protobuf.DurationR\x16inactiveSessionTimeout\x125\n" +
"\x17enable_audit_log_stdout\x18\x0f \x01(\bR\x14enableAuditLogStdout\x12\x1c\n" +
"\twatermark\x18\x10 \x01(\bR\twatermark\x120\n" +
- "\x14directory_sync_token\x18\x11 \x01(\tR\x12directorySyncToken\"\xe9\x01\n" +
+ "\x14directory_sync_token\x18\x11 \x01(\tR\x12directorySyncToken\x12#\n" +
+ "\rbranding_logo\x18\x12 \x01(\tR\fbrandingLogo\"\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" +
@@ -2455,11 +2462,10 @@ 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*\x94\x02\n" +
+ "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01*\x81\x02\n" +
"\vSettingName\x12\x1c\n" +
"\x18SETTING_NAME_UNSPECIFIED\x10\x00\x12\x0f\n" +
- "\vAUTH_SECRET\x10\x01\x12\x11\n" +
- "\rBRANDING_LOGO\x10\x02\x12\x10\n" +
+ "\vAUTH_SECRET\x10\x01\x12\x10\n" +
"\fWORKSPACE_ID\x10\x03\x12\x15\n" +
"\x11WORKSPACE_PROFILE\x10\x04\x12\x16\n" +
"\x12WORKSPACE_APPROVAL\x10\x05\x12\x16\n" +
diff --git a/backend/generated-go/store/setting_equal.pb.go b/backend/generated-go/store/setting_equal.pb.go
index de5da622eb..152a175875 100644
--- a/backend/generated-go/store/setting_equal.pb.go
+++ b/backend/generated-go/store/setting_equal.pb.go
@@ -65,6 +65,9 @@ func (x *WorkspaceProfileSetting) Equal(y *WorkspaceProfileSetting) bool {
if x.DirectorySyncToken != y.DirectorySyncToken {
return false
}
+ if x.BrandingLogo != y.BrandingLogo {
+ return false
+ }
return true
}
diff --git a/backend/generated-go/v1/setting_service.pb.go b/backend/generated-go/v1/setting_service.pb.go
index cd6c7c9ff7..485fdd1886 100644
--- a/backend/generated-go/v1/setting_service.pb.go
+++ b/backend/generated-go/v1/setting_service.pb.go
@@ -81,7 +81,6 @@ type Setting_SettingName int32
const (
Setting_SETTING_NAME_UNSPECIFIED Setting_SettingName = 0
- Setting_BRANDING_LOGO Setting_SettingName = 2
Setting_WORKSPACE_PROFILE Setting_SettingName = 4
Setting_WORKSPACE_APPROVAL Setting_SettingName = 5
Setting_APP_IM Setting_SettingName = 8
@@ -96,7 +95,6 @@ const (
var (
Setting_SettingName_name = map[int32]string{
0: "SETTING_NAME_UNSPECIFIED",
- 2: "BRANDING_LOGO",
4: "WORKSPACE_PROFILE",
5: "WORKSPACE_APPROVAL",
8: "APP_IM",
@@ -108,7 +106,6 @@ var (
}
Setting_SettingName_value = map[string]int32{
"SETTING_NAME_UNSPECIFIED": 0,
- "BRANDING_LOGO": 2,
"WORKSPACE_PROFILE": 4,
"WORKSPACE_APPROVAL": 5,
"APP_IM": 8,
@@ -665,7 +662,6 @@ type SettingValue struct {
state protoimpl.MessageState `protogen:"open.v1"`
// Types that are valid to be assigned to Value:
//
- // *SettingValue_StringValue
// *SettingValue_AppIm
// *SettingValue_WorkspaceProfile
// *SettingValue_WorkspaceApproval
@@ -716,15 +712,6 @@ func (x *SettingValue) GetValue() isSettingValue_Value {
return nil
}
-func (x *SettingValue) GetStringValue() string {
- if x != nil {
- if x, ok := x.Value.(*SettingValue_StringValue); ok {
- return x.StringValue
- }
- }
- return ""
-}
-
func (x *SettingValue) GetAppIm() *AppIMSetting {
if x != nil {
if x, ok := x.Value.(*SettingValue_AppIm); ok {
@@ -801,11 +788,6 @@ type isSettingValue_Value interface {
isSettingValue_Value()
}
-type SettingValue_StringValue struct {
- // Defines this value as being a string value.
- StringValue string `protobuf:"bytes,1,opt,name=string_value,json=stringValue,proto3,oneof"`
-}
-
type SettingValue_AppIm struct {
AppIm *AppIMSetting `protobuf:"bytes,3,opt,name=app_im,json=appIm,proto3,oneof"`
}
@@ -838,8 +820,6 @@ type SettingValue_Environment struct {
Environment *EnvironmentSetting `protobuf:"bytes,17,opt,name=environment,proto3,oneof"`
}
-func (*SettingValue_StringValue) isSettingValue_Value() {}
-
func (*SettingValue_AppIm) isSettingValue_Value() {}
func (*SettingValue_WorkspaceProfile) isSettingValue_Value() {}
@@ -934,8 +914,10 @@ type WorkspaceProfileSetting struct {
Watermark bool `protobuf:"varint,16,opt,name=watermark,proto3" json:"watermark,omitempty"`
// The token for directory sync authentication.
DirectorySyncToken string `protobuf:"bytes,17,opt,name=directory_sync_token,json=directorySyncToken,proto3" json:"directory_sync_token,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
+ // The branding logo as a data URI (e.g. data:image/png;base64,...).
+ BrandingLogo string `protobuf:"bytes,18,opt,name=branding_logo,json=brandingLogo,proto3" json:"branding_logo,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
}
func (x *WorkspaceProfileSetting) Reset() {
@@ -1073,6 +1055,13 @@ func (x *WorkspaceProfileSetting) GetDirectorySyncToken() string {
return ""
}
+func (x *WorkspaceProfileSetting) GetBrandingLogo() string {
+ if x != nil {
+ return x.BrandingLogo
+ }
+ return ""
+}
+
type Announcement struct {
state protoimpl.MessageState `protogen:"open.v1"`
// The alert level of announcement
@@ -2832,13 +2821,12 @@ 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\"\xe3\x02\n" +
+ "updateMask\"\xd0\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\"\xd9\x01\n" +
+ "\x05value\x18\x02 \x01(\v2\x19.bytebase.v1.SettingValueB\x03\xe0A\x02R\x05value\"\xc6\x01\n" +
"\vSettingName\x12\x1c\n" +
- "\x18SETTING_NAME_UNSPECIFIED\x10\x00\x12\x11\n" +
- "\rBRANDING_LOGO\x10\x02\x12\x15\n" +
+ "\x18SETTING_NAME_UNSPECIFIED\x10\x00\x12\x15\n" +
"\x11WORKSPACE_PROFILE\x10\x04\x12\x16\n" +
"\x12WORKSPACE_APPROVAL\x10\x05\x12\n" +
"\n" +
@@ -2849,9 +2837,8 @@ const file_v1_setting_service_proto_rawDesc = "" +
"\x0eSEMANTIC_TYPES\x10\x0f\x12\x18\n" +
"\x14PASSWORD_RESTRICTION\x10\x12\x12\x0f\n" +
"\vENVIRONMENT\x10\x13:-\xeaA*\n" +
- "\x14bytebase.com/Setting\x12\x12settings/{setting}\"\x8e\x05\n" +
- "\fSettingValue\x12#\n" +
- "\fstring_value\x18\x01 \x01(\tH\x00R\vstringValue\x122\n" +
+ "\x14bytebase.com/Setting\x12\x12settings/{setting}\"\xe9\x04\n" +
+ "\fSettingValue\x122\n" +
"\x06app_im\x18\x03 \x01(\v2\x19.bytebase.v1.AppIMSettingH\x00R\x05appIm\x12S\n" +
"\x11workspace_profile\x18\x05 \x01(\v2$.bytebase.v1.WorkspaceProfileSettingH\x00R\x10workspaceProfile\x12V\n" +
"\x12workspace_approval\x18\x06 \x01(\v2%.bytebase.v1.WorkspaceApprovalSettingH\x00R\x11workspaceApproval\x12Y\n" +
@@ -2895,7 +2882,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\"\xcf\x06\n" +
+ "\apayload\"\xf4\x06\n" +
"\x17WorkspaceProfileSetting\x12!\n" +
"\fexternal_url\x18\x01 \x01(\tR\vexternalUrl\x12'\n" +
"\x0fdisallow_signup\x18\x02 \x01(\bR\x0edisallowSignup\x12\x1f\n" +
@@ -2913,7 +2900,8 @@ const file_v1_setting_service_proto_rawDesc = "" +
"\x18inactive_session_timeout\x18\x0e \x01(\v2\x19.google.protobuf.DurationR\x16inactiveSessionTimeout\x125\n" +
"\x17enable_audit_log_stdout\x18\x0f \x01(\bR\x14enableAuditLogStdout\x12\x1c\n" +
"\twatermark\x18\x10 \x01(\bR\twatermark\x120\n" +
- "\x14directory_sync_token\x18\x11 \x01(\tR\x12directorySyncToken\"\xc2\x01\n" +
+ "\x14directory_sync_token\x18\x11 \x01(\tR\x12directorySyncToken\x12#\n" +
+ "\rbranding_logo\x18\x12 \x01(\tR\fbrandingLogo\"\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" +
@@ -3173,7 +3161,6 @@ func file_v1_setting_service_proto_init() {
file_v1_issue_service_proto_init()
file_v1_project_service_proto_init()
file_v1_setting_service_proto_msgTypes[6].OneofWrappers = []any{
- (*SettingValue_StringValue)(nil),
(*SettingValue_AppIm)(nil),
(*SettingValue_WorkspaceProfile)(nil),
(*SettingValue_WorkspaceApproval)(nil),
diff --git a/backend/generated-go/v1/setting_service_equal.pb.go b/backend/generated-go/v1/setting_service_equal.pb.go
index fcb5f19082..833f037d9e 100644
--- a/backend/generated-go/v1/setting_service_equal.pb.go
+++ b/backend/generated-go/v1/setting_service_equal.pb.go
@@ -112,9 +112,6 @@ func (x *SettingValue) Equal(y *SettingValue) bool {
if x == nil || y == nil {
return x == nil && y == nil
}
- if x.GetStringValue() != y.GetStringValue() {
- return false
- }
if !x.GetAppIm().Equal(y.GetAppIm()) {
return false
}
@@ -350,6 +347,9 @@ func (x *WorkspaceProfileSetting) Equal(y *WorkspaceProfileSetting) bool {
if x.DirectorySyncToken != y.DirectorySyncToken {
return false
}
+ if x.BrandingLogo != y.BrandingLogo {
+ return false
+ }
return true
}
diff --git a/backend/migrator/migration/3.13/0011##migrate_branding_logo_to_workspace_profile.sql b/backend/migrator/migration/3.13/0011##migrate_branding_logo_to_workspace_profile.sql
new file mode 100644
index 0000000000..37b32de86d
--- /dev/null
+++ b/backend/migrator/migration/3.13/0011##migrate_branding_logo_to_workspace_profile.sql
@@ -0,0 +1,16 @@
+-- Migrate BRANDING_LOGO into WORKSPACE_PROFILE as brandingLogo
+-- Extract logo from BRANDING_LOGO setting and merge into WORKSPACE_PROFILE
+UPDATE setting
+SET value = jsonb_set(
+ COALESCE(value::jsonb, '{}'::jsonb),
+ '{brandingLogo}',
+ to_jsonb((SELECT value FROM setting WHERE name = 'BRANDING_LOGO')),
+ true
+)::text
+WHERE name = 'WORKSPACE_PROFILE'
+AND EXISTS (
+ SELECT 1 FROM setting WHERE name = 'BRANDING_LOGO' AND value IS NOT NULL AND value != ''
+);
+
+-- Delete the old BRANDING_LOGO setting
+DELETE FROM setting WHERE name = 'BRANDING_LOGO';
diff --git a/backend/migrator/migration/LATEST.sql b/backend/migrator/migration/LATEST.sql
index b88ff4d2b9..06eac04e2e 100644
--- a/backend/migrator/migration/LATEST.sql
+++ b/backend/migrator/migration/LATEST.sql
@@ -33,7 +33,7 @@ CREATE TABLE principal (
-- Setting
CREATE TABLE setting (
id serial PRIMARY KEY,
- -- name: AUTH_SECRET, BRANDING_LOGO, WORKSPACE_ID, WORKSPACE_PROFILE, WORKSPACE_APPROVAL,
+ -- name: AUTH_SECRET, WORKSPACE_ID, WORKSPACE_PROFILE, WORKSPACE_APPROVAL,
-- ENTERPRISE_LICENSE, APP_IM, AI,
-- DATA_CLASSIFICATION, SEMANTIC_TYPES, PASSWORD_RESTRICTION, ENVIRONMENT
-- Enum: SettingName (proto/store/store/setting.proto)
@@ -549,7 +549,6 @@ INSERT INTO project (id, name, resource_id) VALUES (1, 'Default', 'default');
ALTER SEQUENCE project_id_seq RESTART WITH 101;
-- Initialize settings with static values
-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 ('DATA_CLASSIFICATION', '{}');
diff --git a/backend/migrator/migrator_test.go b/backend/migrator/migrator_test.go
index 953b2d882e..b975073237 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.10"), *files[len(files)-1].version)
+ require.Equal(t, semver.MustParse("3.13.11"), *files[len(files)-1].version)
}
func TestVersionUnique(t *testing.T) {
diff --git a/frontend/src/components/GeneralSetting/BrandingSetting.vue b/frontend/src/components/GeneralSetting/BrandingSetting.vue
index f2ef4d4cf1..c87c91b530 100644
--- a/frontend/src/components/GeneralSetting/BrandingSetting.vue
+++ b/frontend/src/components/GeneralSetting/BrandingSetting.vue
@@ -65,15 +65,12 @@
<script lang="ts" setup>
import { create } from "@bufbuild/protobuf";
+import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";
import { NButton, NTooltip } from "naive-ui";
import { computed, reactive } from "vue";
import { featureToRef } from "@/store";
import { useActuatorV1Store } from "@/store/modules/v1/actuator";
import { useSettingV1Store } from "@/store/modules/v1/setting";
-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, FeatureModal } from "../FeatureGuard";
import SingleFileSelector from "../SingleFileSelector.vue";
@@ -121,13 +118,12 @@ const doUpdate = async (content: string) => {
}
state.loading = true;
try {
- await settingV1Store.upsertSetting({
- name: Setting_SettingName.BRANDING_LOGO,
- value: create(SettingSettingValueSchema, {
- value: {
- case: "stringValue",
- value: content,
- },
+ await settingV1Store.updateWorkspaceProfile({
+ payload: {
+ brandingLogo: content,
+ },
+ updateMask: create(FieldMaskSchema, {
+ paths: ["value.workspace_profile.branding_logo"],
}),
});
useActuatorV1Store().setLogo(content);
diff --git a/frontend/src/store/modules/v1/setting.ts b/frontend/src/store/modules/v1/setting.ts
index f47bb0f00c..e1ab9a9a2e 100644
--- a/frontend/src/store/modules/v1/setting.ts
+++ b/frontend/src/store/modules/v1/setting.ts
@@ -43,16 +43,8 @@ export const useSettingV1Store = defineStore("setting_v1", {
}
return undefined;
},
- brandingLogo(state): string | undefined {
- const setting = state.settingMapByName.get(
- `${settingNamePrefix}${Setting_SettingName[Setting_SettingName.BRANDING_LOGO]}`
- );
- if (!setting?.value?.value) return undefined;
- const value = setting.value.value;
- if (value.case === "stringValue") {
- return value.value;
- }
- return undefined;
+ brandingLogo(): string | undefined {
+ return this.workspaceProfileSetting?.brandingLogo;
},
classification(): DataClassificationSetting_DataClassificationConfig[] {
const setting = this.settingMapByName.get(
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.ts
index 60211035b3..ba17652483 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
@@ -158,11 +158,6 @@ export enum Setting_SettingName {
*/
SETTING_NAME_UNSPECIFIED = 0,
- /**
- * @generated from enum value: BRANDING_LOGO = 2;
- */
- BRANDING_LOGO = 2,
-
/**
* @generated from enum value: WORKSPACE_PROFILE = 4;
*/
@@ -219,14 +214,6 @@ export declare type SettingValue = Message<"bytebase.v1.SettingValue"> & {
* @generated from oneof bytebase.v1.SettingValue.value
*/
value: {
- /**
- * Defines this value as being a string value.
- *
- * @generated from field: string string_value = 1;
- */
- value: string;
- case: "stringValue";
- } | {
/**
* @generated from field: bytebase.v1.AppIMSetting app_im = 3;
*/
@@ -608,6 +595,13 @@ export declare type WorkspaceProfileSetting = Message<"bytebase.v1.WorkspaceProf
* @generated from field: string directory_sync_token = 17;
*/
directorySyncToken: string;
+
+ /**
+ * The branding logo as a data URI (e.g. data:image/png;base64,...).
+ *
+ * @generated from field: string branding_logo = 18;
+ */
+ brandingLogo: string;
};
/**
diff --git a/frontend/src/types/proto-es/v1/setting_service_pb.js b/frontend/src/types/proto-es/v1/setting_service_pb.js
index 13c90630ff..8cf98d3e69 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("Chh2MS9zZXR0aW5nX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIhUKE0xpc3RTZXR0aW5nc1JlcXVlc3QiPgoUTGlzdFNldHRpbmdzUmVzcG9uc2USJgoIc2V0dGluZ3MYASADKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIj8KEUdldFNldHRpbmdSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1NldHRpbmciOwoSR2V0U2V0dGluZ1Jlc3BvbnNlEiUKB3NldHRpbmcYASABKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIqEBChRVcGRhdGVTZXR0aW5nUmVxdWVzdBIqCgdzZXR0aW5nGAEgASgLMhQuYnl0ZWJhc2UudjEuU2V0dGluZ0ID4EECEhUKDXZhbGlkYXRlX29ubHkYAiABKAgSFQoNYWxsb3dfbWlzc2luZxgDIAEoCBIvCgt1cGRhdGVfbWFzaxgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2si1gIKB1NldHRpbmcSEQoEbmFtZRgBIAEoCUID4EEIEi0KBXZhbHVlGAIgASgLMhkuYnl0ZWJhc2UudjEuU2V0dGluZ1ZhbHVlQgPgQQIi2QEKC1NldHRpbmdOYW1lEhwKGFNFVFRJTkdfTkFNRV9VTlNQRUNJRklFRBAAEhEKDUJSQU5ESU5HX0xPR08QAhIVChFXT1JLU1BBQ0VfUFJPRklMRRAEEhYKEldPUktTUEFDRV9BUFBST1ZBTBAFEgoKBkFQUF9JTRAIEgYKAkFJEAoSFwoTREFUQV9DTEFTU0lGSUNBVElPThAOEhIKDlNFTUFOVElDX1RZUEVTEA8SGAoUUEFTU1dPUkRfUkVTVFJJQ1RJT04QEhIPCgtFTlZJUk9OTUVOVBATOi3qQSoKFGJ5dGViYXNlLmNvbS9TZXR0aW5nEhJzZXR0aW5ncy97c2V0dGluZ30ijQQKDFNldHRpbmdWYWx1ZRIWCgxzdHJpbmdfdmFsdWUYASABKAlIABIrCgZhcHBfaW0YAyABKAsyGS5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmdIABJBChF3b3Jrc3BhY2VfcHJvZmlsZRgFIAEoCzIkLmJ5dGViYXNlLnYxLldvcmtzcGFjZVByb2ZpbGVTZXR0aW5nSAASQwoSd29ya3NwYWNlX2FwcHJvdmFsGAYgASgLMiUuYnl0ZWJhc2UudjEuV29ya3NwYWNlQXBwcm92YWxTZXR0aW5nSAASRQoTZGF0YV9jbGFzc2lmaWNhdGlvbhgKIAEoCzImLmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmdIABI5Cg1zZW1hbnRpY190eXBlGAsgASgLMiAuYnl0ZWJhc2UudjEuU2VtYW50aWNUeXBlU2V0dGluZ0gAEkcKFHBhc3N3b3JkX3Jlc3RyaWN0aW9uGA8gASgLMicuYnl0ZWJhc2UudjEuUGFzc3dvcmRSZXN0cmljdGlvblNldHRpbmdIABIkCgJhaRgQIAEoCzIWLmJ5dGViYXNlLnYxLkFJU2V0dGluZ0gAEjYKC2Vudmlyb25tZW50GBEgASgLMh8uYnl0ZWJhc2UudjEuRW52aXJvbm1lbnRTZXR0aW5nSABCBwoFdmFsdWUivQYKDEFwcElNU2V0dGluZxI1CghzZXR0aW5ncxgBIAMoCzIjLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5JTVNldHRpbmcaGwoFU2xhY2sSEgoFdG9rZW4YASABKAlCA+BBBBo2CgZGZWlzaHUSEwoGYXBwX2lkGAEgASgJQgPgQQQSFwoKYXBwX3NlY3JldBgCIAEoCUID4EEEGkkKBVdlY29tEhQKB2NvcnBfaWQYASABKAlCA+BBBBIVCghhZ2VudF9pZBgCIAEoCUID4EEEEhMKBnNlY3JldBgDIAEoCUID4EEEGjQKBExhcmsSEwoGYXBwX2lkGAEgASgJQgPgQQQSFwoKYXBwX3NlY3JldBgCIAEoCUID4EEEGlcKCERpbmdUYWxrEhYKCWNsaWVudF9pZBgBIAEoCUID4EEEEhoKDWNsaWVudF9zZWNyZXQYAiABKAlCA+BBBBIXCgpyb2JvdF9jb2RlGAMgASgJQgPgQQQaUwoFVGVhbXMSFgoJdGVuYW50X2lkGAEgASgJQgPgQQQSFgoJY2xpZW50X2lkGAIgASgJQgPgQQQSGgoNY2xpZW50X3NlY3JldBgDIAEoCUID4EEEGvECCglJTVNldHRpbmcSJwoEdHlwZRgBIAEoDjIZLmJ5dGViYXNlLnYxLldlYmhvb2suVHlwZRIwCgVzbGFjaxgCIAEoCzIfLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5TbGFja0gAEjIKBmZlaXNodRgDIAEoCzIgLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5GZWlzaHVIABIwCgV3ZWNvbRgEIAEoCzIfLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5XZWNvbUgAEi4KBGxhcmsYBSABKAsyHi5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuTGFya0gAEjYKCGRpbmd0YWxrGAYgASgLMiIuYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLkRpbmdUYWxrSAASMAoFdGVhbXMYByABKAsyHy5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuVGVhbXNIAEIJCgdwYXlsb2FkIsEEChdXb3Jrc3BhY2VQcm9maWxlU2V0dGluZxIUCgxleHRlcm5hbF91cmwYASABKAkSFwoPZGlzYWxsb3dfc2lnbnVwGAIgASgIEhMKC3JlcXVpcmVfMmZhGAMgASgIEjEKDnRva2VuX2R1cmF0aW9uGAYgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEi8KDGFubm91bmNlbWVudBgHIAEoCzIZLmJ5dGViYXNlLnYxLkFubm91bmNlbWVudBI6ChdtYXhpbXVtX3JvbGVfZXhwaXJhdGlvbhgIIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIPCgdkb21haW5zGAkgAygJEh8KF2VuZm9yY2VfaWRlbnRpdHlfZG9tYWluGAogASgIEj0KFGRhdGFiYXNlX2NoYW5nZV9tb2RlGAsgASgOMh8uYnl0ZWJhc2UudjEuRGF0YWJhc2VDaGFuZ2VNb2RlEiAKGGRpc2FsbG93X3Bhc3N3b3JkX3NpZ25pbhgMIAEoCBIgChhlbmFibGVfbWV0cmljX2NvbGxlY3Rpb24YDSABKAgSOwoYaW5hY3RpdmVfc2Vzc2lvbl90aW1lb3V0GA4gASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEh8KF2VuYWJsZV9hdWRpdF9sb2dfc3Rkb3V0GA8gASgIEhEKCXdhdGVybWFyaxgQIAEoCBIcChRkaXJlY3Rvcnlfc3luY190b2tlbhgRIAEoCSKvAQoMQW5ub3VuY2VtZW50EjMKBWxldmVsGAEgASgOMiQuYnl0ZWJhc2UudjEuQW5ub3VuY2VtZW50LkFsZXJ0TGV2ZWwSDAoEdGV4dBgCIAEoCRIMCgRsaW5rGAMgASgJIk4KCkFsZXJ0TGV2ZWwSGwoXQUxFUlRfTEVWRUxfVU5TUEVDSUZJRUQQABIICgRJTkZPEAESCwoHV0FSTklORxACEgwKCENSSVRJQ0FMEAMi5wIKGFdvcmtzcGFjZUFwcHJvdmFsU2V0dGluZxI5CgVydWxlcxgBIAMoCzIqLmJ5dGViYXNlLnYxLldvcmtzcGFjZUFwcHJvdmFsU2V0dGluZy5SdWxlGo8CCgRSdWxlEi8KCHRlbXBsYXRlGAEgASgLMh0uYnl0ZWJhc2UudjEuQXBwcm92YWxUZW1wbGF0ZRIkCgljb25kaXRpb24YAiABKAsyES5nb29nbGUudHlwZS5FeHByEkEKBnNvdXJjZRgDIAEoDjIxLmJ5dGViYXNlLnYxLldvcmtzcGFjZUFwcHJvdmFsU2V0dGluZy5SdWxlLlNvdXJjZSJtCgZTb3VyY2USFgoSU09VUkNFX1VOU1BFQ0lGSUVEEAASEwoPQ0hBTkdFX0RBVEFCQVNFEAESEwoPQ1JFQVRFX0RBVEFCQVNFEAISDwoLRVhQT1JUX0RBVEEQAxIQCgxSRVFVRVNUX1JPTEUQBCKYBQoZRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZxJQCgdjb25maWdzGAEgAygLMj8uYnl0ZWJhc2UudjEuRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZy5EYXRhQ2xhc3NpZmljYXRpb25Db25maWcaqAQKGERhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZxIKCgJpZBgBIAEoCRINCgV0aXRsZRgCIAEoCRJVCgZsZXZlbHMYAyADKAsyRS5ieXRlYmFzZS52MS5EYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nLkRhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZy5MZXZlbBJrCg5jbGFzc2lmaWNhdGlvbhgEIAMoCzJTLmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcuRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnLkNsYXNzaWZpY2F0aW9uRW50cnkaNwoFTGV2ZWwSCgoCaWQYASABKAkSDQoFdGl0bGUYAiABKAkSEwoLZGVzY3JpcHRpb24YAyABKAkaaAoSRGF0YUNsYXNzaWZpY2F0aW9uEgoKAmlkGAEgASgJEg0KBXRpdGxlGAIgASgJEhMKC2Rlc2NyaXB0aW9uGAMgASgJEhUKCGxldmVsX2lkGAQgASgJSACIAQFCCwoJX2xldmVsX2lkGokBChNDbGFzc2lmaWNhdGlvbkVudHJ5EgsKA2tleRgBIAEoCRJhCgV2YWx1ZRgCIAEoCzJSLmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcuRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnLkRhdGFDbGFzc2lmaWNhdGlvbjoCOAEizAEKE1NlbWFudGljVHlwZVNldHRpbmcSPAoFdHlwZXMYASADKAsyLS5ieXRlYmFzZS52MS5TZW1hbnRpY1R5cGVTZXR0aW5nLlNlbWFudGljVHlwZRp3CgxTZW1hbnRpY1R5cGUSCgoCaWQYASABKAkSDQoFdGl0bGUYAiABKAkSEwoLZGVzY3JpcHRpb24YAyABKAkSKQoJYWxnb3JpdGhtGAYgASgLMhYuYnl0ZWJhc2UudjEuQWxnb3JpdGhtEgwKBGljb24YByABKAki/wQKCUFsZ29yaXRobRI0CglmdWxsX21hc2sYBSABKAsyHy5ieXRlYmFzZS52MS5BbGdvcml0aG0uRnVsbE1hc2tIABI2CgpyYW5nZV9tYXNrGAYgASgLMiAuYnl0ZWJhc2UudjEuQWxnb3JpdGhtLlJhbmdlTWFza0gAEjIKCG1kNV9tYXNrGAcgASgLMh4uYnl0ZWJhc2UudjEuQWxnb3JpdGhtLk1ENU1hc2tIABJBChBpbm5lcl9vdXRlcl9tYXNrGAggASgLMiUuYnl0ZWJhc2UudjEuQWxnb3JpdGhtLklubmVyT3V0ZXJNYXNrSAAaIAoIRnVsbE1hc2sSFAoMc3Vic3RpdHV0aW9uGAEgASgJGn4KCVJhbmdlTWFzaxI2CgZzbGljZXMYASADKAsyJi5ieXRlYmFzZS52MS5BbGdvcml0aG0uUmFuZ2VNYXNrLlNsaWNlGjkKBVNsaWNlEg0KBXN0YXJ0GAEgASgFEgsKA2VuZBgCIAEoBRIUCgxzdWJzdGl0dXRpb24YAyABKAkaFwoHTUQ1TWFzaxIMCgRzYWx0GAEgASgJGskBCg5Jbm5lck91dGVyTWFzaxISCgpwcmVmaXhfbGVuGAEgASgFEhIKCnN1ZmZpeF9sZW4YAiABKAUSPAoEdHlwZRgDIAEoDjIuLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5Jbm5lck91dGVyTWFzay5NYXNrVHlwZRIUCgxzdWJzdGl0dXRpb24YBCABKAkiOwoITWFza1R5cGUSGQoVTUFTS19UWVBFX1VOU1BFQ0lGSUVEEAASCQoFSU5ORVIQARIJCgVPVVRFUhACQgYKBG1hc2siiwIKGlBhc3N3b3JkUmVzdHJpY3Rpb25TZXR0aW5nEhIKCm1pbl9sZW5ndGgYASABKAUSFgoOcmVxdWlyZV9udW1iZXIYAiABKAgSFgoOcmVxdWlyZV9sZXR0ZXIYAyABKAgSIAoYcmVxdWlyZV91cHBlcmNhc2VfbGV0dGVyGAQgASgIEiEKGXJlcXVpcmVfc3BlY2lhbF9jaGFyYWN0ZXIYBSABKAgSLgomcmVxdWlyZV9yZXNldF9wYXNzd29yZF9mb3JfZmlyc3RfbG9naW4YBiABKAgSNAoRcGFzc3dvcmRfcm90YXRpb24YByABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24i7wEKCUFJU2V0dGluZxIPCgdlbmFibGVkGAEgASgIEjEKCHByb3ZpZGVyGAIgASgOMh8uYnl0ZWJhc2UudjEuQUlTZXR0aW5nLlByb3ZpZGVyEhAKCGVuZHBvaW50GAMgASgJEg8KB2FwaV9rZXkYBCABKAkSDQoFbW9kZWwYBSABKAkSDwoHdmVyc2lvbhgGIAEoCSJbCghQcm92aWRlchIYChRQUk9WSURFUl9VTlNQRUNJRklFRBAAEgsKB09QRU5fQUkQARIKCgZDTEFVREUQAhIKCgZHRU1JTkkQAxIQCgxBWlVSRV9PUEVOQUkQBCKWAgoSRW52aXJvbm1lbnRTZXR0aW5nEkEKDGVudmlyb25tZW50cxgBIAMoCzIrLmJ5dGViYXNlLnYxLkVudmlyb25tZW50U2V0dGluZy5FbnZpcm9ubWVudBq8AQoLRW52aXJvbm1lbnQSEQoEbmFtZRgBIAEoCUID4EEDEgoKAmlkGAIgASgJEg0KBXRpdGxlGAMgASgJEkMKBHRhZ3MYBCADKAsyNS5ieXRlYmFzZS52MS5FbnZpcm9ubWVudFNldHRpbmcuRW52aXJvbm1lbnQuVGFnc0VudHJ5Eg0KBWNvbG9yGAUgASgJGisKCVRhZ3NFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBKlQKEkRhdGFiYXNlQ2hhbmdlTW9kZRIkCiBEQVRBQkFTRV9DSEFOR0VfTU9ERV9VTlNQRUNJRklFRBAAEgwKCFBJUEVMSU5FEAESCgoGRURJVE9SEAIyrgMKDlNldHRpbmdTZXJ2aWNlEoQBCgxMaXN0U2V0dGluZ3MSIC5ieXRlYmFzZS52MS5MaXN0U2V0dGluZ3NSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuTGlzdFNldHRpbmdzUmVzcG9uc2UiL9pBAIrqMBBiYi5zZXR0aW5ncy5saXN0kOowAYLT5JMCDhIML3YxL3NldHRpbmdzEn8KCkdldFNldHRpbmcSHi5ieXRlYmFzZS52MS5HZXRTZXR0aW5nUmVxdWVzdBoULmJ5dGViYXNlLnYxLlNldHRpbmciO9pBBG5hbWWK6jAPYmIuc2V0dGluZ3MuZ2V0kOowAYLT5JMCFxIVL3YxL3tuYW1lPXNldHRpbmdzLyp9EpMBCg1VcGRhdGVTZXR0aW5nEiEuYnl0ZWJhc2UudjEuVXBkYXRlU2V0dGluZ1JlcXVlc3QaFC5ieXRlYmFzZS52MS5TZXR0aW5nIkmK6jAPYmIuc2V0dGluZ3Muc2V0kOowAZjqMAGC0+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("Chh2MS9zZXR0aW5nX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIhUKE0xpc3RTZXR0aW5nc1JlcXVlc3QiPgoUTGlzdFNldHRpbmdzUmVzcG9uc2USJgoIc2V0dGluZ3MYASADKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIj8KEUdldFNldHRpbmdSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1NldHRpbmciOwoSR2V0U2V0dGluZ1Jlc3BvbnNlEiUKB3NldHRpbmcYASABKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIqEBChRVcGRhdGVTZXR0aW5nUmVxdWVzdBIqCgdzZXR0aW5nGAEgASgLMhQuYnl0ZWJhc2UudjEuU2V0dGluZ0ID4EECEhUKDXZhbGlkYXRlX29ubHkYAiABKAgSFQoNYWxsb3dfbWlzc2luZxgDIAEoCBIvCgt1cGRhdGVfbWFzaxgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2siwwIKB1NldHRpbmcSEQoEbmFtZRgBIAEoCUID4EEIEi0KBXZhbHVlGAIgASgLMhkuYnl0ZWJhc2UudjEuU2V0dGluZ1ZhbHVlQgPgQQIixgEKC1NldHRpbmdOYW1lEhwKGFNFVFRJTkdfTkFNRV9VTlNQRUNJRklFRBAAEhUKEVdPUktTUEFDRV9QUk9GSUxFEAQSFgoSV09SS1NQQUNFX0FQUFJPVkFMEAUSCgoGQVBQX0lNEAgSBgoCQUkQChIXChNEQVRBX0NMQVNTSUZJQ0FUSU9OEA4SEgoOU0VNQU5USUNfVFlQRVMQDxIYChRQQVNTV09SRF9SRVNUUklDVElPThASEg8KC0VOVklST05NRU5UEBM6LepBKgoUYnl0ZWJhc2UuY29tL1NldHRpbmcSEnNldHRpbmdzL3tzZXR0aW5nfSL1AwoMU2V0dGluZ1ZhbHVlEisKBmFwcF9pbRgDIAEoCzIZLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZ0gAEkEKEXdvcmtzcGFjZV9wcm9maWxlGAUgASgLMiQuYnl0ZWJhc2UudjEuV29ya3NwYWNlUHJvZmlsZVNldHRpbmdIABJDChJ3b3Jrc3BhY2VfYXBwcm92YWwYBiABKAsyJS5ieXRlYmFzZS52MS5Xb3Jrc3BhY2VBcHByb3ZhbFNldHRpbmdIABJFChNkYXRhX2NsYXNzaWZpY2F0aW9uGAogASgLMiYuYnl0ZWJhc2UudjEuRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZ0gAEjkKDXNlbWFudGljX3R5cGUYCyABKAsyIC5ieXRlYmFzZS52MS5TZW1hbnRpY1R5cGVTZXR0aW5nSAASRwoUcGFzc3dvcmRfcmVzdHJpY3Rpb24YDyABKAsyJy5ieXRlYmFzZS52MS5QYXNzd29yZFJlc3RyaWN0aW9uU2V0dGluZ0gAEiQKAmFpGBAgASgLMhYuYnl0ZWJhc2UudjEuQUlTZXR0aW5nSAASNgoLZW52aXJvbm1lbnQYESABKAsyHy5ieXRlYmFzZS52MS5FbnZpcm9ubWVudFNldHRpbmdIAEIHCgV2YWx1ZSK9BgoMQXBwSU1TZXR0aW5nEjUKCHNldHRpbmdzGAEgAygLMiMuYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLklNU2V0dGluZxobCgVTbGFjaxISCgV0b2tlbhgBIAEoCUID4EEEGjYKBkZlaXNodRITCgZhcHBfaWQYASABKAlCA+BBBBIXCgphcHBfc2VjcmV0GAIgASgJQgPgQQQaSQoFV2Vjb20SFAoHY29ycF9pZBgBIAEoCUID4EEEEhUKCGFnZW50X2lkGAIgASgJQgPgQQQSEwoGc2VjcmV0GAMgASgJQgPgQQQaNAoETGFyaxITCgZhcHBfaWQYASABKAlCA+BBBBIXCgphcHBfc2VjcmV0GAIgASgJQgPgQQQaVwoIRGluZ1RhbGsSFgoJY2xpZW50X2lkGAEgASgJQgPgQQQSGgoNY2xpZW50X3NlY3JldBgCIAEoCUID4EEEEhcKCnJvYm90X2NvZGUYAyABKAlCA+BBBBpTCgVUZWFtcxIWCgl0ZW5hbnRfaWQYASABKAlCA+BBBBIWCgljbGllbnRfaWQYAiABKAlCA+BBBBIaCg1jbGllbnRfc2VjcmV0GAMgASgJQgPgQQQa8QIKCUlNU2V0dGluZxInCgR0eXBlGAEgASgOMhkuYnl0ZWJhc2UudjEuV2ViaG9vay5UeXBlEjAKBXNsYWNrGAIgASgLMh8uYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLlNsYWNrSAASMgoGZmVpc2h1GAMgASgLMiAuYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLkZlaXNodUgAEjAKBXdlY29tGAQgASgLMh8uYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLldlY29tSAASLgoEbGFyaxgFIAEoCzIeLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5MYXJrSAASNgoIZGluZ3RhbGsYBiABKAsyIi5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuRGluZ1RhbGtIABIwCgV0ZWFtcxgHIAEoCzIfLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5UZWFtc0gAQgkKB3BheWxvYWQi2AQKF1dvcmtzcGFjZVByb2ZpbGVTZXR0aW5nEhQKDGV4dGVybmFsX3VybBgBIAEoCRIXCg9kaXNhbGxvd19zaWdudXAYAiABKAgSEwoLcmVxdWlyZV8yZmEYAyABKAgSMQoOdG9rZW5fZHVyYXRpb24YBiABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SLwoMYW5ub3VuY2VtZW50GAcgASgLMhkuYnl0ZWJhc2UudjEuQW5ub3VuY2VtZW50EjoKF21heGltdW1fcm9sZV9leHBpcmF0aW9uGAggASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEg8KB2RvbWFpbnMYCSADKAkSHwoXZW5mb3JjZV9pZGVudGl0eV9kb21haW4YCiABKAgSPQoUZGF0YWJhc2VfY2hhbmdlX21vZGUYCyABKA4yHy5ieXRlYmFzZS52MS5EYXRhYmFzZUNoYW5nZU1vZGUSIAoYZGlzYWxsb3dfcGFzc3dvcmRfc2lnbmluGAwgASgIEiAKGGVuYWJsZV9tZXRyaWNfY29sbGVjdGlvbhgNIAEoCBI7ChhpbmFjdGl2ZV9zZXNzaW9uX3RpbWVvdXQYDiABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SHwoXZW5hYmxlX2F1ZGl0X2xvZ19zdGRvdXQYDyABKAgSEQoJd2F0ZXJtYXJrGBAgASgIEhwKFGRpcmVjdG9yeV9zeW5jX3Rva2VuGBEgASgJEhUKDWJyYW5kaW5nX2xvZ28YEiABKAkirwEKDEFubm91bmNlbWVudBIzCgVsZXZlbBgBIAEoDjIkLmJ5dGViYXNlLnYxLkFubm91bmNlbWVudC5BbGVydExldmVsEgwKBHRleHQYAiABKAkSDAoEbGluaxgDIAEoCSJOCgpBbGVydExldmVsEhsKF0FMRVJUX0xFVkVMX1VOU1BFQ0lGSUVEEAASCAoESU5GTxABEgsKB1dBUk5JTkcQAhIMCghDUklUSUNBTBADIucCChhXb3Jrc3BhY2VBcHByb3ZhbFNldHRpbmcSOQoFcnVsZXMYASADKAsyKi5ieXRlYmFzZS52MS5Xb3Jrc3BhY2VBcHByb3ZhbFNldHRpbmcuUnVsZRqPAgoEUnVsZRIvCgh0ZW1wbGF0ZRgBIAEoCzIdLmJ5dGViYXNlLnYxLkFwcHJvdmFsVGVtcGxhdGUSJAoJY29uZGl0aW9uGAIgASgLMhEuZ29vZ2xlLnR5cGUuRXhwchJBCgZzb3VyY2UYAyABKA4yMS5ieXRlYmFzZS52MS5Xb3Jrc3BhY2VBcHByb3ZhbFNldHRpbmcuUnVsZS5Tb3VyY2UibQoGU291cmNlEhYKElNPVVJDRV9VTlNQRUNJRklFRBAAEhMKD0NIQU5HRV9EQVRBQkFTRRABEhMKD0NSRUFURV9EQVRBQkFTRRACEg8KC0VYUE9SVF9EQVRBEAMSEAoMUkVRVUVTVF9ST0xFEAQimAUKGURhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcSUAoHY29uZmlncxgBIAMoCzI/LmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcuRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnGqgEChhEYXRhQ2xhc3NpZmljYXRpb25Db25maWcSCgoCaWQYASABKAkSDQoFdGl0bGUYAiABKAkSVQoGbGV2ZWxzGAMgAygLMkUuYnl0ZWJhc2UudjEuRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZy5EYXRhQ2xhc3NpZmljYXRpb25Db25maWcuTGV2ZWwSawoOY2xhc3NpZmljYXRpb24YBCADKAsyUy5ieXRlYmFzZS52MS5EYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nLkRhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZy5DbGFzc2lmaWNhdGlvbkVudHJ5GjcKBUxldmVsEgoKAmlkGAEgASgJEg0KBXRpdGxlGAIgASgJEhMKC2Rlc2NyaXB0aW9uGAMgASgJGmgKEkRhdGFDbGFzc2lmaWNhdGlvbhIKCgJpZBgBIAEoCRINCgV0aXRsZRgCIAEoCRITCgtkZXNjcmlwdGlvbhgDIAEoCRIVCghsZXZlbF9pZBgEIAEoCUgAiAEBQgsKCV9sZXZlbF9pZBqJAQoTQ2xhc3NpZmljYXRpb25FbnRyeRILCgNrZXkYASABKAkSYQoFdmFsdWUYAiABKAsyUi5ieXRlYmFzZS52MS5EYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nLkRhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZy5EYXRhQ2xhc3NpZmljYXRpb246AjgBIswBChNTZW1hbnRpY1R5cGVTZXR0aW5nEjwKBXR5cGVzGAEgAygLMi0uYnl0ZWJhc2UudjEuU2VtYW50aWNUeXBlU2V0dGluZy5TZW1hbnRpY1R5cGUadwoMU2VtYW50aWNUeXBlEgoKAmlkGAEgASgJEg0KBXRpdGxlGAIgASgJEhMKC2Rlc2NyaXB0aW9uGAMgASgJEikKCWFsZ29yaXRobRgGIAEoCzIWLmJ5dGViYXNlLnYxLkFsZ29yaXRobRIMCgRpY29uGAcgASgJIv8ECglBbGdvcml0aG0SNAoJZnVsbF9tYXNrGAUgASgLMh8uYnl0ZWJhc2UudjEuQWxnb3JpdGhtLkZ1bGxNYXNrSAASNgoKcmFuZ2VfbWFzaxgGIAEoCzIgLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5SYW5nZU1hc2tIABIyCghtZDVfbWFzaxgHIAEoCzIeLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5NRDVNYXNrSAASQQoQaW5uZXJfb3V0ZXJfbWFzaxgIIAEoCzIlLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5Jbm5lck91dGVyTWFza0gAGiAKCEZ1bGxNYXNrEhQKDHN1YnN0aXR1dGlvbhgBIAEoCRp+CglSYW5nZU1hc2sSNgoGc2xpY2VzGAEgAygLMiYuYnl0ZWJhc2UudjEuQWxnb3JpdGhtLlJhbmdlTWFzay5TbGljZRo5CgVTbGljZRINCgVzdGFydBgBIAEoBRILCgNlbmQYAiABKAUSFAoMc3Vic3RpdHV0aW9uGAMgASgJGhcKB01ENU1hc2sSDAoEc2FsdBgBIAEoCRrJAQoOSW5uZXJPdXRlck1hc2sSEgoKcHJlZml4X2xlbhgBIAEoBRISCgpzdWZmaXhfbGVuGAIgASgFEjwKBHR5cGUYAyABKA4yLi5ieXRlYmFzZS52MS5BbGdvcml0aG0uSW5uZXJPdXRlck1hc2suTWFza1R5cGUSFAoMc3Vic3RpdHV0aW9uGAQgASgJIjsKCE1hc2tUeXBlEhkKFU1BU0tfVFlQRV9VTlNQRUNJRklFRBAAEgkKBUlOTkVSEAESCQoFT1VURVIQAkIGCgRtYXNrIosCChpQYXNzd29yZFJlc3RyaWN0aW9uU2V0dGluZxISCgptaW5fbGVuZ3RoGAEgASgFEhYKDnJlcXVpcmVfbnVtYmVyGAIgASgIEhYKDnJlcXVpcmVfbGV0dGVyGAMgASgIEiAKGHJlcXVpcmVfdXBwZXJjYXNlX2xldHRlchgEIAEoCBIhChlyZXF1aXJlX3NwZWNpYWxfY2hhcmFjdGVyGAUgASgIEi4KJnJlcXVpcmVfcmVzZXRfcGFzc3dvcmRfZm9yX2ZpcnN0X2xvZ2luGAYgASgIEjQKEXBhc3N3b3JkX3JvdGF0aW9uGAcgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uIu8BCglBSVNldHRpbmcSDwoHZW5hYmxlZBgBIAEoCBIxCghwcm92aWRlchgCIAEoDjIfLmJ5dGViYXNlLnYxLkFJU2V0dGluZy5Qcm92aWRlchIQCghlbmRwb2ludBgDIAEoCRIPCgdhcGlfa2V5GAQgASgJEg0KBW1vZGVsGAUgASgJEg8KB3ZlcnNpb24YBiABKAkiWwoIUHJvdmlkZXISGAoUUFJPVklERVJfVU5TUEVDSUZJRUQQABILCgdPUEVOX0FJEAESCgoGQ0xBVURFEAISCgoGR0VNSU5JEAMSEAoMQVpVUkVfT1BFTkFJEAQilgIKEkVudmlyb25tZW50U2V0dGluZxJBCgxlbnZpcm9ubWVudHMYASADKAsyKy5ieXRlYmFzZS52MS5FbnZpcm9ubWVudFNldHRpbmcuRW52aXJvbm1lbnQavAEKC0Vudmlyb25tZW50EhEKBG5hbWUYASABKAlCA+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.yaml
index c97ccd60d0..c40600363b 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -12926,9 +12926,6 @@ components:
SettingValue:
type: object
properties:
- stringValue:
- type: string
- description: Defines this value as being a string value.
appIm:
$ref: '#/components/schemas/AppIMSetting'
workspaceProfile:
@@ -13976,6 +13973,9 @@ components:
directorySyncToken:
type: string
description: The token for directory sync authentication.
+ brandingLogo:
+ type: string
+ description: The branding logo as a data URI (e.g. data:image/png;base64,...).
tags:
- name: ActuatorService
description: ActuatorService manages system health and operational information.
diff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.md
index d803d77ac6..4a10460c50 100644
--- a/proto/gen/grpc-doc/store/README.md
+++ b/proto/gen/grpc-doc/store/README.md
@@ -4624,6 +4624,7 @@ ISSUE_CREATE represents creating an issue. |
| 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. |
| directory_sync_token | [string](#string) | | The token for directory sync authentication. |
+| branding_logo | [string](#string) | | The branding logo as a data URI (e.g. data:image/png;base64,...). |
@@ -4696,7 +4697,6 @@ We support three levels of AlertLevel: INFO, WARNING, and ERROR.
| ---- | ------ | ----------- |
| SETTING_NAME_UNSPECIFIED | 0 | |
| AUTH_SECRET | 1 | |
-| BRANDING_LOGO | 2 | |
| WORKSPACE_ID | 3 | |
| WORKSPACE_PROFILE | 4 | |
| WORKSPACE_APPROVAL | 5 | |
diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.html
index dbfca0a605..1476957127 100644
--- a/proto/gen/grpc-doc/store/index.html
+++ b/proto/gen/grpc-doc/store/index.html
@@ -12215,6 +12215,13 @@ Requires ENTERPRISE license. </p></td>
<td><p>The token for directory sync authentication. </p></td>
</tr>
+ <tr>
+ <td>branding_logo</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>The branding logo as a data URI (e.g. data:image/png;base64,...). </p></td>
+ </tr>
+
</tbody>
</table>
@@ -12379,12 +12386,6 @@ Default to this mode.</p></td>
<td><p></p></td>
</tr>
- <tr>
- <td>BRANDING_LOGO</td>
- <td>2</td>
- <td><p></p></td>
- </tr>
-
<tr>
<td>WORKSPACE_ID</td>
<td>3</td>
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index 0f39f3a3dd..3d68f2128d 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -2711,7 +2711,6 @@ The data in setting value.
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
-| string_value | [string](#string) | | Defines this value as being a string value. |
| app_im | [AppIMSetting](#bytebase-v1-AppIMSetting) | | |
| workspace_profile | [WorkspaceProfileSetting](#bytebase-v1-WorkspaceProfileSetting) | | |
| workspace_approval | [WorkspaceApprovalSetting](#bytebase-v1-WorkspaceApprovalSetting) | | |
@@ -2807,6 +2806,7 @@ For examples: resource.environment_id == &#34;prod&#34; &amp;&amp; statement.aff
| 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. |
| directory_sync_token | [string](#string) | | The token for directory sync authentication. |
+| branding_logo | [string](#string) | | The branding logo as a data URI (e.g. data:image/png;base64,...). |
@@ -2878,7 +2878,6 @@ We support three levels of AlertLevel: INFO, WARNING, and ERROR.
| Name | Number | Description |
| ---- | ------ | ----------- |
| SETTING_NAME_UNSPECIFIED | 0 | |
-| BRANDING_LOGO | 2 | |
| WORKSPACE_PROFILE | 4 | |
| WORKSPACE_APPROVAL | 5 | |
| APP_IM | 8 | |
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index a089fa58a4..92a47c6dd4 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -7952,13 +7952,6 @@ Example: &#34;settings/SEMANTIC_TYPES&#34; </p></td>
</thead>
<tbody>
- <tr>
- <td>string_value</td>
- <td><a href="#string">string</a></td>
- <td></td>
- <td><p>Defines this value as being a string value. </p></td>
- </tr>
-
<tr>
<td>app_im</td>
<td><a href="#bytebase.v1.AppIMSetting">AppIMSetting</a></td>
@@ -8273,6 +8266,13 @@ Requires ENTERPRISE license. </p></td>
<td><p>The token for directory sync authentication. </p></td>
</tr>
+ <tr>
+ <td>branding_logo</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>The branding logo as a data URI (e.g. data:image/png;base64,...). </p></td>
+ </tr>
+
</tbody>
</table>
@@ -8431,12 +8431,6 @@ Default to this mode.</p></td>
<td><p></p></td>
</tr>
- <tr>
- <td>BRANDING_LOGO</td>
- <td>2</td>
- <td><p></p></td>
- </tr>
-
<tr>
<td>WORKSPACE_PROFILE</td>
<td>4</td>
diff --git a/proto/store/store/setting.proto b/proto/store/store/setting.proto
index 122995d536..186b2130e3 100644
--- a/proto/store/store/setting.proto
+++ b/proto/store/store/setting.proto
@@ -12,7 +12,6 @@ option go_package = "generated-go/store";
enum SettingName {
SETTING_NAME_UNSPECIFIED = 0;
AUTH_SECRET = 1;
- BRANDING_LOGO = 2;
WORKSPACE_ID = 3;
WORKSPACE_PROFILE = 4;
WORKSPACE_APPROVAL = 5;
@@ -72,6 +71,9 @@ message WorkspaceProfileSetting {
// The token for directory sync authentication.
string directory_sync_token = 17;
+
+ // The branding logo as a data URI (e.g. data:image/png;base64,...).
+ string branding_logo = 18;
}
message Announcement {
diff --git a/proto/v1/v1/setting_service.proto b/proto/v1/v1/setting_service.proto
index 8be7e3631d..5dd262f13a 100644
--- a/proto/v1/v1/setting_service.proto
+++ b/proto/v1/v1/setting_service.proto
@@ -92,7 +92,6 @@ message Setting {
enum SettingName {
SETTING_NAME_UNSPECIFIED = 0;
- BRANDING_LOGO = 2;
WORKSPACE_PROFILE = 4;
WORKSPACE_APPROVAL = 5;
APP_IM = 8;
@@ -115,8 +114,6 @@ message Setting {
// The data in setting value.
message SettingValue {
oneof value {
- // Defines this value as being a string value.
- string string_value = 1;
AppIMSetting app_im = 3;
WorkspaceProfileSetting workspace_profile = 5;
WorkspaceApprovalSetting workspace_approval = 6;
@@ -221,6 +218,9 @@ message WorkspaceProfileSetting {
// The token for directory sync authentication.
string directory_sync_token = 17;
+
+ // The branding logo as a data URI (e.g. data:image/png;base64,...).
+ string branding_logo = 18;
}
message Announcement {