@openui5/sap.ui.core 1.115.1 → 1.117.0

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

@@ -87,7 +87,8 @@ sap.ui.define([
 			sharedRequests : true,
 			supportReferences : true,
 			synchronizationMode : true,
-			updateGroupId : true
+			updateGroupId : true,
+			withCredentials : true
 		},
 		// system query options allowed in mParameters
 		aSystemQueryOptions = ["$apply", "$count", "$expand", "$filter", "$orderby", "$search",
@@ -174,12 +175,16 @@ sap.ui.define([
 		 *   (Controls synchronization between different bindings which refer to the same data for
 		 *   the case data changes in one binding. Must be set to 'None' which means bindings are
 		 *   not synchronized at all; all other values are not supported and lead to an error.)
-		 *   <b>deprecated:</b> As of version 1.110.0, this parameter is optional; see also
+		 *   <b>deprecated:</b> As of Version 1.110.0, this parameter is optional; see also
 		 *   {@link topic:648e360fa22d46248ca783dc6eb44531 Data Reuse}
 		 * @param {string} [mParameters.updateGroupId]
 		 *   The group ID that is used for update requests. If no update group ID is specified,
 		 *   <code>mParameters.groupId</code> is used. Valid update group IDs are
 		 *   <code>undefined</code>, '$auto', '$direct' or an application group ID.
+		 * @param {boolean} [mParameters.withCredentials]
+		 *   Whether the XMLHttpRequest is called with <code>withCredentials</code>, so that user
+		 *   credentials are included in cross-origin requests by the browser (@experimental as of
+		 *   Version 1.117.0)
 		 * @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 system query options or parameter aliases are specified as parameters, if an
@@ -228,7 +233,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.Model
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.115.1
+		 * @version 1.117.0
 		 */
 		ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */{
@@ -347,13 +352,13 @@ sap.ui.define([
 		mQueryParams = Object.assign({}, mUriParameters, mParameters.metadataUrlParams);
 		this.oMetaModel = new ODataMetaModel(
 			_MetadataRequestor.create(this.mMetadataHeaders, sODataVersion,
-				mParameters.ignoreAnnotationsFromMetadata, mQueryParams),
+				mParameters.ignoreAnnotationsFromMetadata, mQueryParams,
+				mParameters.withCredentials),
 			this.sServiceUrl + "$metadata", mParameters.annotationURI, this,
 			mParameters.supportReferences, mQueryParams["sap-language"]);
 		this.oInterface = {
 			fetchEntityContainer : this.oMetaModel.fetchEntityContainer.bind(this.oMetaModel),
 			fetchMetadata : this.oMetaModel.fetchObject.bind(this.oMetaModel),
-			fireMessageChange : this.fireMessageChange.bind(this),
 			fireDataReceived : this.fireDataReceived.bind(this),
 			fireDataRequested : this.fireDataRequested.bind(this),
 			fireSessionTimeout : function () {
@@ -372,10 +377,13 @@ sap.ui.define([
 				}
 			},
 			reportStateMessages : this.reportStateMessages.bind(this),
-			reportTransitionMessages : this.reportTransitionMessages.bind(this)
+			reportTransitionMessages : this.reportTransitionMessages.bind(this),
+			updateMessages : function (aOldMessages, aNewMessages) {
+				MessageManager.updateMessages(aOldMessages, aNewMessages);
+			}
 		};
 		this.oRequestor = _Requestor.create(this.sServiceUrl, this.oInterface, this.mHeaders,
-			mUriParameters, sODataVersion);
+			mUriParameters, sODataVersion, mParameters.withCredentials);
 		this.changeHttpHeaders(mParameters.httpHeaders);
 		this.bEarlyRequests = mParameters.earlyRequests;
 		if (this.bEarlyRequests) {
@@ -455,12 +463,12 @@ sap.ui.define([
 	 * the entity is also available.
 	 *
 	 * @param {sap.ui.base.Event} oEvent
-	 * @param {object} oEvent.getParameters()
-	 * @param {object} [oEvent.getParameters().data]
+	 * @param {object} oEvent.getParameters
+	 * @param {object} [oEvent.getParameters.data]
 	 *   An empty data object if a back-end request succeeds
-	 * @param {Error} [oEvent.getParameters().error]
+	 * @param {Error} [oEvent.getParameters.error]
 	 *   The error object if a back-end request failed.
-	 * @param {string} [oEvent.getParameters().path]
+	 * @param {string} [oEvent.getParameters.path]
 	 *   The absolute path to the entity which caused the event. The path is only provided for
 	 *   additional property requests; for other requests it is <code>undefined</code>.
 	 *
@@ -497,8 +505,8 @@ sap.ui.define([
 	 * </ul>
 	 *
 	 * @param {sap.ui.base.Event} oEvent
-	 * @param {object} oEvent.getParameters()
-	 * @param {string} [oEvent.getParameters().path]
+	 * @param {object} oEvent.getParameters
+	 * @param {string} [oEvent.getParameters.path]
 	 *   The absolute path to the entity which caused the event. The path is only provided for
 	 *   additional property requests; for other requests it is <code>undefined</code>.
 	 *
@@ -526,20 +534,20 @@ sap.ui.define([
 	 * not user input.
 	 *
 	 * @param {sap.ui.base.Event} oEvent
-	 * @param {object} oEvent.getParameters()
-	 * @param {sap.ui.model.Context} [oEvent.getParameters().context]
+	 * @param {object} oEvent.getParameters
+	 * @param {sap.ui.model.Context} [oEvent.getParameters.context]
 	 *   The property binding's {@link sap.ui.model.Binding#getContext context}, if available
-	 * @param {string} oEvent.getParameters().path
+	 * @param {string} oEvent.getParameters.path
 	 *   The property binding's {@link sap.ui.model.Binding#getPath path}
-	 * @param {Promise} [oEvent.getParameters().promise]
+	 * @param {Promise<void>} [oEvent.getParameters.promise]
 	 *   A promise on the outcome of the PATCH request, much like
 	 *   {@link sap.ui.model.odata.v4.Context#setProperty} provides it for
 	 *   <code>bRetry === true</code>; missing in case there is no PATCH
-	 * @param {sap.ui.model.ChangeReason} oEvent.getParameters().reason
+	 * @param {sap.ui.model.ChangeReason} oEvent.getParameters.reason
 	 *   The reason for the property change: always <code>sap.ui.model.ChangeReason.Binding</code>
-	 * @param {string} oEvent.getParameters().resolvedPath
+	 * @param {string} oEvent.getParameters.resolvedPath
 	 *   The property binding's {@link sap.ui.model.Binding#getResolvedPath resolved path}
-	 * @param {any} oEvent.getParameters().value
+	 * @param {any} oEvent.getParameters.value
 	 *   The property binding's new
 	 *   {@link sap.ui.model.odata.v4.ODataPropertyBinding#getValue value}
 	 *
@@ -1498,10 +1506,10 @@ sap.ui.define([
 	 *   If <code>true</code>, deletion fails if the entity does not exist (HTTP status code 404 or
 	 *   412 due to the <code>If-Match: *</code> header); otherwise we assume that it has already
 	 *   been deleted by someone else and report success
-	 * @returns {Promise}
-	 *   A promise resolving when the delete succeeded, and rejecting with an instance of Error
-	 *   otherwise. In the latter case the HTTP status code of the response is given in the error's
-	 *   property <code>status</code>.
+	 * @returns {Promise<void>}
+	 *   A promise which is resolved without a defined result when the delete succeeded, or rejected
+	 *   with an instance of Error otherwise. In the latter case the HTTP status code of the
+	 *   response is given in the error's property <code>status</code>.
 	 * @throws {Error} If
 	 *   <ul>
 	 *     <li> the path does not start with a '/',
@@ -1543,6 +1551,7 @@ sap.ui.define([
 			).catch(function (oError) {
 				if (bRejectIfNotFound
 						|| !(oError.status === 404 || bInAllBindings && oError.status === 412)) {
+					that.reportError("Failed to delete " + aResults[0], sClassName, oError);
 					throw oError;
 				} // else: map 404/412 to 204
 			}).then(function () {
@@ -1708,10 +1717,6 @@ sap.ui.define([
 		}
 	};
 
-	ODataModel.prototype.fireMessageChange = function (mParameters) {
-		MessageManager.updateMessages(mParameters.oldMessages, mParameters.newMessages);
-	};
-
 	/**
 	 * Returns the model's bindings.
 	 *
@@ -2408,7 +2413,7 @@ sap.ui.define([
 			});
 		});
 		if (aNewMessages.length || aOldMessages.length) {
-			this.fireMessageChange({newMessages : aNewMessages, oldMessages : aOldMessages});
+			MessageManager.updateMessages(aOldMessages, aNewMessages);
 		}
 	};
 
@@ -2427,12 +2432,10 @@ sap.ui.define([
 		var that = this;
 
 		if (aMessages && aMessages.length) {
-			this.fireMessageChange({
-				newMessages : aMessages.map(function (oMessage) {
-					oMessage.transition = true;
-					return that.createUI5Message(oMessage, sResourcePath);
-				})
-			});
+			MessageManager.updateMessages(undefined, aMessages.map(function (oMessage) {
+				oMessage.transition = true;
+				return that.createUI5Message(oMessage, sResourcePath);
+			}));
 		}
 	};
 
@@ -2525,7 +2528,7 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.model.odata.v4.Context} oEntityContext
 	 *   A context in this model which must point to a non-contained OData entity
-	 * @returns {Promise}
+	 * @returns {Promise<string>}
 	 *   A promise which is resolved with the canonical path (e.g. "/SalesOrderList('0500000000')")
 	 *   in case of success, or rejected with an instance of <code>Error</code> in case of failure,
 	 *   e.g. when the given context does not point to an entity
@@ -2570,8 +2573,8 @@ sap.ui.define([
 	 *   The absolute paths to request side effects for; each path must not start with the fully
 	 *   qualified container name.
 	 * @returns {sap.ui.base.SyncPromise|undefined}
-	 *   A promise resolving without a defined result, or rejecting with an error if loading of side
-	 *   effects fails, or <code>undefined</code> if there is nothing to do
+	 *   A promise which is resolved without a defined result, or rejected with an error if loading
+	 *   of side effects fails, or <code>undefined</code> if there is nothing to do
 	 *
 	 * @private
 	 */
@@ -2789,8 +2792,8 @@ sap.ui.define([
 	 *
 	 * @param {string} sGroupId
 	 *   A valid group ID as specified in {@link sap.ui.model.odata.v4.ODataModel}.
-	 * @returns {Promise<undefined>}
-	 *   A promise on the outcome of the HTTP request resolving with <code>undefined</code>; it is
+	 * @returns {Promise<void>}
+	 *   A promise which is resolved without a defined result on the outcome of the HTTP request, or
 	 *   rejected with an error if the batch request itself fails
 	 * @throws {Error}
 	 *   If the given group ID is not a valid group ID or has
@@ -2857,10 +2860,12 @@ sap.ui.define([
 	/**
 	 * Cleans up the optimistic batch cache to a given point in time.
 	 *
-	 * @param {Date} [dOlderThan] The point in time from which on older cache entries are deleted.
-	 *   If not supplied, all optimistic batch entries are deleted.
-	 * @returns {Promise} A promise resolving without a defined result, or rejecting with an error
-	 *   if deletion fails.
+	 * @param {Date} [dOlderThan]
+	 *   The point in time from which on older cache entries are deleted. If not supplied, all
+	 *   optimistic batch entries are deleted.
+	 * @returns {Promise<void>}
+	 *   A promise which is resolved without a defined result, or rejected with an error if
+	 *   deletion fails.
 	 *
 	 * @experimental As of version 1.102.0
 	 * @private

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

@@ -31,6 +31,7 @@ sap.ui.define([
 		this.mAggregatedQueryOptions = {};
 		// whether the aggregated query options are processed the first time
 		this.bAggregatedQueryOptionsInitial = true;
+		this.mCanUseCachePromiseByChildPath = {};
 		// auto-$expand/$select: promises to wait until child bindings have provided
 		// their path and query options
 		this.aChildCanUseCachePromises = [];
@@ -215,28 +216,33 @@ sap.ui.define([
 	 * @param {object} mQueryOptions - The query options to be merged
 	 * @param {string} sBaseMetaPath - This binding's meta path
 	 * @param {boolean} bCacheImmutable - Whether the cache of this binding is immutable
-	 * @param {boolean} bIsProperty - Whether the child is a property binding
+	 * @param {boolean} [bIsProperty] - Whether the child is a property binding
 	 * @returns {boolean} Whether the query options can be fulfilled by this binding
 	 *
 	 * @private
 	 */
 	ODataParentBinding.prototype.aggregateQueryOptions = function (mQueryOptions, sBaseMetaPath,
 			bCacheImmutable, bIsProperty) {
-		var mAggregatedQueryOptionsClone = _Helper.merge({},
+		var mAggregatedQueryOptionsClone = _Helper.clone(
 				bCacheImmutable && this.mLateQueryOptions || this.mAggregatedQueryOptions),
 			that = this;
 
 		/*
 		 * Recursively merges the given query options into the given aggregated query options.
 		 *
-		 * @param {object} mAggregatedQueryOptions The aggregated query options
-		 * @param {object} mQueryOptions0 The query options to merge into the aggregated query
-		 *   options
-		 * @param {string} sMetaPath The meta path for the current $expand
-		 * @param {boolean} [bInsideExpand] Whether the given query options are inside a $expand
-		 * @param {boolean} [bAdd] Whether to add the given query options because they are in a
-		 * $expand that has not been aggregated yet
-		 * @returns {boolean} Whether the query options can be fulfilled by this binding
+		 * @param {object} mAggregatedQueryOptions
+		 *   The aggregated query options
+		 * @param {object} mQueryOptions0
+		 *   The query options to merge into the aggregated query options
+		 * @param {string} [sMetaPath]
+		 *   The meta path for the current $expand (only used if cache is immutable)
+		 * @param {boolean} [bInsideExpand]
+		 *   Whether the given query options are inside a $expand
+		 * @param {boolean} [bAdd]
+		 *   Whether to add the given query options because they are in a $expand that has not been
+		 *   aggregated yet
+		 * @returns {boolean}
+		 *   Whether the query options can be fulfilled by this binding
 		 */
 		function merge(mAggregatedQueryOptions, mQueryOptions0, sMetaPath, bInsideExpand, bAdd) {
 			/*
@@ -306,10 +312,13 @@ sap.ui.define([
 		}
 
 		if (merge(mAggregatedQueryOptionsClone, mQueryOptions, sBaseMetaPath)) {
-			if (!bCacheImmutable) {
-				this.mAggregatedQueryOptions = mAggregatedQueryOptionsClone;
-			} else {
+			if (bCacheImmutable) {
 				this.mLateQueryOptions = mAggregatedQueryOptionsClone;
+			} else {
+				this.mAggregatedQueryOptions = mAggregatedQueryOptionsClone;
+				if (this.mLateQueryOptions) {
+					merge(this.mLateQueryOptions, mQueryOptions);
+				}
 			}
 			return true;
 		}
@@ -450,9 +459,10 @@ sap.ui.define([
 	 * parent context changed.
 	 *
 	 * @returns {sap.ui.base.SyncPromise}
-	 *   A promise resolving without a defined result when the check is finished, or rejecting in
-	 *   case of an error
-	 * @throws {Error} If called with parameters
+	 *   A promise which is resolved without a defined result when the check is finished, or
+	 *   rejected in case of an error
+	 * @throws {Error}
+	 *   If called with parameters
 	 *
 	 * @private
 	 */
@@ -704,14 +714,14 @@ sap.ui.define([
 	 * @param {sap.ui.model.odata.v4.Context} oContext
 	 *   A context of this binding which is the direct or indirect parent of the child binding.
 	 *   Initially it is the child binding's parent context (See
-	 *   {@link sap.ui.model.odata.v4.ODataBinding#fetchQueryOptionsForOwnCache}). When a binding
-	 *   delegates up to its parent binding, it passes its own parent context adjusting
+	 *   {@link sap.ui.model.odata.v4.ODataBinding#fetchOrGetQueryOptionsForOwnCache}). When a
+	 *   binding delegates up to its parent binding, it passes its own parent context adjusting
 	 *   <code>sChildPath</code> accordingly.
 	 * @param {string} sChildPath
 	 *   The child binding's binding path relative to <code>oContext</code>
-	 * @param {object|sap.ui.base.SyncPromise} vChildQueryOptions
-	 *   The child binding's (aggregated) query options or a promise resolving with them
-	 * @param {boolean} bIsProperty
+	 * @param {object|sap.ui.base.SyncPromise} [vChildQueryOptions={}]
+	 *   The child binding's (aggregated) query options (if any) or a promise resolving with them
+	 * @param {boolean} [bIsProperty]
 	 *   Whether the child is a property binding
 	 * @returns {sap.ui.base.SyncPromise}
 	 *   A promise resolved with the reduced path for the child binding if the child binding can use
@@ -726,7 +736,7 @@ 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 = _Helper.getMetaPath(oContext.getPath()),
+			sBaseMetaPath,
 			bCacheImmutable,
 			oCanUseCachePromise,
 			// whether this binding is an operation or depends on one
@@ -782,6 +792,23 @@ sap.ui.define([
 			return SyncPromise.resolve(sResolvedChildPath);
 		}
 
+		oCanUseCachePromise = this.mCanUseCachePromiseByChildPath[sChildPath];
+		if (oCanUseCachePromise && bIsProperty) {
+			return oCanUseCachePromise.then(function (sOldReducedPath) {
+				if (!sOldReducedPath) {
+					return undefined;
+				}
+				// Note: sResolvedChildPath could be "/SalesOrderList('42')/SO_2_SOITEM/0/Note"
+				// w/ index (thus getMetaPath helps), but getStrippedMetaPath makes no difference
+				if (!sChildPath.includes("/")
+					|| _Helper.getMetaPath(sOldReducedPath)
+						=== _Helper.getMetaPath(sResolvedChildPath)) {
+					return sResolvedChildPath;
+				}
+				return oMetaModel.getReducedPath(sResolvedChildPath, sBaseForPathReduction);
+			});
+		}
+
 		// Note: this.oCachePromise exists for all bindings except operation bindings; it might
 		// become pending again
 		bCacheImmutable = this.oCachePromise.isRejected()
@@ -789,16 +816,17 @@ sap.ui.define([
 			|| oContext.isEffectivelyKeptAlive() // no index when not in aContexts
 			|| this.oCache === null
 			|| this.oCache && this.oCache.hasSentRequest();
+		sBaseMetaPath = _Helper.getMetaPath(oContext.getPath());
 		aPromises = [
-			this.doFetchQueryOptions(oParentContext),
+			this.doFetchOrGetQueryOptions(oParentContext),
 			// After access to complete meta path of property, the metadata of all prefix paths
 			// is loaded so that synchronous access in wrapChildQueryOptions via getObject is
-			// possible
+			// possible - as well as #getReducedPath
 			fetchPropertyAndType(),
 			vChildQueryOptions
 		];
 		oCanUseCachePromise = SyncPromise.all(aPromises).then(function (aResult) {
-			var mChildQueryOptions = aResult[2],
+			var mChildQueryOptions = aResult[2] || {},
 				mWrappedChildQueryOptions,
 				mLocalQueryOptions = aResult[0],
 				oProperty = aResult[1],
@@ -819,7 +847,7 @@ sap.ui.define([
 				that.bHasPathReductionToParent = true;
 				return oParentContext.getBinding().fetchIfChildCanUseCache(oParentContext,
 					_Helper.getRelativePath(sResolvedChildPath, oParentContext.getPath()),
-					vChildQueryOptions);
+					mChildQueryOptions, bIsProperty);
 			}
 
 			if (bDependsOnOperation || sReducedChildMetaPath === "$count"
@@ -828,8 +856,8 @@ sap.ui.define([
 			}
 
 			if (that.bAggregatedQueryOptionsInitial) {
-				that.selectKeyProperties(mLocalQueryOptions, sBaseMetaPath);
 				that.mAggregatedQueryOptions = _Helper.clone(mLocalQueryOptions);
+				that.selectKeyProperties(that.mAggregatedQueryOptions, sBaseMetaPath);
 				that.bAggregatedQueryOptionsInitial = false;
 			}
 			if (bIsAdvertisement) {
@@ -869,8 +897,7 @@ sap.ui.define([
 					that.oCache.setLateQueryOptions(that.mLateQueryOptions);
 				} else if (that.oCache === null) {
 					return oParentContext.getBinding()
-						.fetchIfChildCanUseCache(oParentContext, that.sPath,
-							SyncPromise.resolve(that.mLateQueryOptions))
+						.fetchIfChildCanUseCache(oParentContext, that.sPath, that.mLateQueryOptions)
 						.then(function (sPath) {
 							return sPath && sReducedPath;
 						});
@@ -878,6 +905,9 @@ sap.ui.define([
 			}
 			return sReducedPath;
 		});
+		if (bIsProperty && !oContext.getPath().includes("($uid=")) {
+			this.mCanUseCachePromiseByChildPath[sChildPath] = oCanUseCachePromise;
+		}
 		this.aChildCanUseCachePromises.push(oCanUseCachePromise);
 		this.oCachePromise = SyncPromise.all([this.oCachePromise, oCanUseCachePromise])
 			.then(function (aResult) {
@@ -903,6 +933,7 @@ sap.ui.define([
 			that.oModel.reportError(that + ": Failed to enhance query options for "
 				+ "auto-$expand/$select for child " + sChildPath, sClassName, oError);
 		});
+
 		return oCanUseCachePromise;
 	};
 
@@ -932,7 +963,7 @@ sap.ui.define([
 
 		fnFetchMetadata = oModel.oInterface.fetchMetadata;
 		sMetaPath = _Helper.getMetaPath(oModel.resolve(this.sPath, oContext));
-		mConvertedQueryOptions = Object.assign({}, mQueryOptions, {$select : []});
+		mConvertedQueryOptions = Object.assign({}, _Helper.clone(mQueryOptions), {$select : []});
 		return SyncPromise.all(mQueryOptions.$select.map(function (sSelectPath) {
 			var sMetaSelectPath = sMetaPath + "/" + sSelectPath;
 
@@ -1026,7 +1057,7 @@ sap.ui.define([
 	 * @private
 	 */
 	ODataParentBinding.prototype.getQueryOptionsForPath = function (sPath, oContext) {
-		if (Object.keys(this.mParameters).length) {
+		if (!_Helper.isEmptyObject(this.mParameters)) {
 			// binding has parameters -> all query options need to be defined at the binding
 			return _Helper.getQueryOptionsForPath(this.getQueryOptionsFromParameters(), sPath);
 		}
@@ -1055,8 +1086,8 @@ sap.ui.define([
 	 * @function
 	 * @name sap.ui.model.odata.v4.ODataParentBinding.getQueryOptionsFromParameters
 	 * @private
-	 * @see sap.ui.model.odata.v4.ODataBinding#fetchQueryOptionsForOwnCache
-	 * @see sap.ui.model.odata.v4.ODataBinding#doFetchQueryOptions
+	 * @see sap.ui.model.odata.v4.ODataBinding#fetchOrGetQueryOptionsForOwnCache
+	 * @see sap.ui.model.odata.v4.ODataBinding#doFetchOrGetQueryOptions
 	 */
 
 	/**
@@ -1227,8 +1258,8 @@ sap.ui.define([
 	 *   The context for which to request side effects; if this parameter is missing or if it is the
 	 *   header context of a list binding, the whole binding is affected
 	 * @returns {sap.ui.base.SyncPromise}
-	 *   A promise resolving without a defined result, or rejecting with an error if loading of side
-	 *   effects fails
+	 *   A promise which is resolved without a defined result, or rejected with an error if loading
+	 *   of side effects fails
 	 * @throws {Error}
 	 *   If this binding does not use own data service requests or if the binding's root binding is
 	 *   suspended and the given group ID is not the binding's group
@@ -1382,7 +1413,8 @@ sap.ui.define([
 	 * Note: Some API calls are not allowed as long as the binding is in suspended mode, hence the
 	 * returned promise can be used to get the point in time when these APIs can be called again.
 	 *
-	 * @returns {Promise} A promise which is resolved when the binding is resumed.
+	 * @returns {Promise<void>}
+	 *   A promise which is resolved without a defined result when the binding is resumed.
 	 * @throws {Error}
 	 *   If this binding is relative to an {@link sap.ui.model.odata.v4.Context} or if it is an
 	 *   operation binding or if it is not suspended
@@ -1525,7 +1557,10 @@ sap.ui.define([
 
 		aDependentBindings.forEach(function (oDependentBinding) {
 			var sPath = _Helper.buildPath(sPrefix,
-					_Helper.getMetaPath(oDependentBinding.getPath())),
+					oDependentBinding.oOperation
+					? "" // operation's name cannot appear inside aPaths!
+					: _Helper.getMetaPath(oDependentBinding.getPath())
+				),
 				aStrippedPaths;
 
 			if (oDependentBinding.oCache) {

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.115.1
+		 * @version 1.117.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
@@ -103,7 +103,7 @@ sap.ui.define([
 		this.mQueryOptions = this.oModel.buildQueryOptions(_Helper.clone(mParameters),
 			/*bSystemQueryOptionsAllowed*/sPath.endsWith("$count"));
 		this.vValue = undefined;
-		// BEWARE: #doFetchQueryOptions uses #isRoot which relies on this.oContext!
+		// BEWARE: #doFetchOrGetQueryOptions uses #isRoot which relies on this.oContext!
 		this.fetchCache(oContext);
 		oModel.bindingCreated(this);
 	}
@@ -117,8 +117,8 @@ sap.ui.define([
 	 * change reason as parameter.
 	 *
 	 * @param {sap.ui.base.Event} oEvent
-	 * @param {object} oEvent.getParameters()
-	 * @param {sap.ui.model.ChangeReason} oEvent.getParameters().reason
+	 * @param {object} oEvent.getParameters
+	 * @param {sap.ui.model.ChangeReason} oEvent.getParameters.reason
 	 *   The reason for the 'change' event could be
 	 *   <ul>
 	 *     <li> {@link sap.ui.model.ChangeReason.Change Change} when the binding is initialized,
@@ -154,10 +154,10 @@ sap.ui.define([
 	 * 'error' event parameter.
 	 *
 	 * @param {sap.ui.base.Event} oEvent
-	 * @param {object} oEvent.getParameters()
-	 * @param {object} [oEvent.getParameters().data]
+	 * @param {object} oEvent.getParameters
+	 * @param {object} [oEvent.getParameters.data]
 	 *   An empty data object if a back-end request succeeds
-	 * @param {Error} [oEvent.getParameters().error] The error object if a back-end request failed.
+	 * @param {Error} [oEvent.getParameters.error] The error object if a back-end request failed.
 	 *   If there are multiple failed back-end requests, the error of the first one is provided.
 	 *
 	 * @event sap.ui.model.odata.v4.ODataPropertyBinding#dataReceived
@@ -234,10 +234,10 @@ sap.ui.define([
 	 * @param {any} [vValue]
 	 *   The new value obtained from the cache, see {@link #onChange}
 	 * @returns {sap.ui.base.SyncPromise}
-	 *   A promise resolving without a defined result when the check is finished, or rejecting in
-	 *   case of an error. If the cache is no longer the active cache when the response arrives,
-	 *   that response is ignored almost silently (that is, with a canceled error) and the value
-	 *   remains unchanged.
+	 *   A promise which is resolved without a defined result when the check is finished, or
+	 *   rejected in case of an error. If the cache is no longer the active cache when the response
+	 *   arrives, that response is ignored almost silently (that is, with a canceled error) and the
+	 *   value remains unchanged.
 	 *
 	 * @private
 	 * @see sap.ui.model.PropertyBinding#checkDataState
@@ -265,12 +265,9 @@ sap.ui.define([
 			that = this;
 
 		this.oCheckUpdateCallToken = oCallToken;
-		if (this.bHasDeclaredType === undefined) {
-			this.bHasDeclaredType = !!vType;
-		}
-		if (sResolvedPath && !this.bHasDeclaredType && this.sInternalType !== "any"
-				&& !bIsMeta) {
-			vType = oMetaModel.fetchUI5Type(sResolvedPath);
+		if (!vType && sResolvedPath && this.sInternalType !== "any" && !bIsMeta
+				&& !sResolvedPath.includes(sVirtualPath)) {
+			vType = oMetaModel.fetchUI5Type(this.sReducedPath || sResolvedPath);
 		}
 		if (vValue === undefined) {
 			// if called via #onChange, we need to fetch implicit values
@@ -289,9 +286,7 @@ sap.ui.define([
 							return vResult;
 						});
 				}
-				if (!that.sReducedPath || !that.isResolved()) {
-					// binding is unresolved or context was reset by another call to
-					// checkUpdateInternal
+				if (!that.isResolved()) {
 					return undefined;
 				}
 				if (sResolvedPath.includes(sVirtualPath)) {
@@ -332,7 +327,7 @@ sap.ui.define([
 			});
 			if (bForceUpdate && vValue.isFulfilled()) {
 				if (vType && vType.isFulfilled && vType.isFulfilled()) {
-					this.setType(vType.getResult(), this.sInternalType);
+					this.oType = vType.getResult();
 				}
 				this.vValue = vValue.getResult();
 			}
@@ -346,7 +341,7 @@ sap.ui.define([
 
 			if (oCallToken === that.oCheckUpdateCallToken) { // latest call to checkUpdateInternal
 				that.oCheckUpdateCallToken = undefined;
-				that.setType(oType, that.sInternalType);
+				that.oType = oType;
 				if (oCallToken.forceUpdate || that.vValue !== vValue) {
 					that.bInitial = false;
 					that.vValue = vValue;
@@ -406,10 +401,10 @@ sap.ui.define([
 
 	/**
 	 * @override
-	 * @see sap.ui.model.odata.v4.ODataBinding#doFetchQueryOptions
+	 * @see sap.ui.model.odata.v4.ODataBinding#doFetchOrGetQueryOptions
 	 */
-	ODataPropertyBinding.prototype.doFetchQueryOptions = function () {
-		return this.isRoot() ? SyncPromise.resolve(this.mQueryOptions) : SyncPromise.resolve({});
+	ODataPropertyBinding.prototype.doFetchOrGetQueryOptions = function () {
+		return this.isRoot() ? this.mQueryOptions : undefined;
 	};
 
 	/**
@@ -544,8 +539,8 @@ sap.ui.define([
 	 * Requests the value of the property binding.
 	 *
 	 * @returns {Promise<any|undefined>}
-	 *   A promise resolving with the resulting value or <code>undefined</code> if it could not be
-	 *   determined, or rejecting in case of an error
+	 *   A promise resolved with the resulting value or <code>undefined</code> if it could not be
+	 *   determined, or rejected in case of an error
 	 *
 	 * @public
 	 * @since 1.69
@@ -565,7 +560,7 @@ sap.ui.define([
 	 *   The value of the parameter <code>autoExpandSelect</code> for value list models created by
 	 *   this method. If the value list model is this binding's model, this flag has no effect.
 	 *   Supported since 1.68.0
-	 * @returns {Promise}
+	 * @returns {Promise<Object<object>>}
 	 *   See {@link sap.ui.model.odata.v4.ODataMetaModel#requestValueListInfo}
 	 * @throws {Error}
 	 *   If the binding is unresolved (see {@link sap.ui.model.Binding#isResolved})
@@ -586,7 +581,7 @@ sap.ui.define([
 	/**
 	 * Determines which type of value list exists for this property.
 	 *
-	 * @returns {Promise}
+	 * @returns {Promise<sap.ui.model.odata.v4.ValueListType>}
 	 *   A promise that is resolved with the type of the value list. It is rejected if the property
 	 *   cannot be found in the metadata.
 	 * @throws {Error}
@@ -679,6 +674,15 @@ sap.ui.define([
 			if (this.bRelative) {
 				this.checkSuspended(true);
 				this.deregisterChangeListener();
+				if (oContext) {
+					if (this.oType && !this.bHasDeclaredType
+						// Note: this.oType => this.sReducedPath
+						&& _Helper.getMetaPath(this.oModel.resolve(this.sPath, oContext))
+							!== _Helper.getMetaPath(this.sReducedPath)) {
+						this.oType = undefined;
+					}
+					this.sReducedPath = undefined;
+				}
 			}
 			this.oContext = oContext;
 			this.sResumeChangeReason = undefined;
@@ -709,6 +713,7 @@ sap.ui.define([
 	ODataPropertyBinding.prototype.setType = function (oType, _sInternalType) {
 		var oOldType = this.oType;
 
+		this.bHasDeclaredType = !!oType;
 		if (oType && oType.getName() === "sap.ui.model.odata.type.DateTimeOffset") {
 			oType.setV4();
 		}