Merge "Raptor form fields tab in report wizard. Removed package-lock.json and uncommented angular build tags in pom.xml"

2 files changed, 23 insertions, 22 deletions

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 c0577077..ba55a0f4 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
@@ -6,6 +6,7 @@ import { CacheAdminComponent } from './admin/cache-admin/cache-admin.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';
 
 
 
@@ -16,7 +17,7 @@ const routes: Routes = [
   {path: 'report-list', component:ReportComponent}, 
   {path: 'create', component: HeaderTabsWrapperComponent},
   {path: 'reports/:reportMode/:reportId', component: HeaderTabsWrapperComponent},
-  {path: 'run/:reportId', component: RunReportComponent}
+  {path: 'run/:reportId', component: RunReportFormFieldsComponent}
 ];
 
 @NgModule({
diff --git a/ecomp-sdk/epsdk-app-os/ngapp/src/environments/environment.ts b/ecomp-sdk/epsdk-app-os/ngapp/src/environments/environment.ts
index eecaec4a..f728a8ff 100644
--- a/ecomp-sdk/epsdk-app-os/ngapp/src/environments/environment.ts
+++ b/ecomp-sdk/epsdk-app-os/ngapp/src/environments/environment.ts
@@ -4,27 +4,27 @@
 
 export const environment = {
   production: false,
-  baseUrl: 'http://www.sdk.onap.org:8080/epsdk-app-os/',
-  roleFunctionList: 'http://www.sdk.onap.org:8080/epsdk-app-os/get_role_functions',
-  addRoleFunction: 'http://www.sdk.onap.org:8080/epsdk-app-os/role_function_list/addRoleFunction',
-  usageList: 'http://www.sdk.onap.org:8080/epsdk-app-os/get_usage_list',
-  cachedRegions: 'http://www.sdk.onap.org:8080/epsdk-app-os/get_regions',
-  getRole:'http://www.sdk.onap.org:8080/epsdk-app-os/get_role',
-  getFnMenuItems:'http://www.sdk.onap.org:8080/epsdk-app-os/admin_fn_menu',
-  getUserPagination:'http://www.sdk.onap.org:8080/epsdk-app-os/get_user_pagination',
-  deleteRole:'http://www.sdk.onap.org:8080/epsdk-app-os/role_list/removeRole',
-  getTopMenu:'http://www.sdk.onap.org:8080/epsdk-app-os/get_topMenuInfo',
-  deleteRoleFunction:'http://www.sdk.onap.org:8080/epsdk-app-os/role_function_list/removeRoleFunction',
-  deleteMenu:'http://www.sdk.onap.org:8080/epsdk-app-os/admin_fn_menu/removeMenuItem.htm',
-  getRegion:'http://www.sdk.onap.org:8080/epsdk-app-os/jcs_admin/showRegionDetails',
- postSearch:'http://www.sdk.onap.org:8080/epsdk-app-os/post_search/search',
- importSearch:'http://www.sdk.onap.org:8080/epsdk-app-os/post_search/process',
- getPostProfile:'http://www.sdk.onap.org:8080/epsdk-app-os/post_search_sample',
- getSelfProfile:'http://www.sdk.onap.org:8080/epsdk-app-os/get_self_profile',
- removeUserRole:'http://www.sdk.onap.org:8080/epsdk-app-os/profile/removeRole',
- saveProfile :'http://www.sdk.onap.org:8080/epsdk-app-os/profile/saveProfile',
- getFunctionalMenuStaticDetail :'http:/www.sdk.onap.org:8080/epsdk-app-att/get_topMenuInfo',
- getLeftMenu :'http://www.sdk.onap.org:8080/epsdk-app-att/get_menu'
+  baseUrl: 'http://localhost:8080/epsdk-app-os/',
+  roleFunctionList: 'http://localhost:8080/epsdk-app-os/get_role_functions',
+  addRoleFunction: 'http://localhost:8080/epsdk-app-os/role_function_list/addRoleFunction',
+  usageList: 'http://localhost:8080/epsdk-app-os/get_usage_list',
+  cachedRegions: 'http://localhost:8080/epsdk-app-os/get_regions',
+  getRole:'http://localhost:8080/epsdk-app-os/get_role',
+  getFnMenuItems:'http://localhost:8080/epsdk-app-os/admin_fn_menu',
+  getUserPagination:'http://localhost:8080/epsdk-app-os/get_user_pagination',
+  deleteRole:'http://localhost:8080/epsdk-app-os/role_list/removeRole',
+  getTopMenu:'http://localhost:8080/epsdk-app-os/get_topMenuInfo',
+  deleteRoleFunction:'http://localhost:8080/epsdk-app-os/role_function_list/removeRoleFunction',
+  deleteMenu:'http://localhost:8080/epsdk-app-os/admin_fn_menu/removeMenuItem.htm',
+  getRegion:'http://localhost:8080/epsdk-app-os/jcs_admin/showRegionDetails',
+ postSearch:'http://localhost:8080/epsdk-app-os/post_search/search',
+ importSearch:'http://localhost:8080/epsdk-app-os/post_search/process',
+ getPostProfile:'http://localhost:8080/epsdk-app-os/post_search_sample',
+ getSelfProfile:'http://localhost:8080/epsdk-app-os/get_self_profile',
+ removeUserRole:'http://localhost:8080/epsdk-app-os/profile/removeRole',
+ saveProfile :'http://localhost:8080/epsdk-app-os/profile/saveProfile',
+ getFunctionalMenuStaticDetail :'http:/localhost:8080/epsdk-app-os/get_topMenuInfo',
+ getLeftMenu :'http://localhost:8080/epsdk-app-os/get_menu'
 };
 
 /*