Merge pull request #1322 from utmstack/backlog/fix_afterevent_form

fix(rule_management): fixed empty after event form on rule update

Author: osmontero

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

@@ -59,6 +59,7 @@
               (change)="onFieldChange($event, j)"
               formControlName="field"
               [items]="fields"
+              [addTag]="addField"
               bindLabel="name"
               bindValue="name"
               class="w-100"

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

@@ -129,6 +129,13 @@ export class AddAfterEventComponent implements OnInit {
 
   getOperatorByField(fieldName: string) {
     const field = this.fields.find(f => f.name === fieldName);
-    return this.getOperators(field);
+    //if the field doesnt appear on field list, it must be an added field ( so we'll treat it like a STRING)
+    return this.getOperators(field || {name:fieldName,type:ElasticDataTypesEnum.STRING});
   }
+
+  addField(name:string){
+    return {name,type:ElasticDataTypesEnum.STRING};
+  }
+
+
 }

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

@@ -182,7 +182,10 @@ export class AddRuleComponent implements OnInit, OnDestroy {
     });
     // this.savedVariables = rule ? rule.definition.ruleVariables : [];
 
+    if(!rule || rule.afterEvents.length == 0){
     this.addAfterEvent();
+    }
+
   }
 
 

frontend/src/app/rule-management/app-rule/components/deduplicate-fields/deduplicate-fields.component.ts

@@ -38,6 +38,7 @@ export class DeduplicateFieldsComponent implements OnInit {
   }
 
   addTag(name: string) {
+    alert(name)
     return { name };
   }
 }