Skip to content

High performance self-hosted photo and video management solution.

fix(web): avoid deleting empty album unexpectedly (#12175)

Michel Heusschen67468ea3672f
diff --git a/e2e/src/web/specs/album.e2e-spec.ts b/e2e/src/web/specs/album.e2e-spec.ts
new file mode 100644
index 0000000000..953c7d00ae
--- /dev/null
+++ b/e2e/src/web/specs/album.e2e-spec.ts
@@ -0,0 +1,25 @@
+import { LoginResponseDto } from '@immich/sdk';
+import { test } from '@playwright/test';
+import { utils } from 'src/utils';
+
+test.describe('Album', () => {
+ let admin: LoginResponseDto;
+
+ test.beforeAll(async () => {
+ utils.initSdk();
+ await utils.resetDatabase();
+ admin = await utils.adminSetup();
+ });
+
+ test(`doesn't delete album after canceling add assets`, async ({ context, page }) => {
+ await utils.setAuthCookies(context, admin.accessToken);
+
+ await page.goto('/albums');
+ await page.getByRole('button', { name: 'Create album' }).click();
+ await page.getByRole('button', { name: 'Select photos' }).click();
+ await page.getByRole('button', { name: 'Close' }).click();
+
+ await page.reload();
+ await page.getByRole('button', { name: 'Select photos' }).waitFor();
+ });
+});
diff --git a/web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.svelte
index 0fa325c6f5..46812ff289 100644
--- a/web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -419,8 +419,8 @@
}
};
- onNavigate(async () => {
- if (album.assetCount === 0 && !album.albumName) {
+ onNavigate(async ({ to }) => {
+ if (!isAlbumsRoute(to?.route.id) && album.assetCount === 0 && !album.albumName) {
await deleteAlbum(album);
}
});