Skip to content

413365465: (fix) [v2.2.1] add validation to disallow forward slashes or other illegal chars in manufacturer and model fields #1272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OlgaMardvilko merged 3 commits into from
May 6, 2025
Merged

413365465: (fix) [v2.2.1] add validation to disallow forward slashes or other illegal chars in manufacturer and model fields #1272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
473665d
413365465: (fix) [v2.2.1] add validation to disallow forward slashes …
OlgaMardvilko Apr 28, 2025
cc31915
fix error
OlgaMardvilko Apr 28, 2025
561c19a
Merge branch 'dev' into fix/ui/413365465
OlgaMardvilko May 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions modules/ui/src/app/pages/devices/components/device-form/device.validators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
);

Expand Down
8 changes: 8 additions & 0 deletions .../devices/components/device-qualification-from/device-qualification-from.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down