From 11ca14a2d32155e215c0d14d485e2c4048e5c66e Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Fri, 13 Sep 2024 11:52:17 +0200 Subject: [PATCH] fix: add filename to s3 upload --- frontend/src/lib/components/ArgInput.svelte | 3 ++- frontend/src/lib/components/LightweightArgInput.svelte | 3 ++- .../components/apps/components/inputs/AppS3FileInput.svelte | 2 +- .../src/lib/components/common/fileUpload/FileUpload.svelte | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/frontend/src/lib/components/ArgInput.svelte b/frontend/src/lib/components/ArgInput.svelte index 2564fbf595931..ee210a4da0675 100644 --- a/frontend/src/lib/components/ArgInput.svelte +++ b/frontend/src/lib/components/ArgInput.svelte @@ -582,7 +582,8 @@ randomFileKey={true} on:addition={(evt) => { value = { - s3: evt.detail?.path ?? '' + s3: evt.detail?.path ?? '', + filename: evt.detail?.filename ?? '' } }} on:deletion={(evt) => { diff --git a/frontend/src/lib/components/LightweightArgInput.svelte b/frontend/src/lib/components/LightweightArgInput.svelte index d6fb630f8d78f..ed7ea831fe9b3 100644 --- a/frontend/src/lib/components/LightweightArgInput.svelte +++ b/frontend/src/lib/components/LightweightArgInput.svelte @@ -417,7 +417,8 @@ randomFileKey={true} on:addition={(evt) => { value = { - s3: evt.detail?.path ?? '' + s3: evt.detail?.path ?? '', + filename: evt.detail?.filename ?? '' } }} on:deletion={(evt) => { diff --git a/frontend/src/lib/components/apps/components/inputs/AppS3FileInput.svelte b/frontend/src/lib/components/apps/components/inputs/AppS3FileInput.svelte index 694be3166471c..7064449e6a2b9 100644 --- a/frontend/src/lib/components/apps/components/inputs/AppS3FileInput.svelte +++ b/frontend/src/lib/components/apps/components/inputs/AppS3FileInput.svelte @@ -45,7 +45,7 @@ } const outputs = initOutput($worldStore, id, { - result: [] as { path: string }[] | undefined, + result: [] as { path: string; filename: string }[] | undefined, loading: false, jobId: undefined }) diff --git a/frontend/src/lib/components/common/fileUpload/FileUpload.svelte b/frontend/src/lib/components/common/fileUpload/FileUpload.svelte index 078e5922952b3..14228b6b78052 100644 --- a/frontend/src/lib/components/common/fileUpload/FileUpload.svelte +++ b/frontend/src/lib/components/common/fileUpload/FileUpload.svelte @@ -174,7 +174,7 @@ }) return } - dispatch('addition', { path: uploadData.path }) + dispatch('addition', { path: uploadData.path, filename: fileToUpload.name }) sendUserToast('File upload finished!') uploadData.progress = 100