Merge branch 'bugfix/10.7.3/compliance-schedule-standard-selection-' into release/v10.8.1

mjabascal10 · mjabascal10 · commit 57ff3d030896 · 2025-05-08T10:06:46.000-05:00
# Conflicts:
#	CHANGELOG.md
#	version.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,4 +5,10 @@
 - Added support for RedHat; UTMStack can now be installed on both Ubuntu and RedHat.
 - Improved log delivery from ARM-based agents on Windows, now sending native system logs.
 - Added support for macOS ARM64; agents can now be installed on that platform.
-- Improved agent information displayed in the Sources panel, providing more accurate OS details and agent versions.
+- Improved agent information displayed in the Sources panel, providing more accurate OS details and agent versions.
+
+
+### Bug Fixes
+-- Compliance Report Scheduling: Improved the stability of the selection process when creating new report schedules.
+-- Improved field rendering in Log Explorer by consolidating list-based fields into a single entry for better readability and consistency.
+-- Improved field rendering for tags and note fields in Alerts.
diff --git a/frontend/src/app/compliance/compliance-schedule/compliance-schedule.component.ts b/frontend/src/app/compliance/compliance-schedule/compliance-schedule.component.ts
@@ -18,10 +18,10 @@ import {
     UtmComplianceScheduleDeleteComponent
 } from '../shared/components/utm-compliance-schedule-delete/utm-compliance-schedule-delete.component';
 import {ComplianceScheduleService} from '../shared/services/compliance-schedule.service';
+import {CronDescriptionGeneratorService} from '../shared/services/cron-description-generator.service';
 import {ComplianceScheduleFilterType} from '../shared/type/compliance-schedule-filter.type';
 import {ComplianceScheduleType} from '../shared/type/compliance-schedule.type';
 import {ComplianceStandardType} from '../shared/type/compliance-standard.type';
