📚 The open-source, offline-first Notion, Obsidian & Confluence alternative. Advanced Markdown, multi-tenant teams, OIDC/SSO, and local S3 backups. Deploy in one command.
Vue dockergolangkanbanknowledge-baseknowledge-managementmarkdownnote-takingnotesnotes-appnotionnuxtnuxtjsoffline-firstoidcpwaselfhostedssovuevuejswiki
feat: new unified sort method & save sort key & sort order (#667)
Smaug0d3d7c30abc9
diff --git a/frontend/app/components/Node/ContainerView.vue b/frontend/app/components/Node/ContainerView.vueindex 682aba98..98c54e26 100644--- a/frontend/app/components/Node/ContainerView.vue+++ b/frontend/app/components/Node/ContainerView.vue@@ -19,7 +19,7 @@</Teleport><Teleport to="#navbar-actions"><AppBtnIcon v-if="view == 'kanban'" nav icon="reset" :tooltip="t('nodes.actions.resetBoard')" @click="resetKanban" />- <NodeFilter v-show="!isMobile" :nodes="nodes" @update:nodes="filteredNodes = $event" />+ <NodeFilter :nodes="nodes" @update:nodes="filteredNodes = $event" /><AppBtnIconv-if="parent?.shared && parent.user_id != connectedId"nav@@ -102,7 +102,6 @@ const nodesStore = useNodesStore();const nodesPermissionsStore = useNodesPermissionsStore();const userStore = useUserStore();-const { isMobile } = useDevice();const modals = useModal();const { getAppAccent } = useAppColors();const { t } = useI18nT();diff --git a/frontend/app/components/Node/Filter.vue b/frontend/app/components/Node/Filter.vueindex 586414a4..ea57999e 100644--- a/frontend/app/components/Node/Filter.vue+++ b/frontend/app/components/Node/Filter.vue@@ -1,56 +1,72 @@<template><div ref="root" class="filter-component">- <AppBtnIcon nav icon="filter" :tooltip="t('nodes.filter.title')" @click="toggle">+ <AppBtnIcon ref="trigger" nav icon="filter" :tooltip="t('nodes.filter.title')" @click="toggle"><span v-if="filtered.length != nodes?.length" class="bubble"></span></AppBtnIcon>- <Transition name="pop">- <div v-if="opened" class="filter-panel" role="dialog" :aria-label="t('nodes.filter.title')" @keydown.esc.prevent="close">- <!-- Search -->- <div>- <label>{{ t('common.actions.search') }}</label>- <input ref="inputRef" v-model="options.query" />- </div>+ <Teleport to="body">+ <Transition name="pop">+ <div+ v-if="opened"+ ref="panel"+ class="filter-panel"+ role="dialog"+ :aria-label="t('nodes.filter.title')"+ :style="panelStyle"+ @keydown.esc.prevent="close"+ >+ <!-- Search -->+ <div>+ <label>{{ t('common.actions.search') }}</label>+ <input ref="inputRef" v-model="options.query" />+ </div>- <!-- Tags -->- <div>- <label>{{ t('components.filter.tags') }}</label>- <AppTagInput :model-value="(options.tags || []).join(',')" @update:model-value="options.tags = parseTags($event)" />- </div>+ <!-- Tags -->+ <div>+ <label>{{ t('components.filter.tags') }}</label>+ <AppTagInput :model-value="(options.tags || []).join(',')" @update:model-value="options.tags = parseTags($event)" />+ </div>- <!-- Sort & Match -->- <div class="row">- <label class="row">- <input v-model="options.sortType" type="radio" value="ascending" />- <span>{{ t('components.filter.ascending') }}</span>- </label>- <label class="row">- <input v-model="options.sortType" type="radio" value="descending" />- <span>{{ t('components.filter.descending') }}</span>- </label>- </div>- <div class="row">- <div style="flex: 1">- <label>{{ t('components.filter.sort') }}</label>- <AppSelect v-model="options.sortBy" :items="SORT_OPTIONS" />+ <!-- Sort & Match -->+ <div class="row">+ <label class="row">+ <input v-model="sortOrder" type="radio" value="ascending" />+ <span>{{ t('components.filter.ascending') }}</span>+ </label>++ <label class="row">+ <input v-model="sortOrder" type="radio" value="descending" />+ <span>{{ t('components.filter.descending') }}</span>+ </label></div>- <div>- <label>{{ t('components.filter.match') }}</label>- <AppSelect v-model="options.matchMode" :items="MATCH_OPTIONS" size="125px" class="select" />+ <div class="row">+ <div style="flex: 1">+ <label>{{ t('components.filter.sort') }}</label>+ <AppSelect v-model="sortKey" :items="SORT_OPTIONS" />+ </div>++ <div>+ <label>{{ t('components.filter.match') }}</label>+ <AppSelect v-model="options.matchMode" :items="MATCH_OPTIONS" size="125px" class="select" />+ </div></div>- </div>- <div class="panel-actions">- <button class="btn" type="button" @click="reset">{{ t('common.actions.reset') }}</button>- </div>+ <div class="panel-actions">+ <button class="btn" type="button" @click="reset">+ {{ t('common.actions.reset') }}+ </button>+ </div>- <div class="panel-footer">- <small>{{ t('nodes.filter.footer', { count: filtered.length, total: props.nodes.length }) }}</small>- <small>• <kbd>esc</kbd> {{ t('nodes.filter.toClose') }}</small>+ <div class="panel-footer">+ <small>+ {{ t('nodes.filter.footer', { count: filtered.length, total: props.nodes.length }) }}+ </small>+ <small>• <kbd>esc</kbd> {{ t('nodes.filter.toClose') }}</small>+ </div></div>- </div>- </Transition>+ </Transition>+ </Teleport></div></template>@@ -61,11 +77,14 @@ import type { Node, SearchOptions } from '~/stores';const props = defineProps<{ nodes: Node[] }>();const emit = defineEmits<{ (e: 'update:nodes', v: Node[]): void }>();+const preferencesStore = usePreferencesStore();++const sortKey = preferencesStore.get('sortKey');+const sortOrder = preferencesStore.get('sortOrder');+const DEFAULT_OPTIONS: SearchOptions = {query: '',tags: [],- sortType: 'descending',- sortBy: 'created',matchMode: 'includes',};@@ -75,9 +94,11 @@ const route = useRoute();const router = useRouter();const options = ref<SearchOptions>({ ...DEFAULT_OPTIONS, tags: [] });-const opened = ref<boolean>(false);+const opened = ref(false);+const inputRef = ref<HTMLInputElement | null>(null);const root = ref<HTMLDivElement | null>(null);+const panelStyle = ref<Record<string, string>>({});const SORT_OPTIONS = [{ id: 'created', label: t('components.filter.created') },@@ -93,47 +114,90 @@ const MATCH_OPTIONS = [const filtered = computed(() => store.search(options.value, props.nodes));+const updatePanelPosition = () => {+ if (!root.value) return;++ const button = root.value.querySelector('button');+ if (!button) return;++ const rect = button.getBoundingClientRect();++ panelStyle.value = {+ top: `${rect.bottom + 4}px`,+ right: `${window.innerWidth - rect.right - 200}px`,+ };+};+const toggle = () => {opened.value = !opened.value;- if (opened.value) focusInput();++ if (opened.value) {+ nextTick(() => {+ updatePanelPosition();+ inputRef.value?.focus();+ });+ }};const close = () => (opened.value = false);const reset = () => {options.value = { ...DEFAULT_OPTIONS, tags: [] };- if (route.query.tags) router.replace({ query: { ...route.query, tags: undefined } });++ if (route.query.tags) {+ router.replace({+ query: {+ ...route.query,+ tags: undefined,+ },+ });+ }};-// Initialize tags from the URL (e.g. /dashboard/docs?tags=foo) and react to later changeswatch(() => route.query.tags,queryTags => {if (!queryTags) return;+const raw = Array.isArray(queryTags) ? queryTags.filter(Boolean).map(String) : String(queryTags).split(',');+options.value.tags = raw.map(tag => tag.trim()).filter(Boolean);},{ immediate: true },);-const focusInput = () => nextTick(() => inputRef.value?.focus());-watchEffect(() => {- if (props.nodes) emit('update:nodes', filtered.value);+ if (props.nodes) {+ emit('update:nodes', filtered.value);+ }});function outsideHandler(e: MouseEvent) {const target = e.target as HTMLElement;- if (root.value && !root.value.contains(target)) close();++ if (root.value && !root.value.contains(target)) {+ const panel = document.querySelector('.filter-panel');++ if (!panel?.contains(target)) close();+ }}watch(opened, isOpened => {- if (isOpened) document.addEventListener('click', outsideHandler);- else document.removeEventListener('click', outsideHandler);+ if (isOpened) {+ document.addEventListener('click', outsideHandler);+ window.addEventListener('resize', updatePanelPosition);+ window.addEventListener('scroll', updatePanelPosition, true);+ } else {+ document.removeEventListener('click', outsideHandler);+ window.removeEventListener('resize', updatePanelPosition);+ window.removeEventListener('scroll', updatePanelPosition, true);+ }});onBeforeUnmount(() => {document.removeEventListener('click', outsideHandler);+ window.removeEventListener('resize', updatePanelPosition);+ window.removeEventListener('scroll', updatePanelPosition, true);});</script>@@ -144,10 +208,8 @@ onBeforeUnmount(() => {}.filter-panel {- position: absolute;- top: 48px;- right: 0;- z-index: 200;+ position: fixed;+ z-index: 9999;width: 320px;padding: 12px;border: 1px solid var(--border);diff --git a/frontend/app/composables/useNodesSort.ts b/frontend/app/composables/useNodesSort.tsnew file mode 100644index 00000000..aafd6ab9--- /dev/null+++ b/frontend/app/composables/useNodesSort.ts@@ -0,0 +1,57 @@+import type { TreeItem } from '~/helpers/TreeBuilder';+import type { Node } from '~/stores';++export function useNodesSort() {+ const preferences = usePreferencesStore();+ const sortKey = preferences.get('sortKey');+ const sortOrder = preferences.get('sortOrder');++ function sortItems<+ T extends { id: string; parent_id?: string | null; role?: number; order?: number; created_timestamp?: number; updated_timestamp?: number },+ >(a: TreeItem<T>, b: TreeItem<T>) {+ if (a.data.role !== b.data.role) {+ return (b.data.role ?? 0) - (a.data.role ?? 0);+ }+ const orderA = a.data.order ?? 0;+ const orderB = b.data.order ?? 0;+ if (orderA !== orderB) {+ return orderA - orderB;+ }+ let comparison = 0;+ if (sortKey.value === 'name') {+ comparison = a.label.localeCompare(b.label);+ } else if (sortKey.value === 'created') {+ comparison = (a.data.created_timestamp ?? 0) - (b.data.created_timestamp ?? 0);+ } else if (sortKey.value === 'modified') {+ comparison = (a.data.updated_timestamp ?? 0) - (b.data.updated_timestamp ?? 0);+ }++ return sortOrder.value === 'ascending' ? comparison : -comparison;+ }++ function sortNodes(a: Node, b: Node) {+ if (a.role !== b.role) {+ return (b.role ?? 0) - (a.role ?? 0);+ }+ const orderA = a.order ?? 0;+ const orderB = b.order ?? 0;+ if (orderA !== orderB) {+ return orderA - orderB;+ }+ let comparison = 0;+ if (sortKey.value === 'name') {+ comparison = a.name.localeCompare(b.name);+ } else if (sortKey.value === 'created') {+ comparison = a.created_timestamp - b.created_timestamp;+ } else if (sortKey.value === 'modified') {+ comparison = a.updated_timestamp - b.updated_timestamp;+ }++ return sortOrder.value === 'ascending' ? comparison : -comparison;+ }++ return {+ sortItems,+ sortNodes,+ };+}diff --git a/frontend/app/composables/useNodesTree.ts b/frontend/app/composables/useNodesTree.tsindex a9f52d02..85cd429c 100644--- a/frontend/app/composables/useNodesTree.ts+++ b/frontend/app/composables/useNodesTree.ts@@ -10,11 +10,11 @@ let globalBuilder: TreeBuilder<Node> | null = null;let globalTree: ComputedRef<TreeItem<Node>[]> | null = null;let globalTreeMap: ComputedRef<Map<string, TreeItem<Node>>> | null = null;-function initGlobalTree() {+function initGlobalTree(sortNodes: (a: TreeItem<Node>, b: TreeItem<Node>) => number) {const nodesStore = useNodesStore();if (!globalBuilder) {- globalBuilder = new TreeBuilder<Node>(toRaw(nodesStore.nodes), transformNode);+ globalBuilder = new TreeBuilder<Node>(toRaw(nodesStore.nodes), transformNode, sortNodes);}if (!globalTree) {@@ -57,8 +57,9 @@ function transformNode(node: Node): Omit<TreeItem<Node>, 'children'> {export function useNodesTree() {const collapseStore = useCollapseStore();+ const { sortItems } = useNodesSort();- initGlobalTree();+ initGlobalTree(sortItems);const tree = globalTree!;const treeMap = globalTreeMap!;diff --git a/frontend/app/helpers/TreeBuilder.ts b/frontend/app/helpers/TreeBuilder.tsindex 0a3c0d2d..34b03885 100644--- a/frontend/app/helpers/TreeBuilder.ts+++ b/frontend/app/helpers/TreeBuilder.ts@@ -19,6 +19,7 @@ export class TreeBuilder<T extends { id: string; parent_id?: string | null; roleconstructor(private readonly collection: ReadonlyIndexedCollection<T>,private readonly transform: (item: T) => Omit<TreeItem<T>, 'children'>,+ private readonly sortNodes: (a: TreeItem<T>, b: TreeItem<T>) => number,) {}/**@@ -65,7 +66,7 @@ export class TreeBuilder<T extends { id: string; parent_id?: string | null; roleconst mappedChildren = childrenIds.map(childId => buildSubtree(childId)).filter((c): c is TreeItem<T> => !!c);if (mappedChildren.length > 1) {- mappedChildren.sort(sortNodes);+ mappedChildren.sort(this.sortNodes);}item.children = mappedChildren.length > 0 ? mappedChildren : undefined;@@ -86,7 +87,7 @@ export class TreeBuilder<T extends { id: string; parent_id?: string | null; role.filter((item): item is TreeItem<T> => !!item);if (rootItems.length > 1) {- rootItems.sort(sortNodes);+ rootItems.sort(this.sortNodes);}return rootItems;@@ -154,15 +155,3 @@ export function flattenTree<T>(items: TreeItem<T>[]): TreeItem<T>[] {}return result;}--function sortNodes<T extends { id: string; parent_id?: string | null; role?: number; order?: number }>(a: TreeItem<T>, b: TreeItem<T>) {- if (a.data.role !== b.data.role) {- return (b.data.role ?? 0) - (a.data.role ?? 0);- }- const orderA = a.data.order ?? 0;- const orderB = b.data.order ?? 0;- if (orderA !== orderB) {- return orderA - orderB;- }- return a.label.localeCompare(b.label);-}diff --git a/frontend/app/pages/dashboard/settings/_views/other.vue b/frontend/app/pages/dashboard/settings/_views/other.vueindex bb0346ac..c71b7aa5 100644--- a/frontend/app/pages/dashboard/settings/_views/other.vue+++ b/frontend/app/pages/dashboard/settings/_views/other.vue@@ -57,5 +57,31 @@ const options = computed<Array<{ label: string; options: InterfaceOption[] }>>((},],},+ {+ label: t('settings.other.sort'),+ options: [+ {+ label: t('settings.other.sortKey'),+ description: t('settings.other.sortKeyDesc'),+ type: 'select',+ key: 'sortKey',+ choices: [+ { label: t('common.labels.name'), id: 'name' },+ { label: t('components.filter.created'), id: 'created' },+ { label: t('components.filter.modified'), id: 'modified' },+ ],+ },+ {+ label: t('settings.other.sortOrder'),+ description: t('settings.other.sortOrderDesc'),+ type: 'select',+ key: 'sortOrder',+ choices: [+ { label: t('components.filter.ascending'), id: 'ascending' },+ { label: t('components.filter.descending'), id: 'descending' },+ ],+ },+ ],+ },]);</script>diff --git a/frontend/app/stores/nodes.store.ts b/frontend/app/stores/nodes.store.tsindex 6e42882a..4552dda2 100644--- a/frontend/app/stores/nodes.store.ts+++ b/frontend/app/stores/nodes.store.ts@@ -17,14 +17,13 @@ export interface SearchOptions {dateType?: 'created' | 'modified';tags?: string[];category?: string;- sortBy?: 'created' | 'modified' | 'name';- sortType?: 'ascending' | 'descending';matchMode?: 'includes' | 'starts' | 'exact';role?: NodeRole;}export const useNodesStore = defineStore('nodes', () => {const userStore = useUserStore();+ const { sortNodes } = useNodesSort();const nodes = shallowRef(new IndexedCollection());const allTags = ref<string[]>([]);@@ -125,7 +124,7 @@ export const useNodesStore = defineStore('nodes', () => {};const search = (options: SearchOptions, nodesToSearch: Node[] | readonly Node[] = nodes.value.toSortedArray()) => {- const { query, fromDate, toDate, dateType = 'modified', tags, category, sortBy = 'modified', sortType = 'descending', matchMode = 'includes' } = options;+ const { query, fromDate, toDate, dateType = 'modified', tags, category, matchMode = 'includes' } = options;const queryLower = query?.toLowerCase().trim();const hasQuery = Boolean(queryLower);@@ -172,31 +171,7 @@ export const useNodesStore = defineStore('nodes', () => {});// --- Sort results ---- filtered.sort((a, b) => {- let valA: string | number = '';- let valB: string | number = '';-- switch (sortBy) {- case 'created':- valA = a.created_timestamp;- valB = b.created_timestamp;- break;- case 'modified':- valA = a.updated_timestamp;- valB = b.updated_timestamp;- break;- case 'name':- valA = a.name.toLowerCase();- valB = b.name.toLowerCase();- break;- }-- if (valA < valB) return sortType === 'ascending' ? -1 : 1;- if (valA > valB) return sortType === 'ascending' ? 1 : -1;- return 0;- });-- return filtered;+ return filtered.sort(sortNodes);};async function fetch<T extends FetchOptions>(opts?: T): Promise<'id' extends keyof T ? Node : IndexedCollection> {diff --git a/frontend/app/stores/preferences/constants.ts b/frontend/app/stores/preferences/constants.tsindex d047fe05..69851766 100644--- a/frontend/app/stores/preferences/constants.ts+++ b/frontend/app/stores/preferences/constants.ts@@ -72,6 +72,8 @@ export const DEFAULT_PREFERENCES = {editorScrollBeyondLastLine: true as boolean,editorSimplifiedViewOnMobile: true as boolean,developerMode: false as boolean,+ sortKey: 'name' as 'name' | 'created' | 'modified',+ sortOrder: 'ascending' as 'ascending' | 'descending',stylesInjectionEnabled: false as boolean,stylesInjection: '' as string,stylesDocumentsInjection: '' as string,@@ -130,4 +132,6 @@ export const ADVANCED_KEYS: PreferenceKey[] = ['stylesInjection','stylesDocumentsInjection','defaultUploadFolder',+ 'sortKey',+ 'sortOrder',];diff --git a/frontend/i18n/locales/de/settings.ts b/frontend/i18n/locales/de/settings.tsindex 4c0a50f3..89f931c2 100644--- a/frontend/i18n/locales/de/settings.ts+++ b/frontend/i18n/locales/de/settings.ts@@ -148,7 +148,8 @@ export default {simplifiedMobileView: 'Vereinfachte Mobilansicht',simplifiedMobileViewDesc: 'Aktiviere eine vereinfachte Editor-Ansicht auf Mobilgeräten für bessere Benutzerfreundlichkeit.',scrollBeyondLastLine: 'Über die letzte Zeile hinaus scrollen',- scrollBeyondLastLineDesc: 'Erlaube dem Editor, über das Ende des Dokuments hinaus zu scrollen, damit die letzte Zeile nicht am unteren Bildschirmrand bleibt.',+ scrollBeyondLastLineDesc:+ 'Erlaube dem Editor, über das Ende des Dokuments hinaus zu scrollen, damit die letzte Zeile nicht am unteren Bildschirmrand bleibt.',subtitle: 'Verwalte deine Editor-Einstellungen.',title: 'Editor-Einstellungen',},@@ -186,6 +187,11 @@ export default {subtitle: 'Verwalte andere allgemeine Anwendungseinstellungen.',title: 'Sonstiges',uploads: 'Uploads',+ sort: 'Sortierung',+ sortKey: 'Sortierungsschlüssel',+ sortKeyDesc: 'Wähle den Standard-Sortierschlüssel für Elemente in Listen.',+ sortOrder: 'Sortierreihenfolge',+ sortOrderDesc: 'Wähle die Standard-Sortierreihenfolge für Elemente in Listen.',},pages: {diff --git a/frontend/i18n/locales/en/settings.ts b/frontend/i18n/locales/en/settings.tsindex a3025e60..0bcb0f35 100644--- a/frontend/i18n/locales/en/settings.ts+++ b/frontend/i18n/locales/en/settings.ts@@ -185,6 +185,11 @@ export default {subtitle: 'Manage other general application settings.',title: 'Other',uploads: 'Uploads',+ sort: 'Items sorting',+ sortKey: 'Sort by',+ sortKeyDesc: 'Choose the default sorting key for items in lists.',+ sortOrder: 'Sort order',+ sortOrderDesc: 'Choose the default sorting order for items in lists.',},pages: {diff --git a/frontend/i18n/locales/fr/settings.ts b/frontend/i18n/locales/fr/settings.tsindex b59bc12d..28ec80a1 100644--- a/frontend/i18n/locales/fr/settings.ts+++ b/frontend/i18n/locales/fr/settings.ts@@ -186,6 +186,11 @@ export default {subtitle: "Gérez les autres paramètres généraux de l'application.",title: 'Autre',uploads: 'Téléchargements',+ sort: 'Tri des éléments',+ sortKey: 'Clé de tri',+ sortKeyDesc: 'Choisissez la clé de tri par défaut pour les éléments dans les listes.',+ sortOrder: 'Ordre de tri',+ sortOrderDesc: "Choisissez l'ordre de tri par défaut pour les éléments dans les listes.",},pages: {diff --git a/frontend/i18n/locales/it/settings.ts b/frontend/i18n/locales/it/settings.tsindex c0ab8dcc..f057e4c6 100644--- a/frontend/i18n/locales/it/settings.ts+++ b/frontend/i18n/locales/it/settings.ts@@ -187,6 +187,11 @@ export default {subtitle: "Gestisci altre impostazioni generali dell'applicazione.",title: 'Altro',uploads: 'Caricamenti',+ sort: 'Ordinamento elementi',+ sortKey: 'Chiave di ordinamento',+ sortKeyDesc: 'Scegli la chiave di ordinamento predefinita per gli elementi nelle liste.',+ sortOrder: 'Ordine di ordinamento',+ sortOrderDesc: "Scegli l'ordine di ordinamento predefinito per gli elementi nelle liste.",},pages: {diff --git a/frontend/i18n/locales/ko/settings.ts b/frontend/i18n/locales/ko/settings.tsindex cf4f1439..9d041d77 100644--- a/frontend/i18n/locales/ko/settings.ts+++ b/frontend/i18n/locales/ko/settings.ts@@ -184,6 +184,11 @@ export default {subtitle: '기타 일반 애플리케이션 설정을 관리합니다.',title: '기타',uploads: '업로드',+ sort: '항목 정렬',+ sortKey: '정렬 키',+ sortKeyDesc: '목록의 항목에 대한 기본 정렬 키를 선택합니다.',+ sortOrder: '정렬 순서',+ sortOrderDesc: '목록의 항목에 대한 기본 정렬 순서를 선택합니다.',},pages: {diff --git a/frontend/i18n/locales/uk/settings.ts b/frontend/i18n/locales/uk/settings.tsindex 6aca1b73..050006ef 100644--- a/frontend/i18n/locales/uk/settings.ts+++ b/frontend/i18n/locales/uk/settings.ts@@ -185,6 +185,11 @@ export default {subtitle: 'Керуйте іншими загальними налаштуваннями застосунку.',title: 'Інше',uploads: 'Завантаження',+ sort: 'Сортування елементів',+ sortKey: 'Ключ сортування',+ sortKeyDesc: 'Виберіть ключ сортування за замовчуванням для елементів у списках.',+ sortOrder: 'Порядок сортування',+ sortOrderDesc: 'Виберіть порядок сортування за замовчуванням для елементів у списках.',},pages: {