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.

Fix breadcrumb and modals

Smaug673907892520bfca
diff --git a/frontend/app/components/BreadCrumb.vue b/frontend/app/components/BreadCrumb.vue
index 7e9c7b88..905b0661 100644
--- a/frontend/app/components/BreadCrumb.vue
+++ b/frontend/app/components/BreadCrumb.vue
@@ -29,6 +29,8 @@
</template>
<script setup lang="ts">
+import type { RouteLocationNormalizedLoaded } from 'vue-router';
+
const route = useRoute();
const router = useRouter();
const preferences = usePreferences();
@@ -44,26 +46,33 @@ const goForward = () => router.go(1);
declare module 'vue-router' {
interface RouteMeta {
- breadcrumb?: string | (() => string);
+ breadcrumb?: string | ((route: RouteLocationNormalizedLoaded) => string);
}
}
watchEffect(() => {
canGoBack.value = window.history.state?.back !== null;
canGoForward.value = window.history.state?.forward !== null;
+
breadcrumbs.value = [];
+
route.matched.forEach(match => {
- if (!match.meta?.breadcrumb) return;
+ const meta = match.meta?.breadcrumb;
+ if (!meta) return;
let name = '';
- if (typeof match.meta.breadcrumb === 'function') name = match.meta.breadcrumb();
- else if (typeof match.meta.breadcrumb === 'string') name = match.meta.breadcrumb;
+
+ if (typeof meta === 'function') {
+ name = meta(route);
+ } else {
+ name = meta;
+ }
if (!name) return;
- const r = router.resolve(match);
+
breadcrumbs.value.push({
name,
- path: r.path,
+ path: router.resolve(match).path,
});
});
});
diff --git a/frontend/app/components/ModalManager.vue b/frontend/app/components/ModalManager.vue
index 9f843c57..df247e7c 100644
--- a/frontend/app/components/ModalManager.vue
+++ b/frontend/app/components/ModalManager.vue
@@ -12,7 +12,7 @@
v-bind="modal.options.props"
class="modal"
:class="modal.options.size"
- @close="modalManager.close(modal)"
+ @close="(r?:string) => modalManager.close(modal, r)"
/>
</div>
</div>
diff --git a/frontend/app/components/Node/ContextMenu.vue b/frontend/app/components/Node/ContextMenu.vue
index 02d055bb..f4eb5eea 100644
--- a/frontend/app/components/Node/ContextMenu.vue
+++ b/frontend/app/components/Node/ContextMenu.vue
@@ -46,6 +46,8 @@ const emit = defineEmits(['close']);
const nodeStore = useNodesStore();
const userStore = useUserStore();
+const router = useRouter();
+const route = useRoute();
const preferences = usePreferences();
const { shortDate } = useDateFormatters();
const { avatarURL } = useApi();
@@ -58,17 +60,27 @@ const user = computed(() => userStore.getById(props.node.user_id || ''));
async function action(name: string) {
switch (name) {
case 'open':
- useRouter().push(`/dashboard/docs/${props.node.id}`);
+ router.push(`/dashboard/docs/${props.node.id}`);
break;
case 'edit':
- useRouter().push(`/dashboard/docs/edit/${props.node.id}`);
+ router.push(`/dashboard/docs/edit/${props.node.id}`);
break;
case 'duplicate':
nodeStore.duplicate(props.node);
break;
case 'delete':
dotMenu.value?.close();
- useModal().add(new Modal(shallowRef(NodeDeleteModal), { props: { node: props.node }, size: 'small' }));
+ useModal().add(
+ new Modal(shallowRef(NodeDeleteModal), {
+ props: { node: props.node },
+ size: 'small',
+ onClose: r => {
+ console.log('Delete modal closed with reason:', r);
+ console.log('Current route params:', route.params);
+ if (r === 'success' && route.params?.id === props.node.id) navigateTo('/dashboard');
+ },
+ }),
+ );
break;
case 'copyLink':
navigator.clipboard.writeText(`${window.location.origin}/dashboard/docs/${props.node.id}`);
diff --git a/frontend/app/components/Node/DeleteNodeModal.vue b/frontend/app/components/Node/DeleteNodeModal.vue
index b50972e6..c23d858a 100644
--- a/frontend/app/components/Node/DeleteNodeModal.vue
+++ b/frontend/app/components/Node/DeleteNodeModal.vue
@@ -1,6 +1,6 @@
<template>
<div class="modal">
- <h3>Delete {{ nodeType }}</h3>
+ <h3>Delete {{ nodeType }} β€’ {{ props.node.name }}</h3>
<p>Are you sure you want to delete this {{ nodeType }} ?</p>
<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>
@@ -17,7 +17,11 @@ import type { Node } from '~/stores';
const props = defineProps<{ node: Node }>();
const emit = defineEmits(['close']);
-const allChildren = useSidebarTree().getSubTreeById(props.node.id);
+const store = useNodesStore();
+
+const tree = useSidebarTree();
+
+const allChildren = tree.getSubTreeById(props.node.id);
const nodeType = computed(() => {
switch (props.node.role) {
case 1:
@@ -33,13 +37,8 @@ const nodeType = computed(() => {
}
});
const deleteDoc = () => {
- useNodesStore()
- .delete(props.node.id)
- .then(() => {
- emit('close');
- useRouter().push('/dashboard');
- })
- .catch(e => useNotifications().add({ type: 'error', title: 'Error', message: e }));
+ 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/List.vue b/frontend/app/components/Node/List.vue
index d52ced43..b608c999 100644
--- a/frontend/app/components/Node/List.vue
+++ b/frontend/app/components/Node/List.vue
@@ -27,6 +27,9 @@
<NuxtLink v-if="parent && nodesStore.hasPermissions(parent, 2)" class="btn-icon" @click="openEditModal">
<Icon name="settings" display="lg" />
</NuxtLink>
+ <NuxtLink v-if="parent && nodesStore.hasPermissions(parent, 4)" class="btn-icon" @click="openDeleteModal">
+ <Icon name="delete" display="lg" />
+ </NuxtLink>
<span class="doc-count no-mobile">{{ filteredNodes.length != nodes.length ? `${filteredNodes.length} /` : '' }} {{ nodes.length }}</span>
<ViewSelection v-model="view" :show-kanban="true" />
</div>
@@ -70,6 +73,7 @@
<script setup lang="ts">
import NodePermissions from '~/components/Node/NodePermissions.modal.vue';
+import NodeDeleteModal from '~/components/Node/DeleteNodeModal.vue';
import RemoveSharedNode from '~/components/Node/RemoveSharedNode.modal.vue';
import KanbanBoard, { type KanbanMetadata } from '~/components/Kanban/Board.vue';
import NodeMetadataModal from './NodeMetadata.modal.vue';
@@ -120,6 +124,21 @@ const openRemoveShareModal = () => {
};
const openEditModal = () => useModal().add(new Modal(shallowRef(NodeMetadataModal), { props: { doc: props.parent }, size: 'small' }));
+const openDeleteModal = () => {
+ if (props.parent)
+ useModal().add(
+ new Modal(shallowRef(NodeDeleteModal), {
+ size: 'small',
+ props: {
+ node: props.parent,
+ onClose: (r: string) => {
+ if (r === 'success') router.push('/dashboard');
+ },
+ },
+ }),
+ );
+};
+
// Kanban functionality
async function updateKanbanMetadata(metadata: KanbanMetadata) {
if (!props.parent) return;
diff --git a/frontend/app/composables/useModal.ts b/frontend/app/composables/useModal.ts
index d1eeaf33..42e54a39 100644
--- a/frontend/app/composables/useModal.ts
+++ b/frontend/app/composables/useModal.ts
@@ -12,11 +12,11 @@ function add(modal: Modal) {
}
/** Close a modal and trigger its onClose callback */
-function close(modal: Modal) {
+function close(modal: Modal, reason?: string) {
const index = modals.value.indexOf(modal);
if (index !== -1) {
modals.value.splice(index, 1);
- modal.options.onClose?.();
+ modal.options.onClose?.(reason);
}
if (modals.value.length === 0) {
document.body.classList.remove('modal-open');
@@ -28,7 +28,7 @@ export function useModal() {
}
interface ModalOptions {
- onClose?: () => void;
+ onClose?: (reason?: string) => void;
size?: 'small' | 'medium' | 'large';
noPadding?: boolean;
props?: object;
diff --git a/frontend/app/pages/(public)/doc/[id]/edit.vue b/frontend/app/pages/(public)/doc/[id]/edit.vue
index 2127b2fb..498f5eed 100644
--- a/frontend/app/pages/(public)/doc/[id]/edit.vue
+++ b/frontend/app/pages/(public)/doc/[id]/edit.vue
@@ -4,6 +4,8 @@
<script lang="ts" setup>
import type { Node } from '~/stores';
+definePageMeta({ breadcrumb: 'Edit' });
+
const store = useNodesStore();
const route = useRoute();
@@ -30,8 +32,6 @@ watchEffect(async () => {
} else document.value = storedNode;
});
-definePageMeta({ breadcrumb: 'Edit' });
-
function save(doc: Node) {
store
.update(doc)
diff --git a/frontend/app/pages/(public)/doc/[id]/index.vue b/frontend/app/pages/(public)/doc/[id]/index.vue
index 6c267012..c177841a 100644
--- a/frontend/app/pages/(public)/doc/[id]/index.vue
+++ b/frontend/app/pages/(public)/doc/[id]/index.vue
@@ -36,10 +36,6 @@ import DocumentSkeleton from '~/pages/dashboard/docs/_components/DocumentSkeleto
import DocumentCardHeader from '~/pages/dashboard/docs/_components/DocumentCardHeader.vue';
import type { Node } from '~/stores';
-definePageMeta({
- ssr: true,
-});
-
const documentsStore = useNodesStore();
const preferencesStore = usePreferences();
diff --git a/frontend/app/pages/dashboard/categories/[id]/index.vue b/frontend/app/pages/dashboard/categories/[id]/index.vue
index f8144c3c..8c0c2a39 100644
--- a/frontend/app/pages/dashboard/categories/[id]/index.vue
+++ b/frontend/app/pages/dashboard/categories/[id]/index.vue
@@ -3,9 +3,10 @@
</template>
<script setup lang="ts">
+import type { RouteLocationNormalizedLoaded } from 'vue-router';
import type { Node } from '~/stores';
-definePageMeta({ breadcrumb: () => useNodesStore().getById(useRoute().params.id as string)?.name || '' });
+definePageMeta({ breadcrumb: (route: RouteLocationNormalizedLoaded) => useNodesStore().getById(route.params.id as string)?.name || '' });
const route = useRoute();
const nodesStore = useNodesStore();
diff --git a/frontend/app/pages/dashboard/docs/[id].vue b/frontend/app/pages/dashboard/docs/[id].vue
index e10a1b11..9a93eac2 100644
--- a/frontend/app/pages/dashboard/docs/[id].vue
+++ b/frontend/app/pages/dashboard/docs/[id].vue
@@ -38,13 +38,17 @@ import DocumentCardFooter from './_components/DocumentCardFooter.vue';
import DocumentSkeleton from './_components/DocumentSkeleton.vue';
import NodeContextMenu from '~/components/Node/ContextMenu.vue';
import type { Node } from '~/stores';
+import DeleteNodeModal from '~/components/Node/DeleteNodeModal.vue';
+import type { RouteLocationNormalizedLoaded } from 'vue-router';
-const route = useRoute();
const documentsStore = useNodesStore();
const preferencesStore = usePreferences();
const devise = useDevice();
const sidebar = useSidebar();
+const tree = useSidebarTree();
+const route = useRoute();
+const router = useRouter();
const element = ref<HTMLElement>();
const node = ref<Node | undefined>();
@@ -70,14 +74,14 @@ watchEffect(async () => {
});
definePageMeta({
- breadcrumb: () => {
- const doc = useNodesStore().getById(useRoute().params.id as string);
+ breadcrumb: (route: RouteLocationNormalizedLoaded) => {
+ const doc = useNodesStore().getById(route.params.id as string);
return doc?.name || '';
},
});
-const next = computed(() => useSidebarTree().structure.value.next(node.value?.id)?.data);
-const previous = computed(() => useSidebarTree().structure.value.previous(node.value?.id)?.data);
+const next = computed(() => tree.structure.value.next(node.value?.id)?.data);
+const previous = computed(() => tree.structure.value.previous(node.value?.id)?.data);
const width = computed(() => {
if (preferencesStore.get('docSize').value == 2) return '980px';
if (preferencesStore.get('docSize').value == 1) return '800px';
@@ -98,19 +102,39 @@ onMounted(() => {
const handleDocumentKeydown = (e: KeyboardEvent) => {
if (e.ctrlKey && e.key === 'e') {
// Go to the edit page of the current document
- if (!node.value?.id) return;
- e.preventDefault();
- useRouter().push(`/dashboard/docs/edit/${node.value.id}`);
- } else if (e.key === 'ArrowRight') {
+ if (!node.value) return;
e.preventDefault();
+ router.push(`/dashboard/docs/edit/${node.value.id}`);
+ }
+ if (e.key === 'ArrowRight') {
// Go to the next document page
+ e.preventDefault();
if (!next.value?.id) return;
e.preventDefault();
- useRouter().push(`/dashboard/docs/${next.value.id}`);
- } else if (e.key === 'ArrowLeft') {
+ router.push(`/dashboard/docs/${next.value.id}`);
+ }
+ if (e.key === 'ArrowLeft') {
if (!previous.value?.id) return;
e.preventDefault();
- useRouter().push(`/dashboard/docs/${previous.value.id}`);
+ router.push(`/dashboard/docs/${previous.value.id}`);
+ }
+ if (e.key === 'Escape') {
+ // Close context menu on Escape
+ contextMenu.close();
+ }
+ if (e.key === 'Delete') {
+ // Open delete modal on Delete
+ if (!node.value) return;
+ e.preventDefault();
+ useModal().add(
+ new Modal(shallowRef(DeleteNodeModal), {
+ size: 'small',
+ props: { node: node.value },
+ onClose: r => {
+ if (r === 'success') router.push('/dashboard');
+ },
+ }),
+ );
}
};
diff --git a/frontend/app/pages/dashboard/docs/_components/DocumentCardHeaderActionRow.vue b/frontend/app/pages/dashboard/docs/_components/DocumentCardHeaderActionRow.vue
index a21263b9..17f972e5 100644
--- a/frontend/app/pages/dashboard/docs/_components/DocumentCardHeaderActionRow.vue
+++ b/frontend/app/pages/dashboard/docs/_components/DocumentCardHeaderActionRow.vue
@@ -34,12 +34,14 @@ import NodePermissions from '~/components/Node/NodePermissions.modal.vue';
import RemoveSharedNode from '~/components/Node/RemoveSharedNode.modal.vue';
import type { Node } from '~/stores';
-const nodeStore = useNodesStore();
-
const props = defineProps<{ doc: Node }>();
+const nodeStore = useNodesStore();
+const router = useRouter();
+
const print = () => window.print();
-const openDeleteModal = () => useModal().add(new Modal(shallowRef(DeleteNodeModal), { props: { node: props.doc } }));
+const openDeleteModal = () =>
+ useModal().add(new Modal(shallowRef(DeleteNodeModal), { props: { node: props.doc }, onClose: () => router.push('/dashboard'), size: 'small' }));
const openEditModal = () => useModal().add(new Modal(shallowRef(DocumentMeta), { props: { doc: props.doc }, size: 'small' }));
const openPermissionsModal = () => useModal().add(new Modal(shallowRef(NodePermissions), { props: { node: props.doc }, size: 'small' }));
const openRemoveShareModal = () => useModal().add(new Modal(shallowRef(RemoveSharedNode), { props: { nodeId: props.doc.id }, size: 'small' }));
diff --git a/frontend/app/pages/dashboard/docs/edit/[id].vue b/frontend/app/pages/dashboard/docs/edit/[id].vue
index 386b6aae..a6409121 100644
--- a/frontend/app/pages/dashboard/docs/edit/[id].vue
+++ b/frontend/app/pages/dashboard/docs/edit/[id].vue
@@ -4,6 +4,8 @@
<script lang="ts" setup>
import type { Node } from '~/stores';
+definePageMeta({ breadcrumb: 'Edit' });
+
const store = useNodesStore();
const route = useRoute();
@@ -22,8 +24,6 @@ watchEffect(async () => {
} else node.value = docFromStore;
});
-definePageMeta({ breadcrumb: 'Edit' });
-
function save(doc: Node) {
store
.update(doc)
diff --git a/frontend/app/pages/dashboard/docs/index.vue b/frontend/app/pages/dashboard/docs/index.vue
index bcbaaae6..13c64d64 100644
--- a/frontend/app/pages/dashboard/docs/index.vue
+++ b/frontend/app/pages/dashboard/docs/index.vue
@@ -5,11 +5,12 @@
<script setup lang="ts">
import type { Node } from '~/stores';
+definePageMeta({ breadcrumb: 'All' });
+
const nodesStore = useNodesStore();
const { filtered, workspaceId } = useSidebar();
const parent = computed(() => nodesStore.getById(workspaceId.value || ''));
-definePageMeta({ breadcrumb: () => 'All' });
const nodes = computed(() => {
const result: Node[] = [];
diff --git a/frontend/app/pages/dashboard/docs/new.vue b/frontend/app/pages/dashboard/docs/new.vue
index ddd5e52b..a8d96e65 100644
--- a/frontend/app/pages/dashboard/docs/new.vue
+++ b/frontend/app/pages/dashboard/docs/new.vue
@@ -4,9 +4,10 @@
<script lang="ts" setup>
import type { Node } from '~/stores';
-const store = useNodesStore();
definePageMeta({ breadcrumb: 'New' });
+const store = useNodesStore();
+
const defaultParent = (useRoute().query.cat as string | undefined) || useSidebar().workspaceId.value || undefined;
const document = ref<Partial<Node>>({