From 0d6dc2423b9dcee6e9d31ccc8d7bdcbe4ad6735b Mon Sep 17 00:00:00 2001 From: mozhu Date: Thu, 5 Sep 2024 21:55:42 +0800 Subject: [PATCH 01/10] add remove done items --- docs/apidocs.swagger.yaml | 268 +++++++++++++----- proto/api/v1/workspace_setting_service.proto | 2 + .../api/v1/workspace_setting_service.pb.go | 100 ++++--- proto/gen/store/workspace_setting.pb.go | 52 ++-- proto/store/workspace_setting.proto | 2 + .../api/v1/workspace_setting_service.go | 2 + web/src/components/MemoActionMenu.tsx | 31 +- web/src/components/MemoView.tsx | 2 +- .../Settings/MemoRelatedSettings.tsx | 7 + web/src/locales/zh-Hans.json | 10 +- 10 files changed, 343 insertions(+), 133 deletions(-) diff --git a/docs/apidocs.swagger.yaml b/docs/apidocs.swagger.yaml index c01f6b859d0c5..9dd69bb947d07 100644 --- a/docs/apidocs.swagger.yaml +++ b/docs/apidocs.swagger.yaml @@ -300,12 +300,16 @@ paths: type: integer format: int32 - name: pageToken - description: "A page token, received from a previous `ListMemos` call.\r\nProvide this to retrieve the subsequent page." + description: |- + A page token, received from a previous `ListMemos` call. + Provide this to retrieve the subsequent page. in: query required: false type: string - name: filter - description: "Filter is used to filter memos returned in the list.\r\nFormat: \"creator == 'users/{uid}' && visibilities == ['PUBLIC', 'PROTECTED']\"" + description: |- + Filter is used to filter memos returned in the list. + Format: "creator == 'users/{uid}' && visibilities == ['PUBLIC', 'PROTECTED']" in: query required: false type: string @@ -480,7 +484,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: filter - description: "Filter is used to filter users returned in the list.\r\nFormat: \"username == 'frank'\"" + description: |- + Filter is used to filter users returned in the list. + Format: "username == 'frank'" in: query required: false type: string @@ -641,7 +647,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The resource name of the workspace setting.\r\nFormat: settings/{setting}" + description: |- + The resource name of the workspace setting. + Format: settings/{setting} in: path required: true type: string @@ -663,7 +671,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: setting.name - description: "name is the name of the setting.\r\nFormat: settings/{setting}" + description: |- + name is the name of the setting. + Format: settings/{setting} in: path required: true type: string @@ -699,7 +709,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: identityProvider.name - description: "The name of the identityProvider.\r\nFormat: identityProviders/{id}" + description: |- + The name of the identityProvider. + Format: identityProviders/{id} in: path required: true type: string @@ -737,7 +749,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: inbox.name - description: "The name of the inbox.\r\nFormat: inboxes/{id}" + description: |- + The name of the inbox. + Format: inboxes/{id} in: path required: true type: string @@ -781,7 +795,10 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: memo.name - description: "The name of the memo.\r\nFormat: memos/{id}\r\nid is the system generated id." + description: |- + The name of the memo. + Format: memos/{id} + id is the system generated id. in: path required: true type: string @@ -799,7 +816,9 @@ paths: $ref: '#/definitions/v1RowStatus' creator: type: string - title: "The name of the creator.\r\nFormat: users/{id}" + title: |- + The name of the creator. + Format: users/{id} createTime: type: string format: date-time @@ -852,7 +871,9 @@ paths: readOnly: true parent: type: string - title: "The name of the parent memo.\r\nFormat: memos/{id}" + title: |- + The name of the parent memo. + Format: memos/{id} readOnly: true snippet: type: string @@ -874,7 +895,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name_1 - description: "The name of the user.\r\nFormat: users/{id}" + description: |- + The name of the user. + Format: users/{id} in: path required: true type: string @@ -896,7 +919,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name_1 - description: "The name of the identityProvider to delete.\r\nFormat: identityProviders/{id}" + description: |- + The name of the identityProvider to delete. + Format: identityProviders/{id} in: path required: true type: string @@ -918,7 +943,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name_2 - description: "The name of the identityProvider to get.\r\nFormat: identityProviders/{id}" + description: |- + The name of the identityProvider to get. + Format: identityProviders/{id} in: path required: true type: string @@ -940,7 +967,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name_2 - description: "The name of the inbox to delete.\r\nFormat: inboxes/{id}" + description: |- + The name of the inbox to delete. + Format: inboxes/{id} in: path required: true type: string @@ -962,7 +991,10 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name_3 - description: "The name of the resource.\r\nFormat: resources/{id}\r\nid is the system generated unique identifier." + description: |- + The name of the resource. + Format: resources/{id} + id is the system generated unique identifier. in: path required: true type: string @@ -984,7 +1016,10 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name_3 - description: "The name of the resource.\r\nFormat: resources/{id}\r\nid is the system generated unique identifier." + description: |- + The name of the resource. + Format: resources/{id} + id is the system generated unique identifier. in: path required: true type: string @@ -1006,7 +1041,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name_4 - description: "The name of the memo.\r\nFormat: memos/{id}" + description: |- + The name of the memo. + Format: memos/{id} in: path required: true type: string @@ -1028,7 +1065,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name_4 - description: "The name of the memo.\r\nFormat: memos/{id}" + description: |- + The name of the memo. + Format: memos/{id} in: path required: true type: string @@ -1050,7 +1089,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the activity.\r\nFormat: activities/{id}" + description: |- + The name of the activity. + Format: activities/{id} in: path required: true type: string @@ -1072,7 +1113,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the user.\r\nFormat: users/{id}" + description: |- + The name of the user. + Format: users/{id} in: path required: true type: string @@ -1094,7 +1137,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the user.\r\nFormat: users/{id}" + description: |- + The name of the user. + Format: users/{id} in: path required: true type: string @@ -1115,7 +1160,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the user.\r\nFormat: users/{id}" + description: |- + The name of the user. + Format: users/{id} in: path required: true type: string @@ -1143,7 +1190,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the user.\r\nFormat: users/{id}" + description: |- + The name of the user. + Format: users/{id} in: path required: true type: string @@ -1170,7 +1219,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the memo.\r\nFormat: memos/{id}" + description: |- + The name of the memo. + Format: memos/{id} in: path required: true type: string @@ -1191,7 +1242,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the memo.\r\nFormat: memos/{id}" + description: |- + The name of the memo. + Format: memos/{id} in: path required: true type: string @@ -1218,7 +1271,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the memo.\r\nFormat: memos/{id}. Use \"memos/-\" to list all properties." + description: |- + The name of the memo. + Format: memos/{id}. Use "memos/-" to list all properties. in: path required: true type: string @@ -1241,7 +1296,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the memo.\r\nFormat: memos/{id}. Use \"memos/-\" to rebuild all memos." + description: |- + The name of the memo. + Format: memos/{id}. Use "memos/-" to rebuild all memos. in: path required: true type: string @@ -1268,7 +1325,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the memo.\r\nFormat: memos/{id}" + description: |- + The name of the memo. + Format: memos/{id} in: path required: true type: string @@ -1289,7 +1348,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the memo.\r\nFormat: memos/{id}" + description: |- + The name of the memo. + Format: memos/{id} in: path required: true type: string @@ -1316,7 +1377,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the memo.\r\nFormat: memos/{id}" + description: |- + The name of the memo. + Format: memos/{id} in: path required: true type: string @@ -1338,7 +1401,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the memo.\r\nFormat: memos/{id}" + description: |- + The name of the memo. + Format: memos/{id} in: path required: true type: string @@ -1365,7 +1430,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the memo.\r\nFormat: memos/{id}" + description: |- + The name of the memo. + Format: memos/{id} in: path required: true type: string @@ -1387,7 +1454,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the memo.\r\nFormat: memos/{id}" + description: |- + The name of the memo. + Format: memos/{id} in: path required: true type: string @@ -1414,7 +1483,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the user.\r\nFormat: users/{id}" + description: |- + The name of the user. + Format: users/{id} in: path required: true type: string @@ -1436,13 +1507,17 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: parent - description: "The parent, who owns the tags.\r\nFormat: memos/{id}. Use \"memos/-\" to list all tags." + description: |- + The parent, who owns the tags. + Format: memos/{id}. Use "memos/-" to list all tags. in: path required: true type: string pattern: memos/[^/]+ - name: filter - description: "Filter is used to filter memos.\r\nFormat: \"creator == 'users/{uid}' && visibilities == ['PUBLIC', 'PROTECTED']\"" + description: |- + Filter is used to filter memos. + Format: "creator == 'users/{uid}' && visibilities == ['PUBLIC', 'PROTECTED']" in: query required: false type: string @@ -1464,7 +1539,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: parent - description: "The parent, who owns the tags.\r\nFormat: memos/{id}. Use \"memos/-\" to delete all tags." + description: |- + The parent, who owns the tags. + Format: memos/{id}. Use "memos/-" to delete all tags. in: path required: true type: string @@ -1495,7 +1572,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: parent - description: "The parent, who owns the tags.\r\nFormat: memos/{id}. Use \"memos/-\" to rename all tags." + description: |- + The parent, who owns the tags. + Format: memos/{id}. Use "memos/-" to rename all tags. in: path required: true type: string @@ -1522,7 +1601,10 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: resource.name - description: "The name of the resource.\r\nFormat: resources/{id}\r\nid is the system generated unique identifier." + description: |- + The name of the resource. + Format: resources/{id} + id is the system generated unique identifier. in: path required: true type: string @@ -1554,7 +1636,9 @@ paths: format: int64 memo: type: string - title: "The related memo.\r\nFormat: memos/{id}" + title: |- + The related memo. + Format: memos/{id} tags: - ResourceService /api/v1/{setting.name}: @@ -1572,7 +1656,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: setting.name - description: "The name of the user.\r\nFormat: users/{id}" + description: |- + The name of the user. + Format: users/{id} in: path required: true type: string @@ -1609,7 +1695,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: user.name - description: "The name of the user.\r\nFormat: users/{id}" + description: |- + The name of the user. + Format: users/{id} in: path required: true type: string @@ -1663,7 +1751,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the user.\r\nFormat: users/{id}" + description: |- + The name of the user. + Format: users/{id} in: path required: true type: string @@ -1696,7 +1786,10 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the resource.\r\nFormat: resources/{id}\r\nid is the system generated unique identifier." + description: |- + The name of the resource. + Format: resources/{id} + id is the system generated unique identifier. in: path required: true type: string @@ -1883,7 +1976,9 @@ definitions: properties: name: type: string - title: "The name of the identityProvider.\r\nFormat: identityProviders/{id}" + title: |- + The name of the identityProvider. + Format: identityProviders/{id} type: $ref: '#/definitions/apiv1IdentityProviderType' title: @@ -1927,7 +2022,9 @@ definitions: properties: name: type: string - title: "The name of the user.\r\nFormat: users/{id}" + title: |- + The name of the user. + Format: users/{id} locale: type: string description: The preferred locale of the user. @@ -1971,7 +2068,10 @@ definitions: weekStartDayOffset: type: integer format: int32 - description: "week_start_day_offset is the week start day offset from Sunday.\r\n0: Sunday, 1: Monday, 2: Tuesday, 3: Wednesday, 4: Thursday, 5: Friday, 6: Saturday\r\nDefault is Sunday." + description: |- + week_start_day_offset is the week start day offset from Sunday. + 0: Sunday, 1: Monday, 2: Tuesday, 3: Wednesday, 4: Thursday, 5: Friday, 6: Saturday + Default is Sunday. apiv1WorkspaceMemoRelatedSetting: type: object properties: @@ -1997,12 +2097,17 @@ definitions: enableComment: type: boolean description: enable_comment enables comment. + enableRemoveDone: + type: boolean + description: enable_remove_done enables remove done. apiv1WorkspaceSetting: type: object properties: name: type: string - title: "name is the name of the setting.\r\nFormat: settings/{setting}" + title: |- + name is the name of the setting. + Format: settings/{setting} generalSetting: $ref: '#/definitions/apiv1WorkspaceGeneralSetting' storageSetting: @@ -2017,7 +2122,9 @@ definitions: description: storage_type is the storage type. filepathTemplate: type: string - title: "The template of file path.\r\ne.g. assets/{timestamp}_{filename}" + title: |- + The template of file path. + e.g. assets/{timestamp}_{filename} uploadSizeLimitMb: type: string format: int64 @@ -2176,7 +2283,9 @@ definitions: properties: name: type: string - title: "The name of the activity.\r\nFormat: activities/{id}" + title: |- + The name of the activity. + Format: activities/{id} creatorId: type: integer format: int32 @@ -2307,7 +2416,9 @@ definitions: properties: name: type: string - title: "The name of the inbox.\r\nFormat: inboxes/{id}" + title: |- + The name of the inbox. + Format: inboxes/{id} sender: type: string title: 'Format: users/{id}' @@ -2427,7 +2538,10 @@ definitions: additionalProperties: type: integer format: int32 - description: "tag_amounts is the amount of tags.\r\nkey is the tag name. e.g. \"tag1\".\r\nvalue is the amount of the tag." + description: |- + tag_amounts is the amount of tags. + key is the tag name. e.g. "tag1". + value is the amount of the tag. v1ListMemosResponse: type: object properties: @@ -2438,7 +2552,9 @@ definitions: $ref: '#/definitions/v1Memo' nextPageToken: type: string - description: "A token, which can be sent as `page_token` to retrieve the next page.\r\nIf this field is omitted, there are no subsequent pages." + description: |- + A token, which can be sent as `page_token` to retrieve the next page. + If this field is omitted, there are no subsequent pages. v1ListResourcesResponse: type: object properties: @@ -2486,7 +2602,10 @@ definitions: properties: name: type: string - description: "The name of the memo.\r\nFormat: memos/{id}\r\nid is the system generated id." + description: |- + The name of the memo. + Format: memos/{id} + id is the system generated id. uid: type: string description: The user defined id of the memo. @@ -2494,7 +2613,9 @@ definitions: $ref: '#/definitions/v1RowStatus' creator: type: string - title: "The name of the creator.\r\nFormat: users/{id}" + title: |- + The name of the creator. + Format: users/{id} createTime: type: string format: date-time @@ -2547,7 +2668,9 @@ definitions: readOnly: true parent: type: string - title: "The name of the parent memo.\r\nFormat: memos/{id}" + title: |- + The name of the parent memo. + Format: memos/{id} readOnly: true snippet: type: string @@ -2572,7 +2695,9 @@ definitions: properties: name: type: string - title: "The name of the memo property.\r\nFormat: memos/{id}/properties/{property_id}" + title: |- + The name of the memo property. + Format: memos/{id}/properties/{property_id} property: $ref: '#/definitions/v1MemoProperty' readOnly: true @@ -2585,10 +2710,14 @@ definitions: properties: memo: type: string - title: "The name of memo.\r\nFormat: \"memos/{uid}\"" + title: |- + The name of memo. + Format: "memos/{uid}" relatedMemo: type: string - title: "The name of related memo.\r\nFormat: \"memos/{uid}\"" + title: |- + The name of related memo. + Format: "memos/{uid}" type: $ref: '#/definitions/v1MemoRelationType' v1MemoRelationType: @@ -2740,7 +2869,9 @@ definitions: format: int32 creator: type: string - title: "The name of the creator.\r\nFormat: users/{id}" + title: |- + The name of the creator. + Format: users/{id} contentId: type: string reactionType: @@ -2774,7 +2905,10 @@ definitions: properties: name: type: string - description: "The name of the resource.\r\nFormat: resources/{id}\r\nid is the system generated unique identifier." + description: |- + The name of the resource. + Format: resources/{id} + id is the system generated unique identifier. uid: type: string description: The user defined id of the resource. @@ -2796,7 +2930,9 @@ definitions: format: int64 memo: type: string - title: "The related memo.\r\nFormat: memos/{id}" + title: |- + The related memo. + Format: memos/{id} v1RestoreMarkdownNodesRequest: type: object properties: @@ -2918,7 +3054,9 @@ definitions: properties: name: type: string - title: "The name of the user.\r\nFormat: users/{id}" + title: |- + The name of the user. + Format: users/{id} id: type: integer format: int32 @@ -2992,7 +3130,9 @@ definitions: properties: owner: type: string - title: "The name of instance owner.\r\nFormat: \"users/{id}\"" + title: |- + The name of instance owner. + Format: "users/{id}" version: type: string title: version is the current version of instance diff --git a/proto/api/v1/workspace_setting_service.proto b/proto/api/v1/workspace_setting_service.proto index b00714b0de6dd..fe22239d543f3 100644 --- a/proto/api/v1/workspace_setting_service.proto +++ b/proto/api/v1/workspace_setting_service.proto @@ -104,6 +104,8 @@ message WorkspaceMemoRelatedSetting { bool enable_link_preview = 6; // enable_comment enables comment. bool enable_comment = 7; + // enable_remove_done enables remove done. + bool enable_remove_done = 8; } message GetWorkspaceSettingRequest { diff --git a/proto/gen/api/v1/workspace_setting_service.pb.go b/proto/gen/api/v1/workspace_setting_service.pb.go index ff475a6000233..ad8477c495cc9 100644 --- a/proto/gen/api/v1/workspace_setting_service.pb.go +++ b/proto/gen/api/v1/workspace_setting_service.pb.go @@ -450,6 +450,8 @@ type WorkspaceMemoRelatedSetting struct { EnableLinkPreview bool `protobuf:"varint,6,opt,name=enable_link_preview,json=enableLinkPreview,proto3" json:"enable_link_preview,omitempty"` // enable_comment enables comment. EnableComment bool `protobuf:"varint,7,opt,name=enable_comment,json=enableComment,proto3" json:"enable_comment,omitempty"` + // enable_remove_done enables remove done. + EnableRemoveDone bool `protobuf:"varint,8,opt,name=enable_remove_done,json=enableRemoveDone,proto3" json:"enable_remove_done,omitempty"` } func (x *WorkspaceMemoRelatedSetting) Reset() { @@ -533,6 +535,13 @@ func (x *WorkspaceMemoRelatedSetting) GetEnableComment() bool { return false } +func (x *WorkspaceMemoRelatedSetting) GetEnableRemoveDone() bool { + if x != nil { + return x.EnableRemoveDone + } + return false +} + type GetWorkspaceSettingRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -807,7 +816,7 @@ var file_api_v1_workspace_setting_service_proto_rawDesc = []byte{ 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 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, 0x86, 0x03, 0x0a, 0x1b, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, + 0x02, 0x53, 0x33, 0x10, 0x03, 0x22, 0xb4, 0x03, 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, 0x3c, 0x0a, 0x1a, 0x64, 0x69, 0x73, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x76, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, @@ -831,50 +840,53 @@ var file_api_v1_workspace_setting_service_proto_rawDesc = []byte{ 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x50, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x12, 0x25, 0x0a, 0x0e, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x0d, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 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, 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, + 0x0d, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x2c, + 0x0a, 0x12, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x5f, + 0x64, 0x6f, 0x6e, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x65, 0x6e, 0x61, 0x62, + 0x6c, 0x65, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x44, 0x6f, 0x6e, 0x65, 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, 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, + 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, 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/workspace_setting.pb.go b/proto/gen/store/workspace_setting.pb.go index 6f1cd1450b395..3c265daa93e1b 100644 --- a/proto/gen/store/workspace_setting.pb.go +++ b/proto/gen/store/workspace_setting.pb.go @@ -647,6 +647,8 @@ type WorkspaceMemoRelatedSetting struct { EnableLinkPreview bool `protobuf:"varint,6,opt,name=enable_link_preview,json=enableLinkPreview,proto3" json:"enable_link_preview,omitempty"` // enable_comment enables comment. EnableComment bool `protobuf:"varint,7,opt,name=enable_comment,json=enableComment,proto3" json:"enable_comment,omitempty"` + // enable_remove_done enables remove done. + EnableRemoveDone bool `protobuf:"varint,8,opt,name=enable_remove_done,json=enableRemoveDone,proto3" json:"enable_remove_done,omitempty"` } func (x *WorkspaceMemoRelatedSetting) Reset() { @@ -730,6 +732,13 @@ func (x *WorkspaceMemoRelatedSetting) GetEnableComment() bool { return false } +func (x *WorkspaceMemoRelatedSetting) GetEnableRemoveDone() bool { + if x != nil { + return x.EnableRemoveDone + } + return false +} + var File_store_workspace_setting_proto protoreflect.FileDescriptor var file_store_workspace_setting_proto_rawDesc = []byte{ @@ -830,7 +839,7 @@ var file_store_workspace_setting_proto_rawDesc = []byte{ 0x64, 0x70, 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, 0x86, 0x03, 0x0a, 0x1b, 0x57, 0x6f, 0x72, 0x6b, 0x73, + 0x62, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x22, 0xb4, 0x03, 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, 0x3c, 0x0a, 0x1a, 0x64, 0x69, 0x73, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x76, 0x69, 0x73, 0x69, 0x62, 0x69, @@ -854,25 +863,28 @@ var file_store_workspace_setting_proto_rawDesc = []byte{ 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x50, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x12, 0x25, 0x0a, 0x0e, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x0d, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 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, 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, + 0x52, 0x0d, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, + 0x2c, 0x0a, 0x12, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, + 0x5f, 0x64, 0x6f, 0x6e, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x65, 0x6e, 0x61, + 0x62, 0x6c, 0x65, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x44, 0x6f, 0x6e, 0x65, 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, 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/store/workspace_setting.proto b/proto/store/workspace_setting.proto index 7c2fd2d6eb8d8..2dc00bb17d067 100644 --- a/proto/store/workspace_setting.proto +++ b/proto/store/workspace_setting.proto @@ -100,4 +100,6 @@ message WorkspaceMemoRelatedSetting { bool enable_link_preview = 6; // enable_comment enables comment. bool enable_comment = 7; + // enable_remove_done enables remove done. + bool enable_remove_done = 8; } diff --git a/server/router/api/v1/workspace_setting_service.go b/server/router/api/v1/workspace_setting_service.go index ffdaabfbae109..472bd5ee4166d 100644 --- a/server/router/api/v1/workspace_setting_service.go +++ b/server/router/api/v1/workspace_setting_service.go @@ -227,6 +227,7 @@ func convertWorkspaceMemoRelatedSettingFromStore(setting *storepb.WorkspaceMemoR EnableDoubleClickEdit: setting.EnableDoubleClickEdit, EnableLinkPreview: setting.EnableLinkPreview, EnableComment: setting.EnableComment, + EnableRemoveDone: setting.EnableRemoveDone, } } @@ -242,5 +243,6 @@ func convertWorkspaceMemoRelatedSettingToStore(setting *v1pb.WorkspaceMemoRelate EnableDoubleClickEdit: setting.EnableDoubleClickEdit, EnableLinkPreview: setting.EnableLinkPreview, EnableComment: setting.EnableComment, + EnableRemoveDone: setting.EnableRemoveDone, } } diff --git a/web/src/components/MemoActionMenu.tsx b/web/src/components/MemoActionMenu.tsx index 86aaec46f8044..0c088e4df01a4 100644 --- a/web/src/components/MemoActionMenu.tsx +++ b/web/src/components/MemoActionMenu.tsx @@ -10,6 +10,7 @@ import { Edit3Icon, MoreVerticalIcon, TrashIcon, + SquareCheckIcon, } from "lucide-react"; import toast from "react-hot-toast"; import { useLocation } from "react-router-dom"; @@ -18,11 +19,12 @@ import { useMemoStore } from "@/store/v1"; import { RowStatus } from "@/types/proto/api/v1/common"; import { Memo } from "@/types/proto/api/v1/memo_service"; import { useTranslate } from "@/utils/i18n"; +import { markdownServiceClient } from "@/grpcweb"; interface Props { memo: Memo; className?: string; - hiddenActions?: ("edit" | "archive" | "delete" | "share" | "pin")[]; + hiddenActions?: ("edit" | "archive" | "delete" | "share" | "pin" | "remove")[]; onEdit?: () => void; } @@ -113,6 +115,27 @@ const MemoActionMenu = (props: Props) => { } }; + const handleRemoveDoneClick = async () => { + const confirmed = window.confirm(t("memo.remove-done-confirm")); + if (confirmed) { + const newNodes = memo.nodes.filter((node) => !node.taskListNode?.complete); + const { markdown } = await markdownServiceClient.restoreMarkdownNodes({ nodes: newNodes }); + await memoStore.updateMemo( + { + name: memo.name, + content: markdown, + }, + ["content"], + ); + + await memoStore.deleteMemo(memo.name); + toast.success(t("message.remove-done-successfully")); + if (isInMemoDetailPage) { + navigateTo("/"); + } + } + }; + return ( @@ -143,6 +166,12 @@ const MemoActionMenu = (props: Props) => { {memo.rowStatus === RowStatus.ARCHIVED ? : } {memo.rowStatus === RowStatus.ARCHIVED ? t("common.restore") : t("common.archive")} + {!hiddenActions?.includes("remove") && ( + + + {t("memo.remove-done")} + + )} {t("common.delete")} diff --git a/web/src/components/MemoView.tsx b/web/src/components/MemoView.tsx index 63949735da28b..65ef92ec55256 100644 --- a/web/src/components/MemoView.tsx +++ b/web/src/components/MemoView.tsx @@ -183,7 +183,7 @@ const MemoView: React.FC = (props: Props) => { setShowEditor(true)} /> )} diff --git a/web/src/components/Settings/MemoRelatedSettings.tsx b/web/src/components/Settings/MemoRelatedSettings.tsx index 8c43620a7f45a..c9b55c6fc4059 100644 --- a/web/src/components/Settings/MemoRelatedSettings.tsx +++ b/web/src/components/Settings/MemoRelatedSettings.tsx @@ -74,6 +74,13 @@ const MemoRelatedSettings = () => { onChange={(event) => updatePartialSetting({ enableDoubleClickEdit: event.target.checked })} /> +
+ {t("setting.system-section.enable-remove-done")} + updatePartialSetting({ enableRemoveDone: event.target.checked })} + /> +
Content length limit(Byte) Date: Fri, 6 Sep 2024 15:04:53 +0800 Subject: [PATCH 02/10] i18n en add --- web/src/locales/en.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/web/src/locales/en.json b/web/src/locales/en.json index d46f2a2dc2544..9ad46bdda9085 100644 --- a/web/src/locales/en.json +++ b/web/src/locales/en.json @@ -118,7 +118,9 @@ }, "links": "Links", "to-do": "To-do", - "code": "Code" + "code": "Code", + "remove-done": "Remove done", + "remove-done-confirm": "Are you sure you want to remove all completed to-dos? THIS ACTION IS IRREVERSIBLE" }, "message": { "archived-successfully": "Archived successfully", @@ -135,7 +137,8 @@ "restored-successfully": "Restored successfully", "succeed-copy-link": "Link copied successfully.", "update-succeed": "Update succeeded", - "user-not-found": "User not found" + "user-not-found": "User not found", + "remove-done-successfully": "The removal was successful" }, "reference": { "add-references": "Add references", @@ -296,7 +299,8 @@ "enable-password-login-warning": "This will enable password login for all users. Continue only if you want to users to be able to log in using both SSO and password", "max-upload-size": "Maximum upload size (MiB)", "max-upload-size-hint": "Recommended value is 32 MiB.", - "server-name": "Server Name" + "server-name": "Server Name", + "enable-remove-done": "Enable remove done" }, "memo-related": "Memo" }, From be8625c4090f11fe9e43a7fc93eed9cb59afe4a7 Mon Sep 17 00:00:00 2001 From: liaocl <2279707742@qq.com> Date: Sat, 7 Sep 2024 11:31:58 +0800 Subject: [PATCH 03/10] bug fix --- web/src/components/MemoActionMenu.tsx | 20 +++++++++----------- web/src/components/MemoView.tsx | 13 ++++++++++++- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/web/src/components/MemoActionMenu.tsx b/web/src/components/MemoActionMenu.tsx index 0c088e4df01a4..bfc8c490d6052 100644 --- a/web/src/components/MemoActionMenu.tsx +++ b/web/src/components/MemoActionMenu.tsx @@ -118,17 +118,15 @@ const MemoActionMenu = (props: Props) => { const handleRemoveDoneClick = async () => { const confirmed = window.confirm(t("memo.remove-done-confirm")); if (confirmed) { - const newNodes = memo.nodes.filter((node) => !node.taskListNode?.complete); - const { markdown } = await markdownServiceClient.restoreMarkdownNodes({ nodes: newNodes }); - await memoStore.updateMemo( - { - name: memo.name, - content: markdown, - }, - ["content"], - ); - - await memoStore.deleteMemo(memo.name); + const newNodes = memo.nodes.filter((node) => !node.taskListNode?.complete); + const { markdown } = await markdownServiceClient.restoreMarkdownNodes({ nodes: newNodes }); + await memoStore.updateMemo( + { + name: memo.name, + content: markdown, + }, + ["content"], + ); toast.success(t("message.remove-done-successfully")); if (isInMemoDetailPage) { navigateTo("/"); diff --git a/web/src/components/MemoView.tsx b/web/src/components/MemoView.tsx index 65ef92ec55256..2aeba5c5a6106 100644 --- a/web/src/components/MemoView.tsx +++ b/web/src/components/MemoView.tsx @@ -98,6 +98,17 @@ const MemoView: React.FC = (props: Props) => { ); + const handleHiddenActions = () => { + const hiddenActions = []; + if (!props.showPinned) { + hiddenActions.push("pin"); + } + if (!workspaceMemoRelatedSetting.enableRemoveDone) { + hiddenActions.push("remove"); + } + return hiddenActions; + }; + return (
= (props: Props) => { setShowEditor(true)} /> )} From 04c7fa2750de37e111055476dd38d80bda064f4b Mon Sep 17 00:00:00 2001 From: liaocl <2279707742@qq.com> Date: Sun, 8 Sep 2024 11:44:26 +0800 Subject: [PATCH 04/10] add i18n --- web/src/components/MemoActionMenu.tsx | 13 ++++++++++++- web/src/components/MemoView.tsx | 4 ++-- web/src/locales/ar.json | 4 +++- web/src/locales/de.json | 10 +++++++--- web/src/locales/es.json | 10 +++++++--- web/src/locales/fr.json | 10 +++++++--- web/src/locales/hi.json | 7 +++++-- web/src/locales/hr.json | 10 +++++++--- web/src/locales/hu.json | 10 +++++++--- web/src/locales/it.json | 10 +++++++--- web/src/locales/ja.json | 10 +++++++--- web/src/locales/ko.json | 10 +++++++--- web/src/locales/mr.json | 10 +++++++--- web/src/locales/nl.json | 10 +++++++--- web/src/locales/pl.json | 10 +++++++--- web/src/locales/pt-BR.json | 10 +++++++--- web/src/locales/ru.json | 10 +++++++--- web/src/locales/sl.json | 10 +++++++--- web/src/locales/sv.json | 10 +++++++--- web/src/locales/th.json | 10 +++++++--- web/src/locales/tr.json | 10 +++++++--- web/src/locales/uk.json | 10 +++++++--- web/src/locales/vi.json | 10 +++++++--- web/src/locales/zh-Hant.json | 10 +++++++--- 24 files changed, 162 insertions(+), 66 deletions(-) diff --git a/web/src/components/MemoActionMenu.tsx b/web/src/components/MemoActionMenu.tsx index bfc8c490d6052..1d4e71bbf318e 100644 --- a/web/src/components/MemoActionMenu.tsx +++ b/web/src/components/MemoActionMenu.tsx @@ -20,6 +20,7 @@ import { RowStatus } from "@/types/proto/api/v1/common"; import { Memo } from "@/types/proto/api/v1/memo_service"; import { useTranslate } from "@/utils/i18n"; import { markdownServiceClient } from "@/grpcweb"; +import { NodeType } from "@/types/proto/api/v1/markdown_service"; interface Props { memo: Memo; @@ -118,7 +119,17 @@ const MemoActionMenu = (props: Props) => { const handleRemoveDoneClick = async () => { const confirmed = window.confirm(t("memo.remove-done-confirm")); if (confirmed) { - const newNodes = memo.nodes.filter((node) => !node.taskListNode?.complete); + const newNodes = memo.nodes; + for (var i = 0; i < newNodes.length; i++) { + if (newNodes[i].type === NodeType.TASK_LIST && newNodes[i].taskListNode?.complete) { + newNodes.splice(i, 1); + i--; + if (newNodes[i]?.type === NodeType.LINE_BREAK) { + newNodes.splice(i, 1); + i--; + } + } + } const { markdown } = await markdownServiceClient.restoreMarkdownNodes({ nodes: newNodes }); await memoStore.updateMemo( { diff --git a/web/src/components/MemoView.tsx b/web/src/components/MemoView.tsx index 2aeba5c5a6106..2e95951f56e25 100644 --- a/web/src/components/MemoView.tsx +++ b/web/src/components/MemoView.tsx @@ -99,7 +99,7 @@ const MemoView: React.FC = (props: Props) => { ); const handleHiddenActions = () => { - const hiddenActions = []; + const hiddenActions: ("edit" | "archive" | "delete" | "share" | "pin" | "remove")[] = []; if (!props.showPinned) { hiddenActions.push("pin"); } @@ -194,7 +194,7 @@ const MemoView: React.FC = (props: Props) => { setShowEditor(true)} /> )} diff --git a/web/src/locales/ar.json b/web/src/locales/ar.json index 108ac4ed03211..e4d94fcbfcb38 100644 --- a/web/src/locales/ar.json +++ b/web/src/locales/ar.json @@ -88,7 +88,9 @@ "private": "خاص", "protected": "مساحة عمل", "public": "عام" - } + }, + "remove-done": "إزالة المنجز", + "remove-done-confirm": "هل أنت متأكد أنك تريد إزالة جميع المهام المنجزة؟ (هذه العملية لا يمكن التراجع عنها)" }, "resource": { "clear": "مسح", diff --git a/web/src/locales/de.json b/web/src/locales/de.json index 0d2300941633f..3d5f8904bfe24 100644 --- a/web/src/locales/de.json +++ b/web/src/locales/de.json @@ -97,7 +97,9 @@ "private": "Nur für dich sichtbar", "protected": "Mitglieder", "public": "Öffentlich" - } + }, + "remove-done": "Erledigt entfernen", + "remove-done-confirm": "Sind Sie sicher, dass Sie alle abgeschlossenen Aufgaben entfernen möchten? (Diese Aktion kann nicht rückgängig gemacht werden)" }, "message": { "change-memo-created-time": "Erstellungszeitpunkt ändern", @@ -112,7 +114,8 @@ "restored-successfully": "Erfolgreich wiederhergestellt", "succeed-copy-link": "Link erfolgreich kopiert", "update-succeed": "Update erfolgreich", - "user-not-found": "Nutzer nicht gefunden" + "user-not-found": "Nutzer nicht gefunden", + "remove-done-successfully": "Erfolgreich entfernt!" }, "resource": { "clear": "Löschen", @@ -263,7 +266,8 @@ "enable-password-login-warning": "Dadurch wird die Passwortanmeldung für alle Benutzer aktiviert. Fahre nur fort, wenn du möchtest, dass sich Benutzer sowohl mit SSO als auch mit einem Passwort anmelden können", "max-upload-size": "Maximale Uploadgröße (MiB)", "max-upload-size-hint": "Empfohlene Wert ist 32 MiB.", - "server-name": "Servername" + "server-name": "Servername", + "enable-remove-done": "Entfernen abgeschlossen aktivieren" } }, "tag": { diff --git a/web/src/locales/es.json b/web/src/locales/es.json index 218d19ae86ca5..15f5c1c0205ba 100644 --- a/web/src/locales/es.json +++ b/web/src/locales/es.json @@ -105,7 +105,9 @@ "private": "Solo visible para ti", "protected": "Espacio de trabajo", "public": "Todo el mundo lo puede ver" - } + }, + "remove-done": "Eliminar completado", + "remove-done-confirm": "¿Estás seguro de que quieres eliminar todas las tareas completadas? (Esta acción es irreversible)" }, "message": { "change-memo-created-time": "Cambiar la hora de creación del memo", @@ -120,7 +122,8 @@ "restored-successfully": "Restaurado con éxito", "succeed-copy-link": "Enlace copiado correctamente.", "update-succeed": "Actualización exitosa", - "user-not-found": "Usuario no encontrado" + "user-not-found": "Usuario no encontrado", + "remove-done-successfully": "¡Eliminado con éxito!" }, "resource": { "clear": "Limpiar", @@ -265,7 +268,8 @@ "enable-password-login-warning": "Esto habilitará el inicio de sesión con contraseña para todos los usuarios. Continúa sólo si deseas que los usuarios puedan iniciar sesión mediante SSO y contraseña", "max-upload-size": "Tamaño máximo de subida (MiB)", "max-upload-size-hint": "El valor recomendado es de 32 MiB.", - "server-name": "Nombre del servidor" + "server-name": "Nombre del servidor", + "enable-remove-done": "Habilitar eliminar completado" } }, "tag": { diff --git a/web/src/locales/fr.json b/web/src/locales/fr.json index 94b3bba38fdf9..f706afe6f7d82 100644 --- a/web/src/locales/fr.json +++ b/web/src/locales/fr.json @@ -118,7 +118,9 @@ "private": "Privé", "protected": "Accès aux membres", "public": "Public" - } + }, + "remove-done": "Supprimer terminé", + "remove-done-confirm": "Êtes-vous sûr de vouloir supprimer toutes les tâches terminées ? (Cette action est irréversible)" }, "message": { "archived-successfully": "Archivé avec succès", @@ -135,7 +137,8 @@ "restored-successfully": "Restauré avec succès", "succeed-copy-link": "Succeed to copy link to clipboard.", "update-succeed": "Mise à jour effectuée", - "user-not-found": "Utilisateur introuvable" + "user-not-found": "Utilisateur introuvable", + "remove-done-successfully": "Supprimé avec succès !" }, "reference": { "add-references": "Ajouter des références", @@ -297,7 +300,8 @@ "enable-password-login-warning": "Ceci activera la connexion par mot de passe pour tous les utilisateurs. Ne continuez que si vous souhaitez que les utilisateurs puissent se connecter à la fois par SSO et par mot de passe", "max-upload-size": "Taille maximale du téléversement (MiB)", "max-upload-size-hint": "La valeur recommandée est 32 MiB.", - "server-name": "Nom du serveur" + "server-name": "Nom du serveur", + "enable-remove-done": "Activer la suppression terminée" } }, "tag": { diff --git a/web/src/locales/hi.json b/web/src/locales/hi.json index 8072fe77bb11c..84eef9a2fa1f1 100644 --- a/web/src/locales/hi.json +++ b/web/src/locales/hi.json @@ -90,7 +90,9 @@ "private": "निजी", "protected": "सदस्यों को दिखाई देता है", "public": "सभी के लिए सार्वजनिक" - } + }, + "remove-done": "हटाएँ किया गया", + "remove-done-confirm": "क्या आप सुनिश्चित हैं कि आप सभी पूरे कामों को हटाना चाहते हैं? (यह क्रिया वापस ले जाने योग्य नहीं है)" }, "message": { "change-memo-created-time": "मेमो बनाने का समय बदलें", @@ -105,7 +107,8 @@ "restored-successfully": "सफलतापूर्वक पुनर्स्थापित किया गया", "succeed-copy-link": "लिंक सफलतापूर्वक कॉपी किया गया।", "update-succeed": "अपडेट सफल हुआ", - "user-not-found": "उपयोगकर्ता नहीं मिला" + "user-not-found": "उपयोगकर्ता नहीं मिला", + "remove-done-successfully": "सफलतापूर्वक हटा दिया!" }, "resource": { "clear": "साफ़ करें", diff --git a/web/src/locales/hr.json b/web/src/locales/hr.json index c207adb63a2b4..14e034d9f3eb0 100644 --- a/web/src/locales/hr.json +++ b/web/src/locales/hr.json @@ -102,7 +102,9 @@ "private": "Privatno", "protected": "Vidljivo članovima", "public": "Javno" - } + }, + "remove-done": "Ukloni obavljen", + "remove-done-confirm": "Jeste li sigurni da želite ukloniti sve obavljene zadatke? (Ova akcija je nevraćiva)" }, "message": { "change-memo-created-time": "Promijeni vrijeme stvaranja memoa", @@ -117,7 +119,8 @@ "restored-successfully": "Uspješno vraćeno", "succeed-copy-link": "Link je uspješno kopiran.", "update-succeed": "Obnavljanje aplikacije je uspjelo!🎉", - "user-not-found": "Korisnik nije nađen" + "user-not-found": "Korisnik nije nađen", + "remove-done-successfully": "Uspješno uklonjeno!" }, "resource": { "clear": "Očisti", @@ -267,7 +270,8 @@ "enable-password-login-warning": "Ovo će omogućiti prijavu lozinkom za sve korisnike.", "max-upload-size": "Maximalna veličina uploada (MiB)", "max-upload-size-hint": "Preporučena vrijednost je 32 MiB.", - "server-name": "Ime servera" + "server-name": "Ime servera", + "enable-remove-done": "Omogući uklanjanje obavljenog" } }, "tag": { diff --git a/web/src/locales/hu.json b/web/src/locales/hu.json index 983ddc60570f3..9e3c0d07ae7b7 100644 --- a/web/src/locales/hu.json +++ b/web/src/locales/hu.json @@ -113,7 +113,9 @@ "private": "Privát", "protected": "Munkatér", "public": "Nyilvános" - } + }, + "remove-done": "Töröld el a kész", + "remove-done-confirm": "Biztos, hogy törölni akarod az összes kész feladatot? (Ez az akció visszavonhatatlan)" }, "message": { "archived-successfully": "Sikeres archiválás", @@ -130,7 +132,8 @@ "restored-successfully": "Sikeres visszaállítás", "succeed-copy-link": "Hivatkozás sikeresen másolva.", "update-succeed": "Sikeres frissítés", - "user-not-found": "Felhasználó nem található" + "user-not-found": "Felhasználó nem található", + "remove-done-successfully": "Sikeresen eltávolítva!" }, "reference": { "add-references": "Referenciák hozzáadása", @@ -287,7 +290,8 @@ "enable-password-login-warning": "Ez engedélyezi a jelszavas bejelentkezést minden felhasználó számára. Csak akkor folytasd, ha szeretnéd, ha a felhasználók SSO és jelszó használatával is be tudjanak jelentkezni", "max-upload-size": "Maximális feltöltési méret (MiB)", "max-upload-size-hint": "Az ajánlott érték 32 MiB.", - "server-name": "Szerver neve" + "server-name": "Szerver neve", + "enable-remove-done": "Kikapcsold a kész törölését" } }, "tag": { diff --git a/web/src/locales/it.json b/web/src/locales/it.json index 261968510eb6f..add6499ce81b9 100644 --- a/web/src/locales/it.json +++ b/web/src/locales/it.json @@ -91,7 +91,9 @@ "private": "Privato", "protected": "Visibile ai membri", "public": "Pubblico" - } + }, + "remove-done": "Rimuovi completato", + "remove-done-confirm": "Sei sicuro di voler rimuovere tutte le cose completate? (Questa azione è irreversibile)" }, "message": { "change-memo-created-time": "Cambia data creazione", @@ -106,7 +108,8 @@ "restored-successfully": "Ripristinato con successo", "succeed-copy-link": "Link copiato.", "update-succeed": "Aggiornato con successo", - "user-not-found": "Utente non trovato" + "user-not-found": "Utente non trovato", + "remove-done-successfully": "Rimosso con successo!" }, "resource": { "clear": "Cancella", @@ -253,7 +256,8 @@ "enable-password-login-warning": "Ciò consentirà l'accesso tramite password per tutti gli utenti. Continua solo se desideri che gli utenti possano accedere utilizzando sia SSO che password❗", "max-upload-size": "Dimensione massima caricamento (MiB)", "max-upload-size-hint": "Valore consigliato di 32 MiB.", - "server-name": "Nome server" + "server-name": "Nome server", + "enable-remove-done": "Abilita rimuovi completato" } }, "tag": { diff --git a/web/src/locales/ja.json b/web/src/locales/ja.json index f53f8c469353d..3a9f69767bb20 100644 --- a/web/src/locales/ja.json +++ b/web/src/locales/ja.json @@ -118,7 +118,9 @@ "private": "非公開", "protected": "メンバーに表示", "public": "公開メモ" - } + }, + "remove-done": "完了を削除", + "remove-done-confirm": "すべての完了したタスクを削除してもよろしいですか?(このアクションは取り消せません)" }, "message": { "archived-successfully": "アーカイブが完了しました", @@ -135,7 +137,8 @@ "restored-successfully": "リストア成功", "succeed-copy-link": "リンクのコピーに成功しました。", "update-succeed": "変更は保存されました", - "user-not-found": "ユーザーが見つかりませんでした" + "user-not-found": "ユーザーが見つかりませんでした", + "remove-done-successfully": "削除が成功しました!" }, "reference": { "add-references": "変更は保存されました", @@ -297,7 +300,8 @@ "enable-password-login-warning": "これにより、すべてのユーザーのパスワードでのログインが有効になります。SSOとパスワードの両方を使用してログインできるようにしたい場合のみ、続行してください", "max-upload-size": "最大ファイルサイズ(MiB)", "max-upload-size-hint": "推奨サイズは32 MiBです。", - "server-name": "サーバーの名前" + "server-name": "サーバーの名前", + "enable-remove-done": "完了削除を有効にする" } }, "tag": { diff --git a/web/src/locales/ko.json b/web/src/locales/ko.json index 7631ad0047355..5cdccd033856f 100644 --- a/web/src/locales/ko.json +++ b/web/src/locales/ko.json @@ -102,7 +102,9 @@ "private": "나만 볼 수 있음", "protected": "멤버 전용", "public": "공개" - } + }, + "remove-done": "완료 제거", + "remove-done-confirm": "모든 완료된 작업을 삭제하겠습니까? (이 작업은 되돌릴 수 없습니다)" }, "message": { "change-memo-created-time": "메모 생성 시각 변경", @@ -117,7 +119,8 @@ "restored-successfully": "성공적으로 복구했습니다", "succeed-copy-link": "링크를 클립보드에 복사했습니다.", "update-succeed": "업데이트 성공", - "user-not-found": "회원을 찾을 수 없습니다" + "user-not-found": "회원을 찾을 수 없습니다", + "remove-done-successfully": "성공적으로 제거되었습니다!" }, "resource": { "clear": "클리어", @@ -268,7 +271,8 @@ "enable-password-login-warning": "모든 사용자가 비밀번호를 사용해서 로그인할 수 있게 합니다. 사용자들이 SSO와 비밀번호 둘 다 사용할 수 있게 하고 싶은 경우에만 켜 주세요", "max-upload-size": "최대 업로드 크기 (MiB)", "max-upload-size-hint": "권장값은 32 MiB입니다.", - "server-name": "서버 이름" + "server-name": "서버 이름", + "enable-remove-done": "완료 제거 활성화" } }, "tag": { diff --git a/web/src/locales/mr.json b/web/src/locales/mr.json index 061c625899fc6..8a61d8faa744f 100644 --- a/web/src/locales/mr.json +++ b/web/src/locales/mr.json @@ -115,7 +115,9 @@ "private": "खाजगी", "protected": "कार्यक्षेत्र", "public": "सार्वजनिक" - } + }, + "remove-done": "हटवा केलेले", + "remove-done-confirm": "तुम्ही सगळ्या पूर्ण केलेल्या कामांचे हटवणार आहात का? (या क्रियेचे उलट घेणे शक्य नाही)" }, "message": { "archived-successfully": "यशस्वीरित्या संग्रहित केले", @@ -132,7 +134,8 @@ "restored-successfully": "यशस्वीरित्या पुनर्संचयित केले", "succeed-copy-link": "लिंक यशस्वीरित्या कॉपी केली.", "update-succeed": "अपडेट यशस्वी झाले", - "user-not-found": "वापरकर्ता सापडला नाही" + "user-not-found": "वापरकर्ता सापडला नाही", + "remove-done-successfully": "सफळताने हटवा झाले!" }, "reference": { "add-references": "संदर्भ जोडा", @@ -291,7 +294,8 @@ "enable-password-login-warning": "हे सर्व वापरकर्त्यांसाठी पासवर्ड लॉगिन सक्षम करेल. जर तुम्ही वापरकर्त्यांना SSO आणि पासवर्ड दोन्ही वापरून लॉग इन करू इच्छित असाल तरच सुरू ठेवा", "max-upload-size": "कमाल अपलोड आकार (MiB)", "max-upload-size-hint": "शिफारस केलेले मूल्य 32 MiB आहे.", - "server-name": "सर्व्हरचे नाव" + "server-name": "सर्व्हरचे नाव", + "enable-remove-done": "हटवा केलेले सक्षम करा" } }, "tag": { diff --git a/web/src/locales/nl.json b/web/src/locales/nl.json index 1404f604a69d8..689e0d9afaeff 100644 --- a/web/src/locales/nl.json +++ b/web/src/locales/nl.json @@ -97,7 +97,9 @@ "private": "Privé", "protected": "Werkruimte", "public": "Openbaar" - } + }, + "remove-done": "Verwijder voltooid", + "remove-done-confirm": "Weet u zeker dat u alle voltooide taken wilt verwijderen? (Deze actie is onomkeerbaar)" }, "message": { "change-memo-created-time": "Tijd van aanmaken wijzigen", @@ -111,7 +113,8 @@ "restored-successfully": "Succesvol teruggezet", "succeed-copy-link": "Link gekopieërd naar klembord.", "update-succeed": "Update voltooid", - "user-not-found": "Gebruiker niet gevonden" + "user-not-found": "Gebruiker niet gevonden", + "remove-done-successfully": "Gelukt verwijderd!" }, "resource": { "clear": "Opruimen", @@ -235,7 +238,8 @@ "enable-password-login-warning": "Als je dit aanzet kan er met zowel SSO als een wachtwoord ingelogd worden", "max-upload-size": "Maximum uploadgrootte (MiB)", "max-upload-size-hint": "32 MiB wordt aangeraden.", - "server-name": "Servernaam" + "server-name": "Servernaam", + "enable-remove-done": "Verwijder voltooid inschakelen" } }, "tag": { diff --git a/web/src/locales/pl.json b/web/src/locales/pl.json index 312615ccfa5dc..e709a8d6a496f 100644 --- a/web/src/locales/pl.json +++ b/web/src/locales/pl.json @@ -117,7 +117,9 @@ }, "links": "Linki", "to-do": "Lista zadań", - "code": "Kod" + "code": "Kod", + "remove-done": "Usuń zakończone", + "remove-done-confirm": "Czy jesteś pewny, że chcesz usunąć wszystkie zakończone zadania? (Ta akcja jest nieodwracalna)" }, "message": { "archived-successfully": "Zarchiwizowano pomyślnie", @@ -134,7 +136,8 @@ "restored-successfully": "Przywrócono pomyślnie", "succeed-copy-link": "Link skopiowany pomyślnie.", "update-succeed": "Aktualizacja zakończona sukcesem", - "user-not-found": "Użytkownik nie został znaleziony" + "user-not-found": "Użytkownik nie został znaleziony", + "remove-done-successfully": "Pomyślnie usunięto!" }, "reference": { "add-references": "Dodaj odniesienia", @@ -295,7 +298,8 @@ "enable-password-login-warning": "To włączy logowanie hasłem dla wszystkich użytkowników. Kontynuuj tylko wtedy, gdy chcesz, aby użytkownicy mogli logować się za pomocą zarówno SSO, jak i hasła", "max-upload-size": "Maksymalny rozmiar przesyłanego pliku (MiB)", "max-upload-size-hint": "Zalecana wartość to 32 MiB.", - "server-name": "Nazwa serwera" + "server-name": "Nazwa serwera", + "enable-remove-done": "Włącz usuwanie zakończonych" }, "memo-related": "Notatki" }, diff --git a/web/src/locales/pt-BR.json b/web/src/locales/pt-BR.json index 9dcf4a3859810..c7a71e750bf32 100644 --- a/web/src/locales/pt-BR.json +++ b/web/src/locales/pt-BR.json @@ -118,7 +118,9 @@ "private": "Privado (eu)", "protected": "Protegido (membros)", "public": "Público (todos)" - } + }, + "remove-done": "Remover concluídos", + "remove-done-confirm": "Você tem certeza de que deseja remover todos os itens concluídos? (Essa ação é irreversível)" }, "message": { "archived-successfully": "Arquivado com êxito", @@ -135,7 +137,8 @@ "restored-successfully": "Restaurado com êxito", "succeed-copy-link": "Link copiado com êxito.", "update-succeed": "Atualizado com êxito", - "user-not-found": "Usuário não encontrado" + "user-not-found": "Usuário não encontrado", + "remove-done-successfully": "Remoção bem-sucedida!" }, "reference": { "add-references": "Adicionar referências", @@ -297,7 +300,8 @@ "enable-password-login-warning": "Isso permitirá o login com senha para todos os usuários. Continue apenas se desejar que os usuários possam fazer login usando SSO e senha local❗", "max-upload-size": "Tamanho máximo de upload (MiB)", "max-upload-size-hint": "O valor recomendado é 32 MiB.", - "server-name": "Nome do servidor" + "server-name": "Nome do servidor", + "enable-remove-done": "Ativar remoção de concluídos" } }, "tag": { diff --git a/web/src/locales/ru.json b/web/src/locales/ru.json index 9648d898ecead..880b22a52a2d4 100644 --- a/web/src/locales/ru.json +++ b/web/src/locales/ru.json @@ -112,7 +112,9 @@ "private": "Видно только вам", "protected": "Видно только пользователям", "public": "Видно всем" - } + }, + "remove-done": "Удалить выполненные", + "remove-done-confirm": "Вы уверены, что хотите удалить все выполненные задачи? (Данное действие необратимо)" }, "message": { "archived-successfully": "Успешная архивация", @@ -129,7 +131,8 @@ "restored-successfully": "Успешно восстановлено.", "succeed-copy-link": "Ссылка скопирована в буфер обмена.", "update-succeed": "Успешно обновлено", - "user-not-found": "Пользователь не найден" + "user-not-found": "Пользователь не найден", + "remove-done-successfully": "Удалено успешно!" }, "reference": { "add-references": "Добавить ссылку", @@ -280,7 +283,8 @@ "display-with-updated-time": "Отображать время обновления записи", "max-upload-size": "Максимальный размер загрузки (МБ)", "max-upload-size-hint": "Рекомендуемое значение 32 MБ.", - "server-name": "Имя сервера" + "server-name": "Имя сервера", + "enable-remove-done": "Включить удаление выполненных" } }, "tag": { diff --git a/web/src/locales/sl.json b/web/src/locales/sl.json index 673375200b731..1294903d38da3 100644 --- a/web/src/locales/sl.json +++ b/web/src/locales/sl.json @@ -69,7 +69,9 @@ "private": "Vidno samo za vas", "protected": "Vidno uporabnikom", "public": "Vidno vsem" - } + }, + "remove-done": "Odstrani končane", + "remove-done-confirm": "Ste prepričani, da želite odstraniti vse končane naloge? (Ta dejanje ni obrnljivo)" }, "message": { "change-memo-created-time": "Spremeni čas izdelave beležke", @@ -82,7 +84,8 @@ "restored-successfully": "Uspešno obnovljeno", "succeed-copy-link": "Povezava je uspešno skopirana.", "update-succeed": "Posodobitev je uspešna", - "user-not-found": "Ne najdem uporabnika" + "user-not-found": "Ne najdem uporabnika", + "remove-done-successfully": "Odstranitev uspešna!" }, "resource": { "clear": "Počisti", @@ -157,7 +160,8 @@ }, "disable-public-memos": "Onemogočite javne beležke", "display-with-updated-time": "Display with updated time", - "server-name": "Ime strežnika" + "server-name": "Ime strežnika", + "enable-remove-done": "Omogoči odstranitev končanih" } }, "tag": { diff --git a/web/src/locales/sv.json b/web/src/locales/sv.json index 3132bcf3c8d12..2ea33729b4082 100644 --- a/web/src/locales/sv.json +++ b/web/src/locales/sv.json @@ -64,7 +64,9 @@ "private": "Endast synlig för dig", "protected": "Synlig för medlemmar", "public": "Synlig för alla" - } + }, + "remove-done": "Ta bort avklarade", + "remove-done-confirm": "Är du säker på att du vill ta bort alla avklarade todo? (Detta är oåterkalleligt)" }, "message": { "change-memo-created-time": "Ändra anteckning skapade tid", @@ -77,7 +79,8 @@ "restored-successfully": "Återställdes framgångsrikt", "succeed-copy-link": "Länk kopierades framgångsrikt.", "update-succeed": "Uppdateras framgångsrikt", - "user-not-found": "Användaren hittades inte" + "user-not-found": "Användaren hittades inte", + "remove-done-successfully": "Borttagning avklarade todo lyckades!" }, "resource": { "clear": "Rensa", @@ -133,7 +136,8 @@ }, "disable-public-memos": "Inaktivera offentliga anteckningar", "display-with-updated-time": "Display with updated time", - "server-name": "Server Name" + "server-name": "Server Name", + "enable-remove-done": "Aktivera ta bort avklarade" } } } diff --git a/web/src/locales/th.json b/web/src/locales/th.json index 36cfb4d282a89..cf33f1362b2f6 100644 --- a/web/src/locales/th.json +++ b/web/src/locales/th.json @@ -118,7 +118,9 @@ "private": "ส่วนตัว", "protected": "พื้นที่ทำงาน", "public": "สาธารณะ" - } + }, + "remove-done": "ลบที่ทำแล้ว", + "remove-done-confirm": "คุณแน่ใจว่าจะลบรายการที่ทำแล้วทั้งหมดหรือไม่? (การกระทำนี้ไม่สามารถย้อนกลับได้)" }, "message": { "archived-successfully": "เก็บถาวรเรียบร้อยแล้ว", @@ -135,7 +137,8 @@ "restored-successfully": "กู้คืนเรียบร้อยแล้ว", "succeed-copy-link": "คัดลอกลิงก์เรียบร้อยแล้ว", "update-succeed": "อัปเดตเรียบร้อยแล้ว", - "user-not-found": "ไม่พบผู้ใช้งาน" + "user-not-found": "ไม่พบผู้ใช้งาน", + "remove-done-successfully": "ลบเรียบร้อย!" }, "reference": { "add-references": "เพิ่มข้อมูลอ้างอิง", @@ -297,7 +300,8 @@ "enable-password-login-warning": "สิ่งนี้จะเปิดใช้งานการเข้าสู่ระบบด้วยรหัสผ่านสำหรับผู้ใช้ทุกคน ดำเนินการต่อหากคุณต้องการให้ผู้ใช้สามารถเข้าสู่ระบบโดยใช้ทั้ง SSO และรหัสผ่าน", "max-upload-size": "ขนาดการอัปโหลดสูงสุด (MiB)", "max-upload-size-hint": "ค่าที่แนะนำคือ 32 MiB", - "server-name": "ชื่อเซิร์ฟเวอร์" + "server-name": "ชื่อเซิร์ฟเวอร์", + "enable-remove-done": "เปิดใช้งานการลบรายการที่ทำแล้ว" } }, "tag": { diff --git a/web/src/locales/tr.json b/web/src/locales/tr.json index 180ce60d1e925..86c844bf25f5b 100644 --- a/web/src/locales/tr.json +++ b/web/src/locales/tr.json @@ -118,7 +118,9 @@ "private": "Sadece sizin için görünür", "protected": "Çalışma Alanı", "public": "Herkese açık" - } + }, + "remove-done": "Tamamlananları Kaldır", + "remove-done-confirm": "Tüm tamamlanan görevleri kaldırmak istediğinize emin misiniz? (Bu işlem geri alınamaz)" }, "message": { "archived-successfully": "Başarıyla arşivlendi", @@ -135,7 +137,8 @@ "restored-successfully": "Başarıyla geri yüklendi.", "succeed-copy-link": "Bağlantı panosuna bağlantı kopyalandı.", "update-succeed": "Başarıyla güncellendi", - "user-not-found": "Kullanıcı bulunamadı" + "user-not-found": "Kullanıcı bulunamadı", + "remove-done-successfully": "Başarıyla kaldırıldı!" }, "reference": { "add-references": "Referans ekle", @@ -297,7 +300,8 @@ "enable-password-login-warning": "Bu, tüm kullanıcılar için parola girişini etkinleştirecektir. Yalnızca kullanıcıların hem SSO hem de parola kullanarak oturum açabilmesini istiyorsanız devam edin", "max-upload-size": "Maksimum yükleme boyutu (MiB)", "max-upload-size-hint": "Önerilen değer 32 MiB'dir.", - "server-name": "Uygulama Adı" + "server-name": "Uygulama Adı", + "enable-remove-done": "Tamamlananları Kaldırma'yı Etkinleştir" } }, "tag": { diff --git a/web/src/locales/uk.json b/web/src/locales/uk.json index 8a99aa58c3f01..39a36c1485736 100644 --- a/web/src/locales/uk.json +++ b/web/src/locales/uk.json @@ -105,7 +105,9 @@ "private": "Видимий тільки вам", "protected": "Видимий тільки користувачам", "public": "Видимий усім" - } + }, + "remove-done": "Видалити виконані", + "remove-done-confirm": "Ви впевнені, що хочете видалити всі виконані задачі? (Ця дія неодмінна)" }, "message": { "archived-successfully": "Успішно архівовано", @@ -122,7 +124,8 @@ "restored-successfully": "Успішно відновлено", "succeed-copy-link": "Скопійовано посилання в буфер обміну.", "update-succeed": "Збережно", - "user-not-found": "Користувача не знайдено" + "user-not-found": "Користувача не знайдено", + "remove-done-successfully": "Видалення виконаних успішно!" }, "reference": { "add-references": "Додати посилання", @@ -185,7 +188,8 @@ }, "disable-public-memos": "Disable public memos", "display-with-updated-time": "Display with updated time", - "server-name": "Назва додатка" + "server-name": "Назва додатка", + "enable-remove-done": "Увімкнути видалення виконаних" } } } diff --git a/web/src/locales/vi.json b/web/src/locales/vi.json index 689b4ac44519b..b976fe5d42457 100644 --- a/web/src/locales/vi.json +++ b/web/src/locales/vi.json @@ -94,7 +94,9 @@ "private": "Riêng tư", "protected": "Bảo vệ", "public": "Công khai" - } + }, + "remove-done": "Xóa đã hoàn thành", + "remove-done-confirm": "Bạn có chắc chắn muốn xóa tất cả các mục đã hoàn thành không? (Hành động này không thể đảo ngược)" }, "message": { "archived-successfully": "Lưu trữ thành công", @@ -110,7 +112,8 @@ "restored-successfully": "Khôi phục thành công", "succeed-copy-link": "Liên kết đã được sao chép thành công.", "update-succeed": "Cập nhật thành công", - "user-not-found": "Không tìm thấy người dùng." + "user-not-found": "Không tìm thấy người dùng.", + "remove-done-successfully": "Xóa thành công!" }, "resource": { "clear": "Xóa", @@ -263,7 +266,8 @@ "enable-password-login-warning": "Điều này sẽ cho phép đăng nhập bằng mật khẩu cho tất cả người dùng. Tiếp tục chỉ nếu bạn muốn người dùng có thể đăng nhập bằng cả SSO và mật khẩu", "max-upload-size": "Kích thước tải lên tối đa (MiB)", "max-upload-size-hint": "Giá trị khuyến nghị là 32 MiB.", - "server-name": "Tên máy chủ" + "server-name": "Tên máy chủ", + "enable-remove-done": "Kích hoạt xóa đã hoàn thành" } }, "tag": { diff --git a/web/src/locales/zh-Hant.json b/web/src/locales/zh-Hant.json index bce65a736c151..360772737e918 100644 --- a/web/src/locales/zh-Hant.json +++ b/web/src/locales/zh-Hant.json @@ -118,7 +118,9 @@ "private": "私人", "protected": "成員可見", "public": "公開給所有人" - } + }, + "remove-done": "移除已完成", + "remove-done-confirm": "您確定要移除所有完成的待辦嗎?(此操作不可逆)" }, "message": { "archived-successfully": "封存成功", @@ -135,7 +137,8 @@ "restored-successfully": "還原成功", "succeed-copy-link": "複製連結到剪貼簿成功。", "update-succeed": "更新成功", - "user-not-found": "查無該使用者" + "user-not-found": "查無該使用者", + "remove-done-successfully": "移除成功!" }, "reference": { "add-references": "添加參考資料", @@ -297,7 +300,8 @@ "enable-password-login-warning": "啟用所有使用者的密碼登入。如果希望使用者同時使用 SSO 和密碼登入,請開啟密碼登入", "max-upload-size": "最大上傳檔案大小 (MiB)", "max-upload-size-hint": "建議值為 32 MiB。", - "server-name": "伺服器名稱" + "server-name": "伺服器名稱", + "enable-remove-done": "啟用移除已完成" } }, "tag": { From 558124e5b528be3d6ef3c9417ffe533d3f8698ed Mon Sep 17 00:00:00 2001 From: mozhu Date: Mon, 9 Sep 2024 15:17:33 +0800 Subject: [PATCH 05/10] Modify the description --- docs/apidocs.swagger.yaml | 4 +- proto/api/v1/workspace_setting_service.proto | 4 +- .../api/v1/workspace_setting_service.pb.go | 102 +++++++++--------- proto/gen/store/workspace_setting.pb.go | 54 +++++----- proto/store/workspace_setting.proto | 4 +- .../api/v1/workspace_setting_service.go | 32 +++--- web/src/components/MemoActionMenu.tsx | 14 +-- web/src/components/MemoView.tsx | 4 +- .../Settings/MemoRelatedSettings.tsx | 6 +- web/src/locales/ar.json | 4 +- web/src/locales/de.json | 8 +- web/src/locales/en.json | 8 +- web/src/locales/es.json | 8 +- web/src/locales/fr.json | 8 +- web/src/locales/hi.json | 6 +- web/src/locales/hr.json | 8 +- web/src/locales/hu.json | 8 +- web/src/locales/it.json | 8 +- web/src/locales/ja.json | 8 +- web/src/locales/ko.json | 8 +- web/src/locales/mr.json | 8 +- web/src/locales/nl.json | 8 +- web/src/locales/pl.json | 8 +- web/src/locales/pt-BR.json | 8 +- web/src/locales/ru.json | 8 +- web/src/locales/sl.json | 8 +- web/src/locales/sv.json | 8 +- web/src/locales/th.json | 8 +- web/src/locales/tr.json | 8 +- web/src/locales/uk.json | 8 +- web/src/locales/vi.json | 8 +- web/src/locales/zh-Hans.json | 8 +- web/src/locales/zh-Hant.json | 8 +- 33 files changed, 207 insertions(+), 203 deletions(-) diff --git a/docs/apidocs.swagger.yaml b/docs/apidocs.swagger.yaml index 9dd69bb947d07..68d5163ef12b2 100644 --- a/docs/apidocs.swagger.yaml +++ b/docs/apidocs.swagger.yaml @@ -2097,9 +2097,9 @@ definitions: enableComment: type: boolean description: enable_comment enables comment. - enableRemoveDone: + removedCompletedChecklistItems: type: boolean - description: enable_remove_done enables remove done. + description: removed_completed_checklist_items removed completed checklist items. apiv1WorkspaceSetting: type: object properties: diff --git a/proto/api/v1/workspace_setting_service.proto b/proto/api/v1/workspace_setting_service.proto index fe22239d543f3..8666f5a52c462 100644 --- a/proto/api/v1/workspace_setting_service.proto +++ b/proto/api/v1/workspace_setting_service.proto @@ -104,8 +104,8 @@ message WorkspaceMemoRelatedSetting { bool enable_link_preview = 6; // enable_comment enables comment. bool enable_comment = 7; - // enable_remove_done enables remove done. - bool enable_remove_done = 8; + // removed_completed_checklist_items removed completed checklist items. + bool removed_completed_checklist_items = 8; } message GetWorkspaceSettingRequest { diff --git a/proto/gen/api/v1/workspace_setting_service.pb.go b/proto/gen/api/v1/workspace_setting_service.pb.go index ad8477c495cc9..386c483b00727 100644 --- a/proto/gen/api/v1/workspace_setting_service.pb.go +++ b/proto/gen/api/v1/workspace_setting_service.pb.go @@ -450,8 +450,8 @@ type WorkspaceMemoRelatedSetting struct { EnableLinkPreview bool `protobuf:"varint,6,opt,name=enable_link_preview,json=enableLinkPreview,proto3" json:"enable_link_preview,omitempty"` // enable_comment enables comment. EnableComment bool `protobuf:"varint,7,opt,name=enable_comment,json=enableComment,proto3" json:"enable_comment,omitempty"` - // enable_remove_done enables remove done. - EnableRemoveDone bool `protobuf:"varint,8,opt,name=enable_remove_done,json=enableRemoveDone,proto3" json:"enable_remove_done,omitempty"` + // removed_completed_checklist_items removed completed checklist items. + RemovedCompletedChecklistItems bool `protobuf:"varint,8,opt,name=removed_completed_checklist_items,json=removedCompletedChecklistItems,proto3" json:"removed_completed_checklist_items,omitempty"` } func (x *WorkspaceMemoRelatedSetting) Reset() { @@ -535,9 +535,9 @@ func (x *WorkspaceMemoRelatedSetting) GetEnableComment() bool { return false } -func (x *WorkspaceMemoRelatedSetting) GetEnableRemoveDone() bool { +func (x *WorkspaceMemoRelatedSetting) GetRemovedCompletedChecklistItems() bool { if x != nil { - return x.EnableRemoveDone + return x.RemovedCompletedChecklistItems } return false } @@ -816,7 +816,7 @@ var file_api_v1_workspace_setting_service_proto_rawDesc = []byte{ 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 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, 0xb4, 0x03, 0x0a, 0x1b, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, + 0x02, 0x53, 0x33, 0x10, 0x03, 0x22, 0xd1, 0x03, 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, 0x3c, 0x0a, 0x1a, 0x64, 0x69, 0x73, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x76, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, @@ -840,53 +840,55 @@ var file_api_v1_workspace_setting_service_proto_rawDesc = []byte{ 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x50, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x12, 0x25, 0x0a, 0x0e, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x0d, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x2c, - 0x0a, 0x12, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x5f, - 0x64, 0x6f, 0x6e, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x65, 0x6e, 0x61, 0x62, - 0x6c, 0x65, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x44, 0x6f, 0x6e, 0x65, 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, + 0x0d, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x49, + 0x0a, 0x21, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, + 0x74, 0x65, 0x64, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x5f, 0x69, 0x74, + 0x65, 0x6d, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1e, 0x72, 0x65, 0x6d, 0x6f, 0x76, + 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x43, 0x68, 0x65, 0x63, 0x6b, + 0x6c, 0x69, 0x73, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x36, 0x0a, 0x1a, 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, + 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, - 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, + 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, } var ( diff --git a/proto/gen/store/workspace_setting.pb.go b/proto/gen/store/workspace_setting.pb.go index 3c265daa93e1b..474f2700b9771 100644 --- a/proto/gen/store/workspace_setting.pb.go +++ b/proto/gen/store/workspace_setting.pb.go @@ -647,8 +647,8 @@ type WorkspaceMemoRelatedSetting struct { EnableLinkPreview bool `protobuf:"varint,6,opt,name=enable_link_preview,json=enableLinkPreview,proto3" json:"enable_link_preview,omitempty"` // enable_comment enables comment. EnableComment bool `protobuf:"varint,7,opt,name=enable_comment,json=enableComment,proto3" json:"enable_comment,omitempty"` - // enable_remove_done enables remove done. - EnableRemoveDone bool `protobuf:"varint,8,opt,name=enable_remove_done,json=enableRemoveDone,proto3" json:"enable_remove_done,omitempty"` + // removed_completed_checklist_items removed completed checklist items. + RemovedCompletedChecklistItems bool `protobuf:"varint,8,opt,name=removed_completed_checklist_items,json=removedCompletedChecklistItems,proto3" json:"removed_completed_checklist_items,omitempty"` } func (x *WorkspaceMemoRelatedSetting) Reset() { @@ -732,9 +732,9 @@ func (x *WorkspaceMemoRelatedSetting) GetEnableComment() bool { return false } -func (x *WorkspaceMemoRelatedSetting) GetEnableRemoveDone() bool { +func (x *WorkspaceMemoRelatedSetting) GetRemovedCompletedChecklistItems() bool { if x != nil { - return x.EnableRemoveDone + return x.RemovedCompletedChecklistItems } return false } @@ -839,7 +839,7 @@ var file_store_workspace_setting_proto_rawDesc = []byte{ 0x64, 0x70, 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, 0xb4, 0x03, 0x0a, 0x1b, 0x57, 0x6f, 0x72, 0x6b, 0x73, + 0x62, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x22, 0xd1, 0x03, 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, 0x3c, 0x0a, 0x1a, 0x64, 0x69, 0x73, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x76, 0x69, 0x73, 0x69, 0x62, 0x69, @@ -864,27 +864,29 @@ var file_store_workspace_setting_proto_rawDesc = []byte{ 0x6b, 0x50, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x12, 0x25, 0x0a, 0x0e, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, - 0x2c, 0x0a, 0x12, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, - 0x5f, 0x64, 0x6f, 0x6e, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x65, 0x6e, 0x61, - 0x62, 0x6c, 0x65, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x44, 0x6f, 0x6e, 0x65, 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, 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, + 0x49, 0x0a, 0x21, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x6c, + 0x65, 0x74, 0x65, 0x64, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x5f, 0x69, + 0x74, 0x65, 0x6d, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1e, 0x72, 0x65, 0x6d, 0x6f, + 0x76, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x43, 0x68, 0x65, 0x63, + 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x73, 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, 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/store/workspace_setting.proto b/proto/store/workspace_setting.proto index 2dc00bb17d067..2983909f7369a 100644 --- a/proto/store/workspace_setting.proto +++ b/proto/store/workspace_setting.proto @@ -100,6 +100,6 @@ message WorkspaceMemoRelatedSetting { bool enable_link_preview = 6; // enable_comment enables comment. bool enable_comment = 7; - // enable_remove_done enables remove done. - bool enable_remove_done = 8; + // removed_completed_checklist_items removed completed checklist items. + bool removed_completed_checklist_items = 8; } diff --git a/server/router/api/v1/workspace_setting_service.go b/server/router/api/v1/workspace_setting_service.go index 472bd5ee4166d..03b28b54b111e 100644 --- a/server/router/api/v1/workspace_setting_service.go +++ b/server/router/api/v1/workspace_setting_service.go @@ -220,14 +220,14 @@ func convertWorkspaceMemoRelatedSettingFromStore(setting *storepb.WorkspaceMemoR return nil } return &v1pb.WorkspaceMemoRelatedSetting{ - DisallowPublicVisibility: setting.DisallowPublicVisibility, - DisplayWithUpdateTime: setting.DisplayWithUpdateTime, - ContentLengthLimit: setting.ContentLengthLimit, - EnableAutoCompact: setting.EnableAutoCompact, - EnableDoubleClickEdit: setting.EnableDoubleClickEdit, - EnableLinkPreview: setting.EnableLinkPreview, - EnableComment: setting.EnableComment, - EnableRemoveDone: setting.EnableRemoveDone, + DisallowPublicVisibility: setting.DisallowPublicVisibility, + DisplayWithUpdateTime: setting.DisplayWithUpdateTime, + ContentLengthLimit: setting.ContentLengthLimit, + EnableAutoCompact: setting.EnableAutoCompact, + EnableDoubleClickEdit: setting.EnableDoubleClickEdit, + EnableLinkPreview: setting.EnableLinkPreview, + EnableComment: setting.EnableComment, + RemovedCompletedChecklistItems: setting.RemovedCompletedChecklistItems, } } @@ -236,13 +236,13 @@ func convertWorkspaceMemoRelatedSettingToStore(setting *v1pb.WorkspaceMemoRelate return nil } return &storepb.WorkspaceMemoRelatedSetting{ - DisallowPublicVisibility: setting.DisallowPublicVisibility, - DisplayWithUpdateTime: setting.DisplayWithUpdateTime, - ContentLengthLimit: setting.ContentLengthLimit, - EnableAutoCompact: setting.EnableAutoCompact, - EnableDoubleClickEdit: setting.EnableDoubleClickEdit, - EnableLinkPreview: setting.EnableLinkPreview, - EnableComment: setting.EnableComment, - EnableRemoveDone: setting.EnableRemoveDone, + DisallowPublicVisibility: setting.DisallowPublicVisibility, + DisplayWithUpdateTime: setting.DisplayWithUpdateTime, + ContentLengthLimit: setting.ContentLengthLimit, + EnableAutoCompact: setting.EnableAutoCompact, + EnableDoubleClickEdit: setting.EnableDoubleClickEdit, + EnableLinkPreview: setting.EnableLinkPreview, + EnableComment: setting.EnableComment, + RemovedCompletedChecklistItems: setting.RemovedCompletedChecklistItems, } } diff --git a/web/src/components/MemoActionMenu.tsx b/web/src/components/MemoActionMenu.tsx index 1d4e71bbf318e..16ef31d8a2c95 100644 --- a/web/src/components/MemoActionMenu.tsx +++ b/web/src/components/MemoActionMenu.tsx @@ -25,7 +25,7 @@ import { NodeType } from "@/types/proto/api/v1/markdown_service"; interface Props { memo: Memo; className?: string; - hiddenActions?: ("edit" | "archive" | "delete" | "share" | "pin" | "remove")[]; + hiddenActions?: ("edit" | "archive" | "delete" | "share" | "pin" | "remove_completed_checklist")[]; onEdit?: () => void; } @@ -116,8 +116,8 @@ const MemoActionMenu = (props: Props) => { } }; - const handleRemoveDoneClick = async () => { - const confirmed = window.confirm(t("memo.remove-done-confirm")); + const handleRemoveCompletedChecklistItemsClick = async () => { + const confirmed = window.confirm(t("memo.remove-completed-checklist-items-confirm")); if (confirmed) { const newNodes = memo.nodes; for (var i = 0; i < newNodes.length; i++) { @@ -138,7 +138,7 @@ const MemoActionMenu = (props: Props) => { }, ["content"], ); - toast.success(t("message.remove-done-successfully")); + toast.success(t("message.remove-completed-checklist-items-successfully")); if (isInMemoDetailPage) { navigateTo("/"); } @@ -175,10 +175,10 @@ const MemoActionMenu = (props: Props) => { {memo.rowStatus === RowStatus.ARCHIVED ? : } {memo.rowStatus === RowStatus.ARCHIVED ? t("common.restore") : t("common.archive")} - {!hiddenActions?.includes("remove") && ( - + {!hiddenActions?.includes("remove_completed_checklist") && ( + - {t("memo.remove-done")} + {t("memo.remove-completed-checklist-items")} )} diff --git a/web/src/components/MemoView.tsx b/web/src/components/MemoView.tsx index 2e95951f56e25..8da9dffc37494 100644 --- a/web/src/components/MemoView.tsx +++ b/web/src/components/MemoView.tsx @@ -99,12 +99,12 @@ const MemoView: React.FC = (props: Props) => { ); const handleHiddenActions = () => { - const hiddenActions: ("edit" | "archive" | "delete" | "share" | "pin" | "remove")[] = []; + const hiddenActions: ("edit" | "archive" | "delete" | "share" | "pin" | "remove_completed_checklist")[] = []; if (!props.showPinned) { hiddenActions.push("pin"); } if (!workspaceMemoRelatedSetting.enableRemoveDone) { - hiddenActions.push("remove"); + hiddenActions.push("remove_completed_checklist"); } return hiddenActions; }; diff --git a/web/src/components/Settings/MemoRelatedSettings.tsx b/web/src/components/Settings/MemoRelatedSettings.tsx index c9b55c6fc4059..89a1023191fc7 100644 --- a/web/src/components/Settings/MemoRelatedSettings.tsx +++ b/web/src/components/Settings/MemoRelatedSettings.tsx @@ -75,10 +75,10 @@ const MemoRelatedSettings = () => { />
- {t("setting.system-section.enable-remove-done")} + {t("setting.system-section.removed-completed-checklist-items")} updatePartialSetting({ enableRemoveDone: event.target.checked })} + checked={memoRelatedSetting.removedCompletedChecklistItems} + onChange={(event) => updatePartialSetting({ removedCompletedChecklistItems: event.target.checked })} />
diff --git a/web/src/locales/ar.json b/web/src/locales/ar.json index e4d94fcbfcb38..a9b8b5cfdab03 100644 --- a/web/src/locales/ar.json +++ b/web/src/locales/ar.json @@ -89,8 +89,8 @@ "protected": "مساحة عمل", "public": "عام" }, - "remove-done": "إزالة المنجز", - "remove-done-confirm": "هل أنت متأكد أنك تريد إزالة جميع المهام المنجزة؟ (هذه العملية لا يمكن التراجع عنها)" + "remove-completed-checklist-items": "إزالة المنجز", + "remove-completed-checklist-items-confirm": "هل أنت متأكد أنك تريد إزالة جميع المهام المنجزة؟ (هذه العملية لا يمكن التراجع عنها)" }, "resource": { "clear": "مسح", diff --git a/web/src/locales/de.json b/web/src/locales/de.json index 3d5f8904bfe24..366f71c29fbe8 100644 --- a/web/src/locales/de.json +++ b/web/src/locales/de.json @@ -98,8 +98,8 @@ "protected": "Mitglieder", "public": "Öffentlich" }, - "remove-done": "Erledigt entfernen", - "remove-done-confirm": "Sind Sie sicher, dass Sie alle abgeschlossenen Aufgaben entfernen möchten? (Diese Aktion kann nicht rückgängig gemacht werden)" + "remove-completed-checklist-items": "Erledigt entfernen", + "remove-completed-checklist-items-confirm": "Sind Sie sicher, dass Sie alle abgeschlossenen Aufgaben entfernen möchten? (Diese Aktion kann nicht rückgängig gemacht werden)" }, "message": { "change-memo-created-time": "Erstellungszeitpunkt ändern", @@ -115,7 +115,7 @@ "succeed-copy-link": "Link erfolgreich kopiert", "update-succeed": "Update erfolgreich", "user-not-found": "Nutzer nicht gefunden", - "remove-done-successfully": "Erfolgreich entfernt!" + "remove-completed-checklist-items-successfully": "Erfolgreich entfernt!" }, "resource": { "clear": "Löschen", @@ -267,7 +267,7 @@ "max-upload-size": "Maximale Uploadgröße (MiB)", "max-upload-size-hint": "Empfohlene Wert ist 32 MiB.", "server-name": "Servername", - "enable-remove-done": "Entfernen abgeschlossen aktivieren" + "removed-completed-checklist-items": "Entfernen abgeschlossen aktivieren" } }, "tag": { diff --git a/web/src/locales/en.json b/web/src/locales/en.json index 9ad46bdda9085..5b09aeefd4ac2 100644 --- a/web/src/locales/en.json +++ b/web/src/locales/en.json @@ -119,8 +119,8 @@ "links": "Links", "to-do": "To-do", "code": "Code", - "remove-done": "Remove done", - "remove-done-confirm": "Are you sure you want to remove all completed to-dos? THIS ACTION IS IRREVERSIBLE" + "remove-completed-checklist-items": "Remove done", + "remove-completed-checklist-items-confirm": "Are you sure you want to remove all completed to-dos? THIS ACTION IS IRREVERSIBLE" }, "message": { "archived-successfully": "Archived successfully", @@ -138,7 +138,7 @@ "succeed-copy-link": "Link copied successfully.", "update-succeed": "Update succeeded", "user-not-found": "User not found", - "remove-done-successfully": "The removal was successful" + "remove-completed-checklist-items-successfully": "The removal was successful" }, "reference": { "add-references": "Add references", @@ -300,7 +300,7 @@ "max-upload-size": "Maximum upload size (MiB)", "max-upload-size-hint": "Recommended value is 32 MiB.", "server-name": "Server Name", - "enable-remove-done": "Enable remove done" + "removed-completed-checklist-items": "Enable removal of completed checklist items" }, "memo-related": "Memo" }, diff --git a/web/src/locales/es.json b/web/src/locales/es.json index 15f5c1c0205ba..6c3e0bff2da02 100644 --- a/web/src/locales/es.json +++ b/web/src/locales/es.json @@ -106,8 +106,8 @@ "protected": "Espacio de trabajo", "public": "Todo el mundo lo puede ver" }, - "remove-done": "Eliminar completado", - "remove-done-confirm": "¿Estás seguro de que quieres eliminar todas las tareas completadas? (Esta acción es irreversible)" + "remove-completed-checklist-items": "Eliminar completado", + "remove-completed-checklist-items-confirm": "¿Estás seguro de que quieres eliminar todas las tareas completadas? (Esta acción es irreversible)" }, "message": { "change-memo-created-time": "Cambiar la hora de creación del memo", @@ -123,7 +123,7 @@ "succeed-copy-link": "Enlace copiado correctamente.", "update-succeed": "Actualización exitosa", "user-not-found": "Usuario no encontrado", - "remove-done-successfully": "¡Eliminado con éxito!" + "remove-completed-checklist-items-successfully": "¡Eliminado con éxito!" }, "resource": { "clear": "Limpiar", @@ -269,7 +269,7 @@ "max-upload-size": "Tamaño máximo de subida (MiB)", "max-upload-size-hint": "El valor recomendado es de 32 MiB.", "server-name": "Nombre del servidor", - "enable-remove-done": "Habilitar eliminar completado" + "removed-completed-checklist-items": "Habilitar eliminar completado" } }, "tag": { diff --git a/web/src/locales/fr.json b/web/src/locales/fr.json index f706afe6f7d82..2c0ec498a221c 100644 --- a/web/src/locales/fr.json +++ b/web/src/locales/fr.json @@ -119,8 +119,8 @@ "protected": "Accès aux membres", "public": "Public" }, - "remove-done": "Supprimer terminé", - "remove-done-confirm": "Êtes-vous sûr de vouloir supprimer toutes les tâches terminées ? (Cette action est irréversible)" + "remove-completed-checklist-items": "Supprimer terminé", + "remove-completed-checklist-items-confirm": "Êtes-vous sûr de vouloir supprimer toutes les tâches terminées ? (Cette action est irréversible)" }, "message": { "archived-successfully": "Archivé avec succès", @@ -138,7 +138,7 @@ "succeed-copy-link": "Succeed to copy link to clipboard.", "update-succeed": "Mise à jour effectuée", "user-not-found": "Utilisateur introuvable", - "remove-done-successfully": "Supprimé avec succès !" + "remove-completed-checklist-items-successfully": "Supprimé avec succès !" }, "reference": { "add-references": "Ajouter des références", @@ -301,7 +301,7 @@ "max-upload-size": "Taille maximale du téléversement (MiB)", "max-upload-size-hint": "La valeur recommandée est 32 MiB.", "server-name": "Nom du serveur", - "enable-remove-done": "Activer la suppression terminée" + "removed-completed-checklist-items": "Activer la suppression terminée" } }, "tag": { diff --git a/web/src/locales/hi.json b/web/src/locales/hi.json index 84eef9a2fa1f1..74eb7a3c52159 100644 --- a/web/src/locales/hi.json +++ b/web/src/locales/hi.json @@ -91,8 +91,8 @@ "protected": "सदस्यों को दिखाई देता है", "public": "सभी के लिए सार्वजनिक" }, - "remove-done": "हटाएँ किया गया", - "remove-done-confirm": "क्या आप सुनिश्चित हैं कि आप सभी पूरे कामों को हटाना चाहते हैं? (यह क्रिया वापस ले जाने योग्य नहीं है)" + "remove-completed-checklist-items": "हटाएँ किया गया", + "remove-completed-checklist-items-confirm": "क्या आप सुनिश्चित हैं कि आप सभी पूरे कामों को हटाना चाहते हैं? (यह क्रिया वापस ले जाने योग्य नहीं है)" }, "message": { "change-memo-created-time": "मेमो बनाने का समय बदलें", @@ -108,7 +108,7 @@ "succeed-copy-link": "लिंक सफलतापूर्वक कॉपी किया गया।", "update-succeed": "अपडेट सफल हुआ", "user-not-found": "उपयोगकर्ता नहीं मिला", - "remove-done-successfully": "सफलतापूर्वक हटा दिया!" + "remove-completed-checklist-items-successfully": "सफलतापूर्वक हटा दिया!" }, "resource": { "clear": "साफ़ करें", diff --git a/web/src/locales/hr.json b/web/src/locales/hr.json index 14e034d9f3eb0..8ba4af11ec3fc 100644 --- a/web/src/locales/hr.json +++ b/web/src/locales/hr.json @@ -103,8 +103,8 @@ "protected": "Vidljivo članovima", "public": "Javno" }, - "remove-done": "Ukloni obavljen", - "remove-done-confirm": "Jeste li sigurni da želite ukloniti sve obavljene zadatke? (Ova akcija je nevraćiva)" + "remove-completed-checklist-items": "Ukloni obavljen", + "remove-completed-checklist-items-confirm": "Jeste li sigurni da želite ukloniti sve obavljene zadatke? (Ova akcija je nevraćiva)" }, "message": { "change-memo-created-time": "Promijeni vrijeme stvaranja memoa", @@ -120,7 +120,7 @@ "succeed-copy-link": "Link je uspješno kopiran.", "update-succeed": "Obnavljanje aplikacije je uspjelo!🎉", "user-not-found": "Korisnik nije nađen", - "remove-done-successfully": "Uspješno uklonjeno!" + "remove-completed-checklist-items-successfully": "Uspješno uklonjeno!" }, "resource": { "clear": "Očisti", @@ -271,7 +271,7 @@ "max-upload-size": "Maximalna veličina uploada (MiB)", "max-upload-size-hint": "Preporučena vrijednost je 32 MiB.", "server-name": "Ime servera", - "enable-remove-done": "Omogući uklanjanje obavljenog" + "removed-completed-checklist-items": "Omogući uklanjanje obavljenog" } }, "tag": { diff --git a/web/src/locales/hu.json b/web/src/locales/hu.json index 9e3c0d07ae7b7..1482259ce2176 100644 --- a/web/src/locales/hu.json +++ b/web/src/locales/hu.json @@ -114,8 +114,8 @@ "protected": "Munkatér", "public": "Nyilvános" }, - "remove-done": "Töröld el a kész", - "remove-done-confirm": "Biztos, hogy törölni akarod az összes kész feladatot? (Ez az akció visszavonhatatlan)" + "remove-completed-checklist-items": "Töröld el a kész", + "remove-completed-checklist-items-confirm": "Biztos, hogy törölni akarod az összes kész feladatot? (Ez az akció visszavonhatatlan)" }, "message": { "archived-successfully": "Sikeres archiválás", @@ -133,7 +133,7 @@ "succeed-copy-link": "Hivatkozás sikeresen másolva.", "update-succeed": "Sikeres frissítés", "user-not-found": "Felhasználó nem található", - "remove-done-successfully": "Sikeresen eltávolítva!" + "remove-completed-checklist-items-successfully": "Sikeresen eltávolítva!" }, "reference": { "add-references": "Referenciák hozzáadása", @@ -291,7 +291,7 @@ "max-upload-size": "Maximális feltöltési méret (MiB)", "max-upload-size-hint": "Az ajánlott érték 32 MiB.", "server-name": "Szerver neve", - "enable-remove-done": "Kikapcsold a kész törölését" + "removed-completed-checklist-items": "Kikapcsold a kész törölését" } }, "tag": { diff --git a/web/src/locales/it.json b/web/src/locales/it.json index add6499ce81b9..0308695c6a9a9 100644 --- a/web/src/locales/it.json +++ b/web/src/locales/it.json @@ -92,8 +92,8 @@ "protected": "Visibile ai membri", "public": "Pubblico" }, - "remove-done": "Rimuovi completato", - "remove-done-confirm": "Sei sicuro di voler rimuovere tutte le cose completate? (Questa azione è irreversibile)" + "remove-completed-checklist-items": "Rimuovi completato", + "remove-completed-checklist-items-confirm": "Sei sicuro di voler rimuovere tutte le cose completate? (Questa azione è irreversibile)" }, "message": { "change-memo-created-time": "Cambia data creazione", @@ -109,7 +109,7 @@ "succeed-copy-link": "Link copiato.", "update-succeed": "Aggiornato con successo", "user-not-found": "Utente non trovato", - "remove-done-successfully": "Rimosso con successo!" + "remove-completed-checklist-items-successfully": "Rimosso con successo!" }, "resource": { "clear": "Cancella", @@ -257,7 +257,7 @@ "max-upload-size": "Dimensione massima caricamento (MiB)", "max-upload-size-hint": "Valore consigliato di 32 MiB.", "server-name": "Nome server", - "enable-remove-done": "Abilita rimuovi completato" + "removed-completed-checklist-items": "Abilita rimuovi completato" } }, "tag": { diff --git a/web/src/locales/ja.json b/web/src/locales/ja.json index 3a9f69767bb20..0a6eddf02b8f7 100644 --- a/web/src/locales/ja.json +++ b/web/src/locales/ja.json @@ -119,8 +119,8 @@ "protected": "メンバーに表示", "public": "公開メモ" }, - "remove-done": "完了を削除", - "remove-done-confirm": "すべての完了したタスクを削除してもよろしいですか?(このアクションは取り消せません)" + "remove-completed-checklist-items": "完了を削除", + "remove-completed-checklist-items-confirm": "すべての完了したタスクを削除してもよろしいですか?(このアクションは取り消せません)" }, "message": { "archived-successfully": "アーカイブが完了しました", @@ -138,7 +138,7 @@ "succeed-copy-link": "リンクのコピーに成功しました。", "update-succeed": "変更は保存されました", "user-not-found": "ユーザーが見つかりませんでした", - "remove-done-successfully": "削除が成功しました!" + "remove-completed-checklist-items-successfully": "削除が成功しました!" }, "reference": { "add-references": "変更は保存されました", @@ -301,7 +301,7 @@ "max-upload-size": "最大ファイルサイズ(MiB)", "max-upload-size-hint": "推奨サイズは32 MiBです。", "server-name": "サーバーの名前", - "enable-remove-done": "完了削除を有効にする" + "removed-completed-checklist-items": "完了削除を有効にする" } }, "tag": { diff --git a/web/src/locales/ko.json b/web/src/locales/ko.json index 5cdccd033856f..af27bcd851887 100644 --- a/web/src/locales/ko.json +++ b/web/src/locales/ko.json @@ -103,8 +103,8 @@ "protected": "멤버 전용", "public": "공개" }, - "remove-done": "완료 제거", - "remove-done-confirm": "모든 완료된 작업을 삭제하겠습니까? (이 작업은 되돌릴 수 없습니다)" + "remove-completed-checklist-items": "완료 제거", + "remove-completed-checklist-items-confirm": "모든 완료된 작업을 삭제하겠습니까? (이 작업은 되돌릴 수 없습니다)" }, "message": { "change-memo-created-time": "메모 생성 시각 변경", @@ -120,7 +120,7 @@ "succeed-copy-link": "링크를 클립보드에 복사했습니다.", "update-succeed": "업데이트 성공", "user-not-found": "회원을 찾을 수 없습니다", - "remove-done-successfully": "성공적으로 제거되었습니다!" + "remove-completed-checklist-items-successfully": "성공적으로 제거되었습니다!" }, "resource": { "clear": "클리어", @@ -272,7 +272,7 @@ "max-upload-size": "최대 업로드 크기 (MiB)", "max-upload-size-hint": "권장값은 32 MiB입니다.", "server-name": "서버 이름", - "enable-remove-done": "완료 제거 활성화" + "removed-completed-checklist-items": "완료 제거 활성화" } }, "tag": { diff --git a/web/src/locales/mr.json b/web/src/locales/mr.json index 8a61d8faa744f..5ed02d79bc5de 100644 --- a/web/src/locales/mr.json +++ b/web/src/locales/mr.json @@ -116,8 +116,8 @@ "protected": "कार्यक्षेत्र", "public": "सार्वजनिक" }, - "remove-done": "हटवा केलेले", - "remove-done-confirm": "तुम्ही सगळ्या पूर्ण केलेल्या कामांचे हटवणार आहात का? (या क्रियेचे उलट घेणे शक्य नाही)" + "remove-completed-checklist-items": "हटवा केलेले", + "remove-completed-checklist-items-confirm": "तुम्ही सगळ्या पूर्ण केलेल्या कामांचे हटवणार आहात का? (या क्रियेचे उलट घेणे शक्य नाही)" }, "message": { "archived-successfully": "यशस्वीरित्या संग्रहित केले", @@ -135,7 +135,7 @@ "succeed-copy-link": "लिंक यशस्वीरित्या कॉपी केली.", "update-succeed": "अपडेट यशस्वी झाले", "user-not-found": "वापरकर्ता सापडला नाही", - "remove-done-successfully": "सफळताने हटवा झाले!" + "remove-completed-checklist-items-successfully": "सफळताने हटवा झाले!" }, "reference": { "add-references": "संदर्भ जोडा", @@ -295,7 +295,7 @@ "max-upload-size": "कमाल अपलोड आकार (MiB)", "max-upload-size-hint": "शिफारस केलेले मूल्य 32 MiB आहे.", "server-name": "सर्व्हरचे नाव", - "enable-remove-done": "हटवा केलेले सक्षम करा" + "removed-completed-checklist-items": "हटवा केलेले सक्षम करा" } }, "tag": { diff --git a/web/src/locales/nl.json b/web/src/locales/nl.json index 689e0d9afaeff..d1d13e8a5f5a4 100644 --- a/web/src/locales/nl.json +++ b/web/src/locales/nl.json @@ -98,8 +98,8 @@ "protected": "Werkruimte", "public": "Openbaar" }, - "remove-done": "Verwijder voltooid", - "remove-done-confirm": "Weet u zeker dat u alle voltooide taken wilt verwijderen? (Deze actie is onomkeerbaar)" + "remove-completed-checklist-items": "Verwijder voltooid", + "remove-completed-checklist-items-confirm": "Weet u zeker dat u alle voltooide taken wilt verwijderen? (Deze actie is onomkeerbaar)" }, "message": { "change-memo-created-time": "Tijd van aanmaken wijzigen", @@ -114,7 +114,7 @@ "succeed-copy-link": "Link gekopieërd naar klembord.", "update-succeed": "Update voltooid", "user-not-found": "Gebruiker niet gevonden", - "remove-done-successfully": "Gelukt verwijderd!" + "remove-completed-checklist-items-successfully": "Gelukt verwijderd!" }, "resource": { "clear": "Opruimen", @@ -239,7 +239,7 @@ "max-upload-size": "Maximum uploadgrootte (MiB)", "max-upload-size-hint": "32 MiB wordt aangeraden.", "server-name": "Servernaam", - "enable-remove-done": "Verwijder voltooid inschakelen" + "removed-completed-checklist-items": "Verwijder voltooid inschakelen" } }, "tag": { diff --git a/web/src/locales/pl.json b/web/src/locales/pl.json index e709a8d6a496f..4a8138487309e 100644 --- a/web/src/locales/pl.json +++ b/web/src/locales/pl.json @@ -118,8 +118,8 @@ "links": "Linki", "to-do": "Lista zadań", "code": "Kod", - "remove-done": "Usuń zakończone", - "remove-done-confirm": "Czy jesteś pewny, że chcesz usunąć wszystkie zakończone zadania? (Ta akcja jest nieodwracalna)" + "remove-completed-checklist-items": "Usuń zakończone", + "remove-completed-checklist-items-confirm": "Czy jesteś pewny, że chcesz usunąć wszystkie zakończone zadania? (Ta akcja jest nieodwracalna)" }, "message": { "archived-successfully": "Zarchiwizowano pomyślnie", @@ -137,7 +137,7 @@ "succeed-copy-link": "Link skopiowany pomyślnie.", "update-succeed": "Aktualizacja zakończona sukcesem", "user-not-found": "Użytkownik nie został znaleziony", - "remove-done-successfully": "Pomyślnie usunięto!" + "remove-completed-checklist-items-successfully": "Pomyślnie usunięto!" }, "reference": { "add-references": "Dodaj odniesienia", @@ -299,7 +299,7 @@ "max-upload-size": "Maksymalny rozmiar przesyłanego pliku (MiB)", "max-upload-size-hint": "Zalecana wartość to 32 MiB.", "server-name": "Nazwa serwera", - "enable-remove-done": "Włącz usuwanie zakończonych" + "removed-completed-checklist-items": "Włącz usuwanie zakończonych" }, "memo-related": "Notatki" }, diff --git a/web/src/locales/pt-BR.json b/web/src/locales/pt-BR.json index c7a71e750bf32..e0522c3aa5b23 100644 --- a/web/src/locales/pt-BR.json +++ b/web/src/locales/pt-BR.json @@ -119,8 +119,8 @@ "protected": "Protegido (membros)", "public": "Público (todos)" }, - "remove-done": "Remover concluídos", - "remove-done-confirm": "Você tem certeza de que deseja remover todos os itens concluídos? (Essa ação é irreversível)" + "remove-completed-checklist-items": "Remover concluídos", + "remove-completed-checklist-items-confirm": "Você tem certeza de que deseja remover todos os itens concluídos? (Essa ação é irreversível)" }, "message": { "archived-successfully": "Arquivado com êxito", @@ -138,7 +138,7 @@ "succeed-copy-link": "Link copiado com êxito.", "update-succeed": "Atualizado com êxito", "user-not-found": "Usuário não encontrado", - "remove-done-successfully": "Remoção bem-sucedida!" + "remove-completed-checklist-items-successfully": "Remoção bem-sucedida!" }, "reference": { "add-references": "Adicionar referências", @@ -301,7 +301,7 @@ "max-upload-size": "Tamanho máximo de upload (MiB)", "max-upload-size-hint": "O valor recomendado é 32 MiB.", "server-name": "Nome do servidor", - "enable-remove-done": "Ativar remoção de concluídos" + "removed-completed-checklist-items": "Ativar remoção de concluídos" } }, "tag": { diff --git a/web/src/locales/ru.json b/web/src/locales/ru.json index 880b22a52a2d4..ff4fc1f10564d 100644 --- a/web/src/locales/ru.json +++ b/web/src/locales/ru.json @@ -113,8 +113,8 @@ "protected": "Видно только пользователям", "public": "Видно всем" }, - "remove-done": "Удалить выполненные", - "remove-done-confirm": "Вы уверены, что хотите удалить все выполненные задачи? (Данное действие необратимо)" + "remove-completed-checklist-items": "Удалить выполненные", + "remove-completed-checklist-items-confirm": "Вы уверены, что хотите удалить все выполненные задачи? (Данное действие необратимо)" }, "message": { "archived-successfully": "Успешная архивация", @@ -132,7 +132,7 @@ "succeed-copy-link": "Ссылка скопирована в буфер обмена.", "update-succeed": "Успешно обновлено", "user-not-found": "Пользователь не найден", - "remove-done-successfully": "Удалено успешно!" + "remove-completed-checklist-items-successfully": "Удалено успешно!" }, "reference": { "add-references": "Добавить ссылку", @@ -284,7 +284,7 @@ "max-upload-size": "Максимальный размер загрузки (МБ)", "max-upload-size-hint": "Рекомендуемое значение 32 MБ.", "server-name": "Имя сервера", - "enable-remove-done": "Включить удаление выполненных" + "removed-completed-checklist-items": "Включить удаление выполненных" } }, "tag": { diff --git a/web/src/locales/sl.json b/web/src/locales/sl.json index 1294903d38da3..4603165eafebc 100644 --- a/web/src/locales/sl.json +++ b/web/src/locales/sl.json @@ -70,8 +70,8 @@ "protected": "Vidno uporabnikom", "public": "Vidno vsem" }, - "remove-done": "Odstrani končane", - "remove-done-confirm": "Ste prepričani, da želite odstraniti vse končane naloge? (Ta dejanje ni obrnljivo)" + "remove-completed-checklist-items": "Odstrani končane", + "remove-completed-checklist-items-confirm": "Ste prepričani, da želite odstraniti vse končane naloge? (Ta dejanje ni obrnljivo)" }, "message": { "change-memo-created-time": "Spremeni čas izdelave beležke", @@ -85,7 +85,7 @@ "succeed-copy-link": "Povezava je uspešno skopirana.", "update-succeed": "Posodobitev je uspešna", "user-not-found": "Ne najdem uporabnika", - "remove-done-successfully": "Odstranitev uspešna!" + "remove-completed-checklist-items-successfully": "Odstranitev uspešna!" }, "resource": { "clear": "Počisti", @@ -161,7 +161,7 @@ "disable-public-memos": "Onemogočite javne beležke", "display-with-updated-time": "Display with updated time", "server-name": "Ime strežnika", - "enable-remove-done": "Omogoči odstranitev končanih" + "removed-completed-checklist-items": "Omogoči odstranitev končanih" } }, "tag": { diff --git a/web/src/locales/sv.json b/web/src/locales/sv.json index 2ea33729b4082..330ea8bdb7d09 100644 --- a/web/src/locales/sv.json +++ b/web/src/locales/sv.json @@ -65,8 +65,8 @@ "protected": "Synlig för medlemmar", "public": "Synlig för alla" }, - "remove-done": "Ta bort avklarade", - "remove-done-confirm": "Är du säker på att du vill ta bort alla avklarade todo? (Detta är oåterkalleligt)" + "remove-completed-checklist-items": "Ta bort avklarade", + "remove-completed-checklist-items-confirm": "Är du säker på att du vill ta bort alla avklarade todo? (Detta är oåterkalleligt)" }, "message": { "change-memo-created-time": "Ändra anteckning skapade tid", @@ -80,7 +80,7 @@ "succeed-copy-link": "Länk kopierades framgångsrikt.", "update-succeed": "Uppdateras framgångsrikt", "user-not-found": "Användaren hittades inte", - "remove-done-successfully": "Borttagning avklarade todo lyckades!" + "remove-completed-checklist-items-successfully": "Borttagning avklarade todo lyckades!" }, "resource": { "clear": "Rensa", @@ -137,7 +137,7 @@ "disable-public-memos": "Inaktivera offentliga anteckningar", "display-with-updated-time": "Display with updated time", "server-name": "Server Name", - "enable-remove-done": "Aktivera ta bort avklarade" + "removed-completed-checklist-items": "Aktivera ta bort avklarade" } } } diff --git a/web/src/locales/th.json b/web/src/locales/th.json index cf33f1362b2f6..4e0f8dd0b5e36 100644 --- a/web/src/locales/th.json +++ b/web/src/locales/th.json @@ -119,8 +119,8 @@ "protected": "พื้นที่ทำงาน", "public": "สาธารณะ" }, - "remove-done": "ลบที่ทำแล้ว", - "remove-done-confirm": "คุณแน่ใจว่าจะลบรายการที่ทำแล้วทั้งหมดหรือไม่? (การกระทำนี้ไม่สามารถย้อนกลับได้)" + "remove-completed-checklist-items": "ลบที่ทำแล้ว", + "remove-completed-checklist-items-confirm": "คุณแน่ใจว่าจะลบรายการที่ทำแล้วทั้งหมดหรือไม่? (การกระทำนี้ไม่สามารถย้อนกลับได้)" }, "message": { "archived-successfully": "เก็บถาวรเรียบร้อยแล้ว", @@ -138,7 +138,7 @@ "succeed-copy-link": "คัดลอกลิงก์เรียบร้อยแล้ว", "update-succeed": "อัปเดตเรียบร้อยแล้ว", "user-not-found": "ไม่พบผู้ใช้งาน", - "remove-done-successfully": "ลบเรียบร้อย!" + "remove-completed-checklist-items-successfully": "ลบเรียบร้อย!" }, "reference": { "add-references": "เพิ่มข้อมูลอ้างอิง", @@ -301,7 +301,7 @@ "max-upload-size": "ขนาดการอัปโหลดสูงสุด (MiB)", "max-upload-size-hint": "ค่าที่แนะนำคือ 32 MiB", "server-name": "ชื่อเซิร์ฟเวอร์", - "enable-remove-done": "เปิดใช้งานการลบรายการที่ทำแล้ว" + "removed-completed-checklist-items": "เปิดใช้งานการลบรายการที่ทำแล้ว" } }, "tag": { diff --git a/web/src/locales/tr.json b/web/src/locales/tr.json index 86c844bf25f5b..f221234ceac96 100644 --- a/web/src/locales/tr.json +++ b/web/src/locales/tr.json @@ -119,8 +119,8 @@ "protected": "Çalışma Alanı", "public": "Herkese açık" }, - "remove-done": "Tamamlananları Kaldır", - "remove-done-confirm": "Tüm tamamlanan görevleri kaldırmak istediğinize emin misiniz? (Bu işlem geri alınamaz)" + "remove-completed-checklist-items": "Tamamlananları Kaldır", + "remove-completed-checklist-items-confirm": "Tüm tamamlanan görevleri kaldırmak istediğinize emin misiniz? (Bu işlem geri alınamaz)" }, "message": { "archived-successfully": "Başarıyla arşivlendi", @@ -138,7 +138,7 @@ "succeed-copy-link": "Bağlantı panosuna bağlantı kopyalandı.", "update-succeed": "Başarıyla güncellendi", "user-not-found": "Kullanıcı bulunamadı", - "remove-done-successfully": "Başarıyla kaldırıldı!" + "remove-completed-checklist-items-successfully": "Başarıyla kaldırıldı!" }, "reference": { "add-references": "Referans ekle", @@ -301,7 +301,7 @@ "max-upload-size": "Maksimum yükleme boyutu (MiB)", "max-upload-size-hint": "Önerilen değer 32 MiB'dir.", "server-name": "Uygulama Adı", - "enable-remove-done": "Tamamlananları Kaldırma'yı Etkinleştir" + "removed-completed-checklist-items": "Tamamlananları Kaldırma'yı Etkinleştir" } }, "tag": { diff --git a/web/src/locales/uk.json b/web/src/locales/uk.json index 39a36c1485736..f20cdd010a0a0 100644 --- a/web/src/locales/uk.json +++ b/web/src/locales/uk.json @@ -106,8 +106,8 @@ "protected": "Видимий тільки користувачам", "public": "Видимий усім" }, - "remove-done": "Видалити виконані", - "remove-done-confirm": "Ви впевнені, що хочете видалити всі виконані задачі? (Ця дія неодмінна)" + "remove-completed-checklist-items": "Видалити виконані", + "remove-completed-checklist-items-confirm": "Ви впевнені, що хочете видалити всі виконані задачі? (Ця дія неодмінна)" }, "message": { "archived-successfully": "Успішно архівовано", @@ -125,7 +125,7 @@ "succeed-copy-link": "Скопійовано посилання в буфер обміну.", "update-succeed": "Збережно", "user-not-found": "Користувача не знайдено", - "remove-done-successfully": "Видалення виконаних успішно!" + "remove-completed-checklist-items-successfully": "Видалення виконаних успішно!" }, "reference": { "add-references": "Додати посилання", @@ -189,7 +189,7 @@ "disable-public-memos": "Disable public memos", "display-with-updated-time": "Display with updated time", "server-name": "Назва додатка", - "enable-remove-done": "Увімкнути видалення виконаних" + "removed-completed-checklist-items": "Увімкнути видалення виконаних" } } } diff --git a/web/src/locales/vi.json b/web/src/locales/vi.json index b976fe5d42457..80b42f60016d2 100644 --- a/web/src/locales/vi.json +++ b/web/src/locales/vi.json @@ -95,8 +95,8 @@ "protected": "Bảo vệ", "public": "Công khai" }, - "remove-done": "Xóa đã hoàn thành", - "remove-done-confirm": "Bạn có chắc chắn muốn xóa tất cả các mục đã hoàn thành không? (Hành động này không thể đảo ngược)" + "remove-completed-checklist-items": "Xóa đã hoàn thành", + "remove-completed-checklist-items-confirm": "Bạn có chắc chắn muốn xóa tất cả các mục đã hoàn thành không? (Hành động này không thể đảo ngược)" }, "message": { "archived-successfully": "Lưu trữ thành công", @@ -113,7 +113,7 @@ "succeed-copy-link": "Liên kết đã được sao chép thành công.", "update-succeed": "Cập nhật thành công", "user-not-found": "Không tìm thấy người dùng.", - "remove-done-successfully": "Xóa thành công!" + "remove-completed-checklist-items-successfully": "Xóa thành công!" }, "resource": { "clear": "Xóa", @@ -267,7 +267,7 @@ "max-upload-size": "Kích thước tải lên tối đa (MiB)", "max-upload-size-hint": "Giá trị khuyến nghị là 32 MiB.", "server-name": "Tên máy chủ", - "enable-remove-done": "Kích hoạt xóa đã hoàn thành" + "removed-completed-checklist-items": "Kích hoạt xóa đã hoàn thành" } }, "tag": { diff --git a/web/src/locales/zh-Hans.json b/web/src/locales/zh-Hans.json index a24da4d8682cf..d1cf07483ebf3 100644 --- a/web/src/locales/zh-Hans.json +++ b/web/src/locales/zh-Hans.json @@ -119,8 +119,8 @@ "protected": "工作区", "public": "公开" }, - "remove-done": "移除已办", - "remove-done-confirm": "您确定要移除所有完成的待办吗?(此操作不可逆)" + "remove-completed-checklist-items": "移除已办", + "remove-completed-checklist-items-confirm": "您确定要移除所有完成的待办吗?(此操作不可逆)" }, "message": { "archived-successfully": "归档成功", @@ -138,7 +138,7 @@ "succeed-copy-link": "复制链接到剪贴板成功。", "update-succeed": "更新成功", "user-not-found": "未找到该用户", - "remove-done-successfully": "移除成功!" + "remove-completed-checklist-items-successfully": "移除成功!" }, "reference": { "add-references": "添加引用", @@ -301,7 +301,7 @@ "max-upload-size": "最大上传大小 (MiB)", "max-upload-size-hint": "建议值为 32 MiB。", "server-name": "服务名称", - "enable-remove-done": "启用移除已办" + "removed-completed-checklist-items": "启用移除已办" } }, "tag": { diff --git a/web/src/locales/zh-Hant.json b/web/src/locales/zh-Hant.json index 360772737e918..f2b095426b14d 100644 --- a/web/src/locales/zh-Hant.json +++ b/web/src/locales/zh-Hant.json @@ -119,8 +119,8 @@ "protected": "成員可見", "public": "公開給所有人" }, - "remove-done": "移除已完成", - "remove-done-confirm": "您確定要移除所有完成的待辦嗎?(此操作不可逆)" + "remove-completed-checklist-items": "移除已完成", + "remove-completed-checklist-items-confirm": "您確定要移除所有完成的待辦嗎?(此操作不可逆)" }, "message": { "archived-successfully": "封存成功", @@ -138,7 +138,7 @@ "succeed-copy-link": "複製連結到剪貼簿成功。", "update-succeed": "更新成功", "user-not-found": "查無該使用者", - "remove-done-successfully": "移除成功!" + "remove-completed-checklist-items-successfully": "移除成功!" }, "reference": { "add-references": "添加參考資料", @@ -301,7 +301,7 @@ "max-upload-size": "最大上傳檔案大小 (MiB)", "max-upload-size-hint": "建議值為 32 MiB。", "server-name": "伺服器名稱", - "enable-remove-done": "啟用移除已完成" + "removed-completed-checklist-items": "啟用移除已完成" } }, "tag": { From 87032ff3813c2860534f97d85d626a153571cba2 Mon Sep 17 00:00:00 2001 From: mozhu Date: Mon, 9 Sep 2024 15:32:31 +0800 Subject: [PATCH 06/10] Modify the description --- web/src/components/MemoView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/components/MemoView.tsx b/web/src/components/MemoView.tsx index 8da9dffc37494..021e58e211ee7 100644 --- a/web/src/components/MemoView.tsx +++ b/web/src/components/MemoView.tsx @@ -103,7 +103,7 @@ const MemoView: React.FC = (props: Props) => { if (!props.showPinned) { hiddenActions.push("pin"); } - if (!workspaceMemoRelatedSetting.enableRemoveDone) { + if (!workspaceMemoRelatedSetting.removedCompletedChecklistItems) { hiddenActions.push("remove_completed_checklist"); } return hiddenActions; From 0b31e4520044abc0d24cc148ba2e03b7f5fa97cb Mon Sep 17 00:00:00 2001 From: mozhu Date: Wed, 13 Nov 2024 16:59:13 +0800 Subject: [PATCH 07/10] Modify the description --- proto/api/v1/workspace_setting_service.proto | 4 +- .../api/v1/workspace_setting_service.pb.go | 98 ++++--- proto/gen/apidocs.swagger.yaml | 251 +++++++++++++----- proto/gen/store/workspace_setting.pb.go | 53 ++-- proto/store/workspace_setting.proto | 4 +- .../api/v1/workspace_setting_service.go | 4 +- web/src/components/MemoActionMenu.tsx | 34 ++- web/src/components/MemoView.tsx | 6 +- .../Settings/MemoRelatedSettings.tsx | 7 + web/src/locales/ar.json | 4 +- web/src/locales/de.json | 8 +- web/src/locales/en.json | 8 +- web/src/locales/es.json | 8 +- web/src/locales/fr.json | 8 +- web/src/locales/hi.json | 6 +- web/src/locales/hr.json | 8 +- web/src/locales/hu.json | 8 +- web/src/locales/it.json | 8 +- web/src/locales/ja.json | 8 +- web/src/locales/ko.json | 8 +- web/src/locales/mr.json | 8 +- web/src/locales/nl.json | 8 +- web/src/locales/pl.json | 8 +- web/src/locales/pt-BR.json | 8 +- web/src/locales/ru.json | 8 +- web/src/locales/sl.json | 8 +- web/src/locales/sv.json | 8 +- web/src/locales/th.json | 8 +- web/src/locales/tr.json | 8 +- web/src/locales/uk.json | 8 +- web/src/locales/vi.json | 8 +- web/src/locales/zh-Hans.json | 8 +- web/src/locales/zh-Hant.json | 8 +- 33 files changed, 409 insertions(+), 238 deletions(-) diff --git a/proto/api/v1/workspace_setting_service.proto b/proto/api/v1/workspace_setting_service.proto index 49b7ee0f01ca9..ca22c88596566 100644 --- a/proto/api/v1/workspace_setting_service.proto +++ b/proto/api/v1/workspace_setting_service.proto @@ -117,8 +117,8 @@ message WorkspaceMemoRelatedSetting { repeated string reactions = 10; // disable_markdown_shortcuts disallow the registration of markdown shortcuts. bool disable_markdown_shortcuts = 11; - // removed_completed_checklist_items removed completed checklist items. - bool removed_completed_checklist_items = 8; + // remove_done_check_items removed completed task list items. + bool remove_done_check_items = 12; } message GetWorkspaceSettingRequest { diff --git a/proto/gen/api/v1/workspace_setting_service.pb.go b/proto/gen/api/v1/workspace_setting_service.pb.go index 38f9b7bbf3c2d..5cfcc8898591c 100644 --- a/proto/gen/api/v1/workspace_setting_service.pb.go +++ b/proto/gen/api/v1/workspace_setting_service.pb.go @@ -468,6 +468,8 @@ type WorkspaceMemoRelatedSetting struct { Reactions []string `protobuf:"bytes,10,rep,name=reactions,proto3" json:"reactions,omitempty"` // disable_markdown_shortcuts disallow the registration of markdown shortcuts. DisableMarkdownShortcuts bool `protobuf:"varint,11,opt,name=disable_markdown_shortcuts,json=disableMarkdownShortcuts,proto3" json:"disable_markdown_shortcuts,omitempty"` + // remove_done_check_items removed completed task list items. + RemoveDoneCheckItems bool `protobuf:"varint,12,opt,name=remove_done_check_items,json=removeDoneCheckItems,proto3" json:"remove_done_check_items,omitempty"` } func (x *WorkspaceMemoRelatedSetting) Reset() { @@ -577,6 +579,13 @@ func (x *WorkspaceMemoRelatedSetting) GetDisableMarkdownShortcuts() bool { return false } +func (x *WorkspaceMemoRelatedSetting) GetRemoveDoneCheckItems() bool { + if x != nil { + return x.RemoveDoneCheckItems + } + return false +} + type GetWorkspaceSettingRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -852,7 +861,7 @@ var file_api_v1_workspace_setting_service_proto_rawDesc = []byte{ 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, 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, 0xba, 0x04, 0x0a, 0x1b, 0x57, 0x6f, + 0x02, 0x12, 0x06, 0x0a, 0x02, 0x53, 0x33, 0x10, 0x03, 0x22, 0xf1, 0x04, 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, 0x3c, 0x0a, 0x1a, 0x64, 0x69, 0x73, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x76, 0x69, 0x73, @@ -888,50 +897,53 @@ var file_api_v1_workspace_setting_service_proto_rawDesc = []byte{ 0x62, 0x6c, 0x65, 0x5f, 0x6d, 0x61, 0x72, 0x6b, 0x64, 0x6f, 0x77, 0x6e, 0x5f, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, 0x74, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x18, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x4d, 0x61, 0x72, 0x6b, 0x64, 0x6f, 0x77, 0x6e, 0x53, 0x68, 0x6f, - 0x72, 0x74, 0x63, 0x75, 0x74, 0x73, 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, + 0x72, 0x74, 0x63, 0x75, 0x74, 0x73, 0x12, 0x35, 0x0a, 0x17, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, + 0x5f, 0x64, 0x6f, 0x6e, 0x65, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x69, 0x74, 0x65, 0x6d, + 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x44, + 0x6f, 0x6e, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x73, 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, 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, + 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, - 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, + 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/apidocs.swagger.yaml b/proto/gen/apidocs.swagger.yaml index b12b1f90be286..86a6189126a9e 100644 --- a/proto/gen/apidocs.swagger.yaml +++ b/proto/gen/apidocs.swagger.yaml @@ -311,12 +311,16 @@ paths: type: integer format: int32 - name: pageToken - description: "A page token, received from a previous `ListMemos` call.\r\nProvide this to retrieve the subsequent page." + description: |- + A page token, received from a previous `ListMemos` call. + Provide this to retrieve the subsequent page. in: query required: false type: string - name: filter - description: "Filter is used to filter memos returned in the list.\r\nFormat: \"creator == 'users/{uid}' && visibilities == ['PUBLIC', 'PROTECTED']\"" + description: |- + Filter is used to filter memos returned in the list. + Format: "creator == 'users/{uid}' && visibilities == ['PUBLIC', 'PROTECTED']" in: query required: false type: string @@ -505,7 +509,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: filter - description: "Filter is used to filter users returned in the list.\r\nFormat: \"username == 'frank'\"" + description: |- + Filter is used to filter users returned in the list. + Format: "username == 'frank'" in: query required: false type: string @@ -666,7 +672,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The resource name of the workspace setting.\r\nFormat: settings/{setting}" + description: |- + The resource name of the workspace setting. + Format: settings/{setting} in: path required: true type: string @@ -688,7 +696,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: setting.name - description: "name is the name of the setting.\r\nFormat: settings/{setting}" + description: |- + name is the name of the setting. + Format: settings/{setting} in: path required: true type: string @@ -724,7 +734,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: identityProvider.name - description: "The name of the identityProvider.\r\nFormat: identityProviders/{id}" + description: |- + The name of the identityProvider. + Format: identityProviders/{id} in: path required: true type: string @@ -762,7 +774,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: inbox.name - description: "The name of the inbox.\r\nFormat: inboxes/{id}" + description: |- + The name of the inbox. + Format: inboxes/{id} in: path required: true type: string @@ -806,7 +820,10 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: memo.name - description: "The name of the memo.\r\nFormat: memos/{id}\r\nid is the system generated id." + description: |- + The name of the memo. + Format: memos/{id} + id is the system generated id. in: path required: true type: string @@ -824,7 +841,9 @@ paths: $ref: '#/definitions/v1RowStatus' creator: type: string - title: "The name of the creator.\r\nFormat: users/{id}" + title: |- + The name of the creator. + Format: users/{id} createTime: type: string format: date-time @@ -871,7 +890,9 @@ paths: readOnly: true parent: type: string - title: "The name of the parent memo.\r\nFormat: memos/{id}" + title: |- + The name of the parent memo. + Format: memos/{id} readOnly: true snippet: type: string @@ -897,7 +918,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name_1 - description: "The name of the user.\r\nFormat: users/{id}" + description: |- + The name of the user. + Format: users/{id} in: path required: true type: string @@ -919,7 +942,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name_1 - description: "The name of the identityProvider to delete.\r\nFormat: identityProviders/{id}" + description: |- + The name of the identityProvider to delete. + Format: identityProviders/{id} in: path required: true type: string @@ -941,7 +966,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name_2 - description: "The name of the identityProvider to get.\r\nFormat: identityProviders/{id}" + description: |- + The name of the identityProvider to get. + Format: identityProviders/{id} in: path required: true type: string @@ -963,7 +990,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name_2 - description: "The name of the inbox to delete.\r\nFormat: inboxes/{id}" + description: |- + The name of the inbox to delete. + Format: inboxes/{id} in: path required: true type: string @@ -985,7 +1014,10 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name_3 - description: "The name of the resource.\r\nFormat: resources/{id}\r\nid is the system generated unique identifier." + description: |- + The name of the resource. + Format: resources/{id} + id is the system generated unique identifier. in: path required: true type: string @@ -1007,7 +1039,10 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name_3 - description: "The name of the resource.\r\nFormat: resources/{id}\r\nid is the system generated unique identifier." + description: |- + The name of the resource. + Format: resources/{id} + id is the system generated unique identifier. in: path required: true type: string @@ -1029,7 +1064,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name_4 - description: "The name of the memo.\r\nFormat: memos/{id}" + description: |- + The name of the memo. + Format: memos/{id} in: path required: true type: string @@ -1051,7 +1088,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name_4 - description: "The name of the memo.\r\nFormat: memos/{id}" + description: |- + The name of the memo. + Format: memos/{id} in: path required: true type: string @@ -1073,7 +1112,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the activity.\r\nFormat: activities/{id}" + description: |- + The name of the activity. + Format: activities/{id} in: path required: true type: string @@ -1095,7 +1136,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the user.\r\nFormat: users/{id}" + description: |- + The name of the user. + Format: users/{id} in: path required: true type: string @@ -1117,7 +1160,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the user.\r\nFormat: users/{id}" + description: |- + The name of the user. + Format: users/{id} in: path required: true type: string @@ -1138,7 +1183,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the user.\r\nFormat: users/{id}" + description: |- + The name of the user. + Format: users/{id} in: path required: true type: string @@ -1166,7 +1213,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the user.\r\nFormat: users/{id}" + description: |- + The name of the user. + Format: users/{id} in: path required: true type: string @@ -1193,7 +1242,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the memo.\r\nFormat: memos/{id}" + description: |- + The name of the memo. + Format: memos/{id} in: path required: true type: string @@ -1214,7 +1265,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the memo.\r\nFormat: memos/{id}" + description: |- + The name of the memo. + Format: memos/{id} in: path required: true type: string @@ -1241,7 +1294,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the memo.\r\nFormat: memos/{id}" + description: |- + The name of the memo. + Format: memos/{id} in: path required: true type: string @@ -1262,7 +1317,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the memo.\r\nFormat: memos/{id}" + description: |- + The name of the memo. + Format: memos/{id} in: path required: true type: string @@ -1289,7 +1346,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the memo.\r\nFormat: memos/{id}" + description: |- + The name of the memo. + Format: memos/{id} in: path required: true type: string @@ -1311,7 +1370,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the memo.\r\nFormat: memos/{id}" + description: |- + The name of the memo. + Format: memos/{id} in: path required: true type: string @@ -1338,7 +1399,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the memo.\r\nFormat: memos/{id}" + description: |- + The name of the memo. + Format: memos/{id} in: path required: true type: string @@ -1360,7 +1423,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the memo.\r\nFormat: memos/{id}" + description: |- + The name of the memo. + Format: memos/{id} in: path required: true type: string @@ -1387,7 +1452,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the user.\r\nFormat: users/{id}" + description: |- + The name of the user. + Format: users/{id} in: path required: true type: string @@ -1410,7 +1477,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: parent - description: "The parent, who owns the tags.\r\nFormat: memos/{id}. Use \"memos/-\" to delete all tags." + description: |- + The parent, who owns the tags. + Format: memos/{id}. Use "memos/-" to delete all tags. in: path required: true type: string @@ -1441,7 +1510,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: parent - description: "The parent, who owns the tags.\r\nFormat: memos/{id}. Use \"memos/-\" to rename all tags." + description: |- + The parent, who owns the tags. + Format: memos/{id}. Use "memos/-" to rename all tags. in: path required: true type: string @@ -1468,7 +1539,10 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: resource.name - description: "The name of the resource.\r\nFormat: resources/{id}\r\nid is the system generated unique identifier." + description: |- + The name of the resource. + Format: resources/{id} + id is the system generated unique identifier. in: path required: true type: string @@ -1500,7 +1574,9 @@ paths: format: int64 memo: type: string - title: "The related memo.\r\nFormat: memos/{id}" + title: |- + The related memo. + Format: memos/{id} tags: - ResourceService /api/v1/{setting.name}: @@ -1518,7 +1594,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: setting.name - description: "The name of the user.\r\nFormat: users/{id}" + description: |- + The name of the user. + Format: users/{id} in: path required: true type: string @@ -1557,7 +1635,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: user.name - description: "The name of the user.\r\nFormat: users/{id}" + description: |- + The name of the user. + Format: users/{id} in: path required: true type: string @@ -1613,7 +1693,9 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the user.\r\nFormat: users/{id}" + description: |- + The name of the user. + Format: users/{id} in: path required: true type: string @@ -1646,7 +1728,10 @@ paths: $ref: '#/definitions/googlerpcStatus' parameters: - name: name - description: "The name of the resource.\r\nFormat: resources/{id}\r\nid is the system generated unique identifier." + description: |- + The name of the resource. + Format: resources/{id} + id is the system generated unique identifier. in: path required: true type: string @@ -1839,7 +1924,9 @@ definitions: properties: name: type: string - title: "The name of the identityProvider.\r\nFormat: identityProviders/{id}" + title: |- + The name of the identityProvider. + Format: identityProviders/{id} type: $ref: '#/definitions/apiv1IdentityProviderType' title: @@ -1875,7 +1962,10 @@ definitions: properties: name: type: string - description: "The name of the memo.\r\nFormat: memos/{id}\r\nid is the system generated id." + description: |- + The name of the memo. + Format: memos/{id} + id is the system generated id. uid: type: string description: The user defined id of the memo. @@ -1883,7 +1973,9 @@ definitions: $ref: '#/definitions/v1RowStatus' creator: type: string - title: "The name of the creator.\r\nFormat: users/{id}" + title: |- + The name of the creator. + Format: users/{id} createTime: type: string format: date-time @@ -1930,7 +2022,9 @@ definitions: readOnly: true parent: type: string - title: "The name of the parent memo.\r\nFormat: memos/{id}" + title: |- + The name of the parent memo. + Format: memos/{id} readOnly: true snippet: type: string @@ -1963,7 +2057,9 @@ definitions: properties: name: type: string - title: "The name of the user.\r\nFormat: users/{id}" + title: |- + The name of the user. + Format: users/{id} locale: type: string description: The preferred locale of the user. @@ -2007,7 +2103,10 @@ definitions: weekStartDayOffset: type: integer format: int32 - description: "week_start_day_offset is the week start day offset from Sunday.\r\n0: Sunday, 1: Monday, 2: Tuesday, 3: Wednesday, 4: Thursday, 5: Friday, 6: Saturday\r\nDefault is Sunday." + description: |- + week_start_day_offset is the week start day offset from Sunday. + 0: Sunday, 1: Monday, 2: Tuesday, 3: Wednesday, 4: Thursday, 5: Friday, 6: Saturday + Default is Sunday. disallowChangeUsername: type: boolean description: disallow_change_username disallows changing username. @@ -2053,12 +2152,17 @@ definitions: disableMarkdownShortcuts: type: boolean description: disable_markdown_shortcuts disallow the registration of markdown shortcuts. + removeDoneCheckItems: + type: boolean + description: remove_done_check_items removed completed task list items. apiv1WorkspaceSetting: type: object properties: name: type: string - title: "name is the name of the setting.\r\nFormat: settings/{setting}" + title: |- + name is the name of the setting. + Format: settings/{setting} generalSetting: $ref: '#/definitions/apiv1WorkspaceGeneralSetting' storageSetting: @@ -2073,7 +2177,9 @@ definitions: description: storage_type is the storage type. filepathTemplate: type: string - title: "The template of file path.\r\ne.g. assets/{timestamp}_{filename}" + title: |- + The template of file path. + e.g. assets/{timestamp}_{filename} uploadSizeLimitMb: type: string format: int64 @@ -2232,7 +2338,9 @@ definitions: properties: name: type: string - title: "The name of the activity.\r\nFormat: activities/{id}" + title: |- + The name of the activity. + Format: activities/{id} creatorId: type: integer format: int32 @@ -2375,7 +2483,9 @@ definitions: properties: name: type: string - title: "The name of the inbox.\r\nFormat: inboxes/{id}" + title: |- + The name of the inbox. + Format: inboxes/{id} sender: type: string title: 'Format: users/{id}' @@ -2449,7 +2559,9 @@ definitions: $ref: '#/definitions/v1Inbox' nextPageToken: type: string - description: "A token, which can be sent as `page_token` to retrieve the next page.\r\nIf this field is omitted, there are no subsequent pages." + description: |- + A token, which can be sent as `page_token` to retrieve the next page. + If this field is omitted, there are no subsequent pages. v1ListMemoCommentsResponse: type: object properties: @@ -2492,7 +2604,9 @@ definitions: $ref: '#/definitions/apiv1Memo' nextPageToken: type: string - description: "A token, which can be sent as `page_token` to retrieve the next page.\r\nIf this field is omitted, there are no subsequent pages." + description: |- + A token, which can be sent as `page_token` to retrieve the next page. + If this field is omitted, there are no subsequent pages. v1ListNode: type: object properties: @@ -2568,10 +2682,14 @@ definitions: properties: memo: $ref: '#/definitions/v1MemoRelationMemo' - title: "The name of memo.\r\nFormat: \"memos/{uid}\"" + title: |- + The name of memo. + Format: "memos/{uid}" relatedMemo: $ref: '#/definitions/v1MemoRelationMemo' - title: "The name of related memo.\r\nFormat: \"memos/{uid}\"" + title: |- + The name of related memo. + Format: "memos/{uid}" type: $ref: '#/definitions/v1MemoRelationType' v1MemoRelationMemo: @@ -2579,7 +2697,9 @@ definitions: properties: name: type: string - title: "The name of the memo.\r\nFormat: memos/{id}" + title: |- + The name of the memo. + Format: memos/{id} uid: type: string snippet: @@ -2753,7 +2873,9 @@ definitions: format: int32 creator: type: string - title: "The name of the creator.\r\nFormat: users/{id}" + title: |- + The name of the creator. + Format: users/{id} contentId: type: string reactionType: @@ -2770,7 +2892,10 @@ definitions: properties: name: type: string - description: "The name of the resource.\r\nFormat: resources/{id}\r\nid is the system generated unique identifier." + description: |- + The name of the resource. + Format: resources/{id} + id is the system generated unique identifier. uid: type: string description: The user defined id of the resource. @@ -2792,7 +2917,9 @@ definitions: format: int64 memo: type: string - title: "The related memo.\r\nFormat: memos/{id}" + title: |- + The related memo. + Format: memos/{id} v1RestoreMarkdownNodesRequest: type: object properties: @@ -2914,7 +3041,9 @@ definitions: properties: name: type: string - title: "The name of the user.\r\nFormat: users/{id}" + title: |- + The name of the user. + Format: users/{id} id: type: integer format: int32 @@ -2988,7 +3117,9 @@ definitions: properties: owner: type: string - title: "The name of instance owner.\r\nFormat: \"users/{id}\"" + title: |- + The name of instance owner. + Format: "users/{id}" version: type: string title: version is the current version of instance diff --git a/proto/gen/store/workspace_setting.pb.go b/proto/gen/store/workspace_setting.pb.go index 96ef453a9689b..921cdf1f83a3a 100644 --- a/proto/gen/store/workspace_setting.pb.go +++ b/proto/gen/store/workspace_setting.pb.go @@ -671,6 +671,8 @@ type WorkspaceMemoRelatedSetting struct { Reactions []string `protobuf:"bytes,10,rep,name=reactions,proto3" json:"reactions,omitempty"` // disable markdown shortcuts DisableMarkdownShortcuts bool `protobuf:"varint,11,opt,name=disable_markdown_shortcuts,json=disableMarkdownShortcuts,proto3" json:"disable_markdown_shortcuts,omitempty"` + // remove_done_check_items removed completed task list items. + RemoveDoneCheckItems bool `protobuf:"varint,12,opt,name=remove_done_check_items,json=removeDoneCheckItems,proto3" json:"remove_done_check_items,omitempty"` } func (x *WorkspaceMemoRelatedSetting) Reset() { @@ -780,6 +782,13 @@ func (x *WorkspaceMemoRelatedSetting) GetDisableMarkdownShortcuts() bool { return false } +func (x *WorkspaceMemoRelatedSetting) GetRemoveDoneCheckItems() bool { + if x != nil { + return x.RemoveDoneCheckItems + } + return false +} + var File_store_workspace_setting_proto protoreflect.FileDescriptor var file_store_workspace_setting_proto_rawDesc = []byte{ @@ -890,7 +899,7 @@ var file_store_workspace_setting_proto_rawDesc = []byte{ 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, 0xba, 0x04, 0x0a, 0x1b, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x4d, + 0x74, 0x22, 0xf1, 0x04, 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, 0x3c, 0x0a, 0x1a, 0x64, 0x69, 0x73, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x76, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x18, @@ -925,25 +934,29 @@ var file_store_workspace_setting_proto_rawDesc = []byte{ 0x12, 0x3c, 0x0a, 0x1a, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6d, 0x61, 0x72, 0x6b, 0x64, 0x6f, 0x77, 0x6e, 0x5f, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, 0x74, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x18, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x4d, 0x61, 0x72, - 0x6b, 0x64, 0x6f, 0x77, 0x6e, 0x53, 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, 0x74, 0x73, 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, 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, + 0x6b, 0x64, 0x6f, 0x77, 0x6e, 0x53, 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, 0x74, 0x73, 0x12, 0x35, + 0x0a, 0x17, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x64, 0x6f, 0x6e, 0x65, 0x5f, 0x63, 0x68, + 0x65, 0x63, 0x6b, 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x14, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x44, 0x6f, 0x6e, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, + 0x49, 0x74, 0x65, 0x6d, 0x73, 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, 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/store/workspace_setting.proto b/proto/store/workspace_setting.proto index 3b92fc4d87e01..2f2205da7a2e5 100644 --- a/proto/store/workspace_setting.proto +++ b/proto/store/workspace_setting.proto @@ -116,6 +116,6 @@ message WorkspaceMemoRelatedSetting { repeated string reactions = 10; // disable markdown shortcuts bool disable_markdown_shortcuts = 11; - // removed_completed_checklist_items removed completed checklist items. - bool removed_completed_checklist_items = 8; + // remove_done_check_items removed completed task list items. + bool remove_done_check_items = 12; } diff --git a/server/router/api/v1/workspace_setting_service.go b/server/router/api/v1/workspace_setting_service.go index 13567b6a3cd29..b48425a36545c 100644 --- a/server/router/api/v1/workspace_setting_service.go +++ b/server/router/api/v1/workspace_setting_service.go @@ -238,7 +238,7 @@ func convertWorkspaceMemoRelatedSettingFromStore(setting *storepb.WorkspaceMemoR DefaultVisibility: setting.DefaultVisibility, Reactions: setting.Reactions, DisableMarkdownShortcuts: setting.DisableMarkdownShortcuts, - RemovedCompletedChecklistItems: setting.RemovedCompletedChecklistItems, + RemoveDoneCheckItems: setting.RemoveDoneCheckItems, } } @@ -258,6 +258,6 @@ func convertWorkspaceMemoRelatedSettingToStore(setting *v1pb.WorkspaceMemoRelate DefaultVisibility: setting.DefaultVisibility, Reactions: setting.Reactions, DisableMarkdownShortcuts: setting.DisableMarkdownShortcuts, - RemovedCompletedChecklistItems: setting.RemovedCompletedChecklistItems, + RemoveDoneCheckItems: setting.RemoveDoneCheckItems, } } diff --git a/web/src/components/MemoActionMenu.tsx b/web/src/components/MemoActionMenu.tsx index 16ef31d8a2c95..1f6622252bab8 100644 --- a/web/src/components/MemoActionMenu.tsx +++ b/web/src/components/MemoActionMenu.tsx @@ -25,7 +25,7 @@ import { NodeType } from "@/types/proto/api/v1/markdown_service"; interface Props { memo: Memo; className?: string; - hiddenActions?: ("edit" | "archive" | "delete" | "share" | "pin" | "remove_completed_checklist")[]; + hiddenActions?: ("edit" | "archive" | "delete" | "share" | "pin" | "remove_completed_task_list")[]; onEdit?: () => void; } @@ -116,17 +116,25 @@ const MemoActionMenu = (props: Props) => { } }; - const handleRemoveCompletedChecklistItemsClick = async () => { - const confirmed = window.confirm(t("memo.remove-completed-checklist-items-confirm")); + const handleRemoveCompletedTaskListItemsClick = async () => { + const confirmed = window.confirm(t("memo.remove-completed-task-list-items-confirm")); if (confirmed) { const newNodes = memo.nodes; for (var i = 0; i < newNodes.length; i++) { - if (newNodes[i].type === NodeType.TASK_LIST && newNodes[i].taskListNode?.complete) { - newNodes.splice(i, 1); - i--; - if (newNodes[i]?.type === NodeType.LINE_BREAK) { - newNodes.splice(i, 1); - i--; + if (newNodes[i].type === NodeType.LIST && newNodes[i].listNode?.children?.length > 0) { + let childrenLength = newNodes[i].listNode.children.length; + for (var j = 0; j < childrenLength; j++) { + if (newNodes[i].listNode.children[j].type === NodeType.TASK_LIST_ITEM + && newNodes[i].listNode.children[j].taskListItemNode?.complete) { + // Remove completed taskList item and next line breaks + newNodes[i].listNode.children.splice(j, 1); + if (newNodes[i].listNode.children[j]?.type === NodeType.LINE_BREAK) { + newNodes[i].listNode.children.splice(j, 1); + childrenLength--; + } + childrenLength--; + j--; + } } } } @@ -138,7 +146,7 @@ const MemoActionMenu = (props: Props) => { }, ["content"], ); - toast.success(t("message.remove-completed-checklist-items-successfully")); + toast.success(t("message.remove-completed-task-list-items-successfully")); if (isInMemoDetailPage) { navigateTo("/"); } @@ -175,10 +183,10 @@ const MemoActionMenu = (props: Props) => { {memo.rowStatus === RowStatus.ARCHIVED ? : } {memo.rowStatus === RowStatus.ARCHIVED ? t("common.restore") : t("common.archive")} - {!hiddenActions?.includes("remove_completed_checklist") && ( - + {!hiddenActions?.includes("remove_completed_task_list") && ( + - {t("memo.remove-completed-checklist-items")} + {t("memo.remove-completed-task-list-items")} )} diff --git a/web/src/components/MemoView.tsx b/web/src/components/MemoView.tsx index edd57bade6101..a8cd226d4eb91 100644 --- a/web/src/components/MemoView.tsx +++ b/web/src/components/MemoView.tsx @@ -116,12 +116,12 @@ const MemoView: React.FC = (props: Props) => { ); const handleHiddenActions = () => { - const hiddenActions: ("edit" | "archive" | "delete" | "share" | "pin" | "remove_completed_checklist")[] = []; + const hiddenActions: ("edit" | "archive" | "delete" | "share" | "pin" | "remove_completed_task_list")[] = []; if (!props.showPinned) { hiddenActions.push("pin"); } - if (!workspaceMemoRelatedSetting.removedCompletedChecklistItems) { - hiddenActions.push("remove_completed_checklist"); + if (!workspaceMemoRelatedSetting.removeDoneCheckItems) { + hiddenActions.push("remove_completed_task_list"); } return hiddenActions; }; diff --git a/web/src/components/Settings/MemoRelatedSettings.tsx b/web/src/components/Settings/MemoRelatedSettings.tsx index cb624cd7ffa36..b575e7e1562b3 100644 --- a/web/src/components/Settings/MemoRelatedSettings.tsx +++ b/web/src/components/Settings/MemoRelatedSettings.tsx @@ -116,6 +116,13 @@ const MemoRelatedSettings = () => { onChange={(event) => updatePartialSetting({ disableMarkdownShortcuts: event.target.checked })} />
+
+ {t("setting.system-section.removed-completed-task-list-items")} + updatePartialSetting({ removeDoneCheckItems: event.target.checked })} + /> +
{t("setting.memo-related-settings.content-lenght-limit")} Date: Thu, 14 Nov 2024 15:47:12 +0800 Subject: [PATCH 08/10] remove remove_done_check_items setting --- proto/api/v1/workspace_setting_service.proto | 2 - .../api/v1/workspace_setting_service.pb.go | 98 ++++++++----------- proto/gen/apidocs.swagger.yaml | 3 - proto/gen/store/workspace_setting.pb.go | 53 ++++------ proto/store/workspace_setting.proto | 2 - .../api/v1/workspace_setting_service.go | 2 - web/src/components/MemoActionMenu.tsx | 5 +- web/src/components/MemoView.tsx | 19 +++- .../Settings/MemoRelatedSettings.tsx | 7 -- 9 files changed, 82 insertions(+), 109 deletions(-) diff --git a/proto/api/v1/workspace_setting_service.proto b/proto/api/v1/workspace_setting_service.proto index ca22c88596566..4e05bc9e92d7d 100644 --- a/proto/api/v1/workspace_setting_service.proto +++ b/proto/api/v1/workspace_setting_service.proto @@ -117,8 +117,6 @@ message WorkspaceMemoRelatedSetting { repeated string reactions = 10; // disable_markdown_shortcuts disallow the registration of markdown shortcuts. bool disable_markdown_shortcuts = 11; - // remove_done_check_items removed completed task list items. - bool remove_done_check_items = 12; } message GetWorkspaceSettingRequest { diff --git a/proto/gen/api/v1/workspace_setting_service.pb.go b/proto/gen/api/v1/workspace_setting_service.pb.go index 5cfcc8898591c..38f9b7bbf3c2d 100644 --- a/proto/gen/api/v1/workspace_setting_service.pb.go +++ b/proto/gen/api/v1/workspace_setting_service.pb.go @@ -468,8 +468,6 @@ type WorkspaceMemoRelatedSetting struct { Reactions []string `protobuf:"bytes,10,rep,name=reactions,proto3" json:"reactions,omitempty"` // disable_markdown_shortcuts disallow the registration of markdown shortcuts. DisableMarkdownShortcuts bool `protobuf:"varint,11,opt,name=disable_markdown_shortcuts,json=disableMarkdownShortcuts,proto3" json:"disable_markdown_shortcuts,omitempty"` - // remove_done_check_items removed completed task list items. - RemoveDoneCheckItems bool `protobuf:"varint,12,opt,name=remove_done_check_items,json=removeDoneCheckItems,proto3" json:"remove_done_check_items,omitempty"` } func (x *WorkspaceMemoRelatedSetting) Reset() { @@ -579,13 +577,6 @@ func (x *WorkspaceMemoRelatedSetting) GetDisableMarkdownShortcuts() bool { return false } -func (x *WorkspaceMemoRelatedSetting) GetRemoveDoneCheckItems() bool { - if x != nil { - return x.RemoveDoneCheckItems - } - return false -} - type GetWorkspaceSettingRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -861,7 +852,7 @@ var file_api_v1_workspace_setting_service_proto_rawDesc = []byte{ 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, 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, 0xf1, 0x04, 0x0a, 0x1b, 0x57, 0x6f, + 0x02, 0x12, 0x06, 0x0a, 0x02, 0x53, 0x33, 0x10, 0x03, 0x22, 0xba, 0x04, 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, 0x3c, 0x0a, 0x1a, 0x64, 0x69, 0x73, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x76, 0x69, 0x73, @@ -897,53 +888,50 @@ var file_api_v1_workspace_setting_service_proto_rawDesc = []byte{ 0x62, 0x6c, 0x65, 0x5f, 0x6d, 0x61, 0x72, 0x6b, 0x64, 0x6f, 0x77, 0x6e, 0x5f, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, 0x74, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x18, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x4d, 0x61, 0x72, 0x6b, 0x64, 0x6f, 0x77, 0x6e, 0x53, 0x68, 0x6f, - 0x72, 0x74, 0x63, 0x75, 0x74, 0x73, 0x12, 0x35, 0x0a, 0x17, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, - 0x5f, 0x64, 0x6f, 0x6e, 0x65, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x69, 0x74, 0x65, 0x6d, - 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x44, - 0x6f, 0x6e, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x73, 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, + 0x72, 0x74, 0x63, 0x75, 0x74, 0x73, 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, + 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, - 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, + 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/apidocs.swagger.yaml b/proto/gen/apidocs.swagger.yaml index 86a6189126a9e..e2fade861c5ce 100644 --- a/proto/gen/apidocs.swagger.yaml +++ b/proto/gen/apidocs.swagger.yaml @@ -2152,9 +2152,6 @@ definitions: disableMarkdownShortcuts: type: boolean description: disable_markdown_shortcuts disallow the registration of markdown shortcuts. - removeDoneCheckItems: - type: boolean - description: remove_done_check_items removed completed task list items. apiv1WorkspaceSetting: type: object properties: diff --git a/proto/gen/store/workspace_setting.pb.go b/proto/gen/store/workspace_setting.pb.go index 921cdf1f83a3a..96ef453a9689b 100644 --- a/proto/gen/store/workspace_setting.pb.go +++ b/proto/gen/store/workspace_setting.pb.go @@ -671,8 +671,6 @@ type WorkspaceMemoRelatedSetting struct { Reactions []string `protobuf:"bytes,10,rep,name=reactions,proto3" json:"reactions,omitempty"` // disable markdown shortcuts DisableMarkdownShortcuts bool `protobuf:"varint,11,opt,name=disable_markdown_shortcuts,json=disableMarkdownShortcuts,proto3" json:"disable_markdown_shortcuts,omitempty"` - // remove_done_check_items removed completed task list items. - RemoveDoneCheckItems bool `protobuf:"varint,12,opt,name=remove_done_check_items,json=removeDoneCheckItems,proto3" json:"remove_done_check_items,omitempty"` } func (x *WorkspaceMemoRelatedSetting) Reset() { @@ -782,13 +780,6 @@ func (x *WorkspaceMemoRelatedSetting) GetDisableMarkdownShortcuts() bool { return false } -func (x *WorkspaceMemoRelatedSetting) GetRemoveDoneCheckItems() bool { - if x != nil { - return x.RemoveDoneCheckItems - } - return false -} - var File_store_workspace_setting_proto protoreflect.FileDescriptor var file_store_workspace_setting_proto_rawDesc = []byte{ @@ -899,7 +890,7 @@ var file_store_workspace_setting_proto_rawDesc = []byte{ 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, 0xf1, 0x04, 0x0a, 0x1b, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x4d, + 0x74, 0x22, 0xba, 0x04, 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, 0x3c, 0x0a, 0x1a, 0x64, 0x69, 0x73, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x76, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x18, @@ -934,29 +925,25 @@ var file_store_workspace_setting_proto_rawDesc = []byte{ 0x12, 0x3c, 0x0a, 0x1a, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6d, 0x61, 0x72, 0x6b, 0x64, 0x6f, 0x77, 0x6e, 0x5f, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, 0x74, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x18, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x4d, 0x61, 0x72, - 0x6b, 0x64, 0x6f, 0x77, 0x6e, 0x53, 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, 0x74, 0x73, 0x12, 0x35, - 0x0a, 0x17, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x64, 0x6f, 0x6e, 0x65, 0x5f, 0x63, 0x68, - 0x65, 0x63, 0x6b, 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x14, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x44, 0x6f, 0x6e, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, - 0x49, 0x74, 0x65, 0x6d, 0x73, 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, 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, + 0x6b, 0x64, 0x6f, 0x77, 0x6e, 0x53, 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, 0x74, 0x73, 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, 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/store/workspace_setting.proto b/proto/store/workspace_setting.proto index 2f2205da7a2e5..445088eedbbd2 100644 --- a/proto/store/workspace_setting.proto +++ b/proto/store/workspace_setting.proto @@ -116,6 +116,4 @@ message WorkspaceMemoRelatedSetting { repeated string reactions = 10; // disable markdown shortcuts bool disable_markdown_shortcuts = 11; - // remove_done_check_items removed completed task list items. - bool remove_done_check_items = 12; } diff --git a/server/router/api/v1/workspace_setting_service.go b/server/router/api/v1/workspace_setting_service.go index b48425a36545c..a7ba4bb440f1f 100644 --- a/server/router/api/v1/workspace_setting_service.go +++ b/server/router/api/v1/workspace_setting_service.go @@ -238,7 +238,6 @@ func convertWorkspaceMemoRelatedSettingFromStore(setting *storepb.WorkspaceMemoR DefaultVisibility: setting.DefaultVisibility, Reactions: setting.Reactions, DisableMarkdownShortcuts: setting.DisableMarkdownShortcuts, - RemoveDoneCheckItems: setting.RemoveDoneCheckItems, } } @@ -258,6 +257,5 @@ func convertWorkspaceMemoRelatedSettingToStore(setting *v1pb.WorkspaceMemoRelate DefaultVisibility: setting.DefaultVisibility, Reactions: setting.Reactions, DisableMarkdownShortcuts: setting.DisableMarkdownShortcuts, - RemoveDoneCheckItems: setting.RemoveDoneCheckItems, } } diff --git a/web/src/components/MemoActionMenu.tsx b/web/src/components/MemoActionMenu.tsx index 1f6622252bab8..68d77d5d06a67 100644 --- a/web/src/components/MemoActionMenu.tsx +++ b/web/src/components/MemoActionMenu.tsx @@ -119,7 +119,7 @@ const MemoActionMenu = (props: Props) => { const handleRemoveCompletedTaskListItemsClick = async () => { const confirmed = window.confirm(t("memo.remove-completed-task-list-items-confirm")); if (confirmed) { - const newNodes = memo.nodes; + const newNodes = JSON.parse(JSON.stringify(memo.nodes)); for (var i = 0; i < newNodes.length; i++) { if (newNodes[i].type === NodeType.LIST && newNodes[i].listNode?.children?.length > 0) { let childrenLength = newNodes[i].listNode.children.length; @@ -147,9 +147,6 @@ const MemoActionMenu = (props: Props) => { ["content"], ); toast.success(t("message.remove-completed-task-list-items-successfully")); - if (isInMemoDetailPage) { - navigateTo("/"); - } } }; diff --git a/web/src/components/MemoView.tsx b/web/src/components/MemoView.tsx index a8cd226d4eb91..36a7e59c5e57b 100644 --- a/web/src/components/MemoView.tsx +++ b/web/src/components/MemoView.tsx @@ -25,6 +25,7 @@ import showPreviewImageDialog from "./PreviewImageDialog"; import ReactionSelector from "./ReactionSelector"; import UserAvatar from "./UserAvatar"; import VisibilityIcon from "./VisibilityIcon"; +import { NodeType } from "@/types/proto/api/v1/markdown_service"; interface Props { memo: Memo; @@ -120,7 +121,23 @@ const MemoView: React.FC = (props: Props) => { if (!props.showPinned) { hiddenActions.push("pin"); } - if (!workspaceMemoRelatedSetting.removeDoneCheckItems) { + // check if the content has done tasks + let hasCompletedTaskList = false; + for (var i = 0; i < memo.nodes.length; i++) { + if (hasCompletedTaskList) { + break; + } + if (memo.nodes[i].type === NodeType.LIST && memo.nodes[i].listNode?.children?.length > 0) { + for (var j = 0; j < memo.nodes[i].listNode.children.length; j++) { + if (memo.nodes[i].listNode.children[j].type === NodeType.TASK_LIST_ITEM + && memo.nodes[i].listNode.children[j].taskListItemNode?.complete) { + hasCompletedTaskList = true; + break; + } + } + } + } + if (!hasCompletedTaskList) { hiddenActions.push("remove_completed_task_list"); } return hiddenActions; diff --git a/web/src/components/Settings/MemoRelatedSettings.tsx b/web/src/components/Settings/MemoRelatedSettings.tsx index b575e7e1562b3..cb624cd7ffa36 100644 --- a/web/src/components/Settings/MemoRelatedSettings.tsx +++ b/web/src/components/Settings/MemoRelatedSettings.tsx @@ -116,13 +116,6 @@ const MemoRelatedSettings = () => { onChange={(event) => updatePartialSetting({ disableMarkdownShortcuts: event.target.checked })} />
-
- {t("setting.system-section.removed-completed-task-list-items")} - updatePartialSetting({ removeDoneCheckItems: event.target.checked })} - /> -
{t("setting.memo-related-settings.content-lenght-limit")} Date: Fri, 15 Nov 2024 10:37:31 +0800 Subject: [PATCH 09/10] fix the static checks --- web/src/components/MemoActionMenu.tsx | 14 ++++++++------ web/src/components/MemoView.tsx | 19 ++++++++----------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/web/src/components/MemoActionMenu.tsx b/web/src/components/MemoActionMenu.tsx index 68d77d5d06a67..cf9ae8745295b 100644 --- a/web/src/components/MemoActionMenu.tsx +++ b/web/src/components/MemoActionMenu.tsx @@ -14,13 +14,13 @@ import { } from "lucide-react"; import toast from "react-hot-toast"; import { useLocation } from "react-router-dom"; +import { markdownServiceClient } from "@/grpcweb"; import useNavigateTo from "@/hooks/useNavigateTo"; import { useMemoStore } from "@/store/v1"; import { RowStatus } from "@/types/proto/api/v1/common"; +import { NodeType } from "@/types/proto/api/v1/markdown_service"; import { Memo } from "@/types/proto/api/v1/memo_service"; import { useTranslate } from "@/utils/i18n"; -import { markdownServiceClient } from "@/grpcweb"; -import { NodeType } from "@/types/proto/api/v1/markdown_service"; interface Props { memo: Memo; @@ -120,12 +120,14 @@ const MemoActionMenu = (props: Props) => { const confirmed = window.confirm(t("memo.remove-completed-task-list-items-confirm")); if (confirmed) { const newNodes = JSON.parse(JSON.stringify(memo.nodes)); - for (var i = 0; i < newNodes.length; i++) { + for (let i = 0; i < newNodes.length; i++) { if (newNodes[i].type === NodeType.LIST && newNodes[i].listNode?.children?.length > 0) { let childrenLength = newNodes[i].listNode.children.length; - for (var j = 0; j < childrenLength; j++) { - if (newNodes[i].listNode.children[j].type === NodeType.TASK_LIST_ITEM - && newNodes[i].listNode.children[j].taskListItemNode?.complete) { + for (let j = 0; j < childrenLength; j++) { + if ( + newNodes[i].listNode.children[j].type === NodeType.TASK_LIST_ITEM && + newNodes[i].listNode.children[j].taskListItemNode?.complete + ) { // Remove completed taskList item and next line breaks newNodes[i].listNode.children.splice(j, 1); if (newNodes[i].listNode.children[j]?.type === NodeType.LINE_BREAK) { diff --git a/web/src/components/MemoView.tsx b/web/src/components/MemoView.tsx index 36a7e59c5e57b..e6fc38611fdf1 100644 --- a/web/src/components/MemoView.tsx +++ b/web/src/components/MemoView.tsx @@ -7,6 +7,7 @@ import useAsyncEffect from "@/hooks/useAsyncEffect"; import useCurrentUser from "@/hooks/useCurrentUser"; import useNavigateTo from "@/hooks/useNavigateTo"; import { useUserStore, useWorkspaceSettingStore, useMemoStore } from "@/store/v1"; +import { NodeType } from "@/types/proto/api/v1/markdown_service"; import { MemoRelation_Type } from "@/types/proto/api/v1/memo_relation_service"; import { Memo, Visibility } from "@/types/proto/api/v1/memo_service"; import { WorkspaceMemoRelatedSetting } from "@/types/proto/api/v1/workspace_setting_service"; @@ -25,7 +26,6 @@ import showPreviewImageDialog from "./PreviewImageDialog"; import ReactionSelector from "./ReactionSelector"; import UserAvatar from "./UserAvatar"; import VisibilityIcon from "./VisibilityIcon"; -import { NodeType } from "@/types/proto/api/v1/markdown_service"; interface Props { memo: Memo; @@ -123,14 +123,16 @@ const MemoView: React.FC = (props: Props) => { } // check if the content has done tasks let hasCompletedTaskList = false; - for (var i = 0; i < memo.nodes.length; i++) { + for (let i = 0; i < memo.nodes.length; i++) { if (hasCompletedTaskList) { break; } if (memo.nodes[i].type === NodeType.LIST && memo.nodes[i].listNode?.children?.length > 0) { - for (var j = 0; j < memo.nodes[i].listNode.children.length; j++) { - if (memo.nodes[i].listNode.children[j].type === NodeType.TASK_LIST_ITEM - && memo.nodes[i].listNode.children[j].taskListItemNode?.complete) { + for (let j = 0; j < memo.nodes[i].listNode.children.length; j++) { + if ( + memo.nodes[i].listNode.children[j].type === NodeType.TASK_LIST_ITEM && + memo.nodes[i].listNode.children[j].taskListItemNode?.complete + ) { hasCompletedTaskList = true; break; } @@ -227,12 +229,7 @@ const MemoView: React.FC = (props: Props) => { )} {!readonly && ( - setShowEditor(true)} - /> + setShowEditor(true)} /> )}
From 73e69b72e38e250173f925625448186700bf31e4 Mon Sep 17 00:00:00 2001 From: mozhu Date: Fri, 15 Nov 2024 10:47:49 +0800 Subject: [PATCH 10/10] fix the static checks --- web/src/components/MemoView.tsx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/web/src/components/MemoView.tsx b/web/src/components/MemoView.tsx index e6fc38611fdf1..840e097b49c54 100644 --- a/web/src/components/MemoView.tsx +++ b/web/src/components/MemoView.tsx @@ -123,15 +123,16 @@ const MemoView: React.FC = (props: Props) => { } // check if the content has done tasks let hasCompletedTaskList = false; - for (let i = 0; i < memo.nodes.length; i++) { + const newNodes = JSON.parse(JSON.stringify(memo.nodes)); + for (let i = 0; i < newNodes.length; i++) { if (hasCompletedTaskList) { break; } - if (memo.nodes[i].type === NodeType.LIST && memo.nodes[i].listNode?.children?.length > 0) { - for (let j = 0; j < memo.nodes[i].listNode.children.length; j++) { + if (newNodes[i].type === NodeType.LIST && newNodes[i].listNode?.children?.length > 0) { + for (let j = 0; j < newNodes[i].listNode.children.length; j++) { if ( - memo.nodes[i].listNode.children[j].type === NodeType.TASK_LIST_ITEM && - memo.nodes[i].listNode.children[j].taskListItemNode?.complete + newNodes[i].listNode.children[j].type === NodeType.TASK_LIST_ITEM && + newNodes[i].listNode.children[j].taskListItemNode?.complete ) { hasCompletedTaskList = true; break;