summaryrefslogtreecommitdiffstats
path: root/ecomp-sdk/epsdk-app-os
diff options
context:
space:
mode:
authormravula <mr257h@att.com>2019-12-16 15:37:23 -0500
committermravula <mr257h@att.com>2020-01-14 10:02:31 -0500
commit28af72fc23a1e0cb67e1ac1b5fac6b6d9020270a (patch)
tree490dc3652bccb7e8752ed8a761fcc6950acb91fe /ecomp-sdk/epsdk-app-os
parentb51640fc222a61869c26c9fc9a5fe5034f6f39b4 (diff)
Resolved null-pointer-exception while running raptor test cases
Issue-ID: PORTAL-725 Change-Id: I31b57e200b98e616f32f73e1b6a14682555fca94 Signed-off-by: mravula <mr257h@att.com>
Diffstat (limited to 'ecomp-sdk/epsdk-app-os')
-rw-r--r--ecomp-sdk/epsdk-app-os/ngapp/package.json3
-rw-r--r--ecomp-sdk/epsdk-app-os/ngapp/src/app/pages/pages-routing.module.ts14
2 files changed, 15 insertions, 2 deletions
diff --git a/ecomp-sdk/epsdk-app-os/ngapp/package.json b/ecomp-sdk/epsdk-app-os/ngapp/package.json
index e3297649..4dc3a3b5 100644
--- a/ecomp-sdk/epsdk-app-os/ngapp/package.json
+++ b/ecomp-sdk/epsdk-app-os/ngapp/package.json
@@ -12,19 +12,20 @@
"private": true,
"dependencies": {
"@angular/animations": "~7.0.0",
+ "@angular/cdk": "~7.0.0",
"@angular/common": "^7.0.0",
"@angular/compiler": "~7.0.0",
"@angular/core": "~7.0.0",
"@angular/forms": "~7.0.0",
"@angular/http": "~7.0.0",
"@angular/material": "~7.0.0",
- "@angular/cdk": "~7.0.0",
"@angular/platform-browser": "~7.0.0",
"@angular/platform-browser-dynamic": "~7.0.0",
"@angular/router": "~7.0.0",
"@ng-bootstrap/ng-bootstrap": "4.2.1",
"@ngx-translate/core": "11.0.1",
"@ngx-translate/http-loader": "4.0.0",
+ "angular-gridster2": "^8.2.0",
"core-js": "^2.5.4",
"font-awesome": "^4.7.0",
"ionicons": "^4.6.2",
diff --git a/ecomp-sdk/epsdk-app-os/ngapp/src/app/pages/pages-routing.module.ts b/ecomp-sdk/epsdk-app-os/ngapp/src/app/pages/pages-routing.module.ts
index ba55a0f4..05c0d50f 100644
--- a/ecomp-sdk/epsdk-app-os/ngapp/src/app/pages/pages-routing.module.ts
+++ b/ecomp-sdk/epsdk-app-os/ngapp/src/app/pages/pages-routing.module.ts
@@ -3,21 +3,33 @@ 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 { 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';
+
+
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: 'report-list', component:ReportComponent},
{path: 'create', component: HeaderTabsWrapperComponent},
{path: 'reports/:reportMode/:reportId', component: HeaderTabsWrapperComponent},
- {path: 'run/:reportId', component: RunReportFormFieldsComponent}
+ {path: 'run/:reportId', component: RunReportFormFieldsComponent},
+ {path: 'run/:reportId/:queryParameters', component: RunReportFormFieldsComponent},
+
+
];
@NgModule({