Migrating screens to Angular 7

Issue-ID: PORTAL-706


Change-Id: Ic3feb4019923040aafe6e9a97a60b41165be8b40
Signed-off-by: statta <statta@research.att.com>

1 files changed, 31 insertions, 21 deletions

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/defs/definitions.xml b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/defs/definitions.xml
index 90ccf9b7..4e223b3f 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/defs/definitions.xml
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/defs/definitions.xml
@@ -57,13 +57,14 @@
 	
 	<!--  <definition name="nbooktest"
 		template="app/fusion/notebook-integration/scripts/view-models/notebook-frame.html"/>
-
-	 <definition name="nbooktest"
-		template="app/fusion/scripts/DS2-view-models/ds2-samplePages/notebook-frame.html"/>
+	
+		 <definition name="nbooktest"
+		template="app/fusion/scripts/DS2-view-models/ds2-samplePages/ngnotebook-frame.html"/>
 
 	-->
-	 <definition name="nbooktest"
-		template="app/fusion/scripts/DS2-view-models/ds2-samplePages/ngnotebook-frame.html"/>
+
+	<definition name="nbooktest"
+		template="app/fusion/scripts/DS2-view-models/ds2-samplePages/notebook-frame.html"/>
 		
 	<definition extends="ebz_template" name="broadcast_list">
 		<put-attribute name="body"
@@ -88,54 +89,61 @@
 		/> 
 		
 	<definition name="user_profile_list"
-		template="/app/fusion/scripts/DS2-view-models/ds2-profile/profile.html" />
+		template="/app/fusion/scripts/DS2-view-models/ds2-profile/ngprofile.html" />
+			
+	
 	-->
 		
 	<definition name="user_profile_list"
-		template="/app/fusion/scripts/DS2-view-models/ds2-profile/ngprofile.html" />
+		template="/app/fusion/scripts/DS2-view-models/ds2-profile/profile.html" />
 	
 
-	<!-- <definition name="admin" template="/app/fusion/scripts/view-models/admin-page/admin.html" 
-		/> -->
+		
 	<definition name="openCollaboration"
 		template="/app/fusion/scripts/DS2-view-models/ds2-admin/collaboration.html" />
 				
-	<!--
+	
 	<definition name="workflows"
 		template="/app/fusion/scripts/DS2-view-models/DS2-workflows-page/workflow-landing.html" />
-	-->
-
+	
+	<!--
 	<definition name="workflows"
 		template="/app/fusion/scripts/DS2-view-models/DS2-workflows-page/ngworkflow-landing.html" />
-
+	-->
+	
 	<definition name="report_dashboard"
 		template="/app/fusion/scripts/view-models/reportdashboard-page/src/report-dashboard.html" />
 
 	<definition name="ds2_sample"
 		template="/app/fusionapp/scripts/DS2-view-models/sampleDS2.html" />
 
-	<!-- 
+	 
 	<definition name="admin"
 		template="/app/fusion/scripts/DS2-view-models/ds2-admin/admin.html" />
-	 -->
 	 
+	<!--
 	<definition name="admin"
 		template="/app/fusion/scripts/DS2-view-models/ds2-admin/ngadmin.html" />		
+	-->
 		
-	<!-- 
+	 
 	<definition name="samplePage"
 		template="/app/fusion/scripts/DS2-view-models/ds2-samplePages/samplePage.html" />
-	 -->
+	
+	<!--
 	<definition name="samplePage"
 		template="/app/fusion/scripts/DS2-view-models/ds2-samplePages/ngsamplePage.html" />
-
+	 -->
+	 
 	<!-- 
 	<definition name="welcome"
 		template="/app/fusion/scripts/DS2-view-models/welcome.html" />
-	 -->
+	
 	 
 	<definition name="welcome"
 		template="/app/ngapp/ngwelcome.html" />
+		
+	-->
 
 	<definition name="bootstrap_sample"
 		template="/app/fusion/scripts/DS2-view-models/bootstrap-sample-page.html" />
@@ -157,12 +165,14 @@
 		<put-attribute name="viewName" value="report_import"></put-attribute>
 	</definition>
 
-	<!--
+	
 	<definition name="report"
 		template="/app/fusion/scripts/DS2-view-models/ds2-reports/all-reports.html" />
-	-->
+	
+	<!--
 	<definition name="report"
 		template="/app/fusion/scripts/DS2-view-models/ds2-reports/ngall-reports.html" />
+	-->
 
 	<definition extends="ebz_template" name="reportDS1">
 		<put-attribute name="body"