fix(ui): refactor add correlation rule

Author: mjabascal10

frontend/src/app/rule-management/app-rule/components/add-rule/add-rule.component.html

@@ -142,7 +142,7 @@
                          [ngClass]="{'is-invalid': ruleForm.get('adversary').invalid && ruleForm.get('adversary').touched}"
                          [virtualScroll]="true"
                          bindLabel="name"
-                         bindValue="id"
+                         bindValue="name"
                          class="flex-item type-select"
                          formControlName="adversary"
                          placeholder="Choose adversary">

frontend/src/app/rule-management/app-rule/components/add-rule/add-rule.component.ts

@@ -97,7 +97,7 @@ export class AddRuleComponent implements OnInit, OnDestroy {
       const variables = this.savedVariables .length > 0 ?  this.savedVariables.map(variable => ({
         as: variable.as,
         get: variable.get,
-        of_type: variable.of_type
+        ofType: variable.ofType
       })) : [];
       this.isSubmitting = true;
       const rule: Rule = {
@@ -131,7 +131,7 @@ export class AddRuleComponent implements OnInit, OnDestroy {
       id: [rule ? rule.id : ''],
       dataTypes: [rule ? rule.dataTypes : '', Validators.required],
       name: [rule ? rule.name : '', Validators.required],
-      adversary: [rule ? rule.adversary : '', Validators.required],
+      adversary: [rule ? rule.adversary : null, Validators.required],
       confidentiality: [rule ? rule.confidentiality : 0, [Validators.required, Validators.min(0), Validators.max(3)]],
       integrity: [rule ? rule.integrity : 0, [Validators.required, Validators.min(0), Validators.max(3)]],
       availability: [rule ? rule.availability : 0, [Validators.required, Validators.min(0), Validators.max(3)]],

frontend/src/app/rule-management/app-rule/components/add-variable/add-variable.component.html

@@ -16,7 +16,7 @@
           <label class="section-label">Variables</label>
           <button
             type="button"
-            [disabled]="variable.invalid || variable.get('of_type').value == null || variable.get('get').value == null"
+            [disabled]="variable.invalid || variable.get('ofType').value == null || variable.get('get').value == null"
             class="btn btn-icon btn-sm btn-outline-primary"
             (click)="saveVariable(i)"
             ngbTooltip="Add a new variable">
@@ -71,15 +71,15 @@
                 <div class="form-group-select">
                   <label>Type:</label>
                   <ng-select
-                    [ngClass]="{'is-invalid': variable.get('of_type').invalid && variable.get('of_type').touched}"
+                    [ngClass]="{'is-invalid': variable.get('ofType').invalid && variable.get('ofType').touched}"
                     [items]="variablesDataType"
                     class="flex-item type-select"
                     bindLabel="label"
                     bindValue="value"
-                    formControlName="of_type"
+                    formControlName="ofType"
                     placeholder="Select type">
                   </ng-select>
-                  <div *ngIf="variable.get('of_type').invalid && variable.get('of_type').touched"
+                  <div *ngIf="variable.get('ofType').invalid && variable.get('ofType').touched"
                        class="invalid-feedback">
                     Type is required.
                   </div>

frontend/src/app/rule-management/app-rule/components/add-variable/add-variable.component.ts

@@ -98,7 +98,7 @@ export class AddVariableComponent implements OnInit {
     control.markAsDirty();
   }
 
-  onVariablesChange(updatedVars: { as: string; of_type: string; get: string }[]) {
+  onVariablesChange(updatedVars: { as: string; ofType: string; get: string }[]) {
     this.savedVariables = updatedVars;
   }
 

frontend/src/app/rule-management/app-rule/components/expression-console/expression-console.component.ts

@@ -12,8 +12,8 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
   }]
 })
 export class ExpressionConsoleComponent implements ControlValueAccessor {
-  @Input() variables: { as: string; of_type: string; get: string }[] = [];
-  @Output() variablesChange = new EventEmitter<{ as: string; of_type: string; get: string }[]>();
+  @Input() variables: { as: string; ofType: string; get: string }[] = [];
+  @Output() variablesChange = new EventEmitter<{ as: string; ofType: string; get: string }[]>();
   @ViewChild('console', {}) consoleRef!: ElementRef<HTMLTextAreaElement>;
 
   @Output() touched = new EventEmitter<void>();

frontend/src/app/rule-management/custom-validators.ts

@@ -1,6 +1,6 @@
 import {AbstractControl, FormArray, ValidationErrors, ValidatorFn} from "@angular/forms";
 
-export const variableTemplate = {get: [], as: [''], of_type: []};
+export const variableTemplate = {get: [], as: [''], ofType: []};
 export function urlValidator(control: AbstractControl): ValidationErrors | null {
   const urlPattern = /^(https?|ftp):\/\/[^\s/$.?#].\S*$/i;
   return urlPattern.test(control.value) ? null : {invalidUrl: true};

frontend/src/app/rule-management/models/rule.model.ts

@@ -13,7 +13,7 @@ export const itemsPerPage = 25;
 export interface Variable {
     get: string;
     as: string;
-    of_type: string;
+    ofType: string;
 }
 
 export interface Definition {