diff --git a/modules/ui/src/app/pages/devices/components/device-form/device.validators.ts b/modules/ui/src/app/pages/devices/components/device-form/device.validators.ts index 8ef530bad..cb882743b 100644 --- a/modules/ui/src/app/pages/devices/components/device-form/device.validators.ts +++ b/modules/ui/src/app/pages/devices/components/device-form/device.validators.ts @@ -23,10 +23,10 @@ import { Device } from '../../../../model/device'; */ export class DeviceValidators { static readonly STRING_FORMAT_MAX_LENGTH = 28; + + // Not allowed symbols: <>?/:;@'"][=^!\#$%&*+{}|() readonly STRING_FORMAT_REGEXP = new RegExp( - "^([a-z0-9\\p{L}\\p{M}.',-_ ]{1," + - DeviceValidators.STRING_FORMAT_MAX_LENGTH + - '})$', + '^([^<>?:;@\'\\\\"\\[\\]=^!/,.#$%&*+{}|()]{1,28})$', 'u' ); diff --git a/modules/ui/src/app/pages/devices/components/device-qualification-from/device-qualification-from.component.spec.ts b/modules/ui/src/app/pages/devices/components/device-qualification-from/device-qualification-from.component.spec.ts index c366aec23..51b0c56a6 100644 --- a/modules/ui/src/app/pages/devices/components/device-qualification-from/device-qualification-from.component.spec.ts +++ b/modules/ui/src/app/pages/devices/components/device-qualification-from/device-qualification-from.component.spec.ts @@ -227,6 +227,10 @@ describe('DeviceQualificationFromComponent', () => { [ 'very long value very long value very long value very long value very long value very long value very long value', 'as&@3$', + 'test/', + 'test|', + 'test[', + ':test', ].forEach(value => { const model: HTMLInputElement = compiled.querySelector( '.device-qualification-form-model' @@ -273,6 +277,10 @@ describe('DeviceQualificationFromComponent', () => { [ 'very long value very long value very long value very long value very long value very long value very long value', 'as&@3$', + 'test/', + 'test|', + 'test[', + ':test', ].forEach(value => { const manufacturer: HTMLInputElement = compiled.querySelector( '.device-qualification-form-manufacturer'