@openui5/sap.ui.core 1.143.1 → 1.144.0

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 //Provides mixin sap.ui.model.odata.v4.ODataBinding for classes extending sap.ui.model.Binding
@@ -49,8 +49,6 @@ sap.ui.define([
 		this.fnDeregisterChangeListener = undefined;
 		// used to create cache only for the latest call to #fetchCache
 		this.oFetchCacheCallToken = undefined;
-		// query options resulting from child bindings added when this binding already has data
-		this.mLateQueryOptions = undefined;
 		// the absolute binding path (possibly reduced if the binding uses a parent binding's cache)
 		// may be incorrect while cache creation is pending (this.oCache === undefined)
 		this.sReducedPath = undefined;
@@ -418,7 +416,6 @@ sap.ui.define([
 		this.oCache = null;
 		this.oCachePromise = SyncPromise.resolve(null); // be nice to #withCache
 		this.mCacheQueryOptions = undefined;
-		this.mLateQueryOptions = undefined;
 		// resolving functions e.g. for oReadPromise in #checkUpdateInternal may run after destroy
 		// of this binding and must not access the context
 		this.oContext = undefined;
@@ -1427,6 +1424,7 @@ sap.ui.define([
 	 * @since 1.87.0
 	 */
 	ODataBinding.prototype.requestRefresh = function (sGroupId) {
+		// Note: ODPrB does not have mParameters
 		if (!this.mParameters?.$$ownRequest && !this.isRoot()) {
 			throw new Error("Refresh on this binding is not supported");
 		}

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -74,7 +74,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.143.1
+		 * @version 1.144.0
 		 *
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
@@ -1552,7 +1552,9 @@ sap.ui.define([
 		var that = this;
 
 		if (this.oOperation && this.oOperation.bAction !== false) {
-			return SyncPromise.resolve();
+			// there may be dependent bindings that refer the parent entity
+			return this.refreshDependentBindings(sResourcePathPrefix, sGroupId, bCheckUpdate,
+				bKeepCacheOnError);
 		}
 
 		this.bHasFetchedExpandSelectProperties = false;

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -60,7 +60,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.143.1
+		 * @version 1.144.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
@@ -305,6 +305,7 @@ sap.ui.define([
 			sApply = _AggregationHelper.buildApply(mParameters.$$aggregation).$apply;
 		}
 
+		// Note: called from c'tor before mParameters are stored for the 1st time
 		const bResetSelection = this.mParameters?.$$clearSelectionOnFilter
 			&& (aChangedParameters?.includes("$filter") || aChangedParameters?.includes("$search")
 				|| mParameters.$$aggregation?.search !== this.mParameters.$$aggregation?.search);
@@ -734,8 +735,10 @@ sap.ui.define([
 		if (oContext === this.oHeaderContext) {
 			throw new Error("Unsupported header context " + oContext);
 		}
-		if (_Helper.isDataAggregation(this.mParameters)) {
-			throw new Error("Unsupported $$aggregation at " + this);
+		// Context#isAggregated() throws an error if its root binding is suspended; avoid that error
+		// in non data aggregation cases
+		if (_Helper.isDataAggregation(this.mParameters) && oContext?.isAggregated()) {
+			throw new Error("Unsupported on aggregated data: " + oContext);
 		}
 		if (this.bSharedRequest) {
 			throw new Error("Unsupported $$sharedRequest at " + this);
@@ -778,7 +781,7 @@ sap.ui.define([
 
 		iCount ??= this.oCache.collapse(
 			_Helper.getRelativePath(oContext.getPath(), this.oHeaderContext.getPath()),
-			bAll ? this.lockGroup() : undefined, bSilent);
+			bAll ? this.lockGroup() : undefined, bSilent, false, this.getKeepAlivePredicates());
 
 		if (iCount > 0) {
 			const aContexts = this.aContexts;
@@ -1943,7 +1946,7 @@ sap.ui.define([
 	 * Returns a URL by which the complete content of the list can be downloaded in JSON format. The
 	 * request delivers all entities considering the binding's query options (such as filters or
 	 * sorters). Returns <code>null</code> if the binding's filter is
-	 * {@link sap.ui.filter.Filter.NONE}.
+	 * {@link sap.ui.model.Filter.NONE}.
 	 *
 	 * @returns {sap.ui.base.SyncPromise<string|null>}
 	 *   A promise that is resolved with the download URL or <code>null</code>
@@ -1983,7 +1986,7 @@ sap.ui.define([
 	/**
 	 * Requests a $filter query option value for this binding; the value is computed from the
 	 * given arrays of dynamic application and control filters and the given static filter. If
-	 * {@link sap.ui.filter.Filter.NONE} is set as any of the dynamic filters, it will override
+	 * {@link sap.ui.model.Filter.NONE} is set as any of the dynamic filters, it will override
 	 * all static filters.
 	 *
 	 * As a side effect, this method computes <code>$$aggregation.$leafLevelAggregated</code>.
@@ -2247,7 +2250,7 @@ sap.ui.define([
 	 * next one (via offset +1) or the previous one (via offset -1).
 	 *
 	 * @param {sap.ui.model.odata.v4.Context} oNode - A node
-	 * @param {number} iOffset - An offset, either -1 or +1
+	 * @param {number} [iOffset=+1] - An offset, either -1 or +1
 	 * @param {boolean} [bAllowRequest]
 	 *   Whether it is allowed to send a GET request to fetch the sibling
 	 * @returns {sap.ui.model.odata.v4.Context|null|undefined
@@ -2931,7 +2934,7 @@ sap.ui.define([
 	 * If known, the value represents the sum of the element count of the collection on the server
 	 * and the number of {@link sap.ui.model.odata.v4.Context#isInactive active}
 	 * {@link sap.ui.model.odata.v4.Context#isTransient transient} entities created on the client,
-	 * minus the {@link #sap.ui.model.data.v4.Context#delete deleted} entities. Otherwise, it is
+	 * minus the {@link #sap.ui.model.odata.v4.Context#delete deleted} entities. Otherwise, it is
 	 * <code>undefined</code>. The value is a number of type <code>Edm.Int64</code>. Since 1.91.0,
 	 * in case of data aggregation with group levels, the count is the leaf count on the server; it
 	 * is only determined if the <code>$count</code> system query option is given. Since 1.110.0,
@@ -3055,7 +3058,7 @@ sap.ui.define([
 	 * Returns a URL by which the complete content of the list can be downloaded in JSON format. The
 	 * request delivers all entities considering the binding's query options (such as filters or
 	 * sorters). Returns <code>null</code> if the binding's filter is
-	 * {@link sap.ui.filter.Filter.NONE}.
+	 * {@link sap.ui.model.Filter.NONE}.
 
 	 * The returned URL does not specify <code>$skip</code> and <code>$top</code> and leaves it up
 	 * to the server how many rows it delivers. Many servers tend to choose a small limit without
@@ -3208,7 +3211,8 @@ sap.ui.define([
 	 *     <li> the binding's root binding is suspended,
 	 *     <li> the binding is part of a {@link #create deep create} because it is relative to a
 	 *       {@link sap.ui.model.odata.v4.Context#isTransient transient} context,
-	 *     <li> {@link sap.ui.model.odata.v4.Context#setKeepAlive} fails
+	 *     <li> {@link sap.ui.model.odata.v4.Context#setKeepAlive} fails, or
+	 *     <li> data aggregation but no recursive hierarchy (see {@link #setAggregation}) is used.
 	 *   </ul>
 	 *
 	 * @public
@@ -3223,6 +3227,9 @@ sap.ui.define([
 			iPredicateIndex = _Helper.getPredicateIndex(sPath),
 			sResolvedPath = this.getResolvedPath();
 
+		if (_Helper.isDataAggregation(this.mParameters)) {
+			throw new Error("Unsupported $$aggregation at " + this);
+		}
 		this.checkKeepAlive();
 		this.checkSuspended();
 		this.checkTransient();
@@ -3791,21 +3798,19 @@ sap.ui.define([
 		}
 		this.checkSuspended();
 
-		const sUpdateGroupId = this.getUpdateGroupId();
-		const oGroupLock = this.lockGroup(sUpdateGroupId, true, true);
-		const sChildPath = oChildContext.getCanonicalPath().slice(1);
+		const sChildPath = oChildContext.getCanonicalPath().slice(1); // before #lockGroup!
 		const sParentPath = oParentContext === null
 			? null
 			: oParentContext.getCanonicalPath().slice(1); // before #lockGroup!
 		const sSiblingPath = oSiblingContext === null
 			? null
 			: oSiblingContext?.getCanonicalPath().slice(1); // before #lockGroup!
-		const sNonCanonicalChildPath = oSiblingContext === undefined
-			? undefined
-			: oChildContext.getPath().slice(1);
+		const sUpdateGroupId = this.getUpdateGroupId();
+		const oGroupLock = this.lockGroup(sUpdateGroupId, true, true); // after #getCanonicalPath!
 		const bUpdateSiblingIndex = oSiblingContext?.isEffectivelyKeptAlive();
 		const {promise : oPromise, refresh : bRefresh} = this.oCache.move(oGroupLock, sChildPath,
-			sParentPath, sSiblingPath, sNonCanonicalChildPath, bUpdateSiblingIndex, bCopy);
+			oChildContext.getPath().slice(1), sParentPath, sSiblingPath, bUpdateSiblingIndex,
+			bCopy);
 
 		if (bRefresh) {
 			return SyncPromise.all([
@@ -4382,7 +4387,7 @@ sap.ui.define([
 	 * Resolves with a URL by which the complete content of the list can be downloaded in JSON
 	 * format. The request delivers all entities considering the binding's query options (such as
 	 * filters or sorters). Resolves with <code>null</code> if the binding's filter is
-	 * {@link sap.ui.filter.Filter.NONE}.
+	 * {@link sap.ui.model.Filter.NONE}.
 	 *
 	 * The returned URL does not specify <code>$skip</code> and <code>$top</code> and leaves it up
 	 * to the server how many rows it delivers. Many servers tend to choose a small limit without

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -203,7 +203,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.143.1
+		 * @version 1.144.0
 		 */
 		ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 				constructor : constructor
@@ -1405,16 +1405,15 @@ sap.ui.define([
 			 *   binding parameter (bound and unbound cases).
 			 */
 			function isRightOverload(oOverload) {
-				return !oOverload.$IsBound && vBindingParameterType === UNBOUND
-					|| oOverload.$IsBound
-					&& vBindingParameterType === oOverload.$Parameter[0].$Type;
+				return vBindingParameterType
+					=== (oOverload.$IsBound ? oOverload.$Parameter[0].$Type : UNBOUND);
 			}
 
 			/*
 			 * Outputs a log message for the given level. Leads to an <code>undefined</code> result
 			 * in case of a WARNING.
 			 *
-			 * @param {sap.base.Log.Level} iLevel
+			 * @param {module:sap/base/Log.Level} iLevel
 			 *   A log level, either DEBUG or WARNING
 			 * @param {...string} aTexts
 			 *   The main text of the message is constructed from the rest of the arguments by
@@ -1664,7 +1663,9 @@ sap.ui.define([
 									if (sSegment === "@$ui5.overload") {
 										return true;
 									}
-									if (vResult.length !== 1) {
+									if (vResult.length !== 1
+										&& (vBindingParameterType !== UNBOUND
+											|| maybeParameter(sSegment, vResult))) {
 										return log(WARNING, "Expected a single overload, but found "
 											+ vResult.length);
 									}
@@ -2602,7 +2603,7 @@ sap.ui.define([
 			oSharedModel = new this.oModel.constructor({
 				autoExpandSelect : bAutoExpandSelect,
 				groupId : bCopyAnnotations ? undefined : "$direct",
-				httpHeaders : this.oModel.getHttpHeaders(),
+				httpHeaders : this.oModel.getHttpHeaders(), // Note: includes X-CSRF-Token
 				metadataUrlParams : this.sLanguage && {"sap-language" : this.sLanguage},
 				operationMode : OperationMode.Server,
 				serviceUrl : sUrl,
@@ -2617,6 +2618,7 @@ sap.ui.define([
 			oSharedModel.setRetryAfterHandler((oError) => {
 				return this.oModel.getOrCreateRetryAfterPromise(oError);
 			});
+			oSharedModel.oRequestor.copySecurityTokenPromise(this.oModel.oRequestor);
 			mSharedModelByUrl[sMapKey] = oSharedModel;
 		}
 		return oSharedModel;
@@ -3194,7 +3196,7 @@ sap.ui.define([
 	 *
 	 * A segment which represents an OData simple identifier (or the special names "$ReturnType",
 	 * since 1.71.0, or "$Parameter", since 1.73.0) needs special preparations. The same applies to
-	 * the empty segment after a trailing slash.
+	 * the empty segment (typically after a trailing slash).
 	 * <ol>
 	 *   <li> If the current object has a "$Action", "$Function" or "$Type" property, it is used for
 	 *     scope lookup first. This way, "/EMPLOYEES/ENTRYDATE" addresses the same object as
@@ -3223,7 +3225,9 @@ sap.ui.define([
 	 *
 	 *     Operation overloads are then filtered by binding parameter; multiple overloads after
 	 *     filtering are invalid except if addressing all overloads via the segment
-	 *     "@$ui5.overload", for example "/acme.NewAction/@$ui5.overload".
+	 *     "@$ui5.overload", for example "/acme.NewAction/@$ui5.overload". Since 1.144.0, multiple
+	 *     overloads for an unbound function are tolerated when addressing the return type (which is
+	 *     the same for all of them).
 	 *
 	 *     Once a single overload has been determined, its parameters can be immediately addressed,
 	 *     for example "/TEAMS/acme.NewAction/Team_ID", or the special name "$Parameter" can be used

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -240,7 +240,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.Model
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.143.1
+		 * @version 1.144.0
 		 */
 		ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */{
@@ -255,7 +255,7 @@ sap.ui.define([
 	/**
 	 * Constructor for a new ODataModel.
 	 *
-	 * @param {object} mParameters
+	 * @param {object} [mParameters={}]
 	 *   The parameters
 	 * @throws {Error} If an unsupported synchronization mode is given, if the given service root
 	 *   URL does not end with a forward slash, if an unsupported parameter is given, if OData
@@ -2351,8 +2351,8 @@ sap.ui.define([
 	};
 
 	/**
-	 * Creates a lock for a group. {@link sap.ui.model.odata.v4._Requestor#submitBatch} has to wait
-	 * until all locks for <code>sGroupId</code> are unlocked. Delegates to
+	 * Creates a lock for a group. {@link sap.ui.model.odata.v4.lib._Requestor#submitBatch} has to
+	 * wait until all locks for <code>sGroupId</code> are unlocked. Delegates to
 	 * {@link sap.ui.model.odata.v4.lib._Requestor#lockGroup}.
 	 *
 	 * The goal of such a lock is to allow using an API that creates a request in a batch group and
@@ -3106,6 +3106,7 @@ sap.ui.define([
 	 * @private
 	 */
 	ODataModel.prototype.waitForKeepAliveBinding = function (oBinding) {
+		// Note: ODPrB does not have mParameters
 		if (oBinding.mParameters?.$$getKeepAliveContext) {
 			// $$canonicalPath is not allowed, binding path and resource path are (almost) identical
 			const oTemporaryBinding = this.mKeepAliveBindingsByPath[oBinding.getResolvedPath()];

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -38,6 +38,8 @@ sap.ui.define([
 		// the child paths that are handled by the parent binding due to path reduction, see
 		// #fetchIfChildCanUseCache and ODLB#fetchDownloadUrl
 		this.mChildPathsReducedToParent = {};
+		// query options resulting from child bindings added when this binding already has data
+		this.mLateQueryOptions = undefined;
 		// counts the sent but not yet completed PATCHes
 		this.iPatchCounter = 0;
 		// whether all sent PATCHes have been successfully processed
@@ -672,6 +674,7 @@ sap.ui.define([
 		this.aChildCanUseCachePromises = [];
 		// cannot be set to undefined, it might be modified after destruction
 		this.mChildPathsReducedToParent = {};
+		this.mLateQueryOptions = undefined;
 		this.removeReadGroupLock();
 		this.oRefreshPromise = undefined;
 		this.oResumePromise = undefined;

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -42,7 +42,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.143.1
+		 * @version 1.144.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

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -351,13 +351,16 @@ sap.ui.define([
 	 *   Whether no ("change") events should be fired
 	 * @param {boolean} [bNested]
 	 *   Whether the "collapse all" was performed at an ancestor
+	 * @param {string[]} [aKeptElementPredicates]
+	 *   The key predicates for all (effectively) kept-alive elements incl. exceptions of selection
 	 * @returns {number}
 	 *   The number of descendant nodes that were affected
 	 *
 	 * @public
 	 * @see #expand
 	 */
-	_AggregationCache.prototype.collapse = function (sGroupNodePath, oGroupLock, bSilent, bNested) {
+	_AggregationCache.prototype.collapse = function (sGroupNodePath, oGroupLock, bSilent, bNested,
+			aKeptElementPredicates) {
 		const oGroupNode = this.getValue(sGroupNodePath);
 		const oCollapsed = _AggregationHelper.getCollapsedObject(oGroupNode);
 		_Helper.updateAll(bSilent ? {} : this.mChangeListeners, sGroupNodePath, oGroupNode,
@@ -382,13 +385,15 @@ sap.ui.define([
 			if (_Helper.hasPrivateAnnotation(oElement, "placeholder")) {
 				continue;
 			}
+			const sPredicate = _Helper.getPrivateAnnotation(oElement, "predicate");
 			if (bAll && oElement["@$ui5.node.isExpanded"]) {
-				iRemaining -= this.collapse(
-					_Helper.getPrivateAnnotation(oElement, "predicate"), oGroupLock, bSilent, true);
+				iRemaining
+					-= this.collapse(sPredicate, oGroupLock, bSilent, true, aKeptElementPredicates);
 			}
 			// exceptions of selection are effectively kept alive
-			if (!this.isSelectionDifferent(oElement)) {
-				delete aElements.$byPredicate[_Helper.getPrivateAnnotation(oElement, "predicate")];
+			if (!this.isSelectionDifferent(oElement)
+					&& !aKeptElementPredicates?.includes(sPredicate)) {
+				delete aElements.$byPredicate[sPredicate];
 				delete aElements.$byPredicate[
 					_Helper.getPrivateAnnotation(oElement, "transientPredicate")];
 			}
@@ -1602,14 +1607,13 @@ sap.ui.define([
 	 * @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
+	 *   The (child) node's canonical resource path (relative to the service)
+	 * @param {string} sNonCanonicalChildPath
+	 *   The (child) node's non-canonical resource path (relative to the service)
 	 * @param {string|null} sParentPath
-	 *   The parent node's path relative to the cache
+	 *   The parent node's canonical resource path (relative to the service)
 	 * @param {string|null} [sSiblingPath]
-	 *   The next sibling's path relative to the cache
-	 * @param {string} [sNonCanonicalChildPath]
-	 *   The (child) node's non-canonical path (relative to the service); only used when
-	 *   <code>sSiblingPath</code> is given
+	 *   The next sibling's canonical resource path (relative to the service)
 	 * @param {boolean} [bRequestSiblingRank]
 	 *   Whether to request the next sibling's rank and return its new index
 	 * @param {boolean} [bCopy]
@@ -1632,8 +1636,8 @@ sap.ui.define([
 	 *
 	 * @public
 	 */
-	_AggregationCache.prototype.move = function (oGroupLock, sChildPath, sParentPath, sSiblingPath,
-			sNonCanonicalChildPath, bRequestSiblingRank, bCopy) {
+	_AggregationCache.prototype.move = function (oGroupLock, sChildPath, sNonCanonicalChildPath,
+			sParentPath, sSiblingPath, bRequestSiblingRank, bCopy) {
 		let bRefreshNeeded = !this.bUnifiedCache;
 
 		const sChildPredicate = sChildPath.slice(sChildPath.indexOf("("));
@@ -1699,7 +1703,8 @@ sap.ui.define([
 			bRefreshNeeded = true;
 			const mQueryOptions = {$select : []};
 			_Helper.selectKeyProperties(mQueryOptions, this.getTypes()[this.sMetaPath]);
-			const sResourcePath = sChildPath + "/" + this.oAggregation.$Actions.CopyAction
+			const sResourcePath = sNonCanonicalChildPath
+				+ "/" + this.oAggregation.$Actions.CopyAction
 				+ this.oRequestor.buildQueryString(this.sMetaPath, mQueryOptions, false, true);
 			oCopyActionPromise = this.oRequestor.request("POST", sResourcePath,
 				oGroupLock.getUnlockedCopy(), {
@@ -1727,8 +1732,15 @@ sap.ui.define([
 				return () => { // Note: caller MUST wait for side-effects refresh first
 					let oCopyIndexPromise;
 					if (bCopy) {
-						oCopyIndexPromise = this.requestRank(oCopy, oGroupLock, true)
-							.then((iCopyIndex) => this.findIndex(iCopyIndex));
+						const oCandidate = this.aElements.$byPredicate[
+							_Helper.getKeyPredicate(oCopy, this.sMetaPath, this.getTypes())];
+						if (oCandidate) { // copy already inside collection
+							oCopyIndexPromise = SyncPromise.resolve(
+								this.aElements.indexOf(oCandidate));
+						} else {
+							oCopyIndexPromise = this.requestRank(oCopy, oGroupLock, true)
+								.then((iCopyRank) => this.findIndex(iCopyRank));
+						}
 					}
 					return [
 						iRank === undefined ? undefined : this.findIndex(iRank),
@@ -2220,10 +2232,6 @@ sap.ui.define([
 	 */
 	_AggregationCache.prototype.refreshKeptElements = function (oGroupLock, fnOnRemove,
 			bIgnorePendingChanges, _bDropApply) {
-		if (!this.oAggregation.hierarchyQualifier) {
-			return; // no own request for data aggregation
-		}
-
 		// "super" call (like @borrows ...)
 		const fnSuper = this.oFirstLevel.refreshKeptElements;
 		return fnSuper.call(this, oGroupLock, fnOnRemove, bIgnorePendingChanges,
@@ -2533,7 +2541,7 @@ sap.ui.define([
 			this.oBackup.oFirstLevel = this.oFirstLevel;
 			this.oBackup.oGrandTotalPromise = this.oGrandTotalPromise;
 			this.oBackup.bUnifiedCache = this.bUnifiedCache;
-			this.bUnifiedCache = true;
+			this.bUnifiedCache = !!oAggregation.hierarchyQualifier;
 		} else {
 			this.oTreeState.reset();
 		}

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -19,7 +19,7 @@ sap.ui.define([
 	var sClassName = "sap.ui.model.odata.v4.lib._Cache",
 		// Matches if ending with a transient key predicate:
 		//   EMPLOYEE($uid=id-1550828854217-16) -> aMatches[0] === "($uid=id-1550828854217-16)"
-		//   @see sap.base.util.uid
+		//   @see sap/base/util/uid
 		rEndsWithTransientPredicate = /\(\$uid=[-\w]+\)$/,
 		rInactive = /^\$inactive\./,
 		sMessagesAnnotation = "@com.sap.vocabularies.Common.v1.Messages",
@@ -1123,7 +1123,7 @@ sap.ui.define([
 			aPromises = [];
 			mTypeForMetaPath = {};
 			aPromises.push(this.oRequestor.fetchType(mTypeForMetaPath, this.sMetaPath));
-			fetchExpandedTypes(this.sMetaPath, this.mQueryOptions);
+			fetchExpandedTypes(this.sMetaPath, this.mLateExpandSelect || this.mQueryOptions);
 			this.oTypePromise = SyncPromise.all(aPromises).then(function () {
 				return mTypeForMetaPath;
 			});
@@ -1549,7 +1549,7 @@ sap.ui.define([
 	 *
 	 * @abstract
 	 * @function
-	 * @name sap.ui.model.odata.lib._Cache#refreshSingleNoCollection
+	 * @name sap.ui.model.odata.v4.lib._Cache#refreshSingleNoCollection
 	 * @private
 	 */
 
@@ -2621,7 +2621,7 @@ sap.ui.define([
 					}
 					return; // ignore other annotations
 				}
-				if (Array.isArray(vPropertyValue) && sProperty !== sMessageProperty) {
+				if (Array.isArray(vPropertyValue)) {
 					vPropertyValue.$created = 0; // number of (client-side) created elements
 					// compute count
 					const sCount = oInstance[sProperty + "@odata.count"];
@@ -3566,7 +3566,8 @@ sap.ui.define([
 			return _Helper.getPrivateAnnotation(oElement, "predicate") === sPredicate
 				&& Object.keys(oElement).length > 1 // entity has key properties
 				&& !oElement["@$ui5.context.isDeleted"]
-				&& !that.hasPendingChangesForPath(sPredicate, bIgnorePendingChanges);
+				&& !that.hasPendingChangesForPath(sPredicate, bIgnorePendingChanges)
+				&& !that.isAggregated?.(oElement); // no refresh needed for aggregated elements
 		}
 
 		this.checkSharedRequest();
@@ -3606,7 +3607,7 @@ sap.ui.define([
 
 	/**
 	 * @override
-	 * @see sap.ui.model.odata.lib._Cache#refreshSingleNoCollection
+	 * @see sap.ui.model.odata.v4.lib._Cache#refreshSingleNoCollection
 	 */
 	_CollectionCache.prototype.refreshSingleNoCollection = function (oGroupLock, sPath) {
 		return this.requestSideEffects(oGroupLock.getUnlockedCopy(), [_Helper.getMetaPath(sPath)],
@@ -4609,7 +4610,7 @@ sap.ui.define([
 
 	/**
 	 * @override
-	 * @see sap.ui.model.odata.lib._Cache#refreshSingleNoCollection
+	 * @see sap.ui.model.odata.v4.lib._Cache#refreshSingleNoCollection
 	 */
 	_SingleCache.prototype.refreshSingleNoCollection = function (oGroupLock, sPath) {
 		return this.requestSideEffects(oGroupLock.getUnlockedCopy(), [_Helper.getMetaPath(sPath)]);

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */