@openui5/sap.ui.core 1.118.0 → 1.119.1

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

@@ -792,8 +792,10 @@ sap.ui.define([
 			return SyncPromise.resolve(sResolvedChildPath);
 		}
 
+		// A binding w/o cache must skip this optimization and pass on to the parent binding;
+		// otherwise late properties might be missing later
 		oCanUseCachePromise = this.mCanUseCachePromiseByChildPath[sChildPath];
-		if (oCanUseCachePromise && bIsProperty) {
+		if (bIsProperty && this.oCache !== null && oCanUseCachePromise) {
 			return oCanUseCachePromise.then(function (sOldReducedPath) {
 				if (!sOldReducedPath) {
 					return undefined;
@@ -905,7 +907,7 @@ sap.ui.define([
 			}
 			return sReducedPath;
 		});
-		if (bIsProperty && !oContext.getPath().includes("($uid=")) {
+		if (bIsProperty && this.oCache !== null && !oContext.getPath().includes("($uid=")) {
 			this.mCanUseCachePromiseByChildPath[sChildPath] = oCanUseCachePromise;
 		}
 		this.aChildCanUseCachePromises.push(oCanUseCachePromise);

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

@@ -6,6 +6,7 @@
 
 //Provides class sap.ui.model.odata.v4.ODataPropertyBinding
 sap.ui.define([
+	"./Context",
 	"./ODataBinding",
 	"./lib/_Cache",
 	"./lib/_Helper",
@@ -13,9 +14,8 @@ sap.ui.define([
 	"sap/ui/base/SyncPromise",
 	"sap/ui/model/BindingMode",
 	"sap/ui/model/ChangeReason",
-	"sap/ui/model/odata/v4/Context",
 	"sap/ui/model/PropertyBinding"
-], function (asODataBinding, _Cache, _Helper, Log, SyncPromise, BindingMode, ChangeReason, Context,
+], function (Context, asODataBinding, _Cache, _Helper, Log, SyncPromise, BindingMode, ChangeReason,
 		PropertyBinding) {
 	"use strict";
 	/*eslint max-nested-callbacks: 0 */
@@ -42,7 +42,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.118.0
+		 * @version 1.119.1
 		 * @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
@@ -118,8 +118,8 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.base.Event} oEvent
 	 *    The event object
-	 * @param {object} oEvent.getParameters
-	 *    Object containing all event parameters
+	 * @param {function():Object<any>} oEvent.getParameters
+	 *   Function which returns an object containing all event parameters
 	 * @param {sap.ui.model.ChangeReason} oEvent.getParameters.reason
 	 *   The reason for the 'change' event could be
 	 *   <ul>
@@ -157,8 +157,8 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.base.Event} oEvent
 	 *    The event object
-	 * @param {object} oEvent.getParameters
-	 *    Object containing all event parameters
+	 * @param {function():Object<any>} oEvent.getParameters
+	 *   Function which returns an object containing all event parameters
 	 * @param {object} [oEvent.getParameters.data]
 	 *   An empty data object if a back-end request succeeds
 	 * @param {Error} [oEvent.getParameters.error] The error object if a back-end request failed.
@@ -368,12 +368,9 @@ sap.ui.define([
 	 * @private
 	 */
 	ODataPropertyBinding.prototype.deregisterChangeListener = function () {
-		var that = this;
-
-		this.withCache(function (_oCache, sPath, oBinding) {
-				oBinding.doDeregisterChangeListener(sPath, that);
-			}, /*sPath*/"", /*bSync*/false, /*bWithOrWithoutCache*/true)
-			.catch(this.oModel.getReporter());
+		if (this.sReducedPath) {
+			this.doDeregisterChangeListener(this.sReducedPath, this);
+		}
 	};
 
 	/**

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

@@ -14,8 +14,8 @@ sap.ui.define([
 	"./_MinMaxHelper",
 	"sap/base/Log",
 	"sap/ui/base/SyncPromise"
-], function (_AggregationHelper, _Cache, _ConcatHelper, _GroupLock, _Helper, _MinMaxHelper,
-		Log, SyncPromise) {
+], function (_AggregationHelper, _Cache, _ConcatHelper, _GroupLock, _Helper, _MinMaxHelper, Log,
+		SyncPromise) {
 	"use strict";
 
 	//*********************************************************************************************
@@ -120,7 +120,7 @@ sap.ui.define([
 	// make _AggregationCache a _Cache, but actively disinherit some critical methods
 	_AggregationCache.prototype = Object.create(_Cache.prototype);
 	_AggregationCache.prototype.addTransientCollection = null;
-	_AggregationCache.prototype.getAndRemoveValue = null;
+	_AggregationCache.prototype.getAndRemoveCollection = null;
 
 	/**
 	 * Deletes an entity on the server and in the cached data.
@@ -191,6 +191,7 @@ sap.ui.define([
 					iFlatIndex = iParentIndex + iIndex + 1;
 					this.restoreElement(this.aElements, iFlatIndex, oElement, "");
 					this.shiftIndex(iFlatIndex, iOffset);
+					_Helper.setPrivateAnnotation(oElement, "index", iIndex);
 				}
 				fnCallback(iFlatIndex, iOffset);
 			});
@@ -332,6 +333,8 @@ sap.ui.define([
 
 		function collapse(j) {
 			delete aElements.$byPredicate[_Helper.getPrivateAnnotation(aElements[j], "predicate")];
+			delete aElements.$byPredicate[
+				_Helper.getPrivateAnnotation(aElements[j], "transientPredicate")];
 			iCount += 1;
 		}
 
@@ -497,13 +500,14 @@ sap.ui.define([
 			});
 		}
 		if (oGroupNode) {
+			const sParentFilter = _Helper.getPrivateAnnotation(oGroupNode, "filter")
+				|| _Helper.getKeyFilter(oGroupNode, oAggregation.$metaPath, this.getTypes());
 			// Note: parent filter is just eq/and, no need for parentheses, but
 			// $$filterBeforeAggregate is a black box! Put specific filter 1st for performance!
-			mQueryOptions.$$filterBeforeAggregate
-				= _Helper.getPrivateAnnotation(oGroupNode, "filter")
-					+ (mQueryOptions.$$filterBeforeAggregate
-						? " and (" + mQueryOptions.$$filterBeforeAggregate + ")"
-						: "");
+			mQueryOptions.$$filterBeforeAggregate = sParentFilter
+				+ (mQueryOptions.$$filterBeforeAggregate
+					? " and (" + mQueryOptions.$$filterBeforeAggregate + ")"
+					: "");
 		}
 		if (!bHasConcatHelper) {
 			// Note: UI5__count currently handled only by _ConcatHelper!
@@ -538,15 +542,11 @@ sap.ui.define([
 	 * @see #collapse
 	 */
 	_AggregationCache.prototype.expand = function (oGroupLock, vGroupNodeOrPath, fnDataRequested) {
-		var oCache,
-			iCount,
-			aElements = this.aElements,
+		var iCount,
 			oGroupNode = typeof vGroupNodeOrPath === "string"
 				? this.getValue(vGroupNodeOrPath)
 				: vGroupNodeOrPath,
-			iIndex,
 			aSpliced = _Helper.getPrivateAnnotation(oGroupNode, "spliced"),
-			bStale,
 			that = this;
 
 		if (vGroupNodeOrPath !== oGroupNode) {
@@ -557,20 +557,20 @@ sap.ui.define([
 
 		if (aSpliced) {
 			_Helper.deletePrivateAnnotation(oGroupNode, "spliced");
-			bStale = aSpliced.$stale;
-
-			iIndex = aElements.indexOf(oGroupNode) + 1;
+			const aOldElements = this.aElements;
+			const iIndex = aOldElements.indexOf(oGroupNode) + 1;
 			// insert aSpliced at iIndex
-			this.aElements = aElements.concat(aSpliced, aElements.splice(iIndex));
-			this.aElements.$byPredicate = aElements.$byPredicate;
-
+			this.aElements = aOldElements.concat(aSpliced, aOldElements.splice(iIndex));
+			this.aElements.$byPredicate = aOldElements.$byPredicate;
 			iCount = aSpliced.length;
-			this.aElements.$count = aElements.$count + iCount;
+			this.aElements.$count = aOldElements.$count + iCount;
+			const iDiff = oGroupNode["@$ui5.node.level"] + 1 - aSpliced[0]["@$ui5.node.level"];
 			aSpliced.forEach(function (oElement) {
 				var sPredicate = _Helper.getPrivateAnnotation(oElement, "predicate");
 
+				oElement["@$ui5.node.level"] += iDiff;
 				if (!_Helper.hasPrivateAnnotation(oElement, "placeholder")) {
-					if (bStale) {
+					if (aSpliced.$stale) {
 						that.turnIntoPlaceholder(oElement, sPredicate);
 					} else {
 						that.aElements.$byPredicate[sPredicate] = oElement;
@@ -584,7 +584,7 @@ sap.ui.define([
 			return SyncPromise.resolve(iCount);
 		}
 
-		oCache = _Helper.getPrivateAnnotation(oGroupNode, "cache");
+		let oCache = _Helper.getPrivateAnnotation(oGroupNode, "cache");
 		if (!oCache) {
 			oCache = this.createGroupLevelCache(oGroupNode);
 			_Helper.setPrivateAnnotation(oGroupNode, "cache", oCache);
@@ -833,6 +833,87 @@ sap.ui.define([
 		});
 	};
 
+	/**
+	 * Moves the (child) node with the given path to the parent node with the given path by sending
+	 * a PATCH request for "<parent navigation>@odata.bind".
+	 *
+	 * @param {sap.ui.model.odata.v4.lib._GroupLock} oGroupLock
+	 *   A lock for the group to associate the requests with
+	 * @param {string} sChildPath
+	 *   The (child) node's path relative to the cache
+	 * @param {string} sParentPath
+	 *   The parent node's path relative to the cache
+	 * @returns {sap.ui.base.SyncPromise<void>}
+	 *   A promise which is resolved without a defined result when the move is finished, or
+	 *   rejected in case of an error
+	 *
+	 * @public
+	 */
+	_AggregationCache.prototype.move = function (oGroupLock, sChildPath, sParentPath) {
+		const sChildPredicate = sChildPath.slice(sChildPath.indexOf("("));
+		const oChildNode = this.aElements.$byPredicate[sChildPredicate];
+
+		return this.oRequestor.request("PATCH", sChildPath, oGroupLock, {
+					"If-Match" : oChildNode,
+					Prefer : "return=minimal"
+				}, {[this.oAggregation.$ParentNavigationProperty + "@odata.bind"] : sParentPath},
+				/*fnSubmit*/null, function fnCancel() { /*nothing to do*/ })
+			.then((oPatchResult) => {
+				// update the cache with the PATCH response (Note: "@odata.etag" is optional!)
+				_Helper.updateExisting(this.mChangeListeners, sChildPredicate, oChildNode,
+					{"@odata.etag" : oPatchResult["@odata.etag"]});
+
+				const iOldIndex = this.aElements.indexOf(oChildNode);
+				this.shiftIndex(iOldIndex, -1);
+				this.aElements.splice(iOldIndex, 1);
+
+				// remove original element from its cache's collection
+				const oOldParentCache = _Helper.getPrivateAnnotation(oChildNode, "parent");
+				oOldParentCache.removeElement(undefined,
+					_Helper.getPrivateAnnotation(oChildNode, "index"), sChildPredicate, "");
+				if (oOldParentCache.getValue("$count") === 0) { // last child has gone
+					const oOldParent = this.aElements[iOldIndex - 1];
+					_Helper.updateAll(this.mChangeListeners,
+						_Helper.getPrivateAnnotation(oOldParent, "predicate"),
+						oOldParent, {"@$ui5.node.isExpanded" : undefined}); // a leaf now
+					// _Helper.updateAll only sets it to undefined
+					delete oOldParent["@$ui5.node.isExpanded"];
+					_Helper.deletePrivateAnnotation(oOldParent, "cache");
+					oOldParentCache.setActive(false);
+				}
+
+				// once oChildNode has moved, it should look 'created' because of its new position
+				if (!_Helper.hasPrivateAnnotation(oChildNode, "transientPredicate")) {
+					const sTransientPredicate = "($uid=" + _Helper.uid() + ")";
+					_Helper.setPrivateAnnotation(oChildNode, "transientPredicate",
+						sTransientPredicate);
+					this.aElements.$byPredicate[sTransientPredicate] = oChildNode;
+					_Helper.updateAll(this.mChangeListeners, sChildPredicate, oChildNode,
+						{"@$ui5.context.isTransient" : false});
+				}
+
+				const sParentPredicate = sParentPath.slice(sParentPath.indexOf("("));
+				const oParentNode = this.aElements.$byPredicate[sParentPredicate];
+				let oCache = _Helper.getPrivateAnnotation(oParentNode, "cache");
+				if (!oCache) {
+					oCache = this.createGroupLevelCache(oParentNode);
+					oCache.setEmpty();
+					_Helper.setPrivateAnnotation(oParentNode, "cache", oCache);
+					_Helper.updateAll(this.mChangeListeners, sParentPredicate, oParentNode,
+						{"@$ui5.node.isExpanded" : true}); // not a leaf anymore
+				}
+				oCache.restoreElement(undefined, 0, oChildNode, "");
+				_Helper.setPrivateAnnotation(oChildNode, "index", 0);
+				_Helper.setPrivateAnnotation(oChildNode, "parent", oCache);
+
+				_Helper.updateAll(this.mChangeListeners, sChildPredicate, oChildNode,
+					{"@$ui5.node.level" : oParentNode["@$ui5.node.level"] + 1});
+				const iNewIndex = this.aElements.indexOf(oParentNode) + 1;
+				this.aElements.splice(iNewIndex, 0, oChildNode);
+				this.shiftIndex(iNewIndex, +1); // relies on "parent" & "@$ui5.node.level"!
+			});
+	};
+
 	/**
 	 * Returns a promise to be resolved with an OData object for a range of the requested data.
 	 *
@@ -1273,7 +1354,8 @@ sap.ui.define([
 	/**
 	 * Turns the given element, which has the given predicate, into a placeholder which keeps all
 	 * private annotations plus the hierarchy node value. The original element is removed from its
-	 * corresponding cache and must not be used any longer.
+	 * corresponding cache and must not be used any longer. Created persisted elements loose their
+	 * special treatment!
 	 *
 	 * @param {object} oElement - An element
 	 * @param {string} sPredicate - Its predicate
@@ -1406,8 +1488,6 @@ sap.ui.define([
 
 			case "collapsed":
 				bIsExpanded = false;
-				_Helper.setPrivateAnnotation(oElement, "filter",
-					_Helper.getKeyFilter(oElement, sMetaPath, mTypeForMetaPath));
 				break;
 
 			default: // "leaf"

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

@@ -158,7 +158,7 @@ sap.ui.define([
 				&& oPlaceholder["@$ui5.node.level"] !== 0) {
 				throw new Error("Wrong placeholder");
 			}
-			["descendants", "filter", "predicate"].forEach(function (sAnnotation) {
+			["descendants", "predicate"].forEach(function (sAnnotation) {
 				if (_Helper.hasPrivateAnnotation(oPlaceholder, sAnnotation)
 					&& _Helper.getPrivateAnnotation(oPlaceholder, sAnnotation)
 						!== _Helper.getPrivateAnnotation(oElement, sAnnotation)) {
@@ -526,9 +526,7 @@ sap.ui.define([
 					select("LimitedDescendantCountProperty");
 				}
 			}
-			if (!bAllLevels) {
-				select("DrillStateProperty");
-			}
+			select("DrillStateProperty");
 			mQueryOptions.$apply = sApply;
 
 			return mQueryOptions;
@@ -593,7 +591,7 @@ sap.ui.define([
 					throw new Error("Not a matching value for '" + sPath + "'");
 				}
 			} else if (typeof vType === "object") {
-				var bIsMap = "*" in vType;
+				const bIsMap = "*" in vType;
 
 				if (typeof vValue !== "object" || !vValue || Array.isArray(vValue)) {
 					throw new Error("Not an object value for '" + sPath + "'");

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

@@ -937,7 +937,7 @@ sap.ui.define([
 			mQueryOptions,
 			sRequestPath,
 			sResourceMetaPath = _Helper.getMetaPath(sResourcePath),
-			mTypeForMetaPath = this.fetchTypes().getResult(),
+			mTypeForMetaPath = this.getTypes(),
 			aUpdateProperties,
 			that = this;
 
@@ -1081,6 +1081,7 @@ sap.ui.define([
 	 *   A promise that is resolved with a map from resource path + entity path to the type
 	 *
 	 * @private
+	 * @see #getTypes
 	 */
 	_Cache.prototype.fetchTypes = function () {
 		var aPromises, mTypeForMetaPath,
@@ -1146,21 +1147,31 @@ sap.ui.define([
 	 */
 
 	/**
-	 * Returns the value at the given path and removes it from the cache.
+	 * Returns the collection at the given path and removes it from the cache if it is marked as
+	 * transferable.
 	 *
 	 * @param {string} sPath - The relative path of the property
-	 * @returns {any} The value
-	 * @throws {Error} If the cache is shared
+	 * @returns {object[]|undefined} The collection or <code>undefined</code>
+	 * @throws {Error} If the cache is shared or if the given path does not point to a collection.
 	 *
 	 * @public
 	 */
-	_Cache.prototype.getAndRemoveValue = function (sPath) {
+	_Cache.prototype.getAndRemoveCollection = function (sPath) {
 		var aSegments = sPath.split("/"),
 			sName = aSegments.pop(),
 			oParent = this.fetchValue(_GroupLock.$cached, aSegments.join("/")).getResult(),
 			vValue = oParent[sName];
 
 		this.checkSharedRequest();
+		if (vValue) {
+			if (!Array.isArray(vValue)) {
+				throw new Error(`${sPath} must point to a collection`);
+			}
+			if (!vValue.$transfer) {
+				return undefined;
+			}
+			delete vValue.$transfer;
+		}
 		delete oParent[sName];
 
 		return vValue;
@@ -1287,6 +1298,19 @@ sap.ui.define([
 		return this.mQueryOptions;
 	};
 
+	/**
+	 * Returns the existing map from meta path to type.
+	 *
+	 * @returns {Object<object>}
+	 *   A map from resource path + entity path to the type
+	 *
+	 * @private
+	 * @see #fetchTypes
+	 */
+	_Cache.prototype.getTypes = function () {
+		return this.fetchTypes().getResult();
+	};
+
 	/**
 	 * Returns the requested data if available synchronously.
 	 *
@@ -1641,8 +1665,8 @@ sap.ui.define([
 	 * <code>$byPredicate</code>, <code>$created</code> and <code>$count</code>, and a collection
 	 * cache's limit and number of active elements (if applicable).
 	 *
-	 * @param {object[]} aElements
-	 *   The array of elements
+	 * @param {object[]} [aElements]
+	 *   The array of elements, defaults to a collection cache's own elements
 	 * @param {number} [iIndex]
 	 *   The array index of the old element to be removed or <code>undefined</code> in case the
 	 *   element is a kept-alive element without an index
@@ -1656,7 +1680,9 @@ sap.ui.define([
 	 *
 	 * @protected
 	 */
-	_Cache.prototype.removeElement = function (aElements, iIndex, sPredicate, sPath) {
+	// eslint-disable-next-line default-param-last
+	_Cache.prototype.removeElement = function (aElements = this.aElements, iIndex, sPredicate,
+			sPath) {
 		var oElement = aElements.$byPredicate[sPredicate],
 			bDeleted = oElement["@$ui5.context.isDeleted"],
 			sTransientPredicate = _Helper.getPrivateAnnotation(oElement, "transientPredicate");
@@ -1880,10 +1906,10 @@ sap.ui.define([
 
 	/**
 	 * Restores the element in the given array at the given index, taking care of the array's
-	 * <code>$created</code> and <code>$count</code>, and a collection cache's limit and number of
-	 * active elements (if applicable).
+	 * <code>$byPredicate</code>, <code>$created</code> and <code>$count</code>, and a collection
+	 * cache's limit and number of active elements (if applicable).
 	 *
-	 * @param {object[]} aElements - The array of elements
+	 * @param {object[]} [aElements] - The array of elements
 	 * @param {number} iIndex - The index to restore at
 	 * @param {object} oElement - The element to restore
 	 * @param {string} sPath
@@ -1894,7 +1920,9 @@ sap.ui.define([
 	 *
 	 * @protected
 	 */
-	_Cache.prototype.restoreElement = function (aElements, iIndex, oElement, sPath, iDeletedIndex) {
+	// eslint-disable-next-line default-param-last
+	_Cache.prototype.restoreElement = function (aElements = this.aElements, iIndex, oElement, sPath,
+			iDeletedIndex) {
 		this.adjustIndexes(sPath, aElements, iIndex, 1, iDeletedIndex);
 		const sTransientPredicate = _Helper.getPrivateAnnotation(oElement, "transientPredicate");
 		if (sTransientPredicate) {
@@ -1907,12 +1935,13 @@ sap.ui.define([
 		}
 		_Helper.addToCount(this.mChangeListeners, sPath, aElements, 1);
 		aElements.splice(iIndex, 0, oElement);
+		aElements.$byPredicate[_Helper.getPrivateAnnotation(oElement, "predicate")] = oElement;
 	};
 
 	/**
 	 * Adds or removes a usage of this cache. A cache with active usages must not be destroyed.
-	 * If a usage is removed, all change listeners are removed too. Note: shared caches have no
-	 * listeners.
+	 * If the last usage is removed, all change listeners are removed too. Note: shared caches have
+	 * no listeners except for the empty path (cf. <code>registerChangeListener("", th</code>).
 	 *
 	 * @param {boolean} bActive
 	 *   Whether a usage is added or removed
@@ -2625,14 +2654,31 @@ sap.ui.define([
 	};
 
 	/**
-	 * Drops the element with the given index and predicate from this cache's collection.
+	 * Drops the element with the given index and predicate from this cache's collection, so that it
+	 * will be read again from the server later on. Created persisted elements loose their special
+	 * treatment!
 	 *
 	 * @param {number} iIndex - An index
 	 * @param {string} sPredicate - A key predicate
+	 * @throws {Error} When the element with the given index is still transient
+	 *
+	 * @public
 	 */
 	_CollectionCache.prototype.drop = function (iIndex, sPredicate) {
+		const oElement = this.aElements[iIndex];
+		if (oElement["@$ui5.context.isTransient"]) {
+			throw new Error("Must not drop a transient element");
+		}
 		delete this.aElements[iIndex];
 		delete this.aElements.$byPredicate[sPredicate];
+
+		const sTransientPredicate = _Helper.getPrivateAnnotation(oElement, "transientPredicate");
+		if (sTransientPredicate) { // createdPersisted => persisted
+			this.aElements.$created -= 1;
+			this.iActiveElements -= 1;
+			this.iLimit += 1;
+			delete this.aElements.$byPredicate[sTransientPredicate];
+		}
 	};
 
 	/**
@@ -2745,8 +2791,7 @@ sap.ui.define([
 		function addKeyFilter(oElement) {
 			var sKeyFilter;
 
-			mTypeForMetaPath = mTypeForMetaPath
-				|| that.fetchTypes().getResult(); // Note: $metadata already read
+			mTypeForMetaPath = mTypeForMetaPath || that.getTypes(); // Note: $metadata already read
 			sKeyFilter = _Helper.getKeyFilter(oElement, that.sMetaPath, mTypeForMetaPath);
 			if (sKeyFilter) {
 				aKeyFilters.push(sKeyFilter);
@@ -3075,7 +3120,8 @@ sap.ui.define([
 	 *   with a number property <code>$count</code> representing the element count on server-side;
 	 *   <code>$count</code> may be <code>undefined</code>, but not <code>Infinity</code>). If an
 	 *   HTTP request fails, the error from the _Requestor is returned and the requested range is
-	 *   reset to <code>undefined</code>.
+	 *   reset to <code>undefined</code>. If the request has been obsoleted by a {@link #reset}, the
+	 *   promise is rejected with an error having a property <code>canceled = true</code>.
 	 * @throws {Error} If given index or length is less than 0
 	 *
 	 * @public
@@ -3245,7 +3291,7 @@ sap.ui.define([
 			return undefined;
 		}
 
-		mTypes = this.fetchTypes().getResult(); // in this stage the promise is resolved
+		mTypes = this.getTypes(); // in this stage the promise is resolved
 
 		return this.oRequestor.request("GET", calculateKeptElementsQuery(), oGroupLock)
 			.then(function (oResponse) {
@@ -3306,7 +3352,8 @@ sap.ui.define([
 	 *   The function is called when the back-end requests have been sent.
 	 * @returns {sap.ui.base.SyncPromise}
 	 *   A promise which is resolved without a defined result when the request is finished and
-	 *   rejected in case of error
+	 *   rejected in case of error; if the request has been obsoleted by a {@link #reset} the error
+	 *   has a property <code>canceled = true</code>)
 	 * @throws {Error}
 	 *   If group ID is '$cached'. The error has a property <code>$cached = true</code>
 	 *
@@ -3331,6 +3378,11 @@ sap.ui.define([
 		]).then(function (aResult) {
 			var iFiltered;
 
+			if (oReadRequest.obsolete) {
+				const oError = new Error("Request is obsolete");
+				oError.canceled = true;
+				throw oError;
+			}
 			that.checkRange(oPromise, oReadRequest.iStart, oReadRequest.iEnd);
 			if (that.aElements.$tail === oPromise) {
 				that.aElements.$tail = undefined;
@@ -3340,8 +3392,10 @@ sap.ui.define([
 			return that.handleCount(oGroupLock, iTransientElements, oReadRequest.iStart,
 				oReadRequest.iEnd, aResult[0], iFiltered);
 		}).catch(function (oError) {
-			that.checkRange(oPromise, oReadRequest.iStart, oReadRequest.iEnd);
-			that.fill(undefined, oReadRequest.iStart, oReadRequest.iEnd);
+			if (!oError.canceled) {
+				that.checkRange(oPromise, oReadRequest.iStart, oReadRequest.iEnd);
+				that.fill(undefined, oReadRequest.iStart, oReadRequest.iEnd);
+			}
 			throw oError;
 		}).finally(function () {
 			that.aReadRequests.splice(that.aReadRequests.indexOf(oReadRequest), 1);
@@ -3387,7 +3441,7 @@ sap.ui.define([
 			mQueryOptions,
 			sResourcePath,
 			bSkip,
-			mTypeForMetaPath = this.fetchTypes().getResult(),
+			mTypeForMetaPath = this.getTypes(),
 			that = this;
 
 		this.checkSharedRequest();
@@ -3557,6 +3611,10 @@ sap.ui.define([
 		aKeptElementPredicates.forEach(function (sPredicate) {
 			that.aElements.$byPredicate[sPredicate] = mByPredicate[sPredicate];
 		});
+		// Beware: fireChange can trigger a read which must not be obsoleted
+		this.aReadRequests?.forEach((oReadRequest) => {
+			oReadRequest.obsolete = true;
+		});
 		if (mChangeListeners[""]) {
 			this.mChangeListeners[""] = mChangeListeners[""];
 			_Helper.fireChange(this.mChangeListeners, "");
@@ -3605,7 +3663,8 @@ sap.ui.define([
 	};
 
 	/**
-	 * Sets the isInactive annotation at the entity with the given path, which might activate it.
+	 * Sets the "@$ui5.context.isInactive" annotation at the entity with the given path, which might
+	 * activate it.
 	 *
 	 * @param {string} sPath - The path
 	 * @param {boolean|number} bInactive

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

@@ -1711,26 +1711,6 @@ sap.ui.define([
 			return sPath;
 		},
 
-		/**
-		 * Returns the path for the return value context. Supports bound operations on an entity or
-		 * a collection.
-		 *
-		 * @param {string} sPath
-		 *   The bindings's path; either a resolved model path or a resource path; for example:
-		 *   "/Artists(ArtistID='42',IsActiveEntity=true)/special.cases.EditAction(...)" or
-		 *   "/Artists/special.cases.Create(...)", the leading "/" can be omitted.
-		 * @param {string} sResponsePredicate The key predicate of the response entity
-		 * @returns {string} The path for the return value context.
-		 *
-		 * @public
-		 */
-		getReturnValueContextPath : function (sPath, sResponsePredicate) {
-			var sBoundParameterPath = sPath.slice(0, sPath.lastIndexOf("/")),
-				i = sBoundParameterPath.indexOf("(");
-
-			return (i < 0 ? sBoundParameterPath : sPath.slice(0, i)) + sResponsePredicate;
-		},
-
 		/**
 		 * Tells whether <code>sPath</code> has <code>sBasePath</code> as path prefix. It returns
 		 * <code>true</code> iff {@link .getRelativePath} does not return <code>undefined</code>.
@@ -2795,6 +2775,12 @@ sap.ui.define([
 				aNestedCreatedEntities.$count = undefined; // -> setCount must fire a change event
 				aNestedCreatedEntities.$created = 0;
 				aNestedCreatedEntities.$byPredicate = {};
+				// If mSelectForMetaPath has query options, the corresponding nested ODLB will get a
+				// cache later and must transfer the data to its own cache; otherwise, the nested
+				// binding has no cache and must not lose its data (BCP: 2380101762)
+				if (mSelectForMetaPath[sSegment]) {
+					aNestedCreatedEntities.$transfer = true;
+				}
 				const sCollectionPath = sPath + "/" + sSegment;
 				_Helper.setCount(mChangeListeners, sCollectionPath, aNestedCreatedEntities,
 					aNestedCreatedEntities.length);

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

@@ -12,11 +12,11 @@ sap.ui.define([
 	"./_V2Requestor",
 	"sap/base/Log",
 	"sap/ui/base/SyncPromise",
-	"sap/ui/core/cache/CacheManager",
 	"sap/ui/core/Configuration",
+	"sap/ui/core/cache/CacheManager",
 	"sap/ui/thirdparty/jquery"
-], function (_Batch, _GroupLock, _Helper, asV2Requestor, Log, SyncPromise, CacheManager,
-		Configuration, jQuery) {
+], function (_Batch, _GroupLock, _Helper, asV2Requestor, Log, SyncPromise, Configuration,
+		CacheManager, jQuery) {
 	"use strict";
 
 	var mBatchHeaders = { // headers for the $batch request

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

@@ -444,7 +444,7 @@ sap.ui.define([
 			case "creatable":
 			case "deletable":
 			case "updatable":
-				// do not consume it here, it might be needed for xxx-path
+				// do not consume it here, it might be needed for xyz-path
 				if (oAnnotatable.peek(sName) === "false") {
 					oAnnotatable.convert(sName, false);
 				}

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

@@ -227,7 +227,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Model
 	 * @public
-	 * @version 1.118.0
+	 * @version 1.119.1
 	 */
 	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/model/SimpleType', 'sap/ui/model/FormatException', 'sap/u
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]