@sapui5/sap.suite.ui.generic.template 1.124.2 → 1.126.0

package/src/sap/suite/ui/generic/template/QuickView/manifest.json

@@ -6,7 +6,7 @@
 	"type": "component",
 	"i18n": "i18n/i18n.properties",
 	"applicationVersion": {
-		"version": "1.124.2"
+		"version": "1.126.0"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickView/view/QuickView.view.xml

@@ -1,7 +1,7 @@
-<core:View
-	xmlns:core="sap.ui.core.mvc"
+<mvc:View
+	xmlns:mvc="sap.ui.core.mvc"
 	xmlns="sap.m"
-	xmlns:c="sap.ui.core"
+	xmlns:core="sap.ui.core"
 	xmlns:f="sap.ui.layout.form"
 	controllerName="sap.suite.ui.generic.template.QuickView.view.QuickView"
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
@@ -9,25 +9,28 @@
 	xmlns:fiori="sap.f"
 	xmlns:html="http://www.w3.org/1999/xhtml"
 	xmlns:semantic="sap.m.semantic"
-	xmlns:fe="sap.suite.ui.generic.template.genericUtilities">
+	xmlns:fe="sap.suite.ui.generic.template.genericUtilities"
+	template:require="{AH: 'sap/suite/ui/generic/template/js/AnnotationHelper',
+					   AHModel: 'sap/ui/model/odata/AnnotationHelper',
+					   AHQuickTemplates: 'sap/suite/ui/generic/template/js/QuickTemplates/AnnotationHelper'}">
 
 	<!-- <FlexBox class="sapQuickViewTitle" width="100%" alignItems="Start" justifyContent="Start">
-		<template:with path="entitySet>entityType" helper="sap.ui.model.odata.AnnotationHelper.gotoEntityType" var="entityType">
-			<template:with path="entityType>com.sap.vocabularies.UI.v1.QuickViewFacets" helper="sap.suite.ui.generic.template.js.QuickTemplates.AnnotationHelper.resolveFieldGroupTarget" var="target">
-				<Text text="{path: 'target>Label', formatter: 'sap.suite.ui.generic.template.js.AnnotationHelper.formatWithExpandSimple'}" class="sapQuickViewTextTitle"/>
+		<template:with path="entitySet>entityType" helper="AHModel.gotoEntityType" var="entityType">
+			<template:with path="entityType>com.sap.vocabularies.UI.v1.QuickViewFacets" helper="AHQuickTemplates.resolveFieldGroupTarget" var="target">
+				<Text text="{path: 'target>Label', formatter: 'AH.formatWithExpandSimple'}" class="sapQuickViewTextTitle"/>
 			</template:with>
 		</template:with>
 	</FlexBox> -->
 
 	<FlexBox visible="{= ${badge>/fallbackBadgeVisible}}" width="100%" alignItems="Start" justifyContent="Start">
-		<template:with path="entitySet>entityType" helper="sap.ui.model.odata.AnnotationHelper.gotoEntityType" var="entityType">
-			<template:with path="entityType>" helper="sap.suite.ui.generic.template.js.QuickTemplates.AnnotationHelper.resolveBadgeTarget" var="badge">
+		<template:with path="entitySet>entityType" helper="AHModel.gotoEntityType" var="entityType">
+			<template:with path="entityType>" helper="AHQuickTemplates.resolveBadgeTarget" var="badge">
 				<HBox alignItems="Left" justifyContent="Left" width="100%">
 					<template:if test="{badge>ImageUrl}">
 						<template:then>
 							<FlexBox alignItems="Start" justifyContent="Center">
 								<Avatar 
-									src="{path: 'badge>ImageUrl', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}"
+									src="{path: 'badge>ImageUrl', formatter: 'AHModel.format'}"
 									class="sapUiSmallMarginEnd sapQuickViewBadgeImageBorder"
 									displaySize="L"
 									displayShape="Square">
@@ -38,14 +41,14 @@
 					<template:if test="{badge>TypeImageUrl}">
 						<template:then>
 							<FlexBox alignItems="Start" justifyContent="Center" class="sapQuickViewBadgeIconPadding">
-								<c:Icon src="{path: 'badge>TypeImageUrl', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}" class="sapUiSmallMarginEnd sapQuickViewBadgeIcon"/>
+								<core:Icon src="{path: 'badge>TypeImageUrl', formatter: 'AHModel.format'}" class="sapUiSmallMarginEnd sapQuickViewBadgeIcon"/>
 							</FlexBox>
 						</template:then>
 					</template:if>
 					<VBox alignItems="Start" justifyContent="Center" class="sapUiTinyMarginEnd">
-						<Text text="{path: 'badge>Title', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}" class="sapQuickViewBadgeTitle"/>
-						<Text text="{path: 'badge>TypeName', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}" class="sapQuickViewBadgeSubtitle sapQuickViewBadgeTinyMarginTop"/>
-						<Text text="{path: 'badge>SubTitle', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}" class="sapQuickViewBadgeSubtitle sapQuickViewBadgeTinyMarginTop"/>
+						<Text text="{path: 'badge>Title', formatter: 'AHModel.format'}" class="sapQuickViewBadgeTitle"/>
+						<Text text="{path: 'badge>TypeName', formatter: 'AHModel.format'}" class="sapQuickViewBadgeSubtitle sapQuickViewBadgeTinyMarginTop"/>
+						<Text text="{path: 'badge>SubTitle', formatter: 'AHModel.format'}" class="sapQuickViewBadgeSubtitle sapQuickViewBadgeTinyMarginTop"/>
 					</VBox>
 				</HBox>
 			</template:with>
@@ -63,7 +66,7 @@
 				</Avatar>
 			</FlexBox>
 			<FlexBox visible="{=${badge>/typeImgUrlDefined}}" alignItems="Start" justifyContent="Center" class="sapQuickViewBadgeIconPadding">
