1 files changed, 27 insertions, 37 deletions
diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages-routing.module.ts b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages-routing.module.ts
index 459220ab..20120d6c 100644
--- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages-routing.module.ts
+++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages-routing.module.ts
@@ -1,45 +1,35 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule, ActivatedRoute } from '@angular/router';
-import { RoleFunctionsComponent } from './admin/role-functions/role-functions.component';
-import { UsageComponent } from './admin/usage/usage.component';
-import { CacheAdminComponent } from './admin/cache-admin/cache-admin.component';
-import { RolesComponent } from './admin/roles/roles.component';
-import { MenusComponent } from './admin/menus/menus.component';
-import { SearchComponent } from './ext/profile/search/search.component';
-import { SelfComponent } from './ext/profile/self/self.component';
-import { ReportComponent } from './analytics/Report_List/Report/report.component';
-import { RunReportComponent } from './analytics/Report_List/Report/run/run-report/run-report.component';
-import { HeaderTabsWrapperComponent } from './analytics/Report_List/header-tabs-wrapper-component/header-tabs-wrapper.component';
-import { RunReportFormFieldsComponent } from './analytics/Report_List/Report/run/run-report-form-fields/run-report-form-fields.component';
-import { WelcomeDashboardComponent } from './welcome-dashboard/welcome-dashboard.component';
+import {NgModule} from '@angular/core';
+import {Routes, RouterModule, ActivatedRoute} from '@angular/router';
+import {RoleFunctionsComponent} from '../admin/role-functions/role-functions.component';
+import {UsageComponent} from '../admin/usage/usage.component';
+import {CacheAdminComponent} from '../admin/cache-admin/cache-admin.component';
+import {RolesComponent} from '../admin/roles/roles.component';
+import {MenusComponent} from '../admin/menus/menus.component';
+import {SearchComponent} from './ext/profile/search/search.component';
+import {SelfComponent} from './ext/profile/self/self.component';
+import {ReportComponent} from './analytics/Report_List/Report/report.component';
+import {RunReportComponent} from './analytics/Report_List/Report/run/run-report/run-report.component';
+import {HeaderTabsWrapperComponent} from './analytics/Report_List/header-tabs-wrapper-component/header-tabs-wrapper.component';
+import {RunReportFormFieldsComponent} from './analytics/Report_List/Report/run/run-report-form-fields/run-report-form-fields.component';
 import {RefreshComponent} from './refresh/refresh.component';
-import { DisplayAreaComponent } from './analytics/Report_List/display-area/display-area.component';
-
-
 
 
 const routes: Routes = [
-  { path: 'admin/role_function_list', component: RoleFunctionsComponent },
-  { path: 'admin/usage_list', component : UsageComponent},
-  { path: 'admin/cache_admin', component :CacheAdminComponent},
-  { path: 'admin/admin', component :RolesComponent},
-  { path: 'admin/admin_menu_edit', component :MenusComponent},
-  { path: 'userProfile', component :SearchComponent},
-  { path: 'userProfile/self_profile', component:SelfComponent},
-  { path: 'report-list', component:ReportComponent},
-  { path: 'create', component: HeaderTabsWrapperComponent},
-  { path: 'reports/:reportMode/:reportId', component: HeaderTabsWrapperComponent},
-  { path: 'run/:reportId', component: RunReportFormFieldsComponent},
-  { path: 'run/:reportId/:queryParameters', component: RunReportFormFieldsComponent},
-  { path: 'run', component: RunReportFormFieldsComponent},
-  { path: 'displayArea/:menuId', component: DisplayAreaComponent},
-  { path: 'welcome', component :WelcomeDashboardComponent},
-  { path: 'refresh', component: RefreshComponent},
-  { path: '', redirectTo: 'welcome'}
+    {path: 'userProfile', component: SearchComponent},
+    {path: 'userProfile/self_profile', component: SelfComponent},
+    {path: 'report-list', component: ReportComponent},
+    {path: 'create', component: HeaderTabsWrapperComponent},
+    {path: 'reports/:reportMode/:reportId', component: HeaderTabsWrapperComponent},
+    {path: 'run/:reportId', component: RunReportFormFieldsComponent},
+    {path: 'run/:reportId/:queryParameters', component: RunReportFormFieldsComponent},
+    {path: 'run/:reportId/:queryParameters/:groupSelectValue', component: RunReportFormFieldsComponent},
+    {path: 'run', component: RunReportFormFieldsComponent},
+    {path: 'refresh', component: RefreshComponent},
 ];
 
 @NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
+    imports: [RouterModule.forChild(routes)],
+    exports: [RouterModule]
 })
-export class PagesRoutingModule { }
+export class PagesRoutingModule {
+}