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
8aae0d00
Commit
8aae0d00
authored
Oct 05, 2023
by
Steven
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: fix fetch comments
parent
16dad8b0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
14 deletions
+10
-14
MemoDetail.tsx
web/src/pages/MemoDetail.tsx
+8
-12
memo.ts
web/src/store/reducer/memo.ts
+1
-1
resource.ts
web/src/store/reducer/resource.ts
+1
-1
No files found.
web/src/pages/MemoDetail.tsx
View file @
8aae0d00
...
@@ -70,19 +70,11 @@ const MemoDetail = () => {
...
@@ -70,19 +70,11 @@ const MemoDetail = () => {
}
}
(
async
()
=>
{
(
async
()
=>
{
await
fetchMemoComments
();
})();
},
[
memo
?.
relationList
]);
const
fetchMemoComments
=
async
()
=>
{
if
(
!
memo
)
{
return
;
}
const
commentRelations
=
memo
.
relationList
.
filter
((
relation
)
=>
relation
.
relatedMemoId
===
memo
.
id
&&
relation
.
type
===
"COMMENT"
);
const
commentRelations
=
memo
.
relationList
.
filter
((
relation
)
=>
relation
.
relatedMemoId
===
memo
.
id
&&
relation
.
type
===
"COMMENT"
);
const
requests
=
commentRelations
.
map
((
relation
)
=>
memoStore
.
fetchMemoById
(
relation
.
memoId
));
const
requests
=
commentRelations
.
map
((
relation
)
=>
memoStore
.
fetchMemoById
(
relation
.
memoId
));
await
Promise
.
all
(
requests
);
await
Promise
.
all
(
requests
);
};
})();
},
[
memo
?.
relationList
]);
if
(
!
memo
)
{
if
(
!
memo
)
{
return
null
;
return
null
;
...
@@ -107,6 +99,10 @@ const MemoDetail = () => {
...
@@ -107,6 +99,10 @@ const MemoDetail = () => {
toast
.
success
(
t
(
"message.succeed-copy-link"
));
toast
.
success
(
t
(
"message.succeed-copy-link"
));
};
};
const
handleCommentCreated
=
async
()
=>
{
await
memoStore
.
fetchMemoById
(
memoId
);
};
return
(
return
(
<>
<>
<
section
className=
"relative top-0 w-full min-h-full overflow-x-hidden bg-zinc-100 dark:bg-zinc-900"
>
<
section
className=
"relative top-0 w-full min-h-full overflow-x-hidden bg-zinc-100 dark:bg-zinc-900"
>
...
@@ -210,7 +206,7 @@ const MemoDetail = () => {
...
@@ -210,7 +206,7 @@ const MemoDetail = () => {
key=
{
memo
.
id
}
key=
{
memo
.
id
}
className=
"!border"
className=
"!border"
relationList=
{
[{
memoId
:
UNKNOWN_ID
,
relatedMemoId
:
memo
.
id
,
type
:
"COMMENT"
}]
}
relationList=
{
[{
memoId
:
UNKNOWN_ID
,
relatedMemoId
:
memo
.
id
,
type
:
"COMMENT"
}]
}
onConfirm=
{
()
=>
fetchMemoComments
()
}
onConfirm=
{
handleCommentCreated
}
/>
/>
)
}
)
}
</
div
>
</
div
>
...
...
web/src/store/reducer/memo.ts
View file @
8aae0d00
...
@@ -14,7 +14,7 @@ const memoSlice = createSlice({
...
@@ -14,7 +14,7 @@ const memoSlice = createSlice({
upsertMemos
:
(
state
,
action
:
PayloadAction
<
Memo
[]
>
)
=>
{
upsertMemos
:
(
state
,
action
:
PayloadAction
<
Memo
[]
>
)
=>
{
return
{
return
{
...
state
,
...
state
,
memos
:
uniqBy
([...
state
.
memos
,
...
action
.
payload
],
"id"
),
memos
:
uniqBy
([...
action
.
payload
,
...
state
.
memos
],
"id"
),
};
};
},
},
createMemo
:
(
state
,
action
:
PayloadAction
<
Memo
>
)
=>
{
createMemo
:
(
state
,
action
:
PayloadAction
<
Memo
>
)
=>
{
...
...
web/src/store/reducer/resource.ts
View file @
8aae0d00
...
@@ -21,7 +21,7 @@ const resourceSlice = createSlice({
...
@@ -21,7 +21,7 @@ const resourceSlice = createSlice({
upsertResources
:
(
state
,
action
:
PayloadAction
<
Resource
[]
>
)
=>
{
upsertResources
:
(
state
,
action
:
PayloadAction
<
Resource
[]
>
)
=>
{
return
{
return
{
...
state
,
...
state
,
resources
:
uniqBy
([...
state
.
resources
,
...
action
.
payload
],
"id"
),
resources
:
uniqBy
([...
action
.
payload
,
...
state
.
resources
],
"id"
),
};
};
},
},
patchResource
:
(
state
,
action
:
PayloadAction
<
Partial
<
Resource
>>
)
=>
{
patchResource
:
(
state
,
action
:
PayloadAction
<
Partial
<
Resource
>>
)
=>
{
...
...
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