@sapui5/sap.suite.ui.generic.template 1.116.0 → 1.117.0

package/package.json

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

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

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

@@ -20,9 +20,10 @@ sap.ui.define([
 	"sap/suite/ui/generic/template/listTemplates/filterSettingsPreparationHelper",
 	"sap/ui/model/json/JSONModel",
 	"sap/m/MessageBox",
-	"sap/suite/ui/generic/template/listTemplates/semanticDateRangeTypeHelper"
+	"sap/suite/ui/generic/template/listTemplates/semanticDateRangeTypeHelper",
+	"sap/m/table/Util"
 ], function (Filter, ExtensionAPI, listUtils, MessageStripHelper, IappStateHandler, MultipleViewsHandler,
-	WorklistHandler, ShareUtils, controlHelper, FeLogger, ObjectPath, StableIdHelper, deepExtend, CreateWithDialogHandler, MultiEditHandler, SelectionVariant, AddCardsHelper, filterSettingsPreparationHelper, JSONModel, MessageBox, semanticDateRangeTypeHelper) {
+	WorklistHandler, ShareUtils, controlHelper, FeLogger, ObjectPath, StableIdHelper, deepExtend, CreateWithDialogHandler, MultiEditHandler, SelectionVariant, AddCardsHelper, filterSettingsPreparationHelper, JSONModel, MessageBox, semanticDateRangeTypeHelper,TableUtil) {
 	"use strict";
 
 	var oLogger = new FeLogger("ListReport.controller.ControllerImplementation").getLogger();
@@ -436,6 +437,12 @@ sap.ui.define([
 					return;
 				}
 
+				// Updating the speech output, after loading data in the table
+				if (controlHelper.isTable(oControl)) {
+					var iRowCount = oTemplateUtils.oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oControl).getBinding().getCount();
+					TableUtil.announceTableUpdate(oControl.getHeader(), iRowCount);
+				}
+
 				oFclProxy.handleDataReceived(oControl, fnNavigateToListItemProgrammatically);
 				var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
 				oTemplatePrivateModel.setProperty("/listReport/firstSelection", true);

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

@@ -378,7 +378,7 @@ sap.ui.define([
 		// - Collapse of filter bar once user press Go (only for phone device)
 		function onSearchPressed() {
 			// if SFB does not allow search, no need to adapt anything
-			if (!isSearchAllowed()){
+			if (!oState.oSmartFilterbar.checkSearchAllowed()){
 				return;
 			}
 			oState.refreshModel();
@@ -430,24 +430,6 @@ sap.ui.define([
 				}
 			}
 		}
-
-		// Checks, whether search is allowed from SFB point of view, i.e. if calling the search on SFB will actually trigger a request
-		function isSearchAllowed() {
-			// Unfortunately, SFB's method verifySearchAllowed does not only check, but also marks filters as erroneous. This is not wanted here - we need to know beforehand, whether
-			// triggering a search would be possible or not.
-			
-			// Workaround: Checking ourselves, whether all mandatory filters are filled
-			// Drawback:
-			// - duplicate implementation
-			// - missing to check any other (existing or future) possible reason for prohibiting the search
-			// TODO: should be replaced, as soon as functionality is provided from SFB (either via checkOnly-parameter in verifySearchAllowed, or as a new method isSearchAllowed)
-			var aMandatoryFilterItems = oState.oSmartFilterbar.determineMandatoryFilterItems();
-			var aFiltersWithValues = oState.oSmartFilterbar.getFiltersWithValues();
-
-			return aMandatoryFilterItems.every(function(sItem) {
-				return aFiltersWithValues.includes(sItem);
-			});
-		}
 		
 		/*
 			This method is called when an LR app is the target of an external navigation and the XAppState data contains a presentationVariant.
@@ -478,7 +460,7 @@ sap.ui.define([
 			// special case: when restoring an old app state with data loaded, but in the meantime a filter not set in that state has been changed to mandatory, SFB.search would not
 			// trigger a request (but instead only mark that filter) - thus hiding placeholder now to avoid it to stay forever
 			// TODO: refactor: Still in that case our internal data shows data are loaded - ideally, that should not be the case
-			if (!isSearchAllowed()){
+			if (!oState.oSmartFilterbar.checkSearchAllowed()){
 				oTemplateUtils.oComponentUtils.hidePlaceholder();
 			}
 
@@ -995,13 +977,14 @@ sap.ui.define([
 			// - worklist
 			// - livemode
 			// - master detail (i.e. bLoadListAndFirstEntryOnStartup is set)
-			var bShouldDataBeLoaded = oState.oWorklistData.bWorkListEnabled || oState.oSmartFilterbar.getLiveMode() || oState.bLoadListAndFirstEntryOnStartup ;
+			var oSmartFilterbar = oState.oSmartFilterbar;
+			var bShouldDataBeLoaded = oState.oWorklistData.bWorkListEnabled || oSmartFilterbar.getLiveMode() || oState.bLoadListAndFirstEntryOnStartup ;
 
 			var sLoadBehaviour = getDataLoadSettings().loadDataOnAppLaunch;
 			if (!oSmartVariantManagement || oController.getOwnerComponent().getVariantManagementHidden()){
 				// No VM -> 
 				bShouldDataBeLoaded = bShouldDataBeLoaded || sLoadBehaviour === "always";
-				bShouldDataBeLoaded = bShouldDataBeLoaded || (sLoadBehaviour === "ifAnyFilterExist" && oState.oSmartFilterbar.getFiltersWithValues().length > 0);
+				bShouldDataBeLoaded = bShouldDataBeLoaded || (sLoadBehaviour === "ifAnyFilterExist" && oSmartFilterbar.getFiltersWithValues().length > 0);
 				// behavior of last patch set would translate to the following - seems not to be correct (in case of setting ifAnyFilterExist but no filters provided)
 				//				bShouldDataBeLoaded = bShouldDataBeLoaded || sLoadBehaviour !== "never";
 			} else {
@@ -1013,7 +996,7 @@ sap.ui.define([
 				//		contains the condition, but if reselecting the standard variant, it  will also select without filters!
 				//		TODO: check, how to solve that inconsistency)
 				// - but in both cases not, if a mandatory filter is missing
-				var bDefaultExecuteOnStandard = (bShouldDataBeLoaded || sLoadBehaviour !== "never") && isSearchAllowed();
+				var bDefaultExecuteOnStandard = (bShouldDataBeLoaded || sLoadBehaviour !== "never") && oSmartFilterbar.checkSearchAllowed();
 				oSmartVariantManagement && oSmartVariantManagement.setExecuteOnStandard(bDefaultExecuteOnStandard);
 
 				// determine final setting according to user's variant settings
@@ -1040,7 +1023,7 @@ sap.ui.define([
 			// If bShouldDataBeLoaded is true up to here, that means, according to the circumstances we would actually like to load data. However, if mandatory filters exist, and not
 			// all of them are provided with data, that means, we cannot load data: SFB.search would just mark the missing filters (which is not wanted here) and not even trigger a
 			// request. Thus, this question overrules everything else.
-			bShouldDataBeLoaded = bShouldDataBeLoaded && isSearchAllowed();
+			bShouldDataBeLoaded = bShouldDataBeLoaded && oSmartFilterbar.checkSearchAllowed();
 
 			oDataLoadedWrapper.setState(!!bShouldDataBeLoaded);
 		}

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

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

@@ -1450,7 +1450,6 @@ sap.ui.define([
 							return false;
 						}
 						oSelectedSection = oControl;
-						oObjectPage.setSelectedSection(oSelectedSection);
 						return null;
 					}
 					if (controlHelper.isObjectPageSubSection(oControl)){
@@ -1461,8 +1460,9 @@ sap.ui.define([
 							return false;
 						}
 						// Scroll to the given subsection and make sure that controls and bindings for this subsection are initialized (necessary because of lazy loading) 
-						oSelectedSection.setSelectedSubSection(oControl);
 						fnSubSectionEntered(oControl);
+						oObjectPage.setSelectedSection(oSelectedSection);
+						oSelectedSection.setSelectedSubSection(oControl);
 						return null;
 					}
 					if (controlHelper.isSmartField(oControl)){ // check whether the SmartField is the correct target for focussing
@@ -2355,31 +2355,27 @@ sap.ui.define([
 							oTemplateUtils.oCommonEventHandlers.submitChangesForSmartMultiInput(oEvent);
 						}
 					},
-					
-					contextEditableChanged: function (oEvent) {
+					onModeToggled: function (oEvent) {
 						/* Set the FieldGroupIds of the SmartField(s) which are 1:1 associated with the object page entity set so that side effect annotation targeting
 						   the object entity set would work. Assigning FieldGroupIds to other SmartFields is already taken care by the SmartFields  */
-						if (oEvent.getParameter("editable")) {
-							var oSmartField = oEvent.getSource();
-							oSmartField._getComputedMetadata().then(function (oComputedMetaData) {
-								if (oComputedMetaData && oComputedMetaData.navigationPath && !!oSmartField.getBindingContext()) {
-									var oClonedMetaData = deepExtend({}, oComputedMetaData);
-									var oMetaModel = oController.getOwnerComponent().getModel().getMetaModel();
-
-									/* EntitySet and EntityType of the cloned metamodel of smartfield needs to be changed to the parent entity so that when
-									   _calculateFieldGroupIDs looks through the passed metamodel, it should be able to find the corresponding side effect annotation */
-									oClonedMetaData.entitySet = oMetaModel.getODataEntitySet(oController.getOwnerComponent().getEntitySet());
-									oClonedMetaData.entityType = oMetaModel.getODataEntityType(oClonedMetaData.entitySet.entityType);
-
-									var aIDs = oSmartField._calculateFieldGroupIDs(oClonedMetaData);
-									if (aIDs) {
-										oSmartField._setInternalFieldGroupIds(aIDs);
-									}
+						var oSmartField = oEvent.getSource();
+						oSmartField._getComputedMetadata().then(function (oComputedMetaData) {
+							if (oComputedMetaData && oComputedMetaData.navigationPath && !!oSmartField.getBindingContext()) {
+								var oClonedMetaData = deepExtend({}, oComputedMetaData);
+								var oMetaModel = oController.getOwnerComponent().getModel().getMetaModel();
+
+								/* EntitySet and EntityType of the cloned metamodel of smartfield needs to be changed to the parent entity so that when
+									_calculateFieldGroupIDs looks through the passed metamodel, it should be able to find the corresponding side effect annotation */
+								oClonedMetaData.entitySet = oMetaModel.getODataEntitySet(oController.getOwnerComponent().getEntitySet());
+								oClonedMetaData.entityType = oMetaModel.getODataEntityType(oClonedMetaData.entitySet.entityType);
+
+								var aIDs = oSmartField._calculateFieldGroupIDs(oClonedMetaData);
+								if (aIDs) {
+									oSmartField._setInternalFieldGroupIds(aIDs);
 								}
-							});
-						}
+							}
+						});
 					},
-
 					deleteEntry: function (oEvent) {
 						var oListItem = oEvent.getParameter("listItem");
 						var oListItemContext = oListItem.getBindingContext();
@@ -2433,8 +2429,8 @@ sap.ui.define([
 						}, Function.prototype); // to avoid console errors add an event handler for the reject case
 					},
 
-					onContactDetails: function (oEvent) {
-						oTemplateUtils.oCommonEventHandlers.onContactDetails(oEvent);
+					onContactDetails: function (oEvent, sNavigationPropertyPath) {
+						oTemplateUtils.oCommonEventHandlers.onContactDetails(oEvent, sNavigationPropertyPath);
 					},
 					onSmartFieldInitialise: function (oEvent) {
 						var sViewId = this.getView().getId();

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

@@ -81,7 +81,7 @@ sap.ui.define([
             mDefaultRowTypeByTableId = new Map(),
             oUIModelPropsWithChangeEventAttached = new Set(),
             mContextWithCreatablePathByTableId = new Map(),
-            oEmptyRowCreated = new Set();
+            oEditedRowContexts = new Set();
 
             function fnOnBeforeRebindObjectPage(){
                 //Clear the cache
@@ -99,7 +99,7 @@ sap.ui.define([
 
             function fnDoesTableHaveCreationRows (oItemsBinding) {
                 return oItemsBinding.getAllCurrentContexts().some(function (oContext){
-                    return oContext.isInactive();
+                    return oContext.isInactive() && !oEditedRowContexts.has(oContext.getPath());
                 });
             }
 
@@ -138,15 +138,27 @@ sap.ui.define([
 
                 var oBindingParams = oEvent.getParameters().bindingParams;
                 var fnOldDataReceived = oBindingParams.events.dataReceived || Function.prototype;
-                oBindingParams.events.dataReceived = function (onDataReceivedEvent) {
-                    fnOldDataReceived.call(this, onDataReceivedEvent);
-                    // When the smart table already has inline creation rows and the user adds a new column to the table, it causes table rebind.
-                    // In this case, just hide the inline controls in the inline creation rows and stop processing further.
+                oBindingParams.events.dataReceived = function (oDataReceivedEvent) {
+                    fnOldDataReceived.call(this, oDataReceivedEvent);
                     var oSmartTableHandler = fnGetSmartTableHandler(oSmartTable),
-                    oItemsBinding = oSmartTableHandler.getBinding();
+                        oItemsBinding = oSmartTableHandler.getBinding();
+                
                     if (fnDoesTableHaveCreationRows(oItemsBinding)) {
-                        fnUpdateTableRows(oSmartTable.getTable());
-                        return;
+                        /**
+                         * If the table already has inline creation rows
+                         * 1. If the dataReceived event triggered by side-effect
+                         *      a. Delete the existing inline creation rows and 
+                         *      b. Continue with the process of creating new inline creation rows
+                         * 2. Otherwise, the dataReceived event would be triggered by adding a column in personalization.
+                         *    In that case, just hide the inline controls and stop processing further.   
+                         */
+                        var bIsTriggeredBySideEffect = oDataReceivedEvent.getParameter("reason") === "SIDE_EFFECT_TARGET";
+                        if (bIsTriggeredBySideEffect) {
+                            fnDeleteCreationRows(oSmartTable);
+                        } else {
+                            fnUpdateTableRows(oSmartTable.getTable());
+                            return;
+                        }
                     }
                     // Check the UI model and proceed with creation of inline creation rows
                     fnCheckUIModelProp(oSmartTable);
@@ -159,9 +171,9 @@ sap.ui.define([
 
                 var fnHandleFirstUserInputOnEmptyRow = function(oBindingContext) {
                     var sPath = oBindingContext.getPath && oBindingContext.getPath();
-                    if (sPath && !oEmptyRowCreated.has(sPath)) {
+                    if (sPath && !oEditedRowContexts.has(sPath)) {
                         fnAddCreationRows(oSmartTable, true);
-                        oEmptyRowCreated.add(sPath);// Maintain the context in a Set so that an Empty row is created only once
+                        oEditedRowContexts.add(sPath);// Maintain the context in a Set so that an Empty row is created only once
                     }
                 };
                 var fnCheckIfBindingIsTransient = function(oSourceControl) {
@@ -186,9 +198,14 @@ sap.ui.define([
             function fnCheckUIModelProp (oSmartTable) {
                 var oUIModel = oObjectPage.getModel("ui"),
                     sSmartTableCreationMode = fnGetSmartTableCreationMode(oSmartTable),
-                    sUIModelProp = oUIModelPropForCreationMode[sSmartTableCreationMode];
+                    sUIModelProp = oUIModelPropForCreationMode[sSmartTableCreationMode],
+                    sSmartTableId = oSmartTable.getId();
+                // Ignore it when the table is already in process
+                if (oTablesToBeProcessed[sSmartTableCreationMode].has(sSmartTableId)) {
+                    return;
+                }    
                 //Add the smart table id to the list of tables to be processed
-                oTablesToBeProcessed[sSmartTableCreationMode].add(oSmartTable.getId());
+                oTablesToBeProcessed[sSmartTableCreationMode].add(sSmartTableId);
                 //If the property is true, proceed with the creating inline creation rows
                 if (oUIModel.getProperty(sUIModelProp)) {
                     fnAddCreationRows(oSmartTable);
@@ -335,9 +352,9 @@ sap.ui.define([
                     var oRowContext = oEvent.getParameter("context"),
                         aAllRequiredProps = oSmartTable.data("inlineCreationRowsConfig").requiredProps;
 
-                    if (oRowContext && !oEmptyRowCreated.has(oRowContext.getPath && oRowContext.getPath())) {
+                    if (oRowContext && !oEditedRowContexts.has(oRowContext.getPath && oRowContext.getPath())) {
                         fnAddCreationRows(oSmartTable, true);
-                        oEmptyRowCreated.add(oRowContext.getPath());
+                        oEditedRowContexts.add(oRowContext.getPath());
                     }
                     // If the table contains required props, validate them and show error messages
                     if (aAllRequiredProps.length > 0) {
@@ -484,7 +501,10 @@ sap.ui.define([
 
                 if (aTransientRows.length === 0) {
                     return;
-                }    
+                }   
+                
+                fnUpdateResponsiveTableRowsBasedOnNonInsertableProperties(oTable, aTransientRows);
+
                 // Preserving the default row type into "mDefaultRowTypeByTableId".
                 // sDefaultRowType is used by "fnHideInlineControlsOnTransientRow" to restore the row type when the row is peristed 
                 if (mDefaultRowTypeByTableId.get(sTableId)) {
@@ -500,6 +520,29 @@ sap.ui.define([
                 });
             }
 
+            function fnUpdateResponsiveTableRowsBasedOnNonInsertableProperties(oTable, aTransientRows) {
+                // Support NonInsertableProperties to disable the field while creation
+                var oSmartTable = oTable.getParent();
+                var aColumns = oTable.getColumns();
+                var aNonInsertableProperties = oSmartTable.data("inlineCreationRowsConfig").nonInsertableProperties;
+                var aIndexOfNonInsertableProperties = [];
+                if (aNonInsertableProperties && aNonInsertableProperties.length > 0) {
+                    for (var i = 0; i < aTransientRows[0].getCells().length; i++) {
+                        for (var j = 0; j < aNonInsertableProperties.length; j++) {
+                            if (aNonInsertableProperties[j].PropertyPath === aColumns[i].data("p13nData").leadingProperty) {
+                                aIndexOfNonInsertableProperties.push(i);
+                            }
+                        }
+                    }
+                    for (var i = 0; i < aTransientRows.length; i++) {
+                        var aTransientRowsCell = aTransientRows[i].getCells();
+                        for (var j = 0; j < aIndexOfNonInsertableProperties.length; j++) {
+                            aTransientRowsCell[aIndexOfNonInsertableProperties[j]].setEditable && aTransientRowsCell[aIndexOfNonInsertableProperties[j]].setEditable(false);
+                        }
+                    }
+                }
+            }
+
             /**
              * This method binds the row type and the visibility of delete control with row's binding context
              * 1. When the binding context is transient ($context.isTransient = true)
@@ -538,7 +581,8 @@ sap.ui.define([
 
             /**
              *
-             * This method iterates through the contexts in the table and removes the inactive contexts (inline creation rows).
+             * This method iterates through the contexts in the table 
+             * and removes the inactive contexts (inline creation rows) which are not yet edited.
              * @param {*} oSmartTable
              */
                function fnDeleteCreationRows (oSmartTable) {
@@ -547,7 +591,7 @@ sap.ui.define([
 
                 if (oItemsBinding.isResolved() && oItemsBinding.isLengthFinal()) {
                     oItemsBinding.getAllCurrentContexts().forEach(function (oContext){
-                        if (oContext.isInactive()) {
+                        if (oContext.isInactive() && !oEditedRowContexts.has(oContext.getPath())) {
                             oContext.delete();
                         }
                     });

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

@@ -143,17 +143,17 @@ sap.ui.define([
 		// - table -> the corresponding SmartTable
 		// - presentationControlHandler -> the corresponding instance of sap.suite.ui.generic.template.lib.presentationControl.SmartTableHandler
 		// - messageToMsgInTableInfo -> a map that maps the ids of messages belonging to rows in this table to detailed information about this relationship
-		//   More preceisely, the detailed information is an object containing the following attributes:
-		//   ~ index -> The index of the entry in the table realting to this message, resp. 9999999 if no such entry could be found
+		//   More precisely, the detailed information is an object containing the following attributes:
+		//   ~ index -> The index of the entry in the table relating to this message, resp. 9999999 if no such entry could be found
 		//   ~ rowCurrentlyShown -> Information whether the row this message relates to is currently shown
 		//   ~ rowIdentifier -> The human readable identification of the row the message relates to
 		//   ~ columnInfo -> Information about the column the message relates to (resp. a faulty value, if no such column could be identified)
 		//     More precisely, this is an object containing properties 'label' (string identifying the column) and 'hidden' (boolean informing whether the column is hidden)
-		//   This information is set (maybe asynchronosly) by addContextInfoToMessageToMsgInTableInfo resp. getDetailsRetrievedPromise.  
+		//   This information is set (maybe asynchronously) by addContextInfoToMessageToMsgInTableInfo resp. getDetailsRetrievedPromise.  
 		// - tableLoaded -> a Promise which is resolved when the table has finished loading its data and the data which have been loaded have
 		//   been used to update the content of the messageToMsgInTableInfo property
 		// - destroy ->  a destroy function for this instance
-		// - columnInfo -> a map (created on demand) mapping pathes that represent columns to the columnInfo as described above
+		// - columnInfo -> a map (created on demand) mapping paths that represent columns to the columnInfo as described above
 		// Note that mTableIdToTableInfo is used as a cash.
 		// Moreover, note that this function returns a faulty value if the table does not possess a binding. However, this information is not cached.		
 		function getTableInfo(oTable){
@@ -221,7 +221,7 @@ sap.ui.define([
 			if (sColumnPath.startsWith("/")){
 				sColumnPath = sColumnPath.substring(1);
 			}
-			// if sColumnPath is empty the whole table should be considered as target. If sColumnPath contains a "(" the target points to a subentity of the current item
+			// if sColumnPath is empty the whole table should be considered as target. If sColumnPath contains a "(" the target points to a sub entity of the current item
 			// In both cases no column can be identified
 			if (!sColumnPath || sColumnPath.indexOf("(") > 0){
 				return;
@@ -273,9 +273,11 @@ sap.ui.define([
 				var mPreviousMessageToMsgInTableInfo = oRet.messageToMsgInTableInfo; // the old content might be useful (see below)
 				oRet.messageToMsgInTableInfo = Object.create(null);  // However, we create the content from scratch now
 				// Analyze all rows currently existing in the table for messages belonging to them
-				var fnHandleContext = addContextInfoToMessageToMsgInTableInfo.bind(null, oRet);
-				var aContexts = oPresentationControlHandler.getCurrentContexts() || [];
-				aContexts.forEach(fnHandleContext);
+				if (!controlHelper.isTreeTable(oTable.getTable())) {	// temporarily disabled for tree tables until oContext.getMessages() is fixed by the model component
+					var fnHandleContext = addContextInfoToMessageToMsgInTableInfo.bind(null, oRet);
+					var aContexts = oPresentationControlHandler.getCurrentContexts() || [];
+					aContexts.forEach(fnHandleContext);
+				}
 				// mPreviousMessageToMsgInTableInfo might contain information for messages belonging to rows
 				// meanwhile filtered out. Do not loose this information.
 				for (var sMsgId in mPreviousMessageToMsgInTableInfo){
@@ -366,7 +368,7 @@ sap.ui.define([
 		// If both messages belong to the same section but to different tables within this section they should be sorted according to the position of the tables within the section
 		// If both messages belong to the same table, but to different selected rows within the table they should be sorted according to the position of that table
 		// If both messages belong to the same table, but only one of them to a selected row, this one should be shown first
-		// If both messages belong the same table, but to different non-selected rows an artifical stable sorting of thoswe rows is assumed (based on the item binding path)
+		// If both messages belong the same table, but to different non-selected rows an artificial stable sorting of those rows is assumed (based on the item binding path)
 		// If both messages belong to the same table and to the same row (which may be none) or to the same section and both to no table then they are sorted by
 		// - reverse severity (if the severity is different) 
 		// - position of the most specific control which has been found for them (if the severity is equal)
@@ -417,7 +419,7 @@ sap.ui.define([
 		}
 
 		// Read the entry for the specified binding path without updating the state messages, and call the specified function on the context obtained from this read (resp. null, if the read did not succeed)
-		// Note: Supressing the state messages is done to prevent that the content of the itemBinding this class relies on is modified while this instance is in use.
+		// Note: Suppressing the state messages is done to prevent that the content of the itemBinding this class relies on is modified while this instance is in use.
 		function performFunctionOnContext(oModel, sBindingPath, fnFunction){
 			// The commented code is not supported by the OData model yet
 /*			oModel.createBindingContext(sBindingPath, null, {
@@ -470,16 +472,16 @@ sap.ui.define([
 							};
 						});
 					}
-					fnResolve();							
+					fnResolve();
 				});
-			});			
+			});
 		}
 
 		// This function is used to identify a table that can be assigned for the message oMessage. This is only used in case that the standard mechanism provided by UI5 that assigns controls
 		// to messages has not provided any result (yet).
 		// In this case we loop over all SmartTable known to us until we find a suitable candidate.
 		// For this purpose we check whether the binding path of the table "fits" to a full target of the message.
-		// Thereby the binding path of the table is determined by concatentaing sBindingPathPrefix with the navigation property of the table.
+		// Thereby the binding path of the table is determined by concatenating sBindingPathPrefix with the navigation property of the table.
 		// If the table is found the corresponding information will be added to mTableInfosReadyPromise by either adding a new entry for the table or extending the existing one.
 		function fnFindTableForMessage(oMessage, mTableInfosReadyPromise, sBindingPathPrefix){
 			var bFound = false;
@@ -525,11 +527,11 @@ sap.ui.define([
 		// This should ensure that for all considered messages the connection to their controls has already been established.
 		// However, this connection is created by ui5 in an asynchronous way, and currently they do not provide a mechanism which
 		// lets us wait until this process has been finished.
-		// Therfore, as a second chance we try to establish the connection between messages and tables ourselves, based on metadata.
+		// Therefore, as a second chance we try to establish the connection between messages and tables ourselves, based on metadata.
 		// This does not help for messages that belong to forms. For these messages the map messageToUpdateFunction is used (see below).
 		// Note that for messages which cannot be assigned to tables (i.e. messages that belong to forms) it might be necessary to do a resorting later.
 		// - oItemBinding is the binding of the message popover which displays the messages.
-		// - aMessages is the array of messages displayed (actually this is redundant, as it could also be retireved from oItemBinding)
+		// - aMessages is the array of messages displayed (actually this is redundant, as it could also be retrieved from oItemBinding)
 		// - oHelperModel is a JSONModel which is used to communicate with the MessageButtonHelper and the message popover
 		// - sBindingPath is the path the object page is currently bound to
 		// The purpose of this function is:
@@ -610,7 +612,7 @@ sap.ui.define([
 			var aTableInfoPromises = [];
 			// We are collecting the tableLoaded-Promises of all relevant tables in order to wait for them.
 			// Note that this is actually superfluous for those tables which have been found relevant with the second try (see above), since this function will only be called
-			// when the corresponding promise in mTableInfosReadyPromise (see above) has been resolved. That promise can only be resolved when tzhe corresponding tableLoaded promise has been resolved.
+			// when the corresponding promise in mTableInfosReadyPromise (see above) has been resolved. That promise can only be resolved when the corresponding tableLoaded promise has been resolved.
 			for (var sTableId in mTableIdToTableInfo){
 				var oTableInfo = mTableIdToTableInfo[sTableId];
 				if (oTableInfo){
@@ -654,22 +656,23 @@ sap.ui.define([
 		// order to add them to messageToMsgInTableInfo of the corresponding table info.
 		// This may still not have provided the required information for all table related messages due to three possible reasons
 		// - The message does not belong to a specific cell within the table but to the table as a whole
-		// - The messsage is a validation message
+		// - The message is a validation message
 		// - The message belongs to a row which has not been loaded
 		// For the first case we do not have to take any additional action.
 		// For the second case we immediately add the missing information using fnAddValidationInfoToTableInfo.
 		// For the third case we trigger an additional backend request which will fetch the data for the missing table row.
 		// The method returns to a Promise which is resolved as soon as all additional backend requests created for the third case have been executed and their results
-		// have also been added to the correspo0nding messageToMsgInTableInfo.
+		// have also been added to the corresponding messageToMsgInTableInfo.
 		// Thus, all in all the returned Promise is resolved as soon as all relevant table data have been fetched and processed.
 		function getMessageSorterForPlacementInfos(){
 			var aMessageDetailsRetrievedPromises = [];
-			var mBindingPathesToMessageList = Object.create(null);
+			var mBindingPathsToMessageList = Object.create(null);
 			var fnHandleMessage = function(sMsgId){
 				var oPlacementInfo = getMessagePlacementInfo(sMsgId);
 				var oTable = oPlacementInfo.groupers[1];
-				var oTableInfo = oTable && getTableInfo(oTable);
-				if (oTableInfo){
+				// Special handling for messages belonging to tables but is temporarily disabled for tree tables until oContext.getMessages() is fixed by the model component
+				var oTableInfo = oTable && !controlHelper.isTreeTable(oTable.getTable()) && getTableInfo(oTable);
+				if (oTableInfo) {
 					var oMessage = oPlacementInfo.message;
 					var oMessageInTableInfo = oTableInfo.messageToMsgInTableInfo[sMsgId];
 					if (!(oMessageInTableInfo && oMessageInTableInfo.rowCurrentlyShown)){
@@ -678,12 +681,12 @@ sap.ui.define([
 						} else {
 							var sBindingPath = oPlacementInfo.getItemBindingPath();
 							if (sBindingPath){ // third case
-								var aBindingPathMessages = mBindingPathesToMessageList[sBindingPath];
+								var aBindingPathMessages = mBindingPathsToMessageList[sBindingPath];
 								if (aBindingPathMessages){
 									aBindingPathMessages.push(sMsgId);
 								} else {
 									aBindingPathMessages = [sMsgId];
-									mBindingPathesToMessageList[sBindingPath] = aBindingPathMessages;
+									mBindingPathsToMessageList[sBindingPath] = aBindingPathMessages;
 									var oDetailsRetrievedPromise = getDetailsRetrievedPromise(sBindingPath, oTableInfo, aBindingPathMessages);
 									aMessageDetailsRetrievedPromises.push(oDetailsRetrievedPromise);
 								}

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

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

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

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.116.0"
+			"version": "1.117.0"
 		},
 		"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.116.0"
+		"version": "1.117.0"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

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

@@ -134,7 +134,7 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
 					actions: ["rename", "remove", "reveal"]
 				},
 				"sap.m.MenuButton": { // used for create and create with filters and possibly created by combining of buttons
-					actions: ["split", "rename"]
+					actions: ["split", "rename", "remove"]
 				},	
 				"sap.m.Button": {
 					actions: ["remove", "reveal", "rename"]

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

@@ -9,10 +9,5 @@
 			                text="{path: 'facet>Label', formatter: 'AHModel.format'}:"
 			                labelFor="{:= ${parameter>/stableId}.getStableId({ type:'ObjectPageSection', subType:'AddressValue', sFacet: ${facetId>id}}) }"/>
 		</template:if>
-		<template:if test="address>label}">
-			<!-- same coding for SmartField is used in SmartFormDataField.fragment.xml -->
-			<sfi:SmartField id="{:= ${parameter>/stableId}.getStableId({ type:'ObjectPageSection', subType:'AddressValue', sFacet: ${facetId>id}}) }"
-				value="{path: 'address>label', formatter: 'AHModel.simplePath'}"/>
-		</template:if>
 	</VBox>
 </core:FragmentDefinition>

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

@@ -12,7 +12,7 @@
 				</layoutData>
 				<items>
 					<List id="{path: 'facet>', formatter: 'AH.getStableIdPartFromFacet'}::ContactsList"
-						  items="{path: 'target>', formatter: 'AHModel.getNavigationPath'}"
+						  items="{parts:[{path: 'target>'}, {path: 'contact>'}], formatter: 'AH.getItemsForContacts'}"
 						  growing="true" growingThreshold="{= ${appSettings>/objectPageColumns/screenSizeXL} === 4 ? '12' : '18'}" class="sapSmartTemplatesObjectPageContactsList"
 						  noDataText="{i18n>NOITEMS}">
 						<CustomListItem class="sapSmartTemplatesObjectPageContactsListItem">
@@ -36,7 +36,7 @@
 								</template:if>
 								<VBox class="sapUiSmallMarginBegin sapUiSmallMarginTopBottom">
 									<fe:Link text="{path: 'contact>fn', formatter: 'AHModel.format'}"
-										  press="._templateEventHandlers.onContactDetails" class="sapSmartTemplatesObjectPageContactsListContactTitle"
+										  press="._templateEventHandlers.onContactDetails($event, '{path: 'target>', formatter: 'AH.getNavigationPropertyPath'}')" class="sapSmartTemplatesObjectPageContactsListContactTitle"
 										  wrapping="true">
 										  <fe:customData>
 											<core:CustomData key="contactDetails" value="{= ${path: 'contact>', formatter: 'AH.getCustomDataForContactPopup'}}"/>