-				<c:Icon src="{badge>/typeImgUrl}" class="sapUiSmallMarginEnd sapQuickViewBadgeIcon"/>
+				<core:Icon src="{badge>/typeImgUrl}" class="sapUiSmallMarginEnd sapQuickViewBadgeIcon"/>
 			</FlexBox>
 			<VBox alignItems="Start" justifyContent="Center" class="sapUiTinyMarginEnd">
 				<Text text="{badge>/title}" class="sapQuickViewBadgeTitle"/>
@@ -74,8 +77,8 @@
 	</FlexBox>
 
 	<VBox class="quickTemplateVBox quickViewParent">
-		<template:with path="entitySet>entityType" helper="sap.ui.model.odata.AnnotationHelper.gotoEntityType" var="entityType">
-			<template:with path="entityType>com.sap.vocabularies.UI.v1.QuickViewFacets" helper="sap.suite.ui.generic.template.js.QuickTemplates.AnnotationHelper.resolveFieldGroupTarget" var="target">
+		<template:with path="entitySet>entityType" helper="AHModel.gotoEntityType" var="entityType">
+			<template:with path="entityType>com.sap.vocabularies.UI.v1.QuickViewFacets" helper="AHQuickTemplates.resolveFieldGroupTarget" var="target">
 				<f:SimpleForm
 					layout="ResponsiveGridLayout"
 					labelSpanXL="4"
@@ -96,32 +99,32 @@
 							<template:if test="{dataField>Label}">
 								<template:then>
 									<Label
-										labelFor="field::{path: 'dataField>', formatter: 'sap.suite.ui.generic.template.js.AnnotationHelper.getStableIdPartFromDataField'}"
+										labelFor="field::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}"
 										
-										text="{path: 'dataField>Label', formatter: 'sap.suite.ui.generic.template.js.AnnotationHelper.formatWithExpandSimple'}" class="sapQuickViewSmartFieldLabel"/>
+										text="{path: 'dataField>Label', formatter: 'AH.formatWithExpandSimple'}" class="sapQuickViewSmartFieldLabel"/>
 								</template:then>
 								<template:else>
-									<smart:SmartLabel labelFor="field::{path: 'dataField>', formatter: 'sap.suite.ui.generic.template.js.AnnotationHelper.getStableIdPartFromDataField'}" class="sapQuickViewSmartFieldLabel"/>
+									<smart:SmartLabel labelFor="field::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}" class="sapQuickViewSmartFieldLabel"/>
 								</template:else>
 							</template:if>
 							
 							<template:if test="{= ${dataField>RecordType} === 'com.sap.vocabularies.UI.v1.DataFieldWithUrl'}">
 								<template:then>
-									<fe:Link id="field::{path: 'dataField>', formatter: 'sap.suite.ui.generic.template.js.AnnotationHelper.getStableIdPartFromDataField'}"
+									<fe:Link id="field::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}"
 										target="_blank"
-										text="{path: 'dataField>Value', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}"
-										href="{= ${dataField>Url} ? ${path: 'dataField>Url', formatter: 'sap.ui.model.odata.AnnotationHelper.format'} : ''}"
+										text="{path: 'dataField>Value', formatter: 'AHModel.format'}"
+										href="{= ${dataField>Url} ? ${path: 'dataField>Url', formatter: 'AHModel.format'} : ''}"
 										class="sapQuickViewTextTitle"/>
 								</template:then>
 								<template:else>
 									<smart:SmartField
-										id="field::{path: 'dataField>', formatter: 'sap.suite.ui.generic.template.js.AnnotationHelper.getStableIdPartFromDataField'}"
+										id="field::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}"
 										editable="false"
 										enabled="true"
 										contextEditable="false"
 										clientSideMandatoryCheck="false"
-										value="{path: 'dataField>Value', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}"
-										url="{= ${dataField>Url} ? ${path: 'dataField>Url', formatter: 'sap.ui.model.odata.AnnotationHelper.format'} : ''}"
+										value="{path: 'dataField>Value', formatter: 'AHModel.format'}"
+										url="{= ${dataField>Url} ? ${path: 'dataField>Url', formatter: 'AHModel.format'} : ''}"
 										innerControlsCreated="onSmartFieldsCreated"
 										class="sapQuickViewTextTitle"/>
 								</template:else>
@@ -131,19 +134,19 @@
                 </f:SimpleForm>
 			</template:with>
 
-			<template:with path="entityType>com.sap.vocabularies.UI.v1.QuickViewFacets" helper="sap.suite.ui.generic.template.js.QuickTemplates.AnnotationHelper.resolveLineItemFacet" var="facet">
-				<template:if test="{path: 'facet>Target', formatter: 'sap.ui.model.odata.AnnotationHelper.isMultiple'}">
+			<template:with path="entityType>com.sap.vocabularies.UI.v1.QuickViewFacets" helper="AHQuickTemplates.resolveLineItemFacet" var="facet">
+				<template:if test="{path: 'facet>Target', formatter: 'AHModel.isMultiple'}">
 					<template:then>
-						<template:with path="facet>Target" helper="sap.ui.model.odata.AnnotationHelper.resolvePath" var="target">
+						<template:with path="facet>Target" helper="AHModel.resolvePath" var="target">
 							<HBox width="100%" alignItems="Center" justifyContent="Center" class="sapQuickViewLineItemTable">
 								<Table
 									id="LineItemsSmartTable"
 									backgroundDesign="Translucent"
-									items="{parts:[{path:'entitySet>entityType'}, {path: 'parameter>/isDraftEnabled'}], formatter: 'sap.suite.ui.generic.template.js.QuickTemplates.AnnotationHelper.formatBindingPathForLineItems'}">
+									items="{parts:[{path:'entitySet>entityType'}, {path: 'parameter>/isDraftEnabled'}], formatter: 'AHQuickTemplates.formatBindingPathForLineItems'}">
 									<headerToolbar>
 										<Toolbar>
