@openui5/sap.ui.core 1.104.0 → 1.105.1

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

@@ -87,7 +87,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.1
 	 *
 	 * @alias sap.ui.model.odata.type.Boolean
 	 * @param {object} [oFormatOptions]

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.Int
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.1
 	 *
 	 * @alias sap.ui.model.odata.type.Byte
 	 * @param {object} [oFormatOptions]

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

@@ -61,7 +61,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.type.Currency
 	 * @public
 	 * @since 1.63.0
-	 * @version 1.104.0
+	 * @version 1.105.1
 	 */
 	var Currency = BaseCurrency.extend("sap.ui.model.odata.type.Currency", {
 		constructor : function (oFormatOptions, oConstraints) {

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

@@ -106,7 +106,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.1
 	 *
 	 * @alias sap.ui.model.odata.type.Date
 	 * @param {object} [oFormatOptions]

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

@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.DateTimeBase
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.1
 	 *
 	 * @alias sap.ui.model.odata.type.DateTime
 	 * @param {object} [oFormatOptions]

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

@@ -132,7 +132,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.27.0
-	 * @version 1.104.0
+	 * @version 1.105.1
 	 */
 	var DateTimeBase = ODataType.extend("sap.ui.model.odata.type.DateTimeBase", {
 			constructor : function (oFormatOptions, oConstraints) {

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

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.DateTimeBase
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.1
 	 *
 	 * @alias sap.ui.model.odata.type.DateTimeOffset
 	 * @param {object} [oFormatOptions]

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

@@ -60,7 +60,7 @@ sap.ui.define([
 	 * @public
 	 * @see {sap.ui.model.odata.v2.ODataModel#bindProperty}
 	 * @since 1.99.0
-	 * @version 1.104.0
+	 * @version 1.105.1
 	 */
 	var DateTimeWithTimezone = CompositeType.extend("sap.ui.model.odata.type.DateTimeWithTimezone",
 		{

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

@@ -201,7 +201,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.1
 	 *
 	 * @alias sap.ui.model.odata.type.Decimal
 	 * @param {object} [oFormatOptions]

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

@@ -95,7 +95,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.1
 	 *
 	 * @alias sap.ui.model.odata.type.Double
 	 * @param {object} [oFormatOptions]

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

@@ -62,7 +62,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.1
 	 *
 	 * @alias sap.ui.model.odata.type.Guid
 	 * @param {object} [oFormatOptions]

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

@@ -80,7 +80,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.1
 	 *
 	 * @abstract
 	 * @alias sap.ui.model.odata.type.Int

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.Int
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.1
 	 *
 	 * @alias sap.ui.model.odata.type.Int16
 	 * @param {object} [oFormatOptions]

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.Int
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.1
 	 *
 	 * @alias sap.ui.model.odata.type.Int32
 	 * @param {object} [oFormatOptions]

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

@@ -137,7 +137,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.1
 	 *
 	 * @alias sap.ui.model.odata.type.Int64
 	 * @param {object} [oFormatOptions]

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

@@ -115,7 +115,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.1
 	 *
 	 * @abstract
 	 * @alias sap.ui.model.odata.type.ODataType

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

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

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.Int
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.1
 	 *
 	 * @alias sap.ui.model.odata.type.SByte
 	 * @param {object} [oFormatOptions]

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

@@ -95,7 +95,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.1
 	 *
 	 * @alias sap.ui.model.odata.type.Single
 	 * @param {object} [oFormatOptions]

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

@@ -60,7 +60,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.51.0
-	 * @version 1.104.0
+	 * @version 1.105.1
 	 */
 	var Stream = ODataType.extend("sap.ui.model.odata.type.Stream", {
 			constructor : function (oFormatOptions, oConstraints) {

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.104.0
+	 * @version 1.105.1
 	 *
 	 * @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.104.0
+	 * @version 1.105.1
 	 *
 	 * @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.104.0
+	 * @version 1.105.1
 	 */
 	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.104.0
+	 * @version 1.105.1
 	 */
 	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.104.0
+	 * @version 1.105.1
 	 */
 	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.104.0
+	 * @version 1.105.1
 	 *
 	 * @public
 	 * @since 1.37.0

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

@@ -143,6 +143,8 @@ sap.ui.define([
 				this._removePersistedCreatedContexts();
 				this.resetData();
 			}
+
+			this._reassignCreateActivate();
 		},
 
 		metadata : {
@@ -1381,9 +1383,14 @@ sap.ui.define([
 		}
 		if (this.sSortParams) {
 			aParams.push(this.sSortParams);
+		} else if (this.aSorters.length && this.useClientMode()) {
+			aParams.push(ODataUtils.createSortParams(this.aSorters));
 		}
 		if (this.sFilterParams) {
 			aParams.push(this.sFilterParams);
+		} else if (this.oCombinedFilter && this.useClientMode()) {
+			aParams.push(ODataUtils.createFilterParams(this.oCombinedFilter, this.oModel.oMetadata,
+				this.oEntityType));
 		}
 		if (this.sCustomParams) {
 			aParams.push(this.sCustomParams);
@@ -2167,5 +2174,23 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * Assigns the "createActivate"-event to all already exisiting inactive contexts which are
+	 * belonging to this binding.
+	 *
+	 * @private
+	 */
+	ODataListBinding.prototype._reassignCreateActivate = function () {
+		var that = this;
+
+		this._getCreatedContexts().forEach(function (oContext) {
+			if (oContext.isInactive()) {
+				oContext.fetchActivated().then(function () {
+					that.fireEvent("createActivate");
+				});
+			}
+		});
+	};
+
 	return ODataListBinding;
 });

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.104.0
+	 * @version 1.105.1
 	 *
 	 * @public
 	 * @alias sap.ui.model.odata.v2.ODataModel
@@ -4329,8 +4329,11 @@ sap.ui.define([
 				}
 			}
 
-			// Parse messages from the back-end
-			this._parseResponse(oResponse, oRequest, mLocalGetEntities, mLocalChangeEntities);
+			// Parse messages from the back-end only if not yet reported
+			if (!oResponse.$reported) {
+				this._parseResponse(oResponse, oRequest, mLocalGetEntities, mLocalChangeEntities);
+				oResponse.$reported = true;
+			}
 
 			// Add the Get and Change entities from this request to the main ones (which differ in case of batch requests)
 			extend(mGetEntities, mLocalGetEntities);
@@ -6277,6 +6280,10 @@ sap.ui.define([
 	 * taken into account. If <code>bAll</code> is set, also deferred requests triggered through
 	 * {@link #create}, {@link #update} or {@link #remove} are taken into account.
 	 *
+	 * With a given <code>aPath</code> only specified entities are reset. Note that tree hierarchy
+	 * changes are only affected if a given path is equal to the tree binding's resolved binding
+	 * path.
+	 *
 	 * If <code>bDeleteCreatedEntities</code> is set, the entity is completely removed, provided it
 	 * has been created
 	 * <ul>
@@ -6352,6 +6359,11 @@ sap.ui.define([
 					oChangedEntity.__metadata.created && bDeleteCreatedEntities);
 			});
 		}
+		this.getBindings().forEach(function (oBinding) {
+			if (oBinding._resetChanges) {
+				oBinding._resetChanges(aPath);
+			}
+		});
 		this.checkUpdate(true);
 
 		return pMetaDataLoaded;
@@ -6447,7 +6459,9 @@ sap.ui.define([
 		bFunction = oOriginalEntry.__metadata.created && oOriginalEntry.__metadata.created.functionImport;
 
 		// Update property value on change object
-		oChangeObject[sPropertyPath] = oValue;
+		oChangeObject[sPropertyPath] = _Helper.isPlainObject(oValue)
+			? _Helper.merge({}, oValue)
+			: oValue;
 
 		// If property is key property of ReferentialConstraint, also update the corresponding
 		// navigation property
@@ -6632,27 +6646,29 @@ sap.ui.define([
 	/**
 	 * Checks if there exist pending changes in the model.
 	 *
-	 * By default, only client data changes triggered through:
-	 * {@link #createEntry}
-	 * {@link #setProperty}
-	 * are taken into account.
+	 * By default, only client data changes triggered through {@link #createEntry} or
+	 * {@link #setProperty}, and tree hierarchy changes are taken into account.
 	 *
-	 * If <code>bAll</code> is set to <code>true</code>, also deferred requests triggered through:
-	 * {@link #create}
-	 * {@link #update}
-	 * {@link #remove}
-	 * are taken into account.
+	 * If <code>bAll</code> is set to <code>true</code>, also deferred requests triggered through
+	 * {@link #create}, {@link #update}, and {@link #remove} are taken into account.
 	 *
 	 * @param {boolean}[bAll=false] If set to true, deferred requests are also taken into account.
 	 * @return {boolean} <code>true</code> if there are pending changes, <code>false</code> otherwise.
 	 * @public
 	 */
 	ODataModel.prototype.hasPendingChanges = function(bAll) {
-		var bChangedEntities = !isEmptyObject(this.mChangedEntities);
+		var bChangedEntities,
+			aChangedEntityKeys = Object.keys(this.mChangedEntities);
+
+		bChangedEntities = this.getBindings().some(function (oBinding) {
+			return oBinding._hasPendingChanges && oBinding._hasPendingChanges(aChangedEntityKeys);
+		});
+		bChangedEntities = bChangedEntities || aChangedEntityKeys.length > 0;
 
-		if (bAll){
-			bChangedEntities = bChangedEntities || this.iPendingDeferredRequests > 0;
+		if (!bChangedEntities && bAll) {
+			bChangedEntities = this.iPendingDeferredRequests > 0;
 		}
+
 		return bChangedEntities;
 	};
 
@@ -6666,8 +6682,9 @@ sap.ui.define([
 	};
 
 	/**
-	 * Returns the changed properties of all changed entities in a map which are still pending.
-	 * The key is the string name of the entity and the value is an object which contains the changed properties.
+	 * Returns the changed properties of all changed entities in a map which are still pending. The
+	 * key is the string name of the entity, and the value is an object which contains the changed
+	 * properties. The tree hierarchy changes for removed nodes are represented via an empty object.
 	 *
 	 * In contrast to the two related functions {@link #hasPendingChanges} and {@link #resetChanges}, only
 	 * client data changes are supported.
@@ -6676,7 +6693,21 @@ sap.ui.define([
 	 * @public
 	 */
 	ODataModel.prototype.getPendingChanges = function() {
-		return merge({}, this.mChangedEntities);
+		var sChangedEntityKey,
+			mChangedEntities = _Helper.merge({}, this.mChangedEntities);
+
+		this.getBindings().forEach(function (oBinding) {
+			if (oBinding._getPendingChanges) {
+				_Helper.merge(mChangedEntities, oBinding._getPendingChanges());
+			}
+		});
+		for (sChangedEntityKey in mChangedEntities) {
+			if (!mChangedEntities[sChangedEntityKey]) {
+				delete mChangedEntities[sChangedEntityKey];
+			}
+		}
+
+		return mChangedEntities;
 	};
 
 	/**

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.104.0
+	 * @version 1.105.1
 	 */
 	var ODataTreeBinding = TreeBinding.extend("sap.ui.model.odata.v2.ODataTreeBinding", /** @lends sap.ui.model.odata.v2.ODataTreeBinding.prototype */ {
 
@@ -181,6 +181,9 @@ sap.ui.define([
 			this.oAllKeys = null;
 			this.oAllLengths = null;
 			this.oAllFinalLengths = null;
+
+			// Whether a refresh has been performed
+			this.bRefresh = false;
 		}
 
 	});