Merge pull request #18824 from jeclrsg/hpcc-32170-zap-dialog-relative…

…-time-param HPCC-32170 ECL Watch v9 fix ZAP dialog relative time param
hpcc-systems · Jun 27, 2024 · ce54645 · ce54645
2 parents 5223d6f + 626baa0
commit ce54645
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/esp/src/src-react/components/forms/ZAPDialog.tsx b/esp/src/src-react/components/forms/ZAPDialog.tsx
@@ -67,7 +67,7 @@ interface ZAPDialogValues {
             StartDate?: string;
             EndDate?: string;
         };
-        RelativeLogTimeRangeBuffer?: string;
+        RelativeTimeRangeBuffer?: string;
         LineLimit?: string;
         LineStartFrom?: string;
         SelectColumnMode?: ColumnMode;
@@ -103,7 +103,7 @@ const defaultValues: ZAPDialogValues = {
             StartDate: "",
             EndDate: "",
         },
-        RelativeLogTimeRangeBuffer: "",
+        RelativeTimeRangeBuffer: "",
         LineLimit: "10000",
         LineStartFrom: "0",
         SelectColumnMode: ColumnMode.DEFAULT,
@@ -464,7 +464,7 @@ export const ZAPDialog: React.FunctionComponent<ZAPDialogProps> = ({
                 rules={{
                     validate: {
                         hasValue: (value, formValues) => {
-                            if (value === "" && formValues.LogFilter.RelativeLogTimeRangeBuffer === "") {
+                            if (value === "" && formValues.LogFilter.RelativeTimeRangeBuffer === "") {
                                 return nlsHPCC.LogFilterTimeRequired;
                             }
                             return true;
@@ -496,14 +496,14 @@ export const ZAPDialog: React.FunctionComponent<ZAPDialogProps> = ({
                 }
             />
             <Controller
-                control={control} name="LogFilter.RelativeLogTimeRangeBuffer"
+                control={control} name="LogFilter.RelativeTimeRangeBuffer"
                 render={({
                     field: { onChange, name: fieldName, value },
                     fieldState: { error }
                 }) => <TextField
                         name={fieldName}
                         onChange={onChange}
-                        label={nlsHPCC.RelativeLogTimeRange}
+                        label={nlsHPCC.RelativeTimeRange}
                         onRenderLabel={(props: CustomLabelProps) => <CustomLabel
                             id={`${fieldName}_Label`}
                             tooltip={nlsHPCC.LogFilterRelativeTimeRangeTooltip}

diff --git a/esp/src/src/nls/hpcc.ts b/esp/src/src/nls/hpcc.ts
@@ -763,7 +763,7 @@ export = {
         Recycling: "Recycling",
         RedBook: "Red Book",
         Refresh: "Refresh",
-        RelativeLogTimeRange: "Relative Log Time Range",
+        RelativeTimeRange: "Relative Time Range",
         ReleaseNotes: "Release Notes",
         Reload: "Reload",
         Remaining: "Remaining",