-											<template:with path="facet>Target" helper="sap.ui.model.odata.AnnotationHelper.gotoEntitySet" var="listEntitySet">
-												<template:with path="listEntitySet>entityType" helper="sap.ui.model.odata.AnnotationHelper.gotoEntityType" var="listEntityType">
+											<template:with path="facet>Target" helper="AHModel.gotoEntitySet" var="listEntitySet">
+												<template:with path="listEntitySet>entityType" helper="AHModel.gotoEntityType" var="listEntityType">
 													<Title text="{listEntityType>com.sap.vocabularies.UI.v1.HeaderInfo/TypeNamePlural/String}" level="h6"/>
 												</template:with>
 											</template:with>
@@ -151,14 +154,14 @@
 									</headerToolbar>
 									<columns>
 										<template:repeat list="{target>}" var="dataField">
-											<template:with path="dataField>Value" helper="sap.ui.model.odata.AnnotationHelper.resolvePath" var="dataFieldValue">
+											<template:with path="dataField>Value" helper="AHModel.resolvePath" var="dataFieldValue">
 												<Column>
 													<template:if test="{dataField>Label}">
 														<template:then>
-															<Text text="{path: 'dataField>Label', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}"/>
+															<Text text="{path: 'dataField>Label', formatter: 'AHModel.format'}"/>
 														</template:then>
 														<template:else>
-															<Text text="{path: 'dataFieldValue>com.sap.vocabularies.Common.v1.Label', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}"/>
+															<Text text="{path: 'dataFieldValue>com.sap.vocabularies.Common.v1.Label', formatter: 'AHModel.format'}"/>
 														</template:else>
 													</template:if>
 												</Column>
@@ -166,7 +169,7 @@
 										</template:repeat>
 										<!-- <template:repeat list="{target>}" var="columnItemField">
 							 													 <Column>
-							 														 			<Text text="{path: 'columnItemField>Label', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}"/>
+							 														 			<Text text="{path: 'columnItemField>Label', formatter: 'AHModel.format'}"/>
 							 													 </Column>
 							 												 </template:repeat> -->
 									</columns>
@@ -179,8 +182,8 @@
 														clientSideMandatoryCheck="false"
 														enabled="true"
 														contextEditable="false"
-														value="{path: 'columnItemFieldValue>Value', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}"
-														url="{= ${columnItemFieldValue>Url} ? ${path: 'columnItemFieldValue>Url', formatter: 'sap.ui.model.odata.AnnotationHelper.format'} : ''}"
+														value="{path: 'columnItemFieldValue>Value', formatter: 'AHModel.format'}"
+														url="{= ${columnItemFieldValue>Url} ? ${path: 'columnItemFieldValue>Url', formatter: 'AHModel.format'} : ''}"
 														innerControlsCreated="onSmartFieldsCreated"/>
 												</template:repeat>
 											</cells>
@@ -195,5 +198,4 @@
 			</template:with>
 		</template:with>
 	</VBox>
-
-</core:View>
+</mvc:View>

package/src/sap/suite/ui/generic/template/app/blankAnalyticalListPage/manifest.json

