@sapui5/sap.suite.ui.generic.template 1.132.0 → 1.134.1

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

@@ -6,11 +6,14 @@
  */
 // Provides the design time metadata for the sap.suite.ui.generic.template.ListReport component
 
-sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"],
-	function (designtimeHelper) {
+sap.ui.define([
+	"sap/suite/ui/generic/template/designtime/utils/designtimeHelper",
+	"sap/suite/ui/generic/template/designtime/utils/designtimeUtils"
+],
+	function (designtimeHelper, designtimeUtils) {
 		"use strict";
 
-		// allow list for designtime adaptation / level-0.  
+		// allow list for designtime adaptation / level-0.
 		var mAllowLevel0 = {
 				"sap.f.DynamicPage": {
 					properties: ["fitContent"]
@@ -23,7 +26,7 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
 					actions: ["settings"]
 				},
 				"sap.m.Table": {
-					properties: ["popinLayout", "includeItemInSelection", "growingThreshold"]
+					properties: ["popinLayout", "includeItemInSelection", "growingThreshold", "rememberSelections"]
 				},
 				"sap.m.Column": {
 					properties: ["width", "hAlign"]
@@ -62,8 +65,8 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
 					properties: ["scrollThreshold"]
 				}
 			};
-		
-		// grey list for designtime adaptation / level-0 (no technical difference too allow list, separated just for documentation  
+
+		// grey list for designtime adaptation / level-0 (no technical difference too allow list, separated just for documentation
 		var mGreyLevel0 = {
 				"sap.f.DynamicPage": {
 					properties: ["headerExpanded"]
@@ -72,7 +75,7 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
 					properties: ["width"]
 				},
 				"sap.ui.comp.smartfilterbar.SmartFilterBar": {
-					properties: ["showClearOnFB", "showFilterConfiguration", "showRestoreOnFB", "useDateRangeType", "filterBarExpanded", "showGoOnFB"]
+					properties: ["showClearOnFB", "showFilterConfiguration", "showRestoreOnFB", "filterBarExpanded", "showGoOnFB"]
 				},
 				"sap.m.Label": {						// not created by us, but by SFB
 					properties: ["width", "wrapping"]
@@ -120,8 +123,8 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
 					properties: ["type"]
 				}
 		};
-		
-		// allow list for key user adaptation. 
+
+		// allow list for key user adaptation.
 		var mAllowKeyUser = {
 				"sap.ui.comp.smartform.SmartForm": {				// used in multiedit dialog
 					aggregations: {
@@ -143,7 +146,7 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
 				},
 				"sap.m.MenuButton": { // used for create and create with filters and possibly created by combining of buttons
 					actions: ["split", "rename", "remove"]
-				},	
+				},
 				"sap.m.Button": {
 					actions: ["remove", "reveal", "rename"]
 				},
@@ -154,7 +157,9 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
 					actions: ["compVariant"]		// allows to adapt filters (same as adapt filters for end user)
 				},
 				"sap.ui.comp.smartfilterbar.SmartFilterBar": {
-					actions: ["compVariant"]		// allows to adapt filters (same as adapt filters for end user)
+					// compVariant - allows to adapt filters (same as adapt filters for end user)
+					// annotation - allows to change text arrangement
+					actions: ["compVariant", "annotation"]
 				},
 				"sap.ui.comp.smarttable.SmartTable": {
 					actions: ["compVariant"]		// allows table personalization (same as for end user)
@@ -166,7 +171,7 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
 					actions: ["rename"]
 				}
 			};
-		
+
 		// allow list for variant management: All changes done here are stored with a variant, and only applied when that variant is selected.
 		// this mode is indicated by url parameter fiori-tools-rta-mode=true
 		var mAllowVariantManagement = {
@@ -189,8 +194,8 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
 		// there's no reliable way to differentiate designtime adaptation and key user adaptation. However
 		// - property changes are possible only in designtime adaptation
 		// - for any other changes (using change handlers), we anyway need to be prepared for the change if it is allowed in one mode, so it shouldn't matter if it's also possible in the other mode
-		const sRtaModeValue = designtimeHelper.getRtaModeValue();
-		const mAllow = sRtaModeValue === designtimeHelper.FioriToolsRtaMode.True ? mAllowVariantManagement : designtimeHelper.getMergedAllowList([mAllowLevel0, mGreyLevel0, mAllowKeyUser]);
-				return designtimeHelper.getViewDesignTime(mAllow, sRtaModeValue);
-			});
-		
+		const sRtaModeValue = designtimeUtils.getRtaModeValue();
+		const mAllow = sRtaModeValue === designtimeUtils.FioriToolsRtaMode.True ? mAllowVariantManagement : designtimeHelper.getMergedAllowList([mAllowLevel0, mGreyLevel0, mAllowKeyUser]);
+		return designtimeHelper.getViewDesignTime(mAllow, sRtaModeValue);
+	});
+

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

