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

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

@@ -1,6 +1,6 @@
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core" xmlns:smartField="sap.ui.comp.smartfield" xmlns:smc="sap.ui.comp.smartmicrochart" xmlns:navpopover="sap.ui.comp.navpopover"
 	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.ListReport.view.fragments.TableColumnListItem.fragment.xml
 		@description: Visualizes columns (content) of a responsive table,
@@ -10,11 +10,11 @@
 
 	<items>
 		<template:with path="listEntitySet>entityType" helper="AHModel.gotoEntityType" var="listEntityType">
-			<template:with path="parameter>/" helper="sap.suite.ui.generic.template.js.StableIdHelper.preparePathForStableId" var="columnListItemId">
+			<template:with path="parameter>/" helper="StableIdHelper.preparePathForStableId" var="columnListItemId">
 				<template:if test="{= ${facet>Target/AnnotationPath} }">
 					<template:then>
 						<!-- ObjectPage -->
-						<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: ${facet>RecordType}, sAnnotationPath: ${facet>Target/AnnotationPath}, sAnnotationId: ${facet>ID/String}, bIsHeaderFacet: ${isHeaderFacet>value}})}"/>
 							<template:if test="{= ${columnListItemId>}.buildStableId({type: 'ObjectPageTable', subType: 'ColumnListItem', sFacet: ${facetId>id}})}" />
 						</template:with>
@@ -25,10 +25,14 @@
 					</template:else>
 				</template:if>
 				<ColumnListItem id="{columnListItemId>id}"
+						core:require="{
+							setRowNavigated: 'sap/suite/ui/generic/template/js/formatters/setRowNavigated',
+							setInfoHighlight: 'sap/suite/ui/generic/template/js/formatters/setInfoHighlight'
+						}"
 						highlight="{parts: [{path: 'listEntityType>'}, {path: 'parameter>/treeNode'}, {path: 'listEntitySet>name'}, {path: 'parameter>/checkIsDraftEnabled'}], formatter: 'AH.setRowHighlight'}"
 						vAlign="{appSettings>/tableColumnVerticalAlignment}"
 						type="{parts: [{path: 'listEntitySet>'}, {path: 'parameter>/settings/subPages/'}, {path: 'parameter>/manifest/'}, {path: 'parameter>/treeNode/'}, {path:'parameter>/isDraftEnabled'}, {path: 'facet>Target/AnnotationPath'}], formatter: 'AH.getColumnListItemType'}"
-						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'}" 
 						detailPress="._templateEventHandlers.onEdit">
 					<template:if test="{parts: [{path: 'listEntitySet>name'}, {path: 'parameter>/settings/subPages/'}, {path: 'facet>Target/AnnotationPath'}], formatter: 'AH.getDisplayNavigationIntent'}">
 						<customData>
@@ -38,7 +42,7 @@
 					</template:if>
 					<cells>
 						<template:repeat list="{collection>}" var="lineItems">
-							<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="{= ${lineItems>RecordType} === 'com.sap.vocabularies.UI.v1.DataField' }">
 									<template:then>
 										<template:if test="{= ${columnId>}.buildStableId({type: 'TableColumn', subType: 'DataField', sSmartTableId: ${smartControlId>id}, sProperty: ${lineItems>Value/Path}})}" />

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

@@ -1,6 +1,6 @@
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core" xmlns:smartField="sap.ui.comp.smartfield" xmlns:smc="sap.ui.comp.smartmicrochart" xmlns:navpopover="sap.ui.comp.navpopover"
 	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'}">
 	<!-- @classdesc @name: Name: sap.suite.ui.generic.template.ListReport.view.fragments.TableColumns.fragment.xml
 		@description: Visualizes columns (header) of a responsive table,
 		as part of a LR, OP or ALP.
@@ -146,7 +146,7 @@
 			</template:if>
 			<!-- handle inline actions -->
 			<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:with path="dataField>Value" helper="AHModel.resolvePath" var="dataFieldValue">
 						<template:if test="{= ${dataField>RecordType} === 'com.sap.vocabularies.UI.v1.DataFieldForAction' }">
 							<template:then>

package/src/sap/suite/ui/generic/template/fragments/TreeTableColumns.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:smartMultiInput="sap.ui.comp.smartmultiinput" xmlns:fe="sap.suite.ui.generic.template.genericUtilities"
 	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'}">
+	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.DataField')}">
@@ -36,7 +36,7 @@
 			</template:with>
 		</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}})}" />
@@ -214,7 +214,9 @@
 													<!--	Progress Indicator generation	 -->
 													<template:elseif test="{= ${dataFieldTarget>Visualization/EnumMember} === 'com.sap.vocabularies.UI.v1.VisualizationType/Progress'}">
 														<template:with path="dataFieldTarget>Value" helper="AHModel.resolvePath" var="value">
+																<!-- 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/genericUtilities/controlStateWrapperFactory/SmartFilterBarWrapper.js

@@ -24,6 +24,7 @@ sap.ui.define([
 	function SmartFilterBarWrapper(vTarget, oFactory, mParams) {
 		var bIsApplying = false;
 		var aBasicFilters = [];
+		var aMissingNavFilters = [];
 		var oSmartFilterBar, oControlAssignedResolve, oPreliminaryState;
 		var oControlAssignedPromise = new Promise(function (resolve) {
 			oControlAssignedResolve = resolve;
@@ -81,9 +82,54 @@ sap.ui.define([
 				/* SFB header state of a variant (standard or custom) gets determined by the Apply Automatically checkbox's value of the corresponding
 				   variant i.e. if the checkbox is checked, then the header should be collapsed and vice versa. */
 				oSVMWrapperCallbacks.setHeaderState(!oEvent.getParameter("executeOnSelect"));
+				aMissingNavFilters = fnGetNavigationProperties();
 			});
 
 		}
+
+		function fnGetNavigationProperties() {
+			//Fetch the navigation properties
+			var oMetaModel = oSmartFilterBar.getModel().getMetaModel(),
+				sEntitySet = oSmartFilterBar.getEntitySet(),
+				oDataEntitySet = oMetaModel.getODataEntitySet(sEntitySet),
+				oDataEntityType = oMetaModel.getODataEntityType(oDataEntitySet.entityType),
+				oNavigationProperties = oDataEntityType['navigationProperty'],
+				aAddedNavigationProperties = [];
+			//Fetch the added filters in the current variant
+			var sCurrentVariantID = oSmartFilterBar.getVariantManagement().getCurrentVariantId();
+			var oCurrentVariant = oSmartFilterBar.getVariantManagement().getAllVariants().find(function(variant) {
+				return variant.getId() === sCurrentVariantID;
+			});			
+			if (oCurrentVariant === undefined || oCurrentVariant.getContent() === undefined) {
+				return aAddedNavigationProperties;
+			}
+			var oSmartFilterBarVariant = JSON.parse( oCurrentVariant.getContent().searchListReportVariant.filterBarVariant );
+			delete oSmartFilterBarVariant["_CUSTOM"];
+			//Compare the filter source and navigation properties
+			var aMatchedRanges = [];
+			for (var key in oSmartFilterBarVariant) {
+				for (var i = 0; i < oNavigationProperties.length; i++) {
+					var obj = oNavigationProperties[i];
+					if (key.startsWith(obj.name)) {
+						if (oSmartFilterBarVariant[key].ranges) {
+							aMatchedRanges.push(oSmartFilterBarVariant[key].ranges);
+						}
+					}
+				}
+			}
+            if (aMatchedRanges.length) {
+                //Compare the manifest property with the filter source
+                var oManifestNavigationProperties = oSmartFilterBar.getNavigationProperties() || [];
+                var missingNavProperty = aMatchedRanges.filter(function(item) {
+                    var sKeyField = item[0].keyField.split('.')[0];
+                    return !oManifestNavigationProperties.includes(sKeyField);
+                });
+                if (missingNavProperty.length) {
+                    aAddedNavigationProperties = aMatchedRanges;
+                }
+            }
+			return aAddedNavigationProperties;
+		}
 		
 		function fnGetState() {
 			if (!oSmartFilterBar) {
@@ -242,6 +288,10 @@ sap.ui.define([
 			oSmartFilterBar = oControl;
 			oControlAssignedResolve(oSmartFilterBar);
 		}
+
+		function fnGetMissingNavProperties() {
+			return aMissingNavFilters;
+		}
 		
 		// check waiting for initialization (like in SmartTableWrapper/SmartChartWrapper)
 		// currently, whole appState restoring is waiting for initialized event from sfb - but probably it would be enough to wait for it here
@@ -256,7 +306,8 @@ sap.ui.define([
 			// specific properties (needed to workaround direct connection between SFB and SVM)
 			setSVMWrapperCallbacks: setSVMWrapperCallbacks,
 			bVMConnection: oSmartFilterBar.getSmartVariant(),
-			suppressSelection: oSmartFilterBar.setSuppressSelection.bind(oSmartFilterBar) // if multiple reasons for suppressing overlap, a counter (to avoid to early resume) could be implemented here 
+			suppressSelection: oSmartFilterBar.setSuppressSelection.bind(oSmartFilterBar), // if multiple reasons for suppressing overlap, a counter (to avoid to early resume) could be implemented here 
+			getMissingNavProperties: fnGetMissingNavProperties
 		};
 	}
 

package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartVariantManagementWrapper.js

@@ -103,9 +103,9 @@ sap.ui.define([
 			var oControl = oController.getView().byId(sId);
 			if (oControl && oControl.isA("sap.ui.comp.smarttable.SmartTable")) {
 				oControl.attachAfterVariantInitialise(function() {
-                                        //set currentVariantId only when sVariantId is not standard (as it might be overriding existing
-                                        //different currentVariantId) or smartTable's (oControl) currentVariantId is not equal to sVariantId.
-					if (sVariantId !== '*standard*' && oControl.getCurrentVarintId && oControl.getCurrentVarintId() !== sVariantId) {
+					//set currentVariantId only when sVariantId is not standard (as it might be overriding existing
+					//different currentVariantId) or smartTable's (oControl) currentVariantId is not equal to sVariantId.
+					if (sVariantId !== '*standard*' && oControl.getCurrentVariantId && oControl.getCurrentVariantId() !== sVariantId) {
 						oControl.setCurrentVariantId(sVariantId);
 						oSmartVariantManagement.setModified(false);
 					}

package/src/sap/suite/ui/generic/template/genericUtilities/utils.js

@@ -21,7 +21,31 @@ sap.ui.define([], function() {
 			return sap.ui.require.toUrl(sAppComponentName.replace(/\./g, "/")) + "/" + sImageUrl; //replacing dots by slashes before calling sap.ui.require.toUrl method. com.xyz.abc to com/xyz/abc
 		}
 
+		// Function check is B array values is a subset of A array values.
+		// A = [], B = ["1", "2", "3"] -> true
+		// A = ["4"], B = ["1", "2", "3"] -> false
+		// A = ["1"], B = ["1", "2", "3"] -> true
+		// A = ["1", "3"], B = ["1", "2", "3"] -> true
+		// A = ["3", "2", "1"], B = ["1", "2", "3"] -> true
+		// A = ["1", "4"], B = ["1", "2", "3"] -> false
+		// A = ["1", "2", "3", "4"], B = ["1", "2", "3"] -> false
+		function fnIsASubsetOfB(a, b) {
+			if (a === b) {
+				return true;
+			}
+			if (!a || !b) {
+				return false;
+			}
+			if (a.length > b.length) {
+				return false;
+			}
+			return a.every(function(entry) {
+				return b.includes(entry);
+			});
+		}
+
 	return {
-		adjustImageUrlPath: fnAdjustImageUrlPath
+		adjustImageUrlPath: fnAdjustImageUrlPath,
+		isASubsetOfB: fnIsASubsetOfB
 	};
 });

package/src/sap/suite/ui/generic/template/js/AnnotationHelper.js

@@ -10,9 +10,10 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 	"sap/m/library",
 	"sap/ui/core/library",
 	"sap/suite/ui/generic/template/genericUtilities/metadataAnalyser",
+	"sap/ui/base/ManagedObject",
 	"sap/suite/ui/generic/template/js/RuntimeFormatters" // just to make sure that it is loaded
 ], function (AnnotationHelperModel, AnnotationHelperModelBasics, SmartField, FeLogger, formatMessage, deepExtend, StableIdHelper, utils, Device,
-	SapMLibrary, SapCoreLibrary, metadataAnalyser) {
+	SapMLibrary, SapCoreLibrary, metadataAnalyser, ManagedObject) {
 	"use strict";
 
 	// shortcut for sap.ui.core.ValueState
@@ -1072,21 +1073,21 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		// builds the expression for the Rating Indicator Subtitle
 		buildRatingIndicatorSubtitleExpression: function (mSampleSize) {
 			if (mSampleSize) {
-				return "{parts: [{path: '" + mSampleSize.Path + "'}], formatter: 'sap.suite.ui.generic.template.js.RuntimeFormatters.formatRatingIndicatorSubTitle'}";
+				return "{parts: [{path: '" + mSampleSize.Path + "'}], formatter: 'formatRatingIndicatorSubTitle'}";
 			}
 		},
 
 		// builds the expression for the Rating Indicator footer
 		buildRatingIndicatorFooterExpression: function (mValue, mTargetValue) {
 			if (mTargetValue) {
-				return "{parts: [{path: '" + mValue.Path + "'}, {path: '" + mTargetValue.Path + "'}], formatter: 'sap.suite.ui.generic.template.js.RuntimeFormatters.formatRatingIndicatorFooterText'}";
+				return "{parts: [{path: '" + mValue.Path + "'}, {path: '" + mTargetValue.Path + "'}], formatter: 'formatRatingIndicatorFooterText'}";
 			}
-			return "{parts: [{path: '" + mValue.Path + "'}], formatter: 'sap.suite.ui.generic.template.js.RuntimeFormatters.formatRatingIndicatorFooterText'}";
+			return "{parts: [{path: '" + mValue.Path + "'}], formatter: 'formatRatingIndicatorFooterText'}";
 		},
 
 		// builds the expression for the Rating Indicator aggregate Count
 		buildRatingIndicatorAggregateCountExpression: function (mValue) {
-			return "{parts: [{path: '" + mValue.Path + "'}], formatter: 'sap.suite.ui.generic.template.js.RuntimeFormatters.formatRatingIndicatorAggregateCount'}";
+			return "{parts: [{path: '" + mValue.Path + "'}], formatter: 'formatRatingIndicatorAggregateCount'}";
 		},
 
 		getIdForMoreBlockContent: function (oFacet) {
@@ -1136,10 +1137,20 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			return sPath;
 		},
 
-		// Returns the creation mode has been configured for the given facet
-		getCreationMode: function (oFacet, oSections) {
+		// Returns the creation mode that has been configured for the given facet if defined, else returns the global level creation mode
+		getCreationMode: function (oFacet, oGlobalSettings) {
+			var oSections = oGlobalSettings && oGlobalSettings.sections;
 			var oSettings = oSections && oSections[oAnnotationHelper.getStableIdPartFromFacet(oFacet)];
-			return (oSettings && oSettings.createMode) || "";
+			var sCreateMode;
+			if (oSettings && oSettings.createMode) {
+				sCreateMode = oSettings.createMode;
+			} else if (oGlobalSettings && oGlobalSettings.createMode) {
+				sCreateMode = oGlobalSettings.createMode;
+			} else {
+				sCreateMode = "";
+			}
+		
+			return sCreateMode;
 		},
 
 		// Checks whether use of the preliminaryContext feature has been configured for the given facet
@@ -1147,10 +1158,11 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			var oSettings = oSections[oAnnotationHelper.getStableIdPartFromFacet(oFacet)];
 			return !!(oSettings && oSettings.preliminaryContext);
 		},
-		//check whether HasActiveEntity sort order(Inline Create mode) has been configured for the given facet(table)
-		isInlineCreateSorting: function (oFacet, oSections) {
+		//check whether HasActiveEntity sort order(Inline Create mode) has been configured for the given facet(table). If not, then check for global settings.
+		isInlineCreateSorting: function (oFacet, oGlobalSettings) {
+			var oSections = oGlobalSettings && oGlobalSettings.sections;
 			var oSettings = oSections && oSections[oAnnotationHelper.getStableIdPartFromFacet(oFacet)];
-			return !!(oSettings && oSettings.disableDefaultInlineCreateSort);
+			return !!((oSettings && oSettings.disableDefaultInlineCreateSort) ? oSettings.disableDefaultInlineCreateSort : oGlobalSettings && oGlobalSettings.disableDefaultInlineCreateSort);
 		},
 
 		isImageUrl: function (oPropertyAnnotations) {
@@ -1191,7 +1203,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			if (oImageUrl.Path) {
 				var sPrefix = "{parts: [{path: '" + oImageUrl.Path + "'}, {value: '" + sAppComponentName + "'}";
 				var sInfix = bSuppressIcons ? ", {value: true}" : "";
-				var sPostfix = "], formatter: 'sap.suite.ui.generic.template.js.RuntimeFormatters.formatImageUrl'}";
+				var sPostfix = "], formatter: 'formatImageUrl'}";
 				return sPrefix + sInfix + sPostfix;
 			}
 			// Apply 
@@ -2639,9 +2651,9 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		 * - Boolean value or
 		 * - Expression binding
 		 */
-		isRelatedEntityCreatable: function (oInterface, oSourceEntitySet, oRelatedEntitySet, aSubPages, oFacet, oSections, bIsDraftEnabled, oCreateWithParameterDialog, sTableType) {
+		isRelatedEntityCreatable: function (oInterface, oSourceEntitySet, oRelatedEntitySet, aSubPages, oFacet, oGlobalSettings, bIsDraftEnabled, oCreateWithParameterDialog, sTableType) {
 			var bHasSubObjectPage = oAnnotationHelper.hasSubObjectPage(oRelatedEntitySet, aSubPages),
-				sTableCreationMode = oAnnotationHelper.getCreationMode(oFacet, oSections),
+				sTableCreationMode = oAnnotationHelper.getCreationMode(oFacet, oGlobalSettings),
 				bIsInlineCreationMode = ["inline", "creationRows", "creationRowsHiddenInEditMode"].includes(sTableCreationMode);
 				
 			if (bHasSubObjectPage || bIsInlineCreationMode || oCreateWithParameterDialog) {
@@ -3227,7 +3239,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 
 			sParts = buildPart(oInterface, dataPoint.Value) + ", " + buildPart(oInterface, dataPoint.TargetValue) + ", " + buildPart(oInterface, mUoM);
 
-			var sDisplayValueExpression = "{ parts: [" + sParts + "], formatter: 'sap.suite.ui.generic.template.js.RuntimeFormatters.formatDisplayValueForProgressIndicator' }";
+			var sDisplayValueExpression = "{ parts: [" + sParts + "], formatter: 'formatDisplayValueForProgressIndicator' }";
 			return sDisplayValueExpression;
 		},
 
@@ -3699,7 +3711,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			// More precisely: {path: '_templPrivMessage>/'} is included to listen to changes of the Message model
 			// {path: ''} is included to listen to change of the row context. This is in particular important for scrolling in grid tables (recommendation from ui5).
 			// sCriticalityPiece is needed to listen to changes of the criticality property. Note that there is a gap in case the criticality actually should be evaluated from the lineItemQualifier
-			return "{parts: [" + sDraftParts + ", " + sMessageParts + sCriticalityPiece + ", {path: ''}], formatter: 'sap.suite.ui.generic.template.js.RuntimeFormatters.setInfoHighlight'}";
+			return "{parts: [" + sDraftParts + ", " + sMessageParts + sCriticalityPiece + ", {path: ''}], formatter: 'setInfoHighlight'}";
 		},
 
 		getDataFieldLabel: function (oInterface, oDataField) {
@@ -3899,7 +3911,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		SmartLinks expect a boolean value for forceLinkRendering which is not covered in this function, as semanticObjectController covers all cases
 		*/
 		hasQuickViewFacet: function (oEntitySet, oTargetEntities) {
-			return oTargetEntities[oEntitySet.entityType].sForceLinkRendering; //Example return value '\\{"ProductForEdit":"true"\\}'
+			return ManagedObject.escapeSettingsValue(oTargetEntities[oEntitySet.entityType].sForceLinkRendering); //Example return value '\\{"ProductForEdit":"true"\\}'
 		},
 
 		/*

package/src/sap/suite/ui/generic/template/js/AnnotationHelperStreamSupport.js

@@ -66,10 +66,6 @@ sap.ui.define([
 			}
 		},
 
-		getIconForStreamForTableCells: function(oEntitySet, oDataField){
-			return "{parts: [{path: '__metadata/content_type'}], formatter: 'sap.ui.core.IconPool.getIconForMimeType'}";
-		},
-
 		getIconForStream: function(oEntitySet, oDataField){
 			var sNavigationProperty = oAnnotationHelperStreamSupport.getStreamEntitySet(oDataField);
 			return sNavigationProperty ? "{= ${_templPriv>/generic/controlProperties/fileUploader/" + sNavigationProperty + "/icon}}" : "{= ${_templPriv>/generic/controlProperties/fileUploader/" + oEntitySet.name + "/icon}}";

package/src/sap/suite/ui/generic/template/js/RuntimeFormatters.js

@@ -1,5 +1,5 @@
-sap.ui.define(["sap/base/security/encodeXML", "sap/ui/core/format/NumberFormat", "sap/ui/core/message/MessageType", "sap/suite/ui/generic/template/genericUtilities/FeLogger", "sap/suite/ui/generic/template/genericUtilities/testableHelper", "sap/suite/ui/generic/template/genericUtilities/utils"
-	], function (encodeXML, NumberFormat, MessageType, FeLogger, testableHelper, utils) {
+sap.ui.define(["sap/ui/core/format/NumberFormat", "sap/ui/core/message/MessageType", "sap/suite/ui/generic/template/genericUtilities/FeLogger", "sap/suite/ui/generic/template/genericUtilities/testableHelper", "sap/suite/ui/generic/template/genericUtilities/utils"
+	], function (NumberFormat, MessageType, FeLogger, testableHelper, utils) {
 	"use strict";
 
 	var oLogger = new FeLogger("js.RuntimeFormatters").getLogger();
@@ -252,10 +252,6 @@ sap.ui.define(["sap/base/security/encodeXML", "sap/ui/core/format/NumberFormat",
 			}
 
 			return sDisplayValue;
-		},		
-
-		encodeHTML: function (HTMLString) {
-			return encodeXML(HTMLString);
 		}
 	};
 

package/src/sap/suite/ui/generic/template/js/formatters/formatDisplayValueForProgressIndicator.js

@@ -0,0 +1,28 @@
+sap.ui.define("sap/suite/ui/generic/template/js/formatters/formatDisplayValueForProgressIndicator",
+["sap/suite/ui/generic/template/js/RuntimeFormatters"], function (RuntimeFormatters) {
+    "use strict";
+    /**
+     * Note: This module is just a wrapper for "RuntimeFormatters.formatDisplayValueForProgressIndicator" function.
+     * 
+     * Currently, there's a limitation from UI5 core on the formatter functions. 
+     * Earlier, the "this" keyword on the formatter function referred to the UI5 control. 
+     * But, currently (UI5 2.0) the "this" keyword refers to the formatter module.
+     * 
+     * As a temporary work-around, core team has suggested us to keep each formatter function in a separate module 
+     * and export the formatter function from the module. In this way, the "this" keyword refers to the UI5 control.
+     * 
+     * Once the limitation is resolved by core team, this module can be removed 
+     * and "RuntimeFormatter" functions can be directly invoked from XML templates
+     */
+
+    /**
+     * @parameter {string} sValue A string containing the value
+     * @parameter {string} sTarget A string containing the target value
+     * @parameter {string} sUoM A string containing the unit of measure
+     * @returns {string} A string containing the text that will be used in the display value of the Progress Indicator
+     */
+    
+    return function (sValue, sTarget, sUoM) {
+        return RuntimeFormatters.formatDisplayValueForProgressIndicator.call(this, sValue, sTarget, sUoM);
+    };
+});

package/src/sap/suite/ui/generic/template/js/formatters/formatImageUrl.js

@@ -0,0 +1,21 @@
+sap.ui.define("sap/suite/ui/generic/template/js/formatters/formatImageUrl",
+["sap/suite/ui/generic/template/js/RuntimeFormatters"], function (RuntimeFormatters) {
+    "use strict";
+    /**
+     * Note: This module is just a wrapper for "RuntimeFormatters.formatImageUrl" function.
+     * 
+     * Currently, there's a limitation from UI5 core on the formatter functions. 
+     * Earlier, the "this" keyword on the formatter function referred to the UI5 control. 
+     * But, currently (UI5 2.0) the "this" keyword refers to the formatter module.
+     * 
+     * As a temporary work-around, core team has suggested us to keep each formatter function in a separate module 
+     * and export the formatter function from the module. In this way, the "this" keyword refers to the UI5 control.
+     * 
+     * Once the limitation is resolved by core team, this module can be removed 
+     * and "RuntimeFormatter" functions can be directly invoked from XML templates
+     */
+
+    return function (sImageUrl, sAppComponentName, bSuppressIcons) {
+        return RuntimeFormatters.formatImageUrl.call(this, sImageUrl, sAppComponentName, bSuppressIcons);
+    };
+});

package/src/sap/suite/ui/generic/template/js/formatters/formatRatingIndicatorAggregateCount.js

@@ -0,0 +1,21 @@
+sap.ui.define("sap/suite/ui/generic/template/js/formatters/formatRatingIndicatorAggregateCount",
+["sap/suite/ui/generic/template/js/RuntimeFormatters"], function (RuntimeFormatters) {
+    "use strict";
+    /**
+     * Note: This module is just a wrapper for "RuntimeFormatters.formatRatingIndicatorAggregateCount" function.
+     * 
+     * Currently, there's a limitation from UI5 core on the formatter functions. 
+     * Earlier, the "this" keyword on the formatter function referred to the UI5 control. 
+     * But, currently (UI5 2.0) the "this" keyword refers to the formatter module.
+     * 
+     * As a temporary work-around, core team has suggested us to keep each formatter function in a separate module 
+     * and export the formatter function from the module. In this way, the "this" keyword refers to the UI5 control.
+     * 
+     * Once the limitation is resolved by core team, this module can be removed 
+     * and "RuntimeFormatter" functions can be directly invoked from XML templates
+     */
+
+    return function (vValue) {
+        return RuntimeFormatters.formatRatingIndicatorAggregateCount.call(this, vValue);
+    };
+});

package/src/sap/suite/ui/generic/template/js/formatters/formatRatingIndicatorFooterText.js

@@ -0,0 +1,21 @@
+sap.ui.define("sap/suite/ui/generic/template/js/formatters/formatRatingIndicatorFooterText",
+["sap/suite/ui/generic/template/js/RuntimeFormatters"], function (RuntimeFormatters) {
+    "use strict";
+    /**
+     * Note: This module is just a wrapper for "RuntimeFormatters.formatRatingIndicatorFooterText" function.
+     * 
+     * Currently, there's a limitation from UI5 core on the formatter functions. 
+     * Earlier, the "this" keyword on the formatter function referred to the UI5 control. 
+     * But, currently (UI5 2.0) the "this" keyword refers to the formatter module.
+     * 
+     * As a temporary work-around, core team has suggested us to keep each formatter function in a separate module 
+     * and export the formatter function from the module. In this way, the "this" keyword refers to the UI5 control.
+     * 
+     * Once the limitation is resolved by core team, this module can be removed 
+     * and "RuntimeFormatter" functions can be directly invoked from XML templates
+     */
+
+    return function (vValue, vTargetValue) {
+        return RuntimeFormatters.formatRatingIndicatorFooterText.call(this, vValue, vTargetValue);
+    };
+});

package/src/sap/suite/ui/generic/template/js/formatters/formatRatingIndicatorSubTitle.js

@@ -0,0 +1,21 @@
+sap.ui.define("sap/suite/ui/generic/template/js/formatters/formatRatingIndicatorSubTitle",
+["sap/suite/ui/generic/template/js/RuntimeFormatters"], function (RuntimeFormatters) {
+    "use strict";
+    /**
+     * Note: This module is just a wrapper for "RuntimeFormatters.formatRatingIndicatorSubTitle" function.
+     * 
+     * Currently, there's a limitation from UI5 core on the formatter functions. 
+     * Earlier, the "this" keyword on the formatter function referred to the UI5 control. 
+     * But, currently (UI5 2.0) the "this" keyword refers to the formatter module.
+     * 
+     * As a temporary work-around, core team has suggested us to keep each formatter function in a separate module 
+     * and export the formatter function from the module. In this way, the "this" keyword refers to the UI5 control.
+     * 
+     * Once the limitation is resolved by core team, this module can be removed 
+     * and "RuntimeFormatter" functions can be directly invoked from XML templates
+     */
+
+    return function (iSampleSizeValue) {
+        return RuntimeFormatters.formatRatingIndicatorSubTitle.call(this, iSampleSizeValue);
+    };
+});

package/src/sap/suite/ui/generic/template/js/formatters/setInfoHighlight.js

@@ -0,0 +1,21 @@
+sap.ui.define("sap/suite/ui/generic/template/js/formatters/setInfoHighlight",
+["sap/suite/ui/generic/template/js/RuntimeFormatters"], function (RuntimeFormatters) {
+    "use strict";
+    /**
+     * Note: This module is just a wrapper for "RuntimeFormatters.setInfoHighlight" function.
+     * 
+     * Currently, there's a limitation from UI5 core on the formatter functions. 
+     * Earlier, the "this" keyword on the formatter function referred to the UI5 control. 
+     * But, currently (UI5 2.0) the "this" keyword refers to the formatter module.
+     * 
+     * As a temporary work-around, core team has suggested us to keep each formatter function in a separate module 
+     * and export the formatter function from the module. In this way, the "this" keyword refers to the UI5 control.
+     * 
+     * Once the limitation is resolved by core team, this module can be removed 
+     * and "RuntimeFormatter" functions can be directly invoked from XML templates
+     */
+
+    return function (bIsActiveEntity, bHasActiveEntity, bEditable) {
+        return RuntimeFormatters.setInfoHighlight.call(this, bIsActiveEntity, bHasActiveEntity, bEditable);
+    };
+});

package/src/sap/suite/ui/generic/template/js/formatters/setRowNavigated.js

@@ -0,0 +1,26 @@
+sap.ui.define("sap/suite/ui/generic/template/js/formatters/setRowNavigated",
+["sap/suite/ui/generic/template/js/RuntimeFormatters"], function (RuntimeFormatters) {
+    "use strict";
+    /**
+     * Note: This module is just a wrapper for "RuntimeFormatters.setRowNavigated" function.
+     * 
+     * Currently, there's a limitation from UI5 core on the formatter functions. 
+     * Earlier, the "this" keyword on the formatter function referred to the UI5 control. 
+     * But, currently (UI5 2.0) the "this" keyword refers to the formatter module.
+     * 
+     * As a temporary work-around, core team has suggested us to keep each formatter function in a separate module 
+     * and export the formatter function from the module. In this way, the "this" keyword refers to the UI5 control.
+     * 
+     * Once the limitation is resolved by core team, this module can be removed 
+     * and "RuntimeFormatter" functions can be directly invoked from XML templates
+     */
+
+    /**
+    * Return the value for the navigated property of the row. Works for both FCL and non-FCL apps.
+    * @param {string} sBindingPath of the row that is used to navigate to OP or Sub-OP
+    * @return {boolean} true/false to set/unset the property
+    */
+    return function (sBindingPath) {
+        return RuntimeFormatters.setRowNavigated.call(this, sBindingPath);
+    };
+});