From 41a06743c2b6a9e45dc2d967fccc5dca80dd1d4b Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Mon, 21 Jul 2025 13:27:42 -0400
Subject: [PATCH 01/31] Multi add to album picker: - update modal for multi
 select - Update add-to-album and add-to-album-action to work with new array
 return from AlbumPickerModal - Add asset-utils.addAssetsToAlbums (incomplete)

---
 .../actions/add-to-album-action.svelte        |  16 ++-
 .../asset-viewer/album-list-item.svelte       | 116 +++++++++++++++++-
 web/src/lib/components/elements/icon.svelte   |   7 ++
 .../photos-page/actions/add-to-album.svelte   |  16 ++-
 .../album-selection/album-selection-utils.ts  |   4 +
 web/src/lib/modals/AlbumPickerModal.svelte    |  60 +++++++--
 web/src/lib/utils/asset-utils.ts              |  11 ++
 7 files changed, 210 insertions(+), 20 deletions(-)

diff --git a/web/src/lib/components/asset-viewer/actions/add-to-album-action.svelte b/web/src/lib/components/asset-viewer/actions/add-to-album-action.svelte
index 8fe765ab2db08..048f5b725d32e 100644
--- a/web/src/lib/components/asset-viewer/actions/add-to-album-action.svelte
+++ b/web/src/lib/components/asset-viewer/actions/add-to-album-action.svelte
@@ -5,7 +5,7 @@
   import { AssetAction } from '$lib/constants';
   import { modalManager } from '$lib/managers/modal-manager.svelte';
   import AlbumPickerModal from '$lib/modals/AlbumPickerModal.svelte';
-  import { addAssetsToAlbum } from '$lib/utils/asset-utils';
+  import { addAssetsToAlbum, addAssetsToAlbums } from '$lib/utils/asset-utils';
   import { toTimelineAsset } from '$lib/utils/timeline-util';
   import type { AssetResponseDto } from '@immich/sdk';
   import { mdiImageAlbum, mdiShareVariantOutline } from '@mdi/js';
