Merge pull request Sunbird-cQube#241 from FaizanMohammed326/development

dashboard menu for vsk
Sharathnaik38 · Jul 25, 2022 · a5d7da3 · a5d7da3
2 parents 62b3ca5 + 6d6d6c1
commit a5d7da3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/development/ui/front-end/src/app/core/components/layout/layout.component.ts b/development/ui/front-end/src/app/core/components/layout/layout.component.ts
@@ -22,7 +22,7 @@ export class LayoutComponent implements OnInit {
       menuToDisplay.isSelected = true;
       menuToDisplay.basepath = "dasboard";
       this.menu.push(menuToDisplay);
-      menuResult.result.forEach((dasboardMenu:IDashboardMenu)=>{
+      menuResult?.result?.forEach((dasboardMenu:IDashboardMenu)=>{
         let menuToDisplay: IMenuItem | any = {};
         menuToDisplay.label = dasboardMenu.title;
         menuToDisplay.path = dasboardMenu.navigationURL;

diff --git a/development/ui/front-end/src/app/core/services/config/config.service.ts b/development/ui/front-end/src/app/core/services/config/config.service.ts
@@ -23,7 +23,8 @@ export class ConfigService {
 
   getDashboardMetrics(forMenu = false): Observable<ResponseType<IDashboardMenu[] | any[]>> {
     if (environment.config.toLowerCase() === 'vsk') {
-      return this._http.get<ResponseType<IDashboardMenu[]>>(`${environment.apiURL}/config/getMetrics/${environment.config.toLowerCase()}/dashboard`);
+      // return this._http.get<ResponseType<IDashboardMenu[]>>(`${environment.apiURL}/config/getMetrics/${environment.config.toLowerCase()}/dashboard`);
+      return this._http.get<ResponseType<IDashboardMenu[]>>(`${environment.apiURL}/metrics/getDashboardMetrics/${environment.config.toLowerCase()}/${forMenu}`);
     } else {
       return this._http.get<ResponseType<IDashboardMenu[]>>(`${environment.apiURL}/metrics/getDashboardMetrics/${environment.config.toLowerCase()}/${forMenu}`);
     }