Skip to content

Commit fc3307b

Browse files
AlexSanchez-bitelmilan06Kbayero
authored
refactor: rollback partial compliance report (#2241)
* refactor: rollback partial compliance report * chore[](go-deps):updated go dependencies --------- Co-authored-by: Elena Lopez Milan <elopez@utmstack.com> Co-authored-by: Yorjander Hernandez Vergara <99102374+Kbayero@users.noreply.github.com>
1 parent 05e5b89 commit fc3307b

8 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎frontend/src/app/compliance/compliance-management/cp-standard-management/cp-standard-management.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ <h5 class="card-title mb-0 text-uppercase label-header">Compliance management</h
3333
</div>
3434
<div class="col-lg-6 col-md-12 col-sm-12 pl-2 pr-0">
3535
<div class="card pt-2">
36-
<app-utm-cp-control-config></app-utm-cp-control-config>
37-
<!--<app-utm-cp-reports></app-utm-cp-reports>-->
36+
<!--<app-utm-cp-control-config></app-utm-cp-control-config>-->
37+
<app-utm-cp-reports></app-utm-cp-reports>
3838
</div>
3939
</div>
4040
</div>

‎frontend/src/app/compliance/compliance-management/cp-standard-management/cp-standard-management.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export class CpStandardManagementComponent implements OnInit {
5252
}
5353

5454
newCompliance() {
55-
//this.modalService.open(UtmComplianceCreateComponent, {centered: true});
56-
this.modalService.open(UtmComplianceControlCreateComponent, {centered: true, size: 'lg'});
55+
this.modalService.open(UtmComplianceCreateComponent, {centered: true});
56+
// this.modalService.open(UtmComplianceControlCreateComponent, {centered: true, size: 'lg'});
5757
}
5858
}

‎frontend/src/app/compliance/compliance-report-viewer/compliance-report-viewer.component.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,21 +48,21 @@ <h5 class="card-title mb-0 text-uppercase label-header">
4848
<div *ngFor="let section of sections$ | async as sections; let index = index; trackBy: trackFn"
4949
[ngClass]="{'mt-3': index === 0}"
5050
class="d-flex flex-column mb-1 mx-2">
51-
<!--<app-utm-cp-section [section]="section"
51+
<app-utm-cp-section [section]="section"
5252
[action]="action"
5353
[loadFirst]="index === activeIndexSection"
5454
[index]="index"
5555
(isActive)="onChangeSectionActive($event, section, sections)"
5656
[expandable]="action==='reports'">
57-
</app-utm-cp-section>-->
57+
</app-utm-cp-section>
5858

59-
<app-utm-cp-section-config [section]="section"
59+
<!--<app-utm-cp-section-config [section]="section"
6060
[action]="action"
6161
[loadFirst]="index === activeIndexSection"
6262
[index]="index"
6363
(isActive)="onChangeSectionActive($event, section, sections)"
6464
[expandable]="action ==='reports'">
65-
</app-utm-cp-section-config>
65+
</app-utm-cp-section-config>-->
6666
</div>
6767
</div>
6868
</div>
@@ -72,10 +72,10 @@ <h5 class="card-title mb-0 text-uppercase label-header">
7272
<div class="col overflow-auto h-100">
7373
<div class="card m-0">
7474
<!-- Conditional rendering based on selected action -->
75-
<app-compliance-latest-evaluations-view [section]="activeSection" (pageChange)="onPageChange($event)" *ngIf="action === 'compliance' && activeSection"></app-compliance-latest-evaluations-view>
76-
<app-compliance-evaluation-history-view *ngIf="action === 'reports'"></app-compliance-evaluation-history-view>
77-
<!--<app-compliance-reports-view [section]="activeSection" (pageChange)="onPageChange($event)" *ngIf="action === 'compliance' && activeSection"></app-compliance-reports-view>
78-
<app-compliance-result-view *ngIf="action === 'reports'" [showExport]="false" [template]="'compliance'"></app-compliance-result-view>-->
75+
<!--<app-compliance-latest-evaluations-view [section]="activeSection" (pageChange)="onPageChange($event)" *ngIf="action === 'compliance' && activeSection"></app-compliance-latest-evaluations-view>
76+
<app-compliance-evaluation-history-view *ngIf="action === 'reports'"></app-compliance-evaluation-history-view>-->
77+
<app-compliance-reports-view [section]="activeSection" (pageChange)="onPageChange($event)" *ngIf="action === 'compliance' && activeSection"></app-compliance-reports-view>
78+
<app-compliance-result-view *ngIf="action === 'reports'" [showExport]="false" [template]="'compliance'"></app-compliance-result-view>
7979
</div>
8080
</div>
8181
</div>

