From 489972080248cb64040289b269a7088f62c8a0c0 Mon Sep 17 00:00:00 2001
From: tglide <26071571+TGlide@users.noreply.github.com>
Date: Wed, 19 Apr 2023 14:42:14 +0100
Subject: [PATCH 1/4] fix: fix input-file dragged file receiving required error

---
 package-lock.json                       |  8 +++----
 package.json                            |  2 +-
 src/lib/elements/forms/inputFile.svelte | 31 ++++++++++++++++++-------
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 46a8434389..916211d932 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
             "dependencies": {
                 "@analytics/google-analytics": "^1.0.5",
                 "@appwrite.io/console": "0.1.0",
-                "@appwrite.io/pink": "^0.0.6-rc.10",
+                "@appwrite.io/pink": "^0.0.6-rc.11",
                 "@popperjs/core": "^2.11.6",
                 "@sentry/svelte": "^7.44.2",
                 "@sentry/tracing": "^7.44.2",
@@ -156,9 +156,9 @@
             }
         },
         "node_modules/@appwrite.io/pink": {
-            "version": "0.0.6-rc.10",
-            "resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.0.6-rc.10.tgz",
-            "integrity": "sha512-mhpgjQVfQvghItgcCzsHN0Ynn4U9JNg8HlSJ+HVDUi/bNHxmlm7XdNJE6s65LMJ6LfepROn6zZMHquANvGfNDg==",
+            "version": "0.0.6-rc.11",
+            "resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.0.6-rc.11.tgz",
+            "integrity": "sha512-wHuWZM1SbBV7GQymBcBGDgtN5teu2OeMl9vB+IM6Ctg+Jkqjlc8QyO8Ef6Om8EFuSJCEzxCugMQPM0Ohtt/V2g==",
             "dependencies": {
                 "@appwrite.io/pink-icons": "*",
                 "normalize.css": "^8.0.1",
diff --git a/package.json b/package.json
index 0e7ec8d6e1..e544d22c13 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "dependencies": {
         "@analytics/google-analytics": "^1.0.5",
         "@appwrite.io/console": "0.1.0",
-        "@appwrite.io/pink": "^0.0.6-rc.10",
+        "@appwrite.io/pink": "^0.0.6-rc.11",
         "@popperjs/core": "^2.11.6",
         "@sentry/svelte": "^7.44.2",
         "@sentry/tracing": "^7.44.2",
diff --git a/src/lib/elements/forms/inputFile.svelte b/src/lib/elements/forms/inputFile.svelte
index 0c73f3dc27..bdd2da2ed9 100644
--- a/src/lib/elements/forms/inputFile.svelte
+++ b/src/lib/elements/forms/inputFile.svelte
@@ -1,11 +1,12 @@
 <script lang="ts">
     import { Trim } from '$lib/components';
     import { humanFileSize } from '$lib/helpers/sizeConvertion';
+    import { onMount } from 'svelte';
     import { Helper } from '.';
 
     export let label: string = null;
     export let files: FileList;
-    export let list = new DataTransfer();
+
     export let allowedFileExtensions: string[] = [];
     export let maxSize: number = null;
     export let required = false;
@@ -14,16 +15,24 @@
     let input: HTMLInputElement;
     let hovering = false;
 
+    function setFiles(value: FileList) {
+        files = value;
+        input.files = value;
+    }
+
+    function resetFiles() {
+        setFiles(new DataTransfer().files);
+    }
+
     function dropHandler(ev: DragEvent) {
         ev.dataTransfer.dropEffect = 'move';
         hovering = false;
-        if (ev.dataTransfer.items) {
-            for (let i = 0; i < ev.dataTransfer.items.length; i++) {
-                if (ev.dataTransfer.items[i].kind === 'file') {
-                    list.items.clear();
-                    list.items.add(ev.dataTransfer.items[i].getAsFile());
-                    files = list.files;
-                }
+        if (!ev.dataTransfer.items) return;
+        for (let i = 0; i < ev.dataTransfer.items.length; i++) {
+            if (ev.dataTransfer.items[i].kind === 'file') {
+                const dataTransfer = new DataTransfer();
+                dataTransfer.items.add(ev.dataTransfer.items[i].getAsFile());
+                setFiles(dataTransfer.files);
             }
         }
     }
@@ -47,6 +56,10 @@
     }
 
     $: fileArray = files?.length ? Array.from(files) : [];
+
+    onMount(() => {
+        setFiles(files);
+    });
 </script>
 
 <input
@@ -123,7 +136,7 @@
                                 {fileSize.value + fileSize.unit}
                             </span>
                             <button
-                                on:click={() => (files = null)}
+                                on:click={resetFiles}
                                 type="button"
                                 class="button is-text is-only-icon u-margin-inline-start-auto"
                                 aria-label="remove file"

From 0f041dc519f520709bdf34100074e83f1aa5b420 Mon Sep 17 00:00:00 2001
From: tglide <26071571+TGlide@users.noreply.github.com>
Date: Fri, 21 Apr 2023 19:23:14 +0100
Subject: [PATCH 2/4] refactor: show actual bucket id on copy output

---
 .../project-[project]/storage/bucket-[bucket]/header.svelte     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/header.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/header.svelte
index 0422235be4..b792328d0e 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/header.svelte
+++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/header.svelte
@@ -34,7 +34,7 @@
         <CoverTitle href={`/console/project-${projectId}/storage`}>
             {$bucket?.name}
         </CoverTitle>
-        <Id value={$bucket?.$id} event="bucket">Bucket ID</Id>
+        <Id value={$bucket?.$id} event="bucket">{$bucket?.$id ?? 'Bucket ID'}</Id>
     </svelte:fragment>
 
     <Tabs>

From 07a8c31e66bf17107e92769e3170cab3a403047b Mon Sep 17 00:00:00 2001
From: tglide <26071571+TGlide@users.noreply.github.com>
Date: Fri, 21 Apr 2023 19:38:44 +0100
Subject: [PATCH 3/4] feat: client side validation for file ext

---
 src/lib/elements/forms/inputFile.svelte | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/lib/elements/forms/inputFile.svelte b/src/lib/elements/forms/inputFile.svelte
index bdd2da2ed9..e85d755e21 100644
--- a/src/lib/elements/forms/inputFile.svelte
+++ b/src/lib/elements/forms/inputFile.svelte
@@ -16,6 +16,17 @@
     let hovering = false;
 
     function setFiles(value: FileList) {
+        if (!value) return;
+
+        const hasInvalidExt = Array.from(value).some((file) => {
+            const fileExtension = file.name.split('.').pop();
+            return !allowedFileExtensions.includes(fileExtension);
+        });
+        if (hasInvalidExt) {
+            error = 'Invalid file extension';
+            return;
+        }
+
         files = value;
         input.files = value;
     }
@@ -60,10 +71,15 @@
     onMount(() => {
         setFiles(files);
     });
+
+    const handleChange = (event: Event) => {
+        const target = event.currentTarget as HTMLInputElement;
+        setFiles(target.files);
+    };
 </script>
 
 <input
-    bind:files
+    on:change={handleChange}
     bind:this={input}
     accept={allowedFileExtensions.map((n) => `.${n}`).join(',')}
     type="file"
@@ -136,7 +152,7 @@
                                 {fileSize.value + fileSize.unit}
                             </span>
                             <button
-                                on:click={resetFiles}
+                                on:click|preventDefault={resetFiles}
                                 type="button"
                                 class="button is-text is-only-icon u-margin-inline-start-auto"
                                 aria-label="remove file"

From 19e7b4712ee9e77355b5341c679bde60e10cc8d5 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Tue, 8 Aug 2023 15:49:58 +0000
Subject: [PATCH 4/4] chore: update dependencies

---
 package-lock.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index 0a3dc10828..1532ae5d61 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
                 "@analytics/google-analytics": "^1.0.5",
                 "@analytics/google-tag-manager": "^0.5.3",
                 "@appwrite.io/console": "0.2.0",
-                "@appwrite.io/pink": "^0.0.6-rc.10",
+                "@appwrite.io/pink": "^0.0.6-rc.14",
                 "@popperjs/core": "^2.11.6",
                 "@sentry/svelte": "^7.44.2",
                 "@sentry/tracing": "^7.44.2",