@openui5/sap.ui.fl 1.114.0 → 1.115.1

package/src/sap/ui/fl/apply/_internal/changes/Utils.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.Utils
 	 * @since 1.70
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal, sap.ui.fl.write._internal
 	 */
@@ -80,16 +80,17 @@ sap.ui.define([
 		 * @returns {Promise} Promise resolving with the change handler or an empty object
 		 */
 		getChangeHandler: function(oChange, mControl, mPropertyBag) {
-			var sLibraryName = mPropertyBag.modifier.getLibraryName(mControl.control);
+			var oLibraryNamePromise = mPropertyBag.modifier.getLibraryName(mControl.control);
 			// the ChangeHandlerRegistration includes all the predefined ChangeHandlers.
 			// With this as a standard import the ChangeHandlers would not be able to access API classes due to circular dependencies.
 			// TODO should be removed as soon as the ChangePersistence / FlexController are gone
-			return requireAsync("sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerRegistration")
-
-			.then(function(ChangeHandlerRegistration) {
-				return ChangeHandlerRegistration.waitForChangeHandlerRegistration(sLibraryName);
+			return Promise.all([
+				requireAsync("sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerRegistration"),
+				oLibraryNamePromise
+			])
+			.then(function(aPromiseValues) {
+				return aPromiseValues[0].waitForChangeHandlerRegistration(aPromiseValues[1]);
 			})
-
 			.then(function() {
 				var sChangeType = oChange.getChangeType();
 				var sLayer = oChange.getLayer();

package/src/sap/ui/fl/apply/_internal/changes/descriptor/Preprocessor.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.Preprocessor
 	 * @since 1.74
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/Registration.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.Registration
 	 * @since 1.74
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/RegistrationBuild.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild
 	 * @since 1.77
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/AddAnnotationsToOData.js

@@ -138,7 +138,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.app.AddAnnotationsToOData
 	 * @since 1.87
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/AddNewInbound.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	* Available for build {@link sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild}.
 	*
 	* @namespace sap.ui.fl.apply._internal.changes.descriptor.app.AddNewInbound
-	* @version 1.114.0
+	* @version 1.115.1
 	* @private
 	* @ui5-restricted sap.ui.fl.apply._internal
 	*/

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeDataSource.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 *
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.app.ChangeDataSource
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeInbound.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	* Available for both runtime and build {@link sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild}.
 	*
 	* @namespace sap.ui.fl.apply._internal.changes.descriptor.app.ChangeInbound
-	* @version 1.114.0
+	* @version 1.115.1
 	* @private
 	* @ui5-restricted sap.ui.fl.apply._internal
 	*/

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/RemoveAllInboundsExceptOne.js

@@ -43,7 +43,7 @@ sap.ui.define([
      * Available for build {@link sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild}.
      *
      * @namespace sap.ui.fl.apply._internal.changes.descriptor.app.RemoveAllInboundsExceptOne
-     * @version 1.114.0
+     * @version 1.115.1
      * @private
      * @ui5-restricted sap.ui.fl.apply._internal
      */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/SetTitle.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * Available for both runtime and build {@link sap.ui.fl.apply._internal.changes.descriptor.Registration}.
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.app.SetTitle
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/fiori/SetAbstract.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * Only available during build time {@link sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild}.
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.fiori.SetAbstract
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/fiori/SetRegistrationIds.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * Only available during build time {@link sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild}.
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.fiori.SetRegistrationIds
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/AddNewCard.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * Available for both runtime and build {@link sap.ui.fl.apply._internal.changes.descriptor.Registration}.
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ovp.AddNewCard
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/ChangeCard.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * Available for both runtime and build {@link sap.ui.fl.apply._internal.changes.descriptor.Registration}.
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ovp.ChangeCard
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/DeleteCard.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * Available for both runtime and build {@link sap.ui.fl.apply._internal.changes.descriptor.Registration}.
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ovp.DeleteCard
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddComponentUsages.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.AddComponentUsages
 	 * @since 1.86
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddLibrary.js

@@ -48,7 +48,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.AddLibrary
 	 * @since 1.74
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddNewModel.js

@@ -96,7 +96,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.AddNewModel
 	 * @since 1.87
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddNewModelEnhanceWith.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * Only available during build time {@link sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild}.
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.AddNewModelEnhanceWith
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetFlexExtensionPointEnabled.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * Only available during build time {@link sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild}.
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.SetFlexExtensionPointEnabled
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetMinUI5Version.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * Only available during build time {@link sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild}.
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.SetMinUI5Version
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/connectors/ObjectStorageUtils.js

@@ -12,7 +12,7 @@ sap.ui.define([], function () {
 	 *
 	 * @namespace sap.ui.fl.initial._internal.connectors.Utils
 	 * @since 1.70
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal, sap.ui.fl.write._internal
 	 */

package/src/sap/ui/fl/apply/_internal/controlVariants/URLHandler.js

@@ -6,7 +6,6 @@
 
 sap.ui.define([
 	"sap/ui/core/Component",
-	"sap/ui/fl/Utils",
 	"sap/base/Log",
 	"sap/base/util/deepEqual",
 	"sap/base/util/merge",
@@ -15,11 +14,9 @@ sap.ui.define([
 	"sap/ui/base/ManagedObjectObserver",
 	"sap/ui/thirdparty/hasher",
 	"sap/base/util/includes",
-	"sap/ui/fl/apply/_internal/controlVariants/Utils",
-	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState"
+	"sap/ui/fl/apply/_internal/controlVariants/Utils"
 ], function(
 	Component,
-	Utils,
 	Log,
 	deepEqual,
 	merge,
@@ -28,8 +25,7 @@ sap.ui.define([
 	ManagedObjectObserver,
 	hasher,
 	includes,
-	VariantUtil,
-	VariantManagementState
+	VariantUtil
 ) {
 	"use strict";
 
@@ -247,15 +243,11 @@ sap.ui.define([
 			if (Array.isArray(mURLParameters[VariantUtil.VARIANT_TECHNICAL_PARAMETER])) {
 				mURLParameters[VariantUtil.VARIANT_TECHNICAL_PARAMETER] = mURLParameters[VariantUtil.VARIANT_TECHNICAL_PARAMETER].map(decodeURIComponent);
 				mURLParameters[VariantUtil.VARIANT_TECHNICAL_PARAMETER].some(function(sParamDecoded, iIndex) {
-					var bVariantExistsForParameter = VariantManagementState.getVariant({
-						vmReference: mPropertyBag.vmReference,
-						vReference: sParamDecoded,
-						reference: oModel.oChangePersistence.getComponentName()
-					});
-					if (bVariantExistsForParameter) {
+					if (oModel.getVariant(sParamDecoded, mPropertyBag.vmReference)) {
 						mReturnObject.index = iIndex;
 						return true;
 					}
+					return false;
 				});
 			}
 		}

package/src/sap/ui/fl/apply/_internal/extensionPoint/Processor.js

@@ -34,7 +34,7 @@ function(
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 */
 	var Processor;
 

package/src/sap/ui/fl/apply/_internal/flexObjects/AppDescriptorChange.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.AppDescriptorChange
 	 * @since 1.105
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/apply/_internal/flexObjects/CompVariant.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.Variant
 	 * @alias sap.ui.fl.apply._internal.flexObjects.CompVariant
 	 * @since 1.103
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.comp
 	 */

package/src/sap/ui/fl/apply/_internal/flexObjects/ControllerExtensionChange.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.ControllerExtensionChange
 	 * @since 1.105
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/apply/_internal/flexObjects/FlVariant.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.Variant
 	 * @alias sap.ui.fl.apply._internal.flexObjects.FlVariant
 	 * @since 1.104
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/apply/_internal/flexObjects/FlexObject.js

@@ -69,7 +69,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @since 1.100
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory.js

@@ -92,7 +92,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexObjects.FlexObjectFactory
 	 * @since 1.100
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -127,7 +127,8 @@ sap.ui.define([
 		}, {});
 		var oFlexObject = new FlexObjectClass(mProperties);
 		if (bPersisted) {
-			oFlexObject.setState(States.LifecycleState.PERSISTED);
+			// Set the property directly for the initial state to avoid state change validation
+			oFlexObject.setProperty("state", States.LifecycleState.PERSISTED);
 		}
 		return oFlexObject;
 	};

package/src/sap/ui/fl/apply/_internal/flexObjects/UIChange.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.UIChange
 	 * @since 1.109
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -71,6 +71,13 @@ sap.ui.define([
 					type: "string"
 				},
 
+				/**
+				 * Indicates if the UIChange is saved to a variant
+				 */
+				savedToVariant: {
+					type: "boolean"
+				},
+
 				// TODO: consolidate with other revert data properties
 				/**
 				 * Information with which the UIChange can be reverted

package/src/sap/ui/fl/apply/_internal/flexObjects/Variant.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.Variant
 	 * @since 1.103
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/DataSelector.js

@@ -10,7 +10,8 @@ sap.ui.define([
 ) {
 	"use strict";
 	/**
-	 * Base class for data selectors
+	 * Base class for data selectors.
+	 * The ID of the data selector should hint on the return type, i.e. plural for arrays and otherwise singular.
 	 *
 	 * @class Base class for data selectors
 	 * @extends sap.ui.base.ManagedObject
@@ -23,7 +24,7 @@ sap.ui.define([
 		metadata: {
 			properties: {
 				/**
-				 * Parent selector for chaining execute functions
+				 * Parent selector for chaining DataSelectors.
 				 * If a parent selector is provided, its <code>execute</code> function is
 				 * called first with the parameters that were specified by the consumer
 				 * The result is then passed to the <code>execute</code> function of the next
@@ -47,7 +48,7 @@ sap.ui.define([
 					type: "string"
 				},
 				/**
-				 * Callback function which is executed once after the selector is created
+				 * Callback function which is executed once for every parameter after the selector is created.
 				 */
 				initFunction: {
 					type: "function"
@@ -81,6 +82,7 @@ sap.ui.define([
 		},
 		constructor: function() {
 			ManagedObject.apply(this, arguments);
+			this._mInitialized = {};
 			if (this.getParameterKey()) {
 				// If value is parameterized, create a map for easier access
 				this.setCachedResult({});
@@ -94,17 +96,6 @@ sap.ui.define([
 		}
 	});
 
-	DataSelector.prototype.setParentDataSelector = function(oParentDataSelector) {
-		if (
-			oParentDataSelector
-			&& this.getParameterKey()
-			&& this.getParameterKey() === oParentDataSelector.getParameterKey()
-		) {
-			throw new Error('Parameter key names must be unique');
-		}
-		return this.setProperty("parentDataSelector", oParentDataSelector);
-	};
-
 	/**
 	 * Registers a callback listener to get notified about changes to the state
 	 * @param {function} fnListener - Callback function that is called in case of state updates
@@ -192,29 +183,36 @@ sap.ui.define([
 	 * @returns {any} Derived state object
 	 */
 	DataSelector.prototype.get = function(mParameters) {
-		if (!this._bInitialized && this.getInitFunction()) {
-			this.getInitFunction()(mParameters);
-			this._bInitialized = true;
-		}
 		var sParameterKey = this.getParameterKey();
 		if (sParameterKey && !(mParameters || {})[sParameterKey]) {
 			throw new Error("Parameter '" + sParameterKey + "' is missing");
 		}
 		var vResult = this._getParameterizedCachedResult(mParameters);
-		// eslint-disable-next-line eqeqeq
-		if (vResult != null) {
+		// Check for undefined or null as indicators for an empty cache
+		if (vResult !== null && vResult !== undefined) {
 			return vResult;
 		}
 		var oParentDataSelector = this.getParentDataSelector();
-		var oData = oParentDataSelector && oParentDataSelector.get(mParameters);
+		var oParentData = oParentDataSelector && oParentDataSelector.get(mParameters);
+
+		var vParameterValue = (mParameters || {})[sParameterKey];
+		if (!this._mInitialized[vParameterValue] && this.getInitFunction()) {
+			this.getInitFunction()(
+				oParentData,
+				vParameterValue
+			);
+			this._mInitialized[vParameterValue] = true;
+		}
+
 		var vNewResult = this.getExecuteFunction()(
-			oData,
-			(mParameters || {})[sParameterKey]
+			oParentData,
+			vParameterValue
 		);
 		this._setParameterizedCachedResult(mParameters, vNewResult);
-		this.getUpdateListeners().forEach(function(fnUpdateFunction) {
-			fnUpdateFunction();
-		});
+		// FIXME: Might lead to infinite loop if update always invalidates
+		// this.getUpdateListeners().forEach(function(fnUpdateFunction) {
+		// 	fnUpdateFunction();
+		// });
 		return vNewResult;
 	};
 
@@ -223,7 +221,7 @@ sap.ui.define([
 	 * @param {object} mParameters - Map of selector specific parameters
 	 */
 	DataSelector.prototype.checkUpdate = function(mParameters) {
-		if (this.getCheckInvalidation()(mParameters)) {
+		if (this.getCheckInvalidation()(mParameters) === true) {
 			this._clearCache(mParameters);
 			this.getUpdateListeners().forEach(function(fnUpdateFunction) {
 				fnUpdateFunction();