High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix(web): sort folders (#15691)
Carsten Ottoe864811a85aa
diff --git a/web/src/lib/components/shared-components/tree/tree-items.svelte b/web/src/lib/components/shared-components/tree/tree-items.svelteindex c6db9fec8d..3724ced6c9 100644--- a/web/src/lib/components/shared-components/tree/tree-items.svelte+++ b/web/src/lib/components/shared-components/tree/tree-items.svelte@@ -15,7 +15,7 @@</script><ul class="list-none ml-2">- {#each Object.entries(items) as [path, tree]}+ {#each Object.entries(items).sort() as [path, tree]}{@const value = normalizeTreePath(`${parent}/${path}`)}{@const key = value + getColor(value)}{#key key}diff --git a/web/src/lib/stores/folders.svelte.ts b/web/src/lib/stores/folders.svelte.tsindex f3b237f8a2..fb59687a38 100644--- a/web/src/lib/stores/folders.svelte.ts+++ b/web/src/lib/stores/folders.svelte.ts@@ -24,7 +24,6 @@ class FoldersStore {const uniquePaths = await getUniqueOriginalPaths();this.uniquePaths.push(...uniquePaths);- this.uniquePaths.sort();}bustAssetCache() {diff --git a/web/src/routes/(user)/folders/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/folders/[[photos=photos]]/[[assetId=id]]/+page.svelteindex 87cd2434d6..8ff2a35981 100644--- a/web/src/routes/(user)/folders/[[photos=photos]]/[[assetId=id]]/+page.svelte+++ b/web/src/routes/(user)/folders/[[photos=photos]]/[[assetId=id]]/+page.svelte@@ -44,7 +44,7 @@let pathSegments = $derived(data.path ? data.path.split('/') : []);let tree = $derived(buildTree(foldersStore.uniquePaths));let currentPath = $derived($page.url.searchParams.get(QueryParameter.PATH) || '');- let currentTreeItems = $derived(currentPath ? data.currentFolders : Object.keys(tree));+ let currentTreeItems = $derived(currentPath ? data.currentFolders : Object.keys(tree).sort());const assetInteraction = new AssetInteraction();diff --git a/web/src/routes/(user)/folders/[[photos=photos]]/[[assetId=id]]/+page.ts b/web/src/routes/(user)/folders/[[photos=photos]]/[[assetId=id]]/+page.tsindex 0d23ba32df..d00ba238ef 100644--- a/web/src/routes/(user)/folders/[[photos=photos]]/[[assetId=id]]/+page.ts+++ b/web/src/routes/(user)/folders/[[photos=photos]]/[[assetId=id]]/+page.ts@@ -34,7 +34,7 @@ export const load = (async ({ params, url }) => {return {asset,path,- currentFolders: Object.keys(tree || {}),+ currentFolders: Object.keys(tree || {}).sort(),pathAssets,meta: {title: $t('folders'),