@@ -6,8 +6,11 @@
  */
 // Provides the design time metadata for the sap.suite.ui.generic.template.ObjectPage component
 
-sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"],
-	function (designtimeHelper) {
+sap.ui.define([
+	"sap/suite/ui/generic/template/designtime/utils/designtimeHelper",
+	"sap/suite/ui/generic/template/designtime/utils/designtimeUtils"
+],
+	function (designtimeHelper, designtimeUtils) {
 		"use strict";
 
 		// allow list for designtime adaptation / level-0.
@@ -40,7 +43,7 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
 					actions: ["settings"]
 				},
 				"sap.m.Table": {
-					properties: ["growingThreshold", "popinLayout", "includeItemInSelection"]		// growingThreshold should not be possible in single section with single subsection
+					properties: ["growingThreshold", "popinLayout", "includeItemInSelection", "rememberSelections"]		// growingThreshold should not be possible in single section with single subsection
 				},
 				"sap.m.Column": {
 					properties: ["width", "hAlign"]
@@ -223,7 +226,7 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
 					actions: ["rename", "remove", "reveal"]
 				},
 				"sap.ui.comp.smartform.SmartForm": {				// not documented in allow list, but checked by RTA OPA test
-					actions: ["localReset"],
+					actions: ["localReset", "annotation"],
 					aggregations: {
 						groups: {
 							actions: ["move", "createContainer", "remove"]	// actually, only move seems to be checked, but createContainer is needed to achieve the correct index in context menu
@@ -252,6 +255,9 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
 				},
 				"sap.m.Title": {
 					actions: ["rename"]
+				},
+				"sap.ui.comp.smartfield.SmartField": {
+					actions: ["annotation"] // Allows to change text arrangement
 				}
 			};
 
@@ -274,8 +280,8 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
 		// there's no reliable way to differentiate designtime adaptation and key user adaptation. However
 		// - property changes are possible only in designtime adaptation
 		// - for any other changes (using change handlers), we anyway need to be prepared for the change if it is allowed in one mode, so it shouldn't matter if it's also possible in the other mode
-		const sRtaModeValue = designtimeHelper.getRtaModeValue();
-		const mAllow = sRtaModeValue === designtimeHelper.FioriToolsRtaMode.True ? mAllowVariantManagement : designtimeHelper.getMergedAllowList([mAllowLevel0, mGreyLevel0, mAllowKeyUser]);
-				return designtimeHelper.getViewDesignTime(mAllow, sRtaModeValue);
+		const sRtaModeValue = designtimeUtils.getRtaModeValue();
+		const mAllow = sRtaModeValue === designtimeUtils.FioriToolsRtaMode.True ? mAllowVariantManagement : designtimeHelper.getMergedAllowList([mAllowLevel0, mGreyLevel0, mAllowKeyUser]);
+		return designtimeHelper.getViewDesignTime(mAllow);
 
-			});
+	});

package/src/sap/suite/ui/generic/template/designtime/utils/designtimeHelper.js

