Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
canifa_note
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vũ Hoàng Anh
canifa_note
Commits
94c71cb8
Commit
94c71cb8
authored
Nov 19, 2023
by
Steven
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: fix loading status
parent
7f7ddf77
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
2 deletions
+13
-2
MemoList.tsx
web/src/components/MemoList.tsx
+4
-0
Explore.tsx
web/src/pages/Explore.tsx
+4
-0
memo.ts
web/src/store/module/memo.ts
+4
-1
memo.ts
web/src/store/reducer/memo.ts
+1
-1
No files found.
web/src/components/MemoList.tsx
View file @
94c71cb8
...
...
@@ -82,6 +82,10 @@ const MemoList: React.FC = () => {
}
}
, [filter]);
useEffect(() =
>
{
memoStore
.
setLoadingStatus
(
"incomplete"
);
}
, []);
useEffect(() =
>
{
if
(
!
fetchMoreRef
.
current
)
return
;
...
...
web/src/pages/Explore.tsx
View file @
94c71cb8
...
...
@@ -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
;
...
...
web/src/store/module/memo.ts
View file @
94c71cb8
...
...
@@ -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
)
{
...
...
web/src/store/reducer/memo.ts
View file @
94c71cb8
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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment