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

package/src/sap/suite/ui/generic/template/designtime/controls/SmartFilterBar.designtime.js

@@ -0,0 +1,236 @@
+/*!
+* SAP UI development toolkit for HTML5 (SAPUI5)
+
+		(c) Copyright 2009-2015 SAP SE. All rights reserved
+	
+*/
+sap.ui.define([
+	"sap/base/util/deepClone",
+	"sap/suite/ui/generic/template/designtime/utils/designtimeUtils",
+	"sap/base/util/ObjectPath",
+	"sap/suite/ui/generic/template/genericUtilities/testableHelper"
+],
+	function (deepClone, designtimeUtils, ObjectPath, testableHelper) {
+		"use strict";
+
+		const LIST_REPORT_COMPONENT_NAME = "sap.suite.ui.generic.template.ListReport";
+		// ALP
+		const ANALYTICAL_LIST_PAGE_COMPONENT_NAME = "sap.suite.ui.generic.template.AnalyticalListPage";
+
+		/**
+		 * @typedef {Object} DesigntimeSetting
+		 * @property {string} id - The ID of the designtime setting.
+		 * @property {string} name - The name of the designtime setting.
+		 * @property {string} description - The description of the designtime setting.
+		 * @property {PropertyValue} [value] - The default value of the designtime setting.
+		 * @property {string} type - The type of the designtime setting.
+		 * @property {Array.<Enum>} [enums] - The array of possible enum values for the designtime setting.
+		 * @property {(mControlDetails: ControlInfo) => string} [getPath] - The path to the designtime setting in the manifest.
+		 * @property {boolean} [bSupportsGlobalScope] - Indicates if the setting supports global scope. (Default: false)
+		 * @property {string[]} [restrictedTo] - The array of components for which the setting is restricted.
+		 * @property {Partial<DesigntimeSetting>[]} [writeObject] - An array of DesigntimeSetting objects.
+		 * @property {string} [writeObjectFor] - The value for which the writeObject should be applied.
+		 * @property {boolean} [skipChange] - Indicates if the change should be skipped.
+
+		===============================================
+		 * @typedef {Object} ChangeParameters - Descriptor change parameters.
+		 * @property {string} [sScope] - The scope of the manifest setting.
+		 * @property {string} [sChangeType] - Desciptor change type.
+		===============================================
+
+		 * @typedef {Object} ControlInfo
+		 * @property {string} [sParentComponentName] - The name of the parent component.
+		 * @extends ChangeParameters
+
+		 * @typedef {ChangeParameters & ControlInfo} ControlChangeParams
+
+		 * @typedef {string | boolean | string[] | null } PropertyValue
+
+		 * @typedef {Object} Enum
+		 * @property {string} id - The ID of the enum value.
+		 * @property {string} name - The name of the enum value.
+		 * @property {Object} [value] - The value of the enum value.
+		 */
+
+
+		/**
+	 * Retrieves the runtime adaptation properties based on the allowed design-time settings and global settings.
+	 *
+	 * @param {Array} aAllowedDesigntimeSettings - The array of allowed design-time settings.
+	 * @param {Object} mFilterSettings - The global manifest settings object.
+	 * @returns {Object} - The object containing the runtime adaptation properties.
+	 */
+		function getRuntimeAdapationProperties(aAllowedDesigntimeSettings, mFilterSettings) {
+			const mPropertyValues = {};
+
+			aAllowedDesigntimeSettings.forEach(oSetting => {
+				const sProperty = oSetting.id;
+				switch (sProperty) {
+					case "useDateRange":
+						mPropertyValues[sProperty] = mFilterSettings[sProperty] || oSetting.value;
+						break;
+					case "navigationProperties":
+						mPropertyValues[sProperty] = mFilterSettings[sProperty] || oSetting.value;
+						break;
+
+
+					default:
+						break;
+				}
+			});
+			return mPropertyValues;
+		}
+
+		/**
+		 * Retrieves the designtime settings for the Control.
+		 * @param {object} oControl - The Control object.
+		 * @returns {DesigntimeSetting[]}
+		 */
+		let getAllDesigntimeSettings = function getAllDesigntimeSettings(oControl) {
+			/**
+			 * Retrieves the enums for the SmartFilterBar control.
+			 * @param {Array<string>} aPropertyNames - The array of enums.
+			 * @returns {Array<Enum>} - The array of enums.
+			 */
+			function getEnums(aPropertyNames) {
+				return aPropertyNames.map(sPropertyName => {
+					return {
+						id: sPropertyName,
+						name: sPropertyName
+					};
+				});
+			}
+
+			/**
+			 * Retrieves the navigation properties for the SmartFilterBar control.
+			 * @returns {Array<string>} - The array of navigation properties.
+			 */
+
+			function getNavigationProperties() {
+				const oMetaModel = oControl.getModel().getMetaModel();
+				// Get the entity set of the SmartFilterBar control
+				const sEntitySet = oControl.getEntitySet?.();
+				if (!sEntitySet){
+					throw new Error("Error while retrieving the entity set of the SmartFilterBar control");
+				}
+
+				const oEntityType = oMetaModel.getODataEntityType(oMetaModel.getODataEntitySet(sEntitySet).entityType);
+				// Sibling entity types are the navigation properties
+				return (oEntityType.navigationProperty || [])
+					.map(oNavigationProperty => oNavigationProperty.name)
+					.filter(sNavigationProperty => sNavigationProperty !== "SiblingEntity");
+			}
+
+			/**
+			 * @type {DesigntimeSetting}
+			*/
+
+			const enableDateRange = {
+				id: "useDateRange",
+				name: "Enable Date Range",
+				description: "Enable Date Range",
+				value: true,
+				type: "boolean",
+				getPath: function (mControlDetails) {
+					return `component/settings/filterSettings/dateSettings/useDateRange`;
+				},
+				restrictedTo: [LIST_REPORT_COMPONENT_NAME, ANALYTICAL_LIST_PAGE_COMPONENT_NAME]
+			};
+
+
+			/**
+			 * @type {DesigntimeSetting}
+			 */
+
+			const navigationProperties = {
+				id: "navigationProperties",
+				name: "Navigation Properties",
+				description: "Navigation Properties",
+				type: "string[]",
+				getPath: function (mControlDetails) {
+					return `component/settings/filterSettings/navigationProperties`;
+				},
+				value: [],
+				restrictedTo: [LIST_REPORT_COMPONENT_NAME, ANALYTICAL_LIST_PAGE_COMPONENT_NAME],
+				enums: getEnums(getNavigationProperties())
+			};
+
+
+			return [enableDateRange, navigationProperties];
+		};
+
+
+
+		function getFilterSettings(oComponent) {
+			const mFilterSettings = oComponent.getFilterSettings();
+			return {
+				useDateRange: ObjectPath.get("dateSettings.useDateRange", mFilterSettings),
+
+				navigationProperties: ObjectPath.get("navigationProperties", mFilterSettings)
+			};
+		}
+
+
+
+
+		/**
+		 * Opens the dialog for the table configuration.
+		 * @param {sap.ui.core.Control} oControl - The control for which the dialog should be opened.
+		 * @param {object} mPropertyBag - The property bag.
+		 * @returns {Promise<ControlChangeParams[]>} - The changes.
+		 */
+		async function fnOpenTableConfigurationDialog(oControl, mPropertyBag) {
+			const oResourceModel = oControl.getModel("i18n");
+			const oComponent = designtimeUtils.getOwnerComponentFor(oControl);
+			// Get the filter settings from the component
+			const mFilterSettings = getFilterSettings(oComponent);
+
+			// Get all the designtime settings
+			const aAllDesigntimeSettings = getAllDesigntimeSettings(oControl);
+			// Get the allowed designtime settings based on the floorplan
+			const aAllowedDesigntimeSettings = designtimeUtils.getAllowedDesigntimeSettings(oControl, aAllDesigntimeSettings);
+
+			// Get the current values of the properties
+			const mRuntimeAdaptationPropertyValues = getRuntimeAdapationProperties(aAllowedDesigntimeSettings, mFilterSettings);
+			// Save the unchanged data to compare later
+			const mUnchangedData = deepClone(mRuntimeAdaptationPropertyValues);
+			// Get the settings of the dialog from the designtime settings using which the dialog will be created
+			const aItems = designtimeUtils.getSettings(mRuntimeAdaptationPropertyValues, aAllowedDesigntimeSettings);
+
+			// disable the scope control if there is only one option
+
+			const mPropertyValuesEntered = await designtimeUtils.openAdaptionDialog([...aItems], mRuntimeAdaptationPropertyValues, mUnchangedData, "{i18n>RTA_CONFIGURATION_TITLE_FILTER_BAR}", { width: "650px", height: "800px" }, oResourceModel);
+
+
+			/**
+			 * @type {ControlChangeParams}
+			 */
+			const mPathParameters = {
+				sChangeType: designtimeUtils.ChangeType.ChangePageConfiguration
+			};
+			return designtimeUtils.extractChanges(mPropertyValuesEntered, mUnchangedData, aAllowedDesigntimeSettings, oComponent, mPathParameters);
+
+		}
+
+		// Expose the functions for QUnit tests
+		testableHelper.testableStatic(fnOpenTableConfigurationDialog, "fnOpenTableConfigurationDialog");
+
+
+		const oHelper = {
+			getDesigntime: function (oControl) {
+				return {
+					actions: {
+						settings: {
+							fe: {
+								name: "Configuration",
+								icon: "sap-icon://developer-settings",
+								handler: fnOpenTableConfigurationDialog
+							}
+						}
+					}
+				};
+			}
+		};
+		return oHelper;
+	}
+);

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";
 
 	/*
@@ -72,8 +86,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 +105,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);
@@ -335,14 +349,27 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 							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":
-									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;
 								}

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}",
@@ -417,6 +455,11 @@ sap.ui.define([
 		return oSupportedGlobalManifestSettings;
 	}
 
+	function getAllowedDesigntimeSettings(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");
@@ -432,6 +475,7 @@ sap.ui.define([
 		getLocalId,
 		SettingScope,
 		ChangeType,
-		getSupportedGlobalManifestSettings
+		getSupportedGlobalManifestSettings,
+		getAllowedDesigntimeSettings
 	};
 });

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/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'}" />
@@ -89,9 +90,9 @@
                     <template:elseif test="{= ${dataFieldTarget>Visualization/EnumMember} === 'com.sap.vocabularies.UI.v1.VisualizationType/Progress'}">
                         <template:with path="dataFieldTarget>Value" helper="AHModel.resolvePath" var="value">
                         <!-- Progress Bar Control -->
-                        <!-- The formatter 'formatDisplayValueForProgressIndicator' is used by 'AH.buildExpressionForProgressIndicatorDisplayValue' -->
+                        <!-- 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/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

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>

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