From 230f8d673ea4c2df0d75c511a82bd5ae1f8238ad Mon Sep 17 00:00:00 2001 From: AlexSanchez-bit Date: Tue, 14 Oct 2025 00:12:22 -0400 Subject: [PATCH 1/4] fix[frontend](alert_management): marked as false positive on create false positive tag rule --- .../alert-apply-tags/alert-tags-apply.component.html | 3 +-- .../alert-apply-tags/alert-tags-apply.component.ts | 4 +++- .../alert-rule-create/alert-rule-create.component.ts | 9 +++++++-- frontend/src/environments/environment.ts | 4 ++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-tags/alert-tags-apply.component.html b/frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-tags/alert-tags-apply.component.html index 10901e8d7..1231f790e 100644 --- a/frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-tags/alert-tags-apply.component.html +++ b/frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-tags/alert-tags-apply.component.html @@ -1,4 +1,3 @@ -
- +   {{ action.label }} diff --git a/frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-tags/alert-tags-apply.component.ts b/frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-tags/alert-tags-apply.component.ts index 205809292..e0a1fc00d 100644 --- a/frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-tags/alert-tags-apply.component.ts +++ b/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(); diff --git a/frontend/src/app/data-management/alert-management/shared/components/alert-rule-create/alert-rule-create.component.ts b/frontend/src/app/data-management/alert-management/shared/components/alert-rule-create/alert-rule-create.component.ts index dc5c87df9..2c53d8191 100644 --- a/frontend/src/app/data-management/alert-management/shared/components/alert-rule-create/alert-rule-create.component.ts +++ b/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(); @@ -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) { diff --git a/frontend/src/environments/environment.ts b/frontend/src/environments/environment.ts index a9c376b4f..d1fff92cc 100644 --- a/frontend/src/environments/environment.ts +++ b/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', From d6984e1f2e0139d9234f0888bfb64f8239128a3e Mon Sep 17 00:00:00 2001 From: Manuel Abascal Date: Tue, 14 Oct 2025 09:04:17 -0500 Subject: [PATCH 2/4] Update frontend/src/app/data-management/alert-management/shared/components/alert-rule-create/alert-rule-create.component.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../alert-rule-create/alert-rule-create.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/data-management/alert-management/shared/components/alert-rule-create/alert-rule-create.component.ts b/frontend/src/app/data-management/alert-management/shared/components/alert-rule-create/alert-rule-create.component.ts index 2c53d8191..a5e3e8cd0 100644 --- a/frontend/src/app/data-management/alert-management/shared/components/alert-rule-create/alert-rule-create.component.ts +++ b/frontend/src/app/data-management/alert-management/shared/components/alert-rule-create/alert-rule-create.component.ts @@ -164,8 +164,8 @@ export class AlertRuleCreateComponent implements OnInit, OnDestroy { this.selected = this.rule.tags.length > 0 ? [...this.rule.tags] : []; } - if(this.isFalsePositiveRule){ - this.selected.push(FALSE_POSITIVE_OBJECT) + if (this.isFalsePositiveRule) { + this.selected.push(FALSE_POSITIVE_OBJECT); } this.alerts$ = this.alertService.onRefresh$ From ecad51f99cd65e06ee2337acde312237f84c787b Mon Sep 17 00:00:00 2001 From: Manuel Abascal Date: Tue, 14 Oct 2025 09:04:50 -0500 Subject: [PATCH 3/4] Update frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-tags/alert-tags-apply.component.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../alert-apply-tags/alert-tags-apply.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-tags/alert-tags-apply.component.ts b/frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-tags/alert-tags-apply.component.ts index e0a1fc00d..09f5fe935 100644 --- a/frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-tags/alert-tags-apply.component.ts +++ b/frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-tags/alert-tags-apply.component.ts @@ -52,7 +52,7 @@ export class AlertTagsApplyComponent implements OnInit, OnChanges { } } - addNewTagRule(isFalsePositive:boolean=false) { + addNewTagRule(isFalsePositive: boolean = false) { const modalRef = this.modalService.open(AlertRuleCreateComponent, {centered: true, size: 'lg'}); modalRef.componentInstance.alert = this.alert; modalRef.componentInstance.action = 'select'; From ea73c2e1a3af2cebaf585a2cece9abb9d43a274d Mon Sep 17 00:00:00 2001 From: Manuel Abascal Date: Tue, 14 Oct 2025 09:05:24 -0500 Subject: [PATCH 4/4] Update frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-tags/alert-tags-apply.component.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../alert-apply-tags/alert-tags-apply.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-tags/alert-tags-apply.component.ts b/frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-tags/alert-tags-apply.component.ts index 09f5fe935..62eafca1d 100644 --- a/frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-tags/alert-tags-apply.component.ts +++ b/frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-tags/alert-tags-apply.component.ts @@ -56,7 +56,7 @@ export class AlertTagsApplyComponent implements OnInit, OnChanges { 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.isFalsePositiveRule = isFalsePositive; modalRef.componentInstance.ruleAdd.subscribe((created) => { this.icon = this.getTagIcon(); this.color = this.getColor();