Merge pull request #1380 from utmstack/backlog/alert_false_positive_tag

fix[frontend](alert_management): marked as false positive on create false positive tag rule

Author: mjabascal10

frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-tags/alert-tags-apply.component.html

@@ -1,4 +1,3 @@
-
 <ng-container *ngIf="template === 'default'">
   <div [ngbTooltip]="selected.length>0?selected.toString():null"
        placement="auto"
@@ -26,7 +25,7 @@
 </ng-container>
 
 <ng-container *ngIf="template === 'menu-item'">
-  <a [ngClass]="action.background"  class="span-small-icon" (click)="addNewTagRule()">
+  <a [ngClass]="action.background"  class="span-small-icon" (click)="addNewTagRule(true)">
     <i [ngClass]="action.icon"></i>&nbsp;
     {{ action.label }}
   </a>

frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-tags/alert-tags-apply.component.ts

@@ -4,6 +4,7 @@ import {AlertTags} from '../../../../../../shared/types/alert/alert-tag.type';
 import {UtmAlertType} from '../../../../../../shared/types/alert/utm-alert.type';
 import {AlertUpdateTagBehavior} from '../../../behavior/alert-update-tag.behavior';
 import {AlertRuleCreateComponent} from '../../alert-rule-create/alert-rule-create.component';
+import { FALSE_POSITIVE_OBJECT } from 'src/app/shared/constants/alert/alert-field.constant';
 
 @Component({
   selector: 'app-alert-tags-apply',
@@ -51,10 +52,11 @@ export class AlertTagsApplyComponent implements OnInit, OnChanges {
     }
   }
 
-  addNewTagRule() {
+  addNewTagRule(isFalsePositive: boolean = false) {
     const modalRef = this.modalService.open(AlertRuleCreateComponent, {centered: true, size: 'lg'});
     modalRef.componentInstance.alert = this.alert;
     modalRef.componentInstance.action = 'select';
+    modalRef.componentInstance.isFalsePositiveRule = isFalsePositive;
     modalRef.componentInstance.ruleAdd.subscribe((created) => {
       this.icon = this.getTagIcon();
       this.color = this.getColor();

frontend/src/app/data-management/alert-management/shared/components/alert-rule-create/alert-rule-create.component.ts

@@ -63,6 +63,7 @@ import {AlertActionRefreshService} from "../../services/alert-action-refresh.ser
 export class AlertRuleCreateComponent implements OnInit, OnDestroy {
   @Input() alert: UtmAlertType;
   @Input() isForComplete = false;
+  @Input() isFalsePositiveRule = false;
   @Input() action: 'create' | 'update' | 'select' = 'create';
   @Input() rule: AlertRuleType;
   @Output() ruleAdd = new EventEmitter<AlertRuleType>();
@@ -159,10 +160,14 @@ export class AlertRuleCreateComponent implements OnInit, OnDestroy {
     });
 
     if (this.rule) {
-      this.filters = [... this.rule.conditions];
+      this.filters = [...this.rule.conditions];
       this.selected = this.rule.tags.length > 0 ? [...this.rule.tags] : [];
     }
 
+    if (this.isFalsePositiveRule) {
+      this.selected.push(FALSE_POSITIVE_OBJECT);
+    }
+
     this.alerts$ = this.alertService.onRefresh$
       .pipe(
         takeUntil(this.destroy$),
@@ -362,7 +367,7 @@ export class AlertRuleCreateComponent implements OnInit, OnDestroy {
   }
 
   isFalsePositive() {
-    return this.selected.findIndex(value => value.tagName.includes('False positive')) !== -1;
+    return this.isFalsePositiveRule || this.selected.findIndex(value => value.tagName.includes('False positive')) !== -1;
   }
 
   getOperators(conditionField: string) {

frontend/src/environments/environment.ts

@@ -4,8 +4,8 @@
 
 export const environment = {
   production: false,
-  //SERVER_API_URL: 'https://192.168.1.18/',
-  SERVER_API_URL: 'http://localhost:8080/',
+  SERVER_API_URL: 'https://192.168.1.18/',
+  // SERVER_API_URL: 'http://localhost:8080/',
   SERVER_API_CONTEXT: '',
   SESSION_AUTH_TOKEN: window.location.host.split(':')[0].toLocaleUpperCase(),
   WEBSOCKET_URL: '//localhost:8080',