Skip to content

Commit 2d90f0d

Browse files
committed
feat: add isEcho input to data field render for conditional rendering of alert status and action components
Signed-off-by: Manuel Abascal <mjabascal10@gmail.com>
1 parent 5424731 commit 2d90f0d

3 files changed

Lines changed: 19 additions & 13 deletions

File tree

frontend/src/app/data-management/alert-management/shared/components/alert-echoes/alert-echoes.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<ng-container *ngFor="let td of fields">
6363
<td *ngIf="td.visible"
6464
[ngClass]="{'min-width': td.field === ALERT_ADVERSARY_FIELD || td.field === ALERT_TARGET_FIELD}">
65-
<app-data-field-render [data]="alert" [field]="td" [dataType]="dataType" [showStatusChange]="true"
65+
<app-data-field-render [data]="alert" [field]="td" [dataType]="dataType" [isEcho]="true" [showStatusChange]="true"
6666
(refreshData)="onRefreshData($event)">
6767
</app-data-field-render>
6868
</td>

frontend/src/app/data-management/alert-management/shared/components/data-field-render/data-field-render.component.html

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,26 @@
11
<div [ngSwitch]="field.field">
2-
<!--<app-alert-status (statusChange)="onStatusChange($event)"
3-
*ngSwitchCase="STATUS_FIELD"
2+
3+
<ng-container *ngSwitchCase="STATUS_FIELD">
4+
<app-alert-status *ngIf="isEcho"
45
[alert]="data"
56
[dataType]="dataType"
6-
[showDrop]="showStatusChange"
7+
[showDrop]="false"
78
[statusField]="STATUS_FIELD">
8-
</app-alert-status>-->
9-
<app-alert-action-select *ngSwitchCase="STATUS_FIELD"
10-
[alert]="data"
11-
[tags]="tags"
12-
[dataType]="dataType"
13-
[showDrop]="showStatusChange"
14-
[statusField]="STATUS_FIELD"
15-
(statusChange)="onStatusChange($event)">
9+
</app-alert-status>
10+
11+
<app-alert-action-select *ngIf="!isEcho"
12+
[alert]="data"
13+
[tags]="tags"
14+
[dataType]="dataType"
15+
[showDrop]="showStatusChange"
16+
[statusField]="STATUS_FIELD"
17+
(statusChange)="onStatusChange($event)">
18+
</app-alert-action-select>
19+
</ng-container>
20+
21+
1622

1723

18-
</app-alert-action-select>
1924
<ng-content *ngSwitchCase="ALERT_ECHOES_FIELD" select="[echoes]"></ng-content>
2025
<app-alert-ip *ngSwitchCase="ALERT_TARGET_IP_FIELD" [alert]="data" [type]="'target'"></app-alert-ip>
2126
<app-alert-ip *ngSwitchCase="ALERT_ADVERSARY_IP_FIELD" [alert]="data" [type]="'adversary'"></app-alert-ip>

frontend/src/app/data-management/alert-management/shared/components/data-field-render/data-field-render.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ export class DataFieldRenderComponent implements OnInit {
2828
@Input() showStatusChange: boolean;
2929
@Input() dataType: EventDataTypeEnum;
3030
@Input() tags: any[];
31+
@Input() isEcho = false;
3132
@Output() refreshData = new EventEmitter<boolean>();
3233
STATUS_FIELD = ALERT_STATUS_FIELD;
3334
SEVERITY_LABEL_FIELD = ALERT_SEVERITY_FIELD_LABEL;

0 commit comments

Comments
 (0)