@openui5/sap.ui.core 1.132.1 → 1.134.0

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.134.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
@@ -211,8 +208,7 @@ sap.ui.define([
 	 *   A promise which is resolved without a defined result when the entity represented by this
 	 *   context has been created in the back end. It is rejected with an <code>Error</code>
 	 *   instance where <code>oError.canceled === true</code> if the transient entity is deleted
-	 *   before it is created in the back end, for example via
-	 *   {@link sap.ui.model.odata.v4.Context#delete},
+	 *   before it is created in the back end, for example via {@link #delete},
 	 *   {@link sap.ui.model.odata.v4.ODataListBinding#resetChanges} or
 	 *   {@link sap.ui.model.odata.v4.ODataModel#resetChanges}, and for all nested contexts within a
 	 *   deep create. It is rejected with an <code>Error</code> instance without
@@ -294,6 +290,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 +320,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);
 			}
 		}
@@ -433,7 +434,7 @@ sap.ui.define([
 	 *   instance of <code>Error</code> in case of failure
 	 *
 	 * @private
-	 * @see sap.ui.model.odata.v4.Context#delete
+	 * @see #delete
 	 */
 	Context.prototype.doDelete = function (oGroupLock, sEditUrl, sPath, oETagEntity, oBinding,
 			fnCallback) {
@@ -584,7 +585,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 +597,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 +608,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 +678,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 +1201,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 +1293,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 +1409,7 @@ sap.ui.define([
 	 * @since 1.43.0
 	 */
 	Context.prototype.isTransient = function () {
-		return this.oSyncCreatePromise && this.oSyncCreatePromise.isPending();
+		return this.oSyncCreatePromise?.isPending();
 	};
 
 	/**
@@ -1475,11 +1481,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)) {
@@ -1639,8 +1645,7 @@ sap.ui.define([
 	 * any part thereof. The data is a JSON structure as described in <a href=
 	 * "https://docs.oasis-open.org/odata/odata-json-format/v4.0/odata-json-format-v4.0.html"
 	 * >"OData JSON Format Version 4.0"</a>.
-	 * Note that the function clones the result. Modify values via
-	 * {@link sap.ui.model.odata.v4.Context#setProperty}.
+	 * Note that the function clones the result. Modify values via {@link #setProperty}.
 	 *
 	 * The header context of a list binding only delivers <code>$count</code> and
 	 * <code>@$ui5.context.isSelected</code> (wrapped in an object if <code>sPath</code> is "").
@@ -2112,8 +2117,7 @@ sap.ui.define([
 	/**
 	 * Resets all property changes, created entities, and entity deletions of this context. Resets
 	 * also invalid user input and inactive contexts which had their activation prevented (see
-	 * {@link sap.ui.model.odata.v4.Context#isInactive}). This function does not reset the
-	 * invocation of OData operations (see
+	 * {@link #isInactive}). This function does not reset the invocation of OData operations (see
 	 * {@link sap.ui.model.odata.v4.ODataContextBinding#invoke}). For a context which is currently
 	 * {@link #delete deleted} on the client, but not yet on the server, this method cancels the
 	 * deletion and restores the context.
@@ -2126,8 +2130,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 +2148,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 +2185,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

@@ -403,7 +403,7 @@ sap.ui.define([
 	 * Destroys the object. The object must not be used anymore after this function was called.
 	 *
 	 * @public
-	 * @since 1.66
+	 * @since 1.66.0
 	 */
 	ODataBinding.prototype.destroy = function () {
 		this.mCacheByResourcePath = undefined;
@@ -422,8 +422,8 @@ sap.ui.define([
 	};
 
 	/**
-	 * Hook method for {@link sap.ui.model.odata.v4.ODataBinding#fetchCache} to create a cache for
-	 * this binding with the given resource path and query options.
+	 * Hook method for {@link #fetchCache} to create a cache for this binding with the given
+	 * resource path and query options.
 	 *
 	 * @param {string} sResourcePath
 	 *   The resource path, for example "EMPLOYEES"
@@ -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
 	 */
@@ -1426,8 +1428,9 @@ sap.ui.define([
 	 *     <li> the binding's root binding is suspended,
 	 *     <li> there is a change of this binding which has been sent to the server and for which
 	 *       there is no response yet,
-	 *     <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 sap.ui.model.odata.v4.ODataListBinding#create deep create} because it is
+	 *       relative to a {@link sap.ui.model.odata.v4.Context#isTransient transient} context,
 	 *   </ul>
 	 *
 	 * @public
@@ -1559,7 +1562,7 @@ sap.ui.define([
 	 * @param {Promise[]} aPromises
 	 *   List of (sync) promises which is extended for each call to
 	 *   {@link sap.ui.model.odata.v4.ODataParentBinding#requestSideEffects} or
-	 *   {@link sap.ui.model.odata.v4.ODataBinding#refreshInternal}.
+	 *   {@link #refreshInternal}
 	 * @param {string} [sPrefix=""]
 	 *   Prefix for navigation property meta paths; must only be used during recursion
 	 *

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.134.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) {
@@ -1285,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