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

Scheduler name optional

Browse Source
This commit is contained in:
MichaelDvP
2024-07-08 10:20:13 +02:00
parent 2f66fec748
commit d774591065
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
interface/src/project/SchedulerDialog.tsx
View File

@@ -344,7 +344,7 @@ const SchedulerDialog = ({
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors}
name="name" name="name"
label={LL.NAME(0)} label={LL.NAME(0) + ' (' + LL.OPTIONAL() + ')'}
value={editItem.name} value={editItem.name}
fullWidth fullWidth
margin="normal" margin="normal"

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

@@ -288,6 +288,7 @@ export const uniqueNameValidator = (schedule: ScheduleItem[], o_name?: string) =
) { ) {
if ( if (
(o_name === undefined || o_name !== name) && (o_name === undefined || o_name !== name) &&
name !== '' &&
schedule.find((si) => si.name === name) schedule.find((si) => si.name === name)
) { ) {
callback('Name already in use'); callback('Name already in use');
@@ -303,10 +304,9 @@ export const schedulerItemValidation = (
) => ) =>
new Schema({ new Schema({
name: [ name: [
{ required: true, message: 'Name is required' },
{ {
type: 'string', type: 'string',
pattern: /^[a-zA-Z0-9_\\.]{1,15}$/, pattern: /^[a-zA-Z0-9_\\.]{0,15}$/,
message: "Must be <15 characters: alpha numeric, '_' or '.'" message: "Must be <15 characters: alpha numeric, '_' or '.'"
}, },
...[uniqueNameValidator(schedule, scheduleItem.o_name)] ...[uniqueNameValidator(schedule, scheduleItem.o_name)]