Merge remote-tracking branch 'origin/bugfix/v10.5.5/issue-in-report-creation' into bugfix/v10.5.5/issue-in-report-creation

Author: mjabascal10

frontend/src/app/app.component.html

@@ -110,16 +110,13 @@
 </ngx-spinner>
 
 <app-utm-header-health-warning *appHasAnyAuthority="roles" [hidden]="isInExportRoute()"></app-utm-header-health-warning>
-
 <div class="offline" *ngIf="offline">
-  <div
-    class="w-100 p-4 bg-danger-400 d-flex justify-content-center align-items-center">
+  <div class="w-100 p-4 bg-danger-400 d-flex justify-content-center align-items-center">
     <h6 class="font-weight-semibold">Unable to connect with the server</h6>
   </div>
 </div>
-<div class="offline" *ngIf="offline !== null && !offline">
-  <div
-    class="w-100 p-4 bg-success-400 d-flex justify-content-center align-items-center">
+<div class="offline" *ngIf="online && !hideStatus">
+  <div class="w-100 p-4 bg-success-400 d-flex justify-content-center align-items-center">
     <h6 class="font-weight-semibold">Successfully Established Connection with the Server</h6>
   </div>
 </div>

frontend/src/app/app.component.ts

@@ -1,7 +1,7 @@
 import {Component, HostListener, OnInit, Renderer2} from '@angular/core';
 import {Router} from '@angular/router';
 import {TranslateService} from '@ngx-translate/core';
-import {filter} from 'rxjs/operators';
+import {delay, filter, tap} from 'rxjs/operators';
 import {ApiServiceCheckerService} from './core/auth/api-checker-service';
 import {MenuBehavior} from './shared/behaviors/menu.behavior';
 import {ThemeChangeBehavior} from './shared/behaviors/theme-change.behavior';
@@ -20,9 +20,11 @@ export class AppComponent implements OnInit {
   roles = [ADMIN_ROLE, USER_ROLE];
   menu = false;
   private height: string;
-  offline = null;
+  offline = false;
+  online = false;
   iframeView = false;
   favIcon: HTMLLinkElement;
+  hideStatus = false;
 
   constructor(
     private translate: TranslateService,
@@ -53,6 +55,9 @@ export class AppComponent implements OnInit {
       if (this.router.url.includes('iframe')) {
         this.iframeView = true;
       }
+      if (this.router.url.includes('url')) {
+        this.hideStatus = true;
+      }
     });
   }
 
