Merge remote-tracking branch 'origin/bugfix/10.5.18/add-compliance' into bugfix/10.5.18/add-compliance

Author: mjabascal10

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

@@ -35,7 +35,8 @@ export class ComplianceReportViewerComponent implements OnInit, AfterViewInit, O
   activeSection: ComplianceStandardSectionType = null;
   pageable = {
     page: 0,
-    size: 15
+    size: 15,
+    sort: 'configReportName,desc'
   };
   viewportHeight: number;
 
@@ -188,7 +189,8 @@ export class ComplianceReportViewerComponent implements OnInit, AfterViewInit, O
         standardId: this.activeSection.standardId,
         id: this.activeSection.id,
         page: this.pageable.page,
-        size: this.pageable.size
+        size: this.pageable.size,
+        sort: this.pageable.sort
    }));
   }
 

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

@@ -120,7 +120,8 @@ export class ComplianceReportsViewComponent implements OnInit, OnChanges, OnDest
     });
     this.pageChange.emit({
       page,
-      size: this.itemsPerPage
+      size: this.itemsPerPage,
+      sort: this.sort
     });
   }
 

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

@@ -1,13 +1,13 @@
+import { HttpErrorResponse } from '@angular/common/http';
 import {ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit, Output} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
 import {EMPTY, Observable} from 'rxjs';
 import {catchError, concatMap, filter, map, takeUntil, tap} from 'rxjs/operators';
-import { ComplianceReportType } from '../../../shared/type/compliance-report.type';
-import { HttpErrorResponse } from '@angular/common/http';
 import { CpReportsService } from 'src/app/compliance/shared/services/cp-reports.service';
 import { ComplianceStandardSectionType } from 'src/app/compliance/shared/type/compliance-standard-section.type';
 import { UtmToastService } from 'src/app/shared/alert/utm-toast.service';
 import { SortByType } from 'src/app/shared/types/sort-by.type';
-import { ActivatedRoute } from '@angular/router';
+import { ComplianceReportType } from '../../../shared/type/compliance-report.type';
 
 
 @Component({
@@ -22,8 +22,6 @@ export class CompliancePrintViewComponent implements OnInit, OnDestroy {
   reports$: Observable<ComplianceReportType[]>;
   selected: number;
   fields: SortByType[];
-
-  reportDetail: ComplianceReportType;
   preparingPrint = true;
 
   constructor(private reportsService: CpReportsService,
@@ -42,6 +40,8 @@ export class CompliancePrintViewComponent implements OnInit, OnDestroy {
           standardId: this.section.standardId,
           sectionId: this.section.id,
           expandDashboard: true,
+          setStatus: true,
+          sort: params.sort,
         })),
         map((res) => {
           return res.body.map((r, index) => {
@@ -62,13 +62,11 @@ export class CompliancePrintViewComponent implements OnInit, OnDestroy {
     report.visualization = visualization;
   }
 
-  ngOnDestroy(): void {
-    throw new Error('Method not implemented.');
-  }
-
   onVisualizationLoaded(){
     this.preparingPrint = false;
   }
 
-
+  ngOnDestroy(): void {
+    throw new Error('Method not implemented.');
+  }
 }

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

@@ -44,7 +44,10 @@ export class ComplianceReportDetailComponent implements OnInit {
     this.compliance$ = this.utmRenderVisualization.onRefresh$
       .pipe(
         filter((refresh) => !!refresh),
-        concatMap(() => this.runVisualization.run(this.vis)),
+        concatMap(() => this.runVisualization.run(this.vis, {
+          page: 0,
+          size: 5,
+        })),
         map(run => run[0] && run[0] ? run[0] : {
           rows: []
         }),

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

@@ -184,6 +184,5 @@ export class ComplianceResultViewComponent implements OnInit, OnDestroy {
   ngOnDestroy() {
     this.destroy$.next();
     this.destroy$.complete();
-    console.log('destroy!!!');
   }
 }

frontend/src/app/graphic-builder/shared/components/viewer/table-view/table-view.component.html

@@ -118,7 +118,7 @@
           [size]="'sm'"></ngb-pagination>
       </div>
     </div>
-    <div *ngIf="!data  || !data.rows" class="h-100 w-100 p-5 d-flex justify-content-center align-items-center">
+    <div *ngIf="!loadingOption && (!data  || !data.rows)" class="h-100 w-100 p-5 d-flex justify-content-center align-items-center">
       <app-no-data-chart [error]="false" [typeChart]="chart"></app-no-data-chart>
     </div>
   </div>

frontend/src/app/graphic-builder/shared/components/viewer/table-view/table-view.component.ts

@@ -45,7 +45,7 @@ export class TableViewComponent implements OnInit, AfterViewInit, OnChanges {
    */
   @Input() exportFormat: boolean;
   @Output() runned = new EventEmitter<string>();
-  @Input() loadingOption = true;
+  @Input() loadingOption = false;
   @Input() chart: ChartTypeEnum;
   @Input() width: string;
   @Input() height: string;

frontend/src/app/graphic-builder/shared/services/run-visualization.service.ts

@@ -2,6 +2,7 @@ import {Injectable} from '@angular/core';
 import {Observable} from 'rxjs';
 import {VisualizationType} from '../../../shared/chart/types/visualization.type';
 import {VisualizationService} from '../../visualization/shared/services/visualization.service';
+import {createRequestOption} from "../../../shared/util/request-util";
 
 @Injectable({
   providedIn: 'root'
@@ -14,16 +15,18 @@ export class RunVisualizationService {
   /**
    * Method return observable of visualization run response
    * @param visualization Visualization to run
+   * @param request optional pagination
    */
-  run(visualization: VisualizationType): Observable<any> {
+  run(visualization: VisualizationType, request: any = {}): Observable<any> {
+    const req = createRequestOption(request);
     return new Observable<any>(subscriber => {
       if (typeof visualization.chartConfig !== 'string') {
         visualization.chartConfig = JSON.stringify(visualization.chartConfig);
       }
       if (typeof visualization.chartAction !== 'string') {
         visualization.chartAction = JSON.stringify(visualization.chartAction);
       }
-      this.visualizationService.run(visualization).subscribe(resp => {
+      this.visualizationService.run(visualization, req).subscribe(resp => {
         if (typeof visualization.chartConfig === 'string') {
           visualization.chartConfig = JSON.parse(visualization.chartConfig);
         }

frontend/src/app/graphic-builder/visualization/shared/services/visualization.service.ts

@@ -1,4 +1,4 @@
-import {HttpClient, HttpResponse} from '@angular/common/http';
+import {HttpClient, HttpParams, HttpResponse} from '@angular/common/http';
 import {Injectable} from '@angular/core';
 import {Observable} from 'rxjs';
 import {SERVER_API_URL} from '../../../../app.constants';
@@ -42,8 +42,8 @@ export class VisualizationService {
     return this.http.delete(this.resourceUrl + '/bulk-delete/' + visualizations, {observe: 'response'});
   }
 
-  run(visualization: VisualizationType): Observable<HttpResponse<any>> {
-    return this.http.post<VisualizationType>(this.resourceUrl + '/run', visualization, {observe: 'response'});
+  run(visualization: VisualizationType, params: HttpParams): Observable<HttpResponse<any>> {
+    return this.http.post<VisualizationType>(this.resourceUrl + '/run', visualization, {params, observe: 'response'});
   }
 
   bulkImport(visualizations: { visualizations: VisualizationType[], override: boolean }) {