feat: recurring for quick add magic (#1105)
Co-authored-by: kolaente <k@knt.li> Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/1105 Reviewed-by: Dominik Pschenitschni <dpschen@noreply.kolaente.de> Co-authored-by: konrad <k@knt.li> Co-committed-by: konrad <k@knt.li>
This commit is contained in:
@ -7,14 +7,14 @@ describe('Parse Task Text', () => {
|
||||
it('should return text with no intents as is', () => {
|
||||
expect(parseTaskText('Lorem Ipsum').text).toBe('Lorem Ipsum')
|
||||
})
|
||||
|
||||
|
||||
it('should not parse text when disabled', () => {
|
||||
const text = 'Lorem Ipsum today *label +list !2 @user'
|
||||
const result = parseTaskText(text, 'disabled')
|
||||
|
||||
|
||||
expect(result.text).toBe(text)
|
||||
})
|
||||
|
||||
|
||||
it('should parse text in todoist mode when configured', () => {
|
||||
const result = parseTaskText('Lorem Ipsum today @label #list !2 +user', 'todoist')
|
||||
|
||||
@ -510,4 +510,54 @@ describe('Parse Task Text', () => {
|
||||
expect(result.assignees[0]).toBe('user with long name')
|
||||
})
|
||||
})
|
||||
|
||||
describe('Recurring Dates', () => {
|
||||
const cases = {
|
||||
'every 1 hour': {type: 'hours', amount: 1},
|
||||
'every hour': {type: 'hours', amount: 1},
|
||||
'every 5 hours': {type: 'hours', amount: 5},
|
||||
'every 12 hours': {type: 'hours', amount: 12},
|
||||
'every day': {type: 'days', amount: 1},
|
||||
'every 1 day': {type: 'days', amount: 1},
|
||||
'every 2 days': {type: 'days', amount: 2},
|
||||
'every week': {type: 'weeks', amount: 1},
|
||||
'every 1 week': {type: 'weeks', amount: 1},
|
||||
'every 3 weeks': {type: 'weeks', amount: 3},
|
||||
'every month': {type: 'months', amount: 1},
|
||||
'every 1 month': {type: 'months', amount: 1},
|
||||
'every 2 months': {type: 'months', amount: 2},
|
||||
'every year': {type: 'years', amount: 1},
|
||||
'every 1 year': {type: 'years', amount: 1},
|
||||
'every 4 years': {type: 'years', amount: 4},
|
||||
'anually': {type: 'years', amount: 1},
|
||||
'bianually': {type: 'months', amount: 6},
|
||||
'semiannually': {type: 'months', amount: 6},
|
||||
'biennially': {type: 'years', amount: 2},
|
||||
'daily': {type: 'days', amount: 1},
|
||||
'hourly': {type: 'hours', amount: 1},
|
||||
'monthly': {type: 'months', amount: 1},
|
||||
'weekly': {type: 'weeks', amount: 1},
|
||||
'yearly': {type: 'years', amount: 1},
|
||||
'every one hour': {type: 'hours', amount: 1}, // maybe unnesecary but better to include it for completeness sake
|
||||
'every two hours': {type: 'hours', amount: 2},
|
||||
'every three hours': {type: 'hours', amount: 3},
|
||||
'every four hours': {type: 'hours', amount: 4},
|
||||
'every five hours': {type: 'hours', amount: 5},
|
||||
'every six hours': {type: 'hours', amount: 6},
|
||||
'every seven hours': {type: 'hours', amount: 7},
|
||||
'every eight hours': {type: 'hours', amount: 8},
|
||||
'every nine hours': {type: 'hours', amount: 9},
|
||||
'every ten hours': {type: 'hours', amount: 10},
|
||||
}
|
||||
|
||||
for (const c in cases) {
|
||||
it(`should parse ${c} as recurring date every ${cases[c].amount} ${cases[c].type}`, () => {
|
||||
const result = parseTaskText(`Lorem Ipsum ${c}`)
|
||||
|
||||
expect(result.text).toBe('Lorem Ipsum')
|
||||
expect(result.repeats.type).toBe(cases[c].type)
|
||||
expect(result.repeats.amount).toBe(cases[c].amount)
|
||||
})
|
||||
}
|
||||
})
|
||||
})
|
||||
|
@ -38,6 +38,24 @@ interface Priorites {
|
||||
DO_NOW: number,
|
||||
}
|
||||
|
||||
enum RepeatType {
|
||||
Hours = 'hours',
|
||||
Days = 'days',
|
||||
Weeks = 'weeks',
|
||||
Months = 'months',
|
||||
Years = 'years',
|
||||
}
|
||||
|
||||
interface Repeats {
|
||||
type: RepeatType,
|
||||
amount: number,
|
||||
}
|
||||
|
||||
interface repeatParsedResult {
|
||||
textWithoutMatched: string,
|
||||
repeats: Repeats | null,
|
||||
}
|
||||
|
||||
interface ParsedTaskText {
|
||||
text: string,
|
||||
date: Date | null,
|
||||
@ -45,6 +63,7 @@ interface ParsedTaskText {
|
||||
list: string | null,
|
||||
priority: number | null,
|
||||
assignees: string[],
|
||||
repeats: Repeats | null,
|
||||
}
|
||||
|
||||
interface Prefixes {
|
||||
@ -67,6 +86,7 @@ export const parseTaskText = (text: string, prefixesMode: PrefixMode = PrefixMod
|
||||
list: null,
|
||||
priority: null,
|
||||
assignees: [],
|
||||
repeats: null,
|
||||
}
|
||||
|
||||
const prefixes = PREFIXES[prefixesMode]
|
||||
@ -83,7 +103,11 @@ export const parseTaskText = (text: string, prefixesMode: PrefixMode = PrefixMod
|
||||
|
||||
result.assignees = getItemsFromPrefix(text, prefixes.assignee)
|
||||
|
||||
const {newText, date} = parseDate(text)
|
||||
const {textWithoutMatched, repeats} = getRepeats(text)
|
||||
result.text = textWithoutMatched
|
||||
result.repeats = repeats
|
||||
|
||||
const {newText, date} = parseDate(result.text)
|
||||
result.text = newText
|
||||
result.date = date
|
||||
|
||||
@ -132,6 +156,113 @@ const getPriority = (text: string, prefix: string): number | null => {
|
||||
return null
|
||||
}
|
||||
|
||||
const getRepeats = (text: string): repeatParsedResult => {
|
||||
const regex = /((every|each) (([0-9]+|one|two|three|four|five|six|seven|eight|nine|ten) )?(hours?|days?|weeks?|months?|years?))|anually|bianually|semiannually|biennially|daily|hourly|monthly|weekly|yearly/ig
|
||||
const results = regex.exec(text)
|
||||
if (results === null) {
|
||||
return {
|
||||
textWithoutMatched: text,
|
||||
repeats: null,
|
||||
}
|
||||
}
|
||||
|
||||
let amount = 1
|
||||
switch (results[3] ? results[3].trim() : undefined) {
|
||||
case 'one':
|
||||
amount = 1
|
||||
break
|
||||
case 'two':
|
||||
amount = 2
|
||||
break
|
||||
case 'three':
|
||||
amount = 3
|
||||
break
|
||||
case 'four':
|
||||
amount = 4
|
||||
break
|
||||
case 'five':
|
||||
amount = 5
|
||||
break
|
||||
case 'six':
|
||||
amount = 6
|
||||
break
|
||||
case 'seven':
|
||||
amount = 7
|
||||
break
|
||||
case 'eight':
|
||||
amount = 8
|
||||
break
|
||||
case 'nine':
|
||||
amount = 9
|
||||
break
|
||||
case 'ten':
|
||||
amount = 10
|
||||
break
|
||||
default:
|
||||
amount = results[3] ? parseInt(results[3]) : 1
|
||||
}
|
||||
let type: RepeatType = RepeatType.Hours
|
||||
|
||||
switch (results[0]) {
|
||||
case 'biennially':
|
||||
type = RepeatType.Years
|
||||
amount = 2
|
||||
break
|
||||
case 'bianually':
|
||||
case 'semiannually':
|
||||
type = RepeatType.Months
|
||||
amount = 6
|
||||
break
|
||||
case 'yearly':
|
||||
case 'anually':
|
||||
type = RepeatType.Years
|
||||
break
|
||||
case 'daily':
|
||||
type = RepeatType.Days
|
||||
break
|
||||
case 'hourly':
|
||||
type = RepeatType.Hours
|
||||
break
|
||||
case 'monthly':
|
||||
type = RepeatType.Months
|
||||
break
|
||||
case 'weekly':
|
||||
type = RepeatType.Weeks
|
||||
break
|
||||
default:
|
||||
switch (results[5]) {
|
||||
case 'hour':
|
||||
case 'hours':
|
||||
type = RepeatType.Hours
|
||||
break
|
||||
case 'day':
|
||||
case 'days':
|
||||
type = RepeatType.Days
|
||||
break
|
||||
case 'week':
|
||||
case 'weeks':
|
||||
type = RepeatType.Weeks
|
||||
break
|
||||
case 'month':
|
||||
case 'months':
|
||||
type = RepeatType.Months
|
||||
break
|
||||
case 'year':
|
||||
case 'years':
|
||||
type = RepeatType.Years
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
textWithoutMatched: text.replace(results[0], ''),
|
||||
repeats: {
|
||||
amount,
|
||||
type,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
const cleanupItemText = (text: string, items: string[], prefix: string): string => {
|
||||
items.forEach(l => {
|
||||
text = text
|
||||
|
Reference in New Issue
Block a user