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

Bugfix: Checks for slashes in Cron regex to set interval schedule via Cron #1123

Merged
merged 9 commits into from
Nov 18, 2021
Merged

Bugfix: Checks for slashes in Cron regex to set interval schedule via Cron #1123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0ae0259
attempt at testing if the cron string contains a /
ThatGalNatalie Nov 10, 2021
104ea65
optional capture group
ThatGalNatalie Nov 11, 2021
96cb4a5
rm comments
ThatGalNatalie Nov 11, 2021
f41b478
modify CRON_DAY_WEEK_REGEX
ThatGalNatalie Nov 11, 2021
0e5111b
modify CRON_MONTH_REGEX
ThatGalNatalie Nov 11, 2021
06d4c82
Merge branch 'master' of https://github.com/PrefectHQ/ui into issue-1093
ThatGalNatalie Nov 11, 2021
0540b6e
attempt to fix NaN when editing a schedule
ThatGalNatalie Nov 12, 2021
e1c44ae
Merge branch 'master' of https://github.com/PrefectHQ/ui into issue-1093
ThatGalNatalie Nov 12, 2021
c351561
Merge branch 'master' into issue-1093
zhen0 Nov 16, 2021
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 src/pages/Flow/Settings/ClockForms/Simple.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,20 +109,20 @@ export default {
this.intervalValue = this.value / 60000000
return
}

const [minute, hour, day, month, dayWeek] = this.value.split(' ')
const [minute, hour, day, month, dayWeek] = this.value
.replace(/\*\//g, '')
.split(' ')

if (hour.includes('*/')) {
this.minuteValue = parseInt(minute)
this.interval = 'hour'
this.intervalValue = parseInt(hour.split('*/')[1])
this.intervalValue = parseInt(hour)
}

if (day.includes('*/')) {
this.interval = 'day'
this.hourValue = parseInt(hour)

this.intervalValue = parseInt(day.split('*/')[1])
this.intervalValue = parseInt(day)
}

if (dayWeek !== '*') {
Expand Down
10 changes: 5 additions & 5 deletions src/utils/regEx.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@ const PARSED_SCHEDULE_REGEX = /([0-9]{1,2}:?[0-9]{0,2})|(?:am|pm|days|day|years|

// [1-5]?[0-9]
// Tests: https://regex101.com/r/e588QW/1
const CRON_MINUTE_REGEX = /(^\*{1})$|(^[1-5]?[0-9](?:[,-/][1-5]?[0-9])*$)/i
const CRON_MINUTE_REGEX = /(^\*{1})$|(^(\*\/)?[1-5]?[0-9](?:[,-/][1-5]?[0-9])*$)/i

// 2[0-3]|1[0-9]|[0-9]
// Tests: https://regex101.com/r/5cbtnj/1
const CRON_HOUR_REGEX = /^(^\*{1})$|(^(2[0-3]|1[0-9]|[0-9])(?:[,-/](2[0-3]|1[0-9]|[0-9]))*$)/i
const CRON_HOUR_REGEX = /^(^\*{1})$|(^(\*\/)?(2[0-3]|1[0-9]|[0-9])(?:[,-/](2[0-3]|1[0-9]|[0-9]))*$)/i

// 3[01]|[12][0-9]|[1-9]
// Tests: https://regex101.com/r/y1auyB/1
const CRON_DAY_MONTH_REGEX = /^(\*{1})$|(^(3[01]|[12][0-9]|[1-9])(?:[,-/](3[01]|[12][0-9]|[1-9]))*$)/i
const CRON_DAY_MONTH_REGEX = /^(\*{1})$|(^(\*\/)?(3[01]|[12][0-9]|[1-9])(?:[,-/](3[01]|[12][0-9]|[1-9]))*$)/i

// 1[0-2]|[1-9]
// Tests: https://regex101.com/r/dPw34Y/1
const CRON_MONTH_REGEX = /^(\*{1})$|(^(1[0-2]|[1-9])(?:[,-/](1[0-2]|[1-9]))*$)|(^(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)(?:[,-/](jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec))*$)/i
const CRON_MONTH_REGEX = /^(\*{1})$|(^(\*\/)?(1[0-2]|[1-9])(?:[,-/](1[0-2]|[1-9]))*$)|(^(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)(?:[,-/](jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec))*$)/i

// [0-6]
// Tests: https://regex101.com/r/G4cbea/1
const CRON_DAY_WEEK_REGEX = /^(\*{1})$|(^([0-6])(?:[,-/#]([0-6]))*$)|(^(sun|mon|tue|wed|thu|fri|sat)(?:[,-/#](sun|mon|tue|wed|thu|fri|sat))*$)/i
const CRON_DAY_WEEK_REGEX = /^(\*{1})$|(^(\*\/)?([0-6])(?:[,-/#]([0-6]))*$)|(^(sun|mon|tue|wed|thu|fri|sat)(?:[,-/#](sun|mon|tue|wed|thu|fri|sat))*$)/i

export {
EMAIL_REGEX,
Expand Down