@openui5/sap.ui.core 1.101.0 → 1.102.2

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

@@ -60,7 +60,7 @@ sap.ui.define([
 	 * @hideconstructor
 	 * @public
 	 * @since 1.93.0
-	 * @version 1.101.0
+	 * @version 1.102.2
 	 */
 	var Context = BaseContext.extend("sap.ui.model.odata.v2.Context", {
 			constructor : function (oModel, sPath, sDeepPath, oCreatePromise, bInactive) {
@@ -161,12 +161,17 @@ sap.ui.define([
 	 *
 	 * @param {object} [mParameters]
 	 *   For a persistent context, a map of parameters as specified for
-	 *   {@link sap.ui.model.odata.v2.ODataModel#remove}
+	 *   {@link sap.ui.model.odata.v2.ODataModel#remove}, except that the <code>groupId</code> and
+	 *   <code>changeSetId</code> parameters default to the values set via
+	 *   {@link sap.ui.model.odata.v2.ODataModel#setChangeGroups} for the type of the entity to be
+	 *   deleted.
 	 * @param {string} [mParameters.groupId]
 	 *   ID of a request group; requests belonging to the same group will be bundled in one batch
-	 *   request
+	 *   request. If not provided, the <code>groupId</code> defined for the type of the entity to be
+	 *   deleted is used.
 	 * @param {string} [mParameters.changeSetId]
-	 *   ID of the <code>ChangeSet</code> that this request should belong to
+	 *   ID of the <code>ChangeSet</code> that this request should belong to. If not provided, the
+	 *   <code>changeSetId</code> defined for the type of the entity to be deleted is used.
 	 * @param {boolean} [mParameters.refreshAfterChange]
 	 *   Defines whether to update all bindings after submitting this change operation,
 	 *   see {@link #setRefreshAfterChange}. If given, this overrules the model-wide
@@ -203,10 +208,14 @@ sap.ui.define([
 		}
 
 		return new Promise(function (resolve, reject) {
+			var oGroupInfo = oModel._resolveGroup(that.getPath());
+
 			oModel.remove("",
 				_Helper.merge({
+					changeSetId : oGroupInfo.changeSetId,
 					context : that,
 					error : reject,
+					groupId : oGroupInfo.groupId,
 					success : function () {resolve();}
 				}, mParameters));
 		});

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

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @class Annotation loader for OData V2 services
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.2
 	 *
 	 * @public
 	 * @since 1.37.0

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

@@ -57,9 +57,10 @@ sap.ui.define([
 	 * @param {boolean} [mParameters.faultTolerant] Turns on the fault tolerance mode, data is not reset if a back-end request returns an error
 	 * @param {sap.ui.model.odata.OperationMode} [mParameters.operationMode] Defines the operation mode of this binding
 	 * @param {string} [mParameters.select] Value for the OData <code>$select</code> query parameter which is included in the request
-	 * @param {int} [mParameters.threshold] Threshold that defines how many entries should be fetched at least
-	 *                                      by the binding if <code>operationMode</code> is set to <code>Auto</code>
-	 *                                      (See documentation for {@link sap.ui.model.odata.OperationMode.Auto})
+	 * @param {int} [mParameters.threshold]
+	 *   Deprecated since 1.102.0, as {@link sap.ui.model.odata.OperationMode.Auto} is deprecated;
+	 *   the threshold that defines how many entries should be fetched at least by the binding if
+	 *   <code>operationMode</code> is set to <code>Auto</code>
 	 * @param {boolean} [mParameters.transitionMessagesOnly]
 	 *   Whether this list binding only requests transition messages from the back end. If messages
 	 *   for entities of this collection need to be updated, use
@@ -102,7 +103,7 @@ sap.ui.define([
 			this.sGroupId = undefined;
 			this.sRefreshGroupId = undefined;
 			this.bLengthRequested = false;
-			this.bUseExtendedChangeDetection = true;
+			this.bUseExtendedChangeDetection = false;
 			this.bFaultTolerant = mParameters && mParameters.faultTolerant;
 			this.bLengthFinal = false;
 			this.iLastEndIndex = 0;
@@ -188,6 +189,40 @@ sap.ui.define([
 		this.detachEvent("createActivate", fnFunction, oListener);
 	};
 
+	/**
+	 * This helper function must be called only by {@link #getContexts}. It updates
+	 * <code>iLastStartIndex</code>, <code>iLastLength</code> and
+	 * <code>iLastMaximumPrefetchSize</code> with the given start index, length and maximum prefetch
+	 * size. If <code>bKeepCurrent</code> is set, throw an error if keeping
+	 * current contexts untouched is not supported, otherwise don't update
+	 * <code>iLastStartIndex</code>, <code>iLastLength</code> and
+	 * <code>iLastMaximumPrefetchSize</code>.
+	 *
+	 * @param {int} [iStartIndex]
+	 *   The start index
+	 * @param {int} [iLength]
+	 *   The length
+	 * @param {int} [iMaximumPrefetchSize]
+	 *   The maximum number of contexts to read before and after the given range
+	 * @param {boolean} [bKeepCurrent]
+	 *   Whether the result of {@link #getCurrentContexts} keeps untouched
+	 * @throws {Error}
+	 *   If extended change detection is enabled and <code>bKeepCurrent</code> is set, or if
+	 *   <code>iMaximumPrefetchSize</code> and <code>bKeepCurrent</code> are set
+	 *
+	 * @private
+	 */
+	 ODataListBinding.prototype._updateLastStartAndLength = function (iStartIndex, iLength,
+			iMaximumPrefetchSize, bKeepCurrent) {
+		if (bKeepCurrent) {
+			this._checkKeepCurrentSupported(iMaximumPrefetchSize);
+		} else {
+			this.iLastStartIndex = iStartIndex;
+			this.iLastLength = iLength;
+			this.iLastMaximumPrefetchSize = iMaximumPrefetchSize;
+		}
+	};
+
 	/**
 	 * Returns all current contexts of this list binding in no special order. Just like
 	 * {@link #getCurrentContexts}, this method does not request any data from a back end and does
@@ -215,16 +250,29 @@ sap.ui.define([
 	/**
 	 * Return contexts for the list.
 	 *
-	 * @param {int} [iStartIndex] The start index of the requested contexts
-	 * @param {int} [iLength] The requested amount of contexts
-	 * @param {int} [iThreshold] The threshold value
+	 * @param {int} [iStartIndex=0]
+	 *   The index where to start the retrieval of contexts
+	 * @param {int} [iLength]
+	 *   The number of contexts to retrieve beginning from the start index; defaults to the model's
+	 *   size limit, see {@link sap.ui.model.Model#setSizeLimit}, or to the binding's final length
+	 * @param {int} [iMaximumPrefetchSize=0]
+	 *   The maximum number of contexts to read before and after the given range; with this,
+	 *   controls can prefetch data that is likely to be needed soon, e.g. when scrolling down in a
+	 *   table
+	 * @param {boolean} [bKeepCurrent]
+	 *   Whether this call keeps the result of {@link #getCurrentContexts} untouched; since 1.102.0.
 	 * @return {sap.ui.model.odata.v2.Context[]}
-	 *   The array of contexts for each row of the bound list
+	 *   The array of already available contexts with the first entry containing the context for
+	 *   <code>iStartIndex</code>
+	 * @throws {Error}
+	 *   If extended change detection is enabled and <code>bKeepCurrent</code> is set, or if
+	 *   <code>iMaximumPrefetchSize</code> and <code>bKeepCurrent</code> are set
+	 *
 	 * @protected
 	 */
-	ODataListBinding.prototype.getContexts = function(iStartIndex, iLength, iThreshold) {
-		var aContexts, oSkipAndTop,
-			aContextData = [];
+	ODataListBinding.prototype.getContexts = function(iStartIndex, iLength, iMaximumPrefetchSize,
+			bKeepCurrent) {
+		var aContexts, aContextData, oSkipAndTop;
 
 		if (this.bInitial || this._hasTransientParentContext()) {
 			return [];
@@ -247,25 +295,21 @@ sap.ui.define([
 		}
 
 		//this.bInitialized = true;
-		this.iLastLength = iLength;
-		this.iLastStartIndex = iStartIndex;
-		this.iLastThreshold = iThreshold;
-
-		//	Set default values if startindex, threshold or length are not defined
+		this._updateLastStartAndLength(iStartIndex, iLength, iMaximumPrefetchSize, bKeepCurrent);
 		if (!iStartIndex) {
 			iStartIndex = 0;
 		}
 		if (!iLength) {
 			iLength = this._getMaximumLength();
 		}
-		if (!iThreshold) {
-			iThreshold = 0;
+		if (!iMaximumPrefetchSize) {
+			iMaximumPrefetchSize = 0;
 		}
 
 		// re-set the threshold in OperationMode.Auto
 		if (this.sOperationMode == OperationMode.Auto) {
 			if (this.iThreshold >= 0) {
-				iThreshold = Math.max(this.iThreshold, iThreshold);
+				iMaximumPrefetchSize = Math.max(this.iThreshold, iMaximumPrefetchSize);
 			}
 		}
 		aContexts = this._getContexts(iStartIndex, iLength);
@@ -275,7 +319,7 @@ sap.ui.define([
 				aContexts.dataRequested = true;
 			}
 		} else {
-			oSkipAndTop = this._getSkipAndTop(iStartIndex, iLength, iThreshold);
+			oSkipAndTop = this._getSkipAndTop(iStartIndex, iLength, iMaximumPrefetchSize);
 			// check if metadata are already available
 			if (this.oModel.getServiceMetadata()) {
 				// If rows are missing send a request
@@ -299,9 +343,10 @@ sap.ui.define([
 			if (!aContexts.dataRequested && aContexts.length > 0) {
 				this._fireChange({reason : ChangeReason.Change});
 			}
-		} else {
+		} else if (!bKeepCurrent) {
 			// Do not create context data and diff in case of refresh, only if real data has been received
 			// The current behaviour is wrong and makes diff detection useless for OData in case of refresh
+			aContextData = [];
 			for (var i = 0; i < aContexts.length; i++) {
 				aContextData.push(this.getContextData(aContexts[i]));
 			}
@@ -311,9 +356,10 @@ sap.ui.define([
 					aContexts.diff = this.diffData(this.aLastContextData, aContextData);
 				}
 			}
+
 			this.iLastEndIndex = iStartIndex + iLength;
 			this.aLastContexts = aContexts.slice(0);
-			this.aLastContextData = aContextData.slice(0);
+			this.aLastContextData = aContextData;
 		}
 
 		return aContexts;
@@ -578,7 +624,6 @@ sap.ui.define([
 				if (this.aExpandRefs.sideEffects && !bOldUseExpandedList) {
 					// don't switch expanded list mode if data is read via a side effect
 					this.aExpandRefs = undefined;
-					this.aAllKeys = null;
 					this.bUseExpandedList = false;
 
 					return this.bUseExpandedList;
@@ -913,7 +958,7 @@ sap.ui.define([
 
 		// If length is not final and larger than zero, add some additional length to enable
 		// scrolling/paging for controls that only do this if more items are available
-		return iResult + (this.iLastThreshold || this.iLastLength || 10);
+		return iResult + (this.iLastMaximumPrefetchSize || this.iLastLength || 10);
 	};
 
 	/**
@@ -1349,6 +1394,33 @@ sap.ui.define([
 		return sPath && this.oModel._createRequestUrl(sPath, null, aParams);
 	};
 
+	/**
+	 * Appends the keys of a list binding's created persisted contexts to its <code>aAllKeys</code>.
+	 * Afterwards, the created persisted contexts are removed from the creation rows area.
+	 *
+	 * Note that this must only be used in <code>OperationMode.Client</code> as this mode expects
+	 * that <code>aAllKeys</code> knows the complete collection from server.
+	 *
+	 * @returns {boolean} Whether created persisted entries have been processed
+	 *
+	 * @private
+	 */
+	ODataListBinding.prototype._moveCreatedPersistedToAllKeys = function () {
+		var that = this,
+			aCreatedPersistedKeys = this._getCreatedPersistedContexts().map(function (oContext) {
+				return that.oModel.getKey(oContext);
+			});
+
+		if (aCreatedPersistedKeys.length) {
+			this.aAllKeys = this.aAllKeys.concat(aCreatedPersistedKeys);
+			this._removePersistedCreatedContexts();
+
+			return true;
+		}
+
+		return false;
+	};
+
 	/**
 	 * Sorts the list.
 	 *
@@ -1389,12 +1461,10 @@ sap.ui.define([
 			if (this.useClientMode()) {
 				// apply clientside sorters only if data is available
 				if (this.aAllKeys) {
-					// If no sorters are defined, restore initial sort order by calling applyFilter
-					if (aSorters.length == 0) {
+					if (this._moveCreatedPersistedToAllKeys() || !aSorters.length) {
 						this.applyFilter();
-					} else {
-						this.applySort();
 					}
+					this.applySort();
 					this._fireChange({reason: ChangeReason.Sort});
 				} else {
 					this.sChangeReason = ChangeReason.Sort;
@@ -1617,6 +1687,7 @@ sap.ui.define([
 			if (this.useClientMode()) {
 				// apply clientside filters/sorters only if data is available
 				if (this.aAllKeys) {
+					this._moveCreatedPersistedToAllKeys();
 					this.applyFilter();
 					this.applySort();
 					this._fireChange({reason: ChangeReason.Filter});
@@ -1974,13 +2045,14 @@ sap.ui.define([
 
 	/**
 	 * Gets an object with the values for system query options $skip and $top based on the given
-	 * start index (from control point of view), length and threshold. The number of entities
-	 * created via {@link #create} is considered for the <code>$skip</code> value if created at the
-	 * beginning, but it is not considered for the <code>$top</code> value.
+	 * start index (from control point of view), length and maximum prefetch size. The number of
+	 * entities created via {@link #create} is considered for the <code>$skip</code> value if
+	 * created at the beginning, but it is not considered for the <code>$top</code> value.
 	 *
 	 * @param {number} iStartIndex The start index from control point of view
 	 * @param {number} iLength The length
-	 * @param {number} iThreshold The threshold
+	 * @param {number} iMaximumPrefetchSize
+	 *   The maximum number of contexts to read before and after the given range
 	 * @returns {object}
 	 *   An object containing the properties <code>skip</code> and <code>top</code>; the values
 	 *   correspond to the system query options <code>$skip</code> and <code>$top</code>.
@@ -1988,7 +2060,8 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
-	ODataListBinding.prototype._getSkipAndTop = function (iStartIndex, iLength, iThreshold) {
+	ODataListBinding.prototype._getSkipAndTop = function (iStartIndex, iLength,
+			iMaximumPrefetchSize) {
 		var oInterval, aIntervals,
 			aCreatedContexts = this._getCreatedContexts(),
 			bFirstCreateAtStart = this.isFirstCreateAtEnd() === false,
@@ -1996,7 +2069,7 @@ sap.ui.define([
 				? aCreatedContexts.concat(this.aKeys)
 				: this.aKeys;
 
-		aIntervals = ODataUtils._getReadIntervals(aKeys, iStartIndex, iLength, iThreshold,
+		aIntervals = ODataUtils._getReadIntervals(aKeys, iStartIndex, iLength, iMaximumPrefetchSize,
 			/*iLimit*/this.bLengthFinal ? this.iLength : undefined);
 		oInterval = ODataUtils._mergeIntervals(aIntervals);
 

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

@@ -36,6 +36,7 @@ sap.ui.define([
 	"sap/ui/core/library",
 	"sap/ui/core/message/Message",
 	"sap/ui/core/message/MessageParser",
+	"sap/ui/model/_Helper",
 	"sap/ui/model/BindingMode",
 	"sap/ui/model/Context",
 	"sap/ui/model/FilterProcessor",
@@ -55,9 +56,9 @@ sap.ui.define([
 ], function(_CreatedContextsCache, Context, ODataAnnotations, ODataContextBinding, ODataListBinding,
 		ODataTreeBinding, assert, Log, encodeURL, deepEqual, deepExtend, each, extend,
 		isEmptyObject, isPlainObject, merge, uid, UriParameters, SyncPromise, coreLibrary, Message,
-		MessageParser, BindingMode, BaseContext, FilterProcessor, Model, CountMode, MessageScope,
-		ODataMetadata, ODataMetaModel, ODataMessageParser, ODataPropertyBinding, ODataUtils,
-		OperationMode, UpdateMethod, OData, URI, isCrossOriginURL
+		MessageParser, _Helper, BindingMode, BaseContext, FilterProcessor, Model, CountMode,
+		MessageScope, ODataMetadata, ODataMetaModel, ODataMessageParser, ODataPropertyBinding,
+		ODataUtils, OperationMode, UpdateMethod, OData, URI, isCrossOriginURL
 ) {
 
 	"use strict";
@@ -202,7 +203,7 @@ sap.ui.define([
 	 * This model is not prepared to be inherited from.
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.2
 	 *
 	 * @public
 	 * @alias sap.ui.model.odata.v2.ODataModel
@@ -356,9 +357,8 @@ sap.ui.define([
 			this.oMessageParser = oMessageParser;
 
 			//collect internal changes in a deferred group as default
-			this.sDefaultChangeGroup = "changes";
-			this.setDeferredGroups([this.sDefaultChangeGroup]);
-			this.setChangeGroups({"*":{groupId: this.sDefaultChangeGroup}});
+			this.setDeferredGroups(["changes"]);
+			this.setChangeGroups({"*":{groupId: "changes"}});
 
 			this.oData = {};
 			this.oMetadata = null;
@@ -2015,9 +2015,10 @@ sap.ui.define([
 	 *           if not specified, the default operation mode of this model is used
 	 * @param {boolean} [mParameters.faultTolerant] Turns on the fault tolerance mode, data is not reset if a backend request returns an error
 	 * @param {string} [mParameters.batchGroupId] Sets the batch group ID to be used for requests originating from this binding
-	 * @param {int} [mParameters.threshold] Threshold that defines how many entries should be fetched at least
-	 *                                      by the binding if <code>operationMode</code> is set to <code>Auto</code>
-	 *                                      (See documentation for {@link sap.ui.model.odata.OperationMode.Auto})
+	 * @param {int} [mParameters.threshold]
+	 *   Deprecated since 1.102.0, as {@link sap.ui.model.odata.OperationMode.Auto} is deprecated;
+	 *   the threshold that defines how many entries should be fetched at least by the binding if
+	 *   <code>operationMode</code> is set to <code>Auto</code>
 	 * @returns {sap.ui.model.ListBinding} The new list binding
 	 * @see sap.ui.model.Model.prototype.bindList
 	 * @public
@@ -2069,6 +2070,7 @@ sap.ui.define([
 	 * <code>hierarchy-node-descendant-count-for</code> annotation. Services with hierarchy
 	 * annotations including the <code>hierarchy-node-descendant-count-for</code> annotation, do
 	 * <b>not</b> support the operation modes <code>Client</code> and <code>Auto</code>.
+	 * <b>Note:</b> {@link sap.ui.model.odata.OperationMode.Auto} is deprecated since 1.102.0.
 	 *
 	 * @param {string} sPath
 	 *   The binding path, either absolute or relative to a given <code>oContext</code>
@@ -2109,12 +2111,14 @@ sap.ui.define([
 	 *   specified. {@link sap.ui.model.odata.OperationMode.Auto OperationMode.Auto} is only
 	 *   supported for services which expose the hierarchy annotations, yet do <b>NOT</b> expose the
 	 *   <code>hierarchy-node-descendant-count-for</code> annotation.
+	 *   <b>Note:</b> {@link sap.ui.model.odata.OperationMode.Auto} is deprecated since 1.102.0.
 	 * @param {number} [mParameters.threshold]
-	 *   The threshold used if the operation mode is set to
-	 *   {@link sap.ui.model.odata.OperationMode.Auto OperationMode.Auto}. The binding tries to
-	 *   fetch (at least) as many entries as specified by the threshold value.
+	 *   Deprecated since 1.102.0, as {@link sap.ui.model.odata.OperationMode.Auto} is deprecated;
+	 *   the threshold that defines how many entries should be fetched at least by the binding if
+	 *   <code>operationMode</code> is set to <code>Auto</code>
 	 * @param {boolean} [mParameters.useServersideApplicationFilters]
-	 *   Whether <code>$filter</code> statements should be used for the <code>$count</code> /
+	 *   Deprecated since 1.102.0, as {@link sap.ui.model.odata.OperationMode.Auto} is deprecated;
+	 *   whether <code>$filter</code> statements should be used for the <code>$count</code> /
 	 *   <code>$inlinecount</code> requests and for the data request if the operation mode is
 	 *   {@link sap.ui.model.odata.OperationMode.Auto OperationMode.Auto}. Use this feature only
 	 *   if your back end supports pre-filtering the tree and is capable of responding with
@@ -4311,10 +4315,10 @@ sap.ui.define([
 				if (oEntityType) {
 					mEntityTypes[oEntityType.entityType] = true;
 				}
-				if (oRequest.key) { // e.g. /myEntity
+				if (oRequest.key) {
 					// for createEntry entities change context path to new one
 					if (oRequest.created) {
-						var sKey = this._getKey(oResultData); // e.g. /myEntity-4711
+						var sKey = this._getKey(oResultData);
 						// rewrite context for new path
 						var oContext = this.getContext("/" + oRequest.key);
 						sDeepPath = oRequest.deepPath;
@@ -4332,6 +4336,8 @@ sap.ui.define([
 						oEntity = this._getEntity(sKey);
 						if (oEntity) {
 							delete oEntity.__metadata.created;
+							// before deleting the old entity copy and update the changes
+							this._keepChangesAfterCreate(oRequest, oEntity, sKey);
 						}
 						this._removeEntity(oRequest.key);
 					} else {
@@ -4368,6 +4374,46 @@ sap.ui.define([
 		return true;
 	};
 
+	/**
+	 * Creates a new <code>mChangedEntities</code> entry for the <code>sKey</code> for the just
+	 * created entity and takes all changes which have been made after this create has been
+	 * submitted.
+	 *
+	 * @param {object} oRequest
+	 *   The request object for a created entity
+	 * @param {object} oEntity
+	 *   The persisted and retrieved entity object
+	 * @param {string} sKey
+	 *   The key of the created entity
+	 *
+	 * @private
+	 */
+	ODataModel.prototype._keepChangesAfterCreate = function (oRequest, oEntity, sKey) {
+		var oKey2Entity, aNavProps, sProperty,
+			oChangedEntity = this.mChangedEntities[oRequest.key];
+
+		if (oChangedEntity) {
+			aNavProps = this.oMetadata._getNavigationPropertyNames(
+				this.oMetadata._getEntityTypeByPath(sKey));
+			oChangedEntity = _Helper.merge({}, oChangedEntity);
+			oChangedEntity.__metadata = _Helper.merge({}, oEntity.__metadata);
+			oChangedEntity.__metadata.deepPath = oRequest.deepPath;
+			for (sProperty in oRequest.data) {
+				if (_Helper.deepEqual(oRequest.data[sProperty], oChangedEntity[sProperty])
+						|| aNavProps.includes(sProperty)) {
+					delete oChangedEntity[sProperty];
+				}
+			}
+			this.mChangedEntities[sKey] = oChangedEntity;
+			oKey2Entity = {};
+			oKey2Entity[sKey] = oEntity;
+			this._updateChangedEntities(oKey2Entity);
+			// cleanup also further POST request for the just created entity
+			this.abortInternalRequest(this._resolveGroup(oRequest.key).groupId,
+				{requestKey: oRequest.key});
+		}
+	};
+
 	/**
 	 * Process request response for failed requests.
 	 *
@@ -6847,12 +6893,7 @@ sap.ui.define([
 			throw new Error("The 'expand' parameter is only supported if batch mode is used");
 		}
 		bCanonical = this._isCanonicalRequestNeeded(bCanonical);
-
 		mHeaders = mHeaders || {};
-
-		bRefreshAfterChange = this._getRefreshAfterChange(bRefreshAfterChange, sGroupId);
-
-		sGroupId = sGroupId ? sGroupId : this.sDefaultChangeGroup;
 		aUrlParams = ODataUtils._createUrlParamsArray(mUrlParams);
 
 		var oRequestHandle = {
@@ -6875,11 +6916,18 @@ sap.ui.define([
 
 		function create() {
 			var oCreateData, oCreatedContext, oCreateResponse, oEntitySetMetadata, oExpandRequest,
-				sUID,
+				oGroupInfo, sUID,
 				bCreateFailed = false,
 				fnErrorFromParameters = fnError,
 				fnSuccessFromParameters = fnSuccess;
 
+			// fallback to groups as defined in mChangeGroups; using path is OK as we don't have an
+			// entity yet and the entity type can be derived from the path to determine the group ID
+			oGroupInfo = that._resolveGroup(sNormalizedPath);
+			sGroupId = sGroupId || oGroupInfo.groupId;
+			sChangeSetId = sChangeSetId || oGroupInfo.changeSetId;
+			bRefreshAfterChange = that._getRefreshAfterChange(bRefreshAfterChange, sGroupId);
+
 			var oEntityMetadata = that.oMetadata._getEntityTypeByPath(sNormalizedPath);
 			if (!oEntityMetadata) {
 

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

@@ -65,10 +65,12 @@ sap.ui.define([
 	 * @param {sap.ui.model.odata.OperationMode} [mParameters.operationMode]
 	 *   The operation mode for this binding
 	 * @param {number} [mParameters.threshold]
-	 *   The threshold used if the operation mode is set to
-	 *   {@link sap.ui.model.odata.OperationMode.Auto OperationMode.Auto}
+	 *   Deprecated since 1.102.0, as {@link sap.ui.model.odata.OperationMode.Auto} is deprecated;
+	 *   the threshold that defines how many entries should be fetched at least by the binding if
+	 *   <code>operationMode</code> is set to <code>Auto</code>
 	 * @param {boolean} [mParameters.useServersideApplicationFilters]
-	 *   Whether <code>$filter</code> statements should be used for the <code>$count</code> /
+	 *   Deprecated since 1.102.0, as {@link sap.ui.model.odata.OperationMode.Auto} is deprecated;
+	 *   whether <code>$filter</code> statements should be used for the <code>$count</code> /
 	 *   <code>$inlinecount</code> requests and for the data request if the operation mode is
 	 *   {@link sap.ui.model.odata.OperationMode.Auto OperationMode.Auto}
 	 * @param {any} [mParameters.treeState]
@@ -92,7 +94,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.TreeBinding
 	 * @hideconstructor
 	 * @public
-	 * @version 1.101.0
+	 * @version 1.102.2
 	 */
 	var ODataTreeBinding = TreeBinding.extend("sap.ui.model.odata.v2.ODataTreeBinding", /** @lends sap.ui.model.odata.v2.ODataTreeBinding.prototype */ {
 
@@ -1558,6 +1560,7 @@ sap.ui.define([
 	 * instance. If it is set, the filters of type <code>Application</code> will always be applied
 	 * on the back end and trigger an OData request.
 	 * For more information, see {@link sap.ui.model.odata.v2.ODataModel#bindTree}.
+	 * <b>Note:</b> {@link sap.ui.model.odata.OperationMode.Auto} is deprecated since 1.102.0.
 	 *
 	 * @param {sap.ui.model.Filter[]|sap.ui.model.Filter} aFilters
 	 *   Filter or array of filters to apply
@@ -1724,6 +1727,7 @@ sap.ui.define([
 	 * Sorts the Tree according to the given Sorter(s). In <code>OperationMode.Client</code> or
 	 * <code>OperationMode.Auto</code> (if the given threshold is satisfied), the sorters are
 	 * applied locally on the client.
+	 * <b>Note:</b> {@link sap.ui.model.odata.OperationMode.Auto} is deprecated since 1.102.0.
 	 *
 	 * @param {sap.ui.model.Sorter[]|sap.ui.model.Sorter} aSorters
 	 *   The Sorter or an Array of sap.ui.model.Sorter instances

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

@@ -42,7 +42,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.39.0
-		 * @version 1.101.0
+		 * @version 1.102.2
 		 */
 		Context = BaseContext.extend("sap.ui.model.odata.v4.Context", {
 				constructor : constructor
@@ -379,6 +379,10 @@ sap.ui.define([
 			oDependentBinding.setContext(undefined);
 		});
 		this.oBinding = undefined;
+		this.oCreatedPromise = undefined;
+		this.oSyncCreatePromise = undefined;
+		this.bInactive = undefined;
+		this.bKeepAlive = undefined;
 		// When removing oModel, ManagedObject#getBindingContext does not return the destroyed
 		// context although the control still refers to it
 		this.oModel = undefined;
@@ -406,8 +410,28 @@ sap.ui.define([
 	 */
 	Context.prototype.doSetProperty = function (sPath, vValue, oGroupLock, bSkipRetry) {
 		var oMetaModel = this.oModel.getMetaModel(),
+			oPromise,
+			oValue,
 			that = this;
 
+		if (oGroupLock && this.isTransient() && !this.isInactive()) {
+			oValue = this.getValue();
+			oPromise = oValue && _Helper.getPrivateAnnotation(oValue, "transient");
+			if (oPromise instanceof Promise) {
+				oGroupLock.unlock();
+				oGroupLock = oGroupLock.getUnlockedCopy();
+				this.doSetProperty(sPath, vValue, null, true) // early UI update
+					.catch(this.oModel.getReporter());
+
+				return oPromise.then(function (bSuccess) {
+					// in case of success, wait until creation is completed because context path's
+					// key predicate is adjusted
+					return bSuccess && that.created();
+				}).then(function () {
+					return that.doSetProperty(sPath, vValue, oGroupLock, bSkipRetry);
+				});
+			}
+		}
 		if (this.oModel.bAutoExpandSelect) {
 			sPath = oMetaModel.getReducedPath(
 				this.oModel.resolve(sPath, this),

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