@openui5/sap.ui.core 1.120.6 → 1.121.0

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

@@ -22,6 +22,7 @@ sap.ui.define([
 	"./ODataTreeBinding",
 	"sap/base/assert",
 	"sap/base/Log",
+	"sap/base/i18n/Localization",
 	"sap/base/security/encodeURL",
 	"sap/base/util/deepEqual",
 	"sap/base/util/deepExtend",
@@ -33,7 +34,6 @@ sap.ui.define([
 	"sap/base/util/uid",
 	"sap/base/util/UriParameters",
 	"sap/ui/base/SyncPromise",
-	"sap/ui/core/Configuration",
 	"sap/ui/core/library",
 	"sap/ui/core/Messaging",
 	"sap/ui/core/message/Message",
@@ -57,8 +57,8 @@ sap.ui.define([
 	"sap/ui/thirdparty/URI",
 	"sap/ui/util/isCrossOriginURL"
 ], function(_CreatedContextsCache, Context, ODataAnnotations, ODataContextBinding, ODataListBinding,
-		ODataTreeBinding, assert, Log, encodeURL, deepEqual, deepExtend, each, extend,
-		isEmptyObject, isPlainObject, merge, uid, UriParameters, SyncPromise, Configuration,
+		ODataTreeBinding, assert, Log, Localization, encodeURL, deepEqual, deepExtend, each,
+		extend, isEmptyObject, isPlainObject, merge, uid, UriParameters, SyncPromise,
 		coreLibrary, Messaging, Message, MessageParser, Supportability,  _Helper, BindingMode,
 		BaseContext, FilterProcessor, Model, CountMode, MessageScope, ODataMetadata, ODataMetaModel,
 		ODataMessageParser,	ODataPropertyBinding, ODataUtils, OperationMode, UpdateMethod, OData,
@@ -139,10 +139,9 @@ sap.ui.define([
 	 * @param {Object<string,string>} [mParameters.headers]
 	 *   Map of custom headers (name/value pairs) like {"myHeader":"myHeaderValue",...}
 	 * @param {boolean} [mParameters.ignoreAnnotationsFromMetadata]
-	 *   <b>Experimental</b> as of version 1.112.0; may change behavior or be removed in future versions.
 	 *   Whether to ignore all annotations from service metadata, so that they are not available as V4 annotations
 	 *   in this model's metamodel; see {@link #getMetaModel}. Only annotations from annotation files are loaded;
-	 *   see the <code>annotationURI</code> parameter.
+	 *   see the <code>annotationURI</code> parameter. Supported since 1.121.0
 	 * @param {boolean} [mParameters.json=true]
 	 *   If set to <code>true</code>, request payloads will be JSON, XML for <code>false</code>
 	 * @param {boolean} [mParameters.loadAnnotationsJoined]
@@ -218,7 +217,7 @@ sap.ui.define([
 	 * This model is not prepared to be inherited from.
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @alias sap.ui.model.odata.v2.ODataModel
@@ -507,7 +506,7 @@ sap.ui.define([
 					this.securityTokenAvailable();
 				}
 			}
-			this.oHeaders["Accept-Language"] = Configuration.getLanguageTag();
+			this.oHeaders["Accept-Language"] = Localization.getLanguageTag().toString();
 
 			// set version to 2.0 because 1.0 does not support e.g. skip/top, inlinecount...
 			// states the version of the Open Data Protocol used by the client to generate the request.
@@ -3153,9 +3152,13 @@ sap.ui.define([
 			bUseUndefinedIfUnresolved) {
 		var oChangedNode, oCodeListPromise, sCodeListTerm, sDataPath, sKey, oMetaContext,
 			oMetaModel, sMetaPath, oOrigNode, sResolvedPath, iSeparator,
-			vUnresolvedDefault = bUseUndefinedIfUnresolved ? undefined : null,
-			oNode = this.isLegacySyntax() ? this.oData : vUnresolvedDefault;
+			vUnresolvedDefault = bUseUndefinedIfUnresolved ? undefined : null;
+		let oNode = vUnresolvedDefault;
 
+		/** @deprecated As of version 1.88.0 */
+		if (this.isLegacySyntax()) {
+			oNode = this.oData;
+		}
 		sResolvedPath = this.resolve(sPath, oContext, this.bCanonicalRequests);
 		if (!sResolvedPath && this.bCanonicalRequests) {
 			sResolvedPath = this.resolve(sPath, oContext);
@@ -3961,7 +3964,7 @@ sap.ui.define([
 	 * @param {map} mRequests Request queue
 	 * @param {string} sGroupId ID of a request group; requests belonging to the same group will be bundled in one batch request
 	 * @param {string} [sChangeSetId] The changeSet Id
-	 * @param {oRequest} oRequest The request
+	 * @param {object} oRequest The request
 	 * @param {function} fnSuccess The success callback function
 	 * @param {function} fnError The error callback function
 	 * @param {object} requestHandle Handle for the requests
@@ -5226,9 +5229,9 @@ sap.ui.define([
 	 */
 	ODataModel.prototype.create = function(sPath, oData, mParameters) {
 		var oRequest, sUrl, oEntityMetadata,
-		oContext, fnSuccess, fnError, mUrlParams, mRequests,
-		mHeaders, aUrlParams, sEtag, sGroupId, sMethod, sChangeSetId, bRefreshAfterChange,
-		bDeferred, that = this, sNormalizedPath, sDeepPath, bCanonical;
+			oContext, fnSuccess, fnError, mUrlParams, mRequests,
+			mHeaders, aUrlParams, sGroupId, sMethod, sChangeSetId, bRefreshAfterChange,
+			bDeferred, that = this, sNormalizedPath, sDeepPath, bCanonical;
 
 		// The object parameter syntax has been used.
 		if (mParameters) {
@@ -5238,7 +5241,6 @@ sap.ui.define([
 			fnError    = mParameters.error;
 			sGroupId	= mParameters.groupId || mParameters.batchGroupId;
 			sChangeSetId	= mParameters.changeSetId;
-			sEtag		= mParameters.eTag;
 			mHeaders	= mParameters.headers;
 			bRefreshAfterChange = mParameters.refreshAfterChange;
 			bCanonical = mParameters.canonicalRequest;
@@ -5259,7 +5261,7 @@ sap.ui.define([
 
 		return this._processRequest(function(requestHandle) {
 			sUrl = that._createRequestUrlWithNormalizedPath(sNormalizedPath, aUrlParams, that.bUseBatch);
-			oRequest = that._createRequest(sUrl, sDeepPath, sMethod, mHeaders, oData, sEtag);
+			oRequest = that._createRequest(sUrl, sDeepPath, sMethod, mHeaders, oData);
 			oRequest.created = true;
 
 			oEntityMetadata = that.oMetadata._getEntityTypeByPath(sNormalizedPath);
@@ -5815,7 +5817,7 @@ sap.ui.define([
 	 * @private
 	 */
 	 ODataModel.prototype._read = function(sPath, mParameters, bSideEffects) {
-		var bCanonical, oContext, fnError, sETag, aFilters, sGroupId, mHeaders, sMethod, oRequest,
+		var bCanonical, oContext, fnError, aFilters, sGroupId, mHeaders, sMethod, oRequest,
 			aSorters, fnSuccess, bUpdateAggregatedMessages, aUrlParams, mUrlParams,
 			that = this;
 
@@ -5847,7 +5849,6 @@ sap.ui.define([
 		mHeaders = this._getHeaders(mHeaders, true);
 
 		sMethod = "GET";
-		sETag = this._getETag(sPath, oContext);
 
 		var oRequestHandle = {
 			abort: function() {
@@ -5878,7 +5879,7 @@ sap.ui.define([
 
 			sUrl = that._createRequestUrlWithNormalizedPath(sResourcePath, aUrlParams,
 				that.bUseBatch);
-			oRequest = that._createRequest(sUrl, sDeepPath, sMethod, mHeaders, null, sETag,
+			oRequest = that._createRequest(sUrl, sDeepPath, sMethod, mHeaders, null, /*sETag*/undefined,
 				undefined, bUpdateAggregatedMessages, bSideEffects);
 
 			mRequests = that.mRequests;
@@ -7189,7 +7190,7 @@ sap.ui.define([
 	 */
 	ODataModel.prototype.createEntry = function (sPath, mParameters) {
 		var bCanonical, sChangeSetId, oContext, fnCreated, pCreate, fnCreatedPromiseResolve,
-			bDeepCreate, sDeepPath, oEntityMetadata, fnError, sETag, sExpand, sGroupId, mHeaders,
+			bDeepCreate, sDeepPath, oEntityMetadata, fnError, sExpand, sGroupId, mHeaders,
 			bInactive, bIsCollection, sKey, sNormalizedPath, vProperties, bRefreshAfterChange,
 			oRequest, mRequests, fnSuccess, sUrl, aUrlParams, mUrlParams,
 			oEntity = {},
@@ -7243,8 +7244,9 @@ sap.ui.define([
 				assert(oEntityMetadata, "No Metadata for collection " + sNormalizedPath + " found");
 				return undefined;
 			}
+			oEntity = bDeepCreate ? {} : that.getForeignKeysFromReferentialConstraints(sNormalizedPath);
 			if (typeof vProperties === "object" && !Array.isArray(vProperties)) {
-				oEntity = merge({}, vProperties);
+				oEntity = merge(oEntity, vProperties);
 			}
 			sEntityType = "" + oEntityMetadata.entityType;
 			oEntitySetMetadata = that.oMetadata._getEntitySetByType(oEntityMetadata);
@@ -7343,7 +7345,6 @@ sap.ui.define([
 				created : {
 					changeSetId : sChangeSetId,
 					error : fnError,
-					eTag : sETag,
 					groupId : sGroupId,
 					headers : mHeaders,
 					key : sNormalizedPath.substring(1), //store path for later POST
@@ -7379,7 +7380,7 @@ sap.ui.define([
 			});
 			oCreatedContext = addEntityToCacheAndCreateContext();
 			sUrl = that._createRequestUrlWithNormalizedPath(sNormalizedPath, aUrlParams, that.bUseBatch);
-			oRequest = that._createRequest(sUrl, sDeepPath, sMethod, mHeaders, oEntity, sETag);
+			oRequest = that._createRequest(sUrl, sDeepPath, sMethod, mHeaders, oEntity);
 
 			if (sExpand) {
 				mExpandHeaders = that._getHeaders(undefined, true);
@@ -7433,7 +7434,6 @@ sap.ui.define([
 			fnSuccess = mParameters.success;
 			fnError   = mParameters.error;
 			fnCreated = mParameters.created;
-			sETag     = mParameters.eTag;
 			mHeaders  = mParameters.headers;
 			mUrlParams = mParameters.urlParameters;
 			bRefreshAfterChange = mParameters.refreshAfterChange;
@@ -7472,6 +7472,36 @@ sap.ui.define([
 		return undefined;
 	};
 
+	/**
+	 * Gets an object with the values for the foreign keys defined by referential constraints for the given path.
+	 *
+	 * @param {string} sNormalizedPath
+	 *   The absolute normalized path to create an entity, see {@link #_normalizePath}
+	 * @returns {Object<string, any>}
+	 *   An object containing the values from the parent entity for the properties defined in the association's
+	 *   referential constraints; if there are no referential constraints defined an empty object is returned
+	 * @private
+	 */
+	ODataModel.prototype.getForeignKeysFromReferentialConstraints = function (sNormalizedPath) {
+		const mSplitPath = this.oMetadata._splitByLastNavigationProperty(sNormalizedPath);
+
+		if (mSplitPath.lastNavigationProperty) {
+			// check referential constraints
+			const oParentEntityType = this.oMetadata._getEntityTypeByName(mSplitPath.pathBeforeLastNavigationProperty);
+			const mSource2TargetProperty = this.oMetadata._getReferentialConstraintsMapping(oParentEntityType,
+				mSplitPath.lastNavigationProperty.slice(1));
+			const oData = this._getObject(mSplitPath.pathBeforeLastNavigationProperty);
+			if (oData) {
+				return Object.keys(mSource2TargetProperty).reduce((oResult, sSourcePropertyName) => {
+					if (oData[sSourcePropertyName]) {
+						oResult[mSource2TargetProperty[sSourcePropertyName]] = oData[sSourcePropertyName];
+					}
+					return oResult;
+				}, {});
+			}
+		}
+		return {};
+	};
 	/**
 	 * Returns whether the given entity has been created using createEntry.
 	 * @param {object} oEntity The entity to check
@@ -7827,9 +7857,9 @@ sap.ui.define([
 	/**
 	 * Sets the {@link sap.ui.core.message.MessageParser} that is invoked upon every back-end request.
 	 *
-	 * This message parser analyzes the response and notifies {@link sap.ui.core.Messaging} about added and deleted messages.
+	 * This message parser analyzes the response and notifies {@link module:sap/ui/core/Messaging} about added and deleted messages.
 	 *
-	 * @param {object|null} [oParser] The {@link sap.ui.core.message.MessageParser} instance that parses the responses and adds messages to {@link sap.ui.core.Messaging}
+	 * @param {object|null} [oParser] The {@link sap.ui.core.message.MessageParser} instance that parses the responses and adds messages to {@link module:sap/ui/core/Messaging}
 	 * @return {this} Model instance for method chaining
 	 */
 	ODataModel.prototype.setMessageParser = function(oParser) {

package/src/sap/ui/model/odata/v2/ODataTreeBinding.js

@@ -102,7 +102,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.TreeBinding
 	 * @hideconstructor
 	 * @public
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 */
 	var ODataTreeBinding = TreeBinding.extend("sap.ui.model.odata.v2.ODataTreeBinding", /** @lends sap.ui.model.odata.v2.ODataTreeBinding.prototype */ {
 
@@ -1999,7 +1999,8 @@ sap.ui.define([
 			aNavPath.splice(0,1);
 		}
 
-		var oRef = this.oModel._getObject(sPath);
+		const oModel = this.getModel();
+		var oRef = oModel._getObject(sPath);
 		if (Array.isArray(oRef)) {
 			this.oKeys[sPath] = oRef;
 			this.oLengths[sPath] = oRef.length;
@@ -2012,8 +2013,8 @@ sap.ui.define([
 		if (sNavPath && oObject[sNavPath]) {
 			if (Array.isArray(oRef)) {
 				oRef.forEach(function(sRef) {
-					var oObject = that.getModel().getData("/" + sRef);
-					that._processODataObject(oObject, "/" + sRef + "/" + sNavPath, aNavPath.join("/"));
+					that._processODataObject(oModel.getProperty("/" + sRef), "/" + sRef + "/" + sNavPath,
+						aNavPath.join("/"));
 				});
 			} else if (typeof oRef === "object") {
 				that._processODataObject(oObject, sPath + "/" + sNavPath, aNavPath.join("/"));

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

@@ -42,7 +42,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.39.0
-		 * @version 1.120.6
+		 * @version 1.121.0
 		 */
 		Context = BaseContext.extend("sap.ui.model.odata.v4.Context", {
 				constructor : constructor
@@ -258,7 +258,9 @@ sap.ui.define([
 	 *   you can use <code>null</code> to prevent the DELETE request in case of a kept-alive context
 	 *   that is not in the collection and of which you know that it does not exist on the server
 	 *   anymore (for example, a draft after activation). Since 1.108.0 the usage of a group ID with
-	 *   {@link sap.ui.model.odata.v4.SubmitMode.API} is possible.
+	 *   {@link sap.ui.model.odata.v4.SubmitMode.API} is possible. Since 1.121.0, you can use the
+	 *   '$single' group ID to send a DELETE request as fast as possible; it will be wrapped in a
+	 *   batch request as for a '$auto' group.
 	 * @param {boolean} [bDoNotRequestCount]
 	 *   Whether not to request the new count from the server; useful in case of
 	 *   {@link #replaceWith} where it is known that the count remains unchanged (since 1.97.0).
@@ -323,7 +325,7 @@ sap.ui.define([
 			oEditUrlPromise = SyncPromise.resolve();
 			bDoNotRequestCount = true;
 		} else {
-			_Helper.checkGroupId(sGroupId);
+			_Helper.checkGroupId(sGroupId, false, true);
 			oEditUrlPromise = this.fetchCanonicalPath().then(function (sCanonicalPath) {
 				return sCanonicalPath.slice(1);
 			});
@@ -367,7 +369,7 @@ sap.ui.define([
 			this.fnOnBeforeDestroy = undefined;
 			fnOnBeforeDestroy();
 		}
-		this.oModel.getDependentBindings(this).forEach(function (oDependentBinding) {
+		this.oModel?.getDependentBindings(this).forEach(function (oDependentBinding) {
 			oDependentBinding.setContext(undefined);
 		});
 		this.oBinding = undefined;
@@ -710,7 +712,7 @@ sap.ui.define([
 	Context.prototype.getAndRemoveCollection = function (sPath) {
 		return this.withCache(function (oCache, sCachePath) {
 			return oCache.getAndRemoveCollection(sCachePath);
-		}, sPath, true).getResult();
+		}, sPath, true).unwrap();
 	};
 
 	/**
@@ -1197,7 +1199,8 @@ sap.ui.define([
 	 * must happen while this move is pending! Omitting a new parent turns this node into a root
 	 * node (since 1.121.0).
 	 *
-	 * This context's {@link #getIndex index} may change and it becomes "created persisted", with
+	 * This context's {@link #getIndex index} may change and, in case of
+	 * <code>oAggregation.expandTo : 1</code>, it becomes "created persisted", with
 	 * {@link #isTransient} returning <code>false</code> etc.
 	 *
 	 * @param {object} [oParameters] - A parameter object
@@ -1376,7 +1379,14 @@ sap.ui.define([
 	 * The header context of a list binding only delivers <code>$count</code> (wrapped in an object
 	 * if <code>sPath</code> is "").
 	 *
-	 * If you want {@link #requestObject} to read fresh data, call {@link #refresh} first.
+	 * In case of a {@link sap.ui.model.odata.v4.ODataContextBinding#getBoundContext context
+	 * binding's bound context} that hasn't requested its data yet, this method causes an initial
+	 * back-end request using the binding's $expand and $select. Once any binding has requested its
+	 * data, this method does <strong>not</strong> cause requests anymore. If you want to read fresh
+	 * data, call {@link #refresh} first. In contrast to {@link #requestProperty}, it is
+	 * <strong>not</strong> possible to cause additional property requests. Access is only to the
+	 * data the context points to (or any part thereof), as defined by the binding's $expand and
+	 * $select (unless this is a header context, see above).
 	 *
 	 * @param {string} [sPath=""]
 	 *   A path relative to this context
@@ -1772,6 +1782,9 @@ sap.ui.define([
 				break;
 			}
 			if (!oBinding.getBoundContext) {
+				if (oBinding.oCache === undefined) {
+					return undefined; // nothing to do - looks like a refresh in progress
+				}
 				throw new Error("Not a context binding: " + oBinding);
 			}
 			oCandidate = oParentContext;

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

@@ -546,13 +546,19 @@ sap.ui.define([
 			// for a virtual context or if below a transient context
 			if (!that.prepareDeepCreate(oContext, mQueryOptions)) {
 				return that.fetchResourcePath(oContext).then(function (sResourcePath) {
-					var oError;
-
 					// create cache only for the latest call to fetchCache
 					if (that.oFetchCacheCallToken !== oCallToken) {
-						oError = new Error("Cache discarded as a new cache has been created");
-						oError.canceled = true;
-						throw oError;
+						// a previous call waits for the current one to finish
+						return that.oCachePromise.then(function (oNewCache) {
+							// the previous call must fail if a new cache was created
+							if (oNewCache === oCallToken.oOldCache) {
+								return oNewCache;
+							}
+							const oError
+								= new Error("Cache discarded as a new cache has been created");
+							oError.canceled = true;
+							throw oError;
+						});
 					}
 					that.oFetchCacheCallToken = undefined; // cleanup
 					return that.createAndSetCache(mQueryOptions, sResourcePath, oContext,

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.120.6
+		 * @version 1.121.0
 		 *
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
@@ -874,8 +874,10 @@ sap.ui.define([
 	 *   used, see {@link sap.ui.model.odata.v4.ODataContextBinding#constructor} and
 	 *   {@link #getGroupId}. To use the update group ID, see {@link #getUpdateGroupId}, it needs to
 	 *   be specified explicitly.
-	 *   Valid values are <code>undefined</code>, '$auto', '$auto.*', '$direct' or application group
-	 *   IDs as specified in {@link sap.ui.model.odata.v4.ODataModel}.
+	 *   Valid values are <code>undefined</code>, '$auto', '$auto.*', '$direct', '$single', or
+	 *   application group IDs as specified in {@link sap.ui.model.odata.v4.ODataModel}. If
+	 *   '$single' is used, the request will be sent as fast as '$direct', but wrapped in a batch
+	 *   request like '$auto' (since 1.121.0).
 	 * @param {boolean} [bIgnoreETag]
 	 *   Whether the entity's ETag should be actively ignored (If-Match:*); supported for bound
 	 *   actions only, since 1.90.0. Ignored if there is no ETag (since 1.93.0).
@@ -963,6 +965,7 @@ sap.ui.define([
 	 *       a row context of a list binding which uses the <code>$$ownRequest</code> parameter (see
 	 *       {@link sap.ui.model.odata.v4.ODataModel#bindList}) and no data aggregation (see
 	 *       {@link sap.ui.model.odata.v4.ODataListBinding#setAggregation}).
+	 *   </ul>
 	 *
 	 * @public
 	 * @since 1.37.0
@@ -972,7 +975,7 @@ sap.ui.define([
 		var sResolvedPath = this.getResolvedPath();
 
 		this.checkSuspended();
-		_Helper.checkGroupId(sGroupId);
+		_Helper.checkGroupId(sGroupId, false, true);
 		if (!this.oOperation) {
 			throw new Error("The binding must be deferred: " + this.sPath);
 		}
@@ -1272,7 +1275,7 @@ sap.ui.define([
 	 * @returns {string|undefined} The path for the return value context or <code>undefined</code>
 	 *   if it is not possible to create one
 	 *
-	 * @privat
+	 * @private
 	 */
 	ODataContextBinding.prototype.getReturnValueContextPath = function (oResponseEntity) {
 		if (!this.hasReturnValueContext()) {

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.120.6
+		 * @version 1.121.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
@@ -437,7 +437,7 @@ sap.ui.define([
 	 *   The context for the created entity
 	 * @param {boolean} oEvent.getParameters.success
 	 *   Whether the POST was successfully processed; in case of an error, the error is already
-	 *   reported to {@link sap.ui.core.Messaging}
+	 *   reported to {@link module:sap/ui/core/Messaging}
 	 *
 	 * @event sap.ui.model.odata.v4.ODataListBinding#createCompleted
 	 * @public
@@ -631,6 +631,9 @@ sap.ui.define([
 		if (!this.oModel.bAutoExpandSelect) {
 			throw new Error("Deep create is only supported with autoExpandSelect");
 		}
+		if (ODataListBinding.isBelowAggregation(this.oContext)) {
+			throw new Error("Deep create is not supported with data aggregation");
+		}
 		if (!this.oContext.isTransient()) {
 			throw new Error("Unexpected ODataContextBinding in deep create");
 		}
@@ -833,6 +836,7 @@ sap.ui.define([
 	 *           {@link sap.ui.model.odata.v4.ODataModel#constructor model} is not set,
 	 *         <li> or a context binding exists in the binding hierarchy between the binding and the
 	 *           parent list binding,
+	 *         <li> the parent list binding uses {@link #setAggregation data aggregation},
 	 *         <li> or its path contains more than a single navigation property (for example
 	 *           "BP_2_SO/SO_2_SOITEM"),
 	 *       </ul>
@@ -1348,7 +1352,11 @@ sap.ui.define([
 		if (oOldCache && oOldCache.getResourcePath() === sResourcePath
 				&& oOldCache.$deepResourcePath === sDeepResourcePath) {
 			aKeepAlivePredicates = this.getKeepAlivePredicates();
-			if (this.iCreatedContexts || this.iDeletedContexts || aKeepAlivePredicates.length) {
+			if (this.iCreatedContexts || this.iDeletedContexts || aKeepAlivePredicates.length
+					// the cache in a recursive hierarchy must be reused (to keep the tree state)
+					// but immediately after #setAggregation it might still be a _CollectionCache
+					|| this.mParameters.$$aggregation?.hierarchyQualifier
+					&& oOldCache instanceof _AggregationCache) {
 				// 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,
@@ -1503,6 +1511,9 @@ sap.ui.define([
 				this.fireDataRequested();
 			}
 		).then((iCount) => {
+			if (iCount < 0) { // side-effects expand
+				return this.requestSideEffects(this.getGroupId(), [""]);
+			}
 			if (iCount) {
 				this.insertGap(oContext.getModelIndex(), iCount);
 				if (!bSilent) {
@@ -1874,7 +1885,7 @@ sap.ui.define([
 	  * @param {boolean} [bAllowRequest]
 	 *   Whether it is allowed to send a GET request to fetch the parent node's data
 	 * @returns {sap.ui.model.odata.v4.Context|null|undefined|
-	 *     Promise<sap.ui.model.odata.v4.Context>|sap.ui.base.SyncPromise}
+	 *     Promise<sap.ui.model.odata.v4.Context>}
 	 *   <ul>
 	 *     <li> The parent node if already known,
 	 *     <li> <code>null</code> if the given node is a root node and thus has no parent,
@@ -1902,20 +1913,17 @@ sap.ui.define([
 			return null;
 		}
 
-		if (iParentIndex === undefined && bAllowRequest) {
-			return this.oCache.fetchParent(oNode.iIndex, this.lockGroup()).then((oResult) => {
-				const sPath = this.getResolvedPath()
-					+ _Helper.getPrivateAnnotation(oResult, "predicate");
-				const oParentContext = Context.create(this.oModel, this, sPath);
-				this.mPreviousContextsByPath[sPath] = oParentContext;
-
-				return oParentContext;
-			});
+		const requestContext = (iIndex) => {
+			return this.requestContexts(iIndex, 1).then((aResult) => aResult[0]);
+		};
+		if (bAllowRequest) {
+			if (iParentIndex === undefined) {
+				return this.oCache.fetchParentIndex(oNode.iIndex, this.lockGroup())
+					.then(requestContext);
+			}
+			return requestContext(iParentIndex);
 		}
-
-		return bAllowRequest
-			? this.requestContexts(iParentIndex, 1).then((aResult) => aResult[0])
-			: this.aContexts[iParentIndex];
+		return this.aContexts[iParentIndex];
 	};
 
 	/**
@@ -2011,11 +2019,13 @@ sap.ui.define([
 	 * Please use either the automatic grouping of filters (where applicable) or explicit
 	 * AND/OR filters, as a mixture of both is not supported.
 	 *
-	 * @param {sap.ui.model.Filter|sap.ui.model.Filter[]} [vFilters]
-	 *   The dynamic filters to be used; replaces the dynamic filters given in
-	 *   {@link sap.ui.model.odata.v4.ODataModel#bindList}.
-	 *   The filter executed on the list is created from the following parts, which are combined
-	 *   with a logical 'and':
+	 * @param {sap.ui.model.Filter|sap.ui.model.Filter[]} [vFilters=[]]
+	 *   The dynamic filters to be used; in case of type {@link sap.ui.model.FilterType.Application}
+	 *   this replaces the dynamic filters given in
+	 *   {@link sap.ui.model.odata.v4.ODataModel#bindList}. A nullish or missing value is treated as
+	 *   an empty array and thus removes all dynamic filters of the specified type. The filter
+	 *   executed on the list is created from the following parts, which are combined with a logical
+	 *   'and':
 	 *   <ul>
 	 *     <li> Dynamic filters of type {@link sap.ui.model.FilterType.Application}
 	 *     <li> Dynamic filters of type {@link sap.ui.model.FilterType.Control}
@@ -2957,11 +2967,11 @@ sap.ui.define([
 	 * @override
 	 * @see sap.ui.model.odata.v4.ODataBinding#hasPendingChangesForPath
 	 */
-	ODataListBinding.prototype.hasPendingChangesForPath = function (_sPath) {
+	ODataListBinding.prototype.hasPendingChangesForPath = function (_sPath, bIgnoreKeptAlive) {
 		if (this.oCache === undefined) {
 			// as long as cache is not yet known there can be only changes caused by created
 			// entities; sPath does not matter
-			return this.iActiveContexts > 0;
+			return !bIgnoreKeptAlive && this.iActiveContexts > 0;
 		}
 		return asODataParentBinding.prototype.hasPendingChangesForPath.apply(this, arguments);
 	};
@@ -3251,7 +3261,7 @@ sap.ui.define([
 		if (!oAggregation || !oAggregation.hierarchyQualifier) {
 			throw new Error("Missing recursive hierarchy");
 		}
-		if (oAggregation.expandTo > 1 && oAggregation.expandTo < 999) {
+		if (oAggregation.expandTo > 1 && oAggregation.expandTo < Number.MAX_SAFE_INTEGER) {
 			throw new Error("Unsupported $$aggregation.expandTo: " + oAggregation.expandTo);
 		} // Note: undefined is well allowed!
 
@@ -3283,7 +3293,7 @@ sap.ui.define([
 				setIndices(iParentIndex + 1, iChildIndex);
 			} // else: iChildIndex === iParentIndex + 1 => nothing to do
 
-			if (!oChildContext.created() && !(oAggregation.expandTo > 1)) {
+			if (!oChildContext.created() && oAggregation.expandTo === 1) {
 				oChildContext.setCreatedPersisted();
 			}
 
@@ -3380,7 +3390,7 @@ sap.ui.define([
 		// (in #adjustPredicate)
 		this.mCacheQueryOptions = mQueryOptions;
 
-		if (!this.oModel.bAutoExpandSelect) {
+		if (!this.oModel.bAutoExpandSelect || ODataListBinding.isBelowAggregation(oContext)) {
 			// No deep create possible, but it must not create its own cache. It remains empty and
 			// silent until the parent binding created the entity. Then it creates a cache (in
 			// #adjustPredicate) and requests from the back end.
@@ -3997,7 +4007,7 @@ sap.ui.define([
 	 * @param {sap.ui.model.ChangeReason} [sChangeReason]
 	 *   A change reason; if given, a refresh event with this reason is fired and the next
 	 *   getContexts() fires a change event with this reason. Change reason "change" is ignored
-	 *   as long as the binding is still empty.
+	 *   as long as the binding is still empty. Ignored for an unresolved binding.
 	 * @param {boolean} [bDrop]
 	 *   By default, all created persisted contexts are dropped while transient ones are not.
 	 *   (Deleted contexts are not affected here.) <code>true</code> also drops transient ones, and
@@ -4058,7 +4068,8 @@ sap.ui.define([
 		// Note: the binding's length can be greater than this.iMaxLength due to iCreatedContexts!
 		this.iMaxLength = Infinity;
 		this.bLengthFinal = false;
-		if (sChangeReason && !(bEmpty && sChangeReason === ChangeReason.Change)) {
+		if (sChangeReason && !(bEmpty && sChangeReason === ChangeReason.Change)
+				&& this.isResolved()) {
 			this.sChangeReason = sChangeReason;
 			this._fireRefresh({reason : sChangeReason});
 		}
@@ -4423,11 +4434,11 @@ sap.ui.define([
 	 * {@link sap.ui.model.odata.v4.ODataModel#resetChanges} to reset the changes before calling
 	 * {@link #sort}.
 	 *
-	 * @param {sap.ui.model.Sorter | sap.ui.model.Sorter[]} [vSorters]
+	 * @param {sap.ui.model.Sorter | sap.ui.model.Sorter[]} [vSorters=[]]
 	 *   The dynamic sorters to be used; they replace the dynamic sorters given in
-	 *   {@link sap.ui.model.odata.v4.ODataModel#bindList}.
-	 *   Static sorters, as defined in the '$orderby' binding parameter, are always executed after
-	 *   the dynamic sorters.
+	 *   {@link sap.ui.model.odata.v4.ODataModel#bindList}. A nullish or missing value is treated as
+	 *   an empty array and thus removes all dynamic sorters. Static sorters, as defined in the
+	 *   '$orderby' binding parameter, are always executed after the dynamic sorters.
 	 * @returns {this}
 	 *   <code>this</code> to facilitate method chaining
 	 * @throws {Error}
@@ -4683,6 +4694,18 @@ sap.ui.define([
 		return aFilters.length === 1 ? aFilters[0] : new Filter({and : true, filters : aFilters});
 	};
 
+	/**
+	 * Returns whether this binding is below an ODLB with data aggregation.
+	 *
+	 * @param {sap.ui.model.Context} [oContext] - The context
+	 * @returns {boolean} Whether this binding is below an ODLB with data aggregation
+	 *
+	 * @private
+	 */
+	ODataListBinding.isBelowAggregation = function (oContext) {
+		return !!oContext?.getBinding?.().getAggregation?.();
+	};
+
 	/**
 	 * Returns whether the given context is created persisted or below a created persisted one.
 	 *

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

@@ -156,7 +156,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.120.6
+		 * @version 1.121.0
 		 */
 		ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 				constructor : constructor
@@ -2979,9 +2979,12 @@ sap.ui.define([
 	 *   The context to be used as a starting point in case of a relative path
 	 * @param {object} [mParameters]
 	 *   Optional (binding) parameters; if they are given, <code>oContext</code> cannot be omitted
-	 * @param {object} [mParameters.scope]
-	 *   Scope for lookup of aliases for computed annotations (since 1.43.0). Since 1.120.3 looking
-	 *   up a computed annotation via its global name is deprecated; always use this scope instead.
+	 * @param {Object<object|function>} [mParameters.scope]
+	 *   Scope for lookup of aliases for computed annotations (since 1.43.0) as a map from alias to
+	 *   a module (like <code>{AH : AnnotationHelper}</code>) or function (like
+	 *   <code>{format : AnnotationHelper.format}</code>); the alias must not contain a dot.
+	 *   Since 1.120.3 looking up a computed annotation via its global name is deprecated; always
+	 *   use this scope instead.
 	 * @returns {Promise<any>}
 	 *   A promise which is resolved with the requested metadata value as soon as it is available;
 	 *   it is rejected if the requested metadata cannot be loaded