Skip to content
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

Jump to bottom

minor change on if statements #3796

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

minor change on if statements #3796

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31a3796
minor change on if statements
OgunyemiO Jul 11, 2024
ff9477e
Merge branch 'master' into EXUI-152-review-sonar-security-issue-NEW
OgunyemiO Jul 12, 2024
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
9 changes: 6 additions & 3 deletions src/noc/containers/noc-field/utils/noc-validators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import { AbstractControl, ValidationErrors, ValidatorFn } from '@angular/forms';
import * as moment from 'moment';

const REGEX_DOS_FIX_LIMIT = 100;
export class NocValidators {
public static numberValidator(): ValidatorFn {
return (control: AbstractControl): ValidationErrors | null => {
if (control.value === null || control.value === '') {
return;
}
if (!control.value.toString().match(/^[0-9]+(\.?[0-9]+)?$/)) {
if (control.value.length < REGEX_DOS_FIX_LIMIT && !control.value.toString().match(/^[0-9]+(\.?[0-9]+)?$/)) {
return { number: true };
}
return;
Expand All @@ -19,7 +20,8 @@ export class NocValidators {
if (control.value === null || control.value === '') {
return;
}
if (!control.value.toString().match(/^(([A-Za-z]{1,2}[0-9][A-Za-z0-9]?|ASCN|STHL|TDCU|BBND|[BFS]IQQ|PCRN|TKCA) ?[0-9][A-Za-z]{2}|BFPO ?[0-9]{1,4}|(KY[0-9]|MSR|VG|AI)[ -]?[0-9]{4}|[A-Za-z]{2} ?[0-9]{2}|GE ?CX|GIR ?0A{2}|SAN ?TA1)$/)) {
if (control.value.length < REGEX_DOS_FIX_LIMIT &&
!control.value.toString().match(/^(([A-Za-z]{1,2}[0-9][A-Za-z0-9]?|ASCN|STHL|TDCU|BBND|[BFS]IQQ|PCRN|TKCA) ?[0-9][A-Za-z]{2}|BFPO ?[0-9]{1,4}|(KY[0-9]|MSR|VG|AI)[ -]?[0-9]{4}|[A-Za-z]{2} ?[0-9]{2}|GE ?CX|GIR ?0A{2}|SAN ?TA1)$/)) {
return { postcode: true };
}
return;
Expand All @@ -32,7 +34,8 @@ export class NocValidators {
return;
}
// eslint-disable-next-line no-useless-escape
if (!control.value.toString().match(/^(?:(?:\(?(?:0(?:0|11)\)?[\s-]?\(?|\+)44\)?[\s-]?(?:\(?0\)?[\s-]?)?)|(?:\(?0))(?:(?:\d{5}\)?[\s-]?\d{4,5})|(?:\d{4}\)?[\s-]?(?:\d{5}|\d{3}[\s-]?\d{3}))|(?:\d{3}\)?[\s-]?\d{3}[\s-]?\d{3,4})|(?:\d{2}\)?[\s-]?\d{4}[\s-]?\d{4}))(?:[\s-]?(?:x|ext\.?|\#)\d{3,4})?$/)) {
if (control.value.length < REGEX_DOS_FIX_LIMIT &&
!control.value.toString().match(/^(?:(?:\(?(?:0(?:0|11)\)?[\s-]?\(?|\+)44\)?[\s-]?(?:\(?0\)?[\s-]?)?)|(?:\(?0))(?:(?:\d{5}\)?[\s-]?\d{4,5})|(?:\d{4}\)?[\s-]?(?:\d{5}|\d{3}[\s-]?\d{3}))|(?:\d{3}\)?[\s-]?\d{3}[\s-]?\d{3,4})|(?:\d{2}\)?[\s-]?\d{4}[\s-]?\d{4}))(?:[\s-]?(?:x|ext\.?|\)\d{3,4})?$/)) {
return { phoneUK: true };
}
return;
Expand Down