Merge branch 'bugfix/validate_url' into 'develop'

bugfix/validate_url

See merge request upm-inesdata/inesdata-connector-interface!45

Author: ralconada-gmv

src/app/pages/assets/asset-create/asset-create.component.html

@@ -140,7 +140,7 @@
 
           <mat-form-field class="form-field" color="accent">
             <mat-label>Base URL</mat-label>
-            <input [(ngModel)]="httpDataAddress.baseUrl" [pattern]="urlPattern" matInput required>
+            <input [(ngModel)]="httpDataAddress.baseUrl" matInput required>
           </mat-form-field>
 
           <mat-form-field class="form-field" color="accent">

src/app/pages/assets/asset-create/asset-create.component.ts

@@ -103,8 +103,6 @@ export class AssetCreateComponent implements OnInit {
   config = CKEDITOR_CONFIG
   selectedAssetTypeVocabularies: Vocabulary[]
 
-  urlPattern: RegExp = /^https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z]{2,6}\b([-a-zA-Z0-9()@:%_+.~#?&//=]*)$/;
-
   private fetch$ = new BehaviorSubject(null);
 
   ngOnInit(): void {
@@ -370,8 +368,12 @@ export class AssetCreateComponent implements OnInit {
   }
 
   validateUrl(): boolean {
-    const regex = new RegExp(this.urlPattern);
-    return regex.test(this.httpDataAddress.baseUrl);
+    try {
+      var url = new URL(this.httpDataAddress.baseUrl);
+    } catch (e) {
+      return false;
+    }
+    return url.protocol === "http:" || url.protocol === "https:";
   }
 
 

src/styles.scss

@@ -681,6 +681,7 @@ mat-card-actions {
 
 .creation-card .mat-mdc-card-header {
   padding: 0px 0px 20px 0px;
+  display: flex;
 }
 
 app-confirmation-dialog .mat-mdc-dialog-title,