‎frontend/src/app/compliance/compliance-report-viewer/compliance-report-viewer.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ export class ComplianceReportViewerComponent implements OnInit, AfterViewInit, O
176176
return '/dashboard/export-compliance/' + this.report.id;
177177
} else {
178178
const section = this.getActiveSectionParams();
179-
// return encodeURIComponent('/compliance/print-view?section=' + section);
180-
return encodeURIComponent('/compliance/evaluations-print-view=' + section);
179+
return encodeURIComponent('/compliance/print-view?section=' + section);
180+
// return encodeURIComponent('/compliance/evaluations-print-view=' + section);
181181
}
182182
}
183183

‎plugins/aws/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ require (
3131
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.29 // indirect
3232
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.29 // indirect
3333
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.29 // indirect
34-
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.76.0
34+
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.77.0
3535
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.12 // indirect
3636
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.29 // indirect
3737
github.com/aws/aws-sdk-go-v2/service/sso v1.31.3 // indirect

‎plugins/aws/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.29 h1:RdwIf/CuUsvJX3RgJa
1818
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.29/go.mod h1:71wt8W2EgswdZy9Mf9KNnzxZ3TiZlv4caKghPktDOkA=
1919
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.30 h1:VTGy885W5DKBxWRUJbym9hytNaYzsyaPkCHGRRMAOhU=
2020
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.30/go.mod h1:AS0HycUvJRFvTt613AYDOgO2jzw+00cVSMny8XB3yMY=
21-
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.76.0 h1:wdP7t2nMLk/EzDTqVgBuBBvY7I461+kPn2+wUyQSelY=
22-
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.76.0/go.mod h1:N336OxQ6TvRbb6V1esVE8PtQFU86YvYaS+lVjsJTmP0=
21+
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.77.0 h1:tj7fwM3HuGZ7iuxmKWpi3nxvfxfz5u7yVToMCjmupbM=
22+
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.77.0/go.mod h1:N336OxQ6TvRbb6V1esVE8PtQFU86YvYaS+lVjsJTmP0=
2323
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.12 h1:ZD2+BSw9vFsNlKYIasSNt3uDbjqqXIBcM13UJv/Lx2k=
2424
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.12/go.mod h1:Ms4zlcVBbXbiP7EVLhl+lgjvA/a7YphqQ3Ih3174EmI=
2525
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.29 h1:DRebniUGZ2MqiiIVmQJ04vIXr918hubdHMnarSLEWyU=

‎plugins/modules-config/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.8.0
1010
github.com/aws/aws-sdk-go-v2/config v1.32.25
1111
github.com/aws/aws-sdk-go-v2/credentials v1.19.24
12-
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.76.0
12+
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.77.0
1313
github.com/aws/aws-sdk-go-v2/service/sts v1.43.3
1414
github.com/crowdstrike/gofalcon v0.21.0
1515
github.com/gin-gonic/gin v1.12.0

‎plugins/modules-config/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.29 h1:RdwIf/CuUsvJX3RgJa
5858
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.29/go.mod h1:71wt8W2EgswdZy9Mf9KNnzxZ3TiZlv4caKghPktDOkA=
5959
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.30 h1:VTGy885W5DKBxWRUJbym9hytNaYzsyaPkCHGRRMAOhU=
6060
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.30/go.mod h1:AS0HycUvJRFvTt613AYDOgO2jzw+00cVSMny8XB3yMY=
61-
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.76.0 h1:wdP7t2nMLk/EzDTqVgBuBBvY7I461+kPn2+wUyQSelY=
62-
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.76.0/go.mod h1:N336OxQ6TvRbb6V1esVE8PtQFU86YvYaS+lVjsJTmP0=
61+
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.77.0 h1:tj7fwM3HuGZ7iuxmKWpi3nxvfxfz5u7yVToMCjmupbM=
62+
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.77.0/go.mod h1:N336OxQ6TvRbb6V1esVE8PtQFU86YvYaS+lVjsJTmP0=
6363
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.12 h1:ZD2+BSw9vFsNlKYIasSNt3uDbjqqXIBcM13UJv/Lx2k=
6464
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.12/go.mod h1:Ms4zlcVBbXbiP7EVLhl+lgjvA/a7YphqQ3Ih3174EmI=
6565
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.29 h1:DRebniUGZ2MqiiIVmQJ04vIXr918hubdHMnarSLEWyU=

0 commit comments

Comments
 (0)