@openui5/sap.ui.core 1.92.0 → 1.95.0

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

@@ -68,8 +68,8 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @class Context binding for an OData V4 model.
 	 *   An event handler can only be attached to this binding for the following events:
-	 *   'AggregatedDataStateChange', 'change', 'dataReceived', 'dataRequested', and
-	 *   'DataStateChange'. For other events, an error is thrown.
+	 *   'AggregatedDataStateChange', 'change', 'dataReceived', 'dataRequested', 'DataStateChange',
+	 *   'patchCompleted', and 'patchSent'. For other events, an error is thrown.
 	 *
 	 *   A context binding can also be used as an <i>operation binding</i> to support bound actions,
 	 *   action imports, bound functions and function imports. If you want to control the execution
@@ -106,7 +106,7 @@ sap.ui.define([
 	 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 *
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
@@ -114,7 +114,9 @@ sap.ui.define([
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#hasPendingChanges as #hasPendingChanges
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#isInitial as #isInitial
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#refresh as #refresh
+	 * @borrows sap.ui.model.odata.v4.ODataBinding#requestRefresh as #requestRefresh
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#resetChanges as #resetChanges
+	 * @borrows sap.ui.model.odata.v4.ODataBinding#toString as #toString
 	 * @borrows sap.ui.model.odata.v4.ODataParentBinding#attachPatchCompleted as
 	 *   #attachPatchCompleted
 	 * @borrows sap.ui.model.odata.v4.ODataParentBinding#attachPatchSent as #attachPatchSent
@@ -122,13 +124,13 @@ sap.ui.define([
 	 * @borrows sap.ui.model.odata.v4.ODataParentBinding#detachPatchCompleted as
 	 *   #detachPatchCompleted
 	 * @borrows sap.ui.model.odata.v4.ODataParentBinding#detachPatchSent as #detachPatchSent
-	 * @borrows sap.ui.model.odata.v4.ODataParentBinding#initialize as #initialize
 	 * @borrows sap.ui.model.odata.v4.ODataParentBinding#resume as #resume
 	 * @borrows sap.ui.model.odata.v4.ODataParentBinding#suspend as #suspend
 	 */
 	var ODataContextBinding = ContextBinding.extend("sap.ui.model.odata.v4.ODataContextBinding", {
 			constructor : function (oModel, sPath, oContext, mParameters) {
-				var iPos = sPath.indexOf("(...)");
+				var iPos = sPath.indexOf("(...)"),
+					that = this;
 
 				ContextBinding.call(this, oModel, sPath);
 				// initialize mixin members
@@ -178,6 +180,13 @@ sap.ui.define([
 				}
 				this.setContext(oContext);
 				oModel.bindingCreated(this);
+
+				Promise.resolve().then(function () {
+					// bInitial must be true initially, but false later. Then suspend on a just
+					// created binding causes a change event on resume; otherwise further changes
+					// on the suspended binding are required (see doSuspend)
+					that.bInitial = false;
+				});
 			},
 			metadata : {
 				publicMethods : []
@@ -574,11 +583,15 @@ sap.ui.define([
 	 * @returns {SyncPromise}
 	 *   The request promise
 	 * @throws {Error}
-	 *   If <code>fnOnStrictHandlingFailed</code> is given but the given metadata is not an
-	 *   "Action", or the given function does not return a promise, or a collection-valued parameter
-	 *   for an operation other than a V4 action is encountered, or if the given metadata is neither
-	 *   an "Action" nor a "Function", or if <code>bIgnoreETag</code> is used for an operation other
-	 *   than a bound action
+	 *   If
+	 *   <ul>
+	 *    <li> the given metadata is neither an "Action" nor a "Function",
+	 *    <li> a collection-valued parameter for an operation other than a V4 action is encountered,
+	 *    <li> <code>bIgnoreETag</code> is used for an operation other than a bound action,
+	 *    <li> <code>fnOnStrictHandlingFailed</code> is given but the given metadata is not an
+	 *         "Action",
+	 *    <li> <code>fnOnStrictHandlingFailed</code> is given and it does not return a promise.
+	 *   </ul>
 	 *
 	 * @private
 	 */
@@ -621,18 +634,18 @@ sap.ui.define([
 		 * @throws {Error} If <code>fnOnStrictHandlingFailed</code> does not return a promise
 		 */
 		function onStrictHandling(oError) {
-			var oRawMessages, oResult;
+			var oResult;
 
 			_Helper.adjustTargetsInError(oError, oOperationMetadata,
 				that.oParameterContext.getPath(),
 				that.bRelative ? that.oContext.getPath() : undefined);
 			oError.error.$ignoreTopLevel = true;
-			oRawMessages = _Helper.extractMessages(oError);
 
 			oResult = fnOnStrictHandlingFailed(
-				oRawMessages.bound.concat(oRawMessages.unbound).map(function (oRawMessage) {
+				_Helper.extractMessages(oError).map(function (oRawMessage) {
 					return that.oModel.createUI5Message(oRawMessage);
-			}));
+				})
+			);
 
 			if (!(oResult instanceof Promise)) {
 				throw new Error("Not a promise: " + oResult);
@@ -760,6 +773,17 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * @override
+	 * @see sap.ui.model.odata.v4.ODataParentBinding#doSuspend
+	 */
+	ODataContextBinding.prototype.doSuspend = function () {
+		if (this.bInitial) {
+			// if the binding is still initial, it must fire an event in resume
+			this.sResumeChangeReason = ChangeReason.Change;
+		}
+	};
+
 	/**
 	 * Calls the OData operation that corresponds to this operation binding.
 	 *
@@ -779,7 +803,7 @@ sap.ui.define([
 	 *   IDs as specified in {@link sap.ui.model.odata.v4.ODataModel}.
 	 * @param {boolean} [bIgnoreETag]
 	 *   Whether the entity's ETag should be actively ignored (If-Match:*); supported for bound
-	 *   actions only, since 1.90.0
+	 *   actions only, since 1.90.0. Ignored if there is no ETag (since 1.93.0).
 	 * @param {function} [fnOnStrictHandlingFailed]
 	 *   If this callback is given for an action, the preference "handling=strict" is applied. If
 	 *   the service responds with the HTTP status code 412 and a
@@ -799,8 +823,8 @@ sap.ui.define([
 	 *   rejected if <code>fnOnStrictHandlingFailed</code> is supplied and
 	 *   <ul>
 	 *    <li> is used for an operation other than an action,
-	 *    <li> there is another call of {@link #execute} with such a function provided in a
-	 *      different change set in the same $batch request,
+	 *    <li> another request that applies the preference "handling=strict" exists in a different
+	 *      change set of the same $batch request,
 	 *    <li> returns a <code>Promise</code> that resolves with <code>false</code>. In this case
 	 *      <code>oError.canceled === true</code>.
 	 *   </ul>
@@ -820,7 +844,9 @@ sap.ui.define([
 	 *   {@link sap.ui.model.Binding#isResolved}) or relative to a transient context (see
 	 *   {@link sap.ui.model.odata.v4.Context#isTransient}), or if deferred operation bindings are
 	 *   nested, or if the OData resource path for a deferred operation binding's context cannot be
-	 *   determined.
+	 *   determined, or if <code>fnOnStrictHandlingFailed</code> is called and does not return a
+	 *   <code>Promise</code>.
+
 	 *
 	 * @public
 	 * @since 1.37.0
@@ -888,6 +914,7 @@ sap.ui.define([
 		return oCachePromise.then(function (oCache) {
 			var bDataRequested = false,
 				oGroupLock,
+				sResolvedPath = that.getResolvedPath(),
 				sRelativePath = oCache || that.oOperation
 					? that.getRelativePath(sPath)
 					: undefined,
@@ -938,7 +965,7 @@ sap.ui.define([
 				}, function (oError) {
 					oGroupLock.unlock(true);
 					if (bDataRequested) {
-						that.oModel.reportError("Failed to read path " + that.sPath, sClassName,
+						that.oModel.reportError("Failed to read path " + sResolvedPath, sClassName,
 							oError);
 						that.fireDataReceived(oError.canceled ? {data : {}} : {error : oError});
 					}
@@ -1095,12 +1122,11 @@ sap.ui.define([
 	 */
 	// @override sap.ui.model.Binding#initialize
 	ODataContextBinding.prototype.initialize = function () {
-		if (this.isResolved()) {
-			if (this.getRootBinding().isSuspended()) {
-				this.sResumeChangeReason = ChangeReason.Change;
-			} else {
-				this._fireChange({reason : ChangeReason.Change});
-			}
+		this.bInitial = false;
+		// Here no other code but the event for the ManagedObject is expected. The binding should be
+		// useable for controller code without calling initialize.
+		if (this.isResolved() && !this.getRootBinding().isSuspended()) {
+			this._fireChange({reason : ChangeReason.Change});
 		}
 	};
 
@@ -1131,6 +1157,52 @@ sap.ui.define([
 			&& !oMetadata.$EntitySetPath.includes("/"); // case 3
 	};
 
+	/**
+	 * Moves the bound entity into the given list binding. This binding loses its data. The method
+	 * may only be called when this binding has finished loading. You can verify this by calling
+	 * <code>oBinding.getBoundContext().requestObject()</code>. If that promise resolves, the
+	 * binding has finished loading.
+	 *
+	 * @param {sap.ui.model.odata.v4.ODataListBinding} oListBinding
+	 *   The list binding to take the entity
+	 * @throws {Error}
+	 *   If
+	 *   <ul>
+	 *     <li> this binding is not a root binding,
+	 *     <li> this binding has not finished loading yet,
+	 *     <li> not all key properties of the bound entity have been selected (so that it is
+	 *       impossible to determine its key predicate),
+	 *     <li> the bound entity is not an entity of the list binding's collection,
+	 *     <li> this binding is an operation binding,
+	 *     <li> this binding has pending changes (see {@link #hasPendingChanges}),
+	 *     <li> this binding has a <code>$expand</code> to a collection or a dependent list binding
+	 *       without <code>$$ownRequest</code>,
+	 *     <li> the list binding is not suspended,
+	 *     <li> the list binding is relative and does not use the <code>$$ownRequest</code>
+	 *       parameter (see {@link sap.ui.model.odata.v4.ODataModel#bindList}).
+	 *     <li> the list binding uses data aggregation
+	 *       (@see sap.ui.model.odata.v4.ODataListBinding#setAggregation)
+	 *   </ul>
+	 *
+	 * @experimental
+	 * @public
+	 * @since 1.95.0
+	 */
+	ODataContextBinding.prototype.moveEntityTo = function (oListBinding) {
+		if (!this.isRoot()) {
+			throw new Error(this + ": must be a root binding");
+		}
+		if (this.oOperation) {
+			throw new Error(this + ": must not be an operation binding");
+		}
+		if (this.hasPendingChanges()) {
+			throw new Error(this + ": has pending changes");
+		}
+
+		oListBinding.moveEntityHere(this.oElementContext);
+		this.oElementContext = null;
+	};
+
 	/**
 	 * @override
 	 * @see sap.ui.model.odata.v4.ODataBinding#refreshInternal

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

@@ -68,21 +68,24 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @class List binding for an OData V4 model.
 	 *   An event handler can only be attached to this binding for the following events:
-	 *   'AggregatedDataStateChange', 'change', 'dataReceived', 'dataRequested', 'DataStateChange'
-	 *   and 'refresh'. For other events, an error is thrown.
+	 *   'AggregatedDataStateChange', 'change', 'createCompleted', 'createSent', 'dataReceived',
+	 *   'dataRequested', 'DataStateChange', 'patchCompleted', 'patchSent', and 'refresh'. For
+	 *   other events, an error is thrown.
 	 * @extends sap.ui.model.ListBinding
 	 * @hideconstructor
 	 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.92.0
+	 * @version 1.95.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
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#hasPendingChanges as #hasPendingChanges
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#isInitial as #isInitial
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#refresh as #refresh
+	 * @borrows sap.ui.model.odata.v4.ODataBinding#requestRefresh as #requestRefresh
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#resetChanges as #resetChanges
+	 * @borrows sap.ui.model.odata.v4.ODataBinding#toString as #toString
 	 * @borrows sap.ui.model.odata.v4.ODataParentBinding#attachPatchCompleted as
 	 *   #attachPatchCompleted
 	 * @borrows sap.ui.model.odata.v4.ODataParentBinding#attachPatchSent as #attachPatchSent
@@ -90,7 +93,6 @@ sap.ui.define([
 	 * @borrows sap.ui.model.odata.v4.ODataParentBinding#detachPatchCompleted as
 	 *   #detachPatchCompleted
 	 * @borrows sap.ui.model.odata.v4.ODataParentBinding#detachPatchSent as #detachPatchSent
-	 * @borrows sap.ui.model.odata.v4.ODataParentBinding#initialize as #initialize
 	 * @borrows sap.ui.model.odata.v4.ODataParentBinding#resume as #resume
 	 * @borrows sap.ui.model.odata.v4.ODataParentBinding#suspend as #suspend
 	 */
@@ -836,6 +838,7 @@ sap.ui.define([
 			oModel = this.oModel,
 			sPath = this.getResolvedPath(),
 			sPredicate,
+			aPreviousPaths,
 			bStartBeyondRange = iStart > this.aContexts.length,
 			i, that = this;
 
@@ -886,8 +889,9 @@ sap.ui.define([
 			}
 		}
 		// destroy previous contexts which are not reused or kept-alive
-		if (Object.keys(this.mPreviousContextsByPath).length) {
-			oModel.addPrerenderingTask(this.destroyPreviousContexts.bind(this));
+		aPreviousPaths = Object.keys(this.mPreviousContextsByPath);
+		if (aPreviousPaths.length) {
+			oModel.addPrerenderingTask(this.destroyPreviousContexts.bind(this, aPreviousPaths));
 		}
 		if (iCount !== undefined) { // server count is available or "non-empty short read"
 			this.bLengthFinal = true;
@@ -930,7 +934,7 @@ sap.ui.define([
 		this.aContexts.forEach(function (oContext) {
 			oContext.destroy();
 		});
-		this.destroyPreviousContexts(true);
+		this.destroyPreviousContexts();
 		if (this.oHeaderContext) {
 			this.oHeaderContext.destroy();
 		}
@@ -988,24 +992,26 @@ sap.ui.define([
 	/**
 	 * Removes and destroys contexts from mPreviousContextsByPath.
 	 *
-	 * @param {boolean} [bAllContexts]
-	 *   If <code>true</code>, all contexts are removed and destroyed, otherwise only those that
-	 *   are not kept alive (see {@link sap.ui.model.odata.v4.Context#isKeepAlive})
+	 * @param {string[]} [aPathsToDelete]
+	 *   If given, only contexts with paths in this list except kept-alive ones are removed and
+	 *   destroyed; otherwise all contexts in the list are removed and destroyed
 	 *
 	 * @private
 	 */
-	ODataListBinding.prototype.destroyPreviousContexts = function (bAllContexts) {
+	ODataListBinding.prototype.destroyPreviousContexts = function (aPathsToDelete) {
 		var mPreviousContextsByPath = this.mPreviousContextsByPath;
 
 		if (mPreviousContextsByPath) { // binding may have been destroyed already
-			Object.keys(mPreviousContextsByPath).forEach(function (sPath) {
+			(aPathsToDelete || Object.keys(mPreviousContextsByPath)).forEach(function (sPath) {
 				var oContext = mPreviousContextsByPath[sPath];
 
-				if (bAllContexts || !oContext.isKeepAlive()) {
-					oContext.destroy();
-					delete mPreviousContextsByPath[sPath];
-				} else {
-					oContext.iIndex = undefined;
+				if (oContext) {
+					if (aPathsToDelete && oContext.isKeepAlive()) {
+						oContext.iIndex = undefined;
+					} else {
+						oContext.destroy();
+						delete mPreviousContextsByPath[sPath];
+					}
 				}
 			});
 		}
@@ -1784,8 +1790,8 @@ sap.ui.define([
 	 * If known, the value represents the sum of the element count of the collection on the server
 	 * and the number of transient entities created on the client. Otherwise, it is
 	 * <code>undefined</code>. The value is a number of type <code>Edm.Int64</code>. Since 1.91.0,
-	 * in case of data aggregation, the count is the leaf count on the server; it is only determined
-	 * if the <code>$count</code> system query option is given.
+	 * in case of data aggregation with group levels, the count is the leaf count on the server; it
+	 * is only determined if the <code>$count</code> system query option is given.
 	 *
 	 * The count is known to the binding in the following situations:
 	 * <ul>
@@ -2235,6 +2241,63 @@ sap.ui.define([
 		return this.bLengthFinal;
 	};
 
+	/**
+	 * Makes the given context a row context of this binding. Adds the entity data to the cache.
+	 * Makes the context kept-alive.
+	 *
+	 * @param {sap.ui.model.odata.v4.Context} oEntityContext
+	 *   A context pointing to an entity
+	 * @throws {Error}
+	 *   If the binding is not suspended, setKeepAlive is not possible, the resource paths do not
+	 *   match, the entity's key predicate is unknown, the context binding's $expand contains
+	 *   collections, or the context binding is still reading
+	 *
+	 * @private
+	 */
+	ODataListBinding.prototype.moveEntityHere = function (oEntityContext) {
+		var oEntity,
+			oEntityFetchValuePromise,
+			sEntityPath = oEntityContext.getPath(),
+			mEntityQueryOptions = oEntityContext.getBinding().getInheritableQueryOptions(),
+			sRelativePath = _Helper.getRelativePath(sEntityPath, this.oHeaderContext.getPath());
+
+		if (!sRelativePath || sRelativePath.includes("/")) {
+			throw new Error(this + ": " + sEntityPath + " is not an entity of the collection");
+		}
+		if (!this.getRootBinding().isSuspended()) {
+			throw new Error(this + ": must be suspended");
+		}
+		this.checkKeepAlive(oEntityContext);
+
+		// take the value from the context binding's cache
+		oEntityFetchValuePromise = oEntityContext.fetchValue(null, null, /*bCached*/true);
+		if (oEntityFetchValuePromise.isPending()) {
+			throw new Error("Cannot move the entity; the context binding has not finished loading: "
+				+ oEntityContext.getBinding());
+		}
+		oEntity = oEntityFetchValuePromise.getResult();
+
+		if (!_Helper.getPrivateAnnotation(oEntity, "predicate")) {
+			throw new Error("No key predicate known at " + sEntityPath);
+		}
+
+		// add the context binding's query options as late query options
+		if (!this.aggregateQueryOptions(mEntityQueryOptions, "", /*bImmutable*/true)) {
+			throw new Error(oEntityContext + ": could not move the entity. Probably a list binding"
+				+ " w/o $$ownRequest depends on it");
+		}
+
+		this.getRootBinding().resume();
+		oEntityContext.oBinding = this;
+		this.mPreviousContextsByPath[sEntityPath] = oEntityContext;
+		this.oCachePromise.then(function (oCache) {
+			oCache.addKeptElement(oEntity);
+			// setKeepAlive looks into the cache, so this had to wait
+			oEntityContext.setKeepAlive(true);
+			oEntityContext.checkUpdate();  // create listeners in this binding's cache
+		});
+	};
+
 	/**
 	 * @override
 	 * @see sap.ui.model.odata.v4.ODataBinding#refreshInternal
@@ -2251,6 +2314,9 @@ sap.ui.define([
 		// calls refreshInternal on all given bindings and returns an array of promises
 		function refreshAll(aBindings) {
 			return aBindings.map(function (oBinding) {
+				if (oBinding.bIsBeingDestroyed) {
+					return;
+				}
 				// Call refreshInternal with bCheckUpdate = false because property bindings
 				// should not check for updates yet, otherwise they will cause a "Failed to
 				// drill down..." when the row is no longer part of the collection. They get
@@ -2808,7 +2874,7 @@ sap.ui.define([
 	 *   <ul>
 	 *     <li> <code>grandTotal</code>: An optional boolean that tells whether a grand total for
 	 *       this aggregatable property is needed (since 1.59.0); filtering by any aggregatable
-	 *       property is not supported in this case (since 1.89.0)
+	 *       property is not supported in this case (since 1.89.0) as is "$search" (since 1.93.0)
 	 *     <li> <code>subtotals</code>: An optional boolean that tells whether subtotals for this
 	 *       aggregatable property are needed
 	 *     <li> <code>with</code>: An optional string that provides the name of the method (for
@@ -2839,7 +2905,17 @@ sap.ui.define([
 	 * @param {string[]} [oAggregation.groupLevels]
 	 *   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.
+	 *   filtering for aggregated properties or (since 1.93.0) with "$search".
+	 * @param {string} [oAggregation.search]
+	 *   Like the <a
+	 *   href="https://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part2-url-conventions.html">
+	 *   "5.1.7 System Query Option $search"</a>, but applied before data aggregation
+	 *   (since 1.93.0). Note that certain content will break the syntax of the system query option
+	 *   <code>$apply</code> and result in an invalid request. If the OData service supports the
+	 *   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}).
 	 * @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);
@@ -2940,6 +3016,14 @@ sap.ui.define([
 							&& !this.mParameters.$$aggregation) {
 						this.sChangeReason = "AddVirtualContext"; // JIRA: CPOUI5ODATAV4-848
 					}
+					if (oContext.getBinding
+							&& oContext.getBinding().getRootBinding().isSuspended()) {
+						// when becoming suspended, remain silent until resume
+						this.oContext = oContext;
+						this.setResumeChangeReason(ChangeReason.Context);
+
+						return;
+					}
 				}
 				// call Binding#setContext because of data state etc.; fires "change"
 				Binding.prototype.setContext.call(this, oContext,
@@ -3010,7 +3094,9 @@ sap.ui.define([
 	 * aggregation information. Its value is
 	 * "groupby((&lt;dimension_1,...,dimension_N,unit_or_text_1,...,unit_or_text_K>),
 	 * aggregate(&lt;measure> with &lt;method> as &lt;alias>, ...))" where the "aggregate" part is
-	 * only present if measures are given and both "with" and "as" are optional.
+	 * only present if measures are given and both "with" and "as" are optional. Since 1.93.0, a
+	 * previous "search before data aggregation" is considered (see the
+	 * <code>oAggregation.search</code> parameter of {@link #setAggregation}).
 	 *
 	 * @param {object[]} aAggregation
 	 *   An array with objects holding the information needed for data aggregation; see also
@@ -3064,7 +3150,8 @@ sap.ui.define([
 	ODataListBinding.prototype.updateAnalyticalInfo = function (aAggregation) {
 		var oAggregation = {
 				aggregate : {},
-				group : {}
+				group : {},
+				search : this.mParameters.$$aggregation && this.mParameters.$$aggregation.search
 			},
 			bHasMinMax = false,
 			that = this;
@@ -3098,6 +3185,7 @@ sap.ui.define([
 				oAggregation.group[oColumn.name] = oDetails;
 			}
 		});
+
 		this.bHasAnalyticalInfo = true;
 		this.setAggregation(oAggregation);
 		if (bHasMinMax) {
@@ -3157,4 +3245,4 @@ sap.ui.define([
 	};
 
 	return ODataListBinding;
-});
+});

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

@@ -652,11 +652,13 @@ sap.ui.define([
 	 *
 	 *   This model is read-only.
 	 *
+	 *   This model is not prepared to be inherited from.
+	 *
 	 * @extends sap.ui.model.MetaModel
 	 * @hideconstructor
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 */
 	var ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 		/*
@@ -1289,7 +1291,7 @@ sap.ui.define([
 			 *   Whether to continue after this step
 			 */
 			function step(sSegment, i, aSegments) {
-				var iIndexOfAt, bSplitSegment;
+				var iIndexOfAt, bResultIsObject, bSplitSegment;
 
 				if (sSegment === "$Annotations") {
 					return log(WARNING, "Invalid segment: $Annotations");
@@ -1328,8 +1330,9 @@ sap.ui.define([
 
 					if (typeof vResult === "string"
 						&& !(bSplitSegment && (sSegment === "@sapui.name" || sSegment[1] === "@"))
+						&& !(bODataMode && oSchemaChild && oSchemaChild.$kind === "EnumType")
 						// indirection: treat string content as a meta model path unless followed by
-						// a computed annotation
+						// a computed annotation or if it is an (Edm.Int64) enum member value
 						&& !steps(vResult, aSegments.slice(0, i))) {
 						return false;
 					}
@@ -1341,23 +1344,24 @@ sap.ui.define([
 							// technical property, switch to pure "JSON" drill-down
 							bODataMode = false;
 						} else {
+							bResultIsObject = typeof vResult === "object";
 							if (bSplitSegment) {
 								// no special preparations needed, but handle overloads below!
 							} else if (sSegment[0] !== "@" && sSegment.includes(".", 1)) {
 								// "17.3 QualifiedName": scope lookup
 								return scopeLookup(sSegment);
-							} else if (vResult && "$Type" in vResult) {
+							} else if (bResultIsObject && "$Type" in vResult) {
 								// implicit $Type insertion, e.g. at (navigation) property
 								if (!scopeLookup(vResult.$Type, "$Type")) {
 									return false;
 								}
-							} else if (vResult && "$Action" in vResult) {
+							} else if (bResultIsObject && "$Action" in vResult) {
 								// implicit $Action insertion at action import
 								if (!scopeLookup(vResult.$Action, "$Action")) {
 									return false;
 								}
 								vBindingParameterType = UNBOUND;
-							} else if (vResult && "$Function" in vResult) {
+							} else if (bResultIsObject && "$Function" in vResult) {
 								// implicit $Function insertion at function import
 								if (!scopeLookup(vResult.$Function, "$Function")) {
 									return false;
@@ -1462,19 +1466,18 @@ sap.ui.define([
 								aSegments[i].slice(0, iIndexOfAt)).join("/"));
 						}
 					}
-					if (!vResult || typeof vResult !== "object") {
-						// Note: even an OData path cannot continue here (e.g. by type cast)
-						vResult = undefined;
-						return !bInsideAnnotation && log(DEBUG, "Invalid segment: ", sSegment);
-					}
 					if (bODataMode && sSegment[0] === "@") { // annotation(s) via external targeting
 						// Note: inline annotations are reached via above fast path for pure "JSON"
 						// drill-down
-						vBindingParameterType = vResult.$Type || vBindingParameterType;
+						vBindingParameterType = vResult && vResult.$Type || vBindingParameterType;
 						vResult = mScope.$Annotations[sTarget] || {};
 						bODataMode = false; // switch to pure "JSON" drill-down
 					} else if (sSegment === "$" && i + 1 < aSegments.length) {
 						return log(WARNING, "Unsupported path after $");
+					} else if (!vResult || typeof vResult !== "object") {
+						// Note: even an OData path cannot continue here (e.g. by type cast)
+						vResult = undefined;
+						return !bInsideAnnotation && log(DEBUG, "Invalid segment: ", sSegment);
 					}
 				}