@openui5/sap.ui.core 1.91.0 → 1.93.2

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

@@ -98,12 +98,12 @@ sap.ui.define([
 	 *   wins). The same annotations are overwritten; if an annotation file contains other elements
 	 *   (like a type definition) that are already merged, an error is thrown.
 	 *   Supported since 1.41.0
-	 * @param {boolean} [mParameters.autoExpandSelect=false]
+	 * @param {boolean} [mParameters.autoExpandSelect]
 	 *   Whether the OData model's bindings automatically generate $select and $expand system query
 	 *   options from the binding hierarchy. Note: Dynamic changes to the binding hierarchy are not
 	 *   supported. This parameter is supported since 1.47.0, and since 1.75.0 it also enables
 	 *   property paths containing navigation properties in <code>$select</code>.
-	 * @param {boolean} [mParameters.earlyRequests=false]
+	 * @param {boolean} [mParameters.earlyRequests]
 	 *   Whether the following is requested at the earliest convenience:
 	 *   <ul>
 	 *     <li> root $metadata document and annotation files;
@@ -208,7 +208,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.Model
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 */
 	var ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */
@@ -345,7 +345,7 @@ sap.ui.define([
 	 *
 	 * @param {string} sGroupId
 	 *   The group ID
-	 * @param {boolean} [bCatch=false]
+	 * @param {boolean} [bCatch]
 	 *   Whether the returned promise always resolves and never rejects
 	 * @returns {sap.ui.base.SyncPromise}
 	 *   A promise on the outcome of the HTTP request resolving with <code>undefined</code>; it is
@@ -421,7 +421,7 @@ sap.ui.define([
 	 *
 	 * @param {function} fnPrerenderingTask
 	 *   A function that is called before the rendering
-	 * @param {boolean} [bFirst=false]
+	 * @param {boolean} [bFirst]
 	 *   Whether the task should become the first one, not the last one
 	 * @private
 	 */
@@ -446,7 +446,7 @@ sap.ui.define([
 			// runs after all setTimeout(0) tasks scheduled from within the current task, even those
 			// that were scheduled afterwards. A simple setTimeout(n) with n > 0 is not sufficient
 			// because this doesn't help if the current task runs very long.
-			iTimeoutId = setTimeout(function() {
+			iTimeoutId = setTimeout(function () {
 				iTimeoutId = setTimeout(fnRunTasks, 0);
 			}, 0);
 		}
@@ -812,9 +812,9 @@ sap.ui.define([
 	 *
 	 * @param {object} [mParameters={}]
 	 *   Map of binding parameters
-	 * @param {boolean} [bSystemQueryOptionsAllowed=false]
+	 * @param {boolean} [bSystemQueryOptionsAllowed]
 	 *   Whether system query options are allowed
-	 * @param {boolean} [bSapAllowed=false]
+	 * @param {boolean} [bSapAllowed]
 	 *   Whether custom query options starting with "sap-" are allowed (Note: "sap-valid-" is always
 	 *   allowed)
 	 * @throws {Error}
@@ -958,7 +958,7 @@ sap.ui.define([
 				if (sHeaderName === "x-csrf-token") {
 					sKey = "X-CSRF-Token";
 				}
-				mHeadersCopy[sHeaderName] = {key : sKey, value: sHeaderValue};
+				mHeadersCopy[sHeaderName] = {key : sKey, value : sHeaderValue};
 			}
 		}
 		this.oRequestor.checkForOpenRequests();
@@ -1132,6 +1132,83 @@ sap.ui.define([
 		return new BaseContext(this, sResolvedPath);
 	};
 
+	/**
+	 * Creates a {@link sap.ui.core.message.Message} from a given "raw" message object. For a
+	 * bound message, targets are resolved if they are not yet resolved. A message is called a bound
+	 * message if is has a target, even if it is empty.
+	 *
+	 * @param {object} oRawMessage
+	 *   The raw message
+	 * @param {string} [oRawMessage.code]
+	 *   The error code
+	 * @param {string} [oRawMessage.longtextUrl]
+	 *   The message longtext URL; can be relative to the given <code>sResourcePath</code>
+	 * @param {string} [oRawMessage.message]
+	 *   The message text
+	 * @param {number} [oRawMessage.numericSeverity]
+	 *   The numeric message severity
+	 * @param {string} [oRawMessage.target]
+	 *   The message target; can be relative to the <code>sResourcePath</code> plus
+	 *   <code>sCachePath</code>
+	 * @param {string[]} [oRawMessage.additionalTargets]
+	 *   Array of additional targets with the same meaning as <code>target</code>
+	 * @param {boolean} [oRawMessage.technical]
+	 *   Whether the message is reported as <code>technical</code>
+	 * @param {boolean} [oRawMessage.transition]
+	 *   Whether the message is a transition message and not a state message. Unbound messages
+	 *   cannot be state messages
+	 * @param {object} [oRawMessage.@$ui5.error]
+	 *   The original error instance
+	 * @param {object} [oRawMessage.@$ui5.originalMessage]
+	 *   The original message object which is used to create the technical details
+	 * @param {string} [sResourcePath]
+	 *   The resource path of the cache that saw the messages; used to resolve the targets and
+	 *   the longtext URL
+	 * @param {string} [sCachePath]
+	 *   The cache-relative path to the entity; used to resolve the targets
+	 * @returns {sap.ui.core.message.Message}
+	 *   The created UI5 message object
+	 *
+	 * @private
+	 */
+	ODataModel.prototype.createUI5Message = function (oRawMessage, sResourcePath, sCachePath) {
+		var bIsBound = typeof oRawMessage.target === "string",
+			sMessageLongtextUrl = oRawMessage.longtextUrl,
+			aTargets;
+
+		function resolveTarget(sTarget) {
+			return sTarget[0] === "/"
+				? sTarget
+				: _Helper.buildPath("/" + sResourcePath, sCachePath, sTarget);
+		}
+
+		if (bIsBound) {
+			aTargets = [resolveTarget(oRawMessage.target)];
+			if (oRawMessage.additionalTargets) {
+				oRawMessage.additionalTargets.forEach(function (sTarget) {
+					aTargets.push(resolveTarget(sTarget));
+				});
+			}
+		}
+		if (sMessageLongtextUrl && sResourcePath) {
+			sMessageLongtextUrl = _Helper.makeAbsolute(sMessageLongtextUrl,
+				this.sServiceUrl + sResourcePath);
+		}
+
+		return new Message({
+			code : oRawMessage.code,
+			descriptionUrl : sMessageLongtextUrl || undefined,
+			message : oRawMessage.message,
+			persistent : bIsBound ? oRawMessage.transition : true,
+			processor : this,
+			// Note: "" instead of undefined makes filtering easier (agreement with FE!)
+			target : bIsBound ? aTargets : "",
+			technical : oRawMessage.technical,
+			technicalDetails : _Helper.createTechnicalDetails(oRawMessage),
+			type : aMessageTypes[oRawMessage.numericSeverity] || MessageType.None
+		});
+	};
+
 	/**
 	 * Destroys this model, its requestor and its meta model.
 	 *
@@ -1586,37 +1663,14 @@ sap.ui.define([
 	 * the new messages.
 	 *
 	 * @param {string} sResourcePath
-	 *   The resource path of the cache that saw the messages
+	 *   The resource path of the cache that saw the messages; used to resolve the targets and
+	 *   the longtext URL
 	 * @param {object} mPathToODataMessages
-	 *   Maps a cache-relative path with key predicates or indices to an array of messages with the
-	 *   following properties. Each message is passed to the "technicalDetails" (see
-	 *   _Helper.createTechnicalDetails). Currently the "technicalDetails" only contain an attribute
-	 *   named "originalMessage" that contains the message that is received from the back end.
-	 *   {string} code
-	 *     The error code
-	 *   {string} [longtextUrl]
-	 *     The absolute URL for the message's long text
-	 *   {string} message
-	 *     The message text
-	 *   {number} numericSeverity
-	 *     The numeric message severity (1 for "success", 2 for "info", 3 for "warning" and 4 for
-	 *     "error")
-	 *   {string} target
-	 *     The target for the message; if relative the reported target path is a concatenation of
-	 *     the resource path, the cache-relative path and this property
-	 *   {string[]} [additionalTargets]
-	 *     Array of additional targets with the same meaning as <code>target</code>
-	 *   {boolean} [technical]
-	 *     Whether the message is reported as <code>technical</code> (supplied by #reportError)
-	 *   {boolean} [transition]
-	 *     Whether the message is reported as <code>persistent=true</code> and therefore needs to be
-	 *     managed by the application
-	 *   {object} [@$ui5.originalMessage]
-	 *     The original message object supplied by #reportError. In case this is supplied it is used
-	 *     in _Helper.createTechnicalDetails to create the "originalMessage" property
+	 *   Maps a cache-relative path with key predicates or indices to an array of messages suitable
+	 *   for {@link #createUI5Message}
 	 * @param {string[]} [aCachePaths]
-	 *    An array of cache-relative paths of the entities for which non-persistent messages have to
-	 *    be removed; if the array is not given, all entities are affected
+	 *   An array of cache-relative paths of the entities for which non-persistent messages have to
+	 *   be removed; if the array is not given, all entities are affected
 	 *
 	 * @private
 	 */
@@ -1629,32 +1683,7 @@ sap.ui.define([
 
 		Object.keys(mPathToODataMessages).forEach(function (sCachePath) {
 			mPathToODataMessages[sCachePath].forEach(function (oRawMessage) {
-				var aTargets;
-
-				function resolveTarget(sTarget) {
-					return sTarget[0] === "/"
-						? sTarget
-						: _Helper.buildPath(sDataBindingPath, sCachePath, sTarget);
-				}
-
-				aTargets = [resolveTarget(oRawMessage.target)];
-				if (oRawMessage.additionalTargets) {
-					oRawMessage.additionalTargets.forEach(function (sTarget) {
-						aTargets.push(resolveTarget(sTarget));
-					});
-				}
-
-				aNewMessages.push(new Message({
-					code : oRawMessage.code,
-					descriptionUrl : oRawMessage.longtextUrl || undefined,
-					message : oRawMessage.message,
-					persistent : oRawMessage.transition,
-					processor : that,
-					target : aTargets,
-					technical : oRawMessage.technical,
-					technicalDetails : _Helper.createTechnicalDetails(oRawMessage),
-					type : aMessageTypes[oRawMessage.numericSeverity] || MessageType.None
-				}));
+				aNewMessages.push(that.createUI5Message(oRawMessage, sResourcePath, sCachePath));
 			});
 		});
 		(aCachePaths || [""]).forEach(function (sCachePath) {
@@ -1708,57 +1737,8 @@ sap.ui.define([
 	 * @private
 	 */
 	ODataModel.prototype.reportError = function (sLogMessage, sReportingClassName, oError) {
-		var aBoundMessages = [],
-			sDetails,
-			sResourcePath,
-			aUnboundMessages = [];
-
-		/*
-		 * Clones the message object taking all relevant properties, converts the annotations for
-		 * numeric severity and longtext to the corresponding properties and adds it to one of the
-		 * arrays to be reported later.
-		 * @param {object} oMessage The message
-		 * @param {number} [iNumericSeverity] The numeric severity
-		 * @param {boolean} [bTechnical] Whether the message is reported as technical
-		 */
-		function addMessage(oMessage, iNumericSeverity, bTechnical) {
-			var oReportMessage = {
-					additionalTargets : _Helper.getAdditionalTargets(oMessage),
-					code : oMessage.code,
-					message : oMessage.message,
-					numericSeverity : iNumericSeverity,
-					technical : bTechnical || oMessage.technical,
-					// use "@$ui5." prefix to overcome name collisions with instance annotations
-					// returned from back end.
-					"@$ui5.error" : oError,
-					"@$ui5.originalMessage" : oMessage
-				};
-
-			Object.keys(oMessage).forEach(function (sProperty) {
-				if (sProperty[0] === '@') {
-					if (sProperty.endsWith(".numericSeverity")) {
-						oReportMessage.numericSeverity = oMessage[sProperty];
-					} else if (sProperty.endsWith(".longtextUrl") && oError.requestUrl
-							&& oMessage[sProperty]) {
-						oReportMessage.longtextUrl =
-							_Helper.makeAbsolute(oMessage[sProperty], oError.requestUrl);
-					}
-				}
-			});
-
-			if (typeof oMessage.target !== "string") {
-				aUnboundMessages.push(oReportMessage);
-			} else if (oMessage.target[0] === "$" || !sResourcePath) {
-				// target for the bound message is a system query option or cannot be resolved
-				// -> report as unbound message
-				oReportMessage.message = oMessage.target + ": " + oReportMessage.message;
-				aUnboundMessages.push(oReportMessage);
-			} else {
-				oReportMessage.target = oMessage.target;
-				oReportMessage.transition = true;
-				aBoundMessages.push(oReportMessage);
-			}
-		}
+		var sDetails,
+			oRawMessages;
 
 		if (oError.canceled === "noDebugLog") {
 			return;
@@ -1779,24 +1759,16 @@ sap.ui.define([
 		}
 		oError.$reported = true;
 
-		if (oError.error) {
-			sResourcePath = oError.resourcePath && oError.resourcePath.split("?")[0];
-			if (!oError.error.$ignoreTopLevel) {
-				addMessage(oError.error, 4 /* Error */, true);
-			}
-			if (oError.error.details) {
-				oError.error.details.forEach(function (oMessage) {
-					addMessage(oMessage);
-				});
-			}
-			if (aBoundMessages.length) {
-				this.reportBoundMessages(sResourcePath, {"" : aBoundMessages}, []);
-			}
-		} else {
-			addMessage(oError, 4 /* Error */, true);
+		oRawMessages = _Helper.extractMessages(oError);
+		if (oRawMessages.bound.length) {
+			this.reportBoundMessages(
+				oError.resourcePath.split("?")[0],
+				{"" : oRawMessages.bound},
+				[]
+			);
 		}
 		// The longtextUrls are already absolute, so sResourcePath is not needed here
-		this.reportUnboundMessages(aUnboundMessages);
+		this.reportUnboundMessages(oRawMessages.unbound);
 	};
 
 	/**
@@ -1804,27 +1776,10 @@ sap.ui.define([
 	 * the new messages.
 	 *
 	 * @param {object[]} aMessages
-	 *   The array of messages as contained in the <code>sap-messages</code> response header with
-	 *   the following properties. Each message is passed to the "technicalDetails" (see
-	 *   _Helper.createTechnicalDetails). Currently the "technicalDetails" only contain an attribute
-	 *   named "originalMessage" that contains the message that is received from the back end.
-	 *   {string} code
-	 *     The error code
-	 *   {string} [longtextUrl]
-	 *     The URL for the message's long text; it must be absolute if <code>sResourcePath</code> is
-	 *     missing
-	 *   {string} message
-	 *     The message text
-	 *   {number} numericSeverity
-	 *     The numeric message severity (1 for "success", 2 for "info", 3 for "warning" and 4 for
-	 *     "error")
-	 *   {boolean} [technical]
-	 *     Whether the message is reported as <code>technical</code> (supplied by #reportError)
-	 *   {object} [@$ui5.originalMessage]
-	 *     The original message object supplied by #reportError. In case this is supplied it is used
-	 *     in _Helper.createTechnicalDetails to create the "originalMessage" property
+	 *   An array of messages suitable for {@link #createUI5Message}
 	 * @param {string} [sResourcePath]
-	 *   The resource path of the request whose response contained the messages.
+	 *   The resource path of the cache that saw the messages; used to resolve the longtext URL
+	 *
 	 * @private
 	 */
 	ODataModel.prototype.reportUnboundMessages = function (aMessages, sResourcePath) {
@@ -1833,24 +1788,7 @@ sap.ui.define([
 		if (aMessages && aMessages.length) {
 			this.fireMessageChange({
 				newMessages : aMessages.map(function (oMessage) {
-					var sMessageLongTextUrl = oMessage.longtextUrl;
-
-					if (sMessageLongTextUrl && sResourcePath) {
-						sMessageLongTextUrl = _Helper.makeAbsolute(sMessageLongTextUrl,
-							that.sServiceUrl + sResourcePath);
-					}
-
-					return new Message({
-						code : oMessage.code,
-						descriptionUrl : sMessageLongTextUrl,
-						message : oMessage.message,
-						persistent : true,
-						processor : that,
-						target : "",
-						technical : oMessage.technical,
-						technicalDetails : _Helper.createTechnicalDetails(oMessage),
-						type : aMessageTypes[oMessage.numericSeverity] || MessageType.None
-					});
+					return that.createUI5Message(oMessage, sResourcePath);
 				})
 			});
 		}
@@ -1902,7 +1840,7 @@ sap.ui.define([
 
 		return SyncPromise.all(
 			this.aAllBindings.filter(function (oBinding) {
-				return oBinding.isRoot() && oBinding.requestAbsoluteSideEffects;
+				return oBinding.isRoot();
 			}).map(function (oRootBinding) {
 				return oRootBinding.requestAbsoluteSideEffects(sGroupId, aAbsolutePaths);
 			})
@@ -2076,4 +2014,4 @@ sap.ui.define([
 	};
 
 	return ODataModel;
-});
+});

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

@@ -203,10 +203,9 @@ sap.ui.define([
 		 * @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=false] Whether the given query options are inside a
-		 *   $expand
-		 * @param {boolean} [bAdd=false] Whether to add the given query options because they are in
-		 *   a $expand that has not been aggregated yet
+		 * @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) {
@@ -308,7 +307,9 @@ sap.ui.define([
 	 *   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.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.
 	 *
 	 * @public
 	 * @since 1.45.0
@@ -319,14 +320,6 @@ sap.ui.define([
 			sKey,
 			that = this;
 
-		function checkExpandSelect(sName) {
-			if (that.oModel.bAutoExpandSelect && sName in mParameters) {
-				throw new Error("Cannot change $expand or $select parameter in "
-					+ "auto-$expand/$select mode: "
-					+ sName + "=" + JSON.stringify(mParameters[sName]));
-			}
-		}
-
 		/*
 		 * Updates <code>sChangeReason</code> depending on the given custom or system query option
 		 * name:
@@ -338,8 +331,16 @@ sap.ui.define([
 		 *
 		 * @param {string} sName
 		 *   The name of a custom or system query option
+		 * @throws {Error}
+		 *   If name is "$expand" or "$select" when the model is in auto-$expand/$select mode
 		 */
 		function updateChangeReason(sName) {
+			if (that.oModel.bAutoExpandSelect && (sName === "$expand" || sName === "$select")) {
+				throw new Error("Cannot change " + sName
+					+ " parameter in auto-$expand/$select mode: "
+					+ JSON.stringify(mParameters[sName])
+					+ " !== " + JSON.stringify(mBindingParameters[sName]));
+			}
 			if (sName === "$filter" || sName === "$search") {
 				sChangeReason = ChangeReason.Filter;
 			} else if (sName === "$orderby" && sChangeReason !== ChangeReason.Filter) {
@@ -352,11 +353,6 @@ sap.ui.define([
 		if (!mParameters) {
 			throw new Error("Missing map of binding parameters");
 		}
-		checkExpandSelect("$expand");
-		checkExpandSelect("$select");
-		if (this.hasPendingChanges()) {
-			throw new Error("Cannot change parameters due to pending changes");
-		}
 
 		for (sKey in mParameters) {
 			if (sKey.startsWith("$$")) {
@@ -379,6 +375,9 @@ sap.ui.define([
 		}
 
 		if (sChangeReason) {
+			if (this.hasPendingChanges()) {
+				throw new Error("Cannot change parameters due to pending changes");
+			}
 			this.applyParameters(mBindingParameters, sChangeReason);
 		}
 	};
@@ -631,8 +630,8 @@ sap.ui.define([
 	 *   <code>sChildPath</code> accordingly.
 	 * @param {string} sChildPath
 	 *   The child binding's binding path relative to <code>oContext</code>
-	 * @param {sap.ui.base.SyncPromise} oChildQueryOptionsPromise
-	 *   Promise resolving with the child binding's (aggregated) query options
+	 * @param {object|sap.ui.base.SyncPromise} vChildQueryOptions
+	 *   The child binding's (aggregated) query options or a promise resolving with them
 	 * @returns {sap.ui.base.SyncPromise}
 	 *   A promise resolved with the reduced path for the child binding if the child binding can use
 	 *   this binding's or an ancestor binding's cache; <code>undefined</code> otherwise.
@@ -641,7 +640,7 @@ sap.ui.define([
 	 * @see sap.ui.model.odata.v4.ODataMetaModel#getReducedPath
 	 */
 	ODataParentBinding.prototype.fetchIfChildCanUseCache = function (oContext, sChildPath,
-			oChildQueryOptionsPromise) {
+			vChildQueryOptions) {
 		// getBaseForPathReduction must be called early, because the (virtual) parent context may be
 		// lost again when the path is needed
 		var sBaseForPathReduction = this.getBaseForPathReduction(),
@@ -701,7 +700,7 @@ sap.ui.define([
 			// is loaded so that synchronous access in wrapChildQueryOptions via getObject is
 			// possible
 			fetchPropertyAndType(),
-			oChildQueryOptionsPromise
+			vChildQueryOptions
 		];
 		oCanUseCachePromise = SyncPromise.all(aPromises).then(function (aResult) {
 			var sChildMetaPath,
@@ -730,7 +729,7 @@ sap.ui.define([
 				that.bHasPathReductionToParent = true;
 				return that.oContext.getBinding().fetchIfChildCanUseCache(that.oContext,
 					_Helper.getRelativePath(sResolvedChildPath, that.oContext.getPath()),
-					oChildQueryOptionsPromise);
+					vChildQueryOptions);
 			}
 
 			if (bDependsOnOperation) {
@@ -1107,42 +1106,6 @@ sap.ui.define([
 		this.setResumeChangeReason(ChangeReason.Refresh);
 	};
 
-	/**
-	 * Requests side effects for the given absolute paths.
-	 *
-	 * @param {string} sGroupId
-	 *   The effective group ID
-	 * @param {string[]} aAbsolutePaths
-	 *   The absolute paths to request side effects for
-	 * @returns {sap.ui.base.SyncPromise}
-	 *   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
-	 *
-	 * @private
-	 */
-	ODataParentBinding.prototype.requestAbsoluteSideEffects = function (sGroupId, aAbsolutePaths) {
-		var aPaths = [],
-			sMetaPath = _Helper.getMetaPath(this.getResolvedPath()),
-			bRefresh;
-
-		bRefresh = aAbsolutePaths.some(function (sAbsolutePath) {
-			var sRelativePath = _Helper.getRelativePath(sAbsolutePath, sMetaPath);
-
-			if (sRelativePath !== undefined) {
-				aPaths.push(sRelativePath);
-			}
-
-			return _Helper.hasPathPrefix(sMetaPath, sAbsolutePath);
-		});
-
-		if (bRefresh) {
-			return this.refreshInternal("", sGroupId);
-		} else if (aPaths.length) {
-			return this.requestSideEffects(sGroupId, aPaths);
-		}
-		// return undefined;
-	};
-
 	/**
 	 * Loads side effects for the given context of this binding.
 	 *
@@ -1211,20 +1174,24 @@ sap.ui.define([
 	 */
 
 	/**
-	 * Resolves and clears the refresh promise created by {@link #createRefreshPromise} with the
-	 * given result if there is one.
+	 * If there is a refresh promise created by {@link #createRefreshPromise}, it is resolved with
+	 * the given promise and cleared. Does not reject the refresh promise with a canceled error.
 	 *
-	 * @param {any} vResult - The result to resolve with
-	 * @returns {any} vResult for chaining
+	 * @param {Promise} oPromise - The promise to resolve with
+	 * @returns {Promise} oPromise for chaining
 	 *
 	 * @private
 	 */
-	ODataParentBinding.prototype.resolveRefreshPromise = function (vResult) {
+	ODataParentBinding.prototype.resolveRefreshPromise = function (oPromise) {
 		if (this.oRefreshPromise) {
-			this.oRefreshPromise.$resolve(vResult);
+			this.oRefreshPromise.$resolve(oPromise.catch(function (oError) {
+				if (!oError.canceled) {
+					throw oError;
+				}
+			}));
 			this.oRefreshPromise = null;
 		}
-		return vResult;
+		return oPromise;
 	};
 
 	/**
@@ -1467,4 +1434,4 @@ sap.ui.define([
 	});
 
 	return asODataParentBinding;
-}, /* bExport= */ false);
+}, /* bExport= */ false);

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

@@ -57,7 +57,7 @@ sap.ui.define([
 	 * @mixes sap.ui.model.odata.v4.ODataBinding
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 * @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
@@ -226,8 +226,9 @@ sap.ui.define([
 	 *   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 (e.g. thrown by the change event handler of a control), or if the cache is
-	 *   no longer the active cache when the response arrives
+	 *   case of an error (e.g. thrown by the change event handler of a control). If the cache is no
+	 *   longer the active cache when the response arrives, that response is silently ignored and
+	 *   the value remains unchanged.
 	 *
 	 * @private
 	 * @see sap.ui.model.PropertyBinding#checkDataState
@@ -496,15 +497,20 @@ 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()) {
 			this.sResumeChangeReason = ChangeReason.Refresh;
 			return SyncPromise.resolve();
 		}
-		this.fetchCache(this.oContext, false, /*bKeepQueryOptions*/true);
-		return bCheckUpdate
-			? this.checkUpdateInternal(undefined, ChangeReason.Refresh, sGroupId)
-			: SyncPromise.resolve();
+		return this.oCachePromise.then(function () {
+			that.fetchCache(that.oContext, false, /*bKeepQueryOptions*/true);
+
+			if (bCheckUpdate) {
+				return that.checkUpdateInternal(undefined, ChangeReason.Refresh, sGroupId);
+			}
+		});
 	};
 
 	/**
@@ -528,7 +534,7 @@ sap.ui.define([
 	/**
 	 * Requests information to retrieve a value list for this property.
 	 *
-	 * @param {boolean} [bAutoExpandSelect=false]
+	 * @param {boolean} [bAutoExpandSelect]
 	 *   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
@@ -634,6 +640,8 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.model.Context} [oContext]
 	 *   The context which is required as base for a relative path
+	 * @throws {Error}
+	 *   If the binding's root binding is suspended
 	 *
 	 * @private
 	 */
@@ -641,6 +649,7 @@ sap.ui.define([
 	ODataPropertyBinding.prototype.setContext = function (oContext) {
 		if (this.oContext !== oContext) {
 			if (this.bRelative) {
+				this.checkSuspended(true);
 				this.deregisterChange();
 			}
 			this.oContext = oContext;

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

@@ -42,7 +42,7 @@ sap.ui.define([
 			_setDateTimeFormatter : function () {
 				oDateFormatter = DateFormat.getDateInstance({
 					calendarType : CalendarType.Gregorian,
-					pattern: "yyyy-MM-dd",
+					pattern : "yyyy-MM-dd",
 					strictParsing : true,
 					UTC : true
 				});