@sapui5/sap.suite.ui.generic.template 1.136.4 → 1.136.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.136.4",
+  "version": "1.136.6",
   "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.136.4</version>
+	<version>1.136.6</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

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

@@ -153,17 +153,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/manifest.json

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

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.136.4"
+			"version": "1.136.6"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

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.136.4"
+			"version": "1.136.6"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

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

@@ -1936,6 +1936,7 @@ sap.ui.define([
 							oState.oSectionTitleHandler.adjustSubSectionTitle(oSubSection);
 							// Add accessible name to the SmartForm in the first subsection if all titles are hidden, because accessible name will not propogate to the form control
 							oState.oSectionTitleHandler.addAccessibleName(oSubSection);
+							oState.oSectionTitleHandler.setHeaderSmartFormAriaLabelBy(oSubSection);
 						}
 					}
 
@@ -2361,7 +2362,6 @@ sap.ui.define([
 					oState.oMessageStripHelper = new MessageStripHelper(oMultipleViewsHandler, oController, oTemplateUtils, oBase.state.messageButtonHelper);
 					oState.oInlineCreationRowsHelper = new InlineCreationRowsHelper(oObjectPage, oTemplateUtils, fnGetSmartTableCreationMode, oController, oState.oMessageStripHelper);
 					oState.oSectionTitleHandler = new SectionTitleHandler(oController, oObjectPage, oTemplateUtils);
-
 					var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
 
 

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

@@ -1,6 +1,6 @@
 sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend", "sap/suite/ui/generic/template/genericUtilities/controlHelper", "sap/ui/core/library",
-		"sap/suite/ui/generic/template/genericUtilities/FeLogger"
-	], function(BaseObject, extend, controlHelper, SapCoreLibrary, FeLogger) {
+		"sap/suite/ui/generic/template/genericUtilities/FeLogger", "sap/ui/core/Element", "sap/ui/core/InvisibleText"
+	], function(BaseObject, extend, controlHelper, SapCoreLibrary, FeLogger, Element, InvisibleText) {
 		"use strict";
 
 		var STYLE_CLASS_FOR_ADJUSTMENT = "sapUiTableOnObjectPageAdjustmentsForSection";
@@ -174,9 +174,8 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend", "sap/suite/ui/gener
 				oSmartForm.addAriaLabelledBy(sAnchorBarSectionHeaderId);
 			}
 
-			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) {
@@ -193,12 +192,17 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend", "sap/suite/ui/gener
 					.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(`${oFirstSubSection.getId()}-headerTitle`); // 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;
 						}
 					});
@@ -209,7 +213,7 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend", "sap/suite/ui/gener
 				setAsTitleOwner: fnSetAsTitleOwner,
 				adjustSubSectionTitle: fnAdjustSubSectionTitle,
 				addAccessibleName: fnAddAccessibleName,
-				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.136.4"
+			"version": "1.136.6"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

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

@@ -170,9 +170,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.136.4"
+			"version": "1.136.6"
 		},
 		"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.136.4"
+		"version": "1.136.6"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

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

@@ -4505,6 +4505,65 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 					break;
 			}
 			return sPriority;
+		},
+
+		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;
@@ -4575,6 +4634,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 	oAnnotationHelper.getTextArrangementPath.requiresIContext = true;
 	oAnnotationHelper.isValueHelpTableAvailable.requiresIContext = true;
 	oAnnotationHelper.getTextArrangementFinalString.requiresIContext = true;
+	oAnnotationHelper.getSmartFormTitle.requiresIContext = true;
 
 	return oAnnotationHelper;
 }, /* bExport= */ true);

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

@@ -950,7 +950,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.136.6
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	var oAppComponent = UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {

package/src/sap/suite/ui/generic/template/lib/ai/EasyFilterBarHandler.js

@@ -400,6 +400,15 @@ sap.ui.define([
 				oSmartFilterBarVariant.customFilters.editState = oVariantDataFromAI.oEditStateFilter;
 			}
 
+            if (oSmartFilterBarVariant.semanticDates) {
+                var { Low: value1, High: value2 } = oVariantDataFromAI.aSelectOptions[0].Ranges[0];
+                var dateData = oSmartFilterBarVariant.semanticDates.Dates[0].Data;
+            
+                dateData.operation = "DATERANGE";
+                dateData.value1 = value1;
+                dateData.value2 = value2 || value1;
+            }
+
 			oSmartFilterBarWrapper.setState(oSmartFilterBarVariant);
 			oSmartFilterbar.getSmartVariant() && oSmartFilterbar.getSmartVariant().currentVariantSetModified(true);
 			oSmartFilterbar.search();
@@ -425,7 +434,8 @@ sap.ui.define([
 		}
 
         function fnQueryChanged() {
-            // todo : check if any action is required
+            var oSmartFilterbar = oState.oSmartFilterbar;
+			oSmartFilterbar.fireFilterChange();
         }
         // function fnUpdateEasyFilterBarTokens() {
         //     // todo : update the easy filter bar tokens with new values from the SFB VHD
@@ -434,11 +444,18 @@ sap.ui.define([
             // afterFilterDataUpdate
             var mChangeParameters = oEvent.getParameters("mParameters");
             var aEasyFilterTokens = [];
-            var sFilterChangeProperty;
+            var sFilterChangeProperty,filterData,filterDataMap,aItems;
             // filter change will be triggered for each filter change even if the value help is opened from SFB
             // fnValueHelpPromiseResolve will be set only if the valeu help is opened from EasyFilter
             if (mChangeParameters.sId === "change" && fnValueHelpPromiseResolve) {
                 sFilterChangeProperty = mChangeParameters.getParameter("filterChangeReason");
+                filterData = oEvent.getSource().getFilterData();
+				filterDataMap = new Map();
+				aItems = filterData[sFilterChangeProperty]?.items || [];
+ 
+					aItems.forEach(function(item) {
+					  filterDataMap.set(item.key, item.text);
+					});
                 // find an efficient way to get the filters from SFB to update the EasyFilter token
                 oEvent.getSource().getFilters().forEach(function(aFilters) {
                     aFilters.aFilters && aFilters.aFilters.forEach(function(oPropertyFilterItem) {
@@ -459,7 +476,7 @@ sap.ui.define([
                                         if (oToken.operator === oFilterItem.sOperator) {
                                             oToken.selectedValues.push({
                                                 value: oFilterItem.oValue1,
-                                                description: oFilterItem.oValue1
+                                                description: filterDataMap.get(oFilterItem.oValue1) || oFilterItem.oValue1
                                             });
                                         }
                                     });
@@ -467,7 +484,7 @@ sap.ui.define([
                                     oPropertyToken.operator = oFilterItem.sOperator;
                                     oPropertyToken.selectedValues.push({
                                         value: oFilterItem.oValue1,
-                                        description: oFilterItem.oValue1
+                                        description: filterDataMap.get(oFilterItem.oValue1) || oFilterItem.oValue1
                                     });
                                     aEasyFilterTokens.push(oPropertyToken);
                                 }

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

@@ -3216,7 +3216,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.136.4
+	 * @version 1.136.6
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

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

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