@openui5/sap.ui.core 1.127.1 → 1.129.0

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

@@ -1128,32 +1128,6 @@ sap.ui.define([
 	 * @public
 	 */
 
-	/**
-	 * Returns an array containing all current elements of a collection or single cache for the
-	 * given relative path; the array is annotated with the collection's $count. If there are
-	 * pending requests, the corresponding promises will be ignored and set to
-	 * <code>undefined</code>.
-	 *
-	 * @param {string} [sPath]
-	 *   Relative path to drill-down into, may be empty (only for collection cache)
-	 * @returns {object[]} The cache elements
-	 *
-	 * @public
-	 */
-	_Cache.prototype.getAllElements = function (sPath) {
-		var aAllElements;
-
-		if (sPath) {
-			return this.getValue(sPath);
-		}
-		aAllElements = this.aElements.map(function (oElement) {
-			return oElement instanceof SyncPromise ? undefined : oElement;
-		});
-		aAllElements.$count = this.aElements.$count;
-
-		return aAllElements;
-	};
-
 	/**
 	 * Returns the collection at the given path and removes it from the cache if it is marked as
 	 * transferable.
@@ -1242,6 +1216,34 @@ sap.ui.define([
 				this.getDownloadQueryOptions(mQueryOptions), false, true);
 	};
 
+	/**
+	 * Returns an array containing elements of a collection or single cache for the given relative
+	 * path; the array is annotated with the collection's $count. If no range is given, all elements
+	 * are returned. If there are pending requests, the corresponding promises will be ignored and
+	 * set to <code>undefined</code>.
+	 *
+	 * @param {string} [sPath]
+	 *   Relative path to drill-down into, may be empty (only for collection cache)
+	 * @param {number} [iStart]
+	 *   The start index of the range (inclusive)
+	 * @param {number} [iEnd]
+	 *   The end index of the range (exclusive)
+	 * @returns {object[]|undefined} The cache elements
+	 *
+	 * @public
+	 */
+	_Cache.prototype.getElements = function (sPath, iStart, iEnd) {
+		const aElements = this.getValue(sPath);
+		if (!aElements) {
+			return undefined;
+		}
+		const aFilteredElements = aElements.slice(iStart, iEnd)
+			.map((oElement) => (oElement instanceof SyncPromise ? undefined : oElement));
+		aFilteredElements.$count = aElements.$count;
+
+		return aFilteredElements;
+	};
+
 	/**
 	 * Returns the query options for late properties.
 	 *
@@ -1617,7 +1619,11 @@ sap.ui.define([
 						.reportStateMessages(that.sResourcePath, {}, [sPath + sPredicate]);
 					fnOnRemove(false);
 				} else if (bRemoveFromCollection) {
-					_Helper.copySelected(aElements.$byPredicate[sPredicate], aReadResult[0]);
+					const oOldElement = aElements.$byPredicate[sPredicate];
+					_Helper.copySelected(oOldElement, aReadResult[0]);
+					if ("@$ui5.context.isTransient" in oOldElement) {
+						aReadResult[0]["@$ui5.context.isTransient"] = false;
+					}
 					that.removeElement(iIndex, sPredicate, aElements, sPath);
 					// element no longer in cache -> re-insert via replaceElement
 					that.replaceElement(aElements, undefined, sPredicate, aReadResult[0],
@@ -2545,12 +2551,14 @@ sap.ui.define([
 	 *   The deep resource path to be used to build the target path for bound messages
 	 * @param {boolean} [bSharedRequest]
 	 *   If this parameter is set, the cache is read-only and modifying calls lead to an error.
+	 * @param {string[]} [aSeparateProperties]
+	 *   An array of properties which are requested separately
 	 *
 	 * @alias sap.ui.model.odata.v4.lib._CollectionCache
 	 * @constructor
 	 */
 	function _CollectionCache(oRequestor, sResourcePath, mQueryOptions, bSortExpandSelect,
-			sDeepResourcePath, bSharedRequest) {
+			sDeepResourcePath, bSharedRequest, aSeparateProperties) {
 		_Cache.call(this, oRequestor, sResourcePath, mQueryOptions, bSortExpandSelect,
 			sDeepResourcePath, bSharedRequest);
 
@@ -2563,6 +2571,8 @@ sap.ui.define([
 		// number of all (client-side) created elements (active or inactive)
 		this.aElements.$created = 0;
 		// this.aElements.$deleted = []; // only created on demand
+		// "select all", only created on demand
+		// this.aElements["@$ui5.context.isSelected"] = false;
 		this.aElements.$tail = undefined; // promise for a read w/o $top
 		// upper limit for @odata.count, maybe sharp; assumes #getQueryString can $filter out all
 		// created elements
@@ -2572,6 +2582,7 @@ sap.ui.define([
 		// - iStart: the start (inclusive)
 		// - iEnd: the end (exclusive)
 		this.aReadRequests = [];
+		this.aSeparateProperties = aSeparateProperties ?? []; // properties to be loaded separately
 		this.bServerDrivenPaging = false;
 		this.oSyncPromiseAll = undefined;
 	}
@@ -2712,6 +2723,8 @@ sap.ui.define([
 			that = this;
 
 		oGroupLock.unlock();
+		that.registerChangeListener(sPath, oListener);
+
 		if (this.aElements.$byPredicate[sFirstSegment]) {
 			oSyncPromise = SyncPromise.resolve(); // sync access possible
 		} else if ((oGroupLock === _GroupLock.$cached || sFirstSegment !== "$count")
@@ -2731,17 +2744,14 @@ sap.ui.define([
 		}
 
 		return oSyncPromise.then(function () {
-			// register afterwards to avoid that updateExisting fires updates before the first
-			// response
-			that.registerChangeListener(sPath, oListener);
 			return that.drillDown(that.aElements, sPath, oGroupLock, bCreateOnDemand);
 		});
 	};
 
 	/**
-	 * Fills the given range of currently available elements with the given promise. If it is not
-	 * an option to enlarge the array to accommodate <code>iEnd - 1</code>, the promise is also
-	 * stored in <code>aElements.$tail</code>.
+	 * Fills the given range of currently available elements with the given promise. If the
+	 * collection count is unknown and it is not an option to enlarge the array to accommodate
+	 * <code>iEnd - 1</code>, the promise is stored in <code>aElements.$tail</code>.
 	 *
 	 * @param {sap.ui.base.SyncPromise} oPromise
 	 *   The promise
@@ -2749,13 +2759,19 @@ sap.ui.define([
 	 *   The start index
 	 * @param {number} iEnd
 	 *   The end index (will not be filled)
+	 * @throws {Error}
+	 *   If the array cannot be filled and the promise was stored in <code>aElements.$tail</code> in
+	 *   a previous call already
 	 *
 	 * @private
 	 */
 	_CollectionCache.prototype.fill = function (oPromise, iStart, iEnd) {
 		var i;
 
-		if (iEnd > this.aElements.length && iEnd - iStart > 1024) {
+		// iEnd = Infinity is not an issue here. If $count is known, it is taken care of that iEnd
+		// is never higher than $count (using iLimit) @see #read, @see ODataUtils#_getReadIntervals.
+		// If not, iEnd is reduced to this.aElements.length here.
+		if (!this.aElements.$count && iEnd > this.aElements.length && iEnd - iStart > 1024) {
 			if (this.aElements.$tail && oPromise) {
 				throw new Error("Cannot fill from " + iStart + " to " + iEnd
 					+ ", $tail already in use, # of elements is " + this.aElements.length);
@@ -2822,6 +2838,18 @@ sap.ui.define([
 			sFilterOptions = mQueryOptions.$filter,
 			sQueryString = this.sQueryString;
 
+		if (this.aSeparateProperties.length) {
+			mQueryOptions.$expand = {...mQueryOptions.$expand};
+			this.aSeparateProperties.forEach((sProperty) => {
+				delete mQueryOptions.$expand[sProperty];
+			});
+			if (_Helper.isEmptyObject(mQueryOptions.$expand)) {
+				delete mQueryOptions.$expand;
+			}
+			sQueryString = this.oRequestor.buildQueryString(this.sMetaPath, mQueryOptions, false,
+				this.bSortExpandSelect, true);
+		}
+
 		if (sExclusiveFilter) {
 			if (sFilterOptions) {
 				mQueryOptions.$filter = "(" + sFilterOptions + ") and " + sExclusiveFilter;
@@ -3520,6 +3548,26 @@ sap.ui.define([
 			mTypeForMetaPath = this.getTypes(),
 			that = this;
 
+		/*
+		 * Handles the response for a single element.
+		 *
+		 * @param {object} oElement - The response for a single element
+		 * @param {string} [sPredicate] - The element's key predicate
+		 */
+		function handle(oElement,
+				sPredicate = _Helper.getPrivateAnnotation(oElement, "predicate")) {
+			that.beforeUpdateSelected?.(sPredicate, oElement);
+			_Helper.updateSelected(that.mChangeListeners, sPredicate,
+				that.aElements.$byPredicate[sPredicate], oElement, aPaths,
+				function preventKeyPredicateChange(sPath) {
+					sPath = sPath.slice(sPredicate.length + 1); // strip sPredicate
+					// not (below) a $NavigationPropertyPath?
+					return !aPaths.some(function (sSideEffectPath) {
+						return _Helper.getRelativePath(sPath, sSideEffectPath) !== undefined;
+					});
+				});
+		}
+
 		this.checkSharedRequest();
 
 		mQueryOptions = _Helper.intersectQueryOptions(
@@ -3528,31 +3576,29 @@ sap.ui.define([
 		if (!mQueryOptions) {
 			return SyncPromise.resolve(); // micro optimization: use *sync.* promise which is cached
 		}
-		if (this.beforeRequestSideEffects) {
-			this.beforeRequestSideEffects(mQueryOptions);
-		}
+		this.beforeRequestSideEffects?.(mQueryOptions);
 
+		delete mQueryOptions.$count;
+		delete mQueryOptions.$orderby;
+		delete mQueryOptions.$search;
 		if (bSingle) {
-			aElements = [this.aElements.$byPredicate[aPredicates[0]]];
+			delete mQueryOptions.$filter;
 		} else {
 			aElements = this.keepOnlyGivenElements(aPredicates);
 			if (!aElements.length) {
 				return SyncPromise.resolve(); // micro optimization: use cached *sync.* promise
 			}
+			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);
+			}).sort().join(" or ");
+			if (aElements.length > 1) { // avoid small default page size for server-driven paging
+				mQueryOptions.$top = aElements.length;
+			}
+			_Helper.selectKeyProperties(mQueryOptions, mTypeForMetaPath[this.sMetaPath]);
 		}
-		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);
-		}).sort().join(" or ");
-		if (aElements.length > 1) { // avoid small default page size for server-driven paging
-			mQueryOptions.$top = aElements.length;
-		}
-		_Helper.selectKeyProperties(mQueryOptions, mTypeForMetaPath[this.sMetaPath]);
-		delete mQueryOptions.$count;
-		delete mQueryOptions.$orderby;
-		delete mQueryOptions.$search;
 		mMergeableQueryOptions = _Helper.extractMergeableQueryOptions(mQueryOptions);
-		sResourcePath = this.sResourcePath
+		sResourcePath = this.sResourcePath + (bSingle ? aPredicates[0] : "")
 			+ this.oRequestor.buildQueryString(this.sMetaPath, mQueryOptions, false, true);
 
 		return this.oRequestor.request("GET", sResourcePath, oGroupLock, undefined, undefined,
@@ -3565,36 +3611,25 @@ sap.ui.define([
 						return aPaths;
 					}
 			}).then(function (oResult) {
-				var oElement, sPredicate, i, n;
-
-				function preventKeyPredicateChange(sPath) {
-					sPath = sPath.slice(sPredicate.length + 1); // strip sPredicate
-					// not (below) a $NavigationPropertyPath?
-					return !aPaths.some(function (sSideEffectPath) {
-						return _Helper.getRelativePath(sPath, sSideEffectPath) !== undefined;
-					});
-				}
-
 				if (bSkip) {
 					return;
 				}
 
-				if (oResult.value.length !== aElements.length) {
-					throw new Error("Expected " + aElements.length + " row(s), but instead saw "
-						+ oResult.value.length);
-				}
-				// Note: iStart makes no sense here (use NaN instead), but is not needed because
-				// we know we have key predicates
-				that.visitResponse(oResult, mTypeForMetaPath, undefined, "", NaN, true);
-				for (i = 0, n = oResult.value.length; i < n; i += 1) {
-					oElement = oResult.value[i];
-					sPredicate = _Helper.getPrivateAnnotation(oElement, "predicate");
-					if (that.beforeUpdateSelected) {
-						that.beforeUpdateSelected(sPredicate, oElement);
+				if (bSingle) {
+					that.visitResponse(oResult, mTypeForMetaPath, undefined, aPredicates[0],
+						undefined, true);
+					handle(oResult, aPredicates[0]);
+				} else {
+					if (oResult.value.length !== aElements.length) {
+						throw new Error("Expected " + aElements.length + " row(s), but instead saw "
+							+ oResult.value.length);
+					}
+					// Note: iStart makes no sense here (use NaN instead), but is not needed because
+					// we know we have key predicates
+					that.visitResponse(oResult, mTypeForMetaPath, undefined, "", NaN, true);
+					for (let i = 0, n = oResult.value.length; i < n; i += 1) {
+						handle(oResult.value[i]);
 					}
-					_Helper.updateSelected(that.mChangeListeners, sPredicate,
-						that.aElements.$byPredicate[sPredicate], oElement, aPaths,
-						preventKeyPredicateChange);
 				}
 			});
 	};
@@ -3862,8 +3897,9 @@ sap.ui.define([
 				this.sResourcePath + this.sQueryString, oGroupLock, undefined, undefined,
 				fnDataRequested, undefined, this.sMetaPath));
 		}
+		that.registerChangeListener("", oListener);
+
 		return this.oPromise.then(function (oResult) {
-			that.registerChangeListener("", oListener);
 			// Note: For a null value, null is returned due to "204 No Content". For $count,
 			// "a simple primitive integer value with media type text/plain" is returned.
 			return oResult && typeof oResult === "object" ? oResult.value : oResult;
@@ -3991,6 +4027,7 @@ sap.ui.define([
 		var sResourcePath = this.sResourcePath + this.sQueryString,
 			that = this;
 
+		this.registerChangeListener(sPath, oListener);
 		if (this.oPromise) {
 			oGroupLock.unlock();
 		} else {
@@ -4013,7 +4050,6 @@ sap.ui.define([
 			if (oResult && oResult["$ui5.deleted"]) {
 				throw new Error("Cannot read a deleted entity");
 			}
-			that.registerChangeListener(sPath, oListener);
 			return that.drillDown(oResult, sPath, oGroupLock, bCreateOnDemand);
 		});
 	};
@@ -4407,13 +4443,15 @@ sap.ui.define([
 	 *   If this parameter is set, multiple requests for a cache using the same resource path will
 	 *   always return the same, shared cache. This cache is read-only, modifying calls lead to an
 	 *   error.
+	 * @param {string[]} [aSeparateProperties]
+	 *   An array of properties which are requested separately
 	 * @returns {sap.ui.model.odata.v4.lib._Cache}
 	 *   The cache
 	 *
 	 * @public
 	 */
 	_Cache.create = function (oRequestor, sResourcePath, mQueryOptions, bSortExpandSelect,
-			sDeepResourcePath, bSharedRequest) {
+			sDeepResourcePath, bSharedRequest, aSeparateProperties) {
 		var iCount, aKeys, sPath, oSharedCollectionCache, mSharedCollectionCacheByPath;
 
 		if (bSharedRequest) {
@@ -4450,7 +4488,7 @@ sap.ui.define([
 		}
 
 		return new _CollectionCache(oRequestor, sResourcePath, mQueryOptions, bSortExpandSelect,
-				sDeepResourcePath);
+				sDeepResourcePath, bSharedRequest, aSeparateProperties);
 	};
 
 	/**

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

@@ -2230,9 +2230,11 @@ sap.ui.define([
 		 * @param {string} [sOrderby]
 		 *   The new value for the query option "$orderby"
 		 * @param {string[]} [aFilters]
-		 *   An array that consists of two filters, the first one ("$filter") has to be be applied
-		 *   after and the second one ("$$filterBeforeAggregate") has to be applied before
-		 *   aggregating the data. Both can be <code>undefined</code>.
+		 *   An array that consists of three filters where each can be <code>undefined</code>. The
+		 *   first one ("$filter") has to be applied after data aggregation. The second one
+		 *   ("$$filterBeforeAggregate") can be applied before data aggregation. The third one
+		 *   ("$$filterOnAggregate") has to be applied before data aggregation and already contains
+		 *   the special syntax "$these/aggregate(...)" because it relates to aggregates.
 		 * @returns {object}
 		 *   The merged map of query options
 		 *
@@ -2242,8 +2244,8 @@ sap.ui.define([
 			var mResult;
 
 			function set(sProperty, sValue) {
-				if (sValue && (!mQueryOptions || mQueryOptions[sProperty] !== sValue)) {
-					mResult ??= mQueryOptions ? _Helper.clone(mQueryOptions) : {};
+				if (sValue && mQueryOptions?.[sProperty] !== sValue) {
+					mResult ??= {...mQueryOptions};
 					mResult[sProperty] = sValue;
 				}
 			}
@@ -2252,6 +2254,7 @@ sap.ui.define([
 			if (aFilters) {
 				set("$filter", aFilters[0]);
 				set("$$filterBeforeAggregate", aFilters[1]);
+				set("$$filterOnAggregate", aFilters[2]);
 			}
 			return mResult || mQueryOptions;
 		},
@@ -2498,9 +2501,9 @@ sap.ui.define([
 		 * Searches all properties in oOld annotated with "@$ui5.updating" and restores the property
 		 * value in oNew.
 		 *
-		 * @param {object} oOld
+		 * @param {object} [oOld]
 		 *   The old element
-		 * @param {object} oNew
+		 * @param {object} [oNew]
 		 *   The new element
 		 * @returns {object}
 		 *   The new element with the restored properties

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

@@ -91,6 +91,7 @@ sap.ui.define([
 		this.oModelInterface = oModelInterface;
 		this.oOptimisticBatch = null; // optimistic batch processing off
 		this.sQueryParams = _Helper.buildQuery(mQueryParams); // Used for $batch and CSRF token only
+		this.oRetryAfterPromise = null;
 		this.mRunningChangeRequests = {}; // map from group ID to a SyncPromise[]
 		this.iSessionTimer = 0;
 		this.iSerialNumber = 0;
@@ -1396,7 +1397,7 @@ sap.ui.define([
 						// methods it must be possible to insert the ETag from the header
 						oResponse = vRequest.method === "GET" ? null : {};
 					}
-					that.reportHeaderMessages(vRequest.url,
+					that.reportHeaderMessages(vRequest.$resourcePath,
 						getResponseHeader.call(vResponse, "sap-messages"));
 					sETag = getResponseHeader.call(vResponse, "ETag");
 					if (sETag) {
@@ -1425,6 +1426,7 @@ sap.ui.define([
 					"HTTP request was not processed because $batch failed");
 
 				oRequestError.cause = oError;
+				oRequestError.$reported = oError.$reported;
 				reject(oRequestError, aRequests);
 				throw oError;
 			}).finally(function () {
@@ -1891,7 +1893,9 @@ sap.ui.define([
 					aRequests[iChangeSetNo].push(oRequest);
 				}
 				if (sGroupId === "$single") {
-					that.submitBatch("$single");
+					that.submitBatch("$single").catch(() => {
+						// nothing to do, see "HTTP request was not processed because $batch failed"
+					});
 				}
 			});
 			oRequest.$promise = oPromise;
@@ -1913,7 +1917,7 @@ sap.ui.define([
 				sMethod === "GET" ? {"sap-cancel-on-close" : "true"} : undefined),
 			JSON.stringify(oPayload), sOriginalResourcePath
 		).then(function (oResponse) {
-			that.reportHeaderMessages(oResponse.resourcePath, oResponse.messages);
+			that.reportHeaderMessages(sOriginalResourcePath, oResponse.messages);
 			return that.doConvertResponse(
 				// Note: "text/plain" used for $count
 				typeof oResponse.body === "string" ? JSON.parse(oResponse.body) : oResponse.body,
@@ -2072,6 +2076,22 @@ sap.ui.define([
 						that.refreshSecurityToken(sOldCsrfToken).then(function () {
 							send(true);
 						}, fnReject);
+					} else if (jqXHR.status === 503 && jqXHR.getResponseHeader("Retry-After")
+							&& (that.oRetryAfterPromise
+								|| that.oModelInterface.getRetryAfterHandler())) {
+						if (!that.oRetryAfterPromise) {
+							const oRetryAfterError = _Helper.createError(jqXHR, "");
+							that.oRetryAfterPromise = that.oModelInterface.getRetryAfterHandler()(
+								oRetryAfterError);
+							that.oRetryAfterPromise.finally(() => {
+								that.oRetryAfterPromise = null;
+							}).catch(() => { /* catch is only needed due to finally */ });
+							that.oRetryAfterPromise.catch((oError) => {
+								// own error reason is not reported to the message model
+								oError.$reported = oError !== oRetryAfterError;
+							});
+						}
+						that.oRetryAfterPromise.then(send, fnReject);
 					} else {
 						sMessage = "Communication error";
 						if (sContextId) {
@@ -2091,7 +2111,9 @@ sap.ui.define([
 				});
 			}
 
-			if (that.oSecurityTokenPromise && sMethod !== "GET") {
+			if (that.oRetryAfterPromise) {
+				that.oRetryAfterPromise.then(send, fnReject);
+			} else if (that.oSecurityTokenPromise && sMethod !== "GET") {
 				that.oSecurityTokenPromise.then(send);
 			} else {
 				send();
@@ -2309,6 +2331,9 @@ sap.ui.define([
 	 *   A catch handler function expecting an <code>Error</code> instance. This function will call
 	 *   {@link sap.ui.model.odata.v4.ODataModel#reportError} if the error has not been reported
 	 *   yet
+	 * @param {function} oModelInterface.getRetryAfterHandler
+	 *   A function that returns the "Retry-After" handler,
+	 *   see also {@link sap.ui.model.odata.v4.ODataModel#setRetryAfterHandler}
 	 * @param {function():boolean} oModelInterface.isIgnoreETag
 	 *   Tells whether an entity's ETag should be actively ignored (If-Match:*) for PATCH requests.
 	 * @param {function} oModelInterface.onCreateGroup

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

@@ -47,22 +47,29 @@ sap.ui.define([
 		 * Collapse a node.
 		 *
 		 * @param {object} oNode - The node
-		 *
+		 * @param {boolean} bAll
+		 *   Whether collapsing completely
+		 * @param {boolean} [bNested]
+		 *   Whether the "collapse all" was performed at an ancestor
 		 * @public
 		 */
-		collapse(oNode) {
+		collapse(oNode, bAll, bNested) {
 			if (!this.sNodeProperty) {
 				return;
 			}
 
 			const sPredicate = _Helper.getPrivateAnnotation(oNode, "predicate");
 			const oExpandLevel = this.mPredicate2ExpandLevels[sPredicate];
-			if (oExpandLevel && oExpandLevel.Levels !== 0) {
+			if (bNested || oExpandLevel && oExpandLevel.levels !== 0) {
 				delete this.mPredicate2ExpandLevels[sPredicate];
 			} else {
-				// must have NodeId as the node may be missing when calling #getExpandLevels
+				// must determine node ID now; the node may be missing when calling #getExpandLevels
 				const sNodeId = _Helper.drillDown(oNode, this.sNodeProperty);
-				this.mPredicate2ExpandLevels[sPredicate] = {NodeID : sNodeId, Levels : 0};
+				this.mPredicate2ExpandLevels[sPredicate] = {
+					collapseAll : bAll,
+					levels : 0,
+					nodeId : sNodeId
+				};
 			}
 		}
 
@@ -87,6 +94,20 @@ sap.ui.define([
 			});
 		}
 
+		/**
+		 * Deletes the expand levels for the given node and all its descendants.
+		 *
+		 * @param {object} oNode - The node
+		 *
+		 * @private
+		 */
+		deleteExpandLevels(oNode) {
+			delete this.mPredicate2ExpandLevels[_Helper.getPrivateAnnotation(oNode, "predicate")];
+			_Helper.getPrivateAnnotation(oNode, "spliced", []).forEach((oChild) => {
+				this.deleteExpandLevels(oChild);
+			});
+		}
+
 		/**
 		 * Deletes a node and all its descendants from the out-of-place list (making them in-place).
 		 *
@@ -108,6 +129,7 @@ sap.ui.define([
 					sPredicate = sParentPredicate;
 				}
 			}
+			this.mPredicate2OutOfPlace[sPredicate].context.setOutOfPlace(false);
 			delete this.mPredicate2OutOfPlace[sPredicate];
 			Object.values(this.mPredicate2OutOfPlace).forEach((oOutOfPlace) => {
 				if (oOutOfPlace.parentPredicate === sPredicate) {
@@ -131,17 +153,18 @@ sap.ui.define([
 				return;
 			}
 
+			if (iLevels >= Number.MAX_SAFE_INTEGER) {
+				iLevels = null;
+				this.deleteExpandLevels(oNode);
+			}
 			const sPredicate = _Helper.getPrivateAnnotation(oNode, "predicate");
 			const oExpandLevel = this.mPredicate2ExpandLevels[sPredicate];
-			if (oExpandLevel && !oExpandLevel.Levels) {
+			if (oExpandLevel && !oExpandLevel.levels && !oExpandLevel.collapseAll) {
 				delete this.mPredicate2ExpandLevels[sPredicate];
 			} else {
-				// must have NodeId as the node may be missing when calling #getExpandLevels
+				// must determine node ID now; the node may be missing when calling #getExpandLevels
 				const sNodeId = _Helper.drillDown(oNode, this.sNodeProperty);
-				if (iLevels >= Number.MAX_SAFE_INTEGER) {
-					iLevels = null;
-				}
-				this.mPredicate2ExpandLevels[sPredicate] = {NodeID : sNodeId, Levels : iLevels};
+				this.mPredicate2ExpandLevels[sPredicate] = {levels : iLevels, nodeId : sNodeId};
 			}
 		}
 
@@ -155,7 +178,12 @@ sap.ui.define([
 		 */
 		getExpandLevels() {
 			const aExpandLevels = Object.values(this.mPredicate2ExpandLevels);
-			return aExpandLevels.length ? JSON.stringify(aExpandLevels) : undefined;
+			return aExpandLevels.length
+				? JSON.stringify(aExpandLevels.map((oExpandLevel) => {
+						// build the server representation
+						return {NodeID : oExpandLevel.nodeId, Levels : oExpandLevel.levels};
+					}))
+				: undefined;
 		}
 
 		/**
@@ -247,28 +275,50 @@ sap.ui.define([
 		 * @public
 		 */
 		resetOutOfPlace() {
-			this.mPredicate2OutOfPlace = {};
+			this.getOutOfPlacePredicates()
+				.forEach((sPredicate) => this.deleteOutOfPlace(sPredicate));
 		}
 
 		/**
-		 * Makes the node out of place.
+		 * Makes the ("created persisted"!) node out of place.
 		 *
 		 * @param {object} oNode - The node
 		 * @param {object} [oParent] - The parent, unless the node is a root
+		 * @throws {Error} If the node is not 'created persisted'
 		 *
 		 * @public
 		 */
 		setOutOfPlace(oNode, oParent) {
+			if (oNode["@$ui5.context.isTransient"] !== false) {
+				throw new Error("Not 'created persisted'");
+			}
 			const oOutOfPlace = {
+				context : _Helper.getPrivateAnnotation(oNode, "context"),
 				nodeFilter : this.fnGetKeyFilter(oNode),
 				nodePredicate : _Helper.getPrivateAnnotation(oNode, "predicate")
 			};
+			oOutOfPlace.context.setOutOfPlace(true);
 			if (oParent) {
 				oOutOfPlace.parentFilter = this.fnGetKeyFilter(oParent);
 				oOutOfPlace.parentPredicate = _Helper.getPrivateAnnotation(oParent, "predicate");
 			}
 			this.mPredicate2OutOfPlace[oOutOfPlace.nodePredicate] = oOutOfPlace;
 		}
+
+		/**
+		 * The given node is still out of place and thus must keep a client-side annotation
+		 * <code>"@$ui5.context.isTransient"</code> as well as a private annotation "context".
+		 *
+		 * @param {object} oNode - The node
+		 * @param {string} sPredicate - The node's key predicate
+		 *
+		 * @public
+		 */
+		stillOutOfPlace(oNode, sPredicate) {
+			oNode["@$ui5.context.isTransient"] = false;
+			_Helper.setPrivateAnnotation(oNode, "context",
+				this.mPredicate2OutOfPlace[sPredicate].context);
+		}
 	}
 
 	return _TreeState;

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

@@ -227,7 +227,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Model
 	 * @public
-	 * @version 1.127.1
+	 * @version 1.129.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.127.1
+	 * @version 1.129.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.127.1
+	 * @version 1.129.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]