@openui5/sap.ui.core 1.103.0 → 1.105.0

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

@@ -58,7 +58,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.103.0
+		 * @version 1.105.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
@@ -121,10 +121,13 @@ sap.ui.define([
 		// number of active (client-side) created contexts in aContexts
 		this.iActiveContexts = 0;
 		this.aApplicationFilters = _Helper.toArray(vFilters);
-		this.sChangeReason = oModel.bAutoExpandSelect && !mParameters.$$aggregation
+		this.sChangeReason = oModel.bAutoExpandSelect && !_Helper.isDataAggregation(mParameters)
 			? "AddVirtualContext"
 			: undefined;
+		// BEWARE: #doReplaceWith can insert a context w/ negative index, but w/o #created promise
+		// into aContexts' area of "created contexts"!
 		this.iCreatedContexts = 0; // number of (client-side) created contexts in aContexts
+		this.iDeletedContexts = 0; // number of (client-side) deleted contexts
 		this.oDiff = undefined;
 		this.aFilters = [];
 		this.sGroupId = mParameters.$$groupId;
@@ -264,7 +267,7 @@ sap.ui.define([
 	 *   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; w/o a lock this should be true
-	 * @returns {Promise}
+	 * @returns {sap.ui.base.SyncPromise}
 	 *   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.
 	 * @throws {Error}
@@ -274,70 +277,64 @@ sap.ui.define([
 	 */
 	ODataListBinding.prototype._delete = function (oGroupLock, sEditUrl, oContext, oETagEntity,
 			bDoNotRequestCount) {
-		var bDestroy,
-			bFireChange = false,
-			sPath = oContext.iIndex === undefined
+		var sPath = oContext.iIndex === undefined
 				// context is not in aContexts -> use the predicate
 				? _Helper.getRelativePath(oContext.getPath(), this.oHeaderContext.getPath())
 				: String(oContext.iIndex),
 			bReadCount = false,
 			that = this;
 
+		if (oGroupLock && oContext.iIndex === undefined
+				&& this.oModel.isApiGroup(oGroupLock.getGroupId())) {
+			throw new Error("Cannot delete a kept-alive context in an API group when it is not in"
+				+ " the collection");
+		}
+
+		this.iDeletedContexts += 1;
+
 		return this.deleteFromCache(oGroupLock, sEditUrl, sPath, oETagEntity, bDoNotRequestCount,
-			function (iIndex, aEntities) {
-				var sContextPath, sPredicate, sResolvedPath, i$skipIndex, i;
+			function (iIndex, iOffset) {
+				var iContextIndex = oContext.iIndex;
 
-				if (oContext.isKeepAlive()) {
-					oContext.resetKeepAlive(); // ensure that it is destroyed later
-					bDestroy = true;
-				}
-				if (oContext.created()) {
-					// happens only for a created context that is not transient anymore
-					that.destroyCreated(oContext);
-					bFireChange = true;
-				} else if (iIndex >= 0) {
-					// prepare all contexts for deletion
-					for (i = iIndex; i < that.aContexts.length; i += 1) {
-						oContext = that.aContexts[i];
-						if (oContext) {
-							that.mPreviousContextsByPath[oContext.getPath()] = oContext;
-						}
+				if (iIndex !== undefined) {
+					// An entity can only be deleted when its key predicate is known. So we can be
+					// sure to have key predicates and the contexts a related to entities and not
+					// rows. -> Shift them and adjust the indexes
+					if (iOffset > 0) { // we're re-inserting
+						delete that.mPreviousContextsByPath[oContext.getPath()];
+						that.aContexts.splice(iIndex, 0, oContext);
+					} else { // we're deleting
+						that.mPreviousContextsByPath[oContext.getPath()] = oContext;
+						that.aContexts.splice(iIndex, 1);
+						oContext.iIndex = undefined;
+						// fire asynchronously so that multiple deletes only update the table once
+						Promise.resolve().then(function () {
+							that._fireChange({reason : ChangeReason.Remove});
+						});
 					}
-					sResolvedPath = that.getResolvedPath();
-					that.aContexts.splice(iIndex, 1); // adjust the contexts array
-					for (i = iIndex; i < that.aContexts.length; i += 1) {
-						if (that.aContexts[i]) {
-							i$skipIndex = i - that.iCreatedContexts;
-							// calculate the context path and try to re-use the context for it
-							sPredicate = _Helper.getPrivateAnnotation(aEntities[i], "predicate");
-							sContextPath = sResolvedPath + (sPredicate || "/" + i$skipIndex);
-							oContext = that.mPreviousContextsByPath[sContextPath];
-							if (oContext) {
-								delete that.mPreviousContextsByPath[sContextPath];
-								if (oContext.iIndex === i$skipIndex) {
-									oContext.checkUpdate(); // same row, but different data
-								} else {
-									oContext.iIndex = i$skipIndex; // same data, but different row
-								}
-							} else {
-								oContext
-									= Context.create(that.oModel, that, sContextPath, i$skipIndex);
-							}
-							that.aContexts[i] = oContext;
+					if (iContextIndex < 0 || oContext.created()) {
+						that.iCreatedContexts += iOffset;
+						that.iActiveContexts += iOffset;
+						if (!that.iCreatedContexts) { //@see #destroyCreated
+							that.bFirstCreateAtEnd = undefined;
 						}
+					} else {
+						// iMaxLength is the number of server rows w/o the created entities
+						that.iMaxLength += iOffset; // this doesn't change Infinity
 					}
-					that.iMaxLength -= 1; // this doesn't change Infinity
-					bFireChange = true;
+					that.aContexts.forEach(function (oContext0, i) {
+						oContext0.iIndex = i - that.iCreatedContexts;
+					});
 				} else if (that.bLengthFinal) {
 					// a kept-alive context is not in aContexts  -> read the count afterwards
 					bReadCount = true;
 				}
-				// Do not destroy the context immediately to avoid timing issues with dependent
-				// bindings, keep it in mPreviousContextsByPath to destroy it later
 			}
 		).then(function () {
 			var iOldMaxLength = that.iMaxLength;
 
+			that.iDeletedContexts -= 1;
+			oContext.resetKeepAlive();
 			if (bReadCount) {
 				that.iMaxLength = that.fetchValue("$count", undefined, true).getResult()
 					- that.iActiveContexts;
@@ -345,18 +342,17 @@ sap.ui.define([
 				// Note: Although we know that oContext is not in aContexts, a "change" event needs
 				// to be fired in order to notify the control about the new length, for example, to
 				// update the 'More' button or the scrollbar.
-				bFireChange = iOldMaxLength !== that.iMaxLength;
-			}
-			// Fire the change asynchronously so that Cache#delete is finished and #getContexts can
-			// read the data synchronously. This is important for extended change detection.
-			// Without change event there is no destroyPreviousContexts and a kept-alive context
-			// must be destroyed here.
-			if (bFireChange) {
-				that._fireChange({reason : ChangeReason.Remove});
-			} else if (bDestroy) {
-				delete that.mPreviousContextsByPath[oContext.getPath()];
-				oContext.destroy();
+				if (iOldMaxLength !== that.iMaxLength) {
+					that._fireChange({reason : ChangeReason.Remove});
+				}
 			}
+			oContext.iIndex = Context.VIRTUAL; // prevent further cache access via this context
+			that.oModel.addPrerenderingTask(
+				that.destroyPreviousContexts.bind(that, [oContext.getPath()]));
+		}, function (oError) {
+			that.iDeletedContexts -= 1;
+			that._fireChange({reason : ChangeReason.Insert});
+			throw oError;
 		});
 	};
 
@@ -431,7 +427,10 @@ sap.ui.define([
 			if ("$apply" in mParameters) {
 				throw new Error("Cannot combine $$aggregation and $apply");
 			}
-			// Note: this validates mParameters.$$aggregation!
+			if (!sChangeReason) { // called from c'tor or #setAggregation
+				_AggregationHelper.validateAggregation(mParameters.$$aggregation, this.sPath,
+					this.oModel.oInterface.fetchMetadata, this.oModel.bAutoExpandSelect);
+			}
 			sApply = _AggregationHelper.buildApply(mParameters.$$aggregation).$apply;
 		}
 		this.mQueryOptions = this.oModel.buildQueryOptions(mParameters, true);
@@ -1128,9 +1127,9 @@ sap.ui.define([
 	 * Removes and destroys contexts from mPreviousContextsByPath.
 	 *
 	 * @param {string[]} [aPathsToDelete]
-	 *   If given, only contexts with paths in this list except kept-alive ones are removed and
-	 *   destroyed (transient contexts are removed only); otherwise all contexts in the list are
-	 *   removed and destroyed
+	 *   If given, only contexts with paths in this list except kept-alive and deleted ones are
+	 *   removed and destroyed (transient contexts are removed only); otherwise all contexts in the
+	 *   list are removed and destroyed
 	 *
 	 * @private
 	 */
@@ -1142,7 +1141,7 @@ sap.ui.define([
 				var oContext = mPreviousContextsByPath[sPath];
 
 				if (oContext) {
-					if (aPathsToDelete && oContext.isKeepAlive()) {
+					if (aPathsToDelete && (oContext.isKeepAlive() || oContext.isDeleted())) {
 						oContext.iIndex = undefined;
 					} else {
 						if (!oContext.isTransient()) {
@@ -1224,8 +1223,7 @@ sap.ui.define([
 	 * @private
 	 */
 	ODataListBinding.prototype.doReplaceWith = function (oOldContext, oElement, sPredicate) {
-		var iIndex = oOldContext.iIndex,
-			bKeepAlive = oOldContext.isKeepAlive(),
+		var iModelIndex = oOldContext.getModelIndex(),
 			bNew,
 			fnOnBeforeDestroy = oOldContext.fnOnBeforeDestroy,
 			fnOnBeforeDestroyClone,
@@ -1239,21 +1237,21 @@ sap.ui.define([
 			if (oResult.iIndex !== undefined) {
 				throw new Error("Unexpected index: " + oResult);
 			}
-			oResult.iIndex = iIndex;
+			oResult.iIndex = oOldContext.iIndex;
 			delete this.mPreviousContextsByPath[sPath];
 		} else {
-			oResult = Context.create(this.oModel, this, sPath, iIndex);
+			oResult = Context.create(this.oModel, this, sPath, oOldContext.iIndex);
 			bNew = true;
 		}
 		oOldContext.iIndex = undefined;
-		if (iIndex === undefined) {
+		if (iModelIndex === undefined) {
 			this.mPreviousContextsByPath[sPath] = oResult;
 			this.oCache.addKeptElement(oElement);
 		} else {
-			this.aContexts[iIndex] = oResult;
-			this.oCache.doReplaceWith(iIndex, oElement);
+			this.aContexts[iModelIndex] = oResult;
+			this.oCache.doReplaceWith(iModelIndex, oElement);
 		}
-		if (bKeepAlive) {
+		if (oOldContext.isKeepAlive()) {
 			this.mPreviousContextsByPath[oOldContext.getPath()] = oOldContext;
 			if (bNew) {
 				if (fnOnBeforeDestroy) {
@@ -1767,7 +1765,8 @@ sap.ui.define([
 	 *   are ignored if they relate to a
 	 *   {@link sap.ui.model.odata.v4.Context#setKeepAlive kept-alive} context of this binding.
 	 *   Since 1.98.0, {@link sap.ui.model.odata.v4.Context#isTransient transient} contexts
-	 *   of a {@link #getRootBinding root binding} do not count as pending changes.
+	 *   of a {@link #getRootBinding root binding} do not count as pending changes. Pending
+	 *   {@link sap.ui.model.odata.v4.Context#delete deletions} lead to an error.
 	 *
 	 * @public
 	 * @see sap.ui.model.ListBinding#filter
@@ -1787,6 +1786,10 @@ sap.ui.define([
 			return this;
 		}
 
+		if (this.iDeletedContexts) {
+			throw new Error("Cannot filter when delete requests are pending");
+		}
+
 		if (this.hasPendingChanges(true)) {
 			throw new Error("Cannot filter due to pending changes");
 		}
@@ -2014,6 +2017,7 @@ sap.ui.define([
 				}
 				if (!that.isRootBindingSuspended()) {
 					// request data (before removing virtual context), but avoid E.C.D.
+					// (see BCP: 2270085692 for some interesting discussions)
 					that.bUseExtendedChangeDetection = false;
 					that.getContexts(iStart, iLength, iMaximumPrefetchSize);
 					that.bUseExtendedChangeDetection = bOld;
@@ -2724,6 +2728,10 @@ sap.ui.define([
 			});
 		}
 
+		if (this.iDeletedContexts) {
+			throw new Error("Cannot refresh when delete requests are pending");
+		}
+
 		if (this.isRootBindingSuspended()) {
 			// Note: side-effects (incl. refresh) are forbidden while suspended
 			this.refreshSuspended(sGroupId);
@@ -2781,8 +2789,8 @@ sap.ui.define([
 			}
 			// Note: after reset the dependent bindings cannot be found any more
 			aDependentBindings = that.getDependentBindings();
-			// this may reset that.oRefreshPromise
-			that.reset(ChangeReason.Refresh, bKeepCacheOnError ? false : undefined, sGroupId);
+			that.reset(ChangeReason.Refresh, !oCache || (bKeepCacheOnError ? false : undefined),
+				sGroupId); // this may reset that.oRefreshPromise
 			return SyncPromise.all(
 				refreshAll(aDependentBindings).concat(oPromise, oKeptElementsPromise)
 			).then(function () {
@@ -2891,7 +2899,7 @@ sap.ui.define([
 				var iIndex = oContext.getModelIndex(),
 					i;
 
-				if (oContext.created()) {
+				if (oContext.iIndex < 0) {
 					that.destroyCreated(oContext);
 					bDestroyed = true;
 				} else {
@@ -3114,9 +3122,6 @@ sap.ui.define([
 		var aContexts,
 			bMissingPredicate,
 			oModel = this.oModel,
-			// Hash set of collection-valued navigation property meta paths (relative to the cache's
-			// root) which need to be refreshed, maps string to <code>true</code>
-			mNavigationPropertyPaths = {},
 			aPredicates,
 			aPromises,
 			// since this is called from a context or a parent binding, the binding is resolved
@@ -3159,7 +3164,7 @@ sap.ui.define([
 				aContexts = [oContext];
 			} else {
 				aContexts = this.getCurrentContexts().filter(function (oContext0) {
-					return !oContext0.isTransient();
+					return oContext0 && !oContext0.isTransient();
 				});
 				// add kept-alive contexts outside collection
 				Object.keys(this.mPreviousContextsByPath).forEach(function (sPath) {
@@ -3178,11 +3183,10 @@ sap.ui.define([
 			});
 			if (!bMissingPredicate) {
 				aPromises = this.oCache
-					? [this.oCache.requestSideEffects(this.lockGroup(sGroupId),
-						aPaths, mNavigationPropertyPaths, aPredicates, bSingle)]
+					? [this.oCache.requestSideEffects(this.lockGroup(sGroupId), aPaths, aPredicates,
+						bSingle)]
 					: []; // can happen if invoked via absolute side effect
-				this.visitSideEffects(sGroupId, aPaths, bSingle ? oContext : undefined,
-					mNavigationPropertyPaths, aPromises);
+				this.visitSideEffects(sGroupId, aPaths, bSingle ? oContext : undefined, aPromises);
 
 				return SyncPromise.all(aPromises.map(reportError)).then(function () {
 					return that.refreshDependentListBindingsWithoutCache();
@@ -3375,7 +3379,11 @@ sap.ui.define([
 	 *   used to turn on the handling of grand totals like in 1.84.0, using aggregates of aggregates
 	 *   and thus allowing to filter by aggregated properties while grand totals are needed. Beware
 	 *   that methods like "average" or "countdistinct" are not compatible with this approach, and
-	 *   it cannot be combined with group levels.
+	 *   it cannot be combined with group levels.<br>
+	 *   Since 1.105.0, either a recursive hierarchy or pure data aggregation is supported, but no
+	 *   mix; <code>hierarchyQualifier</code> is the leading property that decides between those two
+	 *   use cases - this is an <b>experimental API</b> and is only supported if the model uses the
+	 *   <code>autoExpandSelect</code> parameter!
 	 * @param {object} [oAggregation.aggregate]
 	 *   A map from aggregatable property names or aliases to objects containing the following
 	 *   details:
@@ -3397,6 +3405,9 @@ sap.ui.define([
 	 *       there is only one, or <code>null</code> otherwise ("multi-unit situation"). (SQL
 	 *       suggestion: <code>CASE WHEN MIN(Unit) = MAX(Unit) THEN MIN(Unit) END</code>)
 	 *   </ul>
+	 * @param {number} [oAggregation.expandTo=1]
+	 *   The number of initially expanded levels as a positive integer (@experimental as of version
+	 *   1.105.0), supported only if a <code>hierarchyQualifier</code> is given.
 	 * @param {boolean} [oAggregation.grandTotalAtBottomOnly]
 	 *   Tells whether the grand totals for aggregatable properties are displayed at the bottom only
 	 *   (since 1.86.0); <code>true</code> for bottom only, <code>false</code> for top and bottom,
@@ -3414,6 +3425,12 @@ sap.ui.define([
 	 *   A list of groupable property names used to determine group levels. They may, but don't need
 	 *   to, be repeated in <code>oAggregation.group</code>. Group levels cannot be combined with
 	 *   filtering for aggregated properties or (since 1.93.0) with "$search".
+	 * @param {string} [oAggregation.hierarchyQualifier]
+	 *   The qualifier for the pair of "Org.OData.Aggregation.V1.RecursiveHierarchy" and
+	 *   "com.sap.vocabularies.Hierarchy.v1.RecursiveHierarchy" annotations at this binding's
+	 *   entity type (@experimental as of version 1.105.0). If present, a recursive hierarchy
+	 *   without data aggregation is defined, and the only other supported property is
+	 *   <code>expandTo</code>.
 	 * @param {string} [oAggregation.search]
 	 *   Like the <a
 	 *   href="https://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part2-url-conventions.html">
@@ -3434,7 +3451,9 @@ sap.ui.define([
 	 *     <li> the given data aggregation object is unsupported,
 	 *     <li> the <code>$apply</code> system query option has been specified explicitly before,
 	 *     <li> the binding has a kept-alive context,
-	 *     <li> there are pending changes
+	 *     <li> there are pending changes,
+	 *     <li> a recursive hierarchy is requested, but the model does not use the
+	 *       <code>autoExpandSelect</code> parameter.
 	 *   </ul>
 	 * @example <caption>First group level is product category including subtotals for the net
 	 *     amount in display currency. On leaf level, transaction currency is used as an additional
@@ -3566,13 +3585,18 @@ sap.ui.define([
 	 *   the dynamic sorters.
 	 * @returns {this}
 	 *   <code>this</code> to facilitate method chaining
-	 * @throws {Error}
-	 *   If there are pending changes that cannot be ignored or if an unsupported operation mode is
-	 *   used (see {@link sap.ui.model.odata.v4.ODataModel#bindList}). 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.
-	 *   Since 1.98.0, {@link sap.ui.model.odata.v4.Context#isTransient transient} contexts
-	 *   of a {@link #getRootBinding root binding} do not count as pending changes.
+	 * @throws {Error} If
+	 *   <ul>
+	 *     <li> there are pending changes that cannot be ignored,
+	 *     <li> an unsupported operation mode is used (see
+	 *       {@link sap.ui.model.odata.v4.ODataModel#bindList}). 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.
+	 *       Since 1.98.0, {@link sap.ui.model.odata.v4.Context#isTransient transient} contexts of a
+	 *       {@link #getRootBinding root binding} do not count as pending changes.
+	 *     <li> contexts are {@link sap.ui.model.data.v4.Context#delete deleted} on the client, but
+	 *       the server request has not finished yet.
+	 *   </ul>
 	 *
 	 * @public
 	 * @see sap.ui.model.ListBinding#sort
@@ -3590,6 +3614,10 @@ sap.ui.define([
 			return this;
 		}
 
+		if (this.iDeletedContexts) {
+			throw new Error("Cannot sort when delete requests are pending");
+		}
+
 		if (this.hasPendingChanges(true)) {
 			throw new Error("Cannot sort due to pending changes");
 		}

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

@@ -157,7 +157,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.103.0
+		 * @version 1.105.0
 		 */
 		ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 				constructor : constructor

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

@@ -214,7 +214,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.Model
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.103.0
+		 * @version 1.105.0
 		 */
 		ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */{
@@ -870,7 +870,7 @@ sap.ui.define([
 	ODataModel.prototype.buildQueryOptions = function (mParameters, bSystemQueryOptionsAllowed,
 			bSapAllowed) {
 		var sParameterName,
-			mTransformedOptions = _Helper.clone(mParameters) || {};
+			mTransformedOptions = Object.assign({}, mParameters); // shallow clone
 
 		/*
 		 * Parses the query options for the given option name "sOptionName" in the given map of
@@ -897,6 +897,7 @@ sap.ui.define([
 				mOptions[sOptionName] = vValue;
 			}
 			if (sOptionName === "$expand") {
+				vValue = mOptions[sOptionName] = _Helper.clone(vValue); // deep clone needed!
 				for (sExpandPath in vValue) {
 					mExpandOptions = vValue[sExpandPath];
 					if (mExpandOptions === null || typeof mExpandOptions !== "object") {

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

@@ -599,11 +599,11 @@ sap.ui.define([
 	 * @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; w/o a lock this should be true
-	 * @param {function} fnCallback
-	 *   A function which is called after a transient entity has been deleted from the cache or
-	 *   after the entity has been deleted from the server and from the cache; the index of the
-	 *   entity and the entity list are both passed as parameter, or none of them
+	 *   unchanged; only relevant for the list binding
+	 * @param {function} [fnCallback]
+	 *  A function which is called immediately when an entity has been deleted from the cache, or
+	 *   when it was re-inserted due to an error; only used in the list binding; the index of the
+	 *   entity and an offset (-1 for deletion, 1 for re-insertion) are passed as parameter
 	 * @returns {sap.ui.base.SyncPromise}
 	 *   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; returns <code>undefined</code> if the
@@ -720,8 +720,8 @@ sap.ui.define([
 
 		if (bDependsOnOperation && !sResolvedChildPath.includes("/$Parameter/")
 				|| this.getRootBinding().isSuspended()
-				|| this.mParameters && this.mParameters.$$aggregation) {
-			// With $$aggregation, no auto-$expand/$select is needed, but the child may still use
+				|| _Helper.isDataAggregation(this.mParameters)) {
+			// With data aggregation, no auto-$expand/$select is needed, but the child may still use
 			// the parent's cache
 			// Note: Operation bindings do not support auto-$expand/$select yet
 			return SyncPromise.resolve(sResolvedChildPath);
@@ -1417,8 +1417,8 @@ sap.ui.define([
 	 * @override
 	 * @see sap.ui.model.odata.v4.ODataBinding#visitSideEffects
 	 */
-	ODataParentBinding.prototype.visitSideEffects = function (sGroupId, aPaths, oContext,
-			mNavigationPropertyPaths, aPromises, sPrefix) {
+	ODataParentBinding.prototype.visitSideEffects = function (sGroupId, aPaths, oContext, aPromises,
+			sPrefix) {
 		var aDependentBindings = oContext
 				? this.oModel.getDependentBindings(oContext)
 				: this.getDependentBindings();
@@ -1435,11 +1435,8 @@ sap.ui.define([
 					aPromises.push(
 						oDependentBinding.requestSideEffects(sGroupId, aStrippedPaths));
 				}
-			} else if (mNavigationPropertyPaths[sPath]) {
-				aPromises.push(oDependentBinding.refreshInternal("", sGroupId));
 			} else {
-				oDependentBinding.visitSideEffects(sGroupId, aPaths, null,
-					mNavigationPropertyPaths, aPromises, sPath);
+				oDependentBinding.visitSideEffects(sGroupId, aPaths, null, aPromises, sPath);
 			}
 		});
 	};

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.103.0
+		 * @version 1.105.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
@@ -365,7 +365,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
-	ODataPropertyBinding.prototype.deregisterChange = function () {
+	ODataPropertyBinding.prototype.deregisterChangeListener = function () {
 		var that = this;
 
 		this.withCache(function (_oCache, sPath, oBinding) {
@@ -383,7 +383,7 @@ sap.ui.define([
 	 */
 	// @override sap.ui.model.Binding#destroy
 	ODataPropertyBinding.prototype.destroy = function () {
-		this.deregisterChange();
+		this.deregisterChangeListener();
 		this.oModel.bindingDestroyed(this);
 		this.oCheckUpdateCallToken = undefined;
 		this.mQueryOptions = undefined;
@@ -672,7 +672,7 @@ sap.ui.define([
 		if (this.oContext !== oContext) {
 			if (this.bRelative) {
 				this.checkSuspended(true);
-				this.deregisterChange();
+				this.deregisterChangeListener();
 			}
 			this.oContext = oContext;
 			this.sResumeChangeReason = undefined;