@openui5/sap.ui.core 1.94.0 → 1.97.0

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

@@ -652,11 +652,13 @@ sap.ui.define([
 	 *
 	 *   This model is read-only.
 	 *
+	 *   This model is not prepared to be inherited from.
+	 *
 	 * @extends sap.ui.model.MetaModel
 	 * @hideconstructor
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 */
 	var ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 		/*
@@ -1661,7 +1663,7 @@ sap.ui.define([
 
 		// First fetch the complete metapath to ensure that everything is in mScope
 		// This also ensures that the metadata is valid
-		return this.fetchObject(this.getMetaPath(sResolvedPath)).then(function () {
+		return this.fetchObject(_Helper.getMetaPath(sResolvedPath)).then(function () {
 			// Then fetch mScope
 			return that.fetchEntityContainer();
 		}).then(function (mScope) {
@@ -2079,7 +2081,8 @@ sap.ui.define([
 						&& aSegments0[i + 1] === "$Parameter") {
 					// Filter via the binding parameter
 					aOverloadMetadata = that.getObject(
-						that.getMetaPath(aSegments0.slice(0, i + 1).join("/") + "/@$ui5.overload")
+						_Helper.getMetaPath(aSegments0.slice(0, i + 1).join("/")
+							+ "/@$ui5.overload")
 					);
 					// Note: This must be a bound operation with a binding parameter; otherwise it
 					// would be in the first segment and the loop would not touch it due to
@@ -2098,7 +2101,7 @@ sap.ui.define([
 			return j < iBasePathLength || sSegment[0] === "#" || sSegment[0] === "@"
 					|| rNumber.test(sSegment) || sSegment === "$Parameter"
 				? {} // simply an object w/o $Partner and $isCollection
-				: that.getObject(that.getMetaPath(aSegments.slice(0, j + 1).join("/"))) || {};
+				: that.getObject(_Helper.getMetaPath(aSegments.slice(0, j + 1).join("/"))) || {};
 		});
 		mPaths[sPath] = true;
 		if (!(bNoReduceBeforeCollection
@@ -2227,7 +2230,7 @@ sap.ui.define([
 	 * @since 1.37.0
 	 */
 	ODataMetaModel.prototype.getMetaContext = function (sPath) {
-		return new BaseContext(this, this.getMetaPath(sPath));
+		return new BaseContext(this, _Helper.getMetaPath(sPath));
 	};
 
 	/**
@@ -3083,7 +3086,8 @@ sap.ui.define([
 	 *   instead, see {@link sap.ui.model.odata.v4.ODataModel#bindList}.
 	 *
 	 *   For fixed values, only one mapping is expected and the qualifier is ignored. The mapping
-	 *   is available with key "".
+	 *   is available with key "" and has an additional property "$qualifier" which is the original
+	 *   qualifier (useful in case of "ValueListRelevantQualifiers" annotation).
 	 *
 	 *   The promise is rejected with an error if there is no value list information available
 	 *   for the given property path. Use {@link #getValueListType} to determine if value list
@@ -3111,7 +3115,7 @@ sap.ui.define([
 	 */
 	ODataMetaModel.prototype.requestValueListInfo = function (sPropertyPath, bAutoExpandSelect,
 			oContext) {
-		var sPropertyMetaPath = this.getMetaPath(sPropertyPath),
+		var sPropertyMetaPath = _Helper.getMetaPath(sPropertyPath),
 			sParentMetaPath = sPropertyMetaPath.slice(0, sPropertyMetaPath.lastIndexOf("/"))
 				.replace("/$Parameter", ""),
 			sQualifiedName = sParentMetaPath.slice(sParentMetaPath.lastIndexOf("/") + 1),
@@ -3211,7 +3215,7 @@ sap.ui.define([
 					});
 				});
 			})).then(function () {
-				var aQualifiers;
+				var aRelevantQualifiers = mAnnotationByTerm[sValueListRelevantQualifiers];
 
 				// add all mappings in the data service (or local annotation files)
 				Object.keys(mAnnotationByTerm).filter(function (sTerm) {
@@ -3220,28 +3224,36 @@ sap.ui.define([
 					addMapping(mAnnotationByTerm[sTerm], getValueListQualifier(sTerm), that.sUrl,
 						that.oModel);
 				});
-				aQualifiers = Object.keys(oValueListInfo);
 
 				// Each reference must have contributed at least one qualifier. So if oValueListInfo
 				// is empty, there cannot have been a reference.
-				if (!aQualifiers.length) {
+				if (isEmptyObject(oValueListInfo)) {
 					throw new Error("No annotation '" + sValueListReferences.slice(1) + "' for " +
 						sPropertyPath);
 				}
+
+				return aRelevantQualifiers && oContext && oContext.getBinding
+					? that.filterValueListRelevantQualifiers(oValueListInfo, aRelevantQualifiers,
+						sPropertyMetaPath + sValueListRelevantQualifiers, oContext)
+					: oValueListInfo;
+			}).then(function (mValueListByRelevantQualifier) {
+				var aQualifiers, mValueListMapping;
+
 				if (bFixedValues) {
-					// With fixed values, only one mapping may exist. Return it for qualifier "".
-					if (aQualifiers.length > 1) {
+					aQualifiers = Object.keys(mValueListByRelevantQualifier);
+					// With fixed values, only one mapping should exist. Return it for qualifier "".
+					if (aQualifiers.length !== 1) {
 						throw new Error("Annotation '" + sValueListWithFixedValues.slice(1)
-							+ "' but multiple '" + sValueList.slice(1)
+							+ "' but not exactly one '" + sValueList.slice(1)
 							+ "' for property " + sPropertyPath);
 					}
-					return {"" : oValueListInfo[aQualifiers[0]]};
+					mValueListMapping = mValueListByRelevantQualifier[aQualifiers[0]];
+					mValueListMapping.$qualifier = aQualifiers[0];
+
+					return {"" : mValueListMapping};
 				}
-				aQualifiers = mAnnotationByTerm[sValueListRelevantQualifiers];
-				return aQualifiers && oContext && oContext.getBinding
-					? that.filterValueListRelevantQualifiers(oValueListInfo, aQualifiers,
-						sPropertyMetaPath + sValueListRelevantQualifiers, oContext)
-					: oValueListInfo;
+
+				return mValueListByRelevantQualifier;
 			});
 		});
 	};
@@ -3441,4 +3453,4 @@ sap.ui.define([
 	};
 
 	return ODataMetaModel;
-});
+});

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