@@ -56,7 +56,6 @@ sap.ui.define([
 	var mControlInfo = {};
 	var aViews = [];
 	// var oLogger = new FeLogger("designtime.utils.designTimeHelper").getLogger();
-	var RTA_MODE_URL_PARAM_KEY = "fiori-tools-rta-mode";
 	var oMutationObserver;
 	/**
 	 * get effective designtime for all controls on current active view
@@ -127,15 +126,6 @@ sap.ui.define([
 	function fnStopMutationObserver() {
 		oMutationObserver && oMutationObserver.disconnect();
 	}
-	/**
-	 * Parses the URL parameters and returns the value of RTA mode URL parameter (fiori-tools-rta-mode)
-	 * @returns {string | null} A promise which returns a value of RTA mode
-	 */
-	function getRtaModeValue() {
-		const oUrlParams = new URLSearchParams(window.location.search);
-		const sRtaModeValue = oUrlParams.get(RTA_MODE_URL_PARAM_KEY);
-		return sRtaModeValue;
-	}
 
 	/*
 	 * Returns the branch of the control tree as an array ordered from bottom to top, if the control is relevant (i.e. direct part of a template view). I.e. the first entry of the array is the
@@ -334,7 +324,7 @@ sap.ui.define([
 		return oResult;
 	}
 
-	function getViewDesignTime(mAllow, sFioriToolsRtaMode) {
+	function getViewDesignTime(mAllow) {
 		return loadBaseDesigntime().then(function () {
 
 			// provide propagation function for all controls contained allowing only what we want to allow
@@ -347,32 +337,35 @@ sap.ui.define([
 							var oReducedDesigntime = oElement.getMetadata().getElementName && getReducedDesignTime(oElement, mAllow[oElement.getMetadata().getElementName()]);
 
 							var oCustomDesigntime = {};
-							if (sFioriToolsRtaMode === FioriToolsRtaMode.ForAdaptation) {
-								switch (oElement.getMetadata().getElementName()) {
-									// objectpagelayout
-									case "sap.uxap.ObjectPageLayout":
-										oCustomDesigntime = ObjectPageLayoutDesigntimeHelper.getDesigntime(
-											oElement
-										);
-										break;
-									case "sap.ui.comp.smartfilterbar.SmartFilterBar":
-										oCustomDesigntime = SmartFilterBarDesigntimeHelper.getDesigntime(
-											oElement
-										);
-										break;
-									case "sap.ui.comp.smarttable.SmartTable":
-										oCustomDesigntime = SmartTableDesigntimeHelper.getDesigntime(
-											oElement
-										);
-										break;
-									case "sap.f.DynamicPage":
-										oCustomDesigntime = DynamicPageDesigntimeHelper.getDesigntime(
-											oElement
-										);
-										break;
-									default:
-										break;
-								}
+							switch (oElement.getMetadata().getElementName()) {
+								case "sap.uxap.ObjectPageLayout":
+									oCustomDesigntime = ObjectPageLayoutDesigntimeHelper.getDesigntime(
+										oElement
+									);
+									break;
+								case "sap.ui.comp.smartfilterbar.SmartFilterBar":
+								case "sap.suite.ui.generic.template.AnalyticalListPage.control.SmartFilterBarExt":
+								case "sap.suite.ui.generic.template.AnalyticalListPage.control.visualfilterbar.SmartVisualFilterBar":
+									oCustomDesigntime = SmartFilterBarDesigntimeHelper.getDesigntime(
+										oElement
+									);
+									break;
+								case "sap.ui.comp.smarttable.SmartTable":
+								case "sap.ui.table.Table":
+								case "sap.m.Table":
+								case "sap.ui.table.AnalyticalTable":
+									oCustomDesigntime = SmartTableDesigntimeHelper.getDesigntime(
+										oElement
+									);
+									break;
+								case "sap.f.DynamicPage":
+									oCustomDesigntime = DynamicPageDesigntimeHelper.getDesigntime(
+										oElement
+									);
+									break;
+								default:
+									break;
+
 							}
 							return merge(oReducedDesigntime, oCustomDesigntime);
 						}
@@ -418,16 +411,11 @@ sap.ui.define([
 			}
 		});
 	}
-	const FioriToolsRtaMode = {
-		True: "true",
-		ForAdaptation: "forAdaptation"
-	};
+
 
 	return {
 		getMergedAllowList: deepMergeWithArray,
 		getViewDesignTime: getViewDesignTime,
-		getRtaModeValue: getRtaModeValue,
-		stopMutationObserver: fnStopMutationObserver,
-		FioriToolsRtaMode
+		stopMutationObserver: fnStopMutationObserver
 	};
 });

package/src/sap/suite/ui/generic/template/designtime/utils/designtimeUtils.js

@@ -353,6 +353,7 @@ sap.ui.define([
 	 * @property {DesigntimeSetting[]} [writeObject] - An array of DesigntimeSetting objects.
 	 * @property {string} [writeObjectFor] - The value of the setting for which the Object should be constructed.
 	 * @property {boolean} [skipChange] - Indicates if the change should be skipped.
+	 * @property {boolean} [keyUser] - Indicates if the setting is allowed for key user.
 
 	* @typedef {string | boolean | string[] } PropertyValue
 
@@ -455,7 +456,16 @@ sap.ui.define([
 		return oSupportedGlobalManifestSettings;
 	}
 
-	function getAllowedDesigntimeSettings(oControl, aDesigntimeSettings) {
+	/**
+	 * Retrieves the allowed designtime settings for the given control based on the floorplan component name.
+	 * If the control is not restricted to a specific component, all settings are returned.
+	 * If the control is restricted to a specific component, only the settings for that component are returned.
+	 * @param {sap.ui.core.Control} oControl - The control.
+	 * @param {DesigntimeSetting[]} aDesigntimeSettings - The array of designtime settings.
+	 * @returns {DesigntimeSetting[]} - The allowed designtime settings.
+	 */
+
+	function filterDesigntimeSettingsByFloorPlan(oControl, aDesigntimeSettings) {
 		const sComponentName = getOwnerComponentFor(oControl).getMetadata().getComponentName();
 		return aDesigntimeSettings.filter(oSetting => !oSetting.restrictedTo || oSetting.restrictedTo.includes(sComponentName));
 	}
@@ -466,6 +476,38 @@ sap.ui.define([
 	getChanges = testableHelper.testableStatic(getChanges, "getChanges");
 	getChangeStructure = testableHelper.testableStatic(getChangeStructure, "getChangeStructure");
 
+	/**
+	 * Parses the URL parameters and returns the value of RTA mode URL parameter (fiori-tools-rta-mode)
+	 * @returns {string | null} A promise which returns a value of RTA mode
+	 */
+	function getRtaModeValue() {
+		var RTA_MODE_URL_PARAM_KEY = "fiori-tools-rta-mode";
+
+		const oUrlParams = new URLSearchParams(window.location.search);
+		const sRtaModeValue = oUrlParams.get(RTA_MODE_URL_PARAM_KEY);
+		return sRtaModeValue;
+	}
+
+	const FioriToolsRtaMode = {
+		True: "true",
+		ForAdaptation: "forAdaptation"
+	};
+
+	/**
+	 * Returns the allowed designtime settings based on the adaptation mode.
+	 * If the adaptation mode is not set, only key user settings are returned.
+	 * If the adaptation mode is set, all settings are returned.
+	 *
+	 * @param {DesigntimeSetting[]} aDesigntimeSettings
+	 * @returns {DesigntimeSetting[]}
+	 */
+	function getAllowedDesigntimeSettingsBasedOnAdaptationMode(aDesigntimeSettings) {
+		if (!getRtaModeValue()) {
+			return aDesigntimeSettings.filter(oSetting => oSetting.keyUser);
+		}
+		return aDesigntimeSettings;
+	}
+
 	return {
 		openAdaptionDialog: fnOpenAdaptionDialog,
 		getSettings,
@@ -476,6 +518,9 @@ sap.ui.define([
 		SettingScope,
 		ChangeType,
 		getSupportedGlobalManifestSettings,
-		getAllowedDesigntimeSettings
+		filterDesigntimeSettingsByFloorPlan,
+		getRtaModeValue,
+		FioriToolsRtaMode,
+		getAllowedDesigntimeSettingsBasedOnAdaptationMode
 	};
 });

package/src/sap/suite/ui/generic/template/detailTemplates/DiscardEditHandler.js

@@ -171,6 +171,7 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend", "sap/suite/ui/gener
 								var fnSuccess = function(){ // what to do if cancellation was successfull
 									fnCancellationResult = fnResolve; // now the end of the process is considered as a resolve
 									fnAfterCancellation(); // perform the after cancel navigation
+									fnDisplayDiscardMessage();//display a discard draft message
 									fnCleanUpAfterCancellation(); // clean up the state of this class
 									if (fnSetFocus){
 										oTemplateUtils.oServices.oApplication.setNextFocus(fnSetFocus);
@@ -188,6 +189,18 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend", "sap/suite/ui/gener
 							});
 							oBusyHelper.setBusy(oCancellationPromise);
 						};
+						//This function is responsible for showing the "Draft Discarded" or "Changes Discarded" confirmation text
+						function fnDisplayDiscardMessage() {
+							fnNeedsConfirmation().then(function (bNeedsConfirmation) { //checks if changes are made in the draft
+								if (bNeedsConfirmation) { // Ensure this is a boolean check
+									if (oUiModel.getProperty("/createMode")) { //if it is a "Create Draft"
+										oTemplateUtils.oServices.oApplication.showMessageToast(oTemplateUtils.oCommonUtils.getText("ST_GENERIC_DRAFT_WITHOUT_ACTIVE_DOCUMENT_DELETED"));
+									} else {
+										oTemplateUtils.oServices.oApplication.showMessageToast(oTemplateUtils.oCommonUtils.getText("ST_GENERIC_DRAFT_WITH_ACTIVE_DOCUMENT_DELETED"));//if it is an "Edit Draft"
+									}
+								}
+							});
+						}
 						fnNeedsConfirmation().then(function (bNeedsConfirmation) {
 							if (oCancelButton && bNeedsConfirmation){
 								fnCancellationConfirmed = fnExecuteCancellation;

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

@@ -2,26 +2,24 @@
     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:with path="dataField>Action"
-		helper="AHModel.gotoFunctionImport"
-		var="action">
-	    <Button id="{parts: [{path: 'dataField>'}, {path: 'facet>'}], formatter: 'AH.getStableIdPartForDatafieldActionButton'}::Determining"
-			type="{path:'dataField>', formatter: 'AH.buildExpressionForButtonCriticality'}"
-	        text="{= ${path: 'dataField>Label', formatter: 'AHModel.format'}}"
-            visible="{parts: [{path: 'parameter>/treeNode'}, {path: 'action>sap:applicable-path'}, {path: 'dataField>'}], formatter: 'AH.actionControlDetermining'}"
+	<template:with path="dataField>Action" helper="AHModel.gotoFunctionImport" var="action">
+		<Button id="{parts: [{path: 'dataField>'}, {path: 'facet>'}], formatter: 'AH.getStableIdPartForDatafieldActionButton'}::Determining"
+			type="{path:'dataField>', formatter: 'AH.buildExpressionForButtonCriticality'}" text="{= ${path: 'dataField>Label', formatter: 'AHModel.format'}}"
+			visible="{parts: [{path: 'parameter>/treeNode'}, {path: 'action>sap:applicable-path'}, {path: 'dataField>'}], formatter: 'AH.actionControlDetermining'}"
 			press="{parts: [{path: 'parameter>/settings'}, {path: 'dataField>'}, {path: 'parameter>/manifest'}, {value: 'true'}], formatter: 'AH.getAnnotatedActionPress'}">
-	        <customData>
-	            <core:CustomData key="Action" value="{path: 'dataField>Action', formatter: 'AHModel.format'}" />
-	            <core:CustomData key="Label" value="{path: 'dataField>Label', formatter: 'AHModel.format'}" />
-	            <template:if test="{= ${dataField>RecordType} === 'com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation'}">
-	                <core:CustomData key="SemanticObject" value="{path: 'dataField>SemanticObject', formatter: 'AHModel.format'}" />
-	                <core:CustomData key="RequiresContext" value="{path: 'dataField>RequiresContext', formatter: 'AHModel.format'}" />
-	            </template:if>
-	            <template:with path="dataField>Action" helper="AHModel.gotoFunctionImport" var="action">
-	            	<core:CustomData key="ActionFor" value="{action>sap:action-for}" />
-                </template:with>
-	        </customData>
-	    </Button>
-    </template:with>
+			<customData>
+				<core:CustomData key="Action" value="{path: 'dataField>Action', formatter: 'AHModel.format'}" />
+				<core:CustomData key="Label" value="{path: 'dataField>Label', formatter: 'AHModel.format'}" />
+				<core:CustomData key="ActionType" value="determining" />
+				<template:if test="{= ${dataField>RecordType} === 'com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation'}">
+					<core:CustomData key="SemanticObject" value="{path: 'dataField>SemanticObject', formatter: 'AHModel.format'}" />
+					<core:CustomData key="RequiresContext" value="{path: 'dataField>RequiresContext', formatter: 'AHModel.format'}" />
+				</template:if>
+				<template:with path="dataField>Action" helper="AHModel.gotoFunctionImport" var="action">
+					<core:CustomData key="ActionFor" value="{action>sap:action-for}" />
+				</template:with>
+			</customData>
+		</Button>
+	</template:with>
 
 </core:FragmentDefinition>

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

@@ -4,6 +4,7 @@
 			 ariaLabelledBy="objectNoDataText unsavedPopoverText lockedPopoverText objectChangedText"
 			 contentWidth="15.625rem"
 			 verticalScrolling="false"
+			 placement="Auto"
 			 class="sapSmartTemplatesListReportPopover sapUiContentPadding">
 		<endButton>
 				<Button icon="sap-icon://decline" tooltip="{i18n>CLOSE}" press="closeDraftAdminPopover" />

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

@@ -27,7 +27,7 @@
                <smartField:SmartField value="{path: 'dataField>Value', formatter: 'AHModel.simplePath'}" editable="false" contextEditable="false" fetchValueListReadOnly="false"
                     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>
@@ -55,7 +55,7 @@
                         <core:CustomData key="Target" value="{dataField>Target/NavigationPropertyPath}" />
                     </smartField:customData>
                     <smartField:configuration>
-					<smartField:Configuration displayBehaviour="{parts: [{path: 'dataField>'}, {value: ''}, {path: 'listEntitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}" />
+					<smartField:Configuration displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'listEntitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}" />
 				</smartField:configuration>
                 </smartField:SmartField>
             </template:elseif>
@@ -84,7 +84,7 @@
 						  <RatingIndicator
 								enabled="true" editable="false" maxValue="{path: 'dataFieldTarget>TargetValue', formatter: 'AHModel.format'}"
 								binding="{= ${ path: 'dataField>Target/AnnotationPath'}.indexOf('/') > -1 ? '{' + ${path: 'dataField>Target/AnnotationPath'}.slice(0, ${ path: 'dataField>Target/AnnotationPath'}.indexOf('/')) + '}' : null}"
-								value="{path: 'dataFieldTarget>Value', formatter: 'AHModel.format'}" width="16px" />
+								value="{path: 'dataFieldTarget>Value', formatter: 'AHModel.format'}" iconSize="16px" />
 					   </template:with>
 					</template:elseif>
                     <template:elseif test="{= ${dataFieldTarget>Visualization/EnumMember} === 'com.sap.vocabularies.UI.v1.VisualizationType/Progress'}">
@@ -99,7 +99,7 @@
                                         state="{path:'dataFieldTarget>', formatter: 'AH.buildExpressionForProgressIndicatorCriticality'}">
                                 <customData>
                                     <core:CustomData key="Target" value="{= ${path: 'dataFieldTarget>TargetValue', formatter: 'AHModel.format'} }" />
-                                    <core:CustomData key="UoM" value="{= ${path: 'valueProperty>Org.OData.Measures.V1.Unit', formatter: 'AHModel.format'} }" />
+                                    <core:CustomData key="UoM" value="{= ${path: 'value>Org.OData.Measures.V1.Unit', formatter: 'AHModel.format'} }" />
                                 </customData>
                             </ProgressIndicator>
                         </template:with>

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

@@ -18,7 +18,7 @@
 			</sfi:semanticObjectController>
 			<sfi:configuration>
 				<sfi:Configuration
-						displayBehaviour="{parts: [{path: 'dataPoint>'}, {path: 'annotation>'}, {path: 'entitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}"/>
+						displayBehaviour="{parts: [{path: 'dataPoint>'}, {path: 'entitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}"/>
 			</sfi:configuration>
 			<template:if test="{= ${dataPoint>Criticality} }">
 				<sfi:controlProposal>

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

@@ -77,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'}" />
@@ -113,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/MessagePopover.fragment.xml

@@ -2,16 +2,17 @@
 		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}"
+					markupDescription="{= ${helper>/isAIErrorExplanationEnabled} }"
 					activeTitle="{parts:[{path: 'msg>id'}, {path: 'msg>controlIds'}, {path: 'helper>/isPopoverOpen'}], formatter: '.isPositionable'}"
 					groupName="{= ${helper>/messageToGroupName}[${msg>id}] }">
 					<Link
 						text="{i18n>ST_AI_EE_BUTTON_LABEL}"
 						icon="sap-icon://ai"
-						visible="{helper>/isAIErrorExplanationEnabled}"
+						visible="{= ${helper>/isAIErrorExplanationEnabled} }"
 						press="generateErrorExplanation">
 						<customData>
 							<core:CustomData key="message" value="{msg>message}" />

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

@@ -1,6 +1,6 @@
 <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="{StableIdHelper: 'sap/suite/ui/generic/template/js/StableIdHelper'}">
+	template:require="{StableIdHelper: 'sap/suite/ui/generic/template/js/StableIdHelper', AH: 'sap/suite/ui/generic/template/js/AnnotationHelper'}">
 
 	<template:with path="parameter>/" helper="StableIdHelper.preparePathForStableId" var="contextMenuId">
 		<template:if test="{= ${contextMenuId>}.buildStableId({type: 'SmartControl', subType: 'ContextMenu', sSmartTableId: ${smartControlId>id}})}" />

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>
@@ -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>

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

@@ -123,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>

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

@@ -204,10 +204,12 @@ sap.ui.define([
 		}
 		var sRet = aFiltersForProperty.map(function (oFilter) {
 			var bCaseSensitive = true;
+			// Define the date range operations that need date formatting
+			var dateRangeOperations = ["DATE", "DATERANGE", "DATETIMERANGE", "FROM", "TO"];
 			if (oFilter.bCaseSensitive === undefined) {
 				bCaseSensitive = true;
 			}
-			if ((oProperty.type === "Edm.DateTime" || oProperty.type === "Edm.DateTimeOffset") && oParams.oFilterData[sPropertyForFilterData].conditionTypeInfo && oParams.oFilterData[sPropertyForFilterData].conditionTypeInfo.data.operation !== "DATE") {
+			if ((oProperty.type === "Edm.DateTime" || oProperty.type === "Edm.DateTimeOffset") && oParams.oFilterData[sPropertyForFilterData].conditionTypeInfo && !dateRangeOperations.includes(oParams.oFilterData[sPropertyForFilterData].conditionTypeInfo.data.operation)) {
 				if (!DynamicDateUtil.getAllOptionKeys().includes(oParams.oFilterData[sPropertyForFilterData].conditionTypeInfo.data.operation)) {
 					oParams.bIsStatic = true;
 					return;