@openui5/sap.ui.core 1.115.1 → 1.117.0

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

@@ -57,7 +57,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.115.1
+		 * @version 1.117.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
@@ -338,7 +338,7 @@ sap.ui.define([
 			sApply = _AggregationHelper.buildApply(mParameters.$$aggregation).$apply;
 		}
 		this.mQueryOptions = this.oModel.buildQueryOptions(mParameters, true);
-		this.oQueryOptionsPromise = undefined; // @see #doFetchQueryOptions
+		this.oQueryOptionsPromise = undefined; // @see #doFetchOrGetQueryOptions
 		this.mParameters = mParameters; // store mParameters at binding after validation
 		if (sApply) {
 			this.mQueryOptions.$apply = sApply;
@@ -376,8 +376,8 @@ sap.ui.define([
 	 * detailed reason as parameters.
 	 *
 	 * @param {sap.ui.base.Event} oEvent
-	 * @param {object} oEvent.getParameters()
-	 * @param {sap.ui.model.ChangeReason} oEvent.getParameters().reason
+	 * @param {object} oEvent.getParameters
+	 * @param {sap.ui.model.ChangeReason} oEvent.getParameters.reason
 	 *   The reason for the 'change' event is
 	 *   <ul>
 	 *     <li> {@link sap.ui.model.ChangeReason.Add Add} when a new context is created,
@@ -388,7 +388,7 @@ sap.ui.define([
 	 *   </ul>
 	 *   Additionally each {@link #event:refresh 'refresh'} event is followed by a 'change' event
 	 *   repeating the change reason when the requested data is available.
-	 * @param {string} oEvent.getParameters().detailedReason
+	 * @param {string} oEvent.getParameters.detailedReason
 	 *   During automatic determination of $expand and $select, a "virtual" context is first added
 	 *   with detailed reason "AddVirtualContext" and then removed with detailed reason
 	 *   "RemoveVirtualContext" (since 1.69.0); <code>undefined</code> is used in all other cases
@@ -408,7 +408,7 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.base.Event} oEvent The event object
 	 * @param {sap.ui.model.odata.v4.ODataListBinding} oEvent.getSource() This binding
-	 * @param {sap.ui.model.odata.v4.Context} oEvent.getParameters().context The affected context
+	 * @param {sap.ui.model.odata.v4.Context} oEvent.getParameters.context The affected context
 	 *
 	 * @event sap.ui.model.odata.v4.ODataListBinding#createActivate
 	 * @public
@@ -423,10 +423,10 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.base.Event} oEvent The event object
 	 * @param {sap.ui.model.odata.v4.ODataListBinding} oEvent.getSource() This binding
-	 * @param {object} oEvent.getParameters() Object containing all event parameters
-	 * @param {sap.ui.model.odata.v4.Context} oEvent.getParameters().context
+	 * @param {object} oEvent.getParameters Object containing all event parameters
+	 * @param {sap.ui.model.odata.v4.Context} oEvent.getParameters.context
 	 *   The context for the created entity
-	 * @param {boolean} oEvent.getParameters().success
+	 * @param {boolean} oEvent.getParameters.success
 	 *   Whether the POST was successfully processed; in case of an error, the error is already
 	 *   reported to the {@link sap.ui.core.message.MessageManager}
 	 *
@@ -442,8 +442,8 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.base.Event} oEvent The event object
 	 * @param {sap.ui.model.odata.v4.ODataListBinding} oEvent.getSource() This binding
-	 * @param {object} oEvent.getParameters() Object containing all event parameters
-	 * @param {sap.ui.model.odata.v4.Context} oEvent.getParameters().context
+	 * @param {object} oEvent.getParameters Object containing all event parameters
+	 * @param {sap.ui.model.odata.v4.Context} oEvent.getParameters.context
 	 *   The context for the created entity
 	 *
 	 * @event sap.ui.model.odata.v4.ODataListBinding#createSent
@@ -474,10 +474,10 @@ sap.ui.define([
 	 * @param {sap.ui.base.Event} oEvent
 	 * @param {function} oEvent.cancelBubble
 	 *   A callback function to prevent that the event is bubbled up to the model
-	 * @param {object} oEvent.getParameters()
-	 * @param {object} [oEvent.getParameters().data]
+	 * @param {object} oEvent.getParameters
+	 * @param {object} [oEvent.getParameters.data]
 	 *   An empty data object if a back-end request succeeds
-	 * @param {Error} [oEvent.getParameters().error] The error object if a back-end request failed.
+	 * @param {Error} [oEvent.getParameters.error] The error object if a back-end request failed.
 	 *   If there are multiple failed back-end requests, the error of the first one is provided.
 	 *
 	 * @event sap.ui.model.odata.v4.ODataListBinding#dataReceived
@@ -513,8 +513,8 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.base.Event} oEvent The event object
 	 * @param {sap.ui.model.odata.v4.ODataListBinding} oEvent.getSource() This binding
-	 * @param {object} oEvent.getParameters() Object containing all event parameters
-	 * @param {boolean} oEvent.getParameters().success
+	 * @param {object} oEvent.getParameters Object containing all event parameters
+	 * @param {boolean} oEvent.getParameters.success
 	 *   Whether all PATCHes are successfully processed
 	 *
 	 * @event sap.ui.model.odata.v4.ODataListBinding#patchCompleted
@@ -544,8 +544,8 @@ sap.ui.define([
 	 * binding. Registered event handlers are called with the change reason as parameter.
 	 *
 	 * @param {sap.ui.base.Event} oEvent
-	 * @param {object} oEvent.getParameters()
-	 * @param {sap.ui.model.ChangeReason} oEvent.getParameters().reason
+	 * @param {object} oEvent.getParameters
+	 * @param {sap.ui.model.ChangeReason} oEvent.getParameters.reason
 	 *   The reason for the 'refresh' event could be
 	 *   <ul>
 	 *     <li> {@link sap.ui.model.ChangeReason.Context Context} when the binding's
@@ -731,7 +731,7 @@ sap.ui.define([
 	 * method then adds a transient entity to the parent's navigation property, which is sent with
 	 * the payload of the parent entity. Such a nested context cannot be inactive.
 	 *
-	 * <b>Beware:</b> After a succesful creation of the main entity the context returned for a
+	 * <b>Note:</b> After a succesful creation of the main entity the context returned for a
 	 * nested entity is no longer valid. Do not use the
 	 * {@link sap.ui.model.odata.v4.Context#created created} promise of such a context! New contexts
 	 * are created for the nested collection because it is not possible to reliably assign the
@@ -740,6 +740,13 @@ sap.ui.define([
 	 * of <code>Error</code>, even if the deep create succeeds. This error always has the property
 	 * <code>canceled</code> with the value <code>true</code>.
 	 *
+	 * Since 1.117.0 deep create also supports single-valued navigation properties; no API call is
+	 * required in this case. Simply bind properties of the related entity relative to a transient
+	 * context. An update to the property adds it to the POST request of the parent entity, and by
+	 * this the create becomes deep.
+	 *
+	 * <b>Note</b>: Deep create for single-valued navigation properties is <b>experimental</b>.
+	 *
 	 * Deep create requires the <code>autoExpandSelect</code> parameter at the
 	 * {@link sap.ui.model.odata.v4.ODataModel#constructor model}. The refresh after a deep create
 	 * is optimized. Only the (navigation) properties missing from the POST response are actually
@@ -750,11 +757,25 @@ sap.ui.define([
 	 * the case if the complete collection has been read or if the system query option
 	 * <code>$count</code> is <code>true</code> and the binding has processed at least one request.
 	 *
+	 * Creating a new child beneath an existing and visible parent node (which must either be a leaf
+	 * or expanded, but not collapsed) is supported (@experimental as of version 1.117.0) in case of
+	 * a recursive hierarchy (see {@link #setAggregation}). The parent node must be identified via a
+	 * {@link sap.ui.model.odata.v4.Context} instance given as
+	 * <code>oInitialData["@$ui5.node.parent"]</code>. <code>oAggregation.expandTo</code> (see
+	 * {@link #setAggregation}) must be one, <code>bSkipRefresh</code> must be set, but both
+	 * <code>bAtEnd</code> and <code>bInactive</code> must not be set. No other creation must be
+	 * pending, and no other modification (including collapse of some ancestor node) must happen
+	 * while this creation is pending!
+	 *
 	 * @param {object} [oInitialData={}]
 	 *   The initial data for the created entity
 	 * @param {boolean} [bSkipRefresh]
-	 *   Whether an automatic refresh of the created entity will be skipped; ignored within a deep
-	 *   create (when the binding's parent context is transient)
+	 *   Whether an automatic refresh of the created entity will be skipped.
+	 *   <br>
+	 *   <b>Note:</b> Do not use this parameter for a deep create. It leads to multiple single row
+	 *   requests if the POST response did not supply all properties of the nested list. If it is
+	 *   not set, the model checks whether all required properties and child entities are available
+	 *   on the client and requests only data that is missing.
 	 * @param {boolean} [bAtEnd]
 	 *   Whether the entity is inserted at the end of the list. Supported since 1.66.0.
 	 *   Since 1.99.0 the first insertion determines the overall position of created contexts
@@ -798,17 +819,22 @@ sap.ui.define([
 	 *     <li> an automatic refresh of the created entity cannot be performed and
 	 *       <code>bSkipRefresh</code> is missing. This could be caused by a side-effects refresh
 	 *       happening in parallel to creation (error thrown since 1.114.0; previously failed
-	 *       without an adequate error message).
+	 *       without an adequate error message),
+	 *     <li> the restrictions for creating in a recursive hierarchy (see above) are not met.
 	 *   </ul>
 	 * @public
 	 * @since 1.43.0
 	 */
 	ODataListBinding.prototype.create = function (oInitialData, bSkipRefresh, bAtEnd, bInactive) {
-		var oContext,
+		var oAggregation = this.mParameters.$$aggregation,
+			iChildIndex,
+			oContext,
 			oCreatePathPromise = this.fetchResourcePath(),
 			oCreatePromise,
+			oEntityData,
 			sGroupId = this.getUpdateGroupId(),
 			oGroupLock,
+			oParentContext,
 			sResolvedPath = this.getResolvedPath(),
 			sTransientPredicate = "($uid=" + _Helper.uid() + ")",
 			sTransientPath = sResolvedPath + sTransientPredicate,
@@ -819,7 +845,7 @@ sap.ui.define([
 			throw new Error("Binding is unresolved: " + this);
 		}
 		this.checkSuspended();
-		if (this.mParameters.$$aggregation) {
+		if (_Helper.isDataAggregation(this.mParameters)) {
 			throw new Error("Cannot create in " + this + " when using data aggregation");
 		}
 		if (this.isTransient()) {
@@ -842,7 +868,7 @@ sap.ui.define([
 				throw new Error("Missing $$ownRequest at " + this);
 			}
 			sGroupId = "$inactive." + sGroupId;
-		} else {
+		} else if (!oAggregation) {
 			this.iActiveContexts += 1;
 		}
 
@@ -850,6 +876,32 @@ sap.ui.define([
 			this.bFirstCreateAtEnd = bAtEnd;
 		}
 
+		// clone data to avoid modifications outside the cache
+		// remove any property starting with "@$ui5."
+		oEntityData = _Helper.publicClone(oInitialData, true) || {};
+		if (oAggregation) {
+			if (oAggregation.expandTo > 1) {
+				throw new Error("Unsupported $$aggregation.expandTo: " + oAggregation.expandTo);
+			}
+			if (!bSkipRefresh) {
+				throw new Error("Missing bSkipRefresh");
+			}
+			if (arguments.length > 2) {
+				throw new Error("Only the parameters oInitialData and bSkipRefresh are supported");
+			}
+			oParentContext = oInitialData["@$ui5.node.parent"];
+			iChildIndex = this.aContexts.indexOf(oParentContext) + 1;
+			if (iChildIndex <= 0) {
+				throw new Error("Invalid parent context: " + oParentContext);
+			}
+			if (oParentContext.isExpanded() === false) {
+				throw new Error("Unsupported collapsed parent: " + oParentContext);
+			}
+			oEntityData["@$ui5.node.parent"] = oParentContext.getCanonicalPath().slice(1);
+		} else {
+			this.iCreatedContexts += 1;
+		}
+
 		// only for createInCache
 		oGroupLock = this.lockGroup(sGroupId, true, true, function () {
 			if (!that.aContexts.includes(oContext)) { // #setContext changed the parent context
@@ -867,7 +919,7 @@ sap.ui.define([
 			});
 		});
 		oCreatePromise = this.createInCache(oGroupLock, oCreatePathPromise, sResolvedPath,
-			sTransientPredicate, oInitialData, this.bFirstCreateAtEnd !== bAtEnd,
+			sTransientPredicate, oEntityData, this.bFirstCreateAtEnd !== bAtEnd,
 			function (oError) { // error callback
 				that.oModel.reportError("POST on '" + oCreatePathPromise
 					+ "' failed; will be repeated automatically", sClassName, oError);
@@ -904,8 +956,8 @@ sap.ui.define([
 			throw oError;
 		});
 
-		this.iCreatedContexts += 1;
-		oContext = Context.create(this.oModel, this, sTransientPath, -this.iCreatedContexts,
+		oContext = Context.create(this.oModel, this, sTransientPath,
+			oParentContext ? iChildIndex : -this.iCreatedContexts,
 			oCreatePromise, bInactive);
 		if (this.isTransient()) {
 			oContext.created().catch(this.oModel.getReporter());
@@ -918,7 +970,15 @@ sap.ui.define([
 			} // else: context already destroyed
 		});
 
-		if (this.bFirstCreateAtEnd !== bAtEnd) {
+		if (oParentContext) {
+			this.aContexts.splice(iChildIndex, 0, oContext);
+			for (i = this.aContexts.length - 1; i > iChildIndex; i -= 1) {
+				if (this.aContexts[i]) {
+					this.aContexts[i].iIndex += 1;
+				}
+			}
+			this.iMaxLength += 1;
+		} else if (this.bFirstCreateAtEnd !== bAtEnd) {
 			this.aContexts.splice(this.iCreatedContexts - 1, 0, oContext);
 			for (i = this.iCreatedContexts - 1; i >= 0; i -= 1) {
 				this.aContexts[i].iIndex = i - this.iCreatedContexts;
@@ -1193,7 +1253,8 @@ sap.ui.define([
 	 * @private
 	 */
 	ODataListBinding.prototype.destroyPreviousContexts = function (aPathsToDelete) {
-		var mPreviousContextsByPath = this.mPreviousContextsByPath;
+		var mPreviousContextsByPath = this.mPreviousContextsByPath,
+			that = this;
 
 		if (mPreviousContextsByPath) { // binding may have been destroyed already
 			(aPathsToDelete || Object.keys(mPreviousContextsByPath)).forEach(function (sPath) {
@@ -1206,6 +1267,11 @@ sap.ui.define([
 					} else {
 						if (!oContext.isTransient()) {
 							oContext.destroy();
+							if (oContext.iIndex === undefined && that.oCache) {
+								// was kept alive (or deleted)
+								that.oCache.removeKeptElement(
+									_Helper.getRelativePath(sPath, that.oHeaderContext.getPath()));
+							}
 						}
 						delete mPreviousContextsByPath[sPath];
 					}
@@ -1282,9 +1348,9 @@ sap.ui.define([
 
 	/**
 	 * @override
-	 * @see sap.ui.model.odata.v4.ODataBinding#doFetchQueryOptions
+	 * @see sap.ui.model.odata.v4.ODataBinding#doFetchOrGetQueryOptions
 	 */
-	ODataListBinding.prototype.doFetchQueryOptions = function (oContext) {
+	ODataListBinding.prototype.doFetchOrGetQueryOptions = function (oContext) {
 		// Note: an absolute binding needs no parent context :-)
 		var sMetaPath = oContext && _Helper.getMetaPath(oContext.getPath()),
 			that = this;
@@ -2445,14 +2511,20 @@ sap.ui.define([
 	 * Additionally, you must be aware of server-driven paging and be ready to send a follow-up
 	 * request if the response contains <code>@odata.nextlink</code>.
 	 *
+	 * The URL cannot be determined synchronously in all cases; use {@link #requestDownloadUrl} to
+	 * allow for asynchronous determination then.
+	 *
 	 * @returns {string}
 	 *   The download URL
 	 * @throws {Error}
-	 *   If the binding is unresolved or if the URL determination is not finished yet
+	 *   If the binding is unresolved or if the URL cannot be determined synchronously (either due
+	 *   to a pending metadata request or because the <code>autoExpandSelect</code> parameter at the
+	 *   {@link sap.ui.model.odata.v4.ODataModel#constructor model} is used and the binding has been
+	 *   newly created and is thus still automatically generating its $select and $expand system
+	 *   query options from the binding hierarchy)
 	 *
 	 * @function
 	 * @public
-	 * @see #requestDownloadUrl
 	 * @since 1.74.0
 	 */
 	ODataListBinding.prototype.getDownloadUrl = _Helper.createGetMethod("fetchDownloadUrl", true);
@@ -2805,7 +2877,7 @@ sap.ui.define([
 	ODataListBinding.prototype.inheritQueryOptions = function (mQueryOptions, oContext) {
 		var mInheritedQueryOptions;
 
-		if (!Object.keys(this.mParameters).length) {
+		if (_Helper.isEmptyObject(this.mParameters)) {
 			// mix-in inherited static query options
 			mInheritedQueryOptions = this.getQueryOptionsForPath("", oContext);
 			if (mQueryOptions.$orderby && mInheritedQueryOptions.$orderby) {
@@ -2815,7 +2887,7 @@ sap.ui.define([
 				mQueryOptions.$filter = "(" + mQueryOptions.$filter + ") and ("
 					+ mInheritedQueryOptions.$filter + ")";
 			}
-			mQueryOptions = Object.assign({}, mInheritedQueryOptions, mQueryOptions);
+			mQueryOptions = _Helper.merge({}, mInheritedQueryOptions, mQueryOptions);
 			_Helper.aggregateExpandSelect(mQueryOptions, mInheritedQueryOptions);
 		}
 
@@ -2880,7 +2952,7 @@ sap.ui.define([
 		// When suspended it matches if it already has contexts. Then its getKeepAliveContext fails.
 		return this.mParameters.$$getKeepAliveContext && this.getResolvedPath() === sPath
 			&& (!this.isRootBindingSuspended() || this.aContexts.length
-				|| Object.keys(this.mPreviousContextsByPath).length);
+				|| !_Helper.isEmptyObject(this.mPreviousContextsByPath));
 	};
 
 	/**
@@ -2995,6 +3067,21 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * Notification from a context that its effective keep-alive status changed.
+	 *
+	 * @param {sap.ui.model.odata.v4.Context} oContext - The context
+	 *
+	 * @private
+	 */
+	ODataListBinding.prototype.onKeepAliveChanged = function (oContext) {
+		if (!oContext.isDeleted() // data of a deleted context must remain for the exclusion filter
+				&& oContext.getPath() in this.mPreviousContextsByPath
+				&& !oContext.isEffectivelyKeptAlive()) {
+			this.destroyPreviousContextsLater([oContext.getPath()]);
+		}
+	};
+
 	/**
 	 * Prepares the nested binding for a deep create if it is below a transient parent context. Adds
 	 * a transient collection to the parent binding's cache. Creates contexts for nested entities in
@@ -3180,8 +3267,8 @@ sap.ui.define([
 	 * @param {string} sGroupId
 	 *   The effective group ID
 	 * @returns {sap.ui.base.SyncPromise}
-	 *   A promise resolving without a defined result, or rejecting with an error if the refresh
-	 *   fails.
+	 *   A promise which is resolved without a defined result, or rejected with an error if the
+	 *   refresh fails.
 	 *
 	 * @private
 	 */
@@ -3570,10 +3657,9 @@ sap.ui.define([
 			});
 		}
 
-		if (this.mParameters.$$aggregation && !this.mParameters.$$aggregation.hierarchyQualifier) {
+		if (_Helper.isDataAggregation(this.mParameters)) {
 			if (bSingle) {
-				throw new Error(
-					"Must not request side effects for a context of a binding with $$aggregation");
+				throw new Error("Must not request side effects when using data aggregation");
 			}
 
 			if (_AggregationHelper.isAffected(this.mParameters.$$aggregation,
@@ -3813,7 +3899,8 @@ sap.ui.define([
 	 *   Since 1.105.0, either a 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 - this is an <b>experimental API</b> and is only supported if the model uses the
-	 *   <code>autoExpandSelect</code> parameter!
+	 *   <code>autoExpandSelect</code> parameter! Since 1.117.0, it is available for read-only
+	 *   hierarchies.
 	 * @param {object} [oAggregation.aggregate]
 	 *   A map from aggregatable property names or aliases to objects containing the following
 	 *   details:
@@ -3843,9 +3930,10 @@ sap.ui.define([
 	 *   </ul>
 	 * @param {number} [oAggregation.expandTo=1]
 	 *   The number (as a positive integer) of different levels initially available without calling
-	 *   {@link sap.ui.model.odata.v4.Context#expand} (@experimental as of version 1.105.0),
-	 *   supported only if a <code>hierarchyQualifier</code> is given. Root nodes are on the first
-	 *   level. By default, only root nodes are available; they are not yet expanded.
+	 *   {@link sap.ui.model.odata.v4.Context#expand} (@experimental as of version 1.105.0;
+	 *   available for read-only hierarchies since 1.117.0), supported only if a
+	 *   <code>hierarchyQualifier</code> is given. Root nodes are on the first level. By default,
+	 *   only root nodes are available; they are not yet expanded.
 	 * @param {boolean} [oAggregation.grandTotalAtBottomOnly]
 	 *   Tells whether the grand totals for aggregatable properties are displayed at the bottom only
 	 *   (since 1.86.0); <code>true</code> for bottom only, <code>false</code> for top and bottom,
@@ -3871,10 +3959,10 @@ sap.ui.define([
 	 * @param {string} [oAggregation.hierarchyQualifier]
 	 *   The qualifier for the pair of "Org.OData.Aggregation.V1.RecursiveHierarchy" and
 	 *   "com.sap.vocabularies.Hierarchy.v1.RecursiveHierarchy" annotations at this binding's
-	 *   entity type (@experimental as of version 1.105.0). If present, a recursive hierarchy
-	 *   without data aggregation is defined, and the only other supported properties are
-	 *   <code>expandTo</code> and <code>search</code>. A recursive hierarchy cannot be combined
-	 *   with:
+	 *   entity type (@experimental as of version 1.105.0; available for read-only hierarchies since
+	 *   1.117.0). If present, a recursive hierarchy without data aggregation is defined, and the
+	 *   only other supported properties are <code>expandTo</code> and <code>search</code>. A
+	 *   recursive hierarchy cannot be combined with:
 	 *   <ul>
 	 *     <li> "$search",
 	 *     <li> the <code>vGroup</code> parameter of {@link sap.ui.model.Sorter} (since 1.107.0),
@@ -4009,6 +4097,7 @@ sap.ui.define([
 					if (this.mParameters.$$aggregation) {
 						_AggregationHelper.setPath(this.mParameters.$$aggregation, sResolvedPath);
 					} else if (this.bHasPathReductionToParent && this.oModel.bAutoExpandSelect) {
+						this.mCanUseCachePromiseByChildPath = {};
 						this.sChangeReason = "AddVirtualContext"; // JIRA: CPOUI5ODATAV4-848
 					}
 					if (oContext.getBinding && oContext.getBinding().isRootBindingSuspended()) {

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

@@ -11,7 +11,6 @@ sap.ui.define([
 	"./lib/_Helper",
 	"sap/base/assert",
 	"sap/base/Log",
-	"sap/base/util/isEmptyObject",
 	"sap/base/util/JSTokenizer",
 	"sap/base/util/ObjectPath",
 	"sap/ui/base/ManagedObject",
@@ -43,11 +42,11 @@ sap.ui.define([
 	"sap/ui/model/odata/type/String",
 	"sap/ui/model/odata/type/TimeOfDay",
 	"sap/ui/thirdparty/URI"
-], function (AnnotationHelper, ValueListType, _Helper, assert, Log, isEmptyObject, JSTokenizer,
-		ObjectPath, ManagedObject, SyncPromise, BindingMode, ChangeReason, ClientListBinding,
-		BaseContext, ContextBinding, MetaModel, PropertyBinding, OperationMode, Boolean, Byte,
-		EdmDate, DateTimeOffset, Decimal, Double, Guid, Int16, Int32, Int64, Raw, SByte, Single,
-		Stream, String, TimeOfDay, URI) {
+], function (AnnotationHelper, ValueListType, _Helper, assert, Log, JSTokenizer, ObjectPath,
+		ManagedObject, SyncPromise, BindingMode, ChangeReason, ClientListBinding, BaseContext,
+		ContextBinding, MetaModel, PropertyBinding, OperationMode, Boolean, Byte, EdmDate,
+		DateTimeOffset, Decimal, Double, Guid, Int16, Int32, Int64, Raw, SByte, Single, Stream,
+		String, TimeOfDay, URI) {
 	"use strict";
 	/*eslint max-nested-callbacks: 0 */
 
@@ -157,7 +156,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.115.1
+		 * @version 1.117.0
 		 */
 		ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 				constructor : constructor
@@ -1630,7 +1629,7 @@ sap.ui.define([
 			}
 
 			if (mFormatOptions) {
-				if (isEmptyObject(mFormatOptions)) {
+				if (_Helper.isEmptyObject(mFormatOptions)) {
 					mFormatOptions = undefined;
 				} else if ("parseKeepsEmptyString" in mFormatOptions
 						&& oProperty.$Type !== "Edm.String") {
@@ -1724,6 +1723,7 @@ sap.ui.define([
 				// The relative path following sEntityPath (parameter re-used - encoded)
 				//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
 
 			// Determines the predicate from a segment (empty string if there is none)
@@ -1733,10 +1733,10 @@ sap.ui.define([
 				return i >= 0 ? sSegment.slice(i) : "";
 			}
 
-			// Pushes a request to append the key predicate for oType and the instance at
+			// Pushes a request to append the segment with the key predicate of the instance at
 			// sInstancePath. Does not calculate it yet, because it might be replaced again later.
 			function prepareKeyPredicate(sSegment) {
-				aEditUrl.push({path : sInstancePath, prefix : sSegment, type : oType});
+				aEditUrl.push({path : sInstancePath, prefix : sSegment});
 			}
 
 			// Strips off the predicate from a segment
@@ -1746,16 +1746,6 @@ sap.ui.define([
 				return i >= 0 ? sSegment.slice(0, i) : sSegment;
 			}
 
-			// The segment is added to the edit URL; transient predicate is converted to real
-			// predicate
-			function pushToEditUrl(sSegment) {
-				if (sSegment.includes("($uid=")) {
-					prepareKeyPredicate(stripPredicate(sSegment));
-				} else {
-					aEditUrl.push(sSegment);
-				}
-			}
-
 			aSegments = sResolvedPath.slice(1).split("/");
 			sFirstSegment = aSegments.shift();
 			sInstancePath = "/" + sFirstSegment;
@@ -1768,8 +1758,8 @@ sap.ui.define([
 			oType = mScope[oEntitySet.$Type];
 			sPropertyPath = "";
 			sNavigationPath = "";
-			aEditUrl = [];
-			pushToEditUrl(sFirstSegment);
+			aEditUrl = [sFirstSegment];
+			bTransient = sFirstSegment.includes("($uid=");
 			aSegments.forEach(function (sSegment) {
 				var oProperty, sPropertyName;
 
@@ -1793,7 +1783,12 @@ sap.ui.define([
 						}
 					}
 					oType = mScope[oProperty.$Type];
-					if (oProperty.$kind === "NavigationProperty") {
+					if (sSegment.includes("($uid=")) {
+						// a transient entity in a nested collection
+						sEntityPath = sInstancePath;
+						sPropertyPath = "";
+						bTransient = true;
+					} else if (!bTransient && oProperty.$kind === "NavigationProperty") {
 						if (oEntitySet.$NavigationPropertyBinding
 								&& sNavigationPath in oEntitySet.$NavigationPropertyBinding) {
 							sEntitySetName = oEntitySet.$NavigationPropertyBinding[sNavigationPath];
@@ -1809,7 +1804,7 @@ sap.ui.define([
 								prepareKeyPredicate(aEditUrl.pop());
 							}
 						} else {
-							pushToEditUrl(sSegment);
+							aEditUrl.push(sSegment);
 						}
 						sEntityPath = sInstancePath;
 						sPropertyPath = "";
@@ -1819,7 +1814,7 @@ sap.ui.define([
 				}
 			});
 
-			if (bNoEditUrl) {
+			if (bTransient || bNoEditUrl) {
 				return SyncPromise.resolve({
 					editUrl : undefined,
 					entityPath : sEntityPath,
@@ -1839,10 +1834,6 @@ sap.ui.define([
 					if (!oEntity) {
 						error("No instance to calculate key predicate at " + vSegment.path);
 					}
-					if (oEntity["@$ui5.context.isTransient"]) {
-						bNoEditUrl = true;
-						return undefined;
-					}
 					sPredicate = _Helper.getPrivateAnnotation(oEntity, "predicate");
 					if (!sPredicate) {
 						error("No key predicate known at " + vSegment.path);
@@ -1853,7 +1844,7 @@ sap.ui.define([
 				});
 			})).then(function (aFinalEditUrl) {
 				return {
-					editUrl : bNoEditUrl ? undefined : aFinalEditUrl.join("/"),
+					editUrl : aFinalEditUrl.join("/"),
 					entityPath : sEntityPath,
 					propertyPath : sPropertyPath
 				};
@@ -2203,6 +2194,9 @@ sap.ui.define([
 			if (oProperty.$Nullable === false) {
 				setConstraint("nullable", false);
 			}
+			if (oProperty.$Type === "Edm.DateTimeOffset") {
+				setConstraint("V4", true);
+			}
 		}
 		return mConstraints;
 	};
@@ -2739,7 +2733,7 @@ sap.ui.define([
 	 * parameter <code>supportReferences</code> of
 	 * {@link sap.ui.model.odata.v4.ODataModel#constructor}).
 	 *
-	 * @returns {Promise}
+	 * @returns {Promise<object>}
 	 *   A promise which is resolved with the OData metadata as a "JSON" object as soon as it is
 	 *   available.
 	 *
@@ -2986,7 +2980,7 @@ sap.ui.define([
 	 *   Optional (binding) parameters; if they are given, <code>oContext</code> cannot be omitted
 	 * @param {object} [mParameters.scope]
 	 *   Optional scope for lookup of aliases for computed annotations (since 1.43.0)
-	 * @returns {Promise}
+	 * @returns {Promise<any>}
 	 *   A promise which is resolved with the requested metadata value as soon as it is available;
 	 *   it is rejected if the requested metadata cannot be loaded
 	 *
@@ -3008,7 +3002,7 @@ sap.ui.define([
 	 *   Type-specific format options, since 1.81.0. The boolean format option
 	 *   "parseKeepsEmptyString" applies to {@link sap.ui.model.odata.type.String} only and is
 	 *   ignored for all other types. All other format options are passed "as is".
-	 * @returns {Promise}
+	 * @returns {Promise<sap.ui.model.odata.type.ODataType>}
 	 *   A promise that gets resolved with the corresponding UI5 type from
 	 *   {@link sap.ui.model.odata.type}; if no specific type can be
 	 *   determined, a warning is logged and {@link sap.ui.model.odata.type.Raw} is used
@@ -3119,7 +3113,7 @@ sap.ui.define([
 	 *   Context to resolve "14.5.12 Expression edm:Path" references contained in a
 	 *   "com.sap.vocabularies.Common.v1.ValueListRelevantQualifiers" annotation. Supported since
 	 *   1.84.0
-	 * @returns {Promise}
+	 * @returns {Promise<Object<object>>}
 	 *   A promise which is resolved with a map of qualifier to value list mapping objects
 	 *   structured as defined by <code>com.sap.vocabularies.Common.v1.ValueListType</code>;
 	 *   the map entry with key "" represents the mapping without qualifier. Each entry has an
@@ -3270,7 +3264,7 @@ sap.ui.define([
 
 				// Each reference must have contributed at least one qualifier. So if oValueListInfo
 				// is empty, there cannot have been a reference.
-				if (isEmptyObject(oValueListInfo)) {
+				if (_Helper.isEmptyObject(oValueListInfo)) {
 					throw new Error("No annotation '" + sValueListReferences.slice(1) + "' for "
 						+ sPropertyPath);
 				}
@@ -3341,7 +3335,7 @@ sap.ui.define([
 	 *
 	 * @param {string} sPropertyPath
 	 *   An absolute path to an OData property within the OData data model
-	 * @returns {Promise}
+	 * @returns {Promise<sap.ui.model.odata.v4.ValueListType>}
 	 *   A promise that is resolved with the type of the value list, a constant of the enumeration
 	 *   {@link sap.ui.model.odata.v4.ValueListType}. The promise is rejected if the property cannot
 	 *   be found in the metadata.