From 67468ea3672f482cb374a274de1896e62e48ddff Mon Sep 17 00:00:00 2001
From: Michel Heusschen <59014050+michelheusschen@users.noreply.github.com>
Date: Sat, 31 Aug 2024 19:24:38 +0200
Subject: [PATCH] fix(web): avoid deleting empty album unexpectedly (#12175)

---
 e2e/src/web/specs/album.e2e-spec.ts           | 25 +++++++++++++++++++
 .../[[assetId=id]]/+page.svelte               |  4 +--
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 e2e/src/web/specs/album.e2e-spec.ts

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);
     }
   });