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

[ML] Fixing wizard validation delay #45265

Merged
merged 2 commits into from
Sep 11, 2019
Merged

[ML] Fixing wizard validation delay #45265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5894836
[ML] Fixing wizard validation delay
jgowdyelastic Sep 10, 2019
5860819
changes based on review
jgowdyelastic Sep 11, 2019
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
38 changes: 24 additions & 14 deletions x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_validator/job_validator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export class JobValidator {
private _jobCreator: JobCreatorType;
private _validationSummary: ValidationSummary;
private _lastJobConfig: string;
private _validateTimeout: NodeJS.Timeout;
private _validateTimeout: ReturnType<typeof setTimeout> | null = null;
private _existingJobsAndGroups: ExistingJobsAndGroups;
private _basicValidations: BasicValidations = {
jobId: { valid: true },
Expand All @@ -46,6 +46,7 @@ export class JobValidator {
bucketSpan: { valid: true },
duplicateDetectors: { valid: true },
};
private _validating: boolean = false;

constructor(jobCreator: JobCreatorType, existingJobsAndGroups: ExistingJobsAndGroups) {
this._jobCreator = jobCreator;
Expand All @@ -54,25 +55,30 @@ export class JobValidator {
basic: false,
advanced: false,
};
this._validateTimeout = setTimeout(() => {}, 0);
this._existingJobsAndGroups = existingJobsAndGroups;
}

public validate() {
public validate(callback: () => void) {
this._validating = true;
const formattedJobConfig = this._jobCreator.formattedJobJson;
return new Promise((resolve: () => void) => {
// only validate if the config has changed
if (formattedJobConfig !== this._lastJobConfig) {
// only validate if the config has changed
if (formattedJobConfig !== this._lastJobConfig) {
if (this._validateTimeout !== null) {
// clear any previous on going validation timeouts
clearTimeout(this._validateTimeout);
this._lastJobConfig = formattedJobConfig;
this._validateTimeout = setTimeout(() => {
this._runBasicValidation();
resolve();
}, VALIDATION_DELAY_MS);
} else {
resolve();
}
});
this._lastJobConfig = formattedJobConfig;
this._validateTimeout = setTimeout(() => {
this._runBasicValidation();
this._validating = false;
this._validateTimeout = null;
callback();
}, VALIDATION_DELAY_MS);
} else {
// _validating is still true if there is a previous validation timeout on going.
this._validating = this._validateTimeout !== null;
}
callback();
}

private _resetBasicValidations() {
Expand Down Expand Up @@ -135,4 +141,8 @@ export class JobValidator {
public set advancedValid(valid: boolean) {
this._validationSummary.advanced = valid;
}

public get validating(): boolean {
return this._validating;
}
}
3 changes: 2 additions & 1 deletion ...gacy/plugins/ml/public/jobs/new_job_new/pages/components/job_details_step/job_details.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ export const JobDetailsStep: FC<Props> = ({
const active =
jobValidator.jobId.valid &&
jobValidator.modelMemoryLimit.valid &&
jobValidator.groupIds.valid;
jobValidator.groupIds.valid &&
jobValidator.validating === false;
setNextActive(active);
}, [jobValidatorUpdated]);

Expand Down
3 changes: 2 additions & 1 deletion ...gacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/pick_fields.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ export const PickFieldsStep: FC<StepProps> = ({ setCurrentStep, isCurrentStep })
const active =
jobCreator.detectors.length > 0 &&
jobValidator.bucketSpan.valid &&
jobValidator.duplicateDetectors.valid;
jobValidator.duplicateDetectors.valid &&
jobValidator.validating === false;
setNextActive(active);
}, [jobValidatorUpdated]);

Expand Down
6 changes: 2 additions & 4 deletions x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/wizard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,9 @@ export const Wizard: FC<Props> = ({
);

useEffect(() => {
// IIFE to run the validation. the useEffect callback can't be async
(async () => {
await jobValidator.validate();
jobValidator.validate(() => {
setJobValidatorUpdate(jobValidatorUpdated);
})();
});

// if the job config has changed, reset the highestStep
// compare a stringified config to ensure the configs have actually changed
Expand Down