Skip to content

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

refactor: use color message instead of rgb for theme (#20706)

ecmadao2f5c8bd3ba39
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yaml
index 714bd030b7..515b34b251 100644
--- a/backend/api/mcp/gen/openapi.yaml
+++ b/backend/api/mcp/gen/openapi.yaml
@@ -8361,13 +8361,11 @@ components:
type: object
properties:
background:
- type: string
title: background
- description: '"r g b"'
+ $ref: '#/components/schemas/google.type.Color'
text:
- type: string
title: text
- description: '"r g b"'
+ $ref: '#/components/schemas/google.type.Color'
title: AnnouncementTheme
additionalProperties: false
bytebase.v1.AppIMSetting:
@@ -16898,8 +16896,9 @@ components:
type: object
title: tokens
additionalProperties:
- type: string
title: value
+ $ref: '#/components/schemas/google.type.Color'
+ description: CSS token colors.
title: SQLEditorThemeSetting
additionalProperties: false
bytebase.v1.SQLEditorThemeSetting.TokensEntry:
@@ -16909,8 +16908,8 @@ components:
type: string
title: key
value:
- type: string
title: value
+ $ref: '#/components/schemas/google.type.Color'
title: TokensEntry
additionalProperties: false
bytebase.v1.SQLReviewRule:
@@ -21699,6 +21698,17 @@ components:
The implementation of any API method which has a FieldMask type field in the
request should verify the included field paths, and return an
`INVALID_ARGUMENT` error if any path is unmappable.
+ google.protobuf.FloatValue:
+ oneOf:
+ - type: string
+ - type: number
+ description: |-
+ Wrapper message for `float`.
+
+ The JSON representation for `FloatValue` is JSON number.
+
+ Not recommended for use in new APIs, but still useful for legacy APIs and
+ has no plan to be removed.
google.protobuf.ListValue:
type: object
properties:
@@ -21896,6 +21906,166 @@ components:
You can find out more about this error model and how to work with it in the
[API Design Guide](https://cloud.google.com/apis/design/errors).
+ google.type.Color:
+ type: object
+ properties:
+ red:
+ type: number
+ title: red
+ format: float
+ description: The amount of red in the color as a value in the interval [0, 1].
+ green:
+ type: number
+ title: green
+ format: float
+ description: The amount of green in the color as a value in the interval [0, 1].
+ blue:
+ type: number
+ title: blue
+ format: float
+ description: The amount of blue in the color as a value in the interval [0, 1].
+ alpha:
+ title: alpha
+ description: |-
+ The fraction of this color that should be applied to the pixel. That is,
+ the final pixel color is defined by the equation:
+
+ `pixel color = alpha * (this color) + (1.0 - alpha) * (background color)`
+
+ This means that a value of 1.0 corresponds to a solid color, whereas
+ a value of 0.0 corresponds to a completely transparent color. This
+ uses a wrapper message rather than a simple float scalar so that it is
+ possible to distinguish between a default value and the value being unset.
+ If omitted, this color object is rendered as a solid color
+ (as if the alpha value had been explicitly given a value of 1.0).
+ $ref: '#/components/schemas/google.protobuf.FloatValue'
+ title: Color
+ additionalProperties: false
+ description: |-
+ Represents a color in the RGBA color space. This representation is designed
+ for simplicity of conversion to/from color representations in various
+ languages over compactness. For example, the fields of this representation
+ can be trivially provided to the constructor of `java.awt.Color` in Java; it
+ can also be trivially provided to UIColor's `+colorWithRed:green:blue:alpha`
+ method in iOS; and, with just a little work, it can be easily formatted into
+ a CSS `rgba()` string in JavaScript.
+
+ This reference page doesn't carry information about the absolute color
+ space
+ that should be used to interpret the RGB value (e.g. sRGB, Adobe RGB,
+ DCI-P3, BT.2020, etc.). By default, applications should assume the sRGB color
+ space.
+
+ When color equality needs to be decided, implementations, unless
+ documented otherwise, treat two colors as equal if all their red,
+ green, blue, and alpha values each differ by at most 1e-5.
+
+ Example (Java):
+
+ import com.google.type.Color;
+
+ // ...
+ public static java.awt.Color fromProto(Color protocolor) {
+ float alpha = protocolor.hasAlpha()
+ ? protocolor.getAlpha().getValue()
+ : 1.0;
+
+ return new java.awt.Color(
+ protocolor.getRed(),
+ protocolor.getGreen(),
+ protocolor.getBlue(),
+ alpha);
+ }
+
+ public static Color toProto(java.awt.Color color) {
+ float red = (float) color.getRed();
+ float green = (float) color.getGreen();
+ float blue = (float) color.getBlue();
+ float denominator = 255.0;
+ Color.Builder resultBuilder =
+ Color
+ .newBuilder()
+ .setRed(red / denominator)
+ .setGreen(green / denominator)
+ .setBlue(blue / denominator);
+ int alpha = color.getAlpha();
+ if (alpha != 255) {
+ result.setAlpha(
+ FloatValue
+ .newBuilder()
+ .setValue(((float) alpha) / denominator)
+ .build());
+ }
+ return resultBuilder.build();
+ }
+ // ...
+
+ Example (iOS / Obj-C):
+
+ // ...
+ static UIColor* fromProto(Color* protocolor) {
+ float red = [protocolor red];
+ float green = [protocolor green];
+ float blue = [protocolor blue];
+ FloatValue* alpha_wrapper = [protocolor alpha];
+ float alpha = 1.0;
+ if (alpha_wrapper != nil) {
+ alpha = [alpha_wrapper value];
+ }
+ return [UIColor colorWithRed:red green:green blue:blue alpha:alpha];
+ }
+
+ static Color* toProto(UIColor* color) {
+ CGFloat red, green, blue, alpha;
+ if (![color getRed:&red green:&green blue:&blue alpha:&alpha]) {
+ return nil;
+ }
+ Color* result = [[Color alloc] init];
+ [result setRed:red];
+ [result setGreen:green];
+ [result setBlue:blue];
+ if (alpha <= 0.9999) {
+ [result setAlpha:floatWrapperWithValue(alpha)];
+ }
+ [result autorelease];
+ return result;
+ }
+ // ...
+
+ Example (JavaScript):
+
+ // ...
+
+ var protoToCssColor = function(rgb_color) {
+ var redFrac = rgb_color.red || 0.0;
+ var greenFrac = rgb_color.green || 0.0;
+ var blueFrac = rgb_color.blue || 0.0;
+ var red = Math.floor(redFrac * 255);
+ var green = Math.floor(greenFrac * 255);
+ var blue = Math.floor(blueFrac * 255);
+
+ if (!('alpha' in rgb_color)) {
+ return rgbToCssColor(red, green, blue);
+ }
+
+ var alphaFrac = rgb_color.alpha.value || 0.0;
+ var rgbParams = [red, green, blue].join(',');
+ return ['rgba(', rgbParams, ',', alphaFrac, ')'].join('');
+ };
+
+ var rgbToCssColor = function(red, green, blue) {
+ var rgbNumber = new Number((red << 16) | (green << 8) | blue);
+ var hexString = rgbNumber.toString(16);
+ var missingZeros = 6 - hexString.length;
+ var resultBuilder = ['#'];
+ for (var i = 0; i < missingZeros; i++) {
+ resultBuilder.push('0');
+ }
+ resultBuilder.push(hexString);
+ return resultBuilder.join('');
+ };
+
+ // ...
google.type.Expr:
type: object
properties:
diff --git a/backend/api/v1/setting_service.go b/backend/api/v1/setting_service.go
index 8c12e1b10d..d756b8952c 100644
--- a/backend/api/v1/setting_service.go
+++ b/backend/api/v1/setting_service.go
@@ -4,13 +4,12 @@ import (
"context"
"log/slog"
"regexp"
- "strconv"
- "strings"
"time"
"connectrpc.com/connect"
"github.com/google/uuid"
"github.com/pkg/errors"
+ colorpb "google.golang.org/genproto/googleapis/type/color"
"google.golang.org/protobuf/proto" // Added
"google.golang.org/protobuf/types/known/anypb"
@@ -265,6 +264,11 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_DASHBOARD_ANNOUNCEMENT); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
+ if payload.Announcement != nil {
+ if err := validateAnnouncementTheme(payload.Announcement.Theme); err != nil {
+ return nil, err
+ }
+ }
oldSetting.Announcement = payload.Announcement
case "value.workspace_profile.maximum_request_expiration":
if payload.MaximumRequestExpiration != nil {
@@ -822,6 +826,7 @@ func (s *SettingService) checkSettingPermission(ctx context.Context, req connect
}
var domainRegexp = regexp.MustCompile(`^(?i:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z]{2,}$`)
+var hexColorRegexp = regexp.MustCompile(`^#[0-9a-fA-F]{6}$`)
var disallowedDomains = map[string]bool{
"gmail.com": true,
"googlemail.com": true,
@@ -883,7 +888,7 @@ func validateDomains(domains []string) error {
// validateSQLEditorCustomTheme checks the SHAPE of a custom theme, not the
// frontend's token vocabulary. The `--color-*` token keys are a frontend/CSS
// concern owned by SQL_EDITOR_THEME_TOKENS; the server only ensures the stored
-// value isn't garbage (non-empty tokens, each an "r g b" triple). The frontend
+// value isn't garbage (non-empty tokens, each an opaque Color). The frontend
// derives the full token set and falls back to a built-in if one is missing, so
// the backend stays theme-catalog-agnostic.
func validateSQLEditorCustomTheme(t *storepb.SQLEditorThemeSetting) error {
@@ -906,27 +911,47 @@ func validateSQLEditorCustomTheme(t *storepb.SQLEditorThemeSetting) error {
return connect.NewError(connect.CodeInvalidArgument, errors.Errorf("sql_editor_custom_theme.tokens is required"))
}
for k, v := range t.Tokens {
- if !isRGBTriple(v) {
- return connect.NewError(connect.CodeInvalidArgument, errors.Errorf("sql_editor_custom_theme token %s invalid: %q", k, v))
+ if !isOpaqueColor(v) {
+ return connect.NewError(connect.CodeInvalidArgument, errors.Errorf("sql_editor_custom_theme token %s invalid", k))
}
}
return nil
}
-func isRGBTriple(s string) bool {
- parts := strings.Fields(s)
- if len(parts) != 3 {
+func validateAnnouncementTheme(t *storepb.WorkspaceProfileSetting_Announcement_AnnouncementTheme) error {
+ if t == nil {
+ return nil
+ }
+ if !isOpaqueColor(t.Background) {
+ return connect.NewError(connect.CodeInvalidArgument, errors.Errorf("announcement theme background invalid"))
+ }
+ if !isOpaqueColor(t.Text) {
+ return connect.NewError(connect.CodeInvalidArgument, errors.Errorf("announcement theme text invalid"))
+ }
+ return nil
+}
+
+func isOpaqueColor(c *colorpb.Color) bool {
+ if c == nil {
return false
}
- for _, p := range parts {
- n, err := strconv.Atoi(p)
- if err != nil || n < 0 || n > 255 {
- return false
- }
+ if !isUnitFloat(c.Red) || !isUnitFloat(c.Green) || !isUnitFloat(c.Blue) {
+ return false
+ }
+ if c.Alpha != nil && c.Alpha.Value != 1 {
+ return false
}
return true
}
+func isUnitFloat(v float32) bool {
+ return v >= 0 && v <= 1
+}
+
+func isHexColor(s string) bool {
+ return hexColorRegexp.MatchString(s)
+}
+
func (s *SettingService) validateEnvironments(ctx context.Context, workspaceID string, envs []*v1pb.EnvironmentSetting_Environment) error {
used := map[string]bool{}
for _, env := range envs {
@@ -939,6 +964,9 @@ func (s *SettingService) validateEnvironments(ctx context.Context, workspaceID s
if used[env.Id] {
return connect.NewError(connect.CodeInvalidArgument, errors.Errorf("duplicate environment ID %v", env.Id))
}
+ if env.Color != "" && !isHexColor(env.Color) {
+ return connect.NewError(connect.CodeInvalidArgument, errors.Errorf("environment color invalid: %q", env.Color))
+ }
if v, ok := env.Tags["protected"]; ok && v == "protected" {
if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_ENVIRONMENT_TIERS); err != nil {
return connect.NewError(connect.CodePermissionDenied, err)
diff --git a/backend/api/v1/setting_service_test.go b/backend/api/v1/setting_service_test.go
index fc69525865..a24051f3ad 100644
--- a/backend/api/v1/setting_service_test.go
+++ b/backend/api/v1/setting_service_test.go
@@ -1,11 +1,15 @@
package v1
import (
+ "context"
"testing"
"github.com/stretchr/testify/require"
+ colorpb "google.golang.org/genproto/googleapis/type/color"
+ "google.golang.org/protobuf/types/known/wrapperspb"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
+ v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
)
func TestValidateDomains(t *testing.T) {
@@ -57,17 +61,17 @@ func TestValidateDomains(t *testing.T) {
func TestValidateSQLEditorCustomTheme(t *testing.T) {
// The server validates shape, not the frontend token vocabulary: a non-empty
- // map whose values are "r g b" triples. A representative subset is enough.
- tokens := func() map[string]string {
- return map[string]string{
- "--color-background": "1 2 3",
- "--color-accent": "4 5 6",
+ // map whose values are google.type.Color messages. A representative subset is enough.
+ tokens := func() map[string]*colorpb.Color {
+ return map[string]*colorpb.Color{
+ "--color-background": colorValue(0.01, 0.02, 0.03),
+ "--color-accent": colorValue(0.6, 0.7, 0.8),
}
}
- with := func(m map[string]string) *storepb.SQLEditorThemeSetting {
+ with := func(m map[string]*colorpb.Color) *storepb.SQLEditorThemeSetting {
return &storepb.SQLEditorThemeSetting{Id: "u1", Name: "Brand", MonacoBase: "vs-dark", Tokens: m}
}
- bad := func(k, v string) *storepb.SQLEditorThemeSetting {
+ bad := func(k string, v *colorpb.Color) *storepb.SQLEditorThemeSetting {
m := tokens()
m[k] = v
return with(m)
@@ -79,10 +83,13 @@ func TestValidateSQLEditorCustomTheme(t *testing.T) {
}{
{"nil ok", nil, false},
{"valid", with(tokens()), false},
- // Backend is vocabulary-agnostic: any key with a valid triple is fine.
- {"arbitrary keys ok", with(map[string]string{"--anything": "7 8 9"}), false},
- {"empty tokens", with(map[string]string{}), true},
- {"bad triple", bad("--color-accent", "300 0 0"), true},
+ // Backend is vocabulary-agnostic: any key with a valid Color is fine.
+ {"arbitrary keys ok", with(map[string]*colorpb.Color{"--anything": colorValue(0.7, 0.8, 0.9)}), false},
+ {"empty tokens", with(map[string]*colorpb.Color{}), true},
+ {"nil color rejected", bad("--color-accent", nil), true},
+ {"red below range rejected", bad("--color-accent", colorValue(-0.1, 0, 0)), true},
+ {"green above range rejected", bad("--color-accent", colorValue(0, 1.1, 0)), true},
+ {"alpha below one rejected", bad("--color-accent", colorWithAlpha(0, 0, 0, 0.5)), true},
{"empty id", &storepb.SQLEditorThemeSetting{Id: "", Name: "Brand", MonacoBase: "vs-dark", Tokens: tokens()}, true},
{"empty name", &storepb.SQLEditorThemeSetting{Id: "u1", Name: "", MonacoBase: "vs-dark", Tokens: tokens()}, true},
{"empty base", &storepb.SQLEditorThemeSetting{Id: "u1", Name: "Brand", MonacoBase: "", Tokens: tokens()}, true},
@@ -100,3 +107,70 @@ func TestValidateSQLEditorCustomTheme(t *testing.T) {
})
}
}
+
+func colorValue(red, green, blue float32) *colorpb.Color {
+ return &colorpb.Color{Red: red, Green: green, Blue: blue}
+}
+
+func colorWithAlpha(red, green, blue, alpha float32) *colorpb.Color {
+ return &colorpb.Color{Red: red, Green: green, Blue: blue, Alpha: wrapperspb.Float(alpha)}
+}
+
+func TestValidateAnnouncementTheme(t *testing.T) {
+ cases := []struct {
+ name string
+ theme *storepb.WorkspaceProfileSetting_Announcement_AnnouncementTheme
+ wantErr bool
+ }{
+ {"nil ok", nil, false},
+ {"valid", &storepb.WorkspaceProfileSetting_Announcement_AnnouncementTheme{Background: colorValue(0.2, 0.3, 0.4), Text: colorValue(1, 1, 1)}, false},
+ {"nil background", &storepb.WorkspaceProfileSetting_Announcement_AnnouncementTheme{Background: nil, Text: colorValue(1, 1, 1)}, true},
+ {"nil text", &storepb.WorkspaceProfileSetting_Announcement_AnnouncementTheme{Background: colorValue(0.2, 0.3, 0.4), Text: nil}, true},
+ {"background out of range", &storepb.WorkspaceProfileSetting_Announcement_AnnouncementTheme{Background: colorValue(1.1, 0.3, 0.4), Text: colorValue(1, 1, 1)}, true},
+ {"alpha below one", &storepb.WorkspaceProfileSetting_Announcement_AnnouncementTheme{Background: colorWithAlpha(0.2, 0.3, 0.4, 0.5), Text: colorValue(1, 1, 1)}, true},
+ }
+ for _, tc := range cases {
+ t.Run(tc.name, func(t *testing.T) {
+ err := validateAnnouncementTheme(tc.theme)
+ if tc.wantErr {
+ require.Error(t, err)
+ } else {
+ require.NoError(t, err)
+ }
+ })
+ }
+}
+
+func TestValidateEnvironmentsColor(t *testing.T) {
+ service := &SettingService{}
+ env := func(color string) *v1pb.EnvironmentSetting_Environment {
+ return &v1pb.EnvironmentSetting_Environment{
+ Id: "test",
+ Title: "Test",
+ Color: color,
+ }
+ }
+ cases := []struct {
+ name string
+ color string
+ wantErr bool
+ }{
+ {"empty ok", "", false},
+ {"valid", "#4f46e5", false},
+ {"uppercase valid", "#AABBCC", false},
+ {"rgb rejected", "79 70 229", true},
+ {"missing hash rejected", "4f46e5", true},
+ {"short hex rejected", "#fff", true},
+ {"invalid hex rejected", "#zzzzzz", true},
+ }
+ for _, tc := range cases {
+ t.Run(tc.name, func(t *testing.T) {
+ err := service.validateEnvironments(context.Background(), "workspaces/default", []*v1pb.EnvironmentSetting_Environment{env(tc.color)})
+ if tc.wantErr {
+ require.Error(t, err)
+ } else {
+ require.NoError(t, err)
+ }
+ })
+ }
+}
diff --git a/backend/generated-go/store/setting.pb.go b/backend/generated-go/store/setting.pb.go
index 259949df8a..263b8ddf8d 100644
--- a/backend/generated-go/store/setting.pb.go
+++ b/backend/generated-go/store/setting.pb.go
@@ -8,6 +8,7 @@ package store
import (
_ "google.golang.org/genproto/googleapis/api/annotations"
+ color "google.golang.org/genproto/googleapis/type/color"
expr "google.golang.org/genproto/googleapis/type/expr"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -757,11 +758,12 @@ func (x *WorkspaceProfileSetting) GetSqlEditorCustomTheme() *SQLEditorThemeSetti
}
type SQLEditorThemeSetting struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
- Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
- MonacoBase string `protobuf:"bytes,3,opt,name=monaco_base,json=monacoBase,proto3" json:"monaco_base,omitempty"`
- Tokens map[string]string `protobuf:"bytes,4,rep,name=tokens,proto3" json:"tokens,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+ state protoimpl.MessageState `protogen:"open.v1"`
+ Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+ Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+ MonacoBase string `protobuf:"bytes,3,opt,name=monaco_base,json=monacoBase,proto3" json:"monaco_base,omitempty"`
+ // CSS token colors.
+ Tokens map[string]*color.Color `protobuf:"bytes,4,rep,name=tokens,proto3" json:"tokens,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@@ -817,7 +819,7 @@ func (x *SQLEditorThemeSetting) GetMonacoBase() string {
return ""
}
-func (x *SQLEditorThemeSetting) GetTokens() map[string]string {
+func (x *SQLEditorThemeSetting) GetTokens() map[string]*color.Color {
if x != nil {
return x.Tokens
}
@@ -1497,8 +1499,8 @@ func (x *WorkspaceProfileSetting_PasswordRestriction) GetPasswordRotation() *dur
type WorkspaceProfileSetting_Announcement_AnnouncementTheme struct {
state protoimpl.MessageState `protogen:"open.v1"`
- Background string `protobuf:"bytes,1,opt,name=background,proto3" json:"background,omitempty"` // "r g b"
- Text string `protobuf:"bytes,2,opt,name=text,proto3" json:"text,omitempty"` // "r g b"
+ Background *color.Color `protobuf:"bytes,1,opt,name=background,proto3" json:"background,omitempty"`
+ Text *color.Color `protobuf:"bytes,2,opt,name=text,proto3" json:"text,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@@ -1533,18 +1535,18 @@ func (*WorkspaceProfileSetting_Announcement_AnnouncementTheme) Descriptor() ([]b
return file_store_setting_proto_rawDescGZIP(), []int{1, 0, 0}
}
-func (x *WorkspaceProfileSetting_Announcement_AnnouncementTheme) GetBackground() string {
+func (x *WorkspaceProfileSetting_Announcement_AnnouncementTheme) GetBackground() *color.Color {
if x != nil {
return x.Background
}
- return ""
+ return nil
}
-func (x *WorkspaceProfileSetting_Announcement_AnnouncementTheme) GetText() string {
+func (x *WorkspaceProfileSetting_Announcement_AnnouncementTheme) GetText() *color.Color {
if x != nil {
return x.Text
}
- return ""
+ return nil
}
type WorkspaceApprovalSetting_Rule struct {
@@ -2799,9 +2801,9 @@ var File_store_setting_proto protoreflect.FileDescriptor
const file_store_setting_proto_rawDesc = "" +
"\n" +
- "\x13store/setting.proto\x12\x0ebytebase.store\x1a\x1fgoogle/api/field_behavior.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x16google/type/expr.proto\x1a\x14store/approval.proto\x1a\x12store/common.proto\"P\n" +
+ "\x13store/setting.proto\x12\x0ebytebase.store\x1a\x1fgoogle/api/field_behavior.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x17google/type/color.proto\x1a\x16google/type/expr.proto\x1a\x14store/approval.proto\x1a\x12store/common.proto\"P\n" +
"\rSystemSetting\x12\x18\n" +
- "\alicense\x18\x03 \x01(\tR\alicenseJ\x04\b\x01\x10\x02J\x04\b\x02\x10\x03R\vauth_secretR\fworkspace_id\"\x87\x11\n" +
+ "\alicense\x18\x03 \x01(\tR\alicenseJ\x04\b\x01\x10\x02J\x04\b\x02\x10\x03R\vauth_secretR\fworkspace_id\"\xaf\x11\n" +
"\x17WorkspaceProfileSetting\x12!\n" +
"\fexternal_url\x18\x01 \x01(\tR\vexternalUrl\x12'\n" +
"\x0fdisallow_signup\x18\x02 \x01(\bR\x0edisallowSignup\x12\x1f\n" +
@@ -2827,16 +2829,16 @@ const file_store_setting_proto_rawDesc = "" +
"\rquery_timeout\x18\x15 \x01(\v2\x19.google.protobuf.DurationR\fqueryTimeout\x125\n" +
"\x17allow_email_code_signin\x18\x16 \x01(\bR\x14allowEmailCodeSignin\x12-\n" +
"\x13sql_editor_theme_id\x18\x17 \x01(\tR\x10sqlEditorThemeId\x12\\\n" +
- "\x17sql_editor_custom_theme\x18\x18 \x01(\v2%.bytebase.store.SQLEditorThemeSettingR\x14sqlEditorCustomTheme\x1a\xea\x01\n" +
+ "\x17sql_editor_custom_theme\x18\x18 \x01(\v2%.bytebase.store.SQLEditorThemeSettingR\x14sqlEditorCustomTheme\x1a\x92\x02\n" +
"\fAnnouncement\x12\x12\n" +
"\x04text\x18\x02 \x01(\tR\x04text\x12\x12\n" +
"\x04link\x18\x03 \x01(\tR\x04link\x12\\\n" +
- "\x05theme\x18\x04 \x01(\v2F.bytebase.store.WorkspaceProfileSetting.Announcement.AnnouncementThemeR\x05theme\x1aG\n" +
- "\x11AnnouncementTheme\x12\x1e\n" +
+ "\x05theme\x18\x04 \x01(\v2F.bytebase.store.WorkspaceProfileSetting.Announcement.AnnouncementThemeR\x05theme\x1ao\n" +
+ "\x11AnnouncementTheme\x122\n" +
"\n" +
- "background\x18\x01 \x01(\tR\n" +
- "background\x12\x12\n" +
- "\x04text\x18\x02 \x01(\tR\x04textJ\x04\b\x01\x10\x02R\x05level\x1a\x93\x03\n" +
+ "background\x18\x01 \x01(\v2\x12.google.type.ColorR\n" +
+ "background\x12&\n" +
+ "\x04text\x18\x02 \x01(\v2\x12.google.type.ColorR\x04textJ\x04\b\x01\x10\x02R\x05level\x1a\x93\x03\n" +
"\x13PasswordRestriction\x12\x1d\n" +
"\n" +
"min_length\x18\x01 \x01(\x05R\tminLength\x12%\n" +
@@ -2850,16 +2852,16 @@ const file_store_setting_proto_rawDesc = "" +
" DATABASE_CHANGE_MODE_UNSPECIFIED\x10\x00\x12\f\n" +
"\bPIPELINE\x10\x01\x12\n" +
"\n" +
- "\x06EDITOR\x10\x02J\x04\b\x10\x10\x11\"\xe2\x01\n" +
+ "\x06EDITOR\x10\x02J\x04\b\x10\x10\x11\"\xf6\x01\n" +
"\x15SQLEditorThemeSetting\x12\x0e\n" +
"\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n" +
"\x04name\x18\x02 \x01(\tR\x04name\x12\x1f\n" +
"\vmonaco_base\x18\x03 \x01(\tR\n" +
"monacoBase\x12I\n" +
- "\x06tokens\x18\x04 \x03(\v21.bytebase.store.SQLEditorThemeSetting.TokensEntryR\x06tokens\x1a9\n" +
+ "\x06tokens\x18\x04 \x03(\v21.bytebase.store.SQLEditorThemeSetting.TokensEntryR\x06tokens\x1aM\n" +
"\vTokensEntry\x12\x10\n" +
- "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" +
- "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xad\x03\n" +
+ "\x03key\x18\x01 \x01(\tR\x03key\x12(\n" +
+ "\x05value\x18\x02 \x01(\v2\x12.google.type.ColorR\x05value:\x028\x01\"\xad\x03\n" +
"\x18WorkspaceApprovalSetting\x12C\n" +
"\x05rules\x18\x01 \x03(\v2-.bytebase.store.WorkspaceApprovalSetting.RuleR\x05rules\x1a\xcb\x02\n" +
"\x04Rule\x12<\n" +
@@ -3093,9 +3095,10 @@ var file_store_setting_proto_goTypes = []any{
nil, // 42: bytebase.store.EnvironmentSetting.Environment.TagsEntry
(*EmailSetting_SMTPConfig)(nil), // 43: bytebase.store.EmailSetting.SMTPConfig
(*durationpb.Duration)(nil), // 44: google.protobuf.Duration
- (*ApprovalTemplate)(nil), // 45: bytebase.store.ApprovalTemplate
- (*expr.Expr)(nil), // 46: google.type.Expr
- (WebhookType)(0), // 47: bytebase.store.WebhookType
+ (*color.Color)(nil), // 45: google.type.Color
+ (*ApprovalTemplate)(nil), // 46: bytebase.store.ApprovalTemplate
+ (*expr.Expr)(nil), // 47: google.type.Expr
+ (WebhookType)(0), // 48: bytebase.store.WebhookType
}
var file_store_setting_proto_depIdxs = []int32{
44, // 0: bytebase.store.WorkspaceProfileSetting.refresh_token_duration:type_name -> google.protobuf.Duration
@@ -3122,30 +3125,33 @@ var file_store_setting_proto_depIdxs = []int32{
43, // 21: bytebase.store.EmailSetting.smtp:type_name -> bytebase.store.EmailSetting.SMTPConfig
21, // 22: bytebase.store.WorkspaceProfileSetting.Announcement.theme:type_name -> bytebase.store.WorkspaceProfileSetting.Announcement.AnnouncementTheme
44, // 23: bytebase.store.WorkspaceProfileSetting.PasswordRestriction.password_rotation:type_name -> google.protobuf.Duration
- 45, // 24: bytebase.store.WorkspaceApprovalSetting.Rule.template:type_name -> bytebase.store.ApprovalTemplate
- 46, // 25: bytebase.store.WorkspaceApprovalSetting.Rule.condition:type_name -> google.type.Expr
- 2, // 26: bytebase.store.WorkspaceApprovalSetting.Rule.source:type_name -> bytebase.store.WorkspaceApprovalSetting.Rule.Source
- 25, // 27: bytebase.store.DataClassificationSetting.DataClassificationConfig.levels:type_name -> bytebase.store.DataClassificationSetting.DataClassificationConfig.Level
- 27, // 28: bytebase.store.DataClassificationSetting.DataClassificationConfig.classification:type_name -> bytebase.store.DataClassificationSetting.DataClassificationConfig.ClassificationEntry
- 26, // 29: bytebase.store.DataClassificationSetting.DataClassificationConfig.ClassificationEntry.value:type_name -> bytebase.store.DataClassificationSetting.DataClassificationConfig.DataClassification
- 32, // 30: bytebase.store.Algorithm.RangeMask.slices:type_name -> bytebase.store.Algorithm.RangeMask.Slice
- 3, // 31: bytebase.store.Algorithm.InnerOuterMask.type:type_name -> bytebase.store.Algorithm.InnerOuterMask.MaskType
- 13, // 32: bytebase.store.SemanticTypeSetting.SemanticType.algorithm:type_name -> bytebase.store.Algorithm
- 47, // 33: bytebase.store.AppIMSetting.IMSetting.type:type_name -> bytebase.store.WebhookType
- 34, // 34: bytebase.store.AppIMSetting.IMSetting.slack:type_name -> bytebase.store.AppIMSetting.Slack
- 35, // 35: bytebase.store.AppIMSetting.IMSetting.feishu:type_name -> bytebase.store.AppIMSetting.Feishu
- 36, // 36: bytebase.store.AppIMSetting.IMSetting.wecom:type_name -> bytebase.store.AppIMSetting.Wecom
- 37, // 37: bytebase.store.AppIMSetting.IMSetting.lark:type_name -> bytebase.store.AppIMSetting.Lark
- 38, // 38: bytebase.store.AppIMSetting.IMSetting.dingtalk:type_name -> bytebase.store.AppIMSetting.DingTalk
- 39, // 39: bytebase.store.AppIMSetting.IMSetting.teams:type_name -> bytebase.store.AppIMSetting.Teams
- 42, // 40: bytebase.store.EnvironmentSetting.Environment.tags:type_name -> bytebase.store.EnvironmentSetting.Environment.TagsEntry
- 6, // 41: bytebase.store.EmailSetting.SMTPConfig.encryption:type_name -> bytebase.store.EmailSetting.SMTPConfig.Encryption
- 7, // 42: bytebase.store.EmailSetting.SMTPConfig.authentication:type_name -> bytebase.store.EmailSetting.SMTPConfig.Authentication
- 43, // [43:43] is the sub-list for method output_type
- 43, // [43:43] is the sub-list for method input_type
- 43, // [43:43] is the sub-list for extension type_name
- 43, // [43:43] is the sub-list for extension extendee
- 0, // [0:43] is the sub-list for field type_name
+ 45, // 24: bytebase.store.WorkspaceProfileSetting.Announcement.AnnouncementTheme.background:type_name -> google.type.Color
+ 45, // 25: bytebase.store.WorkspaceProfileSetting.Announcement.AnnouncementTheme.text:type_name -> google.type.Color
+ 45, // 26: bytebase.store.SQLEditorThemeSetting.TokensEntry.value:type_name -> google.type.Color
+ 46, // 27: bytebase.store.WorkspaceApprovalSetting.Rule.template:type_name -> bytebase.store.ApprovalTemplate
+ 47, // 28: bytebase.store.WorkspaceApprovalSetting.Rule.condition:type_name -> google.type.Expr
+ 2, // 29: bytebase.store.WorkspaceApprovalSetting.Rule.source:type_name -> bytebase.store.WorkspaceApprovalSetting.Rule.Source
+ 25, // 30: bytebase.store.DataClassificationSetting.DataClassificationConfig.levels:type_name -> bytebase.store.DataClassificationSetting.DataClassificationConfig.Level
+ 27, // 31: bytebase.store.DataClassificationSetting.DataClassificationConfig.classification:type_name -> bytebase.store.DataClassificationSetting.DataClassificationConfig.ClassificationEntry
+ 26, // 32: bytebase.store.DataClassificationSetting.DataClassificationConfig.ClassificationEntry.value:type_name -> bytebase.store.DataClassificationSetting.DataClassificationConfig.DataClassification
+ 32, // 33: bytebase.store.Algorithm.RangeMask.slices:type_name -> bytebase.store.Algorithm.RangeMask.Slice
+ 3, // 34: bytebase.store.Algorithm.InnerOuterMask.type:type_name -> bytebase.store.Algorithm.InnerOuterMask.MaskType
+ 13, // 35: bytebase.store.SemanticTypeSetting.SemanticType.algorithm:type_name -> bytebase.store.Algorithm
+ 48, // 36: bytebase.store.AppIMSetting.IMSetting.type:type_name -> bytebase.store.WebhookType
+ 34, // 37: bytebase.store.AppIMSetting.IMSetting.slack:type_name -> bytebase.store.AppIMSetting.Slack
+ 35, // 38: bytebase.store.AppIMSetting.IMSetting.feishu:type_name -> bytebase.store.AppIMSetting.Feishu
+ 36, // 39: bytebase.store.AppIMSetting.IMSetting.wecom:type_name -> bytebase.store.AppIMSetting.Wecom
+ 37, // 40: bytebase.store.AppIMSetting.IMSetting.lark:type_name -> bytebase.store.AppIMSetting.Lark
+ 38, // 41: bytebase.store.AppIMSetting.IMSetting.dingtalk:type_name -> bytebase.store.AppIMSetting.DingTalk
+ 39, // 42: bytebase.store.AppIMSetting.IMSetting.teams:type_name -> bytebase.store.AppIMSetting.Teams
+ 42, // 43: bytebase.store.EnvironmentSetting.Environment.tags:type_name -> bytebase.store.EnvironmentSetting.Environment.TagsEntry
+ 6, // 44: bytebase.store.EmailSetting.SMTPConfig.encryption:type_name -> bytebase.store.EmailSetting.SMTPConfig.Encryption
+ 7, // 45: bytebase.store.EmailSetting.SMTPConfig.authentication:type_name -> bytebase.store.EmailSetting.SMTPConfig.Authentication
+ 46, // [46:46] is the sub-list for method output_type
+ 46, // [46:46] is the sub-list for method input_type
+ 46, // [46:46] is the sub-list for extension type_name
+ 46, // [46:46] is the sub-list for extension extendee
+ 0, // [0:46] is the sub-list for field type_name
}
func init() { file_store_setting_proto_init() }
diff --git a/backend/generated-go/store/setting_equal.pb.go b/backend/generated-go/store/setting_equal.pb.go
index b9f5a93b0a..206052891a 100644
--- a/backend/generated-go/store/setting_equal.pb.go
+++ b/backend/generated-go/store/setting_equal.pb.go
@@ -4,6 +4,7 @@
package store
import (
+ color "google.golang.org/genproto/googleapis/type/color"
expr "google.golang.org/genproto/googleapis/type/expr"
proto "google.golang.org/protobuf/proto"
)
@@ -28,10 +29,14 @@ func (x *WorkspaceProfileSetting_Announcement_AnnouncementTheme) Equal(y *Worksp
if x == nil || y == nil {
return x == nil && y == nil
}
- if x.Background != y.Background {
+ if equal, ok := interface{}(x.Background).(interface{ Equal(*color.Color) bool }); !ok || !equal.Equal(y.Background) {
+ return false
+ } else if !proto.Equal(x.Background, y.Background) {
return false
}
- if x.Text != y.Text {
+ if equal, ok := interface{}(x.Text).(interface{ Equal(*color.Color) bool }); !ok || !equal.Equal(y.Text) {
+ return false
+ } else if !proto.Equal(x.Text, y.Text) {
return false
}
return true
@@ -195,7 +200,9 @@ func (x *SQLEditorThemeSetting) Equal(y *SQLEditorThemeSetting) bool {
if !ok {
return false
}
- if x.Tokens[k] != y.Tokens[k] {
+ if equal, ok := interface{}(x.Tokens[k]).(interface{ Equal(*color.Color) bool }); !ok || !equal.Equal(y.Tokens[k]) {
+ return false
+ } else if !proto.Equal(x.Tokens[k], y.Tokens[k]) {
return false
}
}
diff --git a/backend/generated-go/v1/setting_service.pb.go b/backend/generated-go/v1/setting_service.pb.go
index 132dcf8b6a..6c26c50bb6 100644
--- a/backend/generated-go/v1/setting_service.pb.go
+++ b/backend/generated-go/v1/setting_service.pb.go
@@ -8,6 +8,7 @@ package v1
import (
_ "google.golang.org/genproto/googleapis/api/annotations"
+ color "google.golang.org/genproto/googleapis/type/color"
expr "google.golang.org/genproto/googleapis/type/expr"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -1230,11 +1231,12 @@ func (x *WorkspaceProfileSetting) GetSqlEditorCustomTheme() *SQLEditorThemeSetti
}
type SQLEditorThemeSetting struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
- Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
- MonacoBase string `protobuf:"bytes,3,opt,name=monaco_base,json=monacoBase,proto3" json:"monaco_base,omitempty"`
- Tokens map[string]string `protobuf:"bytes,4,rep,name=tokens,proto3" json:"tokens,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+ state protoimpl.MessageState `protogen:"open.v1"`
+ Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+ Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+ MonacoBase string `protobuf:"bytes,3,opt,name=monaco_base,json=monacoBase,proto3" json:"monaco_base,omitempty"`
+ // CSS token colors.
+ Tokens map[string]*color.Color `protobuf:"bytes,4,rep,name=tokens,proto3" json:"tokens,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@@ -1290,7 +1292,7 @@ func (x *SQLEditorThemeSetting) GetMonacoBase() string {
return ""
}
-func (x *SQLEditorThemeSetting) GetTokens() map[string]string {
+func (x *SQLEditorThemeSetting) GetTokens() map[string]*color.Color {
if x != nil {
return x.Tokens
}
@@ -2523,8 +2525,8 @@ func (x *WorkspaceProfileSetting_PasswordRestriction) GetPasswordRotation() *dur
type Announcement_AnnouncementTheme struct {
state protoimpl.MessageState `protogen:"open.v1"`
- Background string `protobuf:"bytes,1,opt,name=background,proto3" json:"background,omitempty"` // "r g b"
- Text string `protobuf:"bytes,2,opt,name=text,proto3" json:"text,omitempty"` // "r g b"
+ Background *color.Color `protobuf:"bytes,1,opt,name=background,proto3" json:"background,omitempty"`
+ Text *color.Color `protobuf:"bytes,2,opt,name=text,proto3" json:"text,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@@ -2559,18 +2561,18 @@ func (*Announcement_AnnouncementTheme) Descriptor() ([]byte, []int) {
return file_v1_setting_service_proto_rawDescGZIP(), []int{10, 0}
}
-func (x *Announcement_AnnouncementTheme) GetBackground() string {
+func (x *Announcement_AnnouncementTheme) GetBackground() *color.Color {
if x != nil {
return x.Background
}
- return ""
+ return nil
}
-func (x *Announcement_AnnouncementTheme) GetText() string {
+func (x *Announcement_AnnouncementTheme) GetText() *color.Color {
if x != nil {
return x.Text
}
- return ""
+ return nil
}
type WorkspaceApprovalSetting_Rule struct {
@@ -3369,7 +3371,7 @@ var File_v1_setting_service_proto protoreflect.FileDescriptor
const file_v1_setting_service_proto_rawDesc = "" +
"\n" +
- "\x18v1/setting_service.proto\x12\vbytebase.v1\x1a\x1cgoogle/api/annotations.proto\x1a\x17google/api/client.proto\x1a\x1fgoogle/api/field_behavior.proto\x1a\x19google/api/resource.proto\x1a\x1egoogle/protobuf/duration.proto\x1a google/protobuf/field_mask.proto\x1a\x16google/type/expr.proto\x1a\x13v1/annotation.proto\x1a\x0fv1/common.proto\x1a\x16v1/issue_service.proto\"\x15\n" +
+ "\x18v1/setting_service.proto\x12\vbytebase.v1\x1a\x1cgoogle/api/annotations.proto\x1a\x17google/api/client.proto\x1a\x1fgoogle/api/field_behavior.proto\x1a\x19google/api/resource.proto\x1a\x1egoogle/protobuf/duration.proto\x1a google/protobuf/field_mask.proto\x1a\x17google/type/color.proto\x1a\x16google/type/expr.proto\x1a\x13v1/annotation.proto\x1a\x0fv1/common.proto\x1a\x16v1/issue_service.proto\"\x15\n" +
"\x13ListSettingsRequest\"H\n" +
"\x14ListSettingsResponse\x120\n" +
"\bsettings\x18\x01 \x03(\v2\x14.bytebase.v1.SettingR\bsettings\"E\n" +
@@ -3477,25 +3479,25 @@ const file_v1_setting_service_proto_rawDesc = "" +
"\x18require_uppercase_letter\x18\x04 \x01(\bR\x16requireUppercaseLetter\x12:\n" +
"\x19require_special_character\x18\x05 \x01(\bR\x17requireSpecialCharacter\x12Q\n" +
"&require_reset_password_for_first_login\x18\x06 \x01(\bR!requireResetPasswordForFirstLogin\x12F\n" +
- "\x11password_rotation\x18\a \x01(\v2\x19.google.protobuf.DurationR\x10passwordRotationJ\x04\b\x10\x10\x11\"\xdf\x01\n" +
+ "\x11password_rotation\x18\a \x01(\v2\x19.google.protobuf.DurationR\x10passwordRotationJ\x04\b\x10\x10\x11\"\xf3\x01\n" +
"\x15SQLEditorThemeSetting\x12\x0e\n" +
"\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n" +
"\x04name\x18\x02 \x01(\tR\x04name\x12\x1f\n" +
"\vmonaco_base\x18\x03 \x01(\tR\n" +
"monacoBase\x12F\n" +
- "\x06tokens\x18\x04 \x03(\v2..bytebase.v1.SQLEditorThemeSetting.TokensEntryR\x06tokens\x1a9\n" +
+ "\x06tokens\x18\x04 \x03(\v2..bytebase.v1.SQLEditorThemeSetting.TokensEntryR\x06tokens\x1aM\n" +
"\vTokensEntry\x12\x10\n" +
- "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" +
- "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xcf\x01\n" +
+ "\x03key\x18\x01 \x01(\tR\x03key\x12(\n" +
+ "\x05value\x18\x02 \x01(\v2\x12.google.type.ColorR\x05value:\x028\x01\"\xf7\x01\n" +
"\fAnnouncement\x12\x12\n" +
"\x04text\x18\x02 \x01(\tR\x04text\x12\x12\n" +
"\x04link\x18\x03 \x01(\tR\x04link\x12A\n" +
- "\x05theme\x18\x04 \x01(\v2+.bytebase.v1.Announcement.AnnouncementThemeR\x05theme\x1aG\n" +
- "\x11AnnouncementTheme\x12\x1e\n" +
+ "\x05theme\x18\x04 \x01(\v2+.bytebase.v1.Announcement.AnnouncementThemeR\x05theme\x1ao\n" +
+ "\x11AnnouncementTheme\x122\n" +
"\n" +
- "background\x18\x01 \x01(\tR\n" +
- "background\x12\x12\n" +
- "\x04text\x18\x02 \x01(\tR\x04textJ\x04\b\x01\x10\x02R\x05level\"\xa2\x03\n" +
+ "background\x18\x01 \x01(\v2\x12.google.type.ColorR\n" +
+ "background\x12&\n" +
+ "\x04text\x18\x02 \x01(\v2\x12.google.type.ColorR\x04textJ\x04\b\x01\x10\x02R\x05level\"\xa2\x03\n" +
"\x18WorkspaceApprovalSetting\x12@\n" +
"\x05rules\x18\x01 \x03(\v2*.bytebase.v1.WorkspaceApprovalSetting.RuleR\x05rules\x1a\xc3\x02\n" +
"\x04Rule\x129\n" +
@@ -3709,8 +3711,9 @@ var file_v1_setting_service_proto_goTypes = []any{
(*fieldmaskpb.FieldMask)(nil), // 52: google.protobuf.FieldMask
(*durationpb.Duration)(nil), // 53: google.protobuf.Duration
(WebhookType)(0), // 54: bytebase.v1.WebhookType
- (*ApprovalTemplate)(nil), // 55: bytebase.v1.ApprovalTemplate
- (*expr.Expr)(nil), // 56: google.type.Expr
+ (*color.Color)(nil), // 55: google.type.Color
+ (*ApprovalTemplate)(nil), // 56: bytebase.v1.ApprovalTemplate
+ (*expr.Expr)(nil), // 57: google.type.Expr
}
var file_v1_setting_service_proto_depIdxs = []int32{
13, // 0: bytebase.v1.ListSettingsResponse.settings:type_name -> bytebase.v1.Setting
@@ -3758,31 +3761,34 @@ var file_v1_setting_service_proto_depIdxs = []int32{
32, // 42: bytebase.v1.AppIMSetting.IMSetting.dingtalk:type_name -> bytebase.v1.AppIMSetting.DingTalk
33, // 43: bytebase.v1.AppIMSetting.IMSetting.teams:type_name -> bytebase.v1.AppIMSetting.Teams
53, // 44: bytebase.v1.WorkspaceProfileSetting.PasswordRestriction.password_rotation:type_name -> google.protobuf.Duration
- 55, // 45: bytebase.v1.WorkspaceApprovalSetting.Rule.template:type_name -> bytebase.v1.ApprovalTemplate
- 56, // 46: bytebase.v1.WorkspaceApprovalSetting.Rule.condition:type_name -> google.type.Expr
- 2, // 47: bytebase.v1.WorkspaceApprovalSetting.Rule.source:type_name -> bytebase.v1.WorkspaceApprovalSetting.Rule.Source
- 40, // 48: bytebase.v1.DataClassificationSetting.DataClassificationConfig.levels:type_name -> bytebase.v1.DataClassificationSetting.DataClassificationConfig.Level
- 42, // 49: bytebase.v1.DataClassificationSetting.DataClassificationConfig.classification:type_name -> bytebase.v1.DataClassificationSetting.DataClassificationConfig.ClassificationEntry
- 41, // 50: bytebase.v1.DataClassificationSetting.DataClassificationConfig.ClassificationEntry.value:type_name -> bytebase.v1.DataClassificationSetting.DataClassificationConfig.DataClassification
- 22, // 51: bytebase.v1.SemanticTypeSetting.SemanticType.algorithm:type_name -> bytebase.v1.Algorithm
- 48, // 52: bytebase.v1.Algorithm.RangeMask.slices:type_name -> bytebase.v1.Algorithm.RangeMask.Slice
- 3, // 53: bytebase.v1.Algorithm.InnerOuterMask.type:type_name -> bytebase.v1.Algorithm.InnerOuterMask.MaskType
- 50, // 54: bytebase.v1.EnvironmentSetting.Environment.tags:type_name -> bytebase.v1.EnvironmentSetting.Environment.TagsEntry
- 6, // 55: bytebase.v1.EmailSetting.SMTPConfig.encryption:type_name -> bytebase.v1.EmailSetting.SMTPConfig.Encryption
- 7, // 56: bytebase.v1.EmailSetting.SMTPConfig.authentication:type_name -> bytebase.v1.EmailSetting.SMTPConfig.Authentication
- 8, // 57: bytebase.v1.SettingService.ListSettings:input_type -> bytebase.v1.ListSettingsRequest
- 10, // 58: bytebase.v1.SettingService.GetSetting:input_type -> bytebase.v1.GetSettingRequest
- 12, // 59: bytebase.v1.SettingService.UpdateSetting:input_type -> bytebase.v1.UpdateSettingRequest
- 26, // 60: bytebase.v1.SettingService.TestEmailSetting:input_type -> bytebase.v1.TestEmailSettingRequest
- 9, // 61: bytebase.v1.SettingService.ListSettings:output_type -> bytebase.v1.ListSettingsResponse
- 13, // 62: bytebase.v1.SettingService.GetSetting:output_type -> bytebase.v1.Setting
- 13, // 63: bytebase.v1.SettingService.UpdateSetting:output_type -> bytebase.v1.Setting
- 27, // 64: bytebase.v1.SettingService.TestEmailSetting:output_type -> bytebase.v1.TestEmailSettingResponse
- 61, // [61:65] is the sub-list for method output_type
- 57, // [57:61] is the sub-list for method input_type
- 57, // [57:57] is the sub-list for extension type_name
- 57, // [57:57] is the sub-list for extension extendee
- 0, // [0:57] is the sub-list for field type_name
+ 55, // 45: bytebase.v1.SQLEditorThemeSetting.TokensEntry.value:type_name -> google.type.Color
+ 55, // 46: bytebase.v1.Announcement.AnnouncementTheme.background:type_name -> google.type.Color
+ 55, // 47: bytebase.v1.Announcement.AnnouncementTheme.text:type_name -> google.type.Color
+ 56, // 48: bytebase.v1.WorkspaceApprovalSetting.Rule.template:type_name -> bytebase.v1.ApprovalTemplate
+ 57, // 49: bytebase.v1.WorkspaceApprovalSetting.Rule.condition:type_name -> google.type.Expr
+ 2, // 50: bytebase.v1.WorkspaceApprovalSetting.Rule.source:type_name -> bytebase.v1.WorkspaceApprovalSetting.Rule.Source
+ 40, // 51: bytebase.v1.DataClassificationSetting.DataClassificationConfig.levels:type_name -> bytebase.v1.DataClassificationSetting.DataClassificationConfig.Level
+ 42, // 52: bytebase.v1.DataClassificationSetting.DataClassificationConfig.classification:type_name -> bytebase.v1.DataClassificationSetting.DataClassificationConfig.ClassificationEntry
+ 41, // 53: bytebase.v1.DataClassificationSetting.DataClassificationConfig.ClassificationEntry.value:type_name -> bytebase.v1.DataClassificationSetting.DataClassificationConfig.DataClassification
+ 22, // 54: bytebase.v1.SemanticTypeSetting.SemanticType.algorithm:type_name -> bytebase.v1.Algorithm
+ 48, // 55: bytebase.v1.Algorithm.RangeMask.slices:type_name -> bytebase.v1.Algorithm.RangeMask.Slice
+ 3, // 56: bytebase.v1.Algorithm.InnerOuterMask.type:type_name -> bytebase.v1.Algorithm.InnerOuterMask.MaskType
+ 50, // 57: bytebase.v1.EnvironmentSetting.Environment.tags:type_name -> bytebase.v1.EnvironmentSetting.Environment.TagsEntry
+ 6, // 58: bytebase.v1.EmailSetting.SMTPConfig.encryption:type_name -> bytebase.v1.EmailSetting.SMTPConfig.Encryption
+ 7, // 59: bytebase.v1.EmailSetting.SMTPConfig.authentication:type_name -> bytebase.v1.EmailSetting.SMTPConfig.Authentication
+ 8, // 60: bytebase.v1.SettingService.ListSettings:input_type -> bytebase.v1.ListSettingsRequest
+ 10, // 61: bytebase.v1.SettingService.GetSetting:input_type -> bytebase.v1.GetSettingRequest
+ 12, // 62: bytebase.v1.SettingService.UpdateSetting:input_type -> bytebase.v1.UpdateSettingRequest
+ 26, // 63: bytebase.v1.SettingService.TestEmailSetting:input_type -> bytebase.v1.TestEmailSettingRequest
+ 9, // 64: bytebase.v1.SettingService.ListSettings:output_type -> bytebase.v1.ListSettingsResponse
+ 13, // 65: bytebase.v1.SettingService.GetSetting:output_type -> bytebase.v1.Setting
+ 13, // 66: bytebase.v1.SettingService.UpdateSetting:output_type -> bytebase.v1.Setting
+ 27, // 67: bytebase.v1.SettingService.TestEmailSetting:output_type -> bytebase.v1.TestEmailSettingResponse
+ 64, // [64:68] is the sub-list for method output_type
+ 60, // [60:64] is the sub-list for method input_type
+ 60, // [60:60] is the sub-list for extension type_name
+ 60, // [60:60] is the sub-list for extension extendee
+ 0, // [0:60] is the sub-list for field type_name
}
func init() { file_v1_setting_service_proto_init() }
diff --git a/backend/generated-go/v1/setting_service_equal.pb.go b/backend/generated-go/v1/setting_service_equal.pb.go
index 6ca879b765..69cf7c29fd 100644
--- a/backend/generated-go/v1/setting_service_equal.pb.go
+++ b/backend/generated-go/v1/setting_service_equal.pb.go
@@ -4,6 +4,7 @@
package v1
import (
+ color "google.golang.org/genproto/googleapis/type/color"
expr "google.golang.org/genproto/googleapis/type/expr"
proto "google.golang.org/protobuf/proto"
fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
@@ -429,7 +430,9 @@ func (x *SQLEditorThemeSetting) Equal(y *SQLEditorThemeSetting) bool {
if !ok {
return false
}
- if x.Tokens[k] != y.Tokens[k] {
+ if equal, ok := interface{}(x.Tokens[k]).(interface{ Equal(*color.Color) bool }); !ok || !equal.Equal(y.Tokens[k]) {
+ return false
+ } else if !proto.Equal(x.Tokens[k], y.Tokens[k]) {
return false
}
}
@@ -443,10 +446,14 @@ func (x *Announcement_AnnouncementTheme) Equal(y *Announcement_AnnouncementTheme
if x == nil || y == nil {
return x == nil && y == nil
}
- if x.Background != y.Background {
+ if equal, ok := interface{}(x.Background).(interface{ Equal(*color.Color) bool }); !ok || !equal.Equal(y.Background) {
+ return false
+ } else if !proto.Equal(x.Background, y.Background) {
return false
}
- if x.Text != y.Text {
+ if equal, ok := interface{}(x.Text).(interface{ Equal(*color.Color) bool }); !ok || !equal.Equal(y.Text) {
+ return false
+ } else if !proto.Equal(x.Text, y.Text) {
return false
}
return true
diff --git a/backend/migrator/migration/3.20/0000##migrate_announcement_level_to_theme.sql b/backend/migrator/migration/3.20/0000##migrate_announcement_level_to_theme.sql
index aa123539aa..f4ff243bdb 100644
--- a/backend/migrator/migration/3.20/0000##migrate_announcement_level_to_theme.sql
+++ b/backend/migrator/migration/3.20/0000##migrate_announcement_level_to_theme.sql
@@ -1,5 +1,5 @@
-- Convert the deprecated announcement `level` enum into the new `theme` colors
--- (background/text "r g b"), then drop the obsolete `level` key. Levels map to
+-- (background/text google.type.Color JSON), then drop the obsolete `level` key. Levels map to
-- the previous banner colors: INFO=--color-info, WARNING=--color-warning,
-- CRITICAL=--color-error; text was always white.
--
@@ -16,10 +16,19 @@ SET value = jsonb_set(
'{announcement,theme}',
CASE
WHEN value->'announcement'->>'level' IN ('WARNING', '2')
- THEN jsonb_build_object('background', '245 158 11', 'text', '255 255 255')
+ THEN jsonb_build_object(
+ 'background', jsonb_build_object('red', 0.960784, 'green', 0.619608, 'blue', 0.043137),
+ 'text', jsonb_build_object('red', 1, 'green', 1, 'blue', 1)
+ )
WHEN value->'announcement'->>'level' IN ('CRITICAL', '3')
- THEN jsonb_build_object('background', '220 38 38', 'text', '255 255 255')
- ELSE jsonb_build_object('background', '37 99 235', 'text', '255 255 255')
+ THEN jsonb_build_object(
+ 'background', jsonb_build_object('red', 0.862745, 'green', 0.14902, 'blue', 0.14902),
+ 'text', jsonb_build_object('red', 1, 'green', 1, 'blue', 1)
+ )
+ ELSE jsonb_build_object(
+ 'background', jsonb_build_object('red', 0.145098, 'green', 0.388235, 'blue', 0.921569),
+ 'text', jsonb_build_object('red', 1, 'green', 1, 'blue', 1)
+ )
END,
true
)
diff --git a/frontend/src/react/components/AnnouncementBanner.tsx b/frontend/src/react/components/AnnouncementBanner.tsx
index 6bed1adbe1..2ea2be484f 100644
--- a/frontend/src/react/components/AnnouncementBanner.tsx
+++ b/frontend/src/react/components/AnnouncementBanner.tsx
@@ -6,9 +6,9 @@ interface AnnouncementBannerProps {
text: string;
/** When set, an arrow affordance is shown next to the text. */
link?: string;
- /** Background color as an `"r g b"` triple. */
+ /** Background color as a #rrggbb hex color. */
background: string;
- /** Text color as an `"r g b"` triple. */
+ /** Text color as a #rrggbb hex color. */
textColor: string;
/**
* When true (default), the link navigates (`<a target="_blank">`). Pass
@@ -65,8 +65,8 @@ export function AnnouncementBanner({
className
)}
style={{
- backgroundColor: `rgb(${background})`,
- color: `rgb(${textColor})`,
+ backgroundColor: background,
+ color: textColor,
}}
>
{content}
diff --git a/frontend/src/react/components/BannersWrapper.test.tsx b/frontend/src/react/components/BannersWrapper.test.tsx
index 8eea5f4f57..86f77ad8e1 100644
--- a/frontend/src/react/components/BannersWrapper.test.tsx
+++ b/frontend/src/react/components/BannersWrapper.test.tsx
@@ -4,6 +4,7 @@ import { createRoot } from "react-dom/client";
import { beforeEach, describe, expect, test, vi } from "vitest";
import type { WorkspaceProfileSetting } from "@/types/proto-es/v1/setting_service_pb";
import { PlanType } from "@/types/proto-es/v1/subscription_service_pb";
+import { hexToColor } from "@/utils";
(
globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }
@@ -87,6 +88,21 @@ vi.mock("@/react/stores/app", () => ({
}));
vi.mock("@/utils", () => ({
+ colorToHex: (color: { red: number; green: number; blue: number }) => {
+ const channelToHex = (value: number) =>
+ Math.round(value * 255)
+ .toString(16)
+ .padStart(2, "0");
+ return `#${channelToHex(color.red)}${channelToHex(color.green)}${channelToHex(color.blue)}`;
+ },
+ hexToColor: (hex: string) => {
+ const value = hex.replace(/^#/, "");
+ return {
+ red: Number.parseInt(value.slice(0, 2), 16) / 255,
+ green: Number.parseInt(value.slice(2, 4), 16) / 255,
+ blue: Number.parseInt(value.slice(4, 6), 16) / 255,
+ };
+ },
isDev: mocks.isDev,
urlfy: mocks.urlfy,
}));
@@ -211,7 +227,10 @@ describe("BannersWrapper", () => {
mocks.usePlanFeature.mockReturnValue(true);
mocks.useWorkspaceProfile.mockReturnValue({
announcement: {
- theme: { background: "0 83 226", text: "255 255 255" },
+ theme: {
+ background: hexToColor("#0053e2"),
+ text: hexToColor("#ffffff"),
+ },
link: "example.com/path",
text: "Maintenance window",
},
@@ -242,7 +261,7 @@ describe("BannersWrapper", () => {
const banner = Array.from(container.querySelectorAll("div")).find((el) =>
el.textContent?.includes("Untheméd banner")
);
- // info preset background: "37 99 235", white text.
+ // info preset background: "#2563eb", white text.
expect(banner?.style.backgroundColor).toBe("rgb(37, 99, 235)");
expect(banner?.style.color).toBe("rgb(255, 255, 255)");
unmount();
diff --git a/frontend/src/react/components/announcement-theme.ts b/frontend/src/react/components/announcement-theme.ts
index acfdbc0b64..6026587602 100644
--- a/frontend/src/react/components/announcement-theme.ts
+++ b/frontend/src/react/components/announcement-theme.ts
@@ -1,5 +1,5 @@
import type { Announcement } from "@/types/proto-es/v1/setting_service_pb";
-import { hexToRgb, rgbToHex } from "@/utils/css";
+import { colorToHex } from "@/utils";
export interface AnnouncementTheme {
background: string;
@@ -10,16 +10,16 @@ export type AnnouncementPresetKey = "info" | "warning" | "critical";
/**
* Built-in presets are a frontend-only concept that seed the two banner colors.
- * Each value is an `"r g b"` triple. The backgrounds match
- * `--color-info` / `--color-warning` / `--color-error`, all with white text.
+ * Each value is a #rrggbb hex color. The backgrounds match `--color-info` /
+ * `--color-warning` / `--color-error`, all with white text.
*/
export const ANNOUNCEMENT_PRESETS: Record<
AnnouncementPresetKey,
AnnouncementTheme
> = {
- info: { background: "37 99 235", text: "255 255 255" },
- warning: { background: "245 158 11", text: "255 255 255" },
- critical: { background: "220 38 38", text: "255 255 255" },
+ info: { background: "#2563eb", text: "#ffffff" },
+ warning: { background: "#f59e0b", text: "#ffffff" },
+ critical: { background: "#dc2626", text: "#ffffff" },
};
export const ANNOUNCEMENT_PRESET_KEYS: AnnouncementPresetKey[] = [
@@ -38,8 +38,10 @@ export function resolveAnnouncementTheme(
): AnnouncementTheme {
if (announcement?.theme?.background) {
return {
- background: announcement.theme.background,
- text: announcement.theme.text,
+ background: colorToHex(announcement.theme.background),
+ text: announcement.theme.text
+ ? colorToHex(announcement.theme.text)
+ : ANNOUNCEMENT_PRESETS.info.text,
};
}
return ANNOUNCEMENT_PRESETS.info;
@@ -61,15 +63,3 @@ export function matchPresetKey(
}
return "custom";
}
-
-/** Converts an `"r g b"` triple to a `#rrggbb` hex string for color inputs. */
-export function tripleToHex(triple: string): string {
- const parts = triple.trim().split(/\s+/).map(Number);
- const [r, g, b] = [parts[0] ?? 0, parts[1] ?? 0, parts[2] ?? 0];
- return rgbToHex(r, g, b);
-}
-
-/** Converts a `#rrggbb` hex string to an `"r g b"` triple for storage. */
-export function hexToTriple(hex: string): string {
- return hexToRgb(hex).join(" ");
-}
diff --git a/frontend/src/react/components/sql-editor/ResultView/VirtualDataTable.tsx b/frontend/src/react/components/sql-editor/ResultView/VirtualDataTable.tsx
index 350208020b..5c2542d8c1 100644
--- a/frontend/src/react/components/sql-editor/ResultView/VirtualDataTable.tsx
+++ b/frontend/src/react/components/sql-editor/ResultView/VirtualDataTable.tsx
@@ -278,6 +278,7 @@ export const VirtualDataTable = forwardRef<
{/* Index header */}
<HeaderCell
width={indexColWidth}
+ borderRight
onResizeStart={(e) => tableResize.onResizeStart(0, e)}
>
<div
@@ -498,7 +499,7 @@ function HeaderCell({
onClick={onClick}
className={cn(
"group relative shrink-0 border-block-border",
- borderRight ? "border-x" : "border-l",
+ borderRight && "border-r",
className
)}
style={{ width: `${width}px` }}
diff --git a/frontend/src/react/components/sql-editor/theme/SQLEditorThemeScope.test.tsx b/frontend/src/react/components/sql-editor/theme/SQLEditorThemeScope.test.tsx
index 0ccbe03591..80e8fc1861 100644
--- a/frontend/src/react/components/sql-editor/theme/SQLEditorThemeScope.test.tsx
+++ b/frontend/src/react/components/sql-editor/theme/SQLEditorThemeScope.test.tsx
@@ -16,9 +16,8 @@ describe("SQLEditorThemeScope", () => {
</SQLEditorThemeScope>
);
const el = container.firstChild as HTMLElement;
- expect(el.style.getPropertyValue("--color-background")).toBe(
- PRESET_BY_ID.dark.tokens["--color-background"]
- );
+ expect(PRESET_BY_ID.dark.tokens["--color-background"]).toBe("#1e1e1e");
+ expect(el.style.getPropertyValue("--color-background")).toBe("30 30 30");
});
test("provides the theme via context", () => {
diff --git a/frontend/src/react/components/sql-editor/theme/derive.test.ts b/frontend/src/react/components/sql-editor/theme/derive.test.ts
index cd2eabb5d9..3d9a0bd2ed 100644
--- a/frontend/src/react/components/sql-editor/theme/derive.test.ts
+++ b/frontend/src/react/components/sql-editor/theme/derive.test.ts
@@ -20,7 +20,7 @@ import {
// Minimal complete fixture (token values arbitrary but every key present).
const fixture = (over: Partial<SQLEditorTheme> = {}): SQLEditorTheme => {
const tokens = Object.fromEntries(
- SQL_EDITOR_THEME_TOKENS.map((k) => [k, "1 2 3"])
+ SQL_EDITOR_THEME_TOKENS.map((k) => [k, "#010203"])
) as SQLEditorTheme["tokens"];
return {
id: "fixture",
@@ -54,7 +54,7 @@ const lightThemed = (over: Partial<SQLEditorTheme> = {}) =>
...over,
tokens: {
...fixture().tokens,
- "--color-background": "255 255 255",
+ "--color-background": "#ffffff",
} as SQLEditorTheme["tokens"],
});
const darkThemed = (over: Partial<SQLEditorTheme> = {}) =>
@@ -62,7 +62,7 @@ const darkThemed = (over: Partial<SQLEditorTheme> = {}) =>
...over,
tokens: {
...fixture().tokens,
- "--color-background": "30 30 30",
+ "--color-background": "#1e1e1e",
} as SQLEditorTheme["tokens"],
});
@@ -93,6 +93,15 @@ describe("validateTheme", () => {
delete bad.tokens["--color-accent"];
expect(() => validateTheme(bad)).toThrow(/--color-accent/);
});
+ test("throws when a chrome token is not a hex color", () => {
+ const bad = fixture({
+ tokens: {
+ ...fixture().tokens,
+ "--color-accent": "1 2 3",
+ } as SQLEditorTheme["tokens"],
+ });
+ expect(() => validateTheme(bad)).toThrow(/--color-accent/);
+ });
});
const lightAnchors: ThemeAnchors = {
@@ -117,16 +126,16 @@ describe("deriveThemeFromAnchors", () => {
});
test("anchors map to direct tokens", () => {
const t = deriveThemeFromAnchors(lightAnchors, "B");
- expect(t.tokens["--color-background"]).toBe("255 255 255");
- expect(t.tokens["--color-main"]).toBe("24 24 27");
- expect(t.tokens["--color-accent"]).toBe("79 70 229");
- expect(t.tokens["--color-block-border"]).toBe("229 231 235");
+ expect(t.tokens["--color-background"]).toBe("#ffffff");
+ expect(t.tokens["--color-main"]).toBe("#18181b");
+ expect(t.tokens["--color-accent"]).toBe("#4f46e5");
+ expect(t.tokens["--color-block-border"]).toBe("#e5e7eb");
});
test("surface is derived from the background (not an anchor)", () => {
// white bg nudged 6% toward near-black text → a light gray.
expect(
deriveThemeFromAnchors(lightAnchors, "B").tokens["--color-control-bg"]
- ).toBe("241 241 241");
+ ).toBe("#f1f1f1");
});
test("monacoBase default by luminance", () => {
expect(deriveThemeFromAnchors(lightAnchors, "L").monacoBase).toBe(
diff --git a/frontend/src/react/components/sql-editor/theme/derive.ts b/frontend/src/react/components/sql-editor/theme/derive.ts
index d4b621a323..cd878f24a1 100644
--- a/frontend/src/react/components/sql-editor/theme/derive.ts
+++ b/frontend/src/react/components/sql-editor/theme/derive.ts
@@ -17,7 +17,7 @@ export function themeToCssVars(
): CSSProperties & Record<string, string> {
const vars: Record<string, string> = {};
for (const token of SQL_EDITOR_THEME_TOKENS) {
- vars[token] = tokens[token];
+ vars[token] = hexToRgbString(tokens[token]);
}
return vars as CSSProperties & Record<string, string>;
}
@@ -34,7 +34,7 @@ export function monacoThemeName(theme: SQLEditorTheme): string {
/** Whether the theme reads as dark (by its chrome background luminance). */
export function isDarkTheme(theme: SQLEditorTheme): boolean {
- return luminance(fromStr(theme.tokens["--color-background"])) < 0.5;
+ return luminance(hexToRgb(theme.tokens["--color-background"])) < 0.5;
}
/**
@@ -59,7 +59,8 @@ export function themeColorScheme(theme: SQLEditorTheme): "dark" | "light" {
/** Throws if any chrome token is missing. */
export function validateTheme(theme: SQLEditorTheme): void {
for (const token of SQL_EDITOR_THEME_TOKENS) {
- if (typeof theme.tokens[token] !== "string") {
+ const value = theme.tokens[token];
+ if (typeof value !== "string" || !isHexColor(value)) {
throw new TypeError(`theme "${theme.id}" missing chrome token ${token}`);
}
}
@@ -84,29 +85,31 @@ export interface ThemeAnchors {
// the accent (the least-semantic "brand" status) so info surfaces match the
// theme instead of clashing with a fixed blue.
const FIXED_TOKEN_VALUES: Record<string, string> = {
- "--color-warning": "245 158 11",
- "--color-warning-hover": "180 83 9",
- "--color-error": "220 38 38",
- "--color-error-hover": "185 28 28",
- "--color-success": "22 163 74",
- "--color-success-hover": "21 128 61",
- "--color-matrix-green": "0 204 0",
- "--color-matrix-green-hover": "136 255 136",
+ "--color-warning": "#f59e0b",
+ "--color-warning-hover": "#b45309",
+ "--color-error": "#dc2626",
+ "--color-error-hover": "#b91c1c",
+ "--color-success": "#16a34a",
+ "--color-success-hover": "#15803d",
+ "--color-matrix-green": "#00cc00",
+ "--color-matrix-green-hover": "#88ff88",
};
type RGB3 = [number, number, number];
+const isHexColor = (value: string): boolean => /^#[\da-fA-F]{6}$/.test(value);
const hexToRgb = (h: string): RGB3 => {
const x = h.replace("#", "");
return [0, 2, 4].map((i) => Number.parseInt(x.slice(i, i + 2), 16)) as RGB3;
};
-const toStr = (c: RGB3): string =>
- c.map((n) => Math.max(0, Math.min(255, Math.round(n)))).join(" ");
-const fromStr = (s: string): RGB3 => s.split(" ").map(Number) as RGB3;
-const toHex = (s: string): string =>
+const normalizeRgb = (c: RGB3): RGB3 =>
+ c.map((n) => Math.max(0, Math.min(255, Math.round(n)))) as RGB3;
+const toHex = (c: RGB3): string =>
"#" +
- fromStr(s)
+ normalizeRgb(c)
.map((n) => n.toString(16).padStart(2, "0"))
.join("");
+const hexToRgbString = (h: string): string =>
+ normalizeRgb(hexToRgb(h)).join(" ");
const mix = (a: RGB3, b: RGB3, t: number): RGB3 =>
a.map((v, i) => v + (b[i] - v) * t) as RGB3;
const luminance = ([r, g, b]: RGB3): number =>
@@ -136,39 +139,39 @@ export function deriveThemeFromAnchors(
// Elevated surface (panels/headers/hover) — the background nudged toward the
// text. Derived (not an anchor) so the admin only picks 4 colors.
const surface = elevate(bg, 0.06);
- const accentRgb = toStr(accent);
- const accentHover = toStr(dark ? elevate(accent, 0.15) : recede(accent, 0.2));
+ const accentHex = toHex(accent);
+ const accentHover = toHex(dark ? elevate(accent, 0.15) : recede(accent, 0.2));
const tokens: Record<string, string> = {
- "--color-background": toStr(bg),
- "--color-dark-bg": toStr(bg),
- "--color-control-bg": toStr(surface),
- "--color-control-bg-hover": toStr(elevate(surface, 0.06)),
- "--color-control": toStr(text),
- "--color-control-hover": toStr(recede(text, 0.15)),
- "--color-control-light": toStr(recede(text, 0.3)),
- "--color-control-light-hover": toStr(recede(text, 0.15)),
- "--color-control-placeholder": toStr(recede(text, 0.5)),
- "--color-control-border": toStr(border),
- "--color-block-border": toStr(border),
- "--color-link-hover": toStr(border),
- "--color-accent": accentRgb,
+ "--color-background": toHex(bg),
+ "--color-dark-bg": toHex(bg),
+ "--color-control-bg": toHex(surface),
+ "--color-control-bg-hover": toHex(elevate(surface, 0.06)),
+ "--color-control": toHex(text),
+ "--color-control-hover": toHex(recede(text, 0.15)),
+ "--color-control-light": toHex(recede(text, 0.3)),
+ "--color-control-light-hover": toHex(recede(text, 0.15)),
+ "--color-control-placeholder": toHex(recede(text, 0.5)),
+ "--color-control-border": toHex(border),
+ "--color-block-border": toHex(border),
+ "--color-link-hover": toHex(border),
+ "--color-accent": accentHex,
"--color-accent-hover": accentHover,
- "--color-accent-disabled": toStr(recede(accent, 0.5)),
+ "--color-accent-disabled": toHex(recede(accent, 0.5)),
// On-accent text (e.g. the Run button label): use whichever of the theme's
// Text / Background anchors contrasts better with the accent — so it follows
// the theme's own colors while staying legible on the accent fill.
"--color-accent-text":
Math.abs(luminance(bg) - luminance(accent)) >=
Math.abs(luminance(text) - luminance(accent))
- ? toStr(bg)
- : toStr(text),
+ ? toHex(bg)
+ : toHex(text),
// Info mirrors the brand accent (warning/error/success stay semantic).
- "--color-info": accentRgb,
+ "--color-info": accentHex,
"--color-info-hover": accentHover,
- "--color-main": toStr(text),
- "--color-main-hover": toStr(recede(text, 0.2)),
- "--color-main-text": luminance(text) < 0.5 ? "255 255 255" : "24 24 27",
+ "--color-main": toHex(text),
+ "--color-main-hover": toHex(recede(text, 0.2)),
+ "--color-main-text": luminance(text) < 0.5 ? "#ffffff" : "#18181b",
};
Object.assign(tokens, FIXED_TOKEN_VALUES);
@@ -187,9 +190,9 @@ export function deriveThemeFromAnchors(
/** Inverse of {@link deriveThemeFromAnchors}: recover the 4 picked anchors. */
export function themeToAnchors(theme: SQLEditorTheme): ThemeAnchors {
return {
- background: toHex(theme.tokens["--color-background"]),
- text: toHex(theme.tokens["--color-main"]),
- accent: toHex(theme.tokens["--color-accent"]),
- border: toHex(theme.tokens["--color-block-border"]),
+ background: theme.tokens["--color-background"],
+ text: theme.tokens["--color-main"],
+ accent: theme.tokens["--color-accent"],
+ border: theme.tokens["--color-block-border"],
};
}
diff --git a/frontend/src/react/components/sql-editor/theme/presets/dark.ts b/frontend/src/react/components/sql-editor/theme/presets/dark.ts
index 7e5fac66e3..b569eeec59 100644
--- a/frontend/src/react/components/sql-editor/theme/presets/dark.ts
+++ b/frontend/src/react/components/sql-editor/theme/presets/dark.ts
@@ -5,34 +5,34 @@ export const dark: SQLEditorTheme = {
name: "Default Dark",
monacoBase: DEFAULT_DARK_EDITOR_THEME,
tokens: {
- "--color-control": "229 231 235",
- "--color-control-hover": "243 244 246",
- "--color-control-light": "209 213 219",
- "--color-control-light-hover": "229 231 235",
- "--color-control-bg": "55 65 81",
- "--color-control-bg-hover": "75 85 99",
- "--color-control-placeholder": "156 163 175",
- "--color-control-border": "82 82 91",
- "--color-accent": "99 102 241",
- "--color-accent-hover": "129 140 248",
- "--color-accent-disabled": "67 56 202",
- "--color-accent-text": "255 255 255",
- "--color-main": "244 244 245",
- "--color-main-hover": "212 212 216",
- "--color-main-text": "24 24 27",
- "--color-background": "30 30 30",
- "--color-block-border": "63 63 70",
- "--color-link-hover": "63 63 70",
- "--color-info": "96 165 250",
- "--color-info-hover": "147 197 253",
- "--color-warning": "251 191 36",
- "--color-warning-hover": "253 224 71",
- "--color-error": "248 113 113",
- "--color-error-hover": "252 165 165",
- "--color-success": "74 222 128",
- "--color-success-hover": "134 239 172",
- "--color-matrix-green": "0 204 0",
- "--color-matrix-green-hover": "136 255 136",
- "--color-dark-bg": "30 30 30",
+ "--color-control": "#e5e7eb",
+ "--color-control-hover": "#f3f4f6",
+ "--color-control-light": "#d1d5db",
+ "--color-control-light-hover": "#e5e7eb",
+ "--color-control-bg": "#374151",
+ "--color-control-bg-hover": "#4b5563",
+ "--color-control-placeholder": "#9ca3af",
+ "--color-control-border": "#52525b",
+ "--color-accent": "#6366f1",
+ "--color-accent-hover": "#818cf8",
+ "--color-accent-disabled": "#4338ca",
+ "--color-accent-text": "#ffffff",
+ "--color-main": "#f4f4f5",
+ "--color-main-hover": "#d4d4d8",
+ "--color-main-text": "#18181b",
+ "--color-background": "#1e1e1e",
+ "--color-block-border": "#3f3f46",
+ "--color-link-hover": "#3f3f46",
+ "--color-info": "#60a5fa",
+ "--color-info-hover": "#93c5fd",
+ "--color-warning": "#fbbf24",
+ "--color-warning-hover": "#fde047",
+ "--color-error": "#f87171",
+ "--color-error-hover": "#fca5a5",
+ "--color-success": "#4ade80",
+ "--color-success-hover": "#86efac",
+ "--color-matrix-green": "#00cc00",
+ "--color-matrix-green-hover": "#88ff88",
+ "--color-dark-bg": "#1e1e1e",
},
};
diff --git a/frontend/src/react/components/sql-editor/theme/presets/light.ts b/frontend/src/react/components/sql-editor/theme/presets/light.ts
index 08ae17147f..5cee93b6c0 100644
--- a/frontend/src/react/components/sql-editor/theme/presets/light.ts
+++ b/frontend/src/react/components/sql-editor/theme/presets/light.ts
@@ -5,34 +5,34 @@ export const light: SQLEditorTheme = {
name: "Default Light",
monacoBase: DEFAULT_LIGHT_EDITOR_THEME,
tokens: {
- "--color-control": "82 82 91",
- "--color-control-hover": "24 24 27",
- "--color-control-light": "113 113 122",
- "--color-control-light-hover": "82 82 91",
- "--color-control-bg": "243 244 246",
- "--color-control-bg-hover": "229 231 235",
- "--color-control-placeholder": "161 161 170",
- "--color-control-border": "209 213 219",
- "--color-accent": "79 70 229",
- "--color-accent-hover": "55 48 163",
- "--color-accent-disabled": "165 180 252",
- "--color-accent-text": "255 255 255",
- "--color-main": "24 24 27",
- "--color-main-hover": "63 63 70",
- "--color-main-text": "255 255 255",
- "--color-background": "255 255 255",
- "--color-block-border": "229 231 235",
- "--color-link-hover": "229 231 235",
- "--color-info": "37 99 235",
- "--color-info-hover": "29 78 216",
- "--color-warning": "245 158 11",
- "--color-warning-hover": "180 83 9",
- "--color-error": "220 38 38",
- "--color-error-hover": "185 28 28",
- "--color-success": "22 163 74",
- "--color-success-hover": "21 128 61",
- "--color-matrix-green": "0 204 0",
- "--color-matrix-green-hover": "136 255 136",
- "--color-dark-bg": "30 30 30",
+ "--color-control": "#52525b",
+ "--color-control-hover": "#18181b",
+ "--color-control-light": "#71717a",
+ "--color-control-light-hover": "#52525b",
+ "--color-control-bg": "#f3f4f6",
+ "--color-control-bg-hover": "#e5e7eb",
+ "--color-control-placeholder": "#a1a1aa",
+ "--color-control-border": "#d1d5db",
+ "--color-accent": "#4f46e5",
+ "--color-accent-hover": "#3730a3",
+ "--color-accent-disabled": "#a5b4fc",
+ "--color-accent-text": "#ffffff",
+ "--color-main": "#18181b",
+ "--color-main-hover": "#3f3f46",
+ "--color-main-text": "#ffffff",
+ "--color-background": "#ffffff",
+ "--color-block-border": "#e5e7eb",
+ "--color-link-hover": "#e5e7eb",
+ "--color-info": "#2563eb",
+ "--color-info-hover": "#1d4ed8",
+ "--color-warning": "#f59e0b",
+ "--color-warning-hover": "#b45309",
+ "--color-error": "#dc2626",
+ "--color-error-hover": "#b91c1c",
+ "--color-success": "#16a34a",
+ "--color-success-hover": "#15803d",
+ "--color-matrix-green": "#00cc00",
+ "--color-matrix-green-hover": "#88ff88",
+ "--color-dark-bg": "#1e1e1e",
},
};
diff --git a/frontend/src/react/components/sql-editor/theme/presets/solarized-dark.ts b/frontend/src/react/components/sql-editor/theme/presets/solarized-dark.ts
index 9387f85da8..e2d63a96ea 100644
--- a/frontend/src/react/components/sql-editor/theme/presets/solarized-dark.ts
+++ b/frontend/src/react/components/sql-editor/theme/presets/solarized-dark.ts
@@ -13,34 +13,34 @@ export const solarizedDark: SQLEditorTheme = {
tokens: {
// Text bumped up the palette for readability — base01 (#586e75) is too dim
// for UI secondary text on the dark base03 bg.
- "--color-control": "147 161 161", // base1
- "--color-control-hover": "203 213 213", // lightened base1
- "--color-control-light": "131 148 150", // base0
- "--color-control-light-hover": "147 161 161", // base1
- "--color-control-bg": "7 54 66", // base02
- "--color-control-bg-hover": "18 71 84",
- "--color-control-placeholder": "101 123 131", // base00
- "--color-control-border": "30 80 92",
- "--color-accent": "38 139 210", // blue
- "--color-accent-hover": "77 163 222",
- "--color-accent-disabled": "44 100 130",
- "--color-accent-text": "253 246 227", // base3
- "--color-main": "147 161 161", // base1
- "--color-main-hover": "203 213 213", // lightened base1 (brighter, not dimmer)
- "--color-main-text": "0 43 54", // base03 (text on a base1 surface)
- "--color-background": "0 43 54", // base03
- "--color-block-border": "18 71 84",
- "--color-link-hover": "18 71 84",
- "--color-info": "38 139 210", // blue
- "--color-info-hover": "77 163 222",
- "--color-warning": "181 137 0", // yellow
- "--color-warning-hover": "204 153 0",
- "--color-error": "220 50 47", // red
- "--color-error-hover": "233 90 88",
- "--color-success": "133 153 0", // green
- "--color-success-hover": "163 184 30",
- "--color-matrix-green": "0 204 0",
- "--color-matrix-green-hover": "136 255 136",
- "--color-dark-bg": "0 43 54", // base03
+ "--color-control": "#93a1a1", // base1
+ "--color-control-hover": "#cbd5d5", // lightened base1
+ "--color-control-light": "#839496", // base0
+ "--color-control-light-hover": "#93a1a1", // base1
+ "--color-control-bg": "#073642", // base02
+ "--color-control-bg-hover": "#124754",
+ "--color-control-placeholder": "#657b83", // base00
+ "--color-control-border": "#1e505c",
+ "--color-accent": "#268bd2", // blue
+ "--color-accent-hover": "#4da3de",
+ "--color-accent-disabled": "#2c6482",
+ "--color-accent-text": "#fdf6e3", // base3
+ "--color-main": "#93a1a1", // base1
+ "--color-main-hover": "#cbd5d5", // lightened base1 (brighter, not dimmer)
+ "--color-main-text": "#002b36", // base03 (text on a base1 surface)
+ "--color-background": "#002b36", // base03
+ "--color-block-border": "#124754",
+ "--color-link-hover": "#124754",
+ "--color-info": "#268bd2", // blue
+ "--color-info-hover": "#4da3de",
+ "--color-warning": "#b58900", // yellow
+ "--color-warning-hover": "#cc9900",
+ "--color-error": "#dc322f", // red
+ "--color-error-hover": "#e95a58",
+ "--color-success": "#859900", // green
+ "--color-success-hover": "#a3b81e",
+ "--color-matrix-green": "#00cc00",
+ "--color-matrix-green-hover": "#88ff88",
+ "--color-dark-bg": "#002b36", // base03
},
};
diff --git a/frontend/src/react/components/sql-editor/theme/types.ts b/frontend/src/react/components/sql-editor/theme/types.ts
index a5b8432cae..b378eb5cb1 100644
--- a/frontend/src/react/components/sql-editor/theme/types.ts
+++ b/frontend/src/react/components/sql-editor/theme/types.ts
@@ -53,7 +53,8 @@ export interface SQLEditorTheme {
// syntax token colors (and is light/dark per the chosen theme).
monacoBase: string;
// Chrome layer: the SQL-Editor `--color-*` token values for this theme,
- // each a "r g b" triple (Tailwind resolves to `rgb(var(--color-x) / <alpha>)`).
+ // each a #rrggbb hex color. Convert to CSS channel triples at the style boundary
+ // because Tailwind resolves scoped tokens as `rgb(var(--color-x) / <alpha>)`.
tokens: Record<SQLEditorThemeToken, string>;
}
diff --git a/frontend/src/react/components/sql-editor/theme/useWorkspaceSQLEditorTheme.test.ts b/frontend/src/react/components/sql-editor/theme/useWorkspaceSQLEditorTheme.test.ts
index 03f1d8f8d3..1262687a08 100644
--- a/frontend/src/react/components/sql-editor/theme/useWorkspaceSQLEditorTheme.test.ts
+++ b/frontend/src/react/components/sql-editor/theme/useWorkspaceSQLEditorTheme.test.ts
@@ -1,17 +1,28 @@
import { describe, expect, test } from "vitest";
+import { hexToColor } from "@/utils";
import { deriveThemeFromAnchors } from "./derive";
import { PRESET_BY_ID } from "./presets";
+import type { SQLEditorTheme } from "./types";
import { resolveWorkspaceTheme } from "./useWorkspaceSQLEditorTheme";
+const toStoredTheme = (theme: SQLEditorTheme) => ({
+ ...theme,
+ tokens: Object.fromEntries(
+ Object.entries(theme.tokens).map(([key, value]) => [key, hexToColor(value)])
+ ),
+});
+
const customDef = {
- ...deriveThemeFromAnchors(
- {
- background: "#1e1e1e",
- text: "#f4f4f5",
- accent: "#6366f1",
- border: "#3f3f46",
- },
- "Brand"
+ ...toStoredTheme(
+ deriveThemeFromAnchors(
+ {
+ background: "#1e1e1e",
+ text: "#f4f4f5",
+ accent: "#6366f1",
+ border: "#3f3f46",
+ },
+ "Brand"
+ )
),
id: "u1",
};
diff --git a/frontend/src/react/components/sql-editor/theme/useWorkspaceSQLEditorTheme.ts b/frontend/src/react/components/sql-editor/theme/useWorkspaceSQLEditorTheme.ts
index f13a8559af..a48c97a564 100644
--- a/frontend/src/react/components/sql-editor/theme/useWorkspaceSQLEditorTheme.ts
+++ b/frontend/src/react/components/sql-editor/theme/useWorkspaceSQLEditorTheme.ts
@@ -1,8 +1,10 @@
import { useMemo } from "react";
import { useAppStore } from "@/react/stores/app";
+import type { Color } from "@/types/proto-es/google/type/color_pb";
+import { colorToHex } from "@/utils";
import { validateTheme } from "./derive";
import { PRESET_BY_ID, resolveThemeId } from "./presets";
-import type { SQLEditorTheme } from "./types";
+import { type SQLEditorTheme, type SQLEditorThemeToken } from "./types";
// Mirrors WorkspaceProfileSetting's two theme fields (protojson camelCase).
export interface WorkspaceThemeInput {
@@ -11,7 +13,7 @@ export interface WorkspaceThemeInput {
id: string;
name: string;
monacoBase: string;
- tokens: Record<string, string>;
+ tokens: Record<string, Color>;
};
}
@@ -27,7 +29,12 @@ export function resolveWorkspaceTheme(
id: custom.id,
name: custom.name,
monacoBase: custom.monacoBase,
- tokens: custom.tokens,
+ tokens: Object.fromEntries(
+ Object.entries(custom.tokens).map(([key, color]) => [
+ key,
+ colorToHex(color),
+ ])
+ ) as Record<SQLEditorThemeToken, string>,
};
try {
validateTheme(theme);
diff --git a/frontend/src/react/pages/settings/general/AIAugmentationSection.tsx b/frontend/src/react/pages/settings/general/AIAugmentationSection.tsx
index 2806edc7a9..6f2d1c1453 100644
--- a/frontend/src/react/pages/settings/general/AIAugmentationSection.tsx
+++ b/frontend/src/react/pages/settings/general/AIAugmentationSection.tsx
@@ -16,6 +16,13 @@ import { PermissionGuard } from "@/react/components/PermissionGuard";
import { Alert } from "@/react/components/ui/alert";
import { Checkbox } from "@/react/components/ui/checkbox";
import { Input } from "@/react/components/ui/input";
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from "@/react/components/ui/select";
import { useServerState } from "@/react/hooks/useAppState";
import { useAppStore } from "@/react/stores/app";
import {
@@ -215,6 +222,23 @@ export const AIAugmentationSection = forwardRef<
});
};
+ const providerLabel = (provider: AISetting_Provider) => {
+ switch (provider) {
+ case AISetting_Provider.OPEN_AI:
+ return t("settings.general.workspace.ai-assistant.provider.open_ai");
+ case AISetting_Provider.AZURE_OPENAI:
+ return t(
+ "settings.general.workspace.ai-assistant.provider.azure_open_ai"
+ );
+ case AISetting_Provider.GEMINI:
+ return t("settings.general.workspace.ai-assistant.provider.gemini");
+ case AISetting_Provider.CLAUDE:
+ return t("settings.general.workspace.ai-assistant.provider.claude");
+ default:
+ return "";
+ }
+ };
+
return (
<div id="ai" ref={containerRef} className="py-6 lg:flex">
<div className="text-left lg:w-1/4">
@@ -272,37 +296,26 @@ export const AIAugmentationSection = forwardRef<
)}
</span>
</label>
- <select
- className="w-48 border border-control-border rounded-xs px-3 py-1.5 text-sm bg-background disabled:opacity-50"
- value={state.provider}
+ <Select
+ value={String(state.provider)}
disabled={!canEdit}
- onChange={(e) =>
- onProviderChange(
- Number(e.target.value) as AISetting_Provider
- )
+ onValueChange={(value) =>
+ onProviderChange(Number(value) as AISetting_Provider)
}
>
- {PROVIDER_OPTIONS.map((provider) => (
- <option key={provider} value={provider}>
- {provider === AISetting_Provider.OPEN_AI &&
- t(
- "settings.general.workspace.ai-assistant.provider.open_ai"
- )}
- {provider === AISetting_Provider.AZURE_OPENAI &&
- t(
- "settings.general.workspace.ai-assistant.provider.azure_open_ai"
- )}
- {provider === AISetting_Provider.GEMINI &&
- t(
- "settings.general.workspace.ai-assistant.provider.gemini"
- )}
- {provider === AISetting_Provider.CLAUDE &&
- t(
- "settings.general.workspace.ai-assistant.provider.claude"
- )}
- </option>
- ))}
- </select>
+ <SelectTrigger className="w-48">
+ <SelectValue>
+ {providerLabel(state.provider)}
+ </SelectValue>
+ </SelectTrigger>
+ <SelectContent>
+ {PROVIDER_OPTIONS.map((provider) => (
+ <SelectItem key={provider} value={String(provider)}>
+ {providerLabel(provider)}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
</div>
{/* API Key */}
diff --git a/frontend/src/react/pages/settings/general/AnnouncementSection.tsx b/frontend/src/react/pages/settings/general/AnnouncementSection.tsx
index 912c91e574..bd2781a10a 100644
--- a/frontend/src/react/pages/settings/general/AnnouncementSection.tsx
+++ b/frontend/src/react/pages/settings/general/AnnouncementSection.tsx
@@ -14,10 +14,8 @@ import {
ANNOUNCEMENT_PRESET_KEYS,
ANNOUNCEMENT_PRESETS,
type AnnouncementTheme,
- hexToTriple,
matchPresetKey,
resolveAnnouncementTheme,
- tripleToHex,
} from "@/react/components/announcement-theme";
import { FeatureBadge } from "@/react/components/FeatureBadge";
import {
@@ -34,6 +32,7 @@ import {
AnnouncementSchema,
} from "@/types/proto-es/v1/setting_service_pb";
import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
+import { hexToColor } from "@/utils";
import type { SectionHandle } from "./useSettingSection";
interface AnnouncementSectionProps {
@@ -104,7 +103,10 @@ export const AnnouncementSection = forwardRef<
announcement: create(AnnouncementSchema, {
text: state.text,
link: state.link,
- theme: create(Announcement_AnnouncementThemeSchema, state.theme),
+ theme: create(Announcement_AnnouncementThemeSchema, {
+ background: hexToColor(state.theme.background),
+ text: hexToColor(state.theme.text),
+ }),
}),
},
updateMask: create(FieldMaskSchema, {
@@ -213,7 +215,7 @@ export const AnnouncementSection = forwardRef<
</label>
<ColorInput
id="announcement-theme-background"
- value={tripleToHex(state.theme.background)}
+ value={state.theme.background}
disabled={disabled}
ariaLabel={t(
"settings.general.workspace.announcement-theme.background"
@@ -221,7 +223,7 @@ export const AnnouncementSection = forwardRef<
onChange={(hex) =>
setState((s) => ({
...s,
- theme: { ...s.theme, background: hexToTriple(hex) },
+ theme: { ...s.theme, background: hex },
}))
}
/>
@@ -235,7 +237,7 @@ export const AnnouncementSection = forwardRef<
</label>
<ColorInput
id="announcement-theme-text"
- value={tripleToHex(state.theme.text)}
+ value={state.theme.text}
disabled={disabled}
ariaLabel={t(
"settings.general.workspace.announcement-theme.text"
@@ -243,7 +245,7 @@ export const AnnouncementSection = forwardRef<
onChange={(hex) =>
setState((s) => ({
...s,
- theme: { ...s.theme, text: hexToTriple(hex) },
+ theme: { ...s.theme, text: hex },
}))
}
/>
diff --git a/frontend/src/react/pages/settings/general/SQLEditorSection.test.tsx b/frontend/src/react/pages/settings/general/SQLEditorSection.test.tsx
index a610af895b..33d14b5e1b 100644
--- a/frontend/src/react/pages/settings/general/SQLEditorSection.test.tsx
+++ b/frontend/src/react/pages/settings/general/SQLEditorSection.test.tsx
@@ -16,7 +16,7 @@ const mocks = vi.hoisted(() => {
id: string;
name: string;
monacoBase: string;
- tokens: Record<string, string>;
+ tokens: Record<string, unknown>;
},
sqlResultSize: 0n,
queryTimeout: undefined as undefined | { seconds: bigint },
@@ -34,7 +34,7 @@ const mocks = vi.hoisted(() => {
sqlEditorCustomTheme?: {
id: string;
name: string;
- tokens: Record<string, string>;
+ tokens: Record<string, unknown>;
};
};
updateMask: { paths: string[] };
@@ -55,6 +55,14 @@ vi.mock("react-i18next", () => ({
vi.mock("@/utils", () => ({
hasWorkspacePermissionV2: mocks.hasWorkspacePermissionV2,
+ hexToColor: (hex: string) => {
+ const value = hex.replace(/^#/, "");
+ return {
+ red: Number.parseInt(value.slice(0, 2), 16) / 255,
+ green: Number.parseInt(value.slice(2, 4), 16) / 255,
+ blue: Number.parseInt(value.slice(4, 6), 16) / 255,
+ };
+ },
}));
vi.mock("@/react/hooks/useAppState", () => ({
@@ -254,8 +262,18 @@ describe("SQLEditorSection theme", () => {
const id = draft.id;
expect(id).toMatch(/[0-9a-f-]{36}/);
// Tokens are complete (background present).
- expect(draft.tokens["--color-background"]).toBeTruthy();
- expect(draft.tokens["--color-main"]).toBeTruthy();
+ expect(draft.tokens["--color-background"]).toMatchObject({
+ red: 1,
+ green: 1,
+ blue: 1,
+ });
+ expect(draft.tokens["--color-main"]).toEqual(
+ expect.objectContaining({
+ red: expect.closeTo(24 / 255),
+ green: expect.closeTo(24 / 255),
+ blue: expect.closeTo(27 / 255),
+ })
+ );
// Edit a color anchor; uuid must be preserved.
const colorInput = container.querySelector(
diff --git a/frontend/src/react/pages/settings/general/SQLEditorSection.tsx b/frontend/src/react/pages/settings/general/SQLEditorSection.tsx
index f3a2f4e713..289ff34870 100644
--- a/frontend/src/react/pages/settings/general/SQLEditorSection.tsx
+++ b/frontend/src/react/pages/settings/general/SQLEditorSection.tsx
@@ -28,7 +28,10 @@ import {
PRESET_BY_ID,
PRESETS,
} from "@/react/components/sql-editor/theme/presets";
-import type { SQLEditorTheme } from "@/react/components/sql-editor/theme/types";
+import type {
+ SQLEditorTheme,
+ SQLEditorThemeToken,
+} from "@/react/components/sql-editor/theme/types";
import { resolveWorkspaceTheme } from "@/react/components/sql-editor/theme/useWorkspaceSQLEditorTheme";
import { Checkbox } from "@/react/components/ui/checkbox";
import { NumberInput } from "@/react/components/ui/number-input";
@@ -46,13 +49,22 @@ import {
} from "@/types/proto-es/v1/org_policy_service_pb";
import { SQLEditorThemeSettingSchema } from "@/types/proto-es/v1/setting_service_pb";
import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
-import { hasWorkspacePermissionV2 } from "@/utils";
+import { hasWorkspacePermissionV2, hexToColor } from "@/utils";
import { ThemeAnchorEditor } from "./sql-editor-theme/ThemeAnchorEditor";
import { ThemePreview } from "./sql-editor-theme/ThemePreview";
import type { SectionHandle } from "./useSettingSection";
const CUSTOM_THEME_OPTION = "__custom__";
+const toSQLEditorThemeSettingPayload = (theme: SQLEditorTheme) => ({
+ id: theme.id,
+ name: theme.name,
+ monacoBase: theme.monacoBase,
+ tokens: Object.fromEntries(
+ Object.entries(theme.tokens).map(([key, hex]) => [key, hexToColor(hex)])
+ ) as Record<SQLEditorThemeToken, ReturnType<typeof hexToColor>>,
+});
+
interface SQLEditorSectionProps {
title: string;
onDirtyChange: () => void;
@@ -168,12 +180,10 @@ export const SQLEditorSection = forwardRef<
// blank one. Matches the applied theme — `resolveThemeId("")` is light too.
selectedThemeId: workspaceProfile.sqlEditorThemeId || DEFAULT_THEME_ID,
customDraft: custom
- ? {
- id: custom.id,
- name: custom.name,
- monacoBase: custom.monacoBase as SQLEditorTheme["monacoBase"],
- tokens: custom.tokens as SQLEditorTheme["tokens"],
- }
+ ? resolveWorkspaceTheme({
+ sqlEditorThemeId: custom.id,
+ sqlEditorCustomTheme: custom,
+ })
: null,
};
}, [workspaceProfile]);
@@ -228,7 +238,6 @@ export const SQLEditorSection = forwardRef<
return;
}
setSelectedThemeId(value);
- setCustomDraft(null);
};
const handleAnchorsChange = (nextAnchors: ThemeAnchors) => {
@@ -360,7 +369,10 @@ export const SQLEditorSection = forwardRef<
sqlEditorThemeId: selectedThemeId,
// `undefined` clears the custom theme when a built-in is selected.
sqlEditorCustomTheme: customDraft
- ? create(SQLEditorThemeSettingSchema, customDraft)
+ ? create(
+ SQLEditorThemeSettingSchema,
+ toSQLEditorThemeSettingPayload(customDraft)
+ )
: undefined,
},
updateMask: create(FieldMaskSchema, {
diff --git a/frontend/src/react/pages/settings/general/sql-editor-theme/ThemeAnchorEditor.tsx b/frontend/src/react/pages/settings/general/sql-editor-theme/ThemeAnchorEditor.tsx
index 865a1030d5..ae69447989 100644
--- a/frontend/src/react/pages/settings/general/sql-editor-theme/ThemeAnchorEditor.tsx
+++ b/frontend/src/react/pages/settings/general/sql-editor-theme/ThemeAnchorEditor.tsx
@@ -123,7 +123,7 @@ export function ThemeAnchorEditor({
if (typeof id === "string") onEditorThemeChange(id);
}}
>
- <SelectTrigger size="sm" className="w-60" disabled={disabled}>
+ <SelectTrigger className="w-60" disabled={disabled}>
<SelectValue />
</SelectTrigger>
<SelectContent>
diff --git a/frontend/src/types/proto-es/google/type/color_pb.d.ts b/frontend/src/types/proto-es/google/type/color_pb.d.ts
new file mode 100644
index 0000000000..daf9d868d3
--- /dev/null
+++ b/frontend/src/types/proto-es/google/type/color_pb.d.ts
@@ -0,0 +1,200 @@
+// Copyright 2025 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// @generated by protoc-gen-es v2.12.0
+// @generated from file google/type/color.proto (package google.type, syntax proto3)
+/* eslint-disable */
+
+import type { GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2";
+import type { Message } from "@bufbuild/protobuf";
+
+/**
+ * Describes the file google/type/color.proto.
+ */
+export declare const file_google_type_color: GenFile;
+
+/**
+ * Represents a color in the RGBA color space. This representation is designed
+ * for simplicity of conversion to/from color representations in various
+ * languages over compactness. For example, the fields of this representation
+ * can be trivially provided to the constructor of `java.awt.Color` in Java; it
+ * can also be trivially provided to UIColor's `+colorWithRed:green:blue:alpha`
+ * method in iOS; and, with just a little work, it can be easily formatted into
+ * a CSS `rgba()` string in JavaScript.
+ *
+ * This reference page doesn't carry information about the absolute color
+ * space
+ * that should be used to interpret the RGB value (e.g. sRGB, Adobe RGB,
+ * DCI-P3, BT.2020, etc.). By default, applications should assume the sRGB color
+ * space.
+ *
+ * When color equality needs to be decided, implementations, unless
+ * documented otherwise, treat two colors as equal if all their red,
+ * green, blue, and alpha values each differ by at most 1e-5.
+ *
+ * Example (Java):
+ *
+ * import com.google.type.Color;
+ *
+ * // ...
+ * public static java.awt.Color fromProto(Color protocolor) {
+ * float alpha = protocolor.hasAlpha()
+ * ? protocolor.getAlpha().getValue()
+ * : 1.0;
+ *
+ * return new java.awt.Color(
+ * protocolor.getRed(),
+ * protocolor.getGreen(),
+ * protocolor.getBlue(),
+ * alpha);
+ * }
+ *
+ * public static Color toProto(java.awt.Color color) {
+ * float red = (float) color.getRed();
+ * float green = (float) color.getGreen();
+ * float blue = (float) color.getBlue();
+ * float denominator = 255.0;
+ * Color.Builder resultBuilder =
+ * Color
+ * .newBuilder()
+ * .setRed(red / denominator)
+ * .setGreen(green / denominator)
+ * .setBlue(blue / denominator);
+ * int alpha = color.getAlpha();
+ * if (alpha != 255) {
+ * result.setAlpha(
+ * FloatValue
+ * .newBuilder()
+ * .setValue(((float) alpha) / denominator)
+ * .build());
+ * }
+ * return resultBuilder.build();
+ * }
+ * // ...
+ *
+ * Example (iOS / Obj-C):
+ *
+ * // ...
+ * static UIColor* fromProto(Color* protocolor) {
+ * float red = [protocolor red];
+ * float green = [protocolor green];
+ * float blue = [protocolor blue];
+ * FloatValue* alpha_wrapper = [protocolor alpha];
+ * float alpha = 1.0;
+ * if (alpha_wrapper != nil) {
+ * alpha = [alpha_wrapper value];
+ * }
+ * return [UIColor colorWithRed:red green:green blue:blue alpha:alpha];
+ * }
+ *
+ * static Color* toProto(UIColor* color) {
+ * CGFloat red, green, blue, alpha;
+ * if (![color getRed:&red green:&green blue:&blue alpha:&alpha]) {
+ * return nil;
+ * }
+ * Color* result = [[Color alloc] init];
+ * [result setRed:red];
+ * [result setGreen:green];
+ * [result setBlue:blue];
+ * if (alpha <= 0.9999) {
+ * [result setAlpha:floatWrapperWithValue(alpha)];
+ * }
+ * [result autorelease];
+ * return result;
+ * }
+ * // ...
+ *
+ * Example (JavaScript):
+ *
+ * // ...
+ *
+ * var protoToCssColor = function(rgb_color) {
+ * var redFrac = rgb_color.red || 0.0;
+ * var greenFrac = rgb_color.green || 0.0;
+ * var blueFrac = rgb_color.blue || 0.0;
+ * var red = Math.floor(redFrac * 255);
+ * var green = Math.floor(greenFrac * 255);
+ * var blue = Math.floor(blueFrac * 255);
+ *
+ * if (!('alpha' in rgb_color)) {
+ * return rgbToCssColor(red, green, blue);
+ * }
+ *
+ * var alphaFrac = rgb_color.alpha.value || 0.0;
+ * var rgbParams = [red, green, blue].join(',');
+ * return ['rgba(', rgbParams, ',', alphaFrac, ')'].join('');
+ * };
+ *
+ * var rgbToCssColor = function(red, green, blue) {
+ * var rgbNumber = new Number((red << 16) | (green << 8) | blue);
+ * var hexString = rgbNumber.toString(16);
+ * var missingZeros = 6 - hexString.length;
+ * var resultBuilder = ['#'];
+ * for (var i = 0; i < missingZeros; i++) {
+ * resultBuilder.push('0');
+ * }
+ * resultBuilder.push(hexString);
+ * return resultBuilder.join('');
+ * };
+ *
+ * // ...
+ *
+ * @generated from message google.type.Color
+ */
+export declare type Color = Message<"google.type.Color"> & {
+ /**
+ * The amount of red in the color as a value in the interval [0, 1].
+ *
+ * @generated from field: float red = 1;
+ */
+ red: number;
+
+ /**
+ * The amount of green in the color as a value in the interval [0, 1].
+ *
+ * @generated from field: float green = 2;
+ */
+ green: number;
+
+ /**
+ * The amount of blue in the color as a value in the interval [0, 1].
+ *
+ * @generated from field: float blue = 3;
+ */
+ blue: number;
+
+ /**
+ * The fraction of this color that should be applied to the pixel. That is,
+ * the final pixel color is defined by the equation:
+ *
+ * `pixel color = alpha * (this color) + (1.0 - alpha) * (background color)`
+ *
+ * This means that a value of 1.0 corresponds to a solid color, whereas
+ * a value of 0.0 corresponds to a completely transparent color. This
+ * uses a wrapper message rather than a simple float scalar so that it is
+ * possible to distinguish between a default value and the value being unset.
+ * If omitted, this color object is rendered as a solid color
+ * (as if the alpha value had been explicitly given a value of 1.0).
+ *
+ * @generated from field: google.protobuf.FloatValue alpha = 4;
+ */
+ alpha?: number | undefined;
+};
+
+/**
+ * Describes the message google.type.Color.
+ * Use `create(ColorSchema)` to create a new message.
+ */
+export declare const ColorSchema: GenMessage<Color>;
+
diff --git a/frontend/src/types/proto-es/google/type/color_pb.js b/frontend/src/types/proto-es/google/type/color_pb.js
new file mode 100644
index 0000000000..e7adb3bd3a
--- /dev/null
+++ b/frontend/src/types/proto-es/google/type/color_pb.js
@@ -0,0 +1,34 @@
+// Copyright 2025 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// @generated by protoc-gen-es v2.12.0
+// @generated from file google/type/color.proto (package google.type, syntax proto3)
+/* eslint-disable */
+
+import { fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv2";
+import { file_google_protobuf_wrappers } from "@bufbuild/protobuf/wkt";
+
+/**
+ * Describes the file google/type/color.proto.
+ */
+export const file_google_type_color = /*@__PURE__*/
+ fileDesc("Chdnb29nbGUvdHlwZS9jb2xvci5wcm90bxILZ29vZ2xlLnR5cGUiXQoFQ29sb3ISCwoDcmVkGAEgASgCEg0KBWdyZWVuGAIgASgCEgwKBGJsdWUYAyABKAISKgoFYWxwaGEYBCABKAsyGy5nb29nbGUucHJvdG9idWYuRmxvYXRWYWx1ZUKlAQoPY29tLmdvb2dsZS50eXBlQgpDb2xvclByb3RvUAFaNmdvb2dsZS5nb2xhbmcub3JnL2dlbnByb3RvL2dvb2dsZWFwaXMvdHlwZS9jb2xvcjtjb2xvcvgBAaICA0dUWKoCC0dvb2dsZS5UeXBlygILR29vZ2xlXFR5cGXiAhdHb29nbGVcVHlwZVxHUEJNZXRhZGF0YeoCDEdvb2dsZTo6VHlwZWIGcHJvdG8z", [file_google_protobuf_wrappers]);
+
+/**
+ * Describes the message google.type.Color.
+ * Use `create(ColorSchema)` to create a new message.
+ */
+export const ColorSchema = /*@__PURE__*/
+ messageDesc(file_google_type_color, 0);
+
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 b54b02429b..0cb67cbff6 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
@@ -6,6 +6,7 @@ import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobu
import type { Message } from "@bufbuild/protobuf";
import type { Duration, FieldMask } from "@bufbuild/protobuf/wkt";
import type { WebhookType } from "./common_pb";
+import type { Color } from "../google/type/color_pb";
import type { ApprovalTemplate } from "./issue_service_pb";
import type { Expr } from "../google/type/expr_pb";
@@ -743,9 +744,11 @@ export declare type SQLEditorThemeSetting = Message<"bytebase.v1.SQLEditorThemeS
monacoBase: string;
/**
- * @generated from field: map<string, string> tokens = 4;
+ * CSS token colors.
+ *
+ * @generated from field: map<string, google.type.Color> tokens = 4;
*/
- tokens: { [key: string]: string };
+ tokens: { [key: string]: Color };
};
/**
@@ -792,18 +795,14 @@ export declare const AnnouncementSchema: GenMessage<Announcement>;
*/
export declare type Announcement_AnnouncementTheme = Message<"bytebase.v1.Announcement.AnnouncementTheme"> & {
/**
- * "r g b"
- *
- * @generated from field: string background = 1;
+ * @generated from field: google.type.Color background = 1;
*/
- background: string;
+ background?: Color | undefined;
/**
- * "r g b"
- *
- * @generated from field: string text = 2;
+ * @generated from field: google.type.Color text = 2;
*/
- text: string;
+ text?: Color | undefined;
};
/**
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 ff9f13a7df..e561a20107 100644
--- a/frontend/src/types/proto-es/v1/setting_service_pb.js
+++ b/frontend/src/types/proto-es/v1/setting_service_pb.js
@@ -8,6 +8,7 @@ import { file_google_api_client } from "../google/api/client_pb";
import { file_google_api_field_behavior } from "../google/api/field_behavior_pb";
import { file_google_api_resource } from "../google/api/resource_pb";
import { file_google_protobuf_duration, file_google_protobuf_field_mask } from "@bufbuild/protobuf/wkt";
+import { file_google_type_color } from "../google/type/color_pb";
import { file_google_type_expr } from "../google/type/expr_pb";
import { file_v1_annotation } from "./annotation_pb";
import { file_v1_common } from "./common_pb";
@@ -17,7 +18,7 @@ import { file_v1_issue_service } from "./issue_service_pb";
* Describes the file v1/setting_service.proto.
*/
export const file_v1_setting_service = /*@__PURE__*/
- fileDesc("Chh2MS9zZXR0aW5nX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIhUKE0xpc3RTZXR0aW5nc1JlcXVlc3QiPgoUTGlzdFNldHRpbmdzUmVzcG9uc2USJgoIc2V0dGluZ3MYASADKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIj8KEUdldFNldHRpbmdSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1NldHRpbmciOwoSR2V0U2V0dGluZ1Jlc3BvbnNlEiUKB3NldHRpbmcYASABKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIqEBChRVcGRhdGVTZXR0aW5nUmVxdWVzdBIqCgdzZXR0aW5nGAEgASgLMhQuYnl0ZWJhc2UudjEuU2V0dGluZ0ID4EECEhUKDXZhbGlkYXRlX29ubHkYAiABKAgSFQoNYWxsb3dfbWlzc2luZxgDIAEoCBIvCgt1cGRhdGVfbWFzaxgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2sitAIKB1NldHRpbmcSEQoEbmFtZRgBIAEoCUID4EEIEi0KBXZhbHVlGAIgASgLMhkuYnl0ZWJhc2UudjEuU2V0dGluZ1ZhbHVlQgPgQQIitwEKC1NldHRpbmdOYW1lEhwKGFNFVFRJTkdfTkFNRV9VTlNQRUNJRklFRBAAEhUKEVdPUktTUEFDRV9QUk9GSUxFEAESFgoSV09SS1NQQUNFX0FQUFJPVkFMEAISCgoGQVBQX0lNEAMSBgoCQUkQBBIXChNEQVRBX0NMQVNTSUZJQ0FUSU9OEAUSEgoOU0VNQU5USUNfVFlQRVMQBhIPCgtFTlZJUk9OTUVOVBAHEgkKBUVNQUlMEAg6LepBKgoUYnl0ZWJhc2UuY29tL1NldHRpbmcSEnNldHRpbmdzL3tzZXR0aW5nfSLYAwoMU2V0dGluZ1ZhbHVlEisKBmFwcF9pbRgBIAEoCzIZLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZ0gAEkEKEXdvcmtzcGFjZV9wcm9maWxlGAIgASgLMiQuYnl0ZWJhc2UudjEuV29ya3NwYWNlUHJvZmlsZVNldHRpbmdIABJDChJ3b3Jrc3BhY2VfYXBwcm92YWwYAyABKAsyJS5ieXRlYmFzZS52MS5Xb3Jrc3BhY2VBcHByb3ZhbFNldHRpbmdIABJFChNkYXRhX2NsYXNzaWZpY2F0aW9uGAQgASgLMiYuYnl0ZWJhc2UudjEuRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZ0gAEjkKDXNlbWFudGljX3R5cGUYBSABKAsyIC5ieXRlYmFzZS52MS5TZW1hbnRpY1R5cGVTZXR0aW5nSAASJAoCYWkYBiABKAsyFi5ieXRlYmFzZS52MS5BSVNldHRpbmdIABI2CgtlbnZpcm9ubWVudBgHIAEoCzIfLmJ5dGViYXNlLnYxLkVudmlyb25tZW50U2V0dGluZ0gAEioKBWVtYWlsGAggASgLMhkuYnl0ZWJhc2UudjEuRW1haWxTZXR0aW5nSABCBwoFdmFsdWUivAYKDEFwcElNU2V0dGluZxI1CghzZXR0aW5ncxgBIAMoCzIjLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5JTVNldHRpbmcaGwoFU2xhY2sSEgoFdG9rZW4YASABKAlCA+BBBBo2CgZGZWlzaHUSEwoGYXBwX2lkGAEgASgJQgPgQQQSFwoKYXBwX3NlY3JldBgCIAEoCUID4EEEGkkKBVdlY29tEhQKB2NvcnBfaWQYASABKAlCA+BBBBIVCghhZ2VudF9pZBgCIAEoCUID4EEEEhMKBnNlY3JldBgDIAEoCUID4EEEGjQKBExhcmsSEwoGYXBwX2lkGAEgASgJQgPgQQQSFwoKYXBwX3NlY3JldBgCIAEoCUID4EEEGlcKCERpbmdUYWxrEhYKCWNsaWVudF9pZBgBIAEoCUID4EEEEhoKDWNsaWVudF9zZWNyZXQYAiABKAlCA+BBBBIXCgpyb2JvdF9jb2RlGAMgASgJQgPgQQQaUwoFVGVhbXMSFgoJdGVuYW50X2lkGAEgASgJQgPgQQQSFgoJY2xpZW50X2lkGAIgASgJQgPgQQQSGgoNY2xpZW50X3NlY3JldBgDIAEoCUID4EEEGvACCglJTVNldHRpbmcSJgoEdHlwZRgBIAEoDjIYLmJ5dGViYXNlLnYxLldlYmhvb2tUeXBlEjAKBXNsYWNrGAIgASgLMh8uYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLlNsYWNrSAASMgoGZmVpc2h1GAMgASgLMiAuYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLkZlaXNodUgAEjAKBXdlY29tGAQgASgLMh8uYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLldlY29tSAASLgoEbGFyaxgFIAEoCzIeLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5MYXJrSAASNgoIZGluZ3RhbGsYBiABKAsyIi5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuRGluZ1RhbGtIABIwCgV0ZWFtcxgHIAEoCzIfLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5UZWFtc0gAQgkKB3BheWxvYWQizwkKF1dvcmtzcGFjZVByb2ZpbGVTZXR0aW5nEhQKDGV4dGVybmFsX3VybBgBIAEoCRIXCg9kaXNhbGxvd19zaWdudXAYAiABKAgSEwoLcmVxdWlyZV9tZmEYAyABKAgSOQoWcmVmcmVzaF90b2tlbl9kdXJhdGlvbhgEIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIvCgxhbm5vdW5jZW1lbnQYBSABKAsyGS5ieXRlYmFzZS52MS5Bbm5vdW5jZW1lbnQSPQoabWF4aW11bV9yZXF1ZXN0X2V4cGlyYXRpb24YBiABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SDwoHZG9tYWlucxgHIAMoCRIfChdlbmZvcmNlX2lkZW50aXR5X2RvbWFpbhgIIAEoCBI9ChRkYXRhYmFzZV9jaGFuZ2VfbW9kZRgJIAEoDjIfLmJ5dGViYXNlLnYxLkRhdGFiYXNlQ2hhbmdlTW9kZRIgChhkaXNhbGxvd19wYXNzd29yZF9zaWduaW4YCiABKAgSIAoYZW5hYmxlX21ldHJpY19jb2xsZWN0aW9uGAsgASgIEjsKGGluYWN0aXZlX3Nlc3Npb25fdGltZW91dBgMIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIfChdlbmFibGVfYXVkaXRfbG9nX3N0ZG91dBgNIAEoCBIRCgl3YXRlcm1hcmsYDiABKAgSHAoUZGlyZWN0b3J5X3N5bmNfdG9rZW4YDyABKAkSVgoUcGFzc3dvcmRfcmVzdHJpY3Rpb24YESABKAsyOC5ieXRlYmFzZS52MS5Xb3Jrc3BhY2VQcm9maWxlU2V0dGluZy5QYXNzd29yZFJlc3RyaWN0aW9uEjgKFWFjY2Vzc190b2tlbl9kdXJhdGlvbhgSIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIUCgxlbmFibGVfZGVidWcYEyABKAgSFwoPc3FsX3Jlc3VsdF9zaXplGBQgASgDEjAKDXF1ZXJ5X3RpbWVvdXQYFSABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SHwoXYWxsb3dfZW1haWxfY29kZV9zaWduaW4YFiABKAgSGwoTc3FsX2VkaXRvcl90aGVtZV9pZBgXIAEoCRJDChdzcWxfZWRpdG9yX2N1c3RvbV90aGVtZRgYIAEoCzIiLmJ5dGViYXNlLnYxLlNRTEVkaXRvclRoZW1lU2V0dGluZxqEAgoTUGFzc3dvcmRSZXN0cmljdGlvbhISCgptaW5fbGVuZ3RoGAEgASgFEhYKDnJlcXVpcmVfbnVtYmVyGAIgASgIEhYKDnJlcXVpcmVfbGV0dGVyGAMgASgIEiAKGHJlcXVpcmVfdXBwZXJjYXNlX2xldHRlchgEIAEoCBIhChlyZXF1aXJlX3NwZWNpYWxfY2hhcmFjdGVyGAUgASgIEi4KJnJlcXVpcmVfcmVzZXRfcGFzc3dvcmRfZm9yX2ZpcnN0X2xvZ2luGAYgASgIEjQKEXBhc3N3b3JkX3JvdGF0aW9uGAcgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uSgQIEBARIrUBChVTUUxFZGl0b3JUaGVtZVNldHRpbmcSCgoCaWQYASABKAkSDAoEbmFtZRgCIAEoCRITCgttb25hY29fYmFzZRgDIAEoCRI+CgZ0b2tlbnMYBCADKAsyLi5ieXRlYmFzZS52MS5TUUxFZGl0b3JUaGVtZVNldHRpbmcuVG9rZW5zRW50cnkaLQoLVG9rZW5zRW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgJOgI4ASKqAQoMQW5ub3VuY2VtZW50EgwKBHRleHQYAiABKAkSDAoEbGluaxgDIAEoCRI6CgV0aGVtZRgEIAEoCzIrLmJ5dGViYXNlLnYxLkFubm91bmNlbWVudC5Bbm5vdW5jZW1lbnRUaGVtZRo1ChFBbm5vdW5jZW1lbnRUaGVtZRISCgpiYWNrZ3JvdW5kGAEgASgJEgwKBHRleHQYAiABKAlKBAgBEAJSBWxldmVsIv4CChhXb3Jrc3BhY2VBcHByb3ZhbFNldHRpbmcSOQoFcnVsZXMYASADKAsyKi5ieXRlYmFzZS52MS5Xb3Jrc3BhY2VBcHByb3ZhbFNldHRpbmcuUnVsZRqmAgoEUnVsZRIvCgh0ZW1wbGF0ZRgBIAEoCzIdLmJ5dGViYXNlLnYxLkFwcHJvdmFsVGVtcGxhdGUSJAoJY29uZGl0aW9uGAIgASgLMhEuZ29vZ2xlLnR5cGUuRXhwchJBCgZzb3VyY2UYAyABKA4yMS5ieXRlYmFzZS52MS5Xb3Jrc3BhY2VBcHByb3ZhbFNldHRpbmcuUnVsZS5Tb3VyY2UigwEKBlNvdXJjZRIWChJTT1VSQ0VfVU5TUEVDSUZJRUQQABITCg9DSEFOR0VfREFUQUJBU0UQARITCg9DUkVBVEVfREFUQUJBU0UQAhIQCgxSRVFVRVNUX1JPTEUQBBISCg5SRVFVRVNUX0FDQ0VTUxAFIgQIAxADKgtFWFBPUlRfREFUQSLrBAoZRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZxJQCgdjb25maWdzGAEgAygLMj8uYnl0ZWJhc2UudjEuRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZy5EYXRhQ2xhc3NpZmljYXRpb25Db25maWca+wMKGERhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZxIKCgJpZBgBIAEoCRINCgV0aXRsZRgCIAEoCRJVCgZsZXZlbHMYAyADKAsyRS5ieXRlYmFzZS52MS5EYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nLkRhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZy5MZXZlbBJrCg5jbGFzc2lmaWNhdGlvbhgEIAMoCzJTLmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcuRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnLkNsYXNzaWZpY2F0aW9uRW50cnkaJQoFTGV2ZWwSDQoFdGl0bGUYAiABKAkSDQoFbGV2ZWwYBCABKAUaTQoSRGF0YUNsYXNzaWZpY2F0aW9uEgoKAmlkGAEgASgJEg0KBXRpdGxlGAIgASgJEhIKBWxldmVsGAQgASgFSACIAQFCCAoGX2xldmVsGokBChNDbGFzc2lmaWNhdGlvbkVudHJ5EgsKA2tleRgBIAEoCRJhCgV2YWx1ZRgCIAEoCzJSLmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcuRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnLkRhdGFDbGFzc2lmaWNhdGlvbjoCOAEizAEKE1NlbWFudGljVHlwZVNldHRpbmcSPAoFdHlwZXMYASADKAsyLS5ieXRlYmFzZS52MS5TZW1hbnRpY1R5cGVTZXR0aW5nLlNlbWFudGljVHlwZRp3CgxTZW1hbnRpY1R5cGUSCgoCaWQYASABKAkSDQoFdGl0bGUYAiABKAkSEwoLZGVzY3JpcHRpb24YAyABKAkSKQoJYWxnb3JpdGhtGAYgASgLMhYuYnl0ZWJhc2UudjEuQWxnb3JpdGhtEgwKBGljb24YByABKAki/wQKCUFsZ29yaXRobRI0CglmdWxsX21hc2sYASABKAsyHy5ieXRlYmFzZS52MS5BbGdvcml0aG0uRnVsbE1hc2tIABI2CgpyYW5nZV9tYXNrGAIgASgLMiAuYnl0ZWJhc2UudjEuQWxnb3JpdGhtLlJhbmdlTWFza0gAEjIKCG1kNV9tYXNrGAMgASgLMh4uYnl0ZWJhc2UudjEuQWxnb3JpdGhtLk1ENU1hc2tIABJBChBpbm5lcl9vdXRlcl9tYXNrGAQgASgLMiUuYnl0ZWJhc2UudjEuQWxnb3JpdGhtLklubmVyT3V0ZXJNYXNrSAAaIAoIRnVsbE1hc2sSFAoMc3Vic3RpdHV0aW9uGAEgASgJGn4KCVJhbmdlTWFzaxI2CgZzbGljZXMYASADKAsyJi5ieXRlYmFzZS52MS5BbGdvcml0aG0uUmFuZ2VNYXNrLlNsaWNlGjkKBVNsaWNlEg0KBXN0YXJ0GAEgASgFEgsKA2VuZBgCIAEoBRIUCgxzdWJzdGl0dXRpb24YAyABKAkaFwoHTUQ1TWFzaxIMCgRzYWx0GAEgASgJGskBCg5Jbm5lck91dGVyTWFzaxISCgpwcmVmaXhfbGVuGAEgASgFEhIKCnN1ZmZpeF9sZW4YAiABKAUSPAoEdHlwZRgDIAEoDjIuLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5Jbm5lck91dGVyTWFzay5NYXNrVHlwZRIUCgxzdWJzdGl0dXRpb24YBCABKAkiOwoITWFza1R5cGUSGQoVTUFTS19UWVBFX1VOU1BFQ0lGSUVEEAASCQoFSU5ORVIQARIJCgVPVVRFUhACQgYKBG1hc2si7wEKCUFJU2V0dGluZxIPCgdlbmFibGVkGAEgASgIEjEKCHByb3ZpZGVyGAIgASgOMh8uYnl0ZWJhc2UudjEuQUlTZXR0aW5nLlByb3ZpZGVyEhAKCGVuZHBvaW50GAMgASgJEg8KB2FwaV9rZXkYBCABKAkSDQoFbW9kZWwYBSABKAkSDwoHdmVyc2lvbhgGIAEoCSJbCghQcm92aWRlchIYChRQUk9WSURFUl9VTlNQRUNJRklFRBAAEgsKB09QRU5fQUkQARIKCgZDTEFVREUQAhIKCgZHRU1JTkkQAxIQCgxBWlVSRV9PUEVOQUkQBCKWAgoSRW52aXJvbm1lbnRTZXR0aW5nEkEKDGVudmlyb25tZW50cxgBIAMoCzIrLmJ5dGViYXNlLnYxLkVudmlyb25tZW50U2V0dGluZy5FbnZpcm9ubWVudBq8AQoLRW52aXJvbm1lbnQSEQoEbmFtZRgBIAEoCUID4EEDEgoKAmlkGAIgASgJEg0KBXRpdGxlGAMgASgJEkMKBHRhZ3MYBCADKAsyNS5ieXRlYmFzZS52MS5FbnZpcm9ubWVudFNldHRpbmcuRW52aXJvbm1lbnQuVGFnc0VudHJ5Eg0KBWNvbG9yGAUgASgJGisKCVRhZ3NFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBIvQECgxFbWFpbFNldHRpbmcSDAoEZnJvbRgBIAEoCRIRCglmcm9tX25hbWUYAiABKAkSLAoEdHlwZRgDIAEoDjIeLmJ5dGViYXNlLnYxLkVtYWlsU2V0dGluZy5UeXBlEjQKBHNtdHAYBCABKAsyJC5ieXRlYmFzZS52MS5FbWFpbFNldHRpbmcuU01UUENvbmZpZ0gAGqwDCgpTTVRQQ29uZmlnEgwKBGhvc3QYASABKAkSDAoEcG9ydBgCIAEoBRIQCgh1c2VybmFtZRgDIAEoCRIVCghwYXNzd29yZBgEIAEoCUID4EEEEkMKCmVuY3J5cHRpb24YBSABKA4yLy5ieXRlYmFzZS52MS5FbWFpbFNldHRpbmcuU01UUENvbmZpZy5FbmNyeXB0aW9uEksKDmF1dGhlbnRpY2F0aW9uGAYgASgOMjMuYnl0ZWJhc2UudjEuRW1haWxTZXR0aW5nLlNNVFBDb25maWcuQXV0aGVudGljYXRpb24iWAoKRW5jcnlwdGlvbhIaChZFTkNSWVBUSU9OX1VOU1BFQ0lGSUVEEAASEwoPRU5DUllQVElPTl9OT05FEAESDAoIU1RBUlRUTFMQAhILCgdTU0xfVExTEAMibQoOQXV0aGVudGljYXRpb24SHgoaQVVUSEVOVElDQVRJT05fVU5TUEVDSUZJRUQQABIXChNBVVRIRU5USUNBVElPTl9OT05FEAESCQoFUExBSU4QAhIJCgVMT0dJThADEgwKCENSQU1fTUQ1EAQiJgoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASCAoEU01UUBABQggKBmNvbmZpZyJ2ChdUZXN0RW1haWxTZXR0aW5nUmVxdWVzdBITCgZwYXJlbnQYASABKAlCA+BBAhI1Cg1lbWFpbF9zZXR0aW5nGAIgASgLMhkuYnl0ZWJhc2UudjEuRW1haWxTZXR0aW5nQgPgQQISDwoCdG8YAyABKAlCA+BBAiI6ChhUZXN0RW1haWxTZXR0aW5nUmVzcG9uc2USDwoHc3VjY2VzcxgBIAEoCBINCgVlcnJvchgCIAEoCSpUChJEYXRhYmFzZUNoYW5nZU1vZGUSJAogREFUQUJBU0VfQ0hBTkdFX01PREVfVU5TUEVDSUZJRUQQABIMCghQSVBFTElORRABEgoKBkVESVRPUhACMuEECg5TZXR0aW5nU2VydmljZRKEAQoMTGlzdFNldHRpbmdzEiAuYnl0ZWJhc2UudjEuTGlzdFNldHRpbmdzUmVxdWVzdBohLmJ5dGViYXNlLnYxLkxpc3RTZXR0aW5nc1Jlc3BvbnNlIi/aQQCK6jAQYmIuc2V0dGluZ3MubGlzdJDqMAGC0+STAg4SDC92MS9zZXR0aW5ncxJ/CgpHZXRTZXR0aW5nEh4uYnl0ZWJhc2UudjEuR2V0U2V0dGluZ1JlcXVlc3QaFC5ieXRlYmFzZS52MS5TZXR0aW5nIjvaQQRuYW1liuowD2JiLnNldHRpbmdzLmdldJDqMAKC0+STAhcSFS92MS97bmFtZT1zZXR0aW5ncy8qfRKTAQoNVXBkYXRlU2V0dGluZxIhLmJ5dGViYXNlLnYxLlVwZGF0ZVNldHRpbmdSZXF1ZXN0GhQuYnl0ZWJhc2UudjEuU2V0dGluZyJJiuowD2JiLnNldHRpbmdzLnNldJDqMAKY6jABgtPkkwIoOgdzZXR0aW5nMh0vdjEve3NldHRpbmcubmFtZT1zZXR0aW5ncy8qfRKwAQoQVGVzdEVtYWlsU2V0dGluZxIkLmJ5dGViYXNlLnYxLlRlc3RFbWFpbFNldHRpbmdSZXF1ZXN0GiUuYnl0ZWJhc2UudjEuVGVzdEVtYWlsU2V0dGluZ1Jlc3BvbnNlIk+K6jAPYmIuc2V0dGluZ3Muc2V0kOowAYLT5JMCMjoBKiItL3YxL3twYXJlbnQ9d29ya3NwYWNlcy8qfS9zZXR0aW5ncy9FTUFJTDp0ZXN0QqkBCg9jb20uYnl0ZWJhc2UudjFCE1NldHRpbmdTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [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_common, file_v1_issue_service]);
+ fileDesc("Chh2MS9zZXR0aW5nX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIhUKE0xpc3RTZXR0aW5nc1JlcXVlc3QiPgoUTGlzdFNldHRpbmdzUmVzcG9uc2USJgoIc2V0dGluZ3MYASADKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIj8KEUdldFNldHRpbmdSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1NldHRpbmciOwoSR2V0U2V0dGluZ1Jlc3BvbnNlEiUKB3NldHRpbmcYASABKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIqEBChRVcGRhdGVTZXR0aW5nUmVxdWVzdBIqCgdzZXR0aW5nGAEgASgLMhQuYnl0ZWJhc2UudjEuU2V0dGluZ0ID4EECEhUKDXZhbGlkYXRlX29ubHkYAiABKAgSFQoNYWxsb3dfbWlzc2luZxgDIAEoCBIvCgt1cGRhdGVfbWFzaxgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2sitAIKB1NldHRpbmcSEQoEbmFtZRgBIAEoCUID4EEIEi0KBXZhbHVlGAIgASgLMhkuYnl0ZWJhc2UudjEuU2V0dGluZ1ZhbHVlQgPgQQIitwEKC1NldHRpbmdOYW1lEhwKGFNFVFRJTkdfTkFNRV9VTlNQRUNJRklFRBAAEhUKEVdPUktTUEFDRV9QUk9GSUxFEAESFgoSV09SS1NQQUNFX0FQUFJPVkFMEAISCgoGQVBQX0lNEAMSBgoCQUkQBBIXChNEQVRBX0NMQVNTSUZJQ0FUSU9OEAUSEgoOU0VNQU5USUNfVFlQRVMQBhIPCgtFTlZJUk9OTUVOVBAHEgkKBUVNQUlMEAg6LepBKgoUYnl0ZWJhc2UuY29tL1NldHRpbmcSEnNldHRpbmdzL3tzZXR0aW5nfSLYAwoMU2V0dGluZ1ZhbHVlEisKBmFwcF9pbRgBIAEoCzIZLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZ0gAEkEKEXdvcmtzcGFjZV9wcm9maWxlGAIgASgLMiQuYnl0ZWJhc2UudjEuV29ya3NwYWNlUHJvZmlsZVNldHRpbmdIABJDChJ3b3Jrc3BhY2VfYXBwcm92YWwYAyABKAsyJS5ieXRlYmFzZS52MS5Xb3Jrc3BhY2VBcHByb3ZhbFNldHRpbmdIABJFChNkYXRhX2NsYXNzaWZpY2F0aW9uGAQgASgLMiYuYnl0ZWJhc2UudjEuRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZ0gAEjkKDXNlbWFudGljX3R5cGUYBSABKAsyIC5ieXRlYmFzZS52MS5TZW1hbnRpY1R5cGVTZXR0aW5nSAASJAoCYWkYBiABKAsyFi5ieXRlYmFzZS52MS5BSVNldHRpbmdIABI2CgtlbnZpcm9ubWVudBgHIAEoCzIfLmJ5dGViYXNlLnYxLkVudmlyb25tZW50U2V0dGluZ0gAEioKBWVtYWlsGAggASgLMhkuYnl0ZWJhc2UudjEuRW1haWxTZXR0aW5nSABCBwoFdmFsdWUivAYKDEFwcElNU2V0dGluZxI1CghzZXR0aW5ncxgBIAMoCzIjLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5JTVNldHRpbmcaGwoFU2xhY2sSEgoFdG9rZW4YASABKAlCA+BBBBo2CgZGZWlzaHUSEwoGYXBwX2lkGAEgASgJQgPgQQQSFwoKYXBwX3NlY3JldBgCIAEoCUID4EEEGkkKBVdlY29tEhQKB2NvcnBfaWQYASABKAlCA+BBBBIVCghhZ2VudF9pZBgCIAEoCUID4EEEEhMKBnNlY3JldBgDIAEoCUID4EEEGjQKBExhcmsSEwoGYXBwX2lkGAEgASgJQgPgQQQSFwoKYXBwX3NlY3JldBgCIAEoCUID4EEEGlcKCERpbmdUYWxrEhYKCWNsaWVudF9pZBgBIAEoCUID4EEEEhoKDWNsaWVudF9zZWNyZXQYAiABKAlCA+BBBBIXCgpyb2JvdF9jb2RlGAMgASgJQgPgQQQaUwoFVGVhbXMSFgoJdGVuYW50X2lkGAEgASgJQgPgQQQSFgoJY2xpZW50X2lkGAIgASgJQgPgQQQSGgoNY2xpZW50X3NlY3JldBgDIAEoCUID4EEEGvACCglJTVNldHRpbmcSJgoEdHlwZRgBIAEoDjIYLmJ5dGViYXNlLnYxLldlYmhvb2tUeXBlEjAKBXNsYWNrGAIgASgLMh8uYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLlNsYWNrSAASMgoGZmVpc2h1GAMgASgLMiAuYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLkZlaXNodUgAEjAKBXdlY29tGAQgASgLMh8uYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLldlY29tSAASLgoEbGFyaxgFIAEoCzIeLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5MYXJrSAASNgoIZGluZ3RhbGsYBiABKAsyIi5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuRGluZ1RhbGtIABIwCgV0ZWFtcxgHIAEoCzIfLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5UZWFtc0gAQgkKB3BheWxvYWQizwkKF1dvcmtzcGFjZVByb2ZpbGVTZXR0aW5nEhQKDGV4dGVybmFsX3VybBgBIAEoCRIXCg9kaXNhbGxvd19zaWdudXAYAiABKAgSEwoLcmVxdWlyZV9tZmEYAyABKAgSOQoWcmVmcmVzaF90b2tlbl9kdXJhdGlvbhgEIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIvCgxhbm5vdW5jZW1lbnQYBSABKAsyGS5ieXRlYmFzZS52MS5Bbm5vdW5jZW1lbnQSPQoabWF4aW11bV9yZXF1ZXN0X2V4cGlyYXRpb24YBiABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SDwoHZG9tYWlucxgHIAMoCRIfChdlbmZvcmNlX2lkZW50aXR5X2RvbWFpbhgIIAEoCBI9ChRkYXRhYmFzZV9jaGFuZ2VfbW9kZRgJIAEoDjIfLmJ5dGViYXNlLnYxLkRhdGFiYXNlQ2hhbmdlTW9kZRIgChhkaXNhbGxvd19wYXNzd29yZF9zaWduaW4YCiABKAgSIAoYZW5hYmxlX21ldHJpY19jb2xsZWN0aW9uGAsgASgIEjsKGGluYWN0aXZlX3Nlc3Npb25fdGltZW91dBgMIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIfChdlbmFibGVfYXVkaXRfbG9nX3N0ZG91dBgNIAEoCBIRCgl3YXRlcm1hcmsYDiABKAgSHAoUZGlyZWN0b3J5X3N5bmNfdG9rZW4YDyABKAkSVgoUcGFzc3dvcmRfcmVzdHJpY3Rpb24YESABKAsyOC5ieXRlYmFzZS52MS5Xb3Jrc3BhY2VQcm9maWxlU2V0dGluZy5QYXNzd29yZFJlc3RyaWN0aW9uEjgKFWFjY2Vzc190b2tlbl9kdXJhdGlvbhgSIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIUCgxlbmFibGVfZGVidWcYEyABKAgSFwoPc3FsX3Jlc3VsdF9zaXplGBQgASgDEjAKDXF1ZXJ5X3RpbWVvdXQYFSABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SHwoXYWxsb3dfZW1haWxfY29kZV9zaWduaW4YFiABKAgSGwoTc3FsX2VkaXRvcl90aGVtZV9pZBgXIAEoCRJDChdzcWxfZWRpdG9yX2N1c3RvbV90aGVtZRgYIAEoCzIiLmJ5dGViYXNlLnYxLlNRTEVkaXRvclRoZW1lU2V0dGluZxqEAgoTUGFzc3dvcmRSZXN0cmljdGlvbhISCgptaW5fbGVuZ3RoGAEgASgFEhYKDnJlcXVpcmVfbnVtYmVyGAIgASgIEhYKDnJlcXVpcmVfbGV0dGVyGAMgASgIEiAKGHJlcXVpcmVfdXBwZXJjYXNlX2xldHRlchgEIAEoCBIhChlyZXF1aXJlX3NwZWNpYWxfY2hhcmFjdGVyGAUgASgIEi4KJnJlcXVpcmVfcmVzZXRfcGFzc3dvcmRfZm9yX2ZpcnN0X2xvZ2luGAYgASgIEjQKEXBhc3N3b3JkX3JvdGF0aW9uGAcgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uSgQIEBARIskBChVTUUxFZGl0b3JUaGVtZVNldHRpbmcSCgoCaWQYASABKAkSDAoEbmFtZRgCIAEoCRITCgttb25hY29fYmFzZRgDIAEoCRI+CgZ0b2tlbnMYBCADKAsyLi5ieXRlYmFzZS52MS5TUUxFZGl0b3JUaGVtZVNldHRpbmcuVG9rZW5zRW50cnkaQQoLVG9rZW5zRW50cnkSCwoDa2V5GAEgASgJEiEKBXZhbHVlGAIgASgLMhIuZ29vZ2xlLnR5cGUuQ29sb3I6AjgBItIBCgxBbm5vdW5jZW1lbnQSDAoEdGV4dBgCIAEoCRIMCgRsaW5rGAMgASgJEjoKBXRoZW1lGAQgASgLMisuYnl0ZWJhc2UudjEuQW5ub3VuY2VtZW50LkFubm91bmNlbWVudFRoZW1lGl0KEUFubm91bmNlbWVudFRoZW1lEiYKCmJhY2tncm91bmQYASABKAsyEi5nb29nbGUudHlwZS5Db2xvchIgCgR0ZXh0GAIgASgLMhIuZ29vZ2xlLnR5cGUuQ29sb3JKBAgBEAJSBWxldmVsIv4CChhXb3Jrc3BhY2VBcHByb3ZhbFNldHRpbmcSOQoFcnVsZXMYASADKAsyKi5ieXRlYmFzZS52MS5Xb3Jrc3BhY2VBcHByb3ZhbFNldHRpbmcuUnVsZRqmAgoEUnVsZRIvCgh0ZW1wbGF0ZRgBIAEoCzIdLmJ5dGViYXNlLnYxLkFwcHJvdmFsVGVtcGxhdGUSJAoJY29uZGl0aW9uGAIgASgLMhEuZ29vZ2xlLnR5cGUuRXhwchJBCgZzb3VyY2UYAyABKA4yMS5ieXRlYmFzZS52MS5Xb3Jrc3BhY2VBcHByb3ZhbFNldHRpbmcuUnVsZS5Tb3VyY2UigwEKBlNvdXJjZRIWChJTT1VSQ0VfVU5TUEVDSUZJRUQQABITCg9DSEFOR0VfREFUQUJBU0UQARITCg9DUkVBVEVfREFUQUJBU0UQAhIQCgxSRVFVRVNUX1JPTEUQBBISCg5SRVFVRVNUX0FDQ0VTUxAFIgQIAxADKgtFWFBPUlRfREFUQSLrBAoZRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZxJQCgdjb25maWdzGAEgAygLMj8uYnl0ZWJhc2UudjEuRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZy5EYXRhQ2xhc3NpZmljYXRpb25Db25maWca+wMKGERhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZxIKCgJpZBgBIAEoCRINCgV0aXRsZRgCIAEoCRJVCgZsZXZlbHMYAyADKAsyRS5ieXRlYmFzZS52MS5EYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nLkRhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZy5MZXZlbBJrCg5jbGFzc2lmaWNhdGlvbhgEIAMoCzJTLmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcuRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnLkNsYXNzaWZpY2F0aW9uRW50cnkaJQoFTGV2ZWwSDQoFdGl0bGUYAiABKAkSDQoFbGV2ZWwYBCABKAUaTQoSRGF0YUNsYXNzaWZpY2F0aW9uEgoKAmlkGAEgASgJEg0KBXRpdGxlGAIgASgJEhIKBWxldmVsGAQgASgFSACIAQFCCAoGX2xldmVsGokBChNDbGFzc2lmaWNhdGlvbkVudHJ5EgsKA2tleRgBIAEoCRJhCgV2YWx1ZRgCIAEoCzJSLmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcuRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnLkRhdGFDbGFzc2lmaWNhdGlvbjoCOAEizAEKE1NlbWFudGljVHlwZVNldHRpbmcSPAoFdHlwZXMYASADKAsyLS5ieXRlYmFzZS52MS5TZW1hbnRpY1R5cGVTZXR0aW5nLlNlbWFudGljVHlwZRp3CgxTZW1hbnRpY1R5cGUSCgoCaWQYASABKAkSDQoFdGl0bGUYAiABKAkSEwoLZGVzY3JpcHRpb24YAyABKAkSKQoJYWxnb3JpdGhtGAYgASgLMhYuYnl0ZWJhc2UudjEuQWxnb3JpdGhtEgwKBGljb24YByABKAki/wQKCUFsZ29yaXRobRI0CglmdWxsX21hc2sYASABKAsyHy5ieXRlYmFzZS52MS5BbGdvcml0aG0uRnVsbE1hc2tIABI2CgpyYW5nZV9tYXNrGAIgASgLMiAuYnl0ZWJhc2UudjEuQWxnb3JpdGhtLlJhbmdlTWFza0gAEjIKCG1kNV9tYXNrGAMgASgLMh4uYnl0ZWJhc2UudjEuQWxnb3JpdGhtLk1ENU1hc2tIABJBChBpbm5lcl9vdXRlcl9tYXNrGAQgASgLMiUuYnl0ZWJhc2UudjEuQWxnb3JpdGhtLklubmVyT3V0ZXJNYXNrSAAaIAoIRnVsbE1hc2sSFAoMc3Vic3RpdHV0aW9uGAEgASgJGn4KCVJhbmdlTWFzaxI2CgZzbGljZXMYASADKAsyJi5ieXRlYmFzZS52MS5BbGdvcml0aG0uUmFuZ2VNYXNrLlNsaWNlGjkKBVNsaWNlEg0KBXN0YXJ0GAEgASgFEgsKA2VuZBgCIAEoBRIUCgxzdWJzdGl0dXRpb24YAyABKAkaFwoHTUQ1TWFzaxIMCgRzYWx0GAEgASgJGskBCg5Jbm5lck91dGVyTWFzaxISCgpwcmVmaXhfbGVuGAEgASgFEhIKCnN1ZmZpeF9sZW4YAiABKAUSPAoEdHlwZRgDIAEoDjIuLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5Jbm5lck91dGVyTWFzay5NYXNrVHlwZRIUCgxzdWJzdGl0dXRpb24YBCABKAkiOwoITWFza1R5cGUSGQoVTUFTS19UWVBFX1VOU1BFQ0lGSUVEEAASCQoFSU5ORVIQARIJCgVPVVRFUhACQgYKBG1hc2si7wEKCUFJU2V0dGluZxIPCgdlbmFibGVkGAEgASgIEjEKCHByb3ZpZGVyGAIgASgOMh8uYnl0ZWJhc2UudjEuQUlTZXR0aW5nLlByb3ZpZGVyEhAKCGVuZHBvaW50GAMgASgJEg8KB2FwaV9rZXkYBCABKAkSDQoFbW9kZWwYBSABKAkSDwoHdmVyc2lvbhgGIAEoCSJbCghQcm92aWRlchIYChRQUk9WSURFUl9VTlNQRUNJRklFRBAAEgsKB09QRU5fQUkQARIKCgZDTEFVREUQAhIKCgZHRU1JTkkQAxIQCgxBWlVSRV9PUEVOQUkQBCKWAgoSRW52aXJvbm1lbnRTZXR0aW5nEkEKDGVudmlyb25tZW50cxgBIAMoCzIrLmJ5dGViYXNlLnYxLkVudmlyb25tZW50U2V0dGluZy5FbnZpcm9ubWVudBq8AQoLRW52aXJvbm1lbnQSEQoEbmFtZRgBIAEoCUID4EEDEgoKAmlkGAIgASgJEg0KBXRpdGxlGAMgASgJEkMKBHRhZ3MYBCADKAsyNS5ieXRlYmFzZS52MS5FbnZpcm9ubWVudFNldHRpbmcuRW52aXJvbm1lbnQuVGFnc0VudHJ5Eg0KBWNvbG9yGAUgASgJGisKCVRhZ3NFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBIvQECgxFbWFpbFNldHRpbmcSDAoEZnJvbRgBIAEoCRIRCglmcm9tX25hbWUYAiABKAkSLAoEdHlwZRgDIAEoDjIeLmJ5dGViYXNlLnYxLkVtYWlsU2V0dGluZy5UeXBlEjQKBHNtdHAYBCABKAsyJC5ieXRlYmFzZS52MS5FbWFpbFNldHRpbmcuU01UUENvbmZpZ0gAGqwDCgpTTVRQQ29uZmlnEgwKBGhvc3QYASABKAkSDAoEcG9ydBgCIAEoBRIQCgh1c2VybmFtZRgDIAEoCRIVCghwYXNzd29yZBgEIAEoCUID4EEEEkMKCmVuY3J5cHRpb24YBSABKA4yLy5ieXRlYmFzZS52MS5FbWFpbFNldHRpbmcuU01UUENvbmZpZy5FbmNyeXB0aW9uEksKDmF1dGhlbnRpY2F0aW9uGAYgASgOMjMuYnl0ZWJhc2UudjEuRW1haWxTZXR0aW5nLlNNVFBDb25maWcuQXV0aGVudGljYXRpb24iWAoKRW5jcnlwdGlvbhIaChZFTkNSWVBUSU9OX1VOU1BFQ0lGSUVEEAASEwoPRU5DUllQVElPTl9OT05FEAESDAoIU1RBUlRUTFMQAhILCgdTU0xfVExTEAMibQoOQXV0aGVudGljYXRpb24SHgoaQVVUSEVOVElDQVRJT05fVU5TUEVDSUZJRUQQABIXChNBVVRIRU5USUNBVElPTl9OT05FEAESCQoFUExBSU4QAhIJCgVMT0dJThADEgwKCENSQU1fTUQ1EAQiJgoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASCAoEU01UUBABQggKBmNvbmZpZyJ2ChdUZXN0RW1haWxTZXR0aW5nUmVxdWVzdBITCgZwYXJlbnQYASABKAlCA+BBAhI1Cg1lbWFpbF9zZXR0aW5nGAIgASgLMhkuYnl0ZWJhc2UudjEuRW1haWxTZXR0aW5nQgPgQQISDwoCdG8YAyABKAlCA+BBAiI6ChhUZXN0RW1haWxTZXR0aW5nUmVzcG9uc2USDwoHc3VjY2VzcxgBIAEoCBINCgVlcnJvchgCIAEoCSpUChJEYXRhYmFzZUNoYW5nZU1vZGUSJAogREFUQUJBU0VfQ0hBTkdFX01PREVfVU5TUEVDSUZJRUQQABIMCghQSVBFTElORRABEgoKBkVESVRPUhACMuEECg5TZXR0aW5nU2VydmljZRKEAQoMTGlzdFNldHRpbmdzEiAuYnl0ZWJhc2UudjEuTGlzdFNldHRpbmdzUmVxdWVzdBohLmJ5dGViYXNlLnYxLkxpc3RTZXR0aW5nc1Jlc3BvbnNlIi/aQQCK6jAQYmIuc2V0dGluZ3MubGlzdJDqMAGC0+STAg4SDC92MS9zZXR0aW5ncxJ/CgpHZXRTZXR0aW5nEh4uYnl0ZWJhc2UudjEuR2V0U2V0dGluZ1JlcXVlc3QaFC5ieXRlYmFzZS52MS5TZXR0aW5nIjvaQQRuYW1liuowD2JiLnNldHRpbmdzLmdldJDqMAKC0+STAhcSFS92MS97bmFtZT1zZXR0aW5ncy8qfRKTAQoNVXBkYXRlU2V0dGluZxIhLmJ5dGViYXNlLnYxLlVwZGF0ZVNldHRpbmdSZXF1ZXN0GhQuYnl0ZWJhc2UudjEuU2V0dGluZyJJiuowD2JiLnNldHRpbmdzLnNldJDqMAKY6jABgtPkkwIoOgdzZXR0aW5nMh0vdjEve3NldHRpbmcubmFtZT1zZXR0aW5ncy8qfRKwAQoQVGVzdEVtYWlsU2V0dGluZxIkLmJ5dGViYXNlLnYxLlRlc3RFbWFpbFNldHRpbmdSZXF1ZXN0GiUuYnl0ZWJhc2UudjEuVGVzdEVtYWlsU2V0dGluZ1Jlc3BvbnNlIk+K6jAPYmIuc2V0dGluZ3Muc2V0kOowAYLT5JMCMjoBKiItL3YxL3twYXJlbnQ9d29ya3NwYWNlcy8qfS9zZXR0aW5ncy9FTUFJTDp0ZXN0QqkBCg9jb20uYnl0ZWJhc2UudjFCE1NldHRpbmdTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [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_color, file_google_type_expr, file_v1_annotation, file_v1_common, file_v1_issue_service]);
/**
* Describes the message bytebase.v1.ListSettingsRequest.
diff --git a/frontend/src/utils/css.test.ts b/frontend/src/utils/css.test.ts
new file mode 100644
index 0000000000..ed08f8e993
--- /dev/null
+++ b/frontend/src/utils/css.test.ts
@@ -0,0 +1,20 @@
+import { describe, expect, test } from "vitest";
+import { colorToHex, colorToRgbString, hexToColor } from "./css";
+
+describe("google.type.Color helpers", () => {
+ test("converts #rrggbb hex to google.type.Color channels", () => {
+ expect(hexToColor("#336699")).toMatchObject({
+ red: 0.2,
+ green: 0.4,
+ blue: 0.6,
+ });
+ });
+
+ test("converts google.type.Color to #rrggbb hex", () => {
+ expect(colorToHex(hexToColor("#336699"))).toBe("#336699");
+ });
+
+ test("converts google.type.Color to CSS rgb channel string", () => {
+ expect(colorToRgbString(hexToColor("#336699"))).toBe("51 102 153");
+ });
+});
diff --git a/frontend/src/utils/css.ts b/frontend/src/utils/css.ts
index 4a1b358c68..c10082bbf4 100644
--- a/frontend/src/utils/css.ts
+++ b/frontend/src/utils/css.ts
@@ -1,3 +1,6 @@
+import { create } from "@bufbuild/protobuf";
+import { type Color, ColorSchema } from "@/types/proto-es/google/type/color_pb";
+
// Tailwind CSS default breakpoints
// https://tailwindcss.com/docs/responsive-design
export const TailwindBreakpoints = {
@@ -31,6 +34,28 @@ export const hexToRgb = (hex: string) => {
return hexValues.map((str) => parseInt(str, 16));
};
+const channelToByte = (channel: number): number =>
+ Math.max(0, Math.min(255, Math.round(channel * 255)));
+
+export const colorToHex = (color: Color): string =>
+ rgbToHex(
+ channelToByte(color.red),
+ channelToByte(color.green),
+ channelToByte(color.blue)
+ );
+
+export const colorToRgbString = (color: Color): string =>
+ [color.red, color.green, color.blue].map(channelToByte).join(" ");
+
+export const hexToColor = (hex: string): Color => {
+ const [red, green, blue] = hexToRgb(hex);
+ return create(ColorSchema, {
+ red: red / 255,
+ green: green / 255,
+ blue: blue / 255,
+ });
+};
+
/**
*
* @param name css variable name including "--" prefix
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index 729a3c6eb1..b07a966cf4 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -16183,13 +16183,11 @@ components:
type: object
properties:
background:
- type: string
title: background
- description: '"r g b"'
+ $ref: '#/components/schemas/google.type.Color'
text:
- type: string
title: text
- description: '"r g b"'
+ $ref: '#/components/schemas/google.type.Color'
title: AnnouncementTheme
additionalProperties: false
bytebase.v1.AppIMSetting:
@@ -25089,8 +25087,9 @@ components:
type: object
title: tokens
additionalProperties:
- type: string
title: value
+ $ref: '#/components/schemas/google.type.Color'
+ description: CSS token colors.
title: SQLEditorThemeSetting
additionalProperties: false
bytebase.v1.SQLEditorThemeSetting.TokensEntry:
@@ -25100,8 +25099,8 @@ components:
type: string
title: key
value:
- type: string
title: value
+ $ref: '#/components/schemas/google.type.Color'
title: TokensEntry
additionalProperties: false
bytebase.v1.SQLReviewRule:
@@ -29963,6 +29962,17 @@ components:
The implementation of any API method which has a FieldMask type field in the
request should verify the included field paths, and return an
`INVALID_ARGUMENT` error if any path is unmappable.
+ google.protobuf.FloatValue:
+ oneOf:
+ - type: string
+ - type: number
+ description: |-
+ Wrapper message for `float`.
+
+ The JSON representation for `FloatValue` is JSON number.
+
+ Not recommended for use in new APIs, but still useful for legacy APIs and
+ has no plan to be removed.
google.protobuf.ListValue:
type: object
properties:
@@ -30160,6 +30170,166 @@ components:
You can find out more about this error model and how to work with it in the
[API Design Guide](https://cloud.google.com/apis/design/errors).
+ google.type.Color:
+ type: object
+ properties:
+ red:
+ type: number
+ title: red
+ format: float
+ description: The amount of red in the color as a value in the interval [0, 1].
+ green:
+ type: number
+ title: green
+ format: float
+ description: The amount of green in the color as a value in the interval [0, 1].
+ blue:
+ type: number
+ title: blue
+ format: float
+ description: The amount of blue in the color as a value in the interval [0, 1].
+ alpha:
+ title: alpha
+ description: |-
+ The fraction of this color that should be applied to the pixel. That is,
+ the final pixel color is defined by the equation:
+
+ `pixel color = alpha * (this color) + (1.0 - alpha) * (background color)`
+
+ This means that a value of 1.0 corresponds to a solid color, whereas
+ a value of 0.0 corresponds to a completely transparent color. This
+ uses a wrapper message rather than a simple float scalar so that it is
+ possible to distinguish between a default value and the value being unset.
+ If omitted, this color object is rendered as a solid color
+ (as if the alpha value had been explicitly given a value of 1.0).
+ $ref: '#/components/schemas/google.protobuf.FloatValue'
+ title: Color
+ additionalProperties: false
+ description: |-
+ Represents a color in the RGBA color space. This representation is designed
+ for simplicity of conversion to/from color representations in various
+ languages over compactness. For example, the fields of this representation
+ can be trivially provided to the constructor of `java.awt.Color` in Java; it
+ can also be trivially provided to UIColor's `+colorWithRed:green:blue:alpha`
+ method in iOS; and, with just a little work, it can be easily formatted into
+ a CSS `rgba()` string in JavaScript.
+
+ This reference page doesn't carry information about the absolute color
+ space
+ that should be used to interpret the RGB value (e.g. sRGB, Adobe RGB,
+ DCI-P3, BT.2020, etc.). By default, applications should assume the sRGB color
+ space.
+
+ When color equality needs to be decided, implementations, unless
+ documented otherwise, treat two colors as equal if all their red,
+ green, blue, and alpha values each differ by at most 1e-5.
+
+ Example (Java):
+
+ import com.google.type.Color;
+
+ // ...
+ public static java.awt.Color fromProto(Color protocolor) {
+ float alpha = protocolor.hasAlpha()
+ ? protocolor.getAlpha().getValue()
+ : 1.0;
+
+ return new java.awt.Color(
+ protocolor.getRed(),
+ protocolor.getGreen(),
+ protocolor.getBlue(),
+ alpha);
+ }
+
+ public static Color toProto(java.awt.Color color) {
+ float red = (float) color.getRed();
+ float green = (float) color.getGreen();
+ float blue = (float) color.getBlue();
+ float denominator = 255.0;
+ Color.Builder resultBuilder =
+ Color
+ .newBuilder()
+ .setRed(red / denominator)
+ .setGreen(green / denominator)
+ .setBlue(blue / denominator);
+ int alpha = color.getAlpha();
+ if (alpha != 255) {
+ result.setAlpha(
+ FloatValue
+ .newBuilder()
+ .setValue(((float) alpha) / denominator)
+ .build());
+ }
+ return resultBuilder.build();
+ }
+ // ...
+
+ Example (iOS / Obj-C):
+
+ // ...
+ static UIColor* fromProto(Color* protocolor) {
+ float red = [protocolor red];
+ float green = [protocolor green];
+ float blue = [protocolor blue];
+ FloatValue* alpha_wrapper = [protocolor alpha];
+ float alpha = 1.0;
+ if (alpha_wrapper != nil) {
+ alpha = [alpha_wrapper value];
+ }
+ return [UIColor colorWithRed:red green:green blue:blue alpha:alpha];
+ }
+
+ static Color* toProto(UIColor* color) {
+ CGFloat red, green, blue, alpha;
+ if (![color getRed:&red green:&green blue:&blue alpha:&alpha]) {
+ return nil;
+ }
+ Color* result = [[Color alloc] init];
+ [result setRed:red];
+ [result setGreen:green];
+ [result setBlue:blue];
+ if (alpha <= 0.9999) {
+ [result setAlpha:floatWrapperWithValue(alpha)];
+ }
+ [result autorelease];
+ return result;
+ }
+ // ...
+
+ Example (JavaScript):
+
+ // ...
+
+ var protoToCssColor = function(rgb_color) {
+ var redFrac = rgb_color.red || 0.0;
+ var greenFrac = rgb_color.green || 0.0;
+ var blueFrac = rgb_color.blue || 0.0;
+ var red = Math.floor(redFrac * 255);
+ var green = Math.floor(greenFrac * 255);
+ var blue = Math.floor(blueFrac * 255);
+
+ if (!('alpha' in rgb_color)) {
+ return rgbToCssColor(red, green, blue);
+ }
+
+ var alphaFrac = rgb_color.alpha.value || 0.0;
+ var rgbParams = [red, green, blue].join(',');
+ return ['rgba(', rgbParams, ',', alphaFrac, ')'].join('');
+ };
+
+ var rgbToCssColor = function(red, green, blue) {
+ var rgbNumber = new Number((red << 16) | (green << 8) | blue);
+ var hexString = rgbNumber.toString(16);
+ var missingZeros = 6 - hexString.length;
+ var resultBuilder = ['#'];
+ for (var i = 0; i < missingZeros; i++) {
+ resultBuilder.push('0');
+ }
+ resultBuilder.push(hexString);
+ return resultBuilder.join('');
+ };
+
+ // ...
google.type.Expr:
type: object
properties:
diff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.md
index ec4dedeeb7..0388b10afe 100644
--- a/proto/gen/grpc-doc/store/README.md
+++ b/proto/gen/grpc-doc/store/README.md
@@ -4528,7 +4528,7 @@ All other settings live in per-workspace WORKSPACE_PROFILE.
| id | [string](#string) | | |
| name | [string](#string) | | |
| monaco_base | [string](#string) | | |
-| tokens | [SQLEditorThemeSetting.TokensEntry](#bytebase-store-SQLEditorThemeSetting-TokensEntry) | repeated | |
+| tokens | [SQLEditorThemeSetting.TokensEntry](#bytebase-store-SQLEditorThemeSetting-TokensEntry) | repeated | CSS token colors. |
@@ -4544,7 +4544,7 @@ All other settings live in per-workspace WORKSPACE_PROFILE.
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
| key | [string](#string) | | |
-| value | [string](#string) | | |
+| value | [google.type.Color](#google-type-Color) | | |
@@ -4694,8 +4694,8 @@ All other settings live in per-workspace WORKSPACE_PROFILE.
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
-| background | [string](#string) | | &#34;r g b&#34; |
-| text | [string](#string) | | &#34;r g b&#34; |
+| background | [google.type.Color](#google-type-Color) | | |
+| text | [google.type.Color](#google-type-Color) | | |
diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.html
index fc14567cfa..92ec158f0b 100644
--- a/proto/gen/grpc-doc/store/index.html
+++ b/proto/gen/grpc-doc/store/index.html
@@ -12442,7 +12442,7 @@ are /[a-z][0-9]-/. </p></td>
<td>tokens</td>
<td><a href="#bytebase.store.SQLEditorThemeSetting.TokensEntry">SQLEditorThemeSetting.TokensEntry</a></td>
<td>repeated</td>
- <td><p> </p></td>
+ <td><p>CSS token colors. </p></td>
</tr>
</tbody>
@@ -12471,7 +12471,7 @@ are /[a-z][0-9]-/. </p></td>
<tr>
<td>value</td>
- <td><a href="#string">string</a></td>
+ <td><a href="#google.type.Color">google.type.Color</a></td>
<td></td>
<td><p> </p></td>
</tr>
@@ -12880,16 +12880,16 @@ frontend-only concept that seeds these colors; the store only holds them. </p></
<tr>
<td>background</td>
- <td><a href="#string">string</a></td>
+ <td><a href="#google.type.Color">google.type.Color</a></td>
<td></td>
- <td><p>&#34;r g b&#34; </p></td>
+ <td><p> </p></td>
</tr>
<tr>
<td>text</td>
- <td><a href="#string">string</a></td>
+ <td><a href="#google.type.Color">google.type.Color</a></td>
<td></td>
- <td><p>&#34;r g b&#34; </p></td>
+ <td><p> </p></td>
</tr>
</tbody>
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index 21bc41d329..defabd43ca 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -6117,8 +6117,8 @@ IssueService manages issues for tracking database changes and tasks.
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
-| background | [string](#string) | | &#34;r g b&#34; |
-| text | [string](#string) | | &#34;r g b&#34; |
+| background | [google.type.Color](#google-type-Color) | | |
+| text | [google.type.Color](#google-type-Color) | | |
@@ -6495,7 +6495,7 @@ The response message for getting a setting.
| id | [string](#string) | | |
| name | [string](#string) | | |
| monaco_base | [string](#string) | | |
-| tokens | [SQLEditorThemeSetting.TokensEntry](#bytebase-v1-SQLEditorThemeSetting-TokensEntry) | repeated | |
+| tokens | [SQLEditorThemeSetting.TokensEntry](#bytebase-v1-SQLEditorThemeSetting-TokensEntry) | repeated | CSS token colors. |
@@ -6511,7 +6511,7 @@ The response message for getting a setting.
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
| key | [string](#string) | | |
-| value | [string](#string) | | |
+| value | [google.type.Color](#google-type-Color) | | |
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index b9ab3d94b8..3a7cec4cb7 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -18101,16 +18101,16 @@ frontend-only concept that seeds these colors; the store only holds them. </p></
<tr>
<td>background</td>
- <td><a href="#string">string</a></td>
+ <td><a href="#google.type.Color">google.type.Color</a></td>
<td></td>
- <td><p>&#34;r g b&#34; </p></td>
+ <td><p> </p></td>
</tr>
<tr>
<td>text</td>
- <td><a href="#string">string</a></td>
+ <td><a href="#google.type.Color">google.type.Color</a></td>
<td></td>
- <td><p>&#34;r g b&#34; </p></td>
+ <td><p> </p></td>
</tr>
</tbody>
@@ -18909,7 +18909,7 @@ are /[a-z][0-9]-/. </p></td>
<td>tokens</td>
<td><a href="#bytebase.v1.SQLEditorThemeSetting.TokensEntry">SQLEditorThemeSetting.TokensEntry</a></td>
<td>repeated</td>
- <td><p> </p></td>
+ <td><p>CSS token colors. </p></td>
</tr>
</tbody>
@@ -18938,7 +18938,7 @@ are /[a-z][0-9]-/. </p></td>
<tr>
<td>value</td>
- <td><a href="#string">string</a></td>
+ <td><a href="#google.type.Color">google.type.Color</a></td>
<td></td>
<td><p> </p></td>
</tr>
diff --git a/proto/store/store/setting.proto b/proto/store/store/setting.proto
index f751655706..52a5474150 100644
--- a/proto/store/store/setting.proto
+++ b/proto/store/store/setting.proto
@@ -4,6 +4,7 @@ package bytebase.store;
import "google/api/field_behavior.proto";
import "google/protobuf/duration.proto";
+import "google/type/color.proto";
import "google/type/expr.proto";
import "store/approval.proto";
import "store/common.proto";
@@ -40,8 +41,8 @@ message WorkspaceProfileSetting {
reserved "level";
message AnnouncementTheme {
- string background = 1; // "r g b"
- string text = 2; // "r g b"
+ google.type.Color background = 1;
+ google.type.Color text = 2;
}
// The text of the announcement.
@@ -162,7 +163,8 @@ message SQLEditorThemeSetting {
string id = 1;
string name = 2;
string monaco_base = 3;
- map<string, string> tokens = 4;
+ // CSS token colors.
+ map<string, google.type.Color> tokens = 4;
}
message WorkspaceApprovalSetting {
diff --git a/proto/v1/v1/setting_service.proto b/proto/v1/v1/setting_service.proto
index 57f7b4f745..926ca97219 100644
--- a/proto/v1/v1/setting_service.proto
+++ b/proto/v1/v1/setting_service.proto
@@ -8,6 +8,7 @@ import "google/api/field_behavior.proto";
import "google/api/resource.proto";
import "google/protobuf/duration.proto";
import "google/protobuf/field_mask.proto";
+import "google/type/color.proto";
import "google/type/expr.proto";
import "v1/annotation.proto";
import "v1/common.proto";
@@ -281,7 +282,8 @@ message SQLEditorThemeSetting {
string id = 1;
string name = 2;
string monaco_base = 3;
- map<string, string> tokens = 4;
+ // CSS token colors.
+ map<string, google.type.Color> tokens = 4;
}
message Announcement {
@@ -289,8 +291,8 @@ message Announcement {
reserved "level";
message AnnouncementTheme {
- string background = 1; // "r g b"
- string text = 2; // "r g b"
+ google.type.Color background = 1;
+ google.type.Color text = 2;
}
// The text of announcement