Merge pull request #363 from FaizanMohammed326/dev

dashboard metrics issue resolved
Sunbird-cQube · Sep 15, 2023 · afc400f · afc400f
2 parents e4dc6bd + 2ffca9f
commit afc400f
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/app/views/dashboard/dashboard.component.ts b/src/app/views/dashboard/dashboard.component.ts
@@ -119,15 +119,16 @@ export class DashboardComponent implements OnInit {
         menuToDisplay.navigationURL = menuData[i].navigationUrl;
         menuToDisplay.icon = menuData[i].imageUrl;
         menuToDisplay.tooltip = menuData[i].tooltip;
-        let results: any = this.getDashboardMetrics(configFiles[menuData[i].programID], this.rbacDetails)
+        let results: any = await this.getDashboardMetrics(configFiles[menuData[i].programID], this.rbacDetails)
         promises.push(results)
         menuToDisplay.metrics = results
         this.dashboardMenu.push(menuToDisplay);
       }
     }
-    Promise.allSettled(promises).then(() => {
-      this.spinner.hide();
-    })
+    // Promise.allSettled(promises).then(() => {
+    //   this.spinner.hide();
+    // })
+    this.spinner.hide();
   }
 
   getDashboardMetrics(programConfig: any, rbacDetails: any) {