@sapui5/sap.suite.ui.generic.template 1.138.1 → 1.139.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.138.1",
+  "version": "1.139.1",
   "description": "SAPUI5 Library sap.suite.ui.generic.template",
   "keywords": [
     "sapui5",
@@ -10,13 +10,12 @@
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "SAP SE (https://www.sap.com)",
   "scripts": {
-    "sonar": "sonar-scanner",
+    
     "test": "echo \"Error: no test specified\" && exit 1",
     "start" : "ui5 serve  --config ./ui5-local.yaml --open \"/test-resources/sap/suite/ui/generic/template/demokit/flpSandbox.html?sap-ui-theme=sap_horizon#Shell-home\"",
     "testsuite-qunit" : "ui5 serve  --config ./ui5-local.yaml --open \"/test-resources/sap/suite/ui/generic/template/qunit/testsuite.qunit.html\""
   },
   "devDependencies": {
-    "sonarqube-scanner": "3.5.0",
     "@sap/ux-ui5-tooling": "latest"
   }
 }

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

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

package/src/sap/suite/ui/generic/template/AnalyticalListPage/Component.js

@@ -608,13 +608,6 @@ sap.ui.define(["sap/ui/core/mvc/OverrideExecution",
 						"type": "boolean",
 					"defaultValue": false
 					},
-					"dshQueryName" : {
-						/*
-							Setting to enable DSH crosstable
-						*/
-						"type" : "string",
-						"defaultValue": undefined
-					},
 					"filterDefaultsFromSelectionVariant" : {
 						/*
 							This setting allows developer to choose SV from annotation

package/src/sap/suite/ui/generic/template/AnalyticalListPage/control/visualfilterbar/SmartVisualFilterBar.js

@@ -129,8 +129,11 @@ sap.ui.define([
 		var bIsCozyMode = document.body.classList.contains("sapUiSizeCozy");		// Default settings
 		//TODO: Get this through CSS rather than hard coding
 		this._cellItemHeightNorth = bIsCozyMode ? "3rem" : "2rem";
-		this._cellItemHeightSouth = bIsCozyMode ? "9.9rem" : "7.5rem";
-		Device.system.phone ? this._cellItemHeightSouth = "9rem" : "";
+		if (Device.system.phone) {
+			this._cellItemHeightSouth = "9rem";
+		} else {
+			this._cellItemHeightSouth = bIsCozyMode ? "9.9rem" : "7.5rem";
+		}
 		this._cellHeight = bIsCozyMode ? "12rem" : "11rem";
 		this._cellWidth = "20rem";
 		this.labelHeight = 2.0;

package/src/sap/suite/ui/generic/template/AnalyticalListPage/control/visualfilterbar/VisualFilterProvider.js

@@ -248,14 +248,13 @@ sap.ui.define([
 						var entityType = metaModel.getODataEntityType(entityTypePath);
 						var allProps = context._oMetadataAnalyser.getFieldsByEntityTypeName(entityTypePath);
 
-						for (var key in allProps) {
-
-							if (allProps[key].name === dimension) {
-								var prop = metaModel.getODataProperty(entityType, allProps[key].name);
+						for (var oCurrentProp of allProps) {
 
+							if (oCurrentProp.name === dimension) {
+								var prop = metaModel.getODataProperty(entityType, oCurrentProp.name);				
 								fieldList.push({ // Dimension definition
-									name: allProps[key].name,
-									fieldInfo: allProps[key],
+									name: oCurrentProp.name,
+									fieldInfo: oCurrentProp,
 									propInfo: prop
 								});
 								//dimMap[allProps[key].name] = dim;

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

@@ -4,7 +4,6 @@ sap.ui.define(["sap/fe/navigation/SelectionVariant",
 	"sap/suite/ui/generic/template/listTemplates/controller/ToolbarController",
 	"sap/suite/ui/generic/template/AnalyticalListPage/controller/VisualFilterBarController",
 	"sap/suite/ui/generic/template/AnalyticalListPage/controller/VisualFilterDialogController",
-	"sap/suite/ui/generic/template/AnalyticalListPage/controller/AnalyticGridController",
 	"sap/ui/table/AnalyticalTable",
 	"sap/ui/model/odata/AnnotationHelper",
 	"sap/ui/model/analytics/odata4analytics",
@@ -31,7 +30,7 @@ sap.ui.define(["sap/fe/navigation/SelectionVariant",
 	"sap/suite/ui/generic/template/js/AnnotationHelperHiddenTermSupport",
 	"sap/suite/ui/generic/template/AnalyticalListPage/controller/CtxMenuHandler"
 ], function(SelectionVariant, ExtensionAPI,
-			FilterBarController, ToolbarController, VisualFilterBarController, VisualFilterDialogController, AnalyticGridController, AnalyticalTable,
+			FilterBarController, ToolbarController, VisualFilterBarController, VisualFilterDialogController, AnalyticalTable,
 			ODataAnnotationHelper, Analytics, ContentAreaController, IappStateHandler, Device, SegmentedButtonItem, ALPHelper, controlHelper, FeLogger, 
 			ObjectPath, ShareUtils, merge, deepExtend, ListUtils, MultipleViewsHandler, StableIdHelper, MessageStripHelper, JSONModel, PersonalizationControllerUtil, 
 			InsightsHandler, metadataAnalyser, filterHelper, AnnotationHelperHiddenTermSupport, CtxMenuHandler) {
@@ -386,11 +385,7 @@ sap.ui.define(["sap/fe/navigation/SelectionVariant",
 						var oMultipleViewsHandler = new MultipleViewsHandler(oState, oController, oTemplateUtils);
 						oState.oMultipleViewsHandler = oMultipleViewsHandler;
 						oState.oMessageStripHelper = new MessageStripHelper(oTemplateUtils.oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oState.oSmartTable), oMultipleViewsHandler, oController, oTemplateUtils, "alp");
-						if (oController.getOwnerComponent().getProperty("dshQueryName")) {
-							oState.oAnalyticGridContainer = oController.byId("template::AnalyticGridContainer");
-							oState.oAnalyticGridController = new AnalyticGridController();
-							oState.oAnalyticGridController.setState(oState);
-						}
+						
 						oState.alr_compactFilterContainer = oController.byId("template::CompactFilterContainer");
 						oState.alr_visualFilterContainer = oController.byId("template::VisualFilterContainer");
 						oState.alr_filterContainer = oController.byId("template::FilterContainer");
@@ -1075,13 +1070,7 @@ sap.ui.define(["sap/fe/navigation/SelectionVariant",
 							oState.filterBarController.fnCheckMandatory();
 						},
 						onContentViewSegmentButtonPressed: function(oEvent){
-							//todo: check if DSH loads if the default filter mode is crosstable
-							//ideally we can init DSH post GO button press
 							var sSelectedKey = oEvent.getSource().getSelectedKey();
-
-							if (sSelectedKey === "crosstable" && !oState.oAnalyticGrid) {
-								oState.oAnalyticGridController.initAnalyticGrid();
-							}
 							
 							if ((sSelectedKey === "table" || sSelectedKey === "charttable") && bTableRebindRequired) {
 								oState.oSmartTable.rebindTable();

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

@@ -295,7 +295,9 @@ sap.ui.define([
 		});
 		var aSelectedParts = sfb.isDialogOpen() ? ["_dialogFilter>/" + oChart.getParentProperty(), property.dimensionField] : ["_filter>/" + oChart.getParentProperty(), property.dimensionField];
 		// send unit field part to the formatter only if unitField is present
-		property.unitField ? aDescriptionBindingParts.push({ path : property.unitField }) : "" ;
+		if (property.unitField) {
+			aDescriptionBindingParts.push({ path: property.unitField });
+		}
 		var template = new StandardListItem({
 			title: {
 				parts: [property.dimensionFieldDisplay, property.dimensionField],

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

@@ -169,9 +169,6 @@ CONTAINER_VIEW_CHART=Chart View
 # XBUT,50: tooltip for chart view
 CONTAINER_VIEW_CHARTTABLE=Chart and Table View
 
-# XBUT,50: tooltip for crosstab view
-CONTAINER_VIEW_CROSSTAB=Crosstable View
-
 # XBUT,50: tooltip for filter switch
 FILTER_VISUAL=Visual Filter
 

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

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

@@ -348,15 +348,6 @@ sap.ui.define(["sap/ui/base/Object",
 		oModel.setProperty("/kpiContext", kpiContext);
 		return "/kpiContext";
 	};
-	oAnnotationHelper.generateKPIToolbarId = function(oKPIs) {
-		for (var item = 0; Object.keys(oKPIs).length; item++) {
-			if (oKPIs[Object.keys(oKPIs)[item]]["filterable"]) {
-				return "template::KPITagContainer::filterableKPIs";
-			} else {
-				return "template::KPITagContainer::globalKPIs";
-			}
-		}
-	};
 	oAnnotationHelper.generateKPITagID = function(oKPI) {
 		return "template::KPITag::" + oKPI.model + "::" + oKPI.qualifier;
 	};

package/src/sap/suite/ui/generic/template/AnalyticalListPage/view/fragments/ContentContainer.fragment.xml

@@ -48,13 +48,6 @@
 						</VBox>
 					</template:then>
 				</template:if>
-				<template:if test="{= ${parameter>/settings/dshQueryName} !== undefined }">
-					<template:then>
-						<VBox class="sapSmartTemplatesAnalyticalListPageMasterExtension" visible="{= ${_templPriv>/alp/contentView} === 'crosstable'}">
-							<core:Fragment fragmentName="sap.suite.ui.generic.template.AnalyticalListPage.view.fragments.AnalyticGrid" type="XML" />
-						</VBox>
-					</template:then>
-				</template:if>
 			</template:else>
 		</template:if>
 	</VBox>

package/src/sap/suite/ui/generic/template/AnalyticalListPage/view/fragments/ContentViewButtons.fragment.xml

@@ -27,12 +27,6 @@
 					key="customview2"
 					icon="{alpCustomModel>/icon/customview2}"/>
 			</template:if>
-			<template:if test="{= ${parameter>/settings/dshQueryName} !== undefined }">
-				<SegmentedButtonItem
-					tooltip="{i18n>CONTAINER_VIEW_CROSSTAB}"
-					key="crosstable"
-					icon="sap-icon://grid" />
-			</template:if>
 			<SegmentedButtonItem
 				tooltip="{i18n>CONTAINER_VIEW_TABLE}"
 				key="table"

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

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_en_US_saprigi.properties

@@ -63,6 +63,8 @@ OBJECT_NOT_EDITABLE=\u206A\u206A\u206A\u200C\u200D\u200B\u200B\u200C\u200D\u200D
 
 NODATA_SMARTTABLE_LR=\u206A\u206A\u206A\u200C\u200C\u200B\u200D\u200B\u200B\u200C\u200D\u200D\u200C\u200B\u200D\u200B\u200B\u200D\u200C\u200C\u200B\u200D\u200C\u200B\u200B\u200C\u200D\u200B\u200B\u200B\u200D\u200D\u200D\u200B\u200B\u200D\u200B\u200D\u200B\u200C\u200C\u200B\u200B\u200C\u206ATo start, set the relevant filters and choose "Go".\u206A\u206A
 
+SEARCH_FILTERS_KEYBOARD_SHORTCUT_DESC=\u206A\u206A\u206A\u200D\u200B\u200B\u200C\u200B\u200C\u200B\u200B\u200B\u200B\u200D\u200B\u200B\u200D\u200C\u200B\u200C\u200C\u200D\u200D\u200D\u200C\u200B\u200C\u200D\u200C\u200B\u200C\u200D\u200B\u200D\u200C\u200C\u200C\u200B\u200D\u200C\u200B\u200C\u206AGo\u206A\u206A
+
 
 CANCEL_AND_DISCARD=\u206A\u206A\u206A\u200D\u200C\u200B\u200D\u200B\u200B\u200C\u200B\u200B\u200B\u200D\u200D\u200D\u200D\u200C\u200D\u200B\u200B\u200C\u200D\u200D\u200C\u200C\u200B\u200B\u200D\u200D\u200D\u200C\u200B\u200D\u200B\u200D\u200B\u200C\u200D\u200D\u200B\u200D\u200B\u206ADo you want to discard this draft?\u206A\u206A
 

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

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

@@ -1342,8 +1342,9 @@ sap.ui.define([
 						return true;
 					}
 				});
-				for (var iPosition = iStartPosition + iDirection; iPosition !== iStartPosition; iPosition = iPosition + iDirection){
-					if (iPosition < 0){
+				var iPosition = iStartPosition + iDirection;
+				while (iPosition !== iStartPosition) {
+					if (iPosition < 0) {
 						iPosition = aSections.length;
 					} else if (iPosition >= aSections.length){
 						iPosition = -1;
@@ -1365,6 +1366,7 @@ sap.ui.define([
 							}
 						}
 					}
+					iPosition += iDirection;
 				}
 			}
 
@@ -1936,7 +1938,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.manageAccessability(oSubSection);
+							oState.oSectionTitleHandler.setHeaderSmartFormAriaLabelBy(oSubSection);
 						}
 					}
 

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

@@ -16,13 +16,13 @@ sap.ui.define([
 	// The MessageDialog (used for transient messages) is (yet) not using this class.
 	function getMethods(oController, oTemplateUtils, oObjectPage) {
 		var fnHeartBeat = Function.prototype; // A function that is called when new subtitle information is available. Will be set to a more specific function below.
-		
+
 		var mMessageToPlacementInfo; // Cache for message placement infos (see function getMessagePlacementInfo)
-		
+
 		var mTableIdToTableInfo; // Cache for table infos (see function getTableInfo). Will be filled for all tables which relate to at least one message.
 
 		var iResortingId; // an id representing a resorting which is already planned for asynchronous execution. Initial if no such resorting is planned.
-		
+
 		function fnReset(){ // remove all collected information and prepare to collect new one. Also used for initialization.
 			mMessageToPlacementInfo = Object.create(null);
 			if (mTableIdToTableInfo){
@@ -31,13 +31,13 @@ sap.ui.define([
 					oTableInfo.destroy();
 				}
 			}
-			mTableIdToTableInfo = Object.create(null); 
+			mTableIdToTableInfo = Object.create(null);
 		}
 
 		// adds the following attributes to oPlacementInfo: controlId, pathToControlId, groupers, getItemBindingPath (see getMessagePlacementInfo() below)
 		// Thereby aCandidates is the list of controlIds which should be considered.
 		function addControlIdToPlacementInfo(aCandidates, oPlacementInfo){
-			var mChildToParent = Object.create(null); // helper map that maps each relevant control id to the parent control. Will be filled as a bonus via onElementVisited while executing getPositionableControlId to find the target control for the message 
+			var mChildToParent = Object.create(null); // helper map that maps each relevant control id to the parent control. Will be filled as a bonus via onElementVisited while executing getPositionableControlId to find the target control for the message
 			var onElementVisited = function (sElementId, oControl, oChild) { // will be called for sElementId being a member of aControlIds and oControl being one of its ancestors, oChild is a child of oControl and was visited previously
 				if (oChild) {
 					mChildToParent[oChild.getId()] = oControl;
@@ -46,13 +46,13 @@ sap.ui.define([
 			oPlacementInfo.controlId = oTemplateUtils.oCommonUtils.getPositionableControlId(aCandidates, true, onElementVisited); // Now we have decided which controlId we want to use for sorting and placing of this message. Note that this entry might be faulty
 			var aPathToControlId = []; // an array of strings starting with the id of the identified control and ending at the view id. Thereby the array steps up the control hierarchy step by step.
 			var oSection, oTable; // will be set to be the section and table the message belongs to (if such controls can be identified)
-			// fill aPathToControlId and determine oSection and oTable if possible. This is done by following the child-parent relationship given by mChildToParent starting from oPlacementInfo.controlId. 
+			// fill aPathToControlId and determine oSection and oTable if possible. This is done by following the child-parent relationship given by mChildToParent starting from oPlacementInfo.controlId.
 			var sControlId;
 			for (var oControl = oPlacementInfo.controlId && controlHelper.byId(oPlacementInfo.controlId); oControl; oControl = mChildToParent[sControlId]){
 				sControlId = oControl.getId();
 				aPathToControlId.push(sControlId);
 				oSection = oSection || (controlHelper.isObjectPageSection(oControl) && oControl);
-				oTable = oTable || (controlHelper.isSmartTable(oControl) && oControl);					
+				oTable = oTable || (controlHelper.isSmartTable(oControl) && oControl);
 			}
 			aPathToControlId.reverse(); // reverse the order in the path. Now it has the right order for property pathToControlId of the placement info
 			oPlacementInfo.pathToControlId = aPathToControlId;
@@ -88,9 +88,9 @@ sap.ui.define([
 				}
 			} else {
 				oPlacementInfo.getItemBindingPath = Function.prototype;
-			}			
+			}
 		}
-		
+
 		// This function retrieves placement info for a message on the object page. The placement info is an object possessing the following properties:
 		// - message -> the message
 		// - controlIds -> maps the control ids which are currently considered for the message to the corresponding control.
@@ -132,11 +132,11 @@ sap.ui.define([
 					controlIds: mControlIds
 				};
 				addControlIdToPlacementInfo(oMessage.controlIds, oRet); // add the missing attributes to oRet
-				mMessageToPlacementInfo[sMsgId] = oRet; // add to the cash	
+				mMessageToPlacementInfo[sMsgId] = oRet; // add to the cash
 			}
 			return oRet;
 		}
-		
+
 		// This function retrieves table info for a SmartTable on the object page. The table info is an object possessing the following properties:
 		// - table -> the corresponding SmartTable
 		// - presentationControlHandler -> the corresponding instance of sap.suite.ui.generic.template.lib.presentationControl.SmartTableHandler
@@ -147,19 +147,19 @@ sap.ui.define([
 		//   ~ 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 asynchronously) 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 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.		
+		// 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){
 			var sTableId = oTable.getId();
 			var oRet = mTableIdToTableInfo[sTableId];
 			if (!oRet){
 				oRet = createTableInfo(oTable);
-				mTableIdToTableInfo[sTableId] = oRet;	
+				mTableIdToTableInfo[sTableId] = oRet;
 			}
 			return oRet;
 		}
@@ -167,7 +167,7 @@ sap.ui.define([
 		// returns the string which is used to identify a row (specified by oContext) within a SmartTable (specified by its PresentationControlHandler)
 		function getRowIdentifier(oPresentationControlHandler, oContext){
 			var oTitleInfo = oPresentationControlHandler.getTitleInfoForItem(oContext);
-			return oTitleInfo && oTitleInfo.title;	
+			return oTitleInfo && oTitleInfo.title;
 		}
 
 		// creates the columnInfo (see getTableInfo) for a column in a table
@@ -178,7 +178,7 @@ sap.ui.define([
 			};
 		}
 
-		// creates the columnInfo (see getTableInfo) for a column specified by a path in a table 
+		// creates the columnInfo (see getTableInfo) for a column specified by a path in a table
 		function createColumnInfoForPath(oTableInfo, sColumnPath){
 			var aColumns = oTableInfo.table.getTable().getColumns();
 			var oColumnForPath = aColumns.find(function(oColumn){
@@ -210,7 +210,7 @@ sap.ui.define([
 			var sBindingPath = oPlacementInfo.getItemBindingPath();
 			var sRelevantTarget = oPlacementInfo.message.aFullTargets.find(function(sFullTarget){
 				return sFullTarget.startsWith(sBindingPath);
-			}); // find the relevant target information 
+			}); // find the relevant target information
 			if (!sRelevantTarget){
 				return;
 			}
@@ -226,7 +226,7 @@ sap.ui.define([
 			}
 			return getColumnInfoForPath(oTableInfo, sColumnPath);
 		}
-		
+
 		// This function analyzes a context belonging to a table and adds the information about the
 		// messages related to this context to oTableInfo.messageToMsgInTableInfo.
 		function addContextInfoToMessageToMsgInTableInfo(oTableInfo, oContext, iPosition){
@@ -238,7 +238,7 @@ sap.ui.define([
 					if (!oPlacementInfo.controlId){ // no control has been determined for this message yet -> the table can be used
 						addControlIdToPlacementInfo([oTableInfo.table.getId()], oPlacementInfo);
 					}
-					if (oPlacementInfo.groupers[1] === oTableInfo.table){ // ignore messages that are grouped somewhere else 
+					if (oPlacementInfo.groupers[1] === oTableInfo.table){ // ignore messages that are grouped somewhere else
 						var	oEntry = {
 							index: iPosition < 0 ? 9999999 : iPosition,
 							rowCurrentlyShown: iPosition >= 0,
@@ -246,11 +246,11 @@ sap.ui.define([
 							columnInfo: getColumnInfoForMessage(oPlacementInfo, oTableInfo)
 						};
 						oTableInfo.messageToMsgInTableInfo[oMessage.id] = oEntry;
-					}					
+					}
 				});
 			}
 		}
-		
+
 		// create the table info object (see getTableInfo above) which does not exist yet.
 		function createTableInfo(oTable){
 			var oPresentationControlHandler = oTemplateUtils.oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oTable);
@@ -305,7 +305,7 @@ sap.ui.define([
 		// Function to get group name for a message. Messages are grouped based on the controls they refer to.
 		// The corresponding controls are contained in property 'groupers' of the placement info for that message.
 		// groupers is an array which is either empty (message could not be assigned to a specific group), contains one entry which is an object page section,
-		// or contains two entries (an object page section and a table within this section). 
+		// or contains two entries (an object page section and a table within this section).
 		// Depending on the case the group is built.
 		function getGroupTitle(sMsgId) {
 			var oPlacementInfo = getMessagePlacementInfo(sMsgId);
@@ -373,9 +373,9 @@ sap.ui.define([
 		// 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 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) 
+		// - reverse severity (if the severity is different)
 		// - position of the most specific control which has been found for them (if the severity is equal)
-		// If none of the above conditions provides a distinction then the messages are sorted alphabetically 
+		// If none of the above conditions provides a distinction then the messages are sorted alphabetically
 		function fnCompare(oMsgObj1, oMsgObj2) {
 			var oPlacementInfo1 = getMessagePlacementInfo(oMsgObj1.id);
 			var oPlacementInfo2 = getMessagePlacementInfo(oMsgObj2.id);
@@ -436,11 +436,11 @@ sap.ui.define([
 				error : fnFunction.bind(null, null),
 				updateAggregatedMessages : false,
 				success: function(oData){
-					var sKey = oData && oModel._getKey(oData);	
+					var sKey = oData && oModel._getKey(oData);
 					var oNewContext = sKey ? oModel.getContext('/' + sKey, sBindingPath) : null;
 					fnFunction(oNewContext);
 				}
-			});			
+			});
 		}
 
 		// sBindingPath is a binding path pointing to a potential row in a SmartTable. oTableInfo is the info object for this table (see getTableInfo above).
@@ -491,7 +491,8 @@ sap.ui.define([
 			oMessage.aFullTargets.some(function(sFullPath){
 				if (sFullPath.startsWith(sBindingPathPrefix)){ // This full target points to a place on the current object page
 					oTemplateUtils.oInfoObjectHandler.executeForAllInformationObjects("smartTable", function(oInfoObject){ // Check for all tables whether it even points to the table
-						if (!bFound){ // If a suitable table has already been identified skip all other tables
+						const bControlExists = !!controlHelper.byId(oInfoObject.getId());
+						if (!bFound && bControlExists){ // If a suitable table has already been identified skip all other tables
 							var sStart = sBindingPathPrefix + oInfoObject.getNavigationProperty();
 							if (sFullPath === sStart || sFullPath.startsWith(sStart + "(")){ // If the full target really identifies the table or an entry within the table
 								bFound = true;
@@ -510,7 +511,7 @@ sap.ui.define([
 													var oPlacementInfo = getMessagePlacementInfo(oCollectedMessage.id, oCollectedMessage);
 													if (!oPlacementInfo.controlId){ // Only act if still no other logic has assigned a control to this message
 														addControlIdToPlacementInfo([sTableId], oPlacementInfo);
-													} 
+													}
 												});
 											});
 										})
@@ -524,7 +525,7 @@ sap.ui.define([
 				return bFound;
 			});
 		}
-		
+
 		// The public function provided by this class. It is called from function fnPrepareForMessageHandling in ControllerImplementation.
 		// Thereby it is assumed that (if considered necessary) all controls on the OP have been rendered and bound.
 		// This should ensure that for all considered messages the connection to their controls has already been established.
@@ -546,7 +547,7 @@ sap.ui.define([
 		// - Make sure that function fnHeartBeat (see above) will update property heartBeat in oHelperModel
 		// - return a Promise that is resolved as soon as the preparation is done. This Promise resolves to an object which currently has one property 'getSubtitle'. This is actually the
 		//   function with this name (see below).
-		//   Note: The subtitle function is actually returned twice, namely once by adding messageToSubtitle to oHelperModel and once by returning the corresponding function. 
+		//   Note: The subtitle function is actually returned twice, namely once by adding messageToSubtitle to oHelperModel and once by returning the corresponding function.
 		function getPrepareMessageDisplayPromise(oItemBinding, aMessages, oHelperModel, sBindingPath){
 			fnReset(); // initialize caches
 			var mTableInfosReadyPromise = Object.create(null);  // used to collect information about tables which could only be identified via second try
@@ -567,7 +568,7 @@ sap.ui.define([
 			var fnSetMapsAndSort = function(){ // The function to be executed when the sufficient information has been collected to sort the messages and update oHelperModel accordingly
 				if (iResortingId){ // stop any other resorting which still may be planned and document that currently no resorting is planned
 					clearTimeout(iResortingId);
-					iResortingId = 0;	
+					iResortingId = 0;
 				}
 				// Initialize the maps that should be added to oHelperModel
 				var mMessageToGroupName = Object.create(null);
@@ -576,13 +577,13 @@ sap.ui.define([
 				var fnSortAgain; // The function that should be called when a resorting is triggered. Initialized on demand
 				aMessages.forEach(function(oMessage){ // for each message ensure that it is added to the maps
 					var oPlacementInfo = getMessagePlacementInfo(oMessage.id, oMessage); // retrieve the current placement information
-					if (oPlacementInfo.groupers.length === 0){ // If the message can only be added to the generic group yet, make sure that it is marked for resorting 
+					if (oPlacementInfo.groupers.length === 0){ // If the message can only be added to the generic group yet, make sure that it is marked for resorting
 						fnSortAgain = fnSortAgain || function(){
 							iResortingId = iResortingId || setTimeout(fnSetMapsAndSort); // if no resorting is planned yet, plan it now
 							oHelperModel.setProperty("/messageToUpdateFunction", null); // no further resorting needs to be planned (probably makes the above || superfluous)
 						};
 						mMessageToUpdateFunction[oMessage.id] = fnSortAgain; // register the message for resorting
-					}						
+					}
 					mMessageToGroupName[oMessage.id] = getGroupTitle(oMessage.id);
 					mMessageToSubtitle[oMessage.id] = getSubtitle(oMessage.id, oMessage.additionalText);
 				});
@@ -592,11 +593,11 @@ sap.ui.define([
 				oHelperModel.setProperty("/messageToUpdateFunction", mMessageToUpdateFunction);
 				// Trigger the sorting
 				var oSorter = new Sorter("");
-				oSorter.fnCompare = fnCompare;						
-				oItemBinding.sort(oSorter);				
+				oSorter.fnCompare = fnCompare;
+				oItemBinding.sort(oSorter);
 			};
 			return Promise.all(aTableInfosReadyPromises).then(function(){ // all tables are ready
-				return getMessageSorterForTableInfos().then(function(){				
+				return getMessageSorterForTableInfos().then(function(){
 					fnSetMapsAndSort();
 					fnHeartBeat = function(){
 						var iHeartBeat = oHelperModel.getProperty("/heartBeat") || 0;
@@ -631,7 +632,7 @@ sap.ui.define([
 
 		// This function is called for all validation messages belonging to cells inside a table.
 		// It will update the messageInTableInfo for this message within oTableInfo (see getTableInfo) and also return the messageToTableInfo.
-		// This is necessary since the normal mechanism for building this info does not work for validation messages, 
+		// This is necessary since the normal mechanism for building this info does not work for validation messages,
 		// as validation messages are not provided by oContext.getMessages(), if oContext is the binding context of the row which contains the validation error.
 		function fnAddValidationInfoToTableInfo(oMessage, oTableInfo){
 			var oTargetControl = controlHelper.byId(oMessage.controlIds[0]); // As oMessage is a validation message we expect exactly one control to be associated to it
@@ -639,23 +640,23 @@ sap.ui.define([
 			// Now search for oContext within the table in order to determine the position
 			var aContexts = oTableInfo.presentationControlHandler.getCurrentContexts() || [];
 			var iPosition = -1;
-			aContexts.some(function(oCandidateContext, i){ 
+			aContexts.some(function(oCandidateContext, i){
 				if (oCandidateContext === oContext){
 					iPosition = i;
 					return true;
 				}
 			});
-			var oColumn = oTableInfo.presentationControlHandler.getColumnForCell(oTargetControl);			
+			var oColumn = oTableInfo.presentationControlHandler.getColumnForCell(oTargetControl);
 			var oMessageInTableInfo = {
 				index: iPosition,
 				rowCurrentlyShown: true,
 				rowIdentifier: getRowIdentifier(oTableInfo.presentationControlHandler, oContext),
 				columnInfo: getColumnInfoForColumn(oTableInfo, oColumn)
-			};						
+			};
 			oTableInfo.messageToMsgInTableInfo[oMessage.id] = oMessageInTableInfo;
-			return oMessageInTableInfo;			
+			return oMessageInTableInfo;
 		}
-		
+
 		// This method is called when the data for all tables that are relevant for messages have been loaded and we have looped over the rows within these tables in
 		// 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
@@ -695,15 +696,15 @@ sap.ui.define([
 								}
 							} // else: first case
 						}
-					}														
+					}
 				}
 			};
 			for (var sMsgId in mMessageToPlacementInfo){
 				fnHandleMessage(sMsgId);
-			}			
-			return Promise.all(aMessageDetailsRetrievedPromises);			
+			}
+			return Promise.all(aMessageDetailsRetrievedPromises);
 		}
-		
+
 		function getSubtitleForRow(oMessageInTableInfo, oTableInfo, oMessage, aColumnsForMessage){
 			const bIsFallback = !Array.isArray(aColumnsForMessage);
 			let sI18NKey = bIsFallback ? "MSG_SUBTITLE_DEFAULT_ROW" : "MSG_SUBTITLE_ROW";
@@ -719,7 +720,7 @@ sap.ui.define([
 				if (oMessageInTableInfo.columnInfo){
 					aParams.push(oMessageInTableInfo.columnInfo.label);
 					sI18NKey += "_COLUMN";
-					if (oMessageInTableInfo.columnInfo.hidden){
+					if (oMessageInTableInfo.columnInfo.hidden && !oMessageInTableInfo.columnInfo.label){
 						sI18NKey += "_HIDDEN";
 					}
 				}
@@ -788,7 +789,7 @@ sap.ui.define([
 			}
 			return sAdditionalText;
 		}
-		
+
 		function getDescriptionForRow(oMessageInTableInfo, oTableInfo, oMessage, aColumnsForMessage){
 			const sNewLine = "\n";
 			const getText = oTemplateUtils.oCommonUtils.getText;
@@ -810,6 +811,7 @@ sap.ui.define([
 			return sTableText + sRowHeaderText + sRowText + sErrorColumnText;
 		}
 		testableHelper.testableStatic(getSubtitleForRow, "filterHelper_getSubtitleForRow");
+		testableHelper.testableStatic(fnFindTableForMessage, "messageSortingHandler_fnFindTableForMessage");
 		// public instance methods
 		return {
 			getPrepareMessageDisplayPromise: getPrepareMessageDisplayPromise
@@ -821,4 +823,4 @@ sap.ui.define([
 			extend(this, getMethods(oController, oTemplateUtils, oObjectPage));
 		}
 	});
-});
+});

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

@@ -102,7 +102,7 @@ sap.ui.define([
 		}
 		
 		function getKeyToPresentationControlHandler(oSmartTable) {
-			var oGenericMultipleViewsHandler = fnGetGenericMultipleViewsHandler(oSmartTable.getId(), true);
+			var oGenericMultipleViewsHandler = fnGetGenericMultipleViewsHandler(oSmartTable.getId());
 			if (!oGenericMultipleViewsHandler) {
 				return null;
 			}