X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fsignal%2Fsignal.component.ts;h=e19f97c04b2bc17d4be2a5a9e1c7013a91337787;hb=60f422d33e1bab1f81b64cb832333f4d5d8501b5;hp=a3ad5a24f6664c77d8aabe7850fcf87a6d58cf80;hpb=7635a665c46bb7a487a3b582bb3e98c7f12e799e;p=portal%2Fric-dashboard.git

diff --git a/webapp-frontend/src/app/signal/signal.component.ts b/webapp-frontend/src/app/signal/signal.component.ts
index a3ad5a24..e19f97c0 100644
--- a/webapp-frontend/src/app/signal/signal.component.ts
+++ b/webapp-frontend/src/app/signal/signal.component.ts
@@ -22,8 +22,8 @@ import { LocalDataSource } from 'ng2-smart-table';
 import { SignalService } from '../services/signal/signal.service';
 import { Router } from '@angular/router';
 import { MatDialog, MatDialogConfig, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog';
-import {MatFormFieldModule} from '@angular/material';
-import { FormGroup, FormControl, FormBuilder } from '@angular/forms';
+import { MatFormFieldModule } from '@angular/material';
+import { FormGroup, FormControl, FormBuilder, ReactiveFormsModule, Validators} from '@angular/forms';
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs/Rx';
 
@@ -38,8 +38,8 @@ export interface DialogData {
     templateUrl: 'signal.component.html',
     styleUrls: ['signal.component.css']
 })
-export class SignalComponent {
 
+export class SignalComponent {
     settings = {
         hideSubHeader: true,
         actions: {
@@ -116,7 +116,22 @@ export class AppRANConnectDialog implements OnInit {
           @Inject(MAT_DIALOG_DATA) public data: DialogData) {
     }
 
+    public ranDialogForm: FormGroup;
+
+        public ranName: string;
+
+        public ranIp: number;
+
+        public ranPort: number;
+
     ngOnInit() {
+        const ipPattern = '((^\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\s*$)|(^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$))';
+        const portPattern = '^([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$';
+        this.ranDialogForm = new FormGroup({
+                ranName: new FormControl('', [Validators.required, Validators.maxLength(50)]),
+                ranIp: new FormControl('', [Validators.required, Validators.pattern(ipPattern)]),
+                ranPort: new FormControl('', [Validators.required, Validators.pattern(portPattern)])
+            });
     }
 
     close() {
@@ -128,4 +143,15 @@ export class AppRANConnectDialog implements OnInit {
         this.dialogRef.close();
     }
 
+    public hasError(controlName: string, errorName: string) {
+        if (this.ranDialogForm.controls[controlName].hasError(errorName))
+            return true;
+        return false;
+    }
+
+  public validateControl(controlName: string) {
+        if (this.ranDialogForm.controls[controlName].invalid && this.ranDialogForm.controls[controlName].touched)
+            return true;
+        return false;
+    }
 }