changes to fix double quote entry in name field of ACL and filter (#253)

* changes to fix double quote entry in name field of ACL and filter
---------

Co-authored-by: monika-Dianomic <monika@dianomic>

Author: MonikaSharma06

src/app/components/core/control-dispatcher/add-control-acl/add-control-acl.component.html

@@ -29,7 +29,7 @@
             <div class="field-body">
               <div class="field">
                 <div class="control">
-                  <input name="name" class="input" type="text" placeholder="Name" required [(ngModel)]="name" title="No double quotes!" pattern="[^\x22]+" autocomplete="off"
+                  <input name="name" class="input" type="text" placeholder="Name" required [(ngModel)]="name" title="No double quotes!" autocomplete="off"
                     [ngClass]="{'is-static static-acl':editMode, 'is-small':sharedService.checkAuth() && !editMode}"
                     [readonly]="!sharedService.checkAuth()">
                 </div>

src/app/components/core/control-dispatcher/add-control-acl/add-control-acl.component.ts

@@ -176,7 +176,7 @@ export class AddControlAclComponent implements OnInit {
   }
 
   addFormControls(index, urlData: any = null) {
-    this.aclForm.form.controls['name'].setValidators([Validators.required, CustomValidator.nospaceValidator]);
+    this.aclForm.form.controls['name'].setValidators([Validators.required, CustomValidator.nospaceValidator, Validators.pattern('^[^\x22]+$')]);
     this.aclForm.form.addControl('urls', new FormGroup({}));
     this.initURLControl(index, urlData);
   }

src/app/components/core/filter/add-filter-wizard/add-filter-wizard.component.html

@@ -53,7 +53,7 @@
                 <div class="column">
                   <div class="field">
                     <div class="control">
-                      <input class="input" id="name" type="text" placeholder="name" title="No double quotes!" pattern="[^\x22]+" autocomplete="off" formControlName="name" required
+                      <input class="input" id="name" type="text" placeholder="name" title="No double quotes!" autocomplete="off" formControlName="name" required
                         (input)="validateServiceName($event)">
                       <small *ngIf="!isValidName" class="help is-danger level-left">Application name is required</small>
                     </div>
@@ -129,7 +129,7 @@
             <div class="field-body">
               <div class="field">
                 <div class="control">
-                  <input class="input" id="name" type="text" placeholder="name" title="No double quotes!" pattern="[^\x22]+" autocomplete="off" formControlName="name" required
+                  <input class="input" id="name" type="text" placeholder="name" title="No double quotes!" autocomplete="off" formControlName="name" required
                     (input)="validateServiceName($event)">
                   <small *ngIf="!isValidName" class="help is-danger level-left">Application name is required</small>
                 </div>
@@ -153,7 +153,7 @@
       <button (click)="movePrevious()" data-nav="previous" class="button" id="previous">Back</button>
     </div>
     <div class="steps-action">
-      <button (click)="gotoNext()" data-nav="next" [disabled]="disabledBtn" class="button is-link"
+      <button (click)="gotoNext()" data-nav="next" [disabled]="serviceForm.invalid" class="button is-link"
         id="next">Next</button>
     </div>
   </div>

src/app/components/core/filter/add-filter-wizard/add-filter-wizard.component.ts

@@ -32,8 +32,6 @@ export class AddFilterWizardComponent implements OnInit {
   public show = false;
   public stopLoading = false;
   public placeholderText = 'fetching available plugins...';
-  public disabledBtn = false;
-
   increment = 1;
   maxRetry = 15;
   initialDelay = 1000;
@@ -65,13 +63,13 @@ export class AddFilterWizardComponent implements OnInit {
   ngOnInit() {
     this.getCategories();
     this.serviceForm = this.formBuilder.group({
-      name: ['', Validators.required],
+      name: ['', [Validators.required, Validators.pattern('[^\x22]+')]],
       plugin: [{ value: '', disabled: false }, Validators.required],
-      pluginToInstall: [{ value: null, disabled: false }, Validators.required]
+      pluginToInstall: [{ value: null, disabled: false }]
     });
     this.getInstalledFilterPlugins();
   }
-
+  
   toggleAvailablePlugins() {
     if (this.show) {
       this.show = false;
@@ -273,7 +271,7 @@ export class AddFilterWizardComponent implements OnInit {
     this.ngProgress.start();
     this.serviceForm.controls.pluginToInstall.disable();
     this.serviceForm.controls.plugin.disable();
-    this.disabledBtn = true;
+    this.serviceForm.setErrors({ 'invalid': true });
     this.alertService.activityMessage('Installing ' + pluginName + ' filter plugin...', true);
     this.service.installPlugin(pluginData).
       subscribe(
@@ -286,7 +284,7 @@ export class AddFilterWizardComponent implements OnInit {
           this.ngProgress.done();
           this.serviceForm.controls.pluginToInstall.enable();
           this.serviceForm.controls.plugin.enable();
-          this.disabledBtn = false;
+          this.serviceForm.setErrors({ 'invalid': false });
           if (error.status === 0) {
             console.log('service down ', error);
           } else {
@@ -343,7 +341,7 @@ export class AddFilterWizardComponent implements OnInit {
         this.getInstalledFilterPlugins(true);
         this.serviceForm.controls.pluginToInstall.enable();
         this.serviceForm.controls.plugin.enable();
-        this.disabledBtn = false;
+        this.serviceForm.setErrors({ 'invalid': false });
       });
   }