Skip to content

389661817: (feat) change profile name validation #1057

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 1 commit into from
Jan 14, 2025
Merged

389661817: (feat) change profile name validation #1057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions modules/ui/src/app/pages/risk-assessment/profile-form/profile-form.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ describe('ProfileFormComponent', () => {
[
'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',
].forEach(value => {
const name: HTMLInputElement = compiled.querySelector(
'.form-name'
Expand Down
2 changes: 1 addition & 1 deletion modules/ui/src/app/pages/risk-assessment/profile-form/profile-form.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ export class ProfileFormComponent implements OnInit, AfterViewInit {

group['name'] = new FormControl('', [
this.profileValidators.textRequired(),
this.deviceValidators.deviceStringFormat(),
this.profileValidators.profileNameFormat(),
this.nameValidator,
]);

Expand Down
10 changes: 10 additions & 0 deletions modules/ui/src/app/pages/risk-assessment/profile-form/profile.validators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ export class ProfileValidators {

readonly STRING_FORMAT_REGEXP = new RegExp('^[^"\\\\]*$', 'u');

// Not allowed symbols: <>?/:;@'"][=^!\#$%&*+{}|()
readonly PROFILE_NAME_FORMAT_REGEXP = new RegExp(
'^([^<>?:;@\'\\\\"\\[\\]=^!/,.#$%&*+{}|()]{1,28})$',
'u'
);

public differentProfileName(
profiles: Profile[],
profile: Profile | null
Expand Down Expand Up @@ -60,6 +66,10 @@ export class ProfileValidators {
};
}

public profileNameFormat(): ValidatorFn {
return this.stringFormat(this.PROFILE_NAME_FORMAT_REGEXP);
}

public multiSelectRequired(g: FormGroup) {
if (Object.values(g.value).every(value => value === false)) {
return { required: true };
Expand Down
Loading