diff --git a/runner/src/server/plugins/engine/components/ClientSideFileUploadField.ts b/runner/src/server/plugins/engine/components/ClientSideFileUploadField.ts index 42740ebcb8..ebc9ad7b6a 100644 --- a/runner/src/server/plugins/engine/components/ClientSideFileUploadField.ts +++ b/runner/src/server/plugins/engine/components/ClientSideFileUploadField.ts @@ -128,6 +128,7 @@ export class ClientSideFileUploadField extends FormComponent { ...super.getViewModel(formData, errors), dropzoneConfig: this.options.dropzoneConfig, existingFiles: [], // this is populated afterwards. + pageAndForm: null, // this is also populated afterwards. showNoScriptWarning: this.options.showNoScriptWarning || false, totalOverallFilesize: this.options.totalOverallFilesize, hideTitle: this.options.hideTitle || false, diff --git a/runner/src/server/plugins/engine/components/types.ts b/runner/src/server/plugins/engine/components/types.ts index 45f36a618b..fd7d96a410 100644 --- a/runner/src/server/plugins/engine/components/types.ts +++ b/runner/src/server/plugins/engine/components/types.ts @@ -86,6 +86,7 @@ export type FreeTextFieldViewModel = { export type ClientSideFileUploadFieldViewModel = { dropzoneConfig: object; existingFiles: S3Object[]; + pageAndForm: string; showNoScriptWarning?: boolean; totalOverallFilesize?: number; hideTitle?: boolean; diff --git a/runner/src/server/plugins/engine/pageControllers/PageControllerBase.ts b/runner/src/server/plugins/engine/pageControllers/PageControllerBase.ts index 33dbaf95fb..d2aee73c0f 100644 --- a/runner/src/server/plugins/engine/pageControllers/PageControllerBase.ts +++ b/runner/src/server/plugins/engine/pageControllers/PageControllerBase.ts @@ -467,6 +467,7 @@ export class PageControllerBase { const pageAndForm = currentPath.includes("?") ? currentPath.split("?")[0] : currentPath; + comp.model.pageAndForm = pageAndForm; const folderPath = `${form_session_identifier}${pageAndForm}/${comp.model.id}`; const files = await uploadService.listFilesInBucketFolder( folderPath, diff --git a/runner/src/server/plugins/engine/views/components/clientsidefileuploadfield.html b/runner/src/server/plugins/engine/views/components/clientsidefileuploadfield.html index cc5a4bf32f..d4c7817d4b 100644 --- a/runner/src/server/plugins/engine/views/components/clientsidefileuploadfield.html +++ b/runner/src/server/plugins/engine/views/components/clientsidefileuploadfield.html @@ -158,7 +158,7 @@
+ href="/s3{{component.model.pageAndForm}}/{{component.model.id}}/download-file?filename={{file.Key}}&form_session_identifier={{file.FormSessionId}}"> {{ file.Key }}
diff --git a/version b/version index 911a841fae..9c2db5afca 100644 --- a/version +++ b/version @@ -1 +1 @@ -VERSION=0.1.229 +VERSION=0.1.230