Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

refactor(memo-views): replace shortcuts with saved views (#6167)

Johnny4e8b262d6d73
diff --git a/internal/filter/engine_test.go b/internal/filter/engine_test.go
index ed8705941..42c038589 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(<outer column>, ...))` 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 982d6393d..305bf4be5 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(<outer column>))` 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 000000000..2e17eb2b4
--- /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 876652445..000000000
--- 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 000000000..ac36e62f0
--- /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 f93c4c10f..000000000
--- 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 10377c955..f03ebd943 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 1c198c5a2..d407bc87b 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 350edfc6a..2a440486a 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 596e8dc0a..f1d2fd082 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 000000000..646f1b63f
--- /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 0e15ae291..73fd9ee75 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,15 +35,12 @@ 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
+ protoReq ListMemoViewsRequest
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")
@@ -52,13 +49,16 @@ func request_ShortcutService_ListShortcuts_0(ctx context.Context, marshaler runt
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))
+ if req.Body != nil {
+ _, _ = io.Copy(io.Discard, req.Body)
+ }
+ msg, err := client.ListMemoViews(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) {
+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 ListShortcutsRequest
+ protoReq ListMemoViewsRequest
metadata runtime.ServerMetadata
err error
)
@@ -70,19 +70,16 @@ 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)
+ msg, err := server.ListMemoViews(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) {
+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 GetShortcutRequest
+ protoReq GetMemoViewRequest
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")
@@ -91,13 +88,16 @@ func request_ShortcutService_GetShortcut_0(ctx context.Context, marshaler runtim
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))
+ if req.Body != nil {
+ _, _ = io.Copy(io.Discard, req.Body)
+ }
+ msg, err := client.GetMemoView(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_GetMemoView_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 GetMemoViewRequest
metadata runtime.ServerMetadata
err error
)
@@ -109,24 +109,21 @@ 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)
+ msg, err := server.GetMemoView(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}}
+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_ShortcutService_CreateShortcut_0(ctx context.Context, marshaler runtime.Marshaler, client ShortcutServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+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 CreateShortcutRequest
+ protoReq CreateMemoViewRequest
metadata runtime.ServerMetadata
err error
)
- if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Shortcut); err != nil && !errors.Is(err, io.EOF) {
+ 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)
}
- 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")
@@ -138,20 +135,23 @@ func request_ShortcutService_CreateShortcut_0(ctx context.Context, marshaler run
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 := client.CreateShortcut(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+ 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
}
-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_CreateMemoView_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 CreateMemoViewRequest
metadata runtime.ServerMetadata
err error
)
- if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Shortcut); err != nil && !errors.Is(err, io.EOF) {
+ 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 +165,18 @@ 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)
+ msg, err := server.CreateMemoView(ctx, &protoReq)
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}}
+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_ShortcutService_UpdateShortcut_0(ctx context.Context, marshaler runtime.Marshaler, client ShortcutServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+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 UpdateShortcutRequest
+ 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,43 +225,40 @@ 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
)
- 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")
@@ -270,13 +267,16 @@ func request_ShortcutService_DeleteShortcut_0(ctx context.Context, marshaler run
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))
+ if req.Body != nil {
+ _, _ = io.Copy(io.Discard, req.Body)
+ }
+ 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 000000000..97503005d
--- /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 cf9b38e3a..000000000
--- 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 840c35bed..000000000
--- 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 fc00e1ec0..563584d34 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 a3a7e171d..da8b69a24 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 2a9c7460e..f05ba4d21 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 c011eaa40..d5e1bca7a 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 0f0b86b71..7da7011ec 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 8038821b8..b8d2282cc 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 c77868fa0..2965967d1 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 4402ece26..e45c054eb 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 000000000..fe7bb5b72
--- /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 64b439ec6..000000000
--- 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 a0e1c9920..c288b94bd 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()
+
+ 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.UpdateShortcutRequest{
- Shortcut: &v1pb.Shortcut{
- Name: "invalid-shortcut-name",
+ 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 a2ce53fe5..9044b329f 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 cd6f5db33..0036bf068 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 b77fcd986..eb5c2dc40 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 034d6f7d5..b9cba3323 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 dec2a0cef..63bbe086c 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 b61897216..47c8e5788 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 ed768bc97..bd9eab3e5 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 1f31ffec2..3371e8aff 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 16d50c77f..9534ad0be 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 3b23aed44..a0ac0ff33 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 000000000..12d1e931b
--- /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 000000000..ce4ac9c42
--- /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 000000000..74ff0f156
--- /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 028f65df5..abb42460b 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 28ff2a56b..1f5ee8489 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 1c634b368..c98c3783f 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)
-
- // Case 3: Empty shortcuts list
- // Should allow saving an empty list (clearing shortcuts)
- shortcuts = &storepb.ShortcutsUserSetting{
- Shortcuts: []*storepb.ShortcutsUserSetting_Shortcut{},
+ 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 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 178294264..5f6f394c7 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 d1ce6b0a0..60e01eaaf 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<CalendarSize, { gap: string; headerText: string }> = {
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 d6a85a2b1..574c9750b 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<Shortcut>();
+ const [deleteTarget, setDeleteTarget] = useState<MemoView>();
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 (
- <section>
- <SidebarSectionHeader
- action={
- !manageActive && (
- <div className="flex items-center gap-0.5">
- <MemoDisplaySettingMenu />
- <Button
- variant="ghost"
- size="icon-sm"
- className="size-5 rounded text-muted-foreground"
- onClick={handleCreate}
- aria-label={t("common.create")}
- >
- <PlusIcon className="size-3.5" />
- </Button>
- </div>
- )
- }
- >
- {t("common.views")}
- </SidebarSectionHeader>
- <div className="space-y-0.5">
- <SidebarRow
- active={!manageActive && selectedShortcut === BUILTIN_TASKS_VIEW_ID}
- icon={ListTodoIcon}
- label={t("common.tasks")}
- onClick={() => handleView(BUILTIN_TASKS_VIEW_ID)}
- />
- {shortcuts.map((shortcut) => {
- const id = getShortcutId(shortcut.name);
- const active = !manageActive && selectedShortcut === id;
- return (
- <div
- key={shortcut.name}
- className={cn(
- SIDEBAR_ROW_CLASSES,
- "group/view",
- active
- ? "bg-sidebar-accent font-medium text-sidebar-accent-foreground"
- : "text-muted-foreground hover:bg-sidebar-accent/65 hover:text-foreground",
- )}
+ <SidebarSection
+ label={t("common.views")}
+ action={
+ !manageActive && (
+ <div className="flex items-center gap-0.5">
+ <MemoDisplaySettingMenu />
+ <Button
+ variant="ghost"
+ size="icon-sm"
+ className={SIDEBAR_SECTION_ACTION_BUTTON_CLASSES}
+ onClick={handleCreate}
+ aria-label={t("common.create")}
>
- <button
- type="button"
- onClick={() => handleView(id)}
- aria-pressed={active || undefined}
- className="flex h-full min-w-0 flex-1 items-center gap-2 text-left focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring/50"
+ <PlusIcon className={SIDEBAR_SECTION_ACTION_ICON_CLASSES} strokeWidth={1.8} />
+ </Button>
+ </div>
+ )
+ }
+ >
+ <SidebarRow
+ active={!manageActive && selectedMemoView === BUILTIN_TASKS_VIEW_ID}
+ label={t("common.tasks")}
+ onClick={() => handleView(BUILTIN_TASKS_VIEW_ID)}
+ />
+ {memoViews.map((memoView) => {
+ const id = getMemoViewId(memoView.name);
+ const active = !manageActive && selectedMemoView === id;
+ return (
+ <div key={memoView.name} className={cn(SIDEBAR_ROW_CLASSES, "group/view", sidebarRowStateClasses(active))}>
+ <button
+ type="button"
+ onClick={() => handleView(id)}
+ aria-pressed={active || undefined}
+ className="flex h-full min-w-0 flex-1 items-center gap-2 text-left focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring/50"
+ >
+ <span className="min-w-0 flex-1 truncate">{memoView.title}</span>
+ </button>
+ <DropdownMenu>
+ <DropdownMenuTrigger
+ nativeButton={false}
+ render={
+ <span
+ role="button"
+ tabIndex={0}
+ aria-label={`${t("common.edit")} ${memoView.title}`}
+ className="-mr-1 flex size-6 shrink-0 items-center justify-center rounded text-muted-foreground transition-opacity hover:bg-background/70 md:opacity-0 md:group-hover/view:opacity-100 md:focus-visible:opacity-100 data-popup-open:opacity-100"
+ />
+ }
>
- <SparklesIcon className={SIDEBAR_ROW_ICON_CLASSES} strokeWidth={1.8} />
- <span className="min-w-0 flex-1 truncate">{shortcut.title}</span>
- </button>
- <DropdownMenu>
- <DropdownMenuTrigger
- nativeButton={false}
- render={
- <span
- role="button"
- tabIndex={0}
- aria-label={`${t("common.edit")} ${shortcut.title}`}
- className="-mr-1 flex size-6 shrink-0 items-center justify-center rounded text-muted-foreground transition-opacity hover:bg-background/70 md:opacity-0 md:group-hover/view:opacity-100 md:focus-visible:opacity-100 data-popup-open:opacity-100"
- />
- }
+ <MoreHorizontalIcon className="size-3.5" />
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end" sideOffset={2} size="sm">
+ <DropdownMenuItem
+ onClick={() => {
+ navigate(ROUTES.VIEWS, { state: { memoView } });
+ setMobileOpen(false);
+ }}
>
- <MoreHorizontalIcon className="size-3.5" />
- </DropdownMenuTrigger>
- <DropdownMenuContent align="end">
- <DropdownMenuItem
- onClick={() => {
- navigate(ROUTES.SHORTCUTS, { state: { shortcut } });
- setMobileOpen(false);
- }}
- >
- {t("common.edit")}
- </DropdownMenuItem>
- <DropdownMenuItem variant="destructive" onClick={() => setDeleteTarget(shortcut)}>
- <Trash2Icon className="size-4" />
- {t("common.delete")}
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
- </div>
- );
- })}
- {manageActive && <SidebarRow active icon={MoreHorizontalIcon} label={t("common.shortcuts")} />}
- </div>
+ {t("common.edit")}
+ </DropdownMenuItem>
+ <DropdownMenuItem variant="destructive" onClick={() => setDeleteTarget(memoView)}>
+ {t("common.delete")}
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ </div>
+ );
+ })}
+ {manageActive && <SidebarRow active icon={MoreHorizontalIcon} label={t("common.manage")} />}
<ConfirmDialog
open={!!deleteTarget}
onOpenChange={(open) => !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"
/>
- </section>
+ </SidebarSection>
);
};
@@ -210,14 +205,15 @@ const ProfileMode = () => {
};
return (
- <div className="space-y-0.5">
+ <SidebarSection label={t("common.profile")}>
<SidebarRow active={active === "memos"} icon={LayoutListIcon} label={t("common.memos")} onClick={() => setMode("memos")} />
<SidebarRow active={active === "map"} icon={MapIcon} label={t("common.map")} onClick={() => setMode("map")} />
- </div>
+ </SidebarSection>
);
};
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 (
- <div className="space-y-3.5">
+ <div className={SIDEBAR_SECTION_STACK_CLASSES}>
{context === "profile" && <ProfileMode />}
- <section>
+ <SidebarSection ariaLabel={t("common.statistics")}>
<StatisticsView statisticsData={statistics} navigationTarget={filterTarget} onDateSelect={() => setMobileOpen(false)} />
- </section>
+ </SidebarSection>
{showViews && <ViewsSection />}
<TagsSection tagCount={tags} navigationTarget={filterTarget} scope={statsUserName ?? context} onSelect={() => setMobileOpen(false)} />
</div>
@@ -272,7 +268,7 @@ const AttachmentsSidebarContent = () => {
{ value: "unused", icon: Trash2Icon, label: t("attachment-library.labels.unused"), count: isComplete ? stats.unused : undefined },
];
return (
- <div className="space-y-0.5">
+ <SidebarSection label={t("common.attachments")}>
{rows.map((row) => (
<SidebarRow
key={row.value}
@@ -286,7 +282,7 @@ const AttachmentsSidebarContent = () => {
}}
/>
))}
- </div>
+ </SidebarSection>
);
};
@@ -310,7 +306,7 @@ const InboxSidebarContent = () => {
},
];
return (
- <div className="space-y-0.5">
+ <SidebarSection label={t("common.inbox")}>
{rows.map((row) => (
<SidebarRow
key={row.value}
@@ -324,7 +320,7 @@ const InboxSidebarContent = () => {
}}
/>
))}
- </div>
+ </SidebarSection>
);
};
@@ -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))}
>
<section.icon className={SIDEBAR_ROW_ICON_CLASSES} strokeWidth={1.8} />
<span className="truncate">{t(section.labelKey)}</span>
</Link>
));
return (
- <div className="space-y-3.5">
- <section>
- <SidebarSectionHeader>{t("common.basic")}</SidebarSectionHeader>
- <div className="space-y-0.5">{renderSections(basic)}</div>
- </section>
- {isHost && (
- <section>
- <SidebarSectionHeader>{t("common.admin")}</SidebarSectionHeader>
- <div className="space-y-0.5">{renderSections(admin)}</div>
- </section>
- )}
+ <div className={SIDEBAR_SECTION_STACK_CLASSES}>
+ <SidebarSection label={t("common.basic")}>{renderSections(basic)}</SidebarSection>
+ {isHost && <SidebarSection label={t("common.admin")}>{renderSections(admin)}</SidebarSection>}
</div>
);
};
@@ -391,7 +374,7 @@ const RouteSidebarContent = () => {
if (kind === "home" || kind === "archived" || kind === "explore" || kind === "profile") {
return <CollectionSidebarContent context={kind} />;
}
- if (kind === "shortcuts") return <ViewsSection manageActive />;
+ if (kind === "views") return <ViewsSection manageActive />;
if (kind === "attachments") return <AttachmentsSidebarContent />;
if (kind === "inbox") return <InboxSidebarContent />;
if (kind === "settings") return <SettingsSidebarContent />;
diff --git a/web/src/components/AppSidebar/QuickFindDialog.tsx b/web/src/components/AppSidebar/QuickFindDialog.tsx
index 5b1c7e306..3cead97b2 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 d3d7565cd..f22644baa 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 className={SIDEBAR_ROW_ICON_CLASSES} strokeWidth={1.8} />
+ {Icon && <Icon className={SIDEBAR_ROW_ICON_CLASSES} strokeWidth={1.8} />}
<span className="min-w-0 flex-1 truncate text-left">{label}</span>
{count != null && count > 0 && <span className={SIDEBAR_ROW_COUNT_CLASSES}>{count}</span>}
{trailing}
diff --git a/web/src/components/AppSidebar/SidebarSection.tsx b/web/src/components/AppSidebar/SidebarSection.tsx
new file mode 100644
index 000000000..9c89655ff
--- /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) => (
+ <section className="w-full" aria-label={ariaLabel}>
+ {label !== undefined && <SidebarSectionHeader action={action}>{label}</SidebarSectionHeader>}
+ {/* Flex gap keeps popup focus guards from affecting the visible row rhythm. */}
+ <div className={SIDEBAR_SECTION_CONTENT_CLASSES}>{children}</div>
+ </section>
+);
+
+export default SidebarSection;
diff --git a/web/src/components/AppSidebar/SidebarSectionHeader.tsx b/web/src/components/AppSidebar/SidebarSectionHeader.tsx
index 6dab49ccb..d721dc955 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) => (
<div className="mb-0.5 flex h-5 min-w-0 items-center justify-between gap-2">
- <span className="min-w-0 truncate ps-2 text-[10px] font-semibold uppercase tracking-[0.09em] text-muted-foreground/55 select-none">
- {children}
- </span>
+ <h2 className="min-w-0 truncate ps-2 text-2xs font-normal uppercase tracking-wide text-muted-foreground/55 select-none">{children}</h2>
{action}
</div>
);
diff --git a/web/src/components/AppSidebar/TagsSection.tsx b/web/src/components/AppSidebar/TagsSection.tsx
index 4ee450a82..f7cee5d0c 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<string, number>;
@@ -92,48 +96,43 @@ const TagsSection = ({ tagCount, onSelect, navigationTarget, scope }: Props) =>
};
return (
- <section>
- <SidebarSectionHeader
- action={
- <div className="flex items-center gap-0.5" role="group" aria-label={t("common.tags")}>
- <Button
- variant="ghost"
- size="icon-sm"
- aria-label={t("common.tags")}
- aria-pressed={!treeMode}
- className={cn("size-5 rounded text-muted-foreground", !treeMode && "bg-accent text-foreground")}
- onClick={() => setTreeMode(false)}
- >
- <ListIcon className="size-3.5" strokeWidth={1.8} />
- </Button>
- <Button
- variant="ghost"
- size="icon-sm"
- aria-label={`${t("common.tags")}: ${t("common.tree-mode")}`}
- aria-pressed={treeMode}
- className={cn("size-5 rounded text-muted-foreground", treeMode && "bg-accent text-foreground")}
- onClick={() => setTreeMode(true)}
- >
- <ListTreeIcon className="size-3.5" strokeWidth={1.8} />
- </Button>
- </div>
- }
- >
- <span className="inline-flex items-center gap-1.5 leading-none">
- {t("common.tags")}
- <span className="font-normal leading-none tracking-normal text-muted-foreground/45">{tags.length}</span>
- </span>
- </SidebarSectionHeader>
+ <SidebarSection
+ label={t("common.tags")}
+ action={
+ <div className="flex items-center gap-0.5" role="group" aria-label={t("common.tags")}>
+ <Button
+ variant="ghost"
+ size="icon-sm"
+ aria-label={`${t("common.tags")}: ${t("memo.layout-list")}`}
+ aria-pressed={!treeMode}
+ className={cn(SIDEBAR_SECTION_ACTION_BUTTON_CLASSES, !treeMode && SIDEBAR_SECTION_ACTION_ACTIVE_CLASSES)}
+ onClick={() => setTreeMode(false)}
+ >
+ <ListIcon className={SIDEBAR_SECTION_ACTION_ICON_CLASSES} strokeWidth={1.8} />
+ </Button>
+ <Button
+ variant="ghost"
+ size="icon-sm"
+ aria-label={`${t("common.tags")}: ${t("common.tree-mode")}`}
+ aria-pressed={treeMode}
+ className={cn(SIDEBAR_SECTION_ACTION_BUTTON_CLASSES, treeMode && SIDEBAR_SECTION_ACTION_ACTIVE_CLASSES)}
+ onClick={() => setTreeMode(true)}
+ >
+ <ListTreeIcon className={SIDEBAR_SECTION_ACTION_ICON_CLASSES} strokeWidth={1.8} />
+ </Button>
+ </div>
+ }
+ >
{treeMode ? (
<TagTree key={scope} tagAmounts={tags} activeTag={activeTag} scope={scope} onTagClick={handleTagClick} />
) : (
- <div className="space-y-0.5">
+ <>
{tags.map(([tag, amount]) => (
<FlatTagRow key={tag} tag={tag} amount={amount} active={activeTags.has(tag)} onClick={() => handleTagClick(tag)} />
))}
- </div>
+ </>
)}
- </section>
+ </SidebarSection>
);
};
diff --git a/web/src/components/AppSidebar/routes.ts b/web/src/components/AppSidebar/routes.ts
index 1a951cce0..858362e44 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 6ee456311..e83eab9f8 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 }) => (
- <section className="w-full">
- <SidebarSectionHeader>{label}</SidebarSectionHeader>
- {/* 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). */}
- <div className="flex flex-col gap-0.5">{children}</div>
- </section>
-);
-
const BacklinkRow = ({ relation, snippet }: { relation: MemoRelation; snippet: string }) => {
const { ref, title } = useOverflowTitle<HTMLSpanElement>(snippet);
const relatedMemo = getRelationMemo(relation, "referenced");
@@ -103,8 +94,8 @@ const MemoDetailSidebar = ({ memo, className, onShareImageOpen, forceReadonly =
};
return (
- <div className={cn("relative flex w-full select-none flex-col gap-3.5", className)}>
- <Section label={t("common.actions")}>
+ <div className={cn("relative w-full select-none", SIDEBAR_SECTION_STACK_CLASSES, className)}>
+ <SidebarSection label={t("common.actions")}>
{canPin && (
<SidebarRow
icon={memo.pinned ? BookmarkCheckIcon : BookmarkIcon}
@@ -143,21 +134,21 @@ const MemoDetailSidebar = ({ memo, className, onShareImageOpen, forceReadonly =
)}
</DropdownMenuContent>
</DropdownMenu>
- </Section>
+ </SidebarSection>
{headings.length > 1 && (
- <Section label={t("memo.outline")}>
+ <SidebarSection label={t("memo.outline")}>
<MemoOutline headings={headings} memoName={memo.name} />
- </Section>
+ </SidebarSection>
)}
{!forceReadonly && referenced.length > 0 && (
- <Section label={t("common.referenced-by")}>
+ <SidebarSection label={t("common.referenced-by")}>
{referenced.map((relation) => {
const relatedMemo = getRelationMemo(relation, "referenced");
return <BacklinkRow key={`referenced-${relatedMemo?.name}`} relation={relation} snippet={backlinkSnippet(relation)} />;
})}
- </Section>
+ </SidebarSection>
)}
{sharePanelOpen && <MemoSharePanel memoName={memo.name} open={sharePanelOpen} onClose={() => setSharePanelOpen(false)} />}
diff --git a/web/src/components/MemoDetailSidebar/MemoOutline.tsx b/web/src/components/MemoDetailSidebar/MemoOutline.tsx
index e22336c93..bd88fec38 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 (
- <nav className="relative flex flex-col">
+ <nav className="relative flex flex-col gap-0.5">
{headings.map((heading, index) => {
const active = heading.slug === activeSlug;
return (
@@ -72,7 +73,8 @@ const MemoOutline = ({ headings, memoName }: MemoOutlineProps) => {
onClick={(e) => handleClick(e, heading.slug)}
aria-current={active ? "location" : undefined}
className={cn(
- "relative flex h-[30px] min-w-0 items-center rounded-md pr-2 text-[13px] leading-[18px] transition-colors",
+ SIDEBAR_ROW_BOX_CLASSES,
+ "relative",
heading.level === minLevel && "font-medium",
active ? "text-foreground" : "text-muted-foreground/70 hover:bg-sidebar-accent/65 hover:text-foreground",
)}
diff --git a/web/src/components/MemoDisplaySettingMenu.tsx b/web/src/components/MemoDisplaySettingMenu.tsx
index 3623c50d4..0f3f72c4d 100644
--- a/web/src/components/MemoDisplaySettingMenu.tsx
+++ b/web/src/components/MemoDisplaySettingMenu.tsx
@@ -1,5 +1,6 @@
import { Columns2Icon, Columns3Icon, InfinityIcon, type LucideIcon, Rows3Icon, SlidersHorizontalIcon } from "lucide-react";
import type { ReactNode } from "react";
+import { SIDEBAR_SECTION_ACTION_BUTTON_CLASSES, SIDEBAR_SECTION_ACTION_ICON_CLASSES } from "@/components/AppSidebar/SidebarSection";
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
import { Switch } from "@/components/ui/switch";
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
@@ -181,11 +182,13 @@ function MemoDisplaySettingMenu({ className }: Props) {
<PopoverTrigger
aria-label={t("memo.view-options")}
className={cn(
- "flex size-5 items-center justify-center rounded-[4px] text-muted-foreground/65 transition-colors hover:bg-sidebar-accent hover:text-foreground focus-visible:outline-none focus-visible:bg-sidebar-accent focus-visible:text-foreground data-popup-open:bg-sidebar-accent data-popup-open:text-foreground",
+ "flex items-center justify-center",
+ SIDEBAR_SECTION_ACTION_BUTTON_CLASSES,
+ "data-popup-open:bg-sidebar-accent data-popup-open:text-foreground",
className,
)}
>
- <SlidersHorizontalIcon className="size-3" strokeWidth={1.8} />
+ <SlidersHorizontalIcon className={SIDEBAR_SECTION_ACTION_ICON_CLASSES} strokeWidth={1.8} />
</PopoverTrigger>
</TooltipTrigger>
<TooltipContent side="top">{t("memo.view-options")}</TooltipContent>
diff --git a/web/src/components/PagedMemoList/PagedMemoList.tsx b/web/src/components/PagedMemoList/PagedMemoList.tsx
index c80ca9103..2575e0a56 100644
--- a/web/src/components/PagedMemoList/PagedMemoList.tsx
+++ b/web/src/components/PagedMemoList/PagedMemoList.tsx
@@ -153,7 +153,7 @@ const PagedMemoList = (props: Props) => {
);
// Tag settings decide whether sensitive memo content must be blurred. Keep that
- // privacy boundary, but do not wait for unrelated shortcuts or instance settings.
+ // privacy boundary, but do not wait for unrelated memo views or instance settings.
const isDisplayPending = isLoading || !isUserSettingsInitialized;
const showLoader = useDelayedFlag(isDisplayPending, LOADING_INDICATOR_DELAY_MS);
diff --git a/web/src/components/StatisticsView/MonthNavigator.tsx b/web/src/components/StatisticsView/MonthNavigator.tsx
index 3230d5500..455be6e9b 100644
--- a/web/src/components/StatisticsView/MonthNavigator.tsx
+++ b/web/src/components/StatisticsView/MonthNavigator.tsx
@@ -2,8 +2,10 @@ import dayjs from "dayjs";
import { ChevronLeftIcon, ChevronRightIcon } from "lucide-react";
import { memo } from "react";
import { useTranslation } from "react-i18next";
+import { SIDEBAR_ROW_BOX_CLASSES } from "@/components/AppSidebar/SidebarRow";
import { Button } from "@/components/ui/button";
import { addMonths } from "@/lib/calendar-utils";
+import { cn } from "@/lib/utils";
import type { MonthNavigatorProps } from "@/types/statistics";
export const MonthNavigator = memo(({ visibleMonth, onMonthChange }: MonthNavigatorProps) => {
@@ -13,20 +15,18 @@ export const MonthNavigator = memo(({ visibleMonth, onMonthChange }: MonthNaviga
const handleNextMonth = () => onMonthChange(addMonths(visibleMonth, 1));
return (
- <header className="mb-1.5 flex w-full items-center justify-between gap-3">
- <h2 className="min-w-0 truncate text-[15px] font-semibold leading-7 tracking-[-0.015em] text-foreground/90 select-none">
- {monthLabel}
- </h2>
+ <header className={cn(SIDEBAR_ROW_BOX_CLASSES, "mb-1.5 justify-between")}>
+ <h2 className="min-w-0 truncate font-medium tracking-[-0.015em] text-foreground/90 select-none">{monthLabel}</h2>
- <nav className="flex shrink-0 items-center gap-1" aria-label={t("common.month-navigation")}>
+ <nav className="flex shrink-0 items-center gap-0.5" aria-label={t("common.month-navigation")}>
<Button
variant="ghost"
size="icon-sm"
onClick={handlePrevMonth}
aria-label={t("common.previous-month")}
- className="size-7 rounded-md text-muted-foreground/65 hover:bg-muted/50 hover:text-foreground/90"
+ className="size-6 rounded text-muted-foreground/65 hover:bg-muted/50 hover:text-foreground/90"
>
- <ChevronLeftIcon className="size-[15px]" strokeWidth={1.75} />
+ <ChevronLeftIcon className="size-4" strokeWidth={1.75} />
</Button>
<Button
@@ -34,9 +34,9 @@ export const MonthNavigator = memo(({ visibleMonth, onMonthChange }: MonthNaviga
size="icon-sm"
onClick={handleNextMonth}
aria-label={t("common.next-month")}
- className="size-7 rounded-md text-muted-foreground/65 hover:bg-muted/50 hover:text-foreground/90"
+ className="size-6 rounded text-muted-foreground/65 hover:bg-muted/50 hover:text-foreground/90"
>
- <ChevronRightIcon className="size-[15px]" strokeWidth={1.75} />
+ <ChevronRightIcon className="size-4" strokeWidth={1.75} />
</Button>
</nav>
</header>
diff --git a/web/src/components/StatisticsView/StatisticsView.tsx b/web/src/components/StatisticsView/StatisticsView.tsx
index 7d5709c54..103191a17 100644
--- a/web/src/components/StatisticsView/StatisticsView.tsx
+++ b/web/src/components/StatisticsView/StatisticsView.tsx
@@ -22,7 +22,7 @@ const StatisticsView = (props: Props) => {
const selectedDate = filters.find((filter) => filter.factor === "displayTime")?.value;
return (
- <div className="group mt-0.5 flex w-full flex-col text-muted-foreground animate-fade-in">
+ <div className="group flex w-full flex-col text-muted-foreground animate-fade-in">
<MonthNavigator visibleMonth={visibleMonthString} onMonthChange={setVisibleMonthString} />
<div className="w-full animate-scale-in">
diff --git a/web/src/components/ui/dropdown-menu.tsx b/web/src/components/ui/dropdown-menu.tsx
index 02518c234..8b686e29e 100644
--- a/web/src/components/ui/dropdown-menu.tsx
+++ b/web/src/components/ui/dropdown-menu.tsx
@@ -10,37 +10,47 @@ const DropdownMenu = ({ ...props }: DropdownMenuPrimitive.Root.Props) => {
const DropdownMenuPortal = DropdownMenuPrimitive.Portal;
+type DropdownMenuSize = "default" | "sm";
+
+const DropdownMenuSizeContext = React.createContext<DropdownMenuSize>("default");
+
const DropdownMenuTrigger = React.forwardRef<HTMLButtonElement, DropdownMenuPrimitive.Trigger.Props>(({ ...props }, ref) => {
return <DropdownMenuPrimitive.Trigger ref={ref} data-slot="dropdown-menu-trigger" {...props} />;
});
DropdownMenuTrigger.displayName = "DropdownMenuTrigger";
type DropdownMenuContentProps = DropdownMenuPrimitive.Popup.Props &
- Pick<DropdownMenuPrimitive.Positioner.Props, "align" | "alignOffset" | "side" | "sideOffset">;
+ Pick<DropdownMenuPrimitive.Positioner.Props, "align" | "alignOffset" | "side" | "sideOffset"> & {
+ size?: DropdownMenuSize;
+ };
const DropdownMenuContent = React.forwardRef<HTMLDivElement, DropdownMenuContentProps>(
- ({ className, align, alignOffset, side, sideOffset = 4, ...props }, ref) => {
+ ({ className, align, alignOffset, side, sideOffset = 4, size = "default", ...props }, ref) => {
return (
- <DropdownMenuPrimitive.Portal>
- <DropdownMenuPrimitive.Positioner
- align={align}
- alignOffset={alignOffset}
- side={side}
- sideOffset={sideOffset}
- className="isolate z-dropdown outline-none"
- >
- <DropdownMenuPrimitive.Popup
- ref={ref}
- data-slot="dropdown-menu-content"
- className={cn(
- "bg-popover text-popover-foreground z-dropdown max-h-(--available-height) min-w-[8rem] origin-(--transform-origin) overflow-x-hidden overflow-y-auto rounded-md border p-1 shadow-md outline-none",
- popupMotionClasses,
- className,
- )}
- {...props}
- />
- </DropdownMenuPrimitive.Positioner>
- </DropdownMenuPrimitive.Portal>
+ <DropdownMenuSizeContext.Provider value={size}>
+ <DropdownMenuPrimitive.Portal>
+ <DropdownMenuPrimitive.Positioner
+ align={align}
+ alignOffset={alignOffset}
+ side={side}
+ sideOffset={sideOffset}
+ className="isolate z-dropdown outline-none"
+ >
+ <DropdownMenuPrimitive.Popup
+ ref={ref}
+ data-slot="dropdown-menu-content"
+ data-size={size}
+ className={cn(
+ "bg-popover text-popover-foreground z-dropdown max-h-(--available-height) origin-(--transform-origin) overflow-x-hidden overflow-y-auto border outline-none",
+ size === "sm" ? "min-w-24 rounded p-0.5 shadow-sm" : "min-w-[8rem] rounded-md p-1 shadow-md",
+ popupMotionClasses,
+ className,
+ )}
+ {...props}
+ />
+ </DropdownMenuPrimitive.Positioner>
+ </DropdownMenuPrimitive.Portal>
+ </DropdownMenuSizeContext.Provider>
);
},
);
@@ -59,13 +69,18 @@ function DropdownMenuItem({
inset?: boolean;
variant?: "default" | "destructive";
}) {
+ const size = React.useContext(DropdownMenuSizeContext);
+
return (
<DropdownMenuPrimitive.Item
data-slot="dropdown-menu-item"
data-inset={inset}
data-variant={variant}
className={cn(
- "data-highlighted:bg-accent data-highlighted:text-accent-foreground data-[variant=destructive]:text-destructive data-[variant=destructive]:data-highlighted:bg-destructive/10 data-[variant=destructive]:data-highlighted:text-destructive data-[variant=destructive]:*:[svg]:!text-destructive [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-disabled:pointer-events-none data-disabled:opacity-50 data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+ "data-highlighted:bg-accent data-highlighted:text-accent-foreground data-[variant=destructive]:text-destructive data-[variant=destructive]:data-highlighted:bg-destructive/10 data-[variant=destructive]:data-highlighted:text-destructive data-[variant=destructive]:*:[svg]:!text-destructive [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center rounded-sm outline-hidden select-none data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+ size === "sm"
+ ? "min-h-7 gap-1.5 px-2 py-1 text-ui data-[inset]:pl-7 [&_svg:not([class*='size-'])]:size-3.5"
+ : "gap-2 px-2 py-1.5 text-sm data-[inset]:pl-8 [&_svg:not([class*='size-'])]:size-4",
className,
)}
{...props}
@@ -74,11 +89,16 @@ function DropdownMenuItem({
}
function DropdownMenuCheckboxItem({ className, children, checked, ...props }: DropdownMenuPrimitive.CheckboxItem.Props) {
+ const size = React.useContext(DropdownMenuSizeContext);
+
return (
<DropdownMenuPrimitive.CheckboxItem
data-slot="dropdown-menu-checkbox-item"
className={cn(
- "data-highlighted:bg-accent data-highlighted:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+ "data-highlighted:bg-accent data-highlighted:text-accent-foreground relative flex cursor-default items-center rounded-sm outline-hidden select-none data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+ size === "sm"
+ ? "min-h-7 gap-1.5 py-1 pr-2 pl-7 text-ui [&_svg:not([class*='size-'])]:size-3.5"
+ : "gap-2 py-1.5 pr-2 pl-8 text-sm [&_svg:not([class*='size-'])]:size-4",
className,
)}
checked={checked}
@@ -86,7 +106,7 @@ function DropdownMenuCheckboxItem({ className, children, checked, ...props }: Dr
>
<span className="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
<DropdownMenuPrimitive.CheckboxItemIndicator>
- <CheckIcon className="size-4" />
+ <CheckIcon className={size === "sm" ? "size-3.5" : "size-4"} />
</DropdownMenuPrimitive.CheckboxItemIndicator>
</span>
{children}
@@ -99,11 +119,16 @@ function DropdownMenuRadioGroup({ ...props }: DropdownMenuPrimitive.RadioGroup.P
}
function DropdownMenuRadioItem({ className, children, ...props }: DropdownMenuPrimitive.RadioItem.Props) {
+ const size = React.useContext(DropdownMenuSizeContext);
+
return (
<DropdownMenuPrimitive.RadioItem
data-slot="dropdown-menu-radio-item"
className={cn(
- "data-highlighted:bg-accent data-highlighted:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+ "data-highlighted:bg-accent data-highlighted:text-accent-foreground relative flex cursor-default items-center rounded-sm outline-hidden select-none data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+ size === "sm"
+ ? "min-h-7 gap-1.5 py-1 pr-2 pl-7 text-ui [&_svg:not([class*='size-'])]:size-3.5"
+ : "gap-2 py-1.5 pr-2 pl-8 text-sm [&_svg:not([class*='size-'])]:size-4",
className,
)}
{...props}
@@ -125,31 +150,37 @@ function DropdownMenuLabel({
}: DropdownMenuPrimitive.GroupLabel.Props & {
inset?: boolean;
}) {
+ const size = React.useContext(DropdownMenuSizeContext);
+
return (
<DropdownMenuPrimitive.GroupLabel
data-slot="dropdown-menu-label"
data-inset={inset}
- className={cn("px-2 py-1.5 text-sm font-medium data-[inset]:pl-8", className)}
+ className={cn("px-2 font-medium", size === "sm" ? "py-1 text-ui data-[inset]:pl-7" : "py-1.5 text-sm data-[inset]:pl-8", className)}
{...props}
/>
);
}
function DropdownMenuSeparator({ className, ...props }: DropdownMenuPrimitive.Separator.Props) {
+ const size = React.useContext(DropdownMenuSizeContext);
+
return (
<DropdownMenuPrimitive.Separator
data-slot="dropdown-menu-separator"
- className={cn("bg-border -mx-1 my-1 h-px", className)}
+ className={cn("bg-border h-px", size === "sm" ? "-mx-0.5 my-0.5" : "-mx-1 my-1", className)}
{...props}
/>
);
}
function DropdownMenuShortcut({ className, ...props }: React.ComponentProps<"span">) {
+ const size = React.useContext(DropdownMenuSizeContext);
+
return (
<span
data-slot="dropdown-menu-shortcut"
- className={cn("text-muted-foreground ml-auto text-xs tracking-widest", className)}
+ className={cn("text-muted-foreground ml-auto tracking-widest", size === "sm" ? "text-2xs" : "text-xs", className)}
{...props}
/>
);
@@ -167,24 +198,41 @@ function DropdownMenuSubTrigger({
}: DropdownMenuPrimitive.SubmenuTrigger.Props & {
inset?: boolean;
}) {
+ const size = React.useContext(DropdownMenuSizeContext);
+
return (
<DropdownMenuPrimitive.SubmenuTrigger
data-slot="dropdown-menu-sub-trigger"
data-inset={inset}
className={cn(
- "data-highlighted:bg-accent data-highlighted:text-accent-foreground data-popup-open:bg-accent data-popup-open:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+ "data-highlighted:bg-accent data-highlighted:text-accent-foreground data-popup-open:bg-accent data-popup-open:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center rounded-sm outline-hidden select-none [&_svg]:pointer-events-none [&_svg]:shrink-0",
+ size === "sm"
+ ? "min-h-7 gap-1.5 px-2 py-1 text-ui data-[inset]:pl-7 [&_svg:not([class*='size-'])]:size-3.5"
+ : "gap-2 px-2 py-1.5 text-sm data-[inset]:pl-8 [&_svg:not([class*='size-'])]:size-4",
className,
)}
{...props}
>
{children}
- <ChevronRightIcon className="ml-auto size-4" />
+ <ChevronRightIcon className={cn("ml-auto", size === "sm" ? "size-3.5" : "size-4")} />
</DropdownMenuPrimitive.SubmenuTrigger>
);
}
-function DropdownMenuSubContent({ className, ...props }: DropdownMenuContentProps) {
- return <DropdownMenuContent align="start" alignOffset={-3} side="right" sideOffset={0} className={cn("w-auto", className)} {...props} />;
+function DropdownMenuSubContent({ className, size, ...props }: DropdownMenuContentProps) {
+ const inheritedSize = React.useContext(DropdownMenuSizeContext);
+
+ return (
+ <DropdownMenuContent
+ align="start"
+ alignOffset={-3}
+ side="right"
+ sideOffset={0}
+ size={size ?? inheritedSize}
+ className={cn("w-auto", className)}
+ {...props}
+ />
+ );
}
export {
diff --git a/web/src/connect.ts b/web/src/connect.ts
index c40ea4195..c53927340 100644
--- a/web/src/connect.ts
+++ b/web/src/connect.ts
@@ -8,7 +8,7 @@ import { AuthService } from "./types/proto/api/v1/auth_service_pb";
import { IdentityProviderService } from "./types/proto/api/v1/idp_service_pb";
import { InstanceService } from "./types/proto/api/v1/instance_service_pb";
import { MemoService } from "./types/proto/api/v1/memo_service_pb";
-import { ShortcutService } from "./types/proto/api/v1/shortcut_service_pb";
+import { MemoViewService } from "./types/proto/api/v1/memo_view_service_pb";
import { UserService } from "./types/proto/api/v1/user_service_pb";
import { redirectOnAuthFailure } from "./utils/auth-redirect";
@@ -197,7 +197,7 @@ export const userServiceClient = createClient(UserService, transport);
export const memoServiceClient = createClient(MemoService, transport);
export const attachmentServiceClient = createClient(AttachmentService, transport);
export const aiServiceClient = createClient(AIService, transport);
-export const shortcutServiceClient = createClient(ShortcutService, transport);
+export const memoViewServiceClient = createClient(MemoViewService, transport);
// Configuration service clients
export const identityProviderServiceClient = createClient(IdentityProviderService, transport);
diff --git a/web/src/contexts/AuthContext.tsx b/web/src/contexts/AuthContext.tsx
index 7443668ad..97392ff60 100644
--- a/web/src/contexts/AuthContext.tsx
+++ b/web/src/contexts/AuthContext.tsx
@@ -1,9 +1,8 @@
import { useQueryClient } from "@tanstack/react-query";
import { createContext, type ReactNode, useCallback, useContext, useMemo, useState } from "react";
import { clearAccessToken, getAccessToken } from "@/auth-state";
-import { authServiceClient, refreshAccessToken, shortcutServiceClient, userServiceClient } from "@/connect";
+import { authServiceClient, refreshAccessToken, userServiceClient } from "@/connect";
import { userKeys } from "@/hooks/useUserQueries";
-import type { Shortcut } from "@/types/proto/api/v1/shortcut_service_pb";
import type {
User,
UserSetting_GeneralSetting,
@@ -16,7 +15,6 @@ interface AuthState {
userGeneralSetting: UserSetting_GeneralSetting | undefined;
userWebhooksSetting: UserSetting_WebhooksSetting | undefined;
userTagsSetting: UserSetting_TagsSetting | undefined;
- shortcuts: Shortcut[];
/** Authentication identity has settled, while user settings may still be loading. */
isIdentityInitialized: boolean;
/** User settings that affect memo presentation are safe to consume. */
@@ -40,7 +38,6 @@ const UNAUTHENTICATED_STATE: AuthState = {
userGeneralSetting: undefined,
userWebhooksSetting: undefined,
userTagsSetting: undefined,
- shortcuts: [],
isIdentityInitialized: true,
isUserSettingsInitialized: true,
isInitialized: true,
@@ -54,7 +51,6 @@ export function AuthProvider({ children }: { children: ReactNode }) {
userGeneralSetting: undefined,
userWebhooksSetting: undefined,
userTagsSetting: undefined,
- shortcuts: [],
isIdentityInitialized: false,
isUserSettingsInitialized: false,
isInitialized: false,
@@ -62,40 +58,29 @@ export function AuthProvider({ children }: { children: ReactNode }) {
});
const fetchUserSettings = useCallback(async (userName: string) => {
- const userSettingsPromise = userServiceClient.listUserSettings({ parent: userName }).then(({ settings }) => {
- const generalSetting = settings.find((s) => s.value.case === "generalSetting");
- const webhooksSetting = settings.find((s) => s.value.case === "webhooksSetting");
- const tagsSetting = settings.find((s) => s.value.case === "tagsSetting");
- const userSettings = {
- userGeneralSetting: generalSetting?.value.case === "generalSetting" ? generalSetting.value.value : undefined,
- userWebhooksSetting: webhooksSetting?.value.case === "webhooksSetting" ? webhooksSetting.value.value : undefined,
- userTagsSetting: tagsSetting?.value.case === "tagsSetting" ? tagsSetting.value.value : undefined,
- };
-
- // Tag settings control sensitive-content blurring. Publish them as soon
- // as this request settles instead of waiting for unrelated shortcuts.
- setState((prev) =>
- prev.currentUser?.name === userName
- ? {
- ...prev,
- ...userSettings,
- isUserSettingsInitialized: true,
- }
- : prev,
- );
-
- return userSettings;
- });
-
- const [userSettings, { shortcuts }] = await Promise.all([
- userSettingsPromise,
- shortcutServiceClient.listShortcuts({ parent: userName }),
- ]);
-
- return {
- ...userSettings,
- shortcuts,
+ const { settings } = await userServiceClient.listUserSettings({ parent: userName });
+ const generalSetting = settings.find((s) => s.value.case === "generalSetting");
+ const webhooksSetting = settings.find((s) => s.value.case === "webhooksSetting");
+ const tagsSetting = settings.find((s) => s.value.case === "tagsSetting");
+ const userSettings = {
+ userGeneralSetting: generalSetting?.value.case === "generalSetting" ? generalSetting.value.value : undefined,
+ userWebhooksSetting: webhooksSetting?.value.case === "webhooksSetting" ? webhooksSetting.value.value : undefined,
+ userTagsSetting: tagsSetting?.value.case === "tagsSetting" ? tagsSetting.value.value : undefined,
};
+
+ // Tag settings control sensitive-content blurring. Publish them as soon as
+ // this request settles; memo views are managed separately by React Query.
+ setState((prev) =>
+ prev.currentUser?.name === userName
+ ? {
+ ...prev,
+ ...userSettings,
+ isUserSettingsInitialized: true,
+ }
+ : prev,
+ );
+
+ return userSettings;
}, []);
const initialize = useCallback(async () => {
diff --git a/web/src/contexts/MemoFilterContext.tsx b/web/src/contexts/MemoFilterContext.tsx
index 357f6a409..3a282b66a 100644
--- a/web/src/contexts/MemoFilterContext.tsx
+++ b/web/src/contexts/MemoFilterContext.tsx
@@ -47,7 +47,7 @@ export const replaceFiltersByFactor = (filters: MemoFilter[], factor: FilterFact
interface MemoFilterContextValue {
filters: MemoFilter[];
- shortcut: string | undefined;
+ memoView: string | undefined;
hasActiveFilters: boolean;
getFiltersByFactor: (factor: FilterFactor) => MemoFilter[];
setFilters: (filters: MemoFilter[]) => void;
@@ -55,7 +55,7 @@ interface MemoFilterContextValue {
removeFilter: (predicate: (f: MemoFilter) => boolean) => void;
removeFiltersByFactor: (factor: FilterFactor) => void;
clearAllFilters: () => void;
- setShortcut: (shortcut?: string) => void;
+ setMemoView: (memoView?: string) => void;
hasFilter: (filter: MemoFilter) => boolean;
}
@@ -70,7 +70,7 @@ export function MemoFilterProvider({ children }: { children: ReactNode }) {
const [filters, setFiltersState] = useState<MemoFilter[]>(() => {
return parseFilterQuery(searchParams.get("filter"));
});
- const [shortcut, setShortcutState] = useState<string | undefined>(undefined);
+ const [memoView, setMemoViewState] = useState<string | undefined>(undefined);
// Sync URL to state when URL changes externally
useEffect(() => {
@@ -119,20 +119,20 @@ export function MemoFilterProvider({ children }: { children: ReactNode }) {
const clearAllFilters = useCallback(() => {
setFiltersState([]);
- setShortcutState(undefined);
+ setMemoViewState(undefined);
}, []);
- const setShortcut = useCallback((newShortcut?: string) => {
- setShortcutState(newShortcut);
+ const setMemoView = useCallback((newMemoView?: string) => {
+ setMemoViewState(newMemoView);
}, []);
const hasFilter = useCallback((filter: MemoFilter) => filters.some((f) => getMemoFilterKey(f) === getMemoFilterKey(filter)), [filters]);
- const hasActiveFilters = filters.length > 0 || shortcut !== undefined;
+ const hasActiveFilters = filters.length > 0 || memoView !== undefined;
const value = useMemo(
() => ({
filters,
- shortcut,
+ memoView,
hasActiveFilters,
getFiltersByFactor,
setFilters,
@@ -140,12 +140,12 @@ export function MemoFilterProvider({ children }: { children: ReactNode }) {
removeFilter,
removeFiltersByFactor,
clearAllFilters,
- setShortcut,
+ setMemoView,
hasFilter,
}),
[
filters,
- shortcut,
+ memoView,
hasActiveFilters,
getFiltersByFactor,
setFilters,
@@ -153,7 +153,7 @@ export function MemoFilterProvider({ children }: { children: ReactNode }) {
removeFilter,
removeFiltersByFactor,
clearAllFilters,
- setShortcut,
+ setMemoView,
hasFilter,
],
);
diff --git a/web/src/hooks/useMemoFilters.ts b/web/src/hooks/useMemoFilters.ts
index 087fe32cd..9ef657246 100644
--- a/web/src/hooks/useMemoFilters.ts
+++ b/web/src/hooks/useMemoFilters.ts
@@ -1,7 +1,8 @@
import { useMemo } from "react";
-import { useAuth } from "@/contexts/AuthContext";
import { type MemoFilter, useMemoFilterContext } from "@/contexts/MemoFilterContext";
-import { BUILTIN_TASKS_VIEW_FILTER, BUILTIN_TASKS_VIEW_ID, getShortcutId } from "@/lib/memo-views";
+import useCurrentUser from "@/hooks/useCurrentUser";
+import { useMemoViews } from "@/hooks/useUserQueries";
+import { BUILTIN_TASKS_VIEW_FILTER, BUILTIN_TASKS_VIEW_ID, getMemoViewId } from "@/lib/memo-views";
import { buildMemoCreatorFilter } from "@/lib/resource-names";
import { Visibility } from "@/types/proto/api/v1/memo_service_pb";
@@ -40,26 +41,26 @@ const getLocalDayTimestampRange = (value: string): { startTimestamp: number; end
export interface UseMemoFiltersOptions {
creatorName?: string;
- includeShortcuts?: boolean;
+ includeMemoViews?: boolean;
includePinned?: boolean;
visibilities?: Visibility[];
}
interface BuildMemoFilterOptions {
creatorName?: string;
- currentShortcut?: string;
+ currentMemoView?: string;
filters: MemoFilter[];
includePinned: boolean;
- selectedShortcutFilter?: string;
+ selectedMemoViewFilter?: string;
visibilities?: Visibility[];
}
export const buildMemoFilter = ({
creatorName,
- currentShortcut,
+ currentMemoView,
filters,
includePinned,
- selectedShortcutFilter,
+ selectedMemoViewFilter,
visibilities,
}: BuildMemoFilterOptions): string | undefined => {
const conditions: string[] = [];
@@ -71,10 +72,10 @@ export const buildMemoFilter = ({
}
}
- if (currentShortcut === BUILTIN_TASKS_VIEW_ID) {
+ if (currentMemoView === BUILTIN_TASKS_VIEW_ID) {
conditions.push(BUILTIN_TASKS_VIEW_FILTER);
- } else if (selectedShortcutFilter) {
- conditions.push(selectedShortcutFilter);
+ } else if (selectedMemoViewFilter) {
+ conditions.push(selectedMemoViewFilter);
}
for (const filter of filters) {
@@ -109,27 +110,28 @@ export const buildMemoFilter = ({
};
export const useMemoFilters = (options: UseMemoFiltersOptions = {}): string | undefined => {
- const { creatorName, includeShortcuts = false, includePinned = false, visibilities } = options;
+ const { creatorName, includeMemoViews = false, includePinned = false, visibilities } = options;
- const { shortcuts } = useAuth();
- const { filters, shortcut: currentShortcut } = useMemoFilterContext();
+ const currentUser = useCurrentUser();
+ const { data: memoViews = [] } = useMemoViews(includeMemoViews ? currentUser?.name : undefined);
+ const { filters, memoView: currentMemoView } = useMemoFilterContext();
- // Get selected shortcut if needed
- const selectedShortcutFilter = useMemo(() => {
- if (!includeShortcuts || currentShortcut === BUILTIN_TASKS_VIEW_ID) return undefined;
- return shortcuts.find((shortcut) => getShortcutId(shortcut.name) === currentShortcut)?.filter;
- }, [includeShortcuts, currentShortcut, shortcuts]);
+ // Get the selected memo view if needed.
+ const selectedMemoViewFilter = useMemo(() => {
+ if (!includeMemoViews || currentMemoView === BUILTIN_TASKS_VIEW_ID) return undefined;
+ return memoViews.find((memoView) => getMemoViewId(memoView.name) === currentMemoView)?.filter;
+ }, [includeMemoViews, currentMemoView, memoViews]);
return useMemo(
() =>
buildMemoFilter({
creatorName,
- currentShortcut: includeShortcuts ? currentShortcut : undefined,
+ currentMemoView: includeMemoViews ? currentMemoView : undefined,
filters,
includePinned,
- selectedShortcutFilter,
+ selectedMemoViewFilter,
visibilities,
}),
- [creatorName, currentShortcut, filters, includePinned, includeShortcuts, selectedShortcutFilter, visibilities],
+ [creatorName, currentMemoView, filters, includePinned, includeMemoViews, selectedMemoViewFilter, visibilities],
);
};
diff --git a/web/src/hooks/useUserQueries.ts b/web/src/hooks/useUserQueries.ts
index 447b743f0..7ddf061d4 100644
--- a/web/src/hooks/useUserQueries.ts
+++ b/web/src/hooks/useUserQueries.ts
@@ -1,7 +1,7 @@
import { create } from "@bufbuild/protobuf";
import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";
import { queryOptions, useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { shortcutServiceClient, userServiceClient } from "@/connect";
+import { memoViewServiceClient, userServiceClient } from "@/connect";
import useCurrentUser from "@/hooks/useCurrentUser";
import { buildUserSettingName, userNamePrefix } from "@/lib/resource-names";
import { mergeTagCounts } from "@/lib/tag";
@@ -29,7 +29,7 @@ export const userKeys = {
userStats: (name: string) => [...userKeys.stats(), name] as const,
allUserStats: (request: Partial<ListAllUserStatsQuery>) => [...userKeys.stats(), "all", request] as const,
currentUser: () => [...userKeys.all, "current"] as const,
- shortcuts: () => [...userKeys.all, "shortcuts"] as const,
+ memoViews: (parent?: string) => [...userKeys.all, "memoViews", parent] as const,
notifications: () => [...userKeys.all, "notifications"] as const,
byNames: (names: string[]) => [...userKeys.all, "byNames", ...[...names].sort()] as const,
byUsernames: (usernames: string[]) => [...userKeys.all, "byUsernames", ...[...usernames].sort()] as const,
@@ -74,13 +74,15 @@ export function useAllUserStats(request: Partial<ListAllUserStatsQuery> = {}, op
});
}
-export function useShortcuts() {
+export function useMemoViews(parent?: string) {
return useQuery({
- queryKey: userKeys.shortcuts(),
+ queryKey: userKeys.memoViews(parent),
queryFn: async () => {
- const { shortcuts } = await shortcutServiceClient.listShortcuts({});
- return shortcuts;
+ if (!parent) return [];
+ const { memoViews } = await memoViewServiceClient.listMemoViews({ parent });
+ return memoViews;
},
+ enabled: !!parent,
});
}
@@ -172,12 +174,9 @@ export function useUserSettings(parent?: string) {
return useQuery({
queryKey: [...userKeys.all, "settings", parent],
queryFn: async () => {
- if (!parent) return { settings: [], shortcuts: [] };
- const [{ settings }, { shortcuts }] = await Promise.all([
- userServiceClient.listUserSettings({ parent }),
- shortcutServiceClient.listShortcuts({ parent }),
- ]);
- return { settings, shortcuts };
+ if (!parent) return { settings: [] };
+ const { settings } = await userServiceClient.listUserSettings({ parent });
+ return { settings };
},
enabled: !!parent,
});
diff --git a/web/src/lib/memo-views.ts b/web/src/lib/memo-views.ts
index fc3851066..9de48a89d 100644
--- a/web/src/lib/memo-views.ts
+++ b/web/src/lib/memo-views.ts
@@ -5,7 +5,7 @@ export type MemoScope = "home" | "explore" | "archived";
export const BUILTIN_TASKS_VIEW_ID = "__built_in_tasks__";
export const BUILTIN_TASKS_VIEW_FILTER = "has_task_list && has_incomplete_tasks";
-export const getShortcutId = (name: string): string => {
+export const getMemoViewId = (name: string): string => {
const parts = name.split("/");
return parts.length === 4 ? parts[3] : name;
};
diff --git a/web/src/lib/utils.ts b/web/src/lib/utils.ts
index 365058ceb..c0d1ab8b3 100644
--- a/web/src/lib/utils.ts
+++ b/web/src/lib/utils.ts
@@ -1,6 +1,14 @@
import { type ClassValue, clsx } from "clsx";
-import { twMerge } from "tailwind-merge";
+import { extendTailwindMerge } from "tailwind-merge";
+
+const mergeTailwindClasses = extendTailwindMerge({
+ extend: {
+ theme: {
+ text: ["2xs", "ui"],
+ },
+ },
+});
export function cn(...inputs: ClassValue[]) {
- return twMerge(clsx(inputs));
+ return mergeTailwindClasses(clsx(inputs));
}
diff --git a/web/src/locales/ar.json b/web/src/locales/ar.json
index 0847e7209..f549f0845 100644
--- a/web/src/locales/ar.json
+++ b/web/src/locales/ar.json
@@ -64,6 +64,7 @@
"last-updated-at": "آخر تحديث في",
"learn-more": "تعلم المزيد",
"link": "الرابط",
+ "manage": "إدارة",
"map": "خريطة",
"mark": "تعليم",
"memo": "مذكرة",
@@ -94,8 +95,6 @@
"select": "تحديد",
"settings": "الإعدادات",
"share": "مشاركة",
- "shortcut-filter": "تصفية الاختصارات",
- "shortcuts": "اختصارات",
"sign-in": "تسجيل الدخول",
"sign-in-with": "تسجيل دخول بواسطة {{provider}}",
"sign-out": "تسجيل خروج",
@@ -113,6 +112,7 @@
"username": "اسم المستخدم",
"version": "الإصدار",
"visibility": "الرؤية",
+ "views": "طرق العرض",
"yourself": "نفسك"
},
"locale-picker": {
@@ -333,9 +333,9 @@
"theme": "السمة",
"label": "التفضيلات"
},
- "shortcut": {
- "delete-confirm": "هل أنت متأكد من حذف الاختصار `{{title}}`؟",
- "delete-success": "تم حذف الاختصار `{{title}}` بنجاح"
+ "memo-view": {
+ "delete-confirm": "هل أنت متأكد من حذف طريقة العرض `{{title}}`؟",
+ "delete-success": "تم حذف طريقة العرض `{{title}}` بنجاح"
},
"sso": {
"authorization-endpoint": "نقطة نهاية التفويض",
diff --git a/web/src/locales/bg.json b/web/src/locales/bg.json
index 12808473f..36d781878 100644
--- a/web/src/locales/bg.json
+++ b/web/src/locales/bg.json
@@ -103,6 +103,7 @@
"last-updated-at": "Последна актуализация на",
"learn-more": "Научете повече",
"link": "Връзка",
+ "manage": "Управление",
"map": "Карта",
"mark": "Марк",
"memo": "Бележка",
@@ -133,8 +134,6 @@
"select": "Изберете",
"settings": "Настройки",
"share": "Споделете",
- "shortcut-filter": "Филтър за бърз достъп",
- "shortcuts": "Преки пътища",
"sign-in": "влезте",
"sign-in-with": "Влезте с {{provider}}",
"sign-out": "Излезте",
@@ -153,6 +152,7 @@
"username": "Потребителско име",
"version": "Версия",
"visibility": "Видимост",
+ "views": "Изгледи",
"yourself": "Себе си"
},
"locale-picker": {
@@ -571,9 +571,9 @@
"theme-description": "Прилага избраната тема веднага на това устройство.",
"theme": "Тема"
},
- "shortcut": {
- "delete-confirm": "Сигурни ли сте, че искате да изтриете пряк път `{{title}}`?",
- "delete-success": "Пряк път `{{title}}` изтрит успешно"
+ "memo-view": {
+ "delete-confirm": "Сигурни ли сте, че искате да изтриете изгледа `{{title}}`?",
+ "delete-success": "Изгледът `{{title}}` е изтрит успешно"
},
"sso": {
"account": "акаунт",
diff --git a/web/src/locales/ca.json b/web/src/locales/ca.json
index 807d5c85f..7b50acea9 100644
--- a/web/src/locales/ca.json
+++ b/web/src/locales/ca.json
@@ -65,6 +65,7 @@
"last-updated-at": "Darrera actualització el",
"learn-more": "Saber-ne més",
"link": "Enllaç",
+ "manage": "Gestiona",
"map": "Mapa",
"mark": "Marca",
"memo": "Memo",
@@ -95,8 +96,6 @@
"select": "Selecciona",
"settings": "Configuració",
"share": "Comparteix",
- "shortcut-filter": "Filtre de dreceres",
- "shortcuts": "Dreceres",
"sign-in": "Identifica't",
"sign-in-with": "Identifica't via {{provider}}",
"sign-out": "Surt",
@@ -114,6 +113,7 @@
"username": "Nom d'usuari",
"version": "Versió",
"visibility": "Visibilitat",
+ "views": "Vistes",
"yourself": "Tu mateix",
"empty-placeholder": "Buit",
"unlink": "Desenllaça"
@@ -454,9 +454,9 @@
"memo-defaults-title": "Memo per defecte",
"theme-description": "Aplica el tema seleccionat immediatament en aquest dispositiu."
},
- "shortcut": {
- "delete-confirm": "Estàs segur que vols eliminar la drecera `{{title}}`?",
- "delete-success": "Drecera `{{title}}` eliminada correctament"
+ "memo-view": {
+ "delete-confirm": "Estàs segur que vols eliminar la vista `{{title}}`?",
+ "delete-success": "Vista `{{title}}` eliminada correctament"
},
"sso": {
"authorization-endpoint": "Punt final d'autorització",
diff --git a/web/src/locales/cs.json b/web/src/locales/cs.json
index ef431e30d..9acb5ee90 100644
--- a/web/src/locales/cs.json
+++ b/web/src/locales/cs.json
@@ -65,6 +65,7 @@
"last-updated-at": "Změněno",
"learn-more": "Více informací",
"link": "Odkaz",
+ "manage": "Spravovat",
"map": "Mapa",
"mark": "Značka",
"memo": "Poznámka",
@@ -95,8 +96,6 @@
"select": "Vybrat",
"settings": "Nastavení",
"share": "Sdílet",
- "shortcut-filter": "Filtr zkratek",
- "shortcuts": "Zkratky",
"sign-in": "Přihlásit se",
"sign-in-with": "Přihlásit se pomocí {{provider}}",
"sign-out": "Odhlásit se",
@@ -114,6 +113,7 @@
"username": "Uživatelské jméno",
"version": "Verze",
"visibility": "Viditelnost",
+ "views": "Zobrazení",
"yourself": "Vy sami",
"empty-placeholder": "Prázdný",
"unlink": "Odpojit"
@@ -454,9 +454,9 @@
"memo-defaults-title": "Výchozí nastavení poznámek",
"theme-description": "Okamžitě použije vybraný motiv na tomto zařízení."
},
- "shortcut": {
- "delete-confirm": "Jste si jisti, že chcete odstranit zkratku `{{title}}`?",
- "delete-success": "Zkratka `{{title}}` úspěšně odstraněna"
+ "memo-view": {
+ "delete-confirm": "Jste si jisti, že chcete odstranit zobrazení `{{title}}`?",
+ "delete-success": "Zobrazení `{{title}}` bylo úspěšně odstraněno"
},
"sso": {
"authorization-endpoint": "Autorizační koncový bod",
diff --git a/web/src/locales/da.json b/web/src/locales/da.json
index 8728051e1..534427084 100644
--- a/web/src/locales/da.json
+++ b/web/src/locales/da.json
@@ -103,6 +103,7 @@
"last-updated-at": "Sidst opdateret kl",
"learn-more": "Få flere oplysninger",
"link": "Forbindelse",
+ "manage": "Administrer",
"map": "Kort",
"mark": "Mærke",
"memo": "Memo",
@@ -133,8 +134,6 @@
"select": "Vælge",
"settings": "Indstillinger",
"share": "Dele",
- "shortcut-filter": "Genvejsfilter",
- "shortcuts": "Genveje",
"sign-in": "Log ind",
"sign-in-with": "Log ind med {{provider}}",
"sign-out": "Log ud",
@@ -153,6 +152,7 @@
"username": "Brugernavn",
"version": "Version",
"visibility": "Sigtbarhed",
+ "views": "Visninger",
"yourself": "Dig selv"
},
"locale-picker": {
@@ -571,9 +571,9 @@
"theme-description": "Anvender det valgte tema med det samme på denne enhed.",
"theme": "Tema"
},
- "shortcut": {
- "delete-confirm": "Er du sikker på, at du vil slette genvejen `{{title}}`?",
- "delete-success": "Genvejen `{{title}}` blev slettet"
+ "memo-view": {
+ "delete-confirm": "Er du sikker på, at du vil slette visningen `{{title}}`?",
+ "delete-success": "Visningen `{{title}}` blev slettet"
},
"sso": {
"account": "Konto",
diff --git a/web/src/locales/de.json b/web/src/locales/de.json
index 172fdf61b..e3f1efcc9 100644
--- a/web/src/locales/de.json
+++ b/web/src/locales/de.json
@@ -65,6 +65,7 @@
"last-updated-at": "Zuletzt aktualisiert am",
"learn-more": "Mehr erfahren",
"link": "Link",
+ "manage": "Verwalten",
"map": "Karte",
"mark": "Markieren",
"memo": "Notiz",
@@ -95,8 +96,6 @@
"select": "Auswählen",
"settings": "Einstellungen",
"share": "Teilen",
- "shortcut-filter": "Verknüpfungsfilter",
- "shortcuts": "Verknüpfungen",
"sign-in": "Anmelden",
"sign-in-with": "Anmelden mit {{provider}}",
"sign-out": "Abmelden",
@@ -114,6 +113,7 @@
"username": "Benutzername",
"version": "Version",
"visibility": "Sichtbarkeit",
+ "views": "Ansichten",
"yourself": "Du selbst",
"empty-placeholder": "Leer",
"unlink": "Verknüpfung aufheben"
@@ -454,9 +454,9 @@
"memo-defaults-title": "Memo-Standardwerte",
"theme-description": "Wendet das ausgewählte Thema sofort auf diesem Gerät an."
},
- "shortcut": {
- "delete-confirm": "Bist du sicher, dass du die Verknüpfung `{{title}}` löschen möchtest?",
- "delete-success": "Verknüpfung `{{title}}` erfolgreich gelöscht"
+ "memo-view": {
+ "delete-confirm": "Bist du sicher, dass du die Ansicht `{{title}}` löschen möchtest?",
+ "delete-success": "Ansicht `{{title}}` erfolgreich gelöscht"
},
"sso": {
"authorization-endpoint": "Autorisierungsendpunkt",
diff --git a/web/src/locales/el.json b/web/src/locales/el.json
index ceace0abf..8c80054c7 100644
--- a/web/src/locales/el.json
+++ b/web/src/locales/el.json
@@ -103,6 +103,7 @@
"last-updated-at": "Τελευταία ενημέρωση στις",
"learn-more": "Μάθετε περισσότερα",
"link": "Σύνδεσμος",
+ "manage": "Διαχείριση",
"map": "Χάρτης",
"mark": "Σημάδι",
"memo": "Σημείωμα",
@@ -133,8 +134,6 @@
"select": "Επιλέγω",
"settings": "Ρυθμίσεις",
"share": "Μερίδιο",
- "shortcut-filter": "Φίλτρο συντόμευσης",
- "shortcuts": "Συντομεύσεις",
"sign-in": "Συνδεθείτε",
"sign-in-with": "Συνδεθείτε με το {{provider}}",
"sign-out": "Αποσυνδεθείτε",
@@ -153,6 +152,7 @@
"username": "Όνομα χρήστη",
"version": "Εκδοχή",
"visibility": "Ορατότητα",
+ "views": "Προβολές",
"yourself": "Σύ ο ίδιος"
},
"locale-picker": {
@@ -571,9 +571,9 @@
"theme-description": "Εφαρμόζει το επιλεγμένο θέμα αμέσως σε αυτήν τη συσκευή.",
"theme": "Θέμα"
},
- "shortcut": {
- "delete-confirm": "Είστε βέβαιοι ότι θέλετε να διαγράψετε τη συντόμευση `{{title}}`;",
- "delete-success": "Η συντόμευση `{{title}}` διαγράφηκε με επιτυχία"
+ "memo-view": {
+ "delete-confirm": "Είστε βέβαιοι ότι θέλετε να διαγράψετε την προβολή `{{title}}`;",
+ "delete-success": "Η προβολή `{{title}}` διαγράφηκε με επιτυχία"
},
"sso": {
"account": "Λογαριασμός",
diff --git a/web/src/locales/en-GB.json b/web/src/locales/en-GB.json
index 0fe1938dc..d69a3bcc9 100644
--- a/web/src/locales/en-GB.json
+++ b/web/src/locales/en-GB.json
@@ -65,6 +65,7 @@
"last-updated-at": "Last updated at",
"learn-more": "Learn more",
"link": "Link",
+ "manage": "Manage",
"map": "Map",
"mark": "Mark",
"memo": "Memo",
@@ -95,8 +96,6 @@
"select": "Select",
"settings": "Settings",
"share": "Share",
- "shortcut-filter": "Shortcut filter",
- "shortcuts": "Shortcuts",
"sign-in": "Sign in",
"sign-in-with": "Sign in with {{provider}}",
"sign-out": "Sign out",
@@ -114,6 +113,7 @@
"username": "Username",
"version": "Version",
"visibility": "Visibility",
+ "views": "Views",
"yourself": "Yourself",
"empty-placeholder": "Empty",
"unlink": "Unlink"
@@ -454,9 +454,9 @@
"memo-defaults-title": "Memo defaults",
"theme-description": "Applies the selected theme immediately on this device."
},
- "shortcut": {
- "delete-confirm": "Are you sure you want to delete shortcut `{{title}}`?",
- "delete-success": "Shortcut `{{title}}` deleted successfully"
+ "memo-view": {
+ "delete-confirm": "Are you sure you want to delete view `{{title}}`?",
+ "delete-success": "View `{{title}}` deleted successfully"
},
"sso": {
"authorization-endpoint": "Authorisation endpoint",
diff --git a/web/src/locales/en.json b/web/src/locales/en.json
index 6576ec0eb..84e4c85f8 100644
--- a/web/src/locales/en.json
+++ b/web/src/locales/en.json
@@ -139,6 +139,7 @@
"learn-more": "Learn more",
"link": "Link",
"location": "Location",
+ "manage": "Manage",
"map": "Map",
"mark": "Mark",
"memo": "Memo",
@@ -173,8 +174,6 @@
"select": "Select",
"settings": "Settings",
"share": "Share",
- "shortcut-filter": "Shortcut filter",
- "shortcuts": "Shortcuts",
"sign-in": "Sign in",
"sign-in-to-memos": "Sign in to Memos",
"sign-out": "Sign out",
@@ -660,9 +659,9 @@
"theme-description": "Applies the selected theme immediately on this device.",
"theme": "Theme"
},
- "shortcut": {
- "delete-confirm": "Are you sure you want to delete shortcut `{{title}}`?",
- "delete-success": "Shortcut `{{title}}` deleted successfully"
+ "memo-view": {
+ "delete-confirm": "Are you sure you want to delete view `{{title}}`?",
+ "delete-success": "View `{{title}}` deleted successfully"
},
"sso": {
"account": "Account",
diff --git a/web/src/locales/es.json b/web/src/locales/es.json
index daf40f64a..09c4edd53 100644
--- a/web/src/locales/es.json
+++ b/web/src/locales/es.json
@@ -65,6 +65,7 @@
"last-updated-at": "Última actualización en",
"learn-more": "Saber más",
"link": "Enlace",
+ "manage": "Gestionar",
"map": "Mapa",
"mark": "Marcar",
"memo": "Memo",
@@ -95,8 +96,6 @@
"select": "Seleccionar",
"settings": "Configuración",
"share": "Compartir",
- "shortcut-filter": "Filtro de atajos",
- "shortcuts": "Atajos",
"sign-in": "Iniciar sesión",
"sign-in-with": "Iniciar sesión con {{provider}}",
"sign-out": "Cerrar sesión",
@@ -114,6 +113,7 @@
"username": "Usuario",
"version": "Versión",
"visibility": "Visibilidad",
+ "views": "Vistas",
"yourself": "Tú mismo",
"empty-placeholder": "Vacía",
"unlink": "Desconectar"
@@ -454,9 +454,9 @@
"memo-defaults-title": "Valores predeterminados de notas",
"theme-description": "Aplica el tema seleccionado inmediatamente en este dispositivo."
},
- "shortcut": {
- "delete-confirm": "¿Estás seguro de que quieres eliminar el atajo `{{title}}`?",
- "delete-success": "Atajo `{{title}}` eliminado correctamente"
+ "memo-view": {
+ "delete-confirm": "¿Estás seguro de que quieres eliminar la vista `{{title}}`?",
+ "delete-success": "Vista `{{title}}` eliminada correctamente"
},
"sso": {
"authorization-endpoint": "Punto final de autorización",
diff --git a/web/src/locales/et.json b/web/src/locales/et.json
index 549c1a990..e7df4d0e9 100644
--- a/web/src/locales/et.json
+++ b/web/src/locales/et.json
@@ -103,6 +103,7 @@
"last-updated-at": "Viimati värskendatud kell",
"learn-more": "Lisateavet",
"link": "Link",
+ "manage": "Halda",
"map": "Kaart",
"mark": "Mark",
"memo": "Memo",
@@ -133,8 +134,6 @@
"select": "Valige",
"settings": "Seaded",
"share": "Jaga",
- "shortcut-filter": "Otsetee filter",
- "shortcuts": "Otseteed",
"sign-in": "Logi sisse",
"sign-in-with": "Logige sisse {{provider}}-iga",
"sign-out": "Logi välja",
@@ -153,6 +152,7 @@
"username": "Kasutajanimi",
"version": "Versioon",
"visibility": "Nähtavus",
+ "views": "Vaated",
"yourself": "iseennast"
},
"locale-picker": {
@@ -571,9 +571,9 @@
"theme-description": "Rakendab valitud teema kohe selles seadmes.",
"theme": "Teema"
},
- "shortcut": {
- "delete-confirm": "Kas olete kindel, et soovite otsetee `{{title}}` kustutada?",
- "delete-success": "Otsetee `{{title}}` kustutati edukalt"
+ "memo-view": {
+ "delete-confirm": "Kas olete kindel, et soovite vaate `{{title}}` kustutada?",
+ "delete-success": "Vaade `{{title}}` kustutati edukalt"
},
"sso": {
"account": "konto",
diff --git a/web/src/locales/fa.json b/web/src/locales/fa.json
index 6320075e5..e81bf002a 100644
--- a/web/src/locales/fa.json
+++ b/web/src/locales/fa.json
@@ -64,6 +64,7 @@
"last-updated-at": "آخرین بروزرسانی در",
"learn-more": "اطلاعات بیشتر",
"link": "پیوست",
+ "manage": "مدیریت",
"map": "نقشه",
"mark": "علامت‌گذاری",
"memo": "یادداشت",
@@ -94,8 +95,6 @@
"select": "انتخاب کردن",
"settings": "تنظیمات",
"share": "اشتراک",
- "shortcut-filter": "فیلتر میانبر",
- "shortcuts": "میانبرها",
"sign-in": "ورود به حساب کاربری",
"sign-in-with": "{{provider}} ورود با",
"sign-out": "خروج از حساب کاربری",
@@ -113,6 +112,7 @@
"username": "نام کاربری",
"version": "نسخه",
"visibility": "قابل مشاهده توسط",
+ "views": "نماها",
"yourself": "خودتان"
},
"locale-picker": {
@@ -333,9 +333,9 @@
"theme": "پوسته",
"label": "ترجیحات"
},
- "shortcut": {
- "delete-confirm": "آیا مطمئن هستید که می‌خواهید میانبر «{{title}}» را حذف کنید؟",
- "delete-success": "میانبر «{{title}}» با موفقیت حذف شد"
+ "memo-view": {
+ "delete-confirm": "آیا مطمئن هستید که می‌خواهید نمای «{{title}}» را حذف کنید؟",
+ "delete-success": "نمای «{{title}}» با موفقیت حذف شد"
},
"sso": {
"authorization-endpoint": "آدرس نقطه مجوز",
diff --git a/web/src/locales/fi.json b/web/src/locales/fi.json
index c2c867191..1e846b62d 100644
--- a/web/src/locales/fi.json
+++ b/web/src/locales/fi.json
@@ -103,6 +103,7 @@
"last-updated-at": "Viimeksi päivitetty klo",
"learn-more": "Lue lisää",
"link": "Linkki",
+ "manage": "Hallinnoi",
"map": "Kartta",
"mark": "Mark",
"memo": "Muistio",
@@ -133,8 +134,6 @@
"select": "Valitse",
"settings": "Asetukset",
"share": "Jakaa",
- "shortcut-filter": "Pikakuvakesuodatin",
- "shortcuts": "Pikanäppäimet",
"sign-in": "Kirjaudu sisään",
"sign-in-with": "Kirjaudu sisään {{provider}}:llä",
"sign-out": "Kirjaudu ulos",
@@ -153,6 +152,7 @@
"username": "Käyttäjätunnus",
"version": "Versio",
"visibility": "Näkyvyys",
+ "views": "Näkymät",
"yourself": "itseäsi"
},
"locale-picker": {
@@ -571,9 +571,9 @@
"theme-description": "Ottaa valitun teeman käyttöön välittömästi tässä laitteessa.",
"theme": "Teema"
},
- "shortcut": {
- "delete-confirm": "Haluatko varmasti poistaa pikakuvakkeen `{{title}}`?",
- "delete-success": "Pikakuvake `{{title}}` poistettu onnistuneesti"
+ "memo-view": {
+ "delete-confirm": "Haluatko varmasti poistaa näkymän `{{title}}`?",
+ "delete-success": "Näkymä `{{title}}` poistettu onnistuneesti"
},
"sso": {
"account": "Tili",
diff --git a/web/src/locales/fr.json b/web/src/locales/fr.json
index 864978054..a72703a49 100644
--- a/web/src/locales/fr.json
+++ b/web/src/locales/fr.json
@@ -65,6 +65,7 @@
"last-updated-at": "Dernière mise à jour le",
"learn-more": "En savoir plus",
"link": "Lien",
+ "manage": "Gérer",
"map": "Carte",
"mark": "Marquer",
"memo": "Memo",
@@ -95,8 +96,6 @@
"select": "Sélectionner",
"settings": "Paramètres",
"share": "Partager",
- "shortcut-filter": "Filtre de raccourcis",
- "shortcuts": "Raccourcis",
"sign-in": "Connexion",
"sign-in-with": "Se connecter avec {{provider}}",
"sign-out": "Déconnexion",
@@ -114,6 +113,7 @@
"username": "Nom d'utilisateur",
"version": "Version",
"visibility": "Visibilité",
+ "views": "Vues",
"yourself": "Vous-même",
"empty-placeholder": "Vide",
"unlink": "Dissocier"
@@ -454,9 +454,9 @@
"memo-defaults-title": "Valeurs par défaut du mémo",
"theme-description": "Applique immédiatement le thème sélectionné sur cet appareil."
},
- "shortcut": {
- "delete-confirm": "Êtes-vous sûr de vouloir supprimer le raccourci `{{title}}` ?",
- "delete-success": "Raccourci `{{title}}` supprimé avec succès"
+ "memo-view": {
+ "delete-confirm": "Êtes-vous sûr de vouloir supprimer la vue `{{title}}` ?",
+ "delete-success": "Vue `{{title}}` supprimée avec succès"
},
"sso": {
"authorization-endpoint": "Point de terminaison d'autorisation",
diff --git a/web/src/locales/gl.json b/web/src/locales/gl.json
index 10310e00b..f407c53d5 100644
--- a/web/src/locales/gl.json
+++ b/web/src/locales/gl.json
@@ -65,6 +65,7 @@
"last-updated-at": "Última actualización",
"learn-more": "Saber máis",
"link": "Ligar",
+ "manage": "Xestionar",
"map": "Map",
"mark": "Marcar",
"memo": "Memo",
@@ -95,8 +96,6 @@
"select": "Seleccionar",
"settings": "Axustes",
"share": "Compartir",
- "shortcut-filter": "Filtrar co atallo",
- "shortcuts": "Atallos",
"sign-in": "Acceder",
"sign-in-with": "Acceder con {{provider}}",
"sign-out": "Fechar sesión",
@@ -114,6 +113,7 @@
"username": "Identificador",
"version": "Versión",
"visibility": "Visibilidade",
+ "views": "Vistas",
"yourself": "Ti",
"empty-placeholder": "Baleiro",
"unlink": "Desvincular"
@@ -454,9 +454,9 @@
"memo-defaults-title": "Valores predeterminados da nota",
"theme-description": "Aplica o tema seleccionado inmediatamente neste dispositivo."
},
- "shortcut": {
- "delete-confirm": "Tes certeza de querer eliminar o atallo `{{title}}`?",
- "delete-success": "Eliminouse correctamente o atallo `{{title}}`"
+ "memo-view": {
+ "delete-confirm": "Tes certeza de querer eliminar a vista `{{title}}`?",
+ "delete-success": "Eliminouse correctamente a vista `{{title}}`"
},
"sso": {
"authorization-endpoint": "Punto de acceso para autorización",
diff --git a/web/src/locales/hi.json b/web/src/locales/hi.json
index a3247e207..01e34e18a 100644
--- a/web/src/locales/hi.json
+++ b/web/src/locales/hi.json
@@ -64,6 +64,7 @@
"last-updated-at": "अंतिम अपडेट",
"learn-more": "अधिक जानें",
"link": "लिंक",
+ "manage": "प्रबंधित करें",
"map": "नक्शा",
"mark": "चिह्नित",
"memo": "मेमो",
@@ -94,8 +95,6 @@
"select": "चयन करें",
"settings": "सेटिंग्स",
"share": "साझा करें",
- "shortcut-filter": "शॉर्टकट फ़िल्टर",
- "shortcuts": "शॉर्टकट्स",
"sign-in": "साइन इन करें",
"sign-in-with": "{{provider}} के साथ साइन इन करें",
"sign-out": "साइन आउट करें",
@@ -113,6 +112,7 @@
"username": "उपयोगकर्ता नाम",
"version": "संस्करण",
"visibility": "दृश्यता",
+ "views": "दृश्य",
"yourself": "खुद"
},
"locale-picker": {
@@ -333,9 +333,9 @@
"theme": "थीम",
"label": "प्राथमिकता"
},
- "shortcut": {
- "delete-confirm": "क्या आप वाकई शॉर्टकट `{{title}}` हटाना चाहते हैं?",
- "delete-success": "शॉर्टकट `{{title}}` सफलतापूर्वक हटाया गया"
+ "memo-view": {
+ "delete-confirm": "क्या आप वाकई दृश्य `{{title}}` हटाना चाहते हैं?",
+ "delete-success": "दृश्य `{{title}}` सफलतापूर्वक हटाया गया"
},
"sso": {
"authorization-endpoint": "प्राधिकरण एंडपॉइंट",
diff --git a/web/src/locales/hr.json b/web/src/locales/hr.json
index b0a7ef99a..072bc8f02 100644
--- a/web/src/locales/hr.json
+++ b/web/src/locales/hr.json
@@ -65,6 +65,7 @@
"last-updated-at": "Zadnje ažurirano",
"learn-more": "Nauči više",
"link": "Link",
+ "manage": "Upravljaj",
"map": "Karta",
"mark": "Označi",
"memo": "Memo",
@@ -95,8 +96,6 @@
"select": "Odaberi",
"settings": "Postavke",
"share": "Podijeli",
- "shortcut-filter": "Filter prečaca",
- "shortcuts": "Prečaci",
"sign-in": "Prijavi se",
"sign-in-with": "Prijavi se s {{provider}}",
"sign-out": "Odjavi se",
@@ -114,6 +113,7 @@
"username": "Korisničko ime",
"version": "Verzija",
"visibility": "Vidljivost",
+ "views": "Prikazi",
"yourself": "Ti",
"empty-placeholder": "Prazan",
"unlink": "Prekini vezu"
@@ -454,9 +454,9 @@
"memo-defaults-title": "Zadane postavke bilješke",
"theme-description": "Odmah primjenjuje odabranu temu na ovom uređaju."
},
- "shortcut": {
- "delete-confirm": "Jesi li siguran da želiš obrisati prečac `{{title}}`?",
- "delete-success": "Prečac `{{title}}` uspješno obrisan"
+ "memo-view": {
+ "delete-confirm": "Jesi li siguran da želiš obrisati prikaz `{{title}}`?",
+ "delete-success": "Prikaz `{{title}}` uspješno obrisan"
},
"sso": {
"authorization-endpoint": "Krajnja točka autorizacije",
diff --git a/web/src/locales/hu.json b/web/src/locales/hu.json
index db9ca3f6f..debe1a58b 100644
--- a/web/src/locales/hu.json
+++ b/web/src/locales/hu.json
@@ -65,6 +65,7 @@
"last-updated-at": "Utoljára frissítve",
"learn-more": "További információ",
"link": "Hivatkozás",
+ "manage": "Kezelés",
"map": "Térkép",
"mark": "Megjelölés",
"memo": "Jegyzet",
@@ -95,8 +96,6 @@
"select": "Kijelölés",
"settings": "Beállítások",
"share": "Megosztás",
- "shortcut-filter": "Gyorsbillentyű szűrő",
- "shortcuts": "Gyorsbillentyűk",
"sign-in": "Bejelentkezés",
"sign-in-with": "Bejelentkezés {{provider}} használatával",
"sign-out": "Kijelentkezés",
@@ -114,6 +113,7 @@
"username": "Felhasználónév",
"version": "Verzió",
"visibility": "Láthatóság",
+ "views": "Nézetek",
"yourself": "Magad",
"empty-placeholder": "Üres",
"unlink": "Leválasztás"
@@ -454,9 +454,9 @@
"memo-defaults-title": "A jegyzet alapbeállításai",
"theme-description": "Azonnal alkalmazza a kiválasztott témát ezen az eszközön."
},
- "shortcut": {
- "delete-confirm": "Biztosan törlöd a `{{title}}` gyorsbillentyűt?",
- "delete-success": "`{{title}}` gyorsbillentyű sikeresen törölve"
+ "memo-view": {
+ "delete-confirm": "Biztosan törlöd a `{{title}}` nézetet?",
+ "delete-success": "`{{title}}` nézet sikeresen törölve"
},
"sso": {
"authorization-endpoint": "Hitelesítési végpont",
diff --git a/web/src/locales/id.json b/web/src/locales/id.json
index 571094581..8fefeba53 100644
--- a/web/src/locales/id.json
+++ b/web/src/locales/id.json
@@ -64,6 +64,7 @@
"last-updated-at": "Terakhir diperbarui pada",
"learn-more": "Pelajari lebih lanjut",
"link": "Tautan",
+ "manage": "Kelola",
"map": "Peta",
"mark": "Tandai",
"memo": "Memo",
@@ -94,8 +95,6 @@
"select": "Pilih",
"settings": "Pengaturan",
"share": "Bagikan",
- "shortcut-filter": "Saring pintasan",
- "shortcuts": "Pintasan",
"sign-in": "Masuk",
"sign-in-with": "Masuk dengan {{provider}}",
"sign-out": "Keluar",
@@ -113,6 +112,7 @@
"username": "Nama pengguna",
"version": "Versi",
"visibility": "Visibilitas",
+ "views": "Tampilan",
"yourself": "Anda sendiri"
},
"locale-picker": {
@@ -333,9 +333,9 @@
"theme": "Tema",
"label": "Preferensi"
},
- "shortcut": {
- "delete-confirm": "Apakah Anda yakin ingin menghapus pintasan `{{title}}`?",
- "delete-success": "Pintasan `{{title}}` berhasil dihapus"
+ "memo-view": {
+ "delete-confirm": "Apakah Anda yakin ingin menghapus tampilan `{{title}}`?",
+ "delete-success": "Tampilan `{{title}}` berhasil dihapus"
},
"sso": {
"authorization-endpoint": "Akhir Otorisasi",
diff --git a/web/src/locales/it.json b/web/src/locales/it.json
index 6253fecdf..92e51370f 100644
--- a/web/src/locales/it.json
+++ b/web/src/locales/it.json
@@ -65,6 +65,7 @@
"last-updated-at": "Ultimo aggiornamento",
"learn-more": "Scopri di più",
"link": "Link",
+ "manage": "Gestisci",
"map": "Mappa",
"mark": "Cita",
"memo": "Memo",
@@ -95,8 +96,6 @@
"select": "Seleziona",
"settings": "Impostazioni",
"share": "Condividi",
- "shortcut-filter": "Filtro scorciatoie",
- "shortcuts": "Scorciatoie",
"sign-in": "Accedi",
"sign-in-with": "Accedi con {{provider}}",
"sign-out": "Esci",
@@ -114,6 +113,7 @@
"username": "Nome utente",
"version": "Versione",
"visibility": "Visibilità",
+ "views": "Viste",
"yourself": "Te stesso",
"empty-placeholder": "Vuota",
"unlink": "Scollega"
@@ -454,9 +454,9 @@
"memo-defaults-title": "Impostazioni predefinite del promemoria",
"theme-description": "Applica immediatamente il tema selezionato su questo dispositivo."
},
- "shortcut": {
- "delete-confirm": "Confermi di voler eliminare la scorciatoia `{{title}}`?",
- "delete-success": "Scorciatoia `{{title}}` eliminata con successo"
+ "memo-view": {
+ "delete-confirm": "Confermi di voler eliminare la vista `{{title}}`?",
+ "delete-success": "Vista `{{title}}` eliminata con successo"
},
"sso": {
"authorization-endpoint": "Endpoint autorizzazione",
diff --git a/web/src/locales/ja.json b/web/src/locales/ja.json
index 784d34518..19d8c8dee 100644
--- a/web/src/locales/ja.json
+++ b/web/src/locales/ja.json
@@ -100,6 +100,7 @@
"learn-more": "さらに詳しく",
"link": "リンク",
"location": "場所",
+ "manage": "管理",
"map": "マップ",
"mark": "マーク",
"memo": "メモ",
@@ -134,8 +135,6 @@
"select": "選択",
"settings": "設定",
"share": "共有する",
- "shortcut-filter": "ショートカットフィルター",
- "shortcuts": "ショートカット",
"sign-in": "サインイン",
"sign-in-to-memos": "Memosにサインイン",
"sign-out": "サインアウト",
@@ -542,9 +541,9 @@
"memo-defaults-title": "メモのデフォルト",
"theme-description": "選択したテーマをこのデバイスにすぐに適用します。"
},
- "shortcut": {
- "delete-confirm": "ショートカット `{{title}}` を削除してもよろしいですか?",
- "delete-success": "ショートカット `{{title}}` を削除しました"
+ "memo-view": {
+ "delete-confirm": "ビュー `{{title}}` を削除してもよろしいですか?",
+ "delete-success": "ビュー `{{title}}` を削除しました"
},
"sso": {
"authorization-endpoint": "認証エンドポイント",
diff --git a/web/src/locales/ka-GE.json b/web/src/locales/ka-GE.json
index ea801c8a5..7fcdbdd24 100644
--- a/web/src/locales/ka-GE.json
+++ b/web/src/locales/ka-GE.json
@@ -65,6 +65,7 @@
"last-updated-at": "ბოლო განახლება",
"learn-more": "გაიგეთ მეტი",
"link": "ლინკი",
+ "manage": "მართვა",
"map": "რუკა",
"mark": "მონიშვნა",
"memo": "მემო",
@@ -95,8 +96,6 @@
"select": "არჩევა",
"settings": "პარამეტრები",
"share": "გაზიარება",
- "shortcut-filter": "მოკლე გზების ფილტრი",
- "shortcuts": "მოკლე გზები",
"sign-in": "შესვლა",
"sign-in-with": "შედით {{provider}}-ით",
"sign-out": "გამოსვლა",
@@ -114,6 +113,7 @@
"username": "მომხმარებლის სახელი",
"version": "ვერსია",
"visibility": "ხილვადობა",
+ "views": "ხედები",
"yourself": "თქვენ",
"empty-placeholder": "ცარიელი",
"unlink": "გაუქმება"
@@ -454,9 +454,9 @@
"memo-defaults-title": "Memo ნაგულისხმევი",
"theme-description": "არჩეულ თემას დაუყოვნებლივ იყენებს ამ მოწყობილობაზე."
},
- "shortcut": {
- "delete-confirm": "დარწმუნებული ხართ, რომ გინდათ მოკლე გზის `{{title}}` წაშლა?",
- "delete-success": "მოკლე გზა `{{title}}` წარმატებით წაიშალა"
+ "memo-view": {
+ "delete-confirm": "დარწმუნებული ხართ, რომ გინდათ ხედის `{{title}}` წაშლა?",
+ "delete-success": "ხედი `{{title}}` წარმატებით წაიშალა"
},
"sso": {
"authorization-endpoint": "ავტორიზაციის წერტილი",
diff --git a/web/src/locales/ko.json b/web/src/locales/ko.json
index 75785987a..055369b7f 100644
--- a/web/src/locales/ko.json
+++ b/web/src/locales/ko.json
@@ -64,6 +64,7 @@
"last-updated-at": "마지막 수정일",
"learn-more": "더 보기",
"link": "링크",
+ "manage": "관리",
"map": "지도",
"mark": "연결",
"memo": "메모",
@@ -94,8 +95,6 @@
"select": "선택",
"settings": "설정",
"share": "공유",
- "shortcut-filter": "단축키 필터",
- "shortcuts": "단축키",
"sign-in": "로그인",
"sign-in-with": "{{provider}}(으)로 로그인",
"sign-out": "로그아웃",
@@ -113,6 +112,7 @@
"username": "유저네임",
"version": "버전",
"visibility": "공개 범위",
+ "views": "보기",
"yourself": "자기 자신"
},
"locale-picker": {
@@ -333,9 +333,9 @@
"theme": "테마",
"label": "개인 설정"
},
- "shortcut": {
- "delete-confirm": "바로가기 `{{title}}`를 정말로 삭제하시겠습니까?",
- "delete-success": "바로가기 `{{title}}`가 성공적으로 삭제되었습니다"
+ "memo-view": {
+ "delete-confirm": "보기 `{{title}}`를 정말로 삭제하시겠습니까?",
+ "delete-success": "보기 `{{title}}`가 성공적으로 삭제되었습니다"
},
"sso": {
"authorization-endpoint": "인증 엔드포인트",
diff --git a/web/src/locales/lt.json b/web/src/locales/lt.json
index f7851b9ff..7e8f7b0a6 100644
--- a/web/src/locales/lt.json
+++ b/web/src/locales/lt.json
@@ -103,6 +103,7 @@
"last-updated-at": "Paskutinį kartą atnaujinta",
"learn-more": "Sužinokite daugiau",
"link": "Nuoroda",
+ "manage": "Tvarkyti",
"map": "Žemėlapis",
"mark": "Pažymėti",
"memo": "Atmintinė",
@@ -133,8 +134,6 @@
"select": "Pasirinkite",
"settings": "Nustatymai",
"share": "Dalintis",
- "shortcut-filter": "Nuorodų filtras",
- "shortcuts": "Spartieji klavišai",
"sign-in": "Prisijunkite",
"sign-in-with": "Prisijunkite naudodami {{provider}}",
"sign-out": "Atsijungti",
@@ -153,6 +152,7 @@
"username": "Vartotojo vardas",
"version": "Versija",
"visibility": "Matomumas",
+ "views": "Rodiniai",
"yourself": "save"
},
"locale-picker": {
@@ -571,9 +571,9 @@
"theme-description": "Šiame įrenginyje iš karto pritaiko pasirinktą temą.",
"theme": "tema"
},
- "shortcut": {
- "delete-confirm": "Ar tikrai norite ištrinti spartųjį klavišą `{{title}}`?",
- "delete-success": "Spartusis klavišas `{{title}}` sėkmingai ištrintas"
+ "memo-view": {
+ "delete-confirm": "Ar tikrai norite ištrinti rodinį `{{title}}`?",
+ "delete-success": "Rodinys `{{title}}` sėkmingai ištrintas"
},
"sso": {
"account": "sąskaita",
diff --git a/web/src/locales/lv.json b/web/src/locales/lv.json
index d70311439..fb1ae8b61 100644
--- a/web/src/locales/lv.json
+++ b/web/src/locales/lv.json
@@ -103,6 +103,7 @@
"last-updated-at": "Pēdējo reizi atjaunināts plkst",
"learn-more": "Uzziniet vairāk",
"link": "Saite",
+ "manage": "Pārvaldīt",
"map": "Karte",
"mark": "Atzīmēt",
"memo": "Piezīme",
@@ -133,8 +134,6 @@
"select": "Izvēlieties",
"settings": "Iestatījumi",
"share": "Dalīties",
- "shortcut-filter": "Īsceļu filtrs",
- "shortcuts": "Īsceļi",
"sign-in": "Pierakstīties",
"sign-in-with": "Pierakstieties ar {{provider}}",
"sign-out": "Izrakstīties",
@@ -153,6 +152,7 @@
"username": "Lietotājvārds",
"version": "Versija",
"visibility": "Redzamība",
+ "views": "Skati",
"yourself": "sevi"
},
"locale-picker": {
@@ -571,9 +571,9 @@
"theme-description": "Šajā ierīcē nekavējoties tiek lietots atlasītais motīvs.",
"theme": "Tēma"
},
- "shortcut": {
- "delete-confirm": "Vai tiešām vēlaties dzēst saīsni `{{title}}`?",
- "delete-success": "Īsceļš `{{title}}` veiksmīgi izdzēsts"
+ "memo-view": {
+ "delete-confirm": "Vai tiešām vēlaties dzēst skatu `{{title}}`?",
+ "delete-success": "Skats `{{title}}` veiksmīgi izdzēsts"
},
"sso": {
"account": "Konts",
diff --git a/web/src/locales/mr.json b/web/src/locales/mr.json
index d41d06600..5d1f63c52 100644
--- a/web/src/locales/mr.json
+++ b/web/src/locales/mr.json
@@ -64,6 +64,7 @@
"last-updated-at": "शेवटचे अद्यतन",
"learn-more": "अधिक जाणून घ्या",
"link": "लिंक",
+ "manage": "व्यवस्थापित करा",
"map": "नकाशा",
"mark": "खूण",
"memo": "मेमो",
@@ -94,8 +95,6 @@
"select": "निवडा",
"settings": "सेटिंग्ज",
"share": "शेअर करा",
- "shortcut-filter": "शॉर्टकट फिल्टर",
- "shortcuts": "शॉर्टकट्स",
"sign-in": "साइन इन करा",
"sign-in-with": "{{provider}} सह साइन इन करा",
"sign-out": "साइन आउट करा",
@@ -113,6 +112,7 @@
"username": "वापरकर्तानाव",
"version": "आवृत्ती",
"visibility": "दृश्यमानता",
+ "views": "दृश्ये",
"yourself": "स्वतः"
},
"locale-picker": {
@@ -333,9 +333,9 @@
"theme": "थीम",
"label": "प्राधान्ये"
},
- "shortcut": {
- "delete-confirm": "तुम्हाला शॉर्टकट `{{title}}` हटवायची खात्री आहे का?",
- "delete-success": "शॉर्टकट `{{title}}` यशस्वीरित्या हटवले"
+ "memo-view": {
+ "delete-confirm": "तुम्हाला दृश्य `{{title}}` हटवायचे आहे याची खात्री आहे का?",
+ "delete-success": "दृश्य `{{title}}` यशस्वीरित्या हटवले"
},
"sso": {
"authorization-endpoint": "अधिकृतता एन्डपाॅंइन्ट",
diff --git a/web/src/locales/nb.json b/web/src/locales/nb.json
index 51d92d057..70c309307 100644
--- a/web/src/locales/nb.json
+++ b/web/src/locales/nb.json
@@ -65,6 +65,7 @@
"last-updated-at": "Sist oppdatert",
"learn-more": "Lær mer",
"link": "Link",
+ "manage": "Administrer",
"map": "Kart",
"mark": "Merk",
"memo": "Memo",
@@ -95,8 +96,6 @@
"select": "Velg",
"settings": "Innstillinger",
"share": "Del",
- "shortcut-filter": "Snarveifilter",
- "shortcuts": "Snarveier",
"sign-in": "Logg inn",
"sign-in-with": "Logg inn med {{provider}}",
"sign-out": "Logg ut",
@@ -114,6 +113,7 @@
"username": "Brukernavn",
"version": "Versjon",
"visibility": "Synlighet",
+ "views": "Visninger",
"yourself": "Deg selv",
"empty-placeholder": "Tømme",
"unlink": "Fjern tilknytningen"
@@ -454,9 +454,9 @@
"memo-defaults-title": "Memo standarder",
"theme-description": "Bruker det valgte temaet umiddelbart på denne enheten."
},
- "shortcut": {
- "delete-confirm": "Er du sikker på at du vil slette snarveien `{{title}}`?",
- "delete-success": "Snarvei `{{title}}` slettet vellykket"
+ "memo-view": {
+ "delete-confirm": "Er du sikker på at du vil slette visningen `{{title}}`?",
+ "delete-success": "Visning `{{title}}` slettet vellykket"
},
"sso": {
"authorization-endpoint": "Autorisasjon endepunkt",
diff --git a/web/src/locales/nl.json b/web/src/locales/nl.json
index 29c66e3f4..8d2228aca 100644
--- a/web/src/locales/nl.json
+++ b/web/src/locales/nl.json
@@ -65,6 +65,7 @@
"last-updated-at": "Laatst bijgewerkt op",
"learn-more": "Meer informatie",
"link": "Link",
+ "manage": "Beheren",
"map": "Kaart",
"mark": "Markeren",
"memo": "Memo",
@@ -95,8 +96,6 @@
"select": "Selecteren",
"settings": "Instellingen",
"share": "Delen",
- "shortcut-filter": "Sneltoetsfilter",
- "shortcuts": "Sneltoetsen",
"sign-in": "Inloggen",
"sign-in-with": "Inloggen met {{provider}}",
"sign-out": "Uitloggen",
@@ -114,6 +113,7 @@
"username": "Gebruikersnaam",
"version": "Versie",
"visibility": "Zichtbaarheid",
+ "views": "Weergaven",
"yourself": "Jijzelf",
"empty-placeholder": "Leeg",
"unlink": "Ontkoppelen"
@@ -454,9 +454,9 @@
"memo-defaults-title": "Standaardinstellingen voor memo's",
"theme-description": "Past het geselecteerde thema onmiddellijk toe op dit apparaat."
},
- "shortcut": {
- "delete-confirm": "Weet je zeker dat je sneltoets `{{title}}` wilt verwijderen?",
- "delete-success": "Sneltoets `{{title}}` succesvol verwijderd"
+ "memo-view": {
+ "delete-confirm": "Weet je zeker dat je weergave `{{title}}` wilt verwijderen?",
+ "delete-success": "Weergave `{{title}}` succesvol verwijderd"
},
"sso": {
"authorization-endpoint": "Autorisatie-eindpunt",
diff --git a/web/src/locales/pl.json b/web/src/locales/pl.json
index 5f54d312b..ac093a181 100644
--- a/web/src/locales/pl.json
+++ b/web/src/locales/pl.json
@@ -65,6 +65,7 @@
"last-updated-at": "Ostatnia aktualizacja",
"learn-more": "Dowiedz się więcej",
"link": "Link",
+ "manage": "Zarządzaj",
"map": "Mapa",
"mark": "Oznacz",
"memo": "Notatka",
@@ -95,8 +96,6 @@
"select": "Wybierz",
"settings": "Ustawienia",
"share": "Udostępnij",
- "shortcut-filter": "Filtr skrótów",
- "shortcuts": "Skróty",
"sign-in": "Zaloguj się",
"sign-in-with": "Zaloguj się za pomocą {{provider}}",
"sign-out": "Wyloguj się",
@@ -114,6 +113,7 @@
"username": "Nazwa użytkownika",
"version": "Wersja",
"visibility": "Widoczność",
+ "views": "Widoki",
"yourself": "Ty sam",
"empty-placeholder": "Pusty",
"unlink": "Odczepić"
@@ -473,9 +473,9 @@
"memo-defaults-title": "Domyślne ustawienia notatki",
"theme-description": "Natychmiast stosuje wybrany motyw na tym urządzeniu."
},
- "shortcut": {
- "delete-confirm": "Czy na pewno chcesz usunąć skrót `{{title}}`?",
- "delete-success": "Skrót `{{title}}` usunięty pomyślnie"
+ "memo-view": {
+ "delete-confirm": "Czy na pewno chcesz usunąć widok `{{title}}`?",
+ "delete-success": "Widok `{{title}}` usunięty pomyślnie"
},
"sso": {
"authorization-endpoint": "Endpoint autoryzacji",
diff --git a/web/src/locales/pt-BR.json b/web/src/locales/pt-BR.json
index 8a359d40d..a00ea375b 100644
--- a/web/src/locales/pt-BR.json
+++ b/web/src/locales/pt-BR.json
@@ -64,6 +64,7 @@
"last-updated-at": "Atualizado em",
"learn-more": "Saiba mais",
"link": "Link",
+ "manage": "Gerenciar",
"map": "Mapa",
"mark": "Vincular",
"memo": "Memo",
@@ -94,8 +95,6 @@
"select": "Selecionar",
"settings": "Ajustes",
"share": "Compartilhar",
- "shortcut-filter": "Filtro de atalhos",
- "shortcuts": "Atalhos",
"sign-in": "Entrar",
"sign-in-with": "Entrar com {{provider}}",
"sign-out": "Sair",
@@ -113,6 +112,7 @@
"username": "Nome de usuário",
"version": "Versão",
"visibility": "Visibilidade",
+ "views": "Vistas",
"yourself": "Você mesmo"
},
"locale-picker": {
@@ -333,9 +333,9 @@
"theme": "Tema",
"label": "Preferências"
},
- "shortcut": {
- "delete-confirm": "Tem certeza de que deseja deletar o atalho `{{title}}`?",
- "delete-success": "Atalho `{{title}}` deletado com êxito"
+ "memo-view": {
+ "delete-confirm": "Tem certeza de que deseja excluir a vista `{{title}}`?",
+ "delete-success": "Vista `{{title}}` excluída com sucesso"
},
"sso": {
"authorization-endpoint": "Endpoint de autenticação",
diff --git a/web/src/locales/pt-PT.json b/web/src/locales/pt-PT.json
index 35438a65f..17e7fbf48 100644
--- a/web/src/locales/pt-PT.json
+++ b/web/src/locales/pt-PT.json
@@ -65,6 +65,7 @@
"last-updated-at": "Última atualização em",
"learn-more": "Saiba mais",
"link": "Link",
+ "manage": "Gerir",
"map": "Mapa",
"mark": "Marcar",
"memo": "Memo",
@@ -95,8 +96,6 @@
"select": "Selecionar",
"settings": "Definições",
"share": "Partilhar",
- "shortcut-filter": "Filtro de atalho",
- "shortcuts": "Atalhos",
"sign-in": "Iniciar sessão",
"sign-in-with": "Iniciar sessão com {{provider}}",
"sign-out": "Terminar sessão",
@@ -114,6 +113,7 @@
"username": "Nome de utilizador",
"version": "Versão",
"visibility": "Visibilidade",
+ "views": "Vistas",
"yourself": "Você próprio",
"empty-placeholder": "Vazia",
"unlink": "Desvincular"
@@ -454,9 +454,9 @@
"memo-defaults-title": "Padrões de memorando",
"theme-description": "Aplica o tema selecionado imediatamente neste dispositivo."
},
- "shortcut": {
- "delete-confirm": "Tem a certeza de que deseja eliminar o atalho `{{title}}`?",
- "delete-success": "Atalho `{{title}}` eliminado com sucesso"
+ "memo-view": {
+ "delete-confirm": "Tem a certeza de que deseja eliminar a vista `{{title}}`?",
+ "delete-success": "Vista `{{title}}` eliminada com sucesso"
},
"sso": {
"authorization-endpoint": "Ponto de Autorização",
diff --git a/web/src/locales/ro.json b/web/src/locales/ro.json
index 3badc855a..e03678f87 100644
--- a/web/src/locales/ro.json
+++ b/web/src/locales/ro.json
@@ -103,6 +103,7 @@
"last-updated-at": "Ultima actualizare la",
"learn-more": "Află mai multe",
"link": "Legătură",
+ "manage": "Gestionează",
"map": "Hartă",
"mark": "Marca",
"memo": "Notă",
@@ -133,8 +134,6 @@
"select": "Selecta",
"settings": "Setări",
"share": "Distribuie",
- "shortcut-filter": "Filtru de comenzi rapide",
- "shortcuts": "Comenzi rapide",
"sign-in": "Conectare",
"sign-in-with": "Conectați-vă cu {{provider}}",
"sign-out": "Sign out",
@@ -153,6 +152,7 @@
"username": "Nume de utilizator",
"version": "Versiune",
"visibility": "Vizibilitate",
+ "views": "Vizualizări",
"yourself": "Te"
},
"locale-picker": {
@@ -571,9 +571,9 @@
"theme-description": "Aplică tema selectată imediat pe acest dispozitiv.",
"theme": "Temă"
},
- "shortcut": {
- "delete-confirm": "Sigur doriți să ștergeți comanda rapidă `{{title}}`?",
- "delete-success": "Comanda rapidă `{{title}}` a fost ștearsă cu succes"
+ "memo-view": {
+ "delete-confirm": "Sigur doriți să ștergeți vizualizarea `{{title}}`?",
+ "delete-success": "Vizualizarea `{{title}}` a fost ștearsă cu succes"
},
"sso": {
"account": "Cont",
diff --git a/web/src/locales/ru.json b/web/src/locales/ru.json
index 09b23a314..9409bb5ea 100644
--- a/web/src/locales/ru.json
+++ b/web/src/locales/ru.json
@@ -65,6 +65,7 @@
"last-updated-at": "Изменено",
"learn-more": "Узнать больше",
"link": "Ссылка",
+ "manage": "Управление",
"map": "Карта",
"mark": "Связать",
"memo": "Заметка",
@@ -95,8 +96,6 @@
"select": "Выбрать",
"settings": "Настройки",
"share": "Поделиться",
- "shortcut-filter": "Условие отбора",
- "shortcuts": "Ярлыки",
"sign-in": "Войти",
"sign-in-with": "Войти через {{provider}}",
"sign-out": "Выйти",
@@ -114,6 +113,7 @@
"username": "Имя пользователя",
"version": "Версия",
"visibility": "Видимость",
+ "views": "Представления",
"yourself": "Вы",
"empty-placeholder": "Пустой",
"unlink": "Отсоединить"
@@ -454,9 +454,9 @@
"memo-defaults-title": "Памятка по умолчанию",
"theme-description": "Немедленно применяет выбранную тему на этом устройстве."
},
- "shortcut": {
- "delete-confirm": "Вы уверены, что хотите удалить ярлык `{{title}}`?",
- "delete-success": "Ярлык `{{title}}` успешно удален"
+ "memo-view": {
+ "delete-confirm": "Вы уверены, что хотите удалить представление `{{title}}`?",
+ "delete-success": "Представление `{{title}}` успешно удалено"
},
"sso": {
"authorization-endpoint": "Конечная точка авторизации",
diff --git a/web/src/locales/sk.json b/web/src/locales/sk.json
index 1fe6110c8..2555ecf11 100644
--- a/web/src/locales/sk.json
+++ b/web/src/locales/sk.json
@@ -103,6 +103,7 @@
"last-updated-at": "Naposledy aktualizované o",
"learn-more": "Zistite viac",
"link": "Odkaz",
+ "manage": "Spravovať",
"map": "Mapa",
"mark": "Marka",
"memo": "Memo",
@@ -133,8 +134,6 @@
"select": "Vyberte",
"settings": "Nastavenia",
"share": "zdieľať",
- "shortcut-filter": "Filter skratiek",
- "shortcuts": "Skratky",
"sign-in": "Prihláste sa",
"sign-in-with": "Prihláste sa pomocou {{provider}}",
"sign-out": "Odhláste sa",
@@ -153,6 +152,7 @@
"username": "Používateľské meno",
"version": "Verzia",
"visibility": "Viditeľnosť",
+ "views": "Zobrazenia",
"yourself": "seba"
},
"locale-picker": {
@@ -571,9 +571,9 @@
"theme-description": "Ihneď použije vybratú tému na tomto zariadení.",
"theme": "Téma"
},
- "shortcut": {
- "delete-confirm": "Naozaj chcete odstrániť skratku `{{title}}`?",
- "delete-success": "Skratka `{{title}}` bola úspešne odstránená"
+ "memo-view": {
+ "delete-confirm": "Naozaj chcete odstrániť zobrazenie `{{title}}`?",
+ "delete-success": "Zobrazenie `{{title}}` bolo úspešne odstránené"
},
"sso": {
"account": "účtu",
diff --git a/web/src/locales/sl.json b/web/src/locales/sl.json
index d84060f57..bd1109fe3 100644
--- a/web/src/locales/sl.json
+++ b/web/src/locales/sl.json
@@ -65,6 +65,7 @@
"last-updated-at": "Zadnja posodobitev",
"learn-more": "Spoznaj več",
"link": "Povezava",
+ "manage": "Upravljaj",
"map": "Zemljevid",
"mark": "Označi",
"memo": "Beležka",
@@ -95,8 +96,6 @@
"select": "Izberi",
"settings": "Nastavitve",
"share": "Deli",
- "shortcut-filter": "Filter bližnjic",
- "shortcuts": "Bližnjice",
"sign-in": "Prijavi se",
"sign-in-with": "Prijavi se z {{provider}}",
"sign-out": "Odjavi se",
@@ -114,6 +113,7 @@
"username": "Uporabniško ime",
"version": "Verzija",
"visibility": "Vidnost",
+ "views": "Pogledi",
"yourself": "Ti",
"empty-placeholder": "prazno",
"unlink": "Prekini povezavo"
@@ -454,9 +454,9 @@
"memo-defaults-title": "Privzete nastavitve beležke",
"theme-description": "Izbrano temo takoj uporabi v tej napravi."
},
- "shortcut": {
- "delete-confirm": "Ali ste prepričani, da želite izbrisati bližnjico \"{{title}}\"?",
- "delete-success": "Bližnjica \"{{title}}\" je uspešno izbrisana"
+ "memo-view": {
+ "delete-confirm": "Ali ste prepričani, da želite izbrisati pogled \"{{title}}\"?",
+ "delete-success": "Pogled \"{{title}}\" je uspešno izbrisan"
},
"sso": {
"authorization-endpoint": "Končna točka avtorizacije",
diff --git a/web/src/locales/sr.json b/web/src/locales/sr.json
index eb0c5651e..ff2b65d03 100644
--- a/web/src/locales/sr.json
+++ b/web/src/locales/sr.json
@@ -103,6 +103,7 @@
"last-updated-at": "Последњи пут ажурирано у",
"learn-more": "Сазнајте више",
"link": "Линк",
+ "manage": "Управљај",
"map": "Мапа",
"mark": "Марк",
"memo": "Мемо",
@@ -133,8 +134,6 @@
"select": "Изаберите",
"settings": "Подешавања",
"share": "Схаре",
- "shortcut-filter": "Филтер пречица",
- "shortcuts": "Пречице",
"sign-in": "Пријавите се",
"sign-in-with": "Пријавите се са {{provider}}",
"sign-out": "Одјави се",
@@ -153,6 +152,7 @@
"username": "Корисничко име",
"version": "Версион",
"visibility": "Видљивост",
+ "views": "Прикази",
"yourself": "Себе"
},
"locale-picker": {
@@ -571,9 +571,9 @@
"theme-description": "Одмах примењује изабрану тему на овом уређају.",
"theme": "Тема"
},
- "shortcut": {
- "delete-confirm": "Да ли сте сигурни да желите да избришете пречицу `{{title}}`?",
- "delete-success": "Пречица `{{title}}` је успешно избрисана"
+ "memo-view": {
+ "delete-confirm": "Да ли сте сигурни да желите да избришете приказ `{{title}}`?",
+ "delete-success": "Приказ `{{title}}` је успешно избрисан"
},
"sso": {
"account": "Рачун",
diff --git a/web/src/locales/sv.json b/web/src/locales/sv.json
index c4e4a024a..cd41541c8 100644
--- a/web/src/locales/sv.json
+++ b/web/src/locales/sv.json
@@ -65,6 +65,7 @@
"last-updated-at": "Senast uppdaterad",
"learn-more": "Läs mer",
"link": "Länk",
+ "manage": "Hantera",
"map": "Karta",
"mark": "Markera",
"memo": "Anteckning",
@@ -95,8 +96,6 @@
"select": "Välj",
"settings": "Inställningar",
"share": "Dela",
- "shortcut-filter": "Genvägsfilter",
- "shortcuts": "Genvägar",
"sign-in": "Logga in",
"sign-in-with": "Logga in med {{provider}}",
"sign-out": "Logga ut",
@@ -114,6 +113,7 @@
"username": "Användarnamn",
"version": "Version",
"visibility": "Synlighet",
+ "views": "Vyer",
"yourself": "Själv",
"empty-placeholder": "Tömma",
"unlink": "Ta bort länken"
@@ -454,9 +454,9 @@
"memo-defaults-title": "Memo standardinställningar",
"theme-description": "Tillämpar det valda temat direkt på den här enheten."
},
- "shortcut": {
- "delete-confirm": "Är du säker på att du vill ta bort genvägen `{{title}}`?",
- "delete-success": "Genväg `{{title}}` raderades framgångsrikt"
+ "memo-view": {
+ "delete-confirm": "Är du säker på att du vill ta bort vyn `{{title}}`?",
+ "delete-success": "Vyn `{{title}}` raderades framgångsrikt"
},
"sso": {
"authorization-endpoint": "Auktoriseringsendpoint",
diff --git a/web/src/locales/th.json b/web/src/locales/th.json
index d2810f40c..25bf82ce5 100644
--- a/web/src/locales/th.json
+++ b/web/src/locales/th.json
@@ -64,6 +64,7 @@
"last-updated-at": "อัปเดตล่าสุดเมื่อ",
"learn-more": "เรียนรู้เพิ่มเติม",
"link": "ลิงก์",
+ "manage": "จัดการ",
"map": "แผนที่",
"mark": "ทำเครื่องหมาย",
"memo": "บันทึกช่วยจำ",
@@ -94,8 +95,6 @@
"select": "เลือก",
"settings": "ตั้งค่า",
"share": "แชร์",
- "shortcut-filter": "ตัวกรองทางลัด",
- "shortcuts": "ทางลัด",
"sign-in": "เข้าระบบ",
"sign-in-with": "เข้าระบบโดย {{provider}}",
"sign-out": "ออกจากระบบ",
@@ -113,6 +112,7 @@
"username": "ชื่อผู้ใช้",
"version": "เวอร์ชั่น",
"visibility": "การมองเห็น",
+ "views": "มุมมอง",
"yourself": "ตัวคุณ"
},
"locale-picker": {
@@ -333,9 +333,9 @@
"theme": "ธีม",
"label": "การตั้งค่า"
},
- "shortcut": {
- "delete-confirm": "คุณแน่ใจหรือไม่ที่จะลบทางลัด `{{title}}`?",
- "delete-success": "ทางลัด `{{title}}` ลบเรียบร้อยแล้ว"
+ "memo-view": {
+ "delete-confirm": "คุณแน่ใจหรือไม่ว่าต้องการลบมุมมอง `{{title}}`?",
+ "delete-success": "ลบมุมมอง `{{title}}` เรียบร้อยแล้ว"
},
"sso": {
"authorization-endpoint": "Endpoint การอนุญาต",
diff --git a/web/src/locales/tr.json b/web/src/locales/tr.json
index d2013dcb0..473f12ea9 100644
--- a/web/src/locales/tr.json
+++ b/web/src/locales/tr.json
@@ -65,6 +65,7 @@
"last-updated-at": "Son güncelleme",
"learn-more": "Daha fazla bilgi",
"link": "Bağlantı",
+ "manage": "Yönet",
"map": "Harita",
"mark": "İşaretle",
"memo": "Not",
@@ -95,8 +96,6 @@
"select": "Seç",
"settings": "Ayarlar",
"share": "Paylaş",
- "shortcut-filter": "Kısayol filtresi",
- "shortcuts": "Kısayollar",
"sign-in": "Giriş yap",
"sign-in-with": "{{provider}} ile giriş yap",
"sign-out": "Çıkış yap",
@@ -114,6 +113,7 @@
"username": "Kullanıcı adı",
"version": "Sürüm",
"visibility": "Görünürlük",
+ "views": "Görünümler",
"yourself": "Kendiniz",
"empty-placeholder": "Boş",
"unlink": "Bağlantıyı kaldır"
@@ -454,9 +454,9 @@
"memo-defaults-title": "Not varsayılanları",
"theme-description": "Seçilen temayı bu cihaza hemen uygular."
},
- "shortcut": {
- "delete-confirm": "`{{title}}` kısayolunu silmek istediğinizden emin misiniz?",
- "delete-success": "`{{title}}` kısayolu başarıyla silindi"
+ "memo-view": {
+ "delete-confirm": "`{{title}}` görünümünü silmek istediğinizden emin misiniz?",
+ "delete-success": "`{{title}}` görünümü başarıyla silindi"
},
"sso": {
"authorization-endpoint": "Yetkilendirme uç noktası",
diff --git a/web/src/locales/uk.json b/web/src/locales/uk.json
index dc23a4459..4156ab89d 100644
--- a/web/src/locales/uk.json
+++ b/web/src/locales/uk.json
@@ -65,6 +65,7 @@
"last-updated-at": "Останнє оновлення",
"learn-more": "Дізнатися більше",
"link": "Посилання",
+ "manage": "Керувати",
"map": "Мапа",
"mark": "Позначити",
"memo": "Нотатка",
@@ -95,8 +96,6 @@
"select": "Вибрати",
"settings": "Налаштування",
"share": "Поділитися",
- "shortcut-filter": "Фільтр ярликів",
- "shortcuts": "Ярлики",
"sign-in": "Увійти",
"sign-in-with": "Увійти через {{provider}}",
"sign-out": "Вийти",
@@ -114,6 +113,7 @@
"username": "Ім'я користувача",
"version": "Версія",
"visibility": "Видимість",
+ "views": "Подання",
"yourself": "Ви",
"empty-placeholder": "Порожній",
"unlink": "Від’єднати"
@@ -454,9 +454,9 @@
"memo-defaults-title": "Пам'ятки за замовчуванням",
"theme-description": "Вибрану тему негайно застосовує на цьому пристрої."
},
- "shortcut": {
- "delete-confirm": "Ви впевнені, що хочете видалити ярлик `{{title}}`?",
- "delete-success": "Ярлик `{{title}}` успішно видалено"
+ "memo-view": {
+ "delete-confirm": "Ви впевнені, що хочете видалити подання `{{title}}`?",
+ "delete-success": "Подання `{{title}}` успішно видалено"
},
"sso": {
"authorization-endpoint": "Точка авторизації",
diff --git a/web/src/locales/vi.json b/web/src/locales/vi.json
index c91d29d6f..f74ec4e05 100644
--- a/web/src/locales/vi.json
+++ b/web/src/locales/vi.json
@@ -64,6 +64,7 @@
"last-updated-at": "Cập nhật lần cuối",
"learn-more": "Tìm hiểu thêm",
"link": "Liên kết",
+ "manage": "Quản lý",
"map": "Bản đồ",
"mark": "Đánh dấu",
"memo": "Ghi chú",
@@ -94,8 +95,6 @@
"select": "Chọn",
"settings": "Cài đặt",
"share": "Chia sẻ",
- "shortcut-filter": "Bộ lọc phím tắt",
- "shortcuts": "Phím tắt",
"sign-in": "Đăng nhập",
"sign-in-with": "Đăng nhập bằng {{provider}}",
"sign-out": "Đăng xuất",
@@ -113,6 +112,7 @@
"username": "Tên người dùng",
"version": "Phiên bản",
"visibility": "Quyền xem",
+ "views": "Các chế độ xem",
"yourself": "Bản thân"
},
"locale-picker": {
@@ -333,9 +333,9 @@
"theme": "Giao diện",
"label": "Tùy chỉnh"
},
- "shortcut": {
- "delete-confirm": "Bạn có chắc chắn muốn xóa phím tắt `{{title}}`?",
- "delete-success": "Đã xóa phím tắt `{{title}}` thành công"
+ "memo-view": {
+ "delete-confirm": "Bạn có chắc chắn muốn xóa chế độ xem `{{title}}`?",
+ "delete-success": "Đã xóa chế độ xem `{{title}}` thành công"
},
"sso": {
"authorization-endpoint": "Điểm cuối xác thực",
diff --git a/web/src/locales/zh-Hans.json b/web/src/locales/zh-Hans.json
index 7b509d73a..331c0e6ab 100644
--- a/web/src/locales/zh-Hans.json
+++ b/web/src/locales/zh-Hans.json
@@ -104,6 +104,7 @@
"last-updated-at": "最后更新时间",
"learn-more": "了解更多",
"link": "链接",
+ "manage": "管理",
"map": "地图",
"mark": "引用",
"memo": "备忘录",
@@ -137,8 +138,6 @@
"select": "选择",
"settings": "设置",
"share": "分享",
- "shortcut-filter": "捷径过滤器",
- "shortcuts": "捷径",
"sign-in": "登录",
"sign-in-to-memos": "登录 Memos",
"sign-out": "退出登录",
@@ -495,9 +494,9 @@
"theme": "主题",
"label": "偏好设置"
},
- "shortcut": {
- "delete-confirm": "您确定要删除捷径 `{{title}}` 吗?",
- "delete-success": "捷径 `{{title}}` 删除成功"
+ "memo-view": {
+ "delete-confirm": "您确定要删除视图 `{{title}}` 吗?",
+ "delete-success": "视图 `{{title}}` 删除成功"
},
"sso": {
"account": "账户",
diff --git a/web/src/locales/zh-Hant.json b/web/src/locales/zh-Hant.json
index 8c52a99a0..e674a8d4c 100644
--- a/web/src/locales/zh-Hant.json
+++ b/web/src/locales/zh-Hant.json
@@ -120,6 +120,7 @@
"last-updated-at": "最後更新於",
"learn-more": "了解更多",
"link": "連結",
+ "manage": "管理",
"map": "地圖",
"mark": "標記",
"memo": "備忘錄",
@@ -153,8 +154,6 @@
"select": "選擇",
"settings": "設定",
"share": "分享",
- "shortcut-filter": "篩選條件表達式",
- "shortcuts": "快捷篩選",
"sign-in": "登入",
"sign-in-to-memos": "登入 Memos",
"sign-in-with": "使用 {{provider}} 登入",
@@ -588,9 +587,9 @@
"theme-description": "立即在此裝置上套入選定的主題。",
"theme": "主題"
},
- "shortcut": {
- "delete-confirm": "您確定要刪除快捷篩選 `{{title}}` 嗎?",
- "delete-success": "快捷篩選 `{{title}}` 刪除成功"
+ "memo-view": {
+ "delete-confirm": "您確定要刪除檢視 `{{title}}` 嗎?",
+ "delete-success": "檢視 `{{title}}` 刪除成功"
},
"sso": {
"account": "帳號",
diff --git a/web/src/pages/Archived.tsx b/web/src/pages/Archived.tsx
index 52941c8e1..ab0fb7f19 100644
--- a/web/src/pages/Archived.tsx
+++ b/web/src/pages/Archived.tsx
@@ -10,7 +10,7 @@ const Archived = () => {
const memoFilter = useMemoFilters({
creatorName: user?.name,
- includeShortcuts: true,
+ includeMemoViews: true,
includePinned: false,
});
diff --git a/web/src/pages/Explore.tsx b/web/src/pages/Explore.tsx
index 3300505e1..fb8b93955 100644
--- a/web/src/pages/Explore.tsx
+++ b/web/src/pages/Explore.tsx
@@ -15,7 +15,7 @@ const Explore = () => {
const visibilities = currentUser ? [Visibility.PUBLIC, Visibility.PROTECTED] : [Visibility.PUBLIC];
const memoFilter = useMemoFilters({
- includeShortcuts: true,
+ includeMemoViews: true,
includePinned: false,
visibilities,
});
diff --git a/web/src/pages/Home.tsx b/web/src/pages/Home.tsx
index 892907855..bf9bc00d1 100644
--- a/web/src/pages/Home.tsx
+++ b/web/src/pages/Home.tsx
@@ -21,7 +21,7 @@ const Home = () => {
const memoFilter = useMemoFilters({
creatorName: user?.name,
- includeShortcuts: true,
+ includeMemoViews: true,
includePinned: true,
});
diff --git a/web/src/pages/Shortcuts.tsx b/web/src/pages/MemoViews.tsx
similarity index 77%
rename from web/src/pages/Shortcuts.tsx
rename to web/src/pages/MemoViews.tsx
index f30eb89c3..37a3e5877 100644
--- a/web/src/pages/Shortcuts.tsx
+++ b/web/src/pages/MemoViews.tsx
@@ -1,5 +1,6 @@
import { create } from "@bufbuild/protobuf";
import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";
+import { useQueryClient } from "@tanstack/react-query";
import {
CheckCircle2Icon,
ClipboardCheckIcon,
@@ -27,17 +28,18 @@ import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigge
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import { Textarea } from "@/components/ui/textarea";
-import { shortcutServiceClient } from "@/connect";
-import { useAuth } from "@/contexts/AuthContext";
+import { memoViewServiceClient } from "@/connect";
+import { useMemoFilterContext } from "@/contexts/MemoFilterContext";
import useCurrentUser from "@/hooks/useCurrentUser";
import useLoading from "@/hooks/useLoading";
+import { useMemoViews, userKeys } from "@/hooks/useUserQueries";
import { handleError } from "@/lib/error";
-import { getShortcutId } from "@/lib/memo-views";
+import { getMemoViewId } from "@/lib/memo-views";
import { cn } from "@/lib/utils";
-import { Shortcut, ShortcutSchema } from "@/types/proto/api/v1/shortcut_service_pb";
+import { MemoView, MemoViewSchema } from "@/types/proto/api/v1/memo_view_service_pb";
import { useTranslate } from "@/utils/i18n";
-const shortcutExamples = [
+const memoViewExamples = [
{
title: "Pinned",
filter: "pinned",
@@ -177,29 +179,29 @@ const filterFields = [
'timestamp("2025-01-01T00:00:00Z")',
];
-const createEmptyShortcut = () =>
- create(ShortcutSchema, {
+const createEmptyMemoView = () =>
+ create(MemoViewSchema, {
name: "",
title: "",
filter: "",
});
-interface ShortcutGuideProps {
- onUseExample: (example: (typeof shortcutExamples)[number]) => void;
+interface MemoViewGuideProps {
+ onUseExample: (example: (typeof memoViewExamples)[number]) => void;
}
-interface ShortcutsRouteState {
+interface MemoViewsRouteState {
openCreate?: boolean;
- shortcut?: Shortcut;
+ memoView?: MemoView;
}
-const ShortcutGuide = ({ onUseExample }: ShortcutGuideProps) => {
+const MemoViewGuide = ({ onUseExample }: MemoViewGuideProps) => {
return (
<aside className="flex flex-col gap-5">
<div className="rounded-lg border border-border p-4">
<h2 className="text-sm font-semibold text-foreground">Expression examples</h2>
<div className="mt-3 flex flex-col gap-2">
- {shortcutExamples.map((example) => {
+ {memoViewExamples.map((example) => {
const Icon = example.icon;
return (
<div
@@ -233,15 +235,17 @@ const ShortcutGuide = ({ onUseExample }: ShortcutGuideProps) => {
);
};
-const Shortcuts = () => {
+const MemoViews = () => {
const t = useTranslate();
const location = useLocation();
const navigate = useNavigate();
const user = useCurrentUser();
- const { shortcuts, refetchSettings } = useAuth();
+ const queryClient = useQueryClient();
+ const { data: memoViews = [] } = useMemoViews(user?.name);
+ const { memoView: selectedMemoView, setMemoView } = useMemoFilterContext();
const [isCreateFormOpen, setIsCreateFormOpen] = useState(false);
- const [draft, setDraft] = useState<Shortcut>(createEmptyShortcut());
- const [deleteTarget, setDeleteTarget] = useState<Shortcut | undefined>();
+ const [draft, setDraft] = useState<MemoView>(createEmptyMemoView());
+ const [deleteTarget, setDeleteTarget] = useState<MemoView | undefined>();
const createState = useLoading(false);
const validateState = useLoading(false);
const updateState = useLoading(false);
@@ -249,33 +253,33 @@ const Shortcuts = () => {
const isSaving = createState.isLoading || updateState.isLoading;
useEffect(() => {
- const state = location.state as ShortcutsRouteState | null;
+ const state = location.state as MemoViewsRouteState | null;
if (!state) return;
- if (state.shortcut) {
+ if (state.memoView) {
setDraft(
- create(ShortcutSchema, {
- name: state.shortcut.name,
- title: state.shortcut.title,
- filter: state.shortcut.filter,
+ create(MemoViewSchema, {
+ name: state.memoView.name,
+ title: state.memoView.title,
+ filter: state.memoView.filter,
}),
);
setIsCreateFormOpen(true);
} else if (state.openCreate) {
- setDraft(createEmptyShortcut());
+ setDraft(createEmptyMemoView());
setIsCreateFormOpen(true);
}
navigate(location.pathname, { replace: true, state: null });
}, [location.key, location.pathname, location.state, navigate]);
- const setDraftState = (state: Partial<Shortcut>) => {
+ const setDraftState = (state: Partial<MemoView>) => {
setDraft((current) => ({ ...current, ...state }));
};
- const handleUseExample = (example: (typeof shortcutExamples)[number]) => {
+ const handleUseExample = (example: (typeof memoViewExamples)[number]) => {
setDraft(
- create(ShortcutSchema, {
+ create(MemoViewSchema, {
name: draft.name,
title: draft.title || example.title,
filter: example.filter,
@@ -285,21 +289,21 @@ const Shortcuts = () => {
};
const handleOpenCreateForm = () => {
- setDraft(createEmptyShortcut());
+ setDraft(createEmptyMemoView());
setIsCreateFormOpen(true);
};
const handleCloseForm = () => {
- setDraft(createEmptyShortcut());
+ setDraft(createEmptyMemoView());
setIsCreateFormOpen(false);
};
- const handleEditShortcut = (shortcut: Shortcut) => {
+ const handleEditMemoView = (memoView: MemoView) => {
setDraft(
- create(ShortcutSchema, {
- name: shortcut.name,
- title: shortcut.title,
- filter: shortcut.filter,
+ create(MemoViewSchema, {
+ name: memoView.name,
+ title: memoView.title,
+ filter: memoView.filter,
}),
);
setIsCreateFormOpen(true);
@@ -317,9 +321,9 @@ const Shortcuts = () => {
try {
validateState.setLoading();
- await shortcutServiceClient.createShortcut({
+ await memoViewServiceClient.createMemoView({
parent: user.name,
- shortcut: { name: "", title: draft.title, filter: draft.filter },
+ memoView: { name: "", title: draft.title, filter: draft.filter },
validateOnly: true,
});
validateState.setFinish();
@@ -327,14 +331,14 @@ const Shortcuts = () => {
return true;
} catch (error: unknown) {
await handleError(error, toast.error, {
- context: "Validate shortcut filter",
+ context: "Validate memo view filter",
onError: () => validateState.setError(),
});
return false;
}
};
- const handleCreateShortcut = async () => {
+ const handleCreateMemoView = async () => {
if (!draft.title || !draft.filter) {
toast.error("Title and filter cannot be empty");
return;
@@ -346,24 +350,24 @@ const Shortcuts = () => {
try {
createState.setLoading();
- await shortcutServiceClient.createShortcut({
+ await memoViewServiceClient.createMemoView({
parent: user.name,
- shortcut: { name: "", title: draft.title, filter: draft.filter },
+ memoView: { name: "", title: draft.title, filter: draft.filter },
});
- await refetchSettings();
+ await queryClient.invalidateQueries({ queryKey: userKeys.memoViews(user.name) });
createState.setFinish();
- setDraft(createEmptyShortcut());
+ setDraft(createEmptyMemoView());
setIsCreateFormOpen(false);
- toast.success("Create shortcut successfully");
+ toast.success("View created successfully");
} catch (error: unknown) {
await handleError(error, toast.error, {
- context: "Create shortcut",
+ context: "Create memo view",
onError: () => createState.setError(),
});
}
};
- const handleUpdateShortcut = async () => {
+ const handleUpdateMemoView = async () => {
if (!draft.title || !draft.filter) {
toast.error("Title and filter cannot be empty");
return;
@@ -371,44 +375,46 @@ const Shortcuts = () => {
try {
updateState.setLoading();
- await shortcutServiceClient.updateShortcut({
- shortcut: draft,
+ await memoViewServiceClient.updateMemoView({
+ memoView: draft,
updateMask: create(FieldMaskSchema, { paths: ["title", "filter"] }),
});
- await refetchSettings();
+ await queryClient.invalidateQueries({ queryKey: userKeys.memoViews(user?.name) });
updateState.setFinish();
- setDraft(createEmptyShortcut());
+ setDraft(createEmptyMemoView());
setIsCreateFormOpen(false);
- toast.success("Update shortcut successfully");
+ toast.success("View updated successfully");
} catch (error: unknown) {
await handleError(error, toast.error, {
- context: "Update shortcut",
+ context: "Update memo view",
onError: () => updateState.setError(),
});
}
};
- const handleSaveShortcut = async () => {
+ const handleSaveMemoView = async () => {
if (isEditing) {
- await handleUpdateShortcut();
+ await handleUpdateMemoView();
return;
}
- await handleCreateShortcut();
+ await handleCreateMemoView();
};
- const confirmDeleteShortcut = async () => {
+ const confirmDeleteMemoView = async () => {
if (!deleteTarget) return;
try {
- await shortcutServiceClient.deleteShortcut({ name: deleteTarget.name });
- await refetchSettings();
- toast.success(t("setting.shortcut.delete-success", { title: deleteTarget.title }));
- setDeleteTarget(undefined);
+ await memoViewServiceClient.deleteMemoView({ name: deleteTarget.name });
+ await queryClient.invalidateQueries({ queryKey: userKeys.memoViews(user?.name) });
+ if (selectedMemoView === getMemoViewId(deleteTarget.name)) setMemoView(undefined);
+ toast.success(t("setting.memo-view.delete-success", { title: deleteTarget.title }));
} catch (error: unknown) {
await handleError(error, toast.error, {
- context: "Delete shortcut",
+ context: "Delete memo view",
});
+ } finally {
+ setDeleteTarget(undefined);
}
};
@@ -418,17 +424,17 @@ const Shortcuts = () => {
<div className="space-y-1">
<div className="flex items-center gap-2 text-muted-foreground">
<FilterIcon className="h-4 w-4" />
- <span className="text-sm font-medium">{t("common.shortcuts")}</span>
+ <span className="text-sm font-medium">{t("common.views")}</span>
</div>
- <h1 className="text-2xl font-semibold tracking-normal text-foreground">Shortcut filters</h1>
+ <h1 className="text-2xl font-semibold tracking-normal text-foreground">Views</h1>
<p className="max-w-2xl text-sm leading-6 text-muted-foreground">
- Create reusable memo filters with fields, operators, time helpers, and tag matching. Use examples as starting points, then
- validate before saving.
+ Create reusable views with fields, operators, time helpers, and tag matching. Use examples as starting points, then validate
+ before saving.
</p>
</div>
<Button onClick={isCreateFormOpen ? handleCloseForm : handleOpenCreateForm}>
{isCreateFormOpen ? <XIcon className="h-4 w-4" /> : <PlusIcon className="h-4 w-4" />}
- {isCreateFormOpen ? t("common.cancel") : `${t("common.create")} ${t("common.shortcuts")}`}
+ {isCreateFormOpen ? t("common.cancel") : t("common.create")}
</Button>
</div>
@@ -443,14 +449,12 @@ const Shortcuts = () => {
<div className="grid gap-5 p-4 sm:p-5">
<div className="flex items-start justify-between gap-3">
<div>
- <h2 className="text-base font-semibold text-foreground">{isEditing ? "Edit shortcut" : "Create shortcut"}</h2>
- <p className="mt-1 text-sm text-muted-foreground">
- Name the shortcut and define the memo filter expression it should apply.
- </p>
+ <h2 className="text-base font-semibold text-foreground">{isEditing ? "Edit view" : "Create view"}</h2>
+ <p className="mt-1 text-sm text-muted-foreground">Name the view and define the memo filter expression it should apply.</p>
</div>
<a
className="inline-flex items-center gap-1 text-sm font-medium text-primary hover:underline"
- href="https://www.usememos.com/docs/usage/shortcuts"
+ href="https://www.usememos.com/docs"
target="_blank"
rel="noopener noreferrer"
>
@@ -461,9 +465,9 @@ const Shortcuts = () => {
<div className="grid gap-4">
<div className="grid gap-2">
- <Label htmlFor="shortcut-title">{t("common.title")}</Label>
+ <Label htmlFor="view-title">{t("common.title")}</Label>
<Input
- id="shortcut-title"
+ id="view-title"
value={draft.title}
placeholder="Pinned, Recent notes, Work"
onChange={(event) => setDraftState({ title: event.target.value })}
@@ -473,9 +477,9 @@ const Shortcuts = () => {
</p>
</div>
<div className="grid gap-2">
- <Label htmlFor="shortcut-filter">{t("common.filter")}</Label>
+ <Label htmlFor="view-filter">{t("common.filter")}</Label>
<Textarea
- id="shortcut-filter"
+ id="view-filter"
rows={5}
className="font-mono text-sm"
value={draft.filter}
@@ -498,7 +502,7 @@ const Shortcuts = () => {
<CheckCircle2Icon className="h-4 w-4" />
Validate
</Button>
- <Button disabled={isSaving || validateState.isLoading} onClick={handleSaveShortcut}>
+ <Button disabled={isSaving || validateState.isLoading} onClick={handleSaveMemoView}>
<SaveIcon className="h-4 w-4" />
{t("common.save")}
</Button>
@@ -508,39 +512,39 @@ const Shortcuts = () => {
<div className="flex flex-col gap-3">
<div className="flex items-center justify-between">
- <h2 className="text-base font-semibold text-foreground">All shortcuts</h2>
- <Badge variant="outline">{shortcuts.length}</Badge>
+ <h2 className="text-base font-semibold text-foreground">All views</h2>
+ <Badge variant="outline">{memoViews.length}</Badge>
</div>
- {shortcuts.length === 0 ? (
+ {memoViews.length === 0 ? (
<div className="rounded-lg border border-dashed border-border px-4 py-10 text-center">
- <p className="text-sm font-medium text-foreground">No shortcuts yet</p>
- <p className="mt-1 text-sm text-muted-foreground">Open the create form to choose an example and add your first filter.</p>
+ <p className="text-sm font-medium text-foreground">No views yet</p>
+ <p className="mt-1 text-sm text-muted-foreground">Open the create form to choose an example and add your first view.</p>
</div>
) : (
<div className="divide-y divide-border overflow-hidden rounded-lg border border-border">
- {shortcuts.map((shortcut) => (
+ {memoViews.map((memoView) => (
<div
- key={shortcut.name}
+ key={memoView.name}
className="grid gap-3 bg-background px-4 py-3 sm:grid-cols-[minmax(10rem,14rem)_minmax(0,1fr)_2rem]"
>
<div className="min-w-0">
- <div className="truncate text-sm font-medium text-foreground">{shortcut.title}</div>
- <div className="mt-1 font-mono text-xs text-muted-foreground">{getShortcutId(shortcut.name)}</div>
+ <div className="truncate text-sm font-medium text-foreground">{memoView.title}</div>
+ <div className="mt-1 font-mono text-xs text-muted-foreground">{getMemoViewId(memoView.name)}</div>
</div>
<pre className="min-w-0 overflow-x-auto rounded-md bg-muted/50 px-3 py-2 font-mono text-xs leading-5 text-muted-foreground">
- {shortcut.filter}
+ {memoView.filter}
</pre>
<DropdownMenu>
<DropdownMenuTrigger render={<Button variant="ghost" size="icon" className="justify-self-end" />}>
<MoreVerticalIcon className="h-4 w-4" />
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
- <DropdownMenuItem onClick={() => handleEditShortcut(shortcut)}>
+ <DropdownMenuItem onClick={() => handleEditMemoView(memoView)}>
<PencilIcon className="h-4 w-4" />
{t("common.edit")}
</DropdownMenuItem>
- <DropdownMenuItem onClick={() => setDeleteTarget(shortcut)}>
+ <DropdownMenuItem onClick={() => setDeleteTarget(memoView)}>
<Trash2Icon className="h-4 w-4" />
{t("common.delete")}
</DropdownMenuItem>
@@ -553,20 +557,20 @@ const Shortcuts = () => {
</div>
</div>
- {isCreateFormOpen ? <ShortcutGuide onUseExample={handleUseExample} /> : null}
+ {isCreateFormOpen ? <MemoViewGuide onUseExample={handleUseExample} /> : null}
</div>
<ConfirmDialog
open={!!deleteTarget}
onOpenChange={(open) => !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={confirmDeleteShortcut}
+ onConfirm={confirmDeleteMemoView}
confirmVariant="destructive"
/>
</section>
);
};
-export default Shortcuts;
+export default MemoViews;
diff --git a/web/src/pages/UserProfile.tsx b/web/src/pages/UserProfile.tsx
index a8ed206cb..57e55d92f 100644
--- a/web/src/pages/UserProfile.tsx
+++ b/web/src/pages/UserProfile.tsx
@@ -59,7 +59,7 @@ const UserProfile = () => {
const memoFilter = useMemoFilters({
creatorName: user?.name,
- includeShortcuts: false,
+ includeMemoViews: false,
includePinned: true,
});
diff --git a/web/src/router/index.tsx b/web/src/router/index.tsx
index 92f7a437a..aab24b40f 100644
--- a/web/src/router/index.tsx
+++ b/web/src/router/index.tsx
@@ -25,7 +25,7 @@ const NotFound = lazyWithReload(() => import("@/pages/NotFound"));
const PermissionDenied = lazyWithReload(() => import("@/pages/PermissionDenied"));
const Attachments = lazyWithReload(() => import("@/pages/Attachments"));
const Setting = lazyWithReload(() => import("@/pages/Setting"));
-const Shortcuts = lazyWithReload(() => import("@/pages/Shortcuts"));
+const MemoViews = lazyWithReload(() => import("@/pages/MemoViews"));
const SignIn = lazyWithReload(() => import("@/pages/SignIn"));
const SignUp = lazyWithReload(() => import("@/pages/SignUp"));
const UserProfile = lazyWithReload(() => import("@/pages/UserProfile"));
@@ -91,7 +91,7 @@ export const routeConfig: RouteObject[] = [
{ path: Routes.ARCHIVED, element: <Archived /> },
{
element: <RequireFullInitializationRoute />,
- children: [{ path: Routes.SHORTCUTS, element: <Shortcuts /> }],
+ children: [{ path: Routes.VIEWS, element: <MemoViews /> }],
},
],
},
diff --git a/web/src/router/routes.ts b/web/src/router/routes.ts
index 916c51181..9fda3a7d0 100644
--- a/web/src/router/routes.ts
+++ b/web/src/router/routes.ts
@@ -4,7 +4,7 @@ export const ROUTES = {
ATTACHMENTS: "/attachments",
INBOX: "/inbox",
ARCHIVED: "/archived",
- SHORTCUTS: "/shortcuts",
+ VIEWS: "/views",
SETTING: "/setting",
EXPLORE: "/explore",
AUTH: "/auth",
diff --git a/web/src/themes/default.css b/web/src/themes/default.css
index 3ec5eceea..a1507494e 100644
--- a/web/src/themes/default.css
+++ b/web/src/themes/default.css
@@ -76,6 +76,12 @@
--font-mono: var(--font-mono);
--font-serif: var(--font-serif);
+ /* Compact application chrome: captions and dense navigation rows. */
+ --text-2xs: 0.6875rem;
+ --text-2xs--line-height: 1rem;
+ --text-ui: 0.8125rem;
+ --text-ui--line-height: 1.125rem;
+
--radius-sm: calc(var(--radius) - 4px);
--radius-md: calc(var(--radius) - 2px);
--radius-lg: var(--radius);
diff --git a/web/src/types/proto/api/v1/memo_view_service_pb.ts b/web/src/types/proto/api/v1/memo_view_service_pb.ts
new file mode 100644
index 000000000..c83a52ff6
--- /dev/null
+++ b/web/src/types/proto/api/v1/memo_view_service_pb.ts
@@ -0,0 +1,253 @@
+// @generated by protoc-gen-es v2.12.1 with parameter "target=ts"
+// @generated from file api/v1/memo_view_service.proto (package memos.api.v1, syntax proto3)
+/* eslint-disable */
+
+import type { GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2";
+import { fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv2";
+import { file_google_api_annotations } from "../../google/api/annotations_pb";
+import { file_google_api_client } from "../../google/api/client_pb";
+import { file_google_api_field_behavior } from "../../google/api/field_behavior_pb";
+import { file_google_api_resource } from "../../google/api/resource_pb";
+import type { EmptySchema, FieldMask } from "@bufbuild/protobuf/wkt";
+import { file_google_protobuf_empty, file_google_protobuf_field_mask } from "@bufbuild/protobuf/wkt";
+import type { Message } from "@bufbuild/protobuf";
+
+/**
+ * Describes the file api/v1/memo_view_service.proto.
+ */
+export const file_api_v1_memo_view_service: GenFile = /*@__PURE__*/
+ fileDesc("Ch5hcGkvdjEvbWVtb192aWV3X3NlcnZpY2UucHJvdG8SDG1lbW9zLmFwaS52MSKKAQoITWVtb1ZpZXcSEQoEbmFtZRgBIAEoCUID4EEIEhIKBXRpdGxlGAIgASgJQgPgQQISEwoGZmlsdGVyGAMgASgJQgPgQQI6QupBPwoVbWVtb3MuYXBpLnYxL01lbW9WaWV3Ehl1c2Vycy97dXNlcn0vdmlld3Mve3ZpZXd9KgV2aWV3czIEdmlldyJFChRMaXN0TWVtb1ZpZXdzUmVxdWVzdBItCgZwYXJlbnQYASABKAlCHeBBAvpBFxIVbWVtb3MuYXBpLnYxL01lbW9WaWV3IkMKFUxpc3RNZW1vVmlld3NSZXNwb25zZRIqCgptZW1vX3ZpZXdzGAEgAygLMhYubWVtb3MuYXBpLnYxLk1lbW9WaWV3IkEKEkdldE1lbW9WaWV3UmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFW1lbW9zLmFwaS52MS9NZW1vVmlldyKSAQoVQ3JlYXRlTWVtb1ZpZXdSZXF1ZXN0Ei0KBnBhcmVudBgBIAEoCUId4EEC+kEXEhVtZW1vcy5hcGkudjEvTWVtb1ZpZXcSLgoJbWVtb192aWV3GAIgASgLMhYubWVtb3MuYXBpLnYxLk1lbW9WaWV3QgPgQQISGgoNdmFsaWRhdGVfb25seRgDIAEoCEID4EEBIn0KFVVwZGF0ZU1lbW9WaWV3UmVxdWVzdBIuCgltZW1vX3ZpZXcYASABKAsyFi5tZW1vcy5hcGkudjEuTWVtb1ZpZXdCA+BBAhI0Cgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2tCA+BBASJEChVEZWxldGVNZW1vVmlld1JlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVtZW1vcy5hcGkudjEvTWVtb1ZpZXcyzgUKD01lbW9WaWV3U2VydmljZRKJAQoNTGlzdE1lbW9WaWV3cxIiLm1lbW9zLmFwaS52MS5MaXN0TWVtb1ZpZXdzUmVxdWVzdBojLm1lbW9zLmFwaS52MS5MaXN0TWVtb1ZpZXdzUmVzcG9uc2UiL9pBBnBhcmVudILT5JMCIBIeL2FwaS92MS97cGFyZW50PXVzZXJzLyp9L3ZpZXdzEnYKC0dldE1lbW9WaWV3EiAubWVtb3MuYXBpLnYxLkdldE1lbW9WaWV3UmVxdWVzdBoWLm1lbW9zLmFwaS52MS5NZW1vVmlldyIt2kEEbmFtZYLT5JMCIBIeL2FwaS92MS97bmFtZT11c2Vycy8qL3ZpZXdzLyp9EpMBCg5DcmVhdGVNZW1vVmlldxIjLm1lbW9zLmFwaS52MS5DcmVhdGVNZW1vVmlld1JlcXVlc3QaFi5tZW1vcy5hcGkudjEuTWVtb1ZpZXciRNpBEHBhcmVudCxtZW1vX3ZpZXeC0+STAis6CW1lbW9fdmlldyIeL2FwaS92MS97cGFyZW50PXVzZXJzLyp9L3ZpZXdzEqIBCg5VcGRhdGVNZW1vVmlldxIjLm1lbW9zLmFwaS52MS5VcGRhdGVNZW1vVmlld1JlcXVlc3QaFi5tZW1vcy5hcGkudjEuTWVtb1ZpZXciU9pBFW1lbW9fdmlldyx1cGRhdGVfbWFza4LT5JMCNToJbWVtb192aWV3MigvYXBpL3YxL3ttZW1vX3ZpZXcubmFtZT11c2Vycy8qL3ZpZXdzLyp9EnwKDkRlbGV0ZU1lbW9WaWV3EiMubWVtb3MuYXBpLnYxLkRlbGV0ZU1lbW9WaWV3UmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSIt2kEEbmFtZYLT5JMCICoeL2FwaS92MS97bmFtZT11c2Vycy8qL3ZpZXdzLyp9QqwBChBjb20ubWVtb3MuYXBpLnYxQhRNZW1vVmlld1NlcnZpY2VQcm90b1ABWjBnaXRodWIuY29tL3VzZW1lbW9zL21lbW9zL3Byb3RvL2dlbi9hcGkvdjE7YXBpdjGiAgNNQViqAgxNZW1vcy5BcGkuVjHKAgxNZW1vc1xBcGlcVjHiAhhNZW1vc1xBcGlcVjFcR1BCTWV0YWRhdGHqAg5NZW1vczo6QXBpOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_field_mask]);
+
+/**
+ * @generated from message memos.api.v1.MemoView
+ */
+export type MemoView = Message<"memos.api.v1.MemoView"> & {
+ /**
+ * The resource name of the memo view.
+ * Format: users/{user}/views/{view}
+ *
+ * @generated from field: string name = 1;
+ */
+ name: string;
+
+ /**
+ * The title of the memo view.
+ *
+ * @generated from field: string title = 2;
+ */
+ title: string;
+
+ /**
+ * 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.
+ *
+ * @generated from field: string filter = 3;
+ */
+ filter: string;
+};
+
+/**
+ * Describes the message memos.api.v1.MemoView.
+ * Use `create(MemoViewSchema)` to create a new message.
+ */
+export const MemoViewSchema: GenMessage<MemoView> = /*@__PURE__*/
+ messageDesc(file_api_v1_memo_view_service, 0);
+
+/**
+ * @generated from message memos.api.v1.ListMemoViewsRequest
+ */
+export type ListMemoViewsRequest = Message<"memos.api.v1.ListMemoViewsRequest"> & {
+ /**
+ * Required. The parent resource where memo views are listed.
+ * Format: users/{user}
+ *
+ * @generated from field: string parent = 1;
+ */
+ parent: string;
+};
+
+/**
+ * Describes the message memos.api.v1.ListMemoViewsRequest.
+ * Use `create(ListMemoViewsRequestSchema)` to create a new message.
+ */
+export const ListMemoViewsRequestSchema: GenMessage<ListMemoViewsRequest> = /*@__PURE__*/
+ messageDesc(file_api_v1_memo_view_service, 1);
+
+/**
+ * @generated from message memos.api.v1.ListMemoViewsResponse
+ */
+export type ListMemoViewsResponse = Message<"memos.api.v1.ListMemoViewsResponse"> & {
+ /**
+ * The list of memo views.
+ *
+ * @generated from field: repeated memos.api.v1.MemoView memo_views = 1;
+ */
+ memoViews: MemoView[];
+};
+
+/**
+ * Describes the message memos.api.v1.ListMemoViewsResponse.
+ * Use `create(ListMemoViewsResponseSchema)` to create a new message.
+ */
+export const ListMemoViewsResponseSchema: GenMessage<ListMemoViewsResponse> = /*@__PURE__*/
+ messageDesc(file_api_v1_memo_view_service, 2);
+
+/**
+ * @generated from message memos.api.v1.GetMemoViewRequest
+ */
+export type GetMemoViewRequest = Message<"memos.api.v1.GetMemoViewRequest"> & {
+ /**
+ * Required. The resource name of the memo view to retrieve.
+ * Format: users/{user}/views/{view}
+ *
+ * @generated from field: string name = 1;
+ */
+ name: string;
+};
+
+/**
+ * Describes the message memos.api.v1.GetMemoViewRequest.
+ * Use `create(GetMemoViewRequestSchema)` to create a new message.
+ */
+export const GetMemoViewRequestSchema: GenMessage<GetMemoViewRequest> = /*@__PURE__*/
+ messageDesc(file_api_v1_memo_view_service, 3);
+
+/**
+ * @generated from message memos.api.v1.CreateMemoViewRequest
+ */
+export type CreateMemoViewRequest = Message<"memos.api.v1.CreateMemoViewRequest"> & {
+ /**
+ * Required. The parent resource where this memo view will be created.
+ * Format: users/{user}
+ *
+ * @generated from field: string parent = 1;
+ */
+ parent: string;
+
+ /**
+ * Required. The memo view to create.
+ *
+ * @generated from field: memos.api.v1.MemoView memo_view = 2;
+ */
+ memoView?: MemoView | undefined;
+
+ /**
+ * Optional. If set, validate the request, but do not actually create the memo view.
+ *
+ * @generated from field: bool validate_only = 3;
+ */
+ validateOnly: boolean;
+};
+
+/**
+ * Describes the message memos.api.v1.CreateMemoViewRequest.
+ * Use `create(CreateMemoViewRequestSchema)` to create a new message.
+ */
+export const CreateMemoViewRequestSchema: GenMessage<CreateMemoViewRequest> = /*@__PURE__*/
+ messageDesc(file_api_v1_memo_view_service, 4);
+
+/**
+ * @generated from message memos.api.v1.UpdateMemoViewRequest
+ */
+export type UpdateMemoViewRequest = Message<"memos.api.v1.UpdateMemoViewRequest"> & {
+ /**
+ * Required. The memo view resource which replaces the resource on the server.
+ *
+ * @generated from field: memos.api.v1.MemoView memo_view = 1;
+ */
+ memoView?: MemoView | undefined;
+
+ /**
+ * Optional. The list of fields to update.
+ *
+ * @generated from field: google.protobuf.FieldMask update_mask = 2;
+ */
+ updateMask?: FieldMask | undefined;
+};
+
+/**
+ * Describes the message memos.api.v1.UpdateMemoViewRequest.
+ * Use `create(UpdateMemoViewRequestSchema)` to create a new message.
+ */
+export const UpdateMemoViewRequestSchema: GenMessage<UpdateMemoViewRequest> = /*@__PURE__*/
+ messageDesc(file_api_v1_memo_view_service, 5);
+
+/**
+ * @generated from message memos.api.v1.DeleteMemoViewRequest
+ */
+export type DeleteMemoViewRequest = Message<"memos.api.v1.DeleteMemoViewRequest"> & {
+ /**
+ * Required. The resource name of the memo view to delete.
+ * Format: users/{user}/views/{view}
+ *
+ * @generated from field: string name = 1;
+ */
+ name: string;
+};
+
+/**
+ * Describes the message memos.api.v1.DeleteMemoViewRequest.
+ * Use `create(DeleteMemoViewRequestSchema)` to create a new message.
+ */
+export const DeleteMemoViewRequestSchema: GenMessage<DeleteMemoViewRequest> = /*@__PURE__*/
+ messageDesc(file_api_v1_memo_view_service, 6);
+
+/**
+ * @generated from service memos.api.v1.MemoViewService
+ */
+export const MemoViewService: GenService<{
+ /**
+ * 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.
+ *
+ * @generated from rpc memos.api.v1.MemoViewService.ListMemoViews
+ */
+ listMemoViews: {
+ methodKind: "unary";
+ input: typeof ListMemoViewsRequestSchema;
+ output: typeof ListMemoViewsResponseSchema;
+ },
+ /**
+ * GetMemoView gets a memo view by name.
+ *
+ * @generated from rpc memos.api.v1.MemoViewService.GetMemoView
+ */
+ getMemoView: {
+ methodKind: "unary";
+ input: typeof GetMemoViewRequestSchema;
+ output: typeof MemoViewSchema;
+ },
+ /**
+ * CreateMemoView creates a new memo view for a user.
+ *
+ * @generated from rpc memos.api.v1.MemoViewService.CreateMemoView
+ */
+ createMemoView: {
+ methodKind: "unary";
+ input: typeof CreateMemoViewRequestSchema;
+ output: typeof MemoViewSchema;
+ },
+ /**
+ * UpdateMemoView updates a memo view for a user.
+ *
+ * @generated from rpc memos.api.v1.MemoViewService.UpdateMemoView
+ */
+ updateMemoView: {
+ methodKind: "unary";
+ input: typeof UpdateMemoViewRequestSchema;
+ output: typeof MemoViewSchema;
+ },
+ /**
+ * DeleteMemoView deletes a memo view for a user.
+ *
+ * @generated from rpc memos.api.v1.MemoViewService.DeleteMemoView
+ */
+ deleteMemoView: {
+ methodKind: "unary";
+ input: typeof DeleteMemoViewRequestSchema;
+ output: typeof EmptySchema;
+ },
+}> = /*@__PURE__*/
+ serviceDesc(file_api_v1_memo_view_service, 0);
+
diff --git a/web/src/types/proto/api/v1/shortcut_service_pb.ts b/web/src/types/proto/api/v1/shortcut_service_pb.ts
deleted file mode 100644
index bdabb3821..000000000
--- a/web/src/types/proto/api/v1/shortcut_service_pb.ts
+++ /dev/null
@@ -1,253 +0,0 @@
-// @generated by protoc-gen-es v2.12.1 with parameter "target=ts"
-// @generated from file api/v1/shortcut_service.proto (package memos.api.v1, syntax proto3)
-/* eslint-disable */
-
-import type { GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2";
-import { fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv2";
-import { file_google_api_annotations } from "../../google/api/annotations_pb";
-import { file_google_api_client } from "../../google/api/client_pb";
-import { file_google_api_field_behavior } from "../../google/api/field_behavior_pb";
-import { file_google_api_resource } from "../../google/api/resource_pb";
-import type { EmptySchema, FieldMask } from "@bufbuild/protobuf/wkt";
-import { file_google_protobuf_empty, file_google_protobuf_field_mask } from "@bufbuild/protobuf/wkt";
-import type { Message } from "@bufbuild/protobuf";
-
-/**
- * Describes the file api/v1/shortcut_service.proto.
- */
-export const file_api_v1_shortcut_service: GenFile = /*@__PURE__*/
- fileDesc("Ch1hcGkvdjEvc2hvcnRjdXRfc2VydmljZS5wcm90bxIMbWVtb3MuYXBpLnYxIpoBCghTaG9ydGN1dBIRCgRuYW1lGAEgASgJQgPgQQgSEgoFdGl0bGUYAiABKAlCA+BBAhITCgZmaWx0ZXIYAyABKAlCA+BBATpS6kFPChVtZW1vcy5hcGkudjEvU2hvcnRjdXQSIXVzZXJzL3t1c2VyfS9zaG9ydGN1dHMve3Nob3J0Y3V0fSoJc2hvcnRjdXRzMghzaG9ydGN1dCJFChRMaXN0U2hvcnRjdXRzUmVxdWVzdBItCgZwYXJlbnQYASABKAlCHeBBAvpBFxIVbWVtb3MuYXBpLnYxL1Nob3J0Y3V0IkIKFUxpc3RTaG9ydGN1dHNSZXNwb25zZRIpCglzaG9ydGN1dHMYASADKAsyFi5tZW1vcy5hcGkudjEuU2hvcnRjdXQiQQoSR2V0U2hvcnRjdXRSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVbWVtb3MuYXBpLnYxL1Nob3J0Y3V0IpEBChVDcmVhdGVTaG9ydGN1dFJlcXVlc3QSLQoGcGFyZW50GAEgASgJQh3gQQL6QRcSFW1lbW9zLmFwaS52MS9TaG9ydGN1dBItCghzaG9ydGN1dBgCIAEoCzIWLm1lbW9zLmFwaS52MS5TaG9ydGN1dEID4EECEhoKDXZhbGlkYXRlX29ubHkYAyABKAhCA+BBASJ8ChVVcGRhdGVTaG9ydGN1dFJlcXVlc3QSLQoIc2hvcnRjdXQYASABKAsyFi5tZW1vcy5hcGkudjEuU2hvcnRjdXRCA+BBAhI0Cgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2tCA+BBASJEChVEZWxldGVTaG9ydGN1dFJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVtZW1vcy5hcGkudjEvU2hvcnRjdXQy3gUKD1Nob3J0Y3V0U2VydmljZRKNAQoNTGlzdFNob3J0Y3V0cxIiLm1lbW9zLmFwaS52MS5MaXN0U2hvcnRjdXRzUmVxdWVzdBojLm1lbW9zLmFwaS52MS5MaXN0U2hvcnRjdXRzUmVzcG9uc2UiM9pBBnBhcmVudILT5JMCJBIiL2FwaS92MS97cGFyZW50PXVzZXJzLyp9L3Nob3J0Y3V0cxJ6CgtHZXRTaG9ydGN1dBIgLm1lbW9zLmFwaS52MS5HZXRTaG9ydGN1dFJlcXVlc3QaFi5tZW1vcy5hcGkudjEuU2hvcnRjdXQiMdpBBG5hbWWC0+STAiQSIi9hcGkvdjEve25hbWU9dXNlcnMvKi9zaG9ydGN1dHMvKn0SlQEKDkNyZWF0ZVNob3J0Y3V0EiMubWVtb3MuYXBpLnYxLkNyZWF0ZVNob3J0Y3V0UmVxdWVzdBoWLm1lbW9zLmFwaS52MS5TaG9ydGN1dCJG2kEPcGFyZW50LHNob3J0Y3V0gtPkkwIuOghzaG9ydGN1dCIiL2FwaS92MS97cGFyZW50PXVzZXJzLyp9L3Nob3J0Y3V0cxKjAQoOVXBkYXRlU2hvcnRjdXQSIy5tZW1vcy5hcGkudjEuVXBkYXRlU2hvcnRjdXRSZXF1ZXN0GhYubWVtb3MuYXBpLnYxLlNob3J0Y3V0IlTaQRRzaG9ydGN1dCx1cGRhdGVfbWFza4LT5JMCNzoIc2hvcnRjdXQyKy9hcGkvdjEve3Nob3J0Y3V0Lm5hbWU9dXNlcnMvKi9zaG9ydGN1dHMvKn0SgAEKDkRlbGV0ZVNob3J0Y3V0EiMubWVtb3MuYXBpLnYxLkRlbGV0ZVNob3J0Y3V0UmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSIx2kEEbmFtZYLT5JMCJCoiL2FwaS92MS97bmFtZT11c2Vycy8qL3Nob3J0Y3V0cy8qfUKsAQoQY29tLm1lbW9zLmFwaS52MUIUU2hvcnRjdXRTZXJ2aWNlUHJvdG9QAVowZ2l0aHViLmNvbS91c2VtZW1vcy9tZW1vcy9wcm90by9nZW4vYXBpL3YxO2FwaXYxogIDTUFYqgIMTWVtb3MuQXBpLlYxygIMTWVtb3NcQXBpXFYx4gIYTWVtb3NcQXBpXFYxXEdQQk1ldGFkYXRh6gIOTWVtb3M6OkFwaTo6VjFiBnByb3RvMw", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_field_mask]);
-
-/**
- * @generated from message memos.api.v1.Shortcut
- */
-export type Shortcut = Message<"memos.api.v1.Shortcut"> & {
- /**
- * The resource name of the shortcut.
- * Format: users/{user}/shortcuts/{shortcut}
- *
- * @generated from field: string name = 1;
- */
- name: string;
-
- /**
- * The title of the shortcut.
- *
- * @generated from field: string title = 2;
- */
- title: string;
-
- /**
- * The CEL filter expression for the shortcut, using the same grammar as the
- * ListMemos `filter` argument. Reuse it by passing this value to ListMemos.
- *
- * @generated from field: string filter = 3;
- */
- filter: string;
-};
-
-/**
- * Describes the message memos.api.v1.Shortcut.
- * Use `create(ShortcutSchema)` to create a new message.
- */
-export const ShortcutSchema: GenMessage<Shortcut> = /*@__PURE__*/
- messageDesc(file_api_v1_shortcut_service, 0);
-
-/**
- * @generated from message memos.api.v1.ListShortcutsRequest
- */
-export type ListShortcutsRequest = Message<"memos.api.v1.ListShortcutsRequest"> & {
- /**
- * Required. The parent resource where shortcuts are listed.
- * Format: users/{user}
- *
- * @generated from field: string parent = 1;
- */
- parent: string;
-};
-
-/**
- * Describes the message memos.api.v1.ListShortcutsRequest.
- * Use `create(ListShortcutsRequestSchema)` to create a new message.
- */
-export const ListShortcutsRequestSchema: GenMessage<ListShortcutsRequest> = /*@__PURE__*/
- messageDesc(file_api_v1_shortcut_service, 1);
-
-/**
- * @generated from message memos.api.v1.ListShortcutsResponse
- */
-export type ListShortcutsResponse = Message<"memos.api.v1.ListShortcutsResponse"> & {
- /**
- * The list of shortcuts.
- *
- * @generated from field: repeated memos.api.v1.Shortcut shortcuts = 1;
- */
- shortcuts: Shortcut[];
-};
-
-/**
- * Describes the message memos.api.v1.ListShortcutsResponse.
- * Use `create(ListShortcutsResponseSchema)` to create a new message.
- */
-export const ListShortcutsResponseSchema: GenMessage<ListShortcutsResponse> = /*@__PURE__*/
- messageDesc(file_api_v1_shortcut_service, 2);
-
-/**
- * @generated from message memos.api.v1.GetShortcutRequest
- */
-export type GetShortcutRequest = Message<"memos.api.v1.GetShortcutRequest"> & {
- /**
- * Required. The resource name of the shortcut to retrieve.
- * Format: users/{user}/shortcuts/{shortcut}
- *
- * @generated from field: string name = 1;
- */
- name: string;
-};
-
-/**
- * Describes the message memos.api.v1.GetShortcutRequest.
- * Use `create(GetShortcutRequestSchema)` to create a new message.
- */
-export const GetShortcutRequestSchema: GenMessage<GetShortcutRequest> = /*@__PURE__*/
- messageDesc(file_api_v1_shortcut_service, 3);
-
-/**
- * @generated from message memos.api.v1.CreateShortcutRequest
- */
-export type CreateShortcutRequest = Message<"memos.api.v1.CreateShortcutRequest"> & {
- /**
- * Required. The parent resource where this shortcut will be created.
- * Format: users/{user}
- *
- * @generated from field: string parent = 1;
- */
- parent: string;
-
- /**
- * Required. The shortcut to create.
- *
- * @generated from field: memos.api.v1.Shortcut shortcut = 2;
- */
- shortcut?: Shortcut | undefined;
-
- /**
- * Optional. If set, validate the request, but do not actually create the shortcut.
- *
- * @generated from field: bool validate_only = 3;
- */
- validateOnly: boolean;
-};
-
-/**
- * Describes the message memos.api.v1.CreateShortcutRequest.
- * Use `create(CreateShortcutRequestSchema)` to create a new message.
- */
-export const CreateShortcutRequestSchema: GenMessage<CreateShortcutRequest> = /*@__PURE__*/
- messageDesc(file_api_v1_shortcut_service, 4);
-
-/**
- * @generated from message memos.api.v1.UpdateShortcutRequest
- */
-export type UpdateShortcutRequest = Message<"memos.api.v1.UpdateShortcutRequest"> & {
- /**
- * Required. The shortcut resource which replaces the resource on the server.
- *
- * @generated from field: memos.api.v1.Shortcut shortcut = 1;
- */
- shortcut?: Shortcut | undefined;
-
- /**
- * Optional. The list of fields to update.
- *
- * @generated from field: google.protobuf.FieldMask update_mask = 2;
- */
- updateMask?: FieldMask | undefined;
-};
-
-/**
- * Describes the message memos.api.v1.UpdateShortcutRequest.
- * Use `create(UpdateShortcutRequestSchema)` to create a new message.
- */
-export const UpdateShortcutRequestSchema: GenMessage<UpdateShortcutRequest> = /*@__PURE__*/
- messageDesc(file_api_v1_shortcut_service, 5);
-
-/**
- * @generated from message memos.api.v1.DeleteShortcutRequest
- */
-export type DeleteShortcutRequest = Message<"memos.api.v1.DeleteShortcutRequest"> & {
- /**
- * Required. The resource name of the shortcut to delete.
- * Format: users/{user}/shortcuts/{shortcut}
- *
- * @generated from field: string name = 1;
- */
- name: string;
-};
-
-/**
- * Describes the message memos.api.v1.DeleteShortcutRequest.
- * Use `create(DeleteShortcutRequestSchema)` to create a new message.
- */
-export const DeleteShortcutRequestSchema: GenMessage<DeleteShortcutRequest> = /*@__PURE__*/
- messageDesc(file_api_v1_shortcut_service, 6);
-
-/**
- * @generated from service memos.api.v1.ShortcutService
- */
-export const ShortcutService: GenService<{
- /**
- * 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.
- *
- * @generated from rpc memos.api.v1.ShortcutService.ListShortcuts
- */
- listShortcuts: {
- methodKind: "unary";
- input: typeof ListShortcutsRequestSchema;
- output: typeof ListShortcutsResponseSchema;
- },
- /**
- * GetShortcut gets a shortcut by name.
- *
- * @generated from rpc memos.api.v1.ShortcutService.GetShortcut
- */
- getShortcut: {
- methodKind: "unary";
- input: typeof GetShortcutRequestSchema;
- output: typeof ShortcutSchema;
- },
- /**
- * CreateShortcut creates a new shortcut for a user.
- *
- * @generated from rpc memos.api.v1.ShortcutService.CreateShortcut
- */
- createShortcut: {
- methodKind: "unary";
- input: typeof CreateShortcutRequestSchema;
- output: typeof ShortcutSchema;
- },
- /**
- * UpdateShortcut updates a shortcut for a user.
- *
- * @generated from rpc memos.api.v1.ShortcutService.UpdateShortcut
- */
- updateShortcut: {
- methodKind: "unary";
- input: typeof UpdateShortcutRequestSchema;
- output: typeof ShortcutSchema;
- },
- /**
- * DeleteShortcut deletes a shortcut for a user.
- *
- * @generated from rpc memos.api.v1.ShortcutService.DeleteShortcut
- */
- deleteShortcut: {
- methodKind: "unary";
- input: typeof DeleteShortcutRequestSchema;
- output: typeof EmptySchema;
- },
-}> = /*@__PURE__*/
- serviceDesc(file_api_v1_shortcut_service, 0);
-
diff --git a/web/tests/app-sidebar-logo.test.tsx b/web/tests/app-sidebar-logo.test.tsx
index af11406e3..25dd4ad5f 100644
--- a/web/tests/app-sidebar-logo.test.tsx
+++ b/web/tests/app-sidebar-logo.test.tsx
@@ -1,9 +1,14 @@
-import { fireEvent, render, screen } from "@testing-library/react";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { fireEvent, render as testingLibraryRender, screen } from "@testing-library/react";
import { MemoryRouter } from "react-router-dom";
import { beforeEach, describe, expect, it, vi } from "vitest";
import AppSidebar, { MobileAppHeader } from "@/components/AppSidebar";
+import { SIDEBAR_SECTION_ACTION_BUTTON_CLASSES, SIDEBAR_SECTION_ACTION_ICON_CLASSES } from "@/components/AppSidebar/SidebarSection";
-const authState = vi.hoisted(() => ({ currentUser: { name: "users/test" } as { name: string } | undefined }));
+const authState = vi.hoisted(() => ({
+ currentUser: { name: "users/test" } as { name: string } | undefined,
+ memoViews: [] as Array<{ name: string; title: string }>,
+}));
const sidebarState = vi.hoisted(() => ({
memoScope: "home" as "home" | "explore" | "archived",
}));
@@ -46,7 +51,7 @@ vi.mock("@/contexts/AppSidebarContext", () => ({
}));
vi.mock("@/contexts/AuthContext", () => ({
- useAuth: () => ({ shortcuts: [], refetchSettings: vi.fn(), isInitialized: true }),
+ useAuth: () => ({ isInitialized: true }),
}));
vi.mock("@/contexts/InstanceContext", () => ({
@@ -57,8 +62,8 @@ vi.mock("@/contexts/MemoFilterContext", () => ({
stringifyFilters: () => "",
useMemoFilterContext: () => ({
filters: [],
- shortcut: undefined,
- setShortcut: vi.fn(),
+ memoView: undefined,
+ setMemoView: vi.fn(),
}),
}));
@@ -79,6 +84,10 @@ vi.mock("@/hooks/useMediaQuery", () => ({
}));
vi.mock("@/hooks/useUserQueries", () => ({
+ userKeys: {
+ memoViews: (parent?: string) => ["users", "memoViews", parent],
+ },
+ useMemoViews: () => ({ data: authState.memoViews }),
useNotifications: () => ({ data: [] }),
useUser: () => ({ data: undefined }),
}));
@@ -91,9 +100,15 @@ vi.mock("@/utils/i18n", () => ({
useTranslate: () => (key: string) => key,
}));
+const render = (ui: Parameters<typeof testingLibraryRender>[0]) =>
+ testingLibraryRender(
+ <QueryClientProvider client={new QueryClient({ defaultOptions: { queries: { retry: false } } })}>{ui}</QueryClientProvider>,
+ );
+
describe("App sidebar logo", () => {
beforeEach(() => {
authState.currentUser = { name: "users/test" };
+ authState.memoViews = [];
sidebarState.memoScope = "home";
});
@@ -132,6 +147,8 @@ describe("App sidebar logo", () => {
);
expect(screen.getByText("Calendar")).toBeInTheDocument();
+ expect(screen.getByRole("region", { name: "common.statistics" })).toBeInTheDocument();
+ expect(screen.queryByRole("heading", { name: "common.statistics" })).not.toBeInTheDocument();
expect(screen.getByText("common.views")).toBeInTheDocument();
expect(screen.getByText("Tags")).toBeInTheDocument();
expect(screen.getByRole("link", { name: "common.attachments" })).toHaveAttribute("href", "/attachments");
@@ -178,11 +195,17 @@ describe("App sidebar logo", () => {
const calendar = screen.getByText("Calendar");
const views = screen.getByText("common.views");
+ expect(screen.getByRole("region", { name: "common.statistics" })).toBeInTheDocument();
+ expect(screen.getByRole("heading", { name: "common.views", level: 2 })).toBeInTheDocument();
expect(calendar.compareDocumentPosition(views) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy();
const viewOptions = screen.getByRole("button", { name: "memo.view-options" });
const createView = screen.getByRole("button", { name: "common.create" });
expect(viewOptions.compareDocumentPosition(createView) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy();
- expect(screen.getByRole("button", { name: "common.tasks" })).toBeInTheDocument();
+ expect(createView).toHaveClass(...SIDEBAR_SECTION_ACTION_BUTTON_CLASSES.split(" "));
+ expect(createView.querySelector("svg")).toHaveClass(SIDEBAR_SECTION_ACTION_ICON_CLASSES);
+ const tasksView = screen.getByRole("button", { name: "common.tasks" });
+ expect(tasksView).toHaveTextContent("common.tasks");
+ expect(tasksView).not.toHaveTextContent("☑️");
expect(screen.queryByRole("button", { name: "common.all" })).not.toBeInTheDocument();
const scopeTrigger = screen.getByRole("button", { name: "common.home" });
@@ -192,6 +215,26 @@ describe("App sidebar logo", () => {
expect(screen.getByRole("menuitem", { name: "common.archived" })).toBeInTheDocument();
});
+ it("uses compact text-only actions for a saved view", async () => {
+ authState.memoViews = [{ name: "memoViews/1", title: "testgp" }];
+ render(
+ <MemoryRouter initialEntries={["/"]}>
+ <AppSidebar />
+ </MemoryRouter>,
+ );
+
+ fireEvent.click(screen.getByRole("button", { name: "common.edit testgp" }));
+
+ const menu = await screen.findByRole("menu");
+ expect(menu).toHaveAttribute("data-size", "sm");
+ expect(menu).toHaveClass("min-w-24", "p-0.5");
+ const editItem = screen.getByRole("menuitem", { name: "common.edit" });
+ const deleteItem = screen.getByRole("menuitem", { name: "common.delete" });
+ expect(editItem.querySelector("svg")).toBeNull();
+ expect(deleteItem.querySelector("svg")).toBeNull();
+ expect(deleteItem).toHaveAttribute("data-variant", "destructive");
+ });
+
it("collapses inactive global destinations and defaults the scope icon to Home", async () => {
render(
<MemoryRouter initialEntries={["/attachments"]}>
@@ -217,6 +260,21 @@ describe("App sidebar logo", () => {
expect(screen.queryByRole("menuitem", { name: "common.explore" })).not.toBeInTheDocument();
});
+ it.each([
+ ["/attachments", "common.attachments"],
+ ["/inbox", "common.inbox"],
+ ["/setting", "common.basic"],
+ ["/u/test", "common.profile"],
+ ])("labels the sidebar content section on %s", (path, label) => {
+ render(
+ <MemoryRouter initialEntries={[path]}>
+ <AppSidebar />
+ </MemoryRouter>,
+ );
+
+ expect(screen.getByRole("heading", { name: label, level: 2 })).toBeInTheDocument();
+ });
+
it.each([
["explore", "common.explore", "/inbox"],
["archived", "common.archived", "/attachments"],
diff --git a/web/tests/app-sidebar-routes.test.ts b/web/tests/app-sidebar-routes.test.ts
index 36746f345..4992be6ea 100644
--- a/web/tests/app-sidebar-routes.test.ts
+++ b/web/tests/app-sidebar-routes.test.ts
@@ -7,7 +7,7 @@ describe("sidebar route content", () => {
["/archived", "archived"],
["/explore", "explore"],
["/u/steven", "profile"],
- ["/shortcuts", "shortcuts"],
+ ["/views", "views"],
["/attachments", "attachments"],
["/inbox", "inbox"],
["/setting", "settings"],
diff --git a/web/tests/auth-context-initialization.test.tsx b/web/tests/auth-context-initialization.test.tsx
index 69b8dc25b..be92cfb55 100644
--- a/web/tests/auth-context-initialization.test.tsx
+++ b/web/tests/auth-context-initialization.test.tsx
@@ -6,7 +6,6 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
const authState = vi.hoisted(() => ({ hasToken: false }));
const clients = vi.hoisted(() => ({
getCurrentUser: vi.fn(),
- listShortcuts: vi.fn(),
listUserSettings: vi.fn(),
}));
@@ -21,9 +20,6 @@ vi.mock("@/connect", () => ({
signOut: vi.fn(),
},
refreshAccessToken: vi.fn(async () => undefined),
- shortcutServiceClient: {
- listShortcuts: clients.listShortcuts,
- },
userServiceClient: {
listUserSettings: clients.listUserSettings,
},
@@ -55,20 +51,15 @@ describe("AuthProvider initialization", () => {
beforeEach(() => {
authState.hasToken = false;
clients.getCurrentUser.mockReset();
- clients.listShortcuts.mockReset();
clients.listUserSettings.mockReset();
});
it("resets full readiness while post-sign-in settings are pending", async () => {
let resolveSettings!: (value: { settings: [] }) => void;
- let resolveShortcuts!: (value: { shortcuts: [] }) => void;
clients.getCurrentUser.mockResolvedValue({ user: { name: "users/alice", username: "alice" } });
clients.listUserSettings.mockImplementation(
() => new Promise<{ settings: [] }>((resolve) => (resolveSettings = resolve)),
);
- clients.listShortcuts.mockImplementation(
- () => new Promise<{ shortcuts: [] }>((resolve) => (resolveShortcuts = resolve)),
- );
render(<Probe />, { wrapper });
@@ -85,9 +76,6 @@ describe("AuthProvider initialization", () => {
resolveSettings({ settings: [] });
await waitFor(() => expect(screen.getByTestId("user-settings-initialized")).toHaveTextContent("yes"));
- expect(screen.getByTestId("initialized")).toHaveTextContent("no");
-
- resolveShortcuts({ shortcuts: [] });
- await waitFor(() => expect(screen.getByTestId("initialized")).toHaveTextContent("yes"));
+ expect(screen.getByTestId("initialized")).toHaveTextContent("yes");
});
});
diff --git a/web/tests/dropdown-menu-size.test.tsx b/web/tests/dropdown-menu-size.test.tsx
new file mode 100644
index 000000000..49ff42914
--- /dev/null
+++ b/web/tests/dropdown-menu-size.test.tsx
@@ -0,0 +1,28 @@
+import { fireEvent, render, screen } from "@testing-library/react";
+import { describe, expect, it } from "vitest";
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu";
+
+describe("DropdownMenu sizing", () => {
+ it("applies compact content and item density through the sm size", async () => {
+ render(
+ <DropdownMenu>
+ <DropdownMenuTrigger>Actions</DropdownMenuTrigger>
+ <DropdownMenuContent size="sm">
+ <DropdownMenuItem>Edit</DropdownMenuItem>
+ <DropdownMenuItem variant="destructive">Delete</DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>,
+ );
+
+ fireEvent.click(screen.getByRole("button", { name: "Actions" }));
+
+ const menu = await screen.findByRole("menu");
+ expect(menu).toHaveAttribute("data-size", "sm");
+ expect(menu).toHaveClass("min-w-24", "rounded", "p-0.5", "shadow-sm");
+
+ for (const item of screen.getAllByRole("menuitem")) {
+ expect(item).toHaveClass("min-h-7", "px-2", "py-1", "text-ui");
+ }
+ expect(screen.getByRole("menuitem", { name: "Delete" })).toHaveAttribute("data-variant", "destructive");
+ });
+});
diff --git a/web/tests/memo-display-setting-menu.test.tsx b/web/tests/memo-display-setting-menu.test.tsx
index f5daf3172..4e70d19bb 100644
--- a/web/tests/memo-display-setting-menu.test.tsx
+++ b/web/tests/memo-display-setting-menu.test.tsx
@@ -1,5 +1,6 @@
import { fireEvent, render, screen } from "@testing-library/react";
import { beforeEach, describe, expect, it, vi } from "vitest";
+import { SIDEBAR_SECTION_ACTION_BUTTON_CLASSES, SIDEBAR_SECTION_ACTION_ICON_CLASSES } from "@/components/AppSidebar/SidebarSection";
import MemoDisplaySettingMenu from "@/components/MemoDisplaySettingMenu";
import { ViewProvider } from "@/contexts/ViewContext";
@@ -41,7 +42,11 @@ describe("MemoDisplaySettingMenu", () => {
</ViewProvider>,
);
- fireEvent.click(screen.getByRole("button", { name: "View options" }));
+ const trigger = screen.getByRole("button", { name: "View options" });
+ expect(trigger).toHaveClass(...SIDEBAR_SECTION_ACTION_BUTTON_CLASSES.split(" "));
+ expect(trigger.querySelector("svg")).toHaveClass(SIDEBAR_SECTION_ACTION_ICON_CLASSES);
+
+ fireEvent.click(trigger);
const compactMode = screen.getByRole("switch", { name: "Compact mode" });
expect(compactMode).not.toBeChecked();
diff --git a/web/tests/memo-filter-context.test.tsx b/web/tests/memo-filter-context.test.tsx
index b004d0e91..4d56b2479 100644
--- a/web/tests/memo-filter-context.test.tsx
+++ b/web/tests/memo-filter-context.test.tsx
@@ -5,15 +5,15 @@ import { MemoFilterProvider, parseFilterQuery, useMemoFilterContext } from "@/co
import { BUILTIN_TASKS_VIEW_ID } from "@/lib/memo-views";
const Harness = () => {
- const { filters, setFilters, setShortcut, shortcut } = useMemoFilterContext();
+ const { filters, setFilters, setMemoView, memoView } = useMemoFilterContext();
return (
<div>
<output data-testid="filters">{JSON.stringify(filters)}</output>
- <output data-testid="shortcut">{shortcut}</output>
+ <output data-testid="memoView">{memoView}</output>
<button type="button" onClick={() => setFilters([{ factor: "contentSearch", value: "plan" }])}>
Search plan
</button>
- <button type="button" onClick={() => setShortcut(BUILTIN_TASKS_VIEW_ID)}>
+ <button type="button" onClick={() => setMemoView(BUILTIN_TASKS_VIEW_ID)}>
Select Tasks
</button>
</div>
@@ -40,6 +40,6 @@ describe("MemoFilterProvider", () => {
fireEvent.click(screen.getByRole("button", { name: "Select Tasks" }));
expect(screen.getByTestId("filters")).toHaveTextContent('[{"factor":"contentSearch","value":"plan"}]');
- expect(screen.getByTestId("shortcut")).toHaveTextContent(BUILTIN_TASKS_VIEW_ID);
+ expect(screen.getByTestId("memoView")).toHaveTextContent(BUILTIN_TASKS_VIEW_ID);
});
});
diff --git a/web/tests/memo-view-locales.test.ts b/web/tests/memo-view-locales.test.ts
new file mode 100644
index 000000000..03abff8d5
--- /dev/null
+++ b/web/tests/memo-view-locales.test.ts
@@ -0,0 +1,24 @@
+import { describe, expect, it } from "vitest";
+
+interface LocaleMessages {
+ common?: Record<string, unknown>;
+ setting?: Record<string, Record<string, unknown>>;
+}
+
+const localeModules = import.meta.glob<{ default: LocaleMessages }>("../src/locales/*.json", { eager: true });
+
+describe("memo view locale resources", () => {
+ for (const [path, module] of Object.entries(localeModules)) {
+ it(`uses only the memo view resource keys in ${path}`, () => {
+ const messages = module.default;
+
+ expect(messages.common?.views).toEqual(expect.any(String));
+ expect(messages.setting?.["memo-view"]?.["delete-confirm"]).toEqual(expect.any(String));
+ expect(messages.setting?.["memo-view"]?.["delete-success"]).toEqual(expect.any(String));
+
+ expect(messages.common?.["shortcut-filter"]).toBeUndefined();
+ expect(messages.common?.shortcuts).toBeUndefined();
+ expect(messages.setting?.shortcut).toBeUndefined();
+ });
+ }
+});
diff --git a/web/tests/memo-views.test.ts b/web/tests/memo-views.test.ts
index 6ad3d653e..4a6052074 100644
--- a/web/tests/memo-views.test.ts
+++ b/web/tests/memo-views.test.ts
@@ -4,7 +4,7 @@ import {
BUILTIN_TASKS_VIEW_FILTER,
BUILTIN_TASKS_VIEW_ID,
getMemoScopePath,
- getShortcutId,
+ getMemoViewId,
isMemoScopeRoute,
resolveMemoScope,
} from "@/lib/memo-views";
@@ -36,14 +36,14 @@ describe("memo views", () => {
it("uses a collision-safe built-in Tasks view", () => {
expect(BUILTIN_TASKS_VIEW_ID).not.toBe("tasks");
expect(BUILTIN_TASKS_VIEW_FILTER).toBe("has_task_list && has_incomplete_tasks");
- expect(getShortcutId("users/steven/shortcuts/work")).toBe("work");
+ expect(getMemoViewId("users/steven/views/work")).toBe("work");
});
it("composes Tasks with search, tags, creator, and visibility", () => {
expect(
buildMemoFilter({
creatorName: "users/steven",
- currentShortcut: BUILTIN_TASKS_VIEW_ID,
+ currentMemoView: BUILTIN_TASKS_VIEW_ID,
filters: [
{ factor: "contentSearch", value: "plan" },
{ factor: "tagSearch", value: "work" },
@@ -56,13 +56,13 @@ describe("memo views", () => {
);
});
- it("uses a custom shortcut filter when Tasks is not selected", () => {
+ it("uses a custom memo view filter when Tasks is not selected", () => {
expect(
buildMemoFilter({
- currentShortcut: "work",
+ currentMemoView: "work",
filters: [],
includePinned: false,
- selectedShortcutFilter: 'tag in ["work"]',
+ selectedMemoViewFilter: 'tag in ["work"]',
}),
).toBe('tag in ["work"]');
});
diff --git a/web/tests/month-navigator.test.tsx b/web/tests/month-navigator.test.tsx
index 759212835..71c433f21 100644
--- a/web/tests/month-navigator.test.tsx
+++ b/web/tests/month-navigator.test.tsx
@@ -1,5 +1,6 @@
import { fireEvent, render, screen } from "@testing-library/react";
import { describe, expect, it, vi } from "vitest";
+import { SIDEBAR_ROW_BOX_CLASSES } from "@/components/AppSidebar/SidebarRow";
import { MonthNavigator } from "@/components/StatisticsView/MonthNavigator";
vi.mock("react-i18next", () => ({
@@ -11,7 +12,9 @@ describe("MonthNavigator", () => {
const onMonthChange = vi.fn();
render(<MonthNavigator visibleMonth="2026-08" onMonthChange={onMonthChange} />);
- expect(screen.getByRole("heading", { name: "August 2026" })).toBeInTheDocument();
+ const heading = screen.getByRole("heading", { name: "August 2026", level: 2 });
+ expect(heading).toBeInTheDocument();
+ expect(heading.closest("header")).toHaveClass(...SIDEBAR_ROW_BOX_CLASSES.split(" "));
expect(screen.queryByRole("button", { name: "Select month" })).not.toBeInTheDocument();
fireEvent.click(screen.getByRole("button", { name: "common.previous-month" }));
diff --git a/web/tests/query-deduplication.test.tsx b/web/tests/query-deduplication.test.tsx
index 51873d270..179288610 100644
--- a/web/tests/query-deduplication.test.tsx
+++ b/web/tests/query-deduplication.test.tsx
@@ -9,7 +9,7 @@ import {
} from "@/components/MemoContent/MentionResolutionContext";
import { useResolvedRelationMemos } from "@/components/MemoMetadata/Relation/useResolvedRelationMemos";
import { memoKeys } from "@/hooks/useMemoQueries";
-import { useUser, userKeys, useUsersByNames, useUsersByUsernames } from "@/hooks/useUserQueries";
+import { useMemoViews, useUser, userKeys, useUsersByNames, useUsersByUsernames } from "@/hooks/useUserQueries";
import type { Memo } from "@/types/proto/api/v1/memo_service_pb";
import type { User } from "@/types/proto/api/v1/user_service_pb";
@@ -17,13 +17,16 @@ const clients = vi.hoisted(() => ({
batchGetUsers: vi.fn(),
getMemo: vi.fn(),
getUser: vi.fn(),
+ listMemoViews: vi.fn(),
}));
vi.mock("@/connect", () => ({
memoServiceClient: {
getMemo: clients.getMemo,
},
- shortcutServiceClient: {},
+ memoViewServiceClient: {
+ listMemoViews: clients.listMemoViews,
+ },
userServiceClient: {
batchGetUsers: clients.batchGetUsers,
getUser: clients.getUser,
@@ -49,6 +52,29 @@ describe("query deduplication", () => {
clients.batchGetUsers.mockReset();
clients.getMemo.mockReset();
clients.getUser.mockReset();
+ clients.listMemoViews.mockReset();
+ });
+
+ it("scopes memo-view queries by parent and skips requests without one", async () => {
+ clients.listMemoViews.mockImplementation(async ({ parent }: { parent: string }) => ({
+ memoViews: [{ name: `${parent}/views/work`, title: parent, filter: "pinned" }],
+ }));
+ const queryClient = createQueryClient();
+ const wrapper = createWrapper(queryClient);
+
+ const disabled = renderHook(() => useMemoViews(undefined), { wrapper });
+ expect(disabled.result.current.fetchStatus).toBe("idle");
+
+ const alice = renderHook(() => useMemoViews("users/alice"), { wrapper });
+ const bob = renderHook(() => useMemoViews("users/bob"), { wrapper });
+ await waitFor(() => {
+ expect(alice.result.current.isSuccess).toBe(true);
+ expect(bob.result.current.isSuccess).toBe(true);
+ });
+
+ expect(clients.listMemoViews.mock.calls.map(([request]) => request.parent)).toEqual(["users/alice", "users/bob"]);
+ expect(queryClient.getQueryData(userKeys.memoViews("users/alice"))).toEqual(alice.result.current.data);
+ expect(queryClient.getQueryData(userKeys.memoViews("users/bob"))).toEqual(bob.result.current.data);
});
it("fetches each user name once across individual and overlapping group queries", async () => {
diff --git a/web/tests/router-config.test.tsx b/web/tests/router-config.test.tsx
index 78e2d81d7..2c05a1249 100644
--- a/web/tests/router-config.test.tsx
+++ b/web/tests/router-config.test.tsx
@@ -58,13 +58,13 @@ describe("router configuration", () => {
});
it("wraps authenticated-only pages in RequireAuthRoute", () => {
- for (const path of [ROUTES.ARCHIVED, ROUTES.ATTACHMENTS, ROUTES.INBOX, ROUTES.SETTING]) {
+ for (const path of [ROUTES.ARCHIVED, ROUTES.VIEWS, ROUTES.ATTACHMENTS, ROUTES.INBOX, ROUTES.SETTING]) {
expect(hasAncestorOfType(routeConfig, path, RequireAuthRoute)).toBe(true);
}
});
it("keeps non-feed pages behind their full initialization requirements", () => {
- for (const path of [ROUTES.SHORTCUTS, ROUTES.ATTACHMENTS, ROUTES.INBOX, ROUTES.SETTING]) {
+ for (const path of [ROUTES.VIEWS, ROUTES.ATTACHMENTS, ROUTES.INBOX, ROUTES.SETTING]) {
expect(hasAncestorOfType(routeConfig, path, RequireFullInitializationRoute)).toBe(true);
}
expect(hasAncestorOfType(routeConfig, ROUTES.ABOUT, RequireInstanceInitializationRoute)).toBe(true);
diff --git a/web/tests/sidebar-row-grammar.test.tsx b/web/tests/sidebar-row-grammar.test.tsx
index c5fd256e7..e43132583 100644
--- a/web/tests/sidebar-row-grammar.test.tsx
+++ b/web/tests/sidebar-row-grammar.test.tsx
@@ -1,6 +1,7 @@
import { render, screen } from "@testing-library/react";
import { describe, expect, it, vi } from "vitest";
import SidebarRow, { SIDEBAR_ROW_BOX_CLASSES } from "@/components/AppSidebar/SidebarRow";
+import SidebarSection, { SIDEBAR_SECTION_CONTENT_CLASSES } from "@/components/AppSidebar/SidebarSection";
import TagTree from "@/components/TagTree";
vi.mock("@/utils/i18n", () => ({ useTranslate: () => (key: string) => key }));
@@ -13,6 +14,17 @@ vi.mock("@/utils/i18n", () => ({ useTranslate: () => (key: string) => key }));
const boxClasses = SIDEBAR_ROW_BOX_CLASSES.split(" ");
describe("sidebar row grammar", () => {
+ it("gives every content section the same title and row rhythm", () => {
+ render(
+ <SidebarSection label="Statistics">
+ <SidebarRow label="August 2026" />
+ </SidebarSection>,
+ );
+
+ expect(screen.getByRole("heading", { name: "Statistics", level: 2 })).toHaveClass("text-2xs", "font-normal");
+ expect(screen.getByRole("button", { name: "August 2026" }).parentElement).toHaveClass(...SIDEBAR_SECTION_CONTENT_CLASSES.split(" "));
+ });
+
it("gives a nav row the shared row box", () => {
render(<SidebarRow icon={() => null} label="Tasks" />);
diff --git a/web/tests/tags-section.test.tsx b/web/tests/tags-section.test.tsx
new file mode 100644
index 000000000..4b5fff6c6
--- /dev/null
+++ b/web/tests/tags-section.test.tsx
@@ -0,0 +1,48 @@
+import { fireEvent, render, screen } from "@testing-library/react";
+import { MemoryRouter } from "react-router-dom";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import {
+ SIDEBAR_SECTION_ACTION_ACTIVE_CLASSES,
+ SIDEBAR_SECTION_ACTION_BUTTON_CLASSES,
+ SIDEBAR_SECTION_ACTION_ICON_CLASSES,
+} from "@/components/AppSidebar/SidebarSection";
+import TagsSection from "@/components/AppSidebar/TagsSection";
+import { MemoFilterProvider } from "@/contexts/MemoFilterContext";
+
+vi.mock("@/utils/i18n", () => ({ useTranslate: () => (key: string) => key }));
+
+describe("TagsSection", () => {
+ beforeEach(() => {
+ localStorage.clear();
+ });
+
+ it("keeps the title count-free and uses the shared section action grammar", () => {
+ render(
+ <MemoryRouter>
+ <MemoFilterProvider>
+ <TagsSection tagCount={{ a: 2, "a/b": 1 }} scope="home" />
+ </MemoFilterProvider>
+ </MemoryRouter>,
+ );
+
+ const heading = screen.getByRole("heading", { name: "common.tags", level: 2 });
+ expect(heading.parentElement).toHaveTextContent(/^common.tags$/);
+
+ const listButton = screen.getByRole("button", { name: "common.tags: memo.layout-list" });
+ const treeButton = screen.getByRole("button", { name: "common.tags: common.tree-mode" });
+ const stableActionClasses = SIDEBAR_SECTION_ACTION_BUTTON_CLASSES.split(" ").filter(
+ (className) => className !== "text-muted-foreground/65",
+ );
+ for (const button of [listButton, treeButton]) {
+ expect(button).toHaveClass(...stableActionClasses);
+ expect(button.querySelector("svg")).toHaveClass(SIDEBAR_SECTION_ACTION_ICON_CLASSES);
+ }
+ expect(listButton).toHaveClass(...SIDEBAR_SECTION_ACTION_ACTIVE_CLASSES.split(" "));
+ expect(treeButton).toHaveClass("text-muted-foreground/65");
+
+ fireEvent.click(treeButton);
+ expect(treeButton).toHaveClass(...SIDEBAR_SECTION_ACTION_ACTIVE_CLASSES.split(" "));
+ expect(listButton).not.toHaveClass(...SIDEBAR_SECTION_ACTION_ACTIVE_CLASSES.split(" "));
+ expect(listButton).toHaveClass("text-muted-foreground/65");
+ });
+});