@openui5/sap.ui.core 1.118.0 → 1.119.1

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

@@ -102,10 +102,8 @@ sap.ui.define([
 
 			this.sFilterParams = null;
 			this.sSortParams = null;
-			this.sRangeParams = null;
 			this.sCustomParams = this.oModel.createCustomParams(this.mParameters);
 			this.mCustomParams = mParameters && mParameters.custom;
-			this.iStartIndex = 0;
 			this.iLength = 0;
 			this.bPendingChange = false;
 			this.aAllKeys = null;
@@ -792,49 +790,52 @@ sap.ui.define([
 	/**
 	 * Load data for the given range from server.
 	 *
-	 * @param {int} iStartIndex The start index
-	 * @param {int} iLength The amount of data to be requested
+	 * @param {int} [iStartIndex] The start index
+	 * @param {int} [iLength] The amount of data to be requested
 	 * @private
 	 */
 	ODataListBinding.prototype.loadData = function(iStartIndex, iLength) {
-		var sGroupId,
+		var sGroupId, oReadParameters,
 			sGuid = uid(),
 			bInlineCountRequested = false,
-			aParams = [],
+			iLimit = this.oModel.iSizeLimit,
 			sPath = this.sPath,
 			bRemovePersistedCreatedAfterRefresh = this.bRemovePersistedCreatedAfterRefresh,
+			aResultPages = [],
+			bUseClientMode = this.useClientMode(),
 			that = this;
 
-		// create range parameters and store start index for sort/filter requests
-		if (iStartIndex || iLength) {
-			this.sRangeParams = "$skip=" + iStartIndex + "&$top=" + iLength;
-			this.iStartIndex = iStartIndex;
-		} else {
-			iStartIndex = this.iStartIndex;
-		}
+		function getUrlParameters() {
+			var aParameters = [];
+			// create range parameters and store start index for sort/filter requests
+			if (iLength) {
+				aParameters.push("$skip=" + iStartIndex + "&$top=" + iLength);
+			} else {
+				// For OperationMode.Client and OperationMode.Auto (if the threshold was sufficient)
+				// loadData is called without iStartIndex and iLength, try reading all data without
+				// $skip and $top
+				iStartIndex = 0;
+			}
+			if (that.sSortParams) {
+				aParameters.push(that.sSortParams);
+			}
+			that._addFilterQueryOption(aParameters, !bUseClientMode);
+			if (that.sCustomParams) {
+				aParameters.push(that.sCustomParams);
+			}
+			if (that.sCountMode == CountMode.InlineRepeat
+					|| !that.bLengthFinal
+						&& (that.sCountMode === CountMode.Inline || that.sCountMode === CountMode.Both)) {
+				aParameters.push("$inlinecount=allpages");
+				bInlineCountRequested = true;
+			} else {
+				bInlineCountRequested = false;
+			}
 
-		// create the request url
-		// $skip/$top and are excluded for OperationMode.Client and Auto if the threshold was sufficient
-		if (this.sRangeParams && !this.useClientMode()) {
-			aParams.push(this.sRangeParams);
-		}
-		if (this.sSortParams) {
-			aParams.push(this.sSortParams);
-		}
-		this._addFilterQueryOption(aParams, !this.useClientMode());
-		if (this.sCustomParams) {
-			aParams.push(this.sCustomParams);
-		}
-		if (this.sCountMode == CountMode.InlineRepeat ||
-			!this.bLengthFinal &&
-			(this.sCountMode === CountMode.Inline ||
-			 this.sCountMode === CountMode.Both)) {
-			aParams.push("$inlinecount=allpages");
-			bInlineCountRequested = true;
+			return aParameters;
 		}
 
 		function fnSuccess(oData) {
-
 			// update iLength (only when the inline count was requested and is available)
 			if (bInlineCountRequested && oData.__count !== undefined) {
 				that.iLength = parseInt(oData.__count);
@@ -862,12 +863,24 @@ sap.ui.define([
 				}
 			}
 
-			if (that.useClientMode()) {
+			if (bUseClientMode) {
 				// For clients mode, store all keys separately and set length to final
-				that.aKeys = [];
+				if (!iStartIndex) {
+					that.aKeys = [];
+				}
 				each(oData.results, function(i, entry) {
-					that.aKeys[i] = that.oModel._getKey(entry);
+					that.aKeys[iStartIndex + i] = that.oModel._getKey(entry);
 				});
+				aResultPages.push(oData.results);
+				if (oData.__next && that.aKeys.length < iLimit /*first request may return enough*/) {
+					// continue reading
+					iStartIndex = that.aKeys.length;
+					iLength = iLimit - iStartIndex; // read up to model size limit
+					oReadParameters.urlParameters = getUrlParameters();
+					that.mRequestHandles[sGuid] = that.oModel.read(that.sPath, oReadParameters);
+
+					return;
+				}
 				that.updateExpandedList(that.aKeys);
 				that.aAllKeys = that.aKeys.slice();
 				that.iLength = that.aKeys.length;
@@ -928,9 +941,17 @@ sap.ui.define([
 				that._removePersistedCreatedContexts();
 			}
 
-			//register datareceived call as  callAfterUpdate
-			that.oModel.callAfterUpdate(function() {
-				that.fireDataReceived({data: oData});
+			that.oModel.callAfterUpdate(function () {
+				if (aResultPages.length > 1) {
+					that.fireDataReceived({
+						data: {
+							__count: String(that.iLength),
+							results: Array.prototype.concat.apply([], aResultPages)
+						}
+					});
+				} else {
+					that.fireDataReceived({data: oData});
+				}
 			});
 		}
 
@@ -957,13 +978,11 @@ sap.ui.define([
 			if (!that.bSkipDataEvents) {
 				that.fireDataReceived();
 			}
-
 		}
 
 		if (this.isRelative()){
 			sPath = this.getResolvedPath();
 		}
-
 		if (sPath) {
 			// Execute the request and use the metadata if available
 			this.bPendingRequest = true;
@@ -973,20 +992,20 @@ sap.ui.define([
 			this.bSkipDataEvents = false;
 			//if load is triggered by a refresh we have to check the refreshGroup
 			sGroupId = this.sRefreshGroupId ? this.sRefreshGroupId : this.sGroupId;
-			this.mRequestHandles[sGuid] = this.oModel.read(this.sPath, {
+			oReadParameters = {
 				headers: this.bTransitionMessagesOnly
 					? {"sap-messages" : "transientOnly"}
 					: undefined,
 				context: this.oContext,
 				groupId: sGroupId,
-				urlParameters: aParams,
+				urlParameters: getUrlParameters(),
 				success: fnSuccess,
 				error: fnError,
 				canonicalRequest: this.bCanonicalRequest,
 				updateAggregatedMessages: this.bRefresh
-			});
+			};
+			this.mRequestHandles[sGuid] = this.oModel.read(this.sPath, oReadParameters);
 		}
-
 	};
 
 	ODataListBinding.prototype.isLengthFinal = function() {
@@ -1737,7 +1756,7 @@ sap.ui.define([
 		if (!this.aApplicationFilters || !Array.isArray(this.aApplicationFilters)) {
 			this.aApplicationFilters = [];
 		}
-
+		/** @deprecated As of version 1.22.0, reason sap.ui.model.odata.Filter.js */
 		this.convertFilters();
 		this.oCombinedFilter = FilterProcessor.combineFilters(this.aFilters, this.aApplicationFilters);
 
@@ -1785,6 +1804,7 @@ sap.ui.define([
 	/**
 	 * Convert sap.ui.model.odata.Filter to sap.ui.model.Filter
 	 *
+	 * @deprecated As of version 1.22.0, reason sap.ui.model.odata.Filter.js
 	 * @private
 	 */
 	ODataListBinding.prototype.convertFilters = function() {
@@ -1823,6 +1843,7 @@ sap.ui.define([
 		this.addComparators(this.aSorters, true);
 		this.addComparators(this.aFilters);
 		this.addComparators(this.aApplicationFilters);
+		/** @deprecated As of version 1.22.0, reason sap.ui.model.odata.Filter.js */
 		this.convertFilters();
 		this.oCombinedFilter = FilterProcessor.combineFilters(this.aFilters, this.aApplicationFilters);
 
@@ -2058,18 +2079,24 @@ sap.ui.define([
 			sResolvedPath = this.getResolvedPath(),
 			that = this;
 
+		function isNonTransientTarget(sFullTarget) {
+			return aCreatedContextDeepPaths
+				.every((sCreatedContextDeepPath) => !sFullTarget.startsWith(sCreatedContextDeepPath));
+		}
+
 		if (!sResolvedPath) {
 			return Promise.resolve(null);
 		}
 
+		const aCreatedContextDeepPaths = this._getCreatedContexts()
+			.map((oCreatedContext) => oCreatedContext.getDeepPath());
 		this.oModel.getMessagesByPath(sDeepPath, true).forEach(function (oMessage) {
 			var sPredicate;
 
 			if (!fnFilter || fnFilter(oMessage)) {
-				// this.oModel.getMessagesByPath returns only messages with full target starting with
-				// deep path
+				// this.oModel.getMessagesByPath returns only messages with full target starting with deep path
 				oMessage.aFullTargets.forEach(function (sFullTarget) {
-					if (sFullTarget.startsWith(sDeepPath)) {
+					if (sFullTarget.startsWith(sDeepPath) && isNonTransientTarget(sFullTarget)) {
 						sPredicate = sFullTarget.slice(sDeepPath.length).split("/")[0];
 						if (sPredicate) {
 							aPredicateSet.add(sPredicate);
@@ -2295,14 +2322,16 @@ sap.ui.define([
 	 * @private
 	 */
 	ODataListBinding.prototype.fireCreateActivate = function (oContext) {
-		if (this.fireEvent("createActivate", {context : oContext}, /*bAllowPreventDefault*/true)) {
-			oContext.finishActivation();
-			this._fireChange({reason : ChangeReason.Change});
-		} else {
-			oContext.cancelActivation();
-			oContext.fetchActivationStarted()
-				.then(this.fireCreateActivate.bind(this, oContext))
-				.catch(this.oModel.getReporter(sClassName));
+		if (!this.bIsBeingDestroyed) {
+			if (this.fireEvent("createActivate", {context : oContext}, /*bAllowPreventDefault*/true)) {
+				oContext.finishActivation();
+				this._fireChange({reason : ChangeReason.Change});
+			} else {
+				oContext.cancelActivation();
+				oContext.fetchActivationStarted()
+					.then(this.fireCreateActivate.bind(this, oContext))
+					.catch(this.oModel.getReporter(sClassName));
+			}
 		}
 	};
 

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

@@ -181,8 +181,11 @@ sap.ui.define([
 	 * @param {Object<string,string>} [mParameters.serviceUrlParams]
 	 *   Map of URL parameters (name/value pairs) - these parameters will be attached to all
 	 *   requests, except for the <code>$metadata</code> request
-	 * @param {boolean} [mParameters.tokenHandling=true]
-	 *   Enable/disable security token handling
+	 * @param {boolean|"skipServerCache"} [mParameters.tokenHandling=true]
+	 *   Enable/disable security token handling. If the "skipServerCache" string value is provided, the security token
+	 *   is not cached with the server as key in order to avoid failing $batch requests when accessing services running
+	 *   on different back-end systems behind a reverse proxy (since 1.119).<br>
+	 *   Use this option only if the system landscape is known.
 	 * @param {boolean} [mParameters.tokenHandlingForGet=false]
 	 *   Send security token for GET requests in case read access logging is activated for the OData
 	 *   Service in the backend.
@@ -213,7 +216,7 @@ sap.ui.define([
 	 * This model is not prepared to be inherited from.
 	 *
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.1
 	 *
 	 * @public
 	 * @alias sap.ui.model.odata.v2.ODataModel
@@ -227,7 +230,7 @@ sap.ui.define([
 			var sUser,
 				sPassword,
 				mHeaders,
-				bTokenHandling,
+				vTokenHandling,
 				bWithCredentials,
 				sMaxDataServiceVersion,
 				bUseBatch,
@@ -272,7 +275,7 @@ sap.ui.define([
 				sUser = mParameters.user;
 				sPassword = mParameters.password;
 				mHeaders = mParameters.headers;
-				bTokenHandling = mParameters.tokenHandling;
+				vTokenHandling = mParameters.tokenHandling;
 				bWithCredentials = mParameters.withCredentials;
 				sMaxDataServiceVersion = mParameters.maxDataServiceVersion;
 				bUseBatch = mParameters.useBatch;
@@ -334,7 +337,7 @@ sap.ui.define([
 			this.mLaunderingState = {};
 			this.sDefaultUpdateMethod = sDefaultUpdateMethod || UpdateMethod.Merge;
 
-			this.bTokenHandling = bTokenHandling !== false;
+			this.bTokenHandling = vTokenHandling !== false;
 			this.bWithCredentials = bWithCredentials === true;
 			this.bUseBatch = bUseBatch !== false;
 			this.bRefreshAfterChange = bRefreshAfterChange !== false;
@@ -414,11 +417,11 @@ sap.ui.define([
 				this.oHeaders["sap-contextid-accept"] = "header";
 				this.mCustomHeaders["sap-contextid-accept"] = "header";
 			}
-			// Get/create shared data containers
-			var sServerUrl = this._getServerUrl();
 			//use warmup url if provided
 			this.sMetadataUrl = this.sWarmupUrl || this._createMetadataUrl("/$metadata");
-			this.oSharedServerData = ODataModel._getSharedData("server", sServerUrl);
+			this.oSharedServerData = vTokenHandling === "skipServerCache"
+				? undefined // server cache for security tokens is not used
+				: ODataModel._getSharedData("server", this._getServerUrl());
 			this.oSharedServiceData = ODataModel._getSharedData("service", this.sServiceUrl);
 			this.oSharedMetaData = ODataModel._getSharedData("meta", this.sMetadataUrl);
 
@@ -494,7 +497,7 @@ sap.ui.define([
 			if (this.bTokenHandling) {
 				if (this.oSharedServiceData.securityToken) {
 					this.oHeaders["x-csrf-token"] = this.oSharedServiceData.securityToken;
-				} else if (this.oSharedServerData.securityToken) {
+				} else if (this.oSharedServerData && this.oSharedServerData.securityToken) {
 					this.oSharedServiceData.securityToken = this.oSharedServerData.securityToken;
 					this.oHeaders["x-csrf-token"] = this.oSharedServiceData.securityToken;
 				}
@@ -3277,12 +3280,12 @@ sap.ui.define([
 	};
 
 	/**
-	 * Returns the current security token.
+	 * Returns the current security token if available; triggers a request to fetch the security token if it is not
+	 * available.
 	 *
-	 * If the token has not been requested from the server it will be requested first (synchronously).
-	 *
-	 * @returns {string} The security token
+	 * @returns {string|undefined} The security token; <code>undefined</code> if it is not available
 	 *
+	 * @deprecated since 1.119.0; use {@link #securityTokenAvailable} instead
 	 * @public
 	 */
 	ODataModel.prototype.getSecurityToken = function() {
@@ -3345,7 +3348,9 @@ sap.ui.define([
 				sToken = that._getHeader("x-csrf-token", oResponse.headers);
 				that._setSessionContextIdHeader(that._getHeader("sap-contextid", oResponse.headers));
 				if (sToken) {
-					that.oSharedServerData.securityToken = sToken;
+					if (that.oSharedServerData) {
+						that.oSharedServerData.securityToken = sToken;
+					}
 					that.oSharedServiceData.securityToken = sToken;
 					that.pSecurityToken = Promise.resolve(sToken);
 					// For compatibility with applications, that are using getHeaders() to retrieve the current

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

@@ -93,7 +93,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.TreeBinding
 	 * @hideconstructor
 	 * @public
-	 * @version 1.118.0
+	 * @version 1.119.1
 	 */
 	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.118.0
+		 * @version 1.119.1
 		 */
 		Context = BaseContext.extend("sap.ui.model.odata.v4.Context", {
 				constructor : constructor
@@ -94,7 +94,8 @@ sap.ui.define([
 		this.oSyncCreatePromise = oCreatePromise;
 		// a promise waiting for the deletion, also used as indicator for #isDeleted
 		this.oDeletePromise = null;
-		this.bFiringCreateActivate = false; // see #doSetProperty
+		// avoids recursion when calling #doSetProperty within the createActivate event handler
+		this.bFiringCreateActivate = false;
 		this.iGeneration = iGeneration || 0;
 		this.bInactive = bInactive || undefined; // be in sync with the annotation
 		this.iIndex = iIndex;
@@ -551,8 +552,8 @@ sap.ui.define([
 							.catch(that.oModel.getReporter());
 						that.bFiringCreateActivate = true;
 						that.bInactive = oBinding.fireCreateActivate(that) ? false : 1;
-						oCache.setInactive(sEntityPath, that.bInactive);
 						that.bFiringCreateActivate = false;
+						oCache.setInactive(sEntityPath, that.bInactive);
 					}
 
 					// if request is canceled fnPatchSent and fnErrorCallback are not called and
@@ -695,16 +696,18 @@ sap.ui.define([
 	};
 
 	/**
-	 * Returns the value at the given path and removes it from the cache.
+	 * Returns the collection at the given path and removes it from the cache if it is marked as
+	 * transferable.
 	 *
-	 * @param {string} sPath - The relative path of the property
-	 * @returns {any} The value
+	 * @param {string} sPath - The relative path of the collection
+	 * @returns {object[]|undefined} The collection or <code>undefined</code>
+	 * @throws {Error} If the given path does not point to a collection.
 	 *
 	 * @private
 	 */
-	Context.prototype.getAndRemoveValue = function (sPath) {
+	Context.prototype.getAndRemoveCollection = function (sPath) {
 		return this.withCache(function (oCache, sCachePath) {
-			return oCache.getAndRemoveValue(sCachePath);
+			return oCache.getAndRemoveCollection(sCachePath);
 		}, sPath, true).getResult();
 	};
 
@@ -1136,6 +1139,35 @@ sap.ui.define([
 		return this.oSyncCreatePromise && this.oSyncCreatePromise.isPending();
 	};
 
+	/**
+	 * Moves this node to the given parent (in case of a recursive hierarchy, see
+	 * {@link #setAggregation}, where <code>oAggregation.expandTo</code> must be one). No other
+	 * {@link sap.ui.model.odata.v4.ODataListBinding#create creation}, {@link #delete deletion}, or
+	 * move must be pending, and no other modification (including collapse of some ancestor node)
+	 * must happen while this move is pending!
+	 *
+	 * This context's {@link #getIndex index} may change and it becomes "created persisted", with
+	 * {@link #isTransient} returning <code>false</code> etc.
+	 *
+	 * @param {object} oParameters - A parameter object
+	 * @param {sap.ui.model.odata.v4.Context} oParameters.parent - The new parent's context
+	 * @returns {Promise<void>}
+	 *   A promise which is resolved without a defined result when the move is finished, or
+	 *   rejected in case of an error
+	 * @throws (Error)
+	 *   If the parent is missing or (a descendant of) this node.
+	 *
+	 * @experimental As of version 1.119.0
+	 * @public
+	 */
+	Context.prototype.move = function ({parent : oParent}) {
+		if (!oParent || oParent === this) {
+			throw new Error("Unsupported parent context: " + oParent);
+		}
+
+		return Promise.resolve(this.oBinding.move(this, oParent));
+	};
+
 	/**
 	 * Patches the context data with the given patch data.
 	 *
@@ -1727,7 +1759,8 @@ sap.ui.define([
 
 		if (this.iIndex === iVIRTUAL || this.isTransient() && !this.isInactive()
 			|| this.oBinding.getHeaderContext && this === this.oBinding.getHeaderContext()
-			|| this.oBinding.getParameterContext && this === this.oBinding.getParameterContext()) {
+			// only operation bindings have a parameter context, for others the function fails
+			|| this.oBinding.oOperation && this === this.oBinding.getParameterContext()) {
 			throw new Error("Cannot reset: " + this);
 		}
 
@@ -1760,12 +1793,29 @@ sap.ui.define([
 		this.bSelected = false;
 	};
 
+	/**
+	 * Sets this context's state from "persisted" to "created persisted".
+	 *
+	 * Note: this is a private and internal API. Do not call this!
+	 *
+	 * @throws {Error} If this context is already "created"
+	 *
+	 * @private
+	 */
+	Context.prototype.setCreatedPersisted = function () {
+		if (this.oCreatedPromise) {
+			throw new Error("Already 'created', currently transient: " + this.isTransient());
+		}
+		this.oCreatedPromise = Promise.resolve();
+		this.oSyncCreatePromise = SyncPromise.resolve();
+	};
+
 	/**
 	 * Sets the inactive flag to <code>true</code>
 	 *
 	 * Note: this is a private and internal API. Do not call this!
 	 *
-	 * @throws {Error} - If this context is not inactive
+	 * @throws {Error} If this context is not inactive
 	 *
 	 * @private
 	 * @see #isInactive

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

@@ -433,16 +433,25 @@ sap.ui.define([
 	 * Deregisters the given change listener from the given path.
 	 *
 	 * @param {string} sPath
-	 *   The path relative to the binding
+	 *   The absolute path
 	 * @param {object} oListener
 	 *   The change listener
 	 *
 	 * @private
 	 */
 	ODataBinding.prototype.doDeregisterChangeListener = function (sPath, oListener) {
-		if (this.oCache) {
-			this.oCache.deregisterChangeListener(sPath, oListener);
-		}
+		this.oCachePromise.then((oCache) => {
+			if (oCache) {
+				const sRelativePath = _Helper.getRelativePath(sPath, this.getResolvedPath());
+				if (sRelativePath !== undefined) {
+					oCache.deregisterChangeListener(sRelativePath, oListener);
+					return;
+				}
+			}
+			if (this.bRelative && this.oContext && this.oContext.getBinding) {
+				this.oContext.getBinding().doDeregisterChangeListener(sPath, oListener);
+			}
+		});
 	};
 
 	/**