@@ -175,6 +175,8 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @class Model implementation for OData V4.
 	 *
+	 *   This model is not prepared to be inherited from.
+	 *
 	 *   Every resource path (relative to the service root URL, no query options) according to
 	 *   "4 Resource Path" in specification "OData Version 4.0 Part 2: URL Conventions" is
 	 *   a valid data binding path within this model if a leading slash is added; for example
@@ -208,7 +210,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.Model
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 */
 	var ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */
@@ -221,6 +223,7 @@ sap.ui.define([
 						sParameter,
 						sServiceUrl,
 						oUri,
+						mUriParameters,
 						that = this;
 
 					// do not pass any parameters to Model
@@ -255,7 +258,13 @@ sap.ui.define([
 					}
 					this.sOperationMode = mParameters.operationMode;
 					// Note: strict checking for model's URI parameters, but "sap-*" is allowed
-					this.mUriParameters = this.buildQueryOptions(oUri.query(true), false, true);
+					mUriParameters = this.buildQueryOptions(oUri.query(true), false, true);
+					// BEWARE: these are shared across all bindings!
+					this.mUriParameters = mUriParameters;
+					if (sap.ui.getCore().getConfiguration().getStatistics()) {
+						// Note: this way, "sap-statistics" is not sent within $batch
+						mUriParameters = Object.assign({"sap-statistics" : true}, mUriParameters);
+					}
 					this.sServiceUrl = oUri.query("").toString();
 					this.sGroupId = mParameters.groupId;
 					if (this.sGroupId === undefined) {
@@ -297,7 +306,7 @@ sap.ui.define([
 					// BEWARE: do not share mHeaders between _MetadataRequestor and _Requestor!
 					this.oMetaModel = new ODataMetaModel(
 						_MetadataRequestor.create(this.mMetadataHeaders, sODataVersion,
-							Object.assign({}, this.mUriParameters, mParameters.metadataUrlParams)),
+							Object.assign({}, mUriParameters, mParameters.metadataUrlParams)),
 						this.sServiceUrl + "$metadata", mParameters.annotationURI, this,
 						mParameters.supportReferences);
 					this.oInterface = {
@@ -318,7 +327,7 @@ sap.ui.define([
 						reportTransitionMessages : this.reportTransitionMessages.bind(this)
 					};
 					this.oRequestor = _Requestor.create(this.sServiceUrl, this.oInterface,
-						this.mHeaders, this.mUriParameters, sODataVersion);
+						this.mHeaders, mUriParameters, sODataVersion);
 					this.changeHttpHeaders(mParameters.httpHeaders);
 					if (mParameters.earlyRequests) {
 						this.oMetaModel.fetchEntityContainer(true);
@@ -531,8 +540,8 @@ sap.ui.define([
 	 * @param {boolean} [mParameters.$$inheritExpandSelect]
 	 *   For operation bindings only: Whether $expand and $select from the parent binding are used
 	 *   in the request sent on {@link #execute}. If set to <code>true</code>, the binding must not
-	 *   set the $expand or $select parameter itself, the operation must be bound, and the return
-	 *   value and the binding parameter must belong to the same entity set.
+	 *   set the $expand itself, the operation must be bound, and the return value and the binding
+	 *   parameter must belong to the same entity set.
 	 * @param {boolean} [mParameters.$$ownRequest]
 	 *   Whether the binding always uses an own service request to read its data; only the value
 	 *   <code>true</code> is allowed.
@@ -552,7 +561,7 @@ sap.ui.define([
 	 * @throws {Error}
 	 *   If disallowed binding parameters are provided, for example if the binding parameter
 	 *   $$inheritExpandSelect is set to <code>true</code> and the binding is no operation binding
-	 *   or the binding has one of the parameters $expand or $select.
+	 *   or the binding has the parameter $expand.
 	 *
 	 * @public
 	 * @see sap.ui.model.Model#bindContext
@@ -599,7 +608,7 @@ sap.ui.define([
 	 * resolve to an absolute OData path for an entity set.
 	 *
 	 * @param {string} sPath
-	 *   The binding path in the model; must not be empty or end with a slash
+	 *   The binding path in the model; must not end with a slash
 	 * @param {sap.ui.model.Context} [oContext]
 	 *   The context which is required as base for a relative path
 	 * @param {sap.ui.model.Sorter|sap.ui.model.Sorter[]} [vSorters]
@@ -717,8 +726,7 @@ sap.ui.define([
 	 * transformed into a metadata context (see
 	 * {@link sap.ui.model.odata.v4.ODataMetaModel#getMetaContext}). The part following the
 	 * separator is then interpreted relative to this metadata context, even if it starts with
-	 * a '/'; a trailing '/' is allowed here, see
-	 * {@link sap.ui.model.odata.v4.ODataMetaModel#requestObject} for the effect it has.
+	 * a '/'; see {@link sap.ui.model.odata.v4.ODataMetaModel#requestObject} for more details.
 	 *
 	 * If the target type specified in the corresponding control property's binding info is "any"
 	 * and the binding is relative or points to metadata, the binding may have an object value;
@@ -726,15 +734,20 @@ sap.ui.define([
 	 * be {@link sap.ui.model.BindingMode.OneTime}.
 	 *
 	 * @param {string} sPath
-	 *   The binding path in the model; must not be empty. Must not end with a '/' unless the
-	 *   binding points to metadata.
+	 *   The binding path in the model; must not end with a slash
 	 * @param {sap.ui.model.Context} [oContext]
 	 *   The context which is required as base for a relative path
 	 * @param {object} [mParameters]
 	 *   Map of binding parameters which can be OData query options as specified in
-	 *   "OData Version 4.0 Part 2: URL Conventions" or the binding-specific parameter "$$groupId".
-	 *   All "5.2 Custom Query Options" are allowed except for those with a name starting with
-	 *   "sap-" (unless starting with "sap-valid-"). All other query options lead to an error.
+	 *   "OData Version 4.0 Part 2: URL Conventions" or the binding-specific parameters as specified
+	 *   below. The following OData query options are allowed:
+	 *   <ul>
+	 *     <li> All "5.2 Custom Query Options" except for those with a name starting with "sap-"
+	 *       (unless starting with "sap-valid-")
+	 *     <li> The $apply, $filter, and $search "5.1 System Query Options" if the path ends with a
+	 *       "$count" segment.
+	 *   </ul>
+	 *   All other query options lead to an error.
 	 *   Query options specified for the binding overwrite model query options.
 	 *   Note: The binding only creates its own data service request if it is absolute or if it is
 	 *   relative to a context created via {@link #createBindingContext}. The binding parameters are
@@ -1171,6 +1184,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
+	// eslint-disable-next-line valid-jsdoc -- .@$ui5. is not understood properly
 	ODataModel.prototype.createUI5Message = function (oRawMessage, sResourcePath, sCachePath) {
 		var bIsBound = typeof oRawMessage.target === "string",
 			sMessageLongtextUrl = oRawMessage.longtextUrl,

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

@@ -93,6 +93,15 @@ sap.ui.define([
 	 * @private
 	 */
 
+	/**
+	 * Binding specific code for suspend.
+	 *
+	 * @private
+	 */
+	ODataParentBinding.prototype.doSuspend = function () {
+		// nothing to do here
+	};
+
 	/**
 	 * Fire event 'patchCompleted' to attached listeners, if the last PATCH request is completed.
 	 *
@@ -290,8 +299,8 @@ sap.ui.define([
 	/**
 	 * Changes this binding's parameters and refreshes the binding.
 	 *
-	 * If there are pending changes an error is thrown. Use {@link #hasPendingChanges} to check if
-	 * there are pending changes. If there are changes, call
+	 * 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
 	 * {@link sap.ui.model.odata.v4.ODataModel#submitBatch} to submit the changes or
 	 * {@link sap.ui.model.odata.v4.ODataModel#resetChanges} to reset the changes before calling
 	 * {@link #changeParameters}.
@@ -304,12 +313,14 @@ sap.ui.define([
 	 *   Map of binding parameters, see {@link sap.ui.model.odata.v4.ODataModel#bindList} and
 	 *   {@link sap.ui.model.odata.v4.ODataModel#bindContext}
 	 * @throws {Error}
-	 *   If there are pending changes or if <code>mParameters</code> is missing, contains
-	 *   binding-specific or unsupported parameters, contains unsupported values, or contains the
-	 *   property "$expand" or "$select" when the model is in auto-$expand/$select mode.
-	 *   Since 1.90.0, binding-specific parameters are ignored if they are unchanged. Since 1.93.0,
-	 *   string values for "$expand" and "$select" are ignored if they are unchanged; pending
-	 *   changes are ignored if all parameters are unchanged.
+	 *   If there are pending changes that cannot be ignored or if <code>mParameters</code> is
+	 *   missing, contains binding-specific or unsupported parameters, contains unsupported values,
+	 *   or contains the property "$expand" or "$select" when the model is in auto-$expand/$select
+	 *   mode. Since 1.90.0, binding-specific parameters are ignored if they are unchanged. Since
+	 *   1.93.0, string values for "$expand" and "$select" are ignored if they are unchanged;
+	 *   pending changes are ignored if all parameters are unchanged. Since 1.97.0, pending changes
+	 *   are ignored if they relate to a
+	 *   {@link sap.ui.model.odata.v4.Context#setKeepAlive kept-alive} context of this binding.
 	 *
 	 * @public
 	 * @since 1.45.0
@@ -375,7 +386,7 @@ sap.ui.define([
 		}
 
 		if (sChangeReason) {
-			if (this.hasPendingChanges()) {
+			if (this.hasPendingChanges(true)) {
 				throw new Error("Cannot change parameters due to pending changes");
 			}
 			this.applyParameters(mBindingParameters, sChangeReason);
@@ -425,7 +436,7 @@ sap.ui.define([
 		return this.oCachePromise.then(function (oCache) {
 			if (oCache && that.bRelative) {
 				return that.fetchResourcePath(that.oContext).then(function (sResourcePath) {
-					if (oCache.$resourcePath === sResourcePath) {
+					if (oCache.getResourcePath() === sResourcePath) {
 						return updateDependents();
 					}
 					return that.refreshInternal(""); // entity of context changed
@@ -447,7 +458,7 @@ sap.ui.define([
 	 *   The absolute path to the collection in the cache where to create the entity
 	 * @param {string} sTransientPredicate
 	 *   A (temporary) key predicate for the transient entity: "($uid=...)"
-	 * @param {object} oInitialData
+	 * @param {object} [oInitialData={}]
 	 *   The initial data for the created entity
 	 * @param {function} fnErrorCallback
 	 *   A function which is called with an error object each time a POST request for the create
@@ -472,10 +483,10 @@ sap.ui.define([
 				return oCache.create(oUpdateGroupLock, vCreatePath, sPathInCache,
 					sTransientPredicate, oInitialData, fnErrorCallback, fnSubmitCallback
 				).then(function (oCreatedEntity) {
-					if (oCache.$resourcePath) {
+					if (that.mCacheByResourcePath) {
 						// Ensure that cache containing non-transient created entity is recreated
 						// when the parent binding changes to another row and back again.
-						delete that.mCacheByResourcePath[oCache.$resourcePath];
+						delete that.mCacheByResourcePath[oCache.getResourcePath()];
 					}
 					return oCreatedEntity;
 				});
@@ -565,6 +576,10 @@ sap.ui.define([
 	 *   An entity with the ETag of the binding for which the deletion was requested. This is
 	 *   provided if the deletion is delegated from a context binding with empty path to a list
 	 *   binding.
+	 * @param {boolean} [bDoNotRequestCount]
+	 *   Whether not to request the new count from the server; useful in case of
+	 *   {@link sap.ui.model.odata.v4.Context#replaceWith} where it is known that the count remains
+	 *   unchanged
 	 * @param {function} fnCallback
 	 *   A function which is called after the entity has been deleted from the server and from the
 	 *   cache; the index of the entity is passed as parameter
@@ -578,7 +593,7 @@ sap.ui.define([
 	 * @private
 	 */
 	ODataParentBinding.prototype.deleteFromCache = function (oGroupLock, sEditUrl, sPath,
-			oETagEntity, fnCallback) {
+			oETagEntity, bDoNotRequestCount, fnCallback) {
 		var sGroupId;
 
 		if (this.oCache === undefined) {
@@ -590,10 +605,12 @@ sap.ui.define([
 			if (!this.oModel.isAutoGroup(sGroupId) && !this.oModel.isDirectGroup(sGroupId)) {
 				throw new Error("Illegal update group ID: " + sGroupId);
 			}
-			return this.oCache._delete(oGroupLock, sEditUrl, sPath, oETagEntity, fnCallback);
+			return this.oCache._delete(oGroupLock, sEditUrl, sPath, oETagEntity, bDoNotRequestCount,
+				fnCallback);
 		}
 		return this.oContext.getBinding().deleteFromCache(oGroupLock, sEditUrl,
-			_Helper.buildPath(this.oContext.iIndex, this.sPath, sPath), oETagEntity, fnCallback);
+			_Helper.buildPath(this.oContext.iIndex, this.sPath, sPath), oETagEntity,
+			bDoNotRequestCount, fnCallback);
 	};
 
 	/**
@@ -644,17 +661,16 @@ sap.ui.define([
 		// getBaseForPathReduction must be called early, because the (virtual) parent context may be
 		// lost again when the path is needed
 		var sBaseForPathReduction = this.getBaseForPathReduction(),
-			sBaseMetaPath,
+			sBaseMetaPath = _Helper.getMetaPath(oContext.getPath()),
 			bCacheImmutable,
 			oCanUseCachePromise,
-			sFullMetaPath,
+			// whether this binding is an operation or depends on one
+			bDependsOnOperation = oContext.getPath().includes("(...)"),
 			iIndex = oContext.getIndex(),
 			bIsAdvertisement = sChildPath[0] === "#",
 			oMetaModel = this.oModel.getMetaModel(),
 			aPromises,
 			sResolvedChildPath = this.oModel.resolve(sChildPath, oContext),
-			// whether this binding is an operation or depends on one
-			bDependsOnOperation = oContext.getPath().includes("(...)"),
 			that = this;
 
 		/*
@@ -668,12 +684,27 @@ sap.ui.define([
 			if (bIsAdvertisement) {
 				// Ensure entity type metadata is loaded even for advertisement so that sync access
 				// to key properties is possible
-				return oMetaModel.fetchObject(sFullMetaPath.slice(0,
-					sFullMetaPath.lastIndexOf("/") + 1));
+				return oMetaModel.fetchObject(sBaseMetaPath + "/");
 			}
 
 			return _Helper.fetchPropertyAndType(that.oModel.oInterface.fetchMetadata,
-				sFullMetaPath);
+				getStrippedMetaPath(sResolvedChildPath));
+		}
+
+		/*
+		 * Returns the meta path corresponding to the given path, with its annotation part stripped
+		 * off.
+		 *
+		 * @param {string} sPath - A path
+		 * @returns {string} The meta path with its annotation part stripped off
+		 */
+		function getStrippedMetaPath(sPath) {
+			var iIndex;
+
+			sPath = _Helper.getMetaPath(sPath);
+			iIndex = sPath.indexOf("@"); // Note: sPath[0] !== "@"
+
+			return iIndex > 0 ? sPath.slice(0, iIndex) : sPath;
 		}
 
 		if (bDependsOnOperation && !sResolvedChildPath.includes("/$Parameter/")
@@ -692,8 +723,6 @@ sap.ui.define([
 			|| oContext.isKeepAlive() // kept-alive contexts have no index when not in aContexts
 			|| this.oCache === null
 			|| this.oCache && this.oCache.hasSentRequest();
-		sBaseMetaPath = oMetaModel.getMetaPath(oContext.getPath());
-		sFullMetaPath = oMetaModel.getMetaPath(sResolvedChildPath);
 		aPromises = [
 			this.doFetchQueryOptions(this.oContext),
 			// After access to complete meta path of property, the metadata of all prefix paths
@@ -703,11 +732,11 @@ sap.ui.define([
 			vChildQueryOptions
 		];
 		oCanUseCachePromise = SyncPromise.all(aPromises).then(function (aResult) {
-			var sChildMetaPath,
-				mChildQueryOptions = aResult[2],
+			var mChildQueryOptions = aResult[2],
 				mWrappedChildQueryOptions,
 				mLocalQueryOptions = aResult[0],
 				oProperty = aResult[1],
+				sReducedChildMetaPath,
 				sReducedPath;
 
 			if (Array.isArray(oProperty)) { // Arrays are only used for functions and actions
@@ -716,15 +745,10 @@ sap.ui.define([
 			}
 
 			sReducedPath = oMetaModel.getReducedPath(sResolvedChildPath, sBaseForPathReduction);
-
-			if (sChildPath === "$count" || sChildPath.endsWith("/$count")
-					|| sChildPath[0] === "@") {
-				return sReducedPath;
-			}
-
-			sChildMetaPath = _Helper.getRelativePath(_Helper.getMetaPath(sReducedPath),
+			sReducedChildMetaPath = _Helper.getRelativePath(getStrippedMetaPath(sReducedPath),
 				sBaseMetaPath);
-			if (sChildMetaPath === undefined) {
+
+			if (sReducedChildMetaPath === undefined) {
 				// the child's data does not fit into this bindings's cache, try the parent
 				that.bHasPathReductionToParent = true;
 				return that.oContext.getBinding().fetchIfChildCanUseCache(that.oContext,
@@ -732,7 +756,8 @@ sap.ui.define([
 					vChildQueryOptions);
 			}
 
-			if (bDependsOnOperation) {
+			if (bDependsOnOperation || sReducedChildMetaPath === "$count"
+					|| sReducedChildMetaPath.endsWith("/$count")) {
 				return sReducedPath;
 			}
 
@@ -742,17 +767,18 @@ sap.ui.define([
 				that.bAggregatedQueryOptionsInitial = false;
 			}
 			if (bIsAdvertisement) {
-				mWrappedChildQueryOptions = {"$select" : [sChildMetaPath.slice(1)]};
+				mWrappedChildQueryOptions = {"$select" : [sReducedChildMetaPath.slice(1)]};
 				return that.aggregateQueryOptions(mWrappedChildQueryOptions, sBaseMetaPath,
 						bCacheImmutable)
 					? sReducedPath
 					: undefined;
 			}
-			if (sChildMetaPath === ""
+			if (sReducedChildMetaPath === ""
 				|| oProperty
 				&& (oProperty.$kind === "Property" || oProperty.$kind === "NavigationProperty")) {
 				mWrappedChildQueryOptions = _Helper.wrapChildQueryOptions(sBaseMetaPath,
-					sChildMetaPath, mChildQueryOptions, that.oModel.oInterface.fetchMetadata);
+					sReducedChildMetaPath, mChildQueryOptions,
+					that.oModel.oInterface.fetchMetadata);
 				if (mWrappedChildQueryOptions) {
 					return that.aggregateQueryOptions(mWrappedChildQueryOptions, sBaseMetaPath,
 							bCacheImmutable)
@@ -761,14 +787,14 @@ sap.ui.define([
 				}
 				return undefined;
 			}
-			if (sChildMetaPath === "value") { // symbolic name for operation result
+			if (sReducedChildMetaPath === "value") { // symbolic name for operation result
 				return that.aggregateQueryOptions(mChildQueryOptions, sBaseMetaPath,
 						bCacheImmutable)
 					? sReducedPath
 					: undefined;
 			}
 			Log.error("Failed to enhance query options for auto-$expand/$select as the path '"
-					+ sFullMetaPath + "' does not point to a property",
+					+ sResolvedChildPath + "' does not point to a property",
 				JSON.stringify(oProperty), sClassName);
 			return undefined;
 		}).then(function (sReducedPath) {
@@ -974,13 +1000,14 @@ sap.ui.define([
 	 * @override
 	 * @see sap.ui.model.odata.v4.ODataBinding#hasPendingChangesInDependents
 	 */
-	ODataParentBinding.prototype.hasPendingChangesInDependents = function () {
-		var aDependents = this.getDependentBindings();
-
-		return aDependents.some(function (oDependent) {
+	ODataParentBinding.prototype.hasPendingChangesInDependents = function (bIgnoreKeptAlive) {
+		return this.getDependentBindings().some(function (oDependent) {
 			var oCache = oDependent.oCache,
 				bHasPendingChanges;
 
+			if (bIgnoreKeptAlive && oDependent.oContext.isKeepAlive()) {
+				return false;
+			}
 			if (oCache !== undefined) {
 				// Pending changes for this cache are only possible when there is a cache already
 				if (oCache && oCache.hasPendingChangesForPath("")) {
@@ -992,7 +1019,10 @@ sap.ui.define([
 			if (oDependent.mCacheByResourcePath) {
 				bHasPendingChanges = Object.keys(oDependent.mCacheByResourcePath)
 					.some(function (sPath) {
-						return oDependent.mCacheByResourcePath[sPath].hasPendingChangesForPath("");
+						var oCacheForPath = oDependent.mCacheByResourcePath[sPath];
+
+						return oCacheForPath !== oCache // don't ask again
+							&& oCacheForPath.hasPendingChangesForPath("");
 					});
 				if (bHasPendingChanges) {
 					return true;
@@ -1304,8 +1334,10 @@ sap.ui.define([
 
 	/**
 	 * Suspends this binding. A suspended binding does not fire change events nor does it trigger
-	 * data service requests. Call {@link #resume} to resume the binding.
-	 * Before 1.53.0, this method was not supported and threw an error.
+	 * data service requests. Call {@link #resume} to resume the binding. Before 1.53.0, this method
+	 * was not supported and threw an error. Since 1.97.0, pending changes are ignored if they
+	 * relate to a {@link sap.ui.model.odata.v4.Context#setKeepAlive kept-alive} context of this
+	 * binding.
 	 *
 	 * @throws {Error}
 	 *   If this binding
@@ -1313,7 +1345,7 @@ sap.ui.define([
 	 *   <li>is relative to a {@link sap.ui.model.odata.v4.Context},</li>
 	 *   <li>is an operation binding,</li>
 	 *   <li>has {@link sap.ui.model.Binding#isSuspended} set to <code>true</code>,</li>
-	 *   <li>has pending changes,</li>
+	 *   <li>has pending changes that cannot be ignored,</li>
 	 *   <li>is not a root binding. Use {@link #getRootBinding} to determine the root binding.</li>
 	 *   </ul>
 	 *
@@ -1338,7 +1370,7 @@ sap.ui.define([
 		if (this.bSuspended) {
 			throw new Error("Cannot suspend a suspended binding: " + this);
 		}
-		if (this.hasPendingChanges()) {
+		if (this.hasPendingChanges(true)) {
 			throw new Error("Cannot suspend a binding with pending changes: " + this);
 		}
 
@@ -1348,6 +1380,7 @@ sap.ui.define([
 		});
 		this.oResumePromise.$resolve = fnResolve;
 		this.removeReadGroupLock();
+		this.doSuspend();
 	};
 
 	/**
@@ -1426,7 +1459,6 @@ sap.ui.define([
 		"adjustPredicate",
 		"destroy",
 		"doDeregisterChangeListener",
-		"fetchCache",
 		"getGeneration",
 		"hasPendingChangesForPath"
 	].forEach(function (sMethod) { // method (still) not final, allow for "super" calls

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

@@ -57,14 +57,16 @@ sap.ui.define([
 	 * @mixes sap.ui.model.odata.v4.ODataBinding
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.94.0
+	 * @version 1.97.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#hasPendingChanges as #hasPendingChanges
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#getUpdateGroupId as #getUpdateGroupId
+	 * @borrows sap.ui.model.odata.v4.ODataBinding#hasPendingChanges as #hasPendingChanges
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#isInitial as #isInitial
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#refresh as #refresh
+	 * @borrows sap.ui.model.odata.v4.ODataBinding#requestRefresh as #requestRefresh
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#resetChanges as #resetChanges
+	 * @borrows sap.ui.model.odata.v4.ODataBinding#toString as #toString
 	 */
 	var ODataPropertyBinding
 		= PropertyBinding.extend("sap.ui.model.odata.v4.ODataPropertyBinding", {
@@ -85,16 +87,18 @@ sap.ui.define([
 					this.setIgnoreMessages(mParameters.$$ignoreMessages);
 				} else {
 					this.sGroupId = undefined;
+					this.bNoPatch = false;
 				}
 				this.oCheckUpdateCallToken = undefined;
-				// Note: no system query options supported at property binding
-				this.mQueryOptions = this.oModel.buildQueryOptions(_Helper.clone(mParameters),
-					/*bSystemQueryOptionsAllowed*/false);
-				this.fetchCache(oContext);
 				this.oContext = oContext;
 				this.bHasDeclaredType = undefined; // whether the binding info declares a type
 				this.bInitial = true;
+				// Note: system query options supported at property binding only for ".../$count"
+				this.mQueryOptions = this.oModel.buildQueryOptions(_Helper.clone(mParameters),
+					/*bSystemQueryOptionsAllowed*/sPath.endsWith("$count"));
 				this.vValue = undefined;
+				// BEWARE: #doFetchQueryOptions uses #isRoot which relies on this.oContext!
+				this.fetchCache(oContext);
 				oModel.bindingCreated(this);
 			},
 			metadata : {
@@ -497,7 +501,7 @@ sap.ui.define([
 	 * @see sap.ui.model.odata.v4.ODataBinding#refreshInternal
 	 */
 	ODataPropertyBinding.prototype.refreshInternal = function (_sResourcePathPrefix, sGroupId,
-			bCheckUpdate, _bKeepCacheOnError) {
+			bCheckUpdate, bKeepCacheOnError) {
 		var that = this;
 
 		if (this.isRootBindingSuspended()) {
@@ -505,7 +509,7 @@ sap.ui.define([
 			return SyncPromise.resolve();
 		}
 		return this.oCachePromise.then(function () {
-			that.fetchCache(that.oContext, false, /*bKeepQueryOptions*/true);
+			that.fetchCache(that.oContext, false, /*bKeepQueryOptions*/true, bKeepCacheOnError);
 
 			if (bCheckUpdate) {
 				return that.checkUpdateInternal(undefined, ChangeReason.Refresh, sGroupId);
@@ -793,4 +797,4 @@ sap.ui.define([
 	ODataPropertyBinding.prototype.visitSideEffects = function () {};
 
 	return ODataPropertyBinding;
-});
+});