YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: move store prefixes to common module

Browse Source
This commit is contained in:
Steven
2025-05-27 07:49:46 +08:00
parent 46be6b0ff6
commit 46900f9807
13 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
web/src/components/Inbox/MemoCommentMessage.tsx
View File

@@ -5,7 +5,8 @@ import toast from "react-hot-toast";
import { activityServiceClient } from "@/grpcweb";
import useAsyncEffect from "@/hooks/useAsyncEffect";
import useNavigateTo from "@/hooks/useNavigateTo";
import { activityNamePrefix, useMemoStore } from "@/store/v1";
import { activityNamePrefix } from "@/store/common";
import { useMemoStore } from "@/store/v1";
import { userStore } from "@/store/v2";
import { Inbox, Inbox_Status } from "@/types/proto/api/v1/inbox_service";
import { Memo } from "@/types/proto/api/v1/memo_service";

3
web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx
View File

@@ -5,7 +5,8 @@ import toast from "react-hot-toast";
import { Link } from "react-router-dom";
import MemoResourceListView from "@/components/MemoResourceListView";
import useLoading from "@/hooks/useLoading";
import { extractMemoIdFromName, useMemoStore } from "@/store/v1";
import { extractMemoIdFromName } from "@/store/common";
import { useMemoStore } from "@/store/v1";
import { cn } from "@/utils";
import MemoContent from "..";
import { RendererContext } from "../types";

3
web/src/components/MemoContent/ReferencedContent/ReferencedMemo.tsx
View File

@@ -1,7 +1,8 @@
import { useContext, useEffect } from "react";
import useLoading from "@/hooks/useLoading";
import useNavigateTo from "@/hooks/useNavigateTo";
import { memoNamePrefix, useMemoStore } from "@/store/v1";
import { memoNamePrefix } from "@/store/common";
import { useMemoStore } from "@/store/v1";
import { RendererContext } from "../types";
import Error from "./Error";

2
web/src/components/MemoEditor/ActionButton/AddMemoRelationPopover.tsx
View File

@@ -9,7 +9,7 @@ import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/Popover
import { memoServiceClient } from "@/grpcweb";
import { DEFAULT_LIST_MEMOS_PAGE_SIZE } from "@/helpers/consts";
import useCurrentUser from "@/hooks/useCurrentUser";
import { extractMemoIdFromName } from "@/store/v1";
import { extractMemoIdFromName } from "@/store/common";
import { Memo, MemoRelation_Memo, MemoRelation_Type } from "@/types/proto/api/v1/memo_service";
import { useTranslate } from "@/utils/i18n";
import { EditorRefActions } from "../Editor";

2
web/src/components/Settings/MemoRelatedSettings.tsx
View File

@@ -4,7 +4,7 @@ import { isEqual, uniq } from "lodash-es";
import { CheckIcon } from "lucide-react";
import { useState } from "react";
import { toast } from "react-hot-toast";
import { workspaceSettingNamePrefix } from "@/store/v1";
import { workspaceSettingNamePrefix } from "@/store/common";
import { workspaceStore } from "@/store/v2";
import { WorkspaceSettingKey } from "@/store/v2/workspace";
import { WorkspaceMemoRelatedSetting } from "@/types/proto/api/v1/workspace_setting_service";

2
web/src/components/Settings/StorageSection.tsx
View File

