refactor(dashboard): streamline component logic and enhance error handling in resolver

Signed-off-by: Manuel Abascal <mjabascal10@gmail.com>

Author: mjabascal10

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

@@ -69,9 +69,7 @@ export class DashboardRenderComponent implements OnInit, OnDestroy, AfterViewIni
               private dashboardBehavior: DashboardBehavior,
               private timeFilterBehavior: TimeFilterBehavior,
               private exportPdfService: ExportPdfService,
-              private spinner: NgxSpinnerService,
-              private refreshService: RefreshService,
-              private router: Router) {
+              private spinner: NgxSpinnerService) {
   }
 
   ngOnInit() {
@@ -82,44 +80,11 @@ export class DashboardRenderComponent implements OnInit, OnDestroy, AfterViewIni
         tap((visualizations) => {
           this.dashboard = this.layoutService.dashboard;
           this.filters = this.dashboard && this.dashboard.filters ? JSON.parse(this.dashboard.filters) : [];
-         /* if (this.dashboard.refreshTime) {
-            console.log(this.dashboard.refreshTime);
-            this.onRefreshTime(this.dashboard.refreshTime);
-          }*/
           this.loadingVisualizations = false;
         }),
         map(data => data.response)
     );
 
-    /*this.activatedRoute.params.subscribe(params => {
-      this.dashboardId = params.id;
-      if (this.dashboardId) {
-        const request = {
-          page: 0,
-          size: 10000,
-          'idDashboard.equals': this.dashboardId,
-          sort: 'order,asc'
-        };
-        this.utmRenderVisualization.query(request).subscribe(response => {
-          this.layoutService.layout = [];
-          this.timeEnable = [];
-          this.visualizationRender = response.body;
-          this.dashboard = this.visualizationRender.length > 0 ? this.visualizationRender[0].dashboard : null;
-          this.filters = this.dashboard.filters ? JSON.parse(this.dashboard.filters) : [];
-          if (this.dashboard.refreshTime) {
-            this.onRefreshTime(this.dashboard.refreshTime);
-          }
-          for (const vis of this.visualizationRender) {
-            if (vis.showTimeFilter) {
-              this.timeEnable.push(vis.visualization.id);
-            }
-            const grid = JSON.parse(vis.gridInfo);
-            this.layoutService.addItem(vis.visualization, grid);
-          }
-          this.loadingVisualizations = false;
-        });
-      }
-    });*/
     this.dashboardBehavior.$filterDashboard.subscribe(dashboardFilter => {
       if (dashboardFilter) {
         mergeParams(dashboardFilter.filter, this.filtersValues).then(newFilters => {
@@ -158,13 +123,6 @@ export class DashboardRenderComponent implements OnInit, OnDestroy, AfterViewIni
     }
   }
 
-  ngOnDestroy(): void {
-    document.body.classList.remove('overflow-hidden');
-    clearInterval(this.interval);
-    this.layoutService.clearLayout();
-    this.dashboardBehavior.$filterDashboard.next(null);
-  }
-
   ngAfterViewInit(): void {
     this.cdr.detectChanges();
   }
@@ -193,5 +151,12 @@ export class DashboardRenderComponent implements OnInit, OnDestroy, AfterViewIni
   trackByFn(index: number, item: { grid: GridsterItem, visualization: VisualizationType }) {
     return item.visualization.id;
   }
+
+  ngOnDestroy(): void {
+    document.body.classList.remove('overflow-hidden');
+    clearInterval(this.interval);
+    this.layoutService.clearLayout();
+    this.dashboardBehavior.$filterDashboard.next(null);
+  }
 }
 

frontend/src/app/dashboard/shared/services/dashboard-resolver.service.ts

@@ -2,18 +2,20 @@ import {Injectable, Type} from '@angular/core';
 import {ActivatedRouteSnapshot, Resolve, RouterStateSnapshot} from '@angular/router';
 import {GridsterItem} from 'angular-gridster2';
 import {NgxSpinnerService} from 'ngx-spinner';
-import {Observable} from 'rxjs';
-import {map, tap} from 'rxjs/operators';
+import {EMPTY, Observable, of, throwError} from 'rxjs';
+import {catchError, map, tap} from 'rxjs/operators';
 import {VisualizationType} from '../../../shared/chart/types/visualization.type';
 import {RenderLayoutService} from './render-layout.service';
 import {UtmRenderVisualization} from './utm-render-visualization.service';
+import {UtmToastService} from "../../../shared/alert/utm-toast.service";
 
 @Injectable()
 export class DashboardResolverService implements Resolve<{ grid: GridsterItem, visualization: VisualizationType } []> {
 
   constructor(private spinner: NgxSpinnerService,
               private utmRenderVisualization: UtmRenderVisualization,
-              private layoutService: RenderLayoutService) {
+              private layoutService: RenderLayoutService,
+              private toastService: UtmToastService) {
   }
 
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot):
@@ -42,6 +44,13 @@ export class DashboardResolverService implements Resolve<{ grid: GridsterItem, v
         ),
         tap(() => {
           this.spinner.hide('loadingSpinner');
-        }));
+        }),
+        catchError(error => {
+          this.spinner.hide('loadingSpinner');
+          this.toastService.showError('Error', 'An error occurred while loading the dashboard visualizations.');
+
+          return throwError(() => error);
+        })
+      );
   }
 }