Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
chore: handle resource not found
Stevend5f874e1853a
diff --git a/api/v2/resource_service.go b/api/v2/resource_service.goindex e80fcf4f6..36a352432 100644--- a/api/v2/resource_service.go+++ b/api/v2/resource_service.go@@ -73,6 +73,9 @@ func (s *APIV2Service) GetResource(ctx context.Context, request *apiv2pb.GetResoif err != nil {return nil, status.Errorf(codes.Internal, "failed to list resources: %v", err)}+ if resource == nil {+ return nil, status.Errorf(codes.NotFound, "resource not found")+ }return &apiv2pb.GetResourceResponse{Resource: s.convertResourceFromStore(ctx, resource),diff --git a/web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx b/web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsxindex 71faad628..d69fd648a 100644--- a/web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx+++ b/web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx@@ -1,4 +1,5 @@import { useContext, useEffect } from "react";+import useLoading from "@/hooks/useLoading";import { useMemoStore } from "@/store/v1";import MemoContent from "..";import { RendererContext } from "../types";@@ -11,17 +12,21 @@ interface Props {const EmbeddedMemo = ({ memoId }: Props) => {const context = useContext(RendererContext);+ const loadingState = useLoading();const memoStore = useMemoStore();const memo = memoStore.getMemoById(memoId);const resourceName = `memos/${memoId}`;useEffect(() => {- memoStore.getOrFetchMemoById(memoId);+ memoStore.getOrFetchMemoById(memoId).finally(() => loadingState.setFinish());}, [memoId]);- if (!memo) {+ if (loadingState.isLoading) {return null;}+ if (!memo) {+ return <Error message={`Memo not found: ${memoId}`} />;+ }if (memoId === context.memoId || context.embeddedMemos.has(resourceName)) {return <Error message={`Nested Rendering Error: ![[${resourceName}]]`} />;}diff --git a/web/src/components/MemoContent/EmbeddedContent/EmbeddedResource.tsx b/web/src/components/MemoContent/EmbeddedContent/EmbeddedResource.tsxindex 620d6b37c..77a8e6a47 100644--- a/web/src/components/MemoContent/EmbeddedContent/EmbeddedResource.tsx+++ b/web/src/components/MemoContent/EmbeddedContent/EmbeddedResource.tsx@@ -1,7 +1,9 @@import classNames from "classnames";import { useEffect } from "react";import MemoResourceListView from "@/components/MemoResourceListView";+import useLoading from "@/hooks/useLoading";import { useResourceStore } from "@/store/v1";+import Error from "./Error";interface Props {resourceId: number;@@ -34,17 +36,21 @@ const getAdditionalClassNameWithParams = (params: URLSearchParams) => {};const EmbeddedResource = ({ resourceId, params: paramsStr }: Props) => {+ const loadingState = useLoading();const resourceStore = useResourceStore();const resource = resourceStore.getResourceById(resourceId);const params = new URLSearchParams(paramsStr);useEffect(() => {- resourceStore.getOrFetchResourceById(resourceId);+ resourceStore.getOrFetchResourceById(resourceId).finally(() => loadingState.setFinish());}, [resourceId]);- if (!resource) {+ if (loadingState.isLoading) {return null;}+ if (!resource) {+ return <Error message={`Resource not found: ${resourceId}`} />;+ }return (<div className={classNames("max-w-full", getAdditionalClassNameWithParams(params))}>