@openui5/sap.ui.core 1.102.1 → 1.102.2

package/src/sap/ui/model/odata/type/String.js

@@ -84,7 +84,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.102.2
 	 *
 	 * @alias sap.ui.model.odata.type.String
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Time.js

@@ -154,7 +154,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.102.2
 	 *
 	 * @alias sap.ui.model.odata.type.Time
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/TimeOfDay.js

@@ -110,7 +110,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.102.1
+	 * @version 1.102.2
 	 */
 	var TimeOfDay = ODataType.extend("sap.ui.model.odata.type.TimeOfDay", {
 			constructor : function (oFormatOptions, oConstraints) {

package/src/sap/ui/model/odata/type/Unit.js

@@ -63,7 +63,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.type.Unit
 	 * @public
 	 * @since 1.63.0
-	 * @version 1.102.1
+	 * @version 1.102.2
 	 */
 	var Unit = BaseUnit.extend("sap.ui.model.odata.type.Unit", {
 		constructor : function (oFormatOptions, oConstraints, aDynamicFormatOptionNames) {

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

@@ -60,7 +60,7 @@ sap.ui.define([
 	 * @hideconstructor
 	 * @public
 	 * @since 1.93.0
-	 * @version 1.102.1
+	 * @version 1.102.2
 	 */
 	var Context = BaseContext.extend("sap.ui.model.odata.v2.Context", {
 			constructor : function (oModel, sPath, sDeepPath, oCreatePromise, bInactive) {

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.102.1
+	 * @version 1.102.2
 	 *
 	 * @public
 	 * @since 1.37.0

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

@@ -203,7 +203,7 @@ sap.ui.define([
 	 * This model is not prepared to be inherited from.
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.102.2
 	 *
 	 * @public
 	 * @alias sap.ui.model.odata.v2.ODataModel

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

@@ -94,7 +94,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.TreeBinding
 	 * @hideconstructor
 	 * @public
-	 * @version 1.102.1
+	 * @version 1.102.2
 	 */
 	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.102.1
+		 * @version 1.102.2
 		 */
 		Context = BaseContext.extend("sap.ui.model.odata.v4.Context", {
 				constructor : constructor

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

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

@@ -58,7 +58,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.102.1
+		 * @version 1.102.2
 		 * @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/ODataMetaModel.js

@@ -157,7 +157,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.102.1
+		 * @version 1.102.2
 		 */
 		ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 				constructor : constructor

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

@@ -214,7 +214,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.Model
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.102.1
+		 * @version 1.102.2
 		 */
 		ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */{

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.102.1
+		 * @version 1.102.2
 		 * @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/lib/_Cache.js

@@ -113,6 +113,7 @@ sap.ui.define([
 		// they are always "newer"
 		this.iInactiveSince = Infinity;
 		this.mPatchRequests = {}; // map from path to an array of (PATCH) promises
+		this.mEditUrl2PatchPromise = {}; // map from edit URL to a PATCH promise for retry
 		// a promise with attached properties $count, $resolve existing while DELETEs or POSTs are
 		// being sent
 		this.oPendingRequestsPromise = null;
@@ -1710,10 +1711,11 @@ sap.ui.define([
 		return oPromise.then(function (oEntity) {
 			var sFullPath = _Helper.buildPath(sEntityPath, sPropertyPath),
 				sGroupId = oGroupLock.getGroupId(),
-				vOldValue,
+				oOldData,
 				oPatchPromise,
 				oPostBody,
 				sParkedGroup,
+				bSkip,
 				sTransientGroup,
 				sUnitOrCurrencyValue,
 				oUpdateData = _Cache.makeUpdateData(aPropertyPath, vValue);
@@ -1725,8 +1727,29 @@ sap.ui.define([
 			function onCancel() {
 				_Helper.removeByPath(that.mPatchRequests, sFullPath, oPatchPromise);
 				// write the previous value into the cache
-				_Helper.updateExisting(that.mChangeListeners, sEntityPath, oEntity,
-					_Cache.makeUpdateData(aPropertyPath, vOldValue));
+				_Helper.updateExisting(that.mChangeListeners, sEntityPath, oEntity, oOldData);
+			}
+
+			/*
+			 * Callback to merge the entity's old data into its one remaining PATCH. If
+			 * no old data from another PATCH is supplied, the PATCH is skipped and returns its
+			 * old data. Otherwise the given old data from the skipped patch is merged into the
+			 * surviving PATCH's own old data.
+			 *
+			 * @param {object} [oOtherOldData]
+	 		 *   Either another PATCH's old data which is to be merged into this one or
+			 *   <code>undefined</code> if this PATCH is the skipped one and has to return its own
+			 *   old data.
+			 * @returns {object}
+			 *   This PATCH's old data which is to be merged into another one or
+			 *   <code>undefined</code> if this is the surviving PATCH.
+			 */
+			function mergePatchRequests(oOtherOldData) {
+				if (arguments.length === 0) {
+					bSkip = true;
+					return oOldData; // my PATCH was merged
+				}
+				_Helper.updateNonExisting(oOldData, oOtherOldData);
 			}
 
 			function patch(oPatchGroupLock, bAtFront) {
@@ -1749,7 +1772,8 @@ sap.ui.define([
 				oPatchPromise = that.oRequestor.request("PATCH", sEditUrl, oPatchGroupLock,
 					mHeaders, oUpdateData, onSubmit, onCancel, /*sMetaPath*/undefined,
 					_Helper.buildPath(that.getOriginalResourcePath(oEntity), sEntityPath),
-					bAtFront);
+					bAtFront, /*mQueryOptions*/ undefined, /*vOwner*/ undefined,
+					mergePatchRequests);
 				oPatchPromise.$isKeepAlive = fnIsKeepAlive;
 				_Helper.addByPath(that.mPatchRequests, sFullPath, oPatchPromise);
 				return SyncPromise.all([
@@ -1759,6 +1783,10 @@ sap.ui.define([
 					var oPatchResult = aResult[0];
 
 					_Helper.removeByPath(that.mPatchRequests, sFullPath, oPatchPromise);
+					if (bSkip) {
+						// if a PATCH is skipped, because it is merged into another, nothing to do!
+						return;
+					}
 					if (!bPatchWithoutSideEffects) {
 						// visit response to report the messages
 						that.visitResponse(oPatchResult, aResult[1],
@@ -1782,11 +1810,19 @@ sap.ui.define([
 					if (oError.canceled) {
 						throw oError;
 					}
+					oRequestLock.unlock();
+					oRequestLock = undefined;
+
+					fnErrorCallback(oError);
+					if (bSkip) {
+						// Note: this PATCH is already merged into another
+						// --> return the corresponding PATCH promise
+						return that.mEditUrl2PatchPromise[sEditUrl];
+					}
 
 					// Note: We arrive here only for the PATCH which was really sent to the server.
 					// The other ones which have been merged are still pending on this one!
 					// In the end, they will either succeed or be canceled.
-					fnErrorCallback(oError);
 					switch (that.oRequestor.getGroupSubmitMode(sGroupId)) {
 						case "API":
 							break;
@@ -1801,14 +1837,16 @@ sap.ui.define([
 						default:
 							throw oError; // no retry, just give up
 					}
-					oRequestLock.unlock();
-					oRequestLock = undefined;
 
-					return patch(that.oRequestor.lockGroup(sRetryGroupId, that, true, true), true);
+					that.mEditUrl2PatchPromise[sEditUrl]
+						= patch(that.oRequestor.lockGroup(sRetryGroupId, that, true, true), true);
+
+					return that.mEditUrl2PatchPromise[sEditUrl];
 				}).finally(function () {
 					if (oRequestLock) {
 						oRequestLock.unlock();
 					}
+					delete that.mEditUrl2PatchPromise[sEditUrl];
 				});
 			}
 
@@ -1832,7 +1870,9 @@ sap.ui.define([
 				}
 			}
 			// remember the old value
-			vOldValue = _Helper.drillDown(oEntity, aPropertyPath);
+			oOldData
+				= _Cache.makeUpdateData(aPropertyPath, _Helper.drillDown(oEntity, aPropertyPath));
+
 			oPostBody = _Helper.getPrivateAnnotation(oEntity, "postBody");
 			if (oPostBody) {
 				// change listeners are informed later

package/src/sap/ui/model/odata/v4/lib/_Requestor.js

@@ -550,6 +550,8 @@ sap.ui.define([
 						&& oCandidate.headers["If-Match"] === oChange.headers["If-Match"]) {
 					_Helper.merge(oCandidate.body, oChange.body);
 					oChange.$resolve(oCandidate.$promise);
+					oCandidate.$mergeRequests(oChange.$mergeRequests());
+
 					return true;
 				}
 			});
@@ -1715,7 +1717,7 @@ sap.ui.define([
 	 * @param {any} [vOwner]
 	 *   An additional precondition for the merging of GET requests: the owner must be identical.
 	 * @param {function(string[]):string[]} [fnMergeRequests]
-	 *   Function which is called during merging of GET requests. If a merged request has a
+	 *   Function which is called during merging of GET or PATCH requests. If a merged request has a
 	 *   function given, this function will be called and its return value is
 	 *   given to the one remaining request's function as a parameter.
 	 * @returns {Promise}

package/src/sap/ui/model/resource/ResourceModel.js

@@ -228,7 +228,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Model
 	 * @public
-	 * @version 1.102.1
+	 * @version 1.102.2
 	 */
 	var ResourceModel = Model.extend("sap.ui.model.resource.ResourceModel", /** @lends sap.ui.model.resource.ResourceModel.prototype */ {
 

package/src/sap/ui/model/type/Boolean.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/ui/model/SimpleType', 'sap/ui/model/FormatException', 'sap/u
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.102.2
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Currency.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.102.2
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Date.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.102.2
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateInstance DateFormat}.

package/src/sap/ui/model/type/DateInterval.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.102.2
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateInstance DateFormat}.

package/src/sap/ui/model/type/DateTime.js

@@ -19,7 +19,7 @@ sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.Date
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.102.2
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateTimeInstance DateFormat}.

package/src/sap/ui/model/type/DateTimeInterval.js

@@ -19,7 +19,7 @@ sap.ui.define(['./DateInterval', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.DateInterval
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.102.2
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateTimeInstance DateFormat}.

package/src/sap/ui/model/type/FileSize.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.102.2
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] formatting options. Supports the same options as {@link sap.ui.core.format.FileSizeFormat.getInstance FileSizeFormat.getInstance}

package/src/sap/ui/model/type/Float.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.102.2
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.NumberFormat NumberFormat}.

package/src/sap/ui/model/type/Integer.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.102.2
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.NumberFormat NumberFormat}.

package/src/sap/ui/model/type/String.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.102.2
 	 *
 	 * @alias sap.ui.model.type.String
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Time.js

@@ -19,7 +19,7 @@ sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.Date
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.102.2
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getTimeInstance DateFormat}.

package/src/sap/ui/model/type/TimeInterval.js

@@ -19,7 +19,7 @@ sap.ui.define(['./DateInterval', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.DateInterval
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.102.2
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getTimeInstance DateFormat}.

package/src/sap/ui/model/type/Unit.js

@@ -47,7 +47,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.102.2
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/xml/XMLModel.js

@@ -47,7 +47,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.ClientModel
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.102.2
 	 *
 	 * @param {object} oData either the URL where to load the XML from or an XML
 	 * @public

package/src/sap/ui/qunit/utils/ControlIterator.js

@@ -53,7 +53,7 @@ sap.ui.define(['sap/ui/core/Core', "sap/ui/VersionInfo"],
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.102.2
 	 *
 	 * @public
 	 * @since 1.48.0

package/src/sap/ui/qunit/utils/MemoryLeakCheck.js

@@ -27,7 +27,7 @@ sap.ui.define([ 'sap/ui/core/Element', 'sap/ui/core/Control', 'sap/ui/core/Core'
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.102.2
 	 *
 	 * @public
 	 * @since 1.48.0

package/src/sap/ui/test/generic/TestBase.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.102.2
 	 * @since 1.100
 	 */
 	return BaseObject.extend("sap.ui.test.generic.TestBase", {

package/src/sap/ui/util/Storage.js

@@ -250,7 +250,7 @@ sap.ui.define(["sap/base/assert"], function (assert) {
 	 *
 	 * @enum {string}
 	 * @public
-	 * @version 1.102.1
+	 * @version 1.102.2
 	 */
 	Storage.Type = {
 		/**