@openui5/sap.ui.core 1.123.0 → 1.124.0

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

@@ -57,7 +57,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.123.0
+		 * @version 1.124.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
@@ -115,8 +115,8 @@ sap.ui.define([
 
 		mParameters = _Helper.clone(mParameters) || {};
 		this.checkBindingParameters(mParameters, ["$$aggregation", "$$canonicalPath",
-			"$$getKeepAliveContext", "$$groupId", "$$operationMode", "$$ownRequest",
-			"$$patchWithoutSideEffects", "$$sharedRequest", "$$updateGroupId"]);
+			"$$clearSelectionOnFilter", "$$getKeepAliveContext", "$$groupId", "$$operationMode",
+			"$$ownRequest", "$$patchWithoutSideEffects", "$$sharedRequest", "$$updateGroupId"]);
 		const aFilters = _Helper.toArray(vFilters);
 		if (mParameters.$$aggregation && aFilters[0] === Filter.NONE) {
 			throw new Error("Cannot combine Filter.NONE with $$aggregation");
@@ -152,6 +152,8 @@ sap.ui.define([
 		this.aPreviousData = null; // no previous data for E.C.D. known yet
 		this.bRefreshKeptElements = false; // refresh kept elements when resuming?
 		this.sResumeAction = undefined; // a special resume action for $$sharedRequest
+		// whether a reset must perform a side-effects refresh (see #setResetViaSideEffects)
+		this.bResetViaSideEffects = undefined;
 		this.bSharedRequest = "$$sharedRequest" in mParameters
 			? mParameters.$$sharedRequest
 			: oModel.bSharedRequests;
@@ -310,19 +312,24 @@ sap.ui.define([
 
 	/**
 	 * Applies the given map of parameters to this binding's parameters and initiates the
-	 * creation of a new cache if called with a change reason. Since 1.111.0, the header context is
-	 * deselected.
+	 * creation of a new cache if called with a change reason. Deselects all contexts (incl. the
+	 * header context) if the binding parameter '$$clearSelectionOnFilter' is set and '$filter',
+	 * '$search', or <code>$$aggregation.search</code> parameters have changed.
 	 *
 	 * @param {object} mParameters
 	 *   Map of binding parameters, {@link sap.ui.model.odata.v4.ODataModel#constructor}
 	 * @param {sap.ui.model.ChangeReason} [sChangeReason]
 	 *   A change reason for {@link #reset}
+	 * @param {string[]} [aChangedParameters]
+	 *   The list of changed parameters, only given from
+	 *   {@link sap.ui.model.odata.v4.ODataParentBinding#changeParameters}
 	 * @throws {Error}
 	 *   If disallowed binding parameters are provided
 	 *
 	 * @private
 	 */
-	ODataListBinding.prototype.applyParameters = function (mParameters, sChangeReason) {
+	ODataListBinding.prototype.applyParameters = function (mParameters, sChangeReason,
+			aChangedParameters) {
 		var sApply,
 			oOldAggregation = this.mParameters && this.mParameters.$$aggregation,
 			sOldApply = this.mQueryOptions && this.mQueryOptions.$apply;
@@ -341,6 +348,11 @@ sap.ui.define([
 			}
 			sApply = _AggregationHelper.buildApply(mParameters.$$aggregation).$apply;
 		}
+
+		const bResetSelection = this.mParameters?.$$clearSelectionOnFilter
+			&& (aChangedParameters?.includes("$filter") || aChangedParameters?.includes("$search")
+				|| mParameters.$$aggregation?.search !== this.mParameters.$$aggregation?.search);
+
 		this.mQueryOptions = this.oModel.buildQueryOptions(mParameters, true);
 		this.oQueryOptionsPromise = undefined; // @see #doFetchOrGetQueryOptions
 		this.mParameters = mParameters; // store mParameters at binding after validation
@@ -358,19 +370,25 @@ sap.ui.define([
 			// resets completely incl. first visible row
 			sChangeReason = this.bHasAnalyticalInfo ? ChangeReason.Change : ChangeReason.Filter;
 		}
+
+		if (aChangedParameters) {
+			this.setResetViaSideEffects(aChangedParameters.every(
+				(sParameter) => sParameter === "$orderby" || sParameter === "$filter"));
+		}
+
 		if (this.isRootBindingSuspended()) {
 			this.setResumeChangeReason(sChangeReason);
 			return;
 		}
 
+		if (bResetSelection) {
+			this.oHeaderContext?.setSelected(false); // must be done before resetting the cache
+		}
 		this.removeCachesAndMessages("");
 		this.fetchCache(this.oContext);
 		this.reset(sChangeReason);
-		if (this.oHeaderContext) {
-			this.oHeaderContext.setSelected(false);
-			// Update after the refresh event, otherwise $count is fetched before the request
-			this.oHeaderContext.checkUpdate();
-		}
+		// Update after the refresh event, otherwise $count is fetched before the request.
+		this.oHeaderContext?.checkUpdate();
 	};
 
 	/**
@@ -674,27 +692,27 @@ sap.ui.define([
 	 *   The context corresponding to the group node
 	 * @param {boolean} [bSilent]
 	 *   Whether no ("change") events should be fired
+	 * @param {number} [iCount]
+	 *   The count of nodes affected by the collapse, in case the cache already performed it
 	 * @throws {Error}
 	 *   If the binding's root binding is suspended
 	 *
 	 * @private
 	 * @see #expand
 	 */
-	ODataListBinding.prototype.collapse = function (oContext, bSilent) {
-		var aContexts = this.aContexts,
-			iCount = this.oCache.collapse(
-				_Helper.getRelativePath(oContext.getPath(), this.oHeaderContext.getPath())),
-			iModelIndex = oContext.getModelIndex(),
-			i,
-			that = this;
+	ODataListBinding.prototype.collapse = function (oContext, bSilent, iCount) {
+		iCount ??= this.oCache.collapse(
+			_Helper.getRelativePath(oContext.getPath(), this.oHeaderContext.getPath()));
 
 		if (iCount > 0) {
-			aContexts.splice(iModelIndex + 1, iCount).forEach(function (oContext) {
+			const aContexts = this.aContexts;
+			const iModelIndex = oContext.getModelIndex();
+			aContexts.splice(iModelIndex + 1, iCount).forEach((oContext) => {
 				if (!oContext.created()) {
-					that.mPreviousContextsByPath[oContext.getPath()] = oContext;
+					this.mPreviousContextsByPath[oContext.getPath()] = oContext;
 				} // else: created (even persisted) is kept inside "context" annotation
 			});
-			for (i = iModelIndex + 1; i < aContexts.length; i += 1) {
+			for (let i = iModelIndex + 1; i < aContexts.length; i += 1) {
 				if (aContexts[i]) {
 					aContexts[i].iIndex = i;
 				}
@@ -1079,6 +1097,9 @@ sap.ui.define([
 					// reuse the previous context, unless it is created (and persisted), but not
 					// kept alive; always reuse created contexts in a recursive hierarchy
 					delete this.mPreviousContextsByPath[sContextPath];
+					if (oContext.created() && !("@$ui5.context.isTransient" in aResults[i])) {
+						oContext.setPersisted();
+					}
 					oContext.iIndex = i$skipIndex;
 					oContext.checkUpdate();
 				} else if (_Helper.hasPrivateAnnotation(aResults[i], "context")) {
@@ -1087,6 +1108,11 @@ sap.ui.define([
 					oContext = _Helper.getPrivateAnnotation(aResults[i], "context");
 					oContext.iIndex = i$skipIndex;
 					// oContext.checkUpdate(); // Note: no changes expected here
+					sContextPath = oContext.getPath();
+					if (this.mPreviousContextsByPath[sContextPath] === oContext) {
+						// MUST not be both in this.aContexts and in this.mPreviousContextsByPath!
+						delete this.mPreviousContextsByPath[sContextPath];
+					}
 				} else {
 					oContext = Context.create(oModel, this, sContextPath, i$skipIndex);
 					oContext.setSelected(this.oHeaderContext.isSelected());
@@ -1347,7 +1373,10 @@ sap.ui.define([
 			sDeepResourcePath, sGroupId, oOldCache) {
 		var oCache,
 			aKeepAlivePredicates,
-			mKeptElementsByPredicate;
+			mKeptElementsByPredicate,
+			bResetViaSideEffects = this.bResetViaSideEffects;
+
+		this.bResetViaSideEffects = undefined;
 
 		if (oOldCache && oOldCache.getResourcePath() === sResourcePath
 				&& oOldCache.$deepResourcePath === sDeepResourcePath) {
@@ -1357,6 +1386,10 @@ sap.ui.define([
 					// but immediately after #setAggregation it might still be a _CollectionCache
 					|| this.mParameters.$$aggregation?.hierarchyQualifier
 					&& oOldCache instanceof _AggregationCache) {
+				if (bResetViaSideEffects && this.mParameters.$$aggregation?.hierarchyQualifier) {
+					sGroupId = this.getGroupId(); // reset via a side-effects refresh
+					oOldCache.resetOutOfPlace();
+				}
 				// Note: #inheritQueryOptions as called below should not matter in case of own
 				// requests, which are a precondition for kept-alive elements
 				oOldCache.reset(aKeepAlivePredicates, sGroupId, mQueryOptions,
@@ -1990,7 +2023,9 @@ sap.ui.define([
 
 	/**
 	 * Filters the list with the given filters. Since 1.97.0, if filters are unchanged, no request
-	 * is sent, regardless of pending changes. Since 1.111.0, the header context is deselected.
+	 * is sent, regardless of pending changes. Since 1.111.0, all contexts (incl. the header
+	 * context) are deselected, but (since 1.120.13) only if the binding parameter
+	 * '$$clearSelectionOnFilter' is set.
 	 *
 	 * If there are pending changes that cannot be ignored, an error is thrown. Use
 	 * {@link #hasPendingChanges} to check if there are such pending changes. If there are, call
@@ -2089,21 +2124,22 @@ sap.ui.define([
 			this.aApplicationFilters = aFilters;
 		}
 		this.oQueryOptionsPromise = undefined;
+		this.setResetViaSideEffects(true);
 
 		if (this.isRootBindingSuspended()) {
 			this.setResumeChangeReason(ChangeReason.Filter);
 			return this;
 		}
 
+		if (this.mParameters.$$clearSelectionOnFilter) {
+			this.oHeaderContext?.setSelected(false); // must be done before resetting the cache
+		}
 		this.createReadGroupLock(this.getGroupId(), true);
 		this.removeCachesAndMessages("");
 		this.fetchCache(this.oContext);
 		this.reset(ChangeReason.Filter);
-		if (this.oHeaderContext) {
-			this.oHeaderContext.setSelected(false);
-			// Update after the refresh event, otherwise $count is fetched before the request
-			this.oHeaderContext.checkUpdate();
-		}
+		// Update after the refresh event, otherwise $count is fetched before the request
+		this.oHeaderContext?.checkUpdate();
 
 		return this;
 	};
@@ -3040,24 +3076,32 @@ sap.ui.define([
 
 	/**
 	 * Inserts a new gap into <code>this.aContexts</code> just after the given index and with the
-	 * given positive length.
+	 * given positive length. Note that the given index may be the last within the array, but not
+	 * outside!
 	 *
 	 * @param {number} iPreviousIndex - Last index just before the new gap
 	 * @param {number} iLength - Positive length of the new gap
+	 * @throws {Error} If the index is outside of the array
 	 *
 	 * @private
 	 */
 	ODataListBinding.prototype.insertGap = function (iPreviousIndex, iLength) {
 		const aContexts = this.aContexts;
-		for (let i = aContexts.length - 1; i > iPreviousIndex; i -= 1) {
-			const oMovingContext = aContexts[i];
-			if (oMovingContext) {
-				oMovingContext.iIndex += iLength;
-				aContexts[i + iLength] = oMovingContext;
-				delete aContexts[i]; // Note: iLength > 0
+		if (iPreviousIndex >= aContexts.length) {
+			throw new Error("Array index out of bounds: " + iPreviousIndex);
+		} else if (iPreviousIndex === aContexts.length - 1) {
+			aContexts.length += iLength;
+		} else {
+			for (let i = aContexts.length - 1; i > iPreviousIndex; i -= 1) {
+				const oMovingContext = aContexts[i];
+				if (oMovingContext) {
+					oMovingContext.iIndex += iLength;
+					aContexts[i + iLength] = oMovingContext;
+					delete aContexts[i]; // Note: iLength > 0
+				}
+				// else: nothing to do because !(i in aContexts) and aContexts[i + iLength]
+				// has been deleted before (loop works backwards)
 			}
-			// else: nothing to do because !(i in aContexts) and aContexts[i + iLength]
-			// has been deleted before (loop works backwards)
 		}
 		this.iMaxLength += iLength;
 	};
@@ -3222,24 +3266,24 @@ sap.ui.define([
 	};
 
 	/**
-	 * Moves the given (child) node to the given parent. An expanded (child) node is silently
-	 * collapsed before and expanded after the move. A collapsed parent is automatically expanded;
-	 * so is a leaf. The (child) node is added as the parent's 1st child (created persisted) in case
-	 * of expandTo:1, or "in place" (and simply persisted) else.
-	 * Omitting a new parent turns the child into a root.
+	 * Moves the given (child) node to the given parent, just before the given next sibling. An
+	 * expanded (child) node is silently collapsed before and expanded after the move. A collapsed
+	 * parent is automatically expanded; so is a leaf. The (child) node is added to the parent at
+	 * its proper position ("in place") and simply "persisted". Specifying a next sibling always
+	 * leads to a subsequent side-effects refresh within the same $batch, but still the moved
+	 * (child) node's index is updated to the new position.
 	 *
 	 * @param {sap.ui.model.odata.v4.Context} oChildContext - The (child) node to be moved
-	 * @param {sap.ui.model.odata.v4.Context} [oParentContext] - The new parent's context
+	 * @param {sap.ui.model.odata.v4.Context|null} oParentContext - The new parent's context
+	 * @param {sap.ui.model.odata.v4.Context|null} [oSiblingContext] - The next sibling's context
 	 * @returns {sap.ui.base.SyncPromise<void>}
 	 *   A promise which is resolved without a defined result when the move is finished, or
 	 *   rejected in case of an error
-	 * @throws {Error}
-	 *   If <code>oAggregation.expandTo</code> is unsupported (neither one nor at least
-	 *   <code>Number.MAX_SAFE_INTEGER</code>).
+	 * @throws {Error} If there is no recursive hierarchy
 	 *
 	 * @private
 	 */
-	ODataListBinding.prototype.move = function (oChildContext, oParentContext) {
+	ODataListBinding.prototype.move = function (oChildContext, oParentContext, oSiblingContext) {
 		/*
 		 * Sets the <code>iIndex</code> of every context instance inside the given range. Allows for
 		 * start greater than end and swaps both in that case.
@@ -3262,61 +3306,54 @@ sap.ui.define([
 		if (!oAggregation || !oAggregation.hierarchyQualifier) {
 			throw new Error("Missing recursive hierarchy");
 		}
-		if (oAggregation.expandTo > 1 && oAggregation.expandTo < Number.MAX_SAFE_INTEGER) {
-			throw new Error("Unsupported $$aggregation.expandTo: " + oAggregation.expandTo);
-		} // Note: undefined is well allowed!
-
-		const bExpanded = oChildContext.isExpanded();
-		if (bExpanded) {
-			this.collapse(oChildContext, /*bSilent*/true);
-		}
 
+		const sUpdateGroupId = this.getUpdateGroupId();
+		const oGroupLock = this.lockGroup(sUpdateGroupId, true, true);
 		const sChildPath = oChildContext.getCanonicalPath().slice(1);
-		const sParentPath = oParentContext?.getCanonicalPath().slice(1); // before #lockGroup!
-		const oGroupLock = this.lockGroup(this.getUpdateGroupId(), true, true);
+		const sParentPath = oParentContext === null
+			? null
+			: oParentContext.getCanonicalPath().slice(1); // before #lockGroup!
+		const sSiblingPath = oSiblingContext === null
+			? null
+			: oSiblingContext?.getCanonicalPath().slice(1); // before #lockGroup!
+		const sNonCanonicalChildPath = oSiblingContext === undefined
+			? undefined
+			: oChildContext.getPath().slice(1);
+		const {promise : oPromise, refresh : bRefresh} = this.oCache.move(oGroupLock, sChildPath,
+			sParentPath, sSiblingPath, sNonCanonicalChildPath);
 
-		return this.oCache.move(oGroupLock, sChildPath, sParentPath).then(([iCount, iNewIndex]) => {
+		if (bRefresh) {
+			return SyncPromise.all([
+				oPromise,
+				this.requestSideEffects(sUpdateGroupId, [""])
+			]).then(([fnGetIndex]) => {
+				// Note: wait for side-effects refresh before getting index!
+				oChildContext.iIndex = fnGetIndex();
+			});
+		}
+
+		return oPromise.then(([iCount, iNewIndex, iCollapseCount]) => {
 			if (iCount > 1) { // Note: skip oChildContext which is treated below
 				this.insertGap(oParentContext.getModelIndex(), iCount - 1);
 			}
-
+			if (iCollapseCount) { // Note: _AC#collapse already done!
+				this.collapse(oChildContext, /*bSilent*/true, iCollapseCount);
+			}
 			const iOldIndex = oChildContext.getModelIndex();
-			if (oAggregation.expandTo > 1) {
-				if (oChildContext.created()) {
-					oChildContext.setPersisted();
-				}
-				this.aContexts.splice(iOldIndex, 1);
-				this.aContexts.splice(iNewIndex, 0, oChildContext);
-				setIndices(iOldIndex, iNewIndex);
+			this.aContexts.splice(iOldIndex, 1);
+			if (iNewIndex > this.aContexts.length) {
+				this.aContexts[iNewIndex] = oChildContext;
+				// Note: no need to adjust iMaxLength
 			} else {
-				if (!oChildContext.created()) {
-					oChildContext.setCreatedPersisted();
-				}
-				// Note: w/o oParentContext, iParentIndex === -1 and iParentIndex + 1 === 0 :-)
-				const iParentIndex = oParentContext
-					? oParentContext.getModelIndex() // Note: !== iOldIndex
-					: -1;
-				if (iOldIndex < iParentIndex) {
-					this.aContexts.splice(iParentIndex + 1, 0, oChildContext);
-					this.aContexts.splice(iOldIndex, 1); // parent moves to lower index!
-					setIndices(iOldIndex, iParentIndex);
-				} else if (iOldIndex > iParentIndex + 1) {
-					this.aContexts.splice(iOldIndex, 1); // parent unaffected!
-					this.aContexts.splice(iParentIndex + 1, 0, oChildContext);
-					setIndices(iParentIndex + 1, iOldIndex);
-				} // else: iOldIndex === iParentIndex + 1 => nothing to do
+				this.aContexts.splice(iNewIndex, 0, oChildContext);
 			}
+			setIndices(iOldIndex, iNewIndex);
 
-			if (bExpanded) {
+			if (iCollapseCount) {
 				this.expand(oChildContext).unwrap(); // guaranteed to be sync! incl. _fireChange
 			} else {
 				this._fireChange({reason : ChangeReason.Change});
 			}
-		}, (oError) => {
-			if (bExpanded) {
-				this.expand(oChildContext, /*bSilent*/true).unwrap(); // guaranteed to be sync!
-			}
-			throw oError;
 		});
 	};
 
@@ -4136,13 +4173,16 @@ sap.ui.define([
 	ODataListBinding.prototype.resumeInternal = function (_bCheckUpdate, bParentHasChanges) {
 		var sResumeAction = this.sResumeAction,
 			sResumeChangeReason = this.sResumeChangeReason,
-			bRefresh = bParentHasChanges || sResumeAction || sResumeChangeReason,
-			that = this;
+			bRefresh = bParentHasChanges || sResumeAction || sResumeChangeReason;
 
 		this.sResumeAction = undefined;
 		this.sResumeChangeReason = undefined;
 
 		if (bRefresh) {
+			if (this.mParameters.$$clearSelectionOnFilter
+				&& sResumeChangeReason === ChangeReason.Filter) {
+				this.oHeaderContext?.setSelected(false);
+			}
 			this.removeCachesAndMessages("");
 			if (sResumeAction === "onChange") {
 				this.onChange();
@@ -4159,7 +4199,7 @@ sap.ui.define([
 
 			if (this.bRefreshKeptElements) {
 				this.bRefreshKeptElements = false;
-				that.refreshKeptElements(that.getGroupId());
+				this.refreshKeptElements(this.getGroupId());
 			}
 		}
 		this.getDependentBindings().forEach(function (oDependentBinding) {
@@ -4285,7 +4325,9 @@ sap.ui.define([
 	 *   proposal <a href="https://issues.oasis-open.org/browse/ODATA-1452">ODATA-1452</a>, then
 	 *   <code>ODataUtils.formatLiteral(sSearch, "Edm.String");</code> should be used to encapsulate
 	 *   the whole search string beforehand (see {@link
-	 *   sap.ui.model.odata.v4.ODataUtils.formatLiteral}).
+	 *   sap.ui.model.odata.v4.ODataUtils.formatLiteral}). Since 1.120.13, all contexts, including
+	 *   the header context are deselected if the '$$clearSelectionOnFilter' binding parameter is
+	 *   set and the search parameter is changed.
 	 * @param {boolean} [oAggregation.subtotalsAtBottomOnly]
 	 *   Tells whether subtotals for aggregatable properties are displayed at the bottom only, as a
 	 *   separate row after all children, when a group level node is expanded (since 1.86.0);
@@ -4428,6 +4470,30 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * Defines whether the following reset must perform a side-effects refresh instead of a full
+	 * refresh.
+	 *
+	 * <code>this.bResetViaSideEffects</code> may have the following values:
+	 * <ul>
+	 *  <li> <code>true</code>: Reset performs a side-effects refresh (possible if only filter or
+	 *    sorter have changed and nothing else).
+	 *  <li> <code>false</code>: It is not possible anymore to perform a side-effects refresh.
+	 *  <li> <code>undefined</code>: The default value, side-effects refresh not yet needed.
+	 *
+	 * @param {boolean} bResetViaSideEffects
+	 *   Whether a side-effects refresh is required
+	 *
+	 * @private
+	 */
+	ODataListBinding.prototype.setResetViaSideEffects = function (bResetViaSideEffects) {
+		if (!bResetViaSideEffects) {
+			this.bResetViaSideEffects = false;
+		} else if (this.bResetViaSideEffects === undefined) {
+			this.bResetViaSideEffects = true;
+		}
+	};
+
 	/**
 	 * Sort the entries represented by this list binding according to the given sorters.
 	 * The sorters are stored at this list binding and they are used for each following data
@@ -4452,7 +4518,6 @@ sap.ui.define([
 	 *   '$orderby' binding parameter, are always applied after the dynamic sorters.
 	 * @returns {this}
 	 *   <code>this</code> to facilitate method chaining
-	 * @throws {Error}
 	 * @throws {Error} If
 	 *   <ul>
 	 *     <li> there are pending changes that cannot be ignored,
@@ -4493,6 +4558,7 @@ sap.ui.define([
 
 		this.aSorters = aSorters;
 		this.oQueryOptionsPromise = undefined;
+		this.setResetViaSideEffects(true);
 
 		if (this.isRootBindingSuspended()) {
 			this.setResumeChangeReason(ChangeReason.Sort);
@@ -4671,7 +4737,7 @@ sap.ui.define([
 	 * @see #getAllCurrentContexts
 	 */
 	ODataListBinding.prototype._getAllExistingContexts = function () {
-		return this.aContexts.filter(function (oContext) {
+		return (this.aContexts ?? []).filter(function (oContext) {
 			return oContext;
 		}).concat(Object.values(this.mPreviousContextsByPath).filter(function (oContext) {
 			return oContext.isEffectivelyKeptAlive();

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

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

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

@@ -36,12 +36,12 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/base/i18n/Localization",
 	"sap/ui/base/SyncPromise",
-	"sap/ui/core/library",
 	"sap/ui/core/Messaging",
 	"sap/ui/core/Rendering",
 	"sap/ui/core/Supportability",
 	"sap/ui/core/cache/CacheManager",
 	"sap/ui/core/message/Message",
+	"sap/ui/core/message/MessageType",
 	"sap/ui/model/BindingMode",
 	"sap/ui/model/Context",
 	"sap/ui/model/Model",
@@ -49,8 +49,8 @@ sap.ui.define([
 	"sap/ui/thirdparty/URI"
 ], function (ODataContextBinding, ODataListBinding, ODataMetaModel, ODataPropertyBinding,
 		SubmitMode, _GroupLock, _Helper, _MetadataRequestor, _Parser, _Requestor, assert, Log,
-		Localization, SyncPromise, coreLibrary, Messaging, Rendering, Supportability,
-		CacheManager, Message, BindingMode, BaseContext, Model, OperationMode, URI) {
+		Localization, SyncPromise, Messaging, Rendering, Supportability, CacheManager,
+		Message, MessageType, BindingMode, BaseContext, Model, OperationMode, URI) {
 	"use strict";
 
 	var sClassName = "sap.ui.model.odata.v4.ODataModel",
@@ -59,7 +59,6 @@ sap.ui.define([
 			"$select"],
 		// binding-specific parameters allowed in getKeepAliveContext
 		aGetKeepAliveParameters = ["$$groupId", "$$patchWithoutSideEffects", "$$updateGroupId"],
-		MessageType = coreLibrary.MessageType,
 		aMessageTypes = [
 			undefined,
 			MessageType.Success,
@@ -235,7 +234,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.Model
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.123.0
+		 * @version 1.124.0
 		 */
 		ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */{
@@ -894,6 +893,10 @@ sap.ui.define([
 	 *   Whether a binding relative to an {@link sap.ui.model.odata.v4.Context} uses the canonical
 	 *   path computed from its context's path for data service requests; only the value
 	 *   <code>true</code> is allowed.
+	 * @param {boolean} [mParameters.$$clearSelectionOnFilter]
+	 *   Whether the selection state of the list binding is cleared when a filter is changed; this
+	 *   includes dynamic filters, '$filter', '$search', and <code>$$aggregation.search</code>.
+	 *   Supported since 1.120.13.
 	 * @param {boolean} [mParameters.$$getKeepAliveContext]
 	 *   Whether this binding is considered for a match when {@link #getKeepAliveContext} is called;
 	 *   only the value <code>true</code> is allowed. Must not be combined with <code>$apply</code>,

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

@@ -327,7 +327,8 @@ sap.ui.define([
 
 	/**
 	 * Changes this binding's parameters and refreshes the binding. Since 1.111.0, a list binding's
-	 * header context is deselected.
+	 * header context is deselected, but (since 1.120.13) only if the binding parameter
+	 * '$$clearSelectionOnFilter' is set and the '$filter' or '$search' parameter is changed.
 	 *
 	 * If there are pending changes that cannot be ignored, an error is thrown. Use
 	 * {@link #hasPendingChanges} to check if there are such pending changes. If there are, call
@@ -370,6 +371,7 @@ sap.ui.define([
 	ODataParentBinding.prototype.changeParameters = function (mParameters) {
 		var mBindingParameters = Object.assign({}, this.mParameters),
 			sChangeReason, // @see sap.ui.model.ChangeReason
+			aChangedParameters = [],
 			sKey,
 			that = this;
 
@@ -401,6 +403,7 @@ sap.ui.define([
 			} else {
 				sChangeReason ??= ChangeReason.Change;
 			}
+			aChangedParameters.push(sKey);
 		}
 
 		this.checkTransient();
@@ -432,7 +435,7 @@ sap.ui.define([
 			if (this.hasPendingChanges(true)) {
 				throw new Error("Cannot change parameters due to pending changes");
 			}
-			this.applyParameters(mBindingParameters, sChangeReason);
+			this.applyParameters(mBindingParameters, sChangeReason, aChangedParameters);
 		}
 	};
 

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.123.0
+		 * @version 1.124.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