Merge pull request #1002 from utmstack/bugfix/10.5.18/add-compliance

Bugfix/10.5.18/add compliance

Author: c3s4rfred

CHANGELOG.md

@@ -4,10 +4,10 @@
 - Fixed time filter updates not reflecting in the filter string.
 - Fixed index pattern changes not updating the browser URL.
 - Fixed container memory resource distribution
+- Fixed empty column status in cvs export
 ## New Features
 - Restricted time filter to a maximum range of one month.
 - Made the timestamp field mandatory and added a summary view when no fields are selected.
 - Moved “Add Filter” button to the left and improved filter UI with better icons.
 - Removed unnecessary header space to enhance table visibility.
-- Added "contains one of" and "does not contain one of" operators to filters.
-- Improved compliance report views with added functionalities, including status tracking and evidence attachments.
+- Added "contains one of" and "does not contain one of" operators to filters.

backend/src/main/resources/config/application-dev.yml

@@ -44,7 +44,7 @@ spring:
         cache: false
 
 server:
-    port: 8081
+    port: 8080
 
 jhipster:
     # CORS is only enabled by default with the "dev" profile

backend/src/main/resources/config/liquibase/changelog/20241120001_update_compliance_menu.xml

@@ -24,24 +24,6 @@
                 name = 'Alerts And Incidents'
             WHERE id = 505;
 
-            INSERT INTO public.utm_menu (id, name, url, parent_id, type, dashboard_id, position, menu_active, menu_action, menu_icon, module_name_short)
-            VALUES (507, 'CMMC', 'compliance/report-viewer?standardId=1000000&standardName=CMMC', 500, 1, null, 6, true, false, null, null);
-
-            INSERT INTO public.utm_menu (id, name, url, parent_id, type, dashboard_id, position, menu_active, menu_action, menu_icon, module_name_short)
-            VALUES (508, 'HIPAA', 'compliance/report-viewer?standardId=1000001&standardName=HIPAA', 500, 1, null, 7, true, false, null, null);
-
-            INSERT INTO public.utm_menu (id, name, url, parent_id, type, dashboard_id, position, menu_active, menu_action, menu_icon, module_name_short)
-            VALUES (509, 'BANKING AUDIT', 'compliance/report-viewer?standardId=1000002&standardName=BANKING AUDIT', 500, 1, null, 7, true, false, null, null);
-
-            INSERT INTO utm_menu_authority (menu_id, authority_name) VALUES (507, 'ROLE_ADMIN');
-            INSERT INTO utm_menu_authority (menu_id, authority_name) VALUES (507, 'ROLE_USER');
-
-            INSERT INTO utm_menu_authority (menu_id, authority_name) VALUES (508, 'ROLE_ADMIN');
-            INSERT INTO utm_menu_authority (menu_id, authority_name) VALUES (508, 'ROLE_USER');
-
-            INSERT INTO utm_menu_authority (menu_id, authority_name) VALUES (509, 'ROLE_ADMIN');
-            INSERT INTO utm_menu_authority (menu_id, authority_name) VALUES (509, 'ROLE_USER');
-
             ALTER TABLE utm_compliance_report_config
                 ADD COLUMN IF NOT EXISTS config_report_note TEXT;
 

backend/src/main/resources/config/liquibase/changelog/20250127001_add_compliance_data.xml

@@ -71,9 +71,4 @@
 
     <include file="/config/liquibase/changelog/20241120001_update_compliance_menu.xml" relativeToChangelogFile="false"/>
 
-    <include file="/config/liquibase/changelog/20250127001_add_compliance_data.xml" relativeToChangelogFile="false"/>
-
-
-
-
 </databaseChangeLog>

backend/src/main/resources/config/liquibase/master.xml

@@ -56,6 +56,7 @@ import {getCurrentAlertStatus, getStatusName} from '../shared/util/alert-util-fu
 import {CheckEmailConfigService, ParamShortType} from '../../../shared/services/util/check-email-config.service';
 import {Subject} from "rxjs";
 import {takeUntil} from "rxjs/operators";
+import {ElasticDataTypesEnum} from "../../../shared/enums/elastic-data-types.enum";
 
 @Component({
   selector: 'app-alert-view',
@@ -327,7 +328,25 @@ export class AlertViewComponent implements OnInit, OnDestroy {
       {centered: true});
     modalSaveReport.componentInstance.filters = this.filters;
     modalSaveReport.componentInstance.dataType = this.dataType;
-    modalSaveReport.componentInstance.fields = this.fields.filter(value => value.visible === true);
+    modalSaveReport.componentInstance.fields = this.getColumnToExport();
+  }
+
+  getColumnToExport() {
+    let fields = this.fields.filter(value => value.visible === true);
+
+    fields = fields.map( f => {
+      if (f.field === ALERT_STATUS_FIELD) {
+        f = {
+          ...f,
+          field: ALERT_STATUS_LABEL_FIELD,
+          type: ElasticDataTypesEnum.STRING
+        };
+      }
+
+      return f;
+    });
+
+    return fields;
   }
 
   toggleCheck() {