@openui5/sap.ui.core 1.134.0 → 1.135.0

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

@@ -342,7 +342,9 @@ sap.ui.define([
 	 * @param {sap.ui.model.Context} [oContext]
 	 *   The context instance to be used, undefined for absolute bindings
 	 * @param {string} [sGroupId]
-	 *   The group ID used for a side-effects refresh, if applicable
+	 *   The group ID; mandatory if <code>bSideEffectsRefresh</code> is set
+	 * @param {boolean} [bSideEffectsRefresh]
+	 *   Whether to perform a side-effects refresh
 	 * @param {sap.ui.model.odata.v4.lib._Cache} [oOldCache]
 	 *   The old cache, in case it may be reused
 	 * @returns {sap.ui.model.odata.v4.lib._Cache}
@@ -352,7 +354,7 @@ sap.ui.define([
 	 * @private
 	 */
 	ODataBinding.prototype.createAndSetCache = function (mQueryOptions, sResourcePath, oContext,
-			sGroupId, oOldCache) {
+			sGroupId, bSideEffectsRefresh, oOldCache) {
 		var oCache, sDeepResourcePath, iGeneration;
 
 		this.mCacheQueryOptions = Object.assign({}, this.oModel.mUriParameters, mQueryOptions);
@@ -365,7 +367,7 @@ sap.ui.define([
 			} else {
 				sDeepResourcePath = this.oModel.resolve(this.sPath, oContext).slice(1);
 				oCache = this.doCreateCache(sResourcePath, this.mCacheQueryOptions, oContext,
-					sDeepResourcePath, sGroupId, oOldCache);
+					sDeepResourcePath, sGroupId, bSideEffectsRefresh, oOldCache);
 				if (!(this.mParameters && this.mParameters.$$sharedRequest)) {
 					this.mCacheByResourcePath ??= {};
 					this.mCacheByResourcePath[sResourcePath] = oCache;
@@ -375,7 +377,7 @@ sap.ui.define([
 			}
 		} else { // absolute binding
 			oCache = this.doCreateCache(sResourcePath, this.mCacheQueryOptions, undefined,
-				undefined, sGroupId, oOldCache);
+				undefined, sGroupId, bSideEffectsRefresh, oOldCache);
 		}
 		if (oOldCache && oOldCache !== oCache) {
 			this.deregisterChangeListener();
@@ -434,7 +436,9 @@ sap.ui.define([
 	 * @param {string} [sDeepResourcePath=sResourcePath]
 	 *   The deep resource path to be used to build the target path for bound messages
 	 * @param {string} [sGroupId]
-	 *   The group ID used for a side-effects refresh, if applicable
+	 *   The group ID; mandatory if <code>bSideEffectsRefresh</code> is set
+	 * @param {boolean} [bSideEffectsRefresh]
+	 *   Whether to perform a side-effects refresh
 	 * @param {sap.ui.model.odata.v4.lib._Cache} [oOldCache]
 	 *   The old cache, in case it may be reused
 	 * @returns {sap.ui.model.odata.v4.lib._Cache}
@@ -483,7 +487,9 @@ sap.ui.define([
 	 *   Whether to keep existing (late) query options and not to run auto-$expand/$select again
 	 *   (cannot be combined with <code>bIgnoreParentCache</code>!)
 	 * @param {string} [sGroupId]
-	 *   The group ID used for a side-effects refresh, if applicable
+	 *   The group ID; mandatory if <code>bSideEffectsRefresh</code> is set
+	 * @param {boolean} [bSideEffectsRefresh]
+	 *   Whether to perform a side-effects refresh
 	 * @throws {Error}
 	 *   If auto-$expand/$select is still running and query options shall be kept (this case is just
 	 *   not yet implemented and should not be needed)
@@ -491,7 +497,7 @@ sap.ui.define([
 	 * @private
 	 */
 	ODataBinding.prototype.fetchCache = function (oContext, bIgnoreParentCache, bKeepQueryOptions,
-			sGroupId) {
+			sGroupId, bSideEffectsRefresh) {
 		var oCache = this.oCache,
 			oCallToken = {
 				// propagate old cache from first call of fetchCache to the latest call
@@ -517,7 +523,7 @@ sap.ui.define([
 			// asynchronously re-create an equivalent cache, but skip auto-$expand/$select
 			this.oCachePromise = SyncPromise.resolve(Promise.resolve()).then(function () {
 				return that.createAndSetCache(that.mCacheQueryOptions, oCache.getResourcePath(),
-					oContext, sGroupId, oCache);
+					oContext, sGroupId, bSideEffectsRefresh, oCache);
 			});
 			return;
 		}
@@ -555,7 +561,7 @@ sap.ui.define([
 					return that.oModel.waitForKeepAliveBinding(that).then(function () {
 						that.oFetchCacheCallToken = undefined; // cleanup
 						return that.createAndSetCache(mQueryOptions, sResourcePath, oContext,
-							sGroupId, oCallToken.oOldCache);
+							sGroupId, bSideEffectsRefresh, oCallToken.oOldCache);
 					});
 				});
 			}

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.134.0
+		 * @version 1.135.0
 		 *
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
@@ -1133,7 +1133,7 @@ sap.ui.define([
 			return undefined;
 		}
 		return sBindingParameterPath.split("/").map((sSegment, i) => {
-			return sSegment.slice(0, sSegment.lastIndexOf("("))
+			return sSegment.slice(0, sSegment.indexOf("("))
 				+ (i ? sPredicate : sPartnerPredicate);
 		}).join("/");
 	};
@@ -1588,8 +1588,8 @@ sap.ui.define([
 					that.mAggregatedQueryOptions = that.mLateQueryOptions;
 					that.mLateQueryOptions = undefined;
 				}
-				that.fetchCache(that.oContext, false, /*bKeepQueryOptions*/false,
-					bKeepCacheOnError ? sGroupId : undefined);
+				that.fetchCache(that.oContext, false, /*bKeepQueryOptions*/false, sGroupId,
+					bKeepCacheOnError);
 				// Do not fire a change event, or else ManagedObject destroys and recreates the
 				// binding hierarchy causing a flood of events.
 				if (bHasChangeListeners) {

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

@@ -59,7 +59,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.134.0
+		 * @version 1.135.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
@@ -193,14 +193,20 @@ sap.ui.define([
 	/**
 	 * Returns all currently existing contexts of this list binding in no special order.
 	 *
+	 * @param {boolean} [bNoCreated]
+	 *   Whether to exclude created contexts
 	 * @returns {sap.ui.model.odata.v4.Context[]}
 	 *   All currently existing contexts of this list binding, in no special order
 	 *
 	 * @private
 	 * @see #getAllCurrentContexts
 	 */
-	ODataListBinding.prototype._getAllExistingContexts = function () {
-		return (this.aContexts ?? []).filter(function (oContext) {
+	ODataListBinding.prototype._getAllExistingContexts = function (bNoCreated) {
+		let aContexts = this.aContexts ?? [];
+		if (bNoCreated) {
+			aContexts = aContexts.slice(this.iCreatedContexts);
+		}
+		return aContexts.filter(function (oContext) {
 			return oContext;
 		}).concat(Object.values(this.mPreviousContextsByPath).filter(function (oContext) {
 			return oContext.isEffectivelyKeptAlive();
@@ -1500,7 +1506,7 @@ sap.ui.define([
 	 * @see sap.ui.model.odata.v4.ODataBinding#doCreateCache
 	 */
 	ODataListBinding.prototype.doCreateCache = function (sResourcePath, mQueryOptions, oContext,
-			sDeepResourcePath, sGroupId, oOldCache) {
+			sDeepResourcePath, sGroupId, bSideEffectsRefresh, oOldCache) {
 		var oCache,
 			aKeepAlivePredicates,
 			mKeptElementsByPredicate,
@@ -1518,12 +1524,14 @@ sap.ui.define([
 					&& oOldCache instanceof _AggregationCache) {
 				if (bResetViaSideEffects && this.mParameters.$$aggregation?.hierarchyQualifier) {
 					sGroupId = this.getGroupId(); // reset via a side-effects refresh
+					bSideEffectsRefresh = true;
 					oOldCache.resetOutOfPlace();
 				}
+				this.validateSelection(oOldCache, sGroupId);
 				// Note: #inheritQueryOptions as called below should not matter in case of own
 				// requests, which are a precondition for kept-alive elements
-				oOldCache.reset(aKeepAlivePredicates, sGroupId, mQueryOptions,
-					this.mParameters.$$aggregation, this.isGrouped());
+				oOldCache.reset(aKeepAlivePredicates, bSideEffectsRefresh ? sGroupId : undefined,
+					mQueryOptions, this.mParameters.$$aggregation, this.isGrouped());
 
 				return oOldCache;
 			}
@@ -2867,9 +2875,7 @@ sap.ui.define([
 	 * @since 1.91.0
 	 */
 	ODataListBinding.prototype.getCount = function () {
-		var oHeaderContext = this.getHeaderContext();
-
-		return oHeaderContext ? oHeaderContext.getProperty("$count") : undefined;
+		return this.getHeaderContext()?.getProperty("$count");
 	};
 
 	/**
@@ -3306,6 +3312,25 @@ sap.ui.define([
 		return this.mQueryOptions;
 	};
 
+	/**
+	 * Returns the count of selected elements as a number of type <code>Edm.Int64</code>. The count
+	 * is bindable via the header context (see {@link #getHeaderContext}) and path
+	 * <code>$selectionCount</code>; it is either available synchronously or unknown. It is unknown
+	 * if the binding is relative but has no context and also if the list binding's
+	 * {@link sap.ui.model.odata.v4.ODataListBinding#getHeaderContext header context} is selected
+	 * ("select all").
+	 *
+	 * @returns {number|undefined}
+	 *   The count of selected elements or <code>undefined</code> if the count or the header
+	 *   context is not available.
+	 *
+	 * @public
+	 * @since 1.135.0
+	 */
+	ODataListBinding.prototype.getSelectionCount = function () {
+		return this.getHeaderContext()?.getProperty("$selectionCount");
+	};
+
 	/**
 	 * Returns true if the binding has {@link sap.ui.model.Filter.NONE} in its filters.
 	 *
@@ -3628,13 +3653,14 @@ sap.ui.define([
 	 * Moves the given (child) node to the given parent, just before the given next sibling. An
 	 * expanded (child) node is silently collapsed before and expanded after the move. A collapsed
 	 * parent is automatically expanded; so is a leaf. The (child) node is added to the parent at
-	 * its proper position ("in place") and simply "persisted". Specifying a next sibling always
-	 * leads to a subsequent side-effects refresh within the same $batch, but still the moved
-	 * (child) node's index is updated to the new position.
+	 * its proper position ("in place") and simply "persisted". If needed, a subsequent side-effects
+	 * refresh within the same $batch is requested, but still the moved (child) node's index is
+	 * updated to the new position.
 	 *
 	 * @param {sap.ui.model.odata.v4.Context} oChildContext - The (child) node to be moved
 	 * @param {sap.ui.model.odata.v4.Context|null} oParentContext - The new parent's context
 	 * @param {sap.ui.model.odata.v4.Context|null} [oSiblingContext] - The next sibling's context
+	 * @param {boolean} [bCopy] - Whether the node should be copied instead of moved
 	 * @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
@@ -3643,7 +3669,8 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
-	ODataListBinding.prototype.move = function (oChildContext, oParentContext, oSiblingContext) {
+	ODataListBinding.prototype.move = function (oChildContext, oParentContext, oSiblingContext,
+			bCopy) {
 		/*
 		 * Sets the <code>iIndex</code> of every context instance inside the given range. Allows for
 		 * start greater than end and swaps both in that case.
@@ -3681,7 +3708,7 @@ sap.ui.define([
 			: oChildContext.getPath().slice(1);
 		const bUpdateSiblingIndex = oSiblingContext?.isEffectivelyKeptAlive();
 		const {promise : oPromise, refresh : bRefresh} = this.oCache.move(oGroupLock, sChildPath,
-			sParentPath, sSiblingPath, sNonCanonicalChildPath, bUpdateSiblingIndex);
+			sParentPath, sSiblingPath, sNonCanonicalChildPath, bUpdateSiblingIndex, bCopy);
 
 		if (bRefresh) {
 			return SyncPromise.all([
@@ -3887,7 +3914,7 @@ sap.ui.define([
 					oCache.reset([]);
 				} else {
 					that.fetchCache(that.oContext, false, /*bKeepQueryOptions*/true,
-						bKeepCacheOnError ? sGroupId : undefined);
+						sGroupId, bKeepCacheOnError);
 					oKeptElementsPromise = that.refreshKeptElements(sGroupId,
 						/*bIgnorePendingChanges*/ bKeepCacheOnError);
 					if (that.iCurrentEnd > 0) {
@@ -4082,6 +4109,7 @@ sap.ui.define([
 
 					if (!bStillAlive) {
 						bDestroyed = true;
+						oContext.doSetSelected(false, true);
 						oContext.destroy();
 					}
 				}
@@ -4340,8 +4368,7 @@ sap.ui.define([
 	/**
 	 * Requests selected contexts matching the binding's filters and ordered by its sorters. A
 	 * context which is selected but no longer part of this list binding's collection (that is,
-	 * which doesn't match the filters) is not returned but still shown as selected on the UI
-	 * (see {@link #requestSelectionValidation}).
+	 * which doesn't match the filters) is not returned but still shown as selected on the UI.
 	 *
 	 * Note: Data for all selected contexts is reread from the server, even if it is already
 	 * available on the client. Any data updates are reflected on the UI but no order is changed.
@@ -5178,6 +5205,46 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * Validates the selected contexts against the list binding's filter criteria and removes the
+	 * selection from contexts that no longer match.
+	 *
+	 * @param {sap.ui.model.odata.v4.lib._Cache} oCache
+	 *   The cache to be used
+	 * @param {string} [sGroupId]
+	 *   The group ID to be used for the request
+	 *
+	 * @private
+	 */
+	ODataListBinding.prototype.validateSelection = function (oCache, sGroupId) {
+		if (!this.mParameters.$$clearSelectionOnFilter || "$$aggregation" in this.mParameters
+			|| this.oHeaderContext.isSelected()) {
+			return;
+		}
+
+		const aSelectedContexts = this._getAllExistingContexts(true)
+			.filter((oContext) => oContext.isSelected());
+
+		if (!aSelectedContexts.length) {
+			return;
+		}
+
+		const iStartOfPredicate = this.getResolvedPath().length;
+		const aPredicatesIn = aSelectedContexts
+			.map((oContext) => oContext.getPath().slice(iStartOfPredicate));
+		oCache.requestFilteredOrderedPredicates(aPredicatesIn, this.lockGroup(sGroupId), true)
+			.then((aPredicatesOut) => {
+				const oPredicates = new Set(aPredicatesOut);
+				aSelectedContexts.forEach((oContext) => {
+					if (!oPredicates.has(oContext.getPath().slice(iStartOfPredicate))) {
+						oContext.setSelected(false);
+					}
+				});
+			}, (oError) => {
+				this.oModel.reportError("Failed to validate selection", sClassName, oError);
+			});
+	};
+
 	//*********************************************************************************************
 	// "static" functions
 	//*********************************************************************************************

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

@@ -60,7 +60,45 @@ sap.ui.define([
 		oBooleanType,
 		mCodeListUrl2Promise = {},
 		DEBUG = Log.Level.DEBUG,
-		aInt64Names = ["$count", "@$ui5.node.groupLevelCount", "@$ui5.node.level"],
+		oGeoJSON = {
+			$kind : "ComplexType",
+			$OpenType : true,
+			bbox : {
+				$kind : "Property",
+				$Type : "Edm.Double",
+				$isCollection : true
+			},
+			type : {
+				$kind : "Property",
+				$Nullable : false,
+				$Type : "Edm.String"
+			}
+		},
+		oGeometry = {
+			...oGeoJSON, // "$BaseType" : "GeoJSON",
+			coordinates : {
+				$kind : "Property",
+				$Nullable : false,
+				$Type : "Edm.Double",
+				$isCollection : true
+			}
+		},
+		mEdmScope = {
+			"Edm.Geography" : {...oGeoJSON, $Abstract : true},
+			"Edm.GeographyLineString" : oGeometry,
+			"Edm.GeographyMultiLineString" : oGeometry,
+			"Edm.GeographyMultiPoint" : oGeometry,
+			"Edm.GeographyMultiPolygon" : oGeometry,
+			"Edm.GeographyPoint" : oGeometry,
+			"Edm.GeographyPolygon" : oGeometry
+			// Note: same for "Edm.Geometry*", see end of file
+		},
+		aInt64Names = [
+			"$count",
+			"$selectionCount",
+			"@$ui5.node.groupLevelCount",
+			"@$ui5.node.level"
+		],
 		oInt64Type,
 		rLeftBraces = /\$\(/g,
 		rNumber = /^-?\d+$/,
@@ -157,7 +195,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.134.0
+		 * @version 1.135.0
 		 */
 		ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 				constructor : constructor
@@ -1091,7 +1129,7 @@ sap.ui.define([
 			if (!bPrefetch) {
 				aPromises.push(this.oModel._requestAnnotationChanges());
 				this.oMetadataPromise = SyncPromise.all(aPromises).then(function (aMetadata) {
-					var mScope = aMetadata[0];
+					var mScope = Object.assign(aMetadata[0], mEdmScope);
 
 					that.aAnnotationChanges = aMetadata.pop();
 					that._mergeAnnotations(mScope, aMetadata.slice(1));
@@ -1785,7 +1823,7 @@ sap.ui.define([
 				return oProperty["$ui5.type"];
 			}
 
-			if (oProperty.$isCollection) {
+			if (oProperty.$isCollection && !rNumber.test(sLastSegment)) {
 				Log.warning("Unsupported collection type, using " + oType.getName(), sPath,
 					sODataMetaModel);
 			} else {
@@ -2675,6 +2713,22 @@ sap.ui.define([
 	ODataMetaModel.prototype.getValueListType
 		= _Helper.createGetMethod("fetchValueListType", true);
 
+	/**
+	 * Tells whether this metadata model's service prefers requests to use a resource path with
+	 * navigation properties instead of a canonical path, thus reflecting the object composition.
+	 * See "com.sap.vocabularies.Common.v1.AddressViaNavigationPath" for more details.
+	 *
+	 * @returns {boolean|undefined}
+	 *   <code>true</code> if the "com.sap.vocabularies.Common.v1.AddressViaNavigationPath" tag is
+	 *   present, <code>undefined</code> if it is missing or metadata is not (yet) available
+	 *
+	 * @public
+	 * @since 1.135.0
+	 */
+	ODataMetaModel.prototype.isAddressViaNavigationPath = function () {
+		return this.getObject("/@com.sap.vocabularies.Common.v1.AddressViaNavigationPath");
+	};
+
 	/**
 	 * Method not supported
 	 *
@@ -3706,5 +3760,10 @@ sap.ui.define([
 		mCodeListUrl2Promise = {};
 	};
 
+	Object.keys(mEdmScope).forEach((sGeographyName) => {
+		const sGeometryName = sGeographyName.replace("Geography", "Geometry");
+		mEdmScope[sGeometryName] = mEdmScope[sGeographyName];
+	});
+
 	return ODataMetaModel;
 });

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

@@ -240,7 +240,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.Model
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.134.0
+		 * @version 1.135.0
 		 */
 		ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */{
@@ -928,7 +928,11 @@ sap.ui.define([
 	 * @param {boolean} [mParameters.$$clearSelectionOnFilter]
 	 *   Whether the selection state of the list binding is cleared when a filter is changed; this
 	 *   includes dynamic filters, '$filter', '$search', and <code>$$aggregation.search</code>.
-	 *   Supported since 1.120.13.
+	 *   Supported since 1.120.13. Since 1.135.0, the selection state is validated when reloading
+	 *   the list binding's data. The
+	 *   {@link sap.ui.model.odata.v4.Context#isSelected selection states of contexts} which no
+	 *   longer match the current filter are reset. <b>Note:</b> The selection state is not
+	 *   validated if the <code>$$aggregation</code> parameter is used.
 	 * @param {boolean} [mParameters.$$getKeepAliveContext]
 	 *   Whether this binding is considered for a match when {@link #getKeepAliveContext} is called;
 	 *   only the value <code>true</code> is allowed. Must not be combined with <code>$apply</code>,
@@ -1045,6 +1049,14 @@ sap.ui.define([
 	 * is also supported (since 1.130.0) for complex types and collections thereof; for entity
 	 * types, use {@link #bindContext} instead.
 	 *
+	 * Since 1.135.0, the binding may also point to an array element inside a collection of
+	 * primitive type, for example in the context of geography locations. Let's assume
+	 * "GeoLocation" is a structural property of type "Edm.GeographyPoint", then "coordinates" is a
+	 * structural property of type "Collection(Edm.Double)":
+	 * <pre>
+	 * &lt;Text id="longitude" text="{Address/GeoLocation/coordinates/0}"/>
+	 * </pre>
+	 *
 	 * @param {string} sPath
 	 *   The binding path in the model; must not end with a slash
 	 * @param {sap.ui.model.Context} [oContext]

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

@@ -276,7 +276,9 @@ sap.ui.define([
 	/**
 	 * Changes this binding's parameters and refreshes the binding. Since 1.111.0, a list binding's
 	 * header context is deselected, but (since 1.120.13) only if the binding parameter
-	 * '$$clearSelectionOnFilter' is set and the '$filter' or '$search' parameter is changed.
+	 * '$$clearSelectionOnFilter' is set and the '$filter' or '$search' parameter is changed. In all
+	 * other cases, the caller of this method needs to evaluate whether the changed parameters
+	 * invalidate the current selection and then deselect the header context if needed.
 	 *
 	 * If there are pending changes that cannot be ignored, an error is thrown. Use
 	 * {@link #hasPendingChanges} to check if there are such pending changes. If there are, call
@@ -870,7 +872,8 @@ sap.ui.define([
 			}
 
 			if (bDependsOnOperation || sReducedChildMetaPath === "$count"
-					|| sReducedChildMetaPath.endsWith("/$count")) {
+					|| sReducedChildMetaPath.endsWith("/$count")
+					|| sReducedChildMetaPath === "$selectionCount") {
 				return sReducedPath;
 			}
 

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.134.0
+		 * @version 1.135.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
@@ -541,7 +541,8 @@ sap.ui.define([
 			if (that.oCache && that.oCache.reset) {
 				that.oCache.reset();
 			} else {
-				that.fetchCache(that.oContext, false, /*bKeepQueryOptions*/true, bKeepCacheOnError);
+				that.fetchCache(that.oContext, false, /*bKeepQueryOptions*/true, sGroupId,
+					bKeepCacheOnError);
 			}
 
 			if (bCheckUpdate) {

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

@@ -1487,7 +1487,9 @@ sap.ui.define([
 	 * a PATCH request for "<parent navigation>@odata.bind". A <code>null</code> parent turns the
 	 * child into a root. The optional sibling path invokes an action for moving the (child) node
 	 * before the given sibling (or with <code>null</code> to the last sibling position) by sending
-	 * a POST request for the "ChangeNextSiblingAction".
+	 * a POST request for the "ChangeNextSiblingAction". If the optional parameter
+	 * <code>bCopy</code> is set, it invokes an action for copying the (child) node by sending a
+	 * POST request for the "CopyAction".
 	 *
 	 * @param {sap.ui.model.odata.v4.lib._GroupLock} oGroupLock
 	 *   A lock for the group to associate the requests with
@@ -1502,6 +1504,8 @@ sap.ui.define([
 	 *   <code>sSiblingPath</code> is given
 	 * @param {boolean} [bRequestSiblingRank]
 	 *   Whether to request the next sibling's rank and return its new index
+	 * @param {boolean} [bCopy]
+	 *   Whether the node should be copied instead of moved
 	 * @returns {{promise : sap.ui.base.SyncPromise<function():number|number[]>, refresh : boolean}}
 	 *   An object with two properties:
 	 *   - <code>promise</code>: A promise which is resolved when the move is finished, or rejected
@@ -1519,12 +1523,12 @@ sap.ui.define([
 	 * @public
 	 */
 	_AggregationCache.prototype.move = function (oGroupLock, sChildPath, sParentPath, sSiblingPath,
-			sNonCanonicalChildPath, bRequestSiblingRank) {
+			sNonCanonicalChildPath, bRequestSiblingRank, bCopy) {
 		let bRefreshNeeded = !this.bUnifiedCache;
 
 		const sChildPredicate = sChildPath.slice(sChildPath.indexOf("("));
 		const oChildNode = this.aElements.$byPredicate[sChildPredicate];
-		if (this.oTreeState.isOutOfPlace(sChildPredicate)) {
+		if (!bCopy && 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"];
@@ -1579,6 +1583,19 @@ sap.ui.define([
 			}
 		};
 
+		let oCopyActionPromise;
+		if (bCopy) {
+			bRefreshNeeded = true;
+			oCopyActionPromise = this.oRequestor.request("POST", sChildPath + "/"
+					+ this.oAggregation.$Actions.CopyAction, oGroupLock.getUnlockedCopy(), {
+					"If-Match" : oChildNode,
+					Prefer : "return=minimal"
+				}, {});
+			// Note: "$-1" references the previous request. Requests with the same path could
+			// possibly be merged, but it is not allowed to invoke several moves at the same time
+			sChildPath = "$-1";
+		}
+
 		let oPromise = SyncPromise.all([
 			this.oRequestor.request("PATCH", sChildPath, oGroupLock, {
 					"If-Match" : oChildNode,
@@ -1587,10 +1604,11 @@ sap.ui.define([
 				/*fnSubmit*/null, function fnCancel() { /*nothing to do*/ }),
 			invokeNextSibling(),
 			this.requestRank(oChildNode, oGroupLock, bRefreshNeeded),
-			bRequestSiblingRank && this.requestRank(oSiblingNode, oGroupLock, true)
+			bRequestSiblingRank && this.requestRank(oSiblingNode, oGroupLock, true),
+			oCopyActionPromise
 		]);
 
-		if (bRefreshNeeded) {
+		if (bRefreshNeeded) { // side-effects refresh needed
 			oPromise = oPromise.then(([,, iRank, iSiblingRank]) => {
 				return () => { // Note: caller MUST wait for side-effects refresh first
 					return [
@@ -1642,7 +1660,7 @@ sap.ui.define([
 
 				return [iResult, iNewIndex, iCount];
 			});
-		} // else: side-effects refresh needed, nothing to do here!
+		}
 
 		return {promise : oPromise, refresh : bRefreshNeeded};
 	};

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

@@ -294,7 +294,11 @@ sap.ui.define([
 				if (iChangeSetIndex !== undefined && sUrl[0] === "$") {
 					// adjust URL if it starts with a Content-ID reference by adding the change set
 					// index
-					sUrl = sUrl.replace(rContentIdReference, "$&." + iChangeSetIndex);
+					if (sUrl === "$-1") { // reference the previous request
+						sUrl = "$" + (iRequestIndex - 1) + "." + iChangeSetIndex;
+					} else {
+						sUrl = sUrl.replace(rContentIdReference, "$&." + iChangeSetIndex);
+					}
 				}
 
 				aRequestBody = aRequestBody.concat(