chore: version v1.125.4

fix(server): cannot render album page when all assets of an album are in trash (#15690 )
* fix(server): cannot render album page when all assets of an album are in trash * inner join * add e2e test * check empty albums too * render add to album button on empty album * lint * count 0 if undefined * fix album card test --------- Co-authored-by: mertalev <101130780+mertalev@users.noreply.github.com>
2025-01-27 18:44:12 +00:00 · 2025-01-26 21:18:34 -06:00 · 2025-01-26 15:09:15 -06:00 · 2025-01-26 15:07:22 -06:00
28 changed files with 133 additions and 97 deletions
--- a/cli/package-lock.json
+++ b/cli/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@immich/cli",
-  "version": "2.2.44",
+  "version": "2.2.45",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@immich/cli",
-      "version": "2.2.44",
+      "version": "2.2.45",
      "license": "GNU Affero General Public License version 3",
      "dependencies": {
        "fast-glob": "^3.3.2",
@@ -52,7 +52,7 @@
    },
    "../open-api/typescript-sdk": {
      "name": "@immich/sdk",
-      "version": "1.125.3",
+      "version": "1.125.4",
      "dev": true,
      "license": "GNU Affero General Public License version 3",
      "dependencies": {
--- a/cli/package.json
+++ b/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@immich/cli",
-  "version": "2.2.44",
+  "version": "2.2.45",
  "description": "Command Line Interface (CLI) for Immich",
  "type": "module",
  "exports": "./dist/index.js",
--- a/docs/static/archived-versions.json
+++ b/docs/static/archived-versions.json
@@ -1,4 +1,8 @@
 [
+  {
+    "label": "v1.125.4",
+    "url": "https://v1.125.4.archive.immich.app"
+  },
  {
    "label": "v1.125.3",
    "url": "https://v1.125.3.archive.immich.app"
--- a/e2e/package-lock.json
+++ b/e2e/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "immich-e2e",
-  "version": "1.125.3",
+  "version": "1.125.4",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "immich-e2e",
-      "version": "1.125.3",
+      "version": "1.125.4",
      "license": "GNU Affero General Public License version 3",
      "devDependencies": {
        "@eslint/eslintrc": "^3.1.0",
@@ -45,7 +45,7 @@
    },
    "../cli": {
      "name": "@immich/cli",
-      "version": "2.2.44",
+      "version": "2.2.45",
      "dev": true,
      "license": "GNU Affero General Public License version 3",
      "dependencies": {
@@ -92,7 +92,7 @@
    },
    "../open-api/typescript-sdk": {
      "name": "@immich/sdk",
-      "version": "1.125.3",
+      "version": "1.125.4",
      "dev": true,
      "license": "GNU Affero General Public License version 3",
      "dependencies": {
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -1,6 +1,6 @@
 {
  "name": "immich-e2e",
-  "version": "1.125.3",
+  "version": "1.125.4",
  "description": "",
  "main": "index.js",
  "type": "module",
--- a/e2e/src/api/specs/album.e2e-spec.ts
+++ b/e2e/src/api/specs/album.e2e-spec.ts
@@ -22,82 +22,92 @@ const user1NotShared = 'user1NotShared';
 const user2SharedUser = 'user2SharedUser';
 const user2SharedLink = 'user2SharedLink';
 const user2NotShared = 'user2NotShared';
+const user4DeletedAsset = 'user4DeletedAsset';
+const user4Empty = 'user4Empty';

 describe('/albums', () => {
  let admin: LoginResponseDto;
  let user1: LoginResponseDto;
  let user1Asset1: AssetMediaResponseDto;
  let user1Asset2: AssetMediaResponseDto;
+  let user4Asset1: AssetMediaResponseDto;
  let user1Albums: AlbumResponseDto[];
  let user2: LoginResponseDto;
  let user2Albums: AlbumResponseDto[];
+  let deletedAssetAlbum: AlbumResponseDto;
  let user3: LoginResponseDto; // deleted
+  let user4: LoginResponseDto;

  beforeAll(async () => {
    await utils.resetDatabase();

    admin = await utils.adminSetup();

-    [user1, user2, user3] = await Promise.all([
+    [user1, user2, user3, user4] = await Promise.all([
      utils.userSetup(admin.accessToken, createUserDto.user1),
      utils.userSetup(admin.accessToken, createUserDto.user2),
      utils.userSetup(admin.accessToken, createUserDto.user3),
+      utils.userSetup(admin.accessToken, createUserDto.user4),
    ]);

-    [user1Asset1, user1Asset2] = await Promise.all([
+    [user1Asset1, user1Asset2, user4Asset1] = await Promise.all([
      utils.createAsset(user1.accessToken, { isFavorite: true }),
      utils.createAsset(user1.accessToken),
+      utils.createAsset(user1.accessToken),
    ]);

-    user1Albums = await Promise.all([
-      utils.createAlbum(user1.accessToken, {
-        albumName: user1SharedEditorUser,
-        albumUsers: [
-          { userId: admin.userId, role: AlbumUserRole.Editor },
-          { userId: user2.userId, role: AlbumUserRole.Editor },
-        ],
-        assetIds: [user1Asset1.id],
-      }),
-      utils.createAlbum(user1.accessToken, {
-        albumName: user1SharedLink,
-        assetIds: [user1Asset1.id],
-      }),
-      utils.createAlbum(user1.accessToken, {
-        albumName: user1NotShared,
-        assetIds: [user1Asset1.id, user1Asset2.id],
-      }),
-      utils.createAlbum(user1.accessToken, {
-        albumName: user1SharedViewerUser,
-        albumUsers: [{ userId: user2.userId, role: AlbumUserRole.Viewer }],
-        assetIds: [user1Asset1.id],
+    [user1Albums, user2Albums, deletedAssetAlbum] = await Promise.all([
+      Promise.all([
+        utils.createAlbum(user1.accessToken, {
+          albumName: user1SharedEditorUser,
+          albumUsers: [
+            { userId: admin.userId, role: AlbumUserRole.Editor },
+            { userId: user2.userId, role: AlbumUserRole.Editor },
+          ],
+          assetIds: [user1Asset1.id],
+        }),
+        utils.createAlbum(user1.accessToken, {
+          albumName: user1SharedLink,
+          assetIds: [user1Asset1.id],
+        }),
+        utils.createAlbum(user1.accessToken, {
+          albumName: user1NotShared,
+          assetIds: [user1Asset1.id, user1Asset2.id],
+        }),
+        utils.createAlbum(user1.accessToken, {
+          albumName: user1SharedViewerUser,
+          albumUsers: [{ userId: user2.userId, role: AlbumUserRole.Viewer }],
+          assetIds: [user1Asset1.id],
+        }),
+      ]),
+      Promise.all([
+        utils.createAlbum(user2.accessToken, {
+          albumName: user2SharedUser,
+          albumUsers: [
+            { userId: user1.userId, role: AlbumUserRole.Editor },
+            { userId: user3.userId, role: AlbumUserRole.Editor },
+          ],
+        }),
+        utils.createAlbum(user2.accessToken, { albumName: user2SharedLink }),
+        utils.createAlbum(user2.accessToken, { albumName: user2NotShared }),
+      ]),
+      utils.createAlbum(user4.accessToken, { albumName: user4DeletedAsset }),
+      utils.createAlbum(user4.accessToken, { albumName: user4Empty }),
+      utils.createAlbum(user3.accessToken, {
+        albumName: 'Deleted',
+        albumUsers: [{ userId: user1.userId, role: AlbumUserRole.Editor }],
      }),
    ]);

-    user2Albums = await Promise.all([
-      utils.createAlbum(user2.accessToken, {
-        albumName: user2SharedUser,
-        albumUsers: [
-          { userId: user1.userId, role: AlbumUserRole.Editor },
-          { userId: user3.userId, role: AlbumUserRole.Editor },
-        ],
-      }),
-      utils.createAlbum(user2.accessToken, { albumName: user2SharedLink }),
-      utils.createAlbum(user2.accessToken, { albumName: user2NotShared }),
-    ]);
-
-    await utils.createAlbum(user3.accessToken, {
-      albumName: 'Deleted',
-      albumUsers: [{ userId: user1.userId, role: AlbumUserRole.Editor }],
-    });
-
-    await addAssetsToAlbum(
-      { id: user2Albums[0].id, bulkIdsDto: { ids: [user1Asset1.id, user1Asset2.id] } },
-      { headers: asBearerAuth(user1.accessToken) },
-    );
-
-    user2Albums[0] = await getAlbumInfo({ id: user2Albums[0].id }, { headers: asBearerAuth(user2.accessToken) });
-
    await Promise.all([
+      addAssetsToAlbum(
+        { id: user2Albums[0].id, bulkIdsDto: { ids: [user1Asset1.id, user1Asset2.id] } },
+        { headers: asBearerAuth(user1.accessToken) },
+      ),
+      addAssetsToAlbum(
+        { id: deletedAssetAlbum.id, bulkIdsDto: { ids: [user4Asset1.id] } },
+        { headers: asBearerAuth(user4.accessToken) },
+      ),
      // add shared link to user1SharedLink album
      utils.createSharedLink(user1.accessToken, {
        type: SharedLinkType.Album,
@@ -110,7 +120,11 @@ describe('/albums', () => {
      }),
    ]);

-    await deleteUserAdmin({ id: user3.userId, userAdminDeleteDto: {} }, { headers: asBearerAuth(admin.accessToken) });
+    [user2Albums[0]] = await Promise.all([
+      getAlbumInfo({ id: user2Albums[0].id }, { headers: asBearerAuth(user2.accessToken) }),
+      deleteUserAdmin({ id: user3.userId, userAdminDeleteDto: {} }, { headers: asBearerAuth(admin.accessToken) }),
+      utils.deleteAssets(user1.accessToken, [user4Asset1.id]),
+    ]);
  });

  describe('GET /albums', () => {
@@ -287,6 +301,25 @@ describe('/albums', () => {
      expect(status).toBe(200);
      expect(body).toHaveLength(5);
    });
+
+    it('should return empty albums and albums where all assets are deleted', async () => {
+      const { status, body } = await request(app).get('/albums').set('Authorization', `Bearer ${user4.accessToken}`);
+      expect(status).toBe(200);
+      expect(body).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            ownerId: user4.userId,
+            albumName: user4DeletedAsset,
+            shared: false,
+          }),
+          expect.objectContaining({
+            ownerId: user4.userId,
+            albumName: user4Empty,
+            shared: false,
+          }),
+        ]),
+      );
+    });
  });

  describe('GET /albums/:id', () => {
--- a/machine-learning/pyproject.toml
+++ b/machine-learning/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "machine-learning"
-version = "1.125.3"
+version = "1.125.4"
 description = ""
 authors = ["Hau Tran <alex.tran1502@gmail.com>"]
 readme = "README.md"
--- a/mobile/android/fastlane/Fastfile
+++ b/mobile/android/fastlane/Fastfile
@@ -35,8 +35,8 @@ platform :android do
      task: 'bundle', 
      build_type: 'Release',
      properties: {
-        "android.injected.version.code" => 179,
-        "android.injected.version.name" => "1.125.3",
+        "android.injected.version.code" => 180,
+        "android.injected.version.name" => "1.125.4",
      }
    )
    upload_to_play_store(skip_upload_apk: true, skip_upload_images: true, skip_upload_screenshots: true, aab: '../build/app/outputs/bundle/release/app-release.aab')
--- a/mobile/ios/Runner.xcodeproj/project.pbxproj
+++ b/mobile/ios/Runner.xcodeproj/project.pbxproj
@@ -541,7 +541,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 189;
+				CURRENT_PROJECT_VERSION = 190;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
@@ -685,7 +685,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 189;
+				CURRENT_PROJECT_VERSION = 190;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
@@ -715,7 +715,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 189;
+				CURRENT_PROJECT_VERSION = 190;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
@@ -748,7 +748,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 189;
+				CURRENT_PROJECT_VERSION = 190;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -791,7 +791,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 189;
+				CURRENT_PROJECT_VERSION = 190;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -831,7 +831,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 189;
+				CURRENT_PROJECT_VERSION = 190;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
--- a/mobile/ios/Runner/Info.plist
+++ b/mobile/ios/Runner/Info.plist
@@ -78,7 +78,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.125.1</string>
+	<string>1.125.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -93,7 +93,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>189</string>
+	<string>190</string>
 	<key>FLTEnableImpeller</key>
 	<true/>
 	<key>ITSAppUsesNonExemptEncryption</key>
--- a/mobile/ios/fastlane/Fastfile
+++ b/mobile/ios/fastlane/Fastfile
@@ -19,7 +19,7 @@ platform :ios do
  desc "iOS Release"
  lane :release do
    increment_version_number(
-      version_number: "1.125.3"
+      version_number: "1.125.4"
    )
    increment_build_number(
      build_number: latest_testflight_build_number + 1,
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -3,7 +3,7 @@ Immich API

 This Dart package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:

- API version: 1.125.3
+- API version: 1.125.4
 - Generator version: 7.8.0
 - Build package: org.openapitools.codegen.languages.DartClientCodegen

--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -2,7 +2,7 @@ name: immich_mobile
 description: Immich - selfhosted backup media file on mobile phone

 publish_to: 'none'
-version: 1.125.3+179
+version: 1.125.4+180

 environment:
  sdk: '>=3.3.0 <4.0.0'
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -7454,7 +7454,7 @@
  "info": {
    "title": "Immich",
    "description": "Immich API",
-    "version": "1.125.3",
+    "version": "1.125.4",
    "contact": {}
  },
  "tags": [],
--- a/open-api/typescript-sdk/package-lock.json
+++ b/open-api/typescript-sdk/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@immich/sdk",
-  "version": "1.125.3",
+  "version": "1.125.4",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@immich/sdk",
-      "version": "1.125.3",
+      "version": "1.125.4",
      "license": "GNU Affero General Public License version 3",
      "dependencies": {
        "@oazapfts/runtime": "^1.0.2"
--- a/open-api/typescript-sdk/package.json
+++ b/open-api/typescript-sdk/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@immich/sdk",
-  "version": "1.125.3",
+  "version": "1.125.4",
  "description": "Auto-generated TypeScript SDK for the Immich API",
  "type": "module",
  "main": "./build/index.js",
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -1,6 +1,6 @@
 /**
 * Immich
- * 1.125.3
+ * 1.125.4
 * DO NOT MODIFY - This file has been generated using oazapfts.
 * See https://www.npmjs.com/package/oazapfts
 */
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "immich",
-  "version": "1.125.3",
+  "version": "1.125.4",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "immich",
-      "version": "1.125.3",
+      "version": "1.125.4",
      "license": "GNU Affero General Public License version 3",
      "dependencies": {
        "@nestjs/bullmq": "^11.0.0",
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
  "name": "immich",
-  "version": "1.125.3",
+  "version": "1.125.4",
  "description": "",
  "author": "",
  "private": true,
--- a/server/src/queries/album.repository.sql
+++ b/server/src/queries/album.repository.sql
@@ -207,8 +207,8 @@ select
  count("assets"."id")::int as "assetCount"
 from
  "albums"
-  left join "albums_assets_assets" as "album_assets" on "album_assets"."albumsId" = "albums"."id"
-  left join "assets" on "assets"."id" = "album_assets"."assetsId"
+  inner join "albums_assets_assets" as "album_assets" on "album_assets"."albumsId" = "albums"."id"
+  inner join "assets" on "assets"."id" = "album_assets"."assetsId"
 where
  "albums"."id" in ($1)
  and "assets"."deletedAt" is null
--- a/server/src/repositories/album.repository.ts
+++ b/server/src/repositories/album.repository.ts
@@ -124,8 +124,8 @@ export class AlbumRepository implements IAlbumRepository {

    return this.db
      .selectFrom('albums')
-      .leftJoin('albums_assets_assets as album_assets', 'album_assets.albumsId', 'albums.id')
-      .leftJoin('assets', 'assets.id', 'album_assets.assetsId')
+      .innerJoin('albums_assets_assets as album_assets', 'album_assets.albumsId', 'albums.id')
+      .innerJoin('assets', 'assets.id', 'album_assets.assetsId')
      .select('albums.id as albumId')
      .select((eb) => eb.fn.min('assets.fileCreatedAt').as('startDate'))
      .select((eb) => eb.fn.max('assets.fileCreatedAt').as('endDate'))
--- a/server/src/services/album.service.ts
+++ b/server/src/services/album.service.ts
@@ -64,9 +64,9 @@ export class AlbumService extends BaseService {
        return {
          ...mapAlbumWithoutAssets(album),
          sharedLinks: undefined,
-          startDate: albumMetadata[album.id].startDate ?? undefined,
-          endDate: albumMetadata[album.id].endDate ?? undefined,
-          assetCount: albumMetadata[album.id].assetCount,
+          startDate: albumMetadata[album.id]?.startDate ?? undefined,
+          endDate: albumMetadata[album.id]?.endDate ?? undefined,
+          assetCount: albumMetadata[album.id]?.assetCount ?? 0,
          lastModifiedAssetTimestamp: lastModifiedAsset?.updatedAt,
        };
      }),
@@ -83,9 +83,9 @@ export class AlbumService extends BaseService {

    return {
      ...mapAlbum(album, withAssets, auth),
-      startDate: albumMetadataForIds.startDate ?? undefined,
-      endDate: albumMetadataForIds.endDate ?? undefined,
-      assetCount: albumMetadataForIds.assetCount,
+      startDate: albumMetadataForIds?.startDate ?? undefined,
+      endDate: albumMetadataForIds?.endDate ?? undefined,
+      assetCount: albumMetadataForIds?.assetCount ?? 0,
      lastModifiedAssetTimestamp: lastModifiedAsset?.updatedAt,
    };
  }
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "immich-web",
-  "version": "1.125.3",
+  "version": "1.125.4",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "immich-web",
-      "version": "1.125.3",
+      "version": "1.125.4",
      "license": "GNU Affero General Public License version 3",
      "dependencies": {
        "@formatjs/icu-messageformat-parser": "^2.9.8",
@@ -75,7 +75,7 @@
    },
    "../open-api/typescript-sdk": {
      "name": "@immich/sdk",
-      "version": "1.125.3",
+      "version": "1.125.4",
      "license": "GNU Affero General Public License version 3",
      "dependencies": {
        "@oazapfts/runtime": "^1.0.2"
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
  "name": "immich-web",
-  "version": "1.125.3",
+  "version": "1.125.4",
  "license": "GNU Affero General Public License version 3",
  "scripts": {
    "dev": "vite dev --host 0.0.0.0 --port 3000",
--- 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}
--- 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() {
--- 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();

--- 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'),
Author	SHA1	Message	Date
github-actions	e5794e6cfc	chore: version v1.125.4	2025-01-27 18:44:12 +00:00
Alex	f6cbc9db06	fix(server): cannot render album page when all assets of an album are in trash (#15690 ) * fix(server): cannot render album page when all assets of an album are in trash * inner join * add e2e test * check empty albums too * render add to album button on empty album * lint * count 0 if undefined * fix album card test --------- Co-authored-by: mertalev <101130780+mertalev@users.noreply.github.com>	2025-01-26 21:18:34 -06:00
Alex	8dab5d3798	chore(mobile): post release task (#15662 )	2025-01-26 15:09:15 -06:00
Carsten Otto	e864811a85	fix(web): sort folders (#15691 ) fixes #13145	2025-01-26 15:07:22 -06:00