@@ -5,7 +5,7 @@ import { HelpCircleIcon } from "lucide-react";
import React, { useEffect, useMemo, useState } from "react";
import { toast } from "react-hot-toast";
import { Link } from "react-router-dom";
import { workspaceSettingNamePrefix } from "@/store/v1";
import { workspaceSettingNamePrefix } from "@/store/common";
import { workspaceStore } from "@/store/v2";
import { WorkspaceSettingKey } from "@/store/v2/workspace";
import {

2
web/src/components/Settings/WorkspaceSection.tsx
View File

@@ -7,7 +7,7 @@ import { useEffect, useState } from "react";
import { toast } from "react-hot-toast";
import { Link } from "react-router-dom";
import { identityProviderServiceClient } from "@/grpcweb";
import { workspaceSettingNamePrefix } from "@/store/v1";
import { workspaceSettingNamePrefix } from "@/store/common";
import { workspaceStore } from "@/store/v2";
import { WorkspaceSettingKey } from "@/store/v2/workspace";
import { IdentityProvider } from "@/types/proto/api/v1/idp_service";

2
web/src/components/UpdateCustomizedProfileDialog.tsx
View File

@@ -2,7 +2,7 @@ import { Button, Input, Textarea } from "@usememos/mui";
import { XIcon } from "lucide-react";
import { useState } from "react";
import { toast } from "react-hot-toast";
import { workspaceSettingNamePrefix } from "@/store/v1";
import { workspaceSettingNamePrefix } from "@/store/common";
import { workspaceStore } from "@/store/v2";
import { WorkspaceSettingKey } from "@/store/v2/workspace";
import { WorkspaceCustomProfile } from "@/types/proto/api/v1/workspace_setting_service";

3
web/src/pages/MemoDetail.tsx
View File

@@ -11,7 +11,8 @@ import MobileHeader from "@/components/MobileHeader";
import useCurrentUser from "@/hooks/useCurrentUser";
import useNavigateTo from "@/hooks/useNavigateTo";
import useResponsiveWidth from "@/hooks/useResponsiveWidth";
import { memoNamePrefix, useMemoStore } from "@/store/v1";
import { memoNamePrefix } from "@/store/common";
import { useMemoStore } from "@/store/v1";
import { workspaceStore } from "@/store/v2";
import { Memo, MemoRelation_Type } from "@/types/proto/api/v1/memo_service";
import { cn } from "@/utils";

2
web/src/pages/SignIn.tsx
View File

@@ -9,7 +9,7 @@ import { identityProviderServiceClient } from "@/grpcweb";
import { absolutifyLink } from "@/helpers/utils";
import useCurrentUser from "@/hooks/useCurrentUser";
import { Routes } from "@/router";
import { extractIdentityProviderIdFromName } from "@/store/v1";
import { extractIdentityProviderIdFromName } from "@/store/common";
import { workspaceStore } from "@/store/v2";
import { IdentityProvider, IdentityProvider_Type } from "@/types/proto/api/v1/idp_service";
import { useTranslate } from "@/utils/i18n";

4
web/src/store/v1/resourceName.ts → web/src/store/common.ts
View File

@@ -4,10 +4,6 @@ export const memoNamePrefix = "memos/";
export const identityProviderNamePrefix = "identityProviders/";
export const activityNamePrefix = "activities/";
export const extractUserIdFromName = (name: string) => {
return parseInt(name.split(userNamePrefix).pop() || "", 10);
};
export const extractMemoIdFromName = (name: string) => {
return name.split(memoNamePrefix).pop() || "";
};

1
web/src/store/v1/index.ts
View File

@@ -1,4 +1,3 @@
export * from "./memo";
export * from "./resourceName";
export * from "./resource";
export * from "./memoFilter";

2
web/src/store/v2/workspace.ts
View File

@@ -4,7 +4,7 @@ import { workspaceServiceClient, workspaceSettingServiceClient } from "@/grpcweb
import { WorkspaceProfile } from "@/types/proto/api/v1/workspace_service";
import { WorkspaceGeneralSetting, WorkspaceMemoRelatedSetting, WorkspaceSetting } from "@/types/proto/api/v1/workspace_setting_service";
import { isValidateLocale } from "@/utils/i18n";
import { workspaceSettingNamePrefix } from "../v1";
import { workspaceSettingNamePrefix } from "../common";
export enum WorkspaceSettingKey {
/** BASIC - BASIC is the key for basic settings. */