@openui5/sap.ui.core 1.132.1 → 1.133.0

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

@@ -124,7 +124,7 @@ sap.ui.define([
 	 *   Sets the default count mode for the model
 	 * @param {sap.ui.model.odata.OperationMode} [mParameters.defaultOperationMode=Default]
 	 *   Sets the default operation mode for the model
-	 * @param {sap.ui.model.odata.UpdateMethod} [mParameters.defaultUpdateMethod=Merge]
+	 * @param {sap.ui.model.odata.UpdateMethod} [mParameters.defaultUpdateMethod=MERGE]
 	 *   Default update method which is used for all update requests
 	 * @param {boolean} [mParameters.disableHeadRequestForToken=false]
 	 *   Set this flag to <code>true</code> if your service does not support <code>HEAD</code>
@@ -218,7 +218,7 @@ sap.ui.define([
 	 * This model is not prepared to be inherited from.
 	 *
 	 * @author SAP SE
-	 * @version 1.132.1
+	 * @version 1.133.0
 	 *
 	 * @public
 	 * @alias sap.ui.model.odata.v2.ODataModel
@@ -337,7 +337,7 @@ sap.ui.define([
 			this.mChangeHandles = {};
 			this.mDeferredGroups = {};
 			this.mLaunderingState = {};
-			this.sDefaultUpdateMethod = sDefaultUpdateMethod || UpdateMethod.Merge;
+			this.sDefaultUpdateMethod = ODataModel._fixUpdateMethod(sDefaultUpdateMethod) || UpdateMethod.MERGE;
 
 			this.bTokenHandling = vTokenHandling !== false;
 			this.bWithCredentials = bWithCredentials === true;
@@ -967,6 +967,23 @@ sap.ui.define([
 		meta: {}
 	};
 
+	/**
+	 * Maps "Put" to "PUT" and "Merge" to "MERGE" to fix wrong usage of deprecated enum keys as manifest entries. If
+	 * the given update method is neither "Put" nor "Merge", it is returned as is.
+	 *
+	 * @param {string} [sUpdateMethod] The update method to fix
+	 * @returns {string|undefined} The fixed update method
+	 * @private
+	 */
+	ODataModel._fixUpdateMethod = function (sUpdateMethod) {
+		if (sUpdateMethod === "Put") {
+			return UpdateMethod.PUT;
+		} else if (sUpdateMethod === "Merge") {
+			return UpdateMethod.MERGE;
+		}
+		return sUpdateMethod;
+	};
+
 	/**
 	 * Get the shared data for the section and the key. If it doesn't exist yet, an empty shared
 	 * data object is created and stored under the section and the key.
@@ -2243,8 +2260,7 @@ sap.ui.define([
 	 * @returns {sap.ui.model.odata.v2.ODataTreeBinding}
 	 *   The new tree binding
 	 * @public
-	 * @see {@link http://www.sap.com/protocols/SAPData
-	 *   "SAP Annotations for OData Version 2.0" Specification}
+	 * @see {@link http://www.sap.com/protocols/SAPData "SAP Annotations for OData Version 2.0" Specification}
 	 */
 	ODataModel.prototype.bindTree = function(sPath, oContext, vFilters, mParameters, vSorters) {
 		var oBinding = new ODataTreeBinding(this, sPath, oContext, vFilters, mParameters, vSorters);
@@ -4150,7 +4166,7 @@ sap.ui.define([
 				oStoredRequest.data = oRequest.data;
 				oStoredRequest.sideEffects = oRequest.sideEffects;
 
-				if (oRequest.method === "PUT") {
+				if (oRequest.method === UpdateMethod.PUT) {
 					// if stored request was a MERGE before (created by setProperty) but is now sent via PUT
 					// (by submitChanges) the merge header must be removed
 					delete oStoredRequest.headers["x-http-method"];
@@ -4744,8 +4760,8 @@ sap.ui.define([
 	 *   The entry data
 	 * @param {string} sGroupId
 	 *   The group ID
-	 * @param {boolean} [sUpdateMethod]
-	 *   Sets <code>MERGE/PUT</code> method, defaults to <code>MERGE</code> if not provided
+	 * @param {sap.ui.model.odata.UpdateMethod} [sUpdateMethod]
+	 *   The update method, defaults to the model's default update method
 	 * @returns {object}
 	 *   The request object
 	 *
@@ -4787,12 +4803,12 @@ sap.ui.define([
 				//delete the uri flag when a new entity was created, since the uri for the create request is generated and does not point to a valid resource
 				delete oPayload.__metadata['uri'];
 			}
-		} else if (sUpdateMethod === "MERGE") {
-			sMethod = "MERGE";
+		} else if (sUpdateMethod === UpdateMethod.MERGE) {
+			sMethod = UpdateMethod.MERGE;
 			// get original unmodified entry for diff
 			oUnModifiedEntry = this._getEntity(sKey);
 		} else {
-			sMethod = "PUT";
+			sMethod = UpdateMethod.PUT;
 		}
 
 		// remove metadata, navigation properties to reduce payload
@@ -4812,7 +4828,7 @@ sap.ui.define([
 			});
 		}
 
-		if (sMethod === "MERGE" && oEntityType && oUnModifiedEntry) {
+		if (sMethod === UpdateMethod.MERGE && oEntityType && oUnModifiedEntry) {
 			each(oPayload, function(sPropName, oPropValue) {
 				if (sPropName !== '__metadata') {
 					// remove unmodified properties and keep only modified properties for delta MERGE
@@ -5135,8 +5151,8 @@ sap.ui.define([
 			mHeaders["Accept"] = "text/plain, */*;q=0.5";
 		}
 
-		if (sMethod === "MERGE" && !this.bUseBatch) {
-			mHeaders["x-http-method"] = "MERGE";
+		if (sMethod === UpdateMethod.MERGE && !this.bUseBatch) {
+			mHeaders["x-http-method"] = UpdateMethod.MERGE;
 			sMethod = "POST";
 		}
 
@@ -5257,7 +5273,7 @@ sap.ui.define([
 	 * Trigger a <code>PUT/MERGE</code> request to the OData service that was specified in the model constructor.
 	 *
 	 * The update method used is defined by the global <code>defaultUpdateMethod</code> parameter which is
-	 * <code>sap.ui.model.odata.UpdateMethod.Merge</code> by default. Please note that deep updates are not
+	 * <code>sap.ui.model.odata.UpdateMethod.MERGE</code> by default. Please note that deep updates are not
 	 * supported and may not work. These should be done separately and directly on the corresponding entry.
 	 *
 	 * @param {string} sPath A string containing the path to the data that should be updated.
@@ -5305,7 +5321,7 @@ sap.ui.define([
 			bCanonical = mParameters.canonicalRequest;
 			// ensure merge parameter backwards compatibility
 			if (mParameters.merge !== undefined) {
-				sMethod =  mParameters.merge ? "MERGE" : "PUT";
+				sMethod = mParameters.merge ? UpdateMethod.MERGE : UpdateMethod.PUT;
 			}
 		}
 
@@ -6344,7 +6360,8 @@ sap.ui.define([
 	 * Submits the collected changes which were collected by the {@link #setProperty} method and other deferred requests.
 	 *
 	 * The update method is defined by the global <code>defaultUpdateMethod</code> parameter which is
-	 * <code>sap.ui.model.odata.UpdateMethod.Merge</code> by default. In case of a <code>sap.ui.model.odata.UpdateMethod.Merge</code>
+	 * <code>sap.ui.model.odata.UpdateMethod.MERGE</code> by default. In case of a
+	 * <code>sap.ui.model.odata.UpdateMethod.MERGE</code>
 	 * request only the changed properties will be updated.
 	 * If a URI with a <code>$expand</code> query option was used then the expand entries will be removed from the collected changes.
 	 * Changes to this entries should be done on the entry itself. So no deep updates are supported.
@@ -6369,8 +6386,8 @@ sap.ui.define([
 	 * @param {boolean} [mParameters.merge]
 	 *   <b>Deprecated</b> since 1.38.0; use the <code>defaultUpdateMethod</code> constructor parameter instead.
 	 *   If unset, the update method is determined from the <code>defaultUpdateMethod</code> constructor parameter.
-	 *   If <code>true</code>, <code>sap.ui.model.odata.UpdateMethod.Merge</code> is used for update operations;
-	 *   if set to <code>false</code>, <code>sap.ui.model.odata.UpdateMethod.Put</code> is used.
+	 *   If <code>true</code>, <code>sap.ui.model.odata.UpdateMethod.MERGE</code> is used for update operations;
+	 *   if set to <code>false</code>, <code>sap.ui.model.odata.UpdateMethod.PUT</code> is used.
 	 * @return {object} An object which has an <code>abort</code> function to abort the current request or requests
 	 *
 	 * @public
@@ -6403,8 +6420,8 @@ sap.ui.define([
 	 * @param {string} [mParameters.batchGroupId]
 	 *   <b>Deprecated</b>, use <code>groupId</code> instead
 	 * @param {boolean} [mParameters.merge]
-	 *   <b>Deprecated</b> since 1.38.0; whether the update method <code>sap.ui.model.odata.UpdateMethod.Merge</code>
-	 *   is used
+	 *   <b>Deprecated</b> since 1.38.0; whether the update method
+	 *   <code>sap.ui.model.odata.UpdateMethod.MERGE</code> is used
 	 * @returns {object}
 	 *   An object which has an <code>abort</code> function
 	 * @throws {Error}
@@ -6428,7 +6445,7 @@ sap.ui.define([
 		fnError = mParameters.error;
 		// ensure merge parameter backwards compatibility
 		if (mParameters.merge !== undefined) {
-			sMethod =  mParameters.merge ? "MERGE" : "PUT";
+			sMethod = mParameters.merge ? UpdateMethod.MERGE : UpdateMethod.PUT;
 		}
 		sPrivateHeader = Object.keys(mParameters.changeHeaders || {}).find(function (sHeader) {
 			return that._isHeaderPrivate(sHeader);

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.132.1
+	 * @version 1.133.0
 	 */
 	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.132.1
+		 * @version 1.133.0
 		 */
 		Context = BaseContext.extend("sap.ui.model.odata.v4.Context", {
 				constructor : constructor
@@ -88,10 +88,7 @@ sap.ui.define([
 		}
 		BaseContext.call(this, oModel, sPath);
 		this.oBinding = oBinding;
-		this.oCreatedPromise = oCreatePromise
-			// ensure to return a promise that is resolved w/o data
-			&& Promise.resolve(oCreatePromise).then(function () {});
-		this.oSyncCreatePromise = oCreatePromise;
+		this.setCreated(oCreatePromise);
 		// a promise waiting for the deletion, also used as indicator for #isDeleted
 		this.oDeletePromise = null;
 		// avoids recursion when calling #doSetProperty within the createActivate event handler
@@ -294,6 +291,8 @@ sap.ui.define([
 	 *       {@link #isKeepAlive kept alive},
 	 *     <li> the context is already being deleted,
 	 *     <li> the context's binding is a list binding with data aggregation,
+	 *     <li> the context is transient but its binding is not a list binding ("upsert") and it
+	 *       therefore must be reset via {@link #resetChanges},
 	 *     <li> the restrictions for deleting from a recursive hierarchy (see above) are not met.
 	 *   </ul>
 	 *
@@ -322,12 +321,15 @@ sap.ui.define([
 		}
 		this.oBinding.checkSuspended();
 		if (this.isTransient()) {
+			if (!this.oBinding.getHeaderContext) { // upsert
+				throw new Error("Cannot delete " + this);
+			}
 			if (this.iIndex === undefined) {
 				return Promise.resolve(); // already deleted, nothing to do
 			}
 			sGroupId = null;
 		} else if (sGroupId === null) {
-			if (!(this.isKeepAlive() && this.iIndex === undefined)) {
+			if (this.iIndex !== undefined || !this.isKeepAlive()) {
 				throw new Error("Cannot delete " + this);
 			}
 		}
@@ -584,7 +586,7 @@ sap.ui.define([
 							bUpdating);
 					}
 
-					if (that.isInactive() && !that.bFiringCreateActivate) {
+					if (that.bInactive && !that.bFiringCreateActivate) {
 						// early cache update so that the new value is properly available on the
 						// event listener
 						// runs synchronously - setProperty calls fetchValue with $cached
@@ -596,6 +598,10 @@ sap.ui.define([
 						oCache.setInactive(sEntityPath, that.bInactive);
 					}
 
+					const fnSetUpsertPromise = _Helper.hasPathSuffix(that.sPath, sEntityPath)
+						? that.setCreated.bind(that)
+						: null;
+
 					// if request is canceled fnPatchSent and fnErrorCallback are not called and
 					// returned Promise is rejected -> no patch events
 					return oCache.update(oGroupLock, oResult.propertyPath, vValue,
@@ -603,7 +609,7 @@ sap.ui.define([
 						// Note: use that.oModel intentionally, fails if already destroyed!
 						oMetaModel.getUnitOrCurrencyPath(that.oModel.resolve(sPath, that)),
 						oBinding.isPatchWithoutSideEffects(), patchSent,
-						that.isEffectivelyKeptAlive.bind(that)
+						that.isEffectivelyKeptAlive.bind(that), fnSetUpsertPromise
 					).then(function () {
 						firePatchCompleted(true);
 					}, function (oError) {
@@ -673,6 +679,7 @@ sap.ui.define([
 				if (!bAll) {
 					throw new Error("Already expanded: " + this);
 				}
+				this.oBinding.collapse(this, /*bAll*/false, /*bSilent*/true);
 				// falls through
 			case false: {
 				const iLevels = bAll ? Number.MAX_SAFE_INTEGER : 1;
@@ -1195,7 +1202,7 @@ sap.ui.define([
 		var that = this;
 
 		return this.isTransient() && this.isInactive() !== true
-			|| this.oDeletePromise && this.oDeletePromise.isPending()
+			|| this.oDeletePromise?.isPending()
 			|| this.oBinding.hasPendingChangesForPath(this.sPath)
 			|| this.oModel.getDependentBindings(this).some(function (oDependentBinding) {
 				return oDependentBinding.oCache
@@ -1287,7 +1294,7 @@ sap.ui.define([
 			|| !mParameters.$$sharedRequest
 			&& this.oBinding.getHeaderContext?.()
 			&& this.oBinding.getHeaderContext().isSelected() !== this.isSelected()
-			&& !(this.oBinding.isRelative() && !mParameters.$$ownRequest)
+			&& (mParameters.$$ownRequest || !this.oBinding.isRelative())
 			&& !_Helper.isDataAggregation(mParameters)
 			// check for key predicate in the last path segment
 			&& this.sPath.indexOf("(", this.sPath.lastIndexOf("/")) > 0;
@@ -1403,7 +1410,7 @@ sap.ui.define([
 	 * @since 1.43.0
 	 */
 	Context.prototype.isTransient = function () {
-		return this.oSyncCreatePromise && this.oSyncCreatePromise.isPending();
+		return this.oSyncCreatePromise?.isPending();
 	};
 
 	/**
@@ -1475,11 +1482,11 @@ sap.ui.define([
 		if (oNextSibling === undefined && oParent === undefined) {
 			return Promise.resolve(); // "no move happens"
 		}
-		if (this.isDeleted() || this.isTransient() || this.iIndex === undefined) {
+		if (this.iIndex === undefined || this.isDeleted() || this.isTransient()) {
 			throw new Error("Cannot move " + this);
 		}
 		if (oParent
-			&& (oParent.isDeleted() || oParent.isTransient() || oParent.iIndex === undefined)) {
+			&& (oParent.iIndex === undefined || oParent.isDeleted() || oParent.isTransient())) {
 			throw new Error("Cannot move to " + oParent);
 		}
 		if (this.isAncestorOf(oParent)) {
@@ -2126,8 +2133,8 @@ sap.ui.define([
 	 *   <li> the binding's root binding is suspended,
 	 *   <li> a change of this context has already been sent to the server and there is no response
 	 *     yet,
-	 *   <li> this context is transient, but not inactive and therefore should rather be reset via
-	 *     {@link #delete}.
+	 *   <li> this context is a transient row context but not inactive and therefore must be reset
+	 *     via {@link #delete}.
 	 *   <li> this context is a
 	 *     {@link sap.ui.model.odata.v4.ODataListBinding#getHeaderContext header context}.
 	 *   <li> this context is a
@@ -2144,7 +2151,8 @@ sap.ui.define([
 				: [],
 			that = this;
 
-		if (this.iIndex === iVIRTUAL || this.isTransient() && !this.isInactive()
+		if (this.iIndex === iVIRTUAL
+			|| this.oBinding.getHeaderContext && !this.bInactive && this.isTransient()
 			|| this === this.oBinding.getHeaderContext?.()
 			// only operation bindings have a parameter context, for others the function fails
 			|| this.oBinding.oOperation && this === this.oBinding.getParameterContext()) {
@@ -2180,6 +2188,30 @@ sap.ui.define([
 		this.bSelected = false;
 	};
 
+	/**
+	 * Sets this context's {@link #created created} promise based on the given one.
+	 *
+	 * Note: this is a private and internal API. Do not call this!
+	 *
+	 * @param {sap.ui.base.SyncPromise} [oSyncCreatePromise]
+	 *   A promise which is resolved with the created entity when the PATCH or POST request has been
+	 *   successfully sent and the entity has been marked as non-transient; used as base for
+	 *   {@link #created}. If missing, this context's {@link #created created} promise is removed
+	 *   again. Don't use <code>null</code>!
+	 * @throws {Error} If this context is not "created" or still transient
+	 *
+	 * @private
+	 */
+	Context.prototype.setCreated = function (oSyncCreatePromise) {
+		if (oSyncCreatePromise && this.oCreatedPromise) {
+			throw new Error("Already 'created'");
+		}
+		this.oCreatedPromise = oSyncCreatePromise
+			// ensure to return a promise that is resolved w/o data
+			&& Promise.resolve(oSyncCreatePromise).then(function () {});
+		this.oSyncCreatePromise = oSyncCreatePromise;
+	};
+
 	/**
 	 * Sets the inactive flag to <code>true</code>
 	 *

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

@@ -1157,6 +1157,8 @@ sap.ui.define([
 	 * @param {string} sCanonicalPath
 	 *   The canonical path of the entity (as a context path with the leading "/")
 	 *
+	 * @abstract
+	 * @function
 	 * @name sap.ui.model.odata.v4.ODataBinding#onDelete
 	 * @private
 	 */

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.132.1
+		 * @version 1.133.0
 		 *
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
@@ -841,6 +841,8 @@ sap.ui.define([
 	/**
 	 * Handles setting a parameter property in case of a deferred operation binding, otherwise it
 	 * returns <code>undefined</code>.
+	 *
+	 * @private
 	 */
 	// @override sap.ui.model.odata.v4.ODataParentBinding#doSetProperty
 	ODataContextBinding.prototype.doSetProperty = function (sPath, vValue, oGroupLock) {

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.132.1
+		 * @version 1.133.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
@@ -738,7 +738,7 @@ sap.ui.define([
 
 		iCount ??= this.oCache.collapse(
 			_Helper.getRelativePath(oContext.getPath(), this.oHeaderContext.getPath()),
-			bAll ? this.lockGroup() : undefined);
+			bAll ? this.lockGroup() : undefined, bSilent);
 
 		if (iCount > 0) {
 			const aContexts = this.aContexts;
@@ -1543,7 +1543,8 @@ sap.ui.define([
 		oCache ??= _AggregationCache.create(this.oModel.oRequestor, sResourcePath,
 			sDeepResourcePath, mQueryOptions, this.mParameters.$$aggregation,
 			this.oModel.bAutoExpandSelect || "$$separate" in this.mParameters,
-			this.bSharedRequest, this.isGrouped(), this.mParameters.$$separate);
+			this.bSharedRequest, this.isGrouped());
+		oCache.setSeparate?.(this.mParameters.$$separate);
 		if (mKeptElementsByPredicate) {
 			aKeepAlivePredicates.forEach(function (sPredicate) {
 				oCache.addKeptElement(mKeptElementsByPredicate[sPredicate]);
@@ -2065,8 +2066,12 @@ sap.ui.define([
 		return oPromise.then((oEntityType) => {
 			const oAggregation = this.mParameters.$$aggregation;
 			if (oEntityType) {
-				oAggregation.$leafLevelAggregated
-					= !oEntityType.$Key?.every((sKey) => sKey in oAggregation.group);
+				oAggregation.$leafLevelAggregated = !oEntityType.$Key?.every((sKey) => {
+					// "group" and "additionally" determine groupby()
+					return sKey in oAggregation.group
+						|| Object.keys(oAggregation.group).some(
+							(sGroup) => oAggregation.group[sGroup].additionally?.includes(sKey));
+				});
 			}
 
 			if (!oCombinedFilter) {
@@ -3403,6 +3408,8 @@ sap.ui.define([
 	 *   The insertion index
 	 * @param {boolean} [bAtEnd]
 	 *   The relative position in the creation area
+	 *
+	 * @private
 	 */
 	ODataListBinding.prototype.insertContext = function (oContext, iIndex, bAtEnd) {
 		if (iIndex !== undefined) {
@@ -3557,6 +3564,7 @@ sap.ui.define([
 	 *
 	 * @returns {sap.ui.model.odata.v4.Context[]} The list of kept contexts
 	 *
+	 * @private
 	 * @see #getCurrentContexts
 	 */
 	ODataListBinding.prototype.keepOnlyVisibleContexts = function () {
@@ -4596,14 +4604,6 @@ sap.ui.define([
 	 *   used to remove the data aggregation object, which allows to set <code>$apply</code>
 	 *   explicitly afterwards. <code>null</code> is not supported.
 	 *   <br>
-	 *   Since 1.89.0, the <b>deprecated</b> property <code>"grandTotal like 1.84" : true</code> can
-	 *   be used to turn on the handling of grand totals like in 1.84.0, using aggregates of
-	 *   aggregates and thus allowing to filter by aggregated properties while grand totals are
-	 *   needed. Beware that methods like "average" or "countdistinct" are not compatible with this
-	 *   approach, and it cannot be combined with group levels. Since 1.129.0, this property is not
-	 *   needed anymore and filtering by aggregated properties is supported even while grand totals
-	 *   or subtotals are needed.
-	 *   <br>
 	 *   Since 1.117.0, either a read-only recursive hierarchy or pure data aggregation is
 	 *   supported, but no mix; <code>hierarchyQualifier</code> is the leading property that decides
 	 *   between those two use cases. Since 1.125.0, maintenance of a recursive hierarchy is
@@ -4701,6 +4701,14 @@ sap.ui.define([
 	 *   separate row after all children, when a group level node is expanded (since 1.86.0);
 	 *   <code>true</code> for bottom only, <code>false</code> for top and bottom, the default is
 	 *   top only (that is, as part of the group level node)
+	 * @param {boolean} [oAggregation."grandTotal like 1.84"]
+	 *   Since 1.89.0, the <b>deprecated</b> property <code>"grandTotal like 1.84" : true</code> can
+	 *   be used to turn on the handling of grand totals like in 1.84.0, using aggregates of
+	 *   aggregates and thus allowing to filter by aggregated properties while grand totals are
+	 *   needed. Beware that methods like "average" or "countdistinct" are not compatible with this
+	 *   approach, and it cannot be combined with group levels. Since 1.129.0, this property is not
+	 *   needed anymore and filtering by aggregated properties is supported even while grand totals
+	 *   or subtotals are needed.
 	 * @throws {Error} If
 	 *   <ul>
 	 *     <li> the given data aggregation object is unsupported,
@@ -4738,6 +4746,7 @@ sap.ui.define([
 	 * @public
 	 * @see #getAggregation
 	 * @since 1.55.0
+	 * @ui5-transform-hint replace-param oAggregation."grandTotal like 1.84" false
 	 */
 	ODataListBinding.prototype.setAggregation = function (oAggregation) {
 		var mParameters;

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

@@ -157,7 +157,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.132.1
+		 * @version 1.133.0
 		 */
 		ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 				constructor : constructor
@@ -1817,7 +1817,9 @@ sap.ui.define([
 	 * @param {sap.ui.model.odata.v4.Context} oContext
 	 *   A context, used for building the path and for determining the key predicate
 	 * @param {boolean} [bNoEditUrl]
-	 *   Whether no edit URL is required
+	 *   Whether no edit URL is required; must be <code>undefined</code> from APIs for canonical
+	 *   paths (based on {@link #fetchCanonicalPath}). Since 1.133.0, when a boolean value is given,
+	 *   the edit URL is allowed to be adjusted for upsert use cases.
 	 * @returns {sap.ui.base.SyncPromise}
 	 *   A promise that gets resolved with an object having the following properties:
 	 *   <ul>
@@ -1840,7 +1842,9 @@ sap.ui.define([
 		function error(sMessage) {
 			var oError = new Error(sResolvedPath + ": " + sMessage);
 
-			oModel.reportError(sMessage, sODataMetaModel, oError);
+			if (bNoEditUrl !== undefined) {
+				oModel.reportError(sMessage, sODataMetaModel, oError);
+			} // else: do not log to console or message model for APIs
 			throw oError;
 		}
 
@@ -1865,7 +1869,8 @@ sap.ui.define([
 				//sPropertyPath,
 				aSegments, // The resource path split in segments (encoded)
 				bTransient = false, // Whether the property is within a transient entity
-				oType; // The type of the data at sInstancePath
+				oType, // The type of the data at sInstancePath
+				bUpsert = false; // Whether the entity is already or about to be created via upsert
 
 			// Determines the predicate from a segment (empty string if there is none)
 			function predicate(sSegment) {
@@ -1965,7 +1970,7 @@ sap.ui.define([
 			}
 
 			// aEditUrl may still contain key predicate requests, run them and wait for the promises
-			return SyncPromise.all(aEditUrl.map(function (vSegment) {
+			return SyncPromise.all(aEditUrl.map(function (vSegment, i) {
 				if (typeof vSegment === "string") {
 					return vSegment;
 				}
@@ -1973,6 +1978,12 @@ sap.ui.define([
 				return oContext.fetchValue(vSegment.path).then(function (oEntity) {
 					var sPredicate;
 
+					if (bNoEditUrl !== undefined && i === aEditUrl.length - 1
+							&& (oEntity === null
+								|| oEntity && _Helper.hasPrivateAnnotation(oEntity, "upsert"))) {
+						bUpsert = true;
+						return undefined;
+					}
 					if (!oEntity) {
 						error("No instance to calculate key predicate at " + vSegment.path);
 					}
@@ -1986,7 +1997,7 @@ sap.ui.define([
 				});
 			})).then(function (aFinalEditUrl) {
 				return {
-					editUrl : aFinalEditUrl.join("/"),
+					editUrl : bUpsert ? sEntityPath.slice(1) : aFinalEditUrl.join("/"),
 					entityPath : sEntityPath,
 					propertyPath : sPropertyPath
 				};

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

@@ -240,7 +240,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.Model
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.132.1
+		 * @version 1.133.0
 		 */
 		ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */{
@@ -1883,10 +1883,10 @@ sap.ui.define([
 	/**
 	 * Returns a map of HTTP headers used for data and metadata requests. While the "X-CSRF-Token"
 	 * header is not used for metadata requests, it is still included here if available. The
-	 * "SAP-ContextId" header is only included if requested explicitly (@since 1.86.0).
+	 * "SAP-ContextId" header is only included if requested explicitly (since 1.86.0).
 	 *
 	 * @param {boolean} [bIncludeContextId]
-	 *   Whether to include the "SAP-ContextId" header (@since 1.86.0)
+	 *   Whether to include the "SAP-ContextId" header (since 1.86.0)
 	 * @returns {Object<string>}
 	 *   The map of HTTP headers
 	 *

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

@@ -599,6 +599,8 @@ sap.ui.define([
 	 * @throws {Error}
 	 *   If the cache promise for this binding is not yet fulfilled, or if the cache is shared
 	 *
+	 * @abstract
+	 * @function
 	 * @name sap.ui.model.odata.v4.ODataParentBinding#delete
 	 * @private
 	 */
@@ -1020,6 +1022,7 @@ sap.ui.define([
 	 * @returns {sap.ui.model.odata.v4.Context}
 	 *   A matching context or <code>undefined</code> if there is none
 	 *
+	 * @abstract
 	 * @function
 	 * @name sap.ui.model.odata.v4.ODataParentBinding#findContextForCanonicalPath
 	 * @private
@@ -1029,6 +1032,7 @@ sap.ui.define([
 	 * Fire event 'patchCompleted' to attached listeners, if the last PATCH request is completed.
 	 *
 	 * @param {boolean} bSuccess Whether the current PATCH request has been processed successfully
+	 *
 	 * @private
 	 */
 	ODataParentBinding.prototype.firePatchCompleted = function (bSuccess) {
@@ -1257,6 +1261,8 @@ sap.ui.define([
 	 * @param {string} sName - The parameter's name
 	 * @param {any} vOtherValue - The parameter's other value
 	 * @returns {boolean} Whether the parameter is "unchanged"
+	 *
+	 * @private
 	 */
 	ODataParentBinding.prototype.isUnchangedParameter = function (sName, vOtherValue) {
 		return this.mParameters[sName] === vOtherValue;

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.132.1
+		 * @version 1.133.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

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

@@ -6,7 +6,7 @@
 
 //Provides class sap.ui.model.odata.v4.ODataUtils
 sap.ui.define([
-	"sap/ui/core/CalendarType",
+	"sap/base/i18n/date/CalendarType",
 	"sap/ui/core/format/DateFormat",
 	"sap/ui/model/odata/ODataUtils",
 	"sap/ui/model/odata/v4/lib/_Batch",