Merge pull request #803 from utmstack/bugfix/v10.5.5/issue-in-report-creation

Bugfix/v10.5.5/issue in report creation

Author: c3s4rfred

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

@@ -17,10 +17,9 @@
   </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">
-  <span *ngIf="preparingPrint" class="text-primary">
-    <i class="spinner icon-spinner2"></i> Loading content, please wait
-  </span>
   <div class="compliance-front-page">
 
     <div *ngIf="account" class="prepared print-front-align">

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

@@ -39,7 +39,7 @@ export class RenderVisualizationPrintComponent implements OnInit {
     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), 1000);
+      setTimeout(() => this.visualizationLoaded.emit(true), 3000);
       console.log('All the visualizations now has rendered');
     }
   }

web-pdf/src/main/java/com/utmstack/webtopdf/service/PdfGenerationService.java

@@ -37,9 +37,8 @@ public byte[] generatePdf(String url, String route, String accessKey, AccessType
 
         try {
             webDriver.get(reportUrl);
-
-            WebDriverWait wait = new WebDriverWait(webDriver, Duration.ofSeconds(30));
-            wait.until(ExpectedConditions.invisibilityOfElementLocated(By.cssSelector("span.text-primary .icon-spinner2")));
+            WebDriverWait wait = new WebDriverWait(webDriver, Duration.ofSeconds(10));
+            wait.until(ExpectedConditions.presenceOfElementLocated(By.cssSelector(".report-loading")));
 
             Pdf print = ((PrintsPage) webDriver).print(printOptions);
             webDriver.quit();