From 817f42aef7c7a659669935909d3ca45c2c516229 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Tue, 20 Aug 2024 09:25:26 -0400
Subject: [PATCH 1/2] fix(web): upload on file paste (#11922)

---
 .../drag-and-drop-upload-overlay.svelte       | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/web/src/lib/components/shared-components/drag-and-drop-upload-overlay.svelte b/web/src/lib/components/shared-components/drag-and-drop-upload-overlay.svelte
index 935c63500d0e1..e84d2d66f08f2 100644
--- a/web/src/lib/components/shared-components/drag-and-drop-upload-overlay.svelte
+++ b/web/src/lib/components/shared-components/drag-and-drop-upload-overlay.svelte
@@ -40,11 +40,23 @@
       return handleFiles(dataTransfer.files);
     }
 
-    const transferEntries = Array.from(dataTransfer.items)
-      .map((i: DataTransferItem) => i.webkitGetAsEntry())
-      .filter((i) => i !== null);
-    const files = await getAllFilesFromTransferEntries(transferEntries);
-    return handleFiles(files);
+    const entries: FileSystemEntry[] = [];
+    const files: File[] = [];
+    for (const item of dataTransfer.items) {
+      const entry = item.webkitGetAsEntry();
+      if (entry) {
+        entries.push(entry);
+        continue;
+      }
+
+      const file = item.getAsFile();
+      if (file) {
+        files.push(file);
+      }
+    }
+
+    const directoryFiles = await getAllFilesFromTransferEntries(entries);
+    return handleFiles([...files, ...directoryFiles]);
   };
 
   const browserSupportsDirectoryUpload = () => typeof DataTransferItem.prototype.webkitGetAsEntry === 'function';

From fd225e7462b357fcb4cf4a7a9de72f0d8523727b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 20 Aug 2024 11:34:43 -0500
Subject: [PATCH 2/2] chore(deps): update ghcr.io/immich-app/base-server-dev
 docker tag to v20240820 (#11941)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 server/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/Dockerfile b/server/Dockerfile
index fe1a07bf923d6..45c68e65e0b94 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,5 +1,5 @@
 # dev build
-FROM ghcr.io/immich-app/base-server-dev:20240813@sha256:2e204a2256c088c9e4a0cf34cc9f70f9196c05e8744004000e7d2889466fc735 AS dev
+FROM ghcr.io/immich-app/base-server-dev:20240820@sha256:a28296b40c1247e539894ac4013e6a3e20588d5aefe697fe2ada15f1bd23f6e5 AS dev
 
 RUN apt-get install --no-install-recommends -yqq tini
 WORKDIR /usr/src/app