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

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"]
@@ -274,8 +277,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

@@ -1,6 +1,20 @@
-sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/util/merge", "sap/suite/ui/generic/template/genericUtilities/FeLogger",
-	"sap/suite/ui/generic/template/designtime/controls/SmartTable.designtime"
-], function (extend, deepExtend, merge, FeLogger, SmartTableDesigntimeHelper) {
+sap.ui.define([
+	"sap/base/util/deepExtend",
+	"sap/base/util/merge",
+	"sap/suite/ui/generic/template/designtime/controls/SmartTable.designtime",
+	"sap/suite/ui/generic/template/designtime/controls/DynamicPage.designtime",
+	"sap/suite/ui/generic/template/designtime/controls/SmartFilterBar.designtime",
+	"sap/suite/ui/generic/template/designtime/controls/ObjectPageLayout.designtime",
+	"sap/ui/core/Element"
+], function (
+	deepExtend,
+	merge,
+	SmartTableDesigntimeHelper,
+	DynamicPageDesigntimeHelper,
+	SmartFilterBarDesigntimeHelper,
+	ObjectPageLayoutDesigntimeHelper,
+	Element
+) {
 	"use strict";
 
 	/*
@@ -42,7 +56,6 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 	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
@@ -72,8 +85,8 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 
 		// Assumption: Enough to start with template views and find all aggregated objects
 		// for later added controls: enough to add listener on those views, react if related Node is a known control, and recheck all aggregated objects of that control
-		document.querySelectorAll(".sapUiXMLView").forEach(function (oTopNode) {
-			var oView = sap.ui.getCore().byId(oTopNode.id);
+		document.querySelectorAll(".sapUiXMLView").forEach(function(oTopNode){
+			var oView = Element.getElementById(oTopNode.id);
 			// defensive programming, as any error here would be caught by UI adaptation and lead to just ignoring designtime provided here - which would open up for any UI adaptation provided from
 			// deeper layers
 			// first two conditions should actually not occur, but if so, evaluating the third would break
@@ -91,7 +104,7 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 						mutation.addedNodes.forEach(function (node) {
 							// Find the preceding known node and the corresponding control
 							var oNode = findPreceedingKnownNode(node);
-							var oControl = oNode && sap.ui.getCore().byId(oNode.id);
+							var oControl = oNode && Element.getElementById(oNode.id);
 							if (oControl) {
 								// For each control, find aggregated objects and add them to control info
 								oControl.findAggregatedObjects(true).forEach(addToControlInfo);
@@ -113,15 +126,6 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 	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
@@ -320,7 +324,7 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 		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
@@ -333,19 +337,35 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 							var oReducedDesigntime = oElement.getMetadata().getElementName && getReducedDesignTime(oElement, mAllow[oElement.getMetadata().getElementName()]);
 
 							var oCustomDesigntime = {};
-							if (sFioriToolsRtaMode === FioriToolsRtaMode.ForAdaptation) {
-								switch (oElement.getMetadata().getElementName()) {
-									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;
-									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);
 						}
@@ -391,16 +411,11 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 			}
 		});
 	}
-	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

@@ -44,8 +44,9 @@ sap.ui.define([
 				"sap/m/CheckBox",
 				"sap/ui/core/Item",
 				"sap/m/Select",
-				"sap/m/Token"
-			], function (JSONModel, InputListItem, List, MultiInput, Input, CheckBox, Item, Select, Token) {
+				"sap/m/Token",
+				"sap/m/MultiComboBox"
+			], function (JSONModel, InputListItem, List, MultiInput, Input, CheckBox, Item, Select, Token, MultiComboBox) {
 				const settingsModel = new JSONModel();
 				settingsModel.setData(aDialogContent);
 
@@ -89,27 +90,51 @@ sap.ui.define([
 									}).data("id", id);
 								}
 							case "string[]":
-								const oMultiInput = new MultiInput({
-									width: "70%",
-									showValueHelp: false,
-									showClearIcon: true,
-									tokens: (propertyValues[id] || []).map(function (navigationProperty) {
-										return new Token({ text: navigationProperty, key: navigationProperty });
-									}),
-									tokenUpdate: function (event) {
-										const array = propertyValues[this.data("id")];
-										if (event.getParameter("addedTokens").length > 0) {
-											array.push(event.getParameter("addedTokens")[0].getKey());
-										} else if (event.getParameter("removedTokens").length > 0) {
-											const index = array.indexOf(event.getParameter("removedTokens")[0].getKey());
-											if (index !== -1) { array.splice(index, 1); }
+								if (oContext.getProperty("enum")) {
+									const multiSelectItem = new Item({ text: "{name}", key: "{id}" });
+									const oMultiComboBox = new MultiComboBox({
+										width: "60%",
+										selectedKeys: propertyValues[id] || [],
+										selectionChange: function (event) {
+											propertyValues[this.data("id")] = event.getSource().getSelectedKeys();
+										},
+										enabled: {
+											path: "disabled",
+											formatter: function (disabled) {
+												return !disabled;
+											}
 										}
-									}
-								}).data("id", id);
-								oMultiInput.addValidator(function (args) {
-									return new Token({ key: args.text, text: args.text });
-								});
-								return oMultiInput;
+									}).data("id", id);
+
+									oMultiComboBox.bindItems({ path: "enum", template: multiSelectItem });
+									oMultiComboBox.setSelectedKeys(unchangedData[id] || []);
+									return oMultiComboBox;
+								} else {
+									const oMultiInput = new MultiInput({
+										width: "70%",
+										showValueHelp: false,
+										showClearIcon: true,
+										tokens: (propertyValues[id] || []).map(function (navigationProperty) {
+											return new Token({ text: navigationProperty, key: navigationProperty });
+										}),
+										tokenUpdate: function (event) {
+											const array = propertyValues[this.data("id")];
+											if (event.getParameter("addedTokens").length > 0) {
+												array.push(event.getParameter("addedTokens")[0].getKey());
+											} else if (event.getParameter("removedTokens").length > 0) {
+												const index = array.indexOf(event.getParameter("removedTokens")[0].getKey());
+												if (index !== -1) {
+													array.splice(index, 1);
+												}
+											}
+										}
+									}).data("id", id);
+
+									oMultiInput.addValidator(function (args) {
+										return new Token({ key: args.text, text: args.text });
+									});
+									return oMultiInput;
+								}
 							case "number":
 								return new Input({
 									value: "{value}",
@@ -141,6 +166,19 @@ sap.ui.define([
 								booleanOrStringSelect.bindItems({ path: "enum", template: booleanOrStringItem });
 								booleanOrStringSelect.setSelectedKey(unchangedData[id]);
 								return booleanOrStringSelect;
+
+							case "booleanOrStringCheckbox":
+								const enums = oContext.getProperty("enum");
+								const booleanOrStringCheckbox = new CheckBox({
+									selected: unchangedData[id] === enums.find(e => e.name === "true").id,
+									select: function (event) {
+										const isSelected = event.getParameter("selected");
+										const value = isSelected ? enums.find(e => e.name === "true").id : enums.find(e => e.name === "false").id;
+										propertyValues[this.data("id")] = value;
+									}
+								}).data("id", id);
+								return booleanOrStringCheckbox;
+
 							case "json":
 								return new Input({
 									value: "{value}",
@@ -315,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
 
@@ -417,12 +456,58 @@ sap.ui.define([
 		return oSupportedGlobalManifestSettings;
 	}
 
+	/**
+	 * 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));
+	}
+
 
 	// Add the functions to the testableHelper for testing which are not exported
 	getChangedPropertyValues = testableHelper.testableStatic(getChangedPropertyValues, "getChangedPropertyValues");
 	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,
@@ -432,6 +517,10 @@ sap.ui.define([
 		getLocalId,
 		SettingScope,
 		ChangeType,
-		getSupportedGlobalManifestSettings
+		getSupportedGlobalManifestSettings,
+		filterDesigntimeSettingsByFloorPlan,
+		getRtaModeValue,
+		FioriToolsRtaMode,
+		getAllowedDesigntimeSettingsBasedOnAdaptationMode
 	};
 });

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

@@ -1,12 +1,12 @@
 
-APPLY=FjbQoCRcRl/2B3xC0rq3SQ_Apply
+APPLY=nH1BrR0hyKgb04d73Mxd+A_Apply
 
-MESSAGE_BUTTON_TOOLTIP_S=GCOLaqD8YToROWMAUmfchg_1 Message
+MESSAGE_BUTTON_TOOLTIP_S=NwlSqAFib9vfeqqNE781IQ_1 Message
 
-MESSAGE_BUTTON_TOOLTIP_P=LlmjXocucDhrIkSWARS1Wg_{0} Messages
+MESSAGE_BUTTON_TOOLTIP_P=NgyLDP6lSQDYc2CsPadzZg_{0} Messages
 
-MESSAGE_BUTTON_TYPE=wUEvSxBs6wVdRxT2PyaANg_Messages
+MESSAGE_BUTTON_TYPE=x5WGCQhSx49hUiJHwlOkmw_Messages
 
-ST_DETAIL_TITLE_VALIDATION=y/JjsrU9rr7ZsJ5VeDuhOQ_Validation Messages
+ST_DETAIL_TITLE_VALIDATION=AfreC6WzZTp/+R8OrCdWgA_Validation Messages
 
-ST_DETAIL_TITLE_DELETE=DdsIwyBHpouKKe6i9MI9Uw_Delete
+ST_DETAIL_TITLE_DELETE=IkZr5MmugIY4SHT8ExcbvQ_Delete

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

@@ -13,7 +13,7 @@
 						press="{customAction>press}"
 						type="Transparent">
 						<layoutData>
-							<OverflowToolbarLayoutData priority = "{customAction>importance}"/>
+							<OverflowToolbarLayoutData priority="{path: 'customAction>importance', formatter: 'AH.getToolbarButtonPriorityFromImportance'}"/>
 						</layoutData>
 					</Button>
   	          </template:if>
@@ -29,7 +29,7 @@
 					press="{customAction>press}"
 					type="Transparent">
 					<layoutData>
-						<OverflowToolbarLayoutData priority = "{customAction>importance}"/>
+						<OverflowToolbarLayoutData priority="{path: 'customAction>importance', formatter: 'AH.getToolbarButtonPriorityFromImportance'}"/>
 					</layoutData>
 				</Button>
             </template:if>

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

@@ -1,12 +1,13 @@
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core"
-	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1">
+	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
+	template:require="{AH:'sap/suite/ui/generic/template/js/AnnotationHelper'}">
 	
 	<template:if test="{= ${tmpEntitySet>EntitySet} === ${parameter>/entitySet} }">
 				<Button id="{customaction>id}"
 					text="{customaction>text}"
 					press="{customaction>press}" type="Default">
 					<layoutData>
-						<OverflowToolbarLayoutData priority = "{customaction>importance}"/>
+						<OverflowToolbarLayoutData priority="{path: 'customaction>importance', formatter: 'AH.getToolbarButtonPriorityFromImportance'}"/>
 					</layoutData>
 				</Button>
 	</template:if>

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/EasyFilter.fragment.xml

@@ -1,11 +1,6 @@
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core" xmlns:feControls="sap.fe.controls.easyFilter">
     <!-- to check how to use a common model property instead of listReport/filterMode  which is specific to LR-->
     <VBox  visible="{= ${_templPriv>/listReport/filterMode} === 'easyFilter'}">
-         <MessageStrip
-            text="{i18n>ST_EASY_FILTER_PROMPT_INFO}"
-            showIcon="true"
-            showCloseButton="true"
-            class="sapUiSmallMarginBottom"/>
          <feControls:EasyFilterBarContainer id="template::easyFilterContainer"
 			showValueHelp="._templateEventHandlers.onEasyFilterShowValueHelp"
 			queryChanged="._templateEventHandlers.onEasyFilterQueryChanged"
@@ -13,7 +8,6 @@
 			beforeQueryProcessing="._templateEventHandlers.onEasyFilterBeforeQueryProcessing"
 			afterQueryProcessing="._templateEventHandlers.onEasyFilterAfterQueryProcessing"
 			clearFilters="._templateEventHandlers.onEasyFilterClearFilters"
-			executeSearch="._templateEventHandlers.onEasyFilterExecuteSearch"
 		/>
     </VBox>
 </core:FragmentDefinition>

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

@@ -1,5 +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">
+		xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
+		template:require="{AH:'sap/suite/ui/generic/template/js/AnnotationHelper'}">
 
 	<template:if test="{= ${tmpEntitySet>EntitySet} === ${parameter>/entitySet} }">
 		<template:repeat list="{tmpEntitySet>Actions}" var="customAction">
@@ -9,7 +10,7 @@
 					press="{= ${customAction>command} ? 'cmd:' + ${customAction>command} : ${customAction>press} }"
 					type="Default">
 					<layoutData>
-						<OverflowToolbarLayoutData priority="{customAction>importance}"/>
+						<OverflowToolbarLayoutData priority="{path: 'customAction>importance', formatter: 'AH.getToolbarButtonPriorityFromImportance'}"/>
 					</layoutData>
 				</Button>
 			</template:if>

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

@@ -10,6 +10,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'}" />
@@ -26,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>
@@ -54,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>
@@ -83,22 +84,22 @@
 						  <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'}">
                         <template:with path="dataFieldTarget>Value" helper="AHModel.resolvePath" var="value">
                         <!-- Progress Bar Control -->
-                        <!-- 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'}"
                                         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/HeaderAddress.fragment.xml

@@ -9,7 +9,8 @@
 		<template:if test="{headerFacet>Label}">
 			<Title id="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::Label"
 				   text="{path: 'headerFacet>Label', formatter: 'AHModel.format'}:"
-				   class="sapSmartTemplatesObjectPageHeaderAddressLabel" />
+				   class="sapSmartTemplatesObjectPageHeaderAddressLabel" 
+				   level="H3"/>
 		</template:if>
 		<Text id="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::Address"
 			  class="sapSmartTemplatesObjectPageHeaderAddressValue"

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

@@ -9,7 +9,8 @@
 		<template:if test="{headerFacet>Label}">
 			<Title id="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::Label"
 				   text="{path: 'headerFacet>Label', formatter: 'AHModel.format'}"
-				   class="sapSmartTemplatesObjectPageHeaderContactLabel"/>
+				   class="sapSmartTemplatesObjectPageHeaderContactLabel"
+				   level="H3"/>
 		</template:if>
 		<HBox>
 			<core:Icon id="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::Link::Icon"

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

@@ -4,7 +4,7 @@
 
 	<Title id="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::{path: 'dataPoint>', formatter: 'AH.getStableIdPartFromDataPoint'}::Label"
 	text="{path: 'dataPoint>Title', formatter: 'AH.formatWithExpandSimple'}"
-		   class="sapSmartTemplatesObjectPageDataPointLabel sapUiTinyMarginEnd"/>
+		   class="sapSmartTemplatesObjectPageDataPointLabel sapUiTinyMarginEnd" level="H3"/>
 	<template:with path="headerFacet>Target" helper="AHModel.gotoEntitySet"
 				   var="annotation">
 		<sfi:SmartField
@@ -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/HeaderForm.fragment.xml

@@ -8,7 +8,7 @@
 		<template:with path="parameter>/" helper="StableIdHelper.preparePathForStableId" var="facetId">
 			<template:if test="{= ${facetId>}.buildStableId({type: 'ObjectPage', subType: 'Facet', sRecordType: ${headerFacet>RecordType}, sAnnotationPath: ${headerFacet>Target/AnnotationPath}, sAnnotationId: ${headerFacet>ID/String}, bIsHeaderFacet: ${isHeaderFacet>value}})}"/>
 				<template:if test="{headerFacet>Label}">
-					<Title id="{:= ${parameter>/stableId}.getStableId({type: 'ObjectPageHeader', subType: 'HeaderTitle', sFacet: ${facetId>id}})}" text="{path: 'headerFacet>Label', formatter: 'AHModel.format'}" class="sapSmartTemplatesObjectPageHeaderFormTitle"/>
+					<Title id="{:= ${parameter>/stableId}.getStableId({type: 'ObjectPageHeader', subType: 'HeaderTitle', sFacet: ${facetId>id}})}" text="{path: 'headerFacet>Label', formatter: 'AHModel.format'}" class="sapSmartTemplatesObjectPageHeaderFormTitle"  level="H3"/>
 				</template:if>	
 			<template:if test="{form>Data}">
 				<template:then>