Skip to content

πŸ“š The open-source, offline-first Notion, Obsidian & Confluence alternative. Advanced Markdown, multi-tenant teams, OIDC/SSO, and local S3 backups. Deploy in one command.

refactor: move actions nodes components in a folder and rewrite the redirect system with node delete modal. Merge NodeDeleteModal and DeleteResourceModal (support bulk delete)

Smaug673910ca979d6bbc
diff --git a/frontend/app/components/Node/Action/ContextMenu.vue b/frontend/app/components/Node/Action/ContextMenu.vue
index cb3e40e4..6beb2e05 100644
--- a/frontend/app/components/Node/Action/ContextMenu.vue
+++ b/frontend/app/components/Node/Action/ContextMenu.vue
@@ -69,11 +69,8 @@ async function action(name: string) {
case 'delete':
useModal().add(
new Modal(shallowRef(NodeDeleteModal), {
- props: { node: props.node },
+ props: { node: props.node, redirectTo: route.params?.id === props.node.id ? '/dashboard' : undefined },
size: 'small',
- onClose: r => {
- if (r === 'success' && route.params?.id === props.node.id) navigateTo('/dashboard');
- },
}),
);
break;
diff --git a/frontend/app/components/Node/ContainerView.vue b/frontend/app/components/Node/ContainerView.vue
index 543390af..e16649bf 100644
--- a/frontend/app/components/Node/ContainerView.vue
+++ b/frontend/app/components/Node/ContainerView.vue
@@ -136,9 +136,7 @@ const openDeleteModal = () => {
size: 'small',
props: {
node: props.parent,
- onClose: (r: string) => {
- if (r === 'success') router.push('/dashboard');
- },
+ redirect: '/dashboard',
},
}),
);
diff --git a/frontend/app/components/Node/Document/HeaderActionRow.vue b/frontend/app/components/Node/Document/HeaderActionRow.vue
index f8febc2d..f86128f2 100644
--- a/frontend/app/components/Node/Document/HeaderActionRow.vue
+++ b/frontend/app/components/Node/Document/HeaderActionRow.vue
@@ -46,17 +46,13 @@ import type { Node } from '~/stores';
const props = defineProps<{ doc: Node; isPublic?: boolean }>();
const nodeStore = useNodesStore();
-const router = useRouter();
const print = () => window.print();
const openDeleteModal = () =>
useModal().add(
new Modal(shallowRef(DeleteNodeModal), {
- props: { node: props.doc },
+ props: { node: props.doc, redirectTo: '/dashboard' },
size: 'small',
- onClose: r => {
- if (r === 'success') router.push('/dashboard');
- },
}),
);
const openEditModal = () => useModal().add(new Modal(shallowRef(DocumentMeta), { props: { doc: props.doc }, size: 'small' }));
diff --git a/frontend/app/components/Node/Modals/Delete.vue b/frontend/app/components/Node/Modals/Delete.vue
index c23d858a..54f18bdd 100644
--- a/frontend/app/components/Node/Modals/Delete.vue
+++ b/frontend/app/components/Node/Modals/Delete.vue
@@ -1,44 +1,66 @@
<template>
<div class="modal">
- <h3>Delete {{ nodeType }} β€’ {{ props.node.name }}</h3>
- <p>Are you sure you want to delete this {{ nodeType }} ?</p>
+ <!-- Single node deletion -->
+ <template v-if="props.node">
+ <h3>Delete {{ nodeType }} β€’ {{ props.node.name }}</h3>
+ <p>Are you sure you want to delete this {{ nodeType }}?</p>
+ <p v-if="allChildren.length > 0" class="warn">This {{ nodeType }} has {{ allChildren.length }} child documents. They will be deleted too.</p>
+ </template>
+
+ <!-- Bulk deletion -->
+ <template v-else-if="props.nodes">
+ <h3>Delete {{ props.nodes.length > 1 ? 'nodes' : 'node' }}</h3>
+ <p>
+ Are you sure you want to delete the selected {{ props.nodes.length > 1 ? 'nodes' : 'node' }}?
+ <br />
+ <span v-if="props.nodes.length > 1">
+ This action will delete <strong>{{ props.nodes.length }}</strong> nodes.
+ </span>
+ </p>
+ </template>
+
<p class="description">This action is irreversible</p>
- <p v-if="allChildren.length > 0" class="warn">This {{ nodeType }} has {{ allChildren.length }} child documents. They will be deleted too.</p>
+
<div class="footer">
<AppButton type="secondary" @click="emit('close')">Cancel</AppButton>
- <AppButton type="danger" @click="deleteDoc">Confirm</AppButton>
+ <AppButton type="danger" @click="handleDelete">Confirm</AppButton>
</div>
</div>
</template>
<script setup lang="ts">
+import { getRoleName } from '~/helpers/node';
import type { Node } from '~/stores';
-const props = defineProps<{ node: Node }>();
+const props = defineProps<{
+ node?: Node;
+ nodes?: Node[];
+ redirectTo?: string;
+}>();
+
const emit = defineEmits(['close']);
const store = useNodesStore();
-
const tree = useSidebarTree();
-const allChildren = tree.getSubTreeById(props.node.id);
-const nodeType = computed(() => {
- switch (props.node.role) {
- case 1:
- return 'workspace';
- case 2:
- return 'category';
- case 3:
- return 'document';
- case 4:
- return 'resource';
- default:
- return 'node';
+const allChildren = computed(() => (props.node ? tree.getSubTreeById(props.node.id) : []));
+
+const nodeType = computed(() => getRoleName(props.node?.role).toLowerCase());
+
+const handleDelete = async () => {
+ try {
+ if (props.nodes && props.nodes.length > 0) {
+ await store.bulkDelete(props.nodes);
+ } else if (props.node) {
+ await store.delete(props.node.id);
+ }
+ emit('close', 'success');
+ if (props.redirectTo) {
+ useRouter().push(props.redirectTo);
+ }
+ } catch (e) {
+ useNotifications().add({ type: 'error', title: 'Error', message: String(e) });
}
-});
-const deleteDoc = () => {
- emit('close', 'success');
- store.delete(props.node.id).catch(e => useNotifications().add({ type: 'error', title: 'Error', message: e }));
};
</script>
diff --git a/frontend/app/components/Node/Modals/DeleteResource.vue b/frontend/app/components/Node/Modals/DeleteResource.vue
deleted file mode 100644
index 0be44b7a..00000000
--- a/frontend/app/components/Node/Modals/DeleteResource.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-<template>
- <div class="modal">
- <h3>Delete {{ resources.length > 1 ? 'resources' : 'resource' }}</h3>
- <p>
- Are you sure you want to delete the selected {{ resources.length > 1 ? 'resources' : 'resource' }}? <br />
- <span v-if="resources.length > 1"
- >This action will delete <strong>{{ resources.length }}</strong> resources.</span
- >
- </p>
- <p style="opacity: 0.7">This action is irreversible</p>
- <div class="footer">
- <AppButton type="secondary" @click="emit('close')">Cancel</AppButton>
- <AppButton type="danger" @click="deleteResource">Confirm</AppButton>
- </div>
- </div>
-</template>
-
-<script setup lang="ts">
-const props = defineProps<{ resources: string[] }>();
-
-const emit = defineEmits(['close']);
-
-const deleteResource = async () => {
- await useNodesStore()
- .bulkDelete(props.resources)
- .then(() => {
- emit('close');
- useRouter().push('/dashboard/cdn');
- })
- .catch(e => useNotifications().add({ type: 'error', title: 'Error', message: e }));
-};
-</script>
diff --git a/frontend/app/composables/useModal.ts b/frontend/app/composables/useModal.ts
index 44b8135a..e1ff8954 100644
--- a/frontend/app/composables/useModal.ts
+++ b/frontend/app/composables/useModal.ts
@@ -11,30 +11,26 @@ function add(modal: Modal) {
modals.value.push(modal);
}
-/** Close a modal and trigger its onClose callback */
-function close(modal: Modal, reason?: string) {
+/** Close a modal */
+function close(modal: Modal) {
const index = modals.value.indexOf(modal);
if (index !== -1) {
modals.value.splice(index, 1);
- modal.options.onClose?.(reason);
}
if (modals.value.length === 0) {
document.body.classList.remove('modal-open');
}
}
-function closeLast(reason?: string) {
+function closeLast() {
if (modals.value.length === 0) return;
const lastModal = modals.value[modals.value.length - 1]!;
- close(lastModal, reason);
+ close(lastModal);
}
/** Close all modals in the stack */
-function closeAll(reason?: string) {
- while (modals.value.length > 0) {
- const modal = modals.value.pop()!;
- modal.options.onClose?.(reason);
- }
+function closeAll() {
+ modals.value = [];
document.body.classList.remove('modal-open');
}
@@ -43,7 +39,6 @@ export function useModal() {
}
interface ModalOptions {
- onClose?: (reason?: string) => void;
size?: 'small' | 'medium' | 'large';
noPadding?: boolean;
props?: object;
diff --git a/frontend/app/helpers/node.ts b/frontend/app/helpers/node.ts
index 1a1fc668..d119aca0 100644
--- a/frontend/app/helpers/node.ts
+++ b/frontend/app/helpers/node.ts
@@ -22,7 +22,8 @@ export const resolveNodeLink = (node: Node): string => {
return '/dashboard';
};
-export const getRoleName = (role: number): string => {
+export const getRoleName = (role?: number): string => {
+ if (role === undefined) return 'Node';
const roles: Record<number, string> = { 1: 'Workspace', 2: 'Category', 3: 'Document', 4: 'Resource' };
return roles[role] || 'Unknown';
};
diff --git a/frontend/app/pages/dashboard/cdn/[id]/index.vue b/frontend/app/pages/dashboard/cdn/[id]/index.vue
index 2793a950..2deb90d3 100644
--- a/frontend/app/pages/dashboard/cdn/[id]/index.vue
+++ b/frontend/app/pages/dashboard/cdn/[id]/index.vue
@@ -43,7 +43,7 @@
</template>
<script lang="ts" setup>
-import DeleteResourceModal from '~/components/Node/Modals/DeleteResource.vue';
+import DeleteNodeModal from '~/components/Node/Modals/Delete.vue';
import { readableFileSize } from '~/helpers/resources';
definePageMeta({ breadcrumb: 'Edit' });
@@ -73,7 +73,7 @@ const updateCategory = async () => {
.catch(e => useNotifications().add({ type: 'error', title: 'Error', message: e }));
};
const showDeleteModal = () => {
- useModal().add(new Modal(shallowRef(DeleteResourceModal), { props: { resources: [resource.value?.id] } }));
+ useModal().add(new Modal(shallowRef(DeleteNodeModal), { props: { nodes: [resource.value], redirectTo: '/dashboard/cdn' }, size: 'small' }));
};
</script>
diff --git a/frontend/app/pages/dashboard/cdn/index.vue b/frontend/app/pages/dashboard/cdn/index.vue
index 9c8e7f26..a1ecb68e 100644
--- a/frontend/app/pages/dashboard/cdn/index.vue
+++ b/frontend/app/pages/dashboard/cdn/index.vue
@@ -50,7 +50,7 @@
<template #action="{ cell }">
<NuxtLink :href="`/dashboard/cdn/${(cell?.data as Node).id}/preview`" style="margin-right: 10px"><Icon name="view" /> </NuxtLink>
<NuxtLink :to="`/dashboard/cdn/${(cell?.data as Node).id}`"><Icon name="edit" style="margin-right: 10px" /></NuxtLink>
- <span @click="() => deleteResource((cell?.data as Node).id)"><Icon name="delete" /></span>
+ <span @click="() => deleteResource(cell?.data as Node)"><Icon name="delete" /></span>
</template>
</DataTable>
<div v-else>
@@ -79,7 +79,7 @@
</div>
</template>
<script setup lang="ts">
-import DeleteResourceModal from '~/components/Node/Modals/DeleteResource.vue';
+import DeleteNodeModal from '~/components/Node/Modals/Delete.vue';
import ResourceContextMenu from '~/components/Node/Action/ResourceContextMenu.vue';
import { readableFileSize } from '~/helpers/resources';
import type { Field } from '~/components/DataTable.vue';
@@ -187,12 +187,12 @@ const rows: ComputedRef<Field[]> = computed(() =>
}),
);
-const deleteResource = async (id: string) => {
- useModal().add(new Modal(shallowRef(DeleteResourceModal), { props: { resources: [id] }, size: 'small' }));
+const deleteResource = async (node: Node) => {
+ useModal().add(new Modal(shallowRef(DeleteNodeModal), { props: { node: node, redirectTo: '/dashboard/cdn' }, size: 'small' }));
};
const bulkDelete = async (lines: Field[]) => {
- const resourcesIds = lines.map(line => (line.action?.data as Node | undefined)?.id).filter((id): id is string => !!id);
- useModal().add(new Modal(shallowRef(DeleteResourceModal), { props: { resources: resourcesIds }, size: 'small' }));
+ const resources = lines.map(line => line.action?.data as Node);
+ useModal().add(new Modal(shallowRef(DeleteNodeModal), { props: { nodes: resources, redirectTo: '/dashboard/cdn' }, size: 'small' }));
};
</script>
diff --git a/frontend/app/pages/dashboard/docs/[id].vue b/frontend/app/pages/dashboard/docs/[id].vue
index beeb64db..e103ce98 100644
--- a/frontend/app/pages/dashboard/docs/[id].vue
+++ b/frontend/app/pages/dashboard/docs/[id].vue
@@ -125,10 +125,7 @@ onMounted(() => {
useModal().add(
new Modal(shallowRef(DeleteNodeModal), {
size: 'small',
- props: { node: node.value },
- onClose: r => {
- if (r === 'success') router.push('/dashboard');
- },
+ props: { node: node.value, redirectTo: '/dashboard' },
}),
);
}
diff --git a/frontend/app/stores/nodes.store.ts b/frontend/app/stores/nodes.store.ts
index 77d64cbb..390e46f7 100644
--- a/frontend/app/stores/nodes.store.ts
+++ b/frontend/app/stores/nodes.store.ts
@@ -370,19 +370,19 @@ export const useNodesStore = defineStore('nodes', {
// Loop through ids and delete them one by one
// Only update the store after all deletions are successful
// Return the list of deleted ids and failed ids
- async bulkDelete(ids: string[]) {
+ async bulkDelete(nodes: Node[]) {
const deletedIds: string[] = [];
const failedIds: { id: string; message: string }[] = [];
- for (const id of ids) {
+ for (const node of nodes) {
try {
- const request = await makeRequest(`nodes/${id}`, 'DELETE', {});
+ const request = await makeRequest(`nodes/${node.id}`, 'DELETE', {});
if (request.status === 'success') {
- deletedIds.push(id);
+ deletedIds.push(node.id);
} else {
- failedIds.push({ id, message: request.message || 'Unknown error' });
+ failedIds.push({ id: node.id, message: request.message || 'Unknown error' });
}
} catch (error) {
- failedIds.push({ id, message: (error as Error).message });
+ failedIds.push({ id: node.id, message: (error as Error).message });
}
}
// Update store