Merge remote-tracking branch 'origin/candidate-9.2.x' into candidate-…

…9.4.x Signed-off-by: Jake Smith <[email protected]>
hpcc-systems · Apr 11, 2024 · c32f5da · c32f5da
2 parents e8cd505 + 2635461
commit c32f5da
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/dockerfiles/image.sh b/dockerfiles/image.sh
@@ -311,6 +311,7 @@ incr() {
 install() {
     if [ -d $DEB_FILE ]; then
         MODE=debug
+        create_build_image
         create_platform_core_image $RELEASE_BASE_IMAGE
         finalize_platform_core_image_from_folder $DEB_FILE
     elif [ -f $DEB_FILE ]; then

diff --git a/esp/src/src-react/components/forms/landing-zone/FileListForm.tsx b/esp/src/src-react/components/forms/landing-zone/FileListForm.tsx
@@ -8,12 +8,17 @@ import { TargetDropzoneTextField, TargetFolderTextField, TargetServerTextField }
 import { joinPath } from "src/Utility";
 import nlsHPCC from "src/nlsHPCC";
 import { MessageBox } from "../../../layouts/MessageBox";
+import { debounce } from "../../../util/throttle";
 import * as FormStyles from "./styles";
 
 const logger = scopedLogger("src-react/components/forms/landing-zone/FileListForm.tsx");
 
 const myFileSprayService = new FileSprayService({ baseUrl: "" });
 
+const targetFolderTextChange = debounce((text, directory, onChange) => {
+    onChange(directory + text);
+}, 200);
+
 interface FileListFormValues {
     dropzone: string;
     machines: string;
@@ -61,6 +66,8 @@ export const FileListForm: React.FunctionComponent<FileListFormProps> = ({
 
     const closeForm = React.useCallback(() => {
         setShowForm(false);
+        const uploaderBtn = document.querySelector("#uploaderBtn");
+        uploaderBtn["value"] = null;
     }, [setShowForm]);
 
     const doSubmit = React.useCallback((data) => {
@@ -235,8 +242,11 @@ export const FileListForm: React.FunctionComponent<FileListFormProps> = ({
                         machineOS={os}
                         required={true}
                         placeholder={nlsHPCC.SelectValue}
+                        onInputValueChange={(text) => targetFolderTextChange(text, directory, onChange)}
                         onChange={(evt, option) => {
-                            onChange(option.key);
+                            if (option?.key) {
+                                onChange(option.key);
+                            }
                         }}
                         errorMessage={error && error?.message}
                     />}