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: fix loading status
Steven94c71cb834bf
diff --git a/web/src/components/MemoList.tsx b/web/src/components/MemoList.tsxindex c4da1cb89..b8784cbe9 100644--- a/web/src/components/MemoList.tsx+++ b/web/src/components/MemoList.tsx@@ -82,6 +82,10 @@ const MemoList: React.FC = () => {}}, [filter]);+ useEffect(() => {+ memoStore.setLoadingStatus("incomplete");+ }, []);+useEffect(() => {if (!fetchMoreRef.current) return;diff --git a/web/src/pages/Explore.tsx b/web/src/pages/Explore.tsxindex ce96eb094..f781c88df 100644--- a/web/src/pages/Explore.tsx+++ b/web/src/pages/Explore.tsx@@ -52,6 +52,10 @@ const Explore = () => {.filter((m) => m.rowStatus === "NORMAL" && m.visibility !== "PRIVATE" && !m.parent).sort((mi, mj) => mj.displayTs - mi.displayTs);+ useEffect(() => {+ memoStore.setLoadingStatus("incomplete");+ }, []);+useEffect(() => {if (!fetchMoreRef.current) return;diff --git a/web/src/store/module/memo.ts b/web/src/store/module/memo.tsindex 19fa77fbe..11e914986 100644--- a/web/src/store/module/memo.ts+++ b/web/src/store/module/memo.ts@@ -2,7 +2,7 @@ import { omit } from "lodash-es";import * as api from "@/helpers/api";import { DEFAULT_MEMO_LIMIT } from "@/helpers/consts";import store, { useAppSelector } from "../";-import { updateLoadingStatus, createMemo, deleteMemo, patchMemo, upsertMemos } from "../reducer/memo";+import { updateLoadingStatus, createMemo, deleteMemo, patchMemo, upsertMemos, LoadingStatus } from "../reducer/memo";import { useMemoCacheStore } from "../v1";export const convertResponseModelMemo = (memo: Memo): Memo => {@@ -82,6 +82,9 @@ export const useMemoStore = () => {});return archivedMemos;},+ setLoadingStatus: (status: LoadingStatus) => {+ store.dispatch(updateLoadingStatus(status));+ },fetchMemoById,getMemoById: async (memoId: MemoId) => {for (const m of state.memos) {diff --git a/web/src/store/reducer/memo.ts b/web/src/store/reducer/memo.tsindex 2c9ef6a92..31ac21f29 100644--- a/web/src/store/reducer/memo.ts+++ b/web/src/store/reducer/memo.ts@@ -1,7 +1,7 @@import { createSlice, PayloadAction } from "@reduxjs/toolkit";import { uniqBy } from "lodash-es";-type LoadingStatus = "incomplete" | "fetching" | "complete";+export type LoadingStatus = "incomplete" | "fetching" | "complete";interface State {loadingStatus: LoadingStatus;