js/docmost
1
0
Fork 0
mirror of https://github.com/docmost/docmost synced 2025-03-28 21:13:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

better page deletion handling

Browse Source
This commit is contained in:
Philipinho 2023-11-13 21:35:04 +00:00
parent fb057b7801
commit d33452ad62
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/features/page/queries/page.ts
View File

@ -7,6 +7,7 @@ import {
updatePage, updatePage,
} from '@/features/page/services/page-service'; } from '@/features/page/services/page-service';
import { IPage } from '@/features/page/types/page.types'; import { IPage } from '@/features/page/types/page.types';
import { notifications } from '@mantine/notifications';
const RECENT_CHANGES_KEY = ['recentChanges']; const RECENT_CHANGES_KEY = ['recentChanges'];
@ -41,5 +42,8 @@ export function useUpdatePageMutation() {
export function useDeletePageMutation() { export function useDeletePageMutation() {
return useMutation({ return useMutation({
mutationFn: (pageId: string) => deletePage(pageId), mutationFn: (pageId: string) => deletePage(pageId),
onSuccess: () => {
notifications.show({ title: 'Page deleted successfully' });
},
}); });
} }

12
client/src/features/page/tree/hooks/use-persistence.ts
View File

@ -8,16 +8,19 @@ import {
} from 'react-arborist'; } from 'react-arborist';
import { useAtom } from 'jotai'; import { useAtom } from 'jotai';
import { treeDataAtom } from '@/features/page/tree/atoms/tree-data-atom'; import { treeDataAtom } from '@/features/page/tree/atoms/tree-data-atom';
import { createPage, deletePage, movePage } from '@/features/page/services/page-service'; import { movePage } from '@/features/page/services/page-service';
import { v4 as uuidv4 } from 'uuid'; import { v4 as uuidv4 } from 'uuid';
import { IMovePage } from '@/features/page/types/page.types'; import { IMovePage } from '@/features/page/types/page.types';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { TreeNode } from '@/features/page/tree/types'; import { TreeNode } from '@/features/page/tree/types';
import { useUpdatePageMutation } from '@/features/page/queries/page'; import { useCreatePageMutation, useDeletePageMutation, useUpdatePageMutation } from '@/features/page/queries/page';
export function usePersistence<T>() { export function usePersistence<T>() {
const [data, setData] = useAtom(treeDataAtom); const [data, setData] = useAtom(treeDataAtom);
const createPageMutation = useCreatePageMutation();
const updatePageMutation = useUpdatePageMutation(); const updatePageMutation = useUpdatePageMutation();
const deletePageMutation = useDeletePageMutation();
const navigate = useNavigate(); const navigate = useNavigate();
const tree = useMemo(() => new SimpleTree<TreeNode>(data), [data]); const tree = useMemo(() => new SimpleTree<TreeNode>(data), [data]);
@ -75,7 +78,7 @@ export function usePersistence<T>() {
} }
try { try {
await createPage(payload); await createPageMutation.mutateAsync(payload);
navigate(`/p/${payload.id}`); navigate(`/p/${payload.id}`);
} catch (error) { } catch (error) {
console.error('Error creating the page:', error); console.error('Error creating the page:', error);
@ -89,7 +92,8 @@ export function usePersistence<T>() {
setData(tree.data); setData(tree.data);
try { try {
await deletePage(args.ids[0]); await deletePageMutation.mutateAsync(args.ids[0]);
navigate('/home');
} catch (error) { } catch (error) {
console.error('Error deleting page:', error); console.error('Error deleting page:', error);
} }

2
client/src/main.tsx
View File

@ -18,7 +18,7 @@ root.render(
<MantineProvider theme={theme}> <MantineProvider theme={theme}>
<ModalsProvider> <ModalsProvider>
<TanstackProvider> <TanstackProvider>
<Notifications /> <Notifications position="top-center" limit={3} />
<App /> <App />
</TanstackProvider> </TanstackProvider>
</ModalsProvider> </ModalsProvider>

2
client/src/pages/page/page.tsx
View File

@ -20,7 +20,7 @@ export default function Page() {
return <div>Loading...</div>; return <div>Loading...</div>;
} }
if (isError) { if (isError || !data) { // TODO: fix this
return <div>Error fetching page data.</div>; return <div>Error fetching page data.</div>;
} }