@openui5/sap.ui.fl 1.123.1 → 1.124.0

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

@@ -6,16 +6,12 @@
 
 sap.ui.define([
 	"sap/base/Log",
-	"sap/base/util/merge",
 	"sap/base/util/restricted/_pick",
-	"sap/ui/fl/requireAsync",
-	"sap/ui/core/util/reflection/JsControlTreeModifier"
+	"sap/ui/fl/requireAsync"
 ], function(
 	Log,
-	merge,
 	_pick,
-	requireAsync,
-	JsControlTreeModifier
+	requireAsync
 ) {
 	"use strict";
 
@@ -26,292 +22,99 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.0
 	 *
 	 */
 	const DelegateMediator = {};
 
-	DelegateMediator._mDefaultDelegateItems = {};
-	DelegateMediator._mControlSpecificDelegateItems = {};
-	DelegateMediator.types = {
-		READONLY: "readonly",
-		WRITEONLY: "writeonly",
-		COMPLETE: "complete"
-	};
+	let mModelSpecificDelegateItems = {};
+	let mControlSpecificDelegateItems = {};
 
-	function getModelTypeForControl(oControl, sModelType) {
-		if (sModelType) {
-			return sModelType;
-		}
-		if (oControl.getModel) {
-			// get the default model
-			const oModel = oControl.getModel();
-			if (!oModel) {
-				return undefined;
-			}
-			return oModel.getMetadata().getName();
+	function getModelTypeForControl(oControl) {
+		const oModel = oControl.getModel?.();
+		if (!oModel) {
+			return undefined;
 		}
-		return undefined;
+		return oModel.getMetadata().getName();
 	}
 
-	function getDefaultDelegateInfo(oControl, sModelType) {
-		sModelType = getModelTypeForControl(oControl, sModelType);
-		const aDelegateInfo = DelegateMediator._mDefaultDelegateItems[sModelType];
-		return (aDelegateInfo || []).map(function(mDelegateInfo) {
-			mDelegateInfo.payload = {};
-			return mDelegateInfo;
-		});
+	function getModelSpecificDelegateInfo(oControl, sModelType) {
+		sModelType ||= getModelTypeForControl(oControl);
+		const mDelegateInfo = mModelSpecificDelegateItems[sModelType];
+		return mDelegateInfo;
 	}
 
-	async function getControlSpecificDelegateInfo(oModifier, oControl) {
+	async function getControlSpecificDelegateInfo(oControl, oModifier) {
 		const oControlMetadata = await oModifier.getControlMetadata(oControl);
-		const mDelegateInfo = DelegateMediator._mControlSpecificDelegateItems[oControlMetadata.getName()];
-		if (mDelegateInfo) {
-			mDelegateInfo.payload ||= {};
-		}
+		const mDelegateInfo = mControlSpecificDelegateItems[oControlMetadata.getName()];
 		return mDelegateInfo;
 	}
 
-	async function requireDelegatesAsync(oModifier, oControl, mDelegateInfo, aLoadedDelegates) {
-		try {
-			const oDelegate = await requireAsync(mDelegateInfo.name);
-			mDelegateInfo.instance = oDelegate || {};
-			aLoadedDelegates.push(mDelegateInfo);
-			return aLoadedDelegates;
-		} catch (oError) {
+	function requireDelegatesAsync(oControl, oModifier, mDelegateInfo) {
+		return requireAsync(mDelegateInfo.name)
+		.catch((oError) => {
 			Log.error(`Failed to load the delegate for the control ${oModifier.getId(oControl)}
 			${oError.message}`);
-			return aLoadedDelegates;
-		}
+			return undefined;
+		});
 	}
 
-	function loadDelegates(oModifier, oControl, aDelegates) {
-		if (!aDelegates.length) {
-			return Promise.resolve([]);
-		}
+	function loadDelegates(oControl, oModifier, aDelegates) {
 		const aPromises = [];
 		aDelegates.forEach(function(mDelegateInfo) {
-			aPromises.push(function(aLoadedDelegates) {
-				return requireDelegatesAsync(oModifier, oControl, mDelegateInfo, aLoadedDelegates);
-			});
-		});
-		return aPromises.reduce(function(oPreviousPromise, oCurrentPromise) {
-			return oPreviousPromise.then(oCurrentPromise);
-		}, Promise.resolve([]));
-	}
-
-	function isFunction(fn) {
-		return fn && typeof fn === "function";
-	}
-
-	function isCompleteDelegate(mDelegateInfo) {
-		return mDelegateInfo.delegateType === DelegateMediator.types.COMPLETE
-			|| (
-				isFunction(mDelegateInfo.instance.getPropertyInfo)
-				&& (isFunction(mDelegateInfo.instance.createLabel) || isFunction(mDelegateInfo.instance.createLayout))
-			);
-	}
-
-	function isReadOnlyDelegate(mDelegateInfo) {
-		return mDelegateInfo.delegateType === DelegateMediator.types.READONLY
-			|| isFunction(mDelegateInfo.instance.getPropertyInfo);
-	}
-
-	function isWriteOnlyDelegate(mDelegateInfo) {
-		return mDelegateInfo.delegateType === DelegateMediator.types.WRITEONLY
-			|| isFunction(mDelegateInfo.instance.createLabel)
-			|| isFunction(mDelegateInfo.instance.createLayout);
-	}
-
-	function assignCommonPart(mTargetDelegateInfo, mDelegateInfo) {
-		mTargetDelegateInfo.names.push(mDelegateInfo.name);
-		if (mDelegateInfo.requiredLibraries) {
-			mTargetDelegateInfo.requiredLibraries =	Object.assign(
-				mTargetDelegateInfo.requiredLibraries || {}, mDelegateInfo.requiredLibraries
-			);
-		}
-		if (mDelegateInfo.payload && !mTargetDelegateInfo.payload) {
-			// is available maximum once for instancespecific delegate
-			mTargetDelegateInfo.payload = mDelegateInfo.payload;
-		}
-		if (mDelegateInfo.delegateType) {
-			mTargetDelegateInfo.delegateType = mDelegateInfo.delegateType;
-		}
-		return mTargetDelegateInfo;
-	}
-
-	function assignReadPart(mTargetDelegateInfo, mDelegateInfo) {
-		mTargetDelegateInfo = assignCommonPart(mTargetDelegateInfo, mDelegateInfo);
-		return merge(mTargetDelegateInfo, { instance: _pick(
-			mDelegateInfo.instance, ["getPropertyInfo", "getRepresentedProperties"]
-		) });
-	}
-
-	function assignWritePart(mTargetDelegateInfo, mDelegateInfo) {
-		mTargetDelegateInfo = assignCommonPart(mTargetDelegateInfo, mDelegateInfo);
-		return merge(mTargetDelegateInfo, { instance: _pick(
-			mDelegateInfo.instance,	["createLabel", "createControlForProperty", "createLayout"]
-		) });
-	}
-
-	function assignCompleteDelegate(mTargetDelegateInfo, mDelegateInfo) {
-		mTargetDelegateInfo = assignCommonPart(mTargetDelegateInfo, mDelegateInfo);
-		return merge(mTargetDelegateInfo, _pick(mDelegateInfo, "instance"));
-	}
-
-	function mergeDelegates(aDelegates) {
-		// check from in reverted order whether the read and or the write part is available
-		// build a new object that consists of the read and the write part probably of more than one delegate
-		 let mResultDelegateInfo = {
-			names: [],
-			instance: {},
-			modelType: aDelegates.length && aDelegates[0].modelType
-		};
-		let bReadPartMissing = true;
-		let bWritePartMissing = true;
-		for (let i = (aDelegates.length - 1); i >= 0; i--) {
-			const mDelegateInfo = aDelegates[i];
-			if (isCompleteDelegate(mDelegateInfo)) {
-				if (bReadPartMissing && bWritePartMissing) {
-					mResultDelegateInfo = assignCompleteDelegate(mResultDelegateInfo, mDelegateInfo);
-				} else if (bReadPartMissing) {
-					mResultDelegateInfo = assignReadPart(mResultDelegateInfo, mDelegateInfo);
-				} else if (bWritePartMissing) {
-					mResultDelegateInfo = assignWritePart(mResultDelegateInfo, mDelegateInfo);
-				}
-				break;
-			} else if (isReadOnlyDelegate(mDelegateInfo) && bReadPartMissing) {
-				mResultDelegateInfo = assignReadPart(mResultDelegateInfo, mDelegateInfo);
-				bReadPartMissing = false;
-			} else if (isWriteOnlyDelegate(mDelegateInfo) && bWritePartMissing) {
-				mResultDelegateInfo = assignWritePart(mResultDelegateInfo, mDelegateInfo);
-				bWritePartMissing = false;
-			}
-		}
-		return aDelegates.length ? mResultDelegateInfo : undefined;
-	}
-
-	function validateInputParameters(oControl, oModifier) {
-		return new Promise(function(resolve, reject) {
-			if (!oControl) {
-				reject(new Error("The control parameter is missing"));
-			}
-			if (!oModifier) {
-				reject(new Error("The modifier parameter is missing"));
-			}
-			if (!oControl) {
-				reject(new Error("The input control should be available"));
+			if (mDelegateInfo) {
+				aPromises.push(
+					async function() {
+						const oDelegate = await requireDelegatesAsync(oControl, oModifier, mDelegateInfo);
+						if (oDelegate) {
+							mDelegateInfo.instance = oDelegate || {};
+							return mDelegateInfo;
+						}
+						return undefined;
+					}()
+				);
+			} else {
+				aPromises.push(Promise.resolve());
 			}
-			if (
-				oModifier === JsControlTreeModifier
-				&& (!oControl.isA || !oControl.isA("sap.ui.base.ManagedObject"))
-			) {
-				reject(new Error("The input control should be a managed object"));
-			}
-			resolve();
 		});
+		return Promise.all(aPromises);
 	}
 
-	function isValidType(mPropertyBag) {
-		return Object.values(DelegateMediator.types).some(function(sDelegateMediatorType) {
-			return sDelegateMediatorType === mPropertyBag.delegateType;
-		});
-	}
-
-	function isCompetingDelegateAlreadyRegistered(mPropertyBag) {
-		const aDefaultDelegates = DelegateMediator._mDefaultDelegateItems[mPropertyBag.modelType] || [];
-		const aDefaultDelegateTypes = aDefaultDelegates.map(function(mDefaultDelegateInfo) {
-			return mDefaultDelegateInfo.delegateType;
-		});
-		return aDefaultDelegateTypes.indexOf(DelegateMediator.types.COMPLETE) > -1
-			|| aDefaultDelegateTypes.indexOf(mPropertyBag.delegateType) > -1
-			|| (mPropertyBag.delegateType === DelegateMediator.types.COMPLETE && aDefaultDelegateTypes.length);
-	}
-
-	DelegateMediator.getKnownDefaultDelegateLibraries = function() {
-		return ["sap.ui.comp"]; // OdataV2Delegate is defined in sap.ui.comp
-	};
-
-	/**
-	 * Returns a list of required libraries for the given default delegate.
-	 * If it is not a default delegate, an empty list is returned.
-	 *
-	 * @param {string} aDelegateNames - List of delegate names
-	 * @param {sap.ui.core.Element} oControl - Control for which the corresponding delegate was returned
-	 * @param {string} [sModelType] - Model type, if none is provided the default model of oControl is taken instead
-	 * @returns {string[]} Required libraries
-	 */
-	DelegateMediator.getRequiredLibrariesForDefaultDelegate = function(aDelegateNames, oControl, sModelType) {
-		sModelType = getModelTypeForControl(oControl, sModelType);
-		const aDelegateInfo = DelegateMediator._mDefaultDelegateItems[sModelType] || [];
-		return aDelegateInfo.reduce(function(aRequiredLibNames, mDelegateInfo) {
-			const bIsDefaultDelegate = aDelegateNames.indexOf(mDelegateInfo.name) > -1;
-			return aRequiredLibNames.concat(Object.keys((bIsDefaultDelegate && mDelegateInfo.requiredLibraries) || {}));
-		}, []);
-	};
-
-	/**
-	 * Checks if there is already a registered delegate available for the given model type
-	 * or control type in case of control specific delegates.
-	 *
-	 * @param {string} sKeyType - Delegate model or control type
-	 * @returns {boolean} <code>true</code> if a delegate is already registered for the model or control type
-	 */
-	DelegateMediator.isDelegateRegistered = function(sKeyType) {
-		return !!DelegateMediator._mDefaultDelegateItems[sKeyType]
-			|| !!DelegateMediator._mControlSpecificDelegateItems[sKeyType];
-	};
-
 	/**
-	 * Register default delegate by the model type.
+	 * Register model-specific read delegate by the model type.
 	 *
-	 * @param {object} mPropertyBag - Property bag for default delegate
-	 * @param {object} mPropertyBag.modelType - Default delegate model type
-	 * @param {object} mPropertyBag.delegate - Path to default delegate
-	 * @param {object} mPropertyBag.delegateType - Defines the type of the default delegate. Please look at <code>DelegageMediator.types</code> for possible entries
-	 * @param {object} [mPropertyBag.requiredLibraries] - map of required libraries
+	 * @param {object} mPropertyBag - Property bag for read delegate
+	 * @param {object} mPropertyBag.modelType - Read delegate model type
+	 * @param {object} mPropertyBag.delegate - Path to read delegate
 	 */
-	DelegateMediator.registerDefaultDelegate = function(mPropertyBag) {
+	DelegateMediator.registerReadDelegate = function(mPropertyBag) {
 		if (!(mPropertyBag.modelType && mPropertyBag.delegate)) {
 			throw new Error("'modelType' and 'delegate' properties are required for registration!");
 		}
-		mPropertyBag.delegateType ||= DelegateMediator.types.COMPLETE;
-		if (mPropertyBag.delegateType && !isValidType(mPropertyBag)) {
-			throw new Error(`default 'delegateType': ${mPropertyBag.delegateType} is invalid!`);
-		}
-		// No overriding of compete delegates possible
-		if (isCompetingDelegateAlreadyRegistered(mPropertyBag)) {
-			throw new Error(`modelType ${mPropertyBag.modelType}is already defined!`);
+		// No overriding of read delegates possible
+		if (mModelSpecificDelegateItems[mPropertyBag.modelType]) {
+			throw new Error(`modelType ${mPropertyBag.modelType} is already defined!`);
 		}
-		DelegateMediator._mDefaultDelegateItems[mPropertyBag.modelType] ||= [];
-		DelegateMediator._mDefaultDelegateItems[mPropertyBag.modelType].push({
+		mModelSpecificDelegateItems[mPropertyBag.modelType] = {
 			name: mPropertyBag.delegate,
-			requiredLibraries: mPropertyBag.requiredLibraries,
-			delegateType: mPropertyBag.delegateType,
 			modelType: mPropertyBag.modelType
-		});
+		};
 	};
 
 	/**
-	 * Registers a control specific delegate by control type.
+	 * Registers a control-specific write delegate by control type.
 	 *
-	 * @param {object} mPropertyBag - Property bag for control specific delegate
-	 * @param {object} mPropertyBag.controlType - control type
-	 * @param {object} mPropertyBag.delegate - path to control specific delegate
-	 * @param {object} mPropertyBag.delegateType - Defines the type of the control specific delegate.
-	 * Please look at <code>DelegageMediator.types</code> for possible entries
-	 * @param {object} [mPropertyBag.requiredLibraries] - map of required libraries
-	 * @param {object} [mPropertyBag.payload] - payload for the delegate
+	 * @param {object} mPropertyBag - Property bag for control-specific delegate
+	 * @param {object} mPropertyBag.controlType - Control type
+	 * @param {object} mPropertyBag.delegate - path to control-specific delegate
+	 * @param {object} [mPropertyBag.requiredLibraries] - Map of required libraries
+	 * @param {object} [mPropertyBag.payload] - Payload for the delegate
 	 */
-	DelegateMediator.registerControlSpecificDelegate = function(mPropertyBag) {
+	DelegateMediator.registerWriteDelegate = function(mPropertyBag) {
 		if (!(mPropertyBag.controlType && mPropertyBag.delegate)) {
 			throw new Error("'controlType' and 'delegate' properties are required for registration!");
 		}
-		mPropertyBag.delegateType ||= DelegateMediator.types.WRITEONLY;
-		if (mPropertyBag.delegateType && !isValidType(mPropertyBag)) {
-			throw new Error(`Control '${mPropertyBag.controlType}' specific delegateType: ${mPropertyBag.delegateType} is invalid!`);
-		}
-		DelegateMediator._mControlSpecificDelegateItems[mPropertyBag.controlType] = {
+		mControlSpecificDelegateItems[mPropertyBag.controlType] = {
 			name: mPropertyBag.delegate,
 			requiredLibraries: mPropertyBag.requiredLibraries,
 			delegateType: mPropertyBag.delegateType,
@@ -320,35 +123,75 @@ sap.ui.define([
 		};
 	};
 
+	function finalizeReadDelegateInfo(mDelegateInfo) {
+		return mDelegateInfo
+			? {
+				...mDelegateInfo,
+				modelType: mDelegateInfo.modelType || mDelegateInfo.payload?.modelType,
+				instance: _pick(mDelegateInfo.instance, ["getPropertyInfo", "getRepresentedProperties"])
+			}
+			: undefined;
+	}
+
 	/**
-	 * Returns the delegate object for the requested control.
+	 * Returns the model-specific read delegate for the requested control.
+	 * The instance-spcific read delegate is returned if available.
 	 *
 	 * @param {sap.ui.core.Element} oControl - Control for which the corresponding delegate should be returned
 	 * @param {sap.ui.core.util.reflection.BaseTreeModifier} oModifier - Control tree modifier
-	 * @param {string} sModelType - Model type; required in case you passed the <code>XmlTreeModifier</code>
-	 * @param {boolean} [bSupportsDefault] - Include default delegate if no instance specific delegate is available
+	 * @param {string} [sModelType] - Model type; required in case you passed the <code>XmlTreeModifier</code>
 	 * @returns {Promise.<sap.ui.core.util.reflection.FlexDelegateInfo>} Delegate information including the lazy loaded instance of the delegate
 	 */
-	DelegateMediator.getDelegateForControl = async function(oControl, oModifier, sModelType, bSupportsDefault) {
-		await validateInputParameters(oControl, oModifier);
+	DelegateMediator.getReadDelegateForControl = async function(oControl, oModifier, sModelType) {
+		let mModelSpecificDelegateInfo = getModelSpecificDelegateInfo(oControl, sModelType);
+		let mInstanceSpecificDelegateInfo = oModifier.getFlexDelegate(oControl);
+		[mInstanceSpecificDelegateInfo, mModelSpecificDelegateInfo] = await loadDelegates(oControl, oModifier, [
+			mInstanceSpecificDelegateInfo,
+			mModelSpecificDelegateInfo
+		]);
+		return mInstanceSpecificDelegateInfo?.instance.getPropertyInfo
+			? finalizeReadDelegateInfo(mInstanceSpecificDelegateInfo)
+			: finalizeReadDelegateInfo(mModelSpecificDelegateInfo);
+	};
 
-		const aDelegateInfo = (bSupportsDefault && getDefaultDelegateInfo(oControl, sModelType)) || [];
-		const mControlSpecificDelegate = await getControlSpecificDelegateInfo(oModifier, oControl);
-		if (mControlSpecificDelegate) {
-			aDelegateInfo.push(mControlSpecificDelegate);
-		}
-		const mInstanceSpecificDelegate = await oModifier.getFlexDelegate(oControl);
-		if (mInstanceSpecificDelegate) {
-			// instance specific delegate always takes over
-			aDelegateInfo.push(mInstanceSpecificDelegate);
-		}
-		const aDelegates = await loadDelegates(oModifier, oControl, aDelegateInfo);
-		return mergeDelegates(aDelegates);
+	function finalizeWriteDelegateInfo(mDelegateInfo, oControl) {
+		return mDelegateInfo
+			? {
+				...mDelegateInfo,
+				controlType: mDelegateInfo.controlType || oControl.getMetadata?.().getName(),
+				instance: _pick(mDelegateInfo.instance, ["createLabel", "createControlForProperty", "createLayout"])
+			}
+			: undefined;
+	}
+
+	/**
+	 * Returns the write delegate for the requested control.
+	 * The instance-specific write delegate is returned if available.
+	 *
+	 * @param {sap.ui.core.Element} oControl - Control for which the corresponding delegate should be returned
+	 * @param {sap.ui.core.util.reflection.BaseTreeModifier} oModifier - Control tree modifier
+	 * @returns {Promise.<sap.ui.core.util.reflection.FlexDelegateInfo>} Delegate information including the lazy loaded instance of the delegate. Undefined if delegate couldn't be loaded.
+	 */
+	DelegateMediator.getWriteDelegateForControl = async function(oControl, oModifier) {
+		let mControlSpecificDelegateInfo = await getControlSpecificDelegateInfo(oControl, oModifier);
+		let mInstanceSpecificDelegateInfo = oModifier.getFlexDelegate(oControl);
+		[mInstanceSpecificDelegateInfo, mControlSpecificDelegateInfo] = await loadDelegates(oControl, oModifier, [
+			mInstanceSpecificDelegateInfo,
+			mControlSpecificDelegateInfo
+		]);
+		return (mInstanceSpecificDelegateInfo?.instance.createLabel
+			|| mInstanceSpecificDelegateInfo?.instance.createLayout)
+			? finalizeWriteDelegateInfo(mInstanceSpecificDelegateInfo, oControl)
+			: finalizeWriteDelegateInfo(mControlSpecificDelegateInfo, oControl);
 	};
 
+	/**
+	 * Clears the model and control-specific delegate items.
+	 * This method is used for testing purposes.
+	 */
 	DelegateMediator.clear = function() {
-		DelegateMediator._mDefaultDelegateItems = {};
-		DelegateMediator._mControlSpecificDelegateItems = {};
+		mModelSpecificDelegateItems = {};
+		mControlSpecificDelegateItems = {};
 	};
 
 	return DelegateMediator;

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

@@ -58,7 +58,8 @@ sap.ui.define([
 				"appdescr_card",
 				"appdescr_card_designtime",
 				"appdescr_fiori_setAbstract",
-				"appdescr_fe_changePageConfiguration"
+				"appdescr_fe_changePageConfiguration",
+				"appdescr_ui5_changeModel"
 			];
 		},
 		getCondensableChangeTypes() {

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

@@ -85,7 +85,7 @@ sap.ui.define([
 		return mPropertyBag.modifier.targets === "xmlTree";
 	}
 
-	function checkAndAdjustChangeStatus(oControl, oChange, mPropertyBag) {
+	function checkAndAdjustChangeStatus(oControl, oChange, mPropertyBag, bSkipDependencies) {
 		// in case of changes in templates, the original control is not always available at this point
 		// example: rename on a control created by a change inside a template
 		var oOriginalControl = Utils.getControlIfTemplateAffected(oChange, oControl, mPropertyBag).control;
@@ -98,7 +98,7 @@ sap.ui.define([
 		if (bChangeStatusAppliedFinished && !bIsCurrentlyAppliedOnControl) {
 			// if a change was already processed and is not applied anymore, then the control was destroyed and recreated.
 			// In this case we need to recreate/copy the dependencies if we are applying in JS
-			if (!isXmlModifier(mPropertyBag)) {
+			if (!bSkipDependencies) {
 				UIChangesState.copyDependenciesFromCompleteDependencyMap(oChange, mPropertyBag.appComponent);
 			}
 			oChange.setInitialApplyState();
@@ -381,6 +381,39 @@ sap.ui.define([
 		});
 	};
 
+	/**
+	 * Applies a given array of changes sequentially. If the change was successfully applied it is added to the LiveDependencyMap.
+	 *
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} aChanges - FlexObjects to be applied
+	 * @param {object} mPropertyBag - Object with parameters as properties
+	 * @param {object} mPropertyBag.reference - Flex reference
+	 * @param {object} mPropertyBag.appComponent - App Component instance
+	 * @returns {Promise} Resolves after all changes were applied
+	 */
+	Applier.applyMultipleChanges = function(aChanges, mPropertyBag) {
+		mPropertyBag.modifier = JsControlTreeModifier;
+		const aPromises = aChanges.map(function(oChange) {
+			const oControl = JsControlTreeModifier.bySelector(oChange.getSelector(), mPropertyBag.appComponent);
+			if (oControl) {
+				checkAndAdjustChangeStatus(oControl, oChange, mPropertyBag, true);
+				if (!oChange.isApplyProcessFinished()) {
+					oChange.setQueuedForApply();
+				}
+				return function() {
+					return Applier.applyChangeOnControl(oChange, oControl, mPropertyBag)
+					.then(function(oResult) {
+						if (oResult.success) {
+							const oLiveDependencyMap = UIChangesState.getLiveDependencyMap(mPropertyBag.reference);
+							DependencyHandler.addRuntimeChangeToMap(oChange, mPropertyBag.appComponent, oLiveDependencyMap);
+						}
+					});
+				};
+			}
+			return () => Promise.resolve();
+		});
+		return FlUtils.execPromiseQueueSequentially(aPromises);
+	};
+
 	/**
 	 * Gets the dependency map and gets all changes for that control from the map, then, depending on
 	 * dependencies, directly applies the change or saves the callback to apply in the dependency.
@@ -460,7 +493,7 @@ sap.ui.define([
 			.then(function(oChangeHandler) {
 				mPropertyBag.changeHandler = oChangeHandler;
 				oChange.setQueuedForApply();
-				checkAndAdjustChangeStatus(oControl, oChange, mPropertyBag);
+				checkAndAdjustChangeStatus(oControl, oChange, mPropertyBag, true);
 
 				if (!oChange.isApplyProcessFinished()) {
 					if (typeof mPropertyBag.changeHandler.onAfterXMLChangeProcessing === "function") {

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

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @since 1.61.0
 	 * @private
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.0
 	 */
 	var FlexCustomData = {};
 

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.123.1
+	 * @version 1.124.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal, sap.ui.fl.write._internal
 	 */

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

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

@@ -135,7 +135,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.app.AddAnnotationsToOData
 	 * @since 1.87
-	 * @version 1.123.1
+	 * @version 1.124.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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

@@ -34,7 +34,7 @@ sap.ui.define([
 	*
 	* @namespace
 	* @alias sap.ui.fl.apply._internal.changes.descriptor.app.AddNewInbound
-	* @version 1.123.1
+	* @version 1.124.0
 	* @private
 	* @ui5-restricted sap.ui.fl.apply._internal
 	*/

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

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

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

@@ -31,7 +31,7 @@ sap.ui.define([
 	*
 	* @namespace
 	* @alias sap.ui.fl.apply._internal.changes.descriptor.app.ChangeInbound
-	* @version 1.123.1
+	* @version 1.124.0
 	* @private
 	* @ui5-restricted sap.ui.fl.apply._internal
 	*/

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

@@ -44,7 +44,7 @@ sap.ui.define([
      *
      * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.app.RemoveAllInboundsExceptOne
-     * @version 1.123.1
+     * @version 1.124.0
      * @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.123.1
+	 * @version 1.124.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
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.fiori.SetAbstract
-	 * @version 1.123.1
+	 * @version 1.124.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
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.fiori.SetRegistrationIds
-	 * @version 1.123.1
+	 * @version 1.124.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */