Bugfix/10.5.18/route does not update when changing the index pattern

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

@@ -24,11 +24,32 @@
                 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;
+
             ALTER TABLE utm_compliance_report_config
-                ADD COLUMN config_report_note TEXT;
+                ADD COLUMN IF NOT EXISTS config_report_name varchar(250);
 
             ALTER TABLE utm_compliance_report_config
-                ADD COLUMN config_report_name varchar(250);
+                ADD COLUMN IF NOT EXISTS config_report_remediation TEXT;
             ]]>
         </sql>
     </changeSet>

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

@@ -69,9 +69,11 @@
 
     <include file="/config/liquibase/changelog/20241213001_updating_asa_and_firepower_filters.xml" relativeToChangelogFile="false"/>
 
-    <!--<include file="/config/liquibase/changelog/20241120001_update_compliance_menu.xml" relativeToChangelogFile="false"/>-->
+    <include file="/config/liquibase/changelog/20241120001_update_compliance_menu.xml" relativeToChangelogFile="false"/>
+
+    <include file="/config/liquibase/changelog/20250127001_add_compliance_data.xml" relativeToChangelogFile="false"/>
+
 
-    <include file="/config/liquibase/changelog/20250121001_add_remediation_column_config_report.xml" relativeToChangelogFile="false"/>
 
 
 </databaseChangeLog>

frontend/src/app/compliance/compliance-reports-view/compliance-reports-view.component.html

@@ -89,6 +89,7 @@ <h5 class="card-title mb-0 text-uppercase label-header d-flex align-items-center
         <div [hidden]="noData" class="my-4">
           <div class="row justify-content-center">
             <ngb-pagination
+              [(page)]="page"
               (pageChange)="loadPage($event)"
               [boundaryLinks]="true"
               [collectionSize]="totalItems"

frontend/src/app/compliance/compliance-reports-view/compliance-reports-view.component.ts

@@ -58,8 +58,8 @@ export class ComplianceReportsViewComponent implements OnInit, OnChanges, OnDest
           this.loading = true;
           this.selected = reportRefresh.reportSelected;
         }),
-        switchMap(() => this.reportsService.fetchData({
-          page: this.page,
+        switchMap((reportRefresh) => this.reportsService.fetchData({
+          page: reportRefresh.page,
           size: this.itemsPerPage,
           standardId: this.section.standardId,
           sectionId: this.section.id,
@@ -100,15 +100,16 @@ export class ComplianceReportsViewComponent implements OnInit, OnChanges, OnDest
     });
   }
 
-  loadPage(page: number) {
-    this.page = page - 1;
+  loadPage(pageEvent: number) {
+    const page = this.page !== 0 ? this.page - 1 : this.page;
     this.reportsService.notifyRefresh({
       loading: true,
       sectionId: this.section.id,
-      reportSelected: 0
+      reportSelected: 0,
+      page
     });
     this.pageChange.emit({
-      page: this.page,
+      page,
       size: this.itemsPerPage
     });
   }

frontend/src/app/compliance/compliance-reports-view/components/compliance-report-detail/compliance-report-detail.component.ts

@@ -68,6 +68,7 @@ export class ComplianceReportDetailComponent implements OnInit {
 
   @Input() set report(report: ComplianceReportType) {
     if (report) {
+      console.log('Report:', report);
       this._report = report;
       this.request = {
         ...this.request,

frontend/src/app/compliance/shared/services/cp-reports.service.ts

@@ -17,7 +17,7 @@ export interface ReportParams  {
   providedIn: 'root'
 })
 export class CpReportsService extends RefreshDataService<{ sectionId: number,
-  loading: boolean, reportSelected: number }, HttpResponse<ComplianceReportType[]>> {
+                  loading: boolean, reportSelected: number, page?: number }, HttpResponse<ComplianceReportType[]>> {
 
   private resourceUrl = SERVER_API_URL + 'api/compliance/report-config';
   private loadReportSubject = new BehaviorSubject<ReportParams>(null);