-import {CronDescriptionGeneratorService} from "../shared/services/cron-description-generator.service";
 
 
 @Component({
diff --git a/frontend/src/app/compliance/shared/components/utm-compliance-select/utm-compliance-select.component.html b/frontend/src/app/compliance/shared/components/utm-compliance-select/utm-compliance-select.component.html
@@ -18,7 +18,7 @@
                  placeholder="Standard"
                  style="width: 50%"
       ></ng-select>
-      <ng-select (change)="filterBySelect($event,'type')"
+      <ng-select (change)="getDashboardList()"
                  [(ngModel)]="section"
                  [clearable]="true"
                  [items]="standardSections"
@@ -47,7 +47,7 @@
                class="cursor-pointer text-blue-800 d-flex justify-content-between align-items-center">
            <span class="span-small-icon">
               <i [ngClass]="idReport === report.id?'icon-radio-checked':'icon-radio-unchecked'"></i>
-             <span class="text-blue-800 ml-2">{{report.associatedDashboard.name}}</span>
+             <span class="text-blue-800 ml-2">{{report.configReportName ? report.configReportName :report.associatedDashboard.name}}</span>
            </span>
             <span class="span-small-icon">
             <i *ngIf="report.associatedDashboard.description" [ngbTooltip]="report.associatedDashboard.description"
@@ -80,7 +80,7 @@
       </tbody>
     </table>
   </div>
-  <div *ngIf="complianceReports && complianceReports.length>0" class="mb-4 mt-2">
+  <div [hidden]="complianceReports && complianceReports.length === 0" class="mb-4 mt-2">
     <div class="row justify-content-center">
       <ngb-pagination
         (pageChange)="loadPage($event)"
diff --git a/frontend/src/app/compliance/shared/components/utm-compliance-select/utm-compliance-select.component.ts b/frontend/src/app/compliance/shared/components/utm-compliance-select/utm-compliance-select.component.ts
@@ -29,7 +29,7 @@ export class UtmComplianceSelectComponent implements OnInit {
   section: number;
   loading = true;
   totalItems: any;
-  page = 1;
+  page = 0;
   itemsPerPage = 10;
   complianceReports: ComplianceReportType[] = [];
   searching = false;
@@ -42,8 +42,8 @@ export class UtmComplianceSelectComponent implements OnInit {
 
   ngOnInit() {
     this.requestParams = {
-      page: this.page - 1,
-      size: this.itemsPerPage,
+      page: 0,
+      size: 1000,
       sort: this.sortBy,
       'name.contains': null
     };
@@ -61,14 +61,14 @@ export class UtmComplianceSelectComponent implements OnInit {
   }
 
   loadPage(page: any) {
-    this.requestParams.page = page - 1;
+    this.page = page > 0 ? page - 1 : page;
     this.getDashboardList();
   }
 
   getDashboardList() {
     const query = {
-      page: this.page - 1,
-      size: 1000,
+      page: this.page,
+      size: this.itemsPerPage,
       sort: 'id,asc',
       'standardSectionId.equals': this.section,
       'configSolution.contains': this.solution
@@ -81,15 +81,15 @@ export class UtmComplianceSelectComponent implements OnInit {
 
   getSections() {
     const query = {
-      page: this.page - 1,
+      page: 0,
       size: 1000,
       sort: 'id,asc',
       'standardId.equals': this.standard,
       'standardSectionName.contains': this.solution
     };
     this.cpStandardSectionService.query(query).subscribe(response => {
       this.standardSections = response.body;
-      this.section = !!this.section ? this.section : this.standardSections[0].id;
+      this.section = this.standardSections.length > 0 ? this.standardSections[0].id : null;
       this.getDashboardList();
       if (this.idReport) {
         this.getSelectedDashboard(this.idReport);
@@ -98,7 +98,8 @@ export class UtmComplianceSelectComponent implements OnInit {
   }
 
   getStandardList() {
-    this.cpStandardService.query({page: 0, size: 1000}).subscribe(
+    this.cpStandardService.query({page: 0, size: 1000})
+      .subscribe(
       (res: HttpResponse<any>) => {
         this.standards = res.body;
         this.standard = !!this.standard ? this.standard : this.standards[0].id;
diff --git a/frontend/src/app/data-management/alert-management/alert-view/alert-view.component.html b/frontend/src/app/data-management/alert-management/alert-view/alert-view.component.html
@@ -160,6 +160,7 @@ <h5 class="card-title mb-0 text-uppercase label-header">
                     *ngIf="(td.visible)">
                   <app-data-field-render (refreshData)="onRefreshData($event)" [data]="alert"
                                          [field]="td"
+                                         [tags]="tags"
                                          [dataType]="dataType"
                                          [showStatusChange]="true"></app-data-field-render>
                 </td>
diff --git a/frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-note/alert-apply-note.component.html b/frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-note/alert-apply-note.component.html
@@ -2,15 +2,16 @@
      placement="top"
      tooltipClass="utm-tooltip-top">
 <span #notePopober=ngbPopover
-      [ngbPopover]="colContent"
+      [ngbPopover]="showIcon ? colContent : ''"
       [popoverTitle]="colTitle"
       autoClose="outside"
-      class="text-blue-800 position-relative cursor-pointer small-md-icon"
+      [ngClass]="{'text-blue-800 position-relative cursor-pointer': showIcon}"
+      class="small-md-icon"
       container="body"
       placement="auto"
       popoverClass="utm-popover"
       triggers="click">
-  <i [ngClass]="creating?'icon-spinner2 spinner':note==='' ? 'icon-pencil3' : 'icon-pencil4'"></i>
+  <i *ngIf="showIcon" [ngClass]="creating?'icon-spinner2 spinner':note==='' ? 'icon-pencil3' : 'icon-pencil4'"></i>
   <span *ngIf="showNote" class="ml-3">
     {{note}}
   </span>
diff --git a/frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-note/alert-apply-note.component.ts b/frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-note/alert-apply-note.component.ts
@@ -17,6 +17,7 @@ export class AlertApplyNoteComponent implements OnInit, OnChanges {
   @Output() applyNote = new EventEmitter<string>();
   note: string;
   creating = false;
+  @Input( )showIcon = true;
 
   constructor(private alertServiceManagement: AlertManagementService,
               private utmToastService: UtmToastService,
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
@@ -2,10 +2,10 @@
      placement="auto"
      container="body"
      tooltipClass="utm-tooltip-top" (click)="addNewTagRule()" *ngIf="tags;else loadingTag">
-    <span class="text-blue-800 position-relative cursor-pointer small-md-icon text-center d-inline"
-    >
+    <span [ngClass]="{'text-blue-800 position-relative cursor-pointer': showIcon}"
+      class="small-md-icon text-center d-inline">
 
-      <i [ngClass]="icon" [ngStyle]="{'color':color}"></i>
+      <i *ngIf="showIcon" [ngClass]="icon" [ngStyle]="{'color':color}"></i>
       <span *ngIf="selected.length>1" class="tag-count badge badge-danger">
         {{selected.length <= 5 ? selected.length : '+5'}}
       </span>
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
@@ -20,6 +20,7 @@ export class AlertTagsApplyComponent implements OnInit, OnChanges {
   @Output() applyTagsEvent = new EventEmitter<{ tags: string[], automatic: boolean }>();
   icon: string;
   color: string;
+  @Input() showIcon = true;
 
   constructor(private modalService: NgbModal,
               private alertUpdateTagBehavior: AlertUpdateTagBehavior) {
@@ -50,6 +51,9 @@ export class AlertTagsApplyComponent implements OnInit, OnChanges {
   }
 
   addNewTagRule() {
+    if (!this.showIcon){
+      return;
+    }
     const modalRef = this.modalService.open(AlertRuleCreateComponent, {centered: true, size: 'lg'});
     modalRef.componentInstance.alert = this.alert;
     modalRef.componentInstance.action = 'select';
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
@@ -340,13 +340,6 @@ export class AlertRuleCreateComponent implements OnInit, OnDestroy {
   getTags() {
     this.alertTagService.query({page: 0, size: 100}).subscribe(reponse => {
       this.tags = reponse.body;
-      if (this.isForComplete) {
-        const index = this.tags.findIndex(value => value.tagName.includes('False positive'));
-        if (index !== -1) {
-          this.selected.push(this.tags[0]);
-          this.formRule.get('tags').setValue(this.selected);
-        }
-      }
     });
   }
 
diff --git a/frontend/src/app/data-management/alert-management/shared/components/data-field-render/data-field-render.component.html b/frontend/src/app/data-management/alert-management/shared/components/data-field-render/data-field-render.component.html
@@ -11,9 +11,13 @@
   <app-alert-severity *ngSwitchCase="SEVERITY_LABEL_FIELD"
                       [severity]="resolveSeverity(data)"></app-alert-severity>
   <app-alert-tags-apply *ngSwitchCase="TAGS_FIELD"
+                        [tags]="this.tags"
+                        [showIcon]="false"
                         [alert]="data"
                         [showTagsLabel]="true"></app-alert-tags-apply>
-  <app-alert-apply-note *ngSwitchCase="NOTE_FIELD" [alert]="data" [showNote]="true"></app-alert-apply-note>
+  <app-alert-apply-note *ngSwitchCase="NOTE_FIELD"
+                        [showIcon]="false"
+                        [alert]="data" [showNote]="true"></app-alert-apply-note>
   <span *ngSwitchDefault [ngClass]="field.customStyle">
     <span *ngIf="field.type!=='date';else dateValue"
           [openDelay]="3000" ngbTooltip="{{resolveValue(data, field)}}">
diff --git a/frontend/src/app/data-management/alert-management/shared/components/data-field-render/data-field-render.component.ts b/frontend/src/app/data-management/alert-management/shared/components/data-field-render/data-field-render.component.ts
@@ -10,6 +10,7 @@ import {
   ALERT_TIMESTAMP_FIELD
 } from '../../../../../shared/constants/alert/alert-field.constant';
 import {UtmDateFormatEnum} from '../../../../../shared/enums/utm-date-format.enum';
+import {AlertTags} from '../../../../../shared/types/alert/alert-tag.type';
 import {UtmAlertType} from '../../../../../shared/types/alert/utm-alert.type';
 import {UtmFieldType} from '../../../../../shared/types/table/utm-field.type';
 import {extractValueFromObjectByPath} from '../../../../../shared/util/get-value-object-from-property-path.util';
@@ -25,6 +26,7 @@ export class DataFieldRenderComponent implements OnInit {
   @Input() field: UtmFieldType;
   @Input() showStatusChange: boolean;
   @Input() dataType: EventDataTypeEnum;
+  @Input() tags: AlertTags[] = [];
   @Output() refreshData = new EventEmitter<boolean>();
   STATUS_FIELD = ALERT_STATUS_FIELD;
   SEVERITY_FIELD = ALERT_SEVERITY_FIELD;
diff --git a/frontend/src/app/shared/components/utm/table/utm-table/dynamic-table/dynamic-table.component.ts b/frontend/src/app/shared/components/utm/table/utm-table/dynamic-table/dynamic-table.component.ts
@@ -4,7 +4,10 @@ import {SortEvent} from '../../../../../directives/sortable/type/sort-event';
 import {ElasticDataTypesEnum} from '../../../../../enums/elastic-data-types.enum';
 import {UtmDateFormatEnum} from '../../../../../enums/utm-date-format.enum';
 import {UtmFieldType} from '../../../../../types/table/utm-field.type';
-import {convertObjectToKeyValueArray, extractValueFromObjectByPath} from '../../../../../util/get-value-object-from-property-path.util';
+import {
+  convertObjectToKeyValueArray,
+  extractFieldValueFromKvArray
+} from '../../../../../util/get-value-object-from-property-path.util';
 
 @Component({
   selector: 'app-dynamic-table',
@@ -85,7 +88,7 @@ export class UtmDynamicTableComponent implements OnInit {
   }
 
   resolveTdValue(row: any, td: UtmFieldType): any {
-    const value = extractValueFromObjectByPath(row, td);
+    const value = extractFieldValueFromKvArray(row, td);
     return td.type === this.dataTypeEnum.DATE && value === '-' ?
       null : value;
   }
diff --git a/frontend/src/app/shared/components/utm/table/utm-table/utm-table-detail/utm-table-detail-view/utm-table-detail-view.component.ts b/frontend/src/app/shared/components/utm/table/utm-table/utm-table-detail/utm-table-detail-view/utm-table-detail-view.component.ts
@@ -1,7 +1,8 @@
 import {Component, Input, OnInit} from '@angular/core';
 import {IndexFieldController} from '../../../../../../../log-analyzer/shared/behaviors/index-field-controller.behavior';
 import {ElasticOperatorsEnum} from '../../../../../../enums/elastic-operators.enum';
-import {convertObjectToKeyValueArray} from '../../../../../../util/get-value-object-from-property-path.util';
+import { flattenToKeyValueArray,
+} from '../../../../../../util/get-value-object-from-property-path.util';
 import {UtmFilterBehavior} from '../../../../filters/utm-elastic-filter/shared/behavior/utm-filter.behavior';
 
 @Component({
@@ -21,7 +22,7 @@ export class UtmTableDetailViewComponent implements OnInit {
   ngOnInit() {
     this.tableData = [];
     if (this.rowDocument) {
-      this.tableData = convertObjectToKeyValueArray(this.rowDocument);
+      this.tableData = flattenToKeyValueArray(this.rowDocument);
     }
   }
 
diff --git a/frontend/src/app/shared/util/get-value-object-from-property-path.util.ts b/frontend/src/app/shared/util/get-value-object-from-property-path.util.ts
@@ -69,6 +69,21 @@ export function extractValueFromObjectByPath(row: any, field: UtmFieldType) {
   return tdValue ? tdValue : '-';
 }
 
+export function extractFieldValueFromKvArray(row: any, field: UtmFieldType) {
+  const arrayRow = flattenToKeyValueArray(row);
+  const objectRow = arrayRow
+    .reduce((acc, { key, value }) => {
+      acc[key] = value;
+      return acc;
+    }, {});
+
+  const fieldExtract = field.field.includes('.keyword') ?
+    field.field.replace('.keyword', '') : field.field;
+
+  const tdValue = convertByType(objectRow[fieldExtract]);
+  return tdValue ? tdValue : '-';
+}
+
 export function convertByType(data: any) {
 
   if (data && typeof data === 'object') {
@@ -90,6 +105,41 @@ export function convertObjectToKeyValueArray(object) {
   }
 }
 
+export function flattenToKeyValueArray(obj: any, parentKey: string = ''): { key: string, value: any }[] {
+  const result: { key: string, value: any }[] = [];
+
+  for (const key in obj) {
+    if (!obj.hasOwnProperty(key)) { continue; }
+
+    const value = obj[key];
+    const fullKey = parentKey ? `${parentKey}.${key}` : key;
+
+    if (Array.isArray(value)) {
+      if (value.length > 0 && typeof value[0] === 'object') {
+        const formattedArray = value.map(item => {
+          if (typeof item === 'object' && item !== null) {
+            return Object.entries(item)
+              .map(([k, v]) => `${k}=${v}`)
+              .join(', ');
+          } else {
+            return String(item);
+          }
+        }).join(' | ');
+        result.push({ key: fullKey, value: formattedArray });
+      } else {
+        result.push({ key: fullKey, value: value.join(', ') });
+      }
+    } else if (value !== null && typeof value === 'object') {
+      result.push(...flattenToKeyValueArray(value, fullKey));
+    } else {
+      result.push({ key: fullKey, value });
+    }
+  }
+
+  return result;
+}
+
+
 export function findInObject(obj, item) {
   for (const key in obj) {
     if (obj[key] && typeof obj[key] === 'object') {
