zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-24 08:51:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Validate that start/end datetime creates at least 1 schedule.

Browse Source
This commit is contained in:
Kia Lam
2021-08-19 18:39:05 -04:00
parent c58fef949d
commit da2bf4c510
3 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,13 @@ import {
import FrequencyDetailSubform from './FrequencyDetailSubform';
import SchedulePromptableFields from './SchedulePromptableFields';
import DateTimePicker from './DateTimePicker';
import buildRuleObj from './buildRuleObj';
const NUM_DAYS_PER_FREQUENCY = {
week: 7,
month: 31,
year: 365,
};
const generateRunOnTheDay = (days = []) => {
if (
@@ -555,6 +562,19 @@ function ScheduleForm({
startDate,
} = values;
if (
end === 'onDate' &&
DateTime.fromISO(endDate)
.diff(DateTime.fromISO(startDate), 'days')
.toObject().days < NUM_DAYS_PER_FREQUENCY[frequency]
) {
const rule = new RRule(buildRuleObj(values));
if (rule.all().length === 0) {
errors.startDate = t`Selected date range must have at least 1 schedule occurrence.`;
errors.endDate = t`Selected date range must have at least 1 schedule occurrence.`;
}
}
if (
end === 'onDate' &&
DateTime.fromISO(startDate) >= DateTime.fromISO(endDate)
@@ -569,7 +589,6 @@ function ScheduleForm({
) {
errors.runOn = t`Please select a day number between 1 and 31.`;
}
return errors;
}}
>