fix: Last log not displayed for a generated alert

Author: mjabascal10

CHANGELOG.md

@@ -3,4 +3,5 @@
 -Fixed an issue preventing incident status updates when entering long solutions.
 -Fixed an issue blocking incident creation from the Alerts panel.
 -Added Asia/Jakarta timezone to the TIMEZONES list.
--Fixed Timezone changes on an instance don't get updated when access by Federation Server
+-Fixed Timezone changes on an instance don't get updated when access by Federation Server
+-Fixed Last log not displayed for a generated alert 

frontend/src/app/data-management/alert-management/alert-view/alert-view.component.html

@@ -227,6 +227,7 @@ <h6 class="card-title text-blue-800 font-weight-light">
                            [alert]="alertDetail"
                            [hideEmptyField]=" true"
                            [tags]="tags"
+                           [timeFilter]="getFilterTime()"
                            [dataType]="dataType"></app-alert-view-detail>
   </div>
 </div>

frontend/src/app/data-management/alert-management/alert-view/alert-view.component.ts

@@ -550,6 +550,10 @@ export class AlertViewComponent implements OnInit, OnDestroy {
     modal.componentInstance.alert = alert;
   }
 
+  getFilterTime(){
+    return this.filters.find(f => f.field === ALERT_TIMESTAMP_FIELD);
+  }
+
   ngOnDestroy(): void {
     this.destroy$.next();
     this.destroy$.complete();

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

@@ -176,6 +176,11 @@
             </span>
           </div>
         </ng-template>
+        <ng-container *ngIf="isEmptyResponse()">
+          <div class="d-flex has-fixed-height w-100 justify-content-center align-items-center">
+            <app-no-data-found></app-no-data-found>
+          </div>
+        </ng-container>
       </div>
     </div>
   </div>

frontend/src/app/data-management/alert-management/shared/components/alert-view-detail/alert-view-detail.component.ts

@@ -16,9 +16,7 @@ import {
   ALERT_PROTOCOL_FIELD,
   ALERT_SENSOR_FIELD,
   ALERT_SEVERITY_FIELD_LABEL,
-  ALERT_STATUS_FIELD,
-  ALERT_TACTIC_FIELD,
-  ALERT_TIMESTAMP_FIELD
+  ALERT_STATUS_FIELD, ALERT_TACTIC_FIELD, ALERT_TIMESTAMP_FIELD
 } from '../../../../../shared/constants/alert/alert-field.constant';
 import {LOG_ROUTE} from '../../../../../shared/constants/app-routes.constant';
 import {LOG_INDEX_PATTERN, LOG_INDEX_PATTERN_ID} from '../../../../../shared/constants/main-index-pattern.constant';
@@ -34,7 +32,6 @@ import {AlertUpdateHistoryBehavior} from '../../behavior/alert-update-history.be
 import {AlertUpdateTagBehavior} from '../../behavior/alert-update-tag.behavior';
 import {AlertHistoryActionEnum} from '../../enums/alert-history-action.enum';
 import {EventDataTypeEnum} from '../../enums/event-data-type.enum';
-import {AlertManagementService} from '../../services/alert-management.service';
 
 @Component({
   selector: 'app-alert-view-detail',
@@ -47,6 +44,7 @@ export class AlertViewDetailComponent implements OnInit {
   @Input() hideEmptyField = false;
   @Input() dataType: EventDataTypeEnum;
   @Input() tags: AlertTags[];
+  @Input()  timeFilter: ElasticFilterType;
   @Output() refreshData = new EventEmitter<boolean>();
   ALERT_NAME = ALERT_NAME_FIELD;
   STATUS_FIELD = ALERT_STATUS_FIELD;
@@ -77,19 +75,17 @@ export class AlertViewDetailComponent implements OnInit {
   hideLastChange = false;
   incidentResponse = false;
 
-  constructor(private alertServiceManagement: AlertManagementService,
-              private utmToastService: UtmToastService,
-              private alertUpdateHistoryBehavior: AlertUpdateHistoryBehavior,
+  constructor(private alertUpdateHistoryBehavior: AlertUpdateHistoryBehavior,
               private alertUpdateTagBehavior: AlertUpdateTagBehavior,
               private spinner: NgxSpinnerService,
               private elasticDataService: ElasticDataService,
               private moduleService: UtmModulesService,
-              private router: Router) {
+              private router: Router,
+              private toastService: UtmToastService) {
   }
 
   ngOnInit() {
     this.viewLog = this.fullScreen;
-    // @ts-ignore
     this.logs = this.alert.logs.reverse();
     this.countRelatedEvents = this.logs.length;
     const ref = this.alert.reference;
@@ -155,14 +151,18 @@ export class AlertViewDetailComponent implements OnInit {
   searchLastLog() {
     if (!this.log) {
       this.getLastLog = true;
-      const filter: ElasticFilterType[] = [{field: ALERT_ID_FIELD, operator: ElasticOperatorsEnum.IS, value: this.logs[0]}];
+      const filters: ElasticFilterType[] = [
+        ...(this.timeFilter ? [this.timeFilter] : []),
+        { field: ALERT_ID_FIELD, operator: ElasticOperatorsEnum.IS, value: this.logs[0] }
+      ];
       this.elasticDataService.search(1, 1,
-        1, LOG_INDEX_PATTERN, filter).subscribe(
+        1, LOG_INDEX_PATTERN, filters).subscribe(
         (res: HttpResponse<any>) => {
-          this.log = res.body[0];
+          this.log = res.body[0] ? res.body[0] : {};
           this.getLastLog = false;
         },
         (res: HttpResponse<any>) => {
+          this.toastService.showError('Error', 'An error occurred while trying to retrieve the latest log.');
         }
       );
     }
@@ -171,6 +171,10 @@ export class AlertViewDetailComponent implements OnInit {
   viewLastLog() {
     this.searchLastLog();
   }
+
+  isEmptyResponse() {
+    return Object.entries(this.log).length === 0;
+  }
 }
 
 export enum AlertDetailTabEnum {