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

validate names lowerCase

Browse Source
This commit is contained in:
MichaelDvP
2024-07-15 11:16:42 +02:00
parent 5b143cd22a
commit ce33ec4bd3
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -289,8 +289,8 @@ export const uniqueNameValidator = (schedule: ScheduleItem[], o_name?: string) =
) { ) {
if ( if (
name !== '' && name !== '' &&
(o_name === undefined || o_name !== name) && (o_name === undefined || o_name.toLowerCase() !== name.toLowerCase()) &&
schedule.find((si) => si.name === name) schedule.find((si) => si.name.toLowerCase() === name.toLowerCase())
) { ) {
callback('Name already in use'); callback('Name already in use');
} else { } else {
@@ -333,8 +333,8 @@ export const uniqueCustomNameValidator = (
callback: (error?: string) => void callback: (error?: string) => void
) { ) {
if ( if (
(o_name === undefined || o_name !== name) && (o_name === undefined || o_name.toLowerCase() !== name.toLowerCase()) &&
entity.find((ei) => ei.name === name) entity.find((ei) => ei.name.toLowerCase() === name.toLowerCase())
) { ) {
callback('Name already in use'); callback('Name already in use');
} else { } else {
@@ -390,7 +390,7 @@ export const entityItemValidation = (entity: EntityItem[], entityItem: EntityIte
export const uniqueTemperatureNameValidator = (sensors: TemperatureSensor[]) => ({ export const uniqueTemperatureNameValidator = (sensors: TemperatureSensor[]) => ({
validator(rule: InternalRuleItem, n: string, callback: (error?: string) => void) { validator(rule: InternalRuleItem, n: string, callback: (error?: string) => void) {
if (n !== '' && sensors.find((ts) => ts.n === n)) { if (n !== '' && sensors.find((ts) => ts.n.toLowerCase() === n.toLowerCase())) {
callback('Name already in use'); callback('Name already in use');
} else { } else {
callback(); callback();
@@ -426,7 +426,7 @@ export const isGPIOUniqueValidator = (sensors: AnalogSensor[]) => ({
export const uniqueAnalogNameValidator = (sensors: AnalogSensor[]) => ({ export const uniqueAnalogNameValidator = (sensors: AnalogSensor[]) => ({
validator(rule: InternalRuleItem, n: string, callback: (error?: string) => void) { validator(rule: InternalRuleItem, n: string, callback: (error?: string) => void) {
if (n !== '' && sensors.find((as) => as.n === n)) { if (n !== '' && sensors.find((as) => as.n.toLowerCase() === n.toLowerCase())) {
callback('Name already in use'); callback('Name already in use');
} else { } else {
callback(); callback();