@@ -20,14 +20,20 @@
   let { asset, onAction, shared = false }: Props = $props();
 
   const onClick = async () => {
-    const album = await modalManager.show(AlbumPickerModal, { shared });
+    const albums = await modalManager.show(AlbumPickerModal, { shared });
 
-    if (!album) {
+    if (!albums || albums.length === 0) {
       return;
     }
 
-    await addAssetsToAlbum(album.id, [asset.id]);
-    onAction({ type: AssetAction.ADD_TO_ALBUM, asset: toTimelineAsset(asset), album });
+    if (albums.length === 1) {
+      const album = albums[0];
+      await addAssetsToAlbum(album.id, [asset.id]);
+      onAction({ type: AssetAction.ADD_TO_ALBUM, asset: toTimelineAsset(asset), album });
+    } else {
+      await addAssetsToAlbums(albums.map(a=>a.id), [asset.id]);
+      onAction({type: AssetAction.ADD_TO_ALBUM, asset: toTimelineAsset(asset), album: albums[0]});
+    }
   };
 </script>
 
diff --git a/web/src/lib/components/asset-viewer/album-list-item.svelte b/web/src/lib/components/asset-viewer/album-list-item.svelte
index 7751bd09d822a..0f64535f56312 100644
--- a/web/src/lib/components/asset-viewer/album-list-item.svelte
+++ b/web/src/lib/components/asset-viewer/album-list-item.svelte
@@ -1,19 +1,32 @@
 <script lang="ts">
+  import Icon from '$lib/components/elements/icon.svelte';
   import { SCROLL_PROPERTIES } from '$lib/components/shared-components/album-selection/album-selection-utils';
   import { getAssetThumbnailUrl } from '$lib/utils';
   import { normalizeSearchString } from '$lib/utils/string-utils.js';
   import { type AlbumResponseDto } from '@immich/sdk';
+  import { mdiCheckCircle } from '@mdi/js';
   import type { Action } from 'svelte/action';
+
+  import { mobileDevice } from '$lib/stores/mobile-device.svelte';
   import AlbumListItemDetails from './album-list-item-details.svelte';
 
   interface Props {
     album: AlbumResponseDto;
     searchQuery?: string;
     selected: boolean;
+    multiSelected?: boolean;
     onAlbumClick: () => void;
+    onMultiSelect: () => void;
   }
 
-  let { album, searchQuery = '', selected = false, onAlbumClick }: Props = $props();
+  let {
+    album,
+    searchQuery = '',
+    selected = false,
+    multiSelected = false,
+    onAlbumClick,
+    onMultiSelect,
+  }: Props = $props();
 
   const scrollIntoViewIfSelected: Action = (node) => {
     $effect(() => {
@@ -37,22 +50,119 @@
       albumName.slice(findIndex + findLength),
     ];
   });
+
+  // const handleAlbumClick = () => {
+  //   if (multiSelectActive) {
+  //     onMultiSelectClicked();
+  //   } else {
+  //     onAlbumClick();
+  //   }
+  // }
+
+  const handleMultiSelectClicked = (e?: MouseEvent) => {
+    e?.stopPropagation();
+    e?.preventDefault();
+    console.log('icon click');
+    // multiSelected = !multiSelected;
+    onMultiSelect();
+  };
+
+  let usingMobileDevice = $derived(mobileDevice.pointerCoarse);
+  let mouseOver = $state(false);
+  const onMouseEnter = () => {
+    if (usingMobileDevice) {
+      return;
+    }
+    mouseOver = true;
+  };
+
+  const onMouseLeave = () => {
+    mouseOver = false;
+  };
+
+  let timer: ReturnType<typeof setTimeout> | null = null;
+  const preventContextMenu = (evt: Event) => evt.preventDefault();
+  const disposeables: (() => void)[] = [];
+  const clearLongPressTimer = () => {
+    if (!timer) {
+      return;
+    }
+    clearTimeout(timer);
+    timer = null;
+    for (const dispose of disposeables) {
+      dispose();
+    }
+    disposeables.length = 0;
+  };
+  function longPress(element: HTMLElement, { onLongPress }: { onLongPress: () => void }) {
+    let didPress = false;
+    const start = (evt: PointerEvent) => {
+      didPress = false;
+      // 350ms for longpress. For reference: iOS uses 500ms for default long press, or 200ms for fast long press.
+      timer = setTimeout(() => {
+        onLongPress();
+        element.addEventListener('contextmenu', preventContextMenu, { once: true });
+        disposeables.push(() => element.removeEventListener('contextmenu', preventContextMenu));
+        didPress = true;
+      }, 350);
+    };
+    const click = (e: MouseEvent) => {
+      if (!didPress) {
+        return;
+      }
+      e.stopPropagation();
+      e.preventDefault();
+    };
+    element.addEventListener('click', click);
+    element.addEventListener('pointerdown', start, true);
+    element.addEventListener('pointerup', clearLongPressTimer, { capture: true, passive: true });
+    return {
+      destroy: () => {
+        element.removeEventListener('click', click);
+        element.removeEventListener('pointerdown', start, true);
+        element.removeEventListener('pointerup', clearLongPressTimer, true);
+      },
+    };
+  }
 </script>
 
 <button
   type="button"
   onclick={onAlbumClick}
   use:scrollIntoViewIfSelected
-  class="flex w-full gap-4 px-6 py-2 text-start transition-colors hover:bg-gray-200 dark:hover:bg-gray-700 rounded-xl"
+  class="relative flex w-full gap-4 px-6 py-2 text-start transition-colors hover:bg-gray-200 dark:hover:bg-gray-700 rounded-xl"
   class:bg-gray-200={selected}
   class:dark:bg-gray-700={selected}
+  onmouseenter={onMouseEnter}
+  onmouseleave={onMouseLeave}
+  use:longPress={{ onLongPress: () => handleMultiSelectClicked() }}
 >
+  {#if mouseOver || multiSelected}
+    <div class="absolute top-2 left-5.1 z-[1] rounded-full">
+      {#if multiSelected}
+        <div class="rounded-full bg-[#D9DCEF] dark:bg-[#232932]">
+          <Icon path={mdiCheckCircle} size="24" class="text-primary" onClick={handleMultiSelectClicked} />
+        </div>
+      {:else}
+        <Icon
+          path={mdiCheckCircle}
+          size="24"
+          class="text-white/80 hover:text-white"
+          onClick={handleMultiSelectClicked}
+        />
+      {/if}
+    </div>
+  {/if}
+
   <span class="h-12 w-12 shrink-0 rounded-xl bg-slate-300">
     {#if album.albumThumbnailAssetId}
       <img
         src={getAssetThumbnailUrl(album.albumThumbnailAssetId)}
         alt={album.albumName}
-        class="h-full w-full rounded-xl object-cover transition-all duration-300 hover:shadow-lg"
+        class={[
+          'h-full w-full rounded-xl object-cover transition-all duration-300 hover:shadow-lg',
+          { 'scale-[0.85]': multiSelected },
+        ]}
         data-testid="album-image"
         draggable="false"
       />
diff --git a/web/src/lib/components/elements/icon.svelte b/web/src/lib/components/elements/icon.svelte
index 4bc55b3247628..628b16c1ab850 100644
--- a/web/src/lib/components/elements/icon.svelte
+++ b/web/src/lib/components/elements/icon.svelte
@@ -17,6 +17,7 @@
     strokeWidth?: number;
     strokeColor?: string;
     spin?: boolean;
+    onClick?: (e?: MouseEvent) => void;
   }
 
   let {
@@ -35,7 +36,12 @@
     strokeWidth = 0,
     strokeColor = 'currentColor',
     spin = false,
+    onClick = undefined,
   }: Props = $props();
+
+  const handleClick = () => {
+    console.log('click');
+  };
 </script>
 
 <svg
@@ -49,6 +55,7 @@
   aria-label={ariaLabel}
   aria-hidden={ariaHidden}
   aria-labelledby={ariaLabelledby}
+  onclick={onClick}
 >
   {#if title}
     <title>{title}</title>
diff --git a/web/src/lib/components/photos-page/actions/add-to-album.svelte b/web/src/lib/components/photos-page/actions/add-to-album.svelte
index c00fd2e1c9c67..56249130e330e 100644
--- a/web/src/lib/components/photos-page/actions/add-to-album.svelte
+++ b/web/src/lib/components/photos-page/actions/add-to-album.svelte
@@ -3,7 +3,7 @@
   import { modalManager } from '$lib/managers/modal-manager.svelte';
   import AlbumPickerModal from '$lib/modals/AlbumPickerModal.svelte';
   import type { OnAddToAlbum } from '$lib/utils/actions';
-  import { addAssetsToAlbum } from '$lib/utils/asset-utils';
+  import { addAssetsToAlbum, addAssetsToAlbums } from '$lib/utils/asset-utils';
   import { mdiImageAlbum, mdiShareVariantOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import { getAssetControlContext } from '../asset-select-control-bar.svelte';
@@ -18,15 +18,21 @@
   const { getAssets } = getAssetControlContext();
 
   const onClick = async () => {
-    const album = await modalManager.show(AlbumPickerModal, { shared });
+    const albums = await modalManager.show(AlbumPickerModal, { shared });
 
-    if (!album) {
+    if (!albums || albums.length === 0) {
       return;
     }
 
     const assetIds = [...getAssets()].map(({ id }) => id);
-    await addAssetsToAlbum(album.id, assetIds);
-    onAddToAlbum(assetIds, album.id);
+    if (albums.length === 1) {
+      const album = albums[0];
+      await addAssetsToAlbum(album.id, assetIds);
+      onAddToAlbum(assetIds, album.id);
+    } else {
+      await addAssetsToAlbums(albums.map(a=>a.id), assetIds);
+      onAddToAlbum(assetIds, albums[0].id);
+    }
   };
 </script>
 
diff --git a/web/src/lib/components/shared-components/album-selection/album-selection-utils.ts b/web/src/lib/components/shared-components/album-selection/album-selection-utils.ts
index 73f289eb1d8cf..893695e3ed693 100644
--- a/web/src/lib/components/shared-components/album-selection/album-selection-utils.ts
+++ b/web/src/lib/components/shared-components/album-selection/album-selection-utils.ts
@@ -16,6 +16,7 @@ export enum AlbumModalRowType {
 export type AlbumModalRow = {
   type: AlbumModalRowType;
   selected?: boolean;
+  multiSelected?: boolean;
   text?: string;
   album?: AlbumResponseDto;
 };
@@ -41,6 +42,7 @@ export class AlbumModalRowConverter {
     recentAlbums: AlbumResponseDto[],
     albums: AlbumResponseDto[],
     selectedRowIndex: number,
+    multiSelectedRowIndexes: string[]
   ): AlbumModalRow[] {
     // only show recent albums if no search was entered, or we're in the normal albums (non-shared) modal.
     const recentAlbumsToShow = !this.shared && search.length === 0 ? recentAlbums : [];
@@ -64,6 +66,7 @@ export class AlbumModalRowConverter {
           rows.push({
             type: AlbumModalRowType.ALBUM_ITEM,
             selected: selectedRowIndex === i + selectedOffsetDueToNewAlbumRow,
+            multiSelected: multiSelectedRowIndexes.includes(album.id),
             album,
           });
         }
@@ -81,6 +84,7 @@ export class AlbumModalRowConverter {
         rows.push({
           type: AlbumModalRowType.ALBUM_ITEM,
           selected: selectedRowIndex === i + selectedOffsetDueToNewAndRecents,
+          multiSelected: multiSelectedRowIndexes.includes(album.id),
           album,
         });
       }
diff --git a/web/src/lib/modals/AlbumPickerModal.svelte b/web/src/lib/modals/AlbumPickerModal.svelte
index 3e16e03b804e5..d8b8397279aef 100644
--- a/web/src/lib/modals/AlbumPickerModal.svelte
+++ b/web/src/lib/modals/AlbumPickerModal.svelte
@@ -4,10 +4,11 @@
     AlbumModalRowConverter,
     AlbumModalRowType,
     isSelectableRowType,
+    type AlbumModalRow,
   } from '$lib/components/shared-components/album-selection/album-selection-utils';
   import { albumViewSettings } from '$lib/stores/preferences.store';
-  import { type AlbumResponseDto, createAlbum, getAllAlbums } from '@immich/sdk';
-  import { Modal, ModalBody } from '@immich/ui';
+  import { createAlbum, getAllAlbums, type AlbumResponseDto } from '@immich/sdk';
+  import { Button, Modal, ModalBody } from '@immich/ui';
   import { onMount } from 'svelte';
   import { t } from 'svelte-i18n';
   import AlbumListItem from '../components/asset-viewer/album-list-item.svelte';
@@ -21,7 +22,7 @@
 
   interface Props {
     shared: boolean;
-    onClose: (album?: AlbumResponseDto) => void;
+    onClose: (albums?: AlbumResponseDto[]) => void;
   }
 
   let { shared, onClose }: Props = $props();
@@ -32,13 +33,48 @@
     loading = false;
   });
 
+  const multiSelectedRowIndexes: string[] = $state([]);
+  const multiSelectActive = $derived(multiSelectedRowIndexes.length > 0);
+
   const rowConverter = new AlbumModalRowConverter(shared, $albumViewSettings.sortBy, $albumViewSettings.sortOrder);
-  const albumModalRows = $derived(rowConverter.toModalRows(search, recentAlbums, albums, selectedRowIndex));
+  const albumModalRows = $derived(
+    rowConverter.toModalRows(search, recentAlbums, albums, selectedRowIndex, multiSelectedRowIndexes),
+  );
   const selectableRowCount = $derived(albumModalRows.filter((row) => isSelectableRowType(row.type)).length);
 
   const onNewAlbum = async (name: string) => {
     const album = await createAlbum({ createAlbumDto: { albumName: name } });
-    onClose(album);
+    onClose([album]);
+  };
+
+  const handleAlbumClick = (album?: AlbumResponseDto) => {
+    if (multiSelectActive) {
+      handleMultiSelect(album);
+    } else {
+      if (album) {
+        onClose([album]);
+      } else {
+        onClose();
+      }      
+    }
+  };
+
+  const handleMultiSelect = (album?: AlbumResponseDto) => {
+    if (!album) {
+      //Attempt to grab the album from the keyboard select
+      const item = albumModalRows.find(({ selected }) => selected);
+      if (item) {
+        album = item.album;
+      }
+    }
+    if (album) {
+      const indexOf = multiSelectedRowIndexes.indexOf(album.id);
+      if (indexOf === -1) {
+        multiSelectedRowIndexes.push(album.id);
+      } else {
+        multiSelectedRowIndexes.splice(indexOf, 1);
+      }
+    }
   };
 
   const onEnter = async () => {
@@ -54,7 +90,7 @@
       }
       case AlbumModalRowType.ALBUM_ITEM: {
         if (item.album) {
-          onClose(item.album);
+          onClose([item.album]);
         }
         break;
       }
@@ -88,6 +124,11 @@
         await onEnter();
         break;
       }
+      case 'm': {
+        e.preventDefault();
+        handleMultiSelect();
+        break;
+      }
       default: {
         selectedRowIndex = -1;
       }
@@ -133,13 +174,18 @@
               <AlbumListItem
                 album={row.album}
                 selected={row.selected || false}
+                multiSelected={row.multiSelected}
                 searchQuery={search}
-                onAlbumClick={() => onClose(row.album)}
+                onAlbumClick={() => handleAlbumClick(row.album)}
+                onMultiSelect={() => handleMultiSelect(row.album)}
               />
             {/if}
           {/each}
         </div>
       {/if}
     </div>
+    {#if multiSelectActive}
+      <Button size="small" shape="round" fullWidth onclick={() => onClose()}>{$t('add_to_albums')}</Button>
+    {/if}
   </ModalBody>
 </Modal>
diff --git a/web/src/lib/utils/asset-utils.ts b/web/src/lib/utils/asset-utils.ts
index 0083343709612..2c3588db90e53 100644
--- a/web/src/lib/utils/asset-utils.ts
+++ b/web/src/lib/utils/asset-utils.ts
@@ -73,6 +73,17 @@ export const addAssetsToAlbum = async (albumId: string, assetIds: string[], show
   }
 };
 
+export const addAssetsToAlbums = async (albumIds: string[], assetIds: string[], showNotification = true) => {
+  const result = await addAssets({
+    id: albumIds[0],
+    bulkIdsDto: {
+      ids: assetIds,
+    },
+    key: authManager.key,
+  });
+  return result;
+}
+
 export const tagAssets = async ({
   assetIds,
   tagIds,

From ebb812b6b106f1023a04de75bf4b5bf97e321569 Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Mon, 21 Jul 2025 13:48:02 -0400
Subject: [PATCH 02/31] initial addToAlbums endpoint

---
 server/src/controllers/album.controller.ts |  7 +++++++
 server/src/dtos/album.dto.ts               |  8 ++++++++
 server/src/services/album.service.ts       | 16 +++++++++++++++-
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/server/src/controllers/album.controller.ts b/server/src/controllers/album.controller.ts
index 2e6d1e7e433f0..74a479b2b0a5e 100644
--- a/server/src/controllers/album.controller.ts
+++ b/server/src/controllers/album.controller.ts
@@ -4,6 +4,7 @@ import {
   AddUsersDto,
   AlbumInfoDto,
   AlbumResponseDto,
+  AlbumsAddAssetsDto,
   AlbumStatisticsResponseDto,
   CreateAlbumDto,
   GetAlbumsDto,
@@ -76,6 +77,12 @@ export class AlbumController {
     return this.service.addAssets(auth, id, dto);
   }
 
+  @Put('/assets')
+  @Authenticated({ sharedLink: true })
+  addAssetsToAlbums(@Auth() auth: AuthDto, @Body() dto: AlbumsAddAssetsDto): Promise<BulkIdResponseDto[][]> {
+    return this.service.addAssetsToAlbums(auth, dto);
+  }
+
   @Delete(':id/assets')
   @Authenticated()
   removeAssetFromAlbum(
diff --git a/server/src/dtos/album.dto.ts b/server/src/dtos/album.dto.ts
index 3a88ba5be3793..6e6fb730bf26d 100644
--- a/server/src/dtos/album.dto.ts
+++ b/server/src/dtos/album.dto.ts
@@ -54,6 +54,14 @@ export class CreateAlbumDto {
   assetIds?: string[];
 }
 
+export class AlbumsAddAssetsDto {
+  @ValidateUUID({ each: true })
+  albumIds!: string[];
+
+  @ValidateUUID({ each: true })
+  assetIds!: string[];
+}
+
 export class UpdateAlbumDto {
   @Optional()
   @IsString()
diff --git a/server/src/services/album.service.ts b/server/src/services/album.service.ts
index e4f2a44bfd537..9954ee9a35b71 100644
--- a/server/src/services/album.service.ts
+++ b/server/src/services/album.service.ts
@@ -3,6 +3,7 @@ import {
   AddUsersDto,
   AlbumInfoDto,
   AlbumResponseDto,
+  AlbumsAddAssetsDto,
   AlbumStatisticsResponseDto,
   CreateAlbumDto,
   GetAlbumsDto,
@@ -13,7 +14,7 @@ import {
   UpdateAlbumDto,
   UpdateAlbumUserDto,
 } from 'src/dtos/album.dto';
-import { BulkIdResponseDto, BulkIdsDto } from 'src/dtos/asset-ids.response.dto';
+import { BulkIdErrorReason, BulkIdResponseDto, BulkIdsDto } from 'src/dtos/asset-ids.response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { Permission } from 'src/enum';
 import { AlbumAssetCount, AlbumInfoOptions } from 'src/repositories/album.repository';
@@ -186,6 +187,19 @@ export class AlbumService extends BaseService {
     return results;
   }
 
+  async addAssetsToAlbums(auth: AuthDto, dto: AlbumsAddAssetsDto): Promise<BulkIdResponseDto[][]> {
+    const results: BulkIdResponseDto[][] = [];
+    for (const albumId in dto.albumIds) {
+      try {
+        const albumResults = await this.addAssets(auth, albumId, { ids: dto.assetIds });
+        results.push(albumResults);
+      } catch {
+        results.push([{ id: albumId, success: false, error: BulkIdErrorReason.NOT_FOUND }]);
+      }
+    }
+    return results;
+  }
+
   async removeAssets(auth: AuthDto, id: string, dto: BulkIdsDto): Promise<BulkIdResponseDto[]> {
     await this.requireAccess({ auth, permission: Permission.AlbumRemoveAsset, ids: [id] });
 

From 4578c0ad523beff713f6367f5eeacd1781b92b98 Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Mon, 21 Jul 2025 14:10:37 -0400
Subject: [PATCH 03/31] - fix endpoint - add test

---
 server/src/controllers/album.controller.spec.ts | 7 +++++++
 server/src/controllers/album.controller.ts      | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/server/src/controllers/album.controller.spec.ts b/server/src/controllers/album.controller.spec.ts
index 9b8a19c129961..d13227555b2f1 100644
--- a/server/src/controllers/album.controller.spec.ts
+++ b/server/src/controllers/album.controller.spec.ts
@@ -65,6 +65,13 @@ describe(AlbumController.name, () => {
     });
   });
 
+  describe('PUT /albums/assets', () => {
+    it('should be an authenticated route', async () => {
+      await request(ctx.getHttpServer()).put(`/albums/assets`);
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+  });
+
   describe('PATCH /albums/:id', () => {
     it('should be an authenticated route', async () => {
       await request(ctx.getHttpServer()).patch(`/albums/${factory.uuid()}`).send({ albumName: 'New album name' });
diff --git a/server/src/controllers/album.controller.ts b/server/src/controllers/album.controller.ts
index 74a479b2b0a5e..77ad7d9889bc6 100644
--- a/server/src/controllers/album.controller.ts
+++ b/server/src/controllers/album.controller.ts
@@ -77,7 +77,7 @@ export class AlbumController {
     return this.service.addAssets(auth, id, dto);
   }
 
-  @Put('/assets')
+  @Put('assets')
   @Authenticated({ sharedLink: true })
   addAssetsToAlbums(@Auth() auth: AuthDto, @Body() dto: AlbumsAddAssetsDto): Promise<BulkIdResponseDto[][]> {
     return this.service.addAssetsToAlbums(auth, dto);

From f129aaf19684670fb30f28ead0bfa858b602ae80 Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Mon, 21 Jul 2025 14:38:55 -0400
Subject: [PATCH 04/31] - update return type - make open-api

---
 mobile/openapi/README.md                      |   3 +
 mobile/openapi/lib/api.dart                   |   2 +
 mobile/openapi/lib/api/albums_api.dart        |  58 +++++++++
 mobile/openapi/lib/api_client.dart            |   4 +
 .../lib/model/albums_add_assets_dto.dart      | 111 ++++++++++++++++++
 .../model/albums_add_assets_response_dto.dart |  99 ++++++++++++++++
 open-api/immich-openapi-specs.json            |  91 ++++++++++++++
 open-api/typescript-sdk/src/fetch-client.ts   |  32 ++++-
 server/src/controllers/album.controller.ts    |   3 +-
 server/src/dtos/album.dto.ts                  |   5 +
 server/src/services/album.service.ts          |   9 +-
 11 files changed, 407 insertions(+), 10 deletions(-)
 create mode 100644 mobile/openapi/lib/model/albums_add_assets_dto.dart
 create mode 100644 mobile/openapi/lib/model/albums_add_assets_response_dto.dart

diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index 28fa63ba84d98..e47c87d799b1d 100644
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -83,6 +83,7 @@ Class | Method | HTTP request | Description
 *ActivitiesApi* | [**getActivities**](doc//ActivitiesApi.md#getactivities) | **GET** /activities | 
 *ActivitiesApi* | [**getActivityStatistics**](doc//ActivitiesApi.md#getactivitystatistics) | **GET** /activities/statistics | 
 *AlbumsApi* | [**addAssetsToAlbum**](doc//AlbumsApi.md#addassetstoalbum) | **PUT** /albums/{id}/assets | 
+*AlbumsApi* | [**addAssetsToAlbums**](doc//AlbumsApi.md#addassetstoalbums) | **PUT** /albums/assets | 
 *AlbumsApi* | [**addUsersToAlbum**](doc//AlbumsApi.md#adduserstoalbum) | **PUT** /albums/{id}/users | 
 *AlbumsApi* | [**createAlbum**](doc//AlbumsApi.md#createalbum) | **POST** /albums | 
 *AlbumsApi* | [**deleteAlbum**](doc//AlbumsApi.md#deletealbum) | **DELETE** /albums/{id} | 
@@ -296,6 +297,8 @@ Class | Method | HTTP request | Description
  - [AlbumUserCreateDto](doc//AlbumUserCreateDto.md)
  - [AlbumUserResponseDto](doc//AlbumUserResponseDto.md)
  - [AlbumUserRole](doc//AlbumUserRole.md)
+ - [AlbumsAddAssetsDto](doc//AlbumsAddAssetsDto.md)
+ - [AlbumsAddAssetsResponseDto](doc//AlbumsAddAssetsResponseDto.md)
  - [AlbumsResponse](doc//AlbumsResponse.md)
  - [AlbumsUpdate](doc//AlbumsUpdate.md)
  - [AllJobStatusResponseDto](doc//AllJobStatusResponseDto.md)
diff --git a/mobile/openapi/lib/api.dart b/mobile/openapi/lib/api.dart
index becafa06bf5ed..57d695de5d397 100644
--- a/mobile/openapi/lib/api.dart
+++ b/mobile/openapi/lib/api.dart
@@ -78,6 +78,8 @@ part 'model/album_user_add_dto.dart';
 part 'model/album_user_create_dto.dart';
 part 'model/album_user_response_dto.dart';
 part 'model/album_user_role.dart';
+part 'model/albums_add_assets_dto.dart';
+part 'model/albums_add_assets_response_dto.dart';
 part 'model/albums_response.dart';
 part 'model/albums_update.dart';
 part 'model/all_job_status_response_dto.dart';
diff --git a/mobile/openapi/lib/api/albums_api.dart b/mobile/openapi/lib/api/albums_api.dart
index a8c518ace2677..7657289e70f76 100644
--- a/mobile/openapi/lib/api/albums_api.dart
+++ b/mobile/openapi/lib/api/albums_api.dart
@@ -79,6 +79,64 @@ class AlbumsApi {
     return null;
   }
 
+  /// Performs an HTTP 'PUT /albums/assets' operation and returns the [Response].
+  /// Parameters:
+  ///
+  /// * [AlbumsAddAssetsDto] albumsAddAssetsDto (required):
+  ///
+  /// * [String] key:
+  Future<Response> addAssetsToAlbumsWithHttpInfo(AlbumsAddAssetsDto albumsAddAssetsDto, { String? key, }) async {
+    // ignore: prefer_const_declarations
+    final apiPath = r'/albums/assets';
+
+    // ignore: prefer_final_locals
+    Object? postBody = albumsAddAssetsDto;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    if (key != null) {
+      queryParams.addAll(_queryParams('', 'key', key));
+    }
+
+    const contentTypes = <String>['application/json'];
+
+
+    return apiClient.invokeAPI(
+      apiPath,
+      'PUT',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// Parameters:
+  ///
+  /// * [AlbumsAddAssetsDto] albumsAddAssetsDto (required):
+  ///
+  /// * [String] key:
+  Future<List<AlbumsAddAssetsResponseDto>?> addAssetsToAlbums(AlbumsAddAssetsDto albumsAddAssetsDto, { String? key, }) async {
+    final response = await addAssetsToAlbumsWithHttpInfo(albumsAddAssetsDto,  key: key, );
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
+    }
+    // When a remote server returns no body with a status of 204, we shall not decode it.
+    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
+    // FormatException when trying to decode an empty string.
+    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
+      final responseBody = await _decodeBodyBytes(response);
+      return (await apiClient.deserializeAsync(responseBody, 'List<AlbumsAddAssetsResponseDto>') as List)
+        .cast<AlbumsAddAssetsResponseDto>()
+        .toList(growable: false);
+
+    }
+    return null;
+  }
+
   /// Performs an HTTP 'PUT /albums/{id}/users' operation and returns the [Response].
   /// Parameters:
   ///
diff --git a/mobile/openapi/lib/api_client.dart b/mobile/openapi/lib/api_client.dart
index 603163f00ef98..83fc7b6d91bcc 100644
--- a/mobile/openapi/lib/api_client.dart
+++ b/mobile/openapi/lib/api_client.dart
@@ -212,6 +212,10 @@ class ApiClient {
           return AlbumUserResponseDto.fromJson(value);
         case 'AlbumUserRole':
           return AlbumUserRoleTypeTransformer().decode(value);
+        case 'AlbumsAddAssetsDto':
+          return AlbumsAddAssetsDto.fromJson(value);
+        case 'AlbumsAddAssetsResponseDto':
+          return AlbumsAddAssetsResponseDto.fromJson(value);
         case 'AlbumsResponse':
           return AlbumsResponse.fromJson(value);
         case 'AlbumsUpdate':
diff --git a/mobile/openapi/lib/model/albums_add_assets_dto.dart b/mobile/openapi/lib/model/albums_add_assets_dto.dart
new file mode 100644
index 0000000000000..bdbf68980ca27
--- /dev/null
+++ b/mobile/openapi/lib/model/albums_add_assets_dto.dart
@@ -0,0 +1,111 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+class AlbumsAddAssetsDto {
+  /// Returns a new [AlbumsAddAssetsDto] instance.
+  AlbumsAddAssetsDto({
+    this.albumIds = const [],
+    this.assetIds = const [],
+  });
+
+  List<String> albumIds;
+
+  List<String> assetIds;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is AlbumsAddAssetsDto &&
+    _deepEquality.equals(other.albumIds, albumIds) &&
+    _deepEquality.equals(other.assetIds, assetIds);
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (albumIds.hashCode) +
+    (assetIds.hashCode);
+
+  @override
+  String toString() => 'AlbumsAddAssetsDto[albumIds=$albumIds, assetIds=$assetIds]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'albumIds'] = this.albumIds;
+      json[r'assetIds'] = this.assetIds;
+    return json;
+  }
+
+  /// Returns a new [AlbumsAddAssetsDto] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static AlbumsAddAssetsDto? fromJson(dynamic value) {
+    upgradeDto(value, "AlbumsAddAssetsDto");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return AlbumsAddAssetsDto(
+        albumIds: json[r'albumIds'] is Iterable
+            ? (json[r'albumIds'] as Iterable).cast<String>().toList(growable: false)
+            : const [],
+        assetIds: json[r'assetIds'] is Iterable
+            ? (json[r'assetIds'] as Iterable).cast<String>().toList(growable: false)
+            : const [],
+      );
+    }
+    return null;
+  }
+
+  static List<AlbumsAddAssetsDto> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <AlbumsAddAssetsDto>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = AlbumsAddAssetsDto.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, AlbumsAddAssetsDto> mapFromJson(dynamic json) {
+    final map = <String, AlbumsAddAssetsDto>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = AlbumsAddAssetsDto.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of AlbumsAddAssetsDto-objects as value to a dart map
+  static Map<String, List<AlbumsAddAssetsDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<AlbumsAddAssetsDto>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = AlbumsAddAssetsDto.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'albumIds',
+    'assetIds',
+  };
+}
+
diff --git a/mobile/openapi/lib/model/albums_add_assets_response_dto.dart b/mobile/openapi/lib/model/albums_add_assets_response_dto.dart
new file mode 100644
index 0000000000000..b01f064afb41c
--- /dev/null
+++ b/mobile/openapi/lib/model/albums_add_assets_response_dto.dart
@@ -0,0 +1,99 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+class AlbumsAddAssetsResponseDto {
+  /// Returns a new [AlbumsAddAssetsResponseDto] instance.
+  AlbumsAddAssetsResponseDto({
+    this.results = const [],
+  });
+
+  List<BulkIdResponseDto> results;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is AlbumsAddAssetsResponseDto &&
+    _deepEquality.equals(other.results, results);
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (results.hashCode);
+
+  @override
+  String toString() => 'AlbumsAddAssetsResponseDto[results=$results]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'results'] = this.results;
+    return json;
+  }
+
+  /// Returns a new [AlbumsAddAssetsResponseDto] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static AlbumsAddAssetsResponseDto? fromJson(dynamic value) {
+    upgradeDto(value, "AlbumsAddAssetsResponseDto");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return AlbumsAddAssetsResponseDto(
+        results: BulkIdResponseDto.listFromJson(json[r'results']),
+      );
+    }
+    return null;
+  }
+
+  static List<AlbumsAddAssetsResponseDto> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <AlbumsAddAssetsResponseDto>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = AlbumsAddAssetsResponseDto.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, AlbumsAddAssetsResponseDto> mapFromJson(dynamic json) {
+    final map = <String, AlbumsAddAssetsResponseDto>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = AlbumsAddAssetsResponseDto.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of AlbumsAddAssetsResponseDto-objects as value to a dart map
+  static Map<String, List<AlbumsAddAssetsResponseDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<AlbumsAddAssetsResponseDto>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = AlbumsAddAssetsResponseDto.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'results',
+  };
+}
+
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index 71329c3f75118..49d21b6c4113d 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -870,6 +870,60 @@
         ]
       }
     },
+    "/albums/assets": {
+      "put": {
+        "operationId": "addAssetsToAlbums",
+        "parameters": [
+          {
+            "name": "key",
+            "required": false,
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/AlbumsAddAssetsDto"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "items": {
+                    "$ref": "#/components/schemas/AlbumsAddAssetsResponseDto"
+                  },
+                  "type": "array"
+                }
+              }
+            },
+            "description": ""
+          }
+        },
+        "security": [
+          {
+            "bearer": []
+          },
+          {
+            "cookie": []
+          },
+          {
+            "api_key": []
+          }
+        ],
+        "tags": [
+          "Albums"
+        ]
+      }
+    },
     "/albums/statistics": {
       "get": {
         "operationId": "getAlbumStatistics",
@@ -9009,6 +9063,43 @@
         ],
         "type": "string"
       },
+      "AlbumsAddAssetsDto": {
+        "properties": {
+          "albumIds": {
+            "items": {
+              "format": "uuid",
+              "type": "string"
+            },
+            "type": "array"
+          },
+          "assetIds": {
+            "items": {
+              "format": "uuid",
+              "type": "string"
+            },
+            "type": "array"
+          }
+        },
+        "required": [
+          "albumIds",
+          "assetIds"
+        ],
+        "type": "object"
+      },
+      "AlbumsAddAssetsResponseDto": {
+        "properties": {
+          "results": {
+            "items": {
+              "$ref": "#/components/schemas/BulkIdResponseDto"
+            },
+            "type": "array"
+          }
+        },
+        "required": [
+          "results"
+        ],
+        "type": "object"
+      },
       "AlbumsResponse": {
         "properties": {
           "defaultAssetOrder": {
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index f60fa6dfe89a9..526b94b168f92 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -384,6 +384,18 @@ export type CreateAlbumDto = {
     assetIds?: string[];
     description?: string;
 };
+export type AlbumsAddAssetsDto = {
+    albumIds: string[];
+    assetIds: string[];
+};
+export type BulkIdResponseDto = {
+    error?: Error;
+    id: string;
+    success: boolean;
+};
+export type AlbumsAddAssetsResponseDto = {
+    results: BulkIdResponseDto[];
+};
 export type AlbumStatisticsResponseDto = {
     notShared: number;
     owned: number;
@@ -399,11 +411,6 @@ export type UpdateAlbumDto = {
 export type BulkIdsDto = {
     ids: string[];
 };
-export type BulkIdResponseDto = {
-    error?: Error;
-    id: string;
-    success: boolean;
-};
 export type UpdateAlbumUserDto = {
     role: AlbumUserRole;
 };
@@ -1805,6 +1812,21 @@ export function createAlbum({ createAlbumDto }: {
         body: createAlbumDto
     })));
 }
+export function addAssetsToAlbums({ key, albumsAddAssetsDto }: {
+    key?: string;
+    albumsAddAssetsDto: AlbumsAddAssetsDto;
+}, opts?: Oazapfts.RequestOpts) {
+    return oazapfts.ok(oazapfts.fetchJson<{
+        status: 200;
+        data: AlbumsAddAssetsResponseDto[];
+    }>(`/albums/assets${QS.query(QS.explode({
+        key
+    }))}`, oazapfts.json({
+        ...opts,
+        method: "PUT",
+        body: albumsAddAssetsDto
+    })));
+}
 export function getAlbumStatistics(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
diff --git a/server/src/controllers/album.controller.ts b/server/src/controllers/album.controller.ts
index 77ad7d9889bc6..87a3ec2a22248 100644
--- a/server/src/controllers/album.controller.ts
+++ b/server/src/controllers/album.controller.ts
@@ -5,6 +5,7 @@ import {
   AlbumInfoDto,
   AlbumResponseDto,
   AlbumsAddAssetsDto,
+  AlbumsAddAssetsResponseDto,
   AlbumStatisticsResponseDto,
   CreateAlbumDto,
   GetAlbumsDto,
@@ -79,7 +80,7 @@ export class AlbumController {
 
   @Put('assets')
   @Authenticated({ sharedLink: true })
-  addAssetsToAlbums(@Auth() auth: AuthDto, @Body() dto: AlbumsAddAssetsDto): Promise<BulkIdResponseDto[][]> {
+  addAssetsToAlbums(@Auth() auth: AuthDto, @Body() dto: AlbumsAddAssetsDto): Promise<AlbumsAddAssetsResponseDto[]> {
     return this.service.addAssetsToAlbums(auth, dto);
   }
 
diff --git a/server/src/dtos/album.dto.ts b/server/src/dtos/album.dto.ts
index 6e6fb730bf26d..e21b03922dbc5 100644
--- a/server/src/dtos/album.dto.ts
+++ b/server/src/dtos/album.dto.ts
@@ -3,6 +3,7 @@ import { Type } from 'class-transformer';
 import { ArrayNotEmpty, IsArray, IsString, ValidateNested } from 'class-validator';
 import _ from 'lodash';
 import { AlbumUser, AuthSharedLink, User } from 'src/database';
+import { BulkIdResponseDto } from 'src/dtos/asset-ids.response.dto';
 import { AssetResponseDto, MapAsset, mapAsset } from 'src/dtos/asset-response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { UserResponseDto, mapUser } from 'src/dtos/user.dto';
@@ -62,6 +63,10 @@ export class AlbumsAddAssetsDto {
   assetIds!: string[];
 }
 
+export class AlbumsAddAssetsResponseDto {
+  results!: BulkIdResponseDto[];
+}
+
 export class UpdateAlbumDto {
   @Optional()
   @IsString()
diff --git a/server/src/services/album.service.ts b/server/src/services/album.service.ts
index 9954ee9a35b71..b09bbd38ddc19 100644
--- a/server/src/services/album.service.ts
+++ b/server/src/services/album.service.ts
@@ -4,6 +4,7 @@ import {
   AlbumInfoDto,
   AlbumResponseDto,
   AlbumsAddAssetsDto,
+  AlbumsAddAssetsResponseDto,
   AlbumStatisticsResponseDto,
   CreateAlbumDto,
   GetAlbumsDto,
@@ -187,14 +188,14 @@ export class AlbumService extends BaseService {
     return results;
   }
 
-  async addAssetsToAlbums(auth: AuthDto, dto: AlbumsAddAssetsDto): Promise<BulkIdResponseDto[][]> {
-    const results: BulkIdResponseDto[][] = [];
+  async addAssetsToAlbums(auth: AuthDto, dto: AlbumsAddAssetsDto): Promise<AlbumsAddAssetsResponseDto[]> {
+    const results: AlbumsAddAssetsResponseDto[] = [];
     for (const albumId in dto.albumIds) {
       try {
         const albumResults = await this.addAssets(auth, albumId, { ids: dto.assetIds });
-        results.push(albumResults);
+        results.push({ results: albumResults });
       } catch {
-        results.push([{ id: albumId, success: false, error: BulkIdErrorReason.NOT_FOUND }]);
+        results.push({ results: [{ id: albumId, success: false, error: BulkIdErrorReason.NOT_FOUND }] });
       }
     }
     return results;

From 9bedaa26a1f0a4d04f99d7c1ca1f98c3e620c664 Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Mon, 21 Jul 2025 15:37:30 -0400
Subject: [PATCH 05/31] - simplify return dto - handle notification

---
 mobile/openapi/lib/api/albums_api.dart        |   9 +-
 .../model/albums_add_assets_response_dto.dart | 123 ++++++++++++++++--
 open-api/immich-openapi-specs.json            |  31 +++--
 open-api/typescript-sdk/src/fetch-client.ts   |  15 ++-
 server/src/controllers/album.controller.ts    |   2 +-
 server/src/dtos/album.dto.ts                  |   9 +-
 server/src/services/album.service.ts          |  42 +++++-
 web/src/lib/utils/asset-utils.ts              |  35 ++++-
 8 files changed, 223 insertions(+), 43 deletions(-)

diff --git a/mobile/openapi/lib/api/albums_api.dart b/mobile/openapi/lib/api/albums_api.dart
index 7657289e70f76..1938eae8ddeea 100644
--- a/mobile/openapi/lib/api/albums_api.dart
+++ b/mobile/openapi/lib/api/albums_api.dart
@@ -119,7 +119,7 @@ class AlbumsApi {
   /// * [AlbumsAddAssetsDto] albumsAddAssetsDto (required):
   ///
   /// * [String] key:
-  Future<List<AlbumsAddAssetsResponseDto>?> addAssetsToAlbums(AlbumsAddAssetsDto albumsAddAssetsDto, { String? key, }) async {
+  Future<AlbumsAddAssetsResponseDto?> addAssetsToAlbums(AlbumsAddAssetsDto albumsAddAssetsDto, { String? key, }) async {
     final response = await addAssetsToAlbumsWithHttpInfo(albumsAddAssetsDto,  key: key, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -128,11 +128,8 @@ class AlbumsApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      final responseBody = await _decodeBodyBytes(response);
-      return (await apiClient.deserializeAsync(responseBody, 'List<AlbumsAddAssetsResponseDto>') as List)
-        .cast<AlbumsAddAssetsResponseDto>()
-        .toList(growable: false);
-
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'AlbumsAddAssetsResponseDto',) as AlbumsAddAssetsResponseDto;
+    
     }
     return null;
   }
diff --git a/mobile/openapi/lib/model/albums_add_assets_response_dto.dart b/mobile/openapi/lib/model/albums_add_assets_response_dto.dart
index b01f064afb41c..4f41bb1f50504 100644
--- a/mobile/openapi/lib/model/albums_add_assets_response_dto.dart
+++ b/mobile/openapi/lib/model/albums_add_assets_response_dto.dart
@@ -13,26 +13,48 @@ part of openapi.api;
 class AlbumsAddAssetsResponseDto {
   /// Returns a new [AlbumsAddAssetsResponseDto] instance.
   AlbumsAddAssetsResponseDto({
-    this.results = const [],
+    required this.albumSuccessCount,
+    required this.assetSuccessCount,
+    this.error,
+    required this.success,
   });
 
-  List<BulkIdResponseDto> results;
+  int albumSuccessCount;
+
+  int assetSuccessCount;
+
+  AlbumsAddAssetsResponseDtoErrorEnum? error;
+
+  bool success;
 
   @override
   bool operator ==(Object other) => identical(this, other) || other is AlbumsAddAssetsResponseDto &&
-    _deepEquality.equals(other.results, results);
+    other.albumSuccessCount == albumSuccessCount &&
+    other.assetSuccessCount == assetSuccessCount &&
+    other.error == error &&
+    other.success == success;
 
   @override
   int get hashCode =>
     // ignore: unnecessary_parenthesis
-    (results.hashCode);
+    (albumSuccessCount.hashCode) +
+    (assetSuccessCount.hashCode) +
+    (error == null ? 0 : error!.hashCode) +
+    (success.hashCode);
 
   @override
-  String toString() => 'AlbumsAddAssetsResponseDto[results=$results]';
+  String toString() => 'AlbumsAddAssetsResponseDto[albumSuccessCount=$albumSuccessCount, assetSuccessCount=$assetSuccessCount, error=$error, success=$success]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
-      json[r'results'] = this.results;
+      json[r'albumSuccessCount'] = this.albumSuccessCount;
+      json[r'assetSuccessCount'] = this.assetSuccessCount;
+    if (this.error != null) {
+      json[r'error'] = this.error;
+    } else {
+    //  json[r'error'] = null;
+    }
+      json[r'success'] = this.success;
     return json;
   }
 
@@ -45,7 +67,10 @@ class AlbumsAddAssetsResponseDto {
       final json = value.cast<String, dynamic>();
 
       return AlbumsAddAssetsResponseDto(
-        results: BulkIdResponseDto.listFromJson(json[r'results']),
+        albumSuccessCount: mapValueOfType<int>(json, r'albumSuccessCount')!,
+        assetSuccessCount: mapValueOfType<int>(json, r'assetSuccessCount')!,
+        error: AlbumsAddAssetsResponseDtoErrorEnum.fromJson(json[r'error']),
+        success: mapValueOfType<bool>(json, r'success')!,
       );
     }
     return null;
@@ -93,7 +118,89 @@ class AlbumsAddAssetsResponseDto {
 
   /// The list of required keys that must be present in a JSON.
   static const requiredKeys = <String>{
-    'results',
+    'albumSuccessCount',
+    'assetSuccessCount',
+    'success',
   };
 }
 
+
+class AlbumsAddAssetsResponseDtoErrorEnum {
+  /// Instantiate a new enum with the provided [value].
+  const AlbumsAddAssetsResponseDtoErrorEnum._(this.value);
+
+  /// The underlying value of this enum member.
+  final String value;
+
+  @override
+  String toString() => value;
+
+  String toJson() => value;
+
+  static const duplicate = AlbumsAddAssetsResponseDtoErrorEnum._(r'duplicate');
+  static const noPermission = AlbumsAddAssetsResponseDtoErrorEnum._(r'no_permission');
+  static const notFound = AlbumsAddAssetsResponseDtoErrorEnum._(r'not_found');
+  static const unknown = AlbumsAddAssetsResponseDtoErrorEnum._(r'unknown');
+
+  /// List of all possible values in this [enum][AlbumsAddAssetsResponseDtoErrorEnum].
+  static const values = <AlbumsAddAssetsResponseDtoErrorEnum>[
+    duplicate,
+    noPermission,
+    notFound,
+    unknown,
+  ];
+
+  static AlbumsAddAssetsResponseDtoErrorEnum? fromJson(dynamic value) => AlbumsAddAssetsResponseDtoErrorEnumTypeTransformer().decode(value);
+
+  static List<AlbumsAddAssetsResponseDtoErrorEnum> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <AlbumsAddAssetsResponseDtoErrorEnum>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = AlbumsAddAssetsResponseDtoErrorEnum.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+}
+
+/// Transformation class that can [encode] an instance of [AlbumsAddAssetsResponseDtoErrorEnum] to String,
+/// and [decode] dynamic data back to [AlbumsAddAssetsResponseDtoErrorEnum].
+class AlbumsAddAssetsResponseDtoErrorEnumTypeTransformer {
+  factory AlbumsAddAssetsResponseDtoErrorEnumTypeTransformer() => _instance ??= const AlbumsAddAssetsResponseDtoErrorEnumTypeTransformer._();
+
+  const AlbumsAddAssetsResponseDtoErrorEnumTypeTransformer._();
+
+  String encode(AlbumsAddAssetsResponseDtoErrorEnum data) => data.value;
+
+  /// Decodes a [dynamic value][data] to a AlbumsAddAssetsResponseDtoErrorEnum.
+  ///
+  /// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,
+  /// then null is returned. However, if [allowNull] is false and the [dynamic value][data]
+  /// cannot be decoded successfully, then an [UnimplementedError] is thrown.
+  ///
+  /// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
+  /// and users are still using an old app with the old code.
+  AlbumsAddAssetsResponseDtoErrorEnum? decode(dynamic data, {bool allowNull = true}) {
+    if (data != null) {
+      switch (data) {
+        case r'duplicate': return AlbumsAddAssetsResponseDtoErrorEnum.duplicate;
+        case r'no_permission': return AlbumsAddAssetsResponseDtoErrorEnum.noPermission;
+        case r'not_found': return AlbumsAddAssetsResponseDtoErrorEnum.notFound;
+        case r'unknown': return AlbumsAddAssetsResponseDtoErrorEnum.unknown;
+        default:
+          if (!allowNull) {
+            throw ArgumentError('Unknown enum value to decode: $data');
+          }
+      }
+    }
+    return null;
+  }
+
+  /// Singleton [AlbumsAddAssetsResponseDtoErrorEnumTypeTransformer] instance.
+  static AlbumsAddAssetsResponseDtoErrorEnumTypeTransformer? _instance;
+}
+
+
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index 49d21b6c4113d..59720590c7bb6 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -898,10 +898,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "items": {
-                    "$ref": "#/components/schemas/AlbumsAddAssetsResponseDto"
-                  },
-                  "type": "array"
+                  "$ref": "#/components/schemas/AlbumsAddAssetsResponseDto"
                 }
               }
             },
@@ -9088,15 +9085,29 @@
       },
       "AlbumsAddAssetsResponseDto": {
         "properties": {
-          "results": {
-            "items": {
-              "$ref": "#/components/schemas/BulkIdResponseDto"
-            },
-            "type": "array"
+          "albumSuccessCount": {
+            "type": "integer"
+          },
+          "assetSuccessCount": {
+            "type": "integer"
+          },
+          "error": {
+            "enum": [
+              "duplicate",
+              "no_permission",
+              "not_found",
+              "unknown"
+            ],
+            "type": "string"
+          },
+          "success": {
+            "type": "boolean"
           }
         },
         "required": [
-          "results"
+          "albumSuccessCount",
+          "assetSuccessCount",
+          "success"
         ],
         "type": "object"
       },
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index 526b94b168f92..96d96db1c7529 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -388,14 +388,12 @@ export type AlbumsAddAssetsDto = {
     albumIds: string[];
     assetIds: string[];
 };
-export type BulkIdResponseDto = {
+export type AlbumsAddAssetsResponseDto = {
+    albumSuccessCount: number;
+    assetSuccessCount: number;
     error?: Error;
-    id: string;
     success: boolean;
 };
-export type AlbumsAddAssetsResponseDto = {
-    results: BulkIdResponseDto[];
-};
 export type AlbumStatisticsResponseDto = {
     notShared: number;
     owned: number;
@@ -411,6 +409,11 @@ export type UpdateAlbumDto = {
 export type BulkIdsDto = {
     ids: string[];
 };
+export type BulkIdResponseDto = {
+    error?: Error;
+    id: string;
+    success: boolean;
+};
 export type UpdateAlbumUserDto = {
     role: AlbumUserRole;
 };
@@ -1818,7 +1821,7 @@ export function addAssetsToAlbums({ key, albumsAddAssetsDto }: {
 }, opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
-        data: AlbumsAddAssetsResponseDto[];
+        data: AlbumsAddAssetsResponseDto;
     }>(`/albums/assets${QS.query(QS.explode({
         key
     }))}`, oazapfts.json({
diff --git a/server/src/controllers/album.controller.ts b/server/src/controllers/album.controller.ts
index 87a3ec2a22248..b462dbe8d2eb5 100644
--- a/server/src/controllers/album.controller.ts
+++ b/server/src/controllers/album.controller.ts
@@ -80,7 +80,7 @@ export class AlbumController {
 
   @Put('assets')
   @Authenticated({ sharedLink: true })
-  addAssetsToAlbums(@Auth() auth: AuthDto, @Body() dto: AlbumsAddAssetsDto): Promise<AlbumsAddAssetsResponseDto[]> {
+  addAssetsToAlbums(@Auth() auth: AuthDto, @Body() dto: AlbumsAddAssetsDto): Promise<AlbumsAddAssetsResponseDto> {
     return this.service.addAssetsToAlbums(auth, dto);
   }
 
diff --git a/server/src/dtos/album.dto.ts b/server/src/dtos/album.dto.ts
index e21b03922dbc5..1a5a5417b5cf4 100644
--- a/server/src/dtos/album.dto.ts
+++ b/server/src/dtos/album.dto.ts
@@ -3,7 +3,7 @@ import { Type } from 'class-transformer';
 import { ArrayNotEmpty, IsArray, IsString, ValidateNested } from 'class-validator';
 import _ from 'lodash';
 import { AlbumUser, AuthSharedLink, User } from 'src/database';
-import { BulkIdResponseDto } from 'src/dtos/asset-ids.response.dto';
+import { BulkIdErrorReason } from 'src/dtos/asset-ids.response.dto';
 import { AssetResponseDto, MapAsset, mapAsset } from 'src/dtos/asset-response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { UserResponseDto, mapUser } from 'src/dtos/user.dto';
@@ -64,7 +64,12 @@ export class AlbumsAddAssetsDto {
 }
 
 export class AlbumsAddAssetsResponseDto {
-  results!: BulkIdResponseDto[];
+  success!: boolean;
+  @ApiProperty({ type: 'integer' })
+  albumSuccessCount!: number;
+  @ApiProperty({ type: 'integer' })
+  assetSuccessCount!: number;
+  error?: BulkIdErrorReason;
 }
 
 export class UpdateAlbumDto {
diff --git a/server/src/services/album.service.ts b/server/src/services/album.service.ts
index b09bbd38ddc19..f44bbab5d51a0 100644
--- a/server/src/services/album.service.ts
+++ b/server/src/services/album.service.ts
@@ -188,17 +188,49 @@ export class AlbumService extends BaseService {
     return results;
   }
 
-  async addAssetsToAlbums(auth: AuthDto, dto: AlbumsAddAssetsDto): Promise<AlbumsAddAssetsResponseDto[]> {
-    const results: AlbumsAddAssetsResponseDto[] = [];
+  async addAssetsToAlbums(auth: AuthDto, dto: AlbumsAddAssetsDto): Promise<AlbumsAddAssetsResponseDto> {
+    const fullResults = [];
     for (const albumId in dto.albumIds) {
       try {
         const albumResults = await this.addAssets(auth, albumId, { ids: dto.assetIds });
-        results.push({ results: albumResults });
+        const successIds = albumResults.filter(({ success }) => success).map((r) => r.id);
+        const success = successIds.length > 0;
+        let error;
+        if (!success) {
+          if (albumResults.every(({ error }) => error === BulkIdErrorReason.DUPLICATE)) {
+            error = BulkIdErrorReason.DUPLICATE;
+          } else if (albumResults.every(({ error }) => error === BulkIdErrorReason.NO_PERMISSION)) {
+            error = BulkIdErrorReason.NO_PERMISSION;
+          } else {
+            error = BulkIdErrorReason.UNKNOWN;
+          }
+        }
+        fullResults.push({ id: albumId, success, successIds, error });
+        // results.push({ results: albumResults });
       } catch {
-        results.push({ results: [{ id: albumId, success: false, error: BulkIdErrorReason.NOT_FOUND }] });
+        fullResults.push({ id: albumId, success: false, error: BulkIdErrorReason.NOT_FOUND });
+        // results.push({ results: [{ id: albumId, success: false, error: BulkIdErrorReason.NOT_FOUND }] });
       }
     }
-    return results;
+
+    //Construct final return
+    const albumSuccessCount = fullResults.filter(({ success }) => success).length;
+    const successIds: Set<string> = new Set(...fullResults.map((result) => result.successIds));
+    const success = successIds.size > 0;
+    let error;
+    if (!success) {
+      if (fullResults.every(({ error }) => error === BulkIdErrorReason.DUPLICATE)) {
+        error = BulkIdErrorReason.DUPLICATE;
+      } else if (fullResults.every(({ error }) => error === BulkIdErrorReason.NO_PERMISSION)) {
+        error = BulkIdErrorReason.NO_PERMISSION;
+      } else if (fullResults.every(({ error }) => error === BulkIdErrorReason.NOT_FOUND)) {
+        error = BulkIdErrorReason.NOT_FOUND;
+      } else {
+        error = BulkIdErrorReason.UNKNOWN;
+      }
+    }
+
+    return { success, albumSuccessCount, assetSuccessCount: successIds.size, error };
   }
 
   async removeAssets(auth: AuthDto, id: string, dto: BulkIdsDto): Promise<BulkIdResponseDto[]> {
diff --git a/web/src/lib/utils/asset-utils.ts b/web/src/lib/utils/asset-utils.ts
index 2c3588db90e53..4666d478656ba 100644
--- a/web/src/lib/utils/asset-utils.ts
+++ b/web/src/lib/utils/asset-utils.ts
@@ -15,11 +15,13 @@ import { getFormatter } from '$lib/utils/i18n';
 import { navigate } from '$lib/utils/navigation';
 import {
   addAssetsToAlbum as addAssets,
+  addAssetsToAlbums as addToAlbums,
   AssetVisibility,
   bulkTagAssets,
   createStack,
   deleteAssets,
   deleteStacks,
+  Error,
   getAssetInfo,
   getBaseUrl,
   getDownloadInfo,
@@ -74,15 +76,38 @@ export const addAssetsToAlbum = async (albumId: string, assetIds: string[], show
 };
 
 export const addAssetsToAlbums = async (albumIds: string[], assetIds: string[], showNotification = true) => {
-  const result = await addAssets({
-    id: albumIds[0],
-    bulkIdsDto: {
-      ids: assetIds,
+  const result = await addToAlbums({
+    albumsAddAssetsDto: {
+      albumIds,
+      assetIds,
     },
     key: authManager.key,
   });
+
+  if (showNotification) {
+    const $t = get(t);
+    let message = $t('assets_added_to_albums_count', {
+      values: { albumCount: result.albumSuccessCount, assetCount: result.assetSuccessCount },
+    });
+    if (result.error) {
+      if (result.error === 'duplicate') {
+        const duplicateErrorCount = 0;
+        message = $t('assets_were_part_of_album_count', { values: { count: duplicateErrorCount } });
+      } else if (result.error === 'no_permission') {
+        message = $t('assets_cannot_be_added_to_album_count', { values: { count: assetIds.length } });
+      } else {
+        message = $t('assets_cannot_be_added_to_albums');
+      }
+    }
+    notificationController.show({
+      type: NotificationType.Info,
+      timeout: 5000,
+      message,
+    });
+  }
+
   return result;
-}
+};
 
 export const tagAssets = async ({
   assetIds,

From e7c119a97a43a714856f311da865b3c17cf7bebf Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Mon, 21 Jul 2025 17:45:39 -0400
Subject: [PATCH 06/31] - fix returns - clean up

---
 server/src/services/album.service.ts           |  6 ++----
 .../asset-viewer/album-list-item.svelte        | 10 ----------
 .../photos-page/actions/add-to-album.svelte    |  6 ++++--
 .../album-selection/album-selection-utils.ts   |  2 +-
 web/src/lib/modals/AlbumPickerModal.svelte     | 18 ++++++++++++++----
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/server/src/services/album.service.ts b/server/src/services/album.service.ts
index f44bbab5d51a0..c1f9a20ce9021 100644
--- a/server/src/services/album.service.ts
+++ b/server/src/services/album.service.ts
@@ -190,7 +190,7 @@ export class AlbumService extends BaseService {
 
   async addAssetsToAlbums(auth: AuthDto, dto: AlbumsAddAssetsDto): Promise<AlbumsAddAssetsResponseDto> {
     const fullResults = [];
-    for (const albumId in dto.albumIds) {
+    for (const albumId of dto.albumIds) {
       try {
         const albumResults = await this.addAssets(auth, albumId, { ids: dto.assetIds });
         const successIds = albumResults.filter(({ success }) => success).map((r) => r.id);
@@ -206,16 +206,14 @@ export class AlbumService extends BaseService {
           }
         }
         fullResults.push({ id: albumId, success, successIds, error });
-        // results.push({ results: albumResults });
       } catch {
         fullResults.push({ id: albumId, success: false, error: BulkIdErrorReason.NOT_FOUND });
-        // results.push({ results: [{ id: albumId, success: false, error: BulkIdErrorReason.NOT_FOUND }] });
       }
     }
 
     //Construct final return
     const albumSuccessCount = fullResults.filter(({ success }) => success).length;
-    const successIds: Set<string> = new Set(...fullResults.map((result) => result.successIds));
+    const successIds: Set<string> = new Set(fullResults.flatMap((result) => result.successIds!));
     const success = successIds.size > 0;
     let error;
     if (!success) {
diff --git a/web/src/lib/components/asset-viewer/album-list-item.svelte b/web/src/lib/components/asset-viewer/album-list-item.svelte
index 0f64535f56312..45ac8f68751fe 100644
--- a/web/src/lib/components/asset-viewer/album-list-item.svelte
+++ b/web/src/lib/components/asset-viewer/album-list-item.svelte
@@ -51,19 +51,9 @@
     ];
   });
 
-  // const handleAlbumClick = () => {
-  //   if (multiSelectActive) {
-  //     onMultiSelectClicked();
-  //   } else {
-  //     onAlbumClick();
-  //   }
-  // }
-
   const handleMultiSelectClicked = (e?: MouseEvent) => {
     e?.stopPropagation();
     e?.preventDefault();
-    console.log('icon click');
-    // multiSelected = !multiSelected;
     onMultiSelect();
   };
 
diff --git a/web/src/lib/components/photos-page/actions/add-to-album.svelte b/web/src/lib/components/photos-page/actions/add-to-album.svelte
index 56249130e330e..d19f3dc9d91bc 100644
--- a/web/src/lib/components/photos-page/actions/add-to-album.svelte
+++ b/web/src/lib/components/photos-page/actions/add-to-album.svelte
@@ -19,7 +19,6 @@
 
   const onClick = async () => {
     const albums = await modalManager.show(AlbumPickerModal, { shared });
-
     if (!albums || albums.length === 0) {
       return;
     }
@@ -30,7 +29,10 @@
       await addAssetsToAlbum(album.id, assetIds);
       onAddToAlbum(assetIds, album.id);
     } else {
-      await addAssetsToAlbums(albums.map(a=>a.id), assetIds);
+      await addAssetsToAlbums(
+        albums.map((a) => a.id),
+        assetIds,
+      );
       onAddToAlbum(assetIds, albums[0].id);
     }
   };
diff --git a/web/src/lib/components/shared-components/album-selection/album-selection-utils.ts b/web/src/lib/components/shared-components/album-selection/album-selection-utils.ts
index 893695e3ed693..85baa174322f6 100644
--- a/web/src/lib/components/shared-components/album-selection/album-selection-utils.ts
+++ b/web/src/lib/components/shared-components/album-selection/album-selection-utils.ts
@@ -42,7 +42,7 @@ export class AlbumModalRowConverter {
     recentAlbums: AlbumResponseDto[],
     albums: AlbumResponseDto[],
     selectedRowIndex: number,
-    multiSelectedRowIndexes: string[]
+    multiSelectedRowIndexes: string[],
   ): AlbumModalRow[] {
     // only show recent albums if no search was entered, or we're in the normal albums (non-shared) modal.
     const recentAlbumsToShow = !this.shared && search.length === 0 ? recentAlbums : [];
diff --git a/web/src/lib/modals/AlbumPickerModal.svelte b/web/src/lib/modals/AlbumPickerModal.svelte
index d8b8397279aef..6b81bd105717b 100644
--- a/web/src/lib/modals/AlbumPickerModal.svelte
+++ b/web/src/lib/modals/AlbumPickerModal.svelte
@@ -4,7 +4,6 @@
     AlbumModalRowConverter,
     AlbumModalRowType,
     isSelectableRowType,
-    type AlbumModalRow,
   } from '$lib/components/shared-components/album-selection/album-selection-utils';
   import { albumViewSettings } from '$lib/stores/preferences.store';
   import { createAlbum, getAllAlbums, type AlbumResponseDto } from '@immich/sdk';
@@ -55,7 +54,7 @@
         onClose([album]);
       } else {
         onClose();
-      }      
+      }
     }
   };
 
@@ -77,6 +76,15 @@
     }
   };
 
+  const handleMultiSubmit = () => {
+    const albums = new Set(albumModalRows.filter((row) => row.multiSelected).map((row) => row.album!));
+    if (albums.size > 0) {
+      onClose([...albums]);
+    } else {
+      onClose();
+    }
+  };
+
   const onEnter = async () => {
     const item = albumModalRows.find(({ selected }) => selected);
     if (!item) {
@@ -89,7 +97,9 @@
         break;
       }
       case AlbumModalRowType.ALBUM_ITEM: {
-        if (item.album) {
+        if (multiSelectActive) {
+          handleMultiSubmit();
+        } if (item.album) {
           onClose([item.album]);
         }
         break;
@@ -185,7 +195,7 @@
       {/if}
     </div>
     {#if multiSelectActive}
-      <Button size="small" shape="round" fullWidth onclick={() => onClose()}>{$t('add_to_albums')}</Button>
+      <Button size="small" shape="round" fullWidth onclick={handleMultiSubmit}>{$t('add_to_albums')}</Button>
     {/if}
   </ModalBody>
 </Modal>

From 3946bfd045f54c5311b4f3c3ba81ef81500ae3fc Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Mon, 21 Jul 2025 18:15:19 -0400
Subject: [PATCH 07/31] - update i18n - format & check

---
 i18n/en.json                                  |  4 ++++
 .../actions/add-to-album-action.svelte        |  7 +++++--
 .../album-selection-utils.spec.ts             | 21 +++++++++++++------
 web/src/lib/modals/AlbumPickerModal.svelte    |  3 ++-
 web/src/lib/utils/asset-utils.ts              |  6 ++----
 5 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index 77dc2e235c56f..5831d0551916c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -25,6 +25,7 @@
   "add_tag": "Add tag",
   "add_to": "Add to…",
   "add_to_album": "Add to album",
+  "add_to_albums": "Add to albums",
   "add_to_album_bottom_sheet_added": "Added to {album}",
   "add_to_album_bottom_sheet_already_exists": "Already in {album}",
   "add_to_shared_album": "Add to shared album",
@@ -483,7 +484,9 @@
   "assets": "Assets",
   "assets_added_count": "Added {count, plural, one {# asset} other {# assets}}",
   "assets_added_to_album_count": "Added {count, plural, one {# asset} other {# assets}} to the album",
+  "assets_added_to_albums_count": "Added {assetCount, plural, one {# asset} other {# assets}} to {albumCount} albums",
   "assets_cannot_be_added_to_album_count": "{count, plural, one {Asset} other {Assets}} cannot be added to the album",
+  "assets_cannot_be_added_to_albums": "{count, plural, one {Asset} other {Assets}} cannot be added any of the albums",
   "assets_count": "{count, plural, one {# asset} other {# assets}}",
   "assets_deleted_permanently": "{count} asset(s) deleted permanently",
   "assets_deleted_permanently_from_server": "{count} asset(s) deleted permanently from the Immich server",
@@ -500,6 +503,7 @@
   "assets_trashed_count": "Trashed {count, plural, one {# asset} other {# assets}}",
   "assets_trashed_from_server": "{count} asset(s) trashed from the Immich server",
   "assets_were_part_of_album_count": "{count, plural, one {Asset was} other {Assets were}} already part of the album",
+  "assets_were_part_of_albums_count": "{count, plural, one {Asset was} other {Assets were}} already part of the albums",
   "authorized_devices": "Authorized Devices",
   "automatic_endpoint_switching_subtitle": "Connect locally over designated Wi-Fi when available and use alternative connections elsewhere",
   "automatic_endpoint_switching_title": "Automatic URL switching",
diff --git a/web/src/lib/components/asset-viewer/actions/add-to-album-action.svelte b/web/src/lib/components/asset-viewer/actions/add-to-album-action.svelte
index 048f5b725d32e..4179839db888d 100644
--- a/web/src/lib/components/asset-viewer/actions/add-to-album-action.svelte
+++ b/web/src/lib/components/asset-viewer/actions/add-to-album-action.svelte
@@ -31,8 +31,11 @@
       await addAssetsToAlbum(album.id, [asset.id]);
       onAction({ type: AssetAction.ADD_TO_ALBUM, asset: toTimelineAsset(asset), album });
     } else {
-      await addAssetsToAlbums(albums.map(a=>a.id), [asset.id]);
-      onAction({type: AssetAction.ADD_TO_ALBUM, asset: toTimelineAsset(asset), album: albums[0]});
+      await addAssetsToAlbums(
+        albums.map((a) => a.id),
+        [asset.id],
+      );
+      onAction({ type: AssetAction.ADD_TO_ALBUM, asset: toTimelineAsset(asset), album: albums[0] });
     }
   };
 </script>
diff --git a/web/src/lib/components/shared-components/album-selection/album-selection-utils.spec.ts b/web/src/lib/components/shared-components/album-selection/album-selection-utils.spec.ts
index 242809d58f984..93ae9003b9cb5 100644
--- a/web/src/lib/components/shared-components/album-selection/album-selection-utils.spec.ts
+++ b/web/src/lib/components/shared-components/album-selection/album-selection-utils.spec.ts
@@ -29,14 +29,20 @@ const createAlbumRow = (album: AlbumResponseDto, selected: boolean) => ({
 describe('Album Modal', () => {
   it('non-shared with no albums configured yet shows message and new', () => {
     const converter = new AlbumModalRowConverter(false, AlbumSortBy.MostRecentPhoto, SortOrder.Desc);
-    const modalRows = converter.toModalRows('', [], [], -1);
+    const modalRows = converter.toModalRows('', [], [], -1, []);
 
     expect(modalRows).toStrictEqual([createNewAlbumRow(false), createMessageRow('no_albums_yet')]);
   });
 
   it('non-shared with no matching albums shows message and new', () => {
     const converter = new AlbumModalRowConverter(false, AlbumSortBy.MostRecentPhoto, SortOrder.Desc);
-    const modalRows = converter.toModalRows('matches_nothing', [], [albumFactory.build({ albumName: 'Holidays' })], -1);
+    const modalRows = converter.toModalRows(
+      'matches_nothing',
+      [],
+      [albumFactory.build({ albumName: 'Holidays' })],
+      -1,
+      [],
+    );
 
     expect(modalRows).toStrictEqual([createNewAlbumRow(false), createMessageRow('no_albums_with_name_yet')]);
   });
@@ -44,7 +50,7 @@ describe('Album Modal', () => {
   it('non-shared displays single albums', () => {
     const converter = new AlbumModalRowConverter(false, AlbumSortBy.MostRecentPhoto, SortOrder.Desc);
     const holidayAlbum = albumFactory.build({ albumName: 'Holidays' });
-    const modalRows = converter.toModalRows('', [], [holidayAlbum], -1);
+    const modalRows = converter.toModalRows('', [], [holidayAlbum], -1, []);
 
     expect(modalRows).toStrictEqual([
       createNewAlbumRow(false),
@@ -64,6 +70,7 @@ describe('Album Modal', () => {
       [holidayAlbum, constructionAlbum],
       [holidayAlbum, constructionAlbum, birthdayAlbum, christmasAlbum],
       -1,
+      [],
     );
 
     expect(modalRows).toStrictEqual([
@@ -90,6 +97,7 @@ describe('Album Modal', () => {
       [holidayAlbum, constructionAlbum],
       [holidayAlbum, constructionAlbum, birthdayAlbum, christmasAlbum],
       -1,
+      [],
     );
 
     expect(modalRows).toStrictEqual([
@@ -112,6 +120,7 @@ describe('Album Modal', () => {
       [holidayAlbum, constructionAlbum],
       [holidayAlbum, constructionAlbum, birthdayAlbum, christmasAlbum],
       -1,
+      [],
     );
 
     expect(modalRows).toStrictEqual([
@@ -125,7 +134,7 @@ describe('Album Modal', () => {
     const converter = new AlbumModalRowConverter(false, AlbumSortBy.MostRecentPhoto, SortOrder.Desc);
     const holidayAlbum = albumFactory.build({ albumName: 'Holidays' });
     const constructionAlbum = albumFactory.build({ albumName: 'Construction' });
-    const modalRows = converter.toModalRows('', [holidayAlbum], [holidayAlbum, constructionAlbum], 0);
+    const modalRows = converter.toModalRows('', [holidayAlbum], [holidayAlbum, constructionAlbum], 0, []);
 
     expect(modalRows).toStrictEqual([
       createNewAlbumRow(true),
@@ -141,7 +150,7 @@ describe('Album Modal', () => {
     const converter = new AlbumModalRowConverter(false, AlbumSortBy.MostRecentPhoto, SortOrder.Desc);
     const holidayAlbum = albumFactory.build({ albumName: 'Holidays' });
     const constructionAlbum = albumFactory.build({ albumName: 'Construction' });
-    const modalRows = converter.toModalRows('', [holidayAlbum], [holidayAlbum, constructionAlbum], 1);
+    const modalRows = converter.toModalRows('', [holidayAlbum], [holidayAlbum, constructionAlbum], 1, []);
 
     expect(modalRows).toStrictEqual([
       createNewAlbumRow(false),
@@ -157,7 +166,7 @@ describe('Album Modal', () => {
     const converter = new AlbumModalRowConverter(false, AlbumSortBy.MostRecentPhoto, SortOrder.Desc);
     const holidayAlbum = albumFactory.build({ albumName: 'Holidays' });
     const constructionAlbum = albumFactory.build({ albumName: 'Construction' });
-    const modalRows = converter.toModalRows('', [holidayAlbum], [holidayAlbum, constructionAlbum], 3);
+    const modalRows = converter.toModalRows('', [holidayAlbum], [holidayAlbum, constructionAlbum], 3, []);
 
     expect(modalRows).toStrictEqual([
       createNewAlbumRow(false),
diff --git a/web/src/lib/modals/AlbumPickerModal.svelte b/web/src/lib/modals/AlbumPickerModal.svelte
index 6b81bd105717b..e60c9f73b82fd 100644
--- a/web/src/lib/modals/AlbumPickerModal.svelte
+++ b/web/src/lib/modals/AlbumPickerModal.svelte
@@ -99,7 +99,8 @@
       case AlbumModalRowType.ALBUM_ITEM: {
         if (multiSelectActive) {
           handleMultiSubmit();
-        } if (item.album) {
+        }
+        if (item.album) {
           onClose([item.album]);
         }
         break;
diff --git a/web/src/lib/utils/asset-utils.ts b/web/src/lib/utils/asset-utils.ts
index 4666d478656ba..0a20cc3ae9738 100644
--- a/web/src/lib/utils/asset-utils.ts
+++ b/web/src/lib/utils/asset-utils.ts
@@ -91,10 +91,8 @@ export const addAssetsToAlbums = async (albumIds: string[], assetIds: string[],
     });
     if (result.error) {
       if (result.error === 'duplicate') {
-        const duplicateErrorCount = 0;
-        message = $t('assets_were_part_of_album_count', { values: { count: duplicateErrorCount } });
-      } else if (result.error === 'no_permission') {
-        message = $t('assets_cannot_be_added_to_album_count', { values: { count: assetIds.length } });
+        const duplicateErrorCount = assetIds.length;
+        message = $t('assets_were_part_of_albums_count', { values: { count: duplicateErrorCount } });
       } else {
         message = $t('assets_cannot_be_added_to_albums');
       }

From a7db5c1e26c87646997c51aedecdd9a3af85a04d Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Mon, 21 Jul 2025 21:44:41 -0400
Subject: [PATCH 08/31] - checks

---
 web/src/lib/components/asset-viewer/album-list-item.svelte | 2 +-
 web/src/lib/components/elements/icon.svelte                | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/web/src/lib/components/asset-viewer/album-list-item.svelte b/web/src/lib/components/asset-viewer/album-list-item.svelte
index 45ac8f68751fe..781767588f419 100644
--- a/web/src/lib/components/asset-viewer/album-list-item.svelte
+++ b/web/src/lib/components/asset-viewer/album-list-item.svelte
@@ -86,7 +86,7 @@
   };
   function longPress(element: HTMLElement, { onLongPress }: { onLongPress: () => void }) {
     let didPress = false;
-    const start = (evt: PointerEvent) => {
+    const start = () => {
       didPress = false;
       // 350ms for longpress. For reference: iOS uses 500ms for default long press, or 200ms for fast long press.
       timer = setTimeout(() => {
diff --git a/web/src/lib/components/elements/icon.svelte b/web/src/lib/components/elements/icon.svelte
index 628b16c1ab850..9102b23d690c0 100644
--- a/web/src/lib/components/elements/icon.svelte
+++ b/web/src/lib/components/elements/icon.svelte
@@ -38,10 +38,6 @@
     spin = false,
     onClick = undefined,
   }: Props = $props();
-
-  const handleClick = () => {
-    console.log('click');
-  };
 </script>
 
 <svg

From 9bbd58309a495292b6f415a62065a9ea45d7f7ca Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Mon, 21 Jul 2025 22:22:51 -0400
Subject: [PATCH 09/31] - correct successId count - fix assets_cannot_be_added
 language call

---
 server/src/services/album.service.ts | 6 +++---
 web/src/lib/utils/asset-utils.ts     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/src/services/album.service.ts b/server/src/services/album.service.ts
index c1f9a20ce9021..623d0e20446e6 100644
--- a/server/src/services/album.service.ts
+++ b/server/src/services/album.service.ts
@@ -210,10 +210,10 @@ export class AlbumService extends BaseService {
         fullResults.push({ id: albumId, success: false, error: BulkIdErrorReason.NOT_FOUND });
       }
     }
-
     //Construct final return
-    const albumSuccessCount = fullResults.filter(({ success }) => success).length;
-    const successIds: Set<string> = new Set(fullResults.flatMap((result) => result.successIds!));
+    const successfulResults = fullResults.filter(({ success }) => success);
+    const albumSuccessCount = successfulResults.length;
+    const successIds: Set<string> = new Set(successfulResults.flatMap((result) => result.successIds!));
     const success = successIds.size > 0;
     let error;
     if (!success) {
diff --git a/web/src/lib/utils/asset-utils.ts b/web/src/lib/utils/asset-utils.ts
index 0a20cc3ae9738..1aead986b2dcb 100644
--- a/web/src/lib/utils/asset-utils.ts
+++ b/web/src/lib/utils/asset-utils.ts
@@ -94,7 +94,7 @@ export const addAssetsToAlbums = async (albumIds: string[], assetIds: string[],
         const duplicateErrorCount = assetIds.length;
         message = $t('assets_were_part_of_albums_count', { values: { count: duplicateErrorCount } });
       } else {
-        message = $t('assets_cannot_be_added_to_albums');
+        message = $t('assets_cannot_be_added_to_albums', { values: { count: assetIds.length } });
       }
     }
     notificationController.show({

From 5c2e0f317c69949e98323abfabc9bd932af14aff Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Tue, 22 Jul 2025 00:22:14 -0400
Subject: [PATCH 10/31] tests

---
 server/src/services/album.service.spec.ts | 271 ++++++++++++++++++++++
 1 file changed, 271 insertions(+)

diff --git a/server/src/services/album.service.spec.ts b/server/src/services/album.service.spec.ts
index 6f07a31dd9426..f2e0e5ede1ebd 100644
--- a/server/src/services/album.service.spec.ts
+++ b/server/src/services/album.service.spec.ts
@@ -776,6 +776,277 @@ describe(AlbumService.name, () => {
     });
   });
 
+  describe('addAssetsToAlbums', () => {
+    it('should allow the owner to add assets', async () => {
+      mocks.access.album.checkOwnerAccess.mockResolvedValueOnce(new Set(['album-123'])).mockResolvedValueOnce(new Set(['album-321']));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2', 'asset-3']));
+      mocks.album.getById.mockResolvedValueOnce(_.cloneDeep(albumStub.empty)).mockResolvedValueOnce(_.cloneDeep(albumStub.oneAsset));
+      mocks.album.getAssetIds.mockResolvedValueOnce(new Set()).mockResolvedValueOnce(new Set());
+
+      await expect(
+        // sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
+        sut.addAssetsToAlbums(authStub.admin, {
+          albumIds: ['album-123', 'album-321'],
+          assetIds: ['asset-1', 'asset-2', 'asset-3'],
+        }),
+      ).resolves.toEqual({ success: true, albumSuccessCount: 2, assetSuccessCount: 3 });
+
+      expect(mocks.album.update).toHaveBeenCalledTimes(2);
+      expect(mocks.album.update).toHaveBeenNthCalledWith(1, 'album-123', {
+        id: 'album-123',
+        updatedAt: expect.any(Date),
+        albumThumbnailAssetId: 'asset-1',
+      });
+      expect(mocks.album.update).toHaveBeenNthCalledWith(2, 'album-321', {
+        id: 'album-321',
+        updatedAt: expect.any(Date),
+        albumThumbnailAssetId: 'asset-1',
+      });
+      expect(mocks.album.addAssetIds).toHaveBeenCalledWith('album-123', ['asset-1', 'asset-2', 'asset-3']);
+      expect(mocks.album.addAssetIds).toHaveBeenCalledWith('album-321', ['asset-1', 'asset-2', 'asset-3']);
+    });
+
+    it('should not set the thumbnail if the album has one already', async () => {
+      mocks.access.album.checkOwnerAccess.mockResolvedValueOnce(new Set(['album-123'])).mockResolvedValueOnce(new Set(['album-321']));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2', 'asset-3']));
+      mocks.album.getById.mockResolvedValueOnce(_.cloneDeep({...albumStub.empty, albumThumbnailAssetId: 'asset-id'})).mockResolvedValueOnce(_.cloneDeep({...albumStub.oneAsset, albumThumbnailAssetId: 'asset-id'}));
+      mocks.album.getAssetIds.mockResolvedValueOnce(new Set()).mockResolvedValueOnce(new Set());
+
+      await expect(
+        // sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
+        sut.addAssetsToAlbums(authStub.admin, {
+          albumIds: ['album-123', 'album-321'],
+          assetIds: ['asset-1', 'asset-2', 'asset-3'],
+        }),
+      ).resolves.toEqual({ success: true, albumSuccessCount: 2, assetSuccessCount: 3 });
+
+      expect(mocks.album.update).toHaveBeenCalledTimes(2);
+      expect(mocks.album.update).toHaveBeenNthCalledWith(1, 'album-123', {
+        id: 'album-123',
+        updatedAt: expect.any(Date),
+        albumThumbnailAssetId: 'asset-id',
+      });
+      expect(mocks.album.update).toHaveBeenNthCalledWith(2, 'album-321', {
+        id: 'album-321',
+        updatedAt: expect.any(Date),
+        albumThumbnailAssetId: 'asset-id',
+      });
+      expect(mocks.album.addAssetIds).toHaveBeenCalledWith('album-123', ['asset-1', 'asset-2', 'asset-3']);
+      expect(mocks.album.addAssetIds).toHaveBeenCalledWith('album-321', ['asset-1', 'asset-2', 'asset-3']);
+    });
+
+    it('should allow a shared user to add assets', async () => {
+      mocks.access.album.checkSharedAlbumAccess.mockResolvedValueOnce(new Set(['album-123'])).mockResolvedValueOnce(new Set(['album-321']));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2', 'asset-3']));
+      mocks.album.getById.mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithUser)).mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithMultiple));
+      mocks.album.getAssetIds.mockResolvedValueOnce(new Set()).mockResolvedValueOnce(new Set());
+
+      await expect(
+        // sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
+        sut.addAssetsToAlbums(authStub.user1, {
+          albumIds: ['album-123', 'album-321'],
+          assetIds: ['asset-1', 'asset-2', 'asset-3'],
+        }),
+      ).resolves.toEqual({ success: true, albumSuccessCount: 2, assetSuccessCount: 3 });
+
+      expect(mocks.album.update).toHaveBeenCalledTimes(2);
+      expect(mocks.album.update).toHaveBeenNthCalledWith(1, 'album-123', {
+        id: 'album-123',
+        updatedAt: expect.any(Date),
+        albumThumbnailAssetId: 'asset-1',
+      });
+      expect(mocks.album.update).toHaveBeenNthCalledWith(2, 'album-321', {
+        id: 'album-321',
+        updatedAt: expect.any(Date),
+        albumThumbnailAssetId: 'asset-1',
+      });
+      expect(mocks.album.addAssetIds).toHaveBeenCalledWith('album-123', ['asset-1', 'asset-2', 'asset-3']);
+      expect(mocks.album.addAssetIds).toHaveBeenCalledWith('album-321', ['asset-1', 'asset-2', 'asset-3']);
+      expect(mocks.event.emit).toHaveBeenCalledWith('AlbumUpdate', {
+        id: 'album-123',
+        recipientId: 'admin_id',
+      });
+      expect(mocks.event.emit).toHaveBeenCalledWith('AlbumUpdate', {
+        id: 'album-321',
+        recipientId: 'admin_id',
+      });
+    });
+
+    it('should not allow a shared user with viewer access to add assets', async () => {
+      mocks.access.album.checkSharedAlbumAccess.mockResolvedValueOnce(new Set()).mockResolvedValueOnce(new Set());
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2', 'asset-3']));
+      mocks.album.getById.mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithUser)).mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithAdmin));
+      mocks.album.getAssetIds.mockResolvedValueOnce(new Set()).mockResolvedValueOnce(new Set());
+
+      await expect(
+        // sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
+        sut.addAssetsToAlbums(authStub.user2, {
+          albumIds: ['album-123', 'album-321'],
+          assetIds: ['asset-1', 'asset-2', 'asset-3'],
+        }),
+      ).resolves.toEqual({ success: false, albumSuccessCount: 0, assetSuccessCount: 0, error: BulkIdErrorReason.NOT_FOUND });
+
+      expect(mocks.album.update).not.toHaveBeenCalled();
+    });
+
+    it('should not allow a shared link user to add assets to multiple albums', async () => {
+      mocks.access.album.checkSharedLinkAccess.mockResolvedValueOnce(new Set(['album-123'])).mockResolvedValueOnce(new Set());
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2', 'asset-3']));
+      mocks.album.getById.mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithUser)).mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithMultiple));
+      mocks.album.getAssetIds.mockResolvedValueOnce(new Set()).mockResolvedValueOnce(new Set());
+
+      await expect(
+        // sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
+        sut.addAssetsToAlbums(authStub.adminSharedLink, {
+          albumIds: ['album-123', 'album-321'],
+          assetIds: ['asset-1', 'asset-2', 'asset-3'],
+        }),
+      ).resolves.toEqual({ success: true, albumSuccessCount: 1, assetSuccessCount: 3 });
+
+      expect(mocks.album.update).toHaveBeenCalledTimes(1);
+      expect(mocks.album.update).toHaveBeenNthCalledWith(1, 'album-123', {
+        id: 'album-123',
+        updatedAt: expect.any(Date),
+        albumThumbnailAssetId: 'asset-1',
+      });
+      expect(mocks.album.addAssetIds).toHaveBeenCalledTimes(1);
+      expect(mocks.album.addAssetIds).toHaveBeenCalledWith('album-123', ['asset-1', 'asset-2', 'asset-3']);
+      expect(mocks.event.emit).toHaveBeenCalledWith('AlbumUpdate', {
+        id: 'album-123',
+        recipientId: 'user-id',
+      });
+      expect(mocks.access.album.checkSharedLinkAccess).toHaveBeenCalledWith(
+        authStub.adminSharedLink.sharedLink?.id,
+        new Set(['album-123']),
+      );
+    });
+
+    it('should allow adding assets shared via partner sharing', async () => {
+      mocks.access.album.checkOwnerAccess.mockResolvedValueOnce(new Set(['album-123'])).mockResolvedValueOnce(new Set(['album-321']));
+      mocks.access.asset.checkPartnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2', 'asset-3']));
+      mocks.album.getById.mockResolvedValueOnce(_.cloneDeep(albumStub.empty)).mockResolvedValueOnce(_.cloneDeep(albumStub.oneAsset));
+      mocks.album.getAssetIds.mockResolvedValueOnce(new Set()).mockResolvedValueOnce(new Set());
+
+      await expect(
+        // sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
+        sut.addAssetsToAlbums(authStub.admin, {
+          albumIds: ['album-123', 'album-321'],
+          assetIds: ['asset-1', 'asset-2', 'asset-3'],
+        }),
+      ).resolves.toEqual({ success: true, albumSuccessCount: 2, assetSuccessCount: 3 });
+
+      expect(mocks.album.update).toHaveBeenCalledTimes(2);
+      expect(mocks.album.update).toHaveBeenNthCalledWith(1, 'album-123', {
+        id: 'album-123',
+        updatedAt: expect.any(Date),
+        albumThumbnailAssetId: 'asset-1',
+      });
+      expect(mocks.album.update).toHaveBeenNthCalledWith(2, 'album-321', {
+        id: 'album-321',
+        updatedAt: expect.any(Date),
+        albumThumbnailAssetId: 'asset-1',
+      });
+      expect(mocks.album.addAssetIds).toHaveBeenCalledWith('album-123', ['asset-1', 'asset-2', 'asset-3']);
+      expect(mocks.album.addAssetIds).toHaveBeenCalledWith('album-321', ['asset-1', 'asset-2', 'asset-3']);
+      expect(mocks.access.asset.checkPartnerAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['asset-1', 'asset-2', 'asset-3']));
+    });
+
+    it('should skip some duplicate assets', async () => {
+      mocks.access.album.checkOwnerAccess.mockResolvedValueOnce(new Set(['album-123'])).mockResolvedValueOnce(new Set(['album-321']));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2', 'asset-3']));
+      mocks.album.getById.mockResolvedValueOnce(_.cloneDeep(albumStub.empty)).mockResolvedValueOnce(_.cloneDeep(albumStub.oneAsset));
+      mocks.album.getAssetIds.mockResolvedValueOnce(new Set(['asset-1', 'asset-2', 'asset-3'])).mockResolvedValueOnce(new Set());
+
+      await expect(
+        // sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
+        sut.addAssetsToAlbums(authStub.admin, {
+          albumIds: ['album-123', 'album-321'],
+          assetIds: ['asset-1', 'asset-2', 'asset-3'],
+        }),
+      ).resolves.toEqual({ success: true, albumSuccessCount: 1, assetSuccessCount: 3 });
+
+      expect(mocks.album.update).toHaveBeenCalledTimes(1);
+      expect(mocks.album.update).toHaveBeenNthCalledWith(1, 'album-321', {
+        id: 'album-321',
+        updatedAt: expect.any(Date),
+        albumThumbnailAssetId: 'asset-1',
+      });
+      expect(mocks.album.addAssetIds).toHaveBeenCalledTimes(1)
+      expect(mocks.album.addAssetIds).toHaveBeenCalledWith('album-321', ['asset-1', 'asset-2', 'asset-3']);
+    });
+
+    it('should skip all duplicate assets', async () => {
+      mocks.access.album.checkOwnerAccess.mockResolvedValueOnce(new Set(['album-123'])).mockResolvedValueOnce(new Set(['album-321']));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2']));
+      mocks.album.getById.mockResolvedValueOnce(_.cloneDeep(albumStub.empty)).mockResolvedValueOnce(_.cloneDeep(albumStub.oneAsset));
+      mocks.album.getAssetIds.mockResolvedValue(new Set(['asset-1', 'asset-2']));
+
+      await expect(
+        // sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
+        sut.addAssetsToAlbums(authStub.admin, {
+          albumIds: ['album-123', 'album-321'],
+          assetIds: ['asset-1', 'asset-2'],
+        }),
+      ).resolves.toEqual({ success: false, albumSuccessCount: 0, assetSuccessCount: 0, error: BulkIdErrorReason.DUPLICATE });
+
+      expect(mocks.album.update).not.toHaveBeenCalled();
+      expect(mocks.album.addAssetIds).not.toHaveBeenCalled()
+    });
+
+    it('should skip assets not shared with user', async () => {
+      mocks.access.album.checkSharedAlbumAccess.mockResolvedValueOnce(new Set(['album-123'])).mockResolvedValueOnce(new Set(['album-321']));
+      mocks.album.getById.mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithUser)).mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithMultiple));
+      mocks.album.getAssetIds.mockResolvedValueOnce(new Set()).mockResolvedValueOnce(new Set());
+
+      await expect(
+        // sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
+        sut.addAssetsToAlbums(authStub.admin, {
+          albumIds: ['album-123', 'album-321'],
+          assetIds: ['asset-1', 'asset-2', 'asset-3'],
+        }),
+      ).resolves.toEqual({ success: false, albumSuccessCount: 0, assetSuccessCount: 0, error: BulkIdErrorReason.NO_PERMISSION });
+
+      expect(mocks.album.update).not.toHaveBeenCalled();
+      expect(mocks.album.addAssetIds).not.toHaveBeenCalled();
+      expect(mocks.access.asset.checkOwnerAccess).toHaveBeenCalledWith(
+        authStub.admin.user.id,
+        new Set(['asset-1', 'asset-2', 'asset-3']),
+        false,
+      );
+      expect(mocks.access.asset.checkPartnerAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['asset-1', 'asset-2', 'asset-3']));
+    });
+
+    it('should not allow unauthorized access to the albums', async () => {
+      mocks.album.getById.mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithUser)).mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithMultiple));
+
+      await expect(
+        // sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
+        sut.addAssetsToAlbums(authStub.admin, {
+          albumIds: ['album-123', 'album-321'],
+          assetIds: ['asset-1', 'asset-2', 'asset-3'],
+        }),
+      ).resolves.toEqual({ success: false, albumSuccessCount: 0, assetSuccessCount: 0, error: BulkIdErrorReason.NOT_FOUND });
+
+      expect(mocks.album.update).not.toHaveBeenCalled();
+      expect(mocks.album.addAssetIds).not.toHaveBeenCalled();
+      expect(mocks.access.album.checkOwnerAccess).toHaveBeenCalled();
+      expect(mocks.access.album.checkSharedAlbumAccess).toHaveBeenCalled();
+    });
+
+    it('should not allow unauthorized shared link access to the album', async () => {
+      mocks.album.getById.mockResolvedValueOnce(_.cloneDeep(albumStub.empty)).mockResolvedValueOnce(_.cloneDeep(albumStub.oneAsset));
+
+      await expect(
+        sut.addAssetsToAlbums(authStub.adminSharedLink, {
+          albumIds: ['album-123', 'album-321'],
+          assetIds: ['asset-1', 'asset-2', 'asset-3'],
+        }),
+      ).resolves.toEqual({ success: false, albumSuccessCount: 0, assetSuccessCount: 0, error: BulkIdErrorReason.NOT_FOUND });
+
+      expect(mocks.access.album.checkSharedLinkAccess).toHaveBeenCalled();
+    });
+  });
+
   describe('removeAssets', () => {
     it('should allow the owner to remove assets', async () => {
       mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set(['album-123']));

From 8904334e8c064e7f7569c1b07fcab4ef33d4942d Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Tue, 22 Jul 2025 00:30:04 -0400
Subject: [PATCH 11/31] foromat

---
 server/src/services/album.service.spec.ts | 129 +++++++++++++++++-----
 1 file changed, 100 insertions(+), 29 deletions(-)

diff --git a/server/src/services/album.service.spec.ts b/server/src/services/album.service.spec.ts
index f2e0e5ede1ebd..1cdd8a36b086f 100644
--- a/server/src/services/album.service.spec.ts
+++ b/server/src/services/album.service.spec.ts
@@ -778,9 +778,13 @@ describe(AlbumService.name, () => {
 
   describe('addAssetsToAlbums', () => {
     it('should allow the owner to add assets', async () => {
-      mocks.access.album.checkOwnerAccess.mockResolvedValueOnce(new Set(['album-123'])).mockResolvedValueOnce(new Set(['album-321']));
+      mocks.access.album.checkOwnerAccess
+        .mockResolvedValueOnce(new Set(['album-123']))
+        .mockResolvedValueOnce(new Set(['album-321']));
       mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2', 'asset-3']));
-      mocks.album.getById.mockResolvedValueOnce(_.cloneDeep(albumStub.empty)).mockResolvedValueOnce(_.cloneDeep(albumStub.oneAsset));
+      mocks.album.getById
+        .mockResolvedValueOnce(_.cloneDeep(albumStub.empty))
+        .mockResolvedValueOnce(_.cloneDeep(albumStub.oneAsset));
       mocks.album.getAssetIds.mockResolvedValueOnce(new Set()).mockResolvedValueOnce(new Set());
 
       await expect(
@@ -807,9 +811,13 @@ describe(AlbumService.name, () => {
     });
 
     it('should not set the thumbnail if the album has one already', async () => {
-      mocks.access.album.checkOwnerAccess.mockResolvedValueOnce(new Set(['album-123'])).mockResolvedValueOnce(new Set(['album-321']));
+      mocks.access.album.checkOwnerAccess
+        .mockResolvedValueOnce(new Set(['album-123']))
+        .mockResolvedValueOnce(new Set(['album-321']));
       mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2', 'asset-3']));
-      mocks.album.getById.mockResolvedValueOnce(_.cloneDeep({...albumStub.empty, albumThumbnailAssetId: 'asset-id'})).mockResolvedValueOnce(_.cloneDeep({...albumStub.oneAsset, albumThumbnailAssetId: 'asset-id'}));
+      mocks.album.getById
+        .mockResolvedValueOnce(_.cloneDeep({ ...albumStub.empty, albumThumbnailAssetId: 'asset-id' }))
+        .mockResolvedValueOnce(_.cloneDeep({ ...albumStub.oneAsset, albumThumbnailAssetId: 'asset-id' }));
       mocks.album.getAssetIds.mockResolvedValueOnce(new Set()).mockResolvedValueOnce(new Set());
 
       await expect(
@@ -836,9 +844,13 @@ describe(AlbumService.name, () => {
     });
 
     it('should allow a shared user to add assets', async () => {
-      mocks.access.album.checkSharedAlbumAccess.mockResolvedValueOnce(new Set(['album-123'])).mockResolvedValueOnce(new Set(['album-321']));
+      mocks.access.album.checkSharedAlbumAccess
+        .mockResolvedValueOnce(new Set(['album-123']))
+        .mockResolvedValueOnce(new Set(['album-321']));
       mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2', 'asset-3']));
-      mocks.album.getById.mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithUser)).mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithMultiple));
+      mocks.album.getById
+        .mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithUser))
+        .mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithMultiple));
       mocks.album.getAssetIds.mockResolvedValueOnce(new Set()).mockResolvedValueOnce(new Set());
 
       await expect(
@@ -875,7 +887,9 @@ describe(AlbumService.name, () => {
     it('should not allow a shared user with viewer access to add assets', async () => {
       mocks.access.album.checkSharedAlbumAccess.mockResolvedValueOnce(new Set()).mockResolvedValueOnce(new Set());
       mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2', 'asset-3']));
-      mocks.album.getById.mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithUser)).mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithAdmin));
+      mocks.album.getById
+        .mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithUser))
+        .mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithAdmin));
       mocks.album.getAssetIds.mockResolvedValueOnce(new Set()).mockResolvedValueOnce(new Set());
 
       await expect(
@@ -884,15 +898,24 @@ describe(AlbumService.name, () => {
           albumIds: ['album-123', 'album-321'],
           assetIds: ['asset-1', 'asset-2', 'asset-3'],
         }),
-      ).resolves.toEqual({ success: false, albumSuccessCount: 0, assetSuccessCount: 0, error: BulkIdErrorReason.NOT_FOUND });
+      ).resolves.toEqual({
+        success: false,
+        albumSuccessCount: 0,
+        assetSuccessCount: 0,
+        error: BulkIdErrorReason.NOT_FOUND,
+      });
 
       expect(mocks.album.update).not.toHaveBeenCalled();
     });
 
     it('should not allow a shared link user to add assets to multiple albums', async () => {
-      mocks.access.album.checkSharedLinkAccess.mockResolvedValueOnce(new Set(['album-123'])).mockResolvedValueOnce(new Set());
+      mocks.access.album.checkSharedLinkAccess
+        .mockResolvedValueOnce(new Set(['album-123']))
+        .mockResolvedValueOnce(new Set());
       mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2', 'asset-3']));
-      mocks.album.getById.mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithUser)).mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithMultiple));
+      mocks.album.getById
+        .mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithUser))
+        .mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithMultiple));
       mocks.album.getAssetIds.mockResolvedValueOnce(new Set()).mockResolvedValueOnce(new Set());
 
       await expect(
@@ -922,9 +945,13 @@ describe(AlbumService.name, () => {
     });
 
     it('should allow adding assets shared via partner sharing', async () => {
-      mocks.access.album.checkOwnerAccess.mockResolvedValueOnce(new Set(['album-123'])).mockResolvedValueOnce(new Set(['album-321']));
+      mocks.access.album.checkOwnerAccess
+        .mockResolvedValueOnce(new Set(['album-123']))
+        .mockResolvedValueOnce(new Set(['album-321']));
       mocks.access.asset.checkPartnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2', 'asset-3']));
-      mocks.album.getById.mockResolvedValueOnce(_.cloneDeep(albumStub.empty)).mockResolvedValueOnce(_.cloneDeep(albumStub.oneAsset));
+      mocks.album.getById
+        .mockResolvedValueOnce(_.cloneDeep(albumStub.empty))
+        .mockResolvedValueOnce(_.cloneDeep(albumStub.oneAsset));
       mocks.album.getAssetIds.mockResolvedValueOnce(new Set()).mockResolvedValueOnce(new Set());
 
       await expect(
@@ -948,14 +975,23 @@ describe(AlbumService.name, () => {
       });
       expect(mocks.album.addAssetIds).toHaveBeenCalledWith('album-123', ['asset-1', 'asset-2', 'asset-3']);
       expect(mocks.album.addAssetIds).toHaveBeenCalledWith('album-321', ['asset-1', 'asset-2', 'asset-3']);
-      expect(mocks.access.asset.checkPartnerAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['asset-1', 'asset-2', 'asset-3']));
+      expect(mocks.access.asset.checkPartnerAccess).toHaveBeenCalledWith(
+        authStub.admin.user.id,
+        new Set(['asset-1', 'asset-2', 'asset-3']),
+      );
     });
 
     it('should skip some duplicate assets', async () => {
-      mocks.access.album.checkOwnerAccess.mockResolvedValueOnce(new Set(['album-123'])).mockResolvedValueOnce(new Set(['album-321']));
+      mocks.access.album.checkOwnerAccess
+        .mockResolvedValueOnce(new Set(['album-123']))
+        .mockResolvedValueOnce(new Set(['album-321']));
       mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2', 'asset-3']));
-      mocks.album.getById.mockResolvedValueOnce(_.cloneDeep(albumStub.empty)).mockResolvedValueOnce(_.cloneDeep(albumStub.oneAsset));
-      mocks.album.getAssetIds.mockResolvedValueOnce(new Set(['asset-1', 'asset-2', 'asset-3'])).mockResolvedValueOnce(new Set());
+      mocks.album.getById
+        .mockResolvedValueOnce(_.cloneDeep(albumStub.empty))
+        .mockResolvedValueOnce(_.cloneDeep(albumStub.oneAsset));
+      mocks.album.getAssetIds
+        .mockResolvedValueOnce(new Set(['asset-1', 'asset-2', 'asset-3']))
+        .mockResolvedValueOnce(new Set());
 
       await expect(
         // sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
@@ -971,14 +1007,18 @@ describe(AlbumService.name, () => {
         updatedAt: expect.any(Date),
         albumThumbnailAssetId: 'asset-1',
       });
-      expect(mocks.album.addAssetIds).toHaveBeenCalledTimes(1)
+      expect(mocks.album.addAssetIds).toHaveBeenCalledTimes(1);
       expect(mocks.album.addAssetIds).toHaveBeenCalledWith('album-321', ['asset-1', 'asset-2', 'asset-3']);
     });
 
     it('should skip all duplicate assets', async () => {
-      mocks.access.album.checkOwnerAccess.mockResolvedValueOnce(new Set(['album-123'])).mockResolvedValueOnce(new Set(['album-321']));
+      mocks.access.album.checkOwnerAccess
+        .mockResolvedValueOnce(new Set(['album-123']))
+        .mockResolvedValueOnce(new Set(['album-321']));
       mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2']));
-      mocks.album.getById.mockResolvedValueOnce(_.cloneDeep(albumStub.empty)).mockResolvedValueOnce(_.cloneDeep(albumStub.oneAsset));
+      mocks.album.getById
+        .mockResolvedValueOnce(_.cloneDeep(albumStub.empty))
+        .mockResolvedValueOnce(_.cloneDeep(albumStub.oneAsset));
       mocks.album.getAssetIds.mockResolvedValue(new Set(['asset-1', 'asset-2']));
 
       await expect(
@@ -987,15 +1027,24 @@ describe(AlbumService.name, () => {
           albumIds: ['album-123', 'album-321'],
           assetIds: ['asset-1', 'asset-2'],
         }),
-      ).resolves.toEqual({ success: false, albumSuccessCount: 0, assetSuccessCount: 0, error: BulkIdErrorReason.DUPLICATE });
+      ).resolves.toEqual({
+        success: false,
+        albumSuccessCount: 0,
+        assetSuccessCount: 0,
+        error: BulkIdErrorReason.DUPLICATE,
+      });
 
       expect(mocks.album.update).not.toHaveBeenCalled();
-      expect(mocks.album.addAssetIds).not.toHaveBeenCalled()
+      expect(mocks.album.addAssetIds).not.toHaveBeenCalled();
     });
 
     it('should skip assets not shared with user', async () => {
-      mocks.access.album.checkSharedAlbumAccess.mockResolvedValueOnce(new Set(['album-123'])).mockResolvedValueOnce(new Set(['album-321']));
-      mocks.album.getById.mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithUser)).mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithMultiple));
+      mocks.access.album.checkSharedAlbumAccess
+        .mockResolvedValueOnce(new Set(['album-123']))
+        .mockResolvedValueOnce(new Set(['album-321']));
+      mocks.album.getById
+        .mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithUser))
+        .mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithMultiple));
       mocks.album.getAssetIds.mockResolvedValueOnce(new Set()).mockResolvedValueOnce(new Set());
 
       await expect(
@@ -1004,7 +1053,12 @@ describe(AlbumService.name, () => {
           albumIds: ['album-123', 'album-321'],
           assetIds: ['asset-1', 'asset-2', 'asset-3'],
         }),
-      ).resolves.toEqual({ success: false, albumSuccessCount: 0, assetSuccessCount: 0, error: BulkIdErrorReason.NO_PERMISSION });
+      ).resolves.toEqual({
+        success: false,
+        albumSuccessCount: 0,
+        assetSuccessCount: 0,
+        error: BulkIdErrorReason.NO_PERMISSION,
+      });
 
       expect(mocks.album.update).not.toHaveBeenCalled();
       expect(mocks.album.addAssetIds).not.toHaveBeenCalled();
@@ -1013,11 +1067,16 @@ describe(AlbumService.name, () => {
         new Set(['asset-1', 'asset-2', 'asset-3']),
         false,
       );
-      expect(mocks.access.asset.checkPartnerAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['asset-1', 'asset-2', 'asset-3']));
+      expect(mocks.access.asset.checkPartnerAccess).toHaveBeenCalledWith(
+        authStub.admin.user.id,
+        new Set(['asset-1', 'asset-2', 'asset-3']),
+      );
     });
 
     it('should not allow unauthorized access to the albums', async () => {
-      mocks.album.getById.mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithUser)).mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithMultiple));
+      mocks.album.getById
+        .mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithUser))
+        .mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithMultiple));
 
       await expect(
         // sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
@@ -1025,7 +1084,12 @@ describe(AlbumService.name, () => {
           albumIds: ['album-123', 'album-321'],
           assetIds: ['asset-1', 'asset-2', 'asset-3'],
         }),
-      ).resolves.toEqual({ success: false, albumSuccessCount: 0, assetSuccessCount: 0, error: BulkIdErrorReason.NOT_FOUND });
+      ).resolves.toEqual({
+        success: false,
+        albumSuccessCount: 0,
+        assetSuccessCount: 0,
+        error: BulkIdErrorReason.NOT_FOUND,
+      });
 
       expect(mocks.album.update).not.toHaveBeenCalled();
       expect(mocks.album.addAssetIds).not.toHaveBeenCalled();
@@ -1034,14 +1098,21 @@ describe(AlbumService.name, () => {
     });
 
     it('should not allow unauthorized shared link access to the album', async () => {
-      mocks.album.getById.mockResolvedValueOnce(_.cloneDeep(albumStub.empty)).mockResolvedValueOnce(_.cloneDeep(albumStub.oneAsset));
+      mocks.album.getById
+        .mockResolvedValueOnce(_.cloneDeep(albumStub.empty))
+        .mockResolvedValueOnce(_.cloneDeep(albumStub.oneAsset));
 
       await expect(
         sut.addAssetsToAlbums(authStub.adminSharedLink, {
           albumIds: ['album-123', 'album-321'],
           assetIds: ['asset-1', 'asset-2', 'asset-3'],
         }),
-      ).resolves.toEqual({ success: false, albumSuccessCount: 0, assetSuccessCount: 0, error: BulkIdErrorReason.NOT_FOUND });
+      ).resolves.toEqual({
+        success: false,
+        albumSuccessCount: 0,
+        assetSuccessCount: 0,
+        error: BulkIdErrorReason.NOT_FOUND,
+      });
 
       expect(mocks.access.album.checkSharedLinkAccess).toHaveBeenCalled();
     });

From 144ac6b40e7d5ef45384e35a73411ae55e0703d2 Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Tue, 22 Jul 2025 00:45:07 -0400
Subject: [PATCH 12/31] refactor

---
 .../album-selection/album-selection-utils.ts         |  6 +++---
 web/src/lib/modals/AlbumPickerModal.svelte           | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/web/src/lib/components/shared-components/album-selection/album-selection-utils.ts b/web/src/lib/components/shared-components/album-selection/album-selection-utils.ts
index 85baa174322f6..f016916f7f243 100644
--- a/web/src/lib/components/shared-components/album-selection/album-selection-utils.ts
+++ b/web/src/lib/components/shared-components/album-selection/album-selection-utils.ts
@@ -42,7 +42,7 @@ export class AlbumModalRowConverter {
     recentAlbums: AlbumResponseDto[],
     albums: AlbumResponseDto[],
     selectedRowIndex: number,
-    multiSelectedRowIndexes: string[],
+    multiSelectedAlbumIds: string[],
   ): AlbumModalRow[] {
     // only show recent albums if no search was entered, or we're in the normal albums (non-shared) modal.
     const recentAlbumsToShow = !this.shared && search.length === 0 ? recentAlbums : [];
@@ -66,7 +66,7 @@ export class AlbumModalRowConverter {
           rows.push({
             type: AlbumModalRowType.ALBUM_ITEM,
             selected: selectedRowIndex === i + selectedOffsetDueToNewAlbumRow,
-            multiSelected: multiSelectedRowIndexes.includes(album.id),
+            multiSelected: multiSelectedAlbumIds.includes(album.id),
             album,
           });
         }
@@ -84,7 +84,7 @@ export class AlbumModalRowConverter {
         rows.push({
           type: AlbumModalRowType.ALBUM_ITEM,
           selected: selectedRowIndex === i + selectedOffsetDueToNewAndRecents,
-          multiSelected: multiSelectedRowIndexes.includes(album.id),
+          multiSelected: multiSelectedAlbumIds.includes(album.id),
           album,
         });
       }
diff --git a/web/src/lib/modals/AlbumPickerModal.svelte b/web/src/lib/modals/AlbumPickerModal.svelte
index e60c9f73b82fd..24b8497251e15 100644
--- a/web/src/lib/modals/AlbumPickerModal.svelte
+++ b/web/src/lib/modals/AlbumPickerModal.svelte
@@ -32,12 +32,12 @@
     loading = false;
   });
 
-  const multiSelectedRowIndexes: string[] = $state([]);
-  const multiSelectActive = $derived(multiSelectedRowIndexes.length > 0);
+  const multiSelectedAlbumIds: string[] = $state([]);
+  const multiSelectActive = $derived(multiSelectedAlbumIds.length > 0);
 
   const rowConverter = new AlbumModalRowConverter(shared, $albumViewSettings.sortBy, $albumViewSettings.sortOrder);
   const albumModalRows = $derived(
-    rowConverter.toModalRows(search, recentAlbums, albums, selectedRowIndex, multiSelectedRowIndexes),
+    rowConverter.toModalRows(search, recentAlbums, albums, selectedRowIndex, multiSelectedAlbumIds),
   );
   const selectableRowCount = $derived(albumModalRows.filter((row) => isSelectableRowType(row.type)).length);
 
@@ -67,11 +67,11 @@
       }
     }
     if (album) {
-      const indexOf = multiSelectedRowIndexes.indexOf(album.id);
+      const indexOf = multiSelectedAlbumIds.indexOf(album.id);
       if (indexOf === -1) {
-        multiSelectedRowIndexes.push(album.id);
+        multiSelectedAlbumIds.push(album.id);
       } else {
-        multiSelectedRowIndexes.splice(indexOf, 1);
+        multiSelectedAlbumIds.splice(indexOf, 1);
       }
     }
   };

From c0be70c33d9a312271b2be6ed484fd82434e3659 Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Tue, 22 Jul 2025 01:17:00 -0400
Subject: [PATCH 13/31] - update successful add message to included total
 attempted

---
 i18n/en.json                     | 2 +-
 web/src/lib/utils/asset-utils.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index 48a2046819130..8f967f30aad10 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -486,7 +486,7 @@
   "assets": "Assets",
   "assets_added_count": "Added {count, plural, one {# asset} other {# assets}}",
   "assets_added_to_album_count": "Added {count, plural, one {# asset} other {# assets}} to the album",
-  "assets_added_to_albums_count": "Added {assetCount, plural, one {# asset} other {# assets}} to {albumCount} albums",
+  "assets_added_to_albums_count": "Added {assetCount} of {assetTotal} assets to {albumCount} of {albumTotal} albums",
   "assets_cannot_be_added_to_album_count": "{count, plural, one {Asset} other {Assets}} cannot be added to the album",
   "assets_cannot_be_added_to_albums": "{count, plural, one {Asset} other {Assets}} cannot be added any of the albums",
   "assets_count": "{count, plural, one {# asset} other {# assets}}",
diff --git a/web/src/lib/utils/asset-utils.ts b/web/src/lib/utils/asset-utils.ts
index 1aead986b2dcb..f72aeebe79628 100644
--- a/web/src/lib/utils/asset-utils.ts
+++ b/web/src/lib/utils/asset-utils.ts
@@ -87,7 +87,7 @@ export const addAssetsToAlbums = async (albumIds: string[], assetIds: string[],
   if (showNotification) {
     const $t = get(t);
     let message = $t('assets_added_to_albums_count', {
-      values: { albumCount: result.albumSuccessCount, assetCount: result.assetSuccessCount },
+      values: { albumCount: result.albumSuccessCount, albumTotal: albumIds.length, assetCount: result.assetSuccessCount, assetTotal: assetIds.length },
     });
     if (result.error) {
       if (result.error === 'duplicate') {

From db74a36aab2fb36de262c116d1362d1a0455ff29 Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Tue, 22 Jul 2025 01:34:10 -0400
Subject: [PATCH 14/31] - fix web test - format i18n

---
 i18n/en.json                                                    | 2 +-
 .../album-selection/album-selection-utils.spec.ts               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/i18n/en.json b/i18n/en.json
index 8f967f30aad10..fb7e4609ac000 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -25,9 +25,9 @@
   "add_tag": "Add tag",
   "add_to": "Add to…",
   "add_to_album": "Add to album",
-  "add_to_albums": "Add to albums",
   "add_to_album_bottom_sheet_added": "Added to {album}",
   "add_to_album_bottom_sheet_already_exists": "Already in {album}",
+  "add_to_albums": "Add to albums",
   "add_to_shared_album": "Add to shared album",
   "add_url": "Add URL",
   "added_to_archive": "Added to archive",
diff --git a/web/src/lib/components/shared-components/album-selection/album-selection-utils.spec.ts b/web/src/lib/components/shared-components/album-selection/album-selection-utils.spec.ts
index 93ae9003b9cb5..a078e55762e00 100644
--- a/web/src/lib/components/shared-components/album-selection/album-selection-utils.spec.ts
+++ b/web/src/lib/components/shared-components/album-selection/album-selection-utils.spec.ts
@@ -24,6 +24,7 @@ const createAlbumRow = (album: AlbumResponseDto, selected: boolean) => ({
   type: AlbumModalRowType.ALBUM_ITEM,
   album,
   selected,
+  multiSelected: false,
 });
 
 describe('Album Modal', () => {

From 14a245691342c74fccf3fc304b7ba338ef9fcd35 Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Tue, 22 Jul 2025 01:45:01 -0400
Subject: [PATCH 15/31] - fix open-api

---
 mobile/openapi/README.md           | 2 ++
 mobile/openapi/lib/api.dart        | 2 ++
 mobile/openapi/lib/api_client.dart | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index e47c87d799b1d..067a1066c3993 100644
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -478,6 +478,8 @@ Class | Method | HTTP request | Description
  - [SyncAlbumV1](doc//SyncAlbumV1.md)
  - [SyncAssetDeleteV1](doc//SyncAssetDeleteV1.md)
  - [SyncAssetExifV1](doc//SyncAssetExifV1.md)
+ - [SyncAssetFaceDeleteV1](doc//SyncAssetFaceDeleteV1.md)
+ - [SyncAssetFaceV1](doc//SyncAssetFaceV1.md)
  - [SyncAssetV1](doc//SyncAssetV1.md)
  - [SyncEntityType](doc//SyncEntityType.md)
  - [SyncMemoryAssetDeleteV1](doc//SyncMemoryAssetDeleteV1.md)
diff --git a/mobile/openapi/lib/api.dart b/mobile/openapi/lib/api.dart
index 57d695de5d397..c856116a2e0de 100644
--- a/mobile/openapi/lib/api.dart
+++ b/mobile/openapi/lib/api.dart
@@ -259,6 +259,8 @@ part 'model/sync_album_user_v1.dart';
 part 'model/sync_album_v1.dart';
 part 'model/sync_asset_delete_v1.dart';
 part 'model/sync_asset_exif_v1.dart';
+part 'model/sync_asset_face_delete_v1.dart';
+part 'model/sync_asset_face_v1.dart';
 part 'model/sync_asset_v1.dart';
 part 'model/sync_entity_type.dart';
 part 'model/sync_memory_asset_delete_v1.dart';
diff --git a/mobile/openapi/lib/api_client.dart b/mobile/openapi/lib/api_client.dart
index 83fc7b6d91bcc..d15ab19125e4b 100644
--- a/mobile/openapi/lib/api_client.dart
+++ b/mobile/openapi/lib/api_client.dart
@@ -574,6 +574,10 @@ class ApiClient {
           return SyncAssetDeleteV1.fromJson(value);
         case 'SyncAssetExifV1':
           return SyncAssetExifV1.fromJson(value);
+        case 'SyncAssetFaceDeleteV1':
+          return SyncAssetFaceDeleteV1.fromJson(value);
+        case 'SyncAssetFaceV1':
+          return SyncAssetFaceV1.fromJson(value);
         case 'SyncAssetV1':
           return SyncAssetV1.fromJson(value);
         case 'SyncEntityType':

From a37ba2ad6a99e19984b1951b2585fc2c61c96edc Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Tue, 22 Jul 2025 01:49:41 -0400
Subject: [PATCH 16/31] - fix imports to resolve checks

---
 web/src/lib/utils/asset-utils.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/web/src/lib/utils/asset-utils.ts b/web/src/lib/utils/asset-utils.ts
index f72aeebe79628..ebe907ae3d26b 100644
--- a/web/src/lib/utils/asset-utils.ts
+++ b/web/src/lib/utils/asset-utils.ts
@@ -21,7 +21,6 @@ import {
   createStack,
   deleteAssets,
   deleteStacks,
-  Error,
   getAssetInfo,
   getBaseUrl,
   getDownloadInfo,
@@ -87,7 +86,12 @@ export const addAssetsToAlbums = async (albumIds: string[], assetIds: string[],
   if (showNotification) {
     const $t = get(t);
     let message = $t('assets_added_to_albums_count', {
-      values: { albumCount: result.albumSuccessCount, albumTotal: albumIds.length, assetCount: result.assetSuccessCount, assetTotal: assetIds.length },
+      values: {
+        albumCount: result.albumSuccessCount,
+        albumTotal: albumIds.length,
+        assetCount: result.assetSuccessCount,
+        assetTotal: assetIds.length,
+      },
     });
     if (result.error) {
       if (result.error === 'duplicate') {

From 2f59ebfa721c0377d3b90d9b13a7941a9657a26c Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Thu, 24 Jul 2025 00:17:25 -0400
Subject: [PATCH 17/31] - PR suggestions

---
 i18n/en.json                               |  2 +-
 open-api/immich-openapi-specs.json         | 21 ++++++----
 server/src/dtos/album.dto.ts               |  1 +
 server/src/services/album.service.spec.ts  | 10 -----
 server/src/services/album.service.ts       |  2 +-
 web/src/lib/modals/AlbumPickerModal.svelte | 37 ++++++++----------
 web/src/lib/utils/asset-utils.ts           | 45 ++++++++++++++--------
 7 files changed, 62 insertions(+), 56 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index 76eea4daea429..f3309d9e0a978 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -488,7 +488,7 @@
   "assets_added_to_album_count": "Added {count, plural, one {# asset} other {# assets}} to the album",
   "assets_added_to_albums_count": "Added {assetCount} of {assetTotal} assets to {albumCount} of {albumTotal} albums",
   "assets_cannot_be_added_to_album_count": "{count, plural, one {Asset} other {Assets}} cannot be added to the album",
-  "assets_cannot_be_added_to_albums": "{count, plural, one {Asset} other {Assets}} cannot be added any of the albums",
+  "assets_cannot_be_added_to_albums": "{count, plural, one {Asset} other {Assets}} cannot be added to any of the albums",
   "assets_count": "{count, plural, one {# asset} other {# assets}}",
   "assets_deleted_permanently": "{count} asset(s) deleted permanently",
   "assets_deleted_permanently_from_server": "{count} asset(s) deleted permanently from the Immich server",
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index a0dd3fc087146..89d562c2f9461 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -9136,13 +9136,11 @@
             "type": "integer"
           },
           "error": {
-            "enum": [
-              "duplicate",
-              "no_permission",
-              "not_found",
-              "unknown"
-            ],
-            "type": "string"
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BulkIdErrorReason"
+              }
+            ]
           },
           "success": {
             "type": "boolean"
@@ -10105,6 +10103,15 @@
         },
         "type": "object"
       },
+      "BulkIdErrorReason": {
+        "enum": [
+          "duplicate",
+          "no_permission",
+          "not_found",
+          "unknown"
+        ],
+        "type": "string"
+      },
       "BulkIdResponseDto": {
         "properties": {
           "error": {
diff --git a/server/src/dtos/album.dto.ts b/server/src/dtos/album.dto.ts
index 1a5a5417b5cf4..73630b63cbc9b 100644
--- a/server/src/dtos/album.dto.ts
+++ b/server/src/dtos/album.dto.ts
@@ -69,6 +69,7 @@ export class AlbumsAddAssetsResponseDto {
   albumSuccessCount!: number;
   @ApiProperty({ type: 'integer' })
   assetSuccessCount!: number;
+  @ValidateEnum({ enum: BulkIdErrorReason, name: 'BulkIdErrorReason', optional: true })
   error?: BulkIdErrorReason;
 }
 
diff --git a/server/src/services/album.service.spec.ts b/server/src/services/album.service.spec.ts
index 1cdd8a36b086f..734dd75e6d011 100644
--- a/server/src/services/album.service.spec.ts
+++ b/server/src/services/album.service.spec.ts
@@ -788,7 +788,6 @@ describe(AlbumService.name, () => {
       mocks.album.getAssetIds.mockResolvedValueOnce(new Set()).mockResolvedValueOnce(new Set());
 
       await expect(
-        // sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
         sut.addAssetsToAlbums(authStub.admin, {
           albumIds: ['album-123', 'album-321'],
           assetIds: ['asset-1', 'asset-2', 'asset-3'],
@@ -821,7 +820,6 @@ describe(AlbumService.name, () => {
       mocks.album.getAssetIds.mockResolvedValueOnce(new Set()).mockResolvedValueOnce(new Set());
 
       await expect(
-        // sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
         sut.addAssetsToAlbums(authStub.admin, {
           albumIds: ['album-123', 'album-321'],
           assetIds: ['asset-1', 'asset-2', 'asset-3'],
@@ -854,7 +852,6 @@ describe(AlbumService.name, () => {
       mocks.album.getAssetIds.mockResolvedValueOnce(new Set()).mockResolvedValueOnce(new Set());
 
       await expect(
-        // sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
         sut.addAssetsToAlbums(authStub.user1, {
           albumIds: ['album-123', 'album-321'],
           assetIds: ['asset-1', 'asset-2', 'asset-3'],
@@ -893,7 +890,6 @@ describe(AlbumService.name, () => {
       mocks.album.getAssetIds.mockResolvedValueOnce(new Set()).mockResolvedValueOnce(new Set());
 
       await expect(
-        // sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
         sut.addAssetsToAlbums(authStub.user2, {
           albumIds: ['album-123', 'album-321'],
           assetIds: ['asset-1', 'asset-2', 'asset-3'],
@@ -919,7 +915,6 @@ describe(AlbumService.name, () => {
       mocks.album.getAssetIds.mockResolvedValueOnce(new Set()).mockResolvedValueOnce(new Set());
 
       await expect(
-        // sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
         sut.addAssetsToAlbums(authStub.adminSharedLink, {
           albumIds: ['album-123', 'album-321'],
           assetIds: ['asset-1', 'asset-2', 'asset-3'],
@@ -955,7 +950,6 @@ describe(AlbumService.name, () => {
       mocks.album.getAssetIds.mockResolvedValueOnce(new Set()).mockResolvedValueOnce(new Set());
 
       await expect(
-        // sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
         sut.addAssetsToAlbums(authStub.admin, {
           albumIds: ['album-123', 'album-321'],
           assetIds: ['asset-1', 'asset-2', 'asset-3'],
@@ -994,7 +988,6 @@ describe(AlbumService.name, () => {
         .mockResolvedValueOnce(new Set());
 
       await expect(
-        // sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
         sut.addAssetsToAlbums(authStub.admin, {
           albumIds: ['album-123', 'album-321'],
           assetIds: ['asset-1', 'asset-2', 'asset-3'],
@@ -1022,7 +1015,6 @@ describe(AlbumService.name, () => {
       mocks.album.getAssetIds.mockResolvedValue(new Set(['asset-1', 'asset-2']));
 
       await expect(
-        // sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
         sut.addAssetsToAlbums(authStub.admin, {
           albumIds: ['album-123', 'album-321'],
           assetIds: ['asset-1', 'asset-2'],
@@ -1048,7 +1040,6 @@ describe(AlbumService.name, () => {
       mocks.album.getAssetIds.mockResolvedValueOnce(new Set()).mockResolvedValueOnce(new Set());
 
       await expect(
-        // sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
         sut.addAssetsToAlbums(authStub.admin, {
           albumIds: ['album-123', 'album-321'],
           assetIds: ['asset-1', 'asset-2', 'asset-3'],
@@ -1079,7 +1070,6 @@ describe(AlbumService.name, () => {
         .mockResolvedValueOnce(_.cloneDeep(albumStub.sharedWithMultiple));
 
       await expect(
-        // sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
         sut.addAssetsToAlbums(authStub.admin, {
           albumIds: ['album-123', 'album-321'],
           assetIds: ['asset-1', 'asset-2', 'asset-3'],
diff --git a/server/src/services/album.service.ts b/server/src/services/album.service.ts
index 623d0e20446e6..d4308655181c9 100644
--- a/server/src/services/album.service.ts
+++ b/server/src/services/album.service.ts
@@ -193,7 +193,7 @@ export class AlbumService extends BaseService {
     for (const albumId of dto.albumIds) {
       try {
         const albumResults = await this.addAssets(auth, albumId, { ids: dto.assetIds });
-        const successIds = albumResults.filter(({ success }) => success).map((r) => r.id);
+        const successIds = albumResults.filter(({ success }) => success).map(({ id }) => id);
         const success = successIds.length > 0;
         let error;
         if (!success) {
diff --git a/web/src/lib/modals/AlbumPickerModal.svelte b/web/src/lib/modals/AlbumPickerModal.svelte
index 24b8497251e15..061aaf5401fb4 100644
--- a/web/src/lib/modals/AlbumPickerModal.svelte
+++ b/web/src/lib/modals/AlbumPickerModal.svelte
@@ -49,35 +49,32 @@
   const handleAlbumClick = (album?: AlbumResponseDto) => {
     if (multiSelectActive) {
       handleMultiSelect(album);
-    } else {
-      if (album) {
-        onClose([album]);
-      } else {
-        onClose();
-      }
+      return;
     }
+    if (album) {
+      onClose([album]);
+      return;
+    }
+    onClose();
   };
 
   const handleMultiSelect = (album?: AlbumResponseDto) => {
-    if (!album) {
-      //Attempt to grab the album from the keyboard select
-      const item = albumModalRows.find(({ selected }) => selected);
-      if (item) {
-        album = item.album;
-      }
+    const selectedAlbum = album ?? albumModalRows.find(({ selected }) => selected)?.album;
+
+    if (!selectedAlbum) {
+      return;
     }
-    if (album) {
-      const indexOf = multiSelectedAlbumIds.indexOf(album.id);
-      if (indexOf === -1) {
-        multiSelectedAlbumIds.push(album.id);
-      } else {
-        multiSelectedAlbumIds.splice(indexOf, 1);
-      }
+
+    const index = multiSelectedAlbumIds.indexOf(selectedAlbum.id);
+    if (index === -1) {
+      multiSelectedAlbumIds.push(selectedAlbum.id);
+      return;
     }
+    multiSelectedAlbumIds.splice(index, 1);
   };
 
   const handleMultiSubmit = () => {
-    const albums = new Set(albumModalRows.filter((row) => row.multiSelected).map((row) => row.album!));
+    const albums = new Set(albumModalRows.filter((row) => row.multiSelected).map(({ album }) => album!));
     if (albums.size > 0) {
       onClose([...albums]);
     } else {
diff --git a/web/src/lib/utils/asset-utils.ts b/web/src/lib/utils/asset-utils.ts
index ebe907ae3d26b..19a1c9f8ebb36 100644
--- a/web/src/lib/utils/asset-utils.ts
+++ b/web/src/lib/utils/asset-utils.ts
@@ -83,32 +83,43 @@ export const addAssetsToAlbums = async (albumIds: string[], assetIds: string[],
     key: authManager.key,
   });
 
+  if (!showNotification) {
+    return result;
+  }
+
   if (showNotification) {
     const $t = get(t);
-    let message = $t('assets_added_to_albums_count', {
-      values: {
-        albumCount: result.albumSuccessCount,
-        albumTotal: albumIds.length,
-        assetCount: result.assetSuccessCount,
-        assetTotal: assetIds.length,
-      },
-    });
+
+    if (result.error === 'duplicate') {
+      notificationController.show({
+        type: NotificationType.Info,
+        timeout: 5000,
+        message: $t('assets_were_part_of_albums_count', { values: { count: assetIds.length } }),
+      });
+      return result;
+    }
     if (result.error) {
-      if (result.error === 'duplicate') {
-        const duplicateErrorCount = assetIds.length;
-        message = $t('assets_were_part_of_albums_count', { values: { count: duplicateErrorCount } });
-      } else {
-        message = $t('assets_cannot_be_added_to_albums', { values: { count: assetIds.length } });
-      }
+      notificationController.show({
+        type: NotificationType.Info,
+        timeout: 5000,
+        message: $t('assets_cannot_be_added_to_albums', { values: { count: assetIds.length } }),
+      });
+      return result;
     }
     notificationController.show({
       type: NotificationType.Info,
       timeout: 5000,
-      message,
+      message: $t('assets_added_to_albums_count', {
+        values: {
+          albumCount: result.albumSuccessCount,
+          albumTotal: albumIds.length,
+          assetCount: result.assetSuccessCount,
+          assetTotal: assetIds.length,
+        },
+      }),
     });
+    return result;
   }
-
-  return result;
 };
 
 export const tagAssets = async ({

From 6ee48f7be59c74917b52cb67e91e8267271f4c11 Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Thu, 24 Jul 2025 00:24:50 -0400
Subject: [PATCH 18/31] open-api

---
 mobile/openapi/README.md                      |  3 +
 mobile/openapi/lib/api.dart                   |  2 +
 mobile/openapi/lib/api_client.dart            |  4 +
 mobile/openapi/lib/api_helper.dart            |  3 +
 .../model/albums_add_assets_response_dto.dart | 90 ++----------------
 .../lib/model/bulk_id_error_reason.dart       | 91 +++++++++++++++++++
 open-api/typescript-sdk/src/fetch-client.ts   |  8 +-
 web/src/lib/utils/asset-utils.ts              |  3 +-
 8 files changed, 120 insertions(+), 84 deletions(-)
 create mode 100644 mobile/openapi/lib/model/bulk_id_error_reason.dart

diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index 067a1066c3993..fd75cbb030ae6 100644
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -222,6 +222,7 @@ Class | Method | HTTP request | Description
 *StacksApi* | [**deleteStack**](doc//StacksApi.md#deletestack) | **DELETE** /stacks/{id} | 
 *StacksApi* | [**deleteStacks**](doc//StacksApi.md#deletestacks) | **DELETE** /stacks | 
 *StacksApi* | [**getStack**](doc//StacksApi.md#getstack) | **GET** /stacks/{id} | 
+*StacksApi* | [**removeAssetFromStack**](doc//StacksApi.md#removeassetfromstack) | **DELETE** /stacks/{id}/assets/{assetId} | 
 *StacksApi* | [**searchStacks**](doc//StacksApi.md#searchstacks) | **GET** /stacks | 
 *StacksApi* | [**updateStack**](doc//StacksApi.md#updatestack) | **PUT** /stacks/{id} | 
 *SyncApi* | [**deleteSyncAck**](doc//SyncApi.md#deletesyncack) | **DELETE** /sync/ack | 
@@ -333,6 +334,7 @@ Class | Method | HTTP request | Description
  - [AudioCodec](doc//AudioCodec.md)
  - [AuthStatusResponseDto](doc//AuthStatusResponseDto.md)
  - [AvatarUpdate](doc//AvatarUpdate.md)
+ - [BulkIdErrorReason](doc//BulkIdErrorReason.md)
  - [BulkIdResponseDto](doc//BulkIdResponseDto.md)
  - [BulkIdsDto](doc//BulkIdsDto.md)
  - [CLIPConfig](doc//CLIPConfig.md)
@@ -481,6 +483,7 @@ Class | Method | HTTP request | Description
  - [SyncAssetFaceDeleteV1](doc//SyncAssetFaceDeleteV1.md)
  - [SyncAssetFaceV1](doc//SyncAssetFaceV1.md)
  - [SyncAssetV1](doc//SyncAssetV1.md)
+ - [SyncAuthUserV1](doc//SyncAuthUserV1.md)
  - [SyncEntityType](doc//SyncEntityType.md)
  - [SyncMemoryAssetDeleteV1](doc//SyncMemoryAssetDeleteV1.md)
  - [SyncMemoryAssetV1](doc//SyncMemoryAssetV1.md)
diff --git a/mobile/openapi/lib/api.dart b/mobile/openapi/lib/api.dart
index c856116a2e0de..0cd4cbab6d35a 100644
--- a/mobile/openapi/lib/api.dart
+++ b/mobile/openapi/lib/api.dart
@@ -114,6 +114,7 @@ part 'model/asset_visibility.dart';
 part 'model/audio_codec.dart';
 part 'model/auth_status_response_dto.dart';
 part 'model/avatar_update.dart';
+part 'model/bulk_id_error_reason.dart';
 part 'model/bulk_id_response_dto.dart';
 part 'model/bulk_ids_dto.dart';
 part 'model/clip_config.dart';
@@ -262,6 +263,7 @@ part 'model/sync_asset_exif_v1.dart';
 part 'model/sync_asset_face_delete_v1.dart';
 part 'model/sync_asset_face_v1.dart';
 part 'model/sync_asset_v1.dart';
+part 'model/sync_auth_user_v1.dart';
 part 'model/sync_entity_type.dart';
 part 'model/sync_memory_asset_delete_v1.dart';
 part 'model/sync_memory_asset_v1.dart';
diff --git a/mobile/openapi/lib/api_client.dart b/mobile/openapi/lib/api_client.dart
index d15ab19125e4b..9683569dfbf1a 100644
--- a/mobile/openapi/lib/api_client.dart
+++ b/mobile/openapi/lib/api_client.dart
@@ -284,6 +284,8 @@ class ApiClient {
           return AuthStatusResponseDto.fromJson(value);
         case 'AvatarUpdate':
           return AvatarUpdate.fromJson(value);
+        case 'BulkIdErrorReason':
+          return BulkIdErrorReasonTypeTransformer().decode(value);
         case 'BulkIdResponseDto':
           return BulkIdResponseDto.fromJson(value);
         case 'BulkIdsDto':
@@ -580,6 +582,8 @@ class ApiClient {
           return SyncAssetFaceV1.fromJson(value);
         case 'SyncAssetV1':
           return SyncAssetV1.fromJson(value);
+        case 'SyncAuthUserV1':
+          return SyncAuthUserV1.fromJson(value);
         case 'SyncEntityType':
           return SyncEntityTypeTypeTransformer().decode(value);
         case 'SyncMemoryAssetDeleteV1':
diff --git a/mobile/openapi/lib/api_helper.dart b/mobile/openapi/lib/api_helper.dart
index 1618f4a670a9a..fa32d284a1aa3 100644
--- a/mobile/openapi/lib/api_helper.dart
+++ b/mobile/openapi/lib/api_helper.dart
@@ -79,6 +79,9 @@ String parameterToString(dynamic value) {
   if (value is AudioCodec) {
     return AudioCodecTypeTransformer().encode(value).toString();
   }
+  if (value is BulkIdErrorReason) {
+    return BulkIdErrorReasonTypeTransformer().encode(value).toString();
+  }
   if (value is CQMode) {
     return CQModeTypeTransformer().encode(value).toString();
   }
diff --git a/mobile/openapi/lib/model/albums_add_assets_response_dto.dart b/mobile/openapi/lib/model/albums_add_assets_response_dto.dart
index 4f41bb1f50504..168b3f2c45acc 100644
--- a/mobile/openapi/lib/model/albums_add_assets_response_dto.dart
+++ b/mobile/openapi/lib/model/albums_add_assets_response_dto.dart
@@ -23,7 +23,13 @@ class AlbumsAddAssetsResponseDto {
 
   int assetSuccessCount;
 
-  AlbumsAddAssetsResponseDtoErrorEnum? error;
+  ///
+  /// Please note: This property should have been non-nullable! Since the specification file
+  /// does not include a default value (using the "default:" property), however, the generated
+  /// source code must fall back to having a nullable type.
+  /// Consider adding a "default:" property in the specification file to hide this note.
+  ///
+  BulkIdErrorReason? error;
 
   bool success;
 
@@ -69,7 +75,7 @@ class AlbumsAddAssetsResponseDto {
       return AlbumsAddAssetsResponseDto(
         albumSuccessCount: mapValueOfType<int>(json, r'albumSuccessCount')!,
         assetSuccessCount: mapValueOfType<int>(json, r'assetSuccessCount')!,
-        error: AlbumsAddAssetsResponseDtoErrorEnum.fromJson(json[r'error']),
+        error: BulkIdErrorReason.fromJson(json[r'error']),
         success: mapValueOfType<bool>(json, r'success')!,
       );
     }
@@ -124,83 +130,3 @@ class AlbumsAddAssetsResponseDto {
   };
 }
 
-
-class AlbumsAddAssetsResponseDtoErrorEnum {
-  /// Instantiate a new enum with the provided [value].
-  const AlbumsAddAssetsResponseDtoErrorEnum._(this.value);
-
-  /// The underlying value of this enum member.
-  final String value;
-
-  @override
-  String toString() => value;
-
-  String toJson() => value;
-
-  static const duplicate = AlbumsAddAssetsResponseDtoErrorEnum._(r'duplicate');
-  static const noPermission = AlbumsAddAssetsResponseDtoErrorEnum._(r'no_permission');
-  static const notFound = AlbumsAddAssetsResponseDtoErrorEnum._(r'not_found');
-  static const unknown = AlbumsAddAssetsResponseDtoErrorEnum._(r'unknown');
-
-  /// List of all possible values in this [enum][AlbumsAddAssetsResponseDtoErrorEnum].
-  static const values = <AlbumsAddAssetsResponseDtoErrorEnum>[
-    duplicate,
-    noPermission,
-    notFound,
-    unknown,
-  ];
-
-  static AlbumsAddAssetsResponseDtoErrorEnum? fromJson(dynamic value) => AlbumsAddAssetsResponseDtoErrorEnumTypeTransformer().decode(value);
-
-  static List<AlbumsAddAssetsResponseDtoErrorEnum> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <AlbumsAddAssetsResponseDtoErrorEnum>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = AlbumsAddAssetsResponseDtoErrorEnum.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-}
-
-/// Transformation class that can [encode] an instance of [AlbumsAddAssetsResponseDtoErrorEnum] to String,
-/// and [decode] dynamic data back to [AlbumsAddAssetsResponseDtoErrorEnum].
-class AlbumsAddAssetsResponseDtoErrorEnumTypeTransformer {
-  factory AlbumsAddAssetsResponseDtoErrorEnumTypeTransformer() => _instance ??= const AlbumsAddAssetsResponseDtoErrorEnumTypeTransformer._();
-
-  const AlbumsAddAssetsResponseDtoErrorEnumTypeTransformer._();
-
-  String encode(AlbumsAddAssetsResponseDtoErrorEnum data) => data.value;
-
-  /// Decodes a [dynamic value][data] to a AlbumsAddAssetsResponseDtoErrorEnum.
-  ///
-  /// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,
-  /// then null is returned. However, if [allowNull] is false and the [dynamic value][data]
-  /// cannot be decoded successfully, then an [UnimplementedError] is thrown.
-  ///
-  /// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
-  /// and users are still using an old app with the old code.
-  AlbumsAddAssetsResponseDtoErrorEnum? decode(dynamic data, {bool allowNull = true}) {
-    if (data != null) {
-      switch (data) {
-        case r'duplicate': return AlbumsAddAssetsResponseDtoErrorEnum.duplicate;
-        case r'no_permission': return AlbumsAddAssetsResponseDtoErrorEnum.noPermission;
-        case r'not_found': return AlbumsAddAssetsResponseDtoErrorEnum.notFound;
-        case r'unknown': return AlbumsAddAssetsResponseDtoErrorEnum.unknown;
-        default:
-          if (!allowNull) {
-            throw ArgumentError('Unknown enum value to decode: $data');
-          }
-      }
-    }
-    return null;
-  }
-
-  /// Singleton [AlbumsAddAssetsResponseDtoErrorEnumTypeTransformer] instance.
-  static AlbumsAddAssetsResponseDtoErrorEnumTypeTransformer? _instance;
-}
-
-
diff --git a/mobile/openapi/lib/model/bulk_id_error_reason.dart b/mobile/openapi/lib/model/bulk_id_error_reason.dart
new file mode 100644
index 0000000000000..cdaf70217e92a
--- /dev/null
+++ b/mobile/openapi/lib/model/bulk_id_error_reason.dart
@@ -0,0 +1,91 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+
+class BulkIdErrorReason {
+  /// Instantiate a new enum with the provided [value].
+  const BulkIdErrorReason._(this.value);
+
+  /// The underlying value of this enum member.
+  final String value;
+
+  @override
+  String toString() => value;
+
+  String toJson() => value;
+
+  static const duplicate = BulkIdErrorReason._(r'duplicate');
+  static const noPermission = BulkIdErrorReason._(r'no_permission');
+  static const notFound = BulkIdErrorReason._(r'not_found');
+  static const unknown = BulkIdErrorReason._(r'unknown');
+
+  /// List of all possible values in this [enum][BulkIdErrorReason].
+  static const values = <BulkIdErrorReason>[
+    duplicate,
+    noPermission,
+    notFound,
+    unknown,
+  ];
+
+  static BulkIdErrorReason? fromJson(dynamic value) => BulkIdErrorReasonTypeTransformer().decode(value);
+
+  static List<BulkIdErrorReason> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <BulkIdErrorReason>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = BulkIdErrorReason.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+}
+
+/// Transformation class that can [encode] an instance of [BulkIdErrorReason] to String,
+/// and [decode] dynamic data back to [BulkIdErrorReason].
+class BulkIdErrorReasonTypeTransformer {
+  factory BulkIdErrorReasonTypeTransformer() => _instance ??= const BulkIdErrorReasonTypeTransformer._();
+
+  const BulkIdErrorReasonTypeTransformer._();
+
+  String encode(BulkIdErrorReason data) => data.value;
+
+  /// Decodes a [dynamic value][data] to a BulkIdErrorReason.
+  ///
+  /// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,
+  /// then null is returned. However, if [allowNull] is false and the [dynamic value][data]
+  /// cannot be decoded successfully, then an [UnimplementedError] is thrown.
+  ///
+  /// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
+  /// and users are still using an old app with the old code.
+  BulkIdErrorReason? decode(dynamic data, {bool allowNull = true}) {
+    if (data != null) {
+      switch (data) {
+        case r'duplicate': return BulkIdErrorReason.duplicate;
+        case r'no_permission': return BulkIdErrorReason.noPermission;
+        case r'not_found': return BulkIdErrorReason.notFound;
+        case r'unknown': return BulkIdErrorReason.unknown;
+        default:
+          if (!allowNull) {
+            throw ArgumentError('Unknown enum value to decode: $data');
+          }
+      }
+    }
+    return null;
+  }
+
+  /// Singleton [BulkIdErrorReasonTypeTransformer] instance.
+  static BulkIdErrorReasonTypeTransformer? _instance;
+}
+
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index dcba698ae148b..9622abd4a7196 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -391,7 +391,7 @@ export type AlbumsAddAssetsDto = {
 export type AlbumsAddAssetsResponseDto = {
     albumSuccessCount: number;
     assetSuccessCount: number;
-    error?: Error;
+    error?: BulkIdErrorReason;
     success: boolean;
 };
 export type AlbumStatisticsResponseDto = {
@@ -3952,6 +3952,12 @@ export enum AssetTypeEnum {
     Audio = "AUDIO",
     Other = "OTHER"
 }
+export enum BulkIdErrorReason {
+    Duplicate = "duplicate",
+    NoPermission = "no_permission",
+    NotFound = "not_found",
+    Unknown = "unknown"
+}
 export enum Error {
     Duplicate = "duplicate",
     NoPermission = "no_permission",
diff --git a/web/src/lib/utils/asset-utils.ts b/web/src/lib/utils/asset-utils.ts
index 19a1c9f8ebb36..3697e2e5334cd 100644
--- a/web/src/lib/utils/asset-utils.ts
+++ b/web/src/lib/utils/asset-utils.ts
@@ -17,6 +17,7 @@ import {
   addAssetsToAlbum as addAssets,
   addAssetsToAlbums as addToAlbums,
   AssetVisibility,
+  BulkIdErrorReason,
   bulkTagAssets,
   createStack,
   deleteAssets,
@@ -90,7 +91,7 @@ export const addAssetsToAlbums = async (albumIds: string[], assetIds: string[],
   if (showNotification) {
     const $t = get(t);
 
-    if (result.error === 'duplicate') {
+    if (result.error === BulkIdErrorReason.Duplicate) {
       notificationController.show({
         type: NotificationType.Info,
         timeout: 5000,

From b77a5c75fc69fdd9eed3c149761281570c5aab03 Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Thu, 24 Jul 2025 18:18:12 -0400
Subject: [PATCH 19/31] refactor addAssetsToAlbums

---
 server/src/services/album.service.ts | 51 ++++++++++------------------
 1 file changed, 18 insertions(+), 33 deletions(-)

diff --git a/server/src/services/album.service.ts b/server/src/services/album.service.ts
index d4308655181c9..5f34a299919df 100644
--- a/server/src/services/album.service.ts
+++ b/server/src/services/album.service.ts
@@ -189,46 +189,31 @@ export class AlbumService extends BaseService {
   }
 
   async addAssetsToAlbums(auth: AuthDto, dto: AlbumsAddAssetsDto): Promise<AlbumsAddAssetsResponseDto> {
-    const fullResults = [];
+    const fullResults: BulkIdResponseDto[][] = []; //:{[albumId: string]: BulkIdResponseDto[]} = {};
     for (const albumId of dto.albumIds) {
       try {
         const albumResults = await this.addAssets(auth, albumId, { ids: dto.assetIds });
-        const successIds = albumResults.filter(({ success }) => success).map(({ id }) => id);
-        const success = successIds.length > 0;
-        let error;
-        if (!success) {
-          if (albumResults.every(({ error }) => error === BulkIdErrorReason.DUPLICATE)) {
-            error = BulkIdErrorReason.DUPLICATE;
-          } else if (albumResults.every(({ error }) => error === BulkIdErrorReason.NO_PERMISSION)) {
-            error = BulkIdErrorReason.NO_PERMISSION;
-          } else {
-            error = BulkIdErrorReason.UNKNOWN;
-          }
-        }
-        fullResults.push({ id: albumId, success, successIds, error });
+        fullResults.push(albumResults);
       } catch {
-        fullResults.push({ id: albumId, success: false, error: BulkIdErrorReason.NOT_FOUND });
-      }
-    }
-    //Construct final return
-    const successfulResults = fullResults.filter(({ success }) => success);
-    const albumSuccessCount = successfulResults.length;
-    const successIds: Set<string> = new Set(successfulResults.flatMap((result) => result.successIds!));
-    const success = successIds.size > 0;
-    let error;
-    if (!success) {
-      if (fullResults.every(({ error }) => error === BulkIdErrorReason.DUPLICATE)) {
-        error = BulkIdErrorReason.DUPLICATE;
-      } else if (fullResults.every(({ error }) => error === BulkIdErrorReason.NO_PERMISSION)) {
-        error = BulkIdErrorReason.NO_PERMISSION;
-      } else if (fullResults.every(({ error }) => error === BulkIdErrorReason.NOT_FOUND)) {
-        error = BulkIdErrorReason.NOT_FOUND;
-      } else {
-        error = BulkIdErrorReason.UNKNOWN;
+        fullResults.push([{ id: albumId, success: false, error: BulkIdErrorReason.NO_PERMISSION }]);
       }
     }
+    const successfulResults = fullResults.filter((r) => r.some(({ success }) => success));
+    if (successfulResults.length > 0) {
+      const albumSuccessCount = successfulResults.length;
+      const successFulAssetIds = new Set(
+        successfulResults.flatMap((result) => result.filter(({ success }) => success).flatMap(({ id }) => id)),
+      );
+      const assetSuccessCount = successFulAssetIds.size;
 
-    return { success, albumSuccessCount, assetSuccessCount: successIds.size, error };
+      return { success: true, albumSuccessCount, assetSuccessCount };
+    }
+    const error =
+      fullResults.flat().filter(({ error }) => error === BulkIdErrorReason.DUPLICATE).length ===
+      dto.albumIds.length * dto.assetIds.length
+        ? BulkIdErrorReason.DUPLICATE
+        : BulkIdErrorReason.UNKNOWN;
+    return { success: false, albumSuccessCount: 0, assetSuccessCount: 0, error };
   }
 
   async removeAssets(auth: AuthDto, id: string, dto: BulkIdsDto): Promise<BulkIdResponseDto[]> {

From 845db941bd71af867173788f7b01af4107828dce Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Thu, 24 Jul 2025 22:46:40 -0400
Subject: [PATCH 20/31] refactor it again

---
 server/src/services/album.service.ts | 43 ++++++++++++++++------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/server/src/services/album.service.ts b/server/src/services/album.service.ts
index 5f34a299919df..16ab82a10f7bb 100644
--- a/server/src/services/album.service.ts
+++ b/server/src/services/album.service.ts
@@ -189,31 +189,38 @@ export class AlbumService extends BaseService {
   }
 
   async addAssetsToAlbums(auth: AuthDto, dto: AlbumsAddAssetsDto): Promise<AlbumsAddAssetsResponseDto> {
-    const fullResults: BulkIdResponseDto[][] = []; //:{[albumId: string]: BulkIdResponseDto[]} = {};
+    const results: AlbumsAddAssetsResponseDto = {
+      success: true,
+      albumSuccessCount: 0,
+      assetSuccessCount: 0,
+      error: BulkIdErrorReason.DUPLICATE,
+    };
+    const successFulAssetIds: Set<string> = new Set();
     for (const albumId of dto.albumIds) {
       try {
         const albumResults = await this.addAssets(auth, albumId, { ids: dto.assetIds });
-        fullResults.push(albumResults);
+
+        let success = false;
+        for (const res of albumResults) {
+          if (res.success) {
+            success = true;
+            results.success = true;
+            results.error = undefined;
+            successFulAssetIds.add(res.id);
+          }
+        }
+        if (success) {
+          results.albumSuccessCount++;
+        }
       } catch {
-        fullResults.push([{ id: albumId, success: false, error: BulkIdErrorReason.NO_PERMISSION }]);
+        if (results.error) {
+          results.error = BulkIdErrorReason.UNKNOWN;
+        }
       }
     }
-    const successfulResults = fullResults.filter((r) => r.some(({ success }) => success));
-    if (successfulResults.length > 0) {
-      const albumSuccessCount = successfulResults.length;
-      const successFulAssetIds = new Set(
-        successfulResults.flatMap((result) => result.filter(({ success }) => success).flatMap(({ id }) => id)),
-      );
-      const assetSuccessCount = successFulAssetIds.size;
+    results.assetSuccessCount = successFulAssetIds.size;
 
-      return { success: true, albumSuccessCount, assetSuccessCount };
-    }
-    const error =
-      fullResults.flat().filter(({ error }) => error === BulkIdErrorReason.DUPLICATE).length ===
-      dto.albumIds.length * dto.assetIds.length
-        ? BulkIdErrorReason.DUPLICATE
-        : BulkIdErrorReason.UNKNOWN;
-    return { success: false, albumSuccessCount: 0, assetSuccessCount: 0, error };
+    return results;
   }
 
   async removeAssets(auth: AuthDto, id: string, dto: BulkIdsDto): Promise<BulkIdResponseDto[]> {

From 860fc03a53ebfe76420339e638dada58fca3bf40 Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Thu, 24 Jul 2025 22:58:16 -0400
Subject: [PATCH 21/31] - fix error returns and tests

---
 server/src/services/album.service.spec.ts | 8 ++++----
 server/src/services/album.service.ts      | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/server/src/services/album.service.spec.ts b/server/src/services/album.service.spec.ts
index 734dd75e6d011..f3ba57d744482 100644
--- a/server/src/services/album.service.spec.ts
+++ b/server/src/services/album.service.spec.ts
@@ -898,7 +898,7 @@ describe(AlbumService.name, () => {
         success: false,
         albumSuccessCount: 0,
         assetSuccessCount: 0,
-        error: BulkIdErrorReason.NOT_FOUND,
+        error: BulkIdErrorReason.UNKNOWN,
       });
 
       expect(mocks.album.update).not.toHaveBeenCalled();
@@ -1048,7 +1048,7 @@ describe(AlbumService.name, () => {
         success: false,
         albumSuccessCount: 0,
         assetSuccessCount: 0,
-        error: BulkIdErrorReason.NO_PERMISSION,
+        error: BulkIdErrorReason.UNKNOWN,
       });
 
       expect(mocks.album.update).not.toHaveBeenCalled();
@@ -1078,7 +1078,7 @@ describe(AlbumService.name, () => {
         success: false,
         albumSuccessCount: 0,
         assetSuccessCount: 0,
-        error: BulkIdErrorReason.NOT_FOUND,
+        error: BulkIdErrorReason.UNKNOWN,
       });
 
       expect(mocks.album.update).not.toHaveBeenCalled();
@@ -1101,7 +1101,7 @@ describe(AlbumService.name, () => {
         success: false,
         albumSuccessCount: 0,
         assetSuccessCount: 0,
-        error: BulkIdErrorReason.NOT_FOUND,
+        error: BulkIdErrorReason.UNKNOWN,
       });
 
       expect(mocks.access.album.checkSharedLinkAccess).toHaveBeenCalled();
diff --git a/server/src/services/album.service.ts b/server/src/services/album.service.ts
index 16ab82a10f7bb..208681590aeab 100644
--- a/server/src/services/album.service.ts
+++ b/server/src/services/album.service.ts
@@ -190,7 +190,7 @@ export class AlbumService extends BaseService {
 
   async addAssetsToAlbums(auth: AuthDto, dto: AlbumsAddAssetsDto): Promise<AlbumsAddAssetsResponseDto> {
     const results: AlbumsAddAssetsResponseDto = {
-      success: true,
+      success: false,
       albumSuccessCount: 0,
       assetSuccessCount: 0,
       error: BulkIdErrorReason.DUPLICATE,
@@ -207,6 +207,8 @@ export class AlbumService extends BaseService {
             results.success = true;
             results.error = undefined;
             successFulAssetIds.add(res.id);
+          } else if (results.error && res.error !== BulkIdErrorReason.DUPLICATE) {
+            results.error = BulkIdErrorReason.UNKNOWN;
           }
         }
         if (success) {

From 37e1209ad839b115da7f46fa360cbfbff02239f8 Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Fri, 25 Jul 2025 00:34:48 -0400
Subject: [PATCH 22/31] - swap icon for IconButton - don't nest the buttons

---
 i18n/en.json                                  |  1 +
 .../asset-viewer/album-list-item.svelte       | 99 ++++++++++---------
 2 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index 80db036984e35..568873998495b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -27,6 +27,7 @@
   "add_to_album": "Add to album",
   "add_to_album_bottom_sheet_added": "Added to {album}",
   "add_to_album_bottom_sheet_already_exists": "Already in {album}",
+  "add_to_album_toggle": "Toggle selection for {album}",
   "add_to_albums": "Add to albums",
   "add_to_shared_album": "Add to shared album",
   "add_url": "Add URL",
diff --git a/web/src/lib/components/asset-viewer/album-list-item.svelte b/web/src/lib/components/asset-viewer/album-list-item.svelte
index 781767588f419..35db4322555ca 100644
--- a/web/src/lib/components/asset-viewer/album-list-item.svelte
+++ b/web/src/lib/components/asset-viewer/album-list-item.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
-  import Icon from '$lib/components/elements/icon.svelte';
   import { SCROLL_PROPERTIES } from '$lib/components/shared-components/album-selection/album-selection-utils';
+  import { mobileDevice } from '$lib/stores/mobile-device.svelte';
   import { getAssetThumbnailUrl } from '$lib/utils';
   import { normalizeSearchString } from '$lib/utils/string-utils.js';
   import { type AlbumResponseDto } from '@immich/sdk';
+  import { IconButton } from '@immich/ui';
   import { mdiCheckCircle } from '@mdi/js';
+  import { t } from 'svelte-i18n';
   import type { Action } from 'svelte/action';
-
-  import { mobileDevice } from '$lib/stores/mobile-device.svelte';
   import AlbumListItemDetails from './album-list-item-details.svelte';
 
   interface Props {
@@ -116,54 +116,63 @@
   }
 </script>
 
-<button
-  type="button"
-  onclick={onAlbumClick}
-  use:scrollIntoViewIfSelected
-  class="relative flex w-full gap-4 px-6 py-2 text-start transition-colors hover:bg-gray-200 dark:hover:bg-gray-700 rounded-xl"
-  class:bg-gray-200={selected}
-  class:dark:bg-gray-700={selected}
-  onmouseenter={onMouseEnter}
-  onmouseleave={onMouseLeave}
-  use:longPress={{ onLongPress: () => handleMultiSelectClicked() }}
->
+<div role="group" class="relative flex w-full text-start" onmouseenter={onMouseEnter} onmouseleave={onMouseLeave}>
   {#if mouseOver || multiSelected}
-    <div class="absolute top-2 left-5.1 z-[1] rounded-full">
+    <div class="absolute left-3.5 z-[1] rounded-full">
       {#if multiSelected}
-        <div class="rounded-full bg-[#D9DCEF] dark:bg-[#232932]">
-          <Icon path={mdiCheckCircle} size="24" class="text-primary" onClick={handleMultiSelectClicked} />
-        </div>
+        <IconButton
+          icon={mdiCheckCircle}
+          aria-label={$t('add_to_album_toggle', { values: { album: album.albumName } })}
+          size="small"
+          shape="round"
+          variant="ghost"
+          color="primary"
+          class="bg-[#D9DCEF] dark:bg-[#232932]"
+          onclick={handleMultiSelectClicked}
+        />
       {:else}
-        <Icon
-          path={mdiCheckCircle}
-          size="24"
+        <IconButton
+          icon={mdiCheckCircle}
+          aria-label={$t('add_to_album_toggle', { values: { album: album.albumName } })}
+          size="small"
+          shape="round"
+          variant="ghost"
           class="text-white/80 hover:text-white"
-          onClick={handleMultiSelectClicked}
+          onclick={handleMultiSelectClicked}
         />
       {/if}
     </div>
   {/if}
-
-  <span class="h-12 w-12 shrink-0 rounded-xl bg-slate-300">
-    {#if album.albumThumbnailAssetId}
-      <img
-        src={getAssetThumbnailUrl(album.albumThumbnailAssetId)}
-        alt={album.albumName}
-        class={[
-          'h-full w-full rounded-xl object-cover transition-all duration-300 hover:shadow-lg',
-          { 'scale-[0.85]': multiSelected },
-        ]}
-        data-testid="album-image"
-        draggable="false"
-      />
-    {/if}
-  </span>
-  <span class="flex h-12 flex-col items-start justify-center overflow-hidden">
-    <span class="w-full shrink overflow-hidden text-ellipsis whitespace-nowrap"
-      >{albumNameArray[0]}<b>{albumNameArray[1]}</b>{albumNameArray[2]}</span
-    >
-    <span class="flex gap-1 text-sm">
-      <AlbumListItemDetails {album} />
+  <button
+    type="button"
+    onclick={onAlbumClick}
+    use:scrollIntoViewIfSelected
+    class="flex w-full gap-4 px-6 py-2 text-start transition-colors hover:bg-gray-200 dark:hover:bg-gray-700 rounded-xl"
+    class:bg-gray-200={selected}
+    class:dark:bg-gray-700={selected}
+    use:longPress={{ onLongPress: () => handleMultiSelectClicked() }}
+  >
+    <span class="h-12 w-12 shrink-0 rounded-xl bg-slate-300">
+      {#if album.albumThumbnailAssetId}
+        <img
+          src={getAssetThumbnailUrl(album.albumThumbnailAssetId)}
+          alt={album.albumName}
+          class={[
+            'h-full w-full rounded-xl object-cover transition-all duration-300 hover:shadow-lg',
+            { 'scale-[0.85]': multiSelected },
+          ]}
+          data-testid="album-image"
+          draggable="false"
+        />
+      {/if}
+    </span>
+    <span class="flex h-12 flex-col items-start justify-center overflow-hidden">
+      <span class="w-full shrink overflow-hidden text-ellipsis whitespace-nowrap"
+        >{albumNameArray[0]}<b>{albumNameArray[1]}</b>{albumNameArray[2]}</span
+      >
+      <span class="flex gap-1 text-sm">
+        <AlbumListItemDetails {album} />
+      </span>
     </span>
-  </span>
-</button>
+  </button>
+</div>

From 383da33123602bbe1d880c8cc601c89de36cdb75 Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Sun, 27 Jul 2025 01:21:58 -0400
Subject: [PATCH 23/31] open-api

---
 mobile/openapi/README.md           | 1 +
 mobile/openapi/lib/api.dart        | 1 +
 mobile/openapi/lib/api_client.dart | 2 ++
 mobile/openapi/lib/api_helper.dart | 3 +++
 4 files changed, 7 insertions(+)

diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index 2ed572ca84fc8..cc5b3b188d5ac 100644
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -561,6 +561,7 @@ Class | Method | HTTP request | Description
  - [UserAdminUpdateDto](doc//UserAdminUpdateDto.md)
  - [UserAvatarColor](doc//UserAvatarColor.md)
  - [UserLicense](doc//UserLicense.md)
+ - [UserMetadataKey](doc//UserMetadataKey.md)
  - [UserPreferencesResponseDto](doc//UserPreferencesResponseDto.md)
  - [UserPreferencesUpdateDto](doc//UserPreferencesUpdateDto.md)
  - [UserResponseDto](doc//UserResponseDto.md)
diff --git a/mobile/openapi/lib/api.dart b/mobile/openapi/lib/api.dart
index 0cd4cbab6d35a..305479e87e373 100644
--- a/mobile/openapi/lib/api.dart
+++ b/mobile/openapi/lib/api.dart
@@ -341,6 +341,7 @@ part 'model/user_admin_response_dto.dart';
 part 'model/user_admin_update_dto.dart';
 part 'model/user_avatar_color.dart';
 part 'model/user_license.dart';
+part 'model/user_metadata_key.dart';
 part 'model/user_preferences_response_dto.dart';
 part 'model/user_preferences_update_dto.dart';
 part 'model/user_response_dto.dart';
diff --git a/mobile/openapi/lib/api_client.dart b/mobile/openapi/lib/api_client.dart
index 9683569dfbf1a..3f31d4ed90f6d 100644
--- a/mobile/openapi/lib/api_client.dart
+++ b/mobile/openapi/lib/api_client.dart
@@ -738,6 +738,8 @@ class ApiClient {
           return UserAvatarColorTypeTransformer().decode(value);
         case 'UserLicense':
           return UserLicense.fromJson(value);
+        case 'UserMetadataKey':
+          return UserMetadataKeyTypeTransformer().decode(value);
         case 'UserPreferencesResponseDto':
           return UserPreferencesResponseDto.fromJson(value);
         case 'UserPreferencesUpdateDto':
diff --git a/mobile/openapi/lib/api_helper.dart b/mobile/openapi/lib/api_helper.dart
index fa32d284a1aa3..4adb62768b889 100644
--- a/mobile/openapi/lib/api_helper.dart
+++ b/mobile/openapi/lib/api_helper.dart
@@ -154,6 +154,9 @@ String parameterToString(dynamic value) {
   if (value is UserAvatarColor) {
     return UserAvatarColorTypeTransformer().encode(value).toString();
   }
+  if (value is UserMetadataKey) {
+    return UserMetadataKeyTypeTransformer().encode(value).toString();
+  }
   if (value is UserStatus) {
     return UserStatusTypeTransformer().encode(value).toString();
   }

From dff2db6741b105924f8f92a74af2badc2c93e47d Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Wed, 30 Jul 2025 00:29:11 -0400
Subject: [PATCH 24/31] - Cleanup multi-select button to match Thumbnail

---
 .../asset-viewer/album-list-item.svelte       | 39 ++++++++-----------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/web/src/lib/components/asset-viewer/album-list-item.svelte b/web/src/lib/components/asset-viewer/album-list-item.svelte
index 35db4322555ca..882d6891a4114 100644
--- a/web/src/lib/components/asset-viewer/album-list-item.svelte
+++ b/web/src/lib/components/asset-viewer/album-list-item.svelte
@@ -5,6 +5,7 @@
   import { normalizeSearchString } from '$lib/utils/string-utils.js';
   import { type AlbumResponseDto } from '@immich/sdk';
   import { IconButton } from '@immich/ui';
+  import Icon from '$lib/components/elements/icon.svelte';
   import { mdiCheckCircle } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import type { Action } from 'svelte/action';
@@ -119,28 +120,22 @@
 <div role="group" class="relative flex w-full text-start" onmouseenter={onMouseEnter} onmouseleave={onMouseLeave}>
   {#if mouseOver || multiSelected}
     <div class="absolute left-3.5 z-[1] rounded-full">
-      {#if multiSelected}
-        <IconButton
-          icon={mdiCheckCircle}
-          aria-label={$t('add_to_album_toggle', { values: { album: album.albumName } })}
-          size="small"
-          shape="round"
-          variant="ghost"
-          color="primary"
-          class="bg-[#D9DCEF] dark:bg-[#232932]"
-          onclick={handleMultiSelectClicked}
-        />
-      {:else}
-        <IconButton
-          icon={mdiCheckCircle}
-          aria-label={$t('add_to_album_toggle', { values: { album: album.albumName } })}
-          size="small"
-          shape="round"
-          variant="ghost"
-          class="text-white/80 hover:text-white"
-          onclick={handleMultiSelectClicked}
-        />
-      {/if}
+      <button
+        type="button"
+        onclick={handleMultiSelectClicked}
+        class='absolute p-2 focus:outline-none'
+        role="checkbox"
+        tabindex={-1}
+        aria-checked={selected}
+      >
+        {#if  multiSelected}
+          <div class="rounded-full bg-[#D9DCEF] dark:bg-[#232932]">
+            <Icon path={mdiCheckCircle} size="24" class="text-primary" />
+          </div>
+        {:else}
+          <Icon path={mdiCheckCircle} size="24" class="text-white/80 hover:text-white" />
+        {/if}
+      </button>
     </div>
   {/if}
   <button

From 08da57074908d52f5fa9a47a2ce4512163c892bc Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Wed, 30 Jul 2025 00:43:22 -0400
Subject: [PATCH 25/31] merge and openapi

---
 mobile/openapi/README.md                      |  1 +
 mobile/openapi/lib/api/albums_api.dart        | 39 ++++++++++++++-----
 open-api/immich-openapi-specs.json            |  8 ++++
 open-api/typescript-sdk/src/fetch-client.ts   |  6 ++-
 .../asset-viewer/album-list-item.svelte       |  8 ++--
 web/src/lib/utils/asset-utils.ts              |  2 +-
 6 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index cc5b3b188d5ac..07247873705d8 100644
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -185,6 +185,7 @@ Class | Method | HTTP request | Description
 *SearchApi* | [**getSearchSuggestions**](doc//SearchApi.md#getsearchsuggestions) | **GET** /search/suggestions | 
 *SearchApi* | [**searchAssetStatistics**](doc//SearchApi.md#searchassetstatistics) | **POST** /search/statistics | 
 *SearchApi* | [**searchAssets**](doc//SearchApi.md#searchassets) | **POST** /search/metadata | 
+*SearchApi* | [**searchLargeAssets**](doc//SearchApi.md#searchlargeassets) | **POST** /search/large-assets | 
 *SearchApi* | [**searchPerson**](doc//SearchApi.md#searchperson) | **GET** /search/person | 
 *SearchApi* | [**searchPlaces**](doc//SearchApi.md#searchplaces) | **GET** /search/places | 
 *SearchApi* | [**searchRandom**](doc//SearchApi.md#searchrandom) | **POST** /search/random | 
diff --git a/mobile/openapi/lib/api/albums_api.dart b/mobile/openapi/lib/api/albums_api.dart
index 1938eae8ddeea..e37b9feb2130c 100644
--- a/mobile/openapi/lib/api/albums_api.dart
+++ b/mobile/openapi/lib/api/albums_api.dart
@@ -24,7 +24,9 @@ class AlbumsApi {
   /// * [BulkIdsDto] bulkIdsDto (required):
   ///
   /// * [String] key:
-  Future<Response> addAssetsToAlbumWithHttpInfo(String id, BulkIdsDto bulkIdsDto, { String? key, }) async {
+  ///
+  /// * [String] slug:
+  Future<Response> addAssetsToAlbumWithHttpInfo(String id, BulkIdsDto bulkIdsDto, { String? key, String? slug, }) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/albums/{id}/assets'
       .replaceAll('{id}', id);
@@ -39,6 +41,9 @@ class AlbumsApi {
     if (key != null) {
       queryParams.addAll(_queryParams('', 'key', key));
     }
+    if (slug != null) {
+      queryParams.addAll(_queryParams('', 'slug', slug));
+    }
 
     const contentTypes = <String>['application/json'];
 
@@ -61,8 +66,10 @@ class AlbumsApi {
   /// * [BulkIdsDto] bulkIdsDto (required):
   ///
   /// * [String] key:
-  Future<List<BulkIdResponseDto>?> addAssetsToAlbum(String id, BulkIdsDto bulkIdsDto, { String? key, }) async {
-    final response = await addAssetsToAlbumWithHttpInfo(id, bulkIdsDto,  key: key, );
+  ///
+  /// * [String] slug:
+  Future<List<BulkIdResponseDto>?> addAssetsToAlbum(String id, BulkIdsDto bulkIdsDto, { String? key, String? slug, }) async {
+    final response = await addAssetsToAlbumWithHttpInfo(id, bulkIdsDto,  key: key, slug: slug, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -85,7 +92,9 @@ class AlbumsApi {
   /// * [AlbumsAddAssetsDto] albumsAddAssetsDto (required):
   ///
   /// * [String] key:
-  Future<Response> addAssetsToAlbumsWithHttpInfo(AlbumsAddAssetsDto albumsAddAssetsDto, { String? key, }) async {
+  ///
+  /// * [String] slug:
+  Future<Response> addAssetsToAlbumsWithHttpInfo(AlbumsAddAssetsDto albumsAddAssetsDto, { String? key, String? slug, }) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/albums/assets';
 
@@ -99,6 +108,9 @@ class AlbumsApi {
     if (key != null) {
       queryParams.addAll(_queryParams('', 'key', key));
     }
+    if (slug != null) {
+      queryParams.addAll(_queryParams('', 'slug', slug));
+    }
 
     const contentTypes = <String>['application/json'];
 
@@ -119,8 +131,10 @@ class AlbumsApi {
   /// * [AlbumsAddAssetsDto] albumsAddAssetsDto (required):
   ///
   /// * [String] key:
-  Future<AlbumsAddAssetsResponseDto?> addAssetsToAlbums(AlbumsAddAssetsDto albumsAddAssetsDto, { String? key, }) async {
-    final response = await addAssetsToAlbumsWithHttpInfo(albumsAddAssetsDto,  key: key, );
+  ///
+  /// * [String] slug:
+  Future<AlbumsAddAssetsResponseDto?> addAssetsToAlbums(AlbumsAddAssetsDto albumsAddAssetsDto, { String? key, String? slug, }) async {
+    final response = await addAssetsToAlbumsWithHttpInfo(albumsAddAssetsDto,  key: key, slug: slug, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -280,8 +294,10 @@ class AlbumsApi {
   ///
   /// * [String] key:
   ///
+  /// * [String] slug:
+  ///
   /// * [bool] withoutAssets:
-  Future<Response> getAlbumInfoWithHttpInfo(String id, { String? key, bool? withoutAssets, }) async {
+  Future<Response> getAlbumInfoWithHttpInfo(String id, { String? key, String? slug, bool? withoutAssets, }) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/albums/{id}'
       .replaceAll('{id}', id);
@@ -296,6 +312,9 @@ class AlbumsApi {
     if (key != null) {
       queryParams.addAll(_queryParams('', 'key', key));
     }
+    if (slug != null) {
+      queryParams.addAll(_queryParams('', 'slug', slug));
+    }
     if (withoutAssets != null) {
       queryParams.addAll(_queryParams('', 'withoutAssets', withoutAssets));
     }
@@ -320,9 +339,11 @@ class AlbumsApi {
   ///
   /// * [String] key:
   ///
+  /// * [String] slug:
+  ///
   /// * [bool] withoutAssets:
-  Future<AlbumResponseDto?> getAlbumInfo(String id, { String? key, bool? withoutAssets, }) async {
-    final response = await getAlbumInfoWithHttpInfo(id,  key: key, withoutAssets: withoutAssets, );
+  Future<AlbumResponseDto?> getAlbumInfo(String id, { String? key, String? slug, bool? withoutAssets, }) async {
+    final response = await getAlbumInfoWithHttpInfo(id,  key: key, slug: slug, withoutAssets: withoutAssets, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index c9540d3e6961b..142c8835aef72 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -896,6 +896,14 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "name": "slug",
+            "required": false,
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "requestBody": {
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index 3918dff72d3f9..510e79e96522b 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -1818,15 +1818,17 @@ export function createAlbum({ createAlbumDto }: {
         body: createAlbumDto
     })));
 }
-export function addAssetsToAlbums({ key, albumsAddAssetsDto }: {
+export function addAssetsToAlbums({ key, slug, albumsAddAssetsDto }: {
     key?: string;
+    slug?: string;
     albumsAddAssetsDto: AlbumsAddAssetsDto;
 }, opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
         data: AlbumsAddAssetsResponseDto;
     }>(`/albums/assets${QS.query(QS.explode({
-        key
+        key,
+        slug
     }))}`, oazapfts.json({
         ...opts,
         method: "PUT",
diff --git a/web/src/lib/components/asset-viewer/album-list-item.svelte b/web/src/lib/components/asset-viewer/album-list-item.svelte
index 882d6891a4114..d3cd16422a5f9 100644
--- a/web/src/lib/components/asset-viewer/album-list-item.svelte
+++ b/web/src/lib/components/asset-viewer/album-list-item.svelte
@@ -1,13 +1,11 @@
 <script lang="ts">
+  import Icon from '$lib/components/elements/icon.svelte';
   import { SCROLL_PROPERTIES } from '$lib/components/shared-components/album-selection/album-selection-utils';
   import { mobileDevice } from '$lib/stores/mobile-device.svelte';
   import { getAssetThumbnailUrl } from '$lib/utils';
   import { normalizeSearchString } from '$lib/utils/string-utils.js';
   import { type AlbumResponseDto } from '@immich/sdk';
-  import { IconButton } from '@immich/ui';
-  import Icon from '$lib/components/elements/icon.svelte';
   import { mdiCheckCircle } from '@mdi/js';
-  import { t } from 'svelte-i18n';
   import type { Action } from 'svelte/action';
   import AlbumListItemDetails from './album-list-item-details.svelte';
 
@@ -123,12 +121,12 @@
       <button
         type="button"
         onclick={handleMultiSelectClicked}
-        class='absolute p-2 focus:outline-none'
+        class="absolute p-2 focus:outline-none"
         role="checkbox"
         tabindex={-1}
         aria-checked={selected}
       >
-        {#if  multiSelected}
+        {#if multiSelected}
           <div class="rounded-full bg-[#D9DCEF] dark:bg-[#232932]">
             <Icon path={mdiCheckCircle} size="24" class="text-primary" />
           </div>
diff --git a/web/src/lib/utils/asset-utils.ts b/web/src/lib/utils/asset-utils.ts
index 1be48dd18172e..7a641f7c32aa6 100644
--- a/web/src/lib/utils/asset-utils.ts
+++ b/web/src/lib/utils/asset-utils.ts
@@ -78,11 +78,11 @@ export const addAssetsToAlbum = async (albumId: string, assetIds: string[], show
 
 export const addAssetsToAlbums = async (albumIds: string[], assetIds: string[], showNotification = true) => {
   const result = await addToAlbums({
+    ...authManager.params,
     albumsAddAssetsDto: {
       albumIds,
       assetIds,
     },
-    key: authManager.key,
   });
 
   if (!showNotification) {

From 35f89ad6e1025d17124e644abae7e72895166c79 Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Wed, 30 Jul 2025 01:00:51 -0400
Subject: [PATCH 26/31] - remove onclick from icon element

---
 web/src/lib/components/elements/icon.svelte | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/web/src/lib/components/elements/icon.svelte b/web/src/lib/components/elements/icon.svelte
index 9102b23d690c0..4bc55b3247628 100644
--- a/web/src/lib/components/elements/icon.svelte
+++ b/web/src/lib/components/elements/icon.svelte
@@ -17,7 +17,6 @@
     strokeWidth?: number;
     strokeColor?: string;
     spin?: boolean;
-    onClick?: (e?: MouseEvent) => void;
   }
 
   let {
@@ -36,7 +35,6 @@
     strokeWidth = 0,
     strokeColor = 'currentColor',
     spin = false,
-    onClick = undefined,
   }: Props = $props();
 </script>
 
@@ -51,7 +49,6 @@
   aria-label={ariaLabel}
   aria-hidden={ariaHidden}
   aria-labelledby={ariaLabelledby}
-  onclick={onClick}
 >
   {#if title}
     <title>{title}</title>

From eeec4a544d7600817b132af633451293de02f74a Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Wed, 30 Jul 2025 01:07:35 -0400
Subject: [PATCH 27/31] - fix double onClose call with keyboard shortcuts

---
 web/src/lib/modals/AlbumPickerModal.svelte | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/src/lib/modals/AlbumPickerModal.svelte b/web/src/lib/modals/AlbumPickerModal.svelte
index 58d46651275bd..1e63b70f793a6 100644
--- a/web/src/lib/modals/AlbumPickerModal.svelte
+++ b/web/src/lib/modals/AlbumPickerModal.svelte
@@ -96,6 +96,7 @@
       case AlbumModalRowType.ALBUM_ITEM: {
         if (multiSelectActive) {
           handleMultiSubmit();
+          break;
         }
         if (item.album) {
           onClose([item.album]);

From db71e108c621d8632cbe32853120012add50db58 Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Sat, 9 Aug 2025 20:28:54 -0400
Subject: [PATCH 28/31] - spelling and formatting - apply new api permission

---
 open-api/immich-openapi-specs.json                          | 4 +++-
 server/src/controllers/album.controller.ts                  | 2 +-
 server/src/services/album.service.ts                        | 6 +++---
 .../lib/components/photos-page/actions/add-to-album.svelte  | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index d8dde20619d5d..e16f6db1c40f1 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -996,7 +996,9 @@
         ],
         "tags": [
           "Albums"
-        ]
+        ],
+        "x-immich-permission": "albumAsset.create",
+        "description": "This endpoint requires the `albumAsset.create` permission."
       }
     },
     "/albums/statistics": {
diff --git a/server/src/controllers/album.controller.ts b/server/src/controllers/album.controller.ts
index e83b4256cec3c..47f8b5603aecb 100644
--- a/server/src/controllers/album.controller.ts
+++ b/server/src/controllers/album.controller.ts
@@ -80,7 +80,7 @@ export class AlbumController {
   }
 
   @Put('assets')
-  @Authenticated({ sharedLink: true })
+  @Authenticated({ permission: Permission.AlbumAssetCreate, sharedLink: true })
   addAssetsToAlbums(@Auth() auth: AuthDto, @Body() dto: AlbumsAddAssetsDto): Promise<AlbumsAddAssetsResponseDto> {
     return this.service.addAssetsToAlbums(auth, dto);
   }
diff --git a/server/src/services/album.service.ts b/server/src/services/album.service.ts
index 2b33ef4c81968..32832f0dd36e2 100644
--- a/server/src/services/album.service.ts
+++ b/server/src/services/album.service.ts
@@ -195,7 +195,7 @@ export class AlbumService extends BaseService {
       assetSuccessCount: 0,
       error: BulkIdErrorReason.DUPLICATE,
     };
-    const successFulAssetIds: Set<string> = new Set();
+    const successfulAssetIds: Set<string> = new Set();
     for (const albumId of dto.albumIds) {
       try {
         const albumResults = await this.addAssets(auth, albumId, { ids: dto.assetIds });
@@ -206,7 +206,7 @@ export class AlbumService extends BaseService {
             success = true;
             results.success = true;
             results.error = undefined;
-            successFulAssetIds.add(res.id);
+            successfulAssetIds.add(res.id);
           } else if (results.error && res.error !== BulkIdErrorReason.DUPLICATE) {
             results.error = BulkIdErrorReason.UNKNOWN;
           }
@@ -220,7 +220,7 @@ export class AlbumService extends BaseService {
         }
       }
     }
-    results.assetSuccessCount = successFulAssetIds.size;
+    results.assetSuccessCount = successfulAssetIds.size;
 
     return results;
   }
diff --git a/web/src/lib/components/photos-page/actions/add-to-album.svelte b/web/src/lib/components/photos-page/actions/add-to-album.svelte
index 8095f22376579..13a26cd1378da 100644
--- a/web/src/lib/components/photos-page/actions/add-to-album.svelte
+++ b/web/src/lib/components/photos-page/actions/add-to-album.svelte
@@ -30,7 +30,7 @@
       onAddToAlbum(assetIds, album.id);
     } else {
       await addAssetsToAlbums(
-        albums.map((a) => a.id),
+        albums.map(({ id }) => id),
         assetIds,
       );
       onAddToAlbum(assetIds, albums[0].id);

From c772a2aaa2d692b833e589661d213704d81272a3 Mon Sep 17 00:00:00 2001
From: CJPeckover <cjpeckover@hotmail.ca>
Date: Sat, 9 Aug 2025 20:29:50 -0400
Subject: [PATCH 29/31] - open-api

---
 mobile/openapi/README.md                    |  3 +-
 mobile/openapi/lib/api.dart                 |  1 +
 mobile/openapi/lib/api/albums_api.dart      | 82 ++++++++++++++++++---
 open-api/typescript-sdk/src/fetch-client.ts |  3 +
 4 files changed, 76 insertions(+), 13 deletions(-)

diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index 07247873705d8..02347d17f0f2e 100644
--- 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.136.0
+- API version: 1.137.3
 - Generator version: 7.8.0
 - Build package: org.openapitools.codegen.languages.DartClientCodegen
 
@@ -109,6 +109,7 @@ Class | Method | HTTP request | Description
 *AssetsApi* | [**updateAssets**](doc//AssetsApi.md#updateassets) | **PUT** /assets | 
 *AssetsApi* | [**uploadAsset**](doc//AssetsApi.md#uploadasset) | **POST** /assets | 
 *AssetsApi* | [**viewAsset**](doc//AssetsApi.md#viewasset) | **GET** /assets/{id}/thumbnail | 
+*AuthAdminApi* | [**unlinkAllOAuthAccountsAdmin**](doc//AuthAdminApi.md#unlinkalloauthaccountsadmin) | **POST** /admin/auth/unlink-all | 
 *AuthenticationApi* | [**changePassword**](doc//AuthenticationApi.md#changepassword) | **POST** /auth/change-password | 
 *AuthenticationApi* | [**changePinCode**](doc//AuthenticationApi.md#changepincode) | **PUT** /auth/pin-code | 
 *AuthenticationApi* | [**getAuthStatus**](doc//AuthenticationApi.md#getauthstatus) | **GET** /auth/status | 
diff --git a/mobile/openapi/lib/api.dart b/mobile/openapi/lib/api.dart
index 305479e87e373..f5f353c968ebb 100644
--- a/mobile/openapi/lib/api.dart
+++ b/mobile/openapi/lib/api.dart
@@ -34,6 +34,7 @@ part 'api/api_keys_api.dart';
 part 'api/activities_api.dart';
 part 'api/albums_api.dart';
 part 'api/assets_api.dart';
+part 'api/auth_admin_api.dart';
 part 'api/authentication_api.dart';
 part 'api/deprecated_api.dart';
 part 'api/download_api.dart';
diff --git a/mobile/openapi/lib/api/albums_api.dart b/mobile/openapi/lib/api/albums_api.dart
index e37b9feb2130c..a45083669c402 100644
--- a/mobile/openapi/lib/api/albums_api.dart
+++ b/mobile/openapi/lib/api/albums_api.dart
@@ -16,7 +16,10 @@ class AlbumsApi {
 
   final ApiClient apiClient;
 
-  /// Performs an HTTP 'PUT /albums/{id}/assets' operation and returns the [Response].
+  /// This endpoint requires the `albumAsset.create` permission.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
   /// * [String] id (required):
@@ -59,6 +62,8 @@ class AlbumsApi {
     );
   }
 
+  /// This endpoint requires the `albumAsset.create` permission.
+  ///
   /// Parameters:
   ///
   /// * [String] id (required):
@@ -86,7 +91,10 @@ class AlbumsApi {
     return null;
   }
 
-  /// Performs an HTTP 'PUT /albums/assets' operation and returns the [Response].
+  /// This endpoint requires the `albumAsset.create` permission.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
   /// * [AlbumsAddAssetsDto] albumsAddAssetsDto (required):
@@ -126,6 +134,8 @@ class AlbumsApi {
     );
   }
 
+  /// This endpoint requires the `albumAsset.create` permission.
+  ///
   /// Parameters:
   ///
   /// * [AlbumsAddAssetsDto] albumsAddAssetsDto (required):
@@ -148,7 +158,10 @@ class AlbumsApi {
     return null;
   }
 
-  /// Performs an HTTP 'PUT /albums/{id}/users' operation and returns the [Response].
+  /// This endpoint requires the `albumUser.create` permission.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
   /// * [String] id (required):
@@ -180,6 +193,8 @@ class AlbumsApi {
     );
   }
 
+  /// This endpoint requires the `albumUser.create` permission.
+  ///
   /// Parameters:
   ///
   /// * [String] id (required):
@@ -200,7 +215,10 @@ class AlbumsApi {
     return null;
   }
 
-  /// Performs an HTTP 'POST /albums' operation and returns the [Response].
+  /// This endpoint requires the `album.create` permission.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
   /// * [CreateAlbumDto] createAlbumDto (required):
@@ -229,6 +247,8 @@ class AlbumsApi {
     );
   }
 
+  /// This endpoint requires the `album.create` permission.
+  ///
   /// Parameters:
   ///
   /// * [CreateAlbumDto] createAlbumDto (required):
@@ -247,7 +267,10 @@ class AlbumsApi {
     return null;
   }
 
-  /// Performs an HTTP 'DELETE /albums/{id}' operation and returns the [Response].
+  /// This endpoint requires the `album.delete` permission.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
   /// * [String] id (required):
@@ -277,6 +300,8 @@ class AlbumsApi {
     );
   }
 
+  /// This endpoint requires the `album.delete` permission.
+  ///
   /// Parameters:
   ///
   /// * [String] id (required):
@@ -287,7 +312,10 @@ class AlbumsApi {
     }
   }
 
-  /// Performs an HTTP 'GET /albums/{id}' operation and returns the [Response].
+  /// This endpoint requires the `album.read` permission.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
   /// * [String] id (required):
@@ -333,6 +361,8 @@ class AlbumsApi {
     );
   }
 
+  /// This endpoint requires the `album.read` permission.
+  ///
   /// Parameters:
   ///
   /// * [String] id (required):
@@ -357,7 +387,9 @@ class AlbumsApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /albums/statistics' operation and returns the [Response].
+  /// This endpoint requires the `album.statistics` permission.
+  ///
+  /// Note: This method returns the HTTP [Response].
   Future<Response> getAlbumStatisticsWithHttpInfo() async {
     // ignore: prefer_const_declarations
     final apiPath = r'/albums/statistics';
@@ -383,6 +415,7 @@ class AlbumsApi {
     );
   }
 
+  /// This endpoint requires the `album.statistics` permission.
   Future<AlbumStatisticsResponseDto?> getAlbumStatistics() async {
     final response = await getAlbumStatisticsWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -398,7 +431,10 @@ class AlbumsApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /albums' operation and returns the [Response].
+  /// This endpoint requires the `album.read` permission.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
   /// * [String] assetId:
@@ -437,6 +473,8 @@ class AlbumsApi {
     );
   }
 
+  /// This endpoint requires the `album.read` permission.
+  ///
   /// Parameters:
   ///
   /// * [String] assetId:
@@ -461,7 +499,10 @@ class AlbumsApi {
     return null;
   }
 
-  /// Performs an HTTP 'DELETE /albums/{id}/assets' operation and returns the [Response].
+  /// This endpoint requires the `albumAsset.delete` permission.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
   /// * [String] id (required):
@@ -493,6 +534,8 @@ class AlbumsApi {
     );
   }
 
+  /// This endpoint requires the `albumAsset.delete` permission.
+  ///
   /// Parameters:
   ///
   /// * [String] id (required):
@@ -516,7 +559,10 @@ class AlbumsApi {
     return null;
   }
 
-  /// Performs an HTTP 'DELETE /albums/{id}/user/{userId}' operation and returns the [Response].
+  /// This endpoint requires the `albumUser.delete` permission.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
   /// * [String] id (required):
@@ -549,6 +595,8 @@ class AlbumsApi {
     );
   }
 
+  /// This endpoint requires the `albumUser.delete` permission.
+  ///
   /// Parameters:
   ///
   /// * [String] id (required):
@@ -561,7 +609,10 @@ class AlbumsApi {
     }
   }
 
-  /// Performs an HTTP 'PATCH /albums/{id}' operation and returns the [Response].
+  /// This endpoint requires the `album.update` permission.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
   /// * [String] id (required):
@@ -593,6 +644,8 @@ class AlbumsApi {
     );
   }
 
+  /// This endpoint requires the `album.update` permission.
+  ///
   /// Parameters:
   ///
   /// * [String] id (required):
@@ -613,7 +666,10 @@ class AlbumsApi {
     return null;
   }
 
-  /// Performs an HTTP 'PUT /albums/{id}/user/{userId}' operation and returns the [Response].
+  /// This endpoint requires the `albumUser.update` permission.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
   /// * [String] id (required):
@@ -648,6 +704,8 @@ class AlbumsApi {
     );
   }
 
+  /// This endpoint requires the `albumUser.update` permission.
+  ///
   /// Parameters:
   ///
   /// * [String] id (required):
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index 0bfe65319513f..730e6f5a4371b 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -1874,6 +1874,9 @@ export function createAlbum({ createAlbumDto }: {
         body: createAlbumDto
     })));
 }
+/**
+ * This endpoint requires the `albumAsset.create` permission.
+ */
 export function addAssetsToAlbums({ key, slug, albumsAddAssetsDto }: {
     key?: string;
     slug?: string;

From 8df87ac2ec53e3a4bffb5820295894c39fe52b31 Mon Sep 17 00:00:00 2001
From: Alex Tran <alex.tran1502@gmail.com>
Date: Mon, 18 Aug 2025 19:15:37 -0500
Subject: [PATCH 30/31] chore: styling

---
 i18n/en.json                                  |  1 +
 .../asset-viewer/album-list-item.svelte       | 60 ++++++++++---------
 .../new-album-list-item.svelte                |  6 +-
 web/src/lib/modals/AlbumPickerModal.svelte    |  4 +-
 4 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index 2e7ad155cceb1..5acdeadce8077 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -30,6 +30,7 @@
   "add_to_album_bottom_sheet_already_exists": "Already in {album}",
   "add_to_album_toggle": "Toggle selection for {album}",
   "add_to_albums": "Add to albums",
+  "add_to_albums_count": "Add to albums ({count})",
   "add_to_shared_album": "Add to shared album",
   "add_url": "Add URL",
   "added_to_archive": "Added to archive",
diff --git a/web/src/lib/components/asset-viewer/album-list-item.svelte b/web/src/lib/components/asset-viewer/album-list-item.svelte
index d3cd16422a5f9..bf2e34b7c9fab 100644
--- a/web/src/lib/components/asset-viewer/album-list-item.svelte
+++ b/web/src/lib/components/asset-viewer/album-list-item.svelte
@@ -115,51 +115,36 @@
   }
 </script>
 
-<div role="group" class="relative flex w-full text-start" onmouseenter={onMouseEnter} onmouseleave={onMouseLeave}>
-  {#if mouseOver || multiSelected}
-    <div class="absolute left-3.5 z-[1] rounded-full">
-      <button
-        type="button"
-        onclick={handleMultiSelectClicked}
-        class="absolute p-2 focus:outline-none"
-        role="checkbox"
-        tabindex={-1}
-        aria-checked={selected}
-      >
-        {#if multiSelected}
-          <div class="rounded-full bg-[#D9DCEF] dark:bg-[#232932]">
-            <Icon path={mdiCheckCircle} size="24" class="text-primary" />
-          </div>
-        {:else}
-          <Icon path={mdiCheckCircle} size="24" class="text-white/80 hover:text-white" />
-        {/if}
-      </button>
-    </div>
-  {/if}
+<div
+  role="group"
+  class={[
+    'relative flex w-full text-start justify-between transition-colors hover:bg-gray-200 dark:hover:bg-gray-700 rounded-xl my-2 hover:cursor-pointer',
+    { 'bg-primary/10 hover:bg-primary/10': multiSelected },
+  ]}
+  onmouseenter={onMouseEnter}
+  onmouseleave={onMouseLeave}
+>
   <button
     type="button"
     onclick={onAlbumClick}
     use:scrollIntoViewIfSelected
-    class="flex w-full gap-4 px-6 py-2 text-start transition-colors hover:bg-gray-200 dark:hover:bg-gray-700 rounded-xl"
+    class="flex gap-4 px-2 py-2 text-start"
     class:bg-gray-200={selected}
     class:dark:bg-gray-700={selected}
     use:longPress={{ onLongPress: () => handleMultiSelectClicked() }}
   >
-    <span class="h-12 w-12 shrink-0 rounded-xl bg-slate-300">
+    <span class="h-16 w-16 shrink-0 rounded-xl bg-slate-300">
       {#if album.albumThumbnailAssetId}
         <img
           src={getAssetThumbnailUrl(album.albumThumbnailAssetId)}
           alt={album.albumName}
-          class={[
-            'h-full w-full rounded-xl object-cover transition-all duration-300 hover:shadow-lg',
-            { 'scale-[0.85]': multiSelected },
-          ]}
+          class={['h-full w-full rounded-xl object-cover transition-all duration-300 hover:shadow-lg']}
           data-testid="album-image"
           draggable="false"
         />
       {/if}
     </span>
-    <span class="flex h-12 flex-col items-start justify-center overflow-hidden">
+    <span class="flex h-full flex-col items-start justify-center overflow-hidden">
       <span class="w-full shrink overflow-hidden text-ellipsis whitespace-nowrap"
         >{albumNameArray[0]}<b>{albumNameArray[1]}</b>{albumNameArray[2]}</span
       >
@@ -168,4 +153,23 @@
       </span>
     </span>
   </button>
+
+  {#if mouseOver || multiSelected}
+    <button
+      type="button"
+      onclick={handleMultiSelectClicked}
+      class="p-3 focus:outline-none hover:cursor-pointer"
+      role="checkbox"
+      tabindex={-1}
+      aria-checked={selected}
+    >
+      {#if multiSelected}
+        <div class="rounded-full">
+          <Icon path={mdiCheckCircle} size="24" class="text-primary" />
+        </div>
+      {:else}
+        <Icon path={mdiCheckCircle} size="24" class="text-gray-300 hover:text-primary/75" />
+      {/if}
+    </button>
+  {/if}
 </div>
diff --git a/web/src/lib/components/shared-components/album-selection/new-album-list-item.svelte b/web/src/lib/components/shared-components/album-selection/new-album-list-item.svelte
index d8be0e2a30d13..a1adc3ef4f9c0 100644
--- a/web/src/lib/components/shared-components/album-selection/new-album-list-item.svelte
+++ b/web/src/lib/components/shared-components/album-selection/new-album-list-item.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-  import type { Action } from 'svelte/action';
-  import { mdiPlus } from '@mdi/js';
-  import { t } from 'svelte-i18n';
   import Icon from '$lib/components/elements/icon.svelte';
   import { SCROLL_PROPERTIES } from '$lib/components/shared-components/album-selection/album-selection-utils';
+  import { mdiPlus } from '@mdi/js';
+  import { t } from 'svelte-i18n';
+  import type { Action } from 'svelte/action';
 
   interface Props {
     searchQuery?: string;
diff --git a/web/src/lib/modals/AlbumPickerModal.svelte b/web/src/lib/modals/AlbumPickerModal.svelte
index 1e63b70f793a6..650d136843a0e 100644
--- a/web/src/lib/modals/AlbumPickerModal.svelte
+++ b/web/src/lib/modals/AlbumPickerModal.svelte
@@ -194,7 +194,9 @@
       {/if}
     </div>
     {#if multiSelectActive}
-      <Button size="small" shape="round" fullWidth onclick={handleMultiSubmit}>{$t('add_to_albums')}</Button>
+      <Button size="small" shape="round" fullWidth onclick={handleMultiSubmit}
+        >{$t('add_to_albums_count', { values: { count: multiSelectedAlbumIds.length } })}</Button
+      >
     {/if}
   </ModalBody>
 </Modal>

From 70a77fbc10436ff931849f8076b1885fc453655f Mon Sep 17 00:00:00 2001
From: Alex Tran <alex.tran1502@gmail.com>
Date: Mon, 18 Aug 2025 19:36:53 -0500
Subject: [PATCH 31/31] translation

---
 i18n/en.json                     | 2 +-
 web/src/lib/utils/asset-utils.ts | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index 5acdeadce8077..3988cfdca7dbc 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -500,7 +500,7 @@
   "assets": "Assets",
   "assets_added_count": "Added {count, plural, one {# asset} other {# assets}}",
   "assets_added_to_album_count": "Added {count, plural, one {# asset} other {# assets}} to the album",
-  "assets_added_to_albums_count": "Added {assetCount} of {assetTotal} assets to {albumCount} of {albumTotal} albums",
+  "assets_added_to_albums_count": "Added {assetTotal} assets to {albumTotal} albums",
   "assets_cannot_be_added_to_album_count": "{count, plural, one {Asset} other {Assets}} cannot be added to the album",
   "assets_cannot_be_added_to_albums": "{count, plural, one {Asset} other {Assets}} cannot be added to any of the albums",
   "assets_count": "{count, plural, one {# asset} other {# assets}}",
diff --git a/web/src/lib/utils/asset-utils.ts b/web/src/lib/utils/asset-utils.ts
index 7a641f7c32aa6..40eb9c9733b54 100644
--- a/web/src/lib/utils/asset-utils.ts
+++ b/web/src/lib/utils/asset-utils.ts
@@ -113,9 +113,7 @@ export const addAssetsToAlbums = async (albumIds: string[], assetIds: string[],
       timeout: 5000,
       message: $t('assets_added_to_albums_count', {
         values: {
-          albumCount: result.albumSuccessCount,
           albumTotal: albumIds.length,
-          assetCount: result.assetSuccessCount,
           assetTotal: assetIds.length,
         },
       }),