= (props: Props) => {
"flex flex-row justify-start items-center hover:opacity-70",
commentAmount === 0 && "invisible group-hover:visible",
)}
- to={`/m/${memo.uid}#comments`}
+ to={`${memoLink(memo.name)}#comments`}
viewTransition
state={{
from: parentPage,
diff --git a/web/src/pages/MemoDetail.tsx b/web/src/pages/MemoDetail.tsx
index 3b006ec9..754c8d6c 100644
--- a/web/src/pages/MemoDetail.tsx
+++ b/web/src/pages/MemoDetail.tsx
@@ -12,11 +12,12 @@ import MobileHeader from "@/components/MobileHeader";
import useCurrentUser from "@/hooks/useCurrentUser";
import useNavigateTo from "@/hooks/useNavigateTo";
import useResponsiveWidth from "@/hooks/useResponsiveWidth";
-import { useMemoStore, useWorkspaceSettingStore } from "@/store/v1";
+import { memoNamePrefix, useMemoStore, useWorkspaceSettingStore } from "@/store/v1";
import { MemoRelation_Type } from "@/types/proto/api/v1/memo_relation_service";
import { Memo } from "@/types/proto/api/v1/memo_service";
import { WorkspaceMemoRelatedSetting, WorkspaceSettingKey } from "@/types/proto/store/workspace_setting";
import { useTranslate } from "@/utils/i18n";
+import { memoLink } from "@/utils/memo";
const MemoDetail = () => {
const t = useTranslate();
@@ -28,7 +29,8 @@ const MemoDetail = () => {
const currentUser = useCurrentUser();
const memoStore = useMemoStore();
const uid = params.uid;
- const memo = memoStore.getMemoByUid(uid || "");
+ const memoName = `${memoNamePrefix}${uid}`;
+ const memo = memoStore.getMemoByName(memoName);
const workspaceMemoRelatedSetting = WorkspaceMemoRelatedSetting.fromPartial(
workspaceSettingStore.getWorkspaceSettingByKey(WorkspaceSettingKey.MEMO_RELATED)?.memoRelatedSetting || {},
);
@@ -41,15 +43,15 @@ const MemoDetail = () => {
// Prepare memo.
useEffect(() => {
- if (uid) {
- memoStore.fetchMemoByUid(uid).catch((error: ClientError) => {
+ if (memoName) {
+ memoStore.getOrFetchMemoByName(memoName).catch((error: ClientError) => {
toast.error(error.details);
navigateTo("/403");
});
} else {
navigateTo("/404");
}
- }, [uid]);
+ }, [memoName]);
// Prepare memo comments.
useEffect(() => {
@@ -96,7 +98,7 @@ const MemoDetail = () => {
diff --git a/web/src/store/v1/memo.ts b/web/src/store/v1/memo.ts
index cf6c3c55..14c1abb9 100644
--- a/web/src/store/v1/memo.ts
+++ b/web/src/store/v1/memo.ts
@@ -78,19 +78,6 @@ export const useMemoStore = create(
getMemoByName: (name: string) => {
return get().memoMapByName[name];
},
- fetchMemoByUid: async (uid: string) => {
- const memo = await memoServiceClient.getMemoByUid({
- uid,
- });
- const memoMap = get().memoMapByName;
- memoMap[memo.name] = memo;
- set({ stateId: uniqueId(), memoMapByName: memoMap });
- return memo;
- },
- getMemoByUid: (uid: string) => {
- const memoMap = get().memoMapByName;
- return Object.values(memoMap).find((memo) => memo.uid === uid);
- },
createMemo: async (request: CreateMemoRequest) => {
const memo = await memoServiceClient.createMemo(request);
const memoMap = get().memoMapByName;
diff --git a/web/src/store/v1/resourceName.ts b/web/src/store/v1/resourceName.ts
index 6cb052ac..5cfa274b 100644
--- a/web/src/store/v1/resourceName.ts
+++ b/web/src/store/v1/resourceName.ts
@@ -9,7 +9,7 @@ export const extractUserIdFromName = (name: string) => {
};
export const extractMemoIdFromName = (name: string) => {
- return parseInt(name.split(memoNamePrefix).pop() || "", 10);
+ return name.split(memoNamePrefix).pop() || "";
};
export const extractIdentityProviderIdFromName = (name: string) => {
diff --git a/web/src/utils/memo.ts b/web/src/utils/memo.ts
index fc944e33..950023af 100644
--- a/web/src/utils/memo.ts
+++ b/web/src/utils/memo.ts
@@ -1,3 +1,4 @@
+import { extractMemoIdFromName } from "@/store/v1";
import { Visibility } from "@/types/proto/api/v1/memo_service";
export const convertVisibilityFromString = (visibility: string) => {
@@ -25,3 +26,5 @@ export const convertVisibilityToString = (visibility: Visibility) => {
return "PRIVATE";
}
};
+
+export const memoLink = (memo: string) => `/m/${extractMemoIdFromName(memo)}`;