External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-03 01:38:50 -03:30
Code Issues Packages Projects Releases Wiki Activity

improve frequency validation performance

Browse Source
This commit is contained in:
Keith J. Grant
2022-09-14 15:33:00 -07:00
parent 16da9b784a
commit 35e9d00beb
2 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
awx/ui/src/components/Schedule/shared/ScheduleForm.js
View File

@@ -412,24 +412,8 @@ function ScheduleForm({
} }
}); });
if (values.exceptionFrequency.length > 0) { if (values.exceptionFrequency.length > 0 && !scheduleHasInstances(values)) {
let rangeToCheck = 1; errors.exceptionFrequency = t`This schedule has no occurrences due to the selected exceptions.`;
values.frequency.forEach((freq) => {
if (NUM_DAYS_PER_FREQUENCY[freq] > rangeToCheck) {
rangeToCheck = NUM_DAYS_PER_FREQUENCY[freq];
}
});
const ruleSet = buildRuleSet(values, true);
const startDate = DateTime.fromISO(values.startDate);
const endDate = startDate.plus({ days: rangeToCheck });
const instances = ruleSet.between(
startDate.toJSDate(),
endDate.toJSDate(),
true
);
if (instances.length === 0) {
errors.exceptionFrequency = t`This schedule has no occurrences due to the selected exceptions.`;
}
} }
return errors; return errors;
@@ -539,3 +523,24 @@ ScheduleForm.defaultProps = {
}; };
export default ScheduleForm; export default ScheduleForm;
function scheduleHasInstances(values) {
let rangeToCheck = 1;
values.frequency.forEach((freq) => {
if (NUM_DAYS_PER_FREQUENCY[freq] > rangeToCheck) {
rangeToCheck = NUM_DAYS_PER_FREQUENCY[freq];
}
});
const ruleSet = buildRuleSet(values, true);
const startDate = DateTime.fromISO(values.startDate);
const endDate = startDate.plus({ days: rangeToCheck });
const instances = ruleSet.between(
startDate.toJSDate(),
endDate.toJSDate(),
true,
(date, i) => i === 0
);
return instances.length > 0;
}

2
awx/ui/src/components/Schedule/shared/ScheduleFormFields.js
View File

@@ -171,7 +171,7 @@ export default function ScheduleFormFields({
> >
<FrequencySelect <FrequencySelect
id="exception-frequency" id="exception-frequency"
onChange={exceptionFrequencyHelper.setValue} onChange={updateFrequency(exceptionFrequencyHelper.setValue)}
value={exceptionFrequency.value} value={exceptionFrequency.value}
placeholderText={ placeholderText={
exceptionFrequency.value.length exceptionFrequency.value.length