@openui5/sap.ui.core 1.118.0 → 1.119.1

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

@@ -74,7 +74,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @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
@@ -142,6 +142,13 @@ sap.ui.define([
 
 			this.oOperation = {
 				bAction : undefined,
+				// Whether the operation is a bound action with a navigation property inside the
+				// path to its binding parameter, and thus additional ($expand/$select) query
+				// options have been computed to facilitate a RVC.
+				// undefined: unknown whether it is possible to determine the needed query options
+				// true: query options are determined
+				// false: the preconditions are not given to determine the query options
+				bAdditionalQueryOptionsForRVC : undefined,
 				mChangeListeners : {}, // map from path to an array of change listeners
 				mParameters : {},
 				mRefreshParameters : {}
@@ -250,7 +257,7 @@ sap.ui.define([
 					mParameters, fnGetEntity, bIgnoreETag, fnOnStrictHandlingFailed);
 			}).then(function (oResponseEntity) {
 				return fireChangeAndRefreshDependentBindings().then(function () {
-					return that.handleOperationResult(sResolvedPath, oOperationMetadata,
+					return that.handleOperationResult(oOperationMetadata,
 						oResponseEntity, bReplaceWithRVC);
 				});
 			}, function (oError) {
@@ -274,6 +281,56 @@ sap.ui.define([
 		return Promise.resolve(oPromise);
 	};
 
+	/**
+	 * Adds the query options for determining the key properties of a return value context.
+	 * If all preconditions are fulfilled (see {@link #isReturnValueLikeBindingParameter} and
+	 * {@link #hasReturnValueContext}) and it was possible to determine the query options, the flag
+	 * <code>bAdditionalQueryOptionsForRVC</code> in <code>this.oOperation</code> is set to
+	 * <code>true</code>, if it was not possible the flag is set to <code>false</code>.
+	 *
+	 * @param {object} oOperationMetadata
+	 *   The operation's metadata
+	 * @param {object} mQueryOptions
+	 *   The operation binding's cache query options
+	 * @returns {object}
+	 *   The computed query options
+	 *
+	 * @private
+	 */
+	ODataContextBinding.prototype.addQueryOptionsForReturnValueContext
+			= function (oOperationMetadata, mQueryOptions) {
+		const aMetaSegments = _Helper.getMetaPath(this.getResolvedPath()).split("/");
+
+		if (!this.isReturnValueLikeBindingParameter(oOperationMetadata)
+				|| !this.hasReturnValueContext() || aMetaSegments.length !== 4) {
+			this.oOperation.bAdditionalQueryOptionsForRVC = false;
+
+			return mQueryOptions;
+		}
+		const oMetaModel = this.oModel.getMetaModel();
+		const sEntitySet = oMetaModel.getObject(
+			"/" + aMetaSegments[1] + "/$NavigationPropertyBinding/" + aMetaSegments[2]);
+		const sPartner = oMetaModel.getObject(
+			"/" + aMetaSegments[1] + "/" + aMetaSegments[2] + "/$Partner");
+
+		let mAdditionalQueryOptions;
+		if (sEntitySet && sPartner) {
+			mAdditionalQueryOptions = {$expand : {}};
+			mAdditionalQueryOptions.$expand[sPartner] = {};
+			_Helper.selectKeyProperties(mAdditionalQueryOptions.$expand[sPartner],
+				oMetaModel.getObject("/" + sEntitySet + "/" + sPartner + "/"));
+			if (mQueryOptions.$select) {
+				_Helper.selectKeyProperties(mAdditionalQueryOptions,
+					oMetaModel.getObject("/" + sEntitySet + "/"));
+			}
+			mQueryOptions = _Helper.clone(mQueryOptions); // "copy on write"
+			_Helper.aggregateExpandSelect(mQueryOptions, mAdditionalQueryOptions);
+		}
+		this.oOperation.bAdditionalQueryOptionsForRVC = !!mAdditionalQueryOptions;
+
+		return mQueryOptions;
+	};
+
 	/**
 	 * @override
 	 * @see sap.ui.model.odata.v4.ODataBinding#adjustPredicate
@@ -329,8 +386,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>
@@ -376,8 +433,8 @@ sap.ui.define([
 	 *   The event object
 	 * @param {function} oEvent.cancelBubble
 	 *   A callback function to prevent that the event is bubbled up to the model
-	 * @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.
@@ -418,7 +475,8 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.base.Event} oEvent The event object
 	 * @param {sap.ui.model.odata.v4.ODataContextBinding} oEvent.getSource() This binding
-	 * @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 {boolean} oEvent.getParameters.success
 	 *   Whether all PATCHes are successfully processed
 	 *
@@ -538,8 +596,7 @@ sap.ui.define([
 		function getOriginalResourcePath(oResponseEntity) {
 			if (that.isReturnValueLikeBindingParameter(oOperationMetadata)) {
 				if (that.hasReturnValueContext()) {
-					return _Helper.getReturnValueContextPath(sOriginalResourcePath,
-						_Helper.getPrivateAnnotation(oResponseEntity, "predicate"));
+					return that.getReturnValueContextPath(oResponseEntity);
 				}
 				if (_Helper.getPrivateAnnotation(vEntity, "predicate")
 						=== _Helper.getPrivateAnnotation(oResponseEntity, "predicate")) {
@@ -611,7 +668,8 @@ sap.ui.define([
 		this.oOperation.bAction = bAction;
 		this.oOperation.mRefreshParameters = mParameters;
 		mParameters = Object.assign({}, mParameters);
-		this.mCacheQueryOptions = this.computeOperationQueryOptions();
+		this.mCacheQueryOptions = this.addQueryOptionsForReturnValueContext(oOperationMetadata,
+			this.computeOperationQueryOptions());
 		// Note: in case of NavigationProperty, this just removes "(...)"
 		sPath = oRequestor.getPathAndAddQueryOptions(sPath, oOperationMetadata, mParameters,
 			this.mCacheQueryOptions, vEntity);
@@ -744,10 +802,12 @@ sap.ui.define([
 	 * @see sap.ui.model.odata.v4.ODataBinding#doDeregisterChangeListener
 	 */
 	ODataContextBinding.prototype.doDeregisterChangeListener = function (sPath, oListener) {
-		if (this.oOperation && (sPath === "$Parameter" || sPath.startsWith("$Parameter/"))) {
-			_Helper.removeByPath(this.oOperation.mChangeListeners,
-				sPath.slice(/*"$Parameter/".length*/11), oListener);
-			return;
+		if (this.oOperation) {
+			const sRelativePath = _Helper.getRelativePath(sPath, this.oParameterContext.getPath());
+			if (sRelativePath !== undefined) {
+				_Helper.removeByPath(this.oOperation.mChangeListeners, sRelativePath, oListener);
+				return;
+			}
 		}
 		asODataParentBinding.prototype.doDeregisterChangeListener.apply(this, arguments);
 	};
@@ -849,27 +909,41 @@ sap.ui.define([
 	 *   <code>bIgnoreETag</code> is used for an operation other than a bound action. It is also
 	 *   rejected if <code>fnOnStrictHandlingFailed</code> is supplied and
 	 *   <ul>
-	 *    <li> is used for an operation other than an action,
-	 *    <li> another request that applies the preference "handling=strict" exists in a different
-	 *      change set of the same $batch request,
-	 *    <li> it does not return a <code>Promise</code>,
-	 *    <li> returns a <code>Promise</code> that resolves with <code>false</code>. In this case
-	 *      <code>oError.canceled === true</code>.
+	 *     <li> is used for an operation other than an action,
+	 *     <li> another request that applies the preference "handling=strict" exists in a different
+	 *       change set of the same $batch request,
+	 *     <li> it does not return a <code>Promise</code>,
+	 *     <li> returns a <code>Promise</code> that resolves with <code>false</code>. In this case
+	 *       <code>oError.canceled === true</code>.
 	 *   </ul>
 	 *   It is also rejected if <code>bReplaceWithRVC</code> is supplied, and there is no return
 	 *   value context at all or the existing context as described above is currently part of the
 	 *   list's collection (that is, has an index).
 	 *   <br>
 	 *   A return value context is an {@link sap.ui.model.odata.v4.Context} which represents a bound
-	 *   operation response. It is created only if the operation is bound and has a single entity
-	 *   return value from the same entity set as the operation's binding parameter and has a
-	 *   parent context which is an {@link sap.ui.model.odata.v4.Context} and points to an entity
-	 *   from an entity set. It is destroyed the next time this operation binding is executed again!
+	 *   operation response. It is created only if the operation is bound and these conditions
+	 *   apply:
+	 *   <ul>
+	 *     <li> The operation has a single entity return value from the same entity set as the
+	 *       operation's binding parameter.
+	 *     <li> It has a parent context which is an {@link sap.ui.model.odata.v4.Context} and points
+	 *       to (an entity from) an entity set. The path of the parent context must not contain a
+	 *       navigation property (but see last paragraph).
+	 *   </ul>
+	 *   <b>Note:</b> A return value context is destroyed the next time the operation binding is
+	 *   executed again.
 	 *   <br>
 	 *   If a return value context is created, it must be used instead of
 	 *   <code>this.getBoundContext()</code>. All bound messages will be related to the return value
 	 *   context only. Such a message can only be connected to a corresponding control if the
 	 *   control's property bindings use the return value context as binding context.
+	 *   <br>
+	 *   A return value context may also be provided if the parent context's path contains a maximum
+	 *   of one navigation property. In addition to the existing preconditions for a return value
+	 *   context, the metadata has to specify a partner attribute for the navigation property and
+	 *   the partner relationship has to be bi-directional. Also the navigation property binding has
+	 *   to be available in the entity set of the first segment in the parent context's path
+	 *   (@experimental as of version 1.119.0).
 	 * @throws {Error} If
 	 *   <ul>
 	 *     <li> the binding's root binding is suspended,
@@ -1187,11 +1261,42 @@ sap.ui.define([
 		return sResolvedPath;
 	};
 
+	/**
+	 * Returns the path for the return value context. Supports bound operations on an entity or
+	 * a collection.
+	 *
+	 * @param {object} oResponseEntity
+	 *   The result of the executed operation
+	 * @returns {string} The path for the return value context.
+	 *
+	 * @privat
+	 */
+	ODataContextBinding.prototype.getReturnValueContextPath = function (oResponseEntity) {
+		if (this.oOperation.bAdditionalQueryOptionsForRVC === undefined) {
+			throw new Error("Unexpected Value for bAdditionalQueryOptionsForRVC: undefined");
+		}
+		const sBindingParameterPath = this.oContext.getPath().slice(1);
+		const sPredicate = _Helper.getPrivateAnnotation(oResponseEntity, "predicate");
+		if (this.oOperation.bAdditionalQueryOptionsForRVC === false) {
+			const i = sBindingParameterPath.indexOf("(");
+
+			return (i < 0 ? sBindingParameterPath : sBindingParameterPath.slice(0, i)) + sPredicate;
+		}
+		const aMetaPathSegments = _Helper.getMetaPath(sBindingParameterPath).split("/");
+		const sPartner = this.oModel.getMetaModel()
+			.getObject("/" + aMetaPathSegments[0] + "/" + aMetaPathSegments[1] + "/$Partner");
+		const sPartnerPredicate
+			= this.oModel.getKeyPredicate("/" + aMetaPathSegments[0], oResponseEntity[sPartner]);
+
+		return sBindingParameterPath.split("/").map(function (sSegment, i) {
+			return sSegment.slice(0, sSegment.lastIndexOf("("))
+				+ (i ? sPredicate : sPartnerPredicate);
+		}).join("/");
+	};
+
 	/**
 	 * Handles the result of an executed operation and creates a return value context if possible.
 	 *
-	 * @param {string} sResolvedPath
-	 *   The resolved path
 	 * @param {object} oOperationMetadata
 	 *   The operation's metadata
 	 * @param {object} oResponseEntity
@@ -1207,8 +1312,8 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
-	ODataContextBinding.prototype.handleOperationResult = function (sResolvedPath,
-			oOperationMetadata, oResponseEntity, bReplaceWithRVC) {
+	ODataContextBinding.prototype.handleOperationResult = function (oOperationMetadata,
+			oResponseEntity, bReplaceWithRVC) {
 		var sContextPredicate, oOldValue, sResponsePredicate, sNewPath, oResult;
 
 		if (this.isReturnValueLikeBindingParameter(oOperationMetadata)) {
@@ -1224,7 +1329,17 @@ sap.ui.define([
 					this.oContext.patch(oResponseEntity);
 				}
 				if (this.hasReturnValueContext()) {
+					// determine the new path
+					sNewPath = this.getReturnValueContextPath(oResponseEntity);
 					if (bReplaceWithRVC) {
+						// replace is only possible if the path does not contain any navigation
+						// property or the key predicate of the first segment has not changed!
+						if (this.oOperation.bAdditionalQueryOptionsForRVC
+								&& this.oContext.getPath().split("/")[1]
+									!== sNewPath.split("/")[1]) {
+							throw new Error("Cannot replace due changed key predicates "
+								+ "and navigation property in path");
+						}
 						this.oCache = null;
 						this.oCachePromise = SyncPromise.resolve(null);
 						oResult = this.oContext.getBinding()
@@ -1234,11 +1349,10 @@ sap.ui.define([
 						return oResult;
 					}
 
-					sNewPath = _Helper.getReturnValueContextPath(sResolvedPath, sResponsePredicate);
 					this.oReturnValueContext = Context.createNewContext(this.oModel,
-						this, sNewPath);
+						this, "/" + sNewPath);
 					// set the resource path for late property requests
-					this.oCache.setResourcePath(sNewPath.slice(1));
+					this.oCache.setResourcePath(sNewPath);
 
 					return this.oReturnValueContext;
 				}
@@ -1260,19 +1374,30 @@ sap.ui.define([
 	 * 3. EntitySetPath of operation is the binding parameter.
 	 * 4. Operation binding has
 	 *    (a) a V4 parent context which
-	 *    (b) points to an entity from an entity set w/o navigation properties.
+	 *    (b) points to an entity from an entity set or the entity set itself w/ a maximum of one
+	 *        navigation property.
 	 *
 	 * BEWARE: It is the caller's duty to check 1. through 4.(a) via
 	 * {@link #isReturnValueLikeBindingParameter}!
 	 *
-	 * @returns {boolean} Whether a return value context is created
+	 * BEWARE: In {@link #addQueryOptionsForReturnValueContext} the flag
+	 * <code>this.oOperation.bAdditionalQueryOptionsForRVC</code> ist set. Until this is done this
+	 * function will also return true, because it seems possible to create a return value context.
+	 * If it was possbile to determine the additional needed query options in
+	 * {@link #addQueryOptionsForReturnValueContext}, we can be sure that it is possible to create a
+	 * return value context.
+	 *
+	 * @returns {boolean} Whether it seems possible to create a return value context
 	 *
 	 * @private
 	 */
 	ODataContextBinding.prototype.hasReturnValueContext = function () {
 		var aMetaSegments = _Helper.getMetaPath(this.getResolvedPath()).split("/");
 
-		// case 4b
+		if (aMetaSegments.length === 4) {
+			return this.oOperation.bAdditionalQueryOptionsForRVC !== false;
+		}
+
 		return aMetaSegments.length === 3
 			&& this.oModel.getMetaModel().getObject("/" + aMetaSegments[1]).$kind === "EntitySet";
 	};

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

@@ -57,7 +57,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @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
@@ -145,7 +145,7 @@ sap.ui.define([
 		// #destroyPreviousContexts after the next call to #createContexts.
 		// A kept-alive context may be parked here for a longer time, with undefined index.
 		this.mPreviousContextsByPath = {};
-		this.aPreviousData = [];
+		this.aPreviousData = null; // no previous data for E.C.D. known yet
 		this.bRefreshKeptElements = false; // refresh kept elements when resuming?
 		this.sResumeAction = undefined; // a special resume action for $$sharedRequest
 		this.bSharedRequest = "$$sharedRequest" in mParameters
@@ -281,7 +281,7 @@ sap.ui.define([
 		 * @param {string} sNewPath - The path with the transient predicate replaced
 		 */
 		function adjustPreviousData(sOldPath, sNewPath) {
-			var iIndex = that.aPreviousData.indexOf(sOldPath);
+			var iIndex = that.aPreviousData?.indexOf(sOldPath);
 
 			if (iIndex >= 0) {
 				that.aPreviousData[iIndex] = sNewPath;
@@ -377,8 +377,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 is
 	 *   <ul>
@@ -410,7 +410,8 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.base.Event} oEvent The event object
 	 * @param {sap.ui.model.odata.v4.ODataListBinding} oEvent.getSource() This binding
-	 * @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.odata.v4.Context} oEvent.getParameters.context The affected context
 	 *
 	 * @event sap.ui.model.odata.v4.ODataListBinding#createActivate
@@ -426,7 +427,8 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.base.Event} oEvent The event object
 	 * @param {sap.ui.model.odata.v4.ODataListBinding} oEvent.getSource() This binding
-	 * @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.odata.v4.Context} oEvent.getParameters.context
 	 *   The context for the created entity
 	 * @param {boolean} oEvent.getParameters.success
@@ -445,7 +447,8 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.base.Event} oEvent The event object
 	 * @param {sap.ui.model.odata.v4.ODataListBinding} oEvent.getSource() This binding
-	 * @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.odata.v4.Context} oEvent.getParameters.context
 	 *   The context for the created entity
 	 *
@@ -478,8 +481,8 @@ sap.ui.define([
 	 *    The event object
 	 * @param {function} oEvent.cancelBubble
 	 *   A callback function to prevent that the event is bubbled up to the model
-	 * @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.
@@ -518,7 +521,8 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.base.Event} oEvent The event object
 	 * @param {sap.ui.model.odata.v4.ODataListBinding} oEvent.getSource() This binding
-	 * @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 {boolean} oEvent.getParameters.success
 	 *   Whether all PATCHes are successfully processed
 	 *
@@ -550,8 +554,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 'refresh' event could be
 	 *   <ul>
@@ -661,13 +665,15 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.model.odata.v4.Context} oContext
 	 *   The context corresponding to the group node
+	 * @param {boolean} [bSilent]
+	 *   Whether no ("change") events should be fired
 	 * @throws {Error}
 	 *   If the binding's root binding is suspended
 	 *
 	 * @private
 	 * @see #expand
 	 */
-	ODataListBinding.prototype.collapse = function (oContext) {
+	ODataListBinding.prototype.collapse = function (oContext, bSilent) {
 		var aContexts = this.aContexts,
 			iCount = this.oCache.collapse(
 				_Helper.getRelativePath(oContext.getPath(), this.oHeaderContext.getPath())),
@@ -685,7 +691,9 @@ sap.ui.define([
 				}
 			}
 			this.iMaxLength -= iCount;
-			this._fireChange({reason : ChangeReason.Change});
+			if (!bSilent) {
+				this._fireChange({reason : ChangeReason.Change});
+			}
 		} // else: collapse before expand has finished
 	};
 
@@ -768,9 +776,9 @@ sap.ui.define([
 	 * {@link sap.ui.model.odata.v4.Context} instance given as
 	 * <code>oInitialData["@$ui5.node.parent"]</code>. <code>oAggregation.expandTo</code> (see
 	 * {@link #setAggregation}) must be one, <code>bSkipRefresh</code> must be set, but both
-	 * <code>bAtEnd</code> and <code>bInactive</code> must not be set. No other creation must be
-	 * pending, and no other modification (including collapse of some ancestor node) must happen
-	 * while this creation is pending!
+	 * <code>bAtEnd</code> and <code>bInactive</code> must not be set. No other creation or
+	 * {@link sap.ui.model.odata.v4.Context#move move} must be pending, and no other modification
+	 * (including collapse of some ancestor node) must happen while this creation is pending!
 	 *
 	 * @param {Object<any>} [oInitialData={}]
 	 *   The initial data for the created entity
@@ -1616,7 +1624,7 @@ sap.ui.define([
 
 			if (oCache) {
 				if (!oCache.hasSentRequest() && ODataListBinding.isBelowCreated(oContext)) {
-					aElements = oContext.getAndRemoveValue(that.sPath);
+					aElements = oContext.getAndRemoveCollection(that.sPath);
 					if (aElements) { // there is a collection from a finished deep create
 						// copy the created elements into the newly created cache
 						oCache.setPersistedCollection(aElements);
@@ -2058,6 +2066,9 @@ sap.ui.define([
 	 *     <li> "$DistanceFromRootProperty" holds the path to the property which provides the raw
 	 *       value for "@$ui5.node.level" (minus one) and should be used only to interpret the
 	 *       response retrieved via {@link #getDownloadUrl}.
+	 *     <li> "$DrillStateProperty" holds the path to the property which provides the raw value
+	 *       for "@$ui5.node.isExpanded" and should be used only to interpret the response retrieved
+	 *       via {@link #getDownloadUrl}.
 	 *     <li> "$NodeProperty" holds the path to the property which provides the hierarchy node
 	 *       value. That property is always $select'ed automatically and can be accessed as usual.
 	 *   </ul>
@@ -2071,7 +2082,8 @@ sap.ui.define([
 	ODataListBinding.prototype.getAggregation = function (bVerbose) {
 		return _Helper.clone(this.mParameters.$$aggregation, function (sKey, vValue) {
 			return sKey[0] === "$"
-				&& !(bVerbose && ["$DistanceFromRootProperty", "$NodeProperty"].includes(sKey))
+				&& !(bVerbose && ["$DistanceFromRootProperty", "$DrillStateProperty",
+					"$NodeProperty"].includes(sKey))
 				? undefined
 				: vValue;
 		});
@@ -2248,7 +2260,7 @@ sap.ui.define([
 		}
 
 		if (!this.isResolved()) { // unresolved relative binding
-			this.aPreviousData = []; // compute diff from scratch when binding is resolved again
+			this.aPreviousData = null; // compute diff from scratch when binding is resolved again
 			return [];
 		}
 
@@ -2316,7 +2328,7 @@ sap.ui.define([
 					};
 				}
 				if (bFireChange) {
-					if (bChanged || (that.oDiff && that.oDiff.aDiff.length)) {
+					if (bChanged || (that.oDiff && that.oDiff.aDiff?.length)) {
 						that._fireChange({reason : sChangeReason});
 					} else { // we cannot keep a diff if we do not tell the control to fetch it!
 						that.oDiff = undefined;
@@ -2490,7 +2502,7 @@ sap.ui.define([
 	 *   The length of the range requested in getContexts
 	 * @returns {object}
 	 *   The array of differences which is the comparison of current versus previous data as given
-	 *   by {@link #getContextData}.
+	 *   by {@link #getContextData}, or <code>null</code> in case no previous data is known.
 	 *
 	 * @private
 	 */
@@ -2502,7 +2514,7 @@ sap.ui.define([
 			return that.getContextData(oContext);
 		});
 
-		return this.diffData(aPreviousData, this.aPreviousData);
+		return aPreviousData ? this.diffData(aPreviousData, this.aPreviousData) : null;
 	};
 
 	/**
@@ -3061,6 +3073,64 @@ sap.ui.define([
 		return aContexts;
 	};
 
+	/**
+	 * Moves the given (child) node to the given parent.
+	 *
+	 * @param {sap.ui.model.odata.v4.Context} oChildContext - The (child) node to be moved
+	 * @param {sap.ui.model.odata.v4.Context} oParentContext - The new parent's context
+	 * @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
+	 *
+	 * @private
+	 */
+	ODataListBinding.prototype.move = function (oChildContext, oParentContext) {
+		/*
+		 * Sets the <code>iIndex</code> of every context instance inside the given range.
+		 *
+		 * @param {number} iFrom - Start index
+		 * @param {number} iToInclusive - Inclusive end index
+		 */
+		const setIndices = (iFrom, iToInclusive) => {
+			for (let i = iFrom; i <= iToInclusive; i += 1) {
+				if (this.aContexts[i]) {
+					this.aContexts[i].iIndex = i;
+				}
+			}
+		};
+
+		const bExpanded = oChildContext.isExpanded();
+		if (bExpanded) {
+			this.collapse(oChildContext, /*bSilent*/true);
+		}
+
+		const sChildPath = oChildContext.getCanonicalPath().slice(1);
+		const sParentPath = oParentContext.getCanonicalPath().slice(1); // before #lockGroup!
+		const oGroupLock = this.lockGroup(this.getUpdateGroupId(), true, true);
+
+		return this.oCache.move(oGroupLock, sChildPath, sParentPath).then(() => {
+			const iChildIndex = this.aContexts.indexOf(oChildContext);
+			const iParentIndex = this.aContexts.indexOf(oParentContext); // Note: !== iChildIndex
+			if (iChildIndex < iParentIndex) {
+				this.aContexts.splice(iParentIndex + 1, 0, oChildContext);
+				this.aContexts.splice(iChildIndex, 1); // parent moves to lower index!
+				setIndices(iChildIndex, iParentIndex);
+			} else if (iChildIndex > iParentIndex + 1) {
+				this.aContexts.splice(iChildIndex, 1); // parent unaffected!
+				this.aContexts.splice(iParentIndex + 1, 0, oChildContext);
+				setIndices(iParentIndex + 1, iChildIndex);
+			} // else: iChildIndex === iParentIndex + 1 => nothing to do
+			if (!oChildContext.created()) {
+				oChildContext.setCreatedPersisted();
+			}
+			if (bExpanded) {
+				this.expand(oChildContext); // guaranteed to by sync! incl. _fireChange
+			} else {
+				this._fireChange({reason : ChangeReason.Change});
+			}
+		});
+	};
+
 	/**
 	 * Notification from the cache that the collection has changed. Currently, only bindings with
 	 * bSharedRequest register at the cache and are notified when the cache has been reset.

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

@@ -156,7 +156,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.118.0
+		 * @version 1.119.1
 		 */
 		ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 				constructor : constructor

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

@@ -35,12 +35,12 @@ sap.ui.define([
 	"sap/base/assert",
 	"sap/base/Log",
 	"sap/ui/base/SyncPromise",
-	"sap/ui/core/cache/CacheManager",
 	"sap/ui/core/Configuration",
 	"sap/ui/core/library",
+	"sap/ui/core/Messaging",
 	"sap/ui/core/Rendering",
+	"sap/ui/core/cache/CacheManager",
 	"sap/ui/core/message/Message",
-	"sap/ui/core/Messaging",
 	"sap/ui/model/BindingMode",
 	"sap/ui/model/Context",
 	"sap/ui/model/Model",
@@ -48,7 +48,7 @@ sap.ui.define([
 	"sap/ui/thirdparty/URI"
 ], function (ODataContextBinding, ODataListBinding, ODataMetaModel, ODataPropertyBinding,
 		SubmitMode, _GroupLock, _Helper, _MetadataRequestor, _Parser, _Requestor, assert, Log,
-		SyncPromise, CacheManager, Configuration, coreLibrary, Rendering, Message, Messaging,
+		SyncPromise, Configuration, coreLibrary, Messaging, Rendering, CacheManager, Message,
 		BindingMode, BaseContext, Model, OperationMode, URI) {
 	"use strict";
 
@@ -234,7 +234,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.Model
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.118.0
+		 * @version 1.119.1
 		 */
 		ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */{
@@ -465,8 +465,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]
@@ -509,8 +509,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 {string} [oEvent.getParameters.path]
 	 *   The absolute path to the entity which caused the event. The path is only provided for
 	 *   additional property requests; for other requests it is <code>undefined</code>.
@@ -540,8 +540,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.Context} [oEvent.getParameters.context]
 	 *   The property binding's {@link sap.ui.model.Binding#getContext context}, if available
 	 * @param {string} oEvent.getParameters.path