@openui5/sap.ui.core 1.133.1 → 1.135.0

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

@@ -74,7 +74,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.133.1
+		 * @version 1.135.0
 		 *
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
@@ -1133,7 +1133,7 @@ sap.ui.define([
 			return undefined;
 		}
 		return sBindingParameterPath.split("/").map((sSegment, i) => {
-			return sSegment.slice(0, sSegment.lastIndexOf("("))
+			return sSegment.slice(0, sSegment.indexOf("("))
 				+ (i ? sPredicate : sPartnerPredicate);
 		}).join("/");
 	};
@@ -1287,9 +1287,8 @@ sap.ui.define([
 	 *
 	 * @param {string} [sGroupId]
 	 *   The group ID to be used for the request; if not specified, the group ID for this binding is
-	 *   used, see {@link sap.ui.model.odata.v4.ODataContextBinding#constructor} and
-	 *   {@link #getGroupId}. To use the update group ID, see {@link #getUpdateGroupId}, it needs to
-	 *   be specified explicitly.
+	 *   used, see {@link #constructor} and {@link #getGroupId}. To use the update group ID, see
+	 *   {@link #getUpdateGroupId}, it needs to be specified explicitly.
 	 *   Valid values are <code>undefined</code>, '$auto', '$auto.*', '$direct', '$single', or
 	 *   application group IDs as specified in {@link sap.ui.model.odata.v4.ODataModel}. If
 	 *   '$single' is used, the request will be sent as fast as '$direct', but wrapped in a batch
@@ -1589,8 +1588,8 @@ sap.ui.define([
 					that.mAggregatedQueryOptions = that.mLateQueryOptions;
 					that.mLateQueryOptions = undefined;
 				}
-				that.fetchCache(that.oContext, false, /*bKeepQueryOptions*/false,
-					bKeepCacheOnError ? sGroupId : undefined);
+				that.fetchCache(that.oContext, false, /*bKeepQueryOptions*/false, sGroupId,
+					bKeepCacheOnError);
 				// Do not fire a change event, or else ManagedObject destroys and recreates the
 				// binding hierarchy causing a flood of events.
 				if (bHasChangeListeners) {

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

@@ -59,7 +59,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.133.1
+		 * @version 1.135.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
@@ -193,14 +193,20 @@ sap.ui.define([
 	/**
 	 * Returns all currently existing contexts of this list binding in no special order.
 	 *
+	 * @param {boolean} [bNoCreated]
+	 *   Whether to exclude created contexts
 	 * @returns {sap.ui.model.odata.v4.Context[]}
 	 *   All currently existing contexts of this list binding, in no special order
 	 *
 	 * @private
 	 * @see #getAllCurrentContexts
 	 */
-	ODataListBinding.prototype._getAllExistingContexts = function () {
-		return (this.aContexts ?? []).filter(function (oContext) {
+	ODataListBinding.prototype._getAllExistingContexts = function (bNoCreated) {
+		let aContexts = this.aContexts ?? [];
+		if (bNoCreated) {
+			aContexts = aContexts.slice(this.iCreatedContexts);
+		}
+		return aContexts.filter(function (oContext) {
 			return oContext;
 		}).concat(Object.values(this.mPreviousContextsByPath).filter(function (oContext) {
 			return oContext.isEffectivelyKeptAlive();
@@ -882,9 +888,9 @@ sap.ui.define([
 	 *   <br>
 	 *   Since 1.98.0, when the first property updates happens, the context is no longer
 	 *   {@link sap.ui.model.odata.v4.Context#isInactive inactive} and the
-	 *   {@link sap.ui.model.odata.v4.ODataListBinding#event:createActivate 'createActivate'} event
-	 *   is fired. While inactive, it does not count as a {@link #hasPendingChanges pending change}
-	 *   and does not contribute to the {@link #getCount count}.
+	 *   {@link #event:createActivate 'createActivate'} event is fired. While inactive, it does not
+	 *   count as a {@link #hasPendingChanges pending change} and does not contribute to the
+	 *   {@link #getCount count}.
 	 * @returns {sap.ui.model.odata.v4.Context}
 	 *   The context object for the created entity; its method
 	 *   {@link sap.ui.model.odata.v4.Context#created} returns a promise that is resolved when the
@@ -1500,7 +1506,7 @@ sap.ui.define([
 	 * @see sap.ui.model.odata.v4.ODataBinding#doCreateCache
 	 */
 	ODataListBinding.prototype.doCreateCache = function (sResourcePath, mQueryOptions, oContext,
-			sDeepResourcePath, sGroupId, oOldCache) {
+			sDeepResourcePath, sGroupId, bSideEffectsRefresh, oOldCache) {
 		var oCache,
 			aKeepAlivePredicates,
 			mKeptElementsByPredicate,
@@ -1518,12 +1524,14 @@ sap.ui.define([
 					&& oOldCache instanceof _AggregationCache) {
 				if (bResetViaSideEffects && this.mParameters.$$aggregation?.hierarchyQualifier) {
 					sGroupId = this.getGroupId(); // reset via a side-effects refresh
+					bSideEffectsRefresh = true;
 					oOldCache.resetOutOfPlace();
 				}
+				this.validateSelection(oOldCache, sGroupId);
 				// 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,
-					this.mParameters.$$aggregation, this.isGrouped());
+				oOldCache.reset(aKeepAlivePredicates, bSideEffectsRefresh ? sGroupId : undefined,
+					mQueryOptions, this.mParameters.$$aggregation, this.isGrouped());
 
 				return oOldCache;
 			}
@@ -1853,7 +1861,7 @@ sap.ui.define([
 	 *   A promise that is resolved with the download URL or <code>null</code>
 	 * @throws {Error}
 	 *   If the binding is unresolved or is {@link #isTransient transient} (part of a
-	 *   {@link sap.ui.model.odata.v4.ODataListBinding#create deep create})
+	 *   {@link #create deep create})
 	 *
 	 * @private
 	 */
@@ -1931,20 +1939,21 @@ sap.ui.define([
 				return bToLower ? "tolower(" + sText + ")" : sText;
 			}
 
-			bToLower = sEdmType === "Edm.String" && oFilter.bCaseSensitive === false;
+			bToLower = sEdmType === "Edm.String" && oFilter.isCaseSensitive() === false;
 			sFilterPath = bThese && !aFiltersNoThese?.includes(oFilter)
-				? setCase(`$these/aggregate(${oFilter.sPath})`)
-				: setCase(decodeURIComponent(oFilter.sPath));
-			sValue = setCase(_Helper.formatLiteral(oFilter.oValue1, sEdmType));
+				? setCase(`$these/aggregate(${oFilter.getPath()})`)
+				: setCase(decodeURIComponent(oFilter.getPath()));
+			sValue = setCase(_Helper.formatLiteral(oFilter.getValue1(), sEdmType));
 
-			switch (oFilter.sOperator) {
+			switch (oFilter.getOperator()) {
 				case FilterOperator.BT:
 					sFilter = sFilterPath + " ge " + sValue + " and " + sFilterPath + " le "
-						+ setCase(_Helper.formatLiteral(oFilter.oValue2, sEdmType));
+						+ setCase(_Helper.formatLiteral(oFilter.getValue2(), sEdmType));
 					break;
 				case FilterOperator.NB:
 					sFilter = wrap(sFilterPath + " lt " + sValue + " or " + sFilterPath + " gt "
-						+ setCase(_Helper.formatLiteral(oFilter.oValue2, sEdmType)), bWithinAnd);
+						+ setCase(_Helper.formatLiteral(oFilter.getValue2(), sEdmType)),
+						bWithinAnd);
 					break;
 				case FilterOperator.EQ:
 				case FilterOperator.GE:
@@ -1952,7 +1961,8 @@ sap.ui.define([
 				case FilterOperator.LE:
 				case FilterOperator.LT:
 				case FilterOperator.NE:
-					sFilter = sFilterPath + " " + oFilter.sOperator.toLowerCase() + " " + sValue;
+					sFilter = sFilterPath + " " + oFilter.getOperator().toLowerCase() + " "
+						+ sValue;
 					break;
 				case FilterOperator.Contains:
 				case FilterOperator.EndsWith:
@@ -1960,11 +1970,11 @@ sap.ui.define([
 				case FilterOperator.NotEndsWith:
 				case FilterOperator.NotStartsWith:
 				case FilterOperator.StartsWith:
-					sFilter = oFilter.sOperator.toLowerCase().replace("not", "not ")
+					sFilter = oFilter.getOperator().toLowerCase().replace("not", "not ")
 						+ "(" + sFilterPath + "," + sValue + ")";
 					break;
 				default:
-					throw new Error("Unsupported operator: " + oFilter.sOperator);
+					throw new Error("Unsupported operator: " + oFilter.getOperator());
 			}
 			return sFilter;
 		}
@@ -1985,18 +1995,18 @@ sap.ui.define([
 				return SyncPromise.resolve();
 			}
 
-			if (oFilter.aFilters) {
-				return SyncPromise.all(oFilter.aFilters.map(function (oSubFilter) {
-					return fetchFilter(oSubFilter, mLambdaVariableToPath, oFilter.bAnd, bThese);
+			if (oFilter.getFilters()) {
+				return SyncPromise.all(oFilter.getFilters().map(function (oSubFilter) {
+					return fetchFilter(oSubFilter, mLambdaVariableToPath, oFilter.isAnd(), bThese);
 				})).then(function (aFilterStrings) {
 					// wrap it if it's an 'or' filter embedded in an 'and'
-					return wrap(aFilterStrings.join(oFilter.bAnd ? " and " : " or "),
-						bWithinAnd && !oFilter.bAnd);
+					return wrap(aFilterStrings.join(oFilter.isAnd() ? " and " : " or "),
+						bWithinAnd && !oFilter.isAnd());
 				});
 			}
 
 			sResolvedPath = oMetaModel.resolve(
-				replaceLambdaVariables(oFilter.sPath, mLambdaVariableToPath), oMetaContext);
+				replaceLambdaVariables(oFilter.getPath(), mLambdaVariableToPath), oMetaContext);
 
 			return oMetaModel.fetchObject(sResolvedPath).then(function (oPropertyMetadata) {
 				var oCondition, sLambdaVariable, sOperator;
@@ -2006,23 +2016,23 @@ sap.ui.define([
 						+ sResolvedPath);
 				}
 
-				sOperator = oFilter.sOperator;
+				sOperator = oFilter.getOperator();
 				if (sOperator === FilterOperator.All || sOperator === FilterOperator.Any) {
-					oCondition = oFilter.oCondition;
-					sLambdaVariable = oFilter.sVariable;
+					oCondition = oFilter.getCondition();
+					sLambdaVariable = oFilter.getVariable();
 					if (sOperator === FilterOperator.Any && !oCondition) {
-						return oFilter.sPath + "/any()";
+						return oFilter.getPath() + "/any()";
 					}
 					// multifilters are processed in parallel, so clone mLambdaVariableToPath
 					// to allow same lambda variables in different filters
 					mLambdaVariableToPath = Object.create(mLambdaVariableToPath);
 					mLambdaVariableToPath[sLambdaVariable]
-						= replaceLambdaVariables(oFilter.sPath, mLambdaVariableToPath);
+						= replaceLambdaVariables(oFilter.getPath(), mLambdaVariableToPath);
 
 					return fetchFilter(
 						oCondition, mLambdaVariableToPath
 					).then(function (sFilterValue) {
-						return oFilter.sPath + "/" + oFilter.sOperator.toLowerCase()
+						return oFilter.getPath() + "/" + oFilter.getOperator().toLowerCase()
 							+ "(" + sLambdaVariable + ":" + sFilterValue + ")";
 					});
 				}
@@ -2317,8 +2327,8 @@ sap.ui.define([
 	 * @throws {Error} If
 	 *   <ul>
 	 *     <li> there are pending changes that cannot be ignored,
-	 *     <li> the binding is {@link #isTransient transient} (part of a
-	 *       {@link sap.ui.model.odata.v4.ODataListBinding#create deep create}),
+	 *     <li> the binding is part of a {@link #create deep create} because it is relative to a
+	 *       {@link sap.ui.model.odata.v4.Context#isTransient transient} context,
 	 *     <li> an unsupported operation mode is used (see
 	 *       {@link sap.ui.model.odata.v4.ODataModel#bindList}),
 	 *     <li> the {@link sap.ui.model.Filter.NONE} filter instance is contained in
@@ -2865,9 +2875,7 @@ sap.ui.define([
 	 * @since 1.91.0
 	 */
 	ODataListBinding.prototype.getCount = function () {
-		var oHeaderContext = this.getHeaderContext();
-
-		return oHeaderContext ? oHeaderContext.getProperty("$count") : undefined;
+		return this.getHeaderContext()?.getProperty("$count");
 	};
 
 	/**
@@ -3108,8 +3116,8 @@ sap.ui.define([
 	 *     <li> the binding is unresolved,
 	 *     <li> the given context path does not match this binding,
 	 *     <li> the binding's root binding is suspended,
-	 *     <li> the binding is {@link #isTransient transient} (part of a
-	 *       {@link sap.ui.model.odata.v4.ODataListBinding#create deep create}).
+	 *     <li> the binding is part of a {@link #create deep create} because it is relative to a
+	 *       {@link sap.ui.model.odata.v4.Context#isTransient transient} context,
 	 *     <li> {@link sap.ui.model.odata.v4.Context#setKeepAlive} fails
 	 *   </ul>
 	 *
@@ -3248,7 +3256,7 @@ sap.ui.define([
 
 		this.aSorters.forEach(function (oSorter) {
 			if (oSorter instanceof Sorter) {
-				aOrderbyOptions.push(oSorter.sPath + (oSorter.bDescending ? " desc" : ""));
+				aOrderbyOptions.push(oSorter.getPath() + (oSorter.isDescending() ? " desc" : ""));
 			} else {
 				throw new Error("Unsupported sorter: " + oSorter + " - " + that);
 			}
@@ -3268,8 +3276,7 @@ sap.ui.define([
 	 * @returns {Object<any>} mQueryOptions
 	 *   The object with the query options. Query options can be provided with
 	 *   {@link sap.ui.model.odata.v4.ODataModel#bindList},
-	 *   {@link sap.ui.model.odata.v4.ODataModel#bindContext},
-	 *   {@link sap.ui.model.odata.v4.ODataListBinding#changeParameters}, and
+	 *   {@link sap.ui.model.odata.v4.ODataModel#bindContext}, {@link #changeParameters}, and
 	 *   {@link sap.ui.model.odata.v4.ODataContextBinding#changeParameters}. System query options
 	 *   can also be calculated, e.g. <code>$filter</code> can be calculated based on provided
 	 *   filter objects.
@@ -3305,6 +3312,25 @@ sap.ui.define([
 		return this.mQueryOptions;
 	};
 
+	/**
+	 * Returns the count of selected elements as a number of type <code>Edm.Int64</code>. The count
+	 * is bindable via the header context (see {@link #getHeaderContext}) and path
+	 * <code>$selectionCount</code>; it is either available synchronously or unknown. It is unknown
+	 * if the binding is relative but has no context and also if the list binding's
+	 * {@link sap.ui.model.odata.v4.ODataListBinding#getHeaderContext header context} is selected
+	 * ("select all").
+	 *
+	 * @returns {number|undefined}
+	 *   The count of selected elements or <code>undefined</code> if the count or the header
+	 *   context is not available.
+	 *
+	 * @public
+	 * @since 1.135.0
+	 */
+	ODataListBinding.prototype.getSelectionCount = function () {
+		return this.getHeaderContext()?.getProperty("$selectionCount");
+	};
+
 	/**
 	 * Returns true if the binding has {@link sap.ui.model.Filter.NONE} in its filters.
 	 *
@@ -3627,13 +3653,14 @@ sap.ui.define([
 	 * 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.
+	 * its proper position ("in place") and simply "persisted". If needed, a subsequent side-effects
+	 * refresh within the same $batch is requested, 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|null} oParentContext - The new parent's context
 	 * @param {sap.ui.model.odata.v4.Context|null} [oSiblingContext] - The next sibling's context
+	 * @param {boolean} [bCopy] - Whether the node should be copied instead of moved
 	 * @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
@@ -3642,7 +3669,8 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
-	ODataListBinding.prototype.move = function (oChildContext, oParentContext, oSiblingContext) {
+	ODataListBinding.prototype.move = function (oChildContext, oParentContext, oSiblingContext,
+			bCopy) {
 		/*
 		 * 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.
@@ -3680,7 +3708,7 @@ sap.ui.define([
 			: oChildContext.getPath().slice(1);
 		const bUpdateSiblingIndex = oSiblingContext?.isEffectivelyKeptAlive();
 		const {promise : oPromise, refresh : bRefresh} = this.oCache.move(oGroupLock, sChildPath,
-			sParentPath, sSiblingPath, sNonCanonicalChildPath, bUpdateSiblingIndex);
+			sParentPath, sSiblingPath, sNonCanonicalChildPath, bUpdateSiblingIndex, bCopy);
 
 		if (bRefresh) {
 			return SyncPromise.all([
@@ -3886,7 +3914,7 @@ sap.ui.define([
 					oCache.reset([]);
 				} else {
 					that.fetchCache(that.oContext, false, /*bKeepQueryOptions*/true,
-						bKeepCacheOnError ? sGroupId : undefined);
+						sGroupId, bKeepCacheOnError);
 					oKeptElementsPromise = that.refreshKeptElements(sGroupId,
 						/*bIgnorePendingChanges*/ bKeepCacheOnError);
 					if (that.iCurrentEnd > 0) {
@@ -3987,10 +4015,8 @@ sap.ui.define([
 	 *   A lock for the group ID to be used for refresh
 	 * @param {boolean} [bAllowRemoval]
 	 *   Allows the list binding to remove the given context from its collection because the
-	 *   entity does not match the binding's filter anymore,
-	 *   see {@link sap.ui.model.odata.v4.ODataListBinding#filter}; a removed context is
-	 *   destroyed, see {@link sap.ui.model.Context#destroy}.
-	 *   Supported since 1.55.0
+	 *   entity does not match the binding's filter anymore, see {@link #filter}; a removed context
+	 *   is destroyed, see {@link sap.ui.model.Context#destroy}. Supported since 1.55.0
 	 *
 	 *   A removed context is destroyed unless it is
 	 *   {@link sap.ui.model.odata.v4.Context#isKeepAlive kept alive} and still exists on the
@@ -4083,6 +4109,7 @@ sap.ui.define([
 
 					if (!bStillAlive) {
 						bDestroyed = true;
+						oContext.doSetSelected(false, true);
 						oContext.destroy();
 					}
 				}
@@ -4284,8 +4311,8 @@ sap.ui.define([
 	 *   messages; it resolves with <code>null</code> if the binding is not resolved or if there is
 	 *   no message for any entry
 	 * @throws {Error}
-	 *   If the binding is {@link #isTransient transient} (part of a
-	 *   {@link sap.ui.model.odata.v4.ODataListBinding#create deep create}).
+	 *   If the binding is part of a {@link #create deep create} because it is relative to a
+	 *   {@link sap.ui.model.odata.v4.Context#isTransient transient} context
 	 *
 	 * @protected
 	 * @see sap.ui.model.ListBinding#requestFilterForMessages
@@ -4338,6 +4365,78 @@ sap.ui.define([
 		});
 	};
 
+	/**
+	 * Requests selected contexts matching the binding's filters and ordered by its sorters. A
+	 * context which is selected but no longer part of this list binding's collection (that is,
+	 * which doesn't match the filters) is not returned but still shown as selected on the UI.
+	 *
+	 * Note: Data for all selected contexts is reread from the server, even if it is already
+	 * available on the client. Any data updates are reflected on the UI but no order is changed.
+	 *
+	 * @param {string} [sGroupId]
+	 *   The group ID to be used for the request; if not specified, the group ID for this binding is
+	 *   used, see {@link #getGroupId}. Valid values are <code>undefined</code>, '$auto', '$auto.*',
+	 *   '$direct' or application group IDs as specified in
+	 *   {@link sap.ui.model.odata.v4.ODataModel}.
+	 * @returns {Promise<sap.ui.model.odata.v4.Context[]>}
+	 *   A promise which resolves with an array of selected contexts (which may well be empty), or
+	 *   rejects with an instance of <code>Error</code> in case of failure
+	 * @throws {Error} If
+	 *   <ul>
+	 *     <li> the binding uses or inherits the <code>$$sharedRequest</code> parameter
+	 *       (see {@link sap.ui.model.odata.v4.ODataModel#bindList}),
+	 *     <li> the binding uses data aggregation or a recursive hierarchy (see
+	 *       {@link #setAggregation}),
+	 *     <li> the binding's root binding is suspended,
+	 *     <li> the binding is part of a {@link #create deep create} because it is relative to a
+	 *       {@link sap.ui.model.odata.v4.Context#isTransient transient} context,
+	 *     <li> the binding's header context is selected ("Select All"),
+	 *     <li> there are pending changes,
+	 *     <li> the given group ID is invalid.
+	 *   </ul>
+	 *
+	 * @private
+	 * @since 1.134.0
+	 * @ui5-restricted sap.m.Table
+	 */
+	ODataListBinding.prototype.requestSelectedContexts = function (sGroupId) {
+		if (this.bSharedRequest) {
+			throw new Error("Unsupported $$sharedRequest at " + this);
+		}
+		if ("$$aggregation" in this.mParameters) {
+			throw new Error("Unsupported $$aggregation at " + this);
+		}
+		this.checkSuspended();
+		this.checkTransient();
+		if (this.oHeaderContext.isSelected()) {
+			throw new Error('Unsupported "Select All": ' + this.oHeaderContext);
+		}
+		if (this.hasPendingChanges()) {
+			throw new Error("Unsupported pending changes");
+		}
+		_Helper.checkGroupId(sGroupId);
+
+		const mPath2Context = {};
+		const iStartOfPredicate = this.getResolvedPath().length;
+		const aPredicatesIn = this._getAllExistingContexts()
+			.filter((oContext) => oContext.isSelected())
+			.map((oContext) => {
+				mPath2Context[oContext.getPath()] = oContext;
+
+				return oContext.getPath().slice(iStartOfPredicate);
+			});
+		if (!aPredicatesIn.length) {
+			return Promise.resolve([]);
+		}
+
+		return this.oCache.requestFilteredOrderedPredicates(aPredicatesIn, this.lockGroup(sGroupId))
+			.then((aPredicatesOut) => {
+				// Note: make sure to respect back-end sort order
+				return aPredicatesOut
+					.map((sPredicate) => mPath2Context[this.oHeaderContext.getPath() + sPredicate]);
+			});
+	};
+
 	/**
 	 * @override
 	 * @see sap.ui.model.odata.v4.ODataParentBinding#requestSideEffects
@@ -4719,8 +4818,8 @@ sap.ui.define([
 	 *     <li> there are pending changes,
 	 *     <li> a recursive hierarchy is requested, but the model does not use the
 	 *       <code>autoExpandSelect</code> parameter,
-	 *     <li> the binding is {@link #isTransient transient} (part of a
-	 *       {@link sap.ui.model.odata.v4.ODataListBinding#create deep create}),
+	 *     <li> the binding is part of a {@link #create deep create} because it is relative to a
+	 *       {@link sap.ui.model.odata.v4.Context#isTransient transient} context,
 	 *     <li> the binding has {@link sap.ui.model.Filter.NONE}
 	 *   </ul>
 	 *
@@ -4900,8 +4999,8 @@ sap.ui.define([
 	 * @throws {Error} If
 	 *   <ul>
 	 *     <li> there are pending changes that cannot be ignored,
-	 *     <li> the binding is {@link #isTransient transient} (part of a
-	 *       {@link sap.ui.model.odata.v4.ODataListBinding#create deep create}),
+	 *     <li> the binding is part of a {@link #create deep create} because it is relative to a
+	 *       {@link sap.ui.model.odata.v4.Context#isTransient transient} context,
 	 *     <li> an unsupported operation mode is used (see
 	 *       {@link sap.ui.model.odata.v4.ODataModel#bindList}).
 	 *   </ul>
@@ -5106,6 +5205,46 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * Validates the selected contexts against the list binding's filter criteria and removes the
+	 * selection from contexts that no longer match.
+	 *
+	 * @param {sap.ui.model.odata.v4.lib._Cache} oCache
+	 *   The cache to be used
+	 * @param {string} [sGroupId]
+	 *   The group ID to be used for the request
+	 *
+	 * @private
+	 */
+	ODataListBinding.prototype.validateSelection = function (oCache, sGroupId) {
+		if (!this.mParameters.$$clearSelectionOnFilter || "$$aggregation" in this.mParameters
+			|| this.oHeaderContext.isSelected()) {
+			return;
+		}
+
+		const aSelectedContexts = this._getAllExistingContexts(true)
+			.filter((oContext) => oContext.isSelected());
+
+		if (!aSelectedContexts.length) {
+			return;
+		}
+
+		const iStartOfPredicate = this.getResolvedPath().length;
+		const aPredicatesIn = aSelectedContexts
+			.map((oContext) => oContext.getPath().slice(iStartOfPredicate));
+		oCache.requestFilteredOrderedPredicates(aPredicatesIn, this.lockGroup(sGroupId), true)
+			.then((aPredicatesOut) => {
+				const oPredicates = new Set(aPredicatesOut);
+				aSelectedContexts.forEach((oContext) => {
+					if (!oPredicates.has(oContext.getPath().slice(iStartOfPredicate))) {
+						oContext.setSelected(false);
+					}
+				});
+			}, (oError) => {
+				this.oModel.reportError("Failed to validate selection", sClassName, oError);
+			});
+	};
+
 	//*********************************************************************************************
 	// "static" functions
 	//*********************************************************************************************

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

@@ -60,7 +60,45 @@ sap.ui.define([
 		oBooleanType,
 		mCodeListUrl2Promise = {},
 		DEBUG = Log.Level.DEBUG,
-		aInt64Names = ["$count", "@$ui5.node.groupLevelCount", "@$ui5.node.level"],
+		oGeoJSON = {
+			$kind : "ComplexType",
+			$OpenType : true,
+			bbox : {
+				$kind : "Property",
+				$Type : "Edm.Double",
+				$isCollection : true
+			},
+			type : {
+				$kind : "Property",
+				$Nullable : false,
+				$Type : "Edm.String"
+			}
+		},
+		oGeometry = {
+			...oGeoJSON, // "$BaseType" : "GeoJSON",
+			coordinates : {
+				$kind : "Property",
+				$Nullable : false,
+				$Type : "Edm.Double",
+				$isCollection : true
+			}
+		},
+		mEdmScope = {
+			"Edm.Geography" : {...oGeoJSON, $Abstract : true},
+			"Edm.GeographyLineString" : oGeometry,
+			"Edm.GeographyMultiLineString" : oGeometry,
+			"Edm.GeographyMultiPoint" : oGeometry,
+			"Edm.GeographyMultiPolygon" : oGeometry,
+			"Edm.GeographyPoint" : oGeometry,
+			"Edm.GeographyPolygon" : oGeometry
+			// Note: same for "Edm.Geometry*", see end of file
+		},
+		aInt64Names = [
+			"$count",
+			"$selectionCount",
+			"@$ui5.node.groupLevelCount",
+			"@$ui5.node.level"
+		],
 		oInt64Type,
 		rLeftBraces = /\$\(/g,
 		rNumber = /^-?\d+$/,
@@ -157,7 +195,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.133.1
+		 * @version 1.135.0
 		 */
 		ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 				constructor : constructor
@@ -1091,7 +1129,7 @@ sap.ui.define([
 			if (!bPrefetch) {
 				aPromises.push(this.oModel._requestAnnotationChanges());
 				this.oMetadataPromise = SyncPromise.all(aPromises).then(function (aMetadata) {
-					var mScope = aMetadata[0];
+					var mScope = Object.assign(aMetadata[0], mEdmScope);
 
 					that.aAnnotationChanges = aMetadata.pop();
 					that._mergeAnnotations(mScope, aMetadata.slice(1));
@@ -1785,7 +1823,7 @@ sap.ui.define([
 				return oProperty["$ui5.type"];
 			}
 
-			if (oProperty.$isCollection) {
+			if (oProperty.$isCollection && !rNumber.test(sLastSegment)) {
 				Log.warning("Unsupported collection type, using " + oType.getName(), sPath,
 					sODataMetaModel);
 			} else {
@@ -2435,8 +2473,8 @@ sap.ui.define([
 	 *   of "cross-service references" (see parameter <code>supportReferences</code> of
 	 *   {@link sap.ui.model.odata.v4.ODataModel#constructor}).
 	 *
-	 * @deprecated As of 1.51.0, use {@link #getETags} instead because modifications to old files
-	 *   may be shadowed by a new file in certain scenarios.
+	 * @deprecated As of version 1.51.0, use {@link #getETags} instead because modifications to old
+	 *   files may be shadowed by a new file in certain scenarios.
 	 * @public
 	 * @since 1.47.0
 	 */
@@ -2675,6 +2713,22 @@ sap.ui.define([
 	ODataMetaModel.prototype.getValueListType
 		= _Helper.createGetMethod("fetchValueListType", true);
 
+	/**
+	 * Tells whether this metadata model's service prefers requests to use a resource path with
+	 * navigation properties instead of a canonical path, thus reflecting the object composition.
+	 * See "com.sap.vocabularies.Common.v1.AddressViaNavigationPath" for more details.
+	 *
+	 * @returns {boolean|undefined}
+	 *   <code>true</code> if the "com.sap.vocabularies.Common.v1.AddressViaNavigationPath" tag is
+	 *   present, <code>undefined</code> if it is missing or metadata is not (yet) available
+	 *
+	 * @public
+	 * @since 1.135.0
+	 */
+	ODataMetaModel.prototype.isAddressViaNavigationPath = function () {
+		return this.getObject("/@com.sap.vocabularies.Common.v1.AddressViaNavigationPath");
+	};
+
 	/**
 	 * Method not supported
 	 *
@@ -3706,5 +3760,10 @@ sap.ui.define([
 		mCodeListUrl2Promise = {};
 	};
 
+	Object.keys(mEdmScope).forEach((sGeographyName) => {
+		const sGeometryName = sGeographyName.replace("Geography", "Geometry");
+		mEdmScope[sGeometryName] = mEdmScope[sGeographyName];
+	});
+
 	return ODataMetaModel;
 });