Merge pull request #17994 from jeclrsg/hpcc-30223-import-form-group-l…

…abels HPCC-30223 ECL Watch file import form label changes
hpcc-systems · Nov 9, 2023 · c30676d · c30676d
2 parents 531e746 + 2543ff6
commit c30676d
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 6 deletions.
diff --git a/esp/src/eclwatch/LZBrowseWidget.js b/esp/src/eclwatch/LZBrowseWidget.js
@@ -643,6 +643,23 @@ define([
             });
 
             this.checkReplicate();
+
+            if (dojoConfig.isContainer) {
+                const groupSelectIds = [
+                    context.sprayFixedDestinationSelect.id ?? "",
+                    context.sprayDelimitedDestinationSelect.id ?? "",
+                    context.sprayXmlDestinationSelect.id ?? "",
+                    context.sprayJsonDestinationSelect.id ?? "",
+                    context.sprayVariableDestinationSelect.id ?? "",
+                    context.sprayBlobDestinationSelect.id ?? ""
+                ];
+                groupSelectIds.forEach(selectId => {
+                    const label = selectId ? document.querySelector("[for='" + selectId + "']") : null;
+                    if (label) {
+                        label.innerText = this.i18n.TargetPlane + ":";
+                    }
+                });
+            }
         },
 
         checkReplicate: function (value, checkBoxValue) {

diff --git a/esp/src/src-react/components/forms/landing-zone/BlobImportForm.tsx b/esp/src/src-react/components/forms/landing-zone/BlobImportForm.tsx
@@ -165,7 +165,7 @@ export const BlobImportForm: React.FunctionComponent<BlobImportFormProps> = ({
                     fieldState: { error }
                 }) => <TargetGroupTextField
                         key="destGroup"
-                        label={nlsHPCC.Group}
+                        label={isContainer ? nlsHPCC.TargetPlane : nlsHPCC.Group}
                         required={true}
                         selectedKey={value}
                         placeholder={nlsHPCC.SelectValue}

diff --git a/esp/src/src-react/components/forms/landing-zone/DelimitedImportForm.tsx b/esp/src/src-react/components/forms/landing-zone/DelimitedImportForm.tsx
@@ -187,7 +187,7 @@ export const DelimitedImportForm: React.FunctionComponent<DelimitedImportFormPro
                     fieldState: { error }
                 }) => <TargetGroupTextField
                         key="destGroup"
-                        label={nlsHPCC.Group}
+                        label={isContainer ? nlsHPCC.TargetPlane : nlsHPCC.Group}
                         required={true}
                         selectedKey={value}
                         placeholder={nlsHPCC.SelectValue}

diff --git a/esp/src/src-react/components/forms/landing-zone/FixedImportForm.tsx b/esp/src/src-react/components/forms/landing-zone/FixedImportForm.tsx
@@ -172,7 +172,7 @@ export const FixedImportForm: React.FunctionComponent<FixedImportFormProps> = ({
                     fieldState: { error }
                 }) => <TargetGroupTextField
                         key="destGroup"
-                        label={nlsHPCC.Group}
+                        label={isContainer ? nlsHPCC.TargetPlane : nlsHPCC.Group}
                         required={true}
                         selectedKey={value}
                         placeholder={nlsHPCC.SelectValue}

diff --git a/esp/src/src-react/components/forms/landing-zone/JsonImportForm.tsx b/esp/src/src-react/components/forms/landing-zone/JsonImportForm.tsx
@@ -176,7 +176,7 @@ export const JsonImportForm: React.FunctionComponent<JsonImportFormProps> = ({
                     fieldState: { error }
                 }) => <TargetGroupTextField
                         key="destGroup"
-                        label={nlsHPCC.Group}
+                        label={isContainer ? nlsHPCC.TargetPlane : nlsHPCC.Group}
                         required={true}
                         selectedKey={value}
                         placeholder={nlsHPCC.SelectValue}

diff --git a/esp/src/src-react/components/forms/landing-zone/VariableImportForm.tsx b/esp/src/src-react/components/forms/landing-zone/VariableImportForm.tsx
@@ -167,7 +167,7 @@ export const VariableImportForm: React.FunctionComponent<VariableImportFormProps
                     fieldState: { error }
                 }) => <TargetGroupTextField
                         key="destGroup"
-                        label={nlsHPCC.Group}
+                        label={isContainer ? nlsHPCC.TargetPlane : nlsHPCC.Group}
                         required={true}
                         selectedKey={value}
                         placeholder={nlsHPCC.SelectValue}

diff --git a/esp/src/src-react/components/forms/landing-zone/XmlImportForm.tsx b/esp/src/src-react/components/forms/landing-zone/XmlImportForm.tsx
@@ -175,7 +175,7 @@ export const XmlImportForm: React.FunctionComponent<XmlImportFormProps> = ({
                     fieldState: { error }
                 }) => <TargetGroupTextField
                         key="destGroup"
-                        label={nlsHPCC.Group}
+                        label={isContainer ? nlsHPCC.TargetPlane : nlsHPCC.Group}
                         required={true}
                         selectedKey={value}
                         placeholder={nlsHPCC.SelectValue}

diff --git a/esp/src/src/nls/hpcc.ts b/esp/src/src/nls/hpcc.ts
@@ -914,6 +914,7 @@ export = {
         Targets: "Targets",
         TargetClusters: "Target Clusters",
         TargetClustersLegacy: "Target Clusters (legacy)",
+        TargetPlane: "Target Plane",
         TargetName: "Target Name",
         TargetNamePlaceholder: "some::logical::name",
         TargetRowTagRequired: "You must supply a target row tag",