@openui5/sap.ui.core 1.126.1 → 1.127.0

package/src/sap/ui/model/odata/v4/ODataModel.js

@@ -182,7 +182,7 @@ sap.ui.define([
 		 * @param {string} [mParameters.updateGroupId]
 		 *   The group ID that is used for update requests. If no update group ID is specified,
 		 *   <code>mParameters.groupId</code> is used. Valid update group IDs are
-		 *   <code>undefined</code>, '$auto', '$direct' or an application group ID.
+		 *   <code>undefined</code>, '$auto', '$auto.*', '$direct' or an application group ID.
 		 * @param {boolean} [mParameters.withCredentials]
 		 *   Whether the XMLHttpRequest is called with <code>withCredentials</code>, so that user
 		 *   credentials are included in cross-origin requests by the browser (since 1.120.0)
@@ -234,7 +234,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.Model
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.126.1
+		 * @version 1.127.0
 		 */
 		ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */{
@@ -397,6 +397,7 @@ sap.ui.define([
 		}
 
 		this.aAllBindings = [];
+		this.oAnnotationChangePromise = null; // @see #_requestAnnotationChanges
 		// The bindings holding keep-alive contexts without a $$getKeepAlive binding
 		this.mKeepAliveBindingsByPath = {};
 		this.mSupportedBindingModes = {
@@ -419,6 +420,22 @@ sap.ui.define([
 		this.mPath2DataRequestedCount = {};
 	}
 
+	/**
+	 * Requests changes to annotations.
+	 *
+	 * @returns {Promise<Array<object>>|sap.ui.base.SyncPromise<undefined>}
+	 *   A promise resolving with an optional array of change objects defining a metamodel path and
+	 *   a value to be set for that path
+	 *
+	 * @private
+	 * @see #setAnnotationChangePromise
+	 */
+	ODataModel.prototype._requestAnnotationChanges = function () {
+		this.oAnnotationChangePromise ??= SyncPromise.resolve(); // now it's too late for the setter
+
+		return this.oAnnotationChangePromise;
+	};
+
 	/**
 	 * Submits the requests associated with this group ID in one batch request.
 	 *
@@ -1007,9 +1024,8 @@ sap.ui.define([
 	 * and the binding is relative or points to metadata, the binding may have an object value;
 	 * in this case and unless the binding refers to an action advertisement the binding's mode must
 	 * be {@link sap.ui.model.BindingMode.OneTime}. {@link sap.ui.model.BindingMode.OneWay OneWay}
-	 * is also supported (@experimental as of version 1.126.0), but client-side updates of the
-	 * object are not supported and <code>$$patchWithoutSideEffects</code> should be used for the
-	 * parent entity.
+	 * is also supported (@experimental as of version 1.126.0) for complex types and collections
+	 * thereof; for entity types, use {@link #bindContext} instead.
 	 *
 	 * @param {string} sPath
 	 *   The binding path in the model; must not end with a slash
@@ -2753,18 +2769,25 @@ sap.ui.define([
 	};
 
 	/**
-	 * Tells whether an entity's ETag should be actively ignored (If-Match:*) for PATCH requests.
-	 * Ignored if there is no ETag. Decided at the point in time when the PATCH is actually being
-	 * sent.
+	 * Sets a promise resolving with changes which are applied to all annotations loaded by this
+	 * model, either as part of service metadata or from annotation files given via parameter
+	 * "annotationURI" (see {@link #constructor}).
 	 *
-	 * @param {boolean} bIgnoreETag - Whether an entity's ETag should be actively ignored
+	 * @param {Promise<Array<object>>} oAnnotationChangePromise
+	 *   A promise resolving with an array of change objects defining a metamodel path (pointing to
+	 *   an annotation) and a value to be set for that annotation
+	 * @throws {Error}
+	 *   In case the promise is set too late or has already been set
 	 *
 	 * @private
-	 * @since 1.110.0
-	 * @ui5-restricted sap.fe
+	 * @since 1.127.0
+	 * @ui5-restricted sap.ui.fl
 	 */
-	ODataModel.prototype.setIgnoreETag = function (bIgnoreETag) {
-		this.bIgnoreETag = bIgnoreETag;
+	ODataModel.prototype.setAnnotationChangePromise = function (oAnnotationChangePromise) {
+		if (this.oAnnotationChangePromise) {
+			throw Error("Too late");
+		}
+		this.oAnnotationChangePromise = oAnnotationChangePromise;
 	};
 
 	/**
@@ -2788,6 +2811,21 @@ sap.ui.define([
 		this.fnHttpListener = fnListener;
 	};
 
+	/**
+	 * Tells whether an entity's ETag should be actively ignored (If-Match:*) for PATCH requests.
+	 * Ignored if there is no ETag. Decided at the point in time when the PATCH is actually being
+	 * sent.
+	 *
+	 * @param {boolean} bIgnoreETag - Whether an entity's ETag should be actively ignored
+	 *
+	 * @private
+	 * @since 1.110.0
+	 * @ui5-restricted sap.fe
+	 */
+	ODataModel.prototype.setIgnoreETag = function (bIgnoreETag) {
+		this.bIgnoreETag = bIgnoreETag;
+	};
+
 	/**
 	 * Method not supported
 	 *

package/src/sap/ui/model/odata/v4/ODataPropertyBinding.js

@@ -42,7 +42,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.126.1
+		 * @version 1.127.0
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getUpdateGroupId as #getUpdateGroupId
@@ -349,7 +349,10 @@ sap.ui.define([
 			// Use Promise to become async so that only the latest sync call to checkUpdateInternal
 			// wins
 			vValue = Promise.resolve(vValue);
+		} else if (vValue && typeof vValue === "object") {
+			vValue = _Helper.publicClone(vValue);
 		}
+
 		return SyncPromise.all([vValue, vType]).then(function (aResults) {
 			var oType = aResults[1],
 				vValue0 = aResults[0];

package/src/sap/ui/model/odata/v4/lib/_AggregationCache.js

@@ -432,34 +432,31 @@ sap.ui.define([
 	_AggregationCache.prototype.countDescendants = function (oGroupNode, iIndex) {
 		var i;
 
-		let iGroupNodeLevel = oGroupNode["@$ui5.node.level"]; // max level of oGroupNode's cache
-		// We have to check a candidate's rank if oGroupNode is in oFirstLevel
-		// Note: expandTo may be undefined (when using data aggregation)
-		let bCheckRank = iGroupNodeLevel <= this.oAggregation.expandTo;
+		const iGroupNodeLevel = oGroupNode["@$ui5.node.level"];
+		// Note: iExpandTo may be undefined (when using data aggregation)
+		const iExpandTo = this.bUnifiedCache ? Infinity : this.oAggregation.expandTo;
+		// Note: "descendants" refers to LimitedDescendantCount and counts descendants within
+		// "top pyramid" only!
 		let iDescendants = _Helper.getPrivateAnnotation(oGroupNode, "descendants");
-		if (iDescendants) { // => this.oAggregation.expandTo > 1
-			// Note: "descendants" refers to LimitedDescendantCount and counts descendants within
-			// "top pyramid" only!
-			iGroupNodeLevel = this.oAggregation.expandTo;
-		}
-		if (this.bUnifiedCache) {
-			iGroupNodeLevel = Infinity;
-			bCheckRank = true;
-		}
-		const aElements = this.aElements;
-		for (i = iIndex + 1; i < aElements.length; i += 1) {
-			// If the candidate is not in a nested level cache and (in oFirstLevel) it has a rank,
-			// it counts as descendant. Or it is a sibling if oGroupNode did not have descendants.
-			if (aElements[i]["@$ui5.node.level"] <= iGroupNodeLevel
-					&& (!bCheckRank || _Helper.hasPrivateAnnotation(aElements[i], "rank"))) {
-				// Note: level 0 or 1 is used for initial placeholders of 1st level cache!
+		for (i = iIndex + 1; i < this.aElements.length; i += 1) {
+			const oCandidate = this.aElements[i];
+			const iCandidateLevel = oCandidate["@$ui5.node.level"];
+			// level 0 means "don't know" for a placeholder, otherwise candidate is grand total
+			const bLevelUnknown = iCandidateLevel === 0
+				&& _Helper.hasPrivateAnnotation(oCandidate, "placeholder");
+			if (!bLevelUnknown && iCandidateLevel <= iGroupNodeLevel) {
+				break; // not a descendant
+			}
+			if (iCandidateLevel <= iExpandTo && _Helper.hasPrivateAnnotation(oCandidate, "rank")) {
+				// a node w/ rank in oFirstLevel => counted in "descendants"
+				// Note: a placeholder w/ level 0 has a rank
 				if (!iDescendants) {
-					break; // we've reached a sibling of the collapsed node
+					break; // not a descendant
 				}
 				iDescendants -= 1;
-				if (aElements[i]["@$ui5.node.isExpanded"] === false) {
+				if (oCandidate["@$ui5.node.isExpanded"] === false) {
 					// skip descendants of manually collapsed node
-					iDescendants -= _Helper.getPrivateAnnotation(aElements[i], "descendants", 0);
+					iDescendants -= _Helper.getPrivateAnnotation(oCandidate, "descendants", 0);
 				}
 			}
 		}
@@ -580,6 +577,7 @@ sap.ui.define([
 		if (this.oAggregation.createInPlace) {
 			return oPromise.then(async () => {
 				_Helper.removeByPath(this.mPostRequests, sTransientPredicate, oEntityData);
+				delete oEntityData["@$ui5.context.isTransient"];
 				const [iRank] = await Promise.all([
 					this.requestRank(oEntityData, oGroupLock),
 					this.requestNodeProperty(oEntityData, oGroupLock)
@@ -684,13 +682,16 @@ sap.ui.define([
 	};
 
 	/**
-	 * Expands the given group node.
+	 * Expands the given group node by the given number of levels.
 	 *
 	 * @param {sap.ui.model.odata.v4.lib._GroupLock} oGroupLock
 	 *   An unlocked lock for the group to associate the requests with
 	 * @param {object|string} vGroupNodeOrPath
 	 *   The group node or its path relative to the cache; a group node instance (instead of a path)
 	 *   MUST only be given in case of "expanding" continued
+	 * @param {number} iLevels
+	 *   The number of levels to expand, <code>iLevels >= Number.MAX_SAFE_INTEGER</code> can be
+	 *   used to expand all levels
 	 * @param {function} [fnDataRequested]
 	 *   The function is called just before the back-end request is sent.
 	 *   If no back-end request is needed, the function is not called.
@@ -702,7 +703,8 @@ sap.ui.define([
 	 * @public
 	 * @see #collapse
 	 */
-	_AggregationCache.prototype.expand = function (oGroupLock, vGroupNodeOrPath, fnDataRequested) {
+	_AggregationCache.prototype.expand = function (oGroupLock, vGroupNodeOrPath, iLevels,
+			fnDataRequested) {
 		var iCount,
 			oGroupNode = typeof vGroupNodeOrPath === "string"
 				? this.getValue(vGroupNodeOrPath)
@@ -714,7 +716,7 @@ sap.ui.define([
 			// Note: this also prevents a 2nd expand of the same node
 			_Helper.updateAll(this.mChangeListeners, vGroupNodeOrPath, oGroupNode,
 				_AggregationHelper.getOrCreateExpandedObject(this.oAggregation, oGroupNode));
-			this.oTreeState.expand(oGroupNode);
+			this.oTreeState.expand(oGroupNode, iLevels);
 		} // else: no update needed!
 
 		if (aSpliced) {
@@ -743,7 +745,7 @@ sap.ui.define([
 					}
 				}
 				if (!_Helper.hasPrivateAnnotation(oElement, "placeholder")) {
-					if (aSpliced.$stale) {
+					if (aSpliced.$stale && !oElement["@$ui5.context.isSelected"]) {
 						that.turnIntoPlaceholder(oElement, sPredicate);
 					} else {
 						that.aElements.$byPredicate[sPredicate] = oElement;
@@ -761,7 +763,7 @@ sap.ui.define([
 			});
 			return SyncPromise.resolve(iCount);
 		}
-		if (this.bUnifiedCache) {
+		if (this.bUnifiedCache || iLevels > 1) {
 			return SyncPromise.resolve(-1); // refresh needed
 		}
 
@@ -997,6 +999,28 @@ sap.ui.define([
 					&& _Helper.getPrivateAnnotation(oNode, "parent") === oCache);
 	};
 
+	/**
+	 * Returns the index in <code>this.aElements</code> of the first in-place child of the given
+	 * parent node, or the first in-place root if no parent is given.
+	 *
+	 * @param {number} iParentIndex
+	 *   The parent node's index, or -1 if looking for a root node
+	 * @returns {number}
+	 *   The array index, or -1 if there is no such first in-place node
+	 *
+	 * @public
+	 */
+	_AggregationCache.prototype.get1stInPlaceChildIndex = function (iParentIndex) {
+		const iLevel = iParentIndex >= 0
+			? this.aElements[iParentIndex]["@$ui5.node.level"] + 1
+			: 1;
+
+		return this.aElements.findIndex(
+			(oElement, iIndex) => iIndex > iParentIndex
+				&& oElement["@$ui5.node.level"] === iLevel
+				&& oElement["@$ui5.context.isTransient"] === undefined);
+	};
+
 	/**
 	 * Returns an array containing all current elements of this aggregation cache's flat list; the
 	 * array is annotated with the collection's $count. If there are placeholders, the corresponding
@@ -1131,7 +1155,7 @@ sap.ui.define([
 
 	/**
 	 * Returns the index of the given node's sibling, either the next one (via offset +1) or the
-	 * previous one (via offset -1).
+	 * previous one (via offset -1), skipping out-of-place nodes.
 	 *
 	 * @param {number} iIndex - The index of a node
 	 * @param {number} iOffset - An offset, either -1 or +1
@@ -1169,8 +1193,16 @@ sap.ui.define([
 
 		if (iSiblingRank >= 0) {
 			const iSiblingIndex = this.findIndex(iSiblingRank, oCache);
+			if (iSiblingIndex < 0) {
+				return -1; // no such sibling
+			}
+			const oSibling = this.aElements[iSiblingIndex];
 			if (bSingleLevelCache && bAllowPlaceholder
-				|| !_Helper.hasPrivateAnnotation(this.aElements[iSiblingIndex], "placeholder")) {
+				|| !_Helper.hasPrivateAnnotation(oSibling, "placeholder")) {
+				if (oSibling["@$ui5.context.isTransient"] !== undefined) {
+					// sibling is out of place, skip it!
+					return this.getSiblingIndex(iSiblingIndex, iOffset, bAllowPlaceholder);
+				}
 				return iSiblingIndex; // sibling found
 			}
 		} // else: iSiblingRank === undefined => return undefined;
@@ -1345,7 +1377,7 @@ sap.ui.define([
 			mPredicates[sPredicate] = true;
 		});
 
-		return this.aElements.filter(function (oElement) {
+		return Object.values(this.aElements.$byPredicate).filter(function (oElement) {
 			var sPredicate = _Helper.getPrivateAnnotation(oElement, "predicate");
 
 			if (!sPredicate) {
@@ -1354,10 +1386,13 @@ sap.ui.define([
 
 			if (mPredicates[sPredicate]) {
 				_AggregationHelper.markSplicedStale(oElement);
+				mPredicates[sPredicate] = false;
 				return true; // keep and request
 			}
 
-			that.turnIntoPlaceholder(oElement, sPredicate);
+			if (!(sPredicate in mPredicates)) {
+				that.turnIntoPlaceholder(oElement, sPredicate);
+			}
 		});
 	};
 
@@ -1422,6 +1457,7 @@ sap.ui.define([
 		if (this.oTreeState.isOutOfPlace(sChildPredicate)) {
 			// remove OOP for all descendants (incl. itself) of a moved OOP node
 			this.oTreeState.deleteOutOfPlace(sChildPredicate);
+			delete oChildNode["@$ui5.context.isTransient"];
 			bRefreshNeeded = true;
 		}
 

package/src/sap/ui/model/odata/v4/lib/_AggregationHelper.js

@@ -1086,14 +1086,17 @@ sap.ui.define([
 					oNodeFilters.add(sNodeFilter);
 				});
 			});
+			const aSelect = [
+				oAggregation.$DistanceFromRoot,
+				oAggregation.$DrillState,
+				oAggregation.$LimitedRank
+			];
+			if (oAggregation.$LimitedDescendantCount) {
+				aSelect.push(oAggregation.$LimitedDescendantCount);
+			}
 			mQueryOptions = Object.assign({}, mQueryOptions, {
 				$filter : [...oNodeFilters].sort().join(" or "),
-				$select : [
-					oAggregation.$DistanceFromRoot,
-					oAggregation.$DrillState,
-					oAggregation.$LimitedDescendantCount,
-					oAggregation.$LimitedRank
-				],
+				$select : aSelect,
 				$top : oNodeFilters.size
 			});
 			delete mQueryOptions.$count;

package/src/sap/ui/model/odata/v4/lib/_Cache.js

@@ -122,7 +122,7 @@ sap.ui.define([
 	 */
 	_Cache.prototype._delete = function (oGroupLock, sEditUrl, sPath, oETagEntity, fnCallback) {
 		var aSegments = sPath.split("/"),
-			// either a :1 nav.prop, the index as string, or a key-predicate (kept-alive and hidden)
+			// either a :1 nav.prop, the index as string, or a key-predicate (kept alive and hidden)
 			sDeleteProperty = aSegments.pop(),
 			sParentPath = aSegments.join("/"),
 			that = this;
@@ -1418,7 +1418,7 @@ sap.ui.define([
 	 *   The key predicate of the entity; only evaluated if <code>iIndex</code> is undefined or
 	 *   negative
 	 * @param {boolean} [bKeepAlive]
-	 *   Whether the entity is kept-alive
+	 *   Whether the entity is kept alive
 	 * @param {boolean} [bWithMessages]
 	 *   Whether the "@com.sap.vocabularies.Common.v1.Messages" path is treated specially, supported
 	 *   only for <code>sPath === ""</code>
@@ -1494,7 +1494,7 @@ sap.ui.define([
 	 * Refreshes a single entity within a collection cache and removes it from the cache if the
 	 * filter does not match anymore.
 	 * Since 1.84.0, only removes entities that do not match the filter from the cache in case they
-	 * are not kept-alive. If the entity is kept-alive, checks also the existence and removes it
+	 * are not kept alive. If the entity is kept alive, checks also the existence and removes it
 	 * from the cache if it is no longer exists. For a kept-alive entity late properties are taken
 	 * into account.
 	 *
@@ -1507,14 +1507,14 @@ sap.ui.define([
 	 * @param {string} [sPredicate]
 	 *   The key predicate of the entity; only evaluated if the <code>iIndex === undefined</code>
 	 * @param {boolean} [bKeepAlive]
-	 *   Whether the entity is kept-alive
+	 *   Whether the entity is kept alive
 	 * @param {function} [fnDataRequested]
 	 *   The function is called just before the back-end request is sent.
 	 *   If no back-end request is needed, the function is not called.
 	 * @param {function} [fnOnRemove]
 	 *   A function which is called after the entity does not match the binding's filter anymore,
 	 *   see {@link sap.ui.model.odata.v4.ODataListBinding#filter}. Since 1.84.0, if the entity is
-	 *   kept-alive and still exists, the function is called with <code>true</code>, otherwise with
+	 *   kept alive and still exists, the function is called with <code>true</code>, otherwise with
 	 *   <code>false</code>
 	 * @returns {sap.ui.base.SyncPromise}
 	 *   A promise which resolves with <code>undefined</code> when the entity is updated in
@@ -2099,7 +2099,7 @@ sap.ui.define([
 	 *   The function is called just before a back-end request is sent for the first time.
 	 *   If no back-end request is needed, the function is not called.
 	 * @param {function} fnIsKeepAlive
-	 *   A function to tell whether the entity is kept-alive
+	 *   A function to tell whether the entity is kept alive
 	 * @returns {sap.ui.base.SyncPromise}
 	 *   A promise for the PATCH request (resolves with <code>undefined</code>); rejected in case of
 	 *   cancellation or if no <code>fnErrorCallback</code> is given
@@ -3543,7 +3543,7 @@ sap.ui.define([
 		mQueryOptions.$filter = aElements.map(function (oElement) {
 			// all elements have a key predicate, so we will get a key filter
 			return _Helper.getKeyFilter(oElement, that.sMetaPath, mTypeForMetaPath);
-		}).join(" or ");
+		}).sort().join(" or ");
 		if (aElements.length > 1) { // avoid small default page size for server-driven paging
 			mQueryOptions.$top = aElements.length;
 		}

package/src/sap/ui/model/odata/v4/lib/_Helper.js

@@ -1890,7 +1890,7 @@ sap.ui.define([
 		 * properties of the related entity type to the "$select" query options. Although this is
 		 * not needed in order to obtain the correct nested entity it enables
 		 * {@link sap.ui.model.odata.v4.Context#requestSideEffects}) to check the consistency of the
-		 * key predicates.
+		 * key predicate.
 		 *
 		 * @param {object} [mCacheQueryOptions]
 		 *   A map of query options as returned by
@@ -2358,7 +2358,7 @@ sap.ui.define([
 
 		/**
 		 * Returns a clone of the given value where all occurrences of the private namespace
-		 * object have been deleted.
+		 * object have been deleted. Also, properties starting with "$" are dropped from arrays.
 		 *
 		 * @param {any} vValue
 		 *   Any value, including <code>undefined</code>
@@ -2373,6 +2373,9 @@ sap.ui.define([
 		 * @see sap.ui.model.odata.v4.lib._Helper.clone
 		 */
 		publicClone : function (vValue, bRemoveClientAnnotations, bAsString) {
+			if (Array.isArray(vValue)) {
+				vValue = vValue.slice(); // drop "$*" properties
+			}
 			return _Helper.clone(vValue, function (sKey, vValue0) {
 				if (bRemoveClientAnnotations ? !sKey.startsWith("@$ui5.") : sKey !== "@$ui5._") {
 					return vValue0;
@@ -2688,7 +2691,7 @@ sap.ui.define([
 		 * taken into account. Fires change events for all changed properties. The function
 		 * recursively handles modified, added or removed structural properties (or single-valued
 		 * navigation properties) and fires change events for all modified/added/removed primitive
-		 * properties therein. It also fires for each collection encounterd, no matter if changed
+		 * properties therein. It also fires for each collection encountered, no matter if changed
 		 * or not.
 		 *
 		 * Restrictions:
@@ -2721,10 +2724,10 @@ sap.ui.define([
 					oTarget[sProperty] = vSourceProperty;
 					_Helper.fireChange(mChangeListeners, sPropertyPath, vSourceProperty);
 				} else if (vSourceProperty && typeof vSourceProperty === "object") {
-					oTarget[sProperty]
+					vTargetProperty = oTarget[sProperty]
 						= _Helper.updateAll(mChangeListeners, sPropertyPath, vTargetProperty || {},
 								vSourceProperty);
-					_Helper.fireChange(mChangeListeners, sPropertyPath, vSourceProperty);
+					_Helper.fireChange(mChangeListeners, sPropertyPath, vTargetProperty);
 				} else if (vTargetProperty !== vSourceProperty) {
 					oTarget[sProperty] = vSourceProperty;
 					if (vTargetProperty && typeof vTargetProperty === "object") {
@@ -2743,14 +2746,15 @@ sap.ui.define([
 		 * are updated. Fires change events for all changed properties. The function recursively
 		 * handles modified, added or removed structural properties and fires change events for all
 		 * modified/added/removed primitive properties therein. Also fires change events for new
-		 * advertised actions.
+		 * advertised actions. It also fires for each collection encountered, no matter if changed
+		 * or not.
 		 *
 		 * Restrictions:
 		 * - oOldObject and oNewObject are expected to have the same structure: when there is an
 		 *   object at a given path in either of them, the other one must have an object or
 		 *   <code>null</code>.
-		 * - no change events for collection-valued properties
-		 * - does not update collection-valued navigation properties
+		 * - does not update collection-valued navigation properties properly (ignores both key
+		 *   predicates and $count)
 		 *
 		 * @param {object} mChangeListeners A map of change listeners by path
 		 * @param {string} sPath The path of the old object in mChangeListeners
@@ -2772,14 +2776,15 @@ sap.ui.define([
 
 				if (sProperty in oNewObject || sProperty[0] === "#") {
 					if (Array.isArray(vNewProperty)) {
-						// copy complete collection; no change events as long as collection-valued
-						// properties are not supported
+						// copy complete collection
 						oOldObject[sProperty] = vNewProperty;
+						_Helper.fireChange(mChangeListeners, sPropertyPath, vNewProperty);
 					} else if (vNewProperty && typeof vNewProperty === "object") {
 						if (vOldProperty) {
 							// a structural property was modified
 							_Helper.updateExisting(mChangeListeners, sPropertyPath, vOldProperty,
 								vNewProperty);
+							_Helper.fireChange(mChangeListeners, sPropertyPath, vOldProperty);
 						} else {
 							// a structural property was added; copy the whole structure because we
 							// cannot tell which primitive properties are required therein
@@ -2948,7 +2953,8 @@ sap.ui.define([
 		 *   object at a given path in either of them, the other one must have an object or
 		 *   <code>null</code>.
 		 * - "*" in aSelect does not work correctly if oNewValue contains navigation properties
-		 * - does not update navigation properties (ignores both key predicates and $count)
+		 * - does not update collection-valued navigation properties properly (ignores both key
+		 *   predicates and $count)
 		 *
 		 * @param {object} mChangeListeners
 		 *   A map of change listeners by path

package/src/sap/ui/model/odata/v4/lib/_Requestor.js

@@ -822,9 +822,17 @@ sap.ui.define([
 					break;
 				case "$select":
 					if (Array.isArray(vValue)) {
-						vValue = bSortExpandSelect
-							? vValue.slice().sort().join(",") // Note: Array#sort is "in place"
-							: vValue.join(",");
+						if (bSortExpandSelect) {
+							vValue = vValue.slice().sort(); // Note: Array#sort is "in place"
+							for (let i = 1; i < vValue.length;) {
+								if (_Helper.hasPathPrefix(vValue[i], vValue[i - 1])) {
+									vValue.splice(i, 1);
+								} else {
+									i += 1;
+								}
+							}
+						}
+						vValue = vValue.join(",");
 					}
 					break;
 				default:

package/src/sap/ui/model/odata/v4/lib/_TreeState.js

@@ -57,7 +57,7 @@ sap.ui.define([
 
 			const sPredicate = _Helper.getPrivateAnnotation(oNode, "predicate");
 			const oExpandLevel = this.mPredicate2ExpandLevels[sPredicate];
-			if (oExpandLevel && oExpandLevel.Levels) {
+			if (oExpandLevel && oExpandLevel.Levels !== 0) {
 				delete this.mPredicate2ExpandLevels[sPredicate];
 			} else {
 				// must have NodeId as the node may be missing when calling #getExpandLevels
@@ -117,13 +117,16 @@ sap.ui.define([
 		}
 
 		/**
-		 * Expand a node.
+		 * Expand a node by the given number of levels.
 		 *
 		 * @param {object} oNode - The node
+		 * @param {number} [iLevels=1]
+		 *   The number of levels to expand, <code>iLevels >= Number.MAX_SAFE_INTEGER</code> can be
+		 *   used to expand all levels
 		 *
 		 * @public
 		 */
-		expand(oNode) {
+		expand(oNode, iLevels = 1) {
 			if (!this.sNodeProperty) {
 				return;
 			}
@@ -135,7 +138,10 @@ sap.ui.define([
 			} else {
 				// must have NodeId as the node may be missing when calling #getExpandLevels
 				const sNodeId = _Helper.drillDown(oNode, this.sNodeProperty);
-				this.mPredicate2ExpandLevels[sPredicate] = {NodeID : sNodeId, Levels : 1};
+				if (iLevels >= Number.MAX_SAFE_INTEGER) {
+					iLevels = null;
+				}
+				this.mPredicate2ExpandLevels[sPredicate] = {NodeID : sNodeId, Levels : iLevels};
 			}
 		}
 

package/src/sap/ui/model/resource/ResourceModel.js

@@ -227,7 +227,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Model
 	 * @public
-	 * @version 1.126.1
+	 * @version 1.127.0
 	 */
 	var ResourceModel = Model.extend("sap.ui.model.resource.ResourceModel", /** @lends sap.ui.model.resource.ResourceModel.prototype */ {
 

package/src/sap/ui/model/type/Boolean.js

@@ -19,7 +19,7 @@ sap.ui.define(["sap/ui/core/Lib", 'sap/ui/model/SimpleType', 'sap/ui/model/Forma
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.127.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Currency.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.127.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Date.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.127.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateInstance DateFormat}.

package/src/sap/ui/model/type/DateInterval.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.127.0
 	 *
 	 * @alias sap.ui.model.type.DateInterval
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/DateTime.js

@@ -19,7 +19,7 @@ sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.Date
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.127.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateTimeInstance DateFormat}.

package/src/sap/ui/model/type/DateTimeInterval.js

@@ -19,7 +19,7 @@ sap.ui.define(['./DateInterval', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.DateInterval
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.127.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateTimeInstance DateFormat}.