@openui5/sap.ui.core 1.96.1 → 1.97.1

package/src/sap/ui/model/CompositeType.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */
@@ -39,7 +39,7 @@ sap.ui.define(['./SimpleType'],
 	 *   <code>true</code>.
 	 * @extends sap.ui.model.SimpleType
 	 * @public
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 */
 	var CompositeType = SimpleType.extend("sap.ui.model.CompositeType", /** @lends sap.ui.model.CompositeType.prototype */ {
 

package/src/sap/ui/model/Context.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */

package/src/sap/ui/model/ContextBinding.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */

package/src/sap/ui/model/DataState.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */
@@ -65,7 +65,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 *
 	 * @public
 	 * @alias sap.ui.model.DataState

package/src/sap/ui/model/Filter.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */

package/src/sap/ui/model/FilterOperator.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */

package/src/sap/ui/model/FilterProcessor.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */

package/src/sap/ui/model/FilterType.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */

package/src/sap/ui/model/FormatException.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/model/ListBinding.js

@@ -1,7 +1,7 @@
 /*!
 
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */
@@ -70,6 +70,22 @@ sap.ui.define(['./Binding', './Filter', './FilterType', './Sorter', 'sap/base/ut
 	}
 
 	// the 'abstract methods' to be implemented by child classes
+	/**
+	 * Returns all current contexts of this list binding in no special order. Just like
+	 * {@link #getCurrentContexts}, this method does not request any data from a back end and does
+	 * not change the binding's state. In contrast to {@link #getCurrentContexts}, it does not only
+	 * return the contexts as last requested by a control, but all that are currently available in
+	 * the binding.
+	 *
+	 * @returns {sap.ui.model.Context[]}
+	 *   All current contexts of this list binding, in no special order
+	 *
+	 * @function
+	 * @name sap.ui.model.ListBinding.prototype.getAllCurrentContexts
+	 * @public
+	 * @since 1.97.0
+	 */
+
 	/**
 	 * Returns an array of binding contexts for the bound target list.
 	 *
@@ -168,13 +184,16 @@ sap.ui.define(['./Binding', './Filter', './FilterType', './Sorter', 'sap/base/ut
 	 */
 
 	/**
-	 * Returns an array of currently used binding contexts of the bound control.
+	 * Returns the contexts of this list binding as last requested by the control and in the same
+	 * order the control has received them.
 	 *
-	 * This method does not trigger any data requests from the back end or a delta calculation, but
-	 * just returns the context array as last requested by the control. This can be used by the
-	 * application to get access to the data currently displayed by a list control.
+	 * This method does not request any data from a back end and does not change the binding's
+	 * state.
+	 *
+	 * @return {sap.ui.model.Context[]}
+	 *   The contexts of this list binding as last requested by the control and in the same order
+	 *   the control has received them
 	 *
-	 * @return {sap.ui.model.Context[]} The array of contexts for each row of the bound list
 	 * @since 1.28
 	 * @public
 	 */

package/src/sap/ui/model/MetaModel.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */
@@ -16,7 +16,7 @@ sap.ui.define(['./Model'],
 	 * @extends sap.ui.model.Model
 	 *
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 *
 	 * @public
 	 * @alias sap.ui.model.MetaModel

package/src/sap/ui/model/Model.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */
@@ -49,7 +49,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.message.MessageProcessor
 	 *
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 *
 	 * @public
 	 * @alias sap.ui.model.Model
@@ -307,15 +307,10 @@ sap.ui.define([
 	/**
 	 * Fires event {@link #event:parseError parseError} to attached listeners.
 	 *
-	 * @param {object} [oParameters] Parameters to pass along with the event
-	 * @param {int} [oParameters.errorCode]
-	 * @param {string} [oParameters.url]
-	 * @param {string} [oParameters.reason]
-	 * @param {string} [oParameters.srcText]
-	 * @param {int} [oParameters.line]
-	 * @param {int} [oParameters.linepos]
-	 * @param {int} [oParameters.filepos]
-	 *
+	 * @param {object} [oParameters]
+	 *   Parameters to pass along with the event; May contain the following parameters:
+	 *   <code>errorCode</code>, <code>url</code>, <code>reason</code>, <code>srcText</code>,
+	 *   <code>line</code>, <code>linePos</code>, <code>filePos</code>
 	 * @returns {this} Reference to <code>this</code> in order to allow method chaining
 	 * @protected
 	 */

package/src/sap/ui/model/ParseException.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/model/PropertyBinding.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */

package/src/sap/ui/model/SelectionModel.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */
@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/base/EventProvider', "sap/base/assert"],
 	 * @extends sap.ui.base.EventProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 *
 	 * @param {int} iSelectionMode <code>sap.ui.model.SelectionModel.SINGLE_SELECTION</code> or <code>sap.ui.model.SelectionModel.MULTI_SELECTION</code>
 	 *

package/src/sap/ui/model/SimpleType.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */
@@ -46,7 +46,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Type
 	 * @public
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 */
 	var SimpleType = Type.extend("sap.ui.model.SimpleType", /** @lends sap.ui.model.SimpleType.prototype */ {
 

package/src/sap/ui/model/Sorter.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */

package/src/sap/ui/model/SorterProcessor.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */

package/src/sap/ui/model/StaticBinding.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */

package/src/sap/ui/model/TreeAutoExpandMode.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */
@@ -12,7 +12,7 @@ sap.ui.define([],
 	/**
 	 * Different modes for setting the auto expand mode on tree or analytical bindings.
 	 *
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 * @enum {string}
 	 * @alias sap.ui.model.TreeAutoExpandMode
 	 * @protected

package/src/sap/ui/model/TreeBinding.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */

package/src/sap/ui/model/TreeBindingAdapter.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */
@@ -78,8 +78,6 @@ sap.ui.define([
 
 		/**
 		 * Returns a tree state handle to encapsulate the actual tree state.
-		 * TODO: Encode the list to avoid conflicts with delimiters in the flat expanded list?
-		 *       Re-Check this when back-end support is implemented.
 		 *
 		 * This function is exposed in the sub-classes/adapters (e.g. ODataTreeBindingAdapter) if
 		 * necessary/possible.

package/src/sap/ui/model/TreeBindingCompatibilityAdapter.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */

package/src/sap/ui/model/TreeBindingUtils.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */
@@ -110,6 +110,8 @@ sap.ui.define(function() {
 		} else if (iNewSectionEndIndex <= oPendingRequest.iSkip || oNewRequest.iSkip >= iPendingSectionEndIndex) {
 			//old and new sections do not overlap, either the new section is completely left or right from the old one
 		}
+
+		return undefined;
 	};
 
 	return TreeBindingUtils;

package/src/sap/ui/model/Type.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -19,7 +19,7 @@ sap.ui.define(['sap/ui/base/Object'],
 	 *
 	 * @extends sap.ui.base.Object
 	 * @public
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 */
 	var Type = BaseObject.extend("sap.ui.model.Type", /** @lends sap.ui.model.Type.prototype */ {
 

package/src/sap/ui/model/ValidateException.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/model/analytics/AnalyticalBinding.js

@@ -1,10 +1,10 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-// Disable some ESLint rules. camelcase (some "_" in names to indicate indexed variables (like in math)), valid-jsdoc (not completed yet), no-warning-comments (some TODOs are left)
+// Disable some ESLint rules. camelcase (some "_" in names to indicate indexed variables (like in math)), valid-jsdoc (not completed yet)
 // All other warnings, errors should be resolved
 /*eslint camelcase:0, valid-jsdoc:0, no-warning-comments:0, max-len:0 */
 
@@ -1476,7 +1476,6 @@ sap.ui.define([
 						oGroupIdRange.threshold);
 			}
 
-			// TODO check current code works, but it would be more natural if this _considerRequestGrouping would be outside of this loop
 			var aRequestId = [];
 			for (var j = -1, sGroupId2; (sGroupId2 = aGroupId[++j]) !== undefined; ) {
 				aRequestId.push(this._getRequestId(AnalyticalBinding._requestType.groupMembersQuery, {groupId: sGroupId2}));
@@ -2425,7 +2424,7 @@ sap.ui.define([
 				aGroupMembersAutoExpansionRequestDetails.push(oLevelMembersRequestDetails);
 				aRequestId.push(oLevelMembersRequestDetails.sRequestId);
 			} else if (oLevelFilter && oLevelFilter.aFilters.length > 0) {
-				if (!oLevelFilter._bMultiFilter || oLevelFilter.bAnd) { // TODO remove this test once impl got mature to get rid of access to internal member; it is a consistency check if break-up will deliver expected results...
+				if (!oLevelFilter._bMultiFilter || oLevelFilter.bAnd) {
 					oLogger.fatal("level filter in wrong shape; cannot break it up");
 				}
 				for (var i = 0; i < oLevelFilter.aFilters.length; i++) { // break up level filter into its tuple filters combined with logical OR
@@ -2941,7 +2940,7 @@ sap.ui.define([
 			this.mServiceFinalLength[sGroupId] = true;
 			this._setServiceKey(this._getKeyIndexMapping(sGroupId, 0), AnalyticalBinding._artificialRootContextGroupId);
 			this.bNeedsUpdate = true;
-			// simulate the async behavior for the root context in case of having no sums (TODO: reconsider!)
+			// simulate the async behavior for the root context in case of having no sums
 			setTimeout(function() {
 				if (that._cleanupGroupingForCompletedRequest(oRequestDetails.sRequestId)) {
 					that.fireDataReceived({__simulateAsyncAnalyticalBinding: true});
@@ -4215,8 +4214,6 @@ sap.ui.define([
 
 	// substitute for indexOf in the key array for some group
 	AnalyticalBinding.prototype._findKeyIndex = function(sGroupId, sKey) {
-		// TODO optimize by first looking into mMultiUnitKey; if not found, search in mServiceKey; if not found, return -1
-
 		// naive implementation follows
 		var aKeyIndex = this.mKeyIndex[sGroupId];
 		var aServiceKey = this.mServiceKey[sGroupId];
@@ -4601,10 +4598,14 @@ sap.ui.define([
 							bChangeDetected = true;
 							return false;
 						}
+
+						return true;
 					});
 					if (bChangeDetected) {
 						return false;
 					}
+
+					return true;
 				});
 			}
 			if (!mChangedEntities && !mEntityTypes) { // default
@@ -4640,10 +4641,14 @@ sap.ui.define([
 							bChangeDetected = true;
 							return false;
 						}
+
+						return true;
 					});
 					if (bChangeDetected) {
 						return false;
 					}
+
+					return true;
 				});
 			}
 		}
@@ -4782,6 +4787,7 @@ sap.ui.define([
 			return this.oModel._createRequestUrl(sPath, null, aParam).replace(/ /g, "%20");
 		}
 
+		return undefined;
 	};
 
 	//**********************************

package/src/sap/ui/model/analytics/AnalyticalTreeBindingAdapter.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */
@@ -54,9 +54,7 @@ sap.ui.define([
 	 * Used by the AnalyticalTable to display the sum row.
 	 */
 	AnalyticalTreeBindingAdapter.prototype.getGrandTotalContext = function () {
-		if (this._oRootNode) {
-			return this._oRootNode.context;
-		}
+		return this._oRootNode && this._oRootNode.context;
 	};
 
 	/*
@@ -64,9 +62,7 @@ sap.ui.define([
 	 * Used by the AnalyticalTable to display the sum row.
 	 */
 	AnalyticalTreeBindingAdapter.prototype.getGrandTotalNode = function () {
-		if (this._oRootNode) {
-			return this._oRootNode;
-		}
+		return this._oRootNode;
 	};
 
 	/*
@@ -109,7 +105,6 @@ sap.ui.define([
 
 		// if the node was not found in the current tree snapshot -> rebuild the tree, and if necessary request the node
 		if (!oNode || !oNode.context) {
-			//@TODO: Maybe preserve the Row Index Cache, before calling getContexts, and restore it afterwards
 			//Beware: getContexts might return nothing, if the context was not yet loaded!
 			oNode = {context: this.getContexts(iIndex, 1, 0)[0]};
 		}
@@ -192,8 +187,9 @@ sap.ui.define([
 		var aContexts = [];
 		//find missing spots in our visible section
 		var mMissingSections;
+		var oNode;
 		for (var i = 0; i < aNodes.length; i++) {
-			var oNode = aNodes[i];
+			oNode = aNodes[i];
 
 			//user scrolled into the water mark node, which is the last of the guaranteed loaded page (length + threshold)
 			if (this._isRunningInAutoExpand(TreeAutoExpandMode.Bundled) && this._oWatermark) {
@@ -233,7 +229,7 @@ sap.ui.define([
 			// try to fill gaps in our return array if we already have new data (thanks to thresholding)
 			aContexts = [];
 			for (var j = 0; j < aNodes.length; j++) {
-				var oNode = aNodes[j];
+				oNode = aNodes[j];
 				aContexts.push(oNode.context);
 			}
 		}
@@ -281,6 +277,8 @@ sap.ui.define([
 				aResults.push(oNode.sumNode);
 			}
 		}
+
+		return undefined;
 	};
 
 	/*
@@ -589,17 +587,15 @@ sap.ui.define([
 		// in case we have no grouping at all, the "groupID" for each node is based on its position as the roots child
 		if (!this.isGrouped() && oNode && oNode.positionInParent) {
 			sGroupID = "/" + oNode.positionInParent + "/";
-		} else {
+		} else if (oNode.level > iMaxLevel) {
 			// if the level of the node exceeds the maximum level (in the analytical case, this is the aggregation level),
 			// the group id is also appended with the relative parent position
-			if (oNode.level > iMaxLevel) {
-				sGroupID = this._getGroupIdFromContext(oNode.context, iMaxLevel);
-				assert(oNode.positionInParent != undefined, "If the node level is greater than the number of grouped columns, the position of the node to its parent must be defined!");
-				sGroupID +=  oNode.positionInParent + "/";
-			} else {
-				//this is the best case, the node sits on a higher level than the aggregation level
-				sGroupID = this._getGroupIdFromContext(oNode.context, oNode.level);
-			}
+			sGroupID = this._getGroupIdFromContext(oNode.context, iMaxLevel);
+			assert(oNode.positionInParent != undefined, "If the node level is greater than the number of grouped columns, the position of the node to its parent must be defined!");
+			sGroupID +=  oNode.positionInParent + "/";
+		} else {
+			//this is the best case, the node sits on a higher level than the aggregation level
+			sGroupID = this._getGroupIdFromContext(oNode.context, oNode.level);
 		}
 		return sGroupID;
 	};
@@ -779,6 +775,8 @@ sap.ui.define([
 				bHasMeasures = true;
 				return false;
 			}
+
+			return true;
 		});
 		return bHasMeasures;
 	};

package/src/sap/ui/model/analytics/AnalyticalVersionInfo.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */

package/src/sap/ui/model/analytics/BatchResponseCollector.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */

package/src/sap/ui/model/analytics/ODataModelAdapter.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */

package/src/sap/ui/model/analytics/odata4analytics.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/model/base/ManagedObjectModel.js

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([

package/src/sap/ui/model/json/JSONListBinding.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*eslint-disable max-len */