@@ -80,10 +80,6 @@
 	},
 	"sap.ui5": {
 		"_version": "1.1.0",
-		"resources": {
-			"js": [],
-			"css": []
-		},
 		"dependencies": {
 			"minUI5Version": "1.42.0",
 			"libs": {

package/src/sap/suite/ui/generic/template/designtime/AnalyticalListPage.designtime.js

@@ -22,7 +22,7 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
 					properties: ["ignoredChartTypes", "selectionMode", "noData", "showChartTooltip", "showChartTypeSelectionButton", "showDownloadButton", "showLegendButton"]
 				},
 				"sap.ui.comp.smarttable.SmartTable": {
-					properties: ["useExportToExcel", "showRowCount", "exportType", "fitContainer", "showTablePersonalisation"],
+					properties: ["useExportToExcel", "showRowCount", "exportType", "showTablePersonalisation"],
 					actions: ["settings"]
 				},
 				"sap.ui.table.AnalyticalColumn": {

package/src/sap/suite/ui/generic/template/designtime/ListReport.designtime.js

@@ -23,7 +23,7 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
 					actions: ["settings"]
 				},
 				"sap.m.Table": {
-					properties: ["sticky", "popinLayout", "includeItemInSelection", "growingThreshold"]
+					properties: ["popinLayout", "includeItemInSelection", "growingThreshold"]
 				},
 				"sap.m.Column": {
 					properties: ["width", "hAlign"]

package/src/sap/suite/ui/generic/template/designtime/ObjectPage.designtime.js

@@ -29,9 +29,6 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
 				"sap.m.HBox": {								// meant in the VBox mentioned above, and for paginator buttons (todo: check exact place)
 					properties: ["visible"]
 				},
-				"sap.ui.layout.Grid": {						// meant for Grid in subSection. Actually there are two grids - clarify whether both are needed and which is meant
-					properties: ["defaultSpan"]			// Todo: check, how this works at all
-				},
 				"sap.uxap.ObjectPageSection": {
 					properties: ["showTitle", "titleUppercase", "title"]
 				},

package/src/sap/suite/ui/generic/template/detailTemplates/i18n/i18n_sh.properties

@@ -1,5 +1,5 @@
 
-APPLY=Primijeni
+APPLY=Primeni
 
 MESSAGE_BUTTON_TOOLTIP_S=1 poruka
 

package/src/sap/suite/ui/generic/template/fragments/AnalyticalTableColumns.fragment.xml

@@ -2,12 +2,12 @@
 	xmlns:customData="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
 	xmlns:smartField="sap.ui.comp.smartfield" xmlns="sap.m" xmlns:table="sap.ui.table" xmlns:core="sap.ui.core"
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
-	template:require="{AH: 'sap/suite/ui/generic/template/js/AnnotationHelper', AHModel: 'sap/ui/model/odata/AnnotationHelper'}">
+	template:require="{AH: 'sap/suite/ui/generic/template/js/AnnotationHelper', AHModel: 'sap/ui/model/odata/AnnotationHelper', StableIdHelper: 'sap/suite/ui/generic/template/js/StableIdHelper'}">
 
 	<template:repeat list="{collection>}" var="dataField">
 		<template:if
 			test="{= (${dataField>RecordType} === 'com.sap.vocabularies.UI.v1.DataFieldForAction' || ${dataField>RecordType} === 'com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation') &amp;&amp; ${dataField>Inline/Bool} === 'true'}">
-			<template:with path="parameter>/" helper="sap.suite.ui.generic.template.js.StableIdHelper.preparePathForStableId" var="columnId">
+			<template:with path="parameter>/" helper="StableIdHelper.preparePathForStableId" var="columnId">
 				<template:if test="{= ${dataField>RecordType} === 'com.sap.vocabularies.UI.v1.DataFieldForAction' }">
 					<template:then>
 						<template:if test="{= ${columnId>}.buildStableId({type: 'TableColumn', subType: 'DataFieldForAction', sSmartTableId: ${smartControlId>id}, sAction: ${dataField>Action/String}})}" />

package/src/sap/suite/ui/generic/template/fragments/ContactDetails.fragment.xml

@@ -64,38 +64,38 @@
 			</VBox>
 
 			<VBox visible="{= !!${contact>/title}}" class="sapUiTinyMarginBottom">
-				<Label text="{i18n>CONTACT_JOB_TITLE}:"/>
-				<Text text="{contact>/title}" class="sapUiTinyMarginBottom" />
+				<Label text="{i18n>CONTACT_JOB_TITLE}:" labelFor="template:::contact:::contactDetails::jobTitle"/>
+				<Text id="template:::contact:::contactDetails::jobTitle" text="{contact>/title}" class="sapUiTinyMarginBottom" />
 			</VBox>
 
 			<VBox visible="{= !!${contact>/org}}" class="sapUiTinyMarginBottom">
-				<Label text="{i18n>CONTACT_DEPARTMENT}:"/>
-				<Text text="{contact>/org}" class="sapUiTinyMarginBottom" />
+				<Label text="{i18n>CONTACT_DEPARTMENT}:" labelFor="template:::contact:::contactDetails::department"/>
+				<Text id="template:::contact:::contactDetails::department" text="{contact>/org}" class="sapUiTinyMarginBottom" />
 			</VBox>
 
 			<VBox visible="{= !!${contact>/email}}" class="sapUiTinyMarginBottom">
-				<Label text="{i18n>CONTACT_EMAIL}:" />
-				<Link text="{contact>/email}" href="{path: 'contact>/email', formatter: '.formatUri'}" class="sapUiTinyMarginBottom" wrapping="true"/>
+				<Label text="{i18n>CONTACT_EMAIL}:" labelFor="template:::contact:::contactDetails::email"/>
+				<Link id="template:::contact:::contactDetails::email" text="{contact>/email}" href="{path: 'contact>/email', formatter: '.formatUri'}" class="sapUiTinyMarginBottom" wrapping="true"/>
 			</VBox>
 
 			<VBox visible="{= !!${contact>/work}}" class="sapUiTinyMarginBottom">
-				<Label text="{i18n>CONTACT_PHONE}:"/>
-				<Link text="{contact>/work}" href="{path: 'contact>/work', formatter: '.formatUri'}" class="sapUiTinyMarginBottom" wrapping="true"/>
+				<Label text="{i18n>CONTACT_PHONE}:" labelFor="template:::contact:::contactDetails::phone"/>
+				<Link id="template:::contact:::contactDetails::phone" text="{contact>/work}" href="{path: 'contact>/work', formatter: '.formatUri'}" class="sapUiTinyMarginBottom" wrapping="true"/>
 			</VBox>
 			
 			<VBox visible="{= !!${contact>/cell}}" class="sapUiTinyMarginBottom">
-				<Label text="{i18n>CONTACT_MOBILE}:"/>
-				<Link text="{contact>/cell}" href="{path: 'contact>/cell', formatter: '.formatUri'}" class="sapUiTinyMarginBottom" wrapping="true"/>
+				<Label text="{i18n>CONTACT_MOBILE}:" labelFor="template:::contact:::contactDetails::mobile"/>
+				<Link id="template:::contact:::contactDetails::mobile" text="{contact>/cell}" href="{path: 'contact>/cell', formatter: '.formatUri'}" class="sapUiTinyMarginBottom" wrapping="true"/>
 			</VBox>
 			
 			<VBox visible="{= !!${contact>/fax}}" class="sapUiTinyMarginBottom">
-				<Label text="{i18n>CONTACT_FAX}:"/>
-				<Text text="{contact>/fax}" class="sapUiTinyMarginBottom" />
+				<Label text="{i18n>CONTACT_FAX}:" labelFor="template:::contact:::contactDetails::fax"/>
+				<Text id="template:::contact:::contactDetails::fax" text="{contact>/fax}" class="sapUiTinyMarginBottom" />
 			</VBox>
 
 			<VBox visible="{= !!${contact>/adr}}" class="sapUiTinyMarginBottom">
-				<Label text="{i18n>CONTACT_ADDRESS}:"/>
-				<Text text="{contact>/adr}" class="sapUiTinyMarginBottom" />
+				<Label text="{i18n>CONTACT_ADDRESS}:" labelFor="template:::contact:::contactDetails::address"/>
+				<Text id="template:::contact:::contactDetails::address" text="{contact>/adr}" class="sapUiTinyMarginBottom" />
 			</VBox>
 
         </VBox>

package/src/sap/suite/ui/generic/template/fragments/FileUploader.fragment.xml

@@ -1,12 +1,12 @@
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core" xmlns:u="sap.ui.unified" xmlns:sfo="sap.ui.comp.smartform" xmlns:fe="sap.suite.ui.generic.template.genericUtilities"
     xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
-    template:require="{AH: 'sap/suite/ui/generic/template/js/AnnotationHelper',  AHModel: 'sap/ui/model/odata/AnnotationHelper', AHStream:'sap/suite/ui/generic/template/js/AnnotationHelperStreamSupport'}">
+    template:require="{AH: 'sap/suite/ui/generic/template/js/AnnotationHelper',  AHModel: 'sap/ui/model/odata/AnnotationHelper', AHStream:'sap/suite/ui/generic/template/js/AnnotationHelperStreamSupport', StableIdHelper: 'sap/suite/ui/generic/template/js/StableIdHelper'}">
 
     <!-- We are consuming the private property of model the "__metadata" (edit_media and content_type) to access the value of the stream content, As per the mail 
         communication with model colleagues, they promised that these will not be changed and we request these to be made public later once Model team has 
         capacity. Till then we use this in our XML templating.
     -->
-    <template:with path="parameter>/" helper="sap.suite.ui.generic.template.js.StableIdHelper.preparePathForStableId" var="facetId">
+    <template:with path="parameter>/" helper="StableIdHelper.preparePathForStableId" var="facetId">
 
     <template:if test="{= ${entityType>Org.OData.Core.V1.MediaType/Path}}">
         <template:if test="{= !!${listEntitySet>}}">
@@ -21,8 +21,12 @@
                                     <template:if test="{:= ${displayType>}.set('icon')}"/>
                                     <HBox alignItems="Center" visible="{parts: [{path: 'entityType>Org.OData.Core.V1.MediaType/Path'}, {path: 'displayType>'}, {path: 'entitySet>'}], formatter:'AHStream.isMimeTypeImage'}">
                                         <template:if test="{:= ${streamContent>}.set('available')}"/>
-                                        <core:Icon src="{parts: [{path: '__metadata/content_type'}], formatter: 'sap.ui.core.IconPool.getIconForMimeType'}" class="sapUiSmallMarginEnd" visible="{parts: [{path: 'entityType>Org.OData.Core.V1.MediaType/Path'}, {path: 'streamContent>'}, {path: 'entitySet>'}], formatter: 'AHStream.isStreamPresent'}"/>
-                                            <fe:Link
+                                        <core:Icon 
+                                            core:require="{IconPool: 'sap/ui/core/IconPool'}"
+                                            src="{parts: [{path: '__metadata/content_type'}], formatter: 'IconPool.getIconForMimeType'}" 
+                                            class="sapUiSmallMarginEnd" 
+                                            visible="{parts: [{path: 'entityType>Org.OData.Core.V1.MediaType/Path'}, {path: 'streamContent>'}, {path: 'entitySet>'}], formatter: 'AHStream.isStreamPresent'}"/>
+                                        <fe:Link
                                             text="{path: 'entitySet>', formatter: 'AHStream.getFileName'}"
                                             href="{__metadata/edit_media}"
                                             target="_blank"

package/src/sap/suite/ui/generic/template/fragments/GridTableCells.fragment.xml

@@ -89,7 +89,9 @@
                     <template:elseif test="{= ${dataFieldTarget>Visualization/EnumMember} === 'com.sap.vocabularies.UI.v1.VisualizationType/Progress'}">
                         <template:with path="dataFieldTarget>Value" helper="AHModel.resolvePath" var="value">
                         <!-- Progress Bar Control -->
+                        <!-- The formatter 'formatDisplayValueForProgressIndicator' is used by 'AH.buildExpressionForProgressIndicatorDisplayValue' -->
                             <ProgressIndicator
+                                        core:require="{formatDisplayValueForProgressIndicator: 'sap/suite/ui/generic/template/js/formatters/formatDisplayValueForProgressIndicator'}"
                                         binding="{= ${ path: 'dataField>Target/AnnotationPath'}.indexOf('/') > -1 ? '{' + ${path: 'dataField>Target/AnnotationPath'}.slice(0, ${ path: 'dataField>Target/AnnotationPath'}.indexOf('/')) + '}' : null}"
                                         percentValue="{ parts: [{path:'dataFieldTarget>'}, {path:'value>'}], formatter: 'AH.buildExpressionForProgressIndicatorPercentValue' }"
                                         displayValue="{ parts: [{path:'dataFieldTarget>'}, {path:'value>Org.OData.Measures.V1.Unit'}], formatter: 'AH.buildExpressionForProgressIndicatorDisplayValue'}"

package/src/sap/suite/ui/generic/template/fragments/GridTableColumns.fragment.xml

@@ -1,7 +1,7 @@
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core" xmlns:table="sap.ui.table" xmlns:smartField="sap.ui.comp.smartfield"
 	xmlns:customData="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
-	template:require="{AH: 'sap/suite/ui/generic/template/js/AnnotationHelper', AHModel: 'sap/ui/model/odata/AnnotationHelper', AHStream:'sap/suite/ui/generic/template/js/AnnotationHelperStreamSupport'}">
+	template:require="{AH: 'sap/suite/ui/generic/template/js/AnnotationHelper', AHModel: 'sap/ui/model/odata/AnnotationHelper', AHStream:'sap/suite/ui/generic/template/js/AnnotationHelperStreamSupport', StableIdHelper: 'sap/suite/ui/generic/template/js/StableIdHelper'}">
 	<template:repeat list="{collection>}" var="dataField">
 		<!-- handle data field with Stream Support -->
 		<template:if test="{= ${dataField>RecordType} === 'com.sap.vocabularies.UI.v1.DataField'}">
@@ -20,7 +20,7 @@
 		</template:if>
 		<template:if
 			test="{= (${dataField>RecordType} === 'com.sap.vocabularies.UI.v1.DataFieldForAction' || ${dataField>RecordType} === 'com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation') &amp;&amp; ${dataField>Inline/Bool} === 'true'}">
-			<template:with path="parameter>/" helper="sap.suite.ui.generic.template.js.StableIdHelper.preparePathForStableId" var="columnId">
+			<template:with path="parameter>/" helper="StableIdHelper.preparePathForStableId" var="columnId">
 				<template:if test="{= ${dataField>RecordType} === 'com.sap.vocabularies.UI.v1.DataFieldForAction' }">
 					<template:then>
 						<template:if test="{= ${columnId>}.buildStableId({type: 'TableColumn', subType: 'DataFieldForAction', sSmartTableId: ${smartControlId>id}, sAction: ${dataField>Action/String}})}" />

package/src/sap/suite/ui/generic/template/fragments/HeaderForm.fragment.xml

@@ -1,11 +1,11 @@
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core" xmlns:sfo="sap.ui.comp.smartform" xmlns:sfi="sap.ui.comp.smartfield" xmlns:l="sap.ui.layout"
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
-	template:require="{AH: 'sap/suite/ui/generic/template/js/AnnotationHelper', AHModel: 'sap/ui/model/odata/AnnotationHelper'}">
+	template:require="{AH: 'sap/suite/ui/generic/template/js/AnnotationHelper', AHModel: 'sap/ui/model/odata/AnnotationHelper', StableIdHelper: 'sap/suite/ui/generic/template/js/StableIdHelper'}">
 
 	<VBox id="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::Form"
 		  displayInline="true" class="sapSmartTemplatesObjectPageHeaderForm sapSmartTemplatesObjectPageHeaderFormBox sapMShowEmpty-CTX"
 		  visible="{path: 'headerFacet>', formatter: 'AH.getBindingForHiddenPath'}">
-		<template:with path="parameter>/" helper="sap.suite.ui.generic.template.js.StableIdHelper.preparePathForStableId" var="facetId">
+		<template:with path="parameter>/" helper="StableIdHelper.preparePathForStableId" var="facetId">
 			<template:if test="{= ${facetId>}.buildStableId({type: 'ObjectPage', subType: 'Facet', sRecordType: ${headerFacet>RecordType}, sAnnotationPath: ${headerFacet>Target/AnnotationPath}, sAnnotationId: ${headerFacet>ID/String}, bIsHeaderFacet: ${isHeaderFacet>value}})}"/>
 				<template:if test="{headerFacet>Label}">
 					<Title id="{:= ${parameter>/stableId}.getStableId({type: 'ObjectPageHeader', subType: 'HeaderTitle', sFacet: ${facetId>id}})}" text="{path: 'headerFacet>Label', formatter: 'AHModel.format'}" class="sapSmartTemplatesObjectPageHeaderFormTitle"/>

package/src/sap/suite/ui/generic/template/fragments/HeaderRatingIndicator.fragment.xml

@@ -1,8 +1,13 @@
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core"
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
 	template:require="{AH: 'sap/suite/ui/generic/template/js/AnnotationHelper', AHModel: 'sap/ui/model/odata/AnnotationHelper'}">
-
+	<!-- The formatter 'formatRatingIndicatorFooterText' is used by 'AH.buildRatingIndicatorFooterExpression' -->
+	<!-- The formatter 'formatRatingIndicatorSubTitle' is used by 'AH.buildRatingIndicatorSubtitleExpression' -->
 	<VBox id="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::RatingIndicatorVBox"
+		core:require="{
+			formatRatingIndicatorFooterText: 'sap/suite/ui/generic/template/js/formatters/formatRatingIndicatorFooterText',
+			formatRatingIndicatorSubTitle: 'sap/suite/ui/generic/template/js/formatters/formatRatingIndicatorSubTitle'
+		}"
 		binding="{parts: [{path: 'headerFacet>Target'}, {path: 'entitySet>'}], formatter: 'AH.getNavigationPathWithExpand'}"
 		visible="{path: 'headerFacet>', formatter: 'AH.getBindingForHiddenPath'}">
 		<items>

package/src/sap/suite/ui/generic/template/fragments/MessagePage.view.xml

@@ -1,4 +1,8 @@
 <mvc:View xmlns:mvc="sap.ui.core.mvc" xmlns="sap.m" height="100%" controllerName="sap.suite.ui.generic.template.fragments.MessagePage">
-                <MessagePage id="messagePage" showNavButton="false" text="{_templPrivGlobal>/generic/messagePage/text}"
-                               description="{_templPrivGlobal>/generic/messagePage/description}" icon="{_templPrivGlobal>/generic/messagePage/icon}" showHeader="false" />
+    <IllustratedMessage 
+        id="messagePage" 
+        title="{_templPrivGlobal>/generic/messagePage/text}"
+        description="{_templPrivGlobal>/generic/messagePage/description}"
+        illustrationSize="Scene"
+        illustrationType="{_templPrivGlobal>/generic/messagePage/messageType}"/>
 </mvc:View>

package/src/sap/suite/ui/generic/template/fragments/ProgressIndicator.fragment.xml

@@ -15,8 +15,10 @@
 			text="{path:'dataPoint>Description', formatter: 'AHModel.format'}"
 			visible="{= !!${dataPoint>Description}}"/>
 		<template:with path="dataPoint>Value" helper="AHModel.resolvePath" var="valueProperty">
+			<!-- The formatter 'formatDisplayValueForProgressIndicator' is used by 'AH.buildExpressionForProgressIndicatorDisplayValue' -->
 			<ProgressIndicator
 				id="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::ProgressIndicator"
+				core:require="{formatDisplayValueForProgressIndicator: 'sap/suite/ui/generic/template/js/formatters/formatDisplayValueForProgressIndicator'}"
 				class="sapSmartTemplatesObjectPageHeaderProgressIndicatorControl"
 				percentValue="{ parts: [{path:'dataPoint>'}, {path:'valueProperty>'}], formatter: 'AH.buildExpressionForProgressIndicatorPercentValue' }"
 				displayValue="{ parts: [{path:'dataPoint>'}, {path:'valueProperty>Org.OData.Measures.V1.Unit'}], formatter: 'AH.buildExpressionForProgressIndicatorDisplayValue'}"

package/src/sap/suite/ui/generic/template/fragments/QuickViewSmartForm.fragment.xml

@@ -13,8 +13,10 @@
 		class="navigationPopover navigationPopoverHeader sapMQuickViewPage sapSmartTemplatesSmartLinkNavPopoverContentTitleAreaTrunc">
 		<!--the icon comes from the target entity type header,
 		the binding context is set relatively to the the target, and an expand is added if the picture is behind a nav property-->
+		<!-- The formatter 'sap/suite/ui/generic/template/js/formatters/formatImageUrl' is used by 'AH.formatImageOrTypeUrl' -->
 		<Avatar
 			id="{:= ${parameter>/stableId}.getStableId({type: 'QuickView', subType: 'Avatar'})}"
+			core:require="{formatImageUrl: 'sap/suite/ui/generic/template/js/formatters/formatImageUrl'}"
 			tooltip="{path: 'header>Title/Value', formatter: 'AHModel.format'}"
 			visible="{= !!(${path: 'header>ImageUrl'} || ${path: 'header>TypeImageUrl'}) }"
 			binding="{parts:[{path: 'entitySet>'}, {path: 'quickView>/navigationPath'}, {path: 'header>ImageUrl'}, {path: 'header>TypeImageUrl'}], formatter: 'AH.getPathWithExpandFromHeader'}"
@@ -82,7 +84,7 @@
 												<template:if test="{= ${dataField>RecordType} !== 'com.sap.vocabularies.UI.v1.DataFieldForAction' &amp;&amp; ${dataField>RecordType} !== 'com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation'}">
 													<template:with path="dataField>Value" helper="AHModel.resolvePath" var="dataFieldValue">
 														<template:if test="{= ${path: 'isFirstEmail>', formatter: 'AH.fnCheckFirstEmail'} &amp;&amp; ${dataFieldValue>com.sap.vocabularies.Communication.v1.IsEmailAddress}.Bool === 'true' &amp;&amp; ${parameter>/templateSpecific/teamsCollabOptions} !== undefined &amp;&amp; ${parameter>/templateSpecific/teamsCollabOptions}.length > 0}">
-															<VBox visible="{path: 'dataField>Value', formatter: 'AHModel.format'}" class="sapUiSmallMarginBegin sapUiTinyMarginTop">
+															<VBox visible="{path: 'dataField>Value', formatter: 'AHModel.format'}" class="sapUiTinyMarginTop">
 																<Toolbar width="100%" height="1px"/>
 																<Toolbar>
 																	<Title text="{i18n>CONTACT_OPTION}" level="H5" class="sapUiTinyMarginBegin"/> 
@@ -115,7 +117,7 @@
 											<sfo:Layout columnsM="2" columnsL="3" columnsXL="4" labelSpanS="12" labelSpanM="12" labelSpanL="12" labelSpanXL="12" singleGroupFullSize="false" />
 										</sfo:layout>
 										<sfo:groups>
-											<sfo:Group label="{path: 'facet>Label' , formatter: 'AHModel.format'}">
+											<sfo:Group title="{path: 'facet>Label' , formatter: 'AHModel.format'}">
 												<template:if test="{target>Data}">
 													<template:then>
 														<template:repeat list="{target>Data}" var="dataField">

package/src/sap/suite/ui/generic/template/fragments/RatingIndicatorFacet.fragment.xml

@@ -18,7 +18,9 @@
 							maxValue="{path: 'dataPoint>TargetValue', formatter: 'AHModel.format'}"
 							value="{path: 'dataPoint>Value', formatter: 'AHModel.format'}"
 							iconSize="1rem" />
+						<!-- The formatter 'formatRatingIndicatorAggregateCount' is used by 'AH.buildRatingIndicatorAggregateCountExpression' -->
 						<Text id="{path: 'facet>', formatter: 'AH.getStableIdPartFromFacet'}::RatingIndicatorTotalRatings"
+							core:require="{formatRatingIndicatorAggregateCount: 'sap/suite/ui/generic/template/js/formatters/formatRatingIndicatorAggregateCount'}"
 							text="{path: 'dataPoint>SampleSize', formatter: 'AH.buildRatingIndicatorAggregateCountExpression'}"
 							visible="{= !!${dataPoint>SampleSize} }">
 							<customData>

package/src/sap/suite/ui/generic/template/fragments/SmartControlContextMenu.fragment.xml

@@ -1,7 +1,8 @@
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core"
-    xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1" >
+    xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1" 
+	template:require="{StableIdHelper: 'sap/suite/ui/generic/template/js/StableIdHelper'}">
 
-	<template:with path="parameter>/" helper="sap.suite.ui.generic.template.js.StableIdHelper.preparePathForStableId" var="contextMenuId">
+	<template:with path="parameter>/" helper="StableIdHelper.preparePathForStableId" var="contextMenuId">
 		<template:if test="{= ${contextMenuId>}.buildStableId({type: 'SmartControl', subType: 'ContextMenu', sSmartTableId: ${smartControlId>id}})}" />
 		<Menu id="{contextMenuId>id}" items="{= '{_templPriv>/generic/controlProperties/' + ${smartControlId>id} + '/contextMenu/items}' }">
 			<MenuItem text="{_templPriv>text}" enabled="{_templPriv>enabled}" icon="{_templPriv>icon}" key="{_templPriv>key}" 

package/src/sap/suite/ui/generic/template/fragments/SmartFormDataField.fragment.xml

@@ -2,7 +2,7 @@
 	xmlns:sfo="sap.ui.comp.smartform" xmlns:smartMultiInput="sap.ui.comp.smartmultiinput" xmlns:layoutData="sap.ui.layout" xmlns:fe="sap.suite.ui.generic.template.genericUtilities"
 	xmlns:custom="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
-	template:require="{AH: 'sap/suite/ui/generic/template/js/AnnotationHelper', AHModel: 'sap/ui/model/odata/AnnotationHelper'}">
+	template:require="{AH: 'sap/suite/ui/generic/template/js/AnnotationHelper', AHModel: 'sap/ui/model/odata/AnnotationHelper', StableIdHelper: 'sap/suite/ui/generic/template/js/StableIdHelper'}">
 
 	<!-- @classdesc @name: Name: sap.suite.ui.generic.template.fragments.SmartFormDataField.fragment.xml
 		@description: This fragment contains label value pairs for the smart form
@@ -11,7 +11,7 @@
 	<!-- Prepare facetId for stableId creation
 		Note: currently only used for AddressFacet, but intentionally placed here to be used by all other stable ids in future
 	-->
-	<template:with path="parameter>/" helper="sap.suite.ui.generic.template.js.StableIdHelper.preparePathForStableId" var="facetId">
+	<template:with path="parameter>/" helper="StableIdHelper.preparePathForStableId" var="facetId">
 		<template:if test="{= ${facetId>}.buildStableId({ type:'ObjectPage', subType:'StandardFacet', sRecordType: ${facet>RecordType}, sAnnotationPath: ${facet>Target/AnnotationPath} , sAnnotationId: ${facet>ID/String} }) }"/>
 
 		<template:with path="groupFacet>Target" helper="AHModel.gotoEntitySet" var="targetEntitySet">

package/src/sap/suite/ui/generic/template/fragments/SmartTableUiTableCommons.fragment.xml

@@ -11,8 +11,12 @@
 	</table:dependents>
 	<table:rowSettingsTemplate>
 		<table:RowSettings 
+			core:require="{
+				setRowNavigated: 'sap/suite/ui/generic/template/js/formatters/setRowNavigated',
+				setInfoHighlight: 'sap/suite/ui/generic/template/js/formatters/setInfoHighlight'
+			}"
 			highlight="{= ${parameter>/templateSpecific/rowHighligths} || ${parts: [{path: 'entityType>'}, {path: 'parameter>/treeNode'}, {path: 'entitySet>name'}, {path: 'parameter>/checkIsDraftEnabled'}], formatter: 'AH.setRowHighlight'} }"
-			navigated="{parts: [{path: '_templPriv>/generic/currentActiveChildContext'}, {path: ''}], formatter: 'sap.suite.ui.generic.template.js.RuntimeFormatters.setRowNavigated'}" />
+			navigated="{parts: [{path: '_templPriv>/generic/currentActiveChildContext'}, {path: ''}], formatter: 'setRowNavigated'}" />
 	</table:rowSettingsTemplate>
 	<table:contextMenu>
 		<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.SmartControlContextMenu" type="XML"/>

package/src/sap/suite/ui/generic/template/fragments/TableCell.fragment.xml

@@ -60,7 +60,9 @@
 	                                        ariaLabelledBy="{columnId>id}"/>
 									</template:else>
 								</template:if>
-								<FormattedText htmlText="&lt;em&gt;{path:'i18n>NEW_OBJECT', formatter:'sap.suite.ui.generic.template.js.RuntimeFormatters.encodeHTML'}&lt;/em&gt;"
+								<FormattedText 
+									core:require="{encodeXML: 'sap/base/security/encodeXML'}"
+									htmlText="&lt;em&gt;{path:'i18n>NEW_OBJECT', formatter:'encodeXML'}&lt;/em&gt;"
 									visible="{parts: [{path: 'dataFieldValue>'}, {path: 'dataField>'}, {path: 'entityType>'}], formatter: 'AH.getHeaderVisibility'}"/>
 								<Text class="sapUiTinyMarginTop"
 									renderWhitespace="true"
@@ -90,7 +92,9 @@
 				<template:if test="{path: 'dataFieldValue>', formatter: 'AH.isImageUrl'}">
 					<!-- handle data field with images -->
 					<template:then>
+						<!-- The formatter 'sap/suite/ui/generic/template/js/formatters/formatImageUrl' is used by 'AH.formatImageUrl' -->
 						<Avatar
+							core:require="{formatImageUrl: 'sap/suite/ui/generic/template/js/formatters/formatImageUrl'}"
 							src="{parts:[{path: 'dataField>Value'}, {path: 'parameter>/appComponentName'}], formatter: 'AH.formatImageUrl'}"
 							tooltip="{path: 'dataFieldValue>com.sap.vocabularies.Common.v1.Text', formatter: 'AHModel.format'}"
 							displaySize="S"
@@ -195,7 +199,9 @@
 									<template:elseif test="{= ${dataFieldTarget>Visualization/EnumMember} === 'com.sap.vocabularies.UI.v1.VisualizationType/Progress'}">
 										<template:with path="dataFieldTarget>Value" helper="AHModel.resolvePath" var="value">
 											<VBox renderType="Bare">
+												<!-- The formatter 'formatDisplayValueForProgressIndicator' is used by 'AH.buildExpressionForProgressIndicatorDisplayValue' -->
 												<ProgressIndicator
+													core:require="{formatDisplayValueForProgressIndicator: 'sap/suite/ui/generic/template/js/formatters/formatDisplayValueForProgressIndicator'}"
 													binding="{= ${ path: 'dataField>Target/AnnotationPath'}.indexOf('/') > -1 ? '{' + ${path: 'dataField>Target/AnnotationPath'}.slice(0, ${ path: 'dataField>Target/AnnotationPath'}.indexOf('/')) + '}' : null}"
 													percentValue="{ parts: [{path:'dataFieldTarget>'}, {path:'value>'}], formatter: 'AH.buildExpressionForProgressIndicatorPercentValue' }"
 													displayValue="{ parts: [{path:'dataFieldTarget>'}, {path:'value>Org.OData.Measures.V1.Unit'}], formatter: 'AH.buildExpressionForProgressIndicatorDisplayValue'}"