diff --git a/CHANGELOG.md b/CHANGELOG.md index 56e2a745e..a6b181782 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,13 @@ -# UTMStack 10.5.18 Release Notes -## Bugfix -- Fixed unable to change status to complete if observations contains french characters -- Fixed Elastic filter time adds unnecessary /d to intervals in Log Explorer -- Fixed handle special characters in password query parameter -- Fixed filter duplication issue in Log Explorer when removing filters -- Fixed Cisco ASA and Cisco Firepower filters when the data coming without syslog date or host information +# UTMStack 10.5.19 Release Notes +## Bug Fixes +- Fixed issue where log fields in the table didn't match the data when adding filters. +- Fixed time filter updates not reflecting in the filter string. +- Fixed index pattern changes not updating the browser URL. - Fixed container memory resource distribution +## 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. \ No newline at end of file diff --git a/backend/src/main/java/com/park/utmstack/domain/compliance/UtmComplianceReportConfig.java b/backend/src/main/java/com/park/utmstack/domain/compliance/UtmComplianceReportConfig.java index 9687f5f1a..66a9ed1a5 100644 --- a/backend/src/main/java/com/park/utmstack/domain/compliance/UtmComplianceReportConfig.java +++ b/backend/src/main/java/com/park/utmstack/domain/compliance/UtmComplianceReportConfig.java @@ -37,6 +37,9 @@ public class UtmComplianceReportConfig implements Serializable { @Column(name = "config_solution") private String configSolution; + @Column(name = "config_report_remediation") + private String configRemediation; + @JsonIgnore @Column(name = "config_report_columns") private String configReportColumns; @@ -325,4 +328,12 @@ public String getConfigReportName() { public void setConfigReportName(String configReportName) { this.configReportName = configReportName; } + + public String getConfigRemediation() { + return configRemediation; + } + + public void setConfigRemediation(String configRemediation) { + this.configRemediation = configRemediation; + } } diff --git a/backend/src/main/resources/config/liquibase/changelog/20241120001_update_compliance_menu.xml b/backend/src/main/resources/config/liquibase/changelog/20241120001_update_compliance_menu.xml index 09a4a078a..78b8963ec 100644 --- a/backend/src/main/resources/config/liquibase/changelog/20241120001_update_compliance_menu.xml +++ b/backend/src/main/resources/config/liquibase/changelog/20241120001_update_compliance_menu.xml @@ -8,32 +8,22 @@ + + + + + + + + diff --git a/backend/src/main/resources/config/liquibase/master.xml b/backend/src/main/resources/config/liquibase/master.xml index b393305b2..0824026dd 100644 --- a/backend/src/main/resources/config/liquibase/master.xml +++ b/backend/src/main/resources/config/liquibase/master.xml @@ -71,5 +71,7 @@ + + diff --git a/frontend/src/app/compliance/compliance-report-viewer/compliance-report-viewer.component.css b/frontend/src/app/compliance/compliance-report-viewer/compliance-report-viewer.component.css index 9831ad69a..ceaa2baa9 100644 --- a/frontend/src/app/compliance/compliance-report-viewer/compliance-report-viewer.component.css +++ b/frontend/src/app/compliance/compliance-report-viewer/compliance-report-viewer.component.css @@ -1,6 +1,5 @@ -.full-height { - height: 90vh; - overflow-y: auto; +.box-sizing{ + box-sizing: border-box; } ::ng-deep app-compliance-report-viewer gridster { background-color: unset !important; @@ -39,5 +38,14 @@ box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); } +.content-menu { + overflow: hidden; +} + +.sidebar-section { + position: sticky; + align-self: start; + width: 350px; +} diff --git a/frontend/src/app/compliance/compliance-report-viewer/compliance-report-viewer.component.html b/frontend/src/app/compliance/compliance-report-viewer/compliance-report-viewer.component.html index 5c0790186..767631fb4 100644 --- a/frontend/src/app/compliance/compliance-report-viewer/compliance-report-viewer.component.html +++ b/frontend/src/app/compliance/compliance-report-viewer/compliance-report-viewer.component.html @@ -1,6 +1,6 @@ -
+
-
+
Reports Templates {{ standard ? ': ' + standard.standardName : '' }} @@ -20,10 +20,10 @@
-
+
-
-
+
+
@@ -44,13 +44,15 @@
-
-
+
+
diff --git a/frontend/src/app/compliance/compliance-report-viewer/compliance-report-viewer.component.ts b/frontend/src/app/compliance/compliance-report-viewer/compliance-report-viewer.component.ts index 8efdb97b3..f2e0e4e82 100644 --- a/frontend/src/app/compliance/compliance-report-viewer/compliance-report-viewer.component.ts +++ b/frontend/src/app/compliance/compliance-report-viewer/compliance-report-viewer.component.ts @@ -1,5 +1,5 @@ import {HttpErrorResponse} from '@angular/common/http'; -import {AfterViewInit, Component, OnDestroy, OnInit} from '@angular/core'; +import {AfterViewInit, Component, HostListener, OnDestroy, OnInit} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; import {NgbModal, NgbModalOptions} from '@ng-bootstrap/ng-bootstrap'; import {NgxSpinnerService} from 'ngx-spinner'; @@ -37,6 +37,7 @@ export class ComplianceReportViewerComponent implements OnInit, AfterViewInit, O page: 0, size: 15 }; + viewportHeight: number; constructor(private standardSectionService: CpStandardSectionService, private toastService: UtmToastService, @@ -50,6 +51,12 @@ export class ComplianceReportViewerComponent implements OnInit, AfterViewInit, O private localStorage: LocalStorageService) { this.standard = this.localStorage.retrieve('selectedStandard'); + this.viewportHeight = window.innerHeight; + } + + @HostListener('window:resize', ['$event']) + onResize(event: Event) { + this.viewportHeight = window.innerHeight; } ngOnInit() { @@ -131,12 +138,17 @@ export class ComplianceReportViewerComponent implements OnInit, AfterViewInit, O }); } - onChangeSectionActive(index: number, sections: ComplianceStandardType[]) { - console.log(index, sections); + onChangeSectionActive(index: number, section: ComplianceStandardSectionType, sections: ComplianceStandardSectionType[]) { this.activeIndexSection = index; - this.standardSectionService.notifyRefresh({ - loading: true, - activeSection: index + sections.forEach((sec, i) => { + if (i === index) { + sec.isCollapsed = true; + sec.isActive = true; + this.activeSection = section; + } else { + sec.isCollapsed = false; + sec.isActive = false; + } }); } @@ -184,6 +196,10 @@ export class ComplianceReportViewerComponent implements OnInit, AfterViewInit, O this.pageable = $event; } + getMenuHeight() { + return 100 - ((150 / this.viewportHeight) * 100) + 'vh'; + } + ngOnDestroy(): void { this.reportsService.loadReport(null); this.destroy$.next(); diff --git a/frontend/src/app/compliance/compliance-reports-view/compliance-reports-view.component.html b/frontend/src/app/compliance/compliance-reports-view/compliance-reports-view.component.html index d826557a6..76e3fbac2 100644 --- a/frontend/src/app/compliance/compliance-reports-view/compliance-reports-view.component.html +++ b/frontend/src/app/compliance/compliance-reports-view/compliance-reports-view.component.html @@ -5,7 +5,7 @@
- Compliance assesment + Compliance assessment
-

{{ report.associatedDashboard.name }}

+

{{ report.configReportName ? report.configReportName : report.associatedDashboard.name }}

{{ report.associatedDashboard.description }}
diff --git a/frontend/src/app/compliance/compliance-reports-view/components/compliance-report-detail/compliance-report-detail.component.html b/frontend/src/app/compliance/compliance-reports-view/components/compliance-report-detail/compliance-report-detail.component.html index 48fd26b15..ed0f0cfb7 100644 --- a/frontend/src/app/compliance/compliance-reports-view/components/compliance-report-detail/compliance-report-detail.component.html +++ b/frontend/src/app/compliance/compliance-reports-view/components/compliance-report-detail/compliance-report-detail.component.html @@ -58,6 +58,16 @@
+ +
+ Compliance remediation: +
+ +
+ +
+ +
Evidence:
diff --git a/frontend/src/app/compliance/compliance-result-view/compliance-result-view.component.ts b/frontend/src/app/compliance/compliance-result-view/compliance-result-view.component.ts index cbf00407b..7730e53ae 100644 --- a/frontend/src/app/compliance/compliance-result-view/compliance-result-view.component.ts +++ b/frontend/src/app/compliance/compliance-result-view/compliance-result-view.component.ts @@ -97,12 +97,9 @@ export class ComplianceResultViewComponent implements OnInit, OnDestroy { .pipe(takeUntil(this.destroy$), filter(params => !!params), tap(() => this.loadingVisualizations = true), - map(params => ({ - ...params, - template: params.template.id - }))) + ) .subscribe(params => { - this.initializeReportParams(params); + this.loadReport(params); }); this.timeFilterBehavior.$time @@ -116,7 +113,19 @@ export class ComplianceResultViewComponent implements OnInit, OnDestroy { }); } - initializeReportParams(params) { + loadReport(params: any) { + this.reportId = params.template.id; + this.standardId = params[ComplianceParamsEnum.STANDARD_ID]; + this.sectionId = params[ComplianceParamsEnum.SECTION_ID]; + + this.report = params.template; + this.dashboardId = this.report.dashboardId; + this.visualizationRender = this.report.dashboard; + this.loadingVisualizations = false; + + } + + initializeReportParams(params: any) { this.reportId = params[ComplianceParamsEnum.TEMPLATE]; this.standardId = params[ComplianceParamsEnum.STANDARD_ID]; this.sectionId = params[ComplianceParamsEnum.SECTION_ID]; diff --git a/frontend/src/app/compliance/shared/components/utm-compliance-create/utm-compliance-create.component.html b/frontend/src/app/compliance/shared/components/utm-compliance-create/utm-compliance-create.component.html index 1986989e6..742e8f0cb 100644 --- a/frontend/src/app/compliance/shared/components/utm-compliance-create/utm-compliance-create.component.html +++ b/frontend/src/app/compliance/shared/components/utm-compliance-create/utm-compliance-create.component.html @@ -59,9 +59,14 @@
- +
+ +
+ + +
diff --git a/frontend/src/app/compliance/shared/components/utm-compliance-create/utm-compliance-create.component.ts b/frontend/src/app/compliance/shared/components/utm-compliance-create/utm-compliance-create.component.ts index ab818fe8a..66f6807bd 100644 --- a/frontend/src/app/compliance/shared/components/utm-compliance-create/utm-compliance-create.component.ts +++ b/frontend/src/app/compliance/shared/components/utm-compliance-create/utm-compliance-create.component.ts @@ -9,7 +9,7 @@ import {CpReportBehavior} from '../../behavior/cp-report.behavior'; import {ComplianceTypeEnum} from '../../enums/compliance-type.enum'; import {CpReportsService} from '../../services/cp-reports.service'; import {ComplianceReportType} from '../../type/compliance-report.type'; -import {FormBuilder, FormGroup, Validators} from "@angular/forms"; +import {FormBuilder, FormGroup, Validators} from '@angular/forms'; @Component({ selector: 'app-utm-compliance-create', @@ -44,7 +44,8 @@ export class UtmComplianceCreateComponent implements OnInit { this.complianceForm = this.fb.group({ reportName: [this.report ? this.report.configReportName : '' , [Validators.required, Validators.minLength(10), Validators.maxLength(200)]], - solution: [this.report ? this.report.configSolution : '', [Validators.maxLength(2000)]] + solution: [this.report ? this.report.configSolution : '', [Validators.maxLength(2000)]], + remediation: [this.report && this.report.configRemediation ? this.report.configRemediation : '', [Validators.maxLength(2000)]] }); if (this.report) { @@ -102,6 +103,7 @@ export class UtmComplianceCreateComponent implements OnInit { // configReportRequestType: ComplianceRequestTypeEnum.POST, // configReportResourceUrl: ELASTIC_SEARCH_ENDPOINT, configSolution: this.complianceForm.controls.solution.value.replace(/\r?\n/g, '
'), + configRemediation: this.complianceForm.controls.remediation.value.replace(/\r?\n/g, '
'), // requestBodyFilters: this.filters, // requestParamFilters: REQUEST_PARAMS_FILTER, configType: ComplianceTypeEnum.TEMPLATE, diff --git a/frontend/src/app/compliance/shared/components/utm-cp-section/utm-cp-section.component.css b/frontend/src/app/compliance/shared/components/utm-cp-section/utm-cp-section.component.css index e0a53e9c4..7e146869b 100644 --- a/frontend/src/app/compliance/shared/components/utm-cp-section/utm-cp-section.component.css +++ b/frontend/src/app/compliance/shared/components/utm-cp-section/utm-cp-section.component.css @@ -4,88 +4,43 @@ transition: background-color 0.3s; } -.section-name.section-active { - background-color: #e9e9e9; -} - -.section-name:hover { - background-color: #f0f0f0; -} - .section-title { font-size: 0.95rem; - font-weight: 500; color: #333; } -.toggle-button { - background: transparent; - border: none; - color: #666; -} - -.section-content { - background-color: #fafafa; - padding: 12px 16px; -} - -.section-content.show { - background-color: #f4f4f4; +.dropdown-btn, .section-item { + text-align: left; + padding: 5px 16px; + font-size: 13px; + line-height: 20px; + text-decoration: none; + border-radius: 6px; } -.report-item { - display: flex; - align-items: center; - padding: 6px 0; - opacity: 0.9; -} - -.report-item:hover { - background-color: #f2f2f2; - opacity: 1; -} - -.text-primary { - color: #333; +.dropdown-btn.active, +.dropdown-btn:hover, +.section-item:hover, +.section-item.active { font-weight: 500; + font-size: 0.90rem; + background-color: rgb(233 233 233 / 0.7); } -.icon-arrow-down32, .icon-arrow-up32 { - transition: transform 0.3s; -} - -.collapse.section-content { - background-color: #f8f9fa; /* Fondo gris claro para la sección desplegable */ - border-top: 1px solid #dcdcdc; /* Borde superior gris claro */ - padding: 10px; /* Espaciado interno */ - transition: all 0.3s ease; /* Suaviza todas las transiciones */ - box-shadow: none; /* Sin sombra inicialmente */ - margin-top: -1px; /* Para superponer el borde superior con la sección */ +.dropdown-btn span{ + flex-grow: 1; } -.collapse.section-content.show { - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2); /* Sombra interna al expandirse */ - transform: scale(1); /* Mantiene el tamaño original al expandirse */ -} +.submenu { + display: grid; + grid-template-rows: 0fr; + transition: 300ms ease-in-out; -.report-item { - background-color: transparent; /* Fondo transparente para cada reporte */ - padding: 2px; /* Espaciado interno */ - border: none; /* Sin borde */ - margin-bottom: 5px; /* Separación entre reportes */ - transition: background-color 0.2s ease; /* Transición suave para el hover */ + > div { + overflow: hidden; + } } -.report-item:hover { - background-color: #e9ecef; /* Fondo gris claro al pasar el ratón */ +.submenu.show { + grid-template-rows: 1fr; } - -.text-primary { - color: #333333!important; /* Color de texto oscuro para mejor legibilidad */ - font-weight: normal; /* Peso normal del texto */ -} - -.report-item.selected label { - font-weight: 500; -} - diff --git a/frontend/src/app/compliance/shared/components/utm-cp-section/utm-cp-section.component.html b/frontend/src/app/compliance/shared/components/utm-cp-section/utm-cp-section.component.html index f214c0e11..c3787a9fe 100644 --- a/frontend/src/app/compliance/shared/components/utm-cp-section/utm-cp-section.component.html +++ b/frontend/src/app/compliance/shared/components/utm-cp-section/utm-cp-section.component.html @@ -1,44 +1,21 @@ -
- - {{ section.standardSectionName }} - -
- -
-
- - - {{ section.standardSectionName }} - - - + +
- - - + diff --git a/frontend/src/app/compliance/shared/components/utm-cp-section/utm-cp-section.component.ts b/frontend/src/app/compliance/shared/components/utm-cp-section/utm-cp-section.component.ts index 8a19e4b0b..bdb1a193b 100644 --- a/frontend/src/app/compliance/shared/components/utm-cp-section/utm-cp-section.component.ts +++ b/frontend/src/app/compliance/shared/components/utm-cp-section/utm-cp-section.component.ts @@ -1,5 +1,14 @@ import {HttpErrorResponse} from '@angular/common/http'; -import {ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; +import { + ChangeDetectionStrategy, + Component, + EventEmitter, + Input, + OnChanges, + OnInit, + Output, + SimpleChanges +} from '@angular/core'; import {EMPTY, Observable} from 'rxjs'; import {catchError, concatMap, filter, map, tap} from 'rxjs/operators'; import {UtmToastService} from '../../../../shared/alert/utm-toast.service'; @@ -13,7 +22,7 @@ import {ComplianceStandardSectionType} from '../../type/compliance-standard-sect styleUrls: ['./utm-cp-section.component.css', ], changeDetection: ChangeDetectionStrategy.OnPush }) -export class UtmCpSectionComponent implements OnInit { +export class UtmCpSectionComponent implements OnInit, OnChanges { @Input() section: ComplianceStandardSectionType; @Input() index: number; @@ -30,16 +39,9 @@ export class UtmCpSectionComponent implements OnInit { } ngOnInit() { - if (this.section.isActive && this.index === 0) { - this.reportsService.notifyRefresh({ - sectionId: this.section.id, - loading: true, - reportSelected: 0 - }); - } this.reports$ = this.reportsService.onRefresh$ .pipe(filter(reportRefresh => - !!reportRefresh && reportRefresh.loading && reportRefresh.sectionId === this.section.id), + !!reportRefresh && reportRefresh.loading && reportRefresh.sectionId === this.section.id && this.expandable), tap((reportRefresh) => { this.selected = reportRefresh.reportSelected; }), @@ -47,7 +49,8 @@ export class UtmCpSectionComponent implements OnInit { page: 0, size: 1000, standardId: this.section.standardId, - sectionId: this.section.id + sectionId: this.section.id, + expandDashboard: true, })), map((res) => { return res.body.map((r, index) => { @@ -70,31 +73,31 @@ export class UtmCpSectionComponent implements OnInit { })); } - loadReports() { - if (this.action === 'reports') { + ngOnChanges(changes: SimpleChanges): void { + if (this.section.isActive) { this.reportsService.notifyRefresh({ sectionId: this.section.id, loading: true, reportSelected: 0 }); } + } + loadReports() { if (!this.section.isActive) { this.isActive.emit(this.index); } } - generateReport(index: number, report: ComplianceReportType) { - if (this.section.isActive) { - this.reportsService.notifyRefresh({ - sectionId: this.section.id, - loading: true, - reportSelected: index - }); + generateReport(report: ComplianceReportType, reports: ComplianceReportType[]) { + if (this.section.isActive && report) { + reports.forEach(r => r.selected = false); + report.selected = true; + this.loadReport(report); } - this.loadReport(report); } + loadReport(report: ComplianceReportType) { this.reportsService.loadReport({ template: report, diff --git a/frontend/src/app/compliance/shared/type/compliance-report.type.ts b/frontend/src/app/compliance/shared/type/compliance-report.type.ts index 01a5bd6a7..746b179f9 100644 --- a/frontend/src/app/compliance/shared/type/compliance-report.type.ts +++ b/frontend/src/app/compliance/shared/type/compliance-report.type.ts @@ -5,7 +5,7 @@ import {ComplianceRequestTypeEnum} from '../enums/compliance-request-type.enum'; import {ComplianceTypeEnum} from '../enums/compliance-type.enum'; import {ComplianceStandardSectionType} from './compliance-standard-section.type'; import {ComplianceTemplateParams} from './compliance-template-params.type'; -import {UtmDashboardVisualizationType} from "../../../shared/chart/types/dashboard/utm-dashboard-visualization.type"; +import {UtmDashboardVisualizationType} from '../../../shared/chart/types/dashboard/utm-dashboard-visualization.type'; export class ComplianceReportType { columns?: UtmFieldType[]; @@ -17,6 +17,7 @@ export class ComplianceReportType { configReportRequestType?: ComplianceRequestTypeEnum; configReportResourceUrl?: string; configSolution?: string; + configRemediation?: string; id?: number; requestBodyFilters?: ElasticFilterType[]; requestParamFilters?: ComplianceTemplateParams[]; diff --git a/version.yml b/version.yml index d96c65c00..f0dd7f4d8 100644 --- a/version.yml +++ b/version.yml @@ -1 +1 @@ -version: 10.5.18 \ No newline at end of file +version: 10.5.19 \ No newline at end of file