Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Deleted pages appear in the page tree #9337

Merged
merged 8 commits into from
Nov 22, 2024
Merged

fix: Deleted pages appear in the page tree #9337

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4bcd912
avoid unnecessary rendering
reiji-h Oct 31, 2024
3c9b112
remove console.log
reiji-h Nov 18, 2024
180a256
use Immutable
reiji-h Nov 18, 2024
a585c63
Merge branch 'master' into fix/111603-126863-pagetree-display-the-pag…
reiji-h Nov 21, 2024
762ab06
add type
reiji-h Nov 21, 2024
1e04e7d
dont use children
reiji-h Nov 21, 2024
0a77342
enable page scroll on init
reiji-h Nov 22, 2024
3a71b77
clean code
reiji-h Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions apps/app/src/client/components/TreeItem/TreeItemLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,21 +73,13 @@ export const TreeItemLayout: FC<TreeItemLayoutProps> = (props) => {
if (hasChildren()) setIsOpen(true);
}, [hasChildren]);

/*
* Make sure itemNode.children and currentChildren are synced
*/
useEffect(() => {
if (children.length > currentChildren.length) {
setCurrentChildren(children);
}
}, [children, currentChildren.length, targetPathOrId]);

/*
* When swr fetch succeeded
*/
useEffect(() => {
if (isOpen && data != null) {
const newChildren = ItemNode.generateNodesFromPages(data.children);
console.log('This is new data!!!!: ', newChildren);
yuki-takei marked this conversation as resolved.
Show resolved Hide resolved
setCurrentChildren(newChildren);
}
}, [data, isOpen, targetPathOrId]);
Expand Down
2 changes: 1 addition & 1 deletion apps/app/src/stores/page-listing.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ export const useSWRxPageAncestorsChildren = (
assert(keyMatcherForPageTree(key));
}

return useSWRImmutable(
return useSWR(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

useSWRxPageAncestorsChildren の自動 revalidation を許すと、API を叩く回数が増えるのを心配している。

https://swr.vercel.app/ja/docs/revalidation#disable-automatic-revalidations

関係ないトリガーはもう少し抑制できないだろうか。

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

useSWRxPageAncestorsChildren の useSWR を Immutable に戻しました。

TreeItemLayout.tsx の受け取る PageTree の情報は、上位から受け取る useSWRxPageAncestorsChildren の childrenA と 41 行目の useSWRxPageChildren の childrenB の2つがありました。/trash に遷移した際、childrenA は削除したものが残っており、childrenB はちゃんと消えていました。常に childrenB の情報のほうが正しかったので、childrenA を受け取るのを辞める形で変更しました。

key,
([, endpoint, path]) => apiv3Get(endpoint, { path }).then((response) => {
return {
Expand Down
Loading