andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 00:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Scheduler #701 updates to dialog

Browse Source
This commit is contained in:
proddy
2023-03-05 10:08:26 +01:00
parent de59434d95
commit 8ee8998381
2 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
interface/src/project/validators.ts
View File

@@ -85,7 +85,7 @@ export const createSettingsValidator = (settings: Settings) =>
})
});
export const schedulerItemValidation = (schedule: ScheduleItem[], o_id: string) =>
export const schedulerItemValidation = (schedule: ScheduleItem[], scheduleItem: ScheduleItem) =>
new Schema({
name: [
{
@@ -93,7 +93,7 @@ export const schedulerItemValidation = (schedule: ScheduleItem[], o_id: string)
pattern: /^[a-zA-Z0-9_\\.]{1,15}$/,
message: "Must be 1-15 characters: alpha numeric, '_' or '.'"
},
...[uniqueNameValidator(schedule, o_id)]
...[uniqueNameValidator(schedule, scheduleItem.o_name)]
],
cmd: [
{ required: true, message: 'Command is required' },
@@ -101,9 +101,9 @@ export const schedulerItemValidation = (schedule: ScheduleItem[], o_id: string)
]
});
export const uniqueNameValidator = (schedule: ScheduleItem[], o_name: string) => ({
export const uniqueNameValidator = (schedule: ScheduleItem[], o_name?: string) => ({
validator(rule: InternalRuleItem, name: string, callback: (error?: string) => void) {
if (name && o_name !== name && schedule.find((si) => si.name === name)) {
if (name && o_name && o_name !== name && schedule.find((si) => si.name === name)) {
callback('Name already in use');
} else {
callback();