@sapui5/sap.suite.ui.generic.template 1.120.32 → 1.120.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.120.32",
+  "version": "1.120.33",
   "description": "SAPUI5 Library sap.suite.ui.generic.template",
   "keywords": [
     "sapui5",

package/src/sap/suite/ui/generic/template/.library

@@ -7,7 +7,7 @@
 
 		(c) Copyright 2009-2015 SAP SE. All rights reserved
 	</copyright>
-	<version>1.120.32</version>
+	<version>1.120.33</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/controller/ControllerImplementation.js

@@ -1,4 +1,3 @@
-/* global window sap */
 sap.ui.define(["sap/fe/navigation/SelectionVariant",
 	"sap/suite/ui/generic/template/AnalyticalListPage/extensionAPI/ExtensionAPI",
 	"sap/suite/ui/generic/template/AnalyticalListPage/controller/FilterBarController",
@@ -151,17 +150,15 @@ sap.ui.define(["sap/fe/navigation/SelectionVariant",
 					oController.templateBaseExtension.onInitSmartFilterBar(oEvent);
 				}
 				function onSmartFilterBarInitialized(){
+					var manifestSetting = oState.oController.getOwnerComponent();
+					if (oState.hideVisualFilter || (manifestSetting.getDefaultFilterMode() == "visual" && manifestSetting.getModel().mMetadataUrlParams && manifestSetting.getModel().mMetadataUrlParams["sap-value-list"] === "none" )) {
+						if (oState.alr_visualFilterBar && !oState.alr_visualFilterBar.getAssociateValueListsCalled()) {
+							oState.alr_visualFilterBar.setAssociateValueListsCalled(true);
+						}
+						oState.oSmartFilterbar.associateValueLists();
+					}
 					var oAppStatePromise = oState.oIappStateHandler.onSmartFilterBarInitialized();
 					oAppStatePromise.then(function(){
-						//execute oSmartFilterbar.associateValueLists after the oSmartFilterbar.setUiState is called
-						//to restore the selection options from the URL parameters
-						var manifestSetting = oState.oController.getOwnerComponent();
-						if (oState.hideVisualFilter || (manifestSetting.getDefaultFilterMode() == "visual" && manifestSetting.getModel().mMetadataUrlParams && manifestSetting.getModel().mMetadataUrlParams["sap-value-list"] === "none" )) {
-							if (oState.alr_visualFilterBar && !oState.alr_visualFilterBar.getAssociateValueListsCalled()) {
-								oState.alr_visualFilterBar.setAssociateValueListsCalled(true);
-							}
-							oState.oSmartFilterbar.associateValueLists();
-						}
 						oState._bIsStartingUp = false;
 						//visual filter config and bindings must be updated after vf has been initialised
 						if (oState.bVisualFilterInitialised) {

package/src/sap/suite/ui/generic/template/AnalyticalListPage/i18n/i18n_fr_CA.properties

@@ -57,7 +57,7 @@ VISUAL_FILTER_CHART_TYPES=Types de diagrammes
 
 VISUAL_FILTER_CHART_TYPE_BAR=Diagramme \u00E0 barres
 
-VISUAL_FILTER_CHART_TYPE_Line=Graphique lin\u00E9aire
+VISUAL_FILTER_CHART_TYPE_Line=Diagramme \u00E0 lignes
 
 VISUAL_FILTER_CHART_TYPE_Donut=Graphique en anneaux
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.120.32"
+			"version": "1.120.33"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

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

@@ -337,7 +337,7 @@ sap.ui.define(["sap/ui/base/Object",
 			for (var item = 0; item < Object.keys(oKPIObject).length; item++){
 				if (oKPIObject[Object.keys(oKPIObject)[item]]["filterable"]) {
 					kpiContext.filterableKPIs.push(oKPIObject[Object.keys(oKPIObject)[item]]);
-				}else {
+				} else {
 					kpiContext.globalKPIs.push(oKPIObject[Object.keys(oKPIObject)[item]]);
 				}
 			}

package/src/sap/suite/ui/generic/template/Canvas/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.120.32"
+			"version": "1.120.33"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

package/src/sap/suite/ui/generic/template/ListReport/controller/ControllerImplementation.js

@@ -1,4 +1,3 @@
-/* global window */
 sap.ui.define([
 	"sap/ui/model/Filter",
 	"sap/suite/ui/generic/template/ListReport/extensionAPI/ExtensionAPI",

package/src/sap/suite/ui/generic/template/ListReport/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.120.32"
+			"version": "1.120.33"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/ObjectPage/controller/ControllerImplementation.js

@@ -1979,8 +1979,8 @@ sap.ui.define([
 									fnAdjustSubSectionTitleForSmartForm(oSubSection, mSubSectionTitle[sSectionId]);
 								}
 							}
+							oState.oSectionTitleHandler.setHeaderSmartFormAriaLabelBy(oSubSection);
 						}
-						oState.oSectionTitleHandler.manageAccessability(oSubSection);
 					}
 
 					if (oSubSectionInfoObj) { // In case of EditableHeaderFacet Sections & SubSection is created at runtime and there is info object handling

package/src/sap/suite/ui/generic/template/ObjectPage/controller/SectionTitleHandler.js

@@ -1,15 +1,16 @@
 sap.ui.define([
 	"sap/ui/base/Object",
 	"sap/base/util/extend",
-	"sap/suite/ui/generic/template/genericUtilities/controlHelper"
-], function(BaseObject, extend, controlHelper) {
+	"sap/suite/ui/generic/template/genericUtilities/controlHelper",
+	"sap/ui/core/Element",
+	"sap/ui/core/InvisibleText"
+	], function(BaseObject, extend, controlHelper, Element, InvisibleText) {
 		"use strict";
 
 		function getMethods(oTemplateUtils) {
 
-			function fnManageAccessability(oFirstSubSection) {
-				var oSubSectionInfoObject = oTemplateUtils.oInfoObjectHandler.getControlInformation(oFirstSubSection.getId()),
-					oSection = oFirstSubSection.getParent();
+			function fnSetHeaderSmartFormAriaLabelBy(oFirstSubSection) {
+				var oSubSectionInfoObject = oTemplateUtils.oInfoObjectHandler.getControlInformation(oFirstSubSection.getId());
 				oFirstSubSection.getBlocks().concat(oFirstSubSection.getMoreBlocks())
 					.reduce(function(accBlock, currentBlock) {
 						if (!currentBlock.getContent || !currentBlock.getContent() || !currentBlock.getContent().length) {
@@ -26,12 +27,17 @@ sap.ui.define([
 					.forEach(function(entry) {
 						if (!oSubSectionInfoObject) {
 							// Case: header is editable. manifest.json, editableHeaderContent=true
-							entry._suggestTitleId(oSection.getId() + "-title"); // set Section title id that will be used for aria
-							return;
-						}
-						if (entry.getGroups().length === 1 && entry.getGroups()[0].getTitle && !entry.getGroups()[0].getTitle()) {
-							// Case: Section -> one SubSection -> one SmartForm -> one Group. Title is not displayed in this case
-							entry._suggestTitleId(oSection.getId() + "-title"); // set title to SubSection title id that will be used for aria
+							var sInvisibleTextID = `${entry.getId()}-ariaLabelBy-InvisibleText`,
+								oInvisibleText = Element.getElementById(sInvisibleTextID);
+							if (!oInvisibleText) {
+								var customData = !entry.getCustomData() ? [] : entry.getCustomData().filter(function(entry) {return entry.getKey() === "smartFormAriaLabel";});
+								if (customData.length && customData[0].getValue()) {
+									oInvisibleText = new InvisibleText({id : sInvisibleTextID, text: customData[0].getValue()}).toStatic();
+								}
+							}
+							if (oInvisibleText) {
+								entry._suggestTitleId(oInvisibleText.getId()); // set Section title id that will be used for aria
+							}
 							return;
 						}
 					});
@@ -39,7 +45,7 @@ sap.ui.define([
 
 			// public instance methods
 			return {
-				manageAccessability: fnManageAccessability
+				setHeaderSmartFormAriaLabelBy: fnSetHeaderSmartFormAriaLabelBy //
 			};
 		}
 

package/src/sap/suite/ui/generic/template/ObjectPage/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.120.32"
+			"version": "1.120.33"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/ObjectPage/view/Details.view.xml

@@ -156,9 +156,8 @@
 		<uxap:landmarkInfo>
 			<uxap:ObjectPageAccessibleLandmarkInfo
 				rootRole="None"
-				rootLabel=""
-				footerRole="ContentInfo"
-				footerLabel="{i18n>FOOTER_REGION_LABEL_ARIA}"/>
+				rootLabel=" "
+				footerRole="ContentInfo"/>
 		</uxap:landmarkInfo>
 	</uxap:ObjectPageLayout>
 

package/src/sap/suite/ui/generic/template/ObjectPage/view/fragments/SmartForm.fragment.xml

@@ -21,6 +21,7 @@
 			<core:CustomData key="defaultDropDownDisplayBehaviour" value="descriptionOnly" />
 			<core:CustomData key="defaultTextInEditModeSource" value="ValueListNoValidation" />
 			<core:CustomData key="dateFormatSettings" value='\{"UTC":true,"style":"medium"\}' />
+			<core:CustomData key="smartFormAriaLabel" value="{parts: [{path: 'facet>'}, {path: 'entitySet>name'}], formatter: 'AH.getSmartFormTitle'}" />
 		</sfo:customData>
 		<sfo:layout>
 			<template:if test="{= ${appSettings>/useColumnLayoutForSmartForm} !== false}">

package/src/sap/suite/ui/generic/template/QuickCreate/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.120.32"
+			"version": "1.120.33"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickView/manifest.json

@@ -6,7 +6,7 @@
 	"type": "component",
 	"i18n": "i18n/i18n.properties",
 	"applicationVersion": {
-		"version": "1.120.32"
+		"version": "1.120.33"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

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

@@ -2,7 +2,6 @@
  * Fiori Element logger which prefix Fiori Elements for the log along with component
  */
 /* eslint-disable no-alert */
-/* global Promise */
 sap.ui.define([
 	"sap/ui/base/Object",
 	"sap/base/Log",

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

@@ -43,7 +43,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 				return oListEntry.PropertyPath === oProperty;
 			});
 		};
-		
+
 		var bNotSortable = fnHasListProperty(oContextSet["Org.OData.Capabilities.V1.SortRestrictions"] && oContextSet["Org.OData.Capabilities.V1.SortRestrictions"].NonSortableProperties);
 		var oFilterRestrictions = oContextSet["Org.OData.Capabilities.V1.FilterRestrictions"];
 		var bNotFilterable = !!oFilterRestrictions && (oFilterRestrictions.Filterable === "false" || fnHasListProperty(oFilterRestrictions.NonFilterableProperties));
@@ -312,7 +312,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 					return oHidden["com.sap.vocabularies.UI.v1.Hidden"].Bool !== "true";
 				}
 				return false; // <Annotation Term="UI.Hidden"/>
-			} 
+			}
 			return true;
 		},
 
@@ -990,13 +990,13 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			var oDataField = {"Path":oSmartField.path};
 			return AnnotationHelperModel.simplePath(oInterface.getModel() ? oInterface : oInterface.getInterface(0), oDataField);
 		},
-		
+
 		// build expression binding for bread crumbs
 		buildBreadCrumbExpression: function (oContext, oTreeNode) {
 			var oHeaderInfo = oTreeNode.entityTypeDefinition && oTreeNode.entityTypeDefinition["com.sap.vocabularies.UI.v1.HeaderInfo"];
 			var oTitle = oHeaderInfo && oHeaderInfo.Title &&  oHeaderInfo.Title.Value;
 			var sBindingTitle = oTitle && AnnotationHelperModel.format(oContext, oTitle);
-			var oTypeName = oHeaderInfo && oHeaderInfo.TypeName;                         
+			var oTypeName = oHeaderInfo && oHeaderInfo.TypeName;
 			// Revisit (AncestorFeature)
 			//sBindingTitle = sBindingTitle.replace("{", "{" + oTreeNode.specificModelName + ">");
 			if (oTitle && oTitle.Path && oTypeName && oTypeName.String) {
@@ -1140,7 +1140,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 				var sPostfix = "], formatter: 'sap.suite.ui.generic.template.js.RuntimeFormatters.formatImageUrl'}";
 				return sPrefix + sInfix + sPostfix;
 			}
-			// Apply 
+			// Apply
 			oImageUrl.Apply.Parameters[0].Value = utils.adjustImageUrlPath(oImageUrl.Apply.Parameters[0].Value, sAppComponentName);
 			return AnnotationHelperModel.format(oInterface, oImageUrl);
 		},
@@ -1162,8 +1162,8 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 
 		getAvatarInitials: function (oInitials) {
 			return (oInitials && (oInitials.Path ? ("{" + oInitials.Path + "}") : oInitials.String) || "");
-		
-		},		
+
+		},
 
 		formatImageOrTypeUrl: function (oInterface, oInputImageUrl, oTypeImageUrl, sAppComponentName, bExpand) {
 			var oImageUrl = oInputImageUrl || oTypeImageUrl;
@@ -1172,7 +1172,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 
 		formatHeaderImage: function (oInterface, oHeaderInfo, sAppComponentName) {
 			return oAnnotationHelper.formatImageOrTypeUrl(oInterface, oHeaderInfo.ImageUrl, oHeaderInfo.TypeImageUrl, sAppComponentName, true);
-		},		
+		},
 
 		getPathWithExpandFromHeader: function (oInterface, oEntitySet, sNavigationProperty, oInputImageUrl, oTypeImageUrl) {
 			var sExpand, sNavigationPath;
@@ -1692,7 +1692,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			return iDraftColumnIndex;
 		},
 
-		// Calculating the column index of Draft Indicator Column for sap.ui.table based on the column index of last Semnatic key avaible 
+		// Calculating the column index of Draft Indicator Column for sap.ui.table based on the column index of last Semnatic key avaible
 		// or else on the 1st Index of the table.
 		_determineColumnIndexForDraftColumn: function (oContext, oLineItem) {
 			var sLineItemPath = oContext.getPath();
@@ -2024,7 +2024,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 
 		createP13NFileUploader: function(oInterface, oContextSet) {
 			var oEntityType = oInterface.getModel(0).getODataEntityType(oContextSet.entityType);
-			var sP13N = ""; 
+			var sP13N = "";
 			var oContentDisposition = oEntityType && oEntityType["Org.OData.Core.V1.ContentDisposition"];
 			var sColumnKey = oContentDisposition && oContentDisposition.Filename && oContentDisposition.Filename.Path;
 			var sFCPath = oEntityType["com.sap.vocabularies.Common.v1.FieldControl"] && oEntityType["com.sap.vocabularies.Common.v1.FieldControl"].Path;
@@ -2296,7 +2296,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 				return false;
 			}
 			var sImageSrc = oAnnotationHelper.formatImageUrl(oInterface, oImageUrl, sAppComponentName);
-			return !!sImageSrc; 
+			return !!sImageSrc;
 		},
 		getVisibilityForExtensionPointBeforeSimpleHeaderFacet: function (sEntitySet, oFacet, oManifestExtend, oDataField) {
 			var sSecondHalfIdPart;
@@ -2579,7 +2579,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			var bHasSubObjectPage = oAnnotationHelper.hasSubObjectPage(oRelatedEntitySet, aSubPages),
 				sTableCreationMode = oAnnotationHelper.getCreationMode(oFacet, oSections),
 				bIsInlineCreationMode = ["inline", "creationRows", "creationRowsHiddenInEditMode"].includes(sTableCreationMode);
-				
+
 			if (bHasSubObjectPage || bIsInlineCreationMode || oCreateWithParameterDialog) {
 				var aConditions = [],
 					sFinalCondition,
@@ -2632,7 +2632,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			// If the creatable path is boolean, return it
 			if (typeof vCreatablePath === "boolean") {
 				return vCreatablePath;
-			}	
+			}
 			// Return the creatable path is a valid property path (string), create an expression and return it
 			var sPrefix = (oCreatablePathObj.negate) ? "!" : "!!";
 			var sCreatablePathExp = sPrefix + "${" + vCreatablePath + "}";
@@ -2669,7 +2669,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		 * @returns {object} oResult - an object contains the creatable path info
 		 * oResult.creatable - true or false or the creatable-path (string)
 		 * oResult.negate - true when the creatable path is a non-insertable navigation property
-		 * 
+		 *
 		 */
 		getCreatablePath: function (oInterface, oSourceEntitySet, oRelatedEntitySet) {
 
@@ -2679,7 +2679,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			var oSourceEntityType = oModel.getODataEntityType(oSourceEntitySet.entityType);
 			var oRestrictionSetViaNavRestrictions;
 			var sFullCreatablePath;
-			
+
 			// check if there are Insert Restrictions.
 			oRestrictionSetViaNavRestrictions = oAnnotationHelper.handleNavigationRestrictions(oModel, oSourceEntitySet, oRelatedEntitySet, "Insertable");
 			if (oRestrictionSetViaNavRestrictions && oRestrictionSetViaNavRestrictions["Insertable"]) {
@@ -2719,7 +2719,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 					}
 				}
 			}
-			
+
 			return oResult;
 		},
 		/***************************************************************
@@ -3339,7 +3339,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		getActionCommandVisibility: function (sButtonId) {
 			return !sButtonId || "{= " + oAnnotationHelper.getControlVisibleTerm(sButtonId) + " && " + oAnnotationHelper.getControlEnabledTerm(sButtonId) + "}";
 		},
-		
+
 		buildVisibilityExprOfDataFieldForIntentBasedNaviButton: function (oDataField) {
 			//If UI.Hidden annotation is used, UI.Hidden gets the highest priority
 			if (oDataField["com.sap.vocabularies.UI.v1.Hidden"]) {
@@ -3667,7 +3667,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			}
 			return sRet;
 		},
-		
+
 		// Note: This function is a temporary solution. It imitates the logic implemented by AnnotationHelperModel.simplePath and returns false exactly when that function would return a binding string but
 		// logs that this binding string is incorrect. In all other cases it returns true (even if AnnotationHelperModel.simplePath throws an exception).
 		isDataFieldRenderable: function(oInterface, oDataFieldValue){
@@ -3720,7 +3720,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 						AnnotationHelperModelBasics.expectType(oSubPathValue, "string");
 						// Note: "PropertyPath" is treated the same...
 						var oTarget = AnnotationHelperModelBasics.followPath(oSubPathValueInterface, {"Path" : sBindingPath});
-						return !!(oTarget && oTarget.resolvedPath);				
+						return !!(oTarget && oTarget.resolvedPath);
 
 				case "Bool": // 14.4.2 Expression edm:Bool
 				case "Date": // 14.4.3 Expression edm:Date
@@ -3749,7 +3749,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 					return true;
 				default:
 					return true;
-			}			
+			}
 		},
 
 		setNoDataTextForSmartTable: function (sEntitySet, sSmartTableId) {
@@ -4062,13 +4062,13 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			}
 			if (oAddress[0].locality) {
 				sAddress += (AnnotationHelperModel.format(oInterface, oAddress[0].locality) + ", ");
-			} 
+			}
 			if (oAddress[0].region) {
 				sAddress += (AnnotationHelperModel.format(oInterface, oAddress[0].region) + ", ");
-			} 
+			}
 			if (oAddress[0].country) {
 				sAddress += (AnnotationHelperModel.format(oInterface, oAddress[0].country) + ", ");
-			} 
+			}
 			return sAddress.slice(0, sAddress.length - 2);
 		},
 
@@ -4120,7 +4120,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			var aIsCopyAction = (aCollection || []).filter(function (oRecord) {
 				return (oRecord.RecordType === "com.sap.vocabularies.UI.v1.DataFieldForAction" && (oRecord["com.sap.vocabularies.UI.v1.IsCopyAction"] && oRecord["com.sap.vocabularies.UI.v1.IsCopyAction"].Bool));
 			});
-		
+
 			if (aIsCopyAction.length > 1) {
 				oLogger.error("Multiple actions are annotated with isCopyAction. There can be only one standard copy action.");
 			}
@@ -4129,8 +4129,8 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 
 		/**
 		 * This method reads the insertable navigation restrictions from parent entity and builds customize config object.
-		 * The smart table reads the customize config and sets the editability of smart fields 
-		 * 
+		 * The smart table reads the customize config and sets the editability of smart fields
+		 *
 		 * @param {*} oInterface Context
 		 * @param {*} oSourceEntitySet Parent entity set (entity set of object page)
 		 * @param {*} oRelatedEntitySet Entity set of smart table
@@ -4152,7 +4152,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			}
 			//Turn off client-side mandatory check
 			oCustomizeConfig["clientSideMandatoryCheck"] = {
-				"*": false   
+				"*": false
 			};
 			sCustomizeConfig = JSON.stringify(oCustomizeConfig);
 			return sCustomizeConfig;
@@ -4199,7 +4199,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			}
 			return sActionPress;
 		},
-		
+
 		/**
 		 * A side effect should get triggered directly if a value is selected for a field like value help/combo box, checkbox, date picker, datetime picker
 		 * provided a side effect is defined on this field. However this should be only done if the side effect has only one source property (the source property must
@@ -4208,7 +4208,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		 * @param {boolean} isDraftEnabled draft or non draft scenario
 		 * @param {object} oMetaModel metamodel
 		 * @param {string} sEntityType entity type of the detail page to which property belongs
-		 * @returns side effect source property's type which represents if the field is annotated as single source property in the side effect or is also used in 
+		 * @returns side effect source property's type which represents if the field is annotated as single source property in the side effect or is also used in
 		 * combination with other field(s).
 		 */
 		getSideEffectSourcePropertyType: function(sPropertyPath, isDraftEnabled, oMetaModel, sEntityType) {
@@ -4216,7 +4216,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		},
 
 		/**
-		 * From UI5 v1.109, variant management is going to be enabled (by default) for smart table/chart and it will lead to the the issue of having multiple 
+		 * From UI5 v1.109, variant management is going to be enabled (by default) for smart table/chart and it will lead to the the issue of having multiple
 		 * duplicate implicit variants created by SVM (named as Personlization), and in order to mitigate the issue, persistencyKey has to be changed in certian scenarios.
 		 * scenarios. With this change, application(s) who has already enabled the variant management will continue to have the old persistencyKey and should have
 		 * no impact whatsoever. However, application(s) should not enable it going forward because of two reasons:
@@ -4263,10 +4263,69 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 				: "";
 		},
 
-		getNavigationPropertyPath: function (oInterface, vRawValue) {		
+		getNavigationPropertyPath: function (oInterface, vRawValue) {
 			var sNavigationPath = AnnotationHelperModel.getNavigationPath(oInterface, vRawValue);
 			var sNavigationPropertyPath = sNavigationPath.replace("{", "").replace("}", "");
 			return sNavigationPropertyPath;
+		},
+
+		getModelData: function(oInterface, sBaseAnnotationPath, sEntitySetName) {
+			var oModel = oInterface.getModel() ? oInterface.getModel() : oInterface.getInterface(0).getModel(),
+				oBaseEntityType = oModel.getODataEntityType(oModel.getODataEntitySet(sEntitySetName).entityType);
+
+			if (sBaseAnnotationPath.indexOf("/") > -1) {
+				var oRelevantData = oAnnotationHelper.getRelevantDataForAnnotationRecord(oModel, sBaseAnnotationPath, oBaseEntityType);
+				return {
+					sAnnotationPath: oRelevantData.dataFieldValuePath[0] === '@' ? oRelevantData.dataFieldValuePath.substring(1) : oRelevantData.dataFieldValuePath,
+					oEntityType: oRelevantData.entityType
+				};
+			}
+			return {
+				sAnnotationPath: sBaseAnnotationPath[0] === '@' ? sBaseAnnotationPath.substring(1) : sBaseAnnotationPath,
+				oEntityType: oBaseEntityType
+			};
+		},
+
+		getSmartFormTitle: function(oInterface, oFacet, sEntitySetName) {
+			if (!oFacet) {
+				return;
+			}
+			if (oFacet.Target && oFacet.Target.AnnotationPath && oFacet.Target.AnnotationPath.indexOf("com.sap.vocabularies.UI.v1.DataPoint") > -1) {
+				// Process DataPoint case
+				var { sAnnotationPath, oEntityType } = oAnnotationHelper.getModelData(oInterface, oFacet.Target.AnnotationPath, sEntitySetName);
+				if (oEntityType[sAnnotationPath] && oEntityType[sAnnotationPath].Title && oEntityType[sAnnotationPath].Title.String) {
+					return oEntityType[sAnnotationPath].Title.String;
+				}
+				// As DataPoint don't have title -> try to get property name as SmartForm title
+				if (!oEntityType[sAnnotationPath] || !oEntityType[sAnnotationPath].Value || !oEntityType[sAnnotationPath].Value.Path || !oEntityType.property) {
+					return;
+				}
+				var aProperty = oEntityType.property.filter(function(entry) {
+					return entry.name === oEntityType[sAnnotationPath].Value.Path;
+				});
+				if (aProperty.length && aProperty[0]['sap:label']) {
+					// Property name found
+					return aProperty[0]['sap:label'];
+				}
+				return;
+			}
+			// It's Identification or FieldGroup case
+			if (oFacet.Label && oFacet.Label.String) {
+				return oFacet.Label.String;
+			}
+			if (!oFacet.Target || !oFacet.Target.AnnotationPath) {
+				return;
+			}
+			if (oFacet.Target.AnnotationPath.indexOf("com.sap.vocabularies.UI.v1.Identification") > -1) {
+				// Identification entry don't have any data which we can use as SmartForm title.
+				return;
+			}
+			var { sAnnotationPath, oEntityType } = oAnnotationHelper.getModelData(oInterface, oFacet.Target.AnnotationPath, sEntitySetName);
+			if (oEntityType[sAnnotationPath] && oEntityType[sAnnotationPath].Label && oEntityType[sAnnotationPath].Label.String) {
+				// Use FieldGroup.Label.String as SmartForm title
+				return oEntityType[sAnnotationPath].Label.String;
+			}
+			return;
 		}
 	};
 	oAnnotationHelper.getBlockForEditableHeaderFacet.requiresIContext = true;
@@ -4334,6 +4393,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 	oAnnotationHelper.getLinkTextForDFwithEmail.requiresIContext = true;
 	oAnnotationHelper.checkIsEmailAddress.requiresIContext = true;
 	oAnnotationHelper.isEmailAddressAndMuliplicity.requiresIContext = true;
-	
+	oAnnotationHelper.getSmartFormTitle.requiresIContext = true;
+
 	return oAnnotationHelper;
 }, /* bExport= */ true);

package/src/sap/suite/ui/generic/template/lib/AppComponent.js

@@ -922,7 +922,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.UIComponent
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.120.32
+	 * @version 1.120.33
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	return UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {

package/src/sap/suite/ui/generic/template/lib/CRUDHelper.js

@@ -291,7 +291,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 					oModel.createBindingContext(sBindingPath, null, null, function(oBindingContext){
 						if (oDraftContext.isDraftEnabled(sEntitySet)) {
 							// todo: enable preserveChanges
-							if (true || !oDraftContext.hasPreserveChanges(oBindingContext)) {
+							//if (true || !oDraftContext.hasPreserveChanges(oBindingContext)) { //Commenting out this if condition to avoid eslint error
 								fnReadDraftAdministrativeData(oModel, sBindingPath, oTemplateContract.oBusyHelper).then(function(oResponse) {
 									if (!oResponse.DraftAdministrativeData || oResponse.DraftAdministrativeData.DraftIsCreatedByMe) {
 										// no or own draft
@@ -319,7 +319,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 										draftAdminReadResponse: oResponse
 									});
 								});
-							}
+							// }
 						} else {
 							resolve({
 								context: oBindingContext

package/src/sap/suite/ui/generic/template/lib/CommonEventHandlers.js

@@ -1097,7 +1097,8 @@ sap.ui.define(["sap/ui/base/Object",
 				renderQuickViewFragment.call(this);
 			});
 
-			if (false && !bFieldGroupAvailable && aContactTitleArea && aContactTitleArea.length && aContactTitleArea.length < 2) {	// Below code is to consume Teams Contacts Collaboration Helper. Commenting this code until we get clarity on CA
+			var skipBelowCode = true;
+			if (!skipBelowCode && !bFieldGroupAvailable && aContactTitleArea && aContactTitleArea.length && aContactTitleArea.length < 2) {	// Below code is to consume Teams Contacts Collaboration Helper. Commenting this code until we get clarity on CA
 				var oModel = oController.getOwnerComponent().getModel();
 				var oContactDataContext = oModel.getContext(sControlBindingContextPath);
 				var oContactData = oContactDataContext.getProperty(oTargetAnnotation.navigation);
@@ -1118,7 +1119,6 @@ sap.ui.define(["sap/ui/base/Object",
 				}
 			}
 
-			var skipBelowCode = true;
 			if (!skipBelowCode) {	// Below code is to consume Teams Contacts Collaboration. Commenting this code until we get clarity on CA
 				ServiceContainer.getServiceAsync().then(function (oTeamsHelper) {
 					if (typeof oTeamsHelper.isContactsCollaborationSupported === 'function' && oTeamsHelper.isContactsCollaborationSupported()) {
@@ -1470,7 +1470,6 @@ sap.ui.define(["sap/ui/base/Object",
 					var oLineItems = oEntityType[sLineItemAnnotation] || []; // some tests in safety net run without any lineitem annotation - seems to work somehow at least for tree table;
 					for (var index = 0; index < oLineItems.length; index++) {
 						switch (oLineItems[index].RecordType) {
-							default: break;
 							case "com.sap.vocabularies.UI.v1.DataFieldWithIntentBasedNavigation":
 							case "com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath":
 								var aDataFieldsWithNavigation = fnGetDataFieldsWithNavigation(oLineItems[index], oMetaModel, oEntityType);
@@ -1505,6 +1504,7 @@ sap.ui.define(["sap/ui/base/Object",
 									}
 								}
 								break;
+							default: break;
 						}
 					}
 

package/src/sap/suite/ui/generic/template/lib/PageLeaveHandler.js

@@ -37,23 +37,23 @@ sap.ui.define(["sap/ui/base/Object",
 				onDraftPopupOk: function () {
 					var selectedItem = getSelectedKey(oDraftPopup);
 					switch (selectedItem) {
-						case "draftPopupOptionSave": {
+						case "draftPopupOptionSave":
 							var oBeforeSavePromise = Promise.resolve(getComponent().oController.beforeSaveExtension());
 							oBeforeSavePromise.then(fnSaveDraft.bind(null, oTemplateContract, sMode), Function.prototype);
 							oDraftPopup.close();
-						} break;
-						case "draftPopupOptionKeep": {
+							break;
+						case "draftPopupOptionKeep":
 							oTemplateContract.oAppComponent.getApplicationController().synchronizeDraftAsync().then(function() {
 								fnOnDiscardOrKeepDraftConfirmed();
 							}).finally(function() {
 								oDraftPopup.close();
 							});
-						} break;
-						case "draftPopupOptionDiscard": {
+							break;
+						case "draftPopupOptionDiscard":
 							var discardDraftPromise = fnDiscardDraft(sMode).then(fnOnDiscardOrKeepDraftConfirmed);
 							discardDraftPromise.catch(fnOnDiscardOrKeepDraftCancel);
 							oDraftPopup.close();
-						} break;
+							break;
 						default:
 							break;
 					}

package/src/sap/suite/ui/generic/template/lib/i18n/i18n_id.properties

@@ -262,7 +262,7 @@ NOITEMS_SMARTCHART=Tidak ditemukan data.
 
 NOITEMS_LR_SMARTCHART=Tidak ada data untuk tampilan bagan dan kriteria filter yang dipilih.
 
-NOITEMS_SMARTCHART_WITH_FILTER=Data tak ada. Ubah parameter filter.
+NOITEMS_SMARTCHART_WITH_FILTER=Data tidak ditemukan. Coba sesuaikan parameter filter.
 
 SMARTCHART_INITIAL_NODATA=Untuk memulai, tetapkan filter yang relevan, pilih "Masuk".
 

package/src/sap/suite/ui/generic/template/lib/navigation/NavigationController.js

@@ -3089,7 +3089,7 @@ sap.ui.define(["sap/ui/base/Object",
 	 * @param {sap.suite.ui.generic.template.lib.AppComponent} oAppComponent The AppComponent instance
 	 * @public
 	 * @extends sap.ui.base.Object
-	 * @version 1.120.32
+	 * @version 1.120.33
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

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

@@ -60,7 +60,7 @@ sap.ui.define([
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.120.32",
+		version: "1.120.33",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {

package/ui5.yaml

@@ -1,4 +1,4 @@
-specVersion: '2.4'
+specVersion: '3.0'
 type: library
 metadata:
   name: sap.suite.ui.generic.template