From 4e8b262d6d739b6fc6979ece398a481c86331c0c Mon Sep 17 00:00:00 2001 From: Johnny Date: Sun, 9 Aug 2026 20:27:27 +0800 Subject: [PATCH] refactor(memo-views): replace shortcuts with saved views (#6167) --- internal/filter/engine_test.go | 55 +- internal/filter/render.go | 21 +- proto/api/v1/memo_view_service.proto | 127 +++++ proto/api/v1/shortcut_service.proto | 127 ----- .../apiv1connect/memo_view_service.connect.go | 240 ++++++++ .../apiv1connect/shortcut_service.connect.go | 240 -------- proto/gen/api/v1/attachment_service.pb.gw.go | 30 +- proto/gen/api/v1/idp_service.pb.gw.go | 24 +- proto/gen/api/v1/instance_service.pb.gw.go | 12 +- proto/gen/api/v1/memo_service.pb.gw.go | 114 ++-- proto/gen/api/v1/memo_view_service.pb.go | 498 +++++++++++++++++ ...ce.pb.gw.go => memo_view_service.pb.gw.go} | 368 ++++++------- proto/gen/api/v1/memo_view_service_grpc.pb.go | 288 ++++++++++ proto/gen/api/v1/shortcut_service.pb.go | 497 ----------------- proto/gen/api/v1/shortcut_service_grpc.pb.go | 288 ---------- proto/gen/api/v1/user_service.pb.gw.go | 150 ++--- proto/gen/openapi.yaml | 119 ++-- proto/gen/store/user_setting.pb.go | 99 ++-- proto/store/user_setting.proto | 12 +- server/router/api/v1/acl_config_test.go | 11 +- server/router/api/v1/attachment_service.go | 12 +- server/router/api/v1/connect_handler.go | 2 +- server/router/api/v1/connect_services.go | 27 +- server/router/api/v1/memo_view_service.go | 250 +++++++++ server/router/api/v1/shortcut_service.go | 360 ------------ ...vice_test.go => memo_view_service_test.go} | 512 +++++++++++------- .../api/v1/test/user_resource_name_test.go | 4 +- .../router/api/v1/test/user_setting_test.go | 6 +- .../router/api/v1/user_service_converters.go | 4 +- server/router/api/v1/v1.go | 4 +- server/router/mcp/README.md | 4 +- server/router/mcp/adapter_test.go | 10 +- server/router/mcp/catalog.go | 4 +- server/router/mcp/catalog_test.go | 6 +- server/router/mcp/evals/README.md | 4 +- server/router/mcp/evals/memos_eval.xml | 2 +- .../00__rename_shortcuts_to_memo_views.sql | 26 + .../00__rename_shortcuts_to_memo_views.sql | 28 + .../00__rename_shortcuts_to_memo_views.sql | 22 + store/store.go | 1 + store/test/migrator_test.go | 122 ++++- store/test/user_setting_test.go | 195 ++++--- store/user_setting.go | 153 +++++- .../ActivityCalendar/MonthCalendar.tsx | 2 +- web/src/components/AppSidebar/AppSidebar.tsx | 241 ++++----- .../components/AppSidebar/QuickFindDialog.tsx | 16 +- web/src/components/AppSidebar/SidebarRow.tsx | 9 +- .../components/AppSidebar/SidebarSection.tsx | 26 + .../AppSidebar/SidebarSectionHeader.tsx | 4 +- web/src/components/AppSidebar/TagsSection.tsx | 71 ++- web/src/components/AppSidebar/routes.ts | 4 +- .../MemoDetailSidebar/MemoDetailSidebar.tsx | 25 +- .../MemoDetailSidebar/MemoOutline.tsx | 6 +- web/src/components/MemoDisplaySettingMenu.tsx | 7 +- .../PagedMemoList/PagedMemoList.tsx | 2 +- .../StatisticsView/MonthNavigator.tsx | 18 +- .../StatisticsView/StatisticsView.tsx | 2 +- web/src/components/ui/dropdown-menu.tsx | 114 ++-- web/src/connect.ts | 4 +- web/src/contexts/AuthContext.tsx | 61 +-- web/src/contexts/MemoFilterContext.tsx | 22 +- web/src/hooks/useMemoFilters.ts | 44 +- web/src/hooks/useUserQueries.ts | 23 +- web/src/lib/memo-views.ts | 2 +- web/src/lib/utils.ts | 12 +- web/src/locales/ar.json | 10 +- web/src/locales/bg.json | 10 +- web/src/locales/ca.json | 10 +- web/src/locales/cs.json | 10 +- web/src/locales/da.json | 10 +- web/src/locales/de.json | 10 +- web/src/locales/el.json | 10 +- web/src/locales/en-GB.json | 10 +- web/src/locales/en.json | 9 +- web/src/locales/es.json | 10 +- web/src/locales/et.json | 10 +- web/src/locales/fa.json | 10 +- web/src/locales/fi.json | 10 +- web/src/locales/fr.json | 10 +- web/src/locales/gl.json | 10 +- web/src/locales/hi.json | 10 +- web/src/locales/hr.json | 10 +- web/src/locales/hu.json | 10 +- web/src/locales/id.json | 10 +- web/src/locales/it.json | 10 +- web/src/locales/ja.json | 9 +- web/src/locales/ka-GE.json | 10 +- web/src/locales/ko.json | 10 +- web/src/locales/lt.json | 10 +- web/src/locales/lv.json | 10 +- web/src/locales/mr.json | 10 +- web/src/locales/nb.json | 10 +- web/src/locales/nl.json | 10 +- web/src/locales/pl.json | 10 +- web/src/locales/pt-BR.json | 10 +- web/src/locales/pt-PT.json | 10 +- web/src/locales/ro.json | 10 +- web/src/locales/ru.json | 10 +- web/src/locales/sk.json | 10 +- web/src/locales/sl.json | 10 +- web/src/locales/sr.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-Hans.json | 9 +- web/src/locales/zh-Hant.json | 9 +- web/src/pages/Archived.tsx | 2 +- web/src/pages/Explore.tsx | 2 +- web/src/pages/Home.tsx | 2 +- .../pages/{Shortcuts.tsx => MemoViews.tsx} | 186 +++---- web/src/pages/UserProfile.tsx | 2 +- web/src/router/index.tsx | 4 +- web/src/router/routes.ts | 2 +- web/src/themes/default.css | 6 + .../proto/api/v1/memo_view_service_pb.ts | 253 +++++++++ .../types/proto/api/v1/shortcut_service_pb.ts | 253 --------- web/tests/app-sidebar-logo.test.tsx | 70 ++- web/tests/app-sidebar-routes.test.ts | 2 +- .../auth-context-initialization.test.tsx | 14 +- web/tests/dropdown-menu-size.test.tsx | 28 + web/tests/memo-display-setting-menu.test.tsx | 7 +- web/tests/memo-filter-context.test.tsx | 8 +- web/tests/memo-view-locales.test.ts | 24 + web/tests/memo-views.test.ts | 12 +- web/tests/month-navigator.test.tsx | 5 +- web/tests/query-deduplication.test.tsx | 30 +- web/tests/router-config.test.tsx | 4 +- web/tests/sidebar-row-grammar.test.tsx | 12 + web/tests/tags-section.test.tsx | 48 ++ 131 files changed, 3954 insertions(+), 3241 deletions(-) create mode 100644 proto/api/v1/memo_view_service.proto delete mode 100644 proto/api/v1/shortcut_service.proto create mode 100644 proto/gen/api/v1/apiv1connect/memo_view_service.connect.go delete mode 100644 proto/gen/api/v1/apiv1connect/shortcut_service.connect.go create mode 100644 proto/gen/api/v1/memo_view_service.pb.go rename proto/gen/api/v1/{shortcut_service.pb.gw.go => memo_view_service.pb.gw.go} (65%) create mode 100644 proto/gen/api/v1/memo_view_service_grpc.pb.go delete mode 100644 proto/gen/api/v1/shortcut_service.pb.go delete mode 100644 proto/gen/api/v1/shortcut_service_grpc.pb.go create mode 100644 server/router/api/v1/memo_view_service.go delete mode 100644 server/router/api/v1/shortcut_service.go rename server/router/api/v1/test/{shortcut_service_test.go => memo_view_service_test.go} (52%) create mode 100644 store/migration/mysql/0.31/00__rename_shortcuts_to_memo_views.sql create mode 100644 store/migration/postgres/0.31/00__rename_shortcuts_to_memo_views.sql create mode 100644 store/migration/sqlite/0.31/00__rename_shortcuts_to_memo_views.sql create mode 100644 web/src/components/AppSidebar/SidebarSection.tsx rename web/src/pages/{Shortcuts.tsx => MemoViews.tsx} (77%) create mode 100644 web/src/types/proto/api/v1/memo_view_service_pb.ts delete mode 100644 web/src/types/proto/api/v1/shortcut_service_pb.ts create mode 100644 web/tests/dropdown-menu-size.test.tsx create mode 100644 web/tests/memo-view-locales.test.ts create mode 100644 web/tests/tags-section.test.tsx diff --git a/internal/filter/engine_test.go b/internal/filter/engine_test.go index ed870594..42c03858 100644 --- a/internal/filter/engine_test.go +++ b/internal/filter/engine_test.go @@ -188,13 +188,17 @@ func TestRenderTagStringPredicatesAreExactPerDialect(t *testing.T) { {name: "contains", expression: `t.contains("Work_%!")`, sqliteSQL: "instr(tag_item.value, ?) > 0", sqliteArgs: []any{"Work_%!"}, likePattern: "%Work!_!%!!%", usesLike: true}, } + // MySQL cannot use EXISTS here: its semi-join rewrite drops JSON_TABLE's lateral + // dependency on the outer row, so it counts rows instead. See + // TestTagComprehensionAvoidsMySQLExistsSemiJoin. for _, comprehension := range []struct { kind string sqlFragment string + mysqlSQL string }{ - {kind: "exists", sqlFragment: "EXISTS (SELECT 1"}, - {kind: "all", sqlFragment: "NOT EXISTS (SELECT 1"}, - {kind: "exists_one", sqlFragment: "SELECT COUNT(*)"}, + {kind: "exists", sqlFragment: "EXISTS (SELECT 1", mysqlSQL: "SELECT COUNT(*)"}, + {kind: "all", sqlFragment: "NOT EXISTS (SELECT 1", mysqlSQL: "SELECT COUNT(*)"}, + {kind: "exists_one", sqlFragment: "SELECT COUNT(*)", mysqlSQL: "SELECT COUNT(*)"}, } { for _, predicate := range predicates { expression := fmt.Sprintf("tags.%s(t, %s)", comprehension.kind, predicate.expression) @@ -212,7 +216,8 @@ func TestRenderTagStringPredicatesAreExactPerDialect(t *testing.T) { mysqlStmt, err := engine.CompileToStatement(context.Background(), expression, RenderOptions{Dialect: DialectMySQL}) require.NoError(t, err) require.Contains(t, mysqlStmt.SQL, "JSON_TABLE(") - require.Contains(t, mysqlStmt.SQL, comprehension.sqlFragment) + require.Contains(t, mysqlStmt.SQL, comprehension.mysqlSQL) + require.NotContains(t, mysqlStmt.SQL, "EXISTS (SELECT 1") require.Contains(t, mysqlStmt.SQL, "CAST(tag_item.value AS BINARY)") postgresStmt, err := engine.CompileToStatement(context.Background(), expression, RenderOptions{Dialect: DialectPostgres}) @@ -434,7 +439,9 @@ func TestRenderTagsAllPerDialect(t *testing.T) { }{ {DialectSQLite, []string{"NOT EXISTS", "json_each(", "json_array_length(", "instr(tag_item.value, ?) = 1"}, []any{"work/"}}, {DialectPostgres, []string{"NOT EXISTS", "jsonb_array_elements_text(", "jsonb_array_length(", `(tag_item.value COLLATE "C") LIKE`}, []any{"work/%"}}, - {DialectMySQL, []string{"NOT EXISTS", "JSON_TABLE(", "JSON_LENGTH(", "CAST(tag_item.value AS BINARY) LIKE"}, []any{"work/%"}}, + // MySQL counts non-matching rows instead of using NOT EXISTS; see + // TestTagComprehensionAvoidsMySQLExistsSemiJoin. + {DialectMySQL, []string{") = 0", "JSON_TABLE(", "JSON_LENGTH(", "CAST(tag_item.value AS BINARY) LIKE"}, []any{"work/%"}}, } for _, tc := range cases { stmt, err := engine.CompileToStatement(context.Background(), `tags.all(t, t.startsWith("work/"))`, RenderOptions{Dialect: tc.dialect}) @@ -468,3 +475,41 @@ func TestRenderAllRejectsUnsupportedPredicate(t *testing.T) { _, err = engine.CompileToStatement(context.Background(), `tags.all(t, size(t) > 2)`, RenderOptions{Dialect: DialectSQLite}) require.Error(t, err) } + +// TestTagComprehensionAvoidsMySQLExistsSemiJoin pins the reason MySQL renders tag +// comprehensions as row counts rather than EXISTS. +// +// MySQL rewrites `EXISTS (SELECT ... FROM JSON_TABLE(, ...))` into a +// semi-join, and that rewrite drops JSON_TABLE's lateral dependency on the outer row: +// the subquery evaluates as empty for every row, so the predicate is silently always +// false and every tag filter returns nothing. It fails with no SQL error, which is why +// this is guarded here rather than left to the container suite. `NOT EXISTS` happens to +// take the anti-join path and works, but relying on that asymmetry is not worth it, so +// both directions use counts. +func TestTagComprehensionAvoidsMySQLExistsSemiJoin(t *testing.T) { + t.Parallel() + + engine, err := NewEngine(NewSchema()) + require.NoError(t, err) + + for _, expression := range []string{ + `tags.exists(t, t == "work")`, + `tags.exists(t, t.startsWith("work/"))`, + `tags.all(t, t == "work")`, + `tags.all(t, t.contains("work"))`, + `tags.exists_one(t, t == "work")`, + } { + stmt, err := engine.CompileToStatement(context.Background(), expression, RenderOptions{Dialect: DialectMySQL}) + require.NoError(t, err, expression) + require.NotContains(t, stmt.SQL, "EXISTS", "%s must not use EXISTS on MySQL", expression) + require.Contains(t, stmt.SQL, "SELECT COUNT(*)", "%s should count JSON_TABLE rows on MySQL", expression) + require.Contains(t, stmt.SQL, "JSON_TABLE(", expression) + } + + // The other dialects correlate EXISTS correctly and keep using it. + for _, dialect := range []DialectName{DialectSQLite, DialectPostgres} { + stmt, err := engine.CompileToStatement(context.Background(), `tags.exists(t, t == "work")`, RenderOptions{Dialect: dialect}) + require.NoError(t, err, dialect) + require.Contains(t, stmt.SQL, "EXISTS (SELECT 1", "dialect %s", dialect) + } +} diff --git a/internal/filter/render.go b/internal/filter/render.go index 982d6393..305bf4be 100644 --- a/internal/filter/render.go +++ b/internal/filter/render.go @@ -627,11 +627,28 @@ func (r *renderer) renderTagComprehension(field Field, pred PredicateExpr, kind return renderResult{}, errors.Errorf("unsupported dialect %s", r.dialect) } + // MySQL rewrites `EXISTS (SELECT ... FROM JSON_TABLE())` into a semi-join + // that drops the lateral dependency on the outer row, so the subquery silently evaluates + // as empty and the predicate is always false. Counting rows keeps the correlation intact. + // See TestTagComprehensionAvoidsMySQLExistsSemiJoin. + anyMatch := func(cond string) string { + if r.dialect == DialectMySQL { + return fmt.Sprintf("(SELECT COUNT(*) FROM %s WHERE %s) > 0", elements, cond) + } + return fmt.Sprintf("EXISTS (SELECT 1 FROM %s WHERE %s)", elements, cond) + } + noMatch := func(cond string) string { + if r.dialect == DialectMySQL { + return fmt.Sprintf("(SELECT COUNT(*) FROM %s WHERE %s) = 0", elements, cond) + } + return fmt.Sprintf("NOT EXISTS (SELECT 1 FROM %s WHERE %s)", elements, cond) + } + switch kind { case ComprehensionExists: - return renderResult{sql: fmt.Sprintf("EXISTS (SELECT 1 FROM %s WHERE %s)", elements, elemCond)}, nil + return renderResult{sql: anyMatch(elemCond)}, nil case ComprehensionAll: - return renderResult{sql: fmt.Sprintf("(%s > 0 AND NOT EXISTS (SELECT 1 FROM %s WHERE NOT (%s)))", length, elements, elemCond)}, nil + return renderResult{sql: fmt.Sprintf("(%s > 0 AND %s)", length, noMatch(fmt.Sprintf("NOT (%s)", elemCond)))}, nil case ComprehensionExistsOne: return renderResult{sql: fmt.Sprintf("(SELECT COUNT(*) FROM %s WHERE %s) = 1", elements, elemCond)}, nil default: diff --git a/proto/api/v1/memo_view_service.proto b/proto/api/v1/memo_view_service.proto new file mode 100644 index 00000000..2e17eb2b --- /dev/null +++ b/proto/api/v1/memo_view_service.proto @@ -0,0 +1,127 @@ +syntax = "proto3"; + +package memos.api.v1; + +import "google/api/annotations.proto"; +import "google/api/client.proto"; +import "google/api/field_behavior.proto"; +import "google/api/resource.proto"; +import "google/protobuf/empty.proto"; +import "google/protobuf/field_mask.proto"; + +option go_package = "gen/api/v1"; + +service MemoViewService { + // ListMemoViews returns a user's memo views. Each view is a named, reusable + // CEL filter (see MemoView.filter); pass its filter string directly to the + // ListMemos `filter` argument. + rpc ListMemoViews(ListMemoViewsRequest) returns (ListMemoViewsResponse) { + option (google.api.http) = {get: "/api/v1/{parent=users/*}/views"}; + option (google.api.method_signature) = "parent"; + } + + // GetMemoView gets a memo view by name. + rpc GetMemoView(GetMemoViewRequest) returns (MemoView) { + option (google.api.http) = {get: "/api/v1/{name=users/*/views/*}"}; + option (google.api.method_signature) = "name"; + } + + // CreateMemoView creates a new memo view for a user. + rpc CreateMemoView(CreateMemoViewRequest) returns (MemoView) { + option (google.api.http) = { + post: "/api/v1/{parent=users/*}/views" + body: "memo_view" + }; + option (google.api.method_signature) = "parent,memo_view"; + } + + // UpdateMemoView updates a memo view for a user. + rpc UpdateMemoView(UpdateMemoViewRequest) returns (MemoView) { + option (google.api.http) = { + patch: "/api/v1/{memo_view.name=users/*/views/*}" + body: "memo_view" + }; + option (google.api.method_signature) = "memo_view,update_mask"; + } + + // DeleteMemoView deletes a memo view for a user. + rpc DeleteMemoView(DeleteMemoViewRequest) returns (google.protobuf.Empty) { + option (google.api.http) = {delete: "/api/v1/{name=users/*/views/*}"}; + option (google.api.method_signature) = "name"; + } +} + +message MemoView { + option (google.api.resource) = { + type: "memos.api.v1/MemoView" + pattern: "users/{user}/views/{view}" + singular: "view" + plural: "views" + }; + + // The resource name of the memo view. + // Format: users/{user}/views/{view} + string name = 1 [(google.api.field_behavior) = IDENTIFIER]; + + // The title of the memo view. + string title = 2 [(google.api.field_behavior) = REQUIRED]; + + // The CEL filter expression for the memo view, using the same grammar as the + // ListMemos `filter` argument. Reuse it by passing this value to ListMemos. + string filter = 3 [(google.api.field_behavior) = REQUIRED]; +} + +message ListMemoViewsRequest { + // Required. The parent resource where memo views are listed. + // Format: users/{user} + string parent = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = {child_type: "memos.api.v1/MemoView"} + ]; +} + +message ListMemoViewsResponse { + // The list of memo views. + repeated MemoView memo_views = 1; +} + +message GetMemoViewRequest { + // Required. The resource name of the memo view to retrieve. + // Format: users/{user}/views/{view} + string name = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = {type: "memos.api.v1/MemoView"} + ]; +} + +message CreateMemoViewRequest { + // Required. The parent resource where this memo view will be created. + // Format: users/{user} + string parent = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = {child_type: "memos.api.v1/MemoView"} + ]; + + // Required. The memo view to create. + MemoView memo_view = 2 [(google.api.field_behavior) = REQUIRED]; + + // Optional. If set, validate the request, but do not actually create the memo view. + bool validate_only = 3 [(google.api.field_behavior) = OPTIONAL]; +} + +message UpdateMemoViewRequest { + // Required. The memo view resource which replaces the resource on the server. + MemoView memo_view = 1 [(google.api.field_behavior) = REQUIRED]; + + // Optional. The list of fields to update. + google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = OPTIONAL]; +} + +message DeleteMemoViewRequest { + // Required. The resource name of the memo view to delete. + // Format: users/{user}/views/{view} + string name = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = {type: "memos.api.v1/MemoView"} + ]; +} diff --git a/proto/api/v1/shortcut_service.proto b/proto/api/v1/shortcut_service.proto deleted file mode 100644 index 87665244..00000000 --- a/proto/api/v1/shortcut_service.proto +++ /dev/null @@ -1,127 +0,0 @@ -syntax = "proto3"; - -package memos.api.v1; - -import "google/api/annotations.proto"; -import "google/api/client.proto"; -import "google/api/field_behavior.proto"; -import "google/api/resource.proto"; -import "google/protobuf/empty.proto"; -import "google/protobuf/field_mask.proto"; - -option go_package = "gen/api/v1"; - -service ShortcutService { - // ListShortcuts returns a user's saved shortcuts. Each shortcut is a named, - // reusable CEL filter (see Shortcut.filter); pass its filter string directly - // to the ListMemos `filter` argument to reuse a saved view. - rpc ListShortcuts(ListShortcutsRequest) returns (ListShortcutsResponse) { - option (google.api.http) = {get: "/api/v1/{parent=users/*}/shortcuts"}; - option (google.api.method_signature) = "parent"; - } - - // GetShortcut gets a shortcut by name. - rpc GetShortcut(GetShortcutRequest) returns (Shortcut) { - option (google.api.http) = {get: "/api/v1/{name=users/*/shortcuts/*}"}; - option (google.api.method_signature) = "name"; - } - - // CreateShortcut creates a new shortcut for a user. - rpc CreateShortcut(CreateShortcutRequest) returns (Shortcut) { - option (google.api.http) = { - post: "/api/v1/{parent=users/*}/shortcuts" - body: "shortcut" - }; - option (google.api.method_signature) = "parent,shortcut"; - } - - // UpdateShortcut updates a shortcut for a user. - rpc UpdateShortcut(UpdateShortcutRequest) returns (Shortcut) { - option (google.api.http) = { - patch: "/api/v1/{shortcut.name=users/*/shortcuts/*}" - body: "shortcut" - }; - option (google.api.method_signature) = "shortcut,update_mask"; - } - - // DeleteShortcut deletes a shortcut for a user. - rpc DeleteShortcut(DeleteShortcutRequest) returns (google.protobuf.Empty) { - option (google.api.http) = {delete: "/api/v1/{name=users/*/shortcuts/*}"}; - option (google.api.method_signature) = "name"; - } -} - -message Shortcut { - option (google.api.resource) = { - type: "memos.api.v1/Shortcut" - pattern: "users/{user}/shortcuts/{shortcut}" - singular: "shortcut" - plural: "shortcuts" - }; - - // The resource name of the shortcut. - // Format: users/{user}/shortcuts/{shortcut} - string name = 1 [(google.api.field_behavior) = IDENTIFIER]; - - // The title of the shortcut. - string title = 2 [(google.api.field_behavior) = REQUIRED]; - - // The CEL filter expression for the shortcut, using the same grammar as the - // ListMemos `filter` argument. Reuse it by passing this value to ListMemos. - string filter = 3 [(google.api.field_behavior) = OPTIONAL]; -} - -message ListShortcutsRequest { - // Required. The parent resource where shortcuts are listed. - // Format: users/{user} - string parent = 1 [ - (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference) = {child_type: "memos.api.v1/Shortcut"} - ]; -} - -message ListShortcutsResponse { - // The list of shortcuts. - repeated Shortcut shortcuts = 1; -} - -message GetShortcutRequest { - // Required. The resource name of the shortcut to retrieve. - // Format: users/{user}/shortcuts/{shortcut} - string name = 1 [ - (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference) = {type: "memos.api.v1/Shortcut"} - ]; -} - -message CreateShortcutRequest { - // Required. The parent resource where this shortcut will be created. - // Format: users/{user} - string parent = 1 [ - (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference) = {child_type: "memos.api.v1/Shortcut"} - ]; - - // Required. The shortcut to create. - Shortcut shortcut = 2 [(google.api.field_behavior) = REQUIRED]; - - // Optional. If set, validate the request, but do not actually create the shortcut. - bool validate_only = 3 [(google.api.field_behavior) = OPTIONAL]; -} - -message UpdateShortcutRequest { - // Required. The shortcut resource which replaces the resource on the server. - Shortcut shortcut = 1 [(google.api.field_behavior) = REQUIRED]; - - // Optional. The list of fields to update. - google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = OPTIONAL]; -} - -message DeleteShortcutRequest { - // Required. The resource name of the shortcut to delete. - // Format: users/{user}/shortcuts/{shortcut} - string name = 1 [ - (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference) = {type: "memos.api.v1/Shortcut"} - ]; -} diff --git a/proto/gen/api/v1/apiv1connect/memo_view_service.connect.go b/proto/gen/api/v1/apiv1connect/memo_view_service.connect.go new file mode 100644 index 00000000..ac36e62f --- /dev/null +++ b/proto/gen/api/v1/apiv1connect/memo_view_service.connect.go @@ -0,0 +1,240 @@ +// Code generated by protoc-gen-connect-go. DO NOT EDIT. +// +// Source: api/v1/memo_view_service.proto + +package apiv1connect + +import ( + connect "connectrpc.com/connect" + context "context" + errors "errors" + v1 "github.com/usememos/memos/proto/gen/api/v1" + emptypb "google.golang.org/protobuf/types/known/emptypb" + http "net/http" + strings "strings" +) + +// This is a compile-time assertion to ensure that this generated file and the connect package are +// compatible. If you get a compiler error that this constant is not defined, this code was +// generated with a version of connect newer than the one compiled into your binary. You can fix the +// problem by either regenerating this code with an older version of connect or updating the connect +// version compiled into your binary. +const _ = connect.IsAtLeastVersion1_13_0 + +const ( + // MemoViewServiceName is the fully-qualified name of the MemoViewService service. + MemoViewServiceName = "memos.api.v1.MemoViewService" +) + +// These constants are the fully-qualified names of the RPCs defined in this package. They're +// exposed at runtime as Spec.Procedure and as the final two segments of the HTTP route. +// +// Note that these are different from the fully-qualified method names used by +// google.golang.org/protobuf/reflect/protoreflect. To convert from these constants to +// reflection-formatted method names, remove the leading slash and convert the remaining slash to a +// period. +const ( + // MemoViewServiceListMemoViewsProcedure is the fully-qualified name of the MemoViewService's + // ListMemoViews RPC. + MemoViewServiceListMemoViewsProcedure = "/memos.api.v1.MemoViewService/ListMemoViews" + // MemoViewServiceGetMemoViewProcedure is the fully-qualified name of the MemoViewService's + // GetMemoView RPC. + MemoViewServiceGetMemoViewProcedure = "/memos.api.v1.MemoViewService/GetMemoView" + // MemoViewServiceCreateMemoViewProcedure is the fully-qualified name of the MemoViewService's + // CreateMemoView RPC. + MemoViewServiceCreateMemoViewProcedure = "/memos.api.v1.MemoViewService/CreateMemoView" + // MemoViewServiceUpdateMemoViewProcedure is the fully-qualified name of the MemoViewService's + // UpdateMemoView RPC. + MemoViewServiceUpdateMemoViewProcedure = "/memos.api.v1.MemoViewService/UpdateMemoView" + // MemoViewServiceDeleteMemoViewProcedure is the fully-qualified name of the MemoViewService's + // DeleteMemoView RPC. + MemoViewServiceDeleteMemoViewProcedure = "/memos.api.v1.MemoViewService/DeleteMemoView" +) + +// MemoViewServiceClient is a client for the memos.api.v1.MemoViewService service. +type MemoViewServiceClient interface { + // ListMemoViews returns a user's memo views. Each view is a named, reusable + // CEL filter (see MemoView.filter); pass its filter string directly to the + // ListMemos `filter` argument. + ListMemoViews(context.Context, *connect.Request[v1.ListMemoViewsRequest]) (*connect.Response[v1.ListMemoViewsResponse], error) + // GetMemoView gets a memo view by name. + GetMemoView(context.Context, *connect.Request[v1.GetMemoViewRequest]) (*connect.Response[v1.MemoView], error) + // CreateMemoView creates a new memo view for a user. + CreateMemoView(context.Context, *connect.Request[v1.CreateMemoViewRequest]) (*connect.Response[v1.MemoView], error) + // UpdateMemoView updates a memo view for a user. + UpdateMemoView(context.Context, *connect.Request[v1.UpdateMemoViewRequest]) (*connect.Response[v1.MemoView], error) + // DeleteMemoView deletes a memo view for a user. + DeleteMemoView(context.Context, *connect.Request[v1.DeleteMemoViewRequest]) (*connect.Response[emptypb.Empty], error) +} + +// NewMemoViewServiceClient constructs a client for the memos.api.v1.MemoViewService service. By +// default, it uses the Connect protocol with the binary Protobuf Codec, asks for gzipped responses, +// and sends uncompressed requests. To use the gRPC or gRPC-Web protocols, supply the +// connect.WithGRPC() or connect.WithGRPCWeb() options. +// +// The URL supplied here should be the base URL for the Connect or gRPC server (for example, +// http://api.acme.com or https://acme.com/grpc). +func NewMemoViewServiceClient(httpClient connect.HTTPClient, baseURL string, opts ...connect.ClientOption) MemoViewServiceClient { + baseURL = strings.TrimRight(baseURL, "/") + memoViewServiceMethods := v1.File_api_v1_memo_view_service_proto.Services().ByName("MemoViewService").Methods() + return &memoViewServiceClient{ + listMemoViews: connect.NewClient[v1.ListMemoViewsRequest, v1.ListMemoViewsResponse]( + httpClient, + baseURL+MemoViewServiceListMemoViewsProcedure, + connect.WithSchema(memoViewServiceMethods.ByName("ListMemoViews")), + connect.WithClientOptions(opts...), + ), + getMemoView: connect.NewClient[v1.GetMemoViewRequest, v1.MemoView]( + httpClient, + baseURL+MemoViewServiceGetMemoViewProcedure, + connect.WithSchema(memoViewServiceMethods.ByName("GetMemoView")), + connect.WithClientOptions(opts...), + ), + createMemoView: connect.NewClient[v1.CreateMemoViewRequest, v1.MemoView]( + httpClient, + baseURL+MemoViewServiceCreateMemoViewProcedure, + connect.WithSchema(memoViewServiceMethods.ByName("CreateMemoView")), + connect.WithClientOptions(opts...), + ), + updateMemoView: connect.NewClient[v1.UpdateMemoViewRequest, v1.MemoView]( + httpClient, + baseURL+MemoViewServiceUpdateMemoViewProcedure, + connect.WithSchema(memoViewServiceMethods.ByName("UpdateMemoView")), + connect.WithClientOptions(opts...), + ), + deleteMemoView: connect.NewClient[v1.DeleteMemoViewRequest, emptypb.Empty]( + httpClient, + baseURL+MemoViewServiceDeleteMemoViewProcedure, + connect.WithSchema(memoViewServiceMethods.ByName("DeleteMemoView")), + connect.WithClientOptions(opts...), + ), + } +} + +// memoViewServiceClient implements MemoViewServiceClient. +type memoViewServiceClient struct { + listMemoViews *connect.Client[v1.ListMemoViewsRequest, v1.ListMemoViewsResponse] + getMemoView *connect.Client[v1.GetMemoViewRequest, v1.MemoView] + createMemoView *connect.Client[v1.CreateMemoViewRequest, v1.MemoView] + updateMemoView *connect.Client[v1.UpdateMemoViewRequest, v1.MemoView] + deleteMemoView *connect.Client[v1.DeleteMemoViewRequest, emptypb.Empty] +} + +// ListMemoViews calls memos.api.v1.MemoViewService.ListMemoViews. +func (c *memoViewServiceClient) ListMemoViews(ctx context.Context, req *connect.Request[v1.ListMemoViewsRequest]) (*connect.Response[v1.ListMemoViewsResponse], error) { + return c.listMemoViews.CallUnary(ctx, req) +} + +// GetMemoView calls memos.api.v1.MemoViewService.GetMemoView. +func (c *memoViewServiceClient) GetMemoView(ctx context.Context, req *connect.Request[v1.GetMemoViewRequest]) (*connect.Response[v1.MemoView], error) { + return c.getMemoView.CallUnary(ctx, req) +} + +// CreateMemoView calls memos.api.v1.MemoViewService.CreateMemoView. +func (c *memoViewServiceClient) CreateMemoView(ctx context.Context, req *connect.Request[v1.CreateMemoViewRequest]) (*connect.Response[v1.MemoView], error) { + return c.createMemoView.CallUnary(ctx, req) +} + +// UpdateMemoView calls memos.api.v1.MemoViewService.UpdateMemoView. +func (c *memoViewServiceClient) UpdateMemoView(ctx context.Context, req *connect.Request[v1.UpdateMemoViewRequest]) (*connect.Response[v1.MemoView], error) { + return c.updateMemoView.CallUnary(ctx, req) +} + +// DeleteMemoView calls memos.api.v1.MemoViewService.DeleteMemoView. +func (c *memoViewServiceClient) DeleteMemoView(ctx context.Context, req *connect.Request[v1.DeleteMemoViewRequest]) (*connect.Response[emptypb.Empty], error) { + return c.deleteMemoView.CallUnary(ctx, req) +} + +// MemoViewServiceHandler is an implementation of the memos.api.v1.MemoViewService service. +type MemoViewServiceHandler interface { + // ListMemoViews returns a user's memo views. Each view is a named, reusable + // CEL filter (see MemoView.filter); pass its filter string directly to the + // ListMemos `filter` argument. + ListMemoViews(context.Context, *connect.Request[v1.ListMemoViewsRequest]) (*connect.Response[v1.ListMemoViewsResponse], error) + // GetMemoView gets a memo view by name. + GetMemoView(context.Context, *connect.Request[v1.GetMemoViewRequest]) (*connect.Response[v1.MemoView], error) + // CreateMemoView creates a new memo view for a user. + CreateMemoView(context.Context, *connect.Request[v1.CreateMemoViewRequest]) (*connect.Response[v1.MemoView], error) + // UpdateMemoView updates a memo view for a user. + UpdateMemoView(context.Context, *connect.Request[v1.UpdateMemoViewRequest]) (*connect.Response[v1.MemoView], error) + // DeleteMemoView deletes a memo view for a user. + DeleteMemoView(context.Context, *connect.Request[v1.DeleteMemoViewRequest]) (*connect.Response[emptypb.Empty], error) +} + +// NewMemoViewServiceHandler builds an HTTP handler from the service implementation. It returns the +// path on which to mount the handler and the handler itself. +// +// By default, handlers support the Connect, gRPC, and gRPC-Web protocols with the binary Protobuf +// and JSON codecs. They also support gzip compression. +func NewMemoViewServiceHandler(svc MemoViewServiceHandler, opts ...connect.HandlerOption) (string, http.Handler) { + memoViewServiceMethods := v1.File_api_v1_memo_view_service_proto.Services().ByName("MemoViewService").Methods() + memoViewServiceListMemoViewsHandler := connect.NewUnaryHandler( + MemoViewServiceListMemoViewsProcedure, + svc.ListMemoViews, + connect.WithSchema(memoViewServiceMethods.ByName("ListMemoViews")), + connect.WithHandlerOptions(opts...), + ) + memoViewServiceGetMemoViewHandler := connect.NewUnaryHandler( + MemoViewServiceGetMemoViewProcedure, + svc.GetMemoView, + connect.WithSchema(memoViewServiceMethods.ByName("GetMemoView")), + connect.WithHandlerOptions(opts...), + ) + memoViewServiceCreateMemoViewHandler := connect.NewUnaryHandler( + MemoViewServiceCreateMemoViewProcedure, + svc.CreateMemoView, + connect.WithSchema(memoViewServiceMethods.ByName("CreateMemoView")), + connect.WithHandlerOptions(opts...), + ) + memoViewServiceUpdateMemoViewHandler := connect.NewUnaryHandler( + MemoViewServiceUpdateMemoViewProcedure, + svc.UpdateMemoView, + connect.WithSchema(memoViewServiceMethods.ByName("UpdateMemoView")), + connect.WithHandlerOptions(opts...), + ) + memoViewServiceDeleteMemoViewHandler := connect.NewUnaryHandler( + MemoViewServiceDeleteMemoViewProcedure, + svc.DeleteMemoView, + connect.WithSchema(memoViewServiceMethods.ByName("DeleteMemoView")), + connect.WithHandlerOptions(opts...), + ) + return "/memos.api.v1.MemoViewService/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + switch r.URL.Path { + case MemoViewServiceListMemoViewsProcedure: + memoViewServiceListMemoViewsHandler.ServeHTTP(w, r) + case MemoViewServiceGetMemoViewProcedure: + memoViewServiceGetMemoViewHandler.ServeHTTP(w, r) + case MemoViewServiceCreateMemoViewProcedure: + memoViewServiceCreateMemoViewHandler.ServeHTTP(w, r) + case MemoViewServiceUpdateMemoViewProcedure: + memoViewServiceUpdateMemoViewHandler.ServeHTTP(w, r) + case MemoViewServiceDeleteMemoViewProcedure: + memoViewServiceDeleteMemoViewHandler.ServeHTTP(w, r) + default: + http.NotFound(w, r) + } + }) +} + +// UnimplementedMemoViewServiceHandler returns CodeUnimplemented from all methods. +type UnimplementedMemoViewServiceHandler struct{} + +func (UnimplementedMemoViewServiceHandler) ListMemoViews(context.Context, *connect.Request[v1.ListMemoViewsRequest]) (*connect.Response[v1.ListMemoViewsResponse], error) { + return nil, connect.NewError(connect.CodeUnimplemented, errors.New("memos.api.v1.MemoViewService.ListMemoViews is not implemented")) +} + +func (UnimplementedMemoViewServiceHandler) GetMemoView(context.Context, *connect.Request[v1.GetMemoViewRequest]) (*connect.Response[v1.MemoView], error) { + return nil, connect.NewError(connect.CodeUnimplemented, errors.New("memos.api.v1.MemoViewService.GetMemoView is not implemented")) +} + +func (UnimplementedMemoViewServiceHandler) CreateMemoView(context.Context, *connect.Request[v1.CreateMemoViewRequest]) (*connect.Response[v1.MemoView], error) { + return nil, connect.NewError(connect.CodeUnimplemented, errors.New("memos.api.v1.MemoViewService.CreateMemoView is not implemented")) +} + +func (UnimplementedMemoViewServiceHandler) UpdateMemoView(context.Context, *connect.Request[v1.UpdateMemoViewRequest]) (*connect.Response[v1.MemoView], error) { + return nil, connect.NewError(connect.CodeUnimplemented, errors.New("memos.api.v1.MemoViewService.UpdateMemoView is not implemented")) +} + +func (UnimplementedMemoViewServiceHandler) DeleteMemoView(context.Context, *connect.Request[v1.DeleteMemoViewRequest]) (*connect.Response[emptypb.Empty], error) { + return nil, connect.NewError(connect.CodeUnimplemented, errors.New("memos.api.v1.MemoViewService.DeleteMemoView is not implemented")) +} diff --git a/proto/gen/api/v1/apiv1connect/shortcut_service.connect.go b/proto/gen/api/v1/apiv1connect/shortcut_service.connect.go deleted file mode 100644 index f93c4c10..00000000 --- a/proto/gen/api/v1/apiv1connect/shortcut_service.connect.go +++ /dev/null @@ -1,240 +0,0 @@ -// Code generated by protoc-gen-connect-go. DO NOT EDIT. -// -// Source: api/v1/shortcut_service.proto - -package apiv1connect - -import ( - connect "connectrpc.com/connect" - context "context" - errors "errors" - v1 "github.com/usememos/memos/proto/gen/api/v1" - emptypb "google.golang.org/protobuf/types/known/emptypb" - http "net/http" - strings "strings" -) - -// This is a compile-time assertion to ensure that this generated file and the connect package are -// compatible. If you get a compiler error that this constant is not defined, this code was -// generated with a version of connect newer than the one compiled into your binary. You can fix the -// problem by either regenerating this code with an older version of connect or updating the connect -// version compiled into your binary. -const _ = connect.IsAtLeastVersion1_13_0 - -const ( - // ShortcutServiceName is the fully-qualified name of the ShortcutService service. - ShortcutServiceName = "memos.api.v1.ShortcutService" -) - -// These constants are the fully-qualified names of the RPCs defined in this package. They're -// exposed at runtime as Spec.Procedure and as the final two segments of the HTTP route. -// -// Note that these are different from the fully-qualified method names used by -// google.golang.org/protobuf/reflect/protoreflect. To convert from these constants to -// reflection-formatted method names, remove the leading slash and convert the remaining slash to a -// period. -const ( - // ShortcutServiceListShortcutsProcedure is the fully-qualified name of the ShortcutService's - // ListShortcuts RPC. - ShortcutServiceListShortcutsProcedure = "/memos.api.v1.ShortcutService/ListShortcuts" - // ShortcutServiceGetShortcutProcedure is the fully-qualified name of the ShortcutService's - // GetShortcut RPC. - ShortcutServiceGetShortcutProcedure = "/memos.api.v1.ShortcutService/GetShortcut" - // ShortcutServiceCreateShortcutProcedure is the fully-qualified name of the ShortcutService's - // CreateShortcut RPC. - ShortcutServiceCreateShortcutProcedure = "/memos.api.v1.ShortcutService/CreateShortcut" - // ShortcutServiceUpdateShortcutProcedure is the fully-qualified name of the ShortcutService's - // UpdateShortcut RPC. - ShortcutServiceUpdateShortcutProcedure = "/memos.api.v1.ShortcutService/UpdateShortcut" - // ShortcutServiceDeleteShortcutProcedure is the fully-qualified name of the ShortcutService's - // DeleteShortcut RPC. - ShortcutServiceDeleteShortcutProcedure = "/memos.api.v1.ShortcutService/DeleteShortcut" -) - -// ShortcutServiceClient is a client for the memos.api.v1.ShortcutService service. -type ShortcutServiceClient interface { - // ListShortcuts returns a user's saved shortcuts. Each shortcut is a named, - // reusable CEL filter (see Shortcut.filter); pass its filter string directly - // to the ListMemos `filter` argument to reuse a saved view. - ListShortcuts(context.Context, *connect.Request[v1.ListShortcutsRequest]) (*connect.Response[v1.ListShortcutsResponse], error) - // GetShortcut gets a shortcut by name. - GetShortcut(context.Context, *connect.Request[v1.GetShortcutRequest]) (*connect.Response[v1.Shortcut], error) - // CreateShortcut creates a new shortcut for a user. - CreateShortcut(context.Context, *connect.Request[v1.CreateShortcutRequest]) (*connect.Response[v1.Shortcut], error) - // UpdateShortcut updates a shortcut for a user. - UpdateShortcut(context.Context, *connect.Request[v1.UpdateShortcutRequest]) (*connect.Response[v1.Shortcut], error) - // DeleteShortcut deletes a shortcut for a user. - DeleteShortcut(context.Context, *connect.Request[v1.DeleteShortcutRequest]) (*connect.Response[emptypb.Empty], error) -} - -// NewShortcutServiceClient constructs a client for the memos.api.v1.ShortcutService service. By -// default, it uses the Connect protocol with the binary Protobuf Codec, asks for gzipped responses, -// and sends uncompressed requests. To use the gRPC or gRPC-Web protocols, supply the -// connect.WithGRPC() or connect.WithGRPCWeb() options. -// -// The URL supplied here should be the base URL for the Connect or gRPC server (for example, -// http://api.acme.com or https://acme.com/grpc). -func NewShortcutServiceClient(httpClient connect.HTTPClient, baseURL string, opts ...connect.ClientOption) ShortcutServiceClient { - baseURL = strings.TrimRight(baseURL, "/") - shortcutServiceMethods := v1.File_api_v1_shortcut_service_proto.Services().ByName("ShortcutService").Methods() - return &shortcutServiceClient{ - listShortcuts: connect.NewClient[v1.ListShortcutsRequest, v1.ListShortcutsResponse]( - httpClient, - baseURL+ShortcutServiceListShortcutsProcedure, - connect.WithSchema(shortcutServiceMethods.ByName("ListShortcuts")), - connect.WithClientOptions(opts...), - ), - getShortcut: connect.NewClient[v1.GetShortcutRequest, v1.Shortcut]( - httpClient, - baseURL+ShortcutServiceGetShortcutProcedure, - connect.WithSchema(shortcutServiceMethods.ByName("GetShortcut")), - connect.WithClientOptions(opts...), - ), - createShortcut: connect.NewClient[v1.CreateShortcutRequest, v1.Shortcut]( - httpClient, - baseURL+ShortcutServiceCreateShortcutProcedure, - connect.WithSchema(shortcutServiceMethods.ByName("CreateShortcut")), - connect.WithClientOptions(opts...), - ), - updateShortcut: connect.NewClient[v1.UpdateShortcutRequest, v1.Shortcut]( - httpClient, - baseURL+ShortcutServiceUpdateShortcutProcedure, - connect.WithSchema(shortcutServiceMethods.ByName("UpdateShortcut")), - connect.WithClientOptions(opts...), - ), - deleteShortcut: connect.NewClient[v1.DeleteShortcutRequest, emptypb.Empty]( - httpClient, - baseURL+ShortcutServiceDeleteShortcutProcedure, - connect.WithSchema(shortcutServiceMethods.ByName("DeleteShortcut")), - connect.WithClientOptions(opts...), - ), - } -} - -// shortcutServiceClient implements ShortcutServiceClient. -type shortcutServiceClient struct { - listShortcuts *connect.Client[v1.ListShortcutsRequest, v1.ListShortcutsResponse] - getShortcut *connect.Client[v1.GetShortcutRequest, v1.Shortcut] - createShortcut *connect.Client[v1.CreateShortcutRequest, v1.Shortcut] - updateShortcut *connect.Client[v1.UpdateShortcutRequest, v1.Shortcut] - deleteShortcut *connect.Client[v1.DeleteShortcutRequest, emptypb.Empty] -} - -// ListShortcuts calls memos.api.v1.ShortcutService.ListShortcuts. -func (c *shortcutServiceClient) ListShortcuts(ctx context.Context, req *connect.Request[v1.ListShortcutsRequest]) (*connect.Response[v1.ListShortcutsResponse], error) { - return c.listShortcuts.CallUnary(ctx, req) -} - -// GetShortcut calls memos.api.v1.ShortcutService.GetShortcut. -func (c *shortcutServiceClient) GetShortcut(ctx context.Context, req *connect.Request[v1.GetShortcutRequest]) (*connect.Response[v1.Shortcut], error) { - return c.getShortcut.CallUnary(ctx, req) -} - -// CreateShortcut calls memos.api.v1.ShortcutService.CreateShortcut. -func (c *shortcutServiceClient) CreateShortcut(ctx context.Context, req *connect.Request[v1.CreateShortcutRequest]) (*connect.Response[v1.Shortcut], error) { - return c.createShortcut.CallUnary(ctx, req) -} - -// UpdateShortcut calls memos.api.v1.ShortcutService.UpdateShortcut. -func (c *shortcutServiceClient) UpdateShortcut(ctx context.Context, req *connect.Request[v1.UpdateShortcutRequest]) (*connect.Response[v1.Shortcut], error) { - return c.updateShortcut.CallUnary(ctx, req) -} - -// DeleteShortcut calls memos.api.v1.ShortcutService.DeleteShortcut. -func (c *shortcutServiceClient) DeleteShortcut(ctx context.Context, req *connect.Request[v1.DeleteShortcutRequest]) (*connect.Response[emptypb.Empty], error) { - return c.deleteShortcut.CallUnary(ctx, req) -} - -// ShortcutServiceHandler is an implementation of the memos.api.v1.ShortcutService service. -type ShortcutServiceHandler interface { - // ListShortcuts returns a user's saved shortcuts. Each shortcut is a named, - // reusable CEL filter (see Shortcut.filter); pass its filter string directly - // to the ListMemos `filter` argument to reuse a saved view. - ListShortcuts(context.Context, *connect.Request[v1.ListShortcutsRequest]) (*connect.Response[v1.ListShortcutsResponse], error) - // GetShortcut gets a shortcut by name. - GetShortcut(context.Context, *connect.Request[v1.GetShortcutRequest]) (*connect.Response[v1.Shortcut], error) - // CreateShortcut creates a new shortcut for a user. - CreateShortcut(context.Context, *connect.Request[v1.CreateShortcutRequest]) (*connect.Response[v1.Shortcut], error) - // UpdateShortcut updates a shortcut for a user. - UpdateShortcut(context.Context, *connect.Request[v1.UpdateShortcutRequest]) (*connect.Response[v1.Shortcut], error) - // DeleteShortcut deletes a shortcut for a user. - DeleteShortcut(context.Context, *connect.Request[v1.DeleteShortcutRequest]) (*connect.Response[emptypb.Empty], error) -} - -// NewShortcutServiceHandler builds an HTTP handler from the service implementation. It returns the -// path on which to mount the handler and the handler itself. -// -// By default, handlers support the Connect, gRPC, and gRPC-Web protocols with the binary Protobuf -// and JSON codecs. They also support gzip compression. -func NewShortcutServiceHandler(svc ShortcutServiceHandler, opts ...connect.HandlerOption) (string, http.Handler) { - shortcutServiceMethods := v1.File_api_v1_shortcut_service_proto.Services().ByName("ShortcutService").Methods() - shortcutServiceListShortcutsHandler := connect.NewUnaryHandler( - ShortcutServiceListShortcutsProcedure, - svc.ListShortcuts, - connect.WithSchema(shortcutServiceMethods.ByName("ListShortcuts")), - connect.WithHandlerOptions(opts...), - ) - shortcutServiceGetShortcutHandler := connect.NewUnaryHandler( - ShortcutServiceGetShortcutProcedure, - svc.GetShortcut, - connect.WithSchema(shortcutServiceMethods.ByName("GetShortcut")), - connect.WithHandlerOptions(opts...), - ) - shortcutServiceCreateShortcutHandler := connect.NewUnaryHandler( - ShortcutServiceCreateShortcutProcedure, - svc.CreateShortcut, - connect.WithSchema(shortcutServiceMethods.ByName("CreateShortcut")), - connect.WithHandlerOptions(opts...), - ) - shortcutServiceUpdateShortcutHandler := connect.NewUnaryHandler( - ShortcutServiceUpdateShortcutProcedure, - svc.UpdateShortcut, - connect.WithSchema(shortcutServiceMethods.ByName("UpdateShortcut")), - connect.WithHandlerOptions(opts...), - ) - shortcutServiceDeleteShortcutHandler := connect.NewUnaryHandler( - ShortcutServiceDeleteShortcutProcedure, - svc.DeleteShortcut, - connect.WithSchema(shortcutServiceMethods.ByName("DeleteShortcut")), - connect.WithHandlerOptions(opts...), - ) - return "/memos.api.v1.ShortcutService/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - switch r.URL.Path { - case ShortcutServiceListShortcutsProcedure: - shortcutServiceListShortcutsHandler.ServeHTTP(w, r) - case ShortcutServiceGetShortcutProcedure: - shortcutServiceGetShortcutHandler.ServeHTTP(w, r) - case ShortcutServiceCreateShortcutProcedure: - shortcutServiceCreateShortcutHandler.ServeHTTP(w, r) - case ShortcutServiceUpdateShortcutProcedure: - shortcutServiceUpdateShortcutHandler.ServeHTTP(w, r) - case ShortcutServiceDeleteShortcutProcedure: - shortcutServiceDeleteShortcutHandler.ServeHTTP(w, r) - default: - http.NotFound(w, r) - } - }) -} - -// UnimplementedShortcutServiceHandler returns CodeUnimplemented from all methods. -type UnimplementedShortcutServiceHandler struct{} - -func (UnimplementedShortcutServiceHandler) ListShortcuts(context.Context, *connect.Request[v1.ListShortcutsRequest]) (*connect.Response[v1.ListShortcutsResponse], error) { - return nil, connect.NewError(connect.CodeUnimplemented, errors.New("memos.api.v1.ShortcutService.ListShortcuts is not implemented")) -} - -func (UnimplementedShortcutServiceHandler) GetShortcut(context.Context, *connect.Request[v1.GetShortcutRequest]) (*connect.Response[v1.Shortcut], error) { - return nil, connect.NewError(connect.CodeUnimplemented, errors.New("memos.api.v1.ShortcutService.GetShortcut is not implemented")) -} - -func (UnimplementedShortcutServiceHandler) CreateShortcut(context.Context, *connect.Request[v1.CreateShortcutRequest]) (*connect.Response[v1.Shortcut], error) { - return nil, connect.NewError(connect.CodeUnimplemented, errors.New("memos.api.v1.ShortcutService.CreateShortcut is not implemented")) -} - -func (UnimplementedShortcutServiceHandler) UpdateShortcut(context.Context, *connect.Request[v1.UpdateShortcutRequest]) (*connect.Response[v1.Shortcut], error) { - return nil, connect.NewError(connect.CodeUnimplemented, errors.New("memos.api.v1.ShortcutService.UpdateShortcut is not implemented")) -} - -func (UnimplementedShortcutServiceHandler) DeleteShortcut(context.Context, *connect.Request[v1.DeleteShortcutRequest]) (*connect.Response[emptypb.Empty], error) { - return nil, connect.NewError(connect.CodeUnimplemented, errors.New("memos.api.v1.ShortcutService.DeleteShortcut is not implemented")) -} diff --git a/proto/gen/api/v1/attachment_service.pb.gw.go b/proto/gen/api/v1/attachment_service.pb.gw.go index 10377c95..f03ebd94 100644 --- a/proto/gen/api/v1/attachment_service.pb.gw.go +++ b/proto/gen/api/v1/attachment_service.pb.gw.go @@ -45,15 +45,15 @@ func request_AttachmentService_CreateAttachment_0(ctx context.Context, marshaler if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Attachment); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_AttachmentService_CreateAttachment_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.CreateAttachment(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -83,15 +83,15 @@ func request_AttachmentService_ListAttachments_0(ctx context.Context, marshaler protoReq ListAttachmentsRequest metadata runtime.ServerMetadata ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_AttachmentService_ListAttachments_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.ListAttachments(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -117,9 +117,6 @@ func request_AttachmentService_GetAttachment_0(ctx context.Context, marshaler ru metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -128,6 +125,9 @@ func request_AttachmentService_GetAttachment_0(ctx context.Context, marshaler ru if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.GetAttachment(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -165,9 +165,6 @@ func request_AttachmentService_UpdateAttachment_0(ctx context.Context, marshaler if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Attachment); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Attachment); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -189,6 +186,9 @@ func request_AttachmentService_UpdateAttachment_0(ctx context.Context, marshaler if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_AttachmentService_UpdateAttachment_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.UpdateAttachment(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -237,9 +237,6 @@ func request_AttachmentService_DeleteAttachment_0(ctx context.Context, marshaler metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -248,6 +245,9 @@ func request_AttachmentService_DeleteAttachment_0(ctx context.Context, marshaler if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.DeleteAttachment(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } diff --git a/proto/gen/api/v1/idp_service.pb.gw.go b/proto/gen/api/v1/idp_service.pb.gw.go index 1c198c5a..d407bc87 100644 --- a/proto/gen/api/v1/idp_service.pb.gw.go +++ b/proto/gen/api/v1/idp_service.pb.gw.go @@ -62,9 +62,6 @@ func request_IdentityProviderService_GetIdentityProvider_0(ctx context.Context, metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -73,6 +70,9 @@ func request_IdentityProviderService_GetIdentityProvider_0(ctx context.Context, if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.GetIdentityProvider(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -105,15 +105,15 @@ func request_IdentityProviderService_CreateIdentityProvider_0(ctx context.Contex if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.IdentityProvider); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_IdentityProviderService_CreateIdentityProvider_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.CreateIdentityProvider(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -151,9 +151,6 @@ func request_IdentityProviderService_UpdateIdentityProvider_0(ctx context.Contex if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.IdentityProvider); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.IdentityProvider); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -175,6 +172,9 @@ func request_IdentityProviderService_UpdateIdentityProvider_0(ctx context.Contex if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_IdentityProviderService_UpdateIdentityProvider_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.UpdateIdentityProvider(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -223,9 +223,6 @@ func request_IdentityProviderService_DeleteIdentityProvider_0(ctx context.Contex metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -234,6 +231,9 @@ func request_IdentityProviderService_DeleteIdentityProvider_0(ctx context.Contex if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.DeleteIdentityProvider(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } diff --git a/proto/gen/api/v1/instance_service.pb.gw.go b/proto/gen/api/v1/instance_service.pb.gw.go index 350edfc6..2a440486 100644 --- a/proto/gen/api/v1/instance_service.pb.gw.go +++ b/proto/gen/api/v1/instance_service.pb.gw.go @@ -62,9 +62,6 @@ func request_InstanceService_GetInstanceSetting_0(ctx context.Context, marshaler metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -73,6 +70,9 @@ func request_InstanceService_GetInstanceSetting_0(ctx context.Context, marshaler if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.GetInstanceSetting(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -137,9 +137,6 @@ func request_InstanceService_UpdateInstanceSetting_0(ctx context.Context, marsha if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Setting); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Setting); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -161,6 +158,9 @@ func request_InstanceService_UpdateInstanceSetting_0(ctx context.Context, marsha if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_InstanceService_UpdateInstanceSetting_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.UpdateInstanceSetting(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } diff --git a/proto/gen/api/v1/memo_service.pb.gw.go b/proto/gen/api/v1/memo_service.pb.gw.go index 596e8dc0..f1d2fd08 100644 --- a/proto/gen/api/v1/memo_service.pb.gw.go +++ b/proto/gen/api/v1/memo_service.pb.gw.go @@ -45,15 +45,15 @@ func request_MemoService_CreateMemo_0(ctx context.Context, marshaler runtime.Mar if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Memo); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_MemoService_CreateMemo_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.CreateMemo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -83,15 +83,15 @@ func request_MemoService_ListMemos_0(ctx context.Context, marshaler runtime.Mars protoReq ListMemosRequest metadata runtime.ServerMetadata ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_MemoService_ListMemos_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.ListMemos(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -117,9 +117,6 @@ func request_MemoService_GetMemo_0(ctx context.Context, marshaler runtime.Marsha metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -128,6 +125,9 @@ func request_MemoService_GetMemo_0(ctx context.Context, marshaler runtime.Marsha if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.GetMemo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -165,9 +165,6 @@ func request_MemoService_UpdateMemo_0(ctx context.Context, marshaler runtime.Mar if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Memo); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Memo); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -189,6 +186,9 @@ func request_MemoService_UpdateMemo_0(ctx context.Context, marshaler runtime.Mar if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_MemoService_UpdateMemo_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.UpdateMemo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -239,9 +239,6 @@ func request_MemoService_DeleteMemo_0(ctx context.Context, marshaler runtime.Mar metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -256,6 +253,9 @@ func request_MemoService_DeleteMemo_0(ctx context.Context, marshaler runtime.Mar if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_MemoService_DeleteMemo_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.DeleteMemo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -293,9 +293,6 @@ func request_MemoService_SetMemoAttachments_0(ctx context.Context, marshaler run if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -304,6 +301,9 @@ func request_MemoService_SetMemoAttachments_0(ctx context.Context, marshaler run if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.SetMemoAttachments(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -337,9 +337,6 @@ func request_MemoService_ListMemoAttachments_0(ctx context.Context, marshaler ru metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -354,6 +351,9 @@ func request_MemoService_ListMemoAttachments_0(ctx context.Context, marshaler ru if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_MemoService_ListMemoAttachments_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.ListMemoAttachments(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -391,9 +391,6 @@ func request_MemoService_SetMemoRelations_0(ctx context.Context, marshaler runti if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -402,6 +399,9 @@ func request_MemoService_SetMemoRelations_0(ctx context.Context, marshaler runti if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.SetMemoRelations(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -435,9 +435,6 @@ func request_MemoService_ListMemoRelations_0(ctx context.Context, marshaler runt metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -452,6 +449,9 @@ func request_MemoService_ListMemoRelations_0(ctx context.Context, marshaler runt if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_MemoService_ListMemoRelations_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.ListMemoRelations(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -491,9 +491,6 @@ func request_MemoService_CreateMemoComment_0(ctx context.Context, marshaler runt if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Comment); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -508,6 +505,9 @@ func request_MemoService_CreateMemoComment_0(ctx context.Context, marshaler runt if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_MemoService_CreateMemoComment_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.CreateMemoComment(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -547,9 +547,6 @@ func request_MemoService_ListMemoComments_0(ctx context.Context, marshaler runti metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -564,6 +561,9 @@ func request_MemoService_ListMemoComments_0(ctx context.Context, marshaler runti if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_MemoService_ListMemoComments_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.ListMemoComments(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -600,9 +600,6 @@ func request_MemoService_ListMemoReactions_0(ctx context.Context, marshaler runt metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -617,6 +614,9 @@ func request_MemoService_ListMemoReactions_0(ctx context.Context, marshaler runt if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_MemoService_ListMemoReactions_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.ListMemoReactions(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -654,9 +654,6 @@ func request_MemoService_UpsertMemoReaction_0(ctx context.Context, marshaler run if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -665,6 +662,9 @@ func request_MemoService_UpsertMemoReaction_0(ctx context.Context, marshaler run if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.UpsertMemoReaction(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -696,9 +696,6 @@ func request_MemoService_DeleteMemoReaction_0(ctx context.Context, marshaler run metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -707,6 +704,9 @@ func request_MemoService_DeleteMemoReaction_0(ctx context.Context, marshaler run if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.DeleteMemoReaction(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -738,9 +738,6 @@ func request_MemoService_CreateMemoShare_0(ctx context.Context, marshaler runtim if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.MemoShare); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["parent"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent") @@ -749,6 +746,9 @@ func request_MemoService_CreateMemoShare_0(ctx context.Context, marshaler runtim if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.CreateMemoShare(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -780,9 +780,6 @@ func request_MemoService_ListMemoShares_0(ctx context.Context, marshaler runtime metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["parent"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent") @@ -791,6 +788,9 @@ func request_MemoService_ListMemoShares_0(ctx context.Context, marshaler runtime if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.ListMemoShares(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -819,9 +819,6 @@ func request_MemoService_DeleteMemoShare_0(ctx context.Context, marshaler runtim metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -830,6 +827,9 @@ func request_MemoService_DeleteMemoShare_0(ctx context.Context, marshaler runtim if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.DeleteMemoShare(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -858,9 +858,6 @@ func request_MemoService_GetSharedMemo_0(ctx context.Context, marshaler runtime. metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["share_token"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "share_token") @@ -869,6 +866,9 @@ func request_MemoService_GetSharedMemo_0(ctx context.Context, marshaler runtime. if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "share_token", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.GetSharedMemo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -898,15 +898,15 @@ func request_MemoService_GetLinkMetadata_0(ctx context.Context, marshaler runtim protoReq GetLinkMetadataRequest metadata runtime.ServerMetadata ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_MemoService_GetLinkMetadata_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.GetLinkMetadata(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } diff --git a/proto/gen/api/v1/memo_view_service.pb.go b/proto/gen/api/v1/memo_view_service.pb.go new file mode 100644 index 00000000..646f1b63 --- /dev/null +++ b/proto/gen/api/v1/memo_view_service.pb.go @@ -0,0 +1,498 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.36.11 +// protoc (unknown) +// source: api/v1/memo_view_service.proto + +package apiv1 + +import ( + _ "google.golang.org/genproto/googleapis/api/annotations" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" + fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb" + reflect "reflect" + sync "sync" + unsafe "unsafe" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type MemoView struct { + state protoimpl.MessageState `protogen:"open.v1"` + // The resource name of the memo view. + // Format: users/{user}/views/{view} + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + // The title of the memo view. + Title string `protobuf:"bytes,2,opt,name=title,proto3" json:"title,omitempty"` + // The CEL filter expression for the memo view, using the same grammar as the + // ListMemos `filter` argument. Reuse it by passing this value to ListMemos. + Filter string `protobuf:"bytes,3,opt,name=filter,proto3" json:"filter,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *MemoView) Reset() { + *x = MemoView{} + mi := &file_api_v1_memo_view_service_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *MemoView) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*MemoView) ProtoMessage() {} + +func (x *MemoView) ProtoReflect() protoreflect.Message { + mi := &file_api_v1_memo_view_service_proto_msgTypes[0] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use MemoView.ProtoReflect.Descriptor instead. +func (*MemoView) Descriptor() ([]byte, []int) { + return file_api_v1_memo_view_service_proto_rawDescGZIP(), []int{0} +} + +func (x *MemoView) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *MemoView) GetTitle() string { + if x != nil { + return x.Title + } + return "" +} + +func (x *MemoView) GetFilter() string { + if x != nil { + return x.Filter + } + return "" +} + +type ListMemoViewsRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + // Required. The parent resource where memo views are listed. + // Format: users/{user} + Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ListMemoViewsRequest) Reset() { + *x = ListMemoViewsRequest{} + mi := &file_api_v1_memo_view_service_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ListMemoViewsRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ListMemoViewsRequest) ProtoMessage() {} + +func (x *ListMemoViewsRequest) ProtoReflect() protoreflect.Message { + mi := &file_api_v1_memo_view_service_proto_msgTypes[1] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ListMemoViewsRequest.ProtoReflect.Descriptor instead. +func (*ListMemoViewsRequest) Descriptor() ([]byte, []int) { + return file_api_v1_memo_view_service_proto_rawDescGZIP(), []int{1} +} + +func (x *ListMemoViewsRequest) GetParent() string { + if x != nil { + return x.Parent + } + return "" +} + +type ListMemoViewsResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + // The list of memo views. + MemoViews []*MemoView `protobuf:"bytes,1,rep,name=memo_views,json=memoViews,proto3" json:"memo_views,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ListMemoViewsResponse) Reset() { + *x = ListMemoViewsResponse{} + mi := &file_api_v1_memo_view_service_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ListMemoViewsResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ListMemoViewsResponse) ProtoMessage() {} + +func (x *ListMemoViewsResponse) ProtoReflect() protoreflect.Message { + mi := &file_api_v1_memo_view_service_proto_msgTypes[2] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ListMemoViewsResponse.ProtoReflect.Descriptor instead. +func (*ListMemoViewsResponse) Descriptor() ([]byte, []int) { + return file_api_v1_memo_view_service_proto_rawDescGZIP(), []int{2} +} + +func (x *ListMemoViewsResponse) GetMemoViews() []*MemoView { + if x != nil { + return x.MemoViews + } + return nil +} + +type GetMemoViewRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + // Required. The resource name of the memo view to retrieve. + // Format: users/{user}/views/{view} + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *GetMemoViewRequest) Reset() { + *x = GetMemoViewRequest{} + mi := &file_api_v1_memo_view_service_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *GetMemoViewRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GetMemoViewRequest) ProtoMessage() {} + +func (x *GetMemoViewRequest) ProtoReflect() protoreflect.Message { + mi := &file_api_v1_memo_view_service_proto_msgTypes[3] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GetMemoViewRequest.ProtoReflect.Descriptor instead. +func (*GetMemoViewRequest) Descriptor() ([]byte, []int) { + return file_api_v1_memo_view_service_proto_rawDescGZIP(), []int{3} +} + +func (x *GetMemoViewRequest) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +type CreateMemoViewRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + // Required. The parent resource where this memo view will be created. + // Format: users/{user} + Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"` + // Required. The memo view to create. + MemoView *MemoView `protobuf:"bytes,2,opt,name=memo_view,json=memoView,proto3" json:"memo_view,omitempty"` + // Optional. If set, validate the request, but do not actually create the memo view. + ValidateOnly bool `protobuf:"varint,3,opt,name=validate_only,json=validateOnly,proto3" json:"validate_only,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *CreateMemoViewRequest) Reset() { + *x = CreateMemoViewRequest{} + mi := &file_api_v1_memo_view_service_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *CreateMemoViewRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CreateMemoViewRequest) ProtoMessage() {} + +func (x *CreateMemoViewRequest) ProtoReflect() protoreflect.Message { + mi := &file_api_v1_memo_view_service_proto_msgTypes[4] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CreateMemoViewRequest.ProtoReflect.Descriptor instead. +func (*CreateMemoViewRequest) Descriptor() ([]byte, []int) { + return file_api_v1_memo_view_service_proto_rawDescGZIP(), []int{4} +} + +func (x *CreateMemoViewRequest) GetParent() string { + if x != nil { + return x.Parent + } + return "" +} + +func (x *CreateMemoViewRequest) GetMemoView() *MemoView { + if x != nil { + return x.MemoView + } + return nil +} + +func (x *CreateMemoViewRequest) GetValidateOnly() bool { + if x != nil { + return x.ValidateOnly + } + return false +} + +type UpdateMemoViewRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + // Required. The memo view resource which replaces the resource on the server. + MemoView *MemoView `protobuf:"bytes,1,opt,name=memo_view,json=memoView,proto3" json:"memo_view,omitempty"` + // Optional. The list of fields to update. + UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *UpdateMemoViewRequest) Reset() { + *x = UpdateMemoViewRequest{} + mi := &file_api_v1_memo_view_service_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *UpdateMemoViewRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UpdateMemoViewRequest) ProtoMessage() {} + +func (x *UpdateMemoViewRequest) ProtoReflect() protoreflect.Message { + mi := &file_api_v1_memo_view_service_proto_msgTypes[5] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UpdateMemoViewRequest.ProtoReflect.Descriptor instead. +func (*UpdateMemoViewRequest) Descriptor() ([]byte, []int) { + return file_api_v1_memo_view_service_proto_rawDescGZIP(), []int{5} +} + +func (x *UpdateMemoViewRequest) GetMemoView() *MemoView { + if x != nil { + return x.MemoView + } + return nil +} + +func (x *UpdateMemoViewRequest) GetUpdateMask() *fieldmaskpb.FieldMask { + if x != nil { + return x.UpdateMask + } + return nil +} + +type DeleteMemoViewRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + // Required. The resource name of the memo view to delete. + // Format: users/{user}/views/{view} + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *DeleteMemoViewRequest) Reset() { + *x = DeleteMemoViewRequest{} + mi := &file_api_v1_memo_view_service_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *DeleteMemoViewRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DeleteMemoViewRequest) ProtoMessage() {} + +func (x *DeleteMemoViewRequest) ProtoReflect() protoreflect.Message { + mi := &file_api_v1_memo_view_service_proto_msgTypes[6] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DeleteMemoViewRequest.ProtoReflect.Descriptor instead. +func (*DeleteMemoViewRequest) Descriptor() ([]byte, []int) { + return file_api_v1_memo_view_service_proto_rawDescGZIP(), []int{6} +} + +func (x *DeleteMemoViewRequest) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +var File_api_v1_memo_view_service_proto protoreflect.FileDescriptor + +const file_api_v1_memo_view_service_proto_rawDesc = "" + + "\n" + + "\x1eapi/v1/memo_view_service.proto\x12\fmemos.api.v1\x1a\x1cgoogle/api/annotations.proto\x1a\x17google/api/client.proto\x1a\x1fgoogle/api/field_behavior.proto\x1a\x19google/api/resource.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a google/protobuf/field_mask.proto\"\x9f\x01\n" + + "\bMemoView\x12\x17\n" + + "\x04name\x18\x01 \x01(\tB\x03\xe0A\bR\x04name\x12\x19\n" + + "\x05title\x18\x02 \x01(\tB\x03\xe0A\x02R\x05title\x12\x1b\n" + + "\x06filter\x18\x03 \x01(\tB\x03\xe0A\x02R\x06filter:B\xeaA?\n" + + "\x15memos.api.v1/MemoView\x12\x19users/{user}/views/{view}*\x05views2\x04view\"M\n" + + "\x14ListMemoViewsRequest\x125\n" + + "\x06parent\x18\x01 \x01(\tB\x1d\xe0A\x02\xfaA\x17\x12\x15memos.api.v1/MemoViewR\x06parent\"N\n" + + "\x15ListMemoViewsResponse\x125\n" + + "\n" + + "memo_views\x18\x01 \x03(\v2\x16.memos.api.v1.MemoViewR\tmemoViews\"G\n" + + "\x12GetMemoViewRequest\x121\n" + + "\x04name\x18\x01 \x01(\tB\x1d\xe0A\x02\xfaA\x17\n" + + "\x15memos.api.v1/MemoViewR\x04name\"\xb2\x01\n" + + "\x15CreateMemoViewRequest\x125\n" + + "\x06parent\x18\x01 \x01(\tB\x1d\xe0A\x02\xfaA\x17\x12\x15memos.api.v1/MemoViewR\x06parent\x128\n" + + "\tmemo_view\x18\x02 \x01(\v2\x16.memos.api.v1.MemoViewB\x03\xe0A\x02R\bmemoView\x12(\n" + + "\rvalidate_only\x18\x03 \x01(\bB\x03\xe0A\x01R\fvalidateOnly\"\x93\x01\n" + + "\x15UpdateMemoViewRequest\x128\n" + + "\tmemo_view\x18\x01 \x01(\v2\x16.memos.api.v1.MemoViewB\x03\xe0A\x02R\bmemoView\x12@\n" + + "\vupdate_mask\x18\x02 \x01(\v2\x1a.google.protobuf.FieldMaskB\x03\xe0A\x01R\n" + + "updateMask\"J\n" + + "\x15DeleteMemoViewRequest\x121\n" + + "\x04name\x18\x01 \x01(\tB\x1d\xe0A\x02\xfaA\x17\n" + + "\x15memos.api.v1/MemoViewR\x04name2\xce\x05\n" + + "\x0fMemoViewService\x12\x89\x01\n" + + "\rListMemoViews\x12\".memos.api.v1.ListMemoViewsRequest\x1a#.memos.api.v1.ListMemoViewsResponse\"/\xdaA\x06parent\x82\xd3\xe4\x93\x02 \x12\x1e/api/v1/{parent=users/*}/views\x12v\n" + + "\vGetMemoView\x12 .memos.api.v1.GetMemoViewRequest\x1a\x16.memos.api.v1.MemoView\"-\xdaA\x04name\x82\xd3\xe4\x93\x02 \x12\x1e/api/v1/{name=users/*/views/*}\x12\x93\x01\n" + + "\x0eCreateMemoView\x12#.memos.api.v1.CreateMemoViewRequest\x1a\x16.memos.api.v1.MemoView\"D\xdaA\x10parent,memo_view\x82\xd3\xe4\x93\x02+:\tmemo_view\"\x1e/api/v1/{parent=users/*}/views\x12\xa2\x01\n" + + "\x0eUpdateMemoView\x12#.memos.api.v1.UpdateMemoViewRequest\x1a\x16.memos.api.v1.MemoView\"S\xdaA\x15memo_view,update_mask\x82\xd3\xe4\x93\x025:\tmemo_view2(/api/v1/{memo_view.name=users/*/views/*}\x12|\n" + + "\x0eDeleteMemoView\x12#.memos.api.v1.DeleteMemoViewRequest\x1a\x16.google.protobuf.Empty\"-\xdaA\x04name\x82\xd3\xe4\x93\x02 *\x1e/api/v1/{name=users/*/views/*}B\xac\x01\n" + + "\x10com.memos.api.v1B\x14MemoViewServiceProtoP\x01Z0github.com/usememos/memos/proto/gen/api/v1;apiv1\xa2\x02\x03MAX\xaa\x02\fMemos.Api.V1\xca\x02\fMemos\\Api\\V1\xe2\x02\x18Memos\\Api\\V1\\GPBMetadata\xea\x02\x0eMemos::Api::V1b\x06proto3" + +var ( + file_api_v1_memo_view_service_proto_rawDescOnce sync.Once + file_api_v1_memo_view_service_proto_rawDescData []byte +) + +func file_api_v1_memo_view_service_proto_rawDescGZIP() []byte { + file_api_v1_memo_view_service_proto_rawDescOnce.Do(func() { + file_api_v1_memo_view_service_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_api_v1_memo_view_service_proto_rawDesc), len(file_api_v1_memo_view_service_proto_rawDesc))) + }) + return file_api_v1_memo_view_service_proto_rawDescData +} + +var file_api_v1_memo_view_service_proto_msgTypes = make([]protoimpl.MessageInfo, 7) +var file_api_v1_memo_view_service_proto_goTypes = []any{ + (*MemoView)(nil), // 0: memos.api.v1.MemoView + (*ListMemoViewsRequest)(nil), // 1: memos.api.v1.ListMemoViewsRequest + (*ListMemoViewsResponse)(nil), // 2: memos.api.v1.ListMemoViewsResponse + (*GetMemoViewRequest)(nil), // 3: memos.api.v1.GetMemoViewRequest + (*CreateMemoViewRequest)(nil), // 4: memos.api.v1.CreateMemoViewRequest + (*UpdateMemoViewRequest)(nil), // 5: memos.api.v1.UpdateMemoViewRequest + (*DeleteMemoViewRequest)(nil), // 6: memos.api.v1.DeleteMemoViewRequest + (*fieldmaskpb.FieldMask)(nil), // 7: google.protobuf.FieldMask + (*emptypb.Empty)(nil), // 8: google.protobuf.Empty +} +var file_api_v1_memo_view_service_proto_depIdxs = []int32{ + 0, // 0: memos.api.v1.ListMemoViewsResponse.memo_views:type_name -> memos.api.v1.MemoView + 0, // 1: memos.api.v1.CreateMemoViewRequest.memo_view:type_name -> memos.api.v1.MemoView + 0, // 2: memos.api.v1.UpdateMemoViewRequest.memo_view:type_name -> memos.api.v1.MemoView + 7, // 3: memos.api.v1.UpdateMemoViewRequest.update_mask:type_name -> google.protobuf.FieldMask + 1, // 4: memos.api.v1.MemoViewService.ListMemoViews:input_type -> memos.api.v1.ListMemoViewsRequest + 3, // 5: memos.api.v1.MemoViewService.GetMemoView:input_type -> memos.api.v1.GetMemoViewRequest + 4, // 6: memos.api.v1.MemoViewService.CreateMemoView:input_type -> memos.api.v1.CreateMemoViewRequest + 5, // 7: memos.api.v1.MemoViewService.UpdateMemoView:input_type -> memos.api.v1.UpdateMemoViewRequest + 6, // 8: memos.api.v1.MemoViewService.DeleteMemoView:input_type -> memos.api.v1.DeleteMemoViewRequest + 2, // 9: memos.api.v1.MemoViewService.ListMemoViews:output_type -> memos.api.v1.ListMemoViewsResponse + 0, // 10: memos.api.v1.MemoViewService.GetMemoView:output_type -> memos.api.v1.MemoView + 0, // 11: memos.api.v1.MemoViewService.CreateMemoView:output_type -> memos.api.v1.MemoView + 0, // 12: memos.api.v1.MemoViewService.UpdateMemoView:output_type -> memos.api.v1.MemoView + 8, // 13: memos.api.v1.MemoViewService.DeleteMemoView:output_type -> google.protobuf.Empty + 9, // [9:14] is the sub-list for method output_type + 4, // [4:9] is the sub-list for method input_type + 4, // [4:4] is the sub-list for extension type_name + 4, // [4:4] is the sub-list for extension extendee + 0, // [0:4] is the sub-list for field type_name +} + +func init() { file_api_v1_memo_view_service_proto_init() } +func file_api_v1_memo_view_service_proto_init() { + if File_api_v1_memo_view_service_proto != nil { + return + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_api_v1_memo_view_service_proto_rawDesc), len(file_api_v1_memo_view_service_proto_rawDesc)), + NumEnums: 0, + NumMessages: 7, + NumExtensions: 0, + NumServices: 1, + }, + GoTypes: file_api_v1_memo_view_service_proto_goTypes, + DependencyIndexes: file_api_v1_memo_view_service_proto_depIdxs, + MessageInfos: file_api_v1_memo_view_service_proto_msgTypes, + }.Build() + File_api_v1_memo_view_service_proto = out.File + file_api_v1_memo_view_service_proto_goTypes = nil + file_api_v1_memo_view_service_proto_depIdxs = nil +} diff --git a/proto/gen/api/v1/shortcut_service.pb.gw.go b/proto/gen/api/v1/memo_view_service.pb.gw.go similarity index 65% rename from proto/gen/api/v1/shortcut_service.pb.gw.go rename to proto/gen/api/v1/memo_view_service.pb.gw.go index 0e15ae29..73fd9ee7 100644 --- a/proto/gen/api/v1/shortcut_service.pb.gw.go +++ b/proto/gen/api/v1/memo_view_service.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: api/v1/shortcut_service.proto +// source: api/v1/memo_view_service.proto /* Package apiv1 is a reverse proxy. @@ -35,30 +35,9 @@ var ( _ = metadata.Join ) -func request_ShortcutService_ListShortcuts_0(ctx context.Context, marshaler runtime.Marshaler, client ShortcutServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func request_MemoViewService_ListMemoViews_0(ctx context.Context, marshaler runtime.Marshaler, client MemoViewServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var ( - protoReq ListShortcutsRequest - metadata runtime.ServerMetadata - err error - ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } - val, ok := pathParams["parent"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent") - } - protoReq.Parent, err = runtime.String(val) - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err) - } - msg, err := client.ListShortcuts(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err -} - -func local_request_ShortcutService_ListShortcuts_0(ctx context.Context, marshaler runtime.Marshaler, server ShortcutServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq ListShortcutsRequest + protoReq ListMemoViewsRequest metadata runtime.ServerMetadata err error ) @@ -70,34 +49,34 @@ func local_request_ShortcutService_ListShortcuts_0(ctx context.Context, marshale if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err) } - msg, err := server.ListShortcuts(ctx, &protoReq) - return msg, metadata, err -} - -func request_ShortcutService_GetShortcut_0(ctx context.Context, marshaler runtime.Marshaler, client ShortcutServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq GetShortcutRequest - metadata runtime.ServerMetadata - err error - ) if req.Body != nil { _, _ = io.Copy(io.Discard, req.Body) } - val, ok := pathParams["name"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") - } - protoReq.Name, err = runtime.String(val) - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) - } - msg, err := client.GetShortcut(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.ListMemoViews(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_ShortcutService_GetShortcut_0(ctx context.Context, marshaler runtime.Marshaler, server ShortcutServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func local_request_MemoViewService_ListMemoViews_0(ctx context.Context, marshaler runtime.Marshaler, server MemoViewServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var ( - protoReq GetShortcutRequest + protoReq ListMemoViewsRequest + metadata runtime.ServerMetadata + err error + ) + val, ok := pathParams["parent"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent") + } + protoReq.Parent, err = runtime.String(val) + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err) + } + msg, err := server.ListMemoViews(ctx, &protoReq) + return msg, metadata, err +} + +func request_MemoViewService_GetMemoView_0(ctx context.Context, marshaler runtime.Marshaler, client MemoViewServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var ( + protoReq GetMemoViewRequest metadata runtime.ServerMetadata err error ) @@ -109,49 +88,40 @@ func local_request_ShortcutService_GetShortcut_0(ctx context.Context, marshaler if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } - msg, err := server.GetShortcut(ctx, &protoReq) - return msg, metadata, err -} - -var filter_ShortcutService_CreateShortcut_0 = &utilities.DoubleArray{Encoding: map[string]int{"shortcut": 0, "parent": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} - -func request_ShortcutService_CreateShortcut_0(ctx context.Context, marshaler runtime.Marshaler, client ShortcutServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq CreateShortcutRequest - metadata runtime.ServerMetadata - err error - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Shortcut); err != nil && !errors.Is(err, io.EOF) { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } if req.Body != nil { _, _ = io.Copy(io.Discard, req.Body) } - val, ok := pathParams["parent"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent") - } - protoReq.Parent, err = runtime.String(val) - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err) - } - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_ShortcutService_CreateShortcut_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - msg, err := client.CreateShortcut(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.GetMemoView(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_ShortcutService_CreateShortcut_0(ctx context.Context, marshaler runtime.Marshaler, server ShortcutServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func local_request_MemoViewService_GetMemoView_0(ctx context.Context, marshaler runtime.Marshaler, server MemoViewServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var ( - protoReq CreateShortcutRequest + protoReq GetMemoViewRequest metadata runtime.ServerMetadata err error ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Shortcut); err != nil && !errors.Is(err, io.EOF) { + val, ok := pathParams["name"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") + } + protoReq.Name, err = runtime.String(val) + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) + } + msg, err := server.GetMemoView(ctx, &protoReq) + return msg, metadata, err +} + +var filter_MemoViewService_CreateMemoView_0 = &utilities.DoubleArray{Encoding: map[string]int{"memo_view": 0, "parent": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} + +func request_MemoViewService_CreateMemoView_0(ctx context.Context, marshaler runtime.Marshaler, client MemoViewServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var ( + protoReq CreateMemoViewRequest + metadata runtime.ServerMetadata + err error + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.MemoView); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } val, ok := pathParams["parent"] @@ -165,18 +135,48 @@ func local_request_ShortcutService_CreateShortcut_0(ctx context.Context, marshal if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_ShortcutService_CreateShortcut_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_MemoViewService_CreateMemoView_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.CreateShortcut(ctx, &protoReq) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + msg, err := client.CreateMemoView(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -var filter_ShortcutService_UpdateShortcut_0 = &utilities.DoubleArray{Encoding: map[string]int{"shortcut": 0, "name": 1}, Base: []int{1, 2, 1, 0, 0}, Check: []int{0, 1, 2, 3, 2}} - -func request_ShortcutService_UpdateShortcut_0(ctx context.Context, marshaler runtime.Marshaler, client ShortcutServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func local_request_MemoViewService_CreateMemoView_0(ctx context.Context, marshaler runtime.Marshaler, server MemoViewServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var ( - protoReq UpdateShortcutRequest + protoReq CreateMemoViewRequest + metadata runtime.ServerMetadata + err error + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.MemoView); err != nil && !errors.Is(err, io.EOF) { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + val, ok := pathParams["parent"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent") + } + protoReq.Parent, err = runtime.String(val) + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err) + } + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_MemoViewService_CreateMemoView_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + msg, err := server.CreateMemoView(ctx, &protoReq) + return msg, metadata, err +} + +var filter_MemoViewService_UpdateMemoView_0 = &utilities.DoubleArray{Encoding: map[string]int{"memo_view": 0, "name": 1}, Base: []int{1, 2, 1, 0, 0}, Check: []int{0, 1, 2, 3, 2}} + +func request_MemoViewService_UpdateMemoView_0(ctx context.Context, marshaler runtime.Marshaler, client MemoViewServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var ( + protoReq UpdateMemoViewRequest metadata runtime.ServerMetadata err error ) @@ -184,40 +184,40 @@ func request_ShortcutService_UpdateShortcut_0(ctx context.Context, marshaler run if berr != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Shortcut); err != nil && !errors.Is(err, io.EOF) { + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.MemoView); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { - if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Shortcut); err != nil { + if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.MemoView); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } else { protoReq.UpdateMask = fieldMask } } - val, ok := pathParams["shortcut.name"] + val, ok := pathParams["memo_view.name"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "shortcut.name") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "memo_view.name") } - err = runtime.PopulateFieldFromPath(&protoReq, "shortcut.name", val) + err = runtime.PopulateFieldFromPath(&protoReq, "memo_view.name", val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "shortcut.name", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "memo_view.name", err) } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_ShortcutService_UpdateShortcut_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_MemoViewService_UpdateMemoView_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.UpdateShortcut(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + msg, err := client.UpdateMemoView(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_ShortcutService_UpdateShortcut_0(ctx context.Context, marshaler runtime.Marshaler, server ShortcutServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func local_request_MemoViewService_UpdateMemoView_0(ctx context.Context, marshaler runtime.Marshaler, server MemoViewServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var ( - protoReq UpdateShortcutRequest + protoReq UpdateMemoViewRequest metadata runtime.ServerMetadata err error ) @@ -225,58 +225,58 @@ func local_request_ShortcutService_UpdateShortcut_0(ctx context.Context, marshal if berr != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Shortcut); err != nil && !errors.Is(err, io.EOF) { + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.MemoView); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { - if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Shortcut); err != nil { + if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.MemoView); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } else { protoReq.UpdateMask = fieldMask } } - val, ok := pathParams["shortcut.name"] + val, ok := pathParams["memo_view.name"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "shortcut.name") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "memo_view.name") } - err = runtime.PopulateFieldFromPath(&protoReq, "shortcut.name", val) + err = runtime.PopulateFieldFromPath(&protoReq, "memo_view.name", val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "shortcut.name", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "memo_view.name", err) } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_ShortcutService_UpdateShortcut_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_MemoViewService_UpdateMemoView_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.UpdateShortcut(ctx, &protoReq) + msg, err := server.UpdateMemoView(ctx, &protoReq) return msg, metadata, err } -func request_ShortcutService_DeleteShortcut_0(ctx context.Context, marshaler runtime.Marshaler, client ShortcutServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func request_MemoViewService_DeleteMemoView_0(ctx context.Context, marshaler runtime.Marshaler, client MemoViewServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var ( - protoReq DeleteShortcutRequest + protoReq DeleteMemoViewRequest metadata runtime.ServerMetadata err error ) + val, ok := pathParams["name"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") + } + protoReq.Name, err = runtime.String(val) + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) + } if req.Body != nil { _, _ = io.Copy(io.Discard, req.Body) } - val, ok := pathParams["name"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") - } - protoReq.Name, err = runtime.String(val) - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) - } - msg, err := client.DeleteShortcut(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.DeleteMemoView(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_ShortcutService_DeleteShortcut_0(ctx context.Context, marshaler runtime.Marshaler, server ShortcutServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func local_request_MemoViewService_DeleteMemoView_0(ctx context.Context, marshaler runtime.Marshaler, server MemoViewServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var ( - protoReq DeleteShortcutRequest + protoReq DeleteMemoViewRequest metadata runtime.ServerMetadata err error ) @@ -288,123 +288,123 @@ func local_request_ShortcutService_DeleteShortcut_0(ctx context.Context, marshal if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } - msg, err := server.DeleteShortcut(ctx, &protoReq) + msg, err := server.DeleteMemoView(ctx, &protoReq) return msg, metadata, err } -// RegisterShortcutServiceHandlerServer registers the http handlers for service ShortcutService to "mux". -// UnaryRPC :call ShortcutServiceServer directly. +// RegisterMemoViewServiceHandlerServer registers the http handlers for service MemoViewService to "mux". +// UnaryRPC :call MemoViewServiceServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. -// Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterShortcutServiceHandlerFromEndpoint instead. +// Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterMemoViewServiceHandlerFromEndpoint instead. // GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call. -func RegisterShortcutServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server ShortcutServiceServer) error { - mux.Handle(http.MethodGet, pattern_ShortcutService_ListShortcuts_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { +func RegisterMemoViewServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server MemoViewServiceServer) error { + mux.Handle(http.MethodGet, pattern_MemoViewService_ListMemoViews_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v1.ShortcutService/ListShortcuts", runtime.WithHTTPPathPattern("/api/v1/{parent=users/*}/shortcuts")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v1.MemoViewService/ListMemoViews", runtime.WithHTTPPathPattern("/api/v1/{parent=users/*}/views")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_ShortcutService_ListShortcuts_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_MemoViewService_ListMemoViews_0(annotatedContext, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) if err != nil { runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_ShortcutService_ListShortcuts_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_MemoViewService_ListMemoViews_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle(http.MethodGet, pattern_ShortcutService_GetShortcut_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_MemoViewService_GetMemoView_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v1.ShortcutService/GetShortcut", runtime.WithHTTPPathPattern("/api/v1/{name=users/*/shortcuts/*}")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v1.MemoViewService/GetMemoView", runtime.WithHTTPPathPattern("/api/v1/{name=users/*/views/*}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_ShortcutService_GetShortcut_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_MemoViewService_GetMemoView_0(annotatedContext, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) if err != nil { runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_ShortcutService_GetShortcut_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_MemoViewService_GetMemoView_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle(http.MethodPost, pattern_ShortcutService_CreateShortcut_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_MemoViewService_CreateMemoView_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v1.ShortcutService/CreateShortcut", runtime.WithHTTPPathPattern("/api/v1/{parent=users/*}/shortcuts")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v1.MemoViewService/CreateMemoView", runtime.WithHTTPPathPattern("/api/v1/{parent=users/*}/views")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_ShortcutService_CreateShortcut_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_MemoViewService_CreateMemoView_0(annotatedContext, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) if err != nil { runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_ShortcutService_CreateShortcut_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_MemoViewService_CreateMemoView_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle(http.MethodPatch, pattern_ShortcutService_UpdateShortcut_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPatch, pattern_MemoViewService_UpdateMemoView_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v1.ShortcutService/UpdateShortcut", runtime.WithHTTPPathPattern("/api/v1/{shortcut.name=users/*/shortcuts/*}")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v1.MemoViewService/UpdateMemoView", runtime.WithHTTPPathPattern("/api/v1/{memo_view.name=users/*/views/*}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_ShortcutService_UpdateShortcut_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_MemoViewService_UpdateMemoView_0(annotatedContext, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) if err != nil { runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_ShortcutService_UpdateShortcut_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_MemoViewService_UpdateMemoView_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle(http.MethodDelete, pattern_ShortcutService_DeleteShortcut_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodDelete, pattern_MemoViewService_DeleteMemoView_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v1.ShortcutService/DeleteShortcut", runtime.WithHTTPPathPattern("/api/v1/{name=users/*/shortcuts/*}")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v1.MemoViewService/DeleteMemoView", runtime.WithHTTPPathPattern("/api/v1/{name=users/*/views/*}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_ShortcutService_DeleteShortcut_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_MemoViewService_DeleteMemoView_0(annotatedContext, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) if err != nil { runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_ShortcutService_DeleteShortcut_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_MemoViewService_DeleteMemoView_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) return nil } -// RegisterShortcutServiceHandlerFromEndpoint is same as RegisterShortcutServiceHandler but +// RegisterMemoViewServiceHandlerFromEndpoint is same as RegisterMemoViewServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. -func RegisterShortcutServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { +func RegisterMemoViewServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err @@ -423,121 +423,121 @@ func RegisterShortcutServiceHandlerFromEndpoint(ctx context.Context, mux *runtim } }() }() - return RegisterShortcutServiceHandler(ctx, mux, conn) + return RegisterMemoViewServiceHandler(ctx, mux, conn) } -// RegisterShortcutServiceHandler registers the http handlers for service ShortcutService to "mux". +// RegisterMemoViewServiceHandler registers the http handlers for service MemoViewService to "mux". // The handlers forward requests to the grpc endpoint over "conn". -func RegisterShortcutServiceHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error { - return RegisterShortcutServiceHandlerClient(ctx, mux, NewShortcutServiceClient(conn)) +func RegisterMemoViewServiceHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error { + return RegisterMemoViewServiceHandlerClient(ctx, mux, NewMemoViewServiceClient(conn)) } -// RegisterShortcutServiceHandlerClient registers the http handlers for service ShortcutService -// to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "ShortcutServiceClient". -// Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "ShortcutServiceClient" +// RegisterMemoViewServiceHandlerClient registers the http handlers for service MemoViewService +// to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "MemoViewServiceClient". +// Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "MemoViewServiceClient" // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in -// "ShortcutServiceClient" to call the correct interceptors. This client ignores the HTTP middlewares. -func RegisterShortcutServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client ShortcutServiceClient) error { - mux.Handle(http.MethodGet, pattern_ShortcutService_ListShortcuts_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { +// "MemoViewServiceClient" to call the correct interceptors. This client ignores the HTTP middlewares. +func RegisterMemoViewServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client MemoViewServiceClient) error { + mux.Handle(http.MethodGet, pattern_MemoViewService_ListMemoViews_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/memos.api.v1.ShortcutService/ListShortcuts", runtime.WithHTTPPathPattern("/api/v1/{parent=users/*}/shortcuts")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/memos.api.v1.MemoViewService/ListMemoViews", runtime.WithHTTPPathPattern("/api/v1/{parent=users/*}/views")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_ShortcutService_ListShortcuts_0(annotatedContext, inboundMarshaler, client, req, pathParams) + resp, md, err := request_MemoViewService_ListMemoViews_0(annotatedContext, inboundMarshaler, client, req, pathParams) annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) if err != nil { runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_ShortcutService_ListShortcuts_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_MemoViewService_ListMemoViews_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle(http.MethodGet, pattern_ShortcutService_GetShortcut_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_MemoViewService_GetMemoView_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/memos.api.v1.ShortcutService/GetShortcut", runtime.WithHTTPPathPattern("/api/v1/{name=users/*/shortcuts/*}")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/memos.api.v1.MemoViewService/GetMemoView", runtime.WithHTTPPathPattern("/api/v1/{name=users/*/views/*}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_ShortcutService_GetShortcut_0(annotatedContext, inboundMarshaler, client, req, pathParams) + resp, md, err := request_MemoViewService_GetMemoView_0(annotatedContext, inboundMarshaler, client, req, pathParams) annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) if err != nil { runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_ShortcutService_GetShortcut_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_MemoViewService_GetMemoView_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle(http.MethodPost, pattern_ShortcutService_CreateShortcut_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_MemoViewService_CreateMemoView_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/memos.api.v1.ShortcutService/CreateShortcut", runtime.WithHTTPPathPattern("/api/v1/{parent=users/*}/shortcuts")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/memos.api.v1.MemoViewService/CreateMemoView", runtime.WithHTTPPathPattern("/api/v1/{parent=users/*}/views")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_ShortcutService_CreateShortcut_0(annotatedContext, inboundMarshaler, client, req, pathParams) + resp, md, err := request_MemoViewService_CreateMemoView_0(annotatedContext, inboundMarshaler, client, req, pathParams) annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) if err != nil { runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_ShortcutService_CreateShortcut_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_MemoViewService_CreateMemoView_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle(http.MethodPatch, pattern_ShortcutService_UpdateShortcut_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPatch, pattern_MemoViewService_UpdateMemoView_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/memos.api.v1.ShortcutService/UpdateShortcut", runtime.WithHTTPPathPattern("/api/v1/{shortcut.name=users/*/shortcuts/*}")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/memos.api.v1.MemoViewService/UpdateMemoView", runtime.WithHTTPPathPattern("/api/v1/{memo_view.name=users/*/views/*}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_ShortcutService_UpdateShortcut_0(annotatedContext, inboundMarshaler, client, req, pathParams) + resp, md, err := request_MemoViewService_UpdateMemoView_0(annotatedContext, inboundMarshaler, client, req, pathParams) annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) if err != nil { runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_ShortcutService_UpdateShortcut_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_MemoViewService_UpdateMemoView_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle(http.MethodDelete, pattern_ShortcutService_DeleteShortcut_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodDelete, pattern_MemoViewService_DeleteMemoView_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/memos.api.v1.ShortcutService/DeleteShortcut", runtime.WithHTTPPathPattern("/api/v1/{name=users/*/shortcuts/*}")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/memos.api.v1.MemoViewService/DeleteMemoView", runtime.WithHTTPPathPattern("/api/v1/{name=users/*/views/*}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_ShortcutService_DeleteShortcut_0(annotatedContext, inboundMarshaler, client, req, pathParams) + resp, md, err := request_MemoViewService_DeleteMemoView_0(annotatedContext, inboundMarshaler, client, req, pathParams) annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) if err != nil { runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_ShortcutService_DeleteShortcut_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_MemoViewService_DeleteMemoView_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) return nil } var ( - pattern_ShortcutService_ListShortcuts_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 2, 5, 3, 2, 4}, []string{"api", "v1", "users", "parent", "shortcuts"}, "")) - pattern_ShortcutService_GetShortcut_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 2, 3, 1, 0, 4, 4, 5, 4}, []string{"api", "v1", "users", "shortcuts", "name"}, "")) - pattern_ShortcutService_CreateShortcut_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 2, 5, 3, 2, 4}, []string{"api", "v1", "users", "parent", "shortcuts"}, "")) - pattern_ShortcutService_UpdateShortcut_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 2, 3, 1, 0, 4, 4, 5, 4}, []string{"api", "v1", "users", "shortcuts", "shortcut.name"}, "")) - pattern_ShortcutService_DeleteShortcut_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 2, 3, 1, 0, 4, 4, 5, 4}, []string{"api", "v1", "users", "shortcuts", "name"}, "")) + pattern_MemoViewService_ListMemoViews_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 2, 5, 3, 2, 4}, []string{"api", "v1", "users", "parent", "views"}, "")) + pattern_MemoViewService_GetMemoView_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 2, 3, 1, 0, 4, 4, 5, 4}, []string{"api", "v1", "users", "views", "name"}, "")) + pattern_MemoViewService_CreateMemoView_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 2, 5, 3, 2, 4}, []string{"api", "v1", "users", "parent", "views"}, "")) + pattern_MemoViewService_UpdateMemoView_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 2, 3, 1, 0, 4, 4, 5, 4}, []string{"api", "v1", "users", "views", "memo_view.name"}, "")) + pattern_MemoViewService_DeleteMemoView_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 2, 3, 1, 0, 4, 4, 5, 4}, []string{"api", "v1", "users", "views", "name"}, "")) ) var ( - forward_ShortcutService_ListShortcuts_0 = runtime.ForwardResponseMessage - forward_ShortcutService_GetShortcut_0 = runtime.ForwardResponseMessage - forward_ShortcutService_CreateShortcut_0 = runtime.ForwardResponseMessage - forward_ShortcutService_UpdateShortcut_0 = runtime.ForwardResponseMessage - forward_ShortcutService_DeleteShortcut_0 = runtime.ForwardResponseMessage + forward_MemoViewService_ListMemoViews_0 = runtime.ForwardResponseMessage + forward_MemoViewService_GetMemoView_0 = runtime.ForwardResponseMessage + forward_MemoViewService_CreateMemoView_0 = runtime.ForwardResponseMessage + forward_MemoViewService_UpdateMemoView_0 = runtime.ForwardResponseMessage + forward_MemoViewService_DeleteMemoView_0 = runtime.ForwardResponseMessage ) diff --git a/proto/gen/api/v1/memo_view_service_grpc.pb.go b/proto/gen/api/v1/memo_view_service_grpc.pb.go new file mode 100644 index 00000000..97503005 --- /dev/null +++ b/proto/gen/api/v1/memo_view_service_grpc.pb.go @@ -0,0 +1,288 @@ +// Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.6.2 +// - protoc (unknown) +// source: api/v1/memo_view_service.proto + +package apiv1 + +import ( + context "context" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + emptypb "google.golang.org/protobuf/types/known/emptypb" +) + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 + +const ( + MemoViewService_ListMemoViews_FullMethodName = "/memos.api.v1.MemoViewService/ListMemoViews" + MemoViewService_GetMemoView_FullMethodName = "/memos.api.v1.MemoViewService/GetMemoView" + MemoViewService_CreateMemoView_FullMethodName = "/memos.api.v1.MemoViewService/CreateMemoView" + MemoViewService_UpdateMemoView_FullMethodName = "/memos.api.v1.MemoViewService/UpdateMemoView" + MemoViewService_DeleteMemoView_FullMethodName = "/memos.api.v1.MemoViewService/DeleteMemoView" +) + +// MemoViewServiceClient is the client API for MemoViewService service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +type MemoViewServiceClient interface { + // ListMemoViews returns a user's memo views. Each view is a named, reusable + // CEL filter (see MemoView.filter); pass its filter string directly to the + // ListMemos `filter` argument. + ListMemoViews(ctx context.Context, in *ListMemoViewsRequest, opts ...grpc.CallOption) (*ListMemoViewsResponse, error) + // GetMemoView gets a memo view by name. + GetMemoView(ctx context.Context, in *GetMemoViewRequest, opts ...grpc.CallOption) (*MemoView, error) + // CreateMemoView creates a new memo view for a user. + CreateMemoView(ctx context.Context, in *CreateMemoViewRequest, opts ...grpc.CallOption) (*MemoView, error) + // UpdateMemoView updates a memo view for a user. + UpdateMemoView(ctx context.Context, in *UpdateMemoViewRequest, opts ...grpc.CallOption) (*MemoView, error) + // DeleteMemoView deletes a memo view for a user. + DeleteMemoView(ctx context.Context, in *DeleteMemoViewRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) +} + +type memoViewServiceClient struct { + cc grpc.ClientConnInterface +} + +func NewMemoViewServiceClient(cc grpc.ClientConnInterface) MemoViewServiceClient { + return &memoViewServiceClient{cc} +} + +func (c *memoViewServiceClient) ListMemoViews(ctx context.Context, in *ListMemoViewsRequest, opts ...grpc.CallOption) (*ListMemoViewsResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(ListMemoViewsResponse) + err := c.cc.Invoke(ctx, MemoViewService_ListMemoViews_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *memoViewServiceClient) GetMemoView(ctx context.Context, in *GetMemoViewRequest, opts ...grpc.CallOption) (*MemoView, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(MemoView) + err := c.cc.Invoke(ctx, MemoViewService_GetMemoView_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *memoViewServiceClient) CreateMemoView(ctx context.Context, in *CreateMemoViewRequest, opts ...grpc.CallOption) (*MemoView, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(MemoView) + err := c.cc.Invoke(ctx, MemoViewService_CreateMemoView_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *memoViewServiceClient) UpdateMemoView(ctx context.Context, in *UpdateMemoViewRequest, opts ...grpc.CallOption) (*MemoView, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(MemoView) + err := c.cc.Invoke(ctx, MemoViewService_UpdateMemoView_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *memoViewServiceClient) DeleteMemoView(ctx context.Context, in *DeleteMemoViewRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(emptypb.Empty) + err := c.cc.Invoke(ctx, MemoViewService_DeleteMemoView_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +// MemoViewServiceServer is the server API for MemoViewService service. +// All implementations must embed UnimplementedMemoViewServiceServer +// for forward compatibility. +type MemoViewServiceServer interface { + // ListMemoViews returns a user's memo views. Each view is a named, reusable + // CEL filter (see MemoView.filter); pass its filter string directly to the + // ListMemos `filter` argument. + ListMemoViews(context.Context, *ListMemoViewsRequest) (*ListMemoViewsResponse, error) + // GetMemoView gets a memo view by name. + GetMemoView(context.Context, *GetMemoViewRequest) (*MemoView, error) + // CreateMemoView creates a new memo view for a user. + CreateMemoView(context.Context, *CreateMemoViewRequest) (*MemoView, error) + // UpdateMemoView updates a memo view for a user. + UpdateMemoView(context.Context, *UpdateMemoViewRequest) (*MemoView, error) + // DeleteMemoView deletes a memo view for a user. + DeleteMemoView(context.Context, *DeleteMemoViewRequest) (*emptypb.Empty, error) + mustEmbedUnimplementedMemoViewServiceServer() +} + +// UnimplementedMemoViewServiceServer must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedMemoViewServiceServer struct{} + +func (UnimplementedMemoViewServiceServer) ListMemoViews(context.Context, *ListMemoViewsRequest) (*ListMemoViewsResponse, error) { + return nil, status.Error(codes.Unimplemented, "method ListMemoViews not implemented") +} +func (UnimplementedMemoViewServiceServer) GetMemoView(context.Context, *GetMemoViewRequest) (*MemoView, error) { + return nil, status.Error(codes.Unimplemented, "method GetMemoView not implemented") +} +func (UnimplementedMemoViewServiceServer) CreateMemoView(context.Context, *CreateMemoViewRequest) (*MemoView, error) { + return nil, status.Error(codes.Unimplemented, "method CreateMemoView not implemented") +} +func (UnimplementedMemoViewServiceServer) UpdateMemoView(context.Context, *UpdateMemoViewRequest) (*MemoView, error) { + return nil, status.Error(codes.Unimplemented, "method UpdateMemoView not implemented") +} +func (UnimplementedMemoViewServiceServer) DeleteMemoView(context.Context, *DeleteMemoViewRequest) (*emptypb.Empty, error) { + return nil, status.Error(codes.Unimplemented, "method DeleteMemoView not implemented") +} +func (UnimplementedMemoViewServiceServer) mustEmbedUnimplementedMemoViewServiceServer() {} +func (UnimplementedMemoViewServiceServer) testEmbeddedByValue() {} + +// UnsafeMemoViewServiceServer may be embedded to opt out of forward compatibility for this service. +// Use of this interface is not recommended, as added methods to MemoViewServiceServer will +// result in compilation errors. +type UnsafeMemoViewServiceServer interface { + mustEmbedUnimplementedMemoViewServiceServer() +} + +func RegisterMemoViewServiceServer(s grpc.ServiceRegistrar, srv MemoViewServiceServer) { + // If the following call panics, it indicates UnimplementedMemoViewServiceServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } + s.RegisterService(&MemoViewService_ServiceDesc, srv) +} + +func _MemoViewService_ListMemoViews_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ListMemoViewsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MemoViewServiceServer).ListMemoViews(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: MemoViewService_ListMemoViews_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MemoViewServiceServer).ListMemoViews(ctx, req.(*ListMemoViewsRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _MemoViewService_GetMemoView_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetMemoViewRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MemoViewServiceServer).GetMemoView(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: MemoViewService_GetMemoView_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MemoViewServiceServer).GetMemoView(ctx, req.(*GetMemoViewRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _MemoViewService_CreateMemoView_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CreateMemoViewRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MemoViewServiceServer).CreateMemoView(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: MemoViewService_CreateMemoView_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MemoViewServiceServer).CreateMemoView(ctx, req.(*CreateMemoViewRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _MemoViewService_UpdateMemoView_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateMemoViewRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MemoViewServiceServer).UpdateMemoView(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: MemoViewService_UpdateMemoView_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MemoViewServiceServer).UpdateMemoView(ctx, req.(*UpdateMemoViewRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _MemoViewService_DeleteMemoView_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteMemoViewRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MemoViewServiceServer).DeleteMemoView(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: MemoViewService_DeleteMemoView_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MemoViewServiceServer).DeleteMemoView(ctx, req.(*DeleteMemoViewRequest)) + } + return interceptor(ctx, in, info, handler) +} + +// MemoViewService_ServiceDesc is the grpc.ServiceDesc for MemoViewService service. +// It's only intended for direct use with grpc.RegisterService, +// and not to be introspected or modified (even as a copy) +var MemoViewService_ServiceDesc = grpc.ServiceDesc{ + ServiceName: "memos.api.v1.MemoViewService", + HandlerType: (*MemoViewServiceServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "ListMemoViews", + Handler: _MemoViewService_ListMemoViews_Handler, + }, + { + MethodName: "GetMemoView", + Handler: _MemoViewService_GetMemoView_Handler, + }, + { + MethodName: "CreateMemoView", + Handler: _MemoViewService_CreateMemoView_Handler, + }, + { + MethodName: "UpdateMemoView", + Handler: _MemoViewService_UpdateMemoView_Handler, + }, + { + MethodName: "DeleteMemoView", + Handler: _MemoViewService_DeleteMemoView_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "api/v1/memo_view_service.proto", +} diff --git a/proto/gen/api/v1/shortcut_service.pb.go b/proto/gen/api/v1/shortcut_service.pb.go deleted file mode 100644 index cf9b38e3..00000000 --- a/proto/gen/api/v1/shortcut_service.pb.go +++ /dev/null @@ -1,497 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.36.11 -// protoc (unknown) -// source: api/v1/shortcut_service.proto - -package apiv1 - -import ( - _ "google.golang.org/genproto/googleapis/api/annotations" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - emptypb "google.golang.org/protobuf/types/known/emptypb" - fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb" - reflect "reflect" - sync "sync" - unsafe "unsafe" -) - -const ( - // Verify that this generated code is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) - // Verify that runtime/protoimpl is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) -) - -type Shortcut struct { - state protoimpl.MessageState `protogen:"open.v1"` - // The resource name of the shortcut. - // Format: users/{user}/shortcuts/{shortcut} - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - // The title of the shortcut. - Title string `protobuf:"bytes,2,opt,name=title,proto3" json:"title,omitempty"` - // The CEL filter expression for the shortcut, using the same grammar as the - // ListMemos `filter` argument. Reuse it by passing this value to ListMemos. - Filter string `protobuf:"bytes,3,opt,name=filter,proto3" json:"filter,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *Shortcut) Reset() { - *x = Shortcut{} - mi := &file_api_v1_shortcut_service_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *Shortcut) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*Shortcut) ProtoMessage() {} - -func (x *Shortcut) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_shortcut_service_proto_msgTypes[0] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use Shortcut.ProtoReflect.Descriptor instead. -func (*Shortcut) Descriptor() ([]byte, []int) { - return file_api_v1_shortcut_service_proto_rawDescGZIP(), []int{0} -} - -func (x *Shortcut) GetName() string { - if x != nil { - return x.Name - } - return "" -} - -func (x *Shortcut) GetTitle() string { - if x != nil { - return x.Title - } - return "" -} - -func (x *Shortcut) GetFilter() string { - if x != nil { - return x.Filter - } - return "" -} - -type ListShortcutsRequest struct { - state protoimpl.MessageState `protogen:"open.v1"` - // Required. The parent resource where shortcuts are listed. - // Format: users/{user} - Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *ListShortcutsRequest) Reset() { - *x = ListShortcutsRequest{} - mi := &file_api_v1_shortcut_service_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *ListShortcutsRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ListShortcutsRequest) ProtoMessage() {} - -func (x *ListShortcutsRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_shortcut_service_proto_msgTypes[1] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ListShortcutsRequest.ProtoReflect.Descriptor instead. -func (*ListShortcutsRequest) Descriptor() ([]byte, []int) { - return file_api_v1_shortcut_service_proto_rawDescGZIP(), []int{1} -} - -func (x *ListShortcutsRequest) GetParent() string { - if x != nil { - return x.Parent - } - return "" -} - -type ListShortcutsResponse struct { - state protoimpl.MessageState `protogen:"open.v1"` - // The list of shortcuts. - Shortcuts []*Shortcut `protobuf:"bytes,1,rep,name=shortcuts,proto3" json:"shortcuts,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *ListShortcutsResponse) Reset() { - *x = ListShortcutsResponse{} - mi := &file_api_v1_shortcut_service_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *ListShortcutsResponse) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ListShortcutsResponse) ProtoMessage() {} - -func (x *ListShortcutsResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_shortcut_service_proto_msgTypes[2] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ListShortcutsResponse.ProtoReflect.Descriptor instead. -func (*ListShortcutsResponse) Descriptor() ([]byte, []int) { - return file_api_v1_shortcut_service_proto_rawDescGZIP(), []int{2} -} - -func (x *ListShortcutsResponse) GetShortcuts() []*Shortcut { - if x != nil { - return x.Shortcuts - } - return nil -} - -type GetShortcutRequest struct { - state protoimpl.MessageState `protogen:"open.v1"` - // Required. The resource name of the shortcut to retrieve. - // Format: users/{user}/shortcuts/{shortcut} - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *GetShortcutRequest) Reset() { - *x = GetShortcutRequest{} - mi := &file_api_v1_shortcut_service_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *GetShortcutRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*GetShortcutRequest) ProtoMessage() {} - -func (x *GetShortcutRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_shortcut_service_proto_msgTypes[3] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use GetShortcutRequest.ProtoReflect.Descriptor instead. -func (*GetShortcutRequest) Descriptor() ([]byte, []int) { - return file_api_v1_shortcut_service_proto_rawDescGZIP(), []int{3} -} - -func (x *GetShortcutRequest) GetName() string { - if x != nil { - return x.Name - } - return "" -} - -type CreateShortcutRequest struct { - state protoimpl.MessageState `protogen:"open.v1"` - // Required. The parent resource where this shortcut will be created. - // Format: users/{user} - Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"` - // Required. The shortcut to create. - Shortcut *Shortcut `protobuf:"bytes,2,opt,name=shortcut,proto3" json:"shortcut,omitempty"` - // Optional. If set, validate the request, but do not actually create the shortcut. - ValidateOnly bool `protobuf:"varint,3,opt,name=validate_only,json=validateOnly,proto3" json:"validate_only,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *CreateShortcutRequest) Reset() { - *x = CreateShortcutRequest{} - mi := &file_api_v1_shortcut_service_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *CreateShortcutRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*CreateShortcutRequest) ProtoMessage() {} - -func (x *CreateShortcutRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_shortcut_service_proto_msgTypes[4] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use CreateShortcutRequest.ProtoReflect.Descriptor instead. -func (*CreateShortcutRequest) Descriptor() ([]byte, []int) { - return file_api_v1_shortcut_service_proto_rawDescGZIP(), []int{4} -} - -func (x *CreateShortcutRequest) GetParent() string { - if x != nil { - return x.Parent - } - return "" -} - -func (x *CreateShortcutRequest) GetShortcut() *Shortcut { - if x != nil { - return x.Shortcut - } - return nil -} - -func (x *CreateShortcutRequest) GetValidateOnly() bool { - if x != nil { - return x.ValidateOnly - } - return false -} - -type UpdateShortcutRequest struct { - state protoimpl.MessageState `protogen:"open.v1"` - // Required. The shortcut resource which replaces the resource on the server. - Shortcut *Shortcut `protobuf:"bytes,1,opt,name=shortcut,proto3" json:"shortcut,omitempty"` - // Optional. The list of fields to update. - UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *UpdateShortcutRequest) Reset() { - *x = UpdateShortcutRequest{} - mi := &file_api_v1_shortcut_service_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *UpdateShortcutRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*UpdateShortcutRequest) ProtoMessage() {} - -func (x *UpdateShortcutRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_shortcut_service_proto_msgTypes[5] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use UpdateShortcutRequest.ProtoReflect.Descriptor instead. -func (*UpdateShortcutRequest) Descriptor() ([]byte, []int) { - return file_api_v1_shortcut_service_proto_rawDescGZIP(), []int{5} -} - -func (x *UpdateShortcutRequest) GetShortcut() *Shortcut { - if x != nil { - return x.Shortcut - } - return nil -} - -func (x *UpdateShortcutRequest) GetUpdateMask() *fieldmaskpb.FieldMask { - if x != nil { - return x.UpdateMask - } - return nil -} - -type DeleteShortcutRequest struct { - state protoimpl.MessageState `protogen:"open.v1"` - // Required. The resource name of the shortcut to delete. - // Format: users/{user}/shortcuts/{shortcut} - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *DeleteShortcutRequest) Reset() { - *x = DeleteShortcutRequest{} - mi := &file_api_v1_shortcut_service_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *DeleteShortcutRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*DeleteShortcutRequest) ProtoMessage() {} - -func (x *DeleteShortcutRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_v1_shortcut_service_proto_msgTypes[6] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use DeleteShortcutRequest.ProtoReflect.Descriptor instead. -func (*DeleteShortcutRequest) Descriptor() ([]byte, []int) { - return file_api_v1_shortcut_service_proto_rawDescGZIP(), []int{6} -} - -func (x *DeleteShortcutRequest) GetName() string { - if x != nil { - return x.Name - } - return "" -} - -var File_api_v1_shortcut_service_proto protoreflect.FileDescriptor - -const file_api_v1_shortcut_service_proto_rawDesc = "" + - "\n" + - "\x1dapi/v1/shortcut_service.proto\x12\fmemos.api.v1\x1a\x1cgoogle/api/annotations.proto\x1a\x17google/api/client.proto\x1a\x1fgoogle/api/field_behavior.proto\x1a\x19google/api/resource.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a google/protobuf/field_mask.proto\"\xaf\x01\n" + - "\bShortcut\x12\x17\n" + - "\x04name\x18\x01 \x01(\tB\x03\xe0A\bR\x04name\x12\x19\n" + - "\x05title\x18\x02 \x01(\tB\x03\xe0A\x02R\x05title\x12\x1b\n" + - "\x06filter\x18\x03 \x01(\tB\x03\xe0A\x01R\x06filter:R\xeaAO\n" + - "\x15memos.api.v1/Shortcut\x12!users/{user}/shortcuts/{shortcut}*\tshortcuts2\bshortcut\"M\n" + - "\x14ListShortcutsRequest\x125\n" + - "\x06parent\x18\x01 \x01(\tB\x1d\xe0A\x02\xfaA\x17\x12\x15memos.api.v1/ShortcutR\x06parent\"M\n" + - "\x15ListShortcutsResponse\x124\n" + - "\tshortcuts\x18\x01 \x03(\v2\x16.memos.api.v1.ShortcutR\tshortcuts\"G\n" + - "\x12GetShortcutRequest\x121\n" + - "\x04name\x18\x01 \x01(\tB\x1d\xe0A\x02\xfaA\x17\n" + - "\x15memos.api.v1/ShortcutR\x04name\"\xb1\x01\n" + - "\x15CreateShortcutRequest\x125\n" + - "\x06parent\x18\x01 \x01(\tB\x1d\xe0A\x02\xfaA\x17\x12\x15memos.api.v1/ShortcutR\x06parent\x127\n" + - "\bshortcut\x18\x02 \x01(\v2\x16.memos.api.v1.ShortcutB\x03\xe0A\x02R\bshortcut\x12(\n" + - "\rvalidate_only\x18\x03 \x01(\bB\x03\xe0A\x01R\fvalidateOnly\"\x92\x01\n" + - "\x15UpdateShortcutRequest\x127\n" + - "\bshortcut\x18\x01 \x01(\v2\x16.memos.api.v1.ShortcutB\x03\xe0A\x02R\bshortcut\x12@\n" + - "\vupdate_mask\x18\x02 \x01(\v2\x1a.google.protobuf.FieldMaskB\x03\xe0A\x01R\n" + - "updateMask\"J\n" + - "\x15DeleteShortcutRequest\x121\n" + - "\x04name\x18\x01 \x01(\tB\x1d\xe0A\x02\xfaA\x17\n" + - "\x15memos.api.v1/ShortcutR\x04name2\xde\x05\n" + - "\x0fShortcutService\x12\x8d\x01\n" + - "\rListShortcuts\x12\".memos.api.v1.ListShortcutsRequest\x1a#.memos.api.v1.ListShortcutsResponse\"3\xdaA\x06parent\x82\xd3\xe4\x93\x02$\x12\"/api/v1/{parent=users/*}/shortcuts\x12z\n" + - "\vGetShortcut\x12 .memos.api.v1.GetShortcutRequest\x1a\x16.memos.api.v1.Shortcut\"1\xdaA\x04name\x82\xd3\xe4\x93\x02$\x12\"/api/v1/{name=users/*/shortcuts/*}\x12\x95\x01\n" + - "\x0eCreateShortcut\x12#.memos.api.v1.CreateShortcutRequest\x1a\x16.memos.api.v1.Shortcut\"F\xdaA\x0fparent,shortcut\x82\xd3\xe4\x93\x02.:\bshortcut\"\"/api/v1/{parent=users/*}/shortcuts\x12\xa3\x01\n" + - "\x0eUpdateShortcut\x12#.memos.api.v1.UpdateShortcutRequest\x1a\x16.memos.api.v1.Shortcut\"T\xdaA\x14shortcut,update_mask\x82\xd3\xe4\x93\x027:\bshortcut2+/api/v1/{shortcut.name=users/*/shortcuts/*}\x12\x80\x01\n" + - "\x0eDeleteShortcut\x12#.memos.api.v1.DeleteShortcutRequest\x1a\x16.google.protobuf.Empty\"1\xdaA\x04name\x82\xd3\xe4\x93\x02$*\"/api/v1/{name=users/*/shortcuts/*}B\xac\x01\n" + - "\x10com.memos.api.v1B\x14ShortcutServiceProtoP\x01Z0github.com/usememos/memos/proto/gen/api/v1;apiv1\xa2\x02\x03MAX\xaa\x02\fMemos.Api.V1\xca\x02\fMemos\\Api\\V1\xe2\x02\x18Memos\\Api\\V1\\GPBMetadata\xea\x02\x0eMemos::Api::V1b\x06proto3" - -var ( - file_api_v1_shortcut_service_proto_rawDescOnce sync.Once - file_api_v1_shortcut_service_proto_rawDescData []byte -) - -func file_api_v1_shortcut_service_proto_rawDescGZIP() []byte { - file_api_v1_shortcut_service_proto_rawDescOnce.Do(func() { - file_api_v1_shortcut_service_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_api_v1_shortcut_service_proto_rawDesc), len(file_api_v1_shortcut_service_proto_rawDesc))) - }) - return file_api_v1_shortcut_service_proto_rawDescData -} - -var file_api_v1_shortcut_service_proto_msgTypes = make([]protoimpl.MessageInfo, 7) -var file_api_v1_shortcut_service_proto_goTypes = []any{ - (*Shortcut)(nil), // 0: memos.api.v1.Shortcut - (*ListShortcutsRequest)(nil), // 1: memos.api.v1.ListShortcutsRequest - (*ListShortcutsResponse)(nil), // 2: memos.api.v1.ListShortcutsResponse - (*GetShortcutRequest)(nil), // 3: memos.api.v1.GetShortcutRequest - (*CreateShortcutRequest)(nil), // 4: memos.api.v1.CreateShortcutRequest - (*UpdateShortcutRequest)(nil), // 5: memos.api.v1.UpdateShortcutRequest - (*DeleteShortcutRequest)(nil), // 6: memos.api.v1.DeleteShortcutRequest - (*fieldmaskpb.FieldMask)(nil), // 7: google.protobuf.FieldMask - (*emptypb.Empty)(nil), // 8: google.protobuf.Empty -} -var file_api_v1_shortcut_service_proto_depIdxs = []int32{ - 0, // 0: memos.api.v1.ListShortcutsResponse.shortcuts:type_name -> memos.api.v1.Shortcut - 0, // 1: memos.api.v1.CreateShortcutRequest.shortcut:type_name -> memos.api.v1.Shortcut - 0, // 2: memos.api.v1.UpdateShortcutRequest.shortcut:type_name -> memos.api.v1.Shortcut - 7, // 3: memos.api.v1.UpdateShortcutRequest.update_mask:type_name -> google.protobuf.FieldMask - 1, // 4: memos.api.v1.ShortcutService.ListShortcuts:input_type -> memos.api.v1.ListShortcutsRequest - 3, // 5: memos.api.v1.ShortcutService.GetShortcut:input_type -> memos.api.v1.GetShortcutRequest - 4, // 6: memos.api.v1.ShortcutService.CreateShortcut:input_type -> memos.api.v1.CreateShortcutRequest - 5, // 7: memos.api.v1.ShortcutService.UpdateShortcut:input_type -> memos.api.v1.UpdateShortcutRequest - 6, // 8: memos.api.v1.ShortcutService.DeleteShortcut:input_type -> memos.api.v1.DeleteShortcutRequest - 2, // 9: memos.api.v1.ShortcutService.ListShortcuts:output_type -> memos.api.v1.ListShortcutsResponse - 0, // 10: memos.api.v1.ShortcutService.GetShortcut:output_type -> memos.api.v1.Shortcut - 0, // 11: memos.api.v1.ShortcutService.CreateShortcut:output_type -> memos.api.v1.Shortcut - 0, // 12: memos.api.v1.ShortcutService.UpdateShortcut:output_type -> memos.api.v1.Shortcut - 8, // 13: memos.api.v1.ShortcutService.DeleteShortcut:output_type -> google.protobuf.Empty - 9, // [9:14] is the sub-list for method output_type - 4, // [4:9] is the sub-list for method input_type - 4, // [4:4] is the sub-list for extension type_name - 4, // [4:4] is the sub-list for extension extendee - 0, // [0:4] is the sub-list for field type_name -} - -func init() { file_api_v1_shortcut_service_proto_init() } -func file_api_v1_shortcut_service_proto_init() { - if File_api_v1_shortcut_service_proto != nil { - return - } - type x struct{} - out := protoimpl.TypeBuilder{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_api_v1_shortcut_service_proto_rawDesc), len(file_api_v1_shortcut_service_proto_rawDesc)), - NumEnums: 0, - NumMessages: 7, - NumExtensions: 0, - NumServices: 1, - }, - GoTypes: file_api_v1_shortcut_service_proto_goTypes, - DependencyIndexes: file_api_v1_shortcut_service_proto_depIdxs, - MessageInfos: file_api_v1_shortcut_service_proto_msgTypes, - }.Build() - File_api_v1_shortcut_service_proto = out.File - file_api_v1_shortcut_service_proto_goTypes = nil - file_api_v1_shortcut_service_proto_depIdxs = nil -} diff --git a/proto/gen/api/v1/shortcut_service_grpc.pb.go b/proto/gen/api/v1/shortcut_service_grpc.pb.go deleted file mode 100644 index 840c35be..00000000 --- a/proto/gen/api/v1/shortcut_service_grpc.pb.go +++ /dev/null @@ -1,288 +0,0 @@ -// Code generated by protoc-gen-go-grpc. DO NOT EDIT. -// versions: -// - protoc-gen-go-grpc v1.6.2 -// - protoc (unknown) -// source: api/v1/shortcut_service.proto - -package apiv1 - -import ( - context "context" - grpc "google.golang.org/grpc" - codes "google.golang.org/grpc/codes" - status "google.golang.org/grpc/status" - emptypb "google.golang.org/protobuf/types/known/emptypb" -) - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.64.0 or later. -const _ = grpc.SupportPackageIsVersion9 - -const ( - ShortcutService_ListShortcuts_FullMethodName = "/memos.api.v1.ShortcutService/ListShortcuts" - ShortcutService_GetShortcut_FullMethodName = "/memos.api.v1.ShortcutService/GetShortcut" - ShortcutService_CreateShortcut_FullMethodName = "/memos.api.v1.ShortcutService/CreateShortcut" - ShortcutService_UpdateShortcut_FullMethodName = "/memos.api.v1.ShortcutService/UpdateShortcut" - ShortcutService_DeleteShortcut_FullMethodName = "/memos.api.v1.ShortcutService/DeleteShortcut" -) - -// ShortcutServiceClient is the client API for ShortcutService service. -// -// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. -type ShortcutServiceClient interface { - // ListShortcuts returns a user's saved shortcuts. Each shortcut is a named, - // reusable CEL filter (see Shortcut.filter); pass its filter string directly - // to the ListMemos `filter` argument to reuse a saved view. - ListShortcuts(ctx context.Context, in *ListShortcutsRequest, opts ...grpc.CallOption) (*ListShortcutsResponse, error) - // GetShortcut gets a shortcut by name. - GetShortcut(ctx context.Context, in *GetShortcutRequest, opts ...grpc.CallOption) (*Shortcut, error) - // CreateShortcut creates a new shortcut for a user. - CreateShortcut(ctx context.Context, in *CreateShortcutRequest, opts ...grpc.CallOption) (*Shortcut, error) - // UpdateShortcut updates a shortcut for a user. - UpdateShortcut(ctx context.Context, in *UpdateShortcutRequest, opts ...grpc.CallOption) (*Shortcut, error) - // DeleteShortcut deletes a shortcut for a user. - DeleteShortcut(ctx context.Context, in *DeleteShortcutRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) -} - -type shortcutServiceClient struct { - cc grpc.ClientConnInterface -} - -func NewShortcutServiceClient(cc grpc.ClientConnInterface) ShortcutServiceClient { - return &shortcutServiceClient{cc} -} - -func (c *shortcutServiceClient) ListShortcuts(ctx context.Context, in *ListShortcutsRequest, opts ...grpc.CallOption) (*ListShortcutsResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(ListShortcutsResponse) - err := c.cc.Invoke(ctx, ShortcutService_ListShortcuts_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *shortcutServiceClient) GetShortcut(ctx context.Context, in *GetShortcutRequest, opts ...grpc.CallOption) (*Shortcut, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(Shortcut) - err := c.cc.Invoke(ctx, ShortcutService_GetShortcut_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *shortcutServiceClient) CreateShortcut(ctx context.Context, in *CreateShortcutRequest, opts ...grpc.CallOption) (*Shortcut, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(Shortcut) - err := c.cc.Invoke(ctx, ShortcutService_CreateShortcut_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *shortcutServiceClient) UpdateShortcut(ctx context.Context, in *UpdateShortcutRequest, opts ...grpc.CallOption) (*Shortcut, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(Shortcut) - err := c.cc.Invoke(ctx, ShortcutService_UpdateShortcut_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *shortcutServiceClient) DeleteShortcut(ctx context.Context, in *DeleteShortcutRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(emptypb.Empty) - err := c.cc.Invoke(ctx, ShortcutService_DeleteShortcut_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -// ShortcutServiceServer is the server API for ShortcutService service. -// All implementations must embed UnimplementedShortcutServiceServer -// for forward compatibility. -type ShortcutServiceServer interface { - // ListShortcuts returns a user's saved shortcuts. Each shortcut is a named, - // reusable CEL filter (see Shortcut.filter); pass its filter string directly - // to the ListMemos `filter` argument to reuse a saved view. - ListShortcuts(context.Context, *ListShortcutsRequest) (*ListShortcutsResponse, error) - // GetShortcut gets a shortcut by name. - GetShortcut(context.Context, *GetShortcutRequest) (*Shortcut, error) - // CreateShortcut creates a new shortcut for a user. - CreateShortcut(context.Context, *CreateShortcutRequest) (*Shortcut, error) - // UpdateShortcut updates a shortcut for a user. - UpdateShortcut(context.Context, *UpdateShortcutRequest) (*Shortcut, error) - // DeleteShortcut deletes a shortcut for a user. - DeleteShortcut(context.Context, *DeleteShortcutRequest) (*emptypb.Empty, error) - mustEmbedUnimplementedShortcutServiceServer() -} - -// UnimplementedShortcutServiceServer must be embedded to have -// forward compatible implementations. -// -// NOTE: this should be embedded by value instead of pointer to avoid a nil -// pointer dereference when methods are called. -type UnimplementedShortcutServiceServer struct{} - -func (UnimplementedShortcutServiceServer) ListShortcuts(context.Context, *ListShortcutsRequest) (*ListShortcutsResponse, error) { - return nil, status.Error(codes.Unimplemented, "method ListShortcuts not implemented") -} -func (UnimplementedShortcutServiceServer) GetShortcut(context.Context, *GetShortcutRequest) (*Shortcut, error) { - return nil, status.Error(codes.Unimplemented, "method GetShortcut not implemented") -} -func (UnimplementedShortcutServiceServer) CreateShortcut(context.Context, *CreateShortcutRequest) (*Shortcut, error) { - return nil, status.Error(codes.Unimplemented, "method CreateShortcut not implemented") -} -func (UnimplementedShortcutServiceServer) UpdateShortcut(context.Context, *UpdateShortcutRequest) (*Shortcut, error) { - return nil, status.Error(codes.Unimplemented, "method UpdateShortcut not implemented") -} -func (UnimplementedShortcutServiceServer) DeleteShortcut(context.Context, *DeleteShortcutRequest) (*emptypb.Empty, error) { - return nil, status.Error(codes.Unimplemented, "method DeleteShortcut not implemented") -} -func (UnimplementedShortcutServiceServer) mustEmbedUnimplementedShortcutServiceServer() {} -func (UnimplementedShortcutServiceServer) testEmbeddedByValue() {} - -// UnsafeShortcutServiceServer may be embedded to opt out of forward compatibility for this service. -// Use of this interface is not recommended, as added methods to ShortcutServiceServer will -// result in compilation errors. -type UnsafeShortcutServiceServer interface { - mustEmbedUnimplementedShortcutServiceServer() -} - -func RegisterShortcutServiceServer(s grpc.ServiceRegistrar, srv ShortcutServiceServer) { - // If the following call panics, it indicates UnimplementedShortcutServiceServer was - // embedded by pointer and is nil. This will cause panics if an - // unimplemented method is ever invoked, so we test this at initialization - // time to prevent it from happening at runtime later due to I/O. - if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { - t.testEmbeddedByValue() - } - s.RegisterService(&ShortcutService_ServiceDesc, srv) -} - -func _ShortcutService_ListShortcuts_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ListShortcutsRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ShortcutServiceServer).ListShortcuts(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: ShortcutService_ListShortcuts_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ShortcutServiceServer).ListShortcuts(ctx, req.(*ListShortcutsRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _ShortcutService_GetShortcut_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(GetShortcutRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ShortcutServiceServer).GetShortcut(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: ShortcutService_GetShortcut_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ShortcutServiceServer).GetShortcut(ctx, req.(*GetShortcutRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _ShortcutService_CreateShortcut_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(CreateShortcutRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ShortcutServiceServer).CreateShortcut(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: ShortcutService_CreateShortcut_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ShortcutServiceServer).CreateShortcut(ctx, req.(*CreateShortcutRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _ShortcutService_UpdateShortcut_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(UpdateShortcutRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ShortcutServiceServer).UpdateShortcut(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: ShortcutService_UpdateShortcut_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ShortcutServiceServer).UpdateShortcut(ctx, req.(*UpdateShortcutRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _ShortcutService_DeleteShortcut_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(DeleteShortcutRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ShortcutServiceServer).DeleteShortcut(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: ShortcutService_DeleteShortcut_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ShortcutServiceServer).DeleteShortcut(ctx, req.(*DeleteShortcutRequest)) - } - return interceptor(ctx, in, info, handler) -} - -// ShortcutService_ServiceDesc is the grpc.ServiceDesc for ShortcutService service. -// It's only intended for direct use with grpc.RegisterService, -// and not to be introspected or modified (even as a copy) -var ShortcutService_ServiceDesc = grpc.ServiceDesc{ - ServiceName: "memos.api.v1.ShortcutService", - HandlerType: (*ShortcutServiceServer)(nil), - Methods: []grpc.MethodDesc{ - { - MethodName: "ListShortcuts", - Handler: _ShortcutService_ListShortcuts_Handler, - }, - { - MethodName: "GetShortcut", - Handler: _ShortcutService_GetShortcut_Handler, - }, - { - MethodName: "CreateShortcut", - Handler: _ShortcutService_CreateShortcut_Handler, - }, - { - MethodName: "UpdateShortcut", - Handler: _ShortcutService_UpdateShortcut_Handler, - }, - { - MethodName: "DeleteShortcut", - Handler: _ShortcutService_DeleteShortcut_Handler, - }, - }, - Streams: []grpc.StreamDesc{}, - Metadata: "api/v1/shortcut_service.proto", -} diff --git a/proto/gen/api/v1/user_service.pb.gw.go b/proto/gen/api/v1/user_service.pb.gw.go index fc00e1ec..563584d3 100644 --- a/proto/gen/api/v1/user_service.pb.gw.go +++ b/proto/gen/api/v1/user_service.pb.gw.go @@ -42,15 +42,15 @@ func request_UserService_ListUsers_0(ctx context.Context, marshaler runtime.Mars protoReq ListUsersRequest metadata runtime.ServerMetadata ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_UserService_ListUsers_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.ListUsers(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -105,9 +105,6 @@ func request_UserService_GetUser_0(ctx context.Context, marshaler runtime.Marsha metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -122,6 +119,9 @@ func request_UserService_GetUser_0(ctx context.Context, marshaler runtime.Marsha if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_UserService_GetUser_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.GetUser(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -160,15 +160,15 @@ func request_UserService_CreateUser_0(ctx context.Context, marshaler runtime.Mar if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.User); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_UserService_CreateUser_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.CreateUser(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -206,9 +206,6 @@ func request_UserService_UpdateUser_0(ctx context.Context, marshaler runtime.Mar if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.User); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.User); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -230,6 +227,9 @@ func request_UserService_UpdateUser_0(ctx context.Context, marshaler runtime.Mar if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_UserService_UpdateUser_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.UpdateUser(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -280,9 +280,6 @@ func request_UserService_DeleteUser_0(ctx context.Context, marshaler runtime.Mar metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -297,6 +294,9 @@ func request_UserService_DeleteUser_0(ctx context.Context, marshaler runtime.Mar if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_UserService_DeleteUser_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.DeleteUser(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -332,15 +332,15 @@ func request_UserService_ListAllUserStats_0(ctx context.Context, marshaler runti protoReq ListAllUserStatsRequest metadata runtime.ServerMetadata ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_UserService_ListAllUserStats_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.ListAllUserStats(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -366,9 +366,6 @@ func request_UserService_GetUserStats_0(ctx context.Context, marshaler runtime.M metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -377,6 +374,9 @@ func request_UserService_GetUserStats_0(ctx context.Context, marshaler runtime.M if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.GetUserStats(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -405,9 +405,6 @@ func request_UserService_GetUserSetting_0(ctx context.Context, marshaler runtime metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -416,6 +413,9 @@ func request_UserService_GetUserSetting_0(ctx context.Context, marshaler runtime if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.GetUserSetting(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -453,9 +453,6 @@ func request_UserService_UpdateUserSetting_0(ctx context.Context, marshaler runt if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Setting); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Setting); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -477,6 +474,9 @@ func request_UserService_UpdateUserSetting_0(ctx context.Context, marshaler runt if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_UserService_UpdateUserSetting_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.UpdateUserSetting(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -527,9 +527,6 @@ func request_UserService_ListUserSettings_0(ctx context.Context, marshaler runti metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["parent"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent") @@ -544,6 +541,9 @@ func request_UserService_ListUserSettings_0(ctx context.Context, marshaler runti if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_UserService_ListUserSettings_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.ListUserSettings(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -578,9 +578,6 @@ func request_UserService_ListLinkedIdentities_0(ctx context.Context, marshaler r metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["parent"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent") @@ -589,6 +586,9 @@ func request_UserService_ListLinkedIdentities_0(ctx context.Context, marshaler r if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.ListLinkedIdentities(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -620,9 +620,6 @@ func request_UserService_CreateLinkedIdentity_0(ctx context.Context, marshaler r if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["parent"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent") @@ -631,6 +628,9 @@ func request_UserService_CreateLinkedIdentity_0(ctx context.Context, marshaler r if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.CreateLinkedIdentity(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -662,9 +662,6 @@ func request_UserService_GetLinkedIdentity_0(ctx context.Context, marshaler runt metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -673,6 +670,9 @@ func request_UserService_GetLinkedIdentity_0(ctx context.Context, marshaler runt if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.GetLinkedIdentity(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -701,9 +701,6 @@ func request_UserService_DeleteLinkedIdentity_0(ctx context.Context, marshaler r metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -712,6 +709,9 @@ func request_UserService_DeleteLinkedIdentity_0(ctx context.Context, marshaler r if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.DeleteLinkedIdentity(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -742,9 +742,6 @@ func request_UserService_ListPersonalAccessTokens_0(ctx context.Context, marshal metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["parent"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent") @@ -759,6 +756,9 @@ func request_UserService_ListPersonalAccessTokens_0(ctx context.Context, marshal if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_UserService_ListPersonalAccessTokens_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.ListPersonalAccessTokens(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -796,9 +796,6 @@ func request_UserService_CreatePersonalAccessToken_0(ctx context.Context, marsha if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["parent"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent") @@ -807,6 +804,9 @@ func request_UserService_CreatePersonalAccessToken_0(ctx context.Context, marsha if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.CreatePersonalAccessToken(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -838,9 +838,6 @@ func request_UserService_DeletePersonalAccessToken_0(ctx context.Context, marsha metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -849,6 +846,9 @@ func request_UserService_DeletePersonalAccessToken_0(ctx context.Context, marsha if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.DeletePersonalAccessToken(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -877,9 +877,6 @@ func request_UserService_ListUserWebhooks_0(ctx context.Context, marshaler runti metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["parent"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent") @@ -888,6 +885,9 @@ func request_UserService_ListUserWebhooks_0(ctx context.Context, marshaler runti if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.ListUserWebhooks(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -919,9 +919,6 @@ func request_UserService_CreateUserWebhook_0(ctx context.Context, marshaler runt if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Webhook); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["parent"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent") @@ -930,6 +927,9 @@ func request_UserService_CreateUserWebhook_0(ctx context.Context, marshaler runt if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.CreateUserWebhook(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -970,9 +970,6 @@ func request_UserService_UpdateUserWebhook_0(ctx context.Context, marshaler runt if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Webhook); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Webhook); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -994,6 +991,9 @@ func request_UserService_UpdateUserWebhook_0(ctx context.Context, marshaler runt if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_UserService_UpdateUserWebhook_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.UpdateUserWebhook(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -1042,9 +1042,6 @@ func request_UserService_DeleteUserWebhook_0(ctx context.Context, marshaler runt metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -1053,6 +1050,9 @@ func request_UserService_DeleteUserWebhook_0(ctx context.Context, marshaler runt if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.DeleteUserWebhook(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -1081,9 +1081,6 @@ func request_UserService_GetUserWebhookSigningSecret_0(ctx context.Context, mars metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -1092,6 +1089,9 @@ func request_UserService_GetUserWebhookSigningSecret_0(ctx context.Context, mars if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.GetUserWebhookSigningSecret(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -1122,9 +1122,6 @@ func request_UserService_ListUserNotifications_0(ctx context.Context, marshaler metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["parent"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent") @@ -1139,6 +1136,9 @@ func request_UserService_ListUserNotifications_0(ctx context.Context, marshaler if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_UserService_ListUserNotifications_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.ListUserNotifications(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -1182,9 +1182,6 @@ func request_UserService_UpdateUserNotification_0(ctx context.Context, marshaler if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Notification); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Notification); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -1206,6 +1203,9 @@ func request_UserService_UpdateUserNotification_0(ctx context.Context, marshaler if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_UserService_UpdateUserNotification_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.UpdateUserNotification(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -1254,9 +1254,6 @@ func request_UserService_DeleteUserNotification_0(ctx context.Context, marshaler metadata runtime.ServerMetadata err error ) - if req.Body != nil { - _, _ = io.Copy(io.Discard, req.Body) - } val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") @@ -1265,6 +1262,9 @@ func request_UserService_DeleteUserNotification_0(ctx context.Context, marshaler if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.DeleteUserNotification(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } diff --git a/proto/gen/openapi.yaml b/proto/gen/openapi.yaml index a3a7e171..da8b69a2 100644 --- a/proto/gen/openapi.yaml +++ b/proto/gen/openapi.yaml @@ -1941,15 +1941,15 @@ paths: application/json: schema: $ref: '#/components/schemas/Status' - /api/v1/users/{user}/shortcuts: + /api/v1/users/{user}/views: get: tags: - - ShortcutService + - MemoViewService description: |- - ListShortcuts returns a user's saved shortcuts. Each shortcut is a named, - reusable CEL filter (see Shortcut.filter); pass its filter string directly - to the ListMemos `filter` argument to reuse a saved view. - operationId: ShortcutService_ListShortcuts + ListMemoViews returns a user's memo views. Each view is a named, reusable + CEL filter (see MemoView.filter); pass its filter string directly to the + ListMemos `filter` argument. + operationId: MemoViewService_ListMemoViews parameters: - name: user in: path @@ -1963,7 +1963,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ListShortcutsResponse' + $ref: '#/components/schemas/ListMemoViewsResponse' default: description: Default error response content: @@ -1972,9 +1972,9 @@ paths: $ref: '#/components/schemas/Status' post: tags: - - ShortcutService - description: CreateShortcut creates a new shortcut for a user. - operationId: ShortcutService_CreateShortcut + - MemoViewService + description: CreateMemoView creates a new memo view for a user. + operationId: MemoViewService_CreateMemoView parameters: - name: user in: path @@ -1984,14 +1984,14 @@ paths: type: string - name: validateOnly in: query - description: Optional. If set, validate the request, but do not actually create the shortcut. + description: Optional. If set, validate the request, but do not actually create the memo view. schema: type: boolean requestBody: content: application/json: schema: - $ref: '#/components/schemas/Shortcut' + $ref: '#/components/schemas/MemoView' required: true responses: "200": @@ -1999,19 +1999,19 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/Shortcut' + $ref: '#/components/schemas/MemoView' default: description: Default error response content: application/json: schema: $ref: '#/components/schemas/Status' - /api/v1/users/{user}/shortcuts/{shortcut}: + /api/v1/users/{user}/views/{view}: get: tags: - - ShortcutService - description: GetShortcut gets a shortcut by name. - operationId: ShortcutService_GetShortcut + - MemoViewService + description: GetMemoView gets a memo view by name. + operationId: MemoViewService_GetMemoView parameters: - name: user in: path @@ -2019,9 +2019,9 @@ paths: required: true schema: type: string - - name: shortcut + - name: view in: path - description: The shortcut id. + description: The view id. required: true schema: type: string @@ -2031,7 +2031,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/Shortcut' + $ref: '#/components/schemas/MemoView' default: description: Default error response content: @@ -2040,9 +2040,9 @@ paths: $ref: '#/components/schemas/Status' delete: tags: - - ShortcutService - description: DeleteShortcut deletes a shortcut for a user. - operationId: ShortcutService_DeleteShortcut + - MemoViewService + description: DeleteMemoView deletes a memo view for a user. + operationId: MemoViewService_DeleteMemoView parameters: - name: user in: path @@ -2050,9 +2050,9 @@ paths: required: true schema: type: string - - name: shortcut + - name: view in: path - description: The shortcut id. + description: The view id. required: true schema: type: string @@ -2068,9 +2068,9 @@ paths: $ref: '#/components/schemas/Status' patch: tags: - - ShortcutService - description: UpdateShortcut updates a shortcut for a user. - operationId: ShortcutService_UpdateShortcut + - MemoViewService + description: UpdateMemoView updates a memo view for a user. + operationId: MemoViewService_UpdateMemoView parameters: - name: user in: path @@ -2078,9 +2078,9 @@ paths: required: true schema: type: string - - name: shortcut + - name: view in: path - description: The shortcut id. + description: The view id. required: true schema: type: string @@ -2094,7 +2094,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/Shortcut' + $ref: '#/components/schemas/MemoView' required: true responses: "200": @@ -2102,7 +2102,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/Shortcut' + $ref: '#/components/schemas/MemoView' default: description: Default error response content: @@ -3129,6 +3129,14 @@ components: items: $ref: '#/components/schemas/MemoShare' description: The list of share links. + ListMemoViewsResponse: + type: object + properties: + memoViews: + type: array + items: + $ref: '#/components/schemas/MemoView' + description: The list of memo views. ListMemosResponse: type: object properties: @@ -3153,14 +3161,6 @@ components: nextPageToken: type: string description: A token for the next page of results. - ListShortcutsResponse: - type: object - properties: - shortcuts: - type: array - items: - $ref: '#/components/schemas/Shortcut' - description: The list of shortcuts. ListUserNotificationsResponse: type: object properties: @@ -3373,6 +3373,25 @@ components: If unset, the link never expires. format: date-time description: MemoShare is an access grant that permits read-only access to a memo via an opaque bearer token. + MemoView: + required: + - title + - filter + type: object + properties: + name: + type: string + description: |- + The resource name of the memo view. + Format: users/{user}/views/{view} + title: + type: string + description: The title of the memo view. + filter: + type: string + description: |- + The CEL filter expression for the memo view, using the same grammar as the + ListMemos `filter` argument. Reuse it by passing this value to ListMemos. Memo_Property: type: object properties: @@ -3562,24 +3581,6 @@ components: items: $ref: '#/components/schemas/MemoRelation' description: Required. The relations to set for the memo. - Shortcut: - required: - - title - type: object - properties: - name: - type: string - description: |- - The resource name of the shortcut. - Format: users/{user}/shortcuts/{shortcut} - title: - type: string - description: The title of the shortcut. - filter: - type: string - description: |- - The CEL filter expression for the shortcut, using the same grammar as the - ListMemos `filter` argument. Reuse it by passing this value to ListMemos. SignInRequest: type: object properties: @@ -4056,5 +4057,5 @@ tags: - name: IdentityProviderService - name: InstanceService - name: MemoService - - name: ShortcutService + - name: MemoViewService - name: UserService diff --git a/proto/gen/store/user_setting.pb.go b/proto/gen/store/user_setting.pb.go index 2a9c7460..f05ba4d2 100644 --- a/proto/gen/store/user_setting.pb.go +++ b/proto/gen/store/user_setting.pb.go @@ -29,8 +29,8 @@ const ( UserSetting_KEY_UNSPECIFIED UserSetting_Key = 0 // General user settings. UserSetting_GENERAL UserSetting_Key = 1 - // The shortcuts of the user. - UserSetting_SHORTCUTS UserSetting_Key = 4 + // The memo views of the user. + UserSetting_MEMO_VIEWS UserSetting_Key = 4 // The webhooks of the user. UserSetting_WEBHOOKS UserSetting_Key = 5 // Refresh tokens for the user. @@ -46,7 +46,7 @@ var ( UserSetting_Key_name = map[int32]string{ 0: "KEY_UNSPECIFIED", 1: "GENERAL", - 4: "SHORTCUTS", + 4: "MEMO_VIEWS", 5: "WEBHOOKS", 6: "REFRESH_TOKENS", 7: "PERSONAL_ACCESS_TOKENS", @@ -55,7 +55,7 @@ var ( UserSetting_Key_value = map[string]int32{ "KEY_UNSPECIFIED": 0, "GENERAL": 1, - "SHORTCUTS": 4, + "MEMO_VIEWS": 4, "WEBHOOKS": 5, "REFRESH_TOKENS": 6, "PERSONAL_ACCESS_TOKENS": 7, @@ -97,7 +97,7 @@ type UserSetting struct { // Types that are valid to be assigned to Value: // // *UserSetting_General - // *UserSetting_Shortcuts + // *UserSetting_MemoViews // *UserSetting_Webhooks // *UserSetting_RefreshTokens // *UserSetting_PersonalAccessTokens @@ -167,10 +167,10 @@ func (x *UserSetting) GetGeneral() *GeneralUserSetting { return nil } -func (x *UserSetting) GetShortcuts() *ShortcutsUserSetting { +func (x *UserSetting) GetMemoViews() *MemoViewsUserSetting { if x != nil { - if x, ok := x.Value.(*UserSetting_Shortcuts); ok { - return x.Shortcuts + if x, ok := x.Value.(*UserSetting_MemoViews); ok { + return x.MemoViews } } return nil @@ -220,8 +220,8 @@ type UserSetting_General struct { General *GeneralUserSetting `protobuf:"bytes,3,opt,name=general,proto3,oneof"` } -type UserSetting_Shortcuts struct { - Shortcuts *ShortcutsUserSetting `protobuf:"bytes,6,opt,name=shortcuts,proto3,oneof"` +type UserSetting_MemoViews struct { + MemoViews *MemoViewsUserSetting `protobuf:"bytes,6,opt,name=memo_views,json=memoViews,proto3,oneof"` } type UserSetting_Webhooks struct { @@ -242,7 +242,7 @@ type UserSetting_Tags struct { func (*UserSetting_General) isUserSetting_Value() {} -func (*UserSetting_Shortcuts) isUserSetting_Value() {} +func (*UserSetting_MemoViews) isUserSetting_Value() {} func (*UserSetting_Webhooks) isUserSetting_Value() {} @@ -507,27 +507,27 @@ func (x *PersonalAccessTokensUserSetting) GetTokens() []*PersonalAccessTokensUse return nil } -type ShortcutsUserSetting struct { +type MemoViewsUserSetting struct { state protoimpl.MessageState `protogen:"open.v1"` - Shortcuts []*ShortcutsUserSetting_Shortcut `protobuf:"bytes,1,rep,name=shortcuts,proto3" json:"shortcuts,omitempty"` + MemoViews []*MemoViewsUserSetting_MemoView `protobuf:"bytes,1,rep,name=memo_views,json=memoViews,proto3" json:"memo_views,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } -func (x *ShortcutsUserSetting) Reset() { - *x = ShortcutsUserSetting{} +func (x *MemoViewsUserSetting) Reset() { + *x = MemoViewsUserSetting{} mi := &file_store_user_setting_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } -func (x *ShortcutsUserSetting) String() string { +func (x *MemoViewsUserSetting) String() string { return protoimpl.X.MessageStringOf(x) } -func (*ShortcutsUserSetting) ProtoMessage() {} +func (*MemoViewsUserSetting) ProtoMessage() {} -func (x *ShortcutsUserSetting) ProtoReflect() protoreflect.Message { +func (x *MemoViewsUserSetting) ProtoReflect() protoreflect.Message { mi := &file_store_user_setting_proto_msgTypes[6] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -539,14 +539,14 @@ func (x *ShortcutsUserSetting) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use ShortcutsUserSetting.ProtoReflect.Descriptor instead. -func (*ShortcutsUserSetting) Descriptor() ([]byte, []int) { +// Deprecated: Use MemoViewsUserSetting.ProtoReflect.Descriptor instead. +func (*MemoViewsUserSetting) Descriptor() ([]byte, []int) { return file_store_user_setting_proto_rawDescGZIP(), []int{6} } -func (x *ShortcutsUserSetting) GetShortcuts() []*ShortcutsUserSetting_Shortcut { +func (x *MemoViewsUserSetting) GetMemoViews() []*MemoViewsUserSetting_MemoView { if x != nil { - return x.Shortcuts + return x.MemoViews } return nil } @@ -847,7 +847,7 @@ func (x *PersonalAccessTokensUserSetting_PersonalAccessToken) GetLastUsedAt() *t return nil } -type ShortcutsUserSetting_Shortcut struct { +type MemoViewsUserSetting_MemoView struct { state protoimpl.MessageState `protogen:"open.v1"` Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` Title string `protobuf:"bytes,2,opt,name=title,proto3" json:"title,omitempty"` @@ -856,20 +856,20 @@ type ShortcutsUserSetting_Shortcut struct { sizeCache protoimpl.SizeCache } -func (x *ShortcutsUserSetting_Shortcut) Reset() { - *x = ShortcutsUserSetting_Shortcut{} +func (x *MemoViewsUserSetting_MemoView) Reset() { + *x = MemoViewsUserSetting_MemoView{} mi := &file_store_user_setting_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } -func (x *ShortcutsUserSetting_Shortcut) String() string { +func (x *MemoViewsUserSetting_MemoView) String() string { return protoimpl.X.MessageStringOf(x) } -func (*ShortcutsUserSetting_Shortcut) ProtoMessage() {} +func (*MemoViewsUserSetting_MemoView) ProtoMessage() {} -func (x *ShortcutsUserSetting_Shortcut) ProtoReflect() protoreflect.Message { +func (x *MemoViewsUserSetting_MemoView) ProtoReflect() protoreflect.Message { mi := &file_store_user_setting_proto_msgTypes[12] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -881,26 +881,26 @@ func (x *ShortcutsUserSetting_Shortcut) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use ShortcutsUserSetting_Shortcut.ProtoReflect.Descriptor instead. -func (*ShortcutsUserSetting_Shortcut) Descriptor() ([]byte, []int) { +// Deprecated: Use MemoViewsUserSetting_MemoView.ProtoReflect.Descriptor instead. +func (*MemoViewsUserSetting_MemoView) Descriptor() ([]byte, []int) { return file_store_user_setting_proto_rawDescGZIP(), []int{6, 0} } -func (x *ShortcutsUserSetting_Shortcut) GetId() string { +func (x *MemoViewsUserSetting_MemoView) GetId() string { if x != nil { return x.Id } return "" } -func (x *ShortcutsUserSetting_Shortcut) GetTitle() string { +func (x *MemoViewsUserSetting_MemoView) GetTitle() string { if x != nil { return x.Title } return "" } -func (x *ShortcutsUserSetting_Shortcut) GetFilter() string { +func (x *MemoViewsUserSetting_MemoView) GetFilter() string { if x != nil { return x.Filter } @@ -983,21 +983,23 @@ var File_store_user_setting_proto protoreflect.FileDescriptor const file_store_user_setting_proto_rawDesc = "" + "\n" + - "\x18store/user_setting.proto\x12\vmemos.store\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x17google/type/color.proto\"\x89\x05\n" + + "\x18store/user_setting.proto\x12\vmemos.store\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x17google/type/color.proto\"\x8b\x05\n" + "\vUserSetting\x12\x17\n" + "\auser_id\x18\x01 \x01(\x05R\x06userId\x12.\n" + "\x03key\x18\x02 \x01(\x0e2\x1c.memos.store.UserSetting.KeyR\x03key\x12;\n" + - "\ageneral\x18\x03 \x01(\v2\x1f.memos.store.GeneralUserSettingH\x00R\ageneral\x12A\n" + - "\tshortcuts\x18\x06 \x01(\v2!.memos.store.ShortcutsUserSettingH\x00R\tshortcuts\x12>\n" + + "\ageneral\x18\x03 \x01(\v2\x1f.memos.store.GeneralUserSettingH\x00R\ageneral\x12B\n" + + "\n" + + "memo_views\x18\x06 \x01(\v2!.memos.store.MemoViewsUserSettingH\x00R\tmemoViews\x12>\n" + "\bwebhooks\x18\a \x01(\v2 .memos.store.WebhooksUserSettingH\x00R\bwebhooks\x12N\n" + "\x0erefresh_tokens\x18\b \x01(\v2%.memos.store.RefreshTokensUserSettingH\x00R\rrefreshTokens\x12d\n" + "\x16personal_access_tokens\x18\t \x01(\v2,.memos.store.PersonalAccessTokensUserSettingH\x00R\x14personalAccessTokens\x122\n" + "\x04tags\x18\n" + - " \x01(\v2\x1c.memos.store.TagsUserSettingH\x00R\x04tags\"~\n" + + " \x01(\v2\x1c.memos.store.TagsUserSettingH\x00R\x04tags\"\x7f\n" + "\x03Key\x12\x13\n" + "\x0fKEY_UNSPECIFIED\x10\x00\x12\v\n" + - "\aGENERAL\x10\x01\x12\r\n" + - "\tSHORTCUTS\x10\x04\x12\f\n" + + "\aGENERAL\x10\x01\x12\x0e\n" + + "\n" + + "MEMO_VIEWS\x10\x04\x12\f\n" + "\bWEBHOOKS\x10\x05\x12\x12\n" + "\x0eREFRESH_TOKENS\x10\x06\x12\x1a\n" + "\x16PERSONAL_ACCESS_TOKENS\x10\a\x12\b\n" + @@ -1048,10 +1050,11 @@ const file_store_user_setting_proto_rawDesc = "" + "\n" + "created_at\x18\x05 \x01(\v2\x1a.google.protobuf.TimestampR\tcreatedAt\x12<\n" + "\flast_used_at\x18\x06 \x01(\v2\x1a.google.protobuf.TimestampR\n" + - "lastUsedAt\"\xaa\x01\n" + - "\x14ShortcutsUserSetting\x12H\n" + - "\tshortcuts\x18\x01 \x03(\v2*.memos.store.ShortcutsUserSetting.ShortcutR\tshortcuts\x1aH\n" + - "\bShortcut\x12\x0e\n" + + "lastUsedAt\"\xab\x01\n" + + "\x14MemoViewsUserSetting\x12I\n" + + "\n" + + "memo_views\x18\x01 \x03(\v2*.memos.store.MemoViewsUserSetting.MemoViewR\tmemoViews\x1aH\n" + + "\bMemoView\x12\x0e\n" + "\x02id\x18\x01 \x01(\tR\x02id\x12\x14\n" + "\x05title\x18\x02 \x01(\tR\x05title\x12\x16\n" + "\x06filter\x18\x03 \x01(\tR\x06filter\"\xc5\x01\n" + @@ -1086,13 +1089,13 @@ var file_store_user_setting_proto_goTypes = []any{ (*TagsUserSetting)(nil), // 4: memos.store.TagsUserSetting (*RefreshTokensUserSetting)(nil), // 5: memos.store.RefreshTokensUserSetting (*PersonalAccessTokensUserSetting)(nil), // 6: memos.store.PersonalAccessTokensUserSetting - (*ShortcutsUserSetting)(nil), // 7: memos.store.ShortcutsUserSetting + (*MemoViewsUserSetting)(nil), // 7: memos.store.MemoViewsUserSetting (*WebhooksUserSetting)(nil), // 8: memos.store.WebhooksUserSetting nil, // 9: memos.store.TagsUserSetting.TagsEntry (*RefreshTokensUserSetting_RefreshToken)(nil), // 10: memos.store.RefreshTokensUserSetting.RefreshToken (*RefreshTokensUserSetting_ClientInfo)(nil), // 11: memos.store.RefreshTokensUserSetting.ClientInfo (*PersonalAccessTokensUserSetting_PersonalAccessToken)(nil), // 12: memos.store.PersonalAccessTokensUserSetting.PersonalAccessToken - (*ShortcutsUserSetting_Shortcut)(nil), // 13: memos.store.ShortcutsUserSetting.Shortcut + (*MemoViewsUserSetting_MemoView)(nil), // 13: memos.store.MemoViewsUserSetting.MemoView (*WebhooksUserSetting_Webhook)(nil), // 14: memos.store.WebhooksUserSetting.Webhook (*color.Color)(nil), // 15: google.type.Color (*timestamppb.Timestamp)(nil), // 16: google.protobuf.Timestamp @@ -1100,7 +1103,7 @@ var file_store_user_setting_proto_goTypes = []any{ var file_store_user_setting_proto_depIdxs = []int32{ 0, // 0: memos.store.UserSetting.key:type_name -> memos.store.UserSetting.Key 2, // 1: memos.store.UserSetting.general:type_name -> memos.store.GeneralUserSetting - 7, // 2: memos.store.UserSetting.shortcuts:type_name -> memos.store.ShortcutsUserSetting + 7, // 2: memos.store.UserSetting.memo_views:type_name -> memos.store.MemoViewsUserSetting 8, // 3: memos.store.UserSetting.webhooks:type_name -> memos.store.WebhooksUserSetting 5, // 4: memos.store.UserSetting.refresh_tokens:type_name -> memos.store.RefreshTokensUserSetting 6, // 5: memos.store.UserSetting.personal_access_tokens:type_name -> memos.store.PersonalAccessTokensUserSetting @@ -1109,7 +1112,7 @@ var file_store_user_setting_proto_depIdxs = []int32{ 9, // 8: memos.store.TagsUserSetting.tags:type_name -> memos.store.TagsUserSetting.TagsEntry 10, // 9: memos.store.RefreshTokensUserSetting.refresh_tokens:type_name -> memos.store.RefreshTokensUserSetting.RefreshToken 12, // 10: memos.store.PersonalAccessTokensUserSetting.tokens:type_name -> memos.store.PersonalAccessTokensUserSetting.PersonalAccessToken - 13, // 11: memos.store.ShortcutsUserSetting.shortcuts:type_name -> memos.store.ShortcutsUserSetting.Shortcut + 13, // 11: memos.store.MemoViewsUserSetting.memo_views:type_name -> memos.store.MemoViewsUserSetting.MemoView 14, // 12: memos.store.WebhooksUserSetting.webhooks:type_name -> memos.store.WebhooksUserSetting.Webhook 3, // 13: memos.store.TagsUserSetting.TagsEntry.value:type_name -> memos.store.UserTagMetadata 16, // 14: memos.store.RefreshTokensUserSetting.RefreshToken.expires_at:type_name -> google.protobuf.Timestamp @@ -1132,7 +1135,7 @@ func file_store_user_setting_proto_init() { } file_store_user_setting_proto_msgTypes[0].OneofWrappers = []any{ (*UserSetting_General)(nil), - (*UserSetting_Shortcuts)(nil), + (*UserSetting_MemoViews)(nil), (*UserSetting_Webhooks)(nil), (*UserSetting_RefreshTokens)(nil), (*UserSetting_PersonalAccessTokens)(nil), diff --git a/proto/store/user_setting.proto b/proto/store/user_setting.proto index c011eaa4..d5e1bca7 100644 --- a/proto/store/user_setting.proto +++ b/proto/store/user_setting.proto @@ -12,8 +12,8 @@ message UserSetting { KEY_UNSPECIFIED = 0; // General user settings. GENERAL = 1; - // The shortcuts of the user. - SHORTCUTS = 4; + // The memo views of the user. + MEMO_VIEWS = 4; // The webhooks of the user. WEBHOOKS = 5; // Refresh tokens for the user. @@ -29,7 +29,7 @@ message UserSetting { Key key = 2; oneof value { GeneralUserSetting general = 3; - ShortcutsUserSetting shortcuts = 6; + MemoViewsUserSetting memo_views = 6; WebhooksUserSetting webhooks = 7; RefreshTokensUserSetting refresh_tokens = 8; PersonalAccessTokensUserSetting personal_access_tokens = 9; @@ -111,13 +111,13 @@ message PersonalAccessTokensUserSetting { repeated PersonalAccessToken tokens = 1; } -message ShortcutsUserSetting { - message Shortcut { +message MemoViewsUserSetting { + message MemoView { string id = 1; string title = 2; string filter = 3; } - repeated Shortcut shortcuts = 1; + repeated MemoView memo_views = 1; } message WebhooksUserSetting { diff --git a/server/router/api/v1/acl_config_test.go b/server/router/api/v1/acl_config_test.go index 0f0b86b7..7da7011e 100644 --- a/server/router/api/v1/acl_config_test.go +++ b/server/router/api/v1/acl_config_test.go @@ -59,11 +59,12 @@ func TestProtectedMethodsRequireAuth(t *testing.T) { // Attachment Service - write operations "/memos.api.v1.AttachmentService/CreateAttachment", "/memos.api.v1.AttachmentService/DeleteAttachment", - // Shortcut Service - "/memos.api.v1.ShortcutService/CreateShortcut", - "/memos.api.v1.ShortcutService/ListShortcuts", - "/memos.api.v1.ShortcutService/UpdateShortcut", - "/memos.api.v1.ShortcutService/DeleteShortcut", + // Memo View Service + "/memos.api.v1.MemoViewService/CreateMemoView", + "/memos.api.v1.MemoViewService/GetMemoView", + "/memos.api.v1.MemoViewService/ListMemoViews", + "/memos.api.v1.MemoViewService/UpdateMemoView", + "/memos.api.v1.MemoViewService/DeleteMemoView", } for _, method := range protectedMethods { diff --git a/server/router/api/v1/attachment_service.go b/server/router/api/v1/attachment_service.go index 8038821b..b8d2282c 100644 --- a/server/router/api/v1/attachment_service.go +++ b/server/router/api/v1/attachment_service.go @@ -400,17 +400,7 @@ func (s *APIV1Service) validateAttachmentFilter(ctx context.Context, filterStr s return err } - var dialect filter.DialectName - switch s.Profile.Driver { - case "mysql": - dialect = filter.DialectMySQL - case "postgres": - dialect = filter.DialectPostgres - default: - dialect = filter.DialectSQLite - } - - if _, err := engine.CompileToStatement(ctx, filterStr, filter.RenderOptions{Dialect: dialect}); err != nil { + if _, err := engine.CompileToStatement(ctx, filterStr, filter.RenderOptions{Dialect: s.filterDialect()}); err != nil { return errors.Wrap(err, "failed to compile filter") } return nil diff --git a/server/router/api/v1/connect_handler.go b/server/router/api/v1/connect_handler.go index c77868fa..2965967d 100644 --- a/server/router/api/v1/connect_handler.go +++ b/server/router/api/v1/connect_handler.go @@ -41,7 +41,7 @@ func (s *ConnectServiceHandler) RegisterConnectHandlers(mux *http.ServeMux, opts wrap(apiv1connect.NewMemoServiceHandler(s, opts...)), wrap(apiv1connect.NewAttachmentServiceHandler(s, opts...)), wrap(apiv1connect.NewAIServiceHandler(s, opts...)), - wrap(apiv1connect.NewShortcutServiceHandler(s, opts...)), + wrap(apiv1connect.NewMemoViewServiceHandler(s, opts...)), wrap(apiv1connect.NewIdentityProviderServiceHandler(s, opts...)), } diff --git a/server/router/api/v1/connect_services.go b/server/router/api/v1/connect_services.go index 4402ece2..e45c054e 100644 --- a/server/router/api/v1/connect_services.go +++ b/server/router/api/v1/connect_services.go @@ -523,42 +523,47 @@ func (s *ConnectServiceHandler) Transcribe(ctx context.Context, req *connect.Req return connect.NewResponse(resp), nil } -// ShortcutService +// MemoViewService -func (s *ConnectServiceHandler) ListShortcuts(ctx context.Context, req *connect.Request[v1pb.ListShortcutsRequest]) (*connect.Response[v1pb.ListShortcutsResponse], error) { - resp, err := s.APIV1Service.ListShortcuts(ctx, req.Msg) +// ListMemoViews lists the saved memo views owned by a user. +func (s *ConnectServiceHandler) ListMemoViews(ctx context.Context, req *connect.Request[v1pb.ListMemoViewsRequest]) (*connect.Response[v1pb.ListMemoViewsResponse], error) { + resp, err := s.APIV1Service.ListMemoViews(ctx, req.Msg) if err != nil { return nil, convertGRPCError(err) } return connect.NewResponse(resp), nil } -func (s *ConnectServiceHandler) GetShortcut(ctx context.Context, req *connect.Request[v1pb.GetShortcutRequest]) (*connect.Response[v1pb.Shortcut], error) { - resp, err := s.APIV1Service.GetShortcut(ctx, req.Msg) +// GetMemoView returns a saved memo view by resource name. +func (s *ConnectServiceHandler) GetMemoView(ctx context.Context, req *connect.Request[v1pb.GetMemoViewRequest]) (*connect.Response[v1pb.MemoView], error) { + resp, err := s.APIV1Service.GetMemoView(ctx, req.Msg) if err != nil { return nil, convertGRPCError(err) } return connect.NewResponse(resp), nil } -func (s *ConnectServiceHandler) CreateShortcut(ctx context.Context, req *connect.Request[v1pb.CreateShortcutRequest]) (*connect.Response[v1pb.Shortcut], error) { - resp, err := s.APIV1Service.CreateShortcut(ctx, req.Msg) +// CreateMemoView creates a saved memo view for a user. +func (s *ConnectServiceHandler) CreateMemoView(ctx context.Context, req *connect.Request[v1pb.CreateMemoViewRequest]) (*connect.Response[v1pb.MemoView], error) { + resp, err := s.APIV1Service.CreateMemoView(ctx, req.Msg) if err != nil { return nil, convertGRPCError(err) } return connect.NewResponse(resp), nil } -func (s *ConnectServiceHandler) UpdateShortcut(ctx context.Context, req *connect.Request[v1pb.UpdateShortcutRequest]) (*connect.Response[v1pb.Shortcut], error) { - resp, err := s.APIV1Service.UpdateShortcut(ctx, req.Msg) +// UpdateMemoView updates the selected fields of a saved memo view. +func (s *ConnectServiceHandler) UpdateMemoView(ctx context.Context, req *connect.Request[v1pb.UpdateMemoViewRequest]) (*connect.Response[v1pb.MemoView], error) { + resp, err := s.APIV1Service.UpdateMemoView(ctx, req.Msg) if err != nil { return nil, convertGRPCError(err) } return connect.NewResponse(resp), nil } -func (s *ConnectServiceHandler) DeleteShortcut(ctx context.Context, req *connect.Request[v1pb.DeleteShortcutRequest]) (*connect.Response[emptypb.Empty], error) { - resp, err := s.APIV1Service.DeleteShortcut(ctx, req.Msg) +// DeleteMemoView deletes a saved memo view by resource name. +func (s *ConnectServiceHandler) DeleteMemoView(ctx context.Context, req *connect.Request[v1pb.DeleteMemoViewRequest]) (*connect.Response[emptypb.Empty], error) { + resp, err := s.APIV1Service.DeleteMemoView(ctx, req.Msg) if err != nil { return nil, convertGRPCError(err) } diff --git a/server/router/api/v1/memo_view_service.go b/server/router/api/v1/memo_view_service.go new file mode 100644 index 00000000..fe7bb5b7 --- /dev/null +++ b/server/router/api/v1/memo_view_service.go @@ -0,0 +1,250 @@ +package v1 + +import ( + "context" + "fmt" + "strings" + + "github.com/pkg/errors" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + "google.golang.org/protobuf/types/known/emptypb" + + "github.com/usememos/memos/internal/filter" + "github.com/usememos/memos/internal/util" + v1pb "github.com/usememos/memos/proto/gen/api/v1" + storepb "github.com/usememos/memos/proto/gen/store" + "github.com/usememos/memos/store" +) + +// Helper function to extract user and memo view ID from a memo view resource name. +// Format: users/{user}/views/{view}. +func (s *APIV1Service) extractUserAndMemoViewIDFromName(ctx context.Context, name string) (*store.User, string, error) { + parts := strings.Split(name, "/") + if len(parts) != 4 || parts[0] != "users" || parts[2] != "views" { + return nil, "", errors.Errorf("invalid memo view name format: %s", name) + } + + user, err := ResolveUserByName(ctx, s.Store, BuildUserName(parts[1])) + if err != nil { + return nil, "", err + } + if user == nil { + return nil, "", errors.Errorf("user not found: %s", parts[1]) + } + + memoViewID := parts[3] + if memoViewID == "" { + return nil, "", errors.Errorf("empty memo view ID in name: %s", name) + } + + return user, memoViewID, nil +} + +// Helper function to construct a memo view resource name. +func constructMemoViewName(username string, memoViewID string) string { + return fmt.Sprintf("%s/views/%s", BuildUserName(username), memoViewID) +} + +func convertMemoViewFromStore(username string, memoView *storepb.MemoViewsUserSetting_MemoView) *v1pb.MemoView { + return &v1pb.MemoView{ + Name: constructMemoViewName(username, memoView.GetId()), + Title: memoView.GetTitle(), + Filter: memoView.GetFilter(), + } +} + +// authorizeMemoViewAccess resolves the owner of a memo view collection and asserts that +// the caller is that owner. +func (s *APIV1Service) authorizeMemoViewAccess(ctx context.Context, user *store.User) error { + currentUser, err := s.fetchCurrentUser(ctx) + if err != nil { + return status.Errorf(codes.Internal, "failed to get current user: %v", err) + } + if currentUser == nil { + return status.Errorf(codes.Unauthenticated, "user not authenticated") + } + if currentUser.ID != user.ID { + return status.Errorf(codes.PermissionDenied, "permission denied") + } + return nil +} + +// ListMemoViews lists the saved memo views owned by a user. +func (s *APIV1Service) ListMemoViews(ctx context.Context, request *v1pb.ListMemoViewsRequest) (*v1pb.ListMemoViewsResponse, error) { + user, err := ResolveUserByName(ctx, s.Store, request.Parent) + if err != nil { + return nil, status.Errorf(codes.InvalidArgument, "invalid user name: %v", err) + } + if user == nil { + return nil, status.Errorf(codes.NotFound, "user not found") + } + if err := s.authorizeMemoViewAccess(ctx, user); err != nil { + return nil, err + } + + storeMemoViews, err := s.Store.GetUserMemoViews(ctx, user.ID) + if err != nil { + return nil, status.Errorf(codes.Internal, "failed to get memo views: %v", err) + } + + memoViews := []*v1pb.MemoView{} + for _, memoView := range storeMemoViews { + memoViews = append(memoViews, convertMemoViewFromStore(user.Username, memoView)) + } + + return &v1pb.ListMemoViewsResponse{ + MemoViews: memoViews, + }, nil +} + +// GetMemoView returns a saved memo view by resource name. +func (s *APIV1Service) GetMemoView(ctx context.Context, request *v1pb.GetMemoViewRequest) (*v1pb.MemoView, error) { + user, memoViewID, err := s.extractUserAndMemoViewIDFromName(ctx, request.Name) + if err != nil { + return nil, status.Errorf(codes.InvalidArgument, "invalid memo view name: %v", err) + } + if err := s.authorizeMemoViewAccess(ctx, user); err != nil { + return nil, err + } + + memoViews, err := s.Store.GetUserMemoViews(ctx, user.ID) + if err != nil { + return nil, status.Errorf(codes.Internal, "failed to get memo views: %v", err) + } + for _, memoView := range memoViews { + if memoView.GetId() == memoViewID { + return convertMemoViewFromStore(user.Username, memoView), nil + } + } + + return nil, status.Errorf(codes.NotFound, "memo view not found") +} + +// CreateMemoView creates a saved memo view for a user. +func (s *APIV1Service) CreateMemoView(ctx context.Context, request *v1pb.CreateMemoViewRequest) (*v1pb.MemoView, error) { + user, err := ResolveUserByName(ctx, s.Store, request.Parent) + if err != nil { + return nil, status.Errorf(codes.InvalidArgument, "invalid user name: %v", err) + } + if user == nil { + return nil, status.Errorf(codes.NotFound, "user not found") + } + if err := s.authorizeMemoViewAccess(ctx, user); err != nil { + return nil, err + } + + newMemoView := &storepb.MemoViewsUserSetting_MemoView{ + Id: util.GenUUID(), + Title: request.GetMemoView().GetTitle(), + Filter: request.GetMemoView().GetFilter(), + } + if newMemoView.Title == "" { + return nil, status.Errorf(codes.InvalidArgument, "title is required") + } + if err := s.validateFilter(ctx, newMemoView.Filter); err != nil { + return nil, status.Errorf(codes.InvalidArgument, "invalid filter: %v", err) + } + if request.ValidateOnly { + return convertMemoViewFromStore(user.Username, newMemoView), nil + } + + if err := s.Store.AddUserMemoView(ctx, user.ID, newMemoView); err != nil { + return nil, status.Errorf(codes.Internal, "failed to create memo view: %v", err) + } + + return convertMemoViewFromStore(user.Username, newMemoView), nil +} + +// UpdateMemoView updates the selected fields of a saved memo view. +func (s *APIV1Service) UpdateMemoView(ctx context.Context, request *v1pb.UpdateMemoViewRequest) (*v1pb.MemoView, error) { + user, memoViewID, err := s.extractUserAndMemoViewIDFromName(ctx, request.GetMemoView().GetName()) + if err != nil { + return nil, status.Errorf(codes.InvalidArgument, "invalid memo view name: %v", err) + } + if err := s.authorizeMemoViewAccess(ctx, user); err != nil { + return nil, err + } + if request.UpdateMask == nil || len(request.UpdateMask.Paths) == 0 { + return nil, status.Errorf(codes.InvalidArgument, "update mask is required") + } + + var title, filterValue *string + for _, field := range request.UpdateMask.Paths { + switch field { + case "title": + if request.GetMemoView().GetTitle() == "" { + return nil, status.Errorf(codes.InvalidArgument, "title is required") + } + value := request.GetMemoView().GetTitle() + title = &value + case "filter": + if err := s.validateFilter(ctx, request.GetMemoView().GetFilter()); err != nil { + return nil, status.Errorf(codes.InvalidArgument, "invalid filter: %v", err) + } + value := request.GetMemoView().GetFilter() + filterValue = &value + default: + return nil, status.Errorf(codes.InvalidArgument, "unsupported update mask path: %s", field) + } + } + + updatedMemoView, err := s.Store.UpdateUserMemoView(ctx, user.ID, memoViewID, title, filterValue) + if err != nil { + return nil, status.Errorf(codes.Internal, "failed to update memo view: %v", err) + } + if updatedMemoView == nil { + return nil, status.Errorf(codes.NotFound, "memo view not found") + } + + return convertMemoViewFromStore(user.Username, updatedMemoView), nil +} + +// DeleteMemoView deletes a saved memo view by resource name. +func (s *APIV1Service) DeleteMemoView(ctx context.Context, request *v1pb.DeleteMemoViewRequest) (*emptypb.Empty, error) { + user, memoViewID, err := s.extractUserAndMemoViewIDFromName(ctx, request.Name) + if err != nil { + return nil, status.Errorf(codes.InvalidArgument, "invalid memo view name: %v", err) + } + if err := s.authorizeMemoViewAccess(ctx, user); err != nil { + return nil, err + } + + found, err := s.Store.RemoveUserMemoView(ctx, user.ID, memoViewID) + if err != nil { + return nil, status.Errorf(codes.Internal, "failed to delete memo view: %v", err) + } + if !found { + return nil, status.Errorf(codes.NotFound, "memo view not found") + } + + return &emptypb.Empty{}, nil +} + +func (s *APIV1Service) validateFilter(ctx context.Context, filterStr string) error { + if filterStr == "" { + return errors.New("filter cannot be empty") + } + + engine, err := filter.DefaultEngine() + if err != nil { + return err + } + + if _, err := engine.CompileToStatement(ctx, filterStr, filter.RenderOptions{Dialect: s.filterDialect()}); err != nil { + return errors.Wrap(err, "failed to compile filter") + } + return nil +} + +// filterDialect maps the configured database driver onto the filter engine dialect. +func (s *APIV1Service) filterDialect() filter.DialectName { + switch s.Profile.Driver { + case "mysql": + return filter.DialectMySQL + case "postgres": + return filter.DialectPostgres + default: + return filter.DialectSQLite + } +} diff --git a/server/router/api/v1/shortcut_service.go b/server/router/api/v1/shortcut_service.go deleted file mode 100644 index 64b439ec..00000000 --- a/server/router/api/v1/shortcut_service.go +++ /dev/null @@ -1,360 +0,0 @@ -package v1 - -import ( - "context" - "fmt" - "strings" - - "github.com/pkg/errors" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" - "google.golang.org/protobuf/types/known/emptypb" - - "github.com/usememos/memos/internal/filter" - "github.com/usememos/memos/internal/util" - v1pb "github.com/usememos/memos/proto/gen/api/v1" - storepb "github.com/usememos/memos/proto/gen/store" - "github.com/usememos/memos/store" -) - -// Helper function to extract user and shortcut ID from shortcut resource name. -// Format: users/{user}/shortcuts/{shortcut}. -func (s *APIV1Service) extractUserAndShortcutIDFromName(ctx context.Context, name string) (*store.User, string, error) { - parts := strings.Split(name, "/") - if len(parts) != 4 || parts[0] != "users" || parts[2] != "shortcuts" { - return nil, "", errors.Errorf("invalid shortcut name format: %s", name) - } - - user, err := ResolveUserByName(ctx, s.Store, BuildUserName(parts[1])) - if err != nil { - return nil, "", err - } - if user == nil { - return nil, "", errors.Errorf("user not found: %s", parts[1]) - } - - shortcutID := parts[3] - if shortcutID == "" { - return nil, "", errors.Errorf("empty shortcut ID in name: %s", name) - } - - return user, shortcutID, nil -} - -// Helper function to construct shortcut resource name. -func constructShortcutName(username string, shortcutID string) string { - return fmt.Sprintf("%s/shortcuts/%s", BuildUserName(username), shortcutID) -} - -func (s *APIV1Service) ListShortcuts(ctx context.Context, request *v1pb.ListShortcutsRequest) (*v1pb.ListShortcutsResponse, error) { - user, err := ResolveUserByName(ctx, s.Store, request.Parent) - if err != nil { - return nil, status.Errorf(codes.InvalidArgument, "invalid user name: %v", err) - } - if user == nil { - return nil, status.Errorf(codes.NotFound, "user not found") - } - userID := user.ID - - currentUser, err := s.fetchCurrentUser(ctx) - if err != nil { - return nil, status.Errorf(codes.Internal, "failed to get current user: %v", err) - } - if currentUser == nil || currentUser.ID != userID { - return nil, status.Errorf(codes.PermissionDenied, "permission denied") - } - - userSetting, err := s.Store.GetUserSetting(ctx, &store.FindUserSetting{ - UserID: &userID, - Key: storepb.UserSetting_SHORTCUTS, - }) - if err != nil { - return nil, status.Errorf(codes.Internal, "failed to get user setting: %v", err) - } - if userSetting == nil { - return &v1pb.ListShortcutsResponse{ - Shortcuts: []*v1pb.Shortcut{}, - }, nil - } - - shortcutsUserSetting := userSetting.GetShortcuts() - shortcuts := []*v1pb.Shortcut{} - for _, shortcut := range shortcutsUserSetting.GetShortcuts() { - shortcuts = append(shortcuts, &v1pb.Shortcut{ - Name: constructShortcutName(user.Username, shortcut.GetId()), - Title: shortcut.GetTitle(), - Filter: shortcut.GetFilter(), - }) - } - - return &v1pb.ListShortcutsResponse{ - Shortcuts: shortcuts, - }, nil -} - -func (s *APIV1Service) GetShortcut(ctx context.Context, request *v1pb.GetShortcutRequest) (*v1pb.Shortcut, error) { - user, shortcutID, err := s.extractUserAndShortcutIDFromName(ctx, request.Name) - if err != nil { - return nil, status.Errorf(codes.InvalidArgument, "invalid shortcut name: %v", err) - } - userID := user.ID - - currentUser, err := s.fetchCurrentUser(ctx) - if err != nil { - return nil, status.Errorf(codes.Internal, "failed to get current user: %v", err) - } - if currentUser == nil || currentUser.ID != userID { - return nil, status.Errorf(codes.PermissionDenied, "permission denied") - } - - userSetting, err := s.Store.GetUserSetting(ctx, &store.FindUserSetting{ - UserID: &userID, - Key: storepb.UserSetting_SHORTCUTS, - }) - if err != nil { - return nil, err - } - if userSetting == nil { - return nil, status.Errorf(codes.NotFound, "shortcut not found") - } - - shortcutsUserSetting := userSetting.GetShortcuts() - for _, shortcut := range shortcutsUserSetting.GetShortcuts() { - if shortcut.GetId() == shortcutID { - return &v1pb.Shortcut{ - Name: constructShortcutName(user.Username, shortcut.GetId()), - Title: shortcut.GetTitle(), - Filter: shortcut.GetFilter(), - }, nil - } - } - - return nil, status.Errorf(codes.NotFound, "shortcut not found") -} - -func (s *APIV1Service) CreateShortcut(ctx context.Context, request *v1pb.CreateShortcutRequest) (*v1pb.Shortcut, error) { - user, err := ResolveUserByName(ctx, s.Store, request.Parent) - if err != nil { - return nil, status.Errorf(codes.InvalidArgument, "invalid user name: %v", err) - } - if user == nil { - return nil, status.Errorf(codes.NotFound, "user not found") - } - userID := user.ID - - currentUser, err := s.fetchCurrentUser(ctx) - if err != nil { - return nil, status.Errorf(codes.Internal, "failed to get current user: %v", err) - } - if currentUser == nil || currentUser.ID != userID { - return nil, status.Errorf(codes.PermissionDenied, "permission denied") - } - - newShortcut := &storepb.ShortcutsUserSetting_Shortcut{ - Id: util.GenUUID(), - Title: request.Shortcut.GetTitle(), - Filter: request.Shortcut.GetFilter(), - } - if newShortcut.Title == "" { - return nil, status.Errorf(codes.InvalidArgument, "title is required") - } - if err := s.validateFilter(ctx, newShortcut.Filter); err != nil { - return nil, status.Errorf(codes.InvalidArgument, "invalid filter: %v", err) - } - if request.ValidateOnly { - return &v1pb.Shortcut{ - Name: constructShortcutName(user.Username, newShortcut.GetId()), - Title: newShortcut.GetTitle(), - Filter: newShortcut.GetFilter(), - }, nil - } - - userSetting, err := s.Store.GetUserSetting(ctx, &store.FindUserSetting{ - UserID: &userID, - Key: storepb.UserSetting_SHORTCUTS, - }) - if err != nil { - return nil, err - } - if userSetting == nil { - userSetting = &storepb.UserSetting{ - UserId: userID, - Key: storepb.UserSetting_SHORTCUTS, - Value: &storepb.UserSetting_Shortcuts{ - Shortcuts: &storepb.ShortcutsUserSetting{ - Shortcuts: []*storepb.ShortcutsUserSetting_Shortcut{}, - }, - }, - } - } - shortcutsUserSetting := userSetting.GetShortcuts() - shortcuts := shortcutsUserSetting.GetShortcuts() - shortcuts = append(shortcuts, newShortcut) - shortcutsUserSetting.Shortcuts = shortcuts - - userSetting.Value = &storepb.UserSetting_Shortcuts{ - Shortcuts: shortcutsUserSetting, - } - - _, err = s.Store.UpsertUserSetting(ctx, userSetting) - if err != nil { - return nil, status.Errorf(codes.Internal, "failed to upsert user setting: %v", err) - } - - return &v1pb.Shortcut{ - Name: constructShortcutName(user.Username, newShortcut.GetId()), - Title: newShortcut.GetTitle(), - Filter: newShortcut.GetFilter(), - }, nil -} - -func (s *APIV1Service) UpdateShortcut(ctx context.Context, request *v1pb.UpdateShortcutRequest) (*v1pb.Shortcut, error) { - user, shortcutID, err := s.extractUserAndShortcutIDFromName(ctx, request.Shortcut.Name) - if err != nil { - return nil, status.Errorf(codes.InvalidArgument, "invalid shortcut name: %v", err) - } - userID := user.ID - - currentUser, err := s.fetchCurrentUser(ctx) - if err != nil { - return nil, status.Errorf(codes.Internal, "failed to get current user: %v", err) - } - if currentUser == nil || currentUser.ID != userID { - return nil, status.Errorf(codes.PermissionDenied, "permission denied") - } - if request.UpdateMask == nil || len(request.UpdateMask.Paths) == 0 { - return nil, status.Errorf(codes.InvalidArgument, "update mask is required") - } - - userSetting, err := s.Store.GetUserSetting(ctx, &store.FindUserSetting{ - UserID: &userID, - Key: storepb.UserSetting_SHORTCUTS, - }) - if err != nil { - return nil, err - } - if userSetting == nil { - return nil, status.Errorf(codes.NotFound, "shortcut not found") - } - - shortcutsUserSetting := userSetting.GetShortcuts() - shortcuts := shortcutsUserSetting.GetShortcuts() - var foundShortcut *storepb.ShortcutsUserSetting_Shortcut - newShortcuts := make([]*storepb.ShortcutsUserSetting_Shortcut, 0, len(shortcuts)) - for _, shortcut := range shortcuts { - if shortcut.GetId() == shortcutID { - foundShortcut = shortcut - for _, field := range request.UpdateMask.Paths { - if field == "title" { - if request.Shortcut.GetTitle() == "" { - return nil, status.Errorf(codes.InvalidArgument, "title is required") - } - shortcut.Title = request.Shortcut.GetTitle() - } else if field == "filter" { - if err := s.validateFilter(ctx, request.Shortcut.GetFilter()); err != nil { - return nil, status.Errorf(codes.InvalidArgument, "invalid filter: %v", err) - } - shortcut.Filter = request.Shortcut.GetFilter() - } - } - } - newShortcuts = append(newShortcuts, shortcut) - } - - if foundShortcut == nil { - return nil, status.Errorf(codes.NotFound, "shortcut not found") - } - - shortcutsUserSetting.Shortcuts = newShortcuts - userSetting.Value = &storepb.UserSetting_Shortcuts{ - Shortcuts: shortcutsUserSetting, - } - _, err = s.Store.UpsertUserSetting(ctx, userSetting) - if err != nil { - return nil, err - } - - return &v1pb.Shortcut{ - Name: constructShortcutName(user.Username, foundShortcut.GetId()), - Title: foundShortcut.GetTitle(), - Filter: foundShortcut.GetFilter(), - }, nil -} - -func (s *APIV1Service) DeleteShortcut(ctx context.Context, request *v1pb.DeleteShortcutRequest) (*emptypb.Empty, error) { - user, shortcutID, err := s.extractUserAndShortcutIDFromName(ctx, request.Name) - if err != nil { - return nil, status.Errorf(codes.InvalidArgument, "invalid shortcut name: %v", err) - } - userID := user.ID - - currentUser, err := s.fetchCurrentUser(ctx) - if err != nil { - return nil, status.Errorf(codes.Internal, "failed to get current user: %v", err) - } - if currentUser == nil || currentUser.ID != userID { - return nil, status.Errorf(codes.PermissionDenied, "permission denied") - } - - userSetting, err := s.Store.GetUserSetting(ctx, &store.FindUserSetting{ - UserID: &userID, - Key: storepb.UserSetting_SHORTCUTS, - }) - if err != nil { - return nil, err - } - if userSetting == nil { - return nil, status.Errorf(codes.NotFound, "shortcut not found") - } - - shortcutsUserSetting := userSetting.GetShortcuts() - shortcuts := shortcutsUserSetting.GetShortcuts() - newShortcuts := make([]*storepb.ShortcutsUserSetting_Shortcut, 0, len(shortcuts)) - found := false - for _, shortcut := range shortcuts { - if shortcut.GetId() != shortcutID { - newShortcuts = append(newShortcuts, shortcut) - } else { - found = true - } - } - if !found { - return nil, status.Errorf(codes.NotFound, "shortcut not found") - } - shortcutsUserSetting.Shortcuts = newShortcuts - userSetting.Value = &storepb.UserSetting_Shortcuts{ - Shortcuts: shortcutsUserSetting, - } - _, err = s.Store.UpsertUserSetting(ctx, userSetting) - if err != nil { - return nil, status.Errorf(codes.Internal, "failed to upsert user setting: %v", err) - } - - return &emptypb.Empty{}, nil -} - -func (s *APIV1Service) validateFilter(ctx context.Context, filterStr string) error { - if filterStr == "" { - return errors.New("filter cannot be empty") - } - - engine, err := filter.DefaultEngine() - if err != nil { - return err - } - - var dialect filter.DialectName - switch s.Profile.Driver { - case "mysql": - dialect = filter.DialectMySQL - case "postgres": - dialect = filter.DialectPostgres - default: - dialect = filter.DialectSQLite - } - - if _, err := engine.CompileToStatement(ctx, filterStr, filter.RenderOptions{Dialect: dialect}); err != nil { - return errors.Wrap(err, "failed to compile filter") - } - return nil -} diff --git a/server/router/api/v1/test/shortcut_service_test.go b/server/router/api/v1/test/memo_view_service_test.go similarity index 52% rename from server/router/api/v1/test/shortcut_service_test.go rename to server/router/api/v1/test/memo_view_service_test.go index a0e1c992..c288b94b 100644 --- a/server/router/api/v1/test/shortcut_service_test.go +++ b/server/router/api/v1/test/memo_view_service_test.go @@ -3,6 +3,7 @@ package test import ( "context" "fmt" + "sync" "testing" "github.com/stretchr/testify/require" @@ -11,10 +12,10 @@ import ( v1pb "github.com/usememos/memos/proto/gen/api/v1" ) -func TestListShortcuts(t *testing.T) { +func TestListMemoViews(t *testing.T) { ctx := context.Background() - t.Run("ListShortcuts success", func(t *testing.T) { + t.Run("ListMemoViews success", func(t *testing.T) { ts := NewTestService(t) defer ts.Cleanup() @@ -25,18 +26,18 @@ func TestListShortcuts(t *testing.T) { // Set user context userCtx := ts.CreateUserContext(ctx, user.ID) - // List shortcuts (should be empty initially) - req := &v1pb.ListShortcutsRequest{ + // List memoViews (should be empty initially) + req := &v1pb.ListMemoViewsRequest{ Parent: fmt.Sprintf("users/%s", user.Username), } - resp, err := ts.Service.ListShortcuts(userCtx, req) + resp, err := ts.Service.ListMemoViews(userCtx, req) require.NoError(t, err) require.NotNil(t, resp) - require.Empty(t, resp.Shortcuts) + require.Empty(t, resp.MemoViews) }) - t.Run("ListShortcuts permission denied for different user", func(t *testing.T) { + t.Run("ListMemoViews permission denied for different user", func(t *testing.T) { ts := NewTestService(t) defer ts.Cleanup() @@ -46,19 +47,19 @@ func TestListShortcuts(t *testing.T) { user2, err := ts.CreateRegularUser(ctx, "user2") require.NoError(t, err) - // Set user1 context but try to list user2's shortcuts + // Set user1 context but try to list user2's memoViews userCtx := ts.CreateUserContext(ctx, user1.ID) - req := &v1pb.ListShortcutsRequest{ + req := &v1pb.ListMemoViewsRequest{ Parent: fmt.Sprintf("users/%s", user2.Username), } - _, err = ts.Service.ListShortcuts(userCtx, req) + _, err = ts.Service.ListMemoViews(userCtx, req) require.Error(t, err) require.Contains(t, err.Error(), "permission denied") }) - t.Run("ListShortcuts invalid parent format", func(t *testing.T) { + t.Run("ListMemoViews invalid parent format", func(t *testing.T) { ts := NewTestService(t) defer ts.Cleanup() @@ -69,32 +70,32 @@ func TestListShortcuts(t *testing.T) { // Set user context userCtx := ts.CreateUserContext(ctx, user.ID) - req := &v1pb.ListShortcutsRequest{ + req := &v1pb.ListMemoViewsRequest{ Parent: "invalid-parent-format", } - _, err = ts.Service.ListShortcuts(userCtx, req) + _, err = ts.Service.ListMemoViews(userCtx, req) require.Error(t, err) require.Contains(t, err.Error(), "invalid user name") }) - t.Run("ListShortcuts unauthenticated", func(t *testing.T) { + t.Run("ListMemoViews unauthenticated", func(t *testing.T) { ts := NewTestService(t) defer ts.Cleanup() _, err := ts.CreateRegularUser(ctx, "testuser") require.NoError(t, err) - req := &v1pb.ListShortcutsRequest{ + req := &v1pb.ListMemoViewsRequest{ Parent: "users/testuser", } - _, err = ts.Service.ListShortcuts(ctx, req) + _, err = ts.Service.ListMemoViews(ctx, req) require.Error(t, err) - require.Contains(t, err.Error(), "permission denied") + require.Contains(t, err.Error(), "user not authenticated") }) - t.Run("ListShortcuts returns not found for numeric parent", func(t *testing.T) { + t.Run("ListMemoViews returns not found for numeric parent", func(t *testing.T) { ts := NewTestService(t) defer ts.Cleanup() @@ -103,7 +104,7 @@ func TestListShortcuts(t *testing.T) { userCtx := ts.CreateUserContext(ctx, user.ID) - _, err = ts.Service.ListShortcuts(userCtx, &v1pb.ListShortcutsRequest{ + _, err = ts.Service.ListMemoViews(userCtx, &v1pb.ListMemoViewsRequest{ Parent: "users/1", }) require.Error(t, err) @@ -111,10 +112,10 @@ func TestListShortcuts(t *testing.T) { }) } -func TestGetShortcut(t *testing.T) { +func TestGetMemoView(t *testing.T) { ctx := context.Background() - t.Run("GetShortcut success", func(t *testing.T) { + t.Run("GetMemoView success", func(t *testing.T) { ts := NewTestService(t) defer ts.Cleanup() @@ -125,32 +126,32 @@ func TestGetShortcut(t *testing.T) { // Set user context userCtx := ts.CreateUserContext(ctx, user.ID) - // First create a shortcut - createReq := &v1pb.CreateShortcutRequest{ + // First create a memoView + createReq := &v1pb.CreateMemoViewRequest{ Parent: fmt.Sprintf("users/%s", user.Username), - Shortcut: &v1pb.Shortcut{ - Title: "Test Shortcut", + MemoView: &v1pb.MemoView{ + Title: "Test MemoView", Filter: "tag in [\"test\"]", }, } - created, err := ts.Service.CreateShortcut(userCtx, createReq) + created, err := ts.Service.CreateMemoView(userCtx, createReq) require.NoError(t, err) - // Now get the shortcut - getReq := &v1pb.GetShortcutRequest{ + // Now get the memoView + getReq := &v1pb.GetMemoViewRequest{ Name: created.Name, } - resp, err := ts.Service.GetShortcut(userCtx, getReq) + resp, err := ts.Service.GetMemoView(userCtx, getReq) require.NoError(t, err) require.NotNil(t, resp) require.Equal(t, created.Name, resp.Name) - require.Equal(t, "Test Shortcut", resp.Title) + require.Equal(t, "Test MemoView", resp.Title) require.Equal(t, "tag in [\"test\"]", resp.Filter) }) - t.Run("GetShortcut permission denied for different user", func(t *testing.T) { + t.Run("GetMemoView permission denied for different user", func(t *testing.T) { ts := NewTestService(t) defer ts.Cleanup() @@ -160,31 +161,31 @@ func TestGetShortcut(t *testing.T) { user2, err := ts.CreateRegularUser(ctx, "user2") require.NoError(t, err) - // Create shortcut as user1 + // Create memoView as user1 user1Ctx := ts.CreateUserContext(ctx, user1.ID) - createReq := &v1pb.CreateShortcutRequest{ + createReq := &v1pb.CreateMemoViewRequest{ Parent: fmt.Sprintf("users/%s", user1.Username), - Shortcut: &v1pb.Shortcut{ - Title: "User1 Shortcut", + MemoView: &v1pb.MemoView{ + Title: "User1 MemoView", Filter: "tag in [\"user1\"]", }, } - created, err := ts.Service.CreateShortcut(user1Ctx, createReq) + created, err := ts.Service.CreateMemoView(user1Ctx, createReq) require.NoError(t, err) - // Try to get shortcut as user2 + // Try to get memoView as user2 user2Ctx := ts.CreateUserContext(ctx, user2.ID) - getReq := &v1pb.GetShortcutRequest{ + getReq := &v1pb.GetMemoViewRequest{ Name: created.Name, } - _, err = ts.Service.GetShortcut(user2Ctx, getReq) + _, err = ts.Service.GetMemoView(user2Ctx, getReq) require.Error(t, err) require.Contains(t, err.Error(), "permission denied") }) - t.Run("GetShortcut invalid name format", func(t *testing.T) { + t.Run("GetMemoView invalid name format", func(t *testing.T) { ts := NewTestService(t) defer ts.Cleanup() @@ -195,16 +196,16 @@ func TestGetShortcut(t *testing.T) { // Set user context userCtx := ts.CreateUserContext(ctx, user.ID) - req := &v1pb.GetShortcutRequest{ - Name: "invalid-shortcut-name", + req := &v1pb.GetMemoViewRequest{ + Name: "invalid-memo-view-name", } - _, err = ts.Service.GetShortcut(userCtx, req) + _, err = ts.Service.GetMemoView(userCtx, req) require.Error(t, err) - require.Contains(t, err.Error(), "invalid shortcut name") + require.Contains(t, err.Error(), "invalid memo view name") }) - t.Run("GetShortcut not found", func(t *testing.T) { + t.Run("GetMemoView not found", func(t *testing.T) { ts := NewTestService(t) defer ts.Cleanup() @@ -215,20 +216,20 @@ func TestGetShortcut(t *testing.T) { // Set user context userCtx := ts.CreateUserContext(ctx, user.ID) - req := &v1pb.GetShortcutRequest{ - Name: fmt.Sprintf("users/%s", user.Username) + "/shortcuts/nonexistent", + req := &v1pb.GetMemoViewRequest{ + Name: fmt.Sprintf("users/%s", user.Username) + "/views/nonexistent", } - _, err = ts.Service.GetShortcut(userCtx, req) + _, err = ts.Service.GetMemoView(userCtx, req) require.Error(t, err) require.Contains(t, err.Error(), "not found") }) } -func TestCreateShortcut(t *testing.T) { +func TestCreateMemoView(t *testing.T) { ctx := context.Background() - t.Run("CreateShortcut success", func(t *testing.T) { + t.Run("CreateMemoView success", func(t *testing.T) { ts := NewTestService(t) defer ts.Cleanup() @@ -239,33 +240,33 @@ func TestCreateShortcut(t *testing.T) { // Set user context userCtx := ts.CreateUserContext(ctx, user.ID) - req := &v1pb.CreateShortcutRequest{ + req := &v1pb.CreateMemoViewRequest{ Parent: fmt.Sprintf("users/%s", user.Username), - Shortcut: &v1pb.Shortcut{ - Title: "My Shortcut", + MemoView: &v1pb.MemoView{ + Title: "My MemoView", Filter: "tag in [\"important\"]", }, } - resp, err := ts.Service.CreateShortcut(userCtx, req) + resp, err := ts.Service.CreateMemoView(userCtx, req) require.NoError(t, err) require.NotNil(t, resp) - require.Equal(t, "My Shortcut", resp.Title) + require.Equal(t, "My MemoView", resp.Title) require.Equal(t, "tag in [\"important\"]", resp.Filter) - require.Contains(t, resp.Name, fmt.Sprintf("users/%s/shortcuts/", user.Username)) + require.Contains(t, resp.Name, fmt.Sprintf("users/%s/views/", user.Username)) - // Verify the shortcut was created by listing - listReq := &v1pb.ListShortcutsRequest{ + // Verify the memoView was created by listing + listReq := &v1pb.ListMemoViewsRequest{ Parent: fmt.Sprintf("users/%s", user.Username), } - listResp, err := ts.Service.ListShortcuts(userCtx, listReq) + listResp, err := ts.Service.ListMemoViews(userCtx, listReq) require.NoError(t, err) - require.Len(t, listResp.Shortcuts, 1) - require.Equal(t, "My Shortcut", listResp.Shortcuts[0].Title) + require.Len(t, listResp.MemoViews, 1) + require.Equal(t, "My MemoView", listResp.MemoViews[0].Title) }) - t.Run("CreateShortcut permission denied for different user", func(t *testing.T) { + t.Run("CreateMemoView permission denied for different user", func(t *testing.T) { ts := NewTestService(t) defer ts.Cleanup() @@ -275,23 +276,23 @@ func TestCreateShortcut(t *testing.T) { user2, err := ts.CreateRegularUser(ctx, "user2") require.NoError(t, err) - // Set user1 context but try to create shortcut for user2 + // Set user1 context but try to create memoView for user2 userCtx := ts.CreateUserContext(ctx, user1.ID) - req := &v1pb.CreateShortcutRequest{ + req := &v1pb.CreateMemoViewRequest{ Parent: fmt.Sprintf("users/%s", user2.Username), - Shortcut: &v1pb.Shortcut{ - Title: "Forbidden Shortcut", + MemoView: &v1pb.MemoView{ + Title: "Forbidden MemoView", Filter: "tag in [\"forbidden\"]", }, } - _, err = ts.Service.CreateShortcut(userCtx, req) + _, err = ts.Service.CreateMemoView(userCtx, req) require.Error(t, err) require.Contains(t, err.Error(), "permission denied") }) - t.Run("CreateShortcut invalid parent format", func(t *testing.T) { + t.Run("CreateMemoView invalid parent format", func(t *testing.T) { ts := NewTestService(t) defer ts.Cleanup() @@ -302,20 +303,20 @@ func TestCreateShortcut(t *testing.T) { // Set user context userCtx := ts.CreateUserContext(ctx, user.ID) - req := &v1pb.CreateShortcutRequest{ + req := &v1pb.CreateMemoViewRequest{ Parent: "invalid-parent", - Shortcut: &v1pb.Shortcut{ - Title: "Test Shortcut", + MemoView: &v1pb.MemoView{ + Title: "Test MemoView", Filter: "tag in [\"test\"]", }, } - _, err = ts.Service.CreateShortcut(userCtx, req) + _, err = ts.Service.CreateMemoView(userCtx, req) require.Error(t, err) require.Contains(t, err.Error(), "invalid user name") }) - t.Run("CreateShortcut invalid filter", func(t *testing.T) { + t.Run("CreateMemoView invalid filter", func(t *testing.T) { ts := NewTestService(t) defer ts.Cleanup() @@ -326,20 +327,20 @@ func TestCreateShortcut(t *testing.T) { // Set user context userCtx := ts.CreateUserContext(ctx, user.ID) - req := &v1pb.CreateShortcutRequest{ + req := &v1pb.CreateMemoViewRequest{ Parent: fmt.Sprintf("users/%s", user.Username), - Shortcut: &v1pb.Shortcut{ - Title: "Invalid Filter Shortcut", + MemoView: &v1pb.MemoView{ + Title: "Invalid Filter MemoView", Filter: "invalid||filter))syntax", }, } - _, err = ts.Service.CreateShortcut(userCtx, req) + _, err = ts.Service.CreateMemoView(userCtx, req) require.Error(t, err) require.Contains(t, err.Error(), "invalid filter") }) - t.Run("CreateShortcut missing title", func(t *testing.T) { + t.Run("CreateMemoView missing title", func(t *testing.T) { ts := NewTestService(t) defer ts.Cleanup() @@ -350,23 +351,23 @@ func TestCreateShortcut(t *testing.T) { // Set user context userCtx := ts.CreateUserContext(ctx, user.ID) - req := &v1pb.CreateShortcutRequest{ + req := &v1pb.CreateMemoViewRequest{ Parent: fmt.Sprintf("users/%s", user.Username), - Shortcut: &v1pb.Shortcut{ + MemoView: &v1pb.MemoView{ Filter: "tag in [\"test\"]", }, } - _, err = ts.Service.CreateShortcut(userCtx, req) + _, err = ts.Service.CreateMemoView(userCtx, req) require.Error(t, err) require.Contains(t, err.Error(), "title is required") }) } -func TestUpdateShortcut(t *testing.T) { +func TestUpdateMemoView(t *testing.T) { ctx := context.Background() - t.Run("UpdateShortcut success", func(t *testing.T) { + t.Run("UpdateMemoView success", func(t *testing.T) { ts := NewTestService(t) defer ts.Cleanup() @@ -377,21 +378,21 @@ func TestUpdateShortcut(t *testing.T) { // Set user context userCtx := ts.CreateUserContext(ctx, user.ID) - // Create a shortcut first - createReq := &v1pb.CreateShortcutRequest{ + // Create a memoView first + createReq := &v1pb.CreateMemoViewRequest{ Parent: fmt.Sprintf("users/%s", user.Username), - Shortcut: &v1pb.Shortcut{ + MemoView: &v1pb.MemoView{ Title: "Original Title", Filter: "tag in [\"original\"]", }, } - created, err := ts.Service.CreateShortcut(userCtx, createReq) + created, err := ts.Service.CreateMemoView(userCtx, createReq) require.NoError(t, err) - // Update the shortcut - updateReq := &v1pb.UpdateShortcutRequest{ - Shortcut: &v1pb.Shortcut{ + // Update the memoView + updateReq := &v1pb.UpdateMemoViewRequest{ + MemoView: &v1pb.MemoView{ Name: created.Name, Title: "Updated Title", Filter: "tag in [\"updated\"]", @@ -401,7 +402,7 @@ func TestUpdateShortcut(t *testing.T) { }, } - updated, err := ts.Service.UpdateShortcut(userCtx, updateReq) + updated, err := ts.Service.UpdateMemoView(userCtx, updateReq) require.NoError(t, err) require.NotNil(t, updated) require.Equal(t, "Updated Title", updated.Title) @@ -409,7 +410,7 @@ func TestUpdateShortcut(t *testing.T) { require.Equal(t, created.Name, updated.Name) }) - t.Run("UpdateShortcut permission denied for different user", func(t *testing.T) { + t.Run("UpdateMemoView permission denied for different user", func(t *testing.T) { ts := NewTestService(t) defer ts.Cleanup() @@ -419,23 +420,23 @@ func TestUpdateShortcut(t *testing.T) { user2, err := ts.CreateRegularUser(ctx, "user2") require.NoError(t, err) - // Create shortcut as user1 + // Create memoView as user1 user1Ctx := ts.CreateUserContext(ctx, user1.ID) - createReq := &v1pb.CreateShortcutRequest{ + createReq := &v1pb.CreateMemoViewRequest{ Parent: fmt.Sprintf("users/%s", user1.Username), - Shortcut: &v1pb.Shortcut{ - Title: "User1 Shortcut", + MemoView: &v1pb.MemoView{ + Title: "User1 MemoView", Filter: "tag in [\"user1\"]", }, } - created, err := ts.Service.CreateShortcut(user1Ctx, createReq) + created, err := ts.Service.CreateMemoView(user1Ctx, createReq) require.NoError(t, err) - // Try to update shortcut as user2 + // Try to update memoView as user2 user2Ctx := ts.CreateUserContext(ctx, user2.ID) - updateReq := &v1pb.UpdateShortcutRequest{ - Shortcut: &v1pb.Shortcut{ + updateReq := &v1pb.UpdateMemoViewRequest{ + MemoView: &v1pb.MemoView{ Name: created.Name, Title: "Hacked Title", Filter: "tag in [\"hacked\"]", @@ -445,12 +446,12 @@ func TestUpdateShortcut(t *testing.T) { }, } - _, err = ts.Service.UpdateShortcut(user2Ctx, updateReq) + _, err = ts.Service.UpdateMemoView(user2Ctx, updateReq) require.Error(t, err) require.Contains(t, err.Error(), "permission denied") }) - t.Run("UpdateShortcut missing update mask", func(t *testing.T) { + t.Run("UpdateMemoView missing update mask", func(t *testing.T) { ts := NewTestService(t) defer ts.Cleanup() @@ -459,25 +460,49 @@ func TestUpdateShortcut(t *testing.T) { require.NoError(t, err) userCtx := ts.CreateUserContext(ctx, user.ID) - req := &v1pb.UpdateShortcutRequest{ - Shortcut: &v1pb.Shortcut{ - Name: fmt.Sprintf("users/%s/shortcuts/test", user.Username), + req := &v1pb.UpdateMemoViewRequest{ + MemoView: &v1pb.MemoView{ + Name: fmt.Sprintf("users/%s/views/test", user.Username), Title: "Updated Title", }, } - _, err = ts.Service.UpdateShortcut(userCtx, req) + _, err = ts.Service.UpdateMemoView(userCtx, req) require.Error(t, err) require.Contains(t, err.Error(), "update mask is required") }) - t.Run("UpdateShortcut invalid name format", func(t *testing.T) { + t.Run("UpdateMemoView rejects unsupported update mask paths", func(t *testing.T) { ts := NewTestService(t) defer ts.Cleanup() - req := &v1pb.UpdateShortcutRequest{ - Shortcut: &v1pb.Shortcut{ - Name: "invalid-shortcut-name", + user, err := ts.CreateRegularUser(ctx, "testuser") + require.NoError(t, err) + userCtx := ts.CreateUserContext(ctx, user.ID) + created, err := ts.Service.CreateMemoView(userCtx, &v1pb.CreateMemoViewRequest{ + Parent: fmt.Sprintf("users/%s", user.Username), + MemoView: &v1pb.MemoView{ + Title: "Original Title", + Filter: `tag in ["original"]`, + }, + }) + require.NoError(t, err) + + _, err = ts.Service.UpdateMemoView(userCtx, &v1pb.UpdateMemoViewRequest{ + MemoView: created, + UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"name"}}, + }) + require.Error(t, err) + require.Contains(t, err.Error(), "unsupported update mask path: name") + }) + + t.Run("UpdateMemoView invalid name format", func(t *testing.T) { + ts := NewTestService(t) + defer ts.Cleanup() + + req := &v1pb.UpdateMemoViewRequest{ + MemoView: &v1pb.MemoView{ + Name: "invalid-memo-view-name", Title: "Updated Title", }, UpdateMask: &fieldmaskpb.FieldMask{ @@ -485,12 +510,12 @@ func TestUpdateShortcut(t *testing.T) { }, } - _, err := ts.Service.UpdateShortcut(ctx, req) + _, err := ts.Service.UpdateMemoView(ctx, req) require.Error(t, err) - require.Contains(t, err.Error(), "invalid shortcut name") + require.Contains(t, err.Error(), "invalid memo view name") }) - t.Run("UpdateShortcut invalid filter", func(t *testing.T) { + t.Run("UpdateMemoView invalid filter", func(t *testing.T) { ts := NewTestService(t) defer ts.Cleanup() @@ -501,21 +526,21 @@ func TestUpdateShortcut(t *testing.T) { // Set user context userCtx := ts.CreateUserContext(ctx, user.ID) - // Create a shortcut first - createReq := &v1pb.CreateShortcutRequest{ + // Create a memoView first + createReq := &v1pb.CreateMemoViewRequest{ Parent: fmt.Sprintf("users/%s", user.Username), - Shortcut: &v1pb.Shortcut{ - Title: "Test Shortcut", + MemoView: &v1pb.MemoView{ + Title: "Test MemoView", Filter: "tag in [\"test\"]", }, } - created, err := ts.Service.CreateShortcut(userCtx, createReq) + created, err := ts.Service.CreateMemoView(userCtx, createReq) require.NoError(t, err) // Try to update with invalid filter - updateReq := &v1pb.UpdateShortcutRequest{ - Shortcut: &v1pb.Shortcut{ + updateReq := &v1pb.UpdateMemoViewRequest{ + MemoView: &v1pb.MemoView{ Name: created.Name, Filter: "invalid||filter))syntax", }, @@ -524,16 +549,16 @@ func TestUpdateShortcut(t *testing.T) { }, } - _, err = ts.Service.UpdateShortcut(userCtx, updateReq) + _, err = ts.Service.UpdateMemoView(userCtx, updateReq) require.Error(t, err) require.Contains(t, err.Error(), "invalid filter") }) } -func TestDeleteShortcut(t *testing.T) { +func TestDeleteMemoView(t *testing.T) { ctx := context.Background() - t.Run("DeleteShortcut success", func(t *testing.T) { + t.Run("DeleteMemoView success", func(t *testing.T) { ts := NewTestService(t) defer ts.Cleanup() @@ -544,46 +569,46 @@ func TestDeleteShortcut(t *testing.T) { // Set user context userCtx := ts.CreateUserContext(ctx, user.ID) - // Create a shortcut first - createReq := &v1pb.CreateShortcutRequest{ + // Create a memoView first + createReq := &v1pb.CreateMemoViewRequest{ Parent: fmt.Sprintf("users/%s", user.Username), - Shortcut: &v1pb.Shortcut{ - Title: "Shortcut to Delete", + MemoView: &v1pb.MemoView{ + Title: "MemoView to Delete", Filter: "tag in [\"delete\"]", }, } - created, err := ts.Service.CreateShortcut(userCtx, createReq) + created, err := ts.Service.CreateMemoView(userCtx, createReq) require.NoError(t, err) - // Delete the shortcut - deleteReq := &v1pb.DeleteShortcutRequest{ + // Delete the memoView + deleteReq := &v1pb.DeleteMemoViewRequest{ Name: created.Name, } - _, err = ts.Service.DeleteShortcut(userCtx, deleteReq) + _, err = ts.Service.DeleteMemoView(userCtx, deleteReq) require.NoError(t, err) - // Verify deletion by listing shortcuts - listReq := &v1pb.ListShortcutsRequest{ + // Verify deletion by listing memoViews + listReq := &v1pb.ListMemoViewsRequest{ Parent: fmt.Sprintf("users/%s", user.Username), } - listResp, err := ts.Service.ListShortcuts(userCtx, listReq) + listResp, err := ts.Service.ListMemoViews(userCtx, listReq) require.NoError(t, err) - require.Empty(t, listResp.Shortcuts) + require.Empty(t, listResp.MemoViews) - // Also verify by trying to get the deleted shortcut - getReq := &v1pb.GetShortcutRequest{ + // Also verify by trying to get the deleted memoView + getReq := &v1pb.GetMemoViewRequest{ Name: created.Name, } - _, err = ts.Service.GetShortcut(userCtx, getReq) + _, err = ts.Service.GetMemoView(userCtx, getReq) require.Error(t, err) require.Contains(t, err.Error(), "not found") }) - t.Run("DeleteShortcut permission denied for different user", func(t *testing.T) { + t.Run("DeleteMemoView permission denied for different user", func(t *testing.T) { ts := NewTestService(t) defer ts.Cleanup() @@ -593,44 +618,44 @@ func TestDeleteShortcut(t *testing.T) { user2, err := ts.CreateRegularUser(ctx, "user2") require.NoError(t, err) - // Create shortcut as user1 + // Create memoView as user1 user1Ctx := ts.CreateUserContext(ctx, user1.ID) - createReq := &v1pb.CreateShortcutRequest{ + createReq := &v1pb.CreateMemoViewRequest{ Parent: fmt.Sprintf("users/%s", user1.Username), - Shortcut: &v1pb.Shortcut{ - Title: "User1 Shortcut", + MemoView: &v1pb.MemoView{ + Title: "User1 MemoView", Filter: "tag in [\"user1\"]", }, } - created, err := ts.Service.CreateShortcut(user1Ctx, createReq) + created, err := ts.Service.CreateMemoView(user1Ctx, createReq) require.NoError(t, err) - // Try to delete shortcut as user2 + // Try to delete memoView as user2 user2Ctx := ts.CreateUserContext(ctx, user2.ID) - deleteReq := &v1pb.DeleteShortcutRequest{ + deleteReq := &v1pb.DeleteMemoViewRequest{ Name: created.Name, } - _, err = ts.Service.DeleteShortcut(user2Ctx, deleteReq) + _, err = ts.Service.DeleteMemoView(user2Ctx, deleteReq) require.Error(t, err) require.Contains(t, err.Error(), "permission denied") }) - t.Run("DeleteShortcut invalid name format", func(t *testing.T) { + t.Run("DeleteMemoView invalid name format", func(t *testing.T) { ts := NewTestService(t) defer ts.Cleanup() - req := &v1pb.DeleteShortcutRequest{ - Name: "invalid-shortcut-name", + req := &v1pb.DeleteMemoViewRequest{ + Name: "invalid-memo-view-name", } - _, err := ts.Service.DeleteShortcut(ctx, req) + _, err := ts.Service.DeleteMemoView(ctx, req) require.Error(t, err) - require.Contains(t, err.Error(), "invalid shortcut name") + require.Contains(t, err.Error(), "invalid memo view name") }) - t.Run("DeleteShortcut not found", func(t *testing.T) { + t.Run("DeleteMemoView not found", func(t *testing.T) { ts := NewTestService(t) defer ts.Cleanup() @@ -641,20 +666,20 @@ func TestDeleteShortcut(t *testing.T) { // Set user context userCtx := ts.CreateUserContext(ctx, user.ID) - req := &v1pb.DeleteShortcutRequest{ - Name: fmt.Sprintf("users/%s", user.Username) + "/shortcuts/nonexistent", + req := &v1pb.DeleteMemoViewRequest{ + Name: fmt.Sprintf("users/%s", user.Username) + "/views/nonexistent", } - _, err = ts.Service.DeleteShortcut(userCtx, req) + _, err = ts.Service.DeleteMemoView(userCtx, req) require.Error(t, err) require.Contains(t, err.Error(), "not found") }) } -func TestShortcutFiltering(t *testing.T) { +func TestMemoViewFiltering(t *testing.T) { ctx := context.Background() - t.Run("CreateShortcut with valid filters", func(t *testing.T) { + t.Run("CreateMemoView with valid filters", func(t *testing.T) { ts := NewTestService(t) defer ts.Cleanup() @@ -678,20 +703,20 @@ func TestShortcutFiltering(t *testing.T) { } for i, filter := range validFilters { - req := &v1pb.CreateShortcutRequest{ + req := &v1pb.CreateMemoViewRequest{ Parent: fmt.Sprintf("users/%s", user.Username), - Shortcut: &v1pb.Shortcut{ - Title: "Valid Filter " + string(rune(i)), + MemoView: &v1pb.MemoView{ + Title: fmt.Sprintf("Valid Filter %d", i), Filter: filter, }, } - _, err = ts.Service.CreateShortcut(userCtx, req) + _, err = ts.Service.CreateMemoView(userCtx, req) require.NoError(t, err, "Filter should be valid: %s", filter) } }) - t.Run("CreateShortcut with invalid filters", func(t *testing.T) { + t.Run("CreateMemoView with invalid filters", func(t *testing.T) { ts := NewTestService(t) defer ts.Cleanup() @@ -715,22 +740,22 @@ func TestShortcutFiltering(t *testing.T) { } for _, filter := range invalidFilters { - req := &v1pb.CreateShortcutRequest{ + req := &v1pb.CreateMemoViewRequest{ Parent: fmt.Sprintf("users/%s", user.Username), - Shortcut: &v1pb.Shortcut{ + MemoView: &v1pb.MemoView{ Title: "Invalid Filter Test", Filter: filter, }, } - _, err = ts.Service.CreateShortcut(userCtx, req) + _, err = ts.Service.CreateMemoView(userCtx, req) require.Error(t, err, "Filter should be invalid: %s", filter) require.Contains(t, err.Error(), "invalid filter", "Error should mention invalid filter for: %s", filter) } }) } -func TestShortcutCRUDComplete(t *testing.T) { +func TestMemoViewCRUDComplete(t *testing.T) { ctx := context.Background() t.Run("Complete CRUD lifecycle", func(t *testing.T) { @@ -744,56 +769,56 @@ func TestShortcutCRUDComplete(t *testing.T) { // Set user context userCtx := ts.CreateUserContext(ctx, user.ID) - // 1. Create multiple shortcuts - shortcut1Req := &v1pb.CreateShortcutRequest{ + // 1. Create multiple memoViews + memoView1Req := &v1pb.CreateMemoViewRequest{ Parent: fmt.Sprintf("users/%s", user.Username), - Shortcut: &v1pb.Shortcut{ + MemoView: &v1pb.MemoView{ Title: "Work Notes", Filter: "tag in [\"work\"]", }, } - shortcut2Req := &v1pb.CreateShortcutRequest{ + memoView2Req := &v1pb.CreateMemoViewRequest{ Parent: fmt.Sprintf("users/%s", user.Username), - Shortcut: &v1pb.Shortcut{ + MemoView: &v1pb.MemoView{ Title: "Personal Notes", Filter: "tag in [\"personal\"]", }, } - created1, err := ts.Service.CreateShortcut(userCtx, shortcut1Req) + created1, err := ts.Service.CreateMemoView(userCtx, memoView1Req) require.NoError(t, err) require.Equal(t, "Work Notes", created1.Title) - created2, err := ts.Service.CreateShortcut(userCtx, shortcut2Req) + created2, err := ts.Service.CreateMemoView(userCtx, memoView2Req) require.NoError(t, err) require.Equal(t, "Personal Notes", created2.Title) - // 2. List shortcuts and verify both exist - listReq := &v1pb.ListShortcutsRequest{ + // 2. List memoViews and verify both exist + listReq := &v1pb.ListMemoViewsRequest{ Parent: fmt.Sprintf("users/%s", user.Username), } - listResp, err := ts.Service.ListShortcuts(userCtx, listReq) + listResp, err := ts.Service.ListMemoViews(userCtx, listReq) require.NoError(t, err) - require.Len(t, listResp.Shortcuts, 2) + require.Len(t, listResp.MemoViews, 2) - // 3. Get individual shortcuts - getReq1 := &v1pb.GetShortcutRequest{Name: created1.Name} - getResp1, err := ts.Service.GetShortcut(userCtx, getReq1) + // 3. Get individual memoViews + getReq1 := &v1pb.GetMemoViewRequest{Name: created1.Name} + getResp1, err := ts.Service.GetMemoView(userCtx, getReq1) require.NoError(t, err) require.Equal(t, created1.Name, getResp1.Name) require.Equal(t, "Work Notes", getResp1.Title) - getReq2 := &v1pb.GetShortcutRequest{Name: created2.Name} - getResp2, err := ts.Service.GetShortcut(userCtx, getReq2) + getReq2 := &v1pb.GetMemoViewRequest{Name: created2.Name} + getResp2, err := ts.Service.GetMemoView(userCtx, getReq2) require.NoError(t, err) require.Equal(t, created2.Name, getResp2.Name) require.Equal(t, "Personal Notes", getResp2.Title) - // 4. Update one shortcut - updateReq := &v1pb.UpdateShortcutRequest{ - Shortcut: &v1pb.Shortcut{ + // 4. Update one memoView + updateReq := &v1pb.UpdateMemoViewRequest{ + MemoView: &v1pb.MemoView{ Name: created1.Name, Title: "Work & Meeting Notes", Filter: "tag in [\"work\"] || tag in [\"meeting\"]", @@ -803,36 +828,127 @@ func TestShortcutCRUDComplete(t *testing.T) { }, } - updated, err := ts.Service.UpdateShortcut(userCtx, updateReq) + updated, err := ts.Service.UpdateMemoView(userCtx, updateReq) require.NoError(t, err) require.Equal(t, "Work & Meeting Notes", updated.Title) require.Equal(t, "tag in [\"work\"] || tag in [\"meeting\"]", updated.Filter) // 5. Verify update by getting it again - getUpdatedReq := &v1pb.GetShortcutRequest{Name: created1.Name} - getUpdatedResp, err := ts.Service.GetShortcut(userCtx, getUpdatedReq) + getUpdatedReq := &v1pb.GetMemoViewRequest{Name: created1.Name} + getUpdatedResp, err := ts.Service.GetMemoView(userCtx, getUpdatedReq) require.NoError(t, err) require.Equal(t, "Work & Meeting Notes", getUpdatedResp.Title) require.Equal(t, "tag in [\"work\"] || tag in [\"meeting\"]", getUpdatedResp.Filter) - // 6. Delete one shortcut - deleteReq := &v1pb.DeleteShortcutRequest{ + // 6. Delete one memoView + deleteReq := &v1pb.DeleteMemoViewRequest{ Name: created2.Name, } - _, err = ts.Service.DeleteShortcut(userCtx, deleteReq) + _, err = ts.Service.DeleteMemoView(userCtx, deleteReq) require.NoError(t, err) // 7. Verify deletion by listing (should only have 1 left) - finalListResp, err := ts.Service.ListShortcuts(userCtx, listReq) + finalListResp, err := ts.Service.ListMemoViews(userCtx, listReq) require.NoError(t, err) - require.Len(t, finalListResp.Shortcuts, 1) - require.Equal(t, "Work & Meeting Notes", finalListResp.Shortcuts[0].Title) + require.Len(t, finalListResp.MemoViews, 1) + require.Equal(t, "Work & Meeting Notes", finalListResp.MemoViews[0].Title) - // 8. Verify deleted shortcut can't be accessed - getDeletedReq := &v1pb.GetShortcutRequest{Name: created2.Name} - _, err = ts.Service.GetShortcut(userCtx, getDeletedReq) + // 8. Verify deleted memoView can't be accessed + getDeletedReq := &v1pb.GetMemoViewRequest{Name: created2.Name} + _, err = ts.Service.GetMemoView(userCtx, getDeletedReq) require.Error(t, err) require.Contains(t, err.Error(), "not found") }) } + +func TestMemoViewRegressions(t *testing.T) { + ctx := context.Background() + + t.Run("UpdateMemoView rejects a missing memo view instead of panicking", func(t *testing.T) { + ts := NewTestService(t) + defer ts.Cleanup() + + user, err := ts.CreateRegularUser(ctx, "testuser") + require.NoError(t, err) + userCtx := ts.CreateUserContext(ctx, user.ID) + + req := &v1pb.UpdateMemoViewRequest{ + UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"title"}}, + } + + _, err = ts.Service.UpdateMemoView(userCtx, req) + require.Error(t, err) + require.Contains(t, err.Error(), "invalid memo view name") + }) + + t.Run("UpdateMemoView leaves the stored view untouched when validation fails", func(t *testing.T) { + ts := NewTestService(t) + defer ts.Cleanup() + + user, err := ts.CreateRegularUser(ctx, "testuser") + require.NoError(t, err) + userCtx := ts.CreateUserContext(ctx, user.ID) + + created, err := ts.Service.CreateMemoView(userCtx, &v1pb.CreateMemoViewRequest{ + Parent: fmt.Sprintf("users/%s", user.Username), + MemoView: &v1pb.MemoView{ + Title: "Original Title", + Filter: `tag in ["work"]`, + }, + }) + require.NoError(t, err) + + // The title path is applied before the filter path is validated. A rejected + // filter must not leave the new title behind. + _, err = ts.Service.UpdateMemoView(userCtx, &v1pb.UpdateMemoViewRequest{ + MemoView: &v1pb.MemoView{ + Name: created.Name, + Title: "Phantom Title", + Filter: "this is not (((a valid filter", + }, + UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"title", "filter"}}, + }) + require.Error(t, err) + require.Contains(t, err.Error(), "invalid filter") + + got, err := ts.Service.GetMemoView(userCtx, &v1pb.GetMemoViewRequest{Name: created.Name}) + require.NoError(t, err) + require.Equal(t, "Original Title", got.Title) + require.Equal(t, `tag in ["work"]`, got.Filter) + }) + + t.Run("CreateMemoView keeps every view under concurrent creates", func(t *testing.T) { + ts := NewTestService(t) + defer ts.Cleanup() + + user, err := ts.CreateRegularUser(ctx, "testuser") + require.NoError(t, err) + userCtx := ts.CreateUserContext(ctx, user.ID) + + const concurrency = 8 + var wg sync.WaitGroup + errs := make([]error, concurrency) + for i := range concurrency { + wg.Go(func() { + _, errs[i] = ts.Service.CreateMemoView(userCtx, &v1pb.CreateMemoViewRequest{ + Parent: fmt.Sprintf("users/%s", user.Username), + MemoView: &v1pb.MemoView{ + Title: fmt.Sprintf("View %d", i), + Filter: `tag in ["work"]`, + }, + }) + }) + } + wg.Wait() + for _, err := range errs { + require.NoError(t, err) + } + + resp, err := ts.Service.ListMemoViews(userCtx, &v1pb.ListMemoViewsRequest{ + Parent: fmt.Sprintf("users/%s", user.Username), + }) + require.NoError(t, err) + require.Len(t, resp.MemoViews, concurrency) + }) +} diff --git a/server/router/api/v1/test/user_resource_name_test.go b/server/router/api/v1/test/user_resource_name_test.go index a2ce53fe..9044b329 100644 --- a/server/router/api/v1/test/user_resource_name_test.go +++ b/server/router/api/v1/test/user_resource_name_test.go @@ -66,11 +66,11 @@ func TestUserResourceName(t *testing.T) { require.NoError(t, err) require.NotNil(t, settings) - shortcuts, err := ts.Service.ListShortcuts(userCtx, &apiv1.ListShortcutsRequest{ + memoViews, err := ts.Service.ListMemoViews(userCtx, &apiv1.ListMemoViewsRequest{ Parent: currentUser.GetUser().Name, }) require.NoError(t, err) - require.NotNil(t, shortcuts) + require.NotNil(t, memoViews) }) t.Run("BatchGetUsers preserves mixed-case usernames", func(t *testing.T) { diff --git a/server/router/api/v1/test/user_setting_test.go b/server/router/api/v1/test/user_setting_test.go index cd6f5db3..0036bf06 100644 --- a/server/router/api/v1/test/user_setting_test.go +++ b/server/router/api/v1/test/user_setting_test.go @@ -32,9 +32,9 @@ func TestListUserSettingsOmitsInternalStoreSettings(t *testing.T) { _, err = ts.Store.UpsertUserSetting(ctx, &storepb.UserSetting{ UserId: user.ID, - Key: storepb.UserSetting_SHORTCUTS, - Value: &storepb.UserSetting_Shortcuts{ - Shortcuts: &storepb.ShortcutsUserSetting{}, + Key: storepb.UserSetting_MEMO_VIEWS, + Value: &storepb.UserSetting_MemoViews{ + MemoViews: &storepb.MemoViewsUserSetting{}, }, }) require.NoError(t, err) diff --git a/server/router/api/v1/user_service_converters.go b/server/router/api/v1/user_service_converters.go index b77fcd98..eb5c2dc4 100644 --- a/server/router/api/v1/user_service_converters.go +++ b/server/router/api/v1/user_service_converters.go @@ -100,8 +100,8 @@ func convertSettingKeyFromStore(key storepb.UserSetting_Key) string { switch key { case storepb.UserSetting_GENERAL: return v1pb.UserSetting_Key_name[int32(v1pb.UserSetting_GENERAL)] - case storepb.UserSetting_SHORTCUTS: - return "SHORTCUTS" // Not defined in API proto + case storepb.UserSetting_MEMO_VIEWS: + return "MEMO_VIEWS" // Not defined in API proto case storepb.UserSetting_WEBHOOKS: return v1pb.UserSetting_Key_name[int32(v1pb.UserSetting_WEBHOOKS)] case storepb.UserSetting_TAGS: diff --git a/server/router/api/v1/v1.go b/server/router/api/v1/v1.go index 034d6f7d..b9cba332 100644 --- a/server/router/api/v1/v1.go +++ b/server/router/api/v1/v1.go @@ -31,7 +31,7 @@ type APIV1Service struct { v1pb.UnimplementedMemoServiceServer v1pb.UnimplementedAttachmentServiceServer v1pb.UnimplementedAIServiceServer - v1pb.UnimplementedShortcutServiceServer + v1pb.UnimplementedMemoViewServiceServer v1pb.UnimplementedIdentityProviderServiceServer Secret string @@ -153,7 +153,7 @@ func (s *APIV1Service) RegisterGateway(ctx context.Context, echoServer *echo.Ech if err := v1pb.RegisterAIServiceHandlerServer(ctx, gwMux, s); err != nil { return err } - if err := v1pb.RegisterShortcutServiceHandlerServer(ctx, gwMux, s); err != nil { + if err := v1pb.RegisterMemoViewServiceHandlerServer(ctx, gwMux, s); err != nil { return err } if err := v1pb.RegisterIdentityProviderServiceHandlerServer(ctx, gwMux, s); err != nil { diff --git a/server/router/mcp/README.md b/server/router/mcp/README.md index dec2a0ce..63bbe086 100644 --- a/server/router/mcp/README.md +++ b/server/router/mcp/README.md @@ -139,7 +139,7 @@ a personal access token as a bearer credential. Example client config: The server exposes a curated allowlist (`curatedOperationIDs` in `catalog.go`), centered on memos and attachments, plus two read-only orientation tools: -`shortcut_list_shortcuts` (surfaces a user's saved CEL filters for reuse with +`memo_view_list_memo_views` (surfaces a user's named CEL filters for reuse with `memo_list_memos`) and `auth_get_current_user` (a "whoami" so an agent can resolve its own user — the single allowed auth/identity operation): @@ -163,7 +163,7 @@ resolve its own user — the single allowed auth/identity operation): | `AttachmentService_CreateAttachment` | `attachment_create_attachment` | | `AttachmentService_GetAttachment` | `attachment_get_attachment` | | `AttachmentService_DeleteAttachment` | `attachment_delete_attachment` | -| `ShortcutService_ListShortcuts` | `shortcut_list_shortcuts` | +| `MemoViewService_ListMemoViews` | `memo_view_list_memo_views` | | `AuthService_GetCurrentUser` | `auth_get_current_user` | **Naming rule** (`toolNameFromOperationID`): drop the `Service` suffix from the diff --git a/server/router/mcp/adapter_test.go b/server/router/mcp/adapter_test.go index b6189721..47c8e578 100644 --- a/server/router/mcp/adapter_test.go +++ b/server/router/mcp/adapter_test.go @@ -177,13 +177,13 @@ func TestBuildAPIRequestAcceptsHierarchicalResourceNamesForPathParameters(t *tes }, { name: "parameter declaration order does not matter", - path: "/api/v1/users/{user}/shortcuts/{shortcut}", - parameters: []string{"shortcut", "user"}, + path: "/api/v1/users/{user}/views/{view}", + parameters: []string{"view", "user"}, arguments: map[string]any{ - "user": "users/user123", - "shortcut": "users/user123/shortcuts/shortcut456", + "user": "users/user123", + "view": "users/user123/views/view456", }, - wantPath: "/api/v1/users/user123/shortcuts/shortcut456", + wantPath: "/api/v1/users/user123/views/view456", }, { name: "canonical nested name on action route", diff --git a/server/router/mcp/catalog.go b/server/router/mcp/catalog.go index ed768bc9..bd9eab3e 100644 --- a/server/router/mcp/catalog.go +++ b/server/router/mcp/catalog.go @@ -28,9 +28,9 @@ var curatedOperationIDs = []string{ "AttachmentService_CreateAttachment", "AttachmentService_GetAttachment", "AttachmentService_DeleteAttachment", - "ShortcutService_ListShortcuts", + "MemoViewService_ListMemoViews", // The only allowed auth/identity operation: a read-only "whoami" so agents - // can resolve the current user (e.g. for ShortcutService_ListShortcuts). + // can resolve the current user (e.g. for MemoViewService_ListMemoViews). "AuthService_GetCurrentUser", } diff --git a/server/router/mcp/catalog_test.go b/server/router/mcp/catalog_test.go index 1f31ffec..3371e8af 100644 --- a/server/router/mcp/catalog_test.go +++ b/server/router/mcp/catalog_test.go @@ -277,14 +277,14 @@ func TestBuildToolFromOperationExposesCurrentUser(t *testing.T) { require.True(t, tool.Annotations.ReadOnlyHint) } -func TestBuildToolFromOperationExposesListShortcuts(t *testing.T) { +func TestBuildToolFromOperationExposesListMemoViews(t *testing.T) { spec, err := loadOpenAPISpec("../../../proto/gen/openapi.yaml") require.NoError(t, err) registry, err := buildOperationRegistry(spec) require.NoError(t, err) - tool, operation := buildToolFromOperation(registry["ShortcutService_ListShortcuts"]) - require.Equal(t, "shortcut_list_shortcuts", tool.Name) + tool, operation := buildToolFromOperation(registry["MemoViewService_ListMemoViews"]) + require.Equal(t, "memo_view_list_memo_views", tool.Name) require.Equal(t, "GET", operation.Method) require.True(t, tool.Annotations.ReadOnlyHint) diff --git a/server/router/mcp/evals/README.md b/server/router/mcp/evals/README.md index 16d50c77..9534ad0b 100644 --- a/server/router/mcp/evals/README.md +++ b/server/router/mcp/evals/README.md @@ -16,7 +16,7 @@ tool calls, and has a single string-comparable answer. Answers are pinned to the deterministic seed in [`store/seed/sqlite/01__dump.sql`](../../../../store/seed/sqlite/01__dump.sql) (10 memos — 7 top-level + 3 comments — 2 users, 12 reactions, no attachments, -no shortcuts). +no memo views). The public demo (`demo.usememos.com`) signs everyone into the **same shared `demo` account**, so visitors continually add/edit/delete memos and reactions. @@ -62,6 +62,6 @@ content, all of which are stable across re-seeds. `"work" in tags` (or `tags.exists(t, t == "work")`), not `tag == "work"`. - `memo_list_memos` returns only top-level memos; comments are reached via `memo_list_memo_comments`. -- The seed defines no shortcuts and no attachments, so `shortcut_list_shortcuts` +- The seed defines no memo views and no attachments, so `memo_view_list_memo_views` and the attachment tools return empty sets against a fresh seed. Add seed rows before writing questions that depend on them. diff --git a/server/router/mcp/evals/memos_eval.xml b/server/router/mcp/evals/memos_eval.xml index 3b23aed4..a0ac0ff3 100644 --- a/server/router/mcp/evals/memos_eval.xml +++ b/server/router/mcp/evals/memos_eval.xml @@ -4,7 +4,7 @@ These questions test whether an LLM can accomplish realistic tasks by composing the curated MCP tools (memo_list_memos with CEL filters, - memo_list_memo_comments, memo_list_memo_reactions, shortcut_list_shortcuts, + memo_list_memo_comments, memo_list_memo_reactions, memo_view_list_memo_views, auth_get_current_user, ...). They are NOT unit tests of the server plumbing — see *_test.go for that. diff --git a/store/migration/mysql/0.31/00__rename_shortcuts_to_memo_views.sql b/store/migration/mysql/0.31/00__rename_shortcuts_to_memo_views.sql new file mode 100644 index 00000000..12d1e931 --- /dev/null +++ b/store/migration/mysql/0.31/00__rename_shortcuts_to_memo_views.sql @@ -0,0 +1,26 @@ +-- Renames the SHORTCUTS user setting to MEMO_VIEWS, rewriting the stored JSON +-- object key from `shortcuts` to `memoViews` to match the renamed proto field. +-- +-- Rows are skipped rather than failing the migration when either +-- * `value` is not valid JSON, which would abort the whole upgrade transaction, or +-- * the user already has a MEMO_VIEWS row, which would violate UNIQUE(user_id, key). +-- The conflict check goes through a derived table because MySQL cannot read the +-- target table of an UPDATE directly in a subquery. +UPDATE user_setting +SET + `key` = 'MEMO_VIEWS', + value = CASE + WHEN JSON_CONTAINS_PATH(value, 'one', '$.shortcuts') THEN JSON_SET( + JSON_REMOVE(value, '$.shortcuts'), + '$.memoViews', + JSON_EXTRACT(value, '$.shortcuts') + ) + ELSE value + END +WHERE `key` = 'SHORTCUTS' + AND JSON_VALID(value) + AND user_id NOT IN ( + SELECT user_id FROM ( + SELECT user_id FROM user_setting WHERE `key` = 'MEMO_VIEWS' + ) AS existing_memo_views + ); diff --git a/store/migration/postgres/0.31/00__rename_shortcuts_to_memo_views.sql b/store/migration/postgres/0.31/00__rename_shortcuts_to_memo_views.sql new file mode 100644 index 00000000..ce4ac9c4 --- /dev/null +++ b/store/migration/postgres/0.31/00__rename_shortcuts_to_memo_views.sql @@ -0,0 +1,28 @@ +-- Renames the SHORTCUTS user setting to MEMO_VIEWS, rewriting the stored JSON +-- object key from `shortcuts` to `memoViews` to match the renamed proto field. +-- +-- Invalid or non-object JSON values are skipped rather than aborting the upgrade, +-- while the conflict check preserves an existing MEMO_VIEWS setting. +UPDATE user_setting AS legacy +SET + key = 'MEMO_VIEWS', + value = CASE + WHEN legacy.value::jsonb ? 'shortcuts' THEN jsonb_set( + legacy.value::jsonb - 'shortcuts', + '{memoViews}', + legacy.value::jsonb->'shortcuts' + )::text + ELSE legacy.value + END +WHERE legacy.key = 'SHORTCUTS' + AND CASE + WHEN pg_input_is_valid(legacy.value, 'jsonb') + THEN jsonb_typeof(legacy.value::jsonb) = 'object' + ELSE FALSE + END + AND NOT EXISTS ( + SELECT 1 + FROM user_setting AS existing + WHERE existing.user_id = legacy.user_id + AND existing.key = 'MEMO_VIEWS' + ); diff --git a/store/migration/sqlite/0.31/00__rename_shortcuts_to_memo_views.sql b/store/migration/sqlite/0.31/00__rename_shortcuts_to_memo_views.sql new file mode 100644 index 00000000..74ff0f15 --- /dev/null +++ b/store/migration/sqlite/0.31/00__rename_shortcuts_to_memo_views.sql @@ -0,0 +1,22 @@ +-- Renames the SHORTCUTS user setting to MEMO_VIEWS, rewriting the stored JSON +-- object key from `shortcuts` to `memoViews` to match the renamed proto field. +-- +-- Rows are skipped rather than failing the migration when either +-- * `value` is not valid JSON, which would abort the whole upgrade transaction, or +-- * the user already has a MEMO_VIEWS row, which would violate UNIQUE(user_id, key). +UPDATE user_setting +SET + key = 'MEMO_VIEWS', + value = CASE + WHEN json_type(value, '$.shortcuts') IS NOT NULL THEN json_set( + json_remove(value, '$.shortcuts'), + '$.memoViews', + json_extract(value, '$.shortcuts') + ) + ELSE value + END +WHERE key = 'SHORTCUTS' + AND json_valid(value) + AND user_id NOT IN ( + SELECT user_id FROM user_setting WHERE key = 'MEMO_VIEWS' + ); diff --git a/store/store.go b/store/store.go index 028f65df..abb42460 100644 --- a/store/store.go +++ b/store/store.go @@ -17,6 +17,7 @@ type Store struct { userCreateMu sync.Mutex authConfigMu sync.Mutex patMu sync.Mutex + memoViewMu sync.Mutex deploymentConfigMu sync.RWMutex deploymentConfig *deploymentConfiguration diff --git a/store/test/migrator_test.go b/store/test/migrator_test.go index 28ff2a56..1f5ee848 100644 --- a/store/test/migrator_test.go +++ b/store/test/migrator_test.go @@ -114,6 +114,106 @@ func TestMigrationMultipleReRuns(t *testing.T) { require.Equal(t, initialVersion, finalVersion, "version should remain unchanged after multiple re-runs") } +// TestMigrationMemoViewSetting verifies the 0.31 rename of the SHORTCUTS user setting +// to MEMO_VIEWS on every driver, since each one rewrites the stored JSON with its own +// dialect-specific functions. +func TestMigrationMemoViewSetting(t *testing.T) { + ctx := context.Background() + driver := getDriverFromEnv() + var dsn string + switch driver { + case "sqlite": + dsn = fmt.Sprintf("%s/memos_memo_view_migration.db", t.TempDir()) + case "mysql": + dsn = GetMySQLDSN(t) + case "postgres": + dsn = GetPostgresDSN(t) + default: + t.Fatalf("unsupported driver: %s", driver) + } + + db, err := sql.Open(driver, dsn) + require.NoError(t, err) + + _, err = db.ExecContext(ctx, legacySchemaFixture(driver)) + require.NoError(t, err) + + basicSettingBytes, err := protojson.Marshal(&storepb.InstanceBasicSetting{SchemaVersion: "0.30.2"}) + require.NoError(t, err) + insertBasicSetting := "INSERT INTO system_setting (name, value, description) VALUES ('BASIC', ?, '')" + if driver == "postgres" { + insertBasicSetting = "INSERT INTO system_setting (name, value, description) VALUES ('BASIC', $1, '')" + } + _, err = db.ExecContext(ctx, insertBasicSetting, string(basicSettingBytes)) + require.NoError(t, err) + + settingKeyColumn := "key" + if driver == "mysql" { + settingKeyColumn = "`key`" + } + // Bound rather than inlined: MySQL treats backslash as an escape character inside + // string literals, so an inlined \" would collapse and corrupt the fixture's JSON. + insertSetting := fmt.Sprintf("INSERT INTO user_setting (user_id, %[1]s, value) VALUES (?, ?, ?)", settingKeyColumn) + if driver == "postgres" { + insertSetting = fmt.Sprintf("INSERT INTO user_setting (user_id, %[1]s, value) VALUES ($1, $2, $3)", settingKeyColumn) + } + settingRows := []struct { + userID int + key string + value string + }{ + // A normal legacy row, must be renamed and rewritten. + {1, "SHORTCUTS", `{"shortcuts":[{"id":"work","title":"shortcuts","filter":"tag in [\"work\"]"}]}`}, + // A corrupt value, must be left alone rather than aborting the upgrade. + {2, "SHORTCUTS", `{oops}`}, + // Already has a MEMO_VIEWS row, must not trip UNIQUE(user_id, key). + {3, "SHORTCUTS", `{"shortcuts":[{"id":"old","title":"old","filter":"tag in [\"old\"]"}]}`}, + {3, "MEMO_VIEWS", `{"memoViews":[{"id":"new","title":"new","filter":"tag in [\"new\"]"}]}`}, + } + for _, row := range settingRows { + _, err = db.ExecContext(ctx, insertSetting, row.userID, row.key, row.value) + require.NoError(t, err) + } + require.NoError(t, db.Close()) + + ts := NewTestingStoreWithDSN(ctx, t, driver, dsn) + require.NoError(t, ts.Migrate(ctx)) + defer ts.Close() + + migratedUserID := int32(1) + setting, err := ts.GetUserSetting(ctx, &store.FindUserSetting{ + UserID: &migratedUserID, + Key: storepb.UserSetting_MEMO_VIEWS, + }) + require.NoError(t, err) + require.NotNil(t, setting) + require.Len(t, setting.GetMemoViews().GetMemoViews(), 1) + require.Equal(t, "work", setting.GetMemoViews().GetMemoViews()[0].GetId()) + require.Equal(t, "shortcuts", setting.GetMemoViews().GetMemoViews()[0].GetTitle()) + require.Equal(t, `tag in ["work"]`, setting.GetMemoViews().GetMemoViews()[0].GetFilter()) + + // Malformed object-like JSON must neither abort the migration nor be renamed. + findCorruptSetting := fmt.Sprintf("SELECT value FROM user_setting WHERE user_id = ? AND %s = ?", settingKeyColumn) + if driver == "postgres" { + findCorruptSetting = fmt.Sprintf("SELECT value FROM user_setting WHERE user_id = $1 AND %s = $2", settingKeyColumn) + } + var corruptValue string + err = ts.GetDriver().GetDB().QueryRowContext(ctx, findCorruptSetting, 2, "SHORTCUTS").Scan(&corruptValue) + require.NoError(t, err) + require.Equal(t, `{oops}`, corruptValue) + + // The pre-existing MEMO_VIEWS row wins; the legacy row is left behind untouched. + conflictUserID := int32(3) + conflicting, err := ts.GetUserSetting(ctx, &store.FindUserSetting{ + UserID: &conflictUserID, + Key: storepb.UserSetting_MEMO_VIEWS, + }) + require.NoError(t, err) + require.NotNil(t, conflicting) + require.Len(t, conflicting.GetMemoViews().GetMemoViews(), 1) + require.Equal(t, "new", conflicting.GetMemoViews().GetMemoViews()[0].GetId()) +} + // TestMigrationCopiesInstanceTagsToUserSettings verifies instance tag metadata is copied into user settings. func TestMigrationCopiesInstanceTagsToUserSettings(t *testing.T) { if getDriverFromEnv() != "sqlite" { @@ -237,7 +337,7 @@ func TestCaseSensitiveUsernameMigration(t *testing.T) { db, err := sql.Open(driver, dsn) require.NoError(t, err) - _, err = db.ExecContext(ctx, caseSensitiveUsernameMigrationFixture(driver)) + _, err = db.ExecContext(ctx, legacySchemaFixture(driver)) require.NoError(t, err) basicSettingBytes, err := protojson.Marshal(&storepb.InstanceBasicSetting{SchemaVersion: "0.30.1"}) @@ -272,7 +372,7 @@ func TestCaseSensitiveUsernameMigration(t *testing.T) { require.Equal(t, "Alice", upper.Username) } -func caseSensitiveUsernameMigrationFixture(driver string) string { +func legacySchemaFixture(driver string) string { switch driver { case "mysql": return ` @@ -294,6 +394,12 @@ func caseSensitiveUsernameMigrationFixture(driver string) string { avatar_url LONGTEXT NOT NULL, description VARCHAR(256) NOT NULL DEFAULT '' ); + CREATE TABLE user_setting ( + user_id INT NOT NULL, + ` + "`key`" + ` VARCHAR(256) NOT NULL, + value LONGTEXT NOT NULL, + UNIQUE(user_id, ` + "`key`" + `) + ); CREATE TABLE memo (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY); ` case "postgres": @@ -316,6 +422,12 @@ func caseSensitiveUsernameMigrationFixture(driver string) string { avatar_url TEXT NOT NULL, description TEXT NOT NULL DEFAULT '' ); + CREATE TABLE user_setting ( + user_id INTEGER NOT NULL, + key TEXT NOT NULL, + value TEXT NOT NULL, + UNIQUE(user_id, key) + ); CREATE TABLE memo (id SERIAL PRIMARY KEY); ` case "sqlite": @@ -339,6 +451,12 @@ func caseSensitiveUsernameMigrationFixture(driver string) string { avatar_url TEXT NOT NULL DEFAULT '', description TEXT NOT NULL DEFAULT '' ); + CREATE TABLE user_setting ( + user_id INTEGER NOT NULL, + key TEXT NOT NULL, + value TEXT NOT NULL, + UNIQUE(user_id, key) + ); CREATE TABLE memo (id INTEGER PRIMARY KEY AUTOINCREMENT); ` default: diff --git a/store/test/user_setting_test.go b/store/test/user_setting_test.go index 1c634b36..c98c3783 100644 --- a/store/test/user_setting_test.go +++ b/store/test/user_setting_test.go @@ -3,6 +3,7 @@ package test import ( "context" "strings" + "sync" "testing" "time" @@ -58,7 +59,7 @@ func TestUserSettingGetByUserID(t *testing.T) { // Get non-existent key nonExistentSetting, err := ts.GetUserSetting(ctx, &store.FindUserSetting{ UserID: &user.ID, - Key: storepb.UserSetting_SHORTCUTS, + Key: storepb.UserSetting_MEMO_VIEWS, }) require.NoError(t, err) require.Nil(t, nonExistentSetting) @@ -285,36 +286,36 @@ func TestUserSettingWebhooks(t *testing.T) { ts.Close() } -func TestUserSettingShortcuts(t *testing.T) { +func TestUserSettingMemoViews(t *testing.T) { t.Parallel() ctx := context.Background() ts := NewTestingStore(ctx, t) user, err := createTestingHostUser(ctx, ts) require.NoError(t, err) - // Create shortcuts setting - shortcuts := &storepb.ShortcutsUserSetting{ - Shortcuts: []*storepb.ShortcutsUserSetting_Shortcut{ - {Id: "shortcut-1", Title: "Work Notes", Filter: "tag:work"}, - {Id: "shortcut-2", Title: "Personal", Filter: "tag:personal"}, + // Create memoViews setting + memoViews := &storepb.MemoViewsUserSetting{ + MemoViews: []*storepb.MemoViewsUserSetting_MemoView{ + {Id: "memoView-1", Title: "Work Notes", Filter: "tag:work"}, + {Id: "memoView-2", Title: "Personal", Filter: "tag:personal"}, }, } _, err = ts.UpsertUserSetting(ctx, &storepb.UserSetting{ UserId: user.ID, - Key: storepb.UserSetting_SHORTCUTS, - Value: &storepb.UserSetting_Shortcuts{Shortcuts: shortcuts}, + Key: storepb.UserSetting_MEMO_VIEWS, + Value: &storepb.UserSetting_MemoViews{MemoViews: memoViews}, }) require.NoError(t, err) // Retrieve and verify setting, err := ts.GetUserSetting(ctx, &store.FindUserSetting{ UserID: &user.ID, - Key: storepb.UserSetting_SHORTCUTS, + Key: storepb.UserSetting_MEMO_VIEWS, }) require.NoError(t, err) require.NotNil(t, setting) - require.Len(t, setting.GetShortcuts().Shortcuts, 2) - require.Equal(t, "Work Notes", setting.GetShortcuts().Shortcuts[0].Title) + require.Len(t, setting.GetMemoViews().MemoViews, 2) + require.Equal(t, "Work Notes", setting.GetMemoViews().MemoViews[0].Title) ts.Close() } @@ -744,13 +745,13 @@ func TestUserSettingMultipleSettingTypes(t *testing.T) { }) require.NoError(t, err) - // Create SHORTCUTS setting + // Create MEMO_VIEWS setting _, err = ts.UpsertUserSetting(ctx, &storepb.UserSetting{ UserId: user.ID, - Key: storepb.UserSetting_SHORTCUTS, - Value: &storepb.UserSetting_Shortcuts{Shortcuts: &storepb.ShortcutsUserSetting{ - Shortcuts: []*storepb.ShortcutsUserSetting_Shortcut{ - {Id: "s1", Title: "Shortcut 1"}, + Key: storepb.UserSetting_MEMO_VIEWS, + Value: &storepb.UserSetting_MemoViews{MemoViews: &storepb.MemoViewsUserSetting{ + MemoViews: []*storepb.MemoViewsUserSetting_MemoView{ + {Id: "s1", Title: "MemoView 1"}, }, }}, }) @@ -773,9 +774,9 @@ func TestUserSettingMultipleSettingTypes(t *testing.T) { require.NoError(t, err) require.Equal(t, "ja", generalSetting.GetGeneral().Locale) - shortcutsSetting, err := ts.GetUserSetting(ctx, &store.FindUserSetting{UserID: &user.ID, Key: storepb.UserSetting_SHORTCUTS}) + memoViewsSetting, err := ts.GetUserSetting(ctx, &store.FindUserSetting{UserID: &user.ID, Key: storepb.UserSetting_MEMO_VIEWS}) require.NoError(t, err) - require.Len(t, shortcutsSetting.GetShortcuts().Shortcuts, 1) + require.Len(t, memoViewsSetting.GetMemoViews().MemoViews, 1) patsSetting, err := ts.GetUserSetting(ctx, &store.FindUserSetting{UserID: &user.ID, Key: storepb.UserSetting_PERSONAL_ACCESS_TOKENS}) require.NoError(t, err) @@ -784,7 +785,7 @@ func TestUserSettingMultipleSettingTypes(t *testing.T) { ts.Close() } -func TestUserSettingShortcutsEdgeCases(t *testing.T) { +func TestUserSettingMemoViewsEdgeCases(t *testing.T) { t.Parallel() ctx := context.Background() ts := NewTestingStore(ctx, t) @@ -795,101 +796,167 @@ func TestUserSettingShortcutsEdgeCases(t *testing.T) { // Includes quotes, backslashes, newlines, and other JSON-sensitive characters specialCharsFilter := `tag in ["work", "project"] && content.contains("urgent")` specialCharsTitle := `Work "Urgent" \ Notes` - shortcuts := &storepb.ShortcutsUserSetting{ - Shortcuts: []*storepb.ShortcutsUserSetting_Shortcut{ + memoViews := &storepb.MemoViewsUserSetting{ + MemoViews: []*storepb.MemoViewsUserSetting_MemoView{ {Id: "s1", Title: specialCharsTitle, Filter: specialCharsFilter}, }, } _, err = ts.UpsertUserSetting(ctx, &storepb.UserSetting{ UserId: user.ID, - Key: storepb.UserSetting_SHORTCUTS, - Value: &storepb.UserSetting_Shortcuts{Shortcuts: shortcuts}, + Key: storepb.UserSetting_MEMO_VIEWS, + Value: &storepb.UserSetting_MemoViews{MemoViews: memoViews}, }) require.NoError(t, err) setting, err := ts.GetUserSetting(ctx, &store.FindUserSetting{ UserID: &user.ID, - Key: storepb.UserSetting_SHORTCUTS, + Key: storepb.UserSetting_MEMO_VIEWS, }) require.NoError(t, err) require.NotNil(t, setting) - require.Len(t, setting.GetShortcuts().Shortcuts, 1) - require.Equal(t, specialCharsTitle, setting.GetShortcuts().Shortcuts[0].Title) - require.Equal(t, specialCharsFilter, setting.GetShortcuts().Shortcuts[0].Filter) + require.Len(t, setting.GetMemoViews().MemoViews, 1) + require.Equal(t, specialCharsTitle, setting.GetMemoViews().MemoViews[0].Title) + require.Equal(t, specialCharsFilter, setting.GetMemoViews().MemoViews[0].Filter) // Case 2: Unicode characters unicodeFilter := `tag in ["你好", "世界"]` - unicodeTitle := `My 🚀 Shortcuts` - shortcuts = &storepb.ShortcutsUserSetting{ - Shortcuts: []*storepb.ShortcutsUserSetting_Shortcut{ + unicodeTitle := `My 🚀 MemoViews` + memoViews = &storepb.MemoViewsUserSetting{ + MemoViews: []*storepb.MemoViewsUserSetting_MemoView{ {Id: "s2", Title: unicodeTitle, Filter: unicodeFilter}, }, } _, err = ts.UpsertUserSetting(ctx, &storepb.UserSetting{ UserId: user.ID, - Key: storepb.UserSetting_SHORTCUTS, - Value: &storepb.UserSetting_Shortcuts{Shortcuts: shortcuts}, + Key: storepb.UserSetting_MEMO_VIEWS, + Value: &storepb.UserSetting_MemoViews{MemoViews: memoViews}, }) require.NoError(t, err) setting, err = ts.GetUserSetting(ctx, &store.FindUserSetting{ UserID: &user.ID, - Key: storepb.UserSetting_SHORTCUTS, + Key: storepb.UserSetting_MEMO_VIEWS, }) require.NoError(t, err) require.NotNil(t, setting) - require.Len(t, setting.GetShortcuts().Shortcuts, 1) - require.Equal(t, unicodeTitle, setting.GetShortcuts().Shortcuts[0].Title) - require.Equal(t, unicodeFilter, setting.GetShortcuts().Shortcuts[0].Filter) + require.Len(t, setting.GetMemoViews().MemoViews, 1) + require.Equal(t, unicodeTitle, setting.GetMemoViews().MemoViews[0].Title) + require.Equal(t, unicodeFilter, setting.GetMemoViews().MemoViews[0].Filter) - // Case 3: Empty shortcuts list - // Should allow saving an empty list (clearing shortcuts) - shortcuts = &storepb.ShortcutsUserSetting{ - Shortcuts: []*storepb.ShortcutsUserSetting_Shortcut{}, + // Case 3: Empty memoViews list + // Should allow saving an empty list (clearing memoViews) + memoViews = &storepb.MemoViewsUserSetting{ + MemoViews: []*storepb.MemoViewsUserSetting_MemoView{}, } _, err = ts.UpsertUserSetting(ctx, &storepb.UserSetting{ UserId: user.ID, - Key: storepb.UserSetting_SHORTCUTS, - Value: &storepb.UserSetting_Shortcuts{Shortcuts: shortcuts}, + Key: storepb.UserSetting_MEMO_VIEWS, + Value: &storepb.UserSetting_MemoViews{MemoViews: memoViews}, }) require.NoError(t, err) setting, err = ts.GetUserSetting(ctx, &store.FindUserSetting{ UserID: &user.ID, - Key: storepb.UserSetting_SHORTCUTS, + Key: storepb.UserSetting_MEMO_VIEWS, }) require.NoError(t, err) require.NotNil(t, setting) - require.NotNil(t, setting.GetShortcuts()) - require.Len(t, setting.GetShortcuts().Shortcuts, 0) + require.NotNil(t, setting.GetMemoViews()) + require.Len(t, setting.GetMemoViews().MemoViews, 0) // Case 4: Large filter string // Test reasonable large string handling (e.g. 4KB) largeFilter := strings.Repeat("tag:long_tag_name ", 200) - shortcuts = &storepb.ShortcutsUserSetting{ - Shortcuts: []*storepb.ShortcutsUserSetting_Shortcut{ + memoViews = &storepb.MemoViewsUserSetting{ + MemoViews: []*storepb.MemoViewsUserSetting_MemoView{ {Id: "s3", Title: "Large Filter", Filter: largeFilter}, }, } _, err = ts.UpsertUserSetting(ctx, &storepb.UserSetting{ UserId: user.ID, - Key: storepb.UserSetting_SHORTCUTS, - Value: &storepb.UserSetting_Shortcuts{Shortcuts: shortcuts}, + Key: storepb.UserSetting_MEMO_VIEWS, + Value: &storepb.UserSetting_MemoViews{MemoViews: memoViews}, }) require.NoError(t, err) setting, err = ts.GetUserSetting(ctx, &store.FindUserSetting{ UserID: &user.ID, - Key: storepb.UserSetting_SHORTCUTS, + Key: storepb.UserSetting_MEMO_VIEWS, }) require.NoError(t, err) require.NotNil(t, setting) - require.Equal(t, largeFilter, setting.GetShortcuts().Shortcuts[0].Filter) + require.Equal(t, largeFilter, setting.GetMemoViews().MemoViews[0].Filter) ts.Close() } -func TestUserSettingShortcutsPartialUpdate(t *testing.T) { +func TestUserMemoViewConcurrentPartialUpdates(t *testing.T) { + t.Parallel() + ctx := context.Background() + ts := NewTestingStore(ctx, t) + defer ts.Close() + + user, err := createTestingHostUser(ctx, ts) + require.NoError(t, err) + require.NoError(t, ts.AddUserMemoView(ctx, user.ID, &storepb.MemoViewsUserSetting_MemoView{ + Id: "work", + Title: "Original title", + Filter: `tag in ["original"]`, + })) + + updatedTitle := "Updated title" + updatedFilter := `tag in ["updated"]` + var wg sync.WaitGroup + errs := make([]error, 2) + start := make(chan struct{}) + + wg.Go(func() { + <-start + _, errs[0] = ts.UpdateUserMemoView(ctx, user.ID, "work", &updatedTitle, nil) + }) + wg.Go(func() { + <-start + _, errs[1] = ts.UpdateUserMemoView(ctx, user.ID, "work", nil, &updatedFilter) + }) + close(start) + wg.Wait() + for _, err := range errs { + require.NoError(t, err) + } + + memoViews, err := ts.GetUserMemoViews(ctx, user.ID) + require.NoError(t, err) + require.Len(t, memoViews, 1) + require.Equal(t, updatedTitle, memoViews[0].GetTitle()) + require.Equal(t, updatedFilter, memoViews[0].GetFilter()) +} + +func TestGetUserMemoViewsReturnsCopies(t *testing.T) { + t.Parallel() + ctx := context.Background() + ts := NewTestingStore(ctx, t) + defer ts.Close() + user, err := createTestingHostUser(ctx, ts) + require.NoError(t, err) + + require.NoError(t, ts.AddUserMemoView(ctx, user.ID, &storepb.MemoViewsUserSetting_MemoView{ + Id: "work", + Title: "Original title", + Filter: `tag in ["original"]`, + })) + + firstRead, err := ts.GetUserMemoViews(ctx, user.ID) + require.NoError(t, err) + require.Len(t, firstRead, 1) + firstRead[0].Title = "Mutated title" + + secondRead, err := ts.GetUserMemoViews(ctx, user.ID) + require.NoError(t, err) + require.Len(t, secondRead, 1) + require.Equal(t, "Original title", secondRead[0].GetTitle()) +} + +func TestUserSettingMemoViewsPartialUpdate(t *testing.T) { t.Parallel() ctx := context.Background() ts := NewTestingStore(ctx, t) @@ -897,23 +964,23 @@ func TestUserSettingShortcutsPartialUpdate(t *testing.T) { require.NoError(t, err) // Initial set - shortcuts := &storepb.ShortcutsUserSetting{ - Shortcuts: []*storepb.ShortcutsUserSetting_Shortcut{ + memoViews := &storepb.MemoViewsUserSetting{ + MemoViews: []*storepb.MemoViewsUserSetting_MemoView{ {Id: "s1", Title: "Note 1", Filter: "tag:1"}, {Id: "s2", Title: "Note 2", Filter: "tag:2"}, }, } _, err = ts.UpsertUserSetting(ctx, &storepb.UserSetting{ UserId: user.ID, - Key: storepb.UserSetting_SHORTCUTS, - Value: &storepb.UserSetting_Shortcuts{Shortcuts: shortcuts}, + Key: storepb.UserSetting_MEMO_VIEWS, + Value: &storepb.UserSetting_MemoViews{MemoViews: memoViews}, }) require.NoError(t, err) // Update by replacing the whole list (Store Upsert replaces the value for the key) // We want to verify that we can "update" a single item by sending the modified list - updatedShortcuts := &storepb.ShortcutsUserSetting{ - Shortcuts: []*storepb.ShortcutsUserSetting_Shortcut{ + updatedMemoViews := &storepb.MemoViewsUserSetting{ + MemoViews: []*storepb.MemoViewsUserSetting_MemoView{ {Id: "s1", Title: "Note 1 Updated", Filter: "tag:1_updated"}, {Id: "s2", Title: "Note 2", Filter: "tag:2"}, {Id: "s3", Title: "Note 3", Filter: "tag:3"}, // Add new one @@ -921,21 +988,21 @@ func TestUserSettingShortcutsPartialUpdate(t *testing.T) { } _, err = ts.UpsertUserSetting(ctx, &storepb.UserSetting{ UserId: user.ID, - Key: storepb.UserSetting_SHORTCUTS, - Value: &storepb.UserSetting_Shortcuts{Shortcuts: updatedShortcuts}, + Key: storepb.UserSetting_MEMO_VIEWS, + Value: &storepb.UserSetting_MemoViews{MemoViews: updatedMemoViews}, }) require.NoError(t, err) setting, err := ts.GetUserSetting(ctx, &store.FindUserSetting{ UserID: &user.ID, - Key: storepb.UserSetting_SHORTCUTS, + Key: storepb.UserSetting_MEMO_VIEWS, }) require.NoError(t, err) require.NotNil(t, setting) - require.Len(t, setting.GetShortcuts().Shortcuts, 3) + require.Len(t, setting.GetMemoViews().MemoViews, 3) // Verify updates - for _, s := range setting.GetShortcuts().Shortcuts { + for _, s := range setting.GetMemoViews().MemoViews { if s.Id == "s1" { require.Equal(t, "Note 1 Updated", s.Title) require.Equal(t, "tag:1_updated", s.Filter) diff --git a/store/user_setting.go b/store/user_setting.go index 17829426..5f6f394c 100644 --- a/store/user_setting.go +++ b/store/user_setting.go @@ -440,6 +440,145 @@ func (s *Store) UpdateUserWebhook(ctx context.Context, userID int32, webhook *st return err } +// GetUserMemoViews returns the memo views of the user. +func (s *Store) GetUserMemoViews(ctx context.Context, userID int32) ([]*storepb.MemoViewsUserSetting_MemoView, error) { + userSetting, err := s.GetUserSetting(ctx, &FindUserSetting{ + UserID: &userID, + Key: storepb.UserSetting_MEMO_VIEWS, + }) + if err != nil { + return nil, errors.Wrap(err, "get memo views user setting") + } + if userSetting == nil { + return []*storepb.MemoViewsUserSetting_MemoView{}, nil + } + + memoViews := userSetting.GetMemoViews().GetMemoViews() + clonedMemoViews := make([]*storepb.MemoViewsUserSetting_MemoView, len(memoViews)) + for i, memoView := range memoViews { + if memoView != nil { + clonedMemoView, ok := proto.Clone(memoView).(*storepb.MemoViewsUserSetting_MemoView) + if !ok { + return nil, errors.New("failed to clone memo view") + } + clonedMemoViews[i] = clonedMemoView + } + } + return clonedMemoViews, nil +} + +// AddUserMemoView appends a new memo view for the user. +func (s *Store) AddUserMemoView(ctx context.Context, userID int32, memoView *storepb.MemoViewsUserSetting_MemoView) error { + s.memoViewMu.Lock() + defer s.memoViewMu.Unlock() + + existing, err := s.GetUserMemoViews(ctx, userID) + if err != nil { + return errors.Wrap(err, "get existing memo views") + } + + // Build a fresh slice so the cached setting is never mutated in place. + memoViews := make([]*storepb.MemoViewsUserSetting_MemoView, 0, len(existing)+1) + memoViews = append(memoViews, existing...) + memoViews = append(memoViews, memoView) + + if err := s.upsertUserMemoViews(ctx, userID, memoViews); err != nil { + return errors.Wrap(err, "add memo view") + } + return nil +} + +// UpdateUserMemoView applies the non-nil field updates to the memo view carrying the same ID. +// It returns nil when no matching memo view is found. +func (s *Store) UpdateUserMemoView( + ctx context.Context, + userID int32, + memoViewID string, + title *string, + filter *string, +) (*storepb.MemoViewsUserSetting_MemoView, error) { + s.memoViewMu.Lock() + defer s.memoViewMu.Unlock() + + existing, err := s.GetUserMemoViews(ctx, userID) + if err != nil { + return nil, errors.Wrap(err, "get existing memo views") + } + + var updatedMemoView *storepb.MemoViewsUserSetting_MemoView + memoViews := make([]*storepb.MemoViewsUserSetting_MemoView, 0, len(existing)) + for _, item := range existing { + if item.GetId() != memoViewID { + memoViews = append(memoViews, item) + continue + } + + updatedMemoView = &storepb.MemoViewsUserSetting_MemoView{ + Id: item.GetId(), + Title: item.GetTitle(), + Filter: item.GetFilter(), + } + if title != nil { + updatedMemoView.Title = *title + } + if filter != nil { + updatedMemoView.Filter = *filter + } + memoViews = append(memoViews, updatedMemoView) + } + if updatedMemoView == nil { + return nil, nil + } + + if err := s.upsertUserMemoViews(ctx, userID, memoViews); err != nil { + return nil, errors.Wrap(err, "update memo view") + } + return updatedMemoView, nil +} + +// RemoveUserMemoView removes the memo view of the user. +// It reports whether a matching memo view was found. +func (s *Store) RemoveUserMemoView(ctx context.Context, userID int32, memoViewID string) (bool, error) { + s.memoViewMu.Lock() + defer s.memoViewMu.Unlock() + + existing, err := s.GetUserMemoViews(ctx, userID) + if err != nil { + return false, errors.Wrap(err, "get existing memo views") + } + + found := false + memoViews := make([]*storepb.MemoViewsUserSetting_MemoView, 0, len(existing)) + for _, item := range existing { + if item.GetId() == memoViewID { + found = true + continue + } + memoViews = append(memoViews, item) + } + if !found { + return false, nil + } + + if err := s.upsertUserMemoViews(ctx, userID, memoViews); err != nil { + return false, errors.Wrap(err, "remove memo view") + } + return true, nil +} + +func (s *Store) upsertUserMemoViews(ctx context.Context, userID int32, memoViews []*storepb.MemoViewsUserSetting_MemoView) error { + _, err := s.UpsertUserSetting(ctx, &storepb.UserSetting{ + UserId: userID, + Key: storepb.UserSetting_MEMO_VIEWS, + Value: &storepb.UserSetting_MemoViews{ + MemoViews: &storepb.MemoViewsUserSetting{ + MemoViews: memoViews, + }, + }, + }) + return errors.Wrap(err, "upsert memo views user setting") +} + func convertUserSettingFromRaw(raw *UserSetting) (*storepb.UserSetting, error) { userSetting := &storepb.UserSetting{ UserId: raw.UserID, @@ -447,12 +586,12 @@ func convertUserSettingFromRaw(raw *UserSetting) (*storepb.UserSetting, error) { } switch raw.Key { - case storepb.UserSetting_SHORTCUTS: - shortcutsUserSetting := &storepb.ShortcutsUserSetting{} - if err := protojsonUnmarshaler.Unmarshal([]byte(raw.Value), shortcutsUserSetting); err != nil { + case storepb.UserSetting_MEMO_VIEWS: + memoViewsUserSetting := &storepb.MemoViewsUserSetting{} + if err := protojsonUnmarshaler.Unmarshal([]byte(raw.Value), memoViewsUserSetting); err != nil { return nil, err } - userSetting.Value = &storepb.UserSetting_Shortcuts{Shortcuts: shortcutsUserSetting} + userSetting.Value = &storepb.UserSetting_MemoViews{MemoViews: memoViewsUserSetting} case storepb.UserSetting_GENERAL: generalUserSetting := &storepb.GeneralUserSetting{} if err := protojsonUnmarshaler.Unmarshal([]byte(raw.Value), generalUserSetting); err != nil { @@ -496,9 +635,9 @@ func convertUserSettingToRaw(userSetting *storepb.UserSetting) (*UserSetting, er } switch userSetting.Key { - case storepb.UserSetting_SHORTCUTS: - shortcutsUserSetting := userSetting.GetShortcuts() - value, err := protojson.Marshal(shortcutsUserSetting) + case storepb.UserSetting_MEMO_VIEWS: + memoViewsUserSetting := userSetting.GetMemoViews() + value, err := protojson.Marshal(memoViewsUserSetting) if err != nil { return nil, err } diff --git a/web/src/components/ActivityCalendar/MonthCalendar.tsx b/web/src/components/ActivityCalendar/MonthCalendar.tsx index d1ce6b0a..60e01eaa 100644 --- a/web/src/components/ActivityCalendar/MonthCalendar.tsx +++ b/web/src/components/ActivityCalendar/MonthCalendar.tsx @@ -10,7 +10,7 @@ import { getTooltipText } from "./utils"; const GRID_STYLES: Record = { small: { gap: "gap-1", headerText: "text-[9px]" }, - default: { gap: "gap-1", headerText: "text-[10px]" }, + default: { gap: "gap-1", headerText: "text-2xs" }, }; interface WeekdayHeaderProps { diff --git a/web/src/components/AppSidebar/AppSidebar.tsx b/web/src/components/AppSidebar/AppSidebar.tsx index d6a85a2b..574c9750 100644 --- a/web/src/components/AppSidebar/AppSidebar.tsx +++ b/web/src/components/AppSidebar/AppSidebar.tsx @@ -1,3 +1,4 @@ +import { useQueryClient } from "@tanstack/react-query"; import { ArchiveIcon, ArrowRightIcon, @@ -11,7 +12,6 @@ import { InfoIcon, LayoutListIcon, ListIcon, - ListTodoIcon, type LucideIcon, MapIcon, MenuIcon, @@ -19,7 +19,6 @@ import { PaperclipIcon, PlusIcon, SearchIcon, - SparklesIcon, Trash2Icon, UserRoundIcon, } from "lucide-react"; @@ -36,7 +35,7 @@ import { Button } from "@/components/ui/button"; import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"; import { Sheet, SheetContent, SheetTitle } from "@/components/ui/sheet"; import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"; -import { shortcutServiceClient } from "@/connect"; +import { memoViewServiceClient } from "@/connect"; import { type AttachmentSection, type InboxFilter, useAppSidebar } from "@/contexts/AppSidebarContext"; import { useAuth } from "@/contexts/AuthContext"; import { useInstance } from "@/contexts/InstanceContext"; @@ -45,11 +44,12 @@ import { useAttachmentLibraryStats } from "@/hooks/useAttachmentLibrary"; import useCurrentUser from "@/hooks/useCurrentUser"; import { type MemoStatsContext, useFilteredMemoStats } from "@/hooks/useFilteredMemoStats"; import useMediaQuery from "@/hooks/useMediaQuery"; -import { useNotifications, useUser } from "@/hooks/useUserQueries"; +import { useMemoViews, useNotifications, userKeys, useUser } from "@/hooks/useUserQueries"; +import { handleError } from "@/lib/error"; import { BUILTIN_TASKS_VIEW_ID, getMemoScopePath, - getShortcutId, + getMemoViewId, isMemoScopeRoute, type MemoScope, resolveMemoScope, @@ -57,13 +57,17 @@ import { import { cn } from "@/lib/utils"; import { ROUTES } from "@/router/routes"; import { State } from "@/types/proto/api/v1/common_pb"; -import type { Shortcut } from "@/types/proto/api/v1/shortcut_service_pb"; +import type { MemoView } from "@/types/proto/api/v1/memo_view_service_pb"; import { User_Role, UserNotification_Status } from "@/types/proto/api/v1/user_service_pb"; import { useTranslate } from "@/utils/i18n"; import MemosLogo from "../MemosLogo"; import { getSidebarRouteKind } from "./routes"; -import SidebarRow, { SIDEBAR_ROW_CLASSES, SIDEBAR_ROW_ICON_CLASSES } from "./SidebarRow"; -import SidebarSectionHeader from "./SidebarSectionHeader"; +import SidebarRow, { SIDEBAR_ROW_CLASSES, SIDEBAR_ROW_ICON_CLASSES, sidebarRowStateClasses } from "./SidebarRow"; +import SidebarSection, { + SIDEBAR_SECTION_ACTION_BUTTON_CLASSES, + SIDEBAR_SECTION_ACTION_ICON_CLASSES, + SIDEBAR_SECTION_STACK_CLASSES, +} from "./SidebarSection"; import TagsSection from "./TagsSection"; const SIDEBAR_HORIZONTAL_PADDING = "px-3"; @@ -71,128 +75,119 @@ const SIDEBAR_HORIZONTAL_PADDING = "px-3"; const ViewsSection = ({ manageActive = false }: { manageActive?: boolean }) => { const t = useTranslate(); const navigate = useNavigate(); - const { shortcuts, refetchSettings } = useAuth(); - const { shortcut: selectedShortcut, setShortcut } = useMemoFilterContext(); + const currentUser = useCurrentUser(); + const queryClient = useQueryClient(); + const { data: memoViews = [] } = useMemoViews(currentUser?.name); + const { memoView: selectedMemoView, setMemoView } = useMemoFilterContext(); const { setMobileOpen } = useAppSidebar(); - const [deleteTarget, setDeleteTarget] = useState(); + const [deleteTarget, setDeleteTarget] = useState(); const location = useLocation(); const handleView = (viewId: string) => { - setShortcut(selectedShortcut === viewId ? undefined : viewId); + setMemoView(selectedMemoView === viewId ? undefined : viewId); if (!isMemoScopeRoute(location.pathname)) navigate(ROUTES.HOME); setMobileOpen(false); }; const handleCreate = () => { - navigate(ROUTES.SHORTCUTS, { state: { openCreate: true } }); + navigate(ROUTES.VIEWS, { state: { openCreate: true } }); setMobileOpen(false); }; const handleDelete = async () => { if (!deleteTarget) return; - await shortcutServiceClient.deleteShortcut({ name: deleteTarget.name }); - await refetchSettings(); - if (selectedShortcut === getShortcutId(deleteTarget.name)) setShortcut(undefined); - toast.success(t("setting.shortcut.delete-success", { title: deleteTarget.title })); - setDeleteTarget(undefined); + try { + await memoViewServiceClient.deleteMemoView({ name: deleteTarget.name }); + await queryClient.invalidateQueries({ queryKey: userKeys.memoViews(currentUser?.name) }); + if (selectedMemoView === getMemoViewId(deleteTarget.name)) setMemoView(undefined); + toast.success(t("setting.memo-view.delete-success", { title: deleteTarget.title })); + } catch (error: unknown) { + handleError(error, toast.error, { context: "Delete memo view" }); + } finally { + setDeleteTarget(undefined); + } }; return ( -
- - - - - ) - } - > - {t("common.views")} - -
- handleView(BUILTIN_TASKS_VIEW_ID)} - /> - {shortcuts.map((shortcut) => { - const id = getShortcutId(shortcut.name); - const active = !manageActive && selectedShortcut === id; - return ( -
+ + +
+ ) + } + > + handleView(BUILTIN_TASKS_VIEW_ID)} + /> + {memoViews.map((memoView) => { + const id = getMemoViewId(memoView.name); + const active = !manageActive && selectedMemoView === id; + return ( +
+ + + + } > - - {shortcut.title} - - - - } + + + + { + navigate(ROUTES.VIEWS, { state: { memoView } }); + setMobileOpen(false); + }} > - - - - { - navigate(ROUTES.SHORTCUTS, { state: { shortcut } }); - setMobileOpen(false); - }} - > - {t("common.edit")} - - setDeleteTarget(shortcut)}> - - {t("common.delete")} - - - -
- ); - })} - {manageActive && } -
+ {t("common.edit")} + + setDeleteTarget(memoView)}> + {t("common.delete")} + + + + + ); + })} + {manageActive && } !open && setDeleteTarget(undefined)} - title={t("setting.shortcut.delete-confirm", { title: deleteTarget?.title ?? "" })} + title={t("setting.memo-view.delete-confirm", { title: deleteTarget?.title ?? "" })} confirmLabel={t("common.delete")} cancelLabel={t("common.cancel")} onConfirm={handleDelete} confirmVariant="destructive" /> -
+ ); }; @@ -210,14 +205,15 @@ const ProfileMode = () => { }; return ( -
+ setMode("memos")} /> setMode("map")} /> -
+ ); }; const CollectionSidebarContent = ({ context }: { context: MemoStatsContext }) => { + const t = useTranslate(); const location = useLocation(); const currentUser = useCurrentUser(); const md = useMediaQuery("md"); @@ -243,11 +239,11 @@ const CollectionSidebarContent = ({ context }: { context: MemoStatsContext }) => const filterTarget = onCollectionRoute ? undefined : context === "explore" ? ROUTES.EXPLORE : ROUTES.HOME; return ( -
+
{context === "profile" && } -
+ setMobileOpen(false)} /> -
+ {showViews && } setMobileOpen(false)} />
@@ -272,7 +268,7 @@ const AttachmentsSidebarContent = () => { { value: "unused", icon: Trash2Icon, label: t("attachment-library.labels.unused"), count: isComplete ? stats.unused : undefined }, ]; return ( -
+ {rows.map((row) => ( { }} /> ))} -
+ ); }; @@ -310,7 +306,7 @@ const InboxSidebarContent = () => { }, ]; return ( -
+ {rows.map((row) => ( { }} /> ))} -
+ ); }; @@ -343,29 +339,16 @@ const SettingsSidebarContent = () => { key={section.key} to={`${ROUTES.SETTING}#${section.key}`} onClick={() => setMobileOpen(false)} - className={cn( - SIDEBAR_ROW_CLASSES, - currentSection === section.key - ? "bg-sidebar-accent font-medium text-sidebar-accent-foreground" - : "text-muted-foreground hover:bg-sidebar-accent/65 hover:text-foreground", - )} + className={cn(SIDEBAR_ROW_CLASSES, sidebarRowStateClasses(currentSection === section.key))} > {t(section.labelKey)} )); return ( -
-
- {t("common.basic")} -
{renderSections(basic)}
-
- {isHost && ( -
- {t("common.admin")} -
{renderSections(admin)}
-
- )} +
+ {renderSections(basic)} + {isHost && {renderSections(admin)}}
); }; @@ -391,7 +374,7 @@ const RouteSidebarContent = () => { if (kind === "home" || kind === "archived" || kind === "explore" || kind === "profile") { return ; } - if (kind === "shortcuts") return ; + if (kind === "views") return ; if (kind === "attachments") return ; if (kind === "inbox") return ; if (kind === "settings") return ; diff --git a/web/src/components/AppSidebar/QuickFindDialog.tsx b/web/src/components/AppSidebar/QuickFindDialog.tsx index 5b1c7e30..3cead97b 100644 --- a/web/src/components/AppSidebar/QuickFindDialog.tsx +++ b/web/src/components/AppSidebar/QuickFindDialog.tsx @@ -5,9 +5,10 @@ import { Button } from "@/components/ui/button"; import { Dialog, DialogContent, DialogDescription, DialogTitle } from "@/components/ui/dialog"; import { Input } from "@/components/ui/input"; import { useAppSidebar } from "@/contexts/AppSidebarContext"; -import { useAuth } from "@/contexts/AuthContext"; import { type MemoFilter, replaceFiltersByFactor, stringifyFilters, useMemoFilterContext } from "@/contexts/MemoFilterContext"; -import { BUILTIN_TASKS_VIEW_ID, getShortcutId, isMemoScopeRoute } from "@/lib/memo-views"; +import useCurrentUser from "@/hooks/useCurrentUser"; +import { useMemoViews } from "@/hooks/useUserQueries"; +import { BUILTIN_TASKS_VIEW_ID, getMemoViewId, isMemoScopeRoute } from "@/lib/memo-views"; import { ROUTES } from "@/router/routes"; import { useTranslate } from "@/utils/i18n"; @@ -30,15 +31,16 @@ const QuickFindDialog = () => { const t = useTranslate(); const location = useLocation(); const navigate = useNavigate(); - const { shortcuts } = useAuth(); - const { filters, setFilters, setShortcut, shortcut } = useMemoFilterContext(); + const currentUser = useCurrentUser(); + const { data: memoViews = [] } = useMemoViews(currentUser?.name); + const { filters, setFilters, setMemoView, memoView } = useMemoFilterContext(); const { quickFindOpen, setQuickFindOpen } = useAppSidebar(); const [query, setQuery] = useState(""); const collectionRoute = isQuickFindCollectionRoute(location.pathname); const viewApplies = isMemoScopeRoute(location.pathname); - const selectedShortcut = viewApplies ? shortcuts.find((item) => getShortcutId(item.name) === shortcut) : undefined; + const selectedMemoView = viewApplies ? memoViews.find((item) => getMemoViewId(item.name) === memoView) : undefined; const scopeLabel = - viewApplies && shortcut === BUILTIN_TASKS_VIEW_ID ? t("common.tasks") : selectedShortcut?.title || getScopeLabel(location.pathname, t); + viewApplies && memoView === BUILTIN_TASKS_VIEW_ID ? t("common.tasks") : selectedMemoView?.title || getScopeLabel(location.pathname, t); useEffect(() => { const handleKeyDown = (event: KeyboardEvent) => { @@ -70,7 +72,7 @@ const QuickFindDialog = () => { } else { const filterQuery = stringifyFilters(nextFilters); setFilters(nextFilters); - setShortcut(undefined); + setMemoView(undefined); navigate(filterQuery ? `${ROUTES.HOME}?filter=${filterQuery}` : ROUTES.HOME); } diff --git a/web/src/components/AppSidebar/SidebarRow.tsx b/web/src/components/AppSidebar/SidebarRow.tsx index d3d7565c..f22644ba 100644 --- a/web/src/components/AppSidebar/SidebarRow.tsx +++ b/web/src/components/AppSidebar/SidebarRow.tsx @@ -9,8 +9,7 @@ import { cn } from "@/lib/utils"; * rows that carry a trailing control put the box on a wrapper and focus on the button * inside it. */ -export const SIDEBAR_ROW_BOX_CLASSES = - "group flex h-[30px] w-full min-w-0 items-center gap-2 rounded-md px-2 text-[13px] leading-[18px] transition-colors"; +export const SIDEBAR_ROW_BOX_CLASSES = "group flex h-[30px] w-full min-w-0 items-center gap-2 rounded-md px-2 text-ui transition-colors"; /** Goes on whichever element in a row actually takes focus. */ export const SIDEBAR_ROW_FOCUS_CLASSES = "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring/50"; @@ -18,7 +17,7 @@ export const SIDEBAR_ROW_FOCUS_CLASSES = "focus-visible:outline-none focus-visib export const SIDEBAR_ROW_CLASSES = `${SIDEBAR_ROW_BOX_CLASSES} ${SIDEBAR_ROW_FOCUS_CLASSES}`; export const SIDEBAR_ROW_ICON_CLASSES = "size-[15px] shrink-0 opacity-75"; -export const SIDEBAR_ROW_COUNT_CLASSES = "text-[11px] tabular-nums text-muted-foreground/60"; +export const SIDEBAR_ROW_COUNT_CLASSES = "text-2xs tabular-nums text-muted-foreground/60"; /** Idle and selected colouring for a row box, kept in one place so lists cannot drift apart. */ export const sidebarRowStateClasses = (active?: boolean) => @@ -28,7 +27,7 @@ export const sidebarRowStateClasses = (active?: boolean) => interface Props { active?: boolean; - icon: LucideIcon; + icon?: LucideIcon; label: ReactNode; count?: number; onClick?: () => void; @@ -42,7 +41,7 @@ const SidebarRow = ({ active, icon: Icon, label, count, onClick, trailing }: Pro aria-pressed={active || undefined} className={cn(SIDEBAR_ROW_CLASSES, sidebarRowStateClasses(active))} > - + {Icon && } {label} {count != null && count > 0 && {count}} {trailing} diff --git a/web/src/components/AppSidebar/SidebarSection.tsx b/web/src/components/AppSidebar/SidebarSection.tsx new file mode 100644 index 00000000..9c89655f --- /dev/null +++ b/web/src/components/AppSidebar/SidebarSection.tsx @@ -0,0 +1,26 @@ +import type { ReactNode } from "react"; +import SidebarSectionHeader from "./SidebarSectionHeader"; + +export const SIDEBAR_SECTION_STACK_CLASSES = "flex flex-col gap-3.5"; +export const SIDEBAR_SECTION_CONTENT_CLASSES = "flex flex-col gap-0.5"; +export const SIDEBAR_SECTION_ACTION_BUTTON_CLASSES = + "size-5 rounded text-muted-foreground/65 transition-colors hover:bg-sidebar-accent hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring/50"; +export const SIDEBAR_SECTION_ACTION_ACTIVE_CLASSES = "bg-sidebar-accent text-foreground"; +export const SIDEBAR_SECTION_ACTION_ICON_CLASSES = "size-3.5"; + +interface Props { + label?: ReactNode; + ariaLabel?: string; + children: ReactNode; + action?: ReactNode; +} + +const SidebarSection = ({ label, ariaLabel, children, action }: Props) => ( +
+ {label !== undefined && {label}} + {/* Flex gap keeps popup focus guards from affecting the visible row rhythm. */} +
{children}
+
+); + +export default SidebarSection; diff --git a/web/src/components/AppSidebar/SidebarSectionHeader.tsx b/web/src/components/AppSidebar/SidebarSectionHeader.tsx index 6dab49cc..d721dc95 100644 --- a/web/src/components/AppSidebar/SidebarSectionHeader.tsx +++ b/web/src/components/AppSidebar/SidebarSectionHeader.tsx @@ -7,9 +7,7 @@ interface Props { const SidebarSectionHeader = ({ children, action }: Props) => (
- - {children} - +

{children}

{action}
); diff --git a/web/src/components/AppSidebar/TagsSection.tsx b/web/src/components/AppSidebar/TagsSection.tsx index 4ee450a8..f7cee5d0 100644 --- a/web/src/components/AppSidebar/TagsSection.tsx +++ b/web/src/components/AppSidebar/TagsSection.tsx @@ -8,7 +8,11 @@ import { cn } from "@/lib/utils"; import { useTranslate } from "@/utils/i18n"; import TagTree from "../TagTree"; import { SIDEBAR_ROW_CLASSES, SIDEBAR_ROW_COUNT_CLASSES, SIDEBAR_ROW_ICON_CLASSES, sidebarRowStateClasses } from "./SidebarRow"; -import SidebarSectionHeader from "./SidebarSectionHeader"; +import SidebarSection, { + SIDEBAR_SECTION_ACTION_ACTIVE_CLASSES, + SIDEBAR_SECTION_ACTION_BUTTON_CLASSES, + SIDEBAR_SECTION_ACTION_ICON_CLASSES, +} from "./SidebarSection"; interface Props { tagCount: Record; @@ -92,48 +96,43 @@ const TagsSection = ({ tagCount, onSelect, navigationTarget, scope }: Props) => }; return ( -
- - - -
- } - > - - {t("common.tags")} - {tags.length} - - + + + +
+ } + > {treeMode ? ( ) : ( -
+ <> {tags.map(([tag, amount]) => ( handleTagClick(tag)} /> ))} -
+ )} - + ); }; diff --git a/web/src/components/AppSidebar/routes.ts b/web/src/components/AppSidebar/routes.ts index 1a951cce..858362e4 100644 --- a/web/src/components/AppSidebar/routes.ts +++ b/web/src/components/AppSidebar/routes.ts @@ -2,12 +2,12 @@ import { matchPath } from "react-router-dom"; import { isMemoScopeRoute, type MemoScope, resolveMemoScope } from "@/lib/memo-views"; import { ROUTES } from "@/router/routes"; -export type SidebarRouteKind = MemoScope | "profile" | "shortcuts" | "attachments" | "inbox" | "settings" | "memo" | "empty"; +export type SidebarRouteKind = MemoScope | "profile" | "views" | "attachments" | "inbox" | "settings" | "memo" | "empty"; export const getSidebarRouteKind = (path: string): SidebarRouteKind => { if (isMemoScopeRoute(path)) return resolveMemoScope(path); if (matchPath("/u/:username", path)) return "profile"; - if (path === ROUTES.SHORTCUTS) return "shortcuts"; + if (path === ROUTES.VIEWS) return "views"; if (path === ROUTES.ATTACHMENTS) return "attachments"; if (path === ROUTES.INBOX) return "inbox"; if (path === ROUTES.SETTING) return "settings"; diff --git a/web/src/components/MemoDetailSidebar/MemoDetailSidebar.tsx b/web/src/components/MemoDetailSidebar/MemoDetailSidebar.tsx index 6ee45631..e83eab9f 100644 --- a/web/src/components/MemoDetailSidebar/MemoDetailSidebar.tsx +++ b/web/src/components/MemoDetailSidebar/MemoDetailSidebar.tsx @@ -4,7 +4,7 @@ import { useMemo, useState } from "react"; import toast from "react-hot-toast"; import { Link } from "react-router-dom"; import SidebarRow, { SIDEBAR_ROW_CLASSES, SIDEBAR_ROW_ICON_CLASSES } from "@/components/AppSidebar/SidebarRow"; -import SidebarSectionHeader from "@/components/AppSidebar/SidebarSectionHeader"; +import SidebarSection, { SIDEBAR_SECTION_STACK_CLASSES } from "@/components/AppSidebar/SidebarSection"; import { extractHeadings } from "@/components/MemoContent/pipeline"; import { getRelationBuckets, getRelationMemo } from "@/components/MemoMetadata/Relation/relationHelpers"; import { useResolvedRelationMemos } from "@/components/MemoMetadata/Relation/useResolvedRelationMemos"; @@ -28,15 +28,6 @@ interface Props { forceReadonly?: boolean; } -const Section = ({ label, children }: { label: string; children: React.ReactNode }) => ( -
- {label} - {/* flex gap, not space-y: open popups insert fixed-position focus guards next to - their trigger, and space-y's :not(:last-child) margin would count them (#6154). */} -
{children}
-
-); - const BacklinkRow = ({ relation, snippet }: { relation: MemoRelation; snippet: string }) => { const { ref, title } = useOverflowTitle(snippet); const relatedMemo = getRelationMemo(relation, "referenced"); @@ -103,8 +94,8 @@ const MemoDetailSidebar = ({ memo, className, onShareImageOpen, forceReadonly = }; return ( -
-
+
+ {canPin && ( -
+ {headings.length > 1 && ( -
+ -
+ )} {!forceReadonly && referenced.length > 0 && ( -
+ {referenced.map((relation) => { const relatedMemo = getRelationMemo(relation, "referenced"); return ; })} -
+ )} {sharePanelOpen && setSharePanelOpen(false)} />} diff --git a/web/src/components/MemoDetailSidebar/MemoOutline.tsx b/web/src/components/MemoDetailSidebar/MemoOutline.tsx index e22336c9..bd88fec3 100644 --- a/web/src/components/MemoDetailSidebar/MemoOutline.tsx +++ b/web/src/components/MemoDetailSidebar/MemoOutline.tsx @@ -1,4 +1,5 @@ import { useEffect, useMemo, useRef, useState } from "react"; +import { SIDEBAR_ROW_BOX_CLASSES } from "@/components/AppSidebar/SidebarRow"; import type { HeadingItem } from "@/components/MemoContent/pipeline"; import { cn } from "@/lib/utils"; import { findAnchorTarget, findMemoContentRoot } from "@/utils/markdown-manipulation"; @@ -62,7 +63,7 @@ const MemoOutline = ({ headings, memoName }: MemoOutlineProps) => { }; return ( -