feat: validate storage url inside storage config (advanced settings) (#…

…299)
ai4os · Jan 30, 2025 · 93cf42d · 93cf42d
1 parent eb30b31
commit 93cf42d
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 1 deletion.
diff --git a/...es/marketplace/components/module-train/storage-conf-form/storage-conf-form.component.html b/...es/marketplace/components/module-train/storage-conf-form/storage-conf-form.component.html
@@ -184,6 +184,18 @@ <h4>
                     <mat-hint *ngIf="_showHelp">{{
                         _defaultFormValues.rclone_url.description
                     }}</mat-hint>
+                    <mat-error
+                        *ngIf="
+                            storageConfFormGroup
+                                .get('storageUrlInput')
+                                ?.hasError('invalidURL')
+                        "
+                    >
+                        {{
+                            'MODULES.MODULE-TRAIN.DATA-CONF-FORM.STORAGE-URL-ERROR'
+                                | translate
+                        }}
+                    </mat-error>
                 </mat-form-field>
 
                 <mat-form-field>

diff --git a/...ules/marketplace/components/module-train/storage-conf-form/storage-conf-form.component.ts b/...ules/marketplace/components/module-train/storage-conf-form/storage-conf-form.component.ts
@@ -7,10 +7,13 @@ import {
     ViewChild,
 } from '@angular/core';
 import {
+    AbstractControl,
     FormBuilder,
     FormControl,
     FormGroup,
     FormGroupDirective,
+    ValidationErrors,
+    ValidatorFn,
     Validators,
 } from '@angular/forms';
 import {
@@ -44,6 +47,19 @@ const mockedConfObjectStringBoolean: confObjectStringBoolean = {
     description: '',
 };
 
+export function urlValidator(): ValidatorFn {
+    return (control: AbstractControl): ValidationErrors | null => {
+        const urlPattern =
+            /^(https?:\/\/)?([\da-z.-]+)\.([a-z.]{2,6})([/\w.-]*)*\/?$/i;
+        const value = control.value;
+        let validURL = true;
+        if (value.trim().length > 0) {
+            validURL = urlPattern.test(value);
+        }
+        return validURL ? null : { invalidURL: true };
+    };
+}
+
 @Component({
     selector: 'app-storage-conf-form',
     templateUrl: './storage-conf-form.component.html',
@@ -118,7 +134,7 @@ export class StorageConfFormComponent implements OnInit {
             disabled: true,
         }),
         rcloneConfInput: [''],
-        storageUrlInput: [''],
+        storageUrlInput: ['', [urlValidator()]],
         rcloneVendorSelect: [''],
         rcloneUserInput: [''],
         rclonePasswordInput: [''],

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -310,6 +310,7 @@
                 "DATASET-LIST": "Datasets list",
                 "NO-DATASETS": "No datasets added yet",
                 "STORAGE-URL": "Storage URL",
+                "STORAGE-URL-ERROR": "Invalid URL format",
                 "STORAGE-SERVICE": "Storage service",
                 "STORAGE-SERVICE-HINT": "You can select which storage service to use. Make sure your account is already linked in your",
                 "PROFILE-SECTION": "profile section",