@openui5/sap.ui.core 1.129.0 → 1.130.1

package/src/sap/ui/model/odata/type/Unit.js

@@ -66,7 +66,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.type.Unit
 	 * @public
 	 * @since 1.63.0
-	 * @version 1.129.0
+	 * @version 1.130.1
 	 */
 	var Unit = BaseUnit.extend("sap.ui.model.odata.type.Unit", {
 		constructor : function (oFormatOptions, oConstraints, aDynamicFormatOptionNames) {

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

@@ -64,7 +64,7 @@ sap.ui.define([
 	 * @hideconstructor
 	 * @public
 	 * @since 1.93.0
-	 * @version 1.129.0
+	 * @version 1.130.1
 	 */
 	var Context = BaseContext.extend("sap.ui.model.odata.v2.Context", {
 			constructor : function (oModel, sPath, sDeepPath, oCreatePromise, bInactive,

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.129.0
+	 * @version 1.130.1
 	 *
 	 * @public
 	 * @since 1.37.0

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

@@ -63,6 +63,11 @@ sap.ui.define([
 ) {
 
 	"use strict";
+	/**
+	 * Whether the ODataModel is marked as final.
+	 * @ui5-transform-hint replace-local true
+	 */
+	const bFinal = false;
 
 	var sClassName = "sap.ui.model.odata.v2.ODataModel",
 		aDeepCreateParametersAllowlist = ["context", "properties"],
@@ -213,7 +218,7 @@ sap.ui.define([
 	 * This model is not prepared to be inherited from.
 	 *
 	 * @author SAP SE
-	 * @version 1.129.0
+	 * @version 1.130.1
 	 *
 	 * @public
 	 * @alias sap.ui.model.odata.v2.ODataModel
@@ -533,7 +538,8 @@ sap.ui.define([
 			                 "setDefaultBindingMode", "getDefaultBindingMode", "getDefaultCountMode",
 			                 "setProperty", "getSecurityToken", "refreshSecurityToken", "setHeaders",
 			                 "getHeaders", "setUseBatch", "setDeferredBatchGroups", "getDeferredBatchGroups",
-			                 "setChangeBatchGroups", "getChangeBatchGroups"]
+			                 "setChangeBatchGroups", "getChangeBatchGroups"],
+			"final": bFinal
 		}
 	});
 
@@ -1794,6 +1800,19 @@ sap.ui.define([
 		});
 	};
 
+	/**
+	 * Returns this model's base URI of the data service (as defined by the "serviceUrl" model parameter; see
+	 * {@link #constructor}), without query options.
+	 *
+	 * @returns {string} The service's base URI without query options
+	 *
+	 * @public
+	 * @since 1.130.0
+	 */
+	ODataModel.prototype.getServiceUrl = function () {
+		return this.sServiceUrl;
+	};
+
 	/**
 	 * Invalidate the model data.
 	 *
@@ -9063,6 +9082,18 @@ sap.ui.define([
 
 		return this.pAnnotationChanges;
 	};
+	/** @deprecated */
+	const fnOriginalExtend = ODataModel.extend;
+	/**
+	 * DO NOT EXTEND THIS CLASS.
+	 *
+	 * @returns {function} The created class / constructor function
+	 * @deprecated
+	 */
+	ODataModel.extend = function () {
+		Log.error("[FUTURE FATAL] sap.ui.model.odata.v2.ODataModel must not be extended");
+		return fnOriginalExtend.apply(this, arguments);
+	};
 
 	return ODataModel;
 });

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

@@ -103,7 +103,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.TreeBinding
 	 * @hideconstructor
 	 * @public
-	 * @version 1.129.0
+	 * @version 1.130.1
 	 */
 	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/Context.js

@@ -42,7 +42,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.39.0
-		 * @version 1.129.0
+		 * @version 1.130.1
 		 */
 		Context = BaseContext.extend("sap.ui.model.odata.v4.Context", {
 				constructor : constructor
@@ -238,8 +238,8 @@ sap.ui.define([
 	 *
 	 * Since 1.105 such a pending deletion is a pending change. It causes
 	 * <code>hasPendingChanges</code> to return <code>true</code> for the context, the binding
-	 * containing it, and the model. The <code>resetChanges</code> method called on the context
-	 * (since 1.109.0), the binding, or the model cancels the deletion and restores the context.
+	 * containing it, and the model. The <code>resetChanges</code> method called on the context, the
+	 * binding, or the model cancels the deletion and restores the context.
 	 *
 	 * If the DELETE request succeeds, the context is destroyed and must not be used anymore. If it
 	 * fails or is canceled, the context is restored, reinserted into the list, and fully functional
@@ -322,6 +322,9 @@ sap.ui.define([
 		}
 		this.oBinding.checkSuspended();
 		if (this.isTransient()) {
+			if (this.iIndex === undefined) {
+				return Promise.resolve(); // already deleted, nothing to do
+			}
 			sGroupId = null;
 		} else if (sGroupId === null) {
 			if (!(this.isKeepAlive() && this.iIndex === undefined)) {
@@ -651,6 +654,9 @@ sap.ui.define([
 	 *   The number of levels to expand (@experimental as of version 1.127.0),
 	 *   <code>iLevels >= Number.MAX_SAFE_INTEGER</code> can be used to expand all levels. If a node
 	 *   is expanded a second time, the expand state of the descendants is not changed.
+	 * @returns {Promise<void>}
+	 *   A promise which is resolved without a defined result when the expand is successful, or
+	 *   rejected in case of an error
 	 * @throws {Error}
 	 *   If the context points to a node that is not expandable or already expanded, the given
 	 *   number of levels is not a positive number, or the given number of levels is greater than
@@ -667,8 +673,7 @@ sap.ui.define([
 		}
 		switch (this.isExpanded()) {
 			case false:
-				this.oBinding.expand(this, iLevels).catch(this.oModel.getReporter());
-				break;
+				return Promise.resolve(this.oBinding.expand(this, iLevels)).then(() => {});
 			case true:
 				throw new Error("Already expanded: " + this);
 			default:
@@ -845,6 +850,46 @@ sap.ui.define([
 	 */
 	Context.prototype.getCanonicalPath = _Helper.createGetMethod("fetchCanonicalPath", true);
 
+	/**
+	 * Returns a filter object corresponding to this context. For an ordinary row context of a list
+	 * binding, the filter matches exactly the entity's key properties. For a subtotal row (see
+	 * {@link sap.ui.model.odata.v4.ODataListBinding.setAggregation}), the filter matches exactly
+	 * the groupable properties corresponding to this context. For a grand total, <code>null</code>
+	 * is returned.
+	 *
+	 * @returns {sap.ui.model.Filter|null}
+	 *   A filter object corresponding to this context
+	 * @throws {Error} If this context is
+	 *   <ul>
+	 *     <li> not a list binding's row context,
+	 *     <li> currently transient,
+	 *     <li> using key aliases,
+	 *     <li> using an index, not a key predicate in the last segment of its path,
+	 *     <li> just created via {@link sap.ui.model.odata.v4.ODataModel#getKeepAliveContext} and
+	 *       metadata is not yet available
+	 *   </ul>
+	 *
+	 * @public
+	 * @since 1.130.0
+	 */
+	Context.prototype.getFilter = function () {
+		if (!this.oBinding.getHeaderContext || this.isTransient()) {
+			throw new Error("Not a list context path to an entity: " + this);
+		}
+
+		const iPredicateIndex = _Helper.getPredicateIndex(this.sPath);
+		const sPredicate = this.sPath.slice(iPredicateIndex).replace(/,?\$isTotal=true\)$/, ")");
+		if (sPredicate === "()") {
+			return null; // grand total
+		}
+
+		const oMetaModel = this.oModel.getMetaModel();
+		const sMetaPath = _Helper.getMetaPath(this.sPath);
+		const oEntityType = oMetaModel.getObject(sMetaPath + "/");
+
+		return _Helper.getFilterForPredicate(sPredicate, oEntityType, oMetaModel, sMetaPath, true);
+	};
+
 	/**
 	 * Returns the unique number of this context's generation, or <code>0</code> if it does not
 	 * belong to any specific generation. This number can be inherited from a parent binding.
@@ -1295,15 +1340,15 @@ sap.ui.define([
 
 	/**
 	 * Tells whether this context is currently selected, but not {@link #delete deleted} on the
-	 * client. Since 1.122.0 the selection state can also be accessed via instance annotation
-	 * "@$ui5.context.isSelected" at the entity. Note that the annotation does not take the deletion
-	 * state into account.
+	 * client. Selection was experimental as of version 1.111.0. Since 1.122.0, the selection state
+	 * can also be accessed via instance annotation "@$ui5.context.isSelected" at the entity. Note
+	 * that the annotation does not take the deletion state into account.
 	 *
 	 * @returns {boolean} Whether this context is currently selected
 	 *
-	 * @experimental As of version 1.111.0
 	 * @public
 	 * @see #setSelected
+	 * @since 1.130.0
 	 */
 	Context.prototype.isSelected = function () {
 		return this.bSelected && !this.oDeletePromise;
@@ -2346,9 +2391,11 @@ sap.ui.define([
 	 * event is fired on the list binding which this context belongs to. While a context is
 	 * currently {@link #delete deleted} on the client, it does not appear as
 	 * {@link #isSelected selected}. If the preconditions of {@link #setKeepAlive} hold, a best
-	 * effort is made to implicitly keep a selected context alive in order to preserve the selection
-	 * state. Once the selection is no longer needed, for example because you perform an operation
-	 * on this context which logically removes it from its list, you need to reset the selection.
+	 * effort is made to implicitly keep a (de-)selected context alive in order to preserve the
+	 * selection state of every exception to the "select all" state defined by the list binding's
+	 * {@link sap.ui.model.odata.v4.ODataListBinding#getHeaderContext header context}. Once the
+	 * selection is no longer needed, for example because you perform an operation on this context
+	 * which logically removes it from its list, you need to reset the selection.
 	 *
 	 * If this context is a header context of a list binding, the new selection state is propagated
 	 * to all row contexts. If the selection state of this header context changes, a
@@ -2360,6 +2407,8 @@ sap.ui.define([
 	 * {@link sap.ui.model.odata.v4.ODataListBinding#event:selectionChanged 'selectionChanged'}
 	 * event is nevertheless fired for this header context, but not for the row context.
 	 *
+	 * Selection was experimental as of version 1.111.0.
+	 *
 	 * <b>Note:</b> It is unsafe to keep a reference to a context instance which is not
 	 * {@link #isKeepAlive kept alive}.
 	 *
@@ -2368,9 +2417,9 @@ sap.ui.define([
 	 *   If this context does not belong to a list binding, or if it is {@link #isDeleted deleted}
 	 *   and <code>bSelected</code> is <code>true</code>
 	 *
-	 * @experimental As of version 1.111.0
 	 * @public
 	 * @see #isSelected
+	 * @since 1.130.0
 	 */
 	Context.prototype.setSelected = function (bSelected) {
 		if (this.oBinding && !this.oBinding.getHeaderContext) {

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

@@ -1345,6 +1345,10 @@ sap.ui.define([
 		var aPaths = [],
 			sMetaPath = _Helper.getMetaPath(this.getResolvedPath());
 
+		if (this.oCache === undefined) {
+			return undefined; // nothing to do - looks like a refresh in progress
+		}
+
 		aAbsolutePaths.some(function (sAbsolutePath) {
 			var sRelativePath = _Helper.getRelativePath(sAbsolutePath, sMetaPath);
 

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.129.0
+		 * @version 1.130.1
 		 *
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding

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

@@ -13,7 +13,6 @@ sap.ui.define([
 	"./lib/_Cache",
 	"./lib/_GroupLock",
 	"./lib/_Helper",
-	"./lib/_Parser",
 	"sap/base/Log",
 	"sap/ui/base/SyncPromise",
 	"sap/ui/model/Binding",
@@ -26,8 +25,8 @@ sap.ui.define([
 	"sap/ui/model/Sorter",
 	"sap/ui/model/odata/OperationMode"
 ], function (Context, asODataParentBinding, _AggregationCache, _AggregationHelper, _Cache,
-		_GroupLock, _Helper, _Parser, Log, SyncPromise, Binding, ChangeReason, Filter,
-		FilterOperator, FilterProcessor, FilterType, ListBinding, Sorter, OperationMode) {
+		_GroupLock, _Helper, Log, SyncPromise, Binding, ChangeReason, Filter, FilterOperator,
+		FilterProcessor, FilterType, ListBinding, Sorter, OperationMode) {
 	"use strict";
 
 	var sClassName = "sap.ui.model.odata.v4.ODataListBinding",
@@ -58,7 +57,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.129.0
+		 * @version 1.130.1
 		 * @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
@@ -551,7 +550,8 @@ sap.ui.define([
 
 	/**
 	 * The 'selectionChanged' event is fired if the selection state of a context changes; for more
-	 * information see {@link sap.ui.model.odata.v4.Context#setSelected}.
+	 * information see {@link sap.ui.model.odata.v4.Context#setSelected}. This event was
+	 * experimental as of version 1.126.0.
 	 *
 	 * @param {sap.ui.base.Event} oEvent The event object
 	 * @param {sap.ui.model.odata.v4.ODataListBinding} oEvent.getSource() This binding
@@ -561,8 +561,8 @@ sap.ui.define([
 	 *   The context for which {@link sap.ui.model.odata.v4.Context#setSelected} was called
 	 *
 	 * @event sap.ui.model.odata.v4.ODataListBinding#selectionChanged
-	 * @experimental As of version 1.126.0
 	 * @public
+	 * @since 1.130.0
 	 */
 
 	/**
@@ -706,7 +706,7 @@ sap.ui.define([
 
 		iCount ??= this.oCache.collapse(
 			_Helper.getRelativePath(oContext.getPath(), this.oHeaderContext.getPath()),
-			bAll);
+			bAll ? this.lockGroup() : undefined);
 
 		if (iCount > 0) {
 			const aContexts = this.aContexts;
@@ -812,13 +812,12 @@ sap.ui.define([
 	 * {@link sap.ui.model.odata.v4.Context#move move} must be pending, and no other modification
 	 * (including collapse of some ancestor node) must happen while this creation is pending!
 	 *
-	 * When using the <code>createInPlace</code> parameter
-	 * (see {@link #setAggregation}, @experimental as of version 1.125.0), the new
-	 * {@link sap.ui.model.odata.v4.Context#isTransient transient} child is hidden until its
-	 * {@link sap.ui.model.odata.v4.Context#created created promise} resolves, and then it is shown
-	 * at a position determined by the back end and the current sort order. Note that the returned
-	 * context is not always part of this list binding's collection and can only be used for the
-	 * following scenarios:
+	 * When using the <code>createInPlace</code> parameter (see {@link #setAggregation},
+	 * since 1.130.0), the new {@link sap.ui.model.odata.v4.Context#isTransient transient} child is
+	 * hidden until its {@link sap.ui.model.odata.v4.Context#created created promise} resolves, and
+	 * then it is shown at a position determined by the back end and the current sort order. Note
+	 * that the returned context is not always part of this list binding's collection and can only
+	 * be used for the following scenarios:
 	 * <ul>
 	 *   <li> The position of the new child can be retrieved by using its
 	 *     {@link sap.ui.model.odata.v4.Context#getIndex index}. If the created child does not
@@ -1511,8 +1510,8 @@ sap.ui.define([
 		}
 		oCache ??= _AggregationCache.create(this.oModel.oRequestor, sResourcePath,
 			sDeepResourcePath, mQueryOptions, this.mParameters.$$aggregation,
-			this.oModel.bAutoExpandSelect, this.bSharedRequest, this.isGrouped(),
-			this.mParameters.$$separate);
+			this.oModel.bAutoExpandSelect || "$$separate" in this.mParameters,
+			this.bSharedRequest, this.isGrouped(), this.mParameters.$$separate);
 		if (mKeptElementsByPredicate) {
 			aKeepAlivePredicates.forEach(function (sPredicate) {
 				oCache.addKeptElement(mKeptElementsByPredicate[sPredicate]);
@@ -1865,7 +1864,8 @@ sap.ui.define([
 	 * @private
 	 */
 	ODataListBinding.prototype.fetchFilter = function (oContext, sStaticFilter) {
-		var oCombinedFilter, aFilters, oMetaModel, oMetaContext;
+		const oMetaModel = this.oModel.getMetaModel();
+		const oMetaContext = oMetaModel.getMetaContext(this.oModel.resolve(this.sPath, oContext));
 
 		/*
 		 * Returns the $filter value for the given single filter using the given Edm type to
@@ -2009,26 +2009,32 @@ sap.ui.define([
 			return bWrap ? "(" + sFilter + ")" : sFilter;
 		}
 
-		oCombinedFilter = FilterProcessor.combineFilters(this.aFilters, this.aApplicationFilters);
+		const oCombinedFilter
+			= FilterProcessor.combineFilters(this.aFilters, this.aApplicationFilters);
 		if (!oCombinedFilter) {
 			return SyncPromise.resolve([sStaticFilter]);
 		}
 		if (oCombinedFilter === Filter.NONE) {
 			return SyncPromise.resolve(["false"]);
 		}
-		aFilters = _AggregationHelper.splitFilter(oCombinedFilter, this.mParameters.$$aggregation);
-		oMetaModel = this.oModel.getMetaModel();
-		oMetaContext = oMetaModel.getMetaContext(this.oModel.resolve(this.sPath, oContext));
-
-		return SyncPromise.all([
-			fetchFilter(aFilters[0], {}, /*bWithinAnd*/sStaticFilter).then(function (sFilter) {
-				return sFilter && sStaticFilter
-					? sFilter + " and (" + sStaticFilter + ")"
-					: sFilter || sStaticFilter;
-			}),
-			fetchFilter(aFilters[1], {}), // $$filterBeforeAggregate
-			fetchFilter(aFilters[2], {}, undefined, /*bThese*/true) // $$filterOnAggregate
-		]);
+
+		const oPromise = _Helper.isDataAggregation(this.mParameters)
+			? oMetaModel.fetchObject(oMetaContext.getPath() + "/")
+			: SyncPromise.resolve();
+
+		return oPromise.then((oEntityType) => {
+			const aFilters = _AggregationHelper.splitFilter(oCombinedFilter,
+				this.mParameters.$$aggregation, oEntityType);
+
+			return SyncPromise.all([
+				fetchFilter(aFilters[0], {}, /*bWithinAnd*/sStaticFilter)
+					.then((sFilter) => (sFilter && sStaticFilter
+						? sFilter + " and (" + sStaticFilter + ")"
+						: sFilter || sStaticFilter)),
+				fetchFilter(aFilters[1], {}), // $$filterBeforeAggregate
+				fetchFilter(aFilters[2], {}, undefined, /*bThese*/true) // $$filterOnAggregate
+			]);
+		});
 	};
 
 	/**
@@ -2532,7 +2538,10 @@ sap.ui.define([
 	 *   Whether this call keeps the result of {@link #getCurrentContexts} untouched; since 1.86.0.
 	 * @returns {sap.ui.model.odata.v4.Context[]}
 	 *   The array of already created contexts with the first entry containing the context for
-	 *   <code>iStart</code>
+	 *   <code>iStart</code>. Since 1.130.0, the array has an additional property
+	 *   <code>bExpectMore</code>, which is <code>true</code> if the response is not complete, a
+	 *   {@link #event:change 'change'} event will follow, and a busy indicator should be switched
+	 *   on.
 	 * @throws {Error}
 	 *   If the binding's root binding is suspended, if <code>iMaximumPrefetchSize</code> and
 	 *   <code>bKeepCurrent</code> are set, if extended change detection is enabled and
@@ -2548,8 +2557,8 @@ sap.ui.define([
 			bKeepCurrent) {
 		var sChangeReason,
 			aContexts,
-			bDataRequested = false,
 			bFireChange = false,
+			bFireDataReceived,
 			bPreventBubbling,
 			oPromise,
 			bRefreshEvent = !!this.sChangeReason, // ignored for "*VirtualContext"
@@ -2641,8 +2650,10 @@ sap.ui.define([
 			// make sure "refresh" is followed by async "change"
 			oPromise = this.fetchContexts(iStart, iLength, iMaximumPrefetchSize, undefined,
 				/*bAsync*/bRefreshEvent, function () {
-					bDataRequested = true;
-					that.fireDataRequested(bPreventBubbling);
+					if (bFireDataReceived === undefined) {
+						bFireDataReceived = true;
+						that.fireDataRequested(bPreventBubbling);
+					}
 				});
 			if (!bRefreshEvent && oPromise.isPending()) {
 				this.createContextsForCachedData(iStart, iLength);
@@ -2661,12 +2672,13 @@ sap.ui.define([
 						that.oDiff = undefined;
 					}
 				}
-				if (bDataRequested) {
+				if (bFireDataReceived) {
 					that.fireDataReceived({data : {}}, bPreventBubbling);
 				}
+				bFireDataReceived = false; // no subsequent #fireDataRequested allowed
 			}, function (oError) {
 				// cache shares promises for concurrent read
-				if (bDataRequested) {
+				if (bFireDataReceived) {
 					that.fireDataReceived(oError.canceled ? {data : {}} : {error : oError},
 						bPreventBubbling);
 				}
@@ -2685,6 +2697,7 @@ sap.ui.define([
 			this.iCurrentEnd = iStart + iLength;
 		}
 		aContexts = this.getContextsInViewOrder(iStart, iLength);
+		aContexts.bExpectMore = this._isExpectingMoreContexts(aContexts, iStart, iLength);
 		if (this.bUseExtendedChangeDetection) {
 			if (this.oDiff && iLength !== this.oDiff.iLength) {
 				throw new Error("Extended change detection protocol violation: Expected "
@@ -4074,6 +4087,7 @@ sap.ui.define([
 			}
 		}
 		this.aContexts.splice(iIndex, 1);
+		oContext.iIndex = undefined;
 		if (!oContext.isEffectivelyKeptAlive()) {
 			this.destroyLater(oContext);
 		}
@@ -4224,8 +4238,8 @@ sap.ui.define([
 			});
 
 			aFilters = Object.keys(mPredicates).map(function (sPredicate) {
-				return ODataListBinding.getFilterForPredicate(sPredicate, oEntityType,
-					oMetaModel, sMetaPath);
+				return _Helper
+					.getFilterForPredicate(sPredicate, oEntityType, oMetaModel, sMetaPath);
 			});
 
 			if (aFilters.length === 0) {
@@ -4305,6 +4319,9 @@ sap.ui.define([
 			}
 		}
 		if (bSingle) {
+			this.oModel.withUnresolvedBindings("removeCachesAndMessages",
+				oContext.getPath().slice(1));
+
 			return this.refreshSingle(oContext, this.lockGroup(sGroupId), /*bAllowRemoval*/false,
 				/*bKeepCacheOnError*/true, /*bWithMessages*/true);
 		}
@@ -4539,7 +4556,7 @@ sap.ui.define([
 	 *   </ul>
 	 * @param {boolean} [oAggregation.createInPlace]
 	 *   Whether created nodes are shown in place at the position specified by the service
-	 *   (@experimental as of version 1.125.0); only the value <code>true</code> is allowed.
+	 *   (since 1.130.0); only the value <code>true</code> is allowed.
 	 *   Otherwise, created nodes are displayed out of place as the first children of their parent
 	 *   or as the first roots, but not in their usual position as defined by the service and the
 	 *   current sort order.
@@ -4559,7 +4576,7 @@ sap.ui.define([
 	 *   <ul>
 	 *     <li> <code>additionally</code>: An optional list of strings that provides the paths to
 	 *       properties (like texts or attributes) related to this groupable property in a 1:1
-	 *       relation (since 1.87.0). They are requested additionally via <code>groupby<code> and
+	 *       relation (since 1.87.0). They are requested additionally via <code>groupby</code> and
 	 *       must not change the actual grouping; a <code>unit</code> for an aggregatable property
 	 *       must not be repeated here.
 	 *   </ul>
@@ -4999,46 +5016,6 @@ sap.ui.define([
 	// "static" functions
 	//*********************************************************************************************
 
-	/**
-	 * Calculates the filter for the given key predicate.
-	 *
-	 * @param {string} sPredicate The key predicate of a message target
-	 * @param {object} oEntityType The metadata for the entity type
-	 * @param {sap.ui.model.odata.v4.ODataMetaModel} oMetaModel The meta model
-	 * @param {string} sMetaPath The meta path
-	 * @returns {sap.ui.model.Filter} an {@link sap.ui.model.Filter} for the given key predicate
-	 *
-	 * @private
-	 */
-	ODataListBinding.getFilterForPredicate = function (sPredicate, oEntityType, oMetaModel,
-			sMetaPath) {
-		var aFilters,
-			mValueByKeyOrAlias = _Parser.parseKeyPredicate(sPredicate);
-
-		if ("" in mValueByKeyOrAlias) {
-			// unnamed key e.g. {"" : ('42')} => replace it by the name of the only key property
-			mValueByKeyOrAlias[oEntityType.$Key[0]] = mValueByKeyOrAlias[""];
-			delete mValueByKeyOrAlias[""];
-		}
-
-		aFilters = oEntityType.$Key.map(function (vKey) {
-			var sKeyOrAlias, sKeyPath;
-
-			if (typeof vKey === "string") {
-				sKeyPath = sKeyOrAlias = vKey;
-			} else {
-				sKeyOrAlias = Object.keys(vKey)[0]; // alias
-				sKeyPath = vKey[sKeyOrAlias];
-			}
-
-			return new Filter(sKeyPath, FilterOperator.EQ,
-				_Helper.parseLiteral(decodeURIComponent(mValueByKeyOrAlias[sKeyOrAlias]),
-					oMetaModel.getObject(sMetaPath + "/" + sKeyPath + "/$Type"), sKeyPath));
-		});
-
-		return aFilters.length === 1 ? aFilters[0] : new Filter({and : true, filters : aFilters});
-	};
-
 	/**
 	 * Returns whether this binding is below an ODLB with data aggregation.
 	 *

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

@@ -57,9 +57,11 @@ sap.ui.define([
 				}
 			}
 		}),
-		oCountType,
+		oBooleanType,
 		mCodeListUrl2Promise = new Map(),
 		DEBUG = Log.Level.DEBUG,
+		aInt64Names = ["$count", "@$ui5.node.groupLevelCount", "@$ui5.node.level"],
+		oInt64Type,
 		rLeftBraces = /\$\(/g,
 		rNumber = /^-?\d+$/,
 		sODataMetaModel = "sap.ui.model.odata.v4.ODataMetaModel",
@@ -156,7 +158,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.129.0
+		 * @version 1.130.1
 		 */
 		ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 				constructor : constructor
@@ -1664,17 +1666,25 @@ sap.ui.define([
 	 * @see #requestUI5Type
 	 */
 	ODataMetaModel.prototype.fetchUI5Type = function (sPath, mFormatOptions) {
-		var oMetaContext = this.getMetaContext(sPath),
-			that = this;
-
-		if (sPath.endsWith("/$count")) {
-			oCountType ??= new Int64();
-			return SyncPromise.resolve(oCountType);
+		const sLastSegment = sPath.slice(sPath.lastIndexOf("/") + 1);
+		if (sLastSegment[0] === "$" || sLastSegment[0] === "@") {
+			if (aInt64Names.includes(sLastSegment)) {
+				oInt64Type ??= new Int64();
+				return SyncPromise.resolve(oInt64Type);
+			}
+			if (sLastSegment.startsWith("@$ui5.context.is")
+					|| sLastSegment.startsWith("@$ui5.node.is")) {
+				oBooleanType ??= new Boolean();
+				return SyncPromise.resolve(oBooleanType);
+			}
 		}
+
+		const oMetaContext = this.getMetaContext(sPath);
+
 		// Note: undefined is more efficient than "" here
 		return this.fetchObject(undefined, oMetaContext).catch(
 			this.oModel.getReporter()
-		).then(function (oProperty) {
+		).then((oProperty) => {
 			var oType = oRawType,
 				oTypeInfo;
 
@@ -1709,7 +1719,7 @@ sap.ui.define([
 				oTypeInfo = mUi5TypeForEdmType[oProperty.$Type];
 				if (oTypeInfo) {
 					oType = new oTypeInfo.Type(mFormatOptions,
-						that.getConstraints(oProperty, oMetaContext.getPath()));
+						this.getConstraints(oProperty, oMetaContext.getPath()));
 				} else {
 					Log.warning("Unsupported type '" + oProperty.$Type + "', using "
 						+ oType.getName(), sPath, sODataMetaModel);