Merge pull request #525 from bcgov/oleks

DSS-324: Takedown Request and Non Compliance notices issues
bcgov · Aug 12, 2024 · ffb876d · ffb876d
2 parents fbfb9c4 + 277abce
commit ffb876d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/frontend/src/app/common/consts/validators.const.ts b/frontend/src/app/common/consts/validators.const.ts
@@ -8,7 +8,7 @@ export function validateUrl(): ValidatorFn {
             return null;
         }
 
-        const urlRegex = new RegExp(/\b(?:[Hh][Tt][Tt][Pp][Ss]?):\/\/[-A-Za-z0-9+&@#\/%?=~_|!:,.;]*[-A-Za-z0-9+&@#\/%=~_|]/);
+        const urlRegex = new RegExp(/https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)/);
         const validUrl = urlRegex.test(url.toLowerCase());
 
         return validUrl ? null : { invalidUrl: true };

diff --git a/frontend/src/app/features/components/delisting-request/delisting-request.component.ts b/frontend/src/app/features/components/delisting-request/delisting-request.component.ts
@@ -183,7 +183,7 @@ export class DelistingRequestComponent implements OnInit {
 
   private initForm(): void {
     this.myForm = this.fb.group({
-      platformId: [0, Validators.required],
+      platformId: [null, Validators.required],
       listingId: [''],
       listingUrl: ['', [Validators.required, validateUrl()]],
       sendCopy: [true],