Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
chore: tweak naming
Stevenb8763905bae3
diff --git a/docs/apidocs.swagger.yaml b/docs/apidocs.swagger.yamlindex 98aa5b818..69a0939c4 100644--- a/docs/apidocs.swagger.yaml+++ b/docs/apidocs.swagger.yaml@@ -2072,14 +2072,14 @@ definitions:type: stringenum:- STORAGE_TYPE_UNSPECIFIED- - STORAGE_TYPE_DATABASE- - STORAGE_TYPE_LOCAL- - STORAGE_TYPE_S3+ - DATABASE+ - LOCAL+ - S3default: STORAGE_TYPE_UNSPECIFIEDdescription: |2-- - STORAGE_TYPE_DATABASE: STORAGE_TYPE_DATABASE is the database storage type.- - STORAGE_TYPE_LOCAL: STORAGE_TYPE_LOCAL is the local storage type.- - STORAGE_TYPE_S3: STORAGE_TYPE_S3 is the S3 storage type.+ - DATABASE: DATABASE is the database storage type.+ - LOCAL: LOCAL is the local storage type.+ - S3: S3 is the S3 storage type.googlerpcStatus:type: objectproperties:@@ -2394,8 +2394,8 @@ definitions:type: stringenum:- TYPE_UNSPECIFIED- - TYPE_MEMO_COMMENT- - TYPE_VERSION_UPDATE+ - MEMO_COMMENT+ - VERSION_UPDATEdefault: TYPE_UNSPECIFIEDv1ItalicNode:type: objectdiff --git a/proto/api/v1/inbox_service.proto b/proto/api/v1/inbox_service.protoindex 425ef1dd2..8bb3f2232 100644--- a/proto/api/v1/inbox_service.proto+++ b/proto/api/v1/inbox_service.proto@@ -50,8 +50,8 @@ message Inbox {enum Type {TYPE_UNSPECIFIED = 0;- TYPE_MEMO_COMMENT = 1;- TYPE_VERSION_UPDATE = 2;+ MEMO_COMMENT = 1;+ VERSION_UPDATE = 2;}Type type = 6;diff --git a/proto/api/v1/workspace_setting_service.proto b/proto/api/v1/workspace_setting_service.protoindex 0fc3f22e0..ac5693c30 100644--- a/proto/api/v1/workspace_setting_service.proto+++ b/proto/api/v1/workspace_setting_service.proto@@ -61,12 +61,12 @@ message WorkspaceCustomProfile {message WorkspaceStorageSetting {enum StorageType {STORAGE_TYPE_UNSPECIFIED = 0;- // STORAGE_TYPE_DATABASE is the database storage type.- STORAGE_TYPE_DATABASE = 1;- // STORAGE_TYPE_LOCAL is the local storage type.- STORAGE_TYPE_LOCAL = 2;- // STORAGE_TYPE_S3 is the S3 storage type.- STORAGE_TYPE_S3 = 3;+ // DATABASE is the database storage type.+ DATABASE = 1;+ // LOCAL is the local storage type.+ LOCAL = 2;+ // S3 is the S3 storage type.+ S3 = 3;}// storage_type is the storage type.StorageType storage_type = 1;diff --git a/proto/gen/api/v1/inbox_service.pb.go b/proto/gen/api/v1/inbox_service.pb.goindex 02efb78bf..8f552eccd 100644--- a/proto/gen/api/v1/inbox_service.pb.go+++ b/proto/gen/api/v1/inbox_service.pb.go@@ -76,22 +76,22 @@ func (Inbox_Status) EnumDescriptor() ([]byte, []int) {type Inbox_Type int32const (- Inbox_TYPE_UNSPECIFIED Inbox_Type = 0- Inbox_TYPE_MEMO_COMMENT Inbox_Type = 1- Inbox_TYPE_VERSION_UPDATE Inbox_Type = 2+ Inbox_TYPE_UNSPECIFIED Inbox_Type = 0+ Inbox_MEMO_COMMENT Inbox_Type = 1+ Inbox_VERSION_UPDATE Inbox_Type = 2)// Enum value maps for Inbox_Type.var (Inbox_Type_name = map[int32]string{0: "TYPE_UNSPECIFIED",- 1: "TYPE_MEMO_COMMENT",- 2: "TYPE_VERSION_UPDATE",+ 1: "MEMO_COMMENT",+ 2: "VERSION_UPDATE",}Inbox_Type_value = map[string]int32{- "TYPE_UNSPECIFIED": 0,- "TYPE_MEMO_COMMENT": 1,- "TYPE_VERSION_UPDATE": 2,+ "TYPE_UNSPECIFIED": 0,+ "MEMO_COMMENT": 1,+ "VERSION_UPDATE": 2,})@@ -435,7 +435,7 @@ var file_api_v1_inbox_service_proto_rawDesc = []byte{0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x6d, 0x61, 0x73, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74,- 0x6f, 0x22, 0xae, 0x03, 0x0a, 0x05, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x12, 0x12, 0x0a, 0x04, 0x6e,+ 0x6f, 0x22, 0xa4, 0x03, 0x0a, 0x05, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x12, 0x12, 0x0a, 0x04, 0x6e,0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12,0x16, 0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69,@@ -456,65 +456,64 @@ var file_api_v1_inbox_service_proto_rawDesc = []byte{0x75, 0x73, 0x12, 0x16, 0x0a, 0x12, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x55, 0x4e, 0x53,0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x55, 0x4e,0x52, 0x45, 0x41, 0x44, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x41, 0x52, 0x43, 0x48, 0x49, 0x56,- 0x45, 0x44, 0x10, 0x02, 0x22, 0x4c, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x10,+ 0x45, 0x44, 0x10, 0x02, 0x22, 0x42, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x10,0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44,- 0x10, 0x00, 0x12, 0x15, 0x0a, 0x11, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4d, 0x45, 0x4d, 0x4f, 0x5f,- 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x10, 0x01, 0x12, 0x17, 0x0a, 0x13, 0x54, 0x59, 0x50,- 0x45, 0x5f, 0x56, 0x45, 0x52, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45,- 0x10, 0x02, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x5f,- 0x69, 0x64, 0x22, 0x28, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x65,- 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72,- 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x22, 0x44, 0x0a, 0x13,- 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,- 0x6e, 0x73, 0x65, 0x12, 0x2d, 0x0a, 0x07, 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x65, 0x73, 0x18, 0x01,- 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69,- 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x52, 0x07, 0x69, 0x6e, 0x62, 0x6f, 0x78,- 0x65, 0x73, 0x22, 0x7c, 0x0a, 0x12, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x62, 0x6f,- 0x78, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x29, 0x0a, 0x05, 0x69, 0x6e, 0x62, 0x6f,- 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e,- 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x52, 0x05, 0x69, 0x6e,- 0x62, 0x6f, 0x78, 0x12, 0x3b, 0x0a, 0x0b, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x6d, 0x61,- 0x73, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,- 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64,- 0x4d, 0x61, 0x73, 0x6b, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x61, 0x73, 0x6b,- 0x22, 0x28, 0x0a, 0x12, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x52,- 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01,- 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x32, 0xf7, 0x02, 0x0a, 0x0c, 0x49,- 0x6e, 0x62, 0x6f, 0x78, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x6b, 0x0a, 0x0b, 0x4c,- 0x69, 0x73, 0x74, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x65, 0x73, 0x12, 0x20, 0x2e, 0x6d, 0x65, 0x6d,- 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e,- 0x62, 0x6f, 0x78, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x6d,- 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74,- 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,- 0x17, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x11, 0x12, 0x0f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31,- 0x2f, 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x65, 0x73, 0x12, 0x87, 0x01, 0x0a, 0x0b, 0x55, 0x70, 0x64,- 0x61, 0x74, 0x65, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x12, 0x20, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73,- 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x49, 0x6e,- 0x62, 0x6f, 0x78, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x6d, 0x65, 0x6d,- 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x22,- 0x41, 0xda, 0x41, 0x11, 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x2c, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65,- 0x5f, 0x6d, 0x61, 0x73, 0x6b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x27, 0x3a, 0x05, 0x69, 0x6e, 0x62,- 0x6f, 0x78, 0x32, 0x1e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x7b, 0x69, 0x6e, 0x62,- 0x6f, 0x78, 0x2e, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x65, 0x73, 0x2f,- 0x2a, 0x7d, 0x12, 0x70, 0x0a, 0x0b, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x6e, 0x62, 0x6f,- 0x78, 0x12, 0x20, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31,- 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x52, 0x65, 0x71, 0x75,- 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,- 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x27, 0xda, 0x41, 0x04,- 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x2a, 0x18, 0x2f, 0x61, 0x70, 0x69,- 0x2f, 0x76, 0x31, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x65,- 0x73, 0x2f, 0x2a, 0x7d, 0x42, 0xa9, 0x01, 0x0a, 0x10, 0x63, 0x6f, 0x6d, 0x2e, 0x6d, 0x65, 0x6d,- 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x42, 0x11, 0x49, 0x6e, 0x62, 0x6f, 0x78,- 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30,- 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x75, 0x73, 0x65, 0x6d, 0x65,- 0x6d, 0x6f, 0x73, 0x2f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f,- 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x3b, 0x61, 0x70, 0x69, 0x76, 0x31,- 0xa2, 0x02, 0x03, 0x4d, 0x41, 0x58, 0xaa, 0x02, 0x0c, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x41,- 0x70, 0x69, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0c, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x70,- 0x69, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x18, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69,- 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea,- 0x02, 0x0e, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x41, 0x70, 0x69, 0x3a, 0x3a, 0x56, 0x31,- 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,+ 0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c, 0x4d, 0x45, 0x4d, 0x4f, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45,+ 0x4e, 0x54, 0x10, 0x01, 0x12, 0x12, 0x0a, 0x0e, 0x56, 0x45, 0x52, 0x53, 0x49, 0x4f, 0x4e, 0x5f,+ 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x10, 0x02, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x61, 0x63, 0x74,+ 0x69, 0x76, 0x69, 0x74, 0x79, 0x5f, 0x69, 0x64, 0x22, 0x28, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74,+ 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12,+ 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x73,+ 0x65, 0x72, 0x22, 0x44, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x65,+ 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2d, 0x0a, 0x07, 0x69, 0x6e, 0x62,+ 0x6f, 0x78, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x65, 0x6d,+ 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x52,+ 0x07, 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x65, 0x73, 0x22, 0x7c, 0x0a, 0x12, 0x55, 0x70, 0x64, 0x61,+ 0x74, 0x65, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x29,+ 0x0a, 0x05, 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e,+ 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x62,+ 0x6f, 0x78, 0x52, 0x05, 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x12, 0x3b, 0x0a, 0x0b, 0x75, 0x70, 0x64,+ 0x61, 0x74, 0x65, 0x5f, 0x6d, 0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a,+ 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,+ 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4d, 0x61, 0x73, 0x6b, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61,+ 0x74, 0x65, 0x4d, 0x61, 0x73, 0x6b, 0x22, 0x28, 0x0a, 0x12, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65,+ 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04,+ 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,+ 0x32, 0xf7, 0x02, 0x0a, 0x0c, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,+ 0x65, 0x12, 0x6b, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x65, 0x73,+ 0x12, 0x20, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e,+ 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,+ 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,+ 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x65, 0x73, 0x52, 0x65, 0x73,+ 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x17, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x11, 0x12, 0x0f, 0x2f,+ 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x65, 0x73, 0x12, 0x87,+ 0x01, 0x0a, 0x0b, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x12, 0x20,+ 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70,+ 0x64, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,+ 0x1a, 0x13, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e,+ 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x22, 0x41, 0xda, 0x41, 0x11, 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x2c,+ 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x6d, 0x61, 0x73, 0x6b, 0x82, 0xd3, 0xe4, 0x93, 0x02,+ 0x27, 0x3a, 0x05, 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x32, 0x1e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76,+ 0x31, 0x2f, 0x7b, 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x2e, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x69, 0x6e,+ 0x62, 0x6f, 0x78, 0x65, 0x73, 0x2f, 0x2a, 0x7d, 0x12, 0x70, 0x0a, 0x0b, 0x44, 0x65, 0x6c, 0x65,+ 0x74, 0x65, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x12, 0x20, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e,+ 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x6e, 0x62,+ 0x6f, 0x78, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67,+ 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74,+ 0x79, 0x22, 0x27, 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a,+ 0x2a, 0x18, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d,+ 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x65, 0x73, 0x2f, 0x2a, 0x7d, 0x42, 0xa9, 0x01, 0x0a, 0x10, 0x63,+ 0x6f, 0x6d, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x42,+ 0x11, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f,+ 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,+ 0x2f, 0x75, 0x73, 0x65, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f,+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31,+ 0x3b, 0x61, 0x70, 0x69, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x4d, 0x41, 0x58, 0xaa, 0x02, 0x0c, 0x4d,+ 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x70, 0x69, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0c, 0x4d, 0x65,+ 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x18, 0x4d, 0x65, 0x6d,+ 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74,+ 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x41,+ 0x70, 0x69, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,}var (diff --git a/proto/gen/api/v1/workspace_setting_service.pb.go b/proto/gen/api/v1/workspace_setting_service.pb.goindex 14c2d18aa..31c70314d 100644--- a/proto/gen/api/v1/workspace_setting_service.pb.go+++ b/proto/gen/api/v1/workspace_setting_service.pb.go@@ -25,27 +25,27 @@ type WorkspaceStorageSetting_StorageType int32const (WorkspaceStorageSetting_STORAGE_TYPE_UNSPECIFIED WorkspaceStorageSetting_StorageType = 0- // STORAGE_TYPE_DATABASE is the database storage type.- WorkspaceStorageSetting_STORAGE_TYPE_DATABASE WorkspaceStorageSetting_StorageType = 1- // STORAGE_TYPE_LOCAL is the local storage type.- WorkspaceStorageSetting_STORAGE_TYPE_LOCAL WorkspaceStorageSetting_StorageType = 2- // STORAGE_TYPE_S3 is the S3 storage type.- WorkspaceStorageSetting_STORAGE_TYPE_S3 WorkspaceStorageSetting_StorageType = 3+ // DATABASE is the database storage type.+ WorkspaceStorageSetting_DATABASE WorkspaceStorageSetting_StorageType = 1+ // LOCAL is the local storage type.+ WorkspaceStorageSetting_LOCAL WorkspaceStorageSetting_StorageType = 2+ // S3 is the S3 storage type.+ WorkspaceStorageSetting_S3 WorkspaceStorageSetting_StorageType = 3)// Enum value maps for WorkspaceStorageSetting_StorageType.var (WorkspaceStorageSetting_StorageType_name = map[int32]string{0: "STORAGE_TYPE_UNSPECIFIED",- 1: "STORAGE_TYPE_DATABASE",- 2: "STORAGE_TYPE_LOCAL",- 3: "STORAGE_TYPE_S3",+ 1: "DATABASE",+ 2: "LOCAL",+ 3: "S3",}WorkspaceStorageSetting_StorageType_value = map[string]int32{"STORAGE_TYPE_UNSPECIFIED": 0,- "STORAGE_TYPE_DATABASE": 1,- "STORAGE_TYPE_LOCAL": 2,- "STORAGE_TYPE_S3": 3,+ "DATABASE": 1,+ "LOCAL": 2,+ "S3": 3,})@@ -733,7 +733,7 @@ var file_api_v1_workspace_setting_service_proto_rawDesc = []byte{0x6f, 0x67, 0x6f, 0x55, 0x72, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x65,0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x65, 0x12, 0x1e,0x0a, 0x0a, 0x61, 0x70, 0x70, 0x65, 0x61, 0x72, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01,- 0x28, 0x09, 0x52, 0x0a, 0x61, 0x70, 0x70, 0x65, 0x61, 0x72, 0x61, 0x6e, 0x63, 0x65, 0x22, 0xb8,+ 0x28, 0x09, 0x52, 0x0a, 0x61, 0x70, 0x70, 0x65, 0x61, 0x72, 0x61, 0x6e, 0x63, 0x65, 0x22, 0x91,0x04, 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x74, 0x6f, 0x72,0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x54, 0x0a, 0x0c, 0x73, 0x74,0x6f, 0x72, 0x61, 0x67, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e,@@ -762,69 +762,66 @@ var file_api_v1_workspace_setting_service_proto_rawDesc = []byte{0x6f, 0x69, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x18, 0x04,0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06,0x62, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x62, 0x75,- 0x63, 0x6b, 0x65, 0x74, 0x22, 0x73, 0x0a, 0x0b, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x54,+ 0x63, 0x6b, 0x65, 0x74, 0x22, 0x4c, 0x0a, 0x0b, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x54,0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x18, 0x53, 0x54, 0x4f, 0x52, 0x41, 0x47, 0x45, 0x5f, 0x54,0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10,- 0x00, 0x12, 0x19, 0x0a, 0x15, 0x53, 0x54, 0x4f, 0x52, 0x41, 0x47, 0x45, 0x5f, 0x54, 0x59, 0x50,- 0x45, 0x5f, 0x44, 0x41, 0x54, 0x41, 0x42, 0x41, 0x53, 0x45, 0x10, 0x01, 0x12, 0x16, 0x0a, 0x12,- 0x53, 0x54, 0x4f, 0x52, 0x41, 0x47, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4c, 0x4f, 0x43,- 0x41, 0x4c, 0x10, 0x02, 0x12, 0x13, 0x0a, 0x0f, 0x53, 0x54, 0x4f, 0x52, 0x41, 0x47, 0x45, 0x5f,- 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x33, 0x10, 0x03, 0x22, 0xc0, 0x01, 0x0a, 0x1b, 0x57, 0x6f,- 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74,- 0x65, 0x64, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x36, 0x0a, 0x17, 0x64, 0x69, 0x73,- 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x76, 0x69, 0x73,- 0x69, 0x62, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15, 0x64, 0x69, 0x73, 0x61,- 0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x56, 0x69, 0x73, 0x69, 0x62, 0x6c,- 0x65, 0x12, 0x37, 0x0a, 0x18, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x5f, 0x77, 0x69, 0x74,- 0x68, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20,- 0x01, 0x28, 0x08, 0x52, 0x15, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x57, 0x69, 0x74, 0x68,- 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x30, 0x0a, 0x14, 0x63, 0x6f,- 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x5f, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x5f, 0x6c, 0x69, 0x6d,- 0x69, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e,- 0x74, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x22, 0x36, 0x0a, 0x1a,- 0x47, 0x65, 0x74, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x65, 0x74, 0x74,- 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x04, 0x6e, 0x61,- 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x04, 0xe2, 0x41, 0x01, 0x02, 0x52, 0x04,- 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x56, 0x0a, 0x1a, 0x53, 0x65, 0x74, 0x57, 0x6f, 0x72, 0x6b, 0x73,- 0x70, 0x61, 0x63, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65,- 0x73, 0x74, 0x12, 0x38, 0x0a, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20,- 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e,+ 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x41, 0x54, 0x41, 0x42, 0x41, 0x53, 0x45, 0x10, 0x01, 0x12,+ 0x09, 0x0a, 0x05, 0x4c, 0x4f, 0x43, 0x41, 0x4c, 0x10, 0x02, 0x12, 0x06, 0x0a, 0x02, 0x53, 0x33,+ 0x10, 0x03, 0x22, 0xc0, 0x01, 0x0a, 0x1b, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65,+ 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x65, 0x64, 0x53, 0x65, 0x74, 0x74, 0x69,+ 0x6e, 0x67, 0x12, 0x36, 0x0a, 0x17, 0x64, 0x69, 0x73, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x70,+ 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x18, 0x01, 0x20,+ 0x01, 0x28, 0x08, 0x52, 0x15, 0x64, 0x69, 0x73, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x75, 0x62,+ 0x6c, 0x69, 0x63, 0x56, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x12, 0x37, 0x0a, 0x18, 0x64, 0x69,+ 0x73, 0x70, 0x6c, 0x61, 0x79, 0x5f, 0x77, 0x69, 0x74, 0x68, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74,+ 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15, 0x64, 0x69,+ 0x73, 0x70, 0x6c, 0x61, 0x79, 0x57, 0x69, 0x74, 0x68, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54,+ 0x69, 0x6d, 0x65, 0x12, 0x30, 0x0a, 0x14, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x5f, 0x6c,+ 0x65, 0x6e, 0x67, 0x74, 0x68, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28,+ 0x05, 0x52, 0x12, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68,+ 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x22, 0x36, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x57, 0x6f, 0x72, 0x6b,+ 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75,+ 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,+ 0x09, 0x42, 0x04, 0xe2, 0x41, 0x01, 0x02, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x56, 0x0a,+ 0x1a, 0x53, 0x65, 0x74, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x65, 0x74,+ 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x07, 0x73,+ 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d,+ 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x6f, 0x72, 0x6b,+ 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x73, 0x65,+ 0x74, 0x74, 0x69, 0x6e, 0x67, 0x32, 0xd9, 0x02, 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70,+ 0x61, 0x63, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,+ 0x65, 0x12, 0x93, 0x01, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61,+ 0x63, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x28, 0x2e, 0x6d, 0x65, 0x6d, 0x6f,+ 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x57, 0x6f, 0x72, 0x6b,+ 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75,+ 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e,0x76, 0x31, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x65, 0x74, 0x74,- 0x69, 0x6e, 0x67, 0x52, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x32, 0xd9, 0x02, 0x0a,- 0x17, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e,- 0x67, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x93, 0x01, 0x0a, 0x13, 0x47, 0x65, 0x74,- 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67,- 0x12, 0x28, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e,- 0x47, 0x65, 0x74, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x65, 0x74, 0x74,- 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x6d, 0x65, 0x6d,- 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70,- 0x61, 0x63, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x32, 0xda, 0x41, 0x04, 0x6e,- 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x25, 0x12, 0x23, 0x2f, 0x61, 0x70, 0x69, 0x2f,- 0x76, 0x31, 0x2f, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x2f, 0x7b, 0x6e, 0x61,- 0x6d, 0x65, 0x3d, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x2f, 0x2a, 0x7d, 0x12, 0xa7,- 0x01, 0x0a, 0x13, 0x53, 0x65, 0x74, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53,- 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x28, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61,- 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x65, 0x74, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61,- 0x63, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,- 0x1a, 0x1e, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e,- 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67,- 0x22, 0x46, 0xda, 0x41, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x82, 0xd3, 0xe4, 0x93,- 0x02, 0x36, 0x3a, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x32, 0x2b, 0x2f, 0x61, 0x70,- 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x2f, 0x7b,- 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x2e, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x73, 0x65, 0x74,- 0x74, 0x69, 0x6e, 0x67, 0x73, 0x2f, 0x2a, 0x7d, 0x42, 0xb4, 0x01, 0x0a, 0x10, 0x63, 0x6f, 0x6d,- 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x42, 0x1c, 0x57,- 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x53,- 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x67,- 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x75, 0x73, 0x65, 0x6d, 0x65, 0x6d,- 0x6f, 0x73, 0x2f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67,- 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x3b, 0x61, 0x70, 0x69, 0x76, 0x31, 0xa2,- 0x02, 0x03, 0x4d, 0x41, 0x58, 0xaa, 0x02, 0x0c, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x70,- 0x69, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0c, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69,- 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x18, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69, 0x5c,- 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02,- 0x0e, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x41, 0x70, 0x69, 0x3a, 0x3a, 0x56, 0x31, 0x62,- 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,+ 0x69, 0x6e, 0x67, 0x22, 0x32, 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93,+ 0x02, 0x25, 0x12, 0x23, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x77, 0x6f, 0x72, 0x6b,+ 0x73, 0x70, 0x61, 0x63, 0x65, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x73, 0x65, 0x74, 0x74,+ 0x69, 0x6e, 0x67, 0x73, 0x2f, 0x2a, 0x7d, 0x12, 0xa7, 0x01, 0x0a, 0x13, 0x53, 0x65, 0x74, 0x57,+ 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x12,+ 0x28, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x53,+ 0x65, 0x74, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69,+ 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x6d, 0x65, 0x6d, 0x6f,+ 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61,+ 0x63, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x46, 0xda, 0x41, 0x07, 0x73, 0x65,+ 0x74, 0x74, 0x69, 0x6e, 0x67, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x36, 0x3a, 0x07, 0x73, 0x65, 0x74,+ 0x74, 0x69, 0x6e, 0x67, 0x32, 0x2b, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x77, 0x6f,+ 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x2f, 0x7b, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67,+ 0x2e, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x2f, 0x2a,+ 0x7d, 0x42, 0xb4, 0x01, 0x0a, 0x10, 0x63, 0x6f, 0x6d, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e,+ 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x42, 0x1c, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63,+ 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50,+ 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,+ 0x6f, 0x6d, 0x2f, 0x75, 0x73, 0x65, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x6d, 0x65, 0x6d, 0x6f,+ 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f,+ 0x76, 0x31, 0x3b, 0x61, 0x70, 0x69, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x4d, 0x41, 0x58, 0xaa, 0x02,+ 0x0c, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x70, 0x69, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0c,+ 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x18, 0x4d,+ 0x65, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d,+ 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x3a,+ 0x3a, 0x41, 0x70, 0x69, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,}var (diff --git a/proto/gen/store/inbox.pb.go b/proto/gen/store/inbox.pb.goindex 603bfe6ca..1ee7bd856 100644--- a/proto/gen/store/inbox.pb.go+++ b/proto/gen/store/inbox.pb.go@@ -23,22 +23,22 @@ const (type InboxMessage_Type int32const (- InboxMessage_TYPE_UNSPECIFIED InboxMessage_Type = 0- InboxMessage_TYPE_MEMO_COMMENT InboxMessage_Type = 1- InboxMessage_TYPE_VERSION_UPDATE InboxMessage_Type = 2+ InboxMessage_TYPE_UNSPECIFIED InboxMessage_Type = 0+ InboxMessage_MEMO_COMMENT InboxMessage_Type = 1+ InboxMessage_VERSION_UPDATE InboxMessage_Type = 2)// Enum value maps for InboxMessage_Type.var (InboxMessage_Type_name = map[int32]string{0: "TYPE_UNSPECIFIED",- 1: "TYPE_MEMO_COMMENT",- 2: "TYPE_VERSION_UPDATE",+ 1: "MEMO_COMMENT",+ 2: "VERSION_UPDATE",}InboxMessage_Type_value = map[string]int32{- "TYPE_UNSPECIFIED": 0,- "TYPE_MEMO_COMMENT": 1,- "TYPE_VERSION_UPDATE": 2,+ "TYPE_UNSPECIFIED": 0,+ "MEMO_COMMENT": 1,+ "VERSION_UPDATE": 2,})@@ -129,29 +129,28 @@ var File_store_inbox_proto protoreflect.FileDescriptorvar file_store_inbox_proto_rawDesc = []byte{0x0a, 0x11, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2f, 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x2e, 0x70, 0x72,0x6f, 0x74, 0x6f, 0x12, 0x0b, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x65,- 0x22, 0xc6, 0x01, 0x0a, 0x0c, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,+ 0x22, 0xbc, 0x01, 0x0a, 0x0c, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,0x65, 0x12, 0x32, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32,0x1e, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2e, 0x49, 0x6e,0x62, 0x6f, 0x78, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52,0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x24, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74,0x79, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x0a, 0x61, 0x63,- 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x49, 0x64, 0x88, 0x01, 0x01, 0x22, 0x4c, 0x0a, 0x04, 0x54,+ 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x49, 0x64, 0x88, 0x01, 0x01, 0x22, 0x42, 0x0a, 0x04, 0x54,0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x10, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50,- 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x15, 0x0a, 0x11, 0x54, 0x59, 0x50,- 0x45, 0x5f, 0x4d, 0x45, 0x4d, 0x4f, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x10, 0x01,- 0x12, 0x17, 0x0a, 0x13, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x56, 0x45, 0x52, 0x53, 0x49, 0x4f, 0x4e,- 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x10, 0x02, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x61, 0x63,- 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x5f, 0x69, 0x64, 0x42, 0x95, 0x01, 0x0a, 0x0f, 0x63, 0x6f,- 0x6d, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x42, 0x0a, 0x49,- 0x6e, 0x62, 0x6f, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x29, 0x67, 0x69, 0x74,- 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x75, 0x73, 0x65, 0x6d, 0x65, 0x6d, 0x6f, 0x73,- 0x2f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e,- 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0xa2, 0x02, 0x03, 0x4d, 0x53, 0x58, 0xaa, 0x02, 0x0b, 0x4d,- 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x53, 0x74, 0x6f, 0x72, 0x65, 0xca, 0x02, 0x0b, 0x4d, 0x65, 0x6d,- 0x6f, 0x73, 0x5c, 0x53, 0x74, 0x6f, 0x72, 0x65, 0xe2, 0x02, 0x17, 0x4d, 0x65, 0x6d, 0x6f, 0x73,- 0x5c, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,- 0x74, 0x61, 0xea, 0x02, 0x0c, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x53, 0x74, 0x6f, 0x72,- 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,+ 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c, 0x4d, 0x45, 0x4d,+ 0x4f, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x10, 0x01, 0x12, 0x12, 0x0a, 0x0e, 0x56,+ 0x45, 0x52, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x10, 0x02, 0x42,+ 0x0e, 0x0a, 0x0c, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x5f, 0x69, 0x64, 0x42,+ 0x95, 0x01, 0x0a, 0x0f, 0x63, 0x6f, 0x6d, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x73, 0x74,+ 0x6f, 0x72, 0x65, 0x42, 0x0a, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,+ 0x01, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x75, 0x73,+ 0x65, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x70, 0x72, 0x6f,+ 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0xa2, 0x02, 0x03, 0x4d,+ 0x53, 0x58, 0xaa, 0x02, 0x0b, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x53, 0x74, 0x6f, 0x72, 0x65,+ 0xca, 0x02, 0x0b, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x5c, 0x53, 0x74, 0x6f, 0x72, 0x65, 0xe2, 0x02,+ 0x17, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x5c, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x5c, 0x47, 0x50, 0x42,+ 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0c, 0x4d, 0x65, 0x6d, 0x6f, 0x73,+ 0x3a, 0x3a, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,}var (diff --git a/proto/gen/store/user_setting.pb.go b/proto/gen/store/user_setting.pb.goindex 4d4ee94ef..78601fe65 100644--- a/proto/gen/store/user_setting.pb.go+++ b/proto/gen/store/user_setting.pb.go@@ -25,30 +25,30 @@ type UserSettingKey int32const (UserSettingKey_USER_SETTING_KEY_UNSPECIFIED UserSettingKey = 0// Access tokens for the user.- UserSettingKey_USER_SETTING_ACCESS_TOKENS UserSettingKey = 1+ UserSettingKey_ACCESS_TOKENS UserSettingKey = 1// The locale of the user.- UserSettingKey_USER_SETTING_LOCALE UserSettingKey = 2+ UserSettingKey_LOCALE UserSettingKey = 2// The appearance of the user.- UserSettingKey_USER_SETTING_APPEARANCE UserSettingKey = 3+ UserSettingKey_APPEARANCE UserSettingKey = 3// The visibility of the memo.- UserSettingKey_USER_SETTING_MEMO_VISIBILITY UserSettingKey = 4+ UserSettingKey_MEMO_VISIBILITY UserSettingKey = 4)// Enum value maps for UserSettingKey.var (UserSettingKey_name = map[int32]string{0: "USER_SETTING_KEY_UNSPECIFIED",- 1: "USER_SETTING_ACCESS_TOKENS",- 2: "USER_SETTING_LOCALE",- 3: "USER_SETTING_APPEARANCE",- 4: "USER_SETTING_MEMO_VISIBILITY",+ 1: "ACCESS_TOKENS",+ 2: "LOCALE",+ 3: "APPEARANCE",+ 4: "MEMO_VISIBILITY",}UserSettingKey_value = map[string]int32{"USER_SETTING_KEY_UNSPECIFIED": 0,- "USER_SETTING_ACCESS_TOKENS": 1,- "USER_SETTING_LOCALE": 2,- "USER_SETTING_APPEARANCE": 3,- "USER_SETTING_MEMO_VISIBILITY": 4,+ "ACCESS_TOKENS": 1,+ "LOCALE": 2,+ "APPEARANCE": 3,+ "MEMO_VISIBILITY": 4,})@@ -344,28 +344,25 @@ var file_store_user_setting_proto_rawDesc = []byte{0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x54, 0x6f, 0x6b, 0x65,0x6e, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e,0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,- 0x69, 0x6f, 0x6e, 0x2a, 0xaa, 0x01, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74,- 0x69, 0x6e, 0x67, 0x4b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x1c, 0x55, 0x53, 0x45, 0x52, 0x5f, 0x53,- 0x45, 0x54, 0x54, 0x49, 0x4e, 0x47, 0x5f, 0x4b, 0x45, 0x59, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45,- 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1e, 0x0a, 0x1a, 0x55, 0x53, 0x45, 0x52,- 0x5f, 0x53, 0x45, 0x54, 0x54, 0x49, 0x4e, 0x47, 0x5f, 0x41, 0x43, 0x43, 0x45, 0x53, 0x53, 0x5f,- 0x54, 0x4f, 0x4b, 0x45, 0x4e, 0x53, 0x10, 0x01, 0x12, 0x17, 0x0a, 0x13, 0x55, 0x53, 0x45, 0x52,- 0x5f, 0x53, 0x45, 0x54, 0x54, 0x49, 0x4e, 0x47, 0x5f, 0x4c, 0x4f, 0x43, 0x41, 0x4c, 0x45, 0x10,- 0x02, 0x12, 0x1b, 0x0a, 0x17, 0x55, 0x53, 0x45, 0x52, 0x5f, 0x53, 0x45, 0x54, 0x54, 0x49, 0x4e,- 0x47, 0x5f, 0x41, 0x50, 0x50, 0x45, 0x41, 0x52, 0x41, 0x4e, 0x43, 0x45, 0x10, 0x03, 0x12, 0x20,- 0x0a, 0x1c, 0x55, 0x53, 0x45, 0x52, 0x5f, 0x53, 0x45, 0x54, 0x54, 0x49, 0x4e, 0x47, 0x5f, 0x4d,- 0x45, 0x4d, 0x4f, 0x5f, 0x56, 0x49, 0x53, 0x49, 0x42, 0x49, 0x4c, 0x49, 0x54, 0x59, 0x10, 0x04,- 0x42, 0x9b, 0x01, 0x0a, 0x0f, 0x63, 0x6f, 0x6d, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x73,- 0x74, 0x6f, 0x72, 0x65, 0x42, 0x10, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e,- 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,- 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x75, 0x73, 0x65, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x6d, 0x65,- 0x6d, 0x6f, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x73, 0x74,- 0x6f, 0x72, 0x65, 0xa2, 0x02, 0x03, 0x4d, 0x53, 0x58, 0xaa, 0x02, 0x0b, 0x4d, 0x65, 0x6d, 0x6f,- 0x73, 0x2e, 0x53, 0x74, 0x6f, 0x72, 0x65, 0xca, 0x02, 0x0b, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x5c,- 0x53, 0x74, 0x6f, 0x72, 0x65, 0xe2, 0x02, 0x17, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x5c, 0x53, 0x74,- 0x6f, 0x72, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea,- 0x02, 0x0c, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x62, 0x06,- 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,+ 0x69, 0x6f, 0x6e, 0x2a, 0x76, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69,+ 0x6e, 0x67, 0x4b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x1c, 0x55, 0x53, 0x45, 0x52, 0x5f, 0x53, 0x45,+ 0x54, 0x54, 0x49, 0x4e, 0x47, 0x5f, 0x4b, 0x45, 0x59, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43,+ 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x41, 0x43, 0x43, 0x45, 0x53,+ 0x53, 0x5f, 0x54, 0x4f, 0x4b, 0x45, 0x4e, 0x53, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x4c, 0x4f,+ 0x43, 0x41, 0x4c, 0x45, 0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x41, 0x50, 0x50, 0x45, 0x41, 0x52,+ 0x41, 0x4e, 0x43, 0x45, 0x10, 0x03, 0x12, 0x13, 0x0a, 0x0f, 0x4d, 0x45, 0x4d, 0x4f, 0x5f, 0x56,+ 0x49, 0x53, 0x49, 0x42, 0x49, 0x4c, 0x49, 0x54, 0x59, 0x10, 0x04, 0x42, 0x9b, 0x01, 0x0a, 0x0f,+ 0x63, 0x6f, 0x6d, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x42,+ 0x10, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x6f, 0x74,+ 0x6f, 0x50, 0x01, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,+ 0x75, 0x73, 0x65, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x70,+ 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0xa2, 0x02,+ 0x03, 0x4d, 0x53, 0x58, 0xaa, 0x02, 0x0b, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x53, 0x74, 0x6f,+ 0x72, 0x65, 0xca, 0x02, 0x0b, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x5c, 0x53, 0x74, 0x6f, 0x72, 0x65,+ 0xe2, 0x02, 0x17, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x5c, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x5c, 0x47,+ 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0c, 0x4d, 0x65, 0x6d,+ 0x6f, 0x73, 0x3a, 0x3a, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,+ 0x33,}var (diff --git a/proto/gen/store/workspace_setting.pb.go b/proto/gen/store/workspace_setting.pb.goindex 30bfc5b10..62bcbfeee 100644--- a/proto/gen/store/workspace_setting.pb.go+++ b/proto/gen/store/workspace_setting.pb.go@@ -24,31 +24,31 @@ type WorkspaceSettingKey int32const (WorkspaceSettingKey_WORKSPACE_SETTING_KEY_UNSPECIFIED WorkspaceSettingKey = 0- // WORKSPACE_SETTING_BASIC is the key for basic settings.- WorkspaceSettingKey_WORKSPACE_SETTING_BASIC WorkspaceSettingKey = 1- // WORKSPACE_SETTING_GENERAL is the key for general settings.- WorkspaceSettingKey_WORKSPACE_SETTING_GENERAL WorkspaceSettingKey = 2- // WORKSPACE_SETTING_STORAGE is the key for storage settings.- WorkspaceSettingKey_WORKSPACE_SETTING_STORAGE WorkspaceSettingKey = 3- // WORKSPACE_SETTING_MEMO_RELATED is the key for memo related settings.- WorkspaceSettingKey_WORKSPACE_SETTING_MEMO_RELATED WorkspaceSettingKey = 4+ // BASIC is the key for basic settings.+ WorkspaceSettingKey_BASIC WorkspaceSettingKey = 1+ // GENERAL is the key for general settings.+ WorkspaceSettingKey_GENERAL WorkspaceSettingKey = 2+ // STORAGE is the key for storage settings.+ WorkspaceSettingKey_STORAGE WorkspaceSettingKey = 3+ // MEMO_RELATED is the key for memo related settings.+ WorkspaceSettingKey_MEMO_RELATED WorkspaceSettingKey = 4)// Enum value maps for WorkspaceSettingKey.var (WorkspaceSettingKey_name = map[int32]string{0: "WORKSPACE_SETTING_KEY_UNSPECIFIED",- 1: "WORKSPACE_SETTING_BASIC",- 2: "WORKSPACE_SETTING_GENERAL",- 3: "WORKSPACE_SETTING_STORAGE",- 4: "WORKSPACE_SETTING_MEMO_RELATED",+ 1: "BASIC",+ 2: "GENERAL",+ 3: "STORAGE",+ 4: "MEMO_RELATED",}WorkspaceSettingKey_value = map[string]int32{"WORKSPACE_SETTING_KEY_UNSPECIFIED": 0,- "WORKSPACE_SETTING_BASIC": 1,- "WORKSPACE_SETTING_GENERAL": 2,- "WORKSPACE_SETTING_STORAGE": 3,- "WORKSPACE_SETTING_MEMO_RELATED": 4,+ "BASIC": 1,+ "GENERAL": 2,+ "STORAGE": 3,+ "MEMO_RELATED": 4,})@@ -84,26 +84,26 @@ type WorkspaceStorageSetting_StorageType int32const (WorkspaceStorageSetting_STORAGE_TYPE_UNSPECIFIED WorkspaceStorageSetting_StorageType = 0// STORAGE_TYPE_DATABASE is the database storage type.- WorkspaceStorageSetting_STORAGE_TYPE_DATABASE WorkspaceStorageSetting_StorageType = 1+ WorkspaceStorageSetting_DATABASE WorkspaceStorageSetting_StorageType = 1// STORAGE_TYPE_LOCAL is the local storage type.- WorkspaceStorageSetting_STORAGE_TYPE_LOCAL WorkspaceStorageSetting_StorageType = 2+ WorkspaceStorageSetting_LOCAL WorkspaceStorageSetting_StorageType = 2// STORAGE_TYPE_S3 is the S3 storage type.- WorkspaceStorageSetting_STORAGE_TYPE_S3 WorkspaceStorageSetting_StorageType = 3+ WorkspaceStorageSetting_S3 WorkspaceStorageSetting_StorageType = 3)// Enum value maps for WorkspaceStorageSetting_StorageType.var (WorkspaceStorageSetting_StorageType_name = map[int32]string{0: "STORAGE_TYPE_UNSPECIFIED",- 1: "STORAGE_TYPE_DATABASE",- 2: "STORAGE_TYPE_LOCAL",- 3: "STORAGE_TYPE_S3",+ 1: "DATABASE",+ 2: "LOCAL",+ 3: "S3",}WorkspaceStorageSetting_StorageType_value = map[string]int32{"STORAGE_TYPE_UNSPECIFIED": 0,- "STORAGE_TYPE_DATABASE": 1,- "STORAGE_TYPE_LOCAL": 2,- "STORAGE_TYPE_S3": 3,+ "DATABASE": 1,+ "LOCAL": 2,+ "S3": 3,})@@ -757,7 +757,7 @@ var file_store_workspace_setting_proto_rawDesc = []byte{0x55, 0x72, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x04, 0x20,0x01, 0x28, 0x09, 0x52, 0x06, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x61,0x70, 0x70, 0x65, 0x61, 0x72, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52,- 0x0a, 0x61, 0x70, 0x70, 0x65, 0x61, 0x72, 0x61, 0x6e, 0x63, 0x65, 0x22, 0xb6, 0x04, 0x0a, 0x17,+ 0x0a, 0x61, 0x70, 0x70, 0x65, 0x61, 0x72, 0x61, 0x6e, 0x63, 0x65, 0x22, 0x8f, 0x04, 0x0a, 0x17,0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65,0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x53, 0x0a, 0x0c, 0x73, 0x74, 0x6f, 0x72, 0x61,0x67, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x30, 0x2e,@@ -786,37 +786,30 @@ var file_store_workspace_setting_proto_rawDesc = []byte{0x16, 0x0a, 0x06, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,0x06, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x63, 0x6b, 0x65,0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x62, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x22,- 0x73, 0x0a, 0x0b, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c,+ 0x4c, 0x0a, 0x0b, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c,0x0a, 0x18, 0x53, 0x54, 0x4f, 0x52, 0x41, 0x47, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55,- 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15,- 0x53, 0x54, 0x4f, 0x52, 0x41, 0x47, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x44, 0x41, 0x54,- 0x41, 0x42, 0x41, 0x53, 0x45, 0x10, 0x01, 0x12, 0x16, 0x0a, 0x12, 0x53, 0x54, 0x4f, 0x52, 0x41,- 0x47, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4c, 0x4f, 0x43, 0x41, 0x4c, 0x10, 0x02, 0x12,- 0x13, 0x0a, 0x0f, 0x53, 0x54, 0x4f, 0x52, 0x41, 0x47, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f,- 0x53, 0x33, 0x10, 0x03, 0x22, 0xc0, 0x01, 0x0a, 0x1b, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61,- 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x65, 0x64, 0x53, 0x65, 0x74,- 0x74, 0x69, 0x6e, 0x67, 0x12, 0x36, 0x0a, 0x17, 0x64, 0x69, 0x73, 0x61, 0x6c, 0x6c, 0x6f, 0x77,- 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x18,- 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15, 0x64, 0x69, 0x73, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x50,- 0x75, 0x62, 0x6c, 0x69, 0x63, 0x56, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x12, 0x37, 0x0a, 0x18,- 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x5f, 0x77, 0x69, 0x74, 0x68, 0x5f, 0x75, 0x70, 0x64,- 0x61, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15,- 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x57, 0x69, 0x74, 0x68, 0x55, 0x70, 0x64, 0x61, 0x74,- 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x30, 0x0a, 0x14, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74,- 0x5f, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x03, 0x20,- 0x01, 0x28, 0x05, 0x52, 0x12, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x4c, 0x65, 0x6e, 0x67,- 0x74, 0x68, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2a, 0xbb, 0x01, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6b,- 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x4b, 0x65, 0x79, 0x12,- 0x25, 0x0a, 0x21, 0x57, 0x4f, 0x52, 0x4b, 0x53, 0x50, 0x41, 0x43, 0x45, 0x5f, 0x53, 0x45, 0x54,- 0x54, 0x49, 0x4e, 0x47, 0x5f, 0x4b, 0x45, 0x59, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49,- 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1b, 0x0a, 0x17, 0x57, 0x4f, 0x52, 0x4b, 0x53, 0x50,- 0x41, 0x43, 0x45, 0x5f, 0x53, 0x45, 0x54, 0x54, 0x49, 0x4e, 0x47, 0x5f, 0x42, 0x41, 0x53, 0x49,- 0x43, 0x10, 0x01, 0x12, 0x1d, 0x0a, 0x19, 0x57, 0x4f, 0x52, 0x4b, 0x53, 0x50, 0x41, 0x43, 0x45,- 0x5f, 0x53, 0x45, 0x54, 0x54, 0x49, 0x4e, 0x47, 0x5f, 0x47, 0x45, 0x4e, 0x45, 0x52, 0x41, 0x4c,- 0x10, 0x02, 0x12, 0x1d, 0x0a, 0x19, 0x57, 0x4f, 0x52, 0x4b, 0x53, 0x50, 0x41, 0x43, 0x45, 0x5f,- 0x53, 0x45, 0x54, 0x54, 0x49, 0x4e, 0x47, 0x5f, 0x53, 0x54, 0x4f, 0x52, 0x41, 0x47, 0x45, 0x10,- 0x03, 0x12, 0x22, 0x0a, 0x1e, 0x57, 0x4f, 0x52, 0x4b, 0x53, 0x50, 0x41, 0x43, 0x45, 0x5f, 0x53,- 0x45, 0x54, 0x54, 0x49, 0x4e, 0x47, 0x5f, 0x4d, 0x45, 0x4d, 0x4f, 0x5f, 0x52, 0x45, 0x4c, 0x41,+ 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08,+ 0x44, 0x41, 0x54, 0x41, 0x42, 0x41, 0x53, 0x45, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x4c, 0x4f,+ 0x43, 0x41, 0x4c, 0x10, 0x02, 0x12, 0x06, 0x0a, 0x02, 0x53, 0x33, 0x10, 0x03, 0x22, 0xc0, 0x01,+ 0x0a, 0x1b, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52,+ 0x65, 0x6c, 0x61, 0x74, 0x65, 0x64, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x36, 0x0a,+ 0x17, 0x64, 0x69, 0x73, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63,+ 0x5f, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15,+ 0x64, 0x69, 0x73, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x56, 0x69,+ 0x73, 0x69, 0x62, 0x6c, 0x65, 0x12, 0x37, 0x0a, 0x18, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79,+ 0x5f, 0x77, 0x69, 0x74, 0x68, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d,+ 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79,+ 0x57, 0x69, 0x74, 0x68, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x30,+ 0x0a, 0x14, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x5f, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68,+ 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x63, 0x6f,+ 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x4c, 0x69, 0x6d, 0x69, 0x74,+ 0x2a, 0x73, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x65, 0x74,+ 0x74, 0x69, 0x6e, 0x67, 0x4b, 0x65, 0x79, 0x12, 0x25, 0x0a, 0x21, 0x57, 0x4f, 0x52, 0x4b, 0x53,+ 0x50, 0x41, 0x43, 0x45, 0x5f, 0x53, 0x45, 0x54, 0x54, 0x49, 0x4e, 0x47, 0x5f, 0x4b, 0x45, 0x59,+ 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x09,+ 0x0a, 0x05, 0x42, 0x41, 0x53, 0x49, 0x43, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x47, 0x45, 0x4e,+ 0x45, 0x52, 0x41, 0x4c, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x54, 0x4f, 0x52, 0x41, 0x47,+ 0x45, 0x10, 0x03, 0x12, 0x10, 0x0a, 0x0c, 0x4d, 0x45, 0x4d, 0x4f, 0x5f, 0x52, 0x45, 0x4c, 0x41,0x54, 0x45, 0x44, 0x10, 0x04, 0x42, 0xa0, 0x01, 0x0a, 0x0f, 0x63, 0x6f, 0x6d, 0x2e, 0x6d, 0x65,0x6d, 0x6f, 0x73, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x42, 0x15, 0x57, 0x6f, 0x72, 0x6b, 0x73,0x70, 0x61, 0x63, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f,diff --git a/proto/store/inbox.proto b/proto/store/inbox.protoindex 6349105ac..f7f708249 100644--- a/proto/store/inbox.proto+++ b/proto/store/inbox.proto@@ -7,8 +7,8 @@ option go_package = "gen/store";message InboxMessage {enum Type {TYPE_UNSPECIFIED = 0;- TYPE_MEMO_COMMENT = 1;- TYPE_VERSION_UPDATE = 2;+ MEMO_COMMENT = 1;+ VERSION_UPDATE = 2;}Type type = 1;optional int32 activity_id = 2;diff --git a/proto/store/user_setting.proto b/proto/store/user_setting.protoindex bca2162a9..345e8dacd 100644--- a/proto/store/user_setting.proto+++ b/proto/store/user_setting.proto@@ -7,13 +7,13 @@ option go_package = "gen/store";enum UserSettingKey {USER_SETTING_KEY_UNSPECIFIED = 0;// Access tokens for the user.- USER_SETTING_ACCESS_TOKENS = 1;+ ACCESS_TOKENS = 1;// The locale of the user.- USER_SETTING_LOCALE = 2;+ LOCALE = 2;// The appearance of the user.- USER_SETTING_APPEARANCE = 3;+ APPEARANCE = 3;// The visibility of the memo.- USER_SETTING_MEMO_VISIBILITY = 4;+ MEMO_VISIBILITY = 4;}message UserSetting {diff --git a/proto/store/workspace_setting.proto b/proto/store/workspace_setting.protoindex 887b86e4e..9d7af2c33 100644--- a/proto/store/workspace_setting.proto+++ b/proto/store/workspace_setting.proto@@ -6,14 +6,14 @@ option go_package = "gen/store";enum WorkspaceSettingKey {WORKSPACE_SETTING_KEY_UNSPECIFIED = 0;- // WORKSPACE_SETTING_BASIC is the key for basic settings.- WORKSPACE_SETTING_BASIC = 1;- // WORKSPACE_SETTING_GENERAL is the key for general settings.- WORKSPACE_SETTING_GENERAL = 2;- // WORKSPACE_SETTING_STORAGE is the key for storage settings.- WORKSPACE_SETTING_STORAGE = 3;- // WORKSPACE_SETTING_MEMO_RELATED is the key for memo related settings.- WORKSPACE_SETTING_MEMO_RELATED = 4;+ // BASIC is the key for basic settings.+ BASIC = 1;+ // GENERAL is the key for general settings.+ GENERAL = 2;+ // STORAGE is the key for storage settings.+ STORAGE = 3;+ // MEMO_RELATED is the key for memo related settings.+ MEMO_RELATED = 4;}message WorkspaceSetting {@@ -57,11 +57,11 @@ message WorkspaceStorageSetting {enum StorageType {STORAGE_TYPE_UNSPECIFIED = 0;// STORAGE_TYPE_DATABASE is the database storage type.- STORAGE_TYPE_DATABASE = 1;+ DATABASE = 1;// STORAGE_TYPE_LOCAL is the local storage type.- STORAGE_TYPE_LOCAL = 2;+ LOCAL = 2;// STORAGE_TYPE_S3 is the S3 storage type.- STORAGE_TYPE_S3 = 3;+ S3 = 3;}// storage_type is the storage type.StorageType storage_type = 1;diff --git a/server/router/api/v1/memo_service.go b/server/router/api/v1/memo_service.goindex 403bee713..c97315578 100644--- a/server/router/api/v1/memo_service.go+++ b/server/router/api/v1/memo_service.go@@ -403,7 +403,7 @@ func (s *APIV1Service) CreateMemoComment(ctx context.Context, request *v1pb.CreaReceiverID: relatedMemo.CreatorID,Status: store.UNREAD,Message: &storepb.InboxMessage{- Type: storepb.InboxMessage_TYPE_MEMO_COMMENT,+ Type: storepb.InboxMessage_MEMO_COMMENT,ActivityId: &activity.ID,},}); err != nil {diff --git a/server/router/api/v1/resource_service.go b/server/router/api/v1/resource_service.goindex 2fb28211f..507f3dc35 100644--- a/server/router/api/v1/resource_service.go+++ b/server/router/api/v1/resource_service.go@@ -308,7 +308,7 @@ func SaveResourceBlob(ctx context.Context, s *store.Store, create *store.Resourcreturn errors.Wrap(err, "Failed to find workspace storage setting")}- if workspaceStorageSetting.StorageType == storepb.WorkspaceStorageSetting_STORAGE_TYPE_LOCAL {+ if workspaceStorageSetting.StorageType == storepb.WorkspaceStorageSetting_LOCAL {filepathTemplate := "assets/{timestamp}_{filename}"if workspaceStorageSetting.FilepathTemplate != "" {filepathTemplate = workspaceStorageSetting.FilepathTemplate@@ -343,7 +343,7 @@ func SaveResourceBlob(ctx context.Context, s *store.Store, create *store.Resourccreate.Reference = internalPathcreate.Blob = nilcreate.StorageType = storepb.ResourceStorageType_LOCAL- } else if workspaceStorageSetting.StorageType == storepb.WorkspaceStorageSetting_STORAGE_TYPE_S3 {+ } else if workspaceStorageSetting.StorageType == storepb.WorkspaceStorageSetting_S3 {s3Config := workspaceStorageSetting.S3Configif s3Config == nil {return errors.Errorf("No actived external storage found")diff --git a/server/router/api/v1/user_service.go b/server/router/api/v1/user_service.goindex dee75ae21..61cc01f08 100644--- a/server/router/api/v1/user_service.go+++ b/server/router/api/v1/user_service.go@@ -286,11 +286,11 @@ func (s *APIV1Service) GetUserSetting(ctx context.Context, _ *v1pb.GetUserSettin}userSettingMessage := getDefaultUserSetting()for _, setting := range userSettings {- if setting.Key == storepb.UserSettingKey_USER_SETTING_LOCALE {+ if setting.Key == storepb.UserSettingKey_LOCALE {userSettingMessage.Locale = setting.GetLocale()- } else if setting.Key == storepb.UserSettingKey_USER_SETTING_APPEARANCE {+ } else if setting.Key == storepb.UserSettingKey_APPEARANCE {userSettingMessage.Appearance = setting.GetAppearance()- } else if setting.Key == storepb.UserSettingKey_USER_SETTING_MEMO_VISIBILITY {+ } else if setting.Key == storepb.UserSettingKey_MEMO_VISIBILITY {userSettingMessage.MemoVisibility = setting.GetMemoVisibility()}}@@ -311,7 +311,7 @@ func (s *APIV1Service) UpdateUserSetting(ctx context.Context, request *v1pb.Updaif field == "locale" {if _, err := s.Store.UpsertUserSetting(ctx, &storepb.UserSetting{UserId: user.ID,- Key: storepb.UserSettingKey_USER_SETTING_LOCALE,+ Key: storepb.UserSettingKey_LOCALE,Value: &storepb.UserSetting_Locale{Locale: request.Setting.Locale,},@@ -321,7 +321,7 @@ func (s *APIV1Service) UpdateUserSetting(ctx context.Context, request *v1pb.Upda} else if field == "appearance" {if _, err := s.Store.UpsertUserSetting(ctx, &storepb.UserSetting{UserId: user.ID,- Key: storepb.UserSettingKey_USER_SETTING_APPEARANCE,+ Key: storepb.UserSettingKey_APPEARANCE,Value: &storepb.UserSetting_Appearance{Appearance: request.Setting.Appearance,},@@ -331,7 +331,7 @@ func (s *APIV1Service) UpdateUserSetting(ctx context.Context, request *v1pb.Upda} else if field == "memo_visibility" {if _, err := s.Store.UpsertUserSetting(ctx, &storepb.UserSetting{UserId: user.ID,- Key: storepb.UserSettingKey_USER_SETTING_MEMO_VISIBILITY,+ Key: storepb.UserSettingKey_MEMO_VISIBILITY,Value: &storepb.UserSetting_MemoVisibility{MemoVisibility: request.Setting.MemoVisibility,},@@ -467,7 +467,7 @@ func (s *APIV1Service) DeleteUserAccessToken(ctx context.Context, request *v1pb.}if _, err := s.Store.UpsertUserSetting(ctx, &storepb.UserSetting{UserId: user.ID,- Key: storepb.UserSettingKey_USER_SETTING_ACCESS_TOKENS,+ Key: storepb.UserSettingKey_ACCESS_TOKENS,Value: &storepb.UserSetting_AccessTokens{AccessTokens: &storepb.AccessTokensUserSetting{AccessTokens: updatedUserAccessTokens,@@ -492,7 +492,7 @@ func (s *APIV1Service) UpsertAccessTokenToStore(ctx context.Context, user *storeuserAccessTokens = append(userAccessTokens, &userAccessToken)if _, err := s.Store.UpsertUserSetting(ctx, &storepb.UserSetting{UserId: user.ID,- Key: storepb.UserSettingKey_USER_SETTING_ACCESS_TOKENS,+ Key: storepb.UserSettingKey_ACCESS_TOKENS,Value: &storepb.UserSetting_AccessTokens{AccessTokens: &storepb.AccessTokensUserSetting{AccessTokens: userAccessTokens,diff --git a/server/router/api/v1/workspace_setting_service.go b/server/router/api/v1/workspace_setting_service.goindex dcf668191..3b8f01c9b 100644--- a/server/router/api/v1/workspace_setting_service.go+++ b/server/router/api/v1/workspace_setting_service.go@@ -21,13 +21,13 @@ func (s *APIV1Service) GetWorkspaceSetting(ctx context.Context, request *v1pb.GeworkspaceSettingKey := storepb.WorkspaceSettingKey(storepb.WorkspaceSettingKey_value[workspaceSettingKeyString])// Get workspace setting from store with default value.switch workspaceSettingKey {- case storepb.WorkspaceSettingKey_WORKSPACE_SETTING_BASIC:+ case storepb.WorkspaceSettingKey_BASIC:_, err = s.Store.GetWorkspaceBasicSetting(ctx)- case storepb.WorkspaceSettingKey_WORKSPACE_SETTING_GENERAL:+ case storepb.WorkspaceSettingKey_GENERAL:_, err = s.Store.GetWorkspaceGeneralSetting(ctx)- case storepb.WorkspaceSettingKey_WORKSPACE_SETTING_MEMO_RELATED:+ case storepb.WorkspaceSettingKey_MEMO_RELATED:_, err = s.Store.GetWorkspaceMemoRelatedSetting(ctx)- case storepb.WorkspaceSettingKey_WORKSPACE_SETTING_STORAGE:+ case storepb.WorkspaceSettingKey_STORAGE:_, err = s.Store.GetWorkspaceStorageSetting(ctx)default:return nil, status.Errorf(codes.InvalidArgument, "unsupported workspace setting key: %v", workspaceSettingKey)@@ -100,15 +100,15 @@ func convertWorkspaceSettingToStore(setting *v1pb.WorkspaceSetting) *storepb.Wor},}switch workspaceSetting.Key {- case storepb.WorkspaceSettingKey_WORKSPACE_SETTING_GENERAL:+ case storepb.WorkspaceSettingKey_GENERAL:workspaceSetting.Value = &storepb.WorkspaceSetting_GeneralSetting{GeneralSetting: convertWorkspaceGeneralSettingToStore(setting.GetGeneralSetting()),}- case storepb.WorkspaceSettingKey_WORKSPACE_SETTING_STORAGE:+ case storepb.WorkspaceSettingKey_STORAGE:workspaceSetting.Value = &storepb.WorkspaceSetting_StorageSetting{StorageSetting: convertWorkspaceStorageSettingToStore(setting.GetStorageSetting()),}- case storepb.WorkspaceSettingKey_WORKSPACE_SETTING_MEMO_RELATED:+ case storepb.WorkspaceSettingKey_MEMO_RELATED:workspaceSetting.Value = &storepb.WorkspaceSetting_MemoRelatedSetting{MemoRelatedSetting: convertWorkspaceMemoRelatedSettingToStore(setting.GetMemoRelatedSetting()),}diff --git a/server/server.go b/server/server.goindex 21edab577..fb2f801ad 100644--- a/server/server.go+++ b/server/server.go@@ -152,7 +152,7 @@ func (s *Server) getOrUpsertWorkspaceBasicSetting(ctx context.Context) (*storepb}if modified {workspaceSetting, err := s.Store.UpsertWorkspaceSetting(ctx, &storepb.WorkspaceSetting{- Key: storepb.WorkspaceSettingKey_WORKSPACE_SETTING_BASIC,+ Key: storepb.WorkspaceSettingKey_BASIC,Value: &storepb.WorkspaceSetting_BasicSetting{BasicSetting: workspaceBasicSetting},})if err != nil {diff --git a/server/service/version_checker/version_checker.go b/server/service/version_checker/version_checker.goindex 0c3459a2c..40e94a745 100644--- a/server/service/version_checker/version_checker.go+++ b/server/service/version_checker/version_checker.go@@ -110,7 +110,7 @@ func (c *VersionChecker) Check(ctx context.Context) {ReceiverID: hostUser.ID,Status: store.UNREAD,Message: &storepb.InboxMessage{- Type: storepb.InboxMessage_TYPE_VERSION_UPDATE,+ Type: storepb.InboxMessage_VERSION_UPDATE,ActivityId: &activity.ID,},}); err != nil {diff --git a/store/user_setting.go b/store/user_setting.goindex c50bf7b30..8ef1bb117 100644--- a/store/user_setting.go+++ b/store/user_setting.go@@ -92,7 +92,7 @@ func (s *Store) GetUserSetting(ctx context.Context, find *FindUserSetting) (*stofunc (s *Store) GetUserAccessTokens(ctx context.Context, userID int32) ([]*storepb.AccessTokensUserSetting_AccessToken, error) {userSetting, err := s.GetUserSetting(ctx, &FindUserSetting{UserID: &userID,- Key: storepb.UserSettingKey_USER_SETTING_ACCESS_TOKENS,+ Key: storepb.UserSettingKey_ACCESS_TOKENS,})if err != nil {return nil, err@@ -121,7 +121,7 @@ func (s *Store) RemoveUserAccessToken(ctx context.Context, userID int32, token s_, err = s.UpsertUserSetting(ctx, &storepb.UserSetting{UserId: userID,- Key: storepb.UserSettingKey_USER_SETTING_ACCESS_TOKENS,+ Key: storepb.UserSettingKey_ACCESS_TOKENS,Value: &storepb.UserSetting_AccessTokens{AccessTokens: &storepb.AccessTokensUserSetting{AccessTokens: newAccessTokens,@@ -139,17 +139,17 @@ func convertUserSettingFromRaw(raw *UserSetting) (*storepb.UserSetting, error) {}switch raw.Key {- case storepb.UserSettingKey_USER_SETTING_ACCESS_TOKENS:+ case storepb.UserSettingKey_ACCESS_TOKENS:accessTokensUserSetting := &storepb.AccessTokensUserSetting{}if err := protojsonUnmarshaler.Unmarshal([]byte(raw.Value), accessTokensUserSetting); err != nil {return nil, err}userSetting.Value = &storepb.UserSetting_AccessTokens{AccessTokens: accessTokensUserSetting}- case storepb.UserSettingKey_USER_SETTING_LOCALE:+ case storepb.UserSettingKey_LOCALE:userSetting.Value = &storepb.UserSetting_Locale{Locale: raw.Value}- case storepb.UserSettingKey_USER_SETTING_APPEARANCE:+ case storepb.UserSettingKey_APPEARANCE:userSetting.Value = &storepb.UserSetting_Appearance{Appearance: raw.Value}- case storepb.UserSettingKey_USER_SETTING_MEMO_VISIBILITY:+ case storepb.UserSettingKey_MEMO_VISIBILITY:userSetting.Value = &storepb.UserSetting_MemoVisibility{MemoVisibility: raw.Value}default:return nil, nil@@ -164,18 +164,18 @@ func convertUserSettingToRaw(userSetting *storepb.UserSetting) (*UserSetting, er}switch userSetting.Key {- case storepb.UserSettingKey_USER_SETTING_ACCESS_TOKENS:+ case storepb.UserSettingKey_ACCESS_TOKENS:accessTokensUserSetting := userSetting.GetAccessTokens()value, err := protojson.Marshal(accessTokensUserSetting)if err != nil {return nil, err}raw.Value = string(value)- case storepb.UserSettingKey_USER_SETTING_LOCALE:+ case storepb.UserSettingKey_LOCALE:raw.Value = userSetting.GetLocale()- case storepb.UserSettingKey_USER_SETTING_APPEARANCE:+ case storepb.UserSettingKey_APPEARANCE:raw.Value = userSetting.GetAppearance()- case storepb.UserSettingKey_USER_SETTING_MEMO_VISIBILITY:+ case storepb.UserSettingKey_MEMO_VISIBILITY:raw.Value = userSetting.GetMemoVisibility()default:return nil, errors.Errorf("unsupported user setting key: %v", userSetting.Key)diff --git a/store/workspace_setting.go b/store/workspace_setting.goindex 7d319cd41..a3cddbacb 100644--- a/store/workspace_setting.go+++ b/store/workspace_setting.go@@ -29,13 +29,13 @@ func (s *Store) UpsertWorkspaceSetting(ctx context.Context, upsert *storepb.Work}var valueBytes []bytevar err error- if upsert.Key == storepb.WorkspaceSettingKey_WORKSPACE_SETTING_BASIC {+ if upsert.Key == storepb.WorkspaceSettingKey_BASIC {valueBytes, err = protojson.Marshal(upsert.GetBasicSetting())- } else if upsert.Key == storepb.WorkspaceSettingKey_WORKSPACE_SETTING_GENERAL {+ } else if upsert.Key == storepb.WorkspaceSettingKey_GENERAL {valueBytes, err = protojson.Marshal(upsert.GetGeneralSetting())- } else if upsert.Key == storepb.WorkspaceSettingKey_WORKSPACE_SETTING_STORAGE {+ } else if upsert.Key == storepb.WorkspaceSettingKey_STORAGE {valueBytes, err = protojson.Marshal(upsert.GetStorageSetting())- } else if upsert.Key == storepb.WorkspaceSettingKey_WORKSPACE_SETTING_MEMO_RELATED {+ } else if upsert.Key == storepb.WorkspaceSettingKey_MEMO_RELATED {valueBytes, err = protojson.Marshal(upsert.GetMemoRelatedSetting())} else {return nil, errors.Errorf("unsupported workspace setting key: %v", upsert.Key)@@ -101,7 +101,7 @@ func (s *Store) GetWorkspaceSetting(ctx context.Context, find *FindWorkspaceSettfunc (s *Store) GetWorkspaceBasicSetting(ctx context.Context) (*storepb.WorkspaceBasicSetting, error) {workspaceSetting, err := s.GetWorkspaceSetting(ctx, &FindWorkspaceSetting{- Name: storepb.WorkspaceSettingKey_WORKSPACE_SETTING_BASIC.String(),+ Name: storepb.WorkspaceSettingKey_BASIC.String(),})if err != nil {return nil, errors.Wrap(err, "failed to get workspace basic setting")@@ -111,8 +111,8 @@ func (s *Store) GetWorkspaceBasicSetting(ctx context.Context) (*storepb.Workspacif workspaceSetting != nil {workspaceBasicSetting = workspaceSetting.GetBasicSetting()}- s.workspaceSettingCache.Store(storepb.WorkspaceSettingKey_WORKSPACE_SETTING_BASIC.String(), &storepb.WorkspaceSetting{- Key: storepb.WorkspaceSettingKey_WORKSPACE_SETTING_BASIC,+ s.workspaceSettingCache.Store(storepb.WorkspaceSettingKey_BASIC.String(), &storepb.WorkspaceSetting{+ Key: storepb.WorkspaceSettingKey_BASIC,Value: &storepb.WorkspaceSetting_BasicSetting{BasicSetting: workspaceBasicSetting},})return workspaceBasicSetting, nil@@ -120,7 +120,7 @@ func (s *Store) GetWorkspaceBasicSetting(ctx context.Context) (*storepb.Workspacfunc (s *Store) GetWorkspaceGeneralSetting(ctx context.Context) (*storepb.WorkspaceGeneralSetting, error) {workspaceSetting, err := s.GetWorkspaceSetting(ctx, &FindWorkspaceSetting{- Name: storepb.WorkspaceSettingKey_WORKSPACE_SETTING_GENERAL.String(),+ Name: storepb.WorkspaceSettingKey_GENERAL.String(),})if err != nil {return nil, errors.Wrap(err, "failed to get workspace general setting")@@ -130,8 +130,8 @@ func (s *Store) GetWorkspaceGeneralSetting(ctx context.Context) (*storepb.Workspif workspaceSetting != nil {workspaceGeneralSetting = workspaceSetting.GetGeneralSetting()}- s.workspaceSettingCache.Store(storepb.WorkspaceSettingKey_WORKSPACE_SETTING_GENERAL.String(), &storepb.WorkspaceSetting{- Key: storepb.WorkspaceSettingKey_WORKSPACE_SETTING_GENERAL,+ s.workspaceSettingCache.Store(storepb.WorkspaceSettingKey_GENERAL.String(), &storepb.WorkspaceSetting{+ Key: storepb.WorkspaceSettingKey_GENERAL,Value: &storepb.WorkspaceSetting_GeneralSetting{GeneralSetting: workspaceGeneralSetting},})return workspaceGeneralSetting, nil@@ -144,7 +144,7 @@ const (func (s *Store) GetWorkspaceMemoRelatedSetting(ctx context.Context) (*storepb.WorkspaceMemoRelatedSetting, error) {workspaceSetting, err := s.GetWorkspaceSetting(ctx, &FindWorkspaceSetting{- Name: storepb.WorkspaceSettingKey_WORKSPACE_SETTING_MEMO_RELATED.String(),+ Name: storepb.WorkspaceSettingKey_MEMO_RELATED.String(),})if err != nil {return nil, errors.Wrap(err, "failed to get workspace general setting")@@ -157,22 +157,22 @@ func (s *Store) GetWorkspaceMemoRelatedSetting(ctx context.Context) (*storepb.Woif workspaceMemoRelatedSetting.ContentLengthLimit < DefaultContentLengthLimit {workspaceMemoRelatedSetting.ContentLengthLimit = DefaultContentLengthLimit}- s.workspaceSettingCache.Store(storepb.WorkspaceSettingKey_WORKSPACE_SETTING_MEMO_RELATED.String(), &storepb.WorkspaceSetting{- Key: storepb.WorkspaceSettingKey_WORKSPACE_SETTING_MEMO_RELATED,+ s.workspaceSettingCache.Store(storepb.WorkspaceSettingKey_MEMO_RELATED.String(), &storepb.WorkspaceSetting{+ Key: storepb.WorkspaceSettingKey_MEMO_RELATED,Value: &storepb.WorkspaceSetting_MemoRelatedSetting{MemoRelatedSetting: workspaceMemoRelatedSetting},})return workspaceMemoRelatedSetting, nil}const (- defaultWorkspaceStorageType = storepb.WorkspaceStorageSetting_STORAGE_TYPE_DATABASE+ defaultWorkspaceStorageType = storepb.WorkspaceStorageSetting_DATABASEdefaultWorkspaceUploadSizeLimitMb = 30defaultWorkspaceFilepathTemplate = "assets/{timestamp}_{filename}")func (s *Store) GetWorkspaceStorageSetting(ctx context.Context) (*storepb.WorkspaceStorageSetting, error) {workspaceSetting, err := s.GetWorkspaceSetting(ctx, &FindWorkspaceSetting{- Name: storepb.WorkspaceSettingKey_WORKSPACE_SETTING_STORAGE.String(),+ Name: storepb.WorkspaceSettingKey_STORAGE.String(),})if err != nil {return nil, errors.Wrap(err, "failed to get workspace storage setting")@@ -191,8 +191,8 @@ func (s *Store) GetWorkspaceStorageSetting(ctx context.Context) (*storepb.Workspif workspaceStorageSetting.FilepathTemplate == "" {workspaceStorageSetting.FilepathTemplate = defaultWorkspaceFilepathTemplate}- s.workspaceSettingCache.Store(storepb.WorkspaceSettingKey_WORKSPACE_SETTING_STORAGE.String(), &storepb.WorkspaceSetting{- Key: storepb.WorkspaceSettingKey_WORKSPACE_SETTING_STORAGE,+ s.workspaceSettingCache.Store(storepb.WorkspaceSettingKey_STORAGE.String(), &storepb.WorkspaceSetting{+ Key: storepb.WorkspaceSettingKey_STORAGE,Value: &storepb.WorkspaceSetting_StorageSetting{StorageSetting: workspaceStorageSetting},})return workspaceStorageSetting, nil@@ -203,25 +203,25 @@ func convertWorkspaceSettingFromRaw(workspaceSettingRaw *WorkspaceSetting) (*stoKey: storepb.WorkspaceSettingKey(storepb.WorkspaceSettingKey_value[workspaceSettingRaw.Name]),}switch workspaceSettingRaw.Name {- case storepb.WorkspaceSettingKey_WORKSPACE_SETTING_BASIC.String():+ case storepb.WorkspaceSettingKey_BASIC.String():basicSetting := &storepb.WorkspaceBasicSetting{}if err := protojsonUnmarshaler.Unmarshal([]byte(workspaceSettingRaw.Value), basicSetting); err != nil {return nil, err}workspaceSetting.Value = &storepb.WorkspaceSetting_BasicSetting{BasicSetting: basicSetting}- case storepb.WorkspaceSettingKey_WORKSPACE_SETTING_GENERAL.String():+ case storepb.WorkspaceSettingKey_GENERAL.String():generalSetting := &storepb.WorkspaceGeneralSetting{}if err := protojsonUnmarshaler.Unmarshal([]byte(workspaceSettingRaw.Value), generalSetting); err != nil {return nil, err}workspaceSetting.Value = &storepb.WorkspaceSetting_GeneralSetting{GeneralSetting: generalSetting}- case storepb.WorkspaceSettingKey_WORKSPACE_SETTING_STORAGE.String():+ case storepb.WorkspaceSettingKey_STORAGE.String():storageSetting := &storepb.WorkspaceStorageSetting{}if err := protojsonUnmarshaler.Unmarshal([]byte(workspaceSettingRaw.Value), storageSetting); err != nil {return nil, err}workspaceSetting.Value = &storepb.WorkspaceSetting_StorageSetting{StorageSetting: storageSetting}- case storepb.WorkspaceSettingKey_WORKSPACE_SETTING_MEMO_RELATED.String():+ case storepb.WorkspaceSettingKey_MEMO_RELATED.String():memoRelatedSetting := &storepb.WorkspaceMemoRelatedSetting{}if err := protojsonUnmarshaler.Unmarshal([]byte(workspaceSettingRaw.Value), memoRelatedSetting); err != nil {return nil, errdiff --git a/test/store/inbox_test.go b/test/store/inbox_test.goindex 63791ad8e..da79c5034 100644--- a/test/store/inbox_test.go+++ b/test/store/inbox_test.go@@ -21,7 +21,7 @@ func TestInboxStore(t *testing.T) {ReceiverID: user.ID,Status: store.UNREAD,Message: &storepb.InboxMessage{- Type: storepb.InboxMessage_TYPE_MEMO_COMMENT,+ Type: storepb.InboxMessage_MEMO_COMMENT,},}inbox, err := ts.CreateInbox(ctx, create)diff --git a/test/store/user_setting_test.go b/test/store/user_setting_test.goindex ce7c012e1..f8cac1cf2 100644--- a/test/store/user_setting_test.go+++ b/test/store/user_setting_test.go@@ -17,7 +17,7 @@ func TestUserSettingStore(t *testing.T) {require.NoError(t, err)_, err = ts.UpsertUserSetting(ctx, &storepb.UserSetting{UserId: user.ID,- Key: storepb.UserSettingKey_USER_SETTING_LOCALE,+ Key: storepb.UserSettingKey_LOCALE,Value: &storepb.UserSetting_Locale{Locale: "en"},})require.NoError(t, err)diff --git a/test/store/workspace_setting_test.go b/test/store/workspace_setting_test.goindex ece721da3..59882946c 100644--- a/test/store/workspace_setting_test.go+++ b/test/store/workspace_setting_test.go@@ -14,7 +14,7 @@ func TestWorkspaceSettingV1Store(t *testing.T) {ctx := context.Background()ts := NewTestingStore(ctx, t)workspaceSetting, err := ts.UpsertWorkspaceSetting(ctx, &storepb.WorkspaceSetting{- Key: storepb.WorkspaceSettingKey_WORKSPACE_SETTING_GENERAL,+ Key: storepb.WorkspaceSettingKey_GENERAL,Value: &storepb.WorkspaceSetting_GeneralSetting{GeneralSetting: &storepb.WorkspaceGeneralSetting{DisallowSignup: true,diff --git a/web/package.json b/web/package.jsonindex 85906884a..507a40c99 100644--- a/web/package.json+++ b/web/package.json@@ -22,7 +22,7 @@"dayjs": "^1.11.11","fuse.js": "^7.0.0","highlight.js": "^11.9.0",- "i18next": "^23.11.3",+ "i18next": "^23.11.4","katex": "^0.16.10","lodash-es": "^4.17.21","lucide-react": "^0.378.0",@@ -32,7 +32,7 @@"react-hot-toast": "^2.4.1","react-i18next": "^14.1.1","react-redux": "^9.1.2",- "react-router-dom": "^6.23.0",+ "react-router-dom": "^6.23.1","react-use": "^17.5.0","tailwindcss": "^3.4.3","textarea-caret": "^3.1.0",@@ -48,7 +48,7 @@"@types/lodash-es": "^4.17.12","@types/node": "^20.12.11","@types/qs": "^6.9.15",- "@types/react": "^18.3.1",+ "@types/react": "^18.3.2","@types/react-dom": "^18.3.0","@types/textarea-caret": "^3.0.3","@types/uuid": "^9.0.8",@@ -65,7 +65,7 @@"nice-grpc-web": "^3.3.3","postcss": "^8.4.38","prettier": "^3.2.5",- "protobufjs": "^7.2.6",+ "protobufjs": "^7.3.0","typescript": "^5.4.5","vite": "^5.2.11"}diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yamlindex d3a0ac17f..3e933e829 100644--- a/web/pnpm-lock.yaml+++ b/web/pnpm-lock.yaml@@ -19,10 +19,10 @@ importers:version: 3.2.2([email protected])'@emotion/react':specifier: ^11.11.4- version: 11.11.4(@types/[email protected])([email protected])+ version: 11.11.4(@types/[email protected])([email protected])'@emotion/styled':specifier: ^11.11.5- version: 11.11.5(@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])+ version: 11.11.5(@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])'@github/relative-time-element':specifier: ^4.4.0version: 4.4.0@@ -31,10 +31,10 @@ importers:version: 3.1.3([email protected])([email protected])'@mui/joy':specifier: 5.0.0-beta.36- version: 5.0.0-beta.36(@emotion/[email protected](@types/[email protected])([email protected]))(@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ version: 5.0.0-beta.36(@emotion/[email protected](@types/[email protected])([email protected]))(@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])'@reduxjs/toolkit':specifier: ^2.2.4- version: 2.2.4([email protected](@types/[email protected])([email protected])([email protected]))([email protected])+ version: 2.2.4([email protected](@types/[email protected])([email protected])([email protected]))([email protected])clsx:specifier: ^2.1.1version: 2.1.1@@ -51,8 +51,8 @@ importers:specifier: ^11.9.0version: 11.9.0i18next:- specifier: ^23.11.3- version: 23.11.3+ specifier: ^23.11.4+ version: 23.11.4katex:specifier: ^0.16.10version: 0.16.10@@ -76,13 +76,13 @@ importers:react-i18next:specifier: ^14.1.1react-redux:specifier: ^9.1.2react-router-dom:- specifier: ^6.23.0+ specifier: ^6.23.1react-use:specifier: ^17.5.0@@ -97,7 +97,7 @@ importers:version: 9.0.1zustand:specifier: ^4.5.2devDependencies:'@bufbuild/buf':specifier: ^1.31.0@@ -124,8 +124,8 @@ importers:specifier: ^6.9.15version: 6.9.15'@types/react':- specifier: ^18.3.1- version: 18.3.1+ specifier: ^18.3.2+ version: 18.3.2'@types/react-dom':specifier: ^18.3.0version: 18.3.0@@ -175,8 +175,8 @@ importers:specifier: ^3.2.5version: 3.2.5protobufjs:- specifier: ^7.2.6- version: 7.2.6+ specifier: ^7.3.0+ version: 7.3.0typescript:specifier: ^5.4.5version: 5.4.5@@ -799,8 +799,8 @@ packages:react-redux:optional: true- '@remix-run/[email protected]':- resolution: {integrity: sha512-Quz1KOffeEf/zwkCBM3kBtH4ZoZ+pT3xIXBG4PPW/XFtDP7EGhtTiC2+gpL9GnR7+Qdet5Oa6cYSvwKYg6kN9Q==}+ '@remix-run/[email protected]':+ resolution: {integrity: sha512-es2g3dq6Nb07iFxGk5GuHN20RwBZOsuDQN7izWIisUcv9r+d2C5jQxqmgkdebXgReWfiyUabcki6Fg77mSNrig==}engines: {node: '>=14.0.0'}'@rollup/[email protected]':@@ -1045,8 +1045,8 @@ packages:'@types/[email protected]':resolution: {integrity: sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==}- '@types/[email protected]':- resolution: {integrity: sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw==}+ '@types/[email protected]':+ resolution: {integrity: sha512-Btgg89dAnqD4vV7R3hlwOxgqobUQKgx3MmrQRi0yYbs/P0ym8XozIAlkqVilPqHQwXs4e9Tf63rrCgl58BcO4w==}'@types/[email protected]':resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==}@@ -1574,14 +1574,14 @@ packages:resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}engines: {node: '>=6.0.0'}- resolution: {integrity: sha512-hLGGBI1tw5N8qTELr3blKjAML/LY4ANxksbS612UiJyDfyf/2D092Pvm+S7pmeTGJRqvlJkFzBoHBQKgQlOQVg==}+ resolution: {integrity: sha512-5sOWYSNPaxz6o2MUPvtyxTTqR4D3L77pr5rUQoWgD5ROQtVIZQgJkXbo1DLlK3vj11YGw5+LnF4SYti4gZmwng==}resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}- resolution: {integrity: sha512-PIbxpiJGx6Bb8dQaonNc6CGTRlVntdLg/2nMa1YhnrwYOORY9a3ZgGN0UQYE6lAcj/lkyduJN7BPt/JiY+jAQQ==}+ resolution: {integrity: sha512-k4J8NrtJ9QrvHLRo8Q18OncqBCB7tIUyqxRcJnlonQ0ioHKYB988GcDFF3ZePmnb8eHEopDs/wPHR/iGAFgoUQ==}resolution: {integrity: sha512-f/ZeWvW/BCXbhGEf1Ujp29EASo/lk1FDnETgNKwJrsVvGZhUWCZyg3xLJjAsxfOmt8KjswHmI5EwCQcPMpOYhQ==}@@ -1811,9 +1811,9 @@ packages:resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}engines: {node: '>=10.13.0'}- resolution: {integrity: sha512-CQ9K7FRtaP//lXUKJVVYFxvozIz3HR4Brk+yB5VSkmWiHVILwd7NqQ2+UH6Ab5/NzCLib+j1REVV+FSZ+ZHOvg==}- engines: {node: '>=16 || 14 >=14.17'}+ resolution: {integrity: sha512-0c6RlJt1TICLyvJYIApxb8GsXoai0KUP7AxKKAtsYXdgJR1mGEUa7DgwShbdk1nly0PYoZj01xd4hzbq3fsjpw==}+ engines: {node: '>=16 || 14 >=14.18'}hasBin: true@@ -1892,8 +1892,8 @@ packages:resolution: {integrity: sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==}- resolution: {integrity: sha512-Pq/aSKowir7JM0rj+Wa23Kb6KKDUGno/HjG+wRQu0PxoTbpQ4N89MAT0rFGvXmLkRLNMb1BbBOKGozl01dabzg==}+ resolution: {integrity: sha512-CCUjtd5TfaCl+mLUzAA0uPSN+AVn4fP/kWCYt/hocPUwusTpMVczdrRyOBUwk6N05iH40qiKx6q1DoNJtBIwdg==}resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}@@ -2415,9 +2415,9 @@ packages:resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}- resolution: {integrity: sha512-nYo46tkNDCe4Ti+K4WP/ns2BjywqQMAeAz7r3lqtVkh8A0L9F86Ju2nLIrzFMUDSs1X0lHivbCiKG4eRUK2Z2Q==}- engines: {node: '>=16 || 14 >=14.17'}+ resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==}+ engines: {node: '>=16 || 14 >=14.18'}resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}@@ -2503,8 +2503,8 @@ packages:resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}- resolution: {integrity: sha512-dgJaEDDL6x8ASUZ1YqWciTRrdOuYNzoOf27oHNfdyvKqHr5i0FV7FSLU+aIeFjyFgVxrpTOtQUi0BLLBymZaBw==}+ resolution: {integrity: sha512-YWD03n3shzV9ImZRX3ccbjqLxj7NokGN0V/ESiBV5xWqrommYHYiihuIyavq03pWSGqlyvYUFmfoMKd+1rPA/g==}engines: {node: '>=12.0.0'}@@ -2564,15 +2564,15 @@ packages:resolution: {integrity: sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==}engines: {node: '>=0.10.0'}- resolution: {integrity: sha512-Q9YaSYvubwgbal2c9DJKfx6hTNoBp3iJDsl+Duva/DwxoJH+OTXkxGpql4iUK2sla/8z4RpjAm6EWx1qUDuopQ==}+ resolution: {integrity: sha512-utP+K+aSTtEdbWpC+4gxhdlPFwuEfDKq8ZrPFU65bbRJY+l706qjR7yaidBpo3MSeA/fzwbXWbKBI6ftOnP3OQ==}engines: {node: '>=14.0.0'}peerDependencies:react: '>=16.8'react-dom: '>=16.8'- resolution: {integrity: sha512-wPMZ8S2TuPadH0sF5irFGjkNLIcRvOSaEe7v+JER8508dyJumm6XZB1u5kztlX0RVq6AzRVndzqcUh6sFIauzA==}+ resolution: {integrity: sha512-fzcOaRF69uvqbbM7OhvQyBTFDVrrGlsFdS3AL+1KfIBtGETibHzi3FkoTRyiDJnWNc2VxrfvR+657ROHjaNjqQ==}engines: {node: '>=14.0.0'}peerDependencies:react: '>=16.8'@@ -2695,8 +2695,8 @@ packages:resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}hasBin: true- resolution: {integrity: sha512-f/vbBsu+fOiYt+lmwZV0rVwJScl46HppnOA1ZvIuBWKOTlllpyJ3bfVax76/OrhCH38dyxoDIA8K7uB963IYgA==}+ resolution: {integrity: sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==}engines: {node: '>=10'}hasBin: true@@ -3320,7 +3320,7 @@ snapshots:'@emotion/[email protected]': {}dependencies:'@babel/runtime': 7.24.5'@emotion/babel-plugin': 11.11.0@@ -3332,7 +3332,7 @@ snapshots:hoist-non-react-statics: 3.3.2react: 18.3.1optionalDependencies:- '@types/react': 18.3.1+ '@types/react': 18.3.2'@emotion/[email protected]':dependencies:@@ -3344,18 +3344,18 @@ snapshots:'@emotion/[email protected]': {}- '@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])':+ '@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])':dependencies:'@babel/runtime': 7.24.5'@emotion/babel-plugin': 11.11.0'@emotion/is-prop-valid': 1.2.2- '@emotion/react': 11.11.4(@types/[email protected])([email protected])+ '@emotion/react': 11.11.4(@types/[email protected])([email protected])'@emotion/serialize': 1.1.4'@emotion/use-insertion-effect-with-fallbacks': 1.0.1([email protected])'@emotion/utils': 1.2.1react: 18.3.1optionalDependencies:- '@types/react': 18.3.1+ '@types/react': 18.3.2'@emotion/[email protected]': {}@@ -3521,49 +3521,49 @@ snapshots:katex: 0.16.10react: 18.3.1- '@mui/[email protected](@types/[email protected])([email protected]([email protected]))([email protected])':+ '@mui/[email protected](@types/[email protected])([email protected]([email protected]))([email protected])':dependencies:'@babel/runtime': 7.24.5- '@mui/types': 7.2.14(@types/[email protected])- '@mui/utils': 6.0.0-alpha.5(@types/[email protected])([email protected])+ '@mui/types': 7.2.14(@types/[email protected])+ '@mui/utils': 6.0.0-alpha.5(@types/[email protected])([email protected])'@popperjs/core': 2.11.8clsx: 2.1.1prop-types: 15.8.1react: 18.3.1react-dom: 18.3.1([email protected])optionalDependencies:- '@types/react': 18.3.1+ '@types/react': 18.3.2'@mui/[email protected]': {}- '@mui/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':+ '@mui/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':dependencies:'@babel/runtime': 7.24.5- '@mui/base': 5.0.0-beta.42(@types/[email protected])([email protected]([email protected]))([email protected])+ '@mui/base': 5.0.0-beta.42(@types/[email protected])([email protected]([email protected]))([email protected])'@mui/core-downloads-tracker': 6.0.0-dev.240424162023-9968b4889d- '@mui/system': 6.0.0-dev.240424162023-9968b4889d(@emotion/[email protected](@types/[email protected])([email protected]))(@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]))(@types/[email protected])([email protected])- '@mui/types': 7.2.14(@types/[email protected])- '@mui/utils': 6.0.0-alpha.5(@types/[email protected])([email protected])+ '@mui/system': 6.0.0-dev.240424162023-9968b4889d(@emotion/[email protected](@types/[email protected])([email protected]))(@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]))(@types/[email protected])([email protected])+ '@mui/types': 7.2.14(@types/[email protected])+ '@mui/utils': 6.0.0-alpha.5(@types/[email protected])([email protected])clsx: 2.1.1prop-types: 15.8.1react: 18.3.1react-dom: 18.3.1([email protected])optionalDependencies:- '@emotion/react': 11.11.4(@types/[email protected])([email protected])- '@emotion/styled': 11.11.5(@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])- '@types/react': 18.3.1+ '@emotion/react': 11.11.4(@types/[email protected])([email protected])+ '@emotion/styled': 11.11.5(@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])+ '@types/react': 18.3.2dependencies:'@babel/runtime': 7.24.5- '@mui/utils': 6.0.0-alpha.5(@types/[email protected])([email protected])+ '@mui/utils': 6.0.0-alpha.5(@types/[email protected])([email protected])prop-types: 15.8.1react: 18.3.1optionalDependencies:- '@types/react': 18.3.1+ '@types/react': 18.3.2- '@mui/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]))([email protected])':+ '@mui/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]))([email protected])':dependencies:'@babel/runtime': 7.24.5'@emotion/cache': 11.11.0@@ -3571,30 +3571,30 @@ snapshots:prop-types: 15.8.1react: 18.3.1optionalDependencies:- '@emotion/react': 11.11.4(@types/[email protected])([email protected])- '@emotion/styled': 11.11.5(@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])+ '@emotion/react': 11.11.4(@types/[email protected])([email protected])+ '@emotion/styled': 11.11.5(@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])- '@mui/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]))(@types/[email protected])([email protected])':+ '@mui/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]))(@types/[email protected])([email protected])':dependencies:'@babel/runtime': 7.24.5- '@mui/private-theming': 6.0.0-alpha.5(@types/[email protected])([email protected])- '@mui/styled-engine': 6.0.0-alpha.5(@emotion/[email protected](@types/[email protected])([email protected]))(@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]))([email protected])- '@mui/types': 7.2.14(@types/[email protected])- '@mui/utils': 6.0.0-alpha.5(@types/[email protected])([email protected])+ '@mui/private-theming': 6.0.0-alpha.5(@types/[email protected])([email protected])+ '@mui/styled-engine': 6.0.0-alpha.5(@emotion/[email protected](@types/[email protected])([email protected]))(@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]))([email protected])+ '@mui/types': 7.2.14(@types/[email protected])+ '@mui/utils': 6.0.0-alpha.5(@types/[email protected])([email protected])clsx: 2.1.1csstype: 3.1.3prop-types: 15.8.1react: 18.3.1optionalDependencies:- '@emotion/react': 11.11.4(@types/[email protected])([email protected])- '@emotion/styled': 11.11.5(@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])- '@types/react': 18.3.1+ '@emotion/react': 11.11.4(@types/[email protected])([email protected])+ '@emotion/styled': 11.11.5(@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])+ '@types/react': 18.3.2- '@mui/[email protected](@types/[email protected])':+ '@mui/[email protected](@types/[email protected])':optionalDependencies:- '@types/react': 18.3.1+ '@types/react': 18.3.2dependencies:'@babel/runtime': 7.24.5'@types/prop-types': 15.7.12@@ -3602,7 +3602,7 @@ snapshots:react: 18.3.1react-is: 18.3.1optionalDependencies:- '@types/react': 18.3.1+ '@types/react': 18.3.2'@nodelib/[email protected]':dependencies:@@ -3646,7 +3646,7 @@ snapshots:'@protobufjs/[email protected]': {}- '@reduxjs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected])':+ '@reduxjs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected])':dependencies:immer: 10.1.1redux: 5.0.1@@ -3654,9 +3654,9 @@ snapshots:reselect: 5.1.0optionalDependencies:react: 18.3.1- '@remix-run/[email protected]': {}+ '@remix-run/[email protected]': {}'@rollup/[email protected]':optional: true@@ -3898,9 +3898,9 @@ snapshots:'@types/[email protected]':dependencies:- '@types/react': 18.3.1+ '@types/react': 18.3.2- '@types/[email protected]':+ '@types/[email protected]':dependencies:'@types/prop-types': 15.7.12csstype: 3.1.3@@ -3930,7 +3930,7 @@ snapshots:graphemer: 1.4.0ignore: 5.3.1natural-compare: 1.4.0- semver: 7.6.1+ semver: 7.6.2ts-api-utils: 1.3.0([email protected])optionalDependencies:typescript: 5.4.5@@ -3977,7 +3977,7 @@ snapshots:globby: 11.1.0is-glob: 4.0.3minimatch: 9.0.4- semver: 7.6.1+ semver: 7.6.2ts-api-utils: 1.3.0([email protected])optionalDependencies:typescript: 5.4.5@@ -3993,7 +3993,7 @@ snapshots:'@typescript-eslint/types': 7.8.0'@typescript-eslint/typescript-estree': 7.8.0([email protected])eslint: 8.57.0- semver: 7.6.1+ semver: 7.6.2transitivePeerDependencies:- supports-color- typescript@@ -4163,7 +4163,7 @@ snapshots:dependencies:caniuse-lite: 1.0.30001617- electron-to-chromium: 1.4.761+ electron-to-chromium: 1.4.763node-releases: 2.0.14update-browserslist-db: 1.0.15([email protected])@@ -4516,11 +4516,11 @@ snapshots:dependencies:esutils: 2.0.3- [email protected]: {}+ [email protected]: {}- [email protected]: {}+ [email protected]: {}@@ -4870,13 +4870,13 @@ snapshots:dependencies:is-glob: 4.0.3dependencies:foreground-child: 3.1.1jackspeak: 2.3.6minimatch: 9.0.4minipass: 7.1.1- path-scurry: 1.10.4+ path-scurry: 1.11.1dependencies:@@ -4954,7 +4954,7 @@ snapshots:dependencies:'@babel/runtime': 7.24.5@@ -5262,7 +5262,7 @@ snapshots:d3-sankey: 0.12.3dagre-d3-es: 7.0.10dayjs: 1.11.11- dompurify: 3.1.2+ dompurify: 3.1.3elkjs: 0.9.3katex: 0.16.10khroma: 2.1.0@@ -5563,7 +5563,7 @@ snapshots:dependencies:lru-cache: 10.2.2minipass: 7.1.1@@ -5634,7 +5634,7 @@ snapshots:object-assign: 4.1.1react-is: 16.13.1dependencies:'@protobufjs/aspromise': 1.1.2'@protobufjs/base64': 1.1.2@@ -5670,11 +5670,11 @@ snapshots:transitivePeerDependencies:- csstypedependencies:'@babel/runtime': 7.24.5html-parse-stringify: 3.0.1- i18next: 23.11.3+ i18next: 23.11.4react: 18.3.1optionalDependencies:react-dom: 18.3.1([email protected])@@ -5683,27 +5683,27 @@ snapshots:dependencies:'@types/use-sync-external-store': 0.0.3react: 18.3.1use-sync-external-store: 1.2.2([email protected])optionalDependencies:- '@types/react': 18.3.1+ '@types/react': 18.3.2redux: 5.0.1dependencies:- '@remix-run/router': 1.16.0+ '@remix-run/router': 1.16.1react: 18.3.1react-dom: 18.3.1([email protected])- react-router: 6.23.0([email protected])+ react-router: 6.23.1([email protected])dependencies:- '@remix-run/router': 1.16.0+ '@remix-run/router': 1.16.1react: 18.3.1@@ -5858,7 +5858,7 @@ snapshots:- [email protected]: {}+ [email protected]: {}dependencies:@@ -5984,7 +5984,7 @@ snapshots:dependencies:'@jridgewell/gen-mapping': 0.3.5commander: 4.1.1- glob: 10.3.13+ glob: 10.3.15lines-and-columns: 1.2.4mz: 2.7.0pirates: 4.0.6@@ -6232,10 +6232,10 @@ snapshots:dependencies:use-sync-external-store: 1.2.0([email protected])optionalDependencies:- '@types/react': 18.3.1+ '@types/react': 18.3.2immer: 10.1.1react: 18.3.1diff --git a/web/src/App.tsx b/web/src/App.tsxindex 3802479b3..daf641241 100644--- a/web/src/App.tsx+++ b/web/src/App.tsx@@ -22,8 +22,7 @@ const App = () => {const userSetting = userStore.userSetting;const workspaceGeneralSetting =- workspaceSettingStore.getWorkspaceSettingByKey(WorkspaceSettingKey.WORKSPACE_SETTING_GENERAL).generalSetting ||- WorkspaceGeneralSetting.fromPartial({});+ workspaceSettingStore.getWorkspaceSettingByKey(WorkspaceSettingKey.GENERAL).generalSetting || WorkspaceGeneralSetting.fromPartial({});// Redirect to sign up page if no instance owner.useEffect(() => {diff --git a/web/src/components/DisablePasswordLoginDialog.tsx b/web/src/components/DisablePasswordLoginDialog.tsxindex 6a172879b..fe8641978 100644--- a/web/src/components/DisablePasswordLoginDialog.tsx+++ b/web/src/components/DisablePasswordLoginDialog.tsx@@ -18,8 +18,7 @@ const DisablePasswordLoginDialog: React.FC<Props> = ({ destroy }: Props) => {const t = useTranslate();const workspaceSettingStore = useWorkspaceSettingStore();const workspaceGeneralSetting =- workspaceSettingStore.getWorkspaceSettingByKey(WorkspaceSettingKey.WORKSPACE_SETTING_GENERAL).generalSetting ||- WorkspaceGeneralSetting.fromPartial({});+ workspaceSettingStore.getWorkspaceSettingByKey(WorkspaceSettingKey.GENERAL).generalSetting || WorkspaceGeneralSetting.fromPartial({});const [state, setState] = useState<State>({disablePasswordLogin: workspaceGeneralSetting.disallowPasswordLogin,});@@ -41,7 +40,7 @@ const DisablePasswordLoginDialog: React.FC<Props> = ({ destroy }: Props) => {setState({ ...state, disablePasswordLogin: true });try {await workspaceSettingStore.setWorkspaceSetting({- name: `${WorkspaceSettingPrefix}${WorkspaceSettingKey.WORKSPACE_SETTING_GENERAL}`,+ name: `${WorkspaceSettingPrefix}${WorkspaceSettingKey.GENERAL}`,generalSetting: {...workspaceGeneralSetting,disallowPasswordLogin: true,diff --git a/web/src/components/MemoEditor/index.tsx b/web/src/components/MemoEditor/index.tsxindex 4176399d8..901d6f5e1 100644--- a/web/src/components/MemoEditor/index.tsx+++ b/web/src/components/MemoEditor/index.tsx@@ -77,7 +77,7 @@ const MemoEditor = (props: Props) => {): state.relationList.filter((relation) => relation.type === MemoRelation_Type.REFERENCE);const workspaceMemoRelatedSetting =- workspaceSettingStore.getWorkspaceSettingByKey(WorkspaceSettingKey.WORKSPACE_SETTING_MEMO_RELATED)?.memoRelatedSetting ||+ workspaceSettingStore.getWorkspaceSettingByKey(WorkspaceSettingKey.MEMO_RELATED)?.memoRelatedSetting ||WorkspaceMemoRelatedSetting.fromPartial({});useEffect(() => {diff --git a/web/src/components/Settings/StorageSection.tsx b/web/src/components/Settings/StorageSection.tsxindex 03bf3fb3e..04e99920b 100644--- a/web/src/components/Settings/StorageSection.tsx+++ b/web/src/components/Settings/StorageSection.tsx@@ -17,9 +17,7 @@ const StorageSection = () => {const t = useTranslate();const workspaceSettingStore = useWorkspaceSettingStore();const [workspaceStorageSetting, setWorkspaceStorageSetting] = useState<WorkspaceStorageSetting>(- WorkspaceStorageSetting.fromPartial(- workspaceSettingStore.getWorkspaceSettingByKey(WorkspaceSettingKey.WORKSPACE_SETTING_STORAGE)?.storageSetting || {},- ),+ WorkspaceStorageSetting.fromPartial(workspaceSettingStore.getWorkspaceSettingByKey(WorkspaceSettingKey.STORAGE)?.storageSetting || {}),);const allowSaveStorageSetting = useMemo(() => {@@ -28,7 +26,7 @@ const StorageSection = () => {}const origin = WorkspaceStorageSetting.fromPartial(- workspaceSettingStore.getWorkspaceSettingByKey(WorkspaceSettingKey.WORKSPACE_SETTING_STORAGE)?.storageSetting || {},+ workspaceSettingStore.getWorkspaceSettingByKey(WorkspaceSettingKey.STORAGE)?.storageSetting || {},);if (workspaceStorageSetting.storageType === WorkspaceStorageSetting_StorageType.STORAGE_TYPE_LOCAL) {if (workspaceStorageSetting.filepathTemplate.length === 0) {@@ -109,7 +107,7 @@ const StorageSection = () => {const saveWorkspaceStorageSetting = async () => {await workspaceSettingStore.setWorkspaceSetting({- name: `${WorkspaceSettingPrefix}${WorkspaceSettingKey.WORKSPACE_SETTING_STORAGE}`,+ name: `${WorkspaceSettingPrefix}${WorkspaceSettingKey.STORAGE}`,storageSetting: workspaceStorageSetting,});toast.success("Updated");diff --git a/web/src/components/Settings/WorkspaceSection.tsx b/web/src/components/Settings/WorkspaceSection.tsxindex fdb86c0ad..ea42ecac4 100644--- a/web/src/components/Settings/WorkspaceSection.tsx+++ b/web/src/components/Settings/WorkspaceSection.tsx@@ -15,13 +15,11 @@ const WorkspaceSection = () => {const t = useTranslate();const workspaceSettingStore = useWorkspaceSettingStore();const [workspaceGeneralSetting, setWorkspaceGeneralSetting] = useState<WorkspaceGeneralSetting>(- WorkspaceGeneralSetting.fromPartial(- workspaceSettingStore.getWorkspaceSettingByKey(WorkspaceSettingKey.WORKSPACE_SETTING_GENERAL)?.generalSetting || {},- ),+ WorkspaceGeneralSetting.fromPartial(workspaceSettingStore.getWorkspaceSettingByKey(WorkspaceSettingKey.GENERAL)?.generalSetting || {}),);const [workspaceMemoRelatedSetting, setWorkspaceMemoRelatedSetting] = useState<WorkspaceMemoRelatedSetting>(WorkspaceMemoRelatedSetting.fromPartial(- workspaceSettingStore.getWorkspaceSettingByKey(WorkspaceSettingKey.WORKSPACE_SETTING_MEMO_RELATED)?.memoRelatedSetting || {},+ workspaceSettingStore.getWorkspaceSettingByKey(WorkspaceSettingKey.MEMO_RELATED)?.memoRelatedSetting || {},),);@@ -29,7 +27,7 @@ const WorkspaceSection = () => {const setting = { ...workspaceGeneralSetting, disallowSignup: !value };await workspaceSettingServiceClient.setWorkspaceSetting({setting: {- name: `${WorkspaceSettingPrefix}${WorkspaceSettingKey.WORKSPACE_SETTING_GENERAL}`,+ name: `${WorkspaceSettingPrefix}${WorkspaceSettingKey.GENERAL}`,generalSetting: setting,},});@@ -41,7 +39,7 @@ const WorkspaceSection = () => {const setting = { ...workspaceGeneralSetting, disallowPasswordLogin: value };await workspaceSettingServiceClient.setWorkspaceSetting({setting: {- name: `${WorkspaceSettingPrefix}${WorkspaceSettingKey.WORKSPACE_SETTING_GENERAL}`,+ name: `${WorkspaceSettingPrefix}${WorkspaceSettingKey.GENERAL}`,generalSetting: setting,},});@@ -74,7 +72,7 @@ const WorkspaceSection = () => {try {await workspaceSettingServiceClient.setWorkspaceSetting({setting: {- name: `${WorkspaceSettingPrefix}${WorkspaceSettingKey.WORKSPACE_SETTING_GENERAL}`,+ name: `${WorkspaceSettingPrefix}${WorkspaceSettingKey.GENERAL}`,generalSetting: workspaceGeneralSetting,},});@@ -94,7 +92,7 @@ const WorkspaceSection = () => {try {await workspaceSettingServiceClient.setWorkspaceSetting({setting: {- name: `${WorkspaceSettingPrefix}${WorkspaceSettingKey.WORKSPACE_SETTING_GENERAL}`,+ name: `${WorkspaceSettingPrefix}${WorkspaceSettingKey.GENERAL}`,generalSetting: workspaceGeneralSetting,},});@@ -114,7 +112,7 @@ const WorkspaceSection = () => {try {await workspaceSettingServiceClient.setWorkspaceSetting({setting: {- name: `${WorkspaceSettingPrefix}${WorkspaceSettingKey.WORKSPACE_SETTING_GENERAL}`,+ name: `${WorkspaceSettingPrefix}${WorkspaceSettingKey.GENERAL}`,generalSetting: workspaceGeneralSetting,},});@@ -130,7 +128,7 @@ const WorkspaceSection = () => {const update: WorkspaceMemoRelatedSetting = { ...workspaceMemoRelatedSetting, disallowPublicVisible: value };setWorkspaceMemoRelatedSetting(update);await workspaceSettingStore.setWorkspaceSetting({- name: `${WorkspaceSettingPrefix}${WorkspaceSettingKey.WORKSPACE_SETTING_MEMO_RELATED}`,+ name: `${WorkspaceSettingPrefix}${WorkspaceSettingKey.MEMO_RELATED}`,memoRelatedSetting: update,});};@@ -139,7 +137,7 @@ const WorkspaceSection = () => {const update: WorkspaceMemoRelatedSetting = { ...workspaceMemoRelatedSetting, displayWithUpdateTime: value };setWorkspaceMemoRelatedSetting(update);await workspaceSettingStore.setWorkspaceSetting({- name: `${WorkspaceSettingPrefix}${WorkspaceSettingKey.WORKSPACE_SETTING_MEMO_RELATED}`,+ name: `${WorkspaceSettingPrefix}${WorkspaceSettingKey.MEMO_RELATED}`,memoRelatedSetting: update,});};@@ -153,7 +151,7 @@ const WorkspaceSection = () => {const update: WorkspaceMemoRelatedSetting = { ...workspaceMemoRelatedSetting, contentLengthLimit: value };setWorkspaceMemoRelatedSetting(update);await workspaceSettingStore.setWorkspaceSetting({- name: `${WorkspaceSettingPrefix}${WorkspaceSettingKey.WORKSPACE_SETTING_MEMO_RELATED}`,+ name: `${WorkspaceSettingPrefix}${WorkspaceSettingKey.MEMO_RELATED}`,memoRelatedSetting: update,});};diff --git a/web/src/components/UpdateCustomizedProfileDialog.tsx b/web/src/components/UpdateCustomizedProfileDialog.tsxindex 2ca086241..6e285439a 100644--- a/web/src/components/UpdateCustomizedProfileDialog.tsx+++ b/web/src/components/UpdateCustomizedProfileDialog.tsx@@ -17,7 +17,7 @@ const UpdateCustomizedProfileDialog: React.FC<Props> = ({ destroy }: Props) => {const t = useTranslate();const workspaceSettingStore = useWorkspaceSettingStore();const workspaceGeneralSetting = WorkspaceGeneralSetting.fromPartial(- workspaceSettingStore.getWorkspaceSettingByKey(WorkspaceSettingKey.WORKSPACE_SETTING_GENERAL)?.generalSetting || {},+ workspaceSettingStore.getWorkspaceSettingByKey(WorkspaceSettingKey.GENERAL)?.generalSetting || {},);const [customProfile, setCustomProfile] = useState<WorkspaceCustomProfile>(WorkspaceCustomProfile.fromPartial(workspaceGeneralSetting.customProfile || {}),@@ -84,7 +84,7 @@ const UpdateCustomizedProfileDialog: React.FC<Props> = ({ destroy }: Props) => {try {await workspaceSettingStore.setWorkspaceSetting({- name: `${WorkspaceSettingPrefix}${WorkspaceSettingKey.WORKSPACE_SETTING_GENERAL}`,+ name: `${WorkspaceSettingPrefix}${WorkspaceSettingKey.GENERAL}`,generalSetting: {...workspaceGeneralSetting,customProfile: customProfile,diff --git a/web/src/layouts/CommonContextProvider.tsx b/web/src/layouts/CommonContextProvider.tsxindex b7ca71d38..625eb460f 100644--- a/web/src/layouts/CommonContextProvider.tsx+++ b/web/src/layouts/CommonContextProvider.tsx@@ -36,10 +36,10 @@ const CommonContextProvider = ({ children }: { children: React.ReactNode }) => {useEffect(() => {const initialWorkspace = async () => {const workspaceProfile = await workspaceServiceClient.getWorkspaceProfile({});- await workspaceSettingStore.fetchWorkspaceSetting(WorkspaceSettingKey.WORKSPACE_SETTING_GENERAL);+ await workspaceSettingStore.fetchWorkspaceSetting(WorkspaceSettingKey.GENERAL);const workspaceGeneralSetting =- workspaceSettingStore.getWorkspaceSettingByKey(WorkspaceSettingKey.WORKSPACE_SETTING_GENERAL).generalSetting ||+ workspaceSettingStore.getWorkspaceSettingByKey(WorkspaceSettingKey.GENERAL).generalSetting ||WorkspaceGeneralSetting.fromPartial({});setCommonContext({locale: locale || workspaceGeneralSetting.customProfile?.locale || "en",diff --git a/web/src/pages/Setting.tsx b/web/src/pages/Setting.tsxindex d9789fa7d..d8cc48f01 100644--- a/web/src/pages/Setting.tsx+++ b/web/src/pages/Setting.tsx@@ -59,7 +59,7 @@ const Setting = () => {// Initial fetch for workspace settings.(async () => {- [WorkspaceSettingKey.WORKSPACE_SETTING_MEMO_RELATED, WorkspaceSettingKey.WORKSPACE_SETTING_STORAGE].forEach(async (key) => {+ [WorkspaceSettingKey.MEMO_RELATED, WorkspaceSettingKey.STORAGE].forEach(async (key) => {await workspaceSettingStore.fetchWorkspaceSetting(key);});})();diff --git a/web/src/pages/SignIn.tsx b/web/src/pages/SignIn.tsxindex ab417e3ce..19434d3c2 100644--- a/web/src/pages/SignIn.tsx+++ b/web/src/pages/SignIn.tsx@@ -28,8 +28,7 @@ const SignIn = () => {const [remember, setRemember] = useState(true);const [identityProviderList, setIdentityProviderList] = useState<IdentityProvider[]>([]);const workspaceGeneralSetting =- workspaceSettingStore.getWorkspaceSettingByKey(WorkspaceSettingKey.WORKSPACE_SETTING_GENERAL).generalSetting ||- WorkspaceGeneralSetting.fromPartial({});+ workspaceSettingStore.getWorkspaceSettingByKey(WorkspaceSettingKey.GENERAL).generalSetting || WorkspaceGeneralSetting.fromPartial({});useEffect(() => {const fetchIdentityProviderList = async () => {diff --git a/web/src/pages/SignUp.tsx b/web/src/pages/SignUp.tsxindex 5cdbfadc3..6f64ad32a 100644--- a/web/src/pages/SignUp.tsx+++ b/web/src/pages/SignUp.tsx@@ -24,8 +24,7 @@ const SignUp = () => {const [username, setUsername] = useState("");const [password, setPassword] = useState("");const workspaceGeneralSetting =- workspaceSettingStore.getWorkspaceSettingByKey(WorkspaceSettingKey.WORKSPACE_SETTING_GENERAL).generalSetting ||- WorkspaceGeneralSetting.fromPartial({});+ workspaceSettingStore.getWorkspaceSettingByKey(WorkspaceSettingKey.GENERAL).generalSetting || WorkspaceGeneralSetting.fromPartial({});const handleUsernameInputChanged = (e: React.ChangeEvent<HTMLInputElement>) => {const text = e.target.value as string;diff --git a/web/src/pages/Timeline.tsx b/web/src/pages/Timeline.tsxindex d5db5eb62..0c0fd6557 100644--- a/web/src/pages/Timeline.tsx+++ b/web/src/pages/Timeline.tsx@@ -149,7 +149,7 @@ const Timeline = () => {type="date"max={dayjs().format("YYYY-MM-DD")}value={dayjs(selectedDateString).format("YYYY-MM-DD")}- onFocus={(e) => e.target.showPicker()}+ onFocus={(e: any) => e.target.showPicker()}onChange={(e) => handleSelectedDataChange(e.target.value)}/></div>