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 index bef48f1f..7c6748ef 100644 --- 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 index ec947548..641de39c 100644 --- 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> { if (environment.config.toLowerCase() === 'vsk') { - return this._http.get>(`${environment.apiURL}/config/getMetrics/${environment.config.toLowerCase()}/dashboard`); + // return this._http.get>(`${environment.apiURL}/config/getMetrics/${environment.config.toLowerCase()}/dashboard`); + return this._http.get>(`${environment.apiURL}/metrics/getDashboardMetrics/${environment.config.toLowerCase()}/${forMenu}`); } else { return this._http.get>(`${environment.apiURL}/metrics/getDashboardMetrics/${environment.config.toLowerCase()}/${forMenu}`); }