@openui5/sap.ui.fl 1.93.3 → 1.96.1

package/src/sap/ui/fl/FlexControllerFactory.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.FlexControllerFactory
 	 * @experimental Since 1.27.0
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl
@@ -184,12 +184,19 @@ sap.ui.define([
 		// only manifest with type = "application" will fetch changes
 		var oManifest = oAppComponent.getManifestObject();
 		var oFlexController = FlexControllerFactory.createForControl(oAppComponent, oManifest);
+		var oVariantModel;
 		return oFlexController._oChangePersistence.loadChangesMapForComponent(oAppComponent)
 		.then(function (fnGetChangesMap) {
 			var fnPropagationListener = Applier.applyAllChangesForControl.bind(Applier, fnGetChangesMap, oAppComponent, oFlexController);
 			fnPropagationListener._bIsSapUiFlFlexControllerApplyChangesOnControl = true;
 			oAppComponent.addPropagationListener(fnPropagationListener);
-			var oVariantModel = new VariantModel({}, oFlexController, oAppComponent);
+			oVariantModel = new VariantModel({}, {
+				flexController: oFlexController,
+				appComponent: oAppComponent
+			});
+			return oVariantModel.initialize();
+		})
+		.then(function() {
 			oAppComponent.setModel(oVariantModel, Utils.VARIANT_MODEL_NAME);
 			Measurement.end("flexProcessing");
 			return oVariantModel;

package/src/sap/ui/fl/LayerUtils.js

@@ -7,13 +7,11 @@
 sap.ui.define([
 	"sap/base/util/UriParameters",
 	"sap/ui/thirdparty/hasher",
-	"sap/ui/fl/Layer",
-	"sap/ui/fl/Utils"
+	"sap/ui/fl/Layer"
 ], function(
 	UriParameters,
 	hasher,
-	Layer,
-	Utils
+	Layer
 ) {
 	"use strict";
 
@@ -43,7 +41,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.LayerUtils
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 */
 	var LayerUtils = {
 		_mLayersIndex: mLayersIndex,
@@ -53,6 +51,7 @@ sap.ui.define([
 		/**
 		 * Indicates if the passed layer is valid.
 		 *
+		 * @param {string} sLayer layer name
 		 * @returns {boolean} <code>true</code> if the layer is valid
 		 * @public
 		 */
@@ -83,6 +82,13 @@ sap.ui.define([
 			return ([Layer.PUBLIC, Layer.CUSTOMER, Layer.CUSTOMER_BASE].indexOf(sLayerName) > -1);
 		},
 
+		/**
+		 * Returns whether provided layer is a developer layer.
+		 *
+		 * @param {string} sLayer layer name
+		 * @returns {boolean} true if provided layer is customer dependent layer else false
+		 * @public
+		 */
 		isDeveloperLayer: function(sLayer) {
 			return LayerUtils.compareAgainstCurrentLayer(sLayer, Layer.CUSTOMER) === -1;
 		},
@@ -104,10 +110,11 @@ sap.ui.define([
 		 * Determine the <code>maxLayer</code> based on the url parameter <code>sap-ui-fl-max-layer</code> or if is not set by <code>topLayer</code>.
 		 *
 		 * @ui5-restricted sap.ui.fl.apply._internal.Connector
-		 * @return {String} maxLayer
+		 * @param {sap.ui.core.service.Service} oURLParsingService Unified Shell URL Parsing Service
+		 * @return {string} maxLayer
 		 */
-		getMaxLayer: function () {
-			var sParseMaxLayer = LayerUtils.getMaxLayerTechnicalParameter(hasher.getHash());
+		getMaxLayer: function (oURLParsingService) {
+			var sParseMaxLayer = LayerUtils.getMaxLayerTechnicalParameter(hasher.getHash(), oURLParsingService);
 			return sParseMaxLayer || getUrlParameter(this.FL_MAX_LAYER_PARAM) || LayerUtils._sTopLayer;
 		},
 
@@ -125,11 +132,12 @@ sap.ui.define([
 		 * Determines whether a layer is higher than the max layer.
 		 *
 		 * @param {string} sLayer Layer name to be evaluated
+		 * @param {sap.ui.core.service.Service} oURLParsingService Unified Shell URL Parsing Service
 		 * @returns {boolean} <code>true</code> if input layer is higher than max layer, otherwise <code>false</code>
 		 * @public
 		 */
-		isOverMaxLayer: function(sLayer) {
-			return this.isOverLayer(sLayer, this.getMaxLayer());
+		isOverMaxLayer: function(sLayer, oURLParsingService) {
+			return this.isOverLayer(sLayer, this.getMaxLayer(oURLParsingService));
 		},
 
 		/**
@@ -148,8 +156,8 @@ sap.ui.define([
 		 * Compares current layer with a provided layer
 		 * -1: Lower layer, 0: Same layer, 1: Layer above.
 		 *
-		 * @param {String} sLayer Layer name to be evaluated
-		 * @param {String} [sCurrentLayer] Current layer name to be evaluated, if not provided the layer is taken from URL parameter
+		 * @param {string} sLayer Layer name to be evaluated
+		 * @param {string} [sCurrentLayer] Current layer name to be evaluated, if not provided the layer is taken from URL parameter
 		 * @returns {int} -1: Lower layer, 0: Same layer, 1: Layer above
 		 * @public
 		 */
@@ -168,10 +176,11 @@ sap.ui.define([
 		 * Determines if filtering of changes based on layer is required.
 		 *
 		 * @returns {boolean} <code>true</code> if the top layer is also the max layer, otherwise <code>false</code>
+		 * @param {sap.ui.core.service.Service} oURLParsingService Unified Shell URL Parsing Service
 		 * @public
 		 */
-		isLayerFilteringRequired: function() {
-			return this._sTopLayer !== this.getMaxLayer();
+		isLayerFilteringRequired: function(oURLParsingService) {
+			return this._sTopLayer !== this.getMaxLayer(oURLParsingService);
 		},
 
 		/**
@@ -199,19 +208,20 @@ sap.ui.define([
 		 * The function loops over the array and filters the object if the layer property is higher than the current max layer.
 		 *
 		 * @param {object[]} aChangeDefinitions - Array of change definitions
+		 * @param {sap.ui.core.service.Service} oURLParsingService Unified Shell URL Parsing Service
 		 * @returns {object[]} Array of filtered change definitions
 		 */
-		filterChangeDefinitionsByMaxLayer: function(aChangeDefinitions) {
+		filterChangeDefinitionsByMaxLayer: function(aChangeDefinitions, oURLParsingService) {
 			return aChangeDefinitions.filter(function(oChangeDefinition) {
-				return !oChangeDefinition.layer || !LayerUtils.isOverMaxLayer(oChangeDefinition.layer);
+				return !oChangeDefinition.layer || !LayerUtils.isOverMaxLayer(oChangeDefinition.layer, oURLParsingService);
 			});
 		},
 
 		/**
 		 * Filters the passed Changes or change definitions and returns only the ones in the current layer
 		 *
-		 * @param {sap.ui.fl.Change|object[]} - aChanges Array of Changes or ChangeDefinitions
-		 * @param {string} - sCurrentLayer Current Layer
+		 * @param {sap.ui.fl.Change|object[]} aChanges Array of Changes or ChangeDefinitions
+		 * @param {string} sCurrentLayer Current Layer
 		 * @returns {sap.ui.fl.Change|object[]} Array of filtered Changes
 		 */
 		filterChangeOrChangeDefinitionsByCurrentLayer: function(aChanges, sCurrentLayer) {
@@ -229,15 +239,17 @@ sap.ui.define([
 		 * Returns max layer technical parameter from the passed hash if ushell is available
 		 *
 		 * @param {string} sHash Hash value
+		 * @param {sap.ui.core.service.Service} oURLParsingService Unified Shell URL Parsing Service
 		 * @returns {string|undefined} Max layer parameter value, if available
 		 */
-		getMaxLayerTechnicalParameter: function(sHash) {
-			return Utils.ifUShellContainerThen(function(aServices) {
-				var oParsedHash = aServices[0].parseShellHash(sHash) || {};
+		getMaxLayerTechnicalParameter: function(sHash, oURLParsingService) {
+			if (oURLParsingService) {
+				var oParsedHash = oURLParsingService.parseShellHash(sHash) || {};
 				if (oParsedHash.params && oParsedHash.params.hasOwnProperty(this.FL_MAX_LAYER_PARAM)) {
 					return oParsedHash.params[this.FL_MAX_LAYER_PARAM][0];
 				}
-			}.bind(this), ["URLParsing"]);
+			}
+			return undefined;
 		}
 	};
 	return LayerUtils;

package/src/sap/ui/fl/PreprocessorImpl.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @experimental Since 1.27.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.core

package/src/sap/ui/fl/RegistrationDelegator.js

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @experimental Since 1.43.0
 	 */
 	var RegistrationDelegator = {

package/src/sap/ui/fl/Utils.js

@@ -47,7 +47,7 @@ function(
 	 * @namespace
 	 * @alias sap.ui.fl.Utils
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @experimental Since 1.25.0
 	 */
 	var Utils = {
@@ -731,32 +731,16 @@ function(
 		},
 
 		/**
-		 * Returns URL hash when ushell container is available
+		 * Returns URL hash when ushell container is available synchronously.
 		 *
+		 * @param  {sap.ushell.services.URLParsing} oURLParsingService - The Unified Shell's internal URL parsing service
 		 * @returns {object} Returns the parsed URL hash object or an empty object if ushell container is not available
 		 */
-		getParsedURLHash: function() {
-			return Utils.ifUShellContainerThen(function(aServices) {
-				var oParsedHash = aServices[0].parseShellHash(hasher.getHash());
-				return oParsedHash || {};
-			}, ["URLParsing"]) || {};
-		},
-
-		/**
-		 * Calls the passed function with the desired ushell services, if ushell container is available
-		 *
-		 * @param {function} fnCallBack - Callback function
-		 * @param {string[]} aServiceNames - Array of ushell service names
-		 * @returns {any|undefined} Returns the Value from the callback
-		 */
-		ifUShellContainerThen: function(fnCallBack, aServiceNames) {
-			var oUShellContainer = Utils.getUshellContainer();
-			if (oUShellContainer) {
-				var aServices = aServiceNames.map(function(sServiceName) {
-					return oUShellContainer.getService(sServiceName);
-				});
-				return fnCallBack(aServices);
+		getParsedURLHash: function(oURLParsingService) {
+			if (oURLParsingService) {
+				return oURLParsingService.parseShellHash(hasher.getHash()) || {};
 			}
+			return {};
 		},
 
 		/**
@@ -781,7 +765,7 @@ function(
 		/**
 		 * Returns the value of the specified url parameter of the current url
 		 *
-		 * @param {String} sParameterName - Name of the url parameter
+		 * @param {string} sParameterName - Name of the url parameter
 		 * @returns {string} url parameter
 		 * @private
 		 */
@@ -790,9 +774,9 @@ function(
 		},
 
 		/**
-		 * Returns ushell container if available
+		 * Returns UShell container if available
 		 *
-		 * @returns {object|undefined} Returns ushell container object if available or undefined
+		 * @returns {object|undefined} Returns UShell container object if available or undefined
 		 */
 		getUshellContainer: function() {
 			return sap.ushell && sap.ushell.Container;
@@ -1194,10 +1178,11 @@ function(
 		 * @param  {string} sParameters - The URL parameters to be modified
 		 * @param  {string} sParameterName - The parameter name that can be removed or added
 		 * @param  {string} sParameterValue - The parameter value of the parameter name that can be removed or added
+		 * @param  {sap.ushell.services.URLParsing} oURLParsingService - The Unified Shell's internal URL parsing service
 		 * @returns {string} The modified URL
 		 */
-		handleUrlParameters: function(sParameters, sParameterName, sParameterValue) {
-			if (this.hasParameterAndValue(sParameterName, sParameterValue)) {
+		handleUrlParameters: function(sParameters, sParameterName, sParameterValue, oURLParsingService) {
+			if (this.hasParameterAndValue(sParameterName, sParameterValue, oURLParsingService)) {
 				if (sParameters.startsWith("?")) {
 					sParameters = sParameters.substr(1, sParameters.length);
 				}
@@ -1219,22 +1204,23 @@ function(
 		 *
 		 * @param  {string} sParameterName - The parameter name to be checked
 		 * @param  {string} sParameterValue - The parameter value to be checked
+		 * @param  {sap.ushell.services.URLParsing} oURLParsingService - The Unified Shell's internal URL parsing service
 		 * @returns {boolean} <code>true</code> if the parameter and the given value are in the URL
 		 */
-		hasParameterAndValue: function(sParameterName, sParameterValue) {
-			return this.getParameter(sParameterName) === sParameterValue;
+		hasParameterAndValue: function(sParameterName, sParameterValue, oURLParsingService) {
+			return this.getParameter(sParameterName, oURLParsingService) === sParameterValue;
 		},
 
 		/**
 		 * Checks if the passed parameter name is contained in the URL and returns its value.
 		 *
 		 * @param  {string} sParameterName - The parameter name to be checked
+		 * @param  {sap.ushell.services.URLParsing} oURLParsingService - The Unified Shell's internal URL parsing service
 		 * @returns {string} The value of the given parameter or undefined
 		 */
-		getParameter: function (sParameterName) {
-			var oUshellContainer = this.getUshellContainer();
-			if (oUshellContainer) {
-				var mParsedHash = this.getParsedURLHash();
+		getParameter: function (sParameterName, oURLParsingService) {
+			if (oURLParsingService) {
+				var mParsedHash = Utils.getParsedURLHash(oURLParsingService);
 				return mParsedHash.params &&
 					mParsedHash.params[sParameterName] &&
 					mParsedHash.params[sParameterName][0];
@@ -1292,7 +1278,41 @@ function(
 				return oControl[sPropertyGetter]();
 			}
 			return undefined;
+		},
+
+		/**
+		 * Returns a Promise resolving with the requested Unified Shell service if available
+		 *
+		 * @param {string} sServiceName UShell service name (e.g. "URLParsing")
+		 * @returns {Promise<object|undefined>} Returns UShell service if available or undefined
+		 */
+		 getUShellService: function(sServiceName) {
+			if (sServiceName) {
+				var oUShellContainer = this.getUshellContainer();
+				if (oUShellContainer) {
+					return oUShellContainer.getServiceAsync(sServiceName);
+				}
+			}
+			return Promise.resolve();
+		},
+
+		/**
+		 * Gets the requested UShell Services from Ushell container, if container is available.
+		 * @param {array} aServiceNames - List of service names
+		 * @returns {Promise<object>} Resolves to an object with the requested ushell services
+		 */
+		getUShellServices: function (aServiceNames) {
+			var aServicePromises = aServiceNames.map(function (sServiceName) {
+				return this.getUShellService(sServiceName);
+			}.bind(this));
+			return Promise.all(aServicePromises).then(function (aServices) {
+				return aServiceNames.reduce(function (mServices, sService, iIndex) {
+					mServices[sService] = aServices && aServices[iIndex];
+					return mServices;
+				}, {});
+			});
 		}
+
 	};
 	return Utils;
 }, true);

package/src/sap/ui/fl/Variant.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @class Variant class.
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @alias sap.ui.fl.Variant
 	 * @experimental Since 1.52.0
 	 */
@@ -495,16 +495,6 @@ sap.ui.define([
 		return (this._bUserDependent);
 	};
 
-	/**
-	 * Returns the pending action on the variant item
-	 * @returns {string} contains one of these values: DELETE/NEW/UPDATE/NONE
-	 *
-	 * @public
-	 */
-	Variant.prototype.getPendingAction = function () {
-		return this.getState();
-	};
-
 	/**
 	 * Gets the JSON definition of the variant
 	 * @returns {object} the content of the variant
@@ -616,6 +606,7 @@ sap.ui.define([
 				creation: "",
 				originalLanguage: Utils.getCurrentLanguage(),
 				conditions: {},
+				contexts: oPropertyBag.content.contexts || {},
 				support: {
 					generator: oPropertyBag.generator || "Change.createInitialFileContent",
 					service: oPropertyBag.service || "",

package/src/sap/ui/fl/XmlPreprocessorImpl.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @experimental Since 1.27.0
 	 */
 	var XmlPreprocessorImpl = function() {

package/src/sap/ui/fl/apply/_internal/DelegateMediator.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 *
 	 * @experimental Since 1.80 This class is experimental and provides only limited functionality. Also the API might be
 	 *               changed in future.

package/src/sap/ui/fl/apply/_internal/appVariant/DescriptorChangeTypes.js

@@ -56,7 +56,8 @@ sap.ui.define([
 				"appdescr_url_setUri",
 				"appdescr_fiori_setRegistrationIds",
 				"appdescr_card",
-				"appdescr_card_designtime"
+				"appdescr_card_designtime",
+				"appdescr_fiori_setAbstract"
 			];
 		},
 		getCondensableChangeTypes: function() {

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

@@ -28,23 +28,23 @@ sap.ui.define([
 	function _checkControlAndDependentSelectorControls(oChange, mPropertyBag) {
 		var oSelector = oChange.getSelector && oChange.getSelector();
 		if (!oSelector || (!oSelector.id && !oSelector.name)) {
-			throw Error("No selector in change found or no selector ID.");
+			return Promise.reject(Error("No selector in change found or no selector ID."));
 		}
 
-		var oControl = mPropertyBag.modifier.bySelector(oSelector, mPropertyBag.appComponent, mPropertyBag.view);
-		if (!oControl) {
-			throw Error("A flexibility change tries to change a nonexistent control.");
-		}
-
-		var aDependentControlSelectorList = oChange.getDependentControlSelectorList();
-		aDependentControlSelectorList.forEach(function(sDependentControlSelector) {
-			var oDependentControl = mPropertyBag.modifier.bySelector(sDependentControlSelector, mPropertyBag.appComponent, mPropertyBag.view);
-			if (!oDependentControl) {
-				throw Error("A dependent selector control of the flexibility change is not available.");
-			}
-		});
-
-		return oControl;
+		return mPropertyBag.modifier.bySelectorTypeIndependent(oSelector, mPropertyBag.appComponent, mPropertyBag.view)
+			.then(function (oControl) {
+				if (!oControl) {
+					throw Error("A flexibility change tries to change a nonexistent control.");
+				}
+				var aDependentControlSelectorList = oChange.getDependentControlSelectorList();
+				aDependentControlSelectorList.forEach(function(sDependentControlSelector) {
+					var oDependentControl = mPropertyBag.modifier.bySelector(sDependentControlSelector, mPropertyBag.appComponent, mPropertyBag.view);
+					if (!oDependentControl) {
+						throw new Error("A dependent selector control of the flexibility change is not available.");
+					}
+				});
+				return oControl;
+			});
 	}
 
 	function _checkAndAdjustChangeStatusSync(oControl, oChange, mChangesMap, oFlexController, mPropertyBag) {
@@ -100,6 +100,9 @@ sap.ui.define([
 							oChange.setRevertData(oParsedRevertDataFromCustomData);
 							oChange.markFinished();
 						});
+				} else if (bChangeStatusAppliedFinished && bIsCurrentlyAppliedOnControl) {
+					// both the change instance and the UI Control are already applied, so the change can be directly marked as finished
+					oChange.markFinished();
 				}
 				return undefined;
 			});
@@ -383,25 +386,27 @@ sap.ui.define([
 
 			return aChanges.reduce(function(oPreviousPromise, oChange) {
 				var oControl;
-				return oPreviousPromise.then(function() {
-					oControl = _checkControlAndDependentSelectorControls(oChange, mPropertyBag);
-					oChange.setQueuedForApply();
-					return _checkAndAdjustChangeStatus(oControl, oChange, undefined, undefined, mPropertyBag);
-				})
-				.then(function () {
-					if (!oChange.isApplyProcessFinished()) {
-						return Applier.applyChangeOnControl(oChange, oControl, mPropertyBag);
-					}
-					return {success: true};
-				})
-				.then(function(oReturn) {
-					if (!oReturn.success) {
-						throw Error(oReturn.error);
-					}
-				})
-				.catch(function(oError) {
-					_logApplyChangeError(oError, oChange);
-				});
+				return oPreviousPromise
+					.then(_checkControlAndDependentSelectorControls.bind(null, oChange, mPropertyBag))
+					.then(function (oReturnedControl) {
+						oControl = oReturnedControl;
+						oChange.setQueuedForApply();
+						return _checkAndAdjustChangeStatus(oControl, oChange, undefined, undefined, mPropertyBag);
+					})
+					.then(function () {
+						if (!oChange.isApplyProcessFinished()) {
+							return Applier.applyChangeOnControl(oChange, oControl, mPropertyBag);
+						}
+						return {success: true};
+					})
+					.then(function(oReturn) {
+						if (!oReturn.success) {
+							throw Error(oReturn.error);
+						}
+					})
+					.catch(function(oError) {
+						_logApplyChangeError(oError, oChange);
+					});
 			}, new FlUtils.FakePromise())
 			.then(function() {
 				return mPropertyBag.view;

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

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.FlexCustomData
 	 * @experimental Since 1.61.0
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 */
 	var FlexCustomData = {};
 	FlexCustomData.sync = {};
@@ -173,25 +173,6 @@ sap.ui.define([
 		return "true";
 	}
 
-	/**
-	 * Adds applied custom data to the control. Depending on whether the change is revertible,
-	 * the value of the custom data is either the revert data of the change (stringified and '{' and '}' escaped) or simply 'true'
-	 *
-	 * @param {sap.ui.core.Control} oControl The control that should be checked
-	 * @param {sap.ui.fl.Change} oChange The change instance
-	 * @param {object} mPropertyBag The propertyBag
-	 * @param {object} mPropertyBag.view The view to process
-	 * @param {object} mPropertyBag.appDescriptor The app descriptor containing the metadata of the current application
-	 * @param {object} mPropertyBag.appComponent The component instance that is currently loading
-	 * @param {boolean} bSaveRevertData 'true' if the revert data should be saved as value
-	 * @returns {Promise} resolves when custom data is written
-	 */
-	FlexCustomData.sync.addAppliedCustomData = function(oControl, oChange, mPropertyBag, bSaveRevertData) {
-		var sCustomDataValue = getCustomValueData(bSaveRevertData, oChange);
-		var sCustomDataKey = FlexCustomData._getCustomDataKey(oChange, FlexCustomData.appliedChangesCustomDataKey);
-		return writeCustomDataSync(oControl, sCustomDataKey, sCustomDataValue, mPropertyBag);
-	};
-
 	/**
 	 * Adds applied custom data to the control. Depending on whether the change is revertible,
 	 * the value of the custom data is either the revert data of the change (stringified and '{' and '}' escaped) or simply 'true'
@@ -302,15 +283,6 @@ sap.ui.define([
 		return sIdentifier + "." + oChange.getId();
 	};
 
-	function writeCustomDataSync(oControl, sKey, sValue, mPropertyBag) {
-		var mCustomData = getCustomDataSync(oControl, sKey);
-		if (!mCustomData.customData) {
-			mPropertyBag.modifier.createAndAddCustomData(oControl, sKey, sValue, mPropertyBag.appComponent);
-		} else {
-			mPropertyBag.modifier.setProperty(mCustomData.customData, "value", sValue);
-		}
-	}
-
 	function writeCustomDataAsync(oControl, sKey, sValue, mPropertyBag) {
 		return getCustomDataAsync(oControl, mPropertyBag.modifier, sKey)
 			.then(function (mCustomData) {

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.connectors.changes.Utils
 	 * @since 1.70
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal, sap.ui.fl.write._internal
 	 */

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

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.Preprocessor
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.Registration
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild
 	 * @experimental
 	 * @since 1.77
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
@@ -34,7 +34,8 @@ sap.ui.define([
 		appdescr_ui5_setFlexExtensionPointEnabled: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetFlexExtensionPointEnabled"),
 		appdescr_ui5_addNewModel: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddNewModel"),
 		appdescr_app_addAnnotationsToOData: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/app/AddAnnotationsToOData"),
-		appdescr_app_changeInbound: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeInbound")
+		appdescr_app_changeInbound: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeInbound"),
+		appdescr_fiori_setAbstract: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/fiori/SetAbstract")
 	};
 
 	var RegistrationCopy = Object.assign({}, Registration);

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

@@ -139,7 +139,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.app.AddAnnotationsToOData
 	 * @experimental
 	 * @since 1.87
-	 * @version 1.93.3
+	 * @version 1.96.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 sap.ui.fl.apply._internal.changes.descriptor.app.ChangeDataSouce
 	 * @experimental
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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

@@ -25,7 +25,7 @@ sap.ui.define([
      *
      * @namespace sap.ui.fl.apply._internal.changes.descriptor.app.ChangeInbound
      * @experimental
-     * @version 1.93.3
+     * @version 1.96.1
      * @private
      * @ui5-restricted sap.ui.fl.apply._internal
      */

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.app.SetTitle
 	 * @experimental
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */