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-32170 ECL Watch v9 fix ZAP dialog relative time param #18824

Merged
merged 1 commit into from
Jun 27, 2024
Merged

HPCC-32170 ECL Watch v9 fix ZAP dialog relative time param #18824

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
10 changes: 5 additions & 5 deletions esp/src/src-react/components/forms/ZAPDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ interface ZAPDialogValues {
StartDate?: string;
EndDate?: string;
};
RelativeLogTimeRangeBuffer?: string;
RelativeTimeRangeBuffer?: string;
LineLimit?: string;
LineStartFrom?: string;
SelectColumnMode?: ColumnMode;
Expand Down Expand Up @@ -103,7 +103,7 @@ const defaultValues: ZAPDialogValues = {
StartDate: "",
EndDate: "",
},
RelativeLogTimeRangeBuffer: "",
RelativeTimeRangeBuffer: "",
LineLimit: "10000",
LineStartFrom: "0",
SelectColumnMode: ColumnMode.DEFAULT,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion esp/src/src/nls/hpcc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading