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

refactor dialog to prevent multiple parent renders

Browse Source
This commit is contained in:
Proddy
2023-04-18 22:04:00 +02:00
parent 8eb7793cd0
commit 6bd744f12e
23 changed files with 622 additions and 501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
import Schema, { InternalRuleItem } from 'async-validator';
import type { InternalRuleItem } from 'async-validator';
import Schema from 'async-validator';
import { IP_OR_HOSTNAME_VALIDATOR } from 'validators/shared';
import { Settings, ScheduleItem, EntityItem } from './types';
import type { Settings, ScheduleItem, EntityItem } from './types';
export const GPIO_VALIDATOR = {
validator(rule: InternalRuleItem, value: number, callback: (error?: string) => void) {
@@ -111,17 +112,7 @@ export const schedulerItemValidation = (schedule: ScheduleItem[], scheduleItem:
]
});
export const uniqueEntityNameValidator = (entities: EntityItem[], o_name?: string) => ({
validator(rule: InternalRuleItem, name: string, callback: (error?: string) => void) {
if (name && o_name && o_name !== name && entities.find((ei) => ei.name === name)) {
callback('Name already in use');
} else {
callback();
}
}
});
export const entityItemValidation = (entities: EntityItem[], entityItem: EntityItem) =>
export const entityItemValidation = (entities: EntityItem[], creating: boolean) =>
new Schema({
name: [
{ required: true, message: 'Name is required' },
@@ -129,8 +120,7 @@ export const entityItemValidation = (entities: EntityItem[], entityItem: EntityI
type: 'string',
pattern: /^[a-zA-Z0-9_\\.]{1,15}$/,
message: "Must be <15 characters: alpha numeric, '_' or '.'"
},
...[uniqueEntityNameValidator(entities, entityItem.o_name)]
}
],
device_id: [{ type: 'hex', required: true, message: 'ID must be a hex value' }]
// type_id: [