@openui5/sap.ui.core 1.115.1 → 1.117.0

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

@@ -64,7 +64,7 @@ sap.ui.define([
 	 * @hideconstructor
 	 * @public
 	 * @since 1.93.0
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 */
 	var Context = BaseContext.extend("sap.ui.model.odata.v2.Context", {
 			constructor : function (oModel, sPath, sDeepPath, oCreatePromise, bInactive,
@@ -217,7 +217,8 @@ sap.ui.define([
 	 *   see {@link #setRefreshAfterChange}. If given, this overrules the model-wide
 	 *   <code>refreshAfterChange</code> flag for this operation only.
 	 * @returns {Promise<undefined>} A promise resolving with <code>undefined</code> in case of
-	 *   successful deletion or rejecting with an error in case the deletion failed
+	 *   successful deletion or rejecting with an error in case the deletion failed. If the <code>DELETE</code> request
+	 *   has been aborted, the error has an <code>aborted</code> flag set to <code>true</code>.
 	 * @throws {Error}
 	 *   If the given parameter map contains any other parameter than those documented above in case
 	 *   of a persistent context

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

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @class Annotation loader for OData V2 services
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 *
 	 * @public
 	 * @since 1.37.0

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

@@ -1935,8 +1935,14 @@ sap.ui.define([
 	 *   batch request
 	 * @param {boolean} [mParameters.inactive]
 	 *   Whether the created context is inactive. An inactive context will only be sent to the
-	 *   server after the first property update. From then on it behaves like any other created
-	 *   context.
+	 *   server when it has become active after a property update. From then on it behaves like any
+	 *   other created context.<br>
+	 *   When a property update happens on an inactive context, the
+	 *   {@link sap.ui.model.odata.v2.ODataListBinding#event:createActivate 'createActivate'} event
+	 *   is fired, and the context becomes active, unless the event handler prevents this. While
+	 *   inactive, the context does not count as a
+	 *   {@link sap.ui.model.odata.v2.ODataModel#hasPendingChanges pending change} and does not
+	 *   contribute to the {@link #getCount count}.
 	 * @param {function} [mParameters.success]
 	 *   The success callback function
 	 * @returns {sap.ui.model.odata.v2.Context}
@@ -2225,15 +2231,20 @@ sap.ui.define([
 	 *   Set of entity types that are affected by side-effects requests
 	 * @param {string} [sGroupId]
 	 *   The ID of a request group
+	 * @returns {boolean}
+	 *   Whether the list binding is affected by the side effect
 	 *
 	 * @private
 	 */
 	ODataListBinding.prototype._refreshForSideEffects = function (oAffectedEntityTypes, sGroupId) {
-		if (!this._isExpandedListUsable() && oAffectedEntityTypes.has(this.oEntityType)) {
+		var bIsAffected = !this._hasTransientParentContext() && oAffectedEntityTypes.has(this.oEntityType);
+
+		if (bIsAffected && !this._isExpandedListUsable()) {
 			this.sRefreshGroupId = sGroupId;
 			this._refresh();
 			this.sRefreshGroupId = undefined;
 		}
+		return bIsAffected;
 	};
 
 	/**

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

@@ -213,7 +213,7 @@ sap.ui.define([
 	 * This model is not prepared to be inherited from.
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 *
 	 * @public
 	 * @alias sap.ui.model.odata.v2.ODataModel
@@ -3893,7 +3893,7 @@ sap.ui.define([
 	 * Abort internal requests such as created via two-way binding changes or created entries.
 	 *
 	 * @param {string} sGroupId ID of the group that should be searched for the request
-	 * @param {string} [mParameters]
+	 * @param {object} [mParameters]
 	 * Map which contains the following parameter properties:
 	 * @param {string} [mParameters.requestKey] Request key used to find the requests, which needs to aborted.
 	 * @param {string} [mParameters.path] Path used to find the requests, which needs to be aborted.
@@ -5092,26 +5092,27 @@ sap.ui.define([
 	 * supported and may not work. These should be done separately and directly on the corresponding entry.
 	 *
 	 * @param {string} sPath A string containing the path to the data that should be updated.
-	 * 		The path is concatenated to the sServiceUrl which was specified
-	 * 		in the model constructor.
+	 *   The path is concatenated to the sServiceUrl which was specified
+	 *   in the model constructor.
 	 * @param {object} oData Data of the entry that should be updated.
 	 * @param {object} [mParameters] Optional, can contain the following attributes:
 	 * @param {object} [mParameters.context] If specified the sPath has to be is relative to the path given with the context.
 	 * @param {function} [mParameters.success] A callback function which is called when the data has been successfully updated.
 	 * @param {function} [mParameters.error] A callback function which is called when the request failed.
-	 * 		The handler can have the parameter <code>oError</code> which contains additional error information.
+	 *   The handler can have the parameter <code>oError</code> which contains additional error information.
+	 *   If the <code>PUT/MERGE</code> request has been aborted, the error has an <code>aborted</code> flag set to
+	 *   <code>true</code>.
 	 * @param {string} [mParameters.eTag] If specified, the <code>If-Match</code> header will be set to this ETag.
-	 * 		Caution: This feature in not officially supported as using asynchronous requests can lead
-	 * 		to data inconsistencies. If you decide to use this feature nevertheless, you have to make
-	 * 		sure that the request is completed before the data is processed any further.
+	 *   Caution: This feature in not officially supported as using asynchronous requests can lead
+	 *   to data inconsistencies. If you decide to use this feature nevertheless, you have to make
+	 *   sure that the request is completed before the data is processed any further.
 	 * @param {Object<string,string>} [mParameters.urlParameters] A map containing the parameters that will be passed as query strings
 	 * @param {Object<string,string>} [mParameters.headers] A map of headers for this request
 	 * @param {string} [mParameters.batchGroupId] Deprecated - use <code>groupId</code> instead
 	 * @param {string} [mParameters.groupId] ID of a request group; requests belonging to the same group will be bundled in one batch request
 	 * @param {string} [mParameters.changeSetId] ID of the <code>ChangeSet</code> that this request should belong to
-	 * @param {boolean} [mParameters.refreshAfterChange] Since 1.46; defines whether to update all bindings after submitting this change operation. See {@link #setRefreshAfterChange}
-	           If given, this overrules the model-wide <code>refreshAfterChange</code> flag for this operation only.
-	 *
+	 * @param {boolean} [mParameters.refreshAfterChange] Since 1.46; defines whether to update all bindings after submitting this change operation.
+	 *   See {@link #setRefreshAfterChange}. If given, this overrules the model-wide <code>refreshAfterChange</code> flag for this operation only.
 	 * @return {object} An object which has an <code>abort</code> function to abort the current request.
 	 *
 	 * @public
@@ -5177,24 +5178,26 @@ sap.ui.define([
 	 * {@link #createEntry} or {@link sap.ui.model.odata.v2.ODataListBinding#create} instead.
 	 *
 	 * @param {string} sPath A string containing the path to the collection where an entry
-	 *		should be created. The path is concatenated to the service URL
-	 *		which was specified in the model constructor.
+	 *   should be created. The path is concatenated to the service URL
+	 *   which was specified in the model constructor.
 	 * @param {object} oData Data of the entry that should be created.
 	 * @param {object} [mParameters] Optional parameter map containing any of the following properties:
 	 * @param {object} [mParameters.context] If specified , <code>sPath</code> has to be relative to the path given with the context.
 	 * @param {function} [mParameters.success] A callback function which is called when the data has
-	 *		been successfully retrieved. The handler can have the
-	 *		following parameters: <code>oData</code> and <code>response</code>. The <code>oData</code> parameter contains the data of the newly created entry if it is provided by the backend.
-	 *		The <code>response</code> parameter contains information about the response of the request.
+	 *   been successfully retrieved. The handler can have the
+	 *   following parameters: <code>oData</code> and <code>response</code>. The <code>oData</code> parameter contains the data of the newly created entry if it is provided by the backend.
+	 *   The <code>response</code> parameter contains information about the response of the request.
 	 * @param {function} [mParameters.error] A callback function which is called when the request failed.
-	 *		The handler can have the parameter <code>oError</code> which contains additional error information.
+	 *   The handler can have the parameter <code>oError</code> which contains additional error information.
+	 *   If the <code>POST</code> request has been aborted, the error has an <code>aborted</code> flag set to
+	 *   <code>true</code>.
 	 * @param {Object<string,string>} [mParameters.urlParameters] A map containing the parameters that will be passed as query strings
 	 * @param {Object<string,string>} [mParameters.headers] A map of headers for this request
 	 * @param {string} [mParameters.batchGroupId] Deprecated - use <code>groupId</code> instead
 	 * @param {string} [mParameters.groupId] ID of a request group; requests belonging to the same group will be bundled in one batch request
 	 * @param {string} [mParameters.changeSetId] ID of the <code>ChangeSet</code> that this request should belong to
-	 * @param {boolean} [mParameters.refreshAfterChange] Since 1.46; defines whether to update all bindings after submitting this change operation. See {@link #setRefreshAfterChange}
-	           If given, this overrules the model-wide <code>refreshAfterChange</code> flag for this operation only.
+	 * @param {boolean} [mParameters.refreshAfterChange] Since 1.46; defines whether to update all bindings after submitting this change operation.
+	 *   See {@link #setRefreshAfterChange}. If given, this overrules the model-wide <code>refreshAfterChange</code> flag for this operation only.
 	 * @return {object} An object which has an <code>abort</code> function to abort the current request.
 	 *
 	 * @public
@@ -5270,6 +5273,8 @@ sap.ui.define([
 	 * @param {function} [mParameters.error]
 	 *   A callback function which is called when the request failed. The handler can have the
 	 *   parameter: <code>oError</code> which contains additional error information.
+	 *   If the <code>DELETE</code> request has been aborted, the error has an <code>aborted</code> flag set to
+	 *   <code>true</code>.
 	 * @param {string} [mParameters.eTag]
 	 *   If specified, the <code>If-Match</code> header will be set to this ETag.
 	 * @param {Object<string,string>} [mParameters.urlParameters]
@@ -5407,6 +5412,7 @@ sap.ui.define([
 	 * @param {function} [mParameters.error]
 	 *   A callback function which is called when the request failed. The handler can have the
 	 *   parameter: <code>oError</code> which contains additional error information.
+	 *   If the request has been aborted, the error has an <code>aborted</code> flag set to <code>true</code>.
 	 * @param {string} [mParameters.eTag]
 	 *   If the function import changes an entity, the ETag for this entity can be passed with this
 	 *   parameter
@@ -5745,16 +5751,18 @@ sap.ui.define([
 	 *   ignored, use <code>mParameters.urlParameters</code> instead
 	 * @param {object} [mParameters] Optional parameter map containing any of the following properties:
 	 * @param {object} [mParameters.context] If specified, <code>sPath</code> has to be relative to the path
-	 * 		given with the context.
+	 *   given with the context.
 	 * @param {Object<string,string>} [mParameters.urlParameters] A map containing the parameters that will be passed as query strings
 	 * @param {sap.ui.model.Filter[]} [mParameters.filters] An array of filters to be included in the request URL
 	 * @param {sap.ui.model.Sorter[]} [mParameters.sorters] An array of sorters to be included in the request URL
 	 * @param {function} [mParameters.success] A callback function which is called when the data has
-	 *		been successfully retrieved. The handler can have the
-	 *		following parameters: <code>oData</code> and <code>response</code>. The <code>oData</code> parameter contains the data of the retrieved data.
-	 *		The <code>response</code> parameter contains further information about the response of the request.
+	 *   been successfully retrieved. The handler can have the
+	 *   following parameters: <code>oData</code> and <code>response</code>. The <code>oData</code> parameter contains the data of the retrieved data.
+	 *   The <code>response</code> parameter contains further information about the response of the request.
 	 * @param {function} [mParameters.error] A callback function which is called when the request
-	 * 		failed. The handler can have the parameter: <code>oError</code> which contains additional error information.
+	 *   failed. The handler can have the parameter: <code>oError</code> which contains additional error information.
+	 *   If the <code>GET</code> request has been aborted, the error has an <code>aborted</code> flag set to
+	 *   <code>true</code>.
 	 * @param {string} [mParameters.batchGroupId] Deprecated - use <code>groupId</code> instead
 	 * @param {string} [mParameters.groupId] ID of a request group; requests belonging to the same group will be bundled in one batch request
 	 * @param {boolean} [mParameters.updateAggregatedMessages]
@@ -5889,10 +5897,10 @@ sap.ui.define([
 	 * @param {Object<string,string>} [mParameters.urlParameters]
 	 *   URL parameters for the side-effects request as a map from a URL parameter name to its
 	 *   string value including <code>$expand</code> and <code>$select</code>
-	 * @returns {Promise}
-	 *   The promise on the outcome of the side-effects request; resolves with
-	 *   <code>undefined</code> if the request is processed successfully, or rejects with an error
-	 *   object if the request fails
+	 * @returns {Promise<Array<sap.ui.model.odata.v2.ODataListBinding>>}
+	 *   The promise on the outcome of the side-effects request; resolves with the array of affected
+	 *   list bindings if the request is processed successfully, or rejects with an error object if
+	 *   the request fails
 	 * @throws {Error}
 	 *   If the given parameters map contains any other parameter than those documented above
 	 *
@@ -5913,6 +5921,7 @@ sap.ui.define([
 
 		return new Promise(function (resolve, reject) {
 			var oAffectedEntityTypes = new Set(),
+				aAffectedListBindings = [],
 				sExpands = mParameters.urlParameters && mParameters.urlParameters["$expand"];
 
 			that._read("", {
@@ -5921,7 +5930,7 @@ sap.ui.define([
 					error : reject,
 					groupId : mParameters.groupId,
 					success : function (/*oData, oResponse*/) {
-						resolve();
+						resolve(aAffectedListBindings);
 					},
 					updateAggregatedMessages : true,
 					urlParameters : mParameters.urlParameters
@@ -5936,7 +5945,9 @@ sap.ui.define([
 				});
 				that.getBindings().forEach(function (oBinding) {
 					if (oBinding.isA("sap.ui.model.odata.v2.ODataListBinding")) {
-						oBinding._refreshForSideEffects(oAffectedEntityTypes, mParameters.groupId);
+						if (oBinding._refreshForSideEffects(oAffectedEntityTypes, mParameters.groupId)) {
+							aAffectedListBindings.push(oBinding);
+						}
 					}
 				});
 			}
@@ -6180,7 +6191,10 @@ sap.ui.define([
 	 * and change sets of the actual batch request which was sent to the backend.
 	 * The changeResponses contain the actual response of that change set in the <code>response</code> property.
 	 * For each change set there is also a <code>__changeResponse</code> property.
-	 * @param {function} [mParameters.error] A callback function which is called when the request failed. The handler can have the parameter: <code>oError</code> which contains additional error information
+	 * @param {function} [mParameters.error] A callback function which is called when the request failed.
+	 *   The handler can have the parameter: <code>oError</code> which contains additional error information.
+	 *   If all contained requests have been aborted, the error has an <code>aborted</code> flag set to
+	 *   <code>true</code>.
 	 * @param {string} [mParameters.batchGroupId]
 	 *   <b>Deprecated</b>, use <code>groupId</code> instead
 	 * @param {boolean} [mParameters.merge]
@@ -6442,7 +6456,7 @@ sap.ui.define([
 	 * @param {array} [aPath]
 	 *   Paths to be reset; if no array is passed, all changes are reset
 	 * @param {boolean} [bAll=false]
-	 *   Whether also deferred requests are taken into account
+	 *   Whether also deferred requests are taken into account so that they are aborted
 	 * @param {boolean} [bDeleteCreatedEntities=false]
 	 *   Whether to delete the entities created via {@link #createEntry} or {@link #callFunction};
 	 *   since 1.95.0

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

@@ -93,7 +93,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.TreeBinding
 	 * @hideconstructor
 	 * @public
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 */
 	var ODataTreeBinding = TreeBinding.extend("sap.ui.model.odata.v2.ODataTreeBinding", /** @lends sap.ui.model.odata.v2.ODataTreeBinding.prototype */ {
 

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

@@ -248,7 +248,7 @@ sap.ui.define([
 			 *   "14.5.12 Expression edm:Path" and "14.5.13 Expression edm:PropertyPath" where it
 			 *   might be used as a first segment (since 1.71.0). This does not apply to annotations
 			 *   on a parameter (since 1.76.0).
-			 * @returns {string|Promise}
+			 * @returns {string|Promise<string>}
 			 *   A data binding, or a fixed text, or a sequence thereof, or a <code>Promise</code>
 			 *   resolving with that string, for example if not all type information is already
 			 *   available
@@ -434,7 +434,7 @@ sap.ui.define([
 			 * @param {string} oDetails.schemaChildName
 			 *   The qualified name of the schema child where the computed annotation has been
 			 *   found, for example "name.space.EntityType"
-			 * @returns {sap.ui.model.odata.v4.ValueListType|Promise}
+			 * @returns {sap.ui.model.odata.v4.ValueListType|Promise<sap.ui.model.odata.v4.ValueListType>}
 			 *   The type of the value list or a <code>Promise</code> resolving with the type of the
 			 *   value list or rejected, if the property cannot be found in the metadata
 			 * @throws {Error}
@@ -488,7 +488,7 @@ sap.ui.define([
 			 * @param {string} oDetails.schemaChildName
 			 *   The qualified name of the schema child where the computed annotation has been
 			 *   found, for example "name.space.EntityType"
-			 * @returns {boolean|Promise}
+			 * @returns {boolean|Promise<boolean>}
 			 *   <code>true</code> if the given path ends with "$count" or with a multi-valued
 			 *   structural or navigation property, <code>false</code> otherwise. If
 			 *   <code>oDetails.$$valueAsPromise</code> is <code>true</code> a <code>Promise</code>
@@ -548,7 +548,7 @@ sap.ui.define([
 			 * @param {sap.ui.model.Context} oDetails.context
 			 *   Points to the given raw value, that is
 			 *   <code>oDetails.context.getProperty("") === vRawValue</code>
-			 * @returns {string|Promise|undefined}
+			 * @returns {string|Promise<string|undefined>|undefined}
 			 *   A data binding or a fixed text or a sequence thereof or <code>undefined</code>. If
 			 *   <code>oDetails.$$valueAsPromise</code> is <code>true</code> a <code>Promise</code>
 			 *   may be returned resolving with the value for the label.

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

@@ -42,7 +42,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.39.0
-		 * @version 1.115.1
+		 * @version 1.117.0
 		 */
 		Context = BaseContext.extend("sap.ui.model.odata.v4.Context", {
 				constructor : constructor
@@ -133,16 +133,18 @@ sap.ui.define([
 	 * @private
 	 */
 	Context.prototype.checkUpdate = function () {
-		this.oModel.getDependentBindings(this).forEach(function (oDependentBinding) {
-			oDependentBinding.checkUpdate();
-		});
+		if (this.oModel) { // might have already been destroyed
+			this.oModel.getDependentBindings(this).forEach(function (oDependentBinding) {
+				oDependentBinding.checkUpdate();
+			});
+		}
 	};
 
 	/**
 	 * Updates all dependent bindings of this context.
 	 *
 	 * @returns {sap.ui.base.SyncPromise}
-	 *   A promise resolving without a defined result when the update is finished
+	 *   A promise which is resolved without a defined result when the update is finished
 	 * @private
 	 */
 	Context.prototype.checkUpdateInternal = function () {
@@ -196,10 +198,11 @@ sap.ui.define([
 	 * details.
 	 *
 	 * @returns {Promise<void>|undefined}
-	 *   A promise that is resolved without data when the entity represented by this context has
-	 *   been created in the back end. It is rejected with an <code>Error</code> instance where
-	 *   <code>oError.canceled === true</code> if the transient entity is deleted before it is
-	 *   created in the back end, for example via {@link sap.ui.model.odata.v4.Context#delete},
+	 *   A promise which is resolved without a defined result when the entity represented by this
+	 *   context has been created in the back end. It is rejected with an <code>Error</code>
+	 *   instance where <code>oError.canceled === true</code> if the transient entity is deleted
+	 *   before it is created in the back end, for example via
+	 *   {@link sap.ui.model.odata.v4.Context#delete},
 	 *   {@link sap.ui.model.odata.v4.ODataListBinding#resetChanges} or
 	 *   {@link sap.ui.model.odata.v4.ODataModel#resetChanges}, and for all nested contexts within a
 	 *   deep create. It is rejected with an <code>Error</code> instance without
@@ -251,9 +254,9 @@ sap.ui.define([
 	 *   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).
 	 *   Since 1.98.0, this is implied if a <code>null</code> group ID is used.
-	 * @returns {Promise}
-	 *   A promise which is resolved without a result in case of success, or rejected with an
-	 *   instance of <code>Error</code> in case of failure, for example if:
+	 * @returns {Promise<void>}
+	 *   A promise which is resolved without a defined result in case of success, or rejected with
+	 *   an instance of <code>Error</code> in case of failure, for example if:
 	 *   <ul>
 	 *     <li> the given context does not point to an entity,
 	 *     <li> the deletion on the server fails,
@@ -1260,7 +1263,7 @@ sap.ui.define([
 	 * Note: For a transient context (see {@link #isTransient}) a wrong path is returned unless all
 	 * key properties are available within the initial data.
 	 *
-	 * @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. if the given context does not point to an entity
@@ -1287,7 +1290,7 @@ sap.ui.define([
 	 *
 	 * @param {string} [sPath=""]
 	 *   A path relative to this context
-	 * @returns {Promise}
+	 * @returns {Promise<any>}
 	 *   A promise on the requested value
 	 * @throws {Error}
 	 *   If the context's root binding is suspended, or if the context is a header context and the
@@ -1316,7 +1319,7 @@ sap.ui.define([
 	 * @param {boolean} [bExternalFormat]
 	 *   If <code>true</code>, the values are returned in external format using UI5 types for the
 	 *   given property paths that format corresponding to the properties' EDM types and constraints
-	 * @returns {Promise}
+	 * @returns {Promise<any>}
 	 *   A promise on the requested value or values; it is rejected if a value is not primitive or
 	 *   if the context is a header context and a path is not "$count"
 	 * @throws {Error}
@@ -1333,7 +1336,7 @@ sap.ui.define([
 		this.oBinding.checkSuspended();
 
 		return Promise.all(aPaths.map(function (sPath) {
-			return that.oBinding.fetchIfChildCanUseCache(that, sPath, SyncPromise.resolve({}))
+			return that.oBinding.fetchIfChildCanUseCache(that, sPath, undefined, true)
 				.then(function (sReducedPath) {
 					if (sReducedPath) {
 						return that.fetchPrimitiveValue(sReducedPath, bExternalFormat);
@@ -1355,9 +1358,9 @@ sap.ui.define([
 	 *   The group ID to be used
 	 * @param {boolean} [bAllowRemoval]
 	 *   Allows to remove the context
-	 * @returns {Promise}
-	 *   A promise which resolves without a defined result when the refresh is finished and rejects
-	 *   with an instance of <code>Error</code> if the refresh failed
+	 * @returns {Promise<void>}
+	 *   A promise which is resolved without a defined result when the refresh is finished, or
+	 *   rejected with an error if the refresh failed
 	 * @throws {Error}
 	 *   See {@link #refresh} for details
 	 *
@@ -1465,11 +1468,11 @@ sap.ui.define([
 	 *   specified, make sure that {@link #requestSideEffects} is called after the corresponding
 	 *   updates have been successfully processed by the server and that there are no pending
 	 *   changes for the affected properties.
-	 * @returns {Promise<undefined>}
-	 *   Promise resolved with <code>undefined</code>, or rejected with an error if loading of side
-	 *   effects fails. Use it to set fields affected by side effects to read-only before
-	 *   {@link #requestSideEffects} and make them editable again when the promise resolves; in the
-	 *   error handler, you can repeat the loading of side effects.
+	 * @returns {Promise<void>}
+	 *   A promise which is resolved without a defined result, or rejected with an error if
+	 *   loading of side effects fails. Use it to set fields affected by side effects to read-only
+	 *   before {@link #requestSideEffects} and make them editable again when the promise resolves;
+	 *   in the error handler, you can repeat the loading of side effects.
 	 *   <br>
 	 *   The promise is rejected if the call wants to refresh a whole list binding (via header
 	 *   context or an absolute path), but the deletion of a row context (see {@link #delete}) is
@@ -1618,8 +1621,8 @@ sap.ui.define([
 	 * @param {string} sGroupId
 	 *   The effective group ID
 	 * @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
 	 */
@@ -1690,7 +1693,7 @@ sap.ui.define([
 	 * context which is currently {@link #delete deleted} on the client, but not yet on the server,
 	 * this method cancels the deletion and restores the context.
 	 *
-	 * @returns {Promise}
+	 * @returns {Promise<void>}
 	 *   A promise which is resolved without a defined result as soon as all changes in the context
 	 *   and its current dependent bindings are canceled
 	 * @throws {Error} If
@@ -1836,7 +1839,7 @@ sap.ui.define([
 				if (!sMessagesPath) {
 					throw new Error("Missing @com.sap.vocabularies.Common.v1.Messages");
 				}
-				return that.oBinding.fetchIfChildCanUseCache(that, sMessagesPath, {});
+				return that.oBinding.fetchIfChildCanUseCache(that, sMessagesPath, undefined, true);
 			}).then(function (sReducedPath) {
 				return that.fetchValue(sReducedPath);
 			}).catch(this.oModel.getReporter());
@@ -1844,6 +1847,7 @@ sap.ui.define([
 
 		this.bKeepAlive = bKeepAlive;
 		this.fnOnBeforeDestroy = bKeepAlive ? fnOnBeforeDestroy : undefined;
+		this.oBinding.onKeepAliveChanged(this);
 	};
 
 	/**
@@ -1887,10 +1891,10 @@ sap.ui.define([
 	 *   Each time the PATCH request is sent to the server, a 'patchSent' event is fired on the
 	 *   binding sending the request. When the response for this request is received, a
 	 *   'patchCompleted' with a boolean parameter 'success' is fired.
-	 * @returns {Promise}
-	 *   A promise which is resolved without a result in case of success, or rejected with an
-	 *   instance of <code>Error</code> in case of failure, for example if the annotation belongs to
-	 *   the read-only namespace "@$ui5.*". With <code>bRetry</code> it is only rejected with an
+	 * @returns {Promise<void>}
+	 *   A promise which is resolved without a defined result in case of success, or rejected with
+	 *   an instance of <code>Error</code> in case of failure, for example if the annotation belongs
+	 *   to the read-only namespace "@$ui5.*". With <code>bRetry</code> it is only rejected with an
 	 *   <code>Error</code> instance where <code>oError.canceled === true</code> when the entity has
 	 *   been deleted while the request was pending or the property has been reset via the methods
 	 *   <ul>
@@ -1961,6 +1965,9 @@ sap.ui.define([
 			throw new Error("Must not select a deleted entity: " + this);
 		}
 		this.bSelected = bSelected;
+		if (this.oBinding) {
+			this.oBinding.onKeepAliveChanged(this); // selected contexts are effectively kept alive
+		}
 	};
 
 	/**