Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HPCC-30223 ECL Watch file import form label changes #17994

Merged
merged 1 commit into from
Nov 9, 2023
Merged

HPCC-30223 ECL Watch file import form label changes #17994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions esp/src/eclwatch/LZBrowseWidget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor: would probably filter the array to remove !selectId and then forEach.

const label = selectId ? document.querySelector("[for='" + selectId + "']") : null;
if (label) {
label.innerText = this.i18n.TargetPlane + ":";
}
});
}
},

checkReplicate: function (value, checkBoxValue) {
Expand Down
2 changes: 1 addition & 1 deletion esp/src/src-react/components/forms/landing-zone/BlobImportForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion esp/src/src-react/components/forms/landing-zone/DelimitedImportForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion esp/src/src-react/components/forms/landing-zone/FixedImportForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion esp/src/src-react/components/forms/landing-zone/JsonImportForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion esp/src/src-react/components/forms/landing-zone/VariableImportForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion esp/src/src-react/components/forms/landing-zone/XmlImportForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
1 change: 1 addition & 0 deletions esp/src/src/nls/hpcc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading