chore: update embedded content renderers

api/v2/resource_service.go

@@ -73,7 +73,7 @@ func (s *APIV2Service) GetResource(ctx context.Context, request *apiv2pb.GetReso
 		ID: &request.Id,
 	})
 	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to list resources: %v", err)
+		return nil, status.Errorf(codes.Internal, "failed to get resource: %v", err)
 	}
 	if resource == nil {
 		return nil, status.Errorf(codes.NotFound, "resource not found")
@@ -84,6 +84,22 @@ func (s *APIV2Service) GetResource(ctx context.Context, request *apiv2pb.GetReso
 	}, nil
 }
 
+func (s *APIV2Service) GetResourceByName(ctx context.Context, request *apiv2pb.GetResourceByNameRequest) (*apiv2pb.GetResourceByNameResponse, error) {
+	resource, err := s.Store.GetResource(ctx, &store.FindResource{
+		ResourceName: &request.Name,
+	})
+	if err != nil {
+		return nil, status.Errorf(codes.Internal, "failed to get resource: %v", err)
+	}
+	if resource == nil {
+		return nil, status.Errorf(codes.NotFound, "resource not found")
+	}
+
+	return &apiv2pb.GetResourceByNameResponse{
+		Resource: s.convertResourceFromStore(ctx, resource),
+	}, nil
+}
+
 func (s *APIV2Service) UpdateResource(ctx context.Context, request *apiv2pb.UpdateResourceRequest) (*apiv2pb.UpdateResourceResponse, error) {
 	if request.UpdateMask == nil || len(request.UpdateMask.Paths) == 0 {
 		return nil, status.Errorf(codes.InvalidArgument, "update mask is required")

plugin/gomark/parser/embedded_content_test.go

@@ -48,6 +48,13 @@ func TestEmbeddedContentParser(t *testing.T) {
 				Params:       "align=center",
 			},
 		},
+		{
+			text: "![[resources/6uxnhT98q8vN8anBbUbRGu?align=center]]",
+			embeddedContent: &ast.EmbeddedContent{
+				ResourceName: "resources/6uxnhT98q8vN8anBbUbRGu",
+				Params:       "align=center",
+			},
+		},
 	}
 
 	for _, test := range tests {

proto/api/v2/resource_service.proto

@@ -20,6 +20,10 @@ service ResourceService {
     option (google.api.http) = {get: "/api/v2/resources/{id}"};
     option (google.api.method_signature) = "id";
   }
+  rpc GetResourceByName(GetResourceByNameRequest) returns (GetResourceByNameResponse) {
+    option (google.api.http) = {get: "/api/v2/resources/{name}"};
+    option (google.api.method_signature) = "name";
+  }
   rpc UpdateResource(UpdateResourceRequest) returns (UpdateResourceResponse) {
     option (google.api.http) = {
       patch: "/api/v2/resources/{resource.id}",
@@ -78,6 +82,14 @@ message GetResourceResponse {
   Resource resource = 1;
 }
 
+message GetResourceByNameRequest {
+  string name = 1;
+}
+
+message GetResourceByNameResponse {
+  Resource resource = 1;
+}
+
 message UpdateResourceRequest {
   Resource resource = 1;
 

proto/gen/api/v2/README.md

@@ -112,6 +112,8 @@
     - [CreateResourceResponse](#memos-api-v2-CreateResourceResponse)
     - [DeleteResourceRequest](#memos-api-v2-DeleteResourceRequest)
     - [DeleteResourceResponse](#memos-api-v2-DeleteResourceResponse)
+    - [GetResourceByNameRequest](#memos-api-v2-GetResourceByNameRequest)
+    - [GetResourceByNameResponse](#memos-api-v2-GetResourceByNameResponse)
     - [GetResourceRequest](#memos-api-v2-GetResourceRequest)
     - [GetResourceResponse](#memos-api-v2-GetResourceResponse)
     - [ListResourcesRequest](#memos-api-v2-ListResourcesRequest)
@@ -1642,6 +1644,36 @@
 
 
 
+<a name="memos-api-v2-GetResourceByNameRequest"></a>
+
+### GetResourceByNameRequest
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| name | [string](#string) |  |  |
+
+
+
+
+
+
+<a name="memos-api-v2-GetResourceByNameResponse"></a>
+
+### GetResourceByNameResponse
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| resource | [Resource](#memos-api-v2-Resource) |  |  |
+
+
+
+
+
+
 <a name="memos-api-v2-GetResourceRequest"></a>
 
 ### GetResourceRequest
@@ -1766,6 +1798,7 @@
 | CreateResource | [CreateResourceRequest](#memos-api-v2-CreateResourceRequest) | [CreateResourceResponse](#memos-api-v2-CreateResourceResponse) |  |
 | ListResources | [ListResourcesRequest](#memos-api-v2-ListResourcesRequest) | [ListResourcesResponse](#memos-api-v2-ListResourcesResponse) |  |
 | GetResource | [GetResourceRequest](#memos-api-v2-GetResourceRequest) | [GetResourceResponse](#memos-api-v2-GetResourceResponse) |  |
+| GetResourceByName | [GetResourceByNameRequest](#memos-api-v2-GetResourceByNameRequest) | [GetResourceByNameResponse](#memos-api-v2-GetResourceByNameResponse) |  |
 | UpdateResource | [UpdateResourceRequest](#memos-api-v2-UpdateResourceRequest) | [UpdateResourceResponse](#memos-api-v2-UpdateResourceResponse) |  |
 | DeleteResource | [DeleteResourceRequest](#memos-api-v2-DeleteResourceRequest) | [DeleteResourceResponse](#memos-api-v2-DeleteResourceResponse) |  |
 

proto/gen/api/v2/resource_service.pb.gw.go

@@ -137,6 +137,58 @@ func local_request_ResourceService_GetResource_0(ctx context.Context, marshaler
 
 }
 
+func request_ResourceService_GetResourceByName_0(ctx context.Context, marshaler runtime.Marshaler, client ResourceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq GetResourceByNameRequest
+	var metadata runtime.ServerMetadata
+
+	var (
+		val string
+		ok  bool
+		err error
+		_   = err
+	)
+
+	val, ok = pathParams["name"]
+	if !ok {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
+	}
+
+	protoReq.Name, err = runtime.String(val)
+	if err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
+	}
+
+	msg, err := client.GetResourceByName(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	return msg, metadata, err
+
+}
+
+func local_request_ResourceService_GetResourceByName_0(ctx context.Context, marshaler runtime.Marshaler, server ResourceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq GetResourceByNameRequest
+	var metadata runtime.ServerMetadata
+
+	var (
+		val string
+		ok  bool
+		err error
+		_   = err
+	)
+
+	val, ok = pathParams["name"]
+	if !ok {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
+	}
+
+	protoReq.Name, err = runtime.String(val)
+	if err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
+	}
+
+	msg, err := server.GetResourceByName(ctx, &protoReq)
+	return msg, metadata, err
+
+}
+
 var (
 	filter_ResourceService_UpdateResource_0 = &utilities.DoubleArray{Encoding: map[string]int{"resource": 0, "id": 1}, Base: []int{1, 4, 5, 2, 0, 0, 0, 0}, Check: []int{0, 1, 1, 2, 4, 2, 2, 3}}
 )
@@ -370,6 +422,31 @@ func RegisterResourceServiceHandlerServer(ctx context.Context, mux *runtime.Serv
 
 	})
 
+	mux.Handle("GET", pattern_ResourceService_GetResourceByName_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)
+		var err error
+		var annotatedContext context.Context
+		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v2.ResourceService/GetResourceByName", runtime.WithHTTPPathPattern("/api/v2/resources/{name}"))
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := local_request_ResourceService_GetResourceByName_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_ResourceService_GetResourceByName_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
 	mux.Handle("PATCH", pattern_ResourceService_UpdateResource_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -527,6 +604,28 @@ func RegisterResourceServiceHandlerClient(ctx context.Context, mux *runtime.Serv
 
 	})
 
+	mux.Handle("GET", pattern_ResourceService_GetResourceByName_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)
+		var err error
+		var annotatedContext context.Context
+		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/memos.api.v2.ResourceService/GetResourceByName", runtime.WithHTTPPathPattern("/api/v2/resources/{name}"))
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := request_ResourceService_GetResourceByName_0(annotatedContext, inboundMarshaler, client, req, pathParams)
+		annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
+		if err != nil {
+			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_ResourceService_GetResourceByName_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
 	mux.Handle("PATCH", pattern_ResourceService_UpdateResource_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -581,6 +680,8 @@ var (
 
 	pattern_ResourceService_GetResource_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"api", "v2", "resources", "id"}, ""))
 
+	pattern_ResourceService_GetResourceByName_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"api", "v2", "resources", "name"}, ""))
+
 	pattern_ResourceService_UpdateResource_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"api", "v2", "resources", "resource.id"}, ""))
 
 	pattern_ResourceService_DeleteResource_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"api", "v2", "resources", "id"}, ""))
@@ -593,6 +694,8 @@ var (
 
 	forward_ResourceService_GetResource_0 = runtime.ForwardResponseMessage
 
+	forward_ResourceService_GetResourceByName_0 = runtime.ForwardResponseMessage
+
 	forward_ResourceService_UpdateResource_0 = runtime.ForwardResponseMessage
 
 	forward_ResourceService_DeleteResource_0 = runtime.ForwardResponseMessage

proto/gen/api/v2/resource_service_grpc.pb.go

@@ -19,11 +19,12 @@ import (
 const _ = grpc.SupportPackageIsVersion7
 
 const (
-	ResourceService_CreateResource_FullMethodName = "/memos.api.v2.ResourceService/CreateResource"
-	ResourceService_ListResources_FullMethodName  = "/memos.api.v2.ResourceService/ListResources"
-	ResourceService_GetResource_FullMethodName    = "/memos.api.v2.ResourceService/GetResource"
-	ResourceService_UpdateResource_FullMethodName = "/memos.api.v2.ResourceService/UpdateResource"
-	ResourceService_DeleteResource_FullMethodName = "/memos.api.v2.ResourceService/DeleteResource"
+	ResourceService_CreateResource_FullMethodName    = "/memos.api.v2.ResourceService/CreateResource"
+	ResourceService_ListResources_FullMethodName     = "/memos.api.v2.ResourceService/ListResources"
+	ResourceService_GetResource_FullMethodName       = "/memos.api.v2.ResourceService/GetResource"
+	ResourceService_GetResourceByName_FullMethodName = "/memos.api.v2.ResourceService/GetResourceByName"
+	ResourceService_UpdateResource_FullMethodName    = "/memos.api.v2.ResourceService/UpdateResource"
+	ResourceService_DeleteResource_FullMethodName    = "/memos.api.v2.ResourceService/DeleteResource"
 )
 
 // ResourceServiceClient is the client API for ResourceService service.
@@ -33,6 +34,7 @@ type ResourceServiceClient interface {
 	CreateResource(ctx context.Context, in *CreateResourceRequest, opts ...grpc.CallOption) (*CreateResourceResponse, error)
 	ListResources(ctx context.Context, in *ListResourcesRequest, opts ...grpc.CallOption) (*ListResourcesResponse, error)
 	GetResource(ctx context.Context, in *GetResourceRequest, opts ...grpc.CallOption) (*GetResourceResponse, error)
+	GetResourceByName(ctx context.Context, in *GetResourceByNameRequest, opts ...grpc.CallOption) (*GetResourceByNameResponse, error)
 	UpdateResource(ctx context.Context, in *UpdateResourceRequest, opts ...grpc.CallOption) (*UpdateResourceResponse, error)
 	DeleteResource(ctx context.Context, in *DeleteResourceRequest, opts ...grpc.CallOption) (*DeleteResourceResponse, error)
 }
@@ -72,6 +74,15 @@ func (c *resourceServiceClient) GetResource(ctx context.Context, in *GetResource
 	return out, nil
 }
 
+func (c *resourceServiceClient) GetResourceByName(ctx context.Context, in *GetResourceByNameRequest, opts ...grpc.CallOption) (*GetResourceByNameResponse, error) {
+	out := new(GetResourceByNameResponse)
+	err := c.cc.Invoke(ctx, ResourceService_GetResourceByName_FullMethodName, in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *resourceServiceClient) UpdateResource(ctx context.Context, in *UpdateResourceRequest, opts ...grpc.CallOption) (*UpdateResourceResponse, error) {
 	out := new(UpdateResourceResponse)
 	err := c.cc.Invoke(ctx, ResourceService_UpdateResource_FullMethodName, in, out, opts...)
@@ -97,6 +108,7 @@ type ResourceServiceServer interface {
 	CreateResource(context.Context, *CreateResourceRequest) (*CreateResourceResponse, error)
 	ListResources(context.Context, *ListResourcesRequest) (*ListResourcesResponse, error)
 	GetResource(context.Context, *GetResourceRequest) (*GetResourceResponse, error)
+	GetResourceByName(context.Context, *GetResourceByNameRequest) (*GetResourceByNameResponse, error)
 	UpdateResource(context.Context, *UpdateResourceRequest) (*UpdateResourceResponse, error)
 	DeleteResource(context.Context, *DeleteResourceRequest) (*DeleteResourceResponse, error)
 	mustEmbedUnimplementedResourceServiceServer()
@@ -115,6 +127,9 @@ func (UnimplementedResourceServiceServer) ListResources(context.Context, *ListRe
 func (UnimplementedResourceServiceServer) GetResource(context.Context, *GetResourceRequest) (*GetResourceResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetResource not implemented")
 }
+func (UnimplementedResourceServiceServer) GetResourceByName(context.Context, *GetResourceByNameRequest) (*GetResourceByNameResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetResourceByName not implemented")
+}
 func (UnimplementedResourceServiceServer) UpdateResource(context.Context, *UpdateResourceRequest) (*UpdateResourceResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateResource not implemented")
 }
@@ -188,6 +203,24 @@ func _ResourceService_GetResource_Handler(srv interface{}, ctx context.Context,
 	return interceptor(ctx, in, info, handler)
 }
 
+func _ResourceService_GetResourceByName_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetResourceByNameRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ResourceServiceServer).GetResourceByName(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: ResourceService_GetResourceByName_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ResourceServiceServer).GetResourceByName(ctx, req.(*GetResourceByNameRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _ResourceService_UpdateResource_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(UpdateResourceRequest)
 	if err := dec(in); err != nil {
@@ -243,6 +276,10 @@ var ResourceService_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "GetResource",
 			Handler:    _ResourceService_GetResource_Handler,
 		},
+		{
+			MethodName: "GetResourceByName",
+			Handler:    _ResourceService_GetResourceByName_Handler,
+		},
 		{
 			MethodName: "UpdateResource",
 			Handler:    _ResourceService_UpdateResource_Handler,

server/version/version.go

@@ -9,7 +9,7 @@ import (
 
 // Version is the service current released version.
 // Semantic versioning: https://semver.org/
-var Version = "0.18.2"
+var Version = "0.19.0"
 
 // DevVersion is the service current development version.
 var DevVersion = "0.18.2"

web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx

@@ -7,28 +7,28 @@ import { RendererContext } from "../types";
 import Error from "./Error";
 
 interface Props {
-  memoId: number;
+  resourceId: string;
   params: string;
 }
 
-const EmbeddedMemo = ({ memoId }: Props) => {
+const EmbeddedMemo = ({ resourceId }: Props) => {
   const context = useContext(RendererContext);
   const loadingState = useLoading();
   const memoStore = useMemoStore();
-  const memo = memoStore.getMemoById(memoId);
-  const resourceName = `memos/${memoId}`;
+  const memo = memoStore.getMemoByName(resourceId);
+  const resourceName = `memos/${resourceId}`;
 
   useEffect(() => {
-    memoStore.getOrFetchMemoById(memoId).finally(() => loadingState.setFinish());
-  }, [memoId]);
+    memoStore.getOrFetchMemoByName(resourceId).finally(() => loadingState.setFinish());
+  }, [resourceId]);
 
   if (loadingState.isLoading) {
     return null;
   }
   if (!memo) {
-    return <Error message={`Memo not found: ${memoId}`} />;
+    return <Error message={`Memo not found: ${resourceId}`} />;
   }
-  if (memoId === context.memoId || context.embeddedMemos.has(resourceName)) {
+  if (memo.id === context.memoId || context.embeddedMemos.has(resourceName)) {
     return <Error message={`Nested Rendering Error: ![[${resourceName}]]`} />;
   }
 
@@ -36,7 +36,7 @@ const EmbeddedMemo = ({ memoId }: Props) => {
   context.embeddedMemos.add(resourceName);
   return (
     <div className="w-full">
-      <MemoContent nodes={memo.nodes} memoId={memoId} embeddedMemos={context.embeddedMemos} />
+      <MemoContent nodes={memo.nodes} memoId={memo.id} embeddedMemos={context.embeddedMemos} />
       <MemoResourceListView resources={memo.resources} />
     </div>
   );

web/src/components/MemoContent/EmbeddedContent/EmbeddedResource.tsx

@@ -6,7 +6,7 @@ import { useResourceStore } from "@/store/v1";
 import Error from "./Error";
 
 interface Props {
-  resourceId: number;
+  resourceId: string;
   params: string;
 }
 
@@ -38,11 +38,11 @@ const getAdditionalClassNameWithParams = (params: URLSearchParams) => {
 const EmbeddedResource = ({ resourceId, params: paramsStr }: Props) => {
   const loadingState = useLoading();
   const resourceStore = useResourceStore();
-  const resource = resourceStore.getResourceById(resourceId);
+  const resource = resourceStore.getResourceByName(resourceId);
   const params = new URLSearchParams(paramsStr);
 
   useEffect(() => {
-    resourceStore.getOrFetchResourceById(resourceId).finally(() => loadingState.setFinish());
+    resourceStore.getOrFetchResourceByName(resourceId).finally(() => loadingState.setFinish());
   }, [resourceId]);
 
   if (loadingState.isLoading) {

web/src/components/MemoContent/EmbeddedContent/index.tsx

@@ -15,9 +15,9 @@ const extractResourceTypeAndId = (resourceName: string) => {
 const EmbeddedContent = ({ resourceName, params }: Props) => {
   const { resourceType, resourceId } = extractResourceTypeAndId(resourceName);
   if (resourceType === "memos") {
-    return <EmbeddedMemo memoId={Number(resourceId)} params={params} />;
+    return <EmbeddedMemo resourceId={resourceId} params={params} />;
   } else if (resourceType === "resources") {
-    return <EmbeddedResource resourceId={Number(resourceId)} params={params} />;
+    return <EmbeddedResource resourceId={resourceId} params={params} />;
   }
   return <Error message={`Unknown resource: ${resourceName}`} />;
 };

web/src/store/v1/resource.ts

@@ -38,5 +38,29 @@ export const useResourceStore = create(
     getResourceById: (id: number) => {
       return get().resourceMapById[id];
     },
+    getOrFetchResourceByName: async (name: string, options?: { skipCache?: boolean; skipStore?: boolean }) => {
+      const resourceMap = get().resourceMapById;
+      const cachedResource = Object.values(resourceMap).find((r) => r.name === name);
+      if (cachedResource && !options?.skipCache) {
+        return cachedResource;
+      }
+
+      const { resource } = await resourceServiceClient.getResourceByName({
+        name,
+      });
+      if (!resource) {
+        throw new Error("Resource not found");
+      }
+
+      if (!options?.skipStore) {
+        resourceMap[resource.id] = resource;
+        set({ resourceMapById: resourceMap });
+      }
+      return resource;
+    },
+    getResourceByName: (name: string) => {
+      const resourceMap = get().resourceMapById;
+      return Object.values(resourceMap).find((r) => r.name === name);
+    },
   }))
 );