@@ -68,12 +73,18 @@ export class AppComponent implements OnInit {
 
     this.apiServiceCheckerService.isOnlineApi$
       .pipe(
-        filter(isOnline => isOnline))
-      .subscribe(isOnline => {
-        if (this.offline) {
-          this.init();
-        }
-        setTimeout(() => this.offline = null, 3000);
+        filter(isOnline => isOnline),
+        tap(() => {
+          if (this.offline) {
+            this.init();
+          }
+          this.online = true;
+        }),
+        delay(1000)
+      )
+      .subscribe(() => {
+        this.offline = false;
+        this.online = false;
       });
   }
 

frontend/src/app/dashboard/compliance-export/compliance-export.component.html

@@ -17,6 +17,8 @@
   </div>
 </div>
 
+
+<div *ngIf="preparingPrint" class="report-loading"></div>
 <div class="d-flex justify-content-center align-items-start w-100 m-0 d-print-block">
   <div class="compliance-front-page">
 
@@ -74,7 +76,6 @@ <h5 class="mb-2 w-50">Compliance report</h5>
 
 <div [ngClass]="printFormat?'vis-container-print':'mt-4'" class="w-100">
 
-  <app-render-visualization-print [loadingVisualizations]="loadingVisualizations"
-                                  (visualizationLoaded)="onVisualizationLoaded()"
+  <app-render-visualization-print (visualizationLoaded)="onVisualizationLoaded()"
                                   [visualizationRender]="visualizationRender"></app-render-visualization-print>
 </div>

frontend/src/app/dashboard/compliance-export/compliance-export.component.ts

@@ -93,13 +93,13 @@ export class ComplianceExportComponent implements OnInit, AfterViewInit {
   }
 
   ngOnInit() {
-    this.spinner.show('buildPrint');
+   /* this.spinner.show('buildPrint');
     window.addEventListener('beforeprint', (event) => {
       this.printFormat = true;
     });
     window.addEventListener('afterprint', (event) => {
       this.printFormat = false;
-    });
+    });*/
     this.activatedRoute.params.subscribe(params => {
       this.reportId = params.id;
       this.getTemplate();
@@ -204,12 +204,14 @@ export class ComplianceExportComponent implements OnInit, AfterViewInit {
   }
 
   onVisualizationLoaded() {
-    this.setVisFilter().then(() => {
+    this.preparingPrint = false;
+    console.log('onVisualizationLoaded');
+    /*this.setVisFilter().then(() => {
       this.spinner.hide('buildPrint').then(() => {
         this.preparingPrint = false;
         this.print();
       });
-    });
+    });*/
   }
 
   resolveFromDate(date: { from: any, to: any }): string {

frontend/src/app/dashboard/dashboard-export-pdf/dashboard-export-pdf.component.html

@@ -40,6 +40,8 @@ <h5 class="mt-5 ">Generated on {{date | date:'short':'UTC'}}</h5>
 </div>
 
 <div [ngClass]="printFormat?'vis-container-print':'mt-4'" class="w-100">
+    <span *ngIf="preparingPrint" class="text-primary">
+    <i class="spinner icon-spinner2"></i> Loading content, please wait</span>
   <div *ngIf="dashboardDescription != ''" class="report-desc-container w-100 d-flex justify-content-center align-items-center flex-column">
     <div class="report-description dashboard-info-container d-flex align-items-start w-100">
       <p class="font-size-lg mb-3">{{dashboardDescription}}</p>
@@ -69,7 +71,6 @@ <h5 class="mt-5 ">Generated on {{date | date:'short':'UTC'}}</h5>
   </div>
 
 
-  <app-render-visualization-print [loadingVisualizations]="loadingVisualizations"
-                                  (visualizationLoaded)="onVisualizationLoaded()"
+  <app-render-visualization-print (visualizationLoaded)="onVisualizationLoaded()"
                                   [visualizationRender]="visualizationRender"></app-render-visualization-print>
 </div>

frontend/src/app/dashboard/dashboard-export-pdf/dashboard-export-pdf.component.ts

@@ -65,16 +65,15 @@ export class DashboardExportPdfComponent implements OnInit, AfterViewInit {
         });
       }
     });
-    this.spinner.show('buildPrint');
     this.accountService.identity().then(account => {
       this.account = account;
     });
-    window.addEventListener('beforeprint', (event) => {
+    /*window.addEventListener('beforeprint', (event) => {
       this.printFormat = true;
     });
     window.addEventListener('afterprint', (event) => {
       this.printFormat = false;
-    });
+    });*/
     this.activatedRoute.params.subscribe(params => {
       this.dashboardId = params.id;
       if (this.dashboardId) {
@@ -144,12 +143,8 @@ export class DashboardExportPdfComponent implements OnInit, AfterViewInit {
   }
 
   onVisualizationLoaded() {
-    this.setVisFilter().then(() => {
-      this.spinner.hide('buildPrint').then(() => {
-        this.preparingPrint = false;
-        // this.print();
-      });
-    });
+    this.preparingPrint = false;
+    console.log('onVisualizationLoaded');
   }
 
   getTimeFilterValue() {

frontend/src/app/dashboard/dashboard-overview/dashboard-overview.component.ts

@@ -128,7 +128,7 @@ export class DashboardOverviewComponent implements OnInit, OnDestroy {
      * END
      */
 
-    this.getDailyAlert();
+    // this.getDailyAlert();
 
     /**
      * Show activate modules modal on constructor

frontend/src/app/dashboard/shared/render-visualization-print/render-visualization-print.component.html

@@ -1,5 +1,5 @@
 <div class="container-fluid container-export">
-  <div *ngIf="visualizationRender&& !loadingVisualizations"
+  <div *ngIf="visualizationRender"
        class="d-flex flex-column justify-content-center align-items-center">
     <div #container
          *ngFor="let vis of visualizationRender"
@@ -20,7 +20,7 @@
     </div>
   </div>
 </div>
-<div *ngIf="loadingVisualizations"
+<div *ngIf="!loadingVisualizations"
      class="dashboard-loader d-flex justify-content-center align-content-center">
   <app-utm-spinner [height]="'110px'" [loading]="loadingVisualizations" [width]="'110px'"
                    label="Loading dashboard"

frontend/src/app/dashboard/shared/render-visualization-print/render-visualization-print.component.ts

@@ -9,7 +9,7 @@ import {ChartTypeEnum} from '../../../shared/enums/chart-type.enum';
 })
 export class RenderVisualizationPrintComponent implements OnInit {
   @Input() visualizationRender: UtmDashboardVisualizationType[];
-  @Input() loadingVisualizations = true;
+  @Input() loadingVisualizations = false;
   @Output() visualizationLoaded = new EventEmitter<boolean>();
   runList = 0;
   chartTypeEnum = ChartTypeEnum;
@@ -37,8 +37,9 @@ export class RenderVisualizationPrintComponent implements OnInit {
   onRun($event: string) {
     this.runList += 1;
     if (this.runList === this.visualizationRender.length) {
+      this.loadingVisualizations = true;
       console.log('All the visualizations data has loaded, waiting for rendering');
-      setTimeout(() => this.visualizationLoaded.emit(true), 5000);
+      setTimeout(() => this.visualizationLoaded.emit(true), 3000);
       console.log('All the visualizations now has rendered');
     }
   }

frontend/src/app/shared/components/auth/login/login.component.html

@@ -62,13 +62,13 @@
   </div>
   <!-- /login form -->
   <ng-template #loading>
-    <app-utm-spinner [loading]="true" label="Loading"></app-utm-spinner>
+    <app-utm-spinner [loading]="loadingLogin" label="Loading"></app-utm-spinner>
   </ng-template>
 
 </div>
 
 <!-- /content area -->
 <div *appHasAnyAuthority="roles" class="content d-flex justify-content-center align-items-center h-100 w-100">
-  <app-utm-spinner [height]="'35px'" [label]="'Loading modules...'" [loading]="true"
+  <app-utm-spinner [height]="'35px'" [label]="'Loading modules...'" [loading]="!isInternalNavigation"
                    [width]="'35px'"></app-utm-spinner>
 </div>