@sapui5/sap.suite.ui.generic.template 1.131.1 → 1.133.0

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

@@ -17,7 +17,9 @@
 					<Label id="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}::Label"
 						   labelFor="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}::Field"
 						   text="{path: 'dataField>Label', formatter: 'AHModel.format'}"
-						   class="sapSmartTemplatesObjectPageHeaderFormLabel sapUiTinyMarginEnd"/>
+						   class="sapSmartTemplatesObjectPageHeaderFormLabel sapUiTinyMarginEnd"
+						   showColon="true"
+					/>
 					<fe:Link id="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}::Field"
 						  press="._templateEventHandlers.onContactDetails"
 						  ariaLabelledBy="{:= ${parameter>/stableId}.getStableId({type: 'ObjectPageHeader', subType: 'HeaderTitle', sFacet: ${facetId>id}})} header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}::Label"
@@ -37,16 +39,19 @@
 			<HBox binding="{parts: [{path: 'headerFacet>Target'}, {path: 'entitySet>'}], formatter: 'AH.getNavigationPathWithExpand'}"
 				visible="{path: 'dataField>', formatter: 'AH.getBindingForHiddenPath'}">
 				<Label
-						id="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}::Label"
-						text="{parts: [{path: 'dataField>'}, {path: 'entitySet>'}], formatter: 'AH.getLabelForDFwithIBN'}"
-						class="sapSmartTemplatesObjectPageHeaderFormLabel sapUiTinyMarginEnd"/>
+					id="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}::Label"
+					text="{parts: [{path: 'dataField>'}, {path: 'entitySet>'}], formatter: 'AH.getLabelForDFwithIBN'}"
+					class="sapSmartTemplatesObjectPageHeaderFormLabel sapUiTinyMarginEnd"
+					showColon="true"
+				/>
 				<fe:Link
 						id="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}::Field"
 						text="{parts: [{path: 'dataField>'}, {path: 'entitySet>'}], formatter: 'AH.getLinkTextForDFwithIBN'}"
 						press="._templateEventHandlers.onDataFieldWithIntentBasedNavigation"
 						wrapping="true"
 						class="sapSmartTemplatesObjectPageHeaderFormField"
-						ariaLabelledBy="{:= ${parameter>/stableId}.getStableId({type: 'ObjectPageHeader', subType: 'HeaderTitle', sFacet: ${facetId>id}})} header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}::Label">
+						ariaLabelledBy="{:= ${parameter>/stableId}.getStableId({type: 'ObjectPageHeader', subType: 'HeaderTitle', sFacet: ${facetId>id}})} header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}::Label"
+						accessibleRole="Button">
 					<fe:customData>
 						<core:CustomData key="SemanticObject" value="{path: 'dataField>SemanticObject', formatter: 'AHModel.format'}"/>
 						<core:CustomData key="Action" value="{path: 'dataField>Action', formatter: 'AHModel.format'}"/>
@@ -61,6 +66,7 @@
 					binding="{parts: [{path: 'headerFacet>Target'}, {path: 'entitySet>'}], formatter: 'AH.getNavigationPathWithExpand'}"
 					visible="{path: 'dataField>', formatter: 'AH.getBindingForHiddenPath'}" >
 					<sfi:SmartLabel
+						showColon="true"
 						labelFor="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}::Field"
 						class="sapSmartTemplatesObjectPageHeaderFormLabel sapUiTinyMarginEnd" />
 
@@ -71,7 +77,7 @@
 						editable="{ui>/editable}" linkPress="._templateEventHandlers.onDataFieldWithNavigationPath">
 						<sfi:configuration>
 							<sfi:Configuration
-								displayBehaviour="{parts: [{path: 'dataField>'}, {value: ''}, {path: 'entitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}" />
+								displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'entitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}" />
 						</sfi:configuration>
 						<sfi:customData>
 							<core:CustomData key="defaultTextInEditModeSource" value="{path: 'dataFieldValue>', formatter: 'AH.setValidationForValueList'}" />
@@ -88,6 +94,7 @@
 					<sfi:SmartLabel
 							id="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}::Label"
 							labelFor="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}::Field"
+							showColon="true"
 							class="{= ${dataField>Criticality} ? 'sapSmartTemplatesObjectPageHeaderFormLabel': 'sapSmartTemplatesObjectPageHeaderFormLabelNCriticcal' }  sapUiTinyMarginEnd"/>
 					<!-- TODO: Should also work with ...format -->
 					<template:with path="headerFacet>Target" helper="AHModel.gotoEntitySet" var="annotation">
@@ -106,7 +113,7 @@
 							</sfi:semanticObjectController>
 							<sfi:configuration>
 								<sfi:Configuration
-										displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'annotation>'}, {path: 'entitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}"/>
+										displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'entitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}"/>
 							</sfi:configuration>
 							<template:if test="{= ${dataField>Criticality} }">
 								<sfi:controlProposal>

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

@@ -8,7 +8,7 @@
           visible="{path: 'headerFacet>', formatter: 'AH.getBindingForHiddenPath'}">
 		<template:if test="{headerFacet>Label}">
 			<Title id="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::PlainTextLabel"
-				  text="{path: 'headerFacet>Label', formatter: 'AHModel.format'}" class="sapSmartTemplatesObjectPageHeaderPlainTextTitle"/>
+				  text="{path: 'headerFacet>Label', formatter: 'AHModel.format'}" class="sapSmartTemplatesObjectPageHeaderPlainTextTitle" level="H3"/>
 		</template:if>
 		<template:with path="form>Data/0/" var="dataField"> <!-- There should only be 1 datafield -->
 			<template:if test="{= ${dataField>RecordType} === 'com.sap.vocabularies.UI.v1.DataField'}">

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

@@ -1,19 +1,17 @@
 <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' -->
+	<!-- The formatter 'RuntimeFormatters.formatRatingIndicatorFooterText' is used by 'AH.buildRatingIndicatorFooterExpression' -->
+	<!-- The formatter 'RuntimeFormatters.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'
-		}"
+		core:require="{RuntimeFormatters: 'sap/suite/ui/generic/template/js/RuntimeFormatters'}"
 		binding="{parts: [{path: 'headerFacet>Target'}, {path: 'entitySet>'}], formatter: 'AH.getNavigationPathWithExpand'}"
 		visible="{path: 'headerFacet>', formatter: 'AH.getBindingForHiddenPath'}">
 		<items>
 			<Title id="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::RatingIndicatorTitle"
 				   text="{path: 'dataPoint>Title', formatter: 'AHModel.format'}"
-				   class="sapSmartTemplatesObjectPageHeaderMiniChartTitle"/>
+				   class="sapSmartTemplatesObjectPageHeaderMiniChartTitle"
+				   level="H3"/>
 			<Label id="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::RatingIndicatorSubTitle"
 				text="{= ${dataPoint>SampleSize} ? ${path: 'dataPoint>SampleSize', formatter: 'AH.buildRatingIndicatorSubtitleExpression'} : ${path: 'dataPoint>Description', formatter: 'AHModel.format'}}"
 				visible="{= !!(${dataPoint>SampleSize} || ${dataPoint>Description}) }"

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

@@ -2,8 +2,9 @@
 		xmlns="sap.m"
 		xmlns:core="sap.ui.core">
 	<MessagePopover groupItems="true" items="{msg>/}" activeTitlePress="titlePressed" beforeOpen="beforeOpen" afterClose="afterClose" >
-		<MessageItem  description="{msg>description}" type="{msg>type}"  title="{msg>message}"
+		<MessageItem  type="{msg>type}"  title="{msg>message}"
 					subtitle="{parts:[{path: 'msg>id'}, {path: 'msg>controlIds'}, {path: 'msg>additionalText'}, {path: 'helper>/isPopoverOpen'}, {path: 'helper>/heartBeat'}], formatter: '.getSubtitle'}"
+					description="{parts:[{path: 'msg>id'}, {path: 'msg>controlIds'}, {path: 'msg>description'}, {path: 'helper>/isPopoverOpen'}, {path: 'helper>/heartBeat'}], formatter: '.getDescription'}"
 					longtextUrl="{msg>descriptionUrl}"
 					markupDescription="{helper>/isAIErrorExplanationEnabled}"
 					activeTitle="{parts:[{path: 'msg>id'}, {path: 'msg>controlIds'}, {path: 'helper>/isPopoverOpen'}], formatter: '.isPositionable'}"

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

@@ -15,10 +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' -->
+			<!-- The formatter 'RuntimeFormatters.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'}"
+				core:require="{RuntimeFormatters: 'sap/suite/ui/generic/template/js/RuntimeFormatters'}"
 				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,10 +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' -->
+		<!-- The formatter 'RuntimeFormatters.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'}"
+			core:require="{RuntimeFormatters: 'sap/suite/ui/generic/template/js/RuntimeFormatters'}"
 			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'}"

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

@@ -18,9 +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' -->
+						<!-- The formatter 'RuntimeFormatters.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'}"
+							core:require="{RuntimeFormatters: 'sap/suite/ui/generic/template/js/RuntimeFormatters'}"
 							text="{path: 'dataPoint>SampleSize', formatter: 'AH.buildRatingIndicatorAggregateCountExpression'}"
 							visible="{= !!${dataPoint>SampleSize} }">
 							<customData>

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', StableIdHelper: 'sap/suite/ui/generic/template/js/StableIdHelper'}">
+	template:require="{AH: 'sap/suite/ui/generic/template/js/AnnotationHelper', AHModel: 'sap/ui/model/odata/AnnotationHelper', StableIdHelper: 'sap/suite/ui/generic/template/js/StableIdHelper', SideEffectUtil: 'sap/suite/ui/generic/template/lib/SideEffectUtil'}">
 
 	<!-- @classdesc @name: Name: sap.suite.ui.generic.template.fragments.SmartFormDataField.fragment.xml
 		@description: This fragment contains label value pairs for the smart form
@@ -35,7 +35,7 @@
 							visible="{path: 'dataField>', formatter: 'AH.getVisibiltyBasedOnImportanceAndHidden'}"
 							binding="{path: 'dataField>Target'}, formatter: 'AH.getNavigationPathWithExpand'}">
 							<fe:customData>
-								<core:CustomData key="SideEffects" value="{parts: [{path: 'entitySet>'}, {path: 'dataField>'}, {path: 'contact>fn/Path'}], formatter: 'AH.getPropsForLinkFields'}"/>
+								<core:CustomData key="SideEffects" value="{parts: [{path: 'entitySet>'}, {path: 'dataField>'}, {path: 'contact>fn/Path'}], formatter: 'SideEffectUtil.getPropsForLinkFields'}"/>
 								<core:CustomData key="Location" value="Section" />
 								<core:CustomData key="contactDetails" value="{= ${path: 'contact>', formatter: 'AH.getCustomDataForContactPopup'}}"/>
 							</fe:customData>
@@ -119,9 +119,10 @@
 							text="{parts: [{path: 'dataField>'}, {path: 'entitySet>'}, {path: 'groupFacet>'}], formatter: 'AH.getLinkTextForDFwithIBN'}"
 							visible="{path: 'dataField>', formatter: 'AH.getVisibiltyBasedOnImportanceAndHidden'}"
 							press="._templateEventHandlers.onDataFieldWithIntentBasedNavigation"
+							accessibleRole="Button"
 							wrapping="true">
 							<fe:customData>
-								<core:CustomData key="SideEffects" value="{parts: [{path: 'entitySet>'}, {path: 'dataField>'}], formatter: 'AH.getPropsForLinkFields'}"/>
+								<core:CustomData key="SideEffects" value="{parts: [{path: 'entitySet>'}, {path: 'dataField>'}], formatter: 'SideEffectUtil.getPropsForLinkFields'}"/>
 								<core:CustomData key="SemanticObject" value="{path: 'dataField>SemanticObject', formatter: 'AHModel.format'}" />
 								<core:CustomData key="Action" value="{path: 'dataField>Action', formatter: 'AHModel.format'}" />
 							</fe:customData>

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

@@ -7,7 +7,7 @@
 			visible="{path: 'headerFacet>', formatter: 'AH.getBindingForHiddenPath'}"
 				displayInline="true">
 			<Title id="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::SmartMicroChartTitle"
-					class="sapSmartTemplatesObjectPageHeaderMiniChartTitle" />
+					class="sapSmartTemplatesObjectPageHeaderMiniChartTitle" level="H3" />
 			<Label id="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::SmartMicroChartSubTitle"
 					class="sapSmartTemplatesObjectPageHeaderMiniChartSubTitle" />
 

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

@@ -11,12 +11,9 @@
 	</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'
-			}"
+			core:require="{RuntimeFormatters: 'sap/suite/ui/generic/template/js/RuntimeFormatters'}"
 			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: 'setRowNavigated'}" />
+			navigated="{parts: [{path: '_templPriv>/generic/currentActiveChildContext'}, {path: ''}], formatter: 'RuntimeFormatters.setRowNavigated.bind($control)'}" />
 	</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

@@ -12,7 +12,7 @@
 						<smartField:SmartField value="{path: 'dataField>Value', formatter: 'AHModel.simplePath'}" editable="{= ${parameter>/treeNode/level} > 0 ? '{ui>/editable}' : 'false'}" contextEditable="{= ${parameter>/treeNode/level} > 0}" fetchValueListReadOnly="{= ${parameter>/treeNode/level} > 0}"
 												ariaLabelledBy="{columnId>id}">
 							<smartField:configuration>
-								<smartField:Configuration displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'entitySet>'}, {path: 'dataFieldTarget>Data'}], formatter: 'AH.getTextArrangementForSCFields'}"/>
+								<smartField:Configuration displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'listEntitySet>'}, {path: 'dataFieldTarget>Data'}], formatter: 'AH.getTextArrangementForSCFields'}"/>
 							</smartField:configuration>
 							<template:if test="{= ${dataField>Criticality}}">
 								<smartField:controlProposal>
@@ -92,9 +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' -->
+						<!-- The formatter 'RuntimeFormatters.formatImageUrl' is used by 'AH.formatImageUrl' -->
 						<Avatar
-							core:require="{formatImageUrl: 'sap/suite/ui/generic/template/js/formatters/formatImageUrl'}"
+							core:require="{RuntimeFormatters: 'sap/suite/ui/generic/template/js/RuntimeFormatters'}"
 							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"
@@ -128,7 +128,7 @@
 				</smartField:customData>
 				<smartField:configuration>
 					<smartField:Configuration
-						displayBehaviour="{parts: [{path: 'dataField>'}, {value: ''}, {path: 'listEntitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}" />
+						displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'listEntitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}" />
 				</smartField:configuration>
 			</smartField:SmartField>
 		</template:elseif>
@@ -140,7 +140,9 @@
 			<!--handle DataFieldWithIntentBasedNavigation -->
 			<fe:Link
 				text="{parts: [{path: 'dataField>'}, {path: 'listEntitySet>'}], formatter: 'AH.getLinkTextForDFwithIBN'}"
-				press="._templateEventHandlers.onDataFieldWithIntentBasedNavigation" wrapping="true">
+				press="._templateEventHandlers.onDataFieldWithIntentBasedNavigation" 
+				accessibleRole="Button"
+				wrapping="true">
 				<fe:customData>
 					<core:CustomData key="SemanticObject" value="{path: 'dataField>SemanticObject', formatter: 'AHModel.format'}"/>
 					<core:CustomData key="Action" value="{path: 'dataField>Action', formatter: 'AHModel.format'}"/>
@@ -199,9 +201,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' -->
+												<!-- The formatter 'RuntimeFormatters.formatDisplayValueForProgressIndicator' is used by 'AH.buildExpressionForProgressIndicatorDisplayValue' -->
 												<ProgressIndicator
-													core:require="{formatDisplayValueForProgressIndicator: 'sap/suite/ui/generic/template/js/formatters/formatDisplayValueForProgressIndicator'}"
+													core:require="{RuntimeFormatters: 'sap/suite/ui/generic/template/js/RuntimeFormatters'}"
 													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/TableColumnListItem.fragment.xml

@@ -25,14 +25,11 @@
 					</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'
-						}"
+						core:require="{RuntimeFormatters: 'sap/suite/ui/generic/template/js/RuntimeFormatters'}"
 						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: 'setRowNavigated'}" 
+						navigated="{parts: [{path: '_templPriv>/generic/currentActiveChildContext'}, {path: ''}], formatter: 'RuntimeFormatters.setRowNavigated.bind($control)'}" 
 						detailPress="._templateEventHandlers.onEdit">
 					<template:if test="{parts: [{path: 'listEntitySet>name'}, {path: 'parameter>/settings/subPages/'}, {path: 'facet>Target/AnnotationPath'}], formatter: 'AH.getDisplayNavigationIntent'}">
 						<customData>

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

@@ -13,7 +13,7 @@
                     type="Transparent"
                     visible="{path: 'dataField>', formatter: 'AH.getBindingForHiddenPath'}">
                     <layoutData>
-                        <OverflowToolbarLayoutData priority = "{dataField>com.sap.vocabularies.UI.v1.Importance/EnumMember}"/>
+                        <OverflowToolbarLayoutData priority="{path: 'dataField>com.sap.vocabularies.UI.v1.Importance/EnumMember', formatter: 'AH.getToolbarButtonPriorityFromImportance'}"/>
                     </layoutData>
                     <customData>
                         <core:CustomData key="Type" value="{dataField>RecordType}" />
@@ -36,7 +36,7 @@
                 visible="{path: 'dataField>', formatter: 'AH.buildVisibilityExprOfDataFieldForIntentBasedNaviButton'}"
                 type="Transparent">
                 <layoutData>
-                    <OverflowToolbarLayoutData priority = "{dataField>com.sap.vocabularies.UI.v1.Importance/EnumMember}"/>
+                    <OverflowToolbarLayoutData priority="{path: 'dataField>com.sap.vocabularies.UI.v1.Importance/EnumMember', formatter: 'AH.getToolbarButtonPriorityFromImportance'}"/>
                 </layoutData>
                 <customData>
                     <core:CustomData key="Type" value="{dataField>RecordType}" />

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

@@ -86,6 +86,7 @@
 							<fe:Link
 								text="{parts: [{path: 'dataField>'}, {path: 'listEntitySet>'}], formatter: 'AH.getLinkTextForDFwithIBN'}"
 								press="._templateEventHandlers.onDataFieldWithIntentBasedNavigation"
+								accessibleRole="Button"
 								wrapping="false">
 								<fe:customData>
 									<core:CustomData key="SemanticObject" value="{path: 'dataField>SemanticObject', formatter: 'AHModel.format'}" />
@@ -122,7 +123,7 @@
 									</smartField:customData>
 									<smartField:configuration>
 										<smartField:Configuration
-											displayBehaviour="{parts: [{path: 'dataField>'}, {value: ''}, {path: 'listEntitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}" />
+											displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'listEntitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}" />
 									</smartField:configuration>
 								</smartField:SmartField>
 							</table:template>
@@ -214,9 +215,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' -->
+																<!-- The formatter 'RuntimeFormatters.formatDisplayValueForProgressIndicator' is used by 'AH.buildExpressionForProgressIndicatorDisplayValue' -->
 																<ProgressIndicator
-																		core:require="{formatDisplayValueForProgressIndicator: 'sap/suite/ui/generic/template/js/formatters/formatDisplayValueForProgressIndicator'}"
+																		core:require="{RuntimeFormatters: 'sap/suite/ui/generic/template/js/RuntimeFormatters'}"
 																		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/controlHelper.js

@@ -64,16 +64,17 @@ sap.ui.define([
 	}
 
 	// returns a Promise that resolves to the boolean information whether the SmartField is a possible focus target for input.
-	function getSmartFieldIsFocussableForInputPromise(oSmartField){
-		var oSmartFieldMetadataAvailablePromise = oSmartField._getComputedMetadata();
-		return oSmartFieldMetadataAvailablePromise.then(function(){
-			return (oSmartField.getMode() === "edit") && (oSmartField._getICRenderedPromise() || Promise.resolve()).then(function(){
-				var oFirstFocusableInput = !oSmartField._bEdmBoolDetected && getFirstEditableInput(oSmartField.getDomRef());
-				return !(!oFirstFocusableInput || oFirstFocusableInput.type === "checkbox");
-			});
+	function getSmartFieldIsFocussableForInputPromise(oSmartField) {
+		return oSmartField._getComputedMetadata().then(function () {
+			return (oSmartField.getMode() === "edit") && (oSmartField._getICRenderedPromise() || Promise.resolve());
+		}).then(function () {
+			var oFirstFocusableInput = !oSmartField._bEdmBoolDetected && getFirstEditableInput(oSmartField.getDomRef());
+			return !(!oFirstFocusableInput || oFirstFocusableInput.type === "checkbox");
+		}).catch(function () {
+			return false;
 		});
-	}	
-	
+	}
+
 	// returns the UI5 control which currently has the focus, if there is one. Otherwise returns a faulty value.
 	// Implementation as recommended by UI5 until the provide an own abstraction.
 	function getControlWithFocus(){

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

@@ -105,8 +105,10 @@ sap.ui.define([
 				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.getCurrentVariantId && oControl.getCurrentVariantId() !== sVariantId) {
-						oControl.setCurrentVariantId(sVariantId);
+					if (sVariantId !== '*standard*') {
+						if (oControl.getCurrentVariantId && oControl.getCurrentVariantId() !== sVariantId) {
+							oControl.setCurrentVariantId(sVariantId);
+						}
 						oSmartVariantManagement.setModified(false);
 					}
 				});

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

@@ -5,8 +5,9 @@ sap.ui.define([
 	"sap/m/DynamicDateUtil",
 	"sap/suite/ui/generic/template/genericUtilities/metadataAnalyser",
 	"sap/base/i18n/date/CalendarType",
-	"sap/suite/ui/generic/template/genericUtilities/testableHelper"
-], function (FilterOperator, DateFormat, encodeURL, DynamicDateUtil, metadataAnalyser, CalendarType, testableHelper) {
+	"sap/suite/ui/generic/template/genericUtilities/testableHelper",
+	"sap/ui/model/Filter"
+], function (FilterOperator, DateFormat, encodeURL, DynamicDateUtil, metadataAnalyser, CalendarType, testableHelper,Filter) {
     "use strict";
 
 	function getInfoForFilters(aFilters, getFilterInfoForPropertyFilters, bAnd){
@@ -260,6 +261,71 @@ sap.ui.define([
 		};
 	}
 
+/**
+	 * function wraps the table level filters into single filter object
+	 * This is done to follow the same format as SFB and chart filters 
+	 * returns the updated aFilters
+	 * @param {Array} aFilters - It contains all the filters applied (in SFB , chart or table level filters)
+	 * @returns {Array} - returns array containing all the filters applied including the table filters wrapped as single filter object similar to SFB and chart filters
+	 */
+
+	function fnNormaliseControlFilters(aFilters) {
+		var aTableFilters = [];
+
+		var aChartAndSFBFilters = [];
+
+		aFilters.forEach((oFilter) => {
+			if (oFilter.aFilters) {
+				aChartAndSFBFilters.push(oFilter);
+			} else {
+				aTableFilters.push(oFilter);
+			}
+		});
+
+		if (aTableFilters && aTableFilters.length > 1) {
+			//Grouping the table level filters based on sPath
+			var aGroupedTableFilters = aTableFilters.reduce(
+				(aGroupedFilters, oCurrentfilter) => {
+					var path = oCurrentfilter.sPath;
+
+					if (!aGroupedFilters[path]) {
+						aGroupedFilters[path] = [];
+					}
+
+					aGroupedFilters[path].push(oCurrentfilter);
+
+					return aGroupedFilters;
+				},
+				{}
+			);
+
+			// Convert grouped table filters into nested filter groups
+
+			var aTableFilterGroups = Object.keys(aGroupedTableFilters).map(
+				(sPath) => {
+					return new Filter({
+						filters: aGroupedTableFilters[sPath],
+
+						and: false // OR logic within each group
+					});
+				}
+			);
+
+			// Forming a single top-level table filter
+
+			aTableFilters = new Filter({
+				filters: aTableFilterGroups,
+
+				and: true // AND logic for combining everything
+			});
+
+			// combining filters from chart , SFB , and table
+			aChartAndSFBFilters.push(aTableFilters);
+			return aChartAndSFBFilters;
+		}
+
+		return aFilters;
+	}
 	/**
      * Function returns filter params for service url
      * @param {object} sEntityTypeName
@@ -274,6 +340,7 @@ sap.ui.define([
 			oFilterData: oFilterData,
 			bIsStatic: false
 		};
+		aApplicationFilters = fnNormaliseControlFilters(aApplicationFilters);
 		// Here oParams.bIsStrict will change if SFB have custom semantic-date filter.
 		var sFilterParams = "$filter=" + getFilterString(aApplicationFilters, getFilterInfoForPropertyFilters.bind(null, oParams));
 		sFilterParams = oParams.bIsStatic ? "" : sFilterParams;
@@ -281,6 +348,7 @@ sap.ui.define([
 	}
 	testableHelper.testableStatic(getFilterInfoForPropertyFilters, "filterHelper_getFilterInfoForPropertyFilters");
 	testableHelper.testableStatic(getFilterString, "filterHelper_getFilterString");
+	testableHelper.testableStatic(fnNormaliseControlFilters, "filterHelper_fnNormaliseControlFilters");
     return {
 		getFilterParams: getFilterParams
     };

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

@@ -28,6 +28,20 @@ sap.ui.define([
 			return null;
 			};
 		}
+		/**
+		 * PolyFill for Promise.withResolvers
+		 */
+		if (!Promise.withResolvers) {
+			Promise.withResolvers = function() {
+			var resolvers = {};
+			var promise = new Promise(function(resolve, reject) {
+				resolvers.resolve = resolve;
+				resolvers.reject = reject;
+			});
+			Object.assign(promise, resolvers);
+			return promise;
+			};
+		}
 		/**
 		* PolyFill for nextSiblingElement
 		*/