@openui5/sap.ui.fl 1.105.1 → 1.107.0

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

@@ -66,7 +66,7 @@ sap.ui.define([
 	 *
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @experimental Since 1.25.0
 	 * @param {object} mComponent - Component data to initiate <code>ChangePersistence</code> instance
 	 * @param {string} mComponent.name - Name of the component this instance is responsible for
@@ -137,7 +137,7 @@ sap.ui.define([
 	/**
 	 * Verifies whether a change fulfils the preconditions.
 	 *
-	 * All changes need to have a fileName;
+	 * All changes need to have a fileType;
 	 * only changes whose <code>fileType</code> is 'change' and whose <code>changeType</code> is different from 'defaultVariant' are valid;
 	 *
 	 * @param {object} oChangeOrChangeContent Change instance or content of the change
@@ -145,14 +145,30 @@ sap.ui.define([
 	 * @returns {boolean} <code>true</code> if all the preconditions are fulfilled
 	 */
 	function preconditionsFulfilled(oChangeOrChangeContent) {
-		var oChangeContent = oChangeOrChangeContent instanceof Change ? oChangeOrChangeContent.getDefinition() : oChangeOrChangeContent;
+		var sFileType;
+		var sVariantManagementReference;
+		var sVariantReference;
+		var sSelectorId;
+
+		if (oChangeOrChangeContent instanceof Change) {
+			var oChange = oChangeOrChangeContent;
+			sFileType = oChange.getFileType();
+			sVariantReference = oChange.getVariantReference();
+			sSelectorId = oChange.getSelector() && oChange.getSelector().id;
+		} else {
+			var oChangeContent = oChangeOrChangeContent;
+			sFileType = oChangeContent.fileType;
+			sVariantManagementReference = oChangeContent.variantManagementReference;
+			sVariantReference = oChangeContent.variantReference;
+			sSelectorId = oChangeContent.selector && oChangeContent.selector.id;
+		}
 
 		var bControlVariantChange = false;
-		if ((oChangeContent.fileType === "ctrl_variant") || (oChangeContent.fileType === "ctrl_variant_change") || (oChangeContent.fileType === "ctrl_variant_management_change")) {
-			bControlVariantChange = oChangeContent.variantManagementReference || oChangeContent.variantReference || (oChangeContent.selector && oChangeContent.selector.id);
+		if ((sFileType === "ctrl_variant") || (sFileType === "ctrl_variant_change") || (sFileType === "ctrl_variant_management_change")) {
+			bControlVariantChange = sVariantManagementReference || sVariantReference || sSelectorId;
 		}
 
-		return oChangeContent.fileType === "change" || bControlVariantChange;
+		return sFileType === "change" || bControlVariantChange;
 	}
 
 	/**
@@ -298,15 +314,15 @@ sap.ui.define([
 	};
 
 	/**
-	 * Checks the current dependencies map for any unresolved dependencies belonging to the given control
-	 * Returns true as soon as the first dependency is found, otherwise false
+	 * Checks the current dependencies map for any open (unresolved) dependencies belonging to the given control
+	 * and returns the IDs of the open dependent changes.
 	 *
 	 * @param {object} oSelector selector of the control
 	 * @param {sap.ui.core.Component} oAppComponent - Application component instance that is currently loading
-	 * @returns {boolean} Returns true if there are open dependencies
+	 * @returns {sap.ui.fl.Change[]} Array of all open dependent changes for the control
 	 */
-	ChangePersistence.prototype.checkForOpenDependenciesForControl = function(oSelector, oAppComponent) {
-		return DependencyHandler.checkForOpenDependenciesForControl(this._mChanges, JsControlTreeModifier.getControlIdBySelector(oSelector, oAppComponent), oAppComponent);
+	ChangePersistence.prototype.getOpenDependentChangesForControl = function(oSelector, oAppComponent) {
+		return DependencyHandler.getOpenDependentChangesForControl(this._mChanges, JsControlTreeModifier.getControlIdBySelector(oSelector, oAppComponent), oAppComponent);
 	};
 
 	function getInitalDependencyClone(oChange) {
@@ -561,7 +577,7 @@ sap.ui.define([
 			if (bAlreadyDeletedViaCondense) {
 				this.removeChange(oChange);
 				// Remove also from Cache if the persisted change is still there (e.g. navigate away and back to the app)
-				Cache.deleteChange(this._mComponent, oChange.getDefinition());
+				Cache.deleteChange(this._mComponent, oChange.convertToFileContent());
 			} else {
 				this.deleteChange(oChange);
 			}
@@ -579,16 +595,20 @@ sap.ui.define([
 		return aUniqueProperties.length === 1;
 	}
 
-	function shouldCondensingBeEnabled(oAppComponent, aChanges) {
+	function canGivenChangesBeCondensed(oAppComponent, aChanges, bCondenseAnyLayer) {
 		var bCondenserEnabled = false;
 
 		if (!oAppComponent || aChanges.length < 2 || !checkIfOnlyOne(aChanges, "getLayer")) {
 			return false;
 		}
 
-		var sLayer = aChanges[0].getLayer();
-		if ([Layer.CUSTOMER, Layer.USER].includes(sLayer)) {
+		if (bCondenseAnyLayer) {
 			bCondenserEnabled = true;
+		} else {
+			var sLayer = aChanges[0].getLayer();
+			if ([Layer.CUSTOMER, Layer.USER].includes(sLayer)) {
+				bCondenserEnabled = true;
+			}
 		}
 
 		var oUriParameters = UriParameters.fromURL(window.location.href);
@@ -613,11 +633,10 @@ sap.ui.define([
 		this._deleteNotSavedChanges(aAllChanges, aCondensedChanges, bAlreadyDeletedViaCondense);
 	}
 
-	function getAllRelevantChangesForCondensing(aDirtyChanges, aDraftFilenames) {
-		if (!aDirtyChanges.length) {
+	function getAllRelevantChangesForCondensing(aDirtyChanges, aDraftFilenames, bCondenseAnyLayer, sLayer) {
+		if (!aDirtyChanges.length && !bCondenseAnyLayer) {
 			return [];
 		}
-		var sLayer = aDirtyChanges[0].getLayer();
 		var aPersistedAndSameLayerChanges = this._mChanges.aChanges.filter(function(oChange) {
 			if (sLayer === Layer.CUSTOMER && aDraftFilenames) {
 				return oChange.getState() === Change.states.PERSISTED && aDraftFilenames.includes(oChange.getId());
@@ -627,6 +646,15 @@ sap.ui.define([
 		return aPersistedAndSameLayerChanges.concat(aDirtyChanges);
 	}
 
+	function canSingleRequestBeUsed(aDirtyChanges) {
+		if (aDirtyChanges.length) {
+			var aRequests = getRequests(aDirtyChanges);
+			var aStates = getStates(aDirtyChanges);
+			return aStates.length === 1 && aRequests.length === 1 && aStates[0] === Change.states.NEW;
+		}
+		return true;
+	}
+
 	/**
 	 * Saves the passed or all dirty changes by calling the appropriate back-end method (create for new changes, deleteChange for deleted changes);
 	 * to ensure the correct order, the methods are called sequentially;
@@ -639,35 +667,35 @@ sap.ui.define([
 	 * therefore, the cache update of the current app is skipped because the dirty change is not saved for the running app.
 	 * @param {sap.ui.fl.Change} [aChanges] - If passed only those changes are saved
 	 * @param {string} sParentVersion - Parent version
-	 * @param {string[]} [aDraftFilenames] - Filesnames from persisted changes draft version
+	 * @param {string[]} [aDraftFilenames] - Filenames from persisted changes draft version
+	 * @param {boolean} [bCondenseAnyLayer] - This will enable condensing regardless of the current layer
+	 * @param {string} [sLayer] - Layer for which the changes should be saved
 	 * @returns {Promise} Resolving after all changes have been saved
 	 */
-	ChangePersistence.prototype.saveDirtyChanges = function(oAppComponent, bSkipUpdateCache, aChanges, sParentVersion, aDraftFilenames) {
+	ChangePersistence.prototype.saveDirtyChanges = function(oAppComponent, bSkipUpdateCache, aChanges, sParentVersion, aDraftFilenames, bCondenseAnyLayer, sLayer) {
 		var aDirtyChanges = aChanges || this._aDirtyChanges;
-		var aRelevantChangesForCondensing = getAllRelevantChangesForCondensing.call(this, aDirtyChanges, aDraftFilenames);
+		var sCurrentLayer = aDirtyChanges.length && aDirtyChanges[0].getLayer() || sLayer;
+		var aRelevantChangesForCondensing = getAllRelevantChangesForCondensing.call(this, aDirtyChanges, aDraftFilenames, bCondenseAnyLayer, sCurrentLayer);
 		var bIsCondensingEnabled = (
 			isBackendCondensingEnabled(aRelevantChangesForCondensing)
-			&& shouldCondensingBeEnabled(oAppComponent, aRelevantChangesForCondensing)
+			&& canGivenChangesBeCondensed(oAppComponent, aRelevantChangesForCondensing, bCondenseAnyLayer)
 		);
 		var aAllChanges = bIsCondensingEnabled ? aRelevantChangesForCondensing : aDirtyChanges;
 		var aChangesClone = aAllChanges.slice(0);
-		var aDirtyChangesClone = aDirtyChanges.slice(0);
 		var aRequests = getRequests(aDirtyChanges);
-		var aStates = getStates(aDirtyChanges);
 
-		if (aStates.length === 1 && aRequests.length === 1 && aStates[0] === Change.states.NEW) {
+		if (canSingleRequestBeUsed(aDirtyChanges)) {
 			var oCondensedChangesPromise = Promise.resolve(aChangesClone);
-			if (shouldCondensingBeEnabled(oAppComponent, aChangesClone)) {
+			if (canGivenChangesBeCondensed(oAppComponent, aChangesClone, bCondenseAnyLayer)) {
 				oCondensedChangesPromise = Condenser.condense(oAppComponent, aChangesClone);
 			}
 			return oCondensedChangesPromise.then(function(aCondensedChanges) {
 				var sRequest = aRequests[0];
-				var sLayer = aDirtyChanges[0].getLayer();
 				if (bIsCondensingEnabled) {
 					return Storage.condense({
 						allChanges: aAllChanges,
 						condensedChanges: aCondensedChanges,
-						layer: sLayer,
+						layer: sCurrentLayer,
 						transport: sRequest,
 						isLegacyVariant: false,
 						parentVersion: sParentVersion
@@ -678,7 +706,7 @@ sap.ui.define([
 				}
 				if (aCondensedChanges.length) {
 					return Storage.write({
-						layer: sLayer,
+						layer: sCurrentLayer,
 						flexObjects: prepareDirtyChanges(aCondensedChanges),
 						transport: sRequest,
 						isLegacyVariant: false,
@@ -692,7 +720,7 @@ sap.ui.define([
 			}.bind(this));
 		}
 
-		return this.saveSequenceOfDirtyChanges(aDirtyChangesClone, bSkipUpdateCache, sParentVersion);
+		return this.saveSequenceOfDirtyChanges(aDirtyChanges, bSkipUpdateCache, sParentVersion);
 	};
 
 	/**
@@ -732,13 +760,13 @@ sap.ui.define([
 				}
 				return Storage.write({
 					layer: oDirtyChange.getLayer(),
-					flexObjects: [oDirtyChange.getDefinition()],
+					flexObjects: [oDirtyChange.convertToFileContent()],
 					transport: oDirtyChange.getRequest(),
 					parentVersion: sParentVersion
 				});
 			case Change.states.DELETED:
 				return Storage.remove({
-					flexObject: oDirtyChange.getDefinition(),
+					flexObject: oDirtyChange.convertToFileContent(),
 					layer: oDirtyChange.getLayer(),
 					transport: oDirtyChange.getRequest(),
 					parentVersion: sParentVersion
@@ -967,7 +995,7 @@ sap.ui.define([
 				return false;
 			}
 
-			if (sGenerator && oChange.getDefinition().support.generator !== sGenerator) {
+			if (sGenerator && oChange.getSupportInformation().generator !== sGenerator) {
 				return false;
 			}
 

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

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.ChangePersistenceFactory
 	 * @experimental Since 1.27.0
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -7,11 +7,13 @@
 sap.ui.define([
 	"sap/ui/fl/Cache",
 	"sap/ui/fl/write/_internal/connectors/ObjectPathConnector",
-	"sap/ui/fl/apply/_internal/connectors/ObjectStorageUtils"
+	"sap/ui/fl/apply/_internal/connectors/ObjectStorageUtils",
+	"sap/ui/core/Configuration"
 ], function(
 	Cache,
 	ObjectPathConnector,
-	ObjectStorageUtils
+	ObjectStorageUtils,
+	Configuration
 ) {
 	"use strict";
 
@@ -40,7 +42,7 @@ sap.ui.define([
 	};
 
 	FakeLrepConnector.setFlexibilityServicesAndClearCache = function(sStorageConnectorName, sInitialComponentJsonPath) {
-		this._oFlexibilityServices = sap.ui.getCore().getConfiguration().getFlexibilityServices();
+		this._oFlexibilityServices = Configuration.getFlexibilityServices();
 
 		var aConnectorConfig = [];
 		if (sInitialComponentJsonPath) {
@@ -48,7 +50,7 @@ sap.ui.define([
 			aConnectorConfig.push({connector: "ObjectPathConnector"});
 		}
 		aConnectorConfig.push({connector: sStorageConnectorName});
-		sap.ui.getCore().getConfiguration().setFlexibilityServices(aConnectorConfig);
+		Configuration.setFlexibilityServices(aConnectorConfig);
 		Cache.clearEntries();
 	};
 
@@ -61,7 +63,7 @@ sap.ui.define([
 
 		// only reset the flexibility Services in case they were changes by the FakeConnector before
 		if (this._oFlexibilityServices) {
-			sap.ui.getCore().getConfiguration().setFlexibilityServices(this._oFlexibilityServices);
+			Configuration.setFlexibilityServices(this._oFlexibilityServices);
 			delete this._oFlexibilityServices;
 		}
 	};

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

@@ -20,7 +20,7 @@ function(
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @private
 	 * @since 1.48

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

@@ -20,7 +20,7 @@ function(
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @private
 	 * @since 1.58

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

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @private
 	 * @since 1.48

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

@@ -6,7 +6,6 @@
 
 sap.ui.define([
 	"sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerStorage",
-	"sap/ui/fl/write/api/Version",
 	"sap/ui/fl/Utils",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/Change",
@@ -21,7 +20,6 @@ sap.ui.define([
 	"sap/base/Log"
 ], function(
 	ChangeHandlerStorage,
-	Version,
 	Utils,
 	Layer,
 	Change,
@@ -86,7 +84,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.FlexController
 	 * @experimental Since 1.27.0
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 */
 	var FlexController = function(sComponentName) {
 		this._oChangePersistence = undefined;
@@ -465,10 +463,11 @@ sap.ui.define([
 	 * @param {boolean} [bDraft=false] - Indicates if changes should be written as a draft
 	 * @param {string} [sLayer] - Layer for which the changes should be saved
 	 * @param {boolean} [bRemoveOtherLayerChanges=false] - Whether to remove changes on other layers before saving
+	 * @param {boolean} [bCondenseAnyLayer] - This will enable condensing regardless of the current layer
 	 * @returns {Promise} resolving with an array of responses or rejecting with the first error
 	 * @public
 	 */
-	FlexController.prototype.saveAll = function(oAppComponent, bSkipUpdateCache, bDraft, sLayer, bRemoveOtherLayerChanges) {
+	FlexController.prototype.saveAll = function(oAppComponent, bSkipUpdateCache, bDraft, sLayer, bRemoveOtherLayerChanges, bCondenseAnyLayer) {
 		var sParentVersion;
 		var aDraftFilenames;
 		if (bDraft) {
@@ -480,7 +479,7 @@ sap.ui.define([
 			aDraftFilenames = oVersionModel.getProperty("/draftFilenames");
 		}
 		return this._removeOtherLayerChanges(oAppComponent, sLayer, bRemoveOtherLayerChanges)
-			.then(this._oChangePersistence.saveDirtyChanges.bind(this._oChangePersistence, oAppComponent, bSkipUpdateCache, undefined, sParentVersion, aDraftFilenames))
+			.then(this._oChangePersistence.saveDirtyChanges.bind(this._oChangePersistence, oAppComponent, bSkipUpdateCache, undefined, sParentVersion, aDraftFilenames, bCondenseAnyLayer, sLayer))
 			.then(function(oResult) {
 				if (bDraft && oResult && oResult.response) {
 					var vChangeDefinition = oResult.response;
@@ -546,10 +545,10 @@ sap.ui.define([
 	 *
 	 * @param {object} oSelector selector of the control
 	 * @param {sap.ui.core.Component} oComponent - component instance that is currently loading
-	 * @returns {boolean} Returns true if there are open dependencies
+	 * @returns {sap.ui.fl.Change[]} Array of all open dependent changes for the control
 	 */
-	FlexController.prototype.checkForOpenDependenciesForControl = function(oSelector, oComponent) {
-		return this._oChangePersistence.checkForOpenDependenciesForControl(oSelector, oComponent);
+	FlexController.prototype.getOpenDependentChangesForControl = function(oSelector, oComponent) {
+		return this._oChangePersistence.getOpenDependentChangesForControl(oSelector, oComponent);
 	};
 
 	/**

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.105.1
+	 * @version 1.107.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

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

@@ -41,7 +41,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.LayerUtils
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 */
 	var LayerUtils = {
 		_mLayersIndex: mLayersIndex,

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

@@ -6,6 +6,7 @@
 
 sap.ui.define([
 	"sap/base/strings/formatMessage",
+	"sap/base/util/ObjectPath",
 	"sap/base/util/isPlainObject",
 	"sap/base/util/uid",
 	"sap/base/util/UriParameters",
@@ -16,9 +17,11 @@ sap.ui.define([
 	"sap/ui/core/Component",
 	"sap/ui/fl/Scenario",
 	"sap/ui/thirdparty/hasher",
-	"sap/ui/thirdparty/jquery"
+	"sap/ui/core/mvc/View",
+	"sap/ui/core/Configuration"
 ], function(
 	formatMessage,
+	ObjectPath,
 	isPlainObject,
 	uid,
 	UriParameters,
@@ -29,7 +32,8 @@ sap.ui.define([
 	Component,
 	Scenario,
 	hasher,
-	jQuery
+	View,
+	Configuration
 ) {
 	"use strict";
 
@@ -39,7 +43,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.Utils
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.rta
@@ -346,7 +350,7 @@ sap.ui.define([
 		 * @ui5-restricted sap.ui.fl
 		 */
 		getViewForControl: function(oControl) {
-			return Utils.getFirstAncestorOfControlWithControlType(oControl, sap.ui.core.mvc.View);
+			return Utils.getFirstAncestorOfControlWithControlType(oControl, View);
 		},
 
 		getFirstAncestorOfControlWithControlType: function(oControl, controlType) {
@@ -410,7 +414,7 @@ sap.ui.define([
 		},
 
 		getLrepUrl: function() {
-			var aFlexibilityServices = sap.ui.getCore().getConfiguration().getFlexibilityServices();
+			var aFlexibilityServices = Configuration.getFlexibilityServices();
 			var oLrepConfiguration = aFlexibilityServices.find(function(oServiceConfig) {
 				return oServiceConfig.connector === "LrepConnector";
 			});
@@ -427,7 +431,7 @@ sap.ui.define([
 		 * @ui5-restricted sap.ui.fl
 		 */
 		getCurrentLanguage: function() {
-			var sLanguage = sap.ui.getCore().getConfiguration().getLanguage();
+			var sLanguage = Configuration.getLanguage();
 			return Utils.convertBrowserLanguageToISO639_1(sLanguage);
 		},
 
@@ -486,11 +490,9 @@ sap.ui.define([
 		asciiToString: function(ascii) {
 			var asciiArray = ascii.split(",");
 			var parsedString = "";
-
-			jQuery.each(asciiArray, function(index, asciiChar) {
-				parsedString += String.fromCharCode(asciiChar);
-			});
-
+			for (var i = 0; i < asciiArray.length; i++) {
+				parsedString += String.fromCharCode(asciiArray[i]);
+			}
 			return parsedString;
 		},
 
@@ -569,7 +571,8 @@ sap.ui.define([
 		 * @returns {object|undefined} Returns UShell container object if available or undefined
 		 */
 		getUshellContainer: function() {
-			return sap.ushell && sap.ushell.Container;
+			// TODO wait until  FLP does offer anything
+			return ObjectPath.get("sap.ushell.Container");
 		},
 
 		createDefaultFileName: function(sNameAddition) {
@@ -790,7 +793,7 @@ sap.ui.define([
 					}
 				})
 				.catch(function(e) {
-					var sErrorMessage = "Error during execPromiseQueueSequentially processing occured";
+					var sErrorMessage = "Error during execPromiseQueueSequentially processing occurred";
 					sErrorMessage += e ? ": " + e.message : "";
 					Log.error(sErrorMessage, e);
 

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @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/changes/Applier.js

@@ -140,7 +140,7 @@ sap.ui.define([
 
 	function _checkPreconditions(oChange, mPropertyBag) {
 		var sErrorMessage;
-		if (_isXmlModifier(mPropertyBag) && oChange.getDefinition().jsOnly) {
+		if (_isXmlModifier(mPropertyBag) && oChange.getJsOnly()) {
 			// change is not capable of xml modifier
 			// the change status has to be reset to initial
 			sErrorMessage = "Change cannot be applied in XML. Retrying in JS.";
@@ -184,8 +184,8 @@ sap.ui.define([
 
 		var sChangeId = oChange.getId();
 		var sLogMessage = "Change ''{0}'' could not be applied.";
-		var bErrorOccured = oError instanceof Error;
-		var sCustomDataIdentifier = FlexCustomData.getCustomDataIdentifier(false, bErrorOccured, bXmlModifier);
+		var bErrorOccurred = oError instanceof Error;
+		var sCustomDataIdentifier = FlexCustomData.getCustomDataIdentifier(false, bErrorOccurred, bXmlModifier);
 		switch (sCustomDataIdentifier) {
 			case FlexCustomData.notApplicableChangesCustomDataKey:
 				FlUtils.formatAndLogMessage("info", [sLogMessage, oError.message], [sChangeId]);
@@ -212,10 +212,9 @@ sap.ui.define([
 	}
 
 	function _logApplyChangeError(oError, oChange) {
-		var oDefinition = oChange.getDefinition();
-		var sChangeType = oDefinition.changeType;
-		var sTargetControlId = oDefinition.selector.id;
-		var fullQualifiedName = oDefinition.namespace + oDefinition.fileName + "." + oDefinition.fileType;
+		var sChangeType = oChange.getChangeType();
+		var sTargetControlId = oChange.getSelector().id;
+		var fullQualifiedName = oChange.getNamespace() + oChange.getId() + "." + oChange.getFileType();
 
 		var sWarningMessage = "A flexibility change could not be applied.";
 		sWarningMessage += "\nThe displayed UI might not be displayed as intedend.";

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.105.1
+	 * @version 1.107.0
 	 */
 	var FlexCustomData = {};
 	FlexCustomData.sync = {};

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.Utils
 	 * @since 1.70
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal, sap.ui.fl.write._internal
 	 */
@@ -49,11 +49,10 @@ sap.ui.define([
 		 */
 		getControlIfTemplateAffected: function (oChange, oControl, mPropertyBag) {
 			var oModifier = mPropertyBag.modifier;
-			var oChangeDefinition = oChange.getDefinition();
 			var mControl = {
 				originalControl: oControl
 			};
-			var oOriginalDependentSelector = oChangeDefinition.dependentSelector && oChangeDefinition.dependentSelector.originalSelector;
+			var oOriginalDependentSelector = oChange.getOriginalSelector();
 			if (oChange.getContent().boundAggregation && oOriginalDependentSelector) {
 				mControl.control = oModifier.bySelector(oOriginalDependentSelector, mPropertyBag.appComponent, mPropertyBag.view);
 				mControl.controlType = oModifier.getControlType(mControl.control);

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.105.1
+	 * @version 1.107.0
 	 * @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.105.1
+	 * @version 1.107.0
 	 * @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.105.1
+	 * @version 1.107.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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.105.1
+	 * @version 1.107.0
 	 * @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.105.1
+	 * @version 1.107.0
 	 * @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.105.1
+     * @version 1.107.0
      * @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.105.1
+	 * @version 1.107.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.fiori.SetAbstract
 	 * @experimental
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.fiori.SetRegistrationIds
 	 * @experimental
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */