@openui5/sap.ui.fl 1.115.0 → 1.116.0

package/src/sap/ui/fl/apply/_internal/flexState/changes/ExtensionPointState.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.ExtensionPointState
 	 * @experimental Since 1.79
 	 * @since 1.79
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -98,9 +98,9 @@ sap.ui.define([
 			return Promise.resolve([]);
 		}
 		return oChangePersistence.getChangesForComponent()
-			.then(function(aChanges) {
-				return aChanges.filter(isChangeValidForExtensionPoint.bind(undefined, mPropertyBag));
-			});
+		.then(function(aChanges) {
+			return aChanges.filter(isChangeValidForExtensionPoint.bind(undefined, mPropertyBag));
+		});
 	};
 
 	/**
@@ -117,61 +117,61 @@ sap.ui.define([
 	 * @private
 	 * @ui5-restricted
 	 */
-	ExtensionPointState.enhanceExtensionPointChanges = function (mPropertyBag, mExtensionPointInfo) {
+	ExtensionPointState.enhanceExtensionPointChanges = function(mPropertyBag, mExtensionPointInfo) {
 		mPropertyBag.extensionPointName = mExtensionPointInfo.name;
 		var oChangePersistence = ChangePersistenceFactory.getChangePersistenceForControl(mExtensionPointInfo.targetControl);
 
 		return ExtensionPointState.getChangesForExtensionPoint(oChangePersistence, mPropertyBag)
-			.then(function (aChanges) {
-				var aPromises = [];
-				aChanges.forEach(function (oChange) {
-					//Only continue process if the change has not been applied, such as in case of XMLPreprocessing of an async view
-					if (oChange.isInInitialState() && !(oChange.getExtensionPointInfo && oChange.getExtensionPointInfo())) {
-						oChange.setExtensionPointInfo(mExtensionPointInfo);
+		.then(function(aChanges) {
+			var aPromises = [];
+			aChanges.forEach(function(oChange) {
+				// Only continue process if the change has not been applied, such as in case of XMLPreprocessing of an async view
+				if (oChange.isInInitialState() && !(oChange.getExtensionPointInfo && oChange.getExtensionPointInfo())) {
+					oChange.setExtensionPointInfo(mExtensionPointInfo);
 
-						//Set correct selector from extension point targetControl's ID
-						replaceChangeSelector(oChange, mExtensionPointInfo, false);
+					// Set correct selector from extension point targetControl's ID
+					replaceChangeSelector(oChange, mExtensionPointInfo, false);
 
-						//If the component creation is async, the changesMap already created without changes on EP --> it need to be updated
-						//Otherwise, update the selector of changes is enough, change map will be created later correctly
-						if (oChangePersistence.isChangeMapCreated()) {
-							oChangePersistence.addChangeAndUpdateDependencies(mPropertyBag.appComponent, oChange);
-						}
-					} else if (isValidForRuntimeOnlyChanges(oChange, mExtensionPointInfo)) {
-						//Change is applied but we need to create additional runtime only changes
-						//in case of duplicate extension points with different fragment id (fragment as template)
-						var oChangeFileContent = oChange.convertToFileContent();
-						var oChangeContent = oChange.getContent();
-						var mChangeSpecificData = _omit(oChangeFileContent, ["dependentSelector", "fileName", "selector", "content"]);
-						Object.keys(oChangeContent).forEach(function (sKey) {
-							mChangeSpecificData[sKey] = oChangeContent[sKey];
-						});
-						mChangeSpecificData.support.sourceChangeFileName = oChange.getId() || "";
-						aPromises.push(ChangesWriteAPI.create({
-							changeSpecificData: mChangeSpecificData,
-							selector: {
-								view: mExtensionPointInfo.view,
-								name: mExtensionPointInfo.name
-							}
-						})
-							.then(function (oRuntimeOnlyChange) {
-								//Set correct selector from extension point targetControl's ID
-								replaceChangeSelector(oRuntimeOnlyChange, mExtensionPointInfo, true);
-								oRuntimeOnlyChange.setExtensionPointInfo(mExtensionPointInfo);
-								var oFlexObjectMetadata = oRuntimeOnlyChange.getFlexObjectMetadata();
-								oFlexObjectMetadata.moduleName = oChange.getFlexObjectMetadata().moduleName;
-								oRuntimeOnlyChange.setFlexObjectMetadata(oFlexObjectMetadata);
-								oRuntimeOnlyChange.setCreation(oChange.getCreation());
-								oChangePersistence.addChangeAndUpdateDependencies(mPropertyBag.appComponent, oRuntimeOnlyChange, oChange);
-							})
-						);
+					// If the component creation is async, the changesMap already created without changes on EP --> it need to be updated
+					// Otherwise, update the selector of changes is enough, change map will be created later correctly
+					if (oChangePersistence.isChangeMapCreated()) {
+						oChangePersistence.addChangeAndUpdateDependencies(mPropertyBag.appComponent, oChange);
 					}
-				});
-				return Promise.all(aPromises)
-					.then(function () {
-						return aChanges;
+				} else if (isValidForRuntimeOnlyChanges(oChange, mExtensionPointInfo)) {
+					// Change is applied but we need to create additional runtime only changes
+					// in case of duplicate extension points with different fragment id (fragment as template)
+					var oChangeFileContent = oChange.convertToFileContent();
+					var oChangeContent = oChange.getContent();
+					var mChangeSpecificData = _omit(oChangeFileContent, ["dependentSelector", "fileName", "selector", "content"]);
+					Object.keys(oChangeContent).forEach(function(sKey) {
+						mChangeSpecificData[sKey] = oChangeContent[sKey];
 					});
+					mChangeSpecificData.support.sourceChangeFileName = oChange.getId() || "";
+					aPromises.push(ChangesWriteAPI.create({
+						changeSpecificData: mChangeSpecificData,
+						selector: {
+							view: mExtensionPointInfo.view,
+							name: mExtensionPointInfo.name
+						}
+					})
+					.then(function(oRuntimeOnlyChange) {
+						// Set correct selector from extension point targetControl's ID
+						replaceChangeSelector(oRuntimeOnlyChange, mExtensionPointInfo, true);
+						oRuntimeOnlyChange.setExtensionPointInfo(mExtensionPointInfo);
+						var oFlexObjectMetadata = oRuntimeOnlyChange.getFlexObjectMetadata();
+						oFlexObjectMetadata.moduleName = oChange.getFlexObjectMetadata().moduleName;
+						oRuntimeOnlyChange.setFlexObjectMetadata(oFlexObjectMetadata);
+						oRuntimeOnlyChange.setCreation(oChange.getCreation());
+						oChangePersistence.addChangeAndUpdateDependencies(mPropertyBag.appComponent, oRuntimeOnlyChange, oChange);
+					})
+					);
+				}
+			});
+			return Promise.all(aPromises)
+			.then(function() {
+				return aChanges;
 			});
+		});
 	};
 
 	return ExtensionPointState;

package/src/sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger.js

@@ -16,13 +16,13 @@ sap.ui.define([
 	"use strict";
 
 	var mChangeHandlers = {
-		addFavorite: function (oVariant) {
+		addFavorite: function(oVariant) {
 			oVariant.setFavorite(true);
 		},
-		removeFavorite: function (oVariant) {
+		removeFavorite: function(oVariant) {
 			oVariant.setFavorite(false);
 		},
-		updateVariant: function (oVariant, oChange) {
+		updateVariant: function(oVariant, oChange) {
 			var oChangeContent = oChange.getContent();
 			if (oChangeContent.executeOnSelection !== undefined) {
 				oVariant.setExecuteOnSelection(oChangeContent.executeOnSelection);
@@ -33,6 +33,9 @@ sap.ui.define([
 			if (oChangeContent.contexts) {
 				oVariant.setContexts(oChangeContent.contexts);
 			}
+			if (oChangeContent.visible !== undefined) {
+				oVariant.setVisible(oChangeContent.visible);
+			}
 
 			if (oChangeContent.variantContent) {
 				oVariant.setContent(oChangeContent.variantContent, /* bSkipStateChange = */ true);
@@ -42,7 +45,7 @@ sap.ui.define([
 				oVariant.setName(sVariantName, /* bSkipStateChange = */ true);
 			}
 		},
-		standardVariant: function (oVariant, oChange) {
+		standardVariant: function(oVariant, oChange) {
 			// legacy change on standard variants
 			oVariant.setExecuteOnSelection(oChange.getContent().executeOnSelect);
 		}
@@ -51,7 +54,7 @@ sap.ui.define([
 	function getChangesMappedByVariant(mCompVariants) {
 		var mChanges = {};
 
-		mCompVariants.changes.forEach(function (oChange) {
+		mCompVariants.changes.forEach(function(oChange) {
 			var sVariantId = oChange.getSelector().variantId || oChange.getContent().key;
 			if (!mChanges[sVariantId]) {
 				mChanges[sVariantId] = [];
@@ -109,7 +112,7 @@ sap.ui.define([
 	function applyChangesOnVariant(mChanges, oVariant) {
 		var sVariantId = oVariant.getVariantId();
 		if (mChanges[sVariantId]) {
-			mChanges[sVariantId].forEach(function (oChange) {
+			mChanges[sVariantId].forEach(function(oChange) {
 				applyChangeOnVariant(oVariant, oChange);
 			});
 		}
@@ -121,18 +124,18 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.compVariants.CompVariantMerger
 	 * @since 1.86
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
 	return {
-		merge: function (sPersistencyKey, mCompData, oStandardVariantInput) {
+		merge: function(sPersistencyKey, mCompData, oStandardVariantInput) {
 			var aVariants = mCompData.nonPersistedVariants.concat(mCompData.variants);
 			var mChanges = getChangesMappedByVariant(mCompData);
 
 			// check for an overwritten standard variant
 			var oStandardVariant;
-			aVariants.forEach(function (oVariant) {
+			aVariants.forEach(function(oVariant) {
 				if (oVariant.getContent() && oVariant.getContent().standardvariant) {
 					oStandardVariant = oVariant;
 				}
@@ -143,13 +146,25 @@ sap.ui.define([
 				oStandardVariant = createVariant(sPersistencyKey, oStandardVariantInput);
 			} else {
 				// remove all standard variant entries
-				aVariants = aVariants.filter(function (oVariant) {
+				aVariants = aVariants.filter(function(oVariant) {
 					return !oVariant.getContent() || !oVariant.getContent().standardvariant;
 				});
 			}
+
 			// apply all changes on non-standard variants
 			aVariants.forEach(applyChangesOnVariant.bind(undefined, mChanges));
 
+			// Remove all invisible variants
+			aVariants = aVariants.filter(function(oVariant) {
+				var bVisible = oVariant.getVisible();
+				if (!bVisible) {
+					var sVariantId = oVariant.getId();
+					delete mChanges[sVariantId];
+					delete mCompData.byId[sVariantId];
+				}
+				return bVisible;
+			});
+
 			// the standard must always be visible
 			oStandardVariant.setFavorite(true);
 			oStandardVariant.setStandardVariant(true);
@@ -159,7 +174,7 @@ sap.ui.define([
 			if (oStandardVariantChange) {
 				mChanges[oStandardVariant.getVariantId()] = mChanges[oStandardVariant.getVariantId()] || [];
 				mChanges[oStandardVariant.getVariantId()].push(oStandardVariantChange);
-				mChanges[oStandardVariant.getVariantId()].sort(function (a, b) {
+				mChanges[oStandardVariant.getVariantId()].sort(function(a, b) {
 					if (a.getCreation() < b.getCreation()) {
 						return -1;
 					}
@@ -173,7 +188,6 @@ sap.ui.define([
 
 			mCompData.standardVariant = oStandardVariant;
 
-
 			return {
 				standardVariant: oStandardVariant,
 				variants: aVariants
@@ -186,7 +200,7 @@ sap.ui.define([
 		 *
 		 * @function
 		 * @since 1.89
-		 * @version 1.115.0
+		 * @version 1.116.0
 		 * @private
 		 * @ui5-restricted sap.ui.fl
 		 *

package/src/sap/ui/fl/apply/_internal/flexState/compVariants/prepareCompVariantsMap.js

@@ -37,11 +37,11 @@ sap.ui.define([
 		mMapOfKey.controlId = sSVMControlId;
 
 		// clear all non-persisted variants in case of a reinitialization
-		mMapOfKey.nonPersistedVariants.forEach(function (oVariant) {
+		mMapOfKey.nonPersistedVariants.forEach(function(oVariant) {
 			delete mMapOfKey.byId[oVariant.getId()];
 		});
 
-		mMapOfKey.nonPersistedVariants = aVariants.map(function (oVariant) {
+		mMapOfKey.nonPersistedVariants = aVariants.map(function(oVariant) {
 			var oVariantInstance = Object.assign({
 				id: oVariant.id,
 				persisted: false
@@ -55,7 +55,7 @@ sap.ui.define([
 	}
 
 	function buildSectionMap(mCompSection, sSubSection, mCompVariants) {
-		var aFlexObjects = mCompSection[sSubSection].map(function (oCompVariantChangeDefinition) {
+		var aFlexObjects = mCompSection[sSubSection].map(function(oCompVariantChangeDefinition) {
 			var oFlexObject;
 			if (sSubSection === "variants") {
 				oFlexObject = FlexObjectFactory.createCompVariant(oCompVariantChangeDefinition);
@@ -66,7 +66,7 @@ sap.ui.define([
 			return oFlexObject;
 		});
 
-		aFlexObjects.forEach(function (oFlexObject) {
+		aFlexObjects.forEach(function(oFlexObject) {
 			var sPersistencyKey = oFlexObject.getPersistencyKey ? oFlexObject.getPersistencyKey() : oFlexObject.getSelector().persistencyKey;
 			getOrCreate(
 				mCompVariants,
@@ -105,7 +105,7 @@ sap.ui.define([
 
 		// check for the existence due to test mocks
 		if (mPropertyBag.storageResponse.changes.comp) {
-			["variants", "changes", "defaultVariants", "standardVariants"].forEach(function (sSection) {
+			["variants", "changes", "defaultVariants", "standardVariants"].forEach(function(sSection) {
 				buildSectionMap(mPropertyBag.storageResponse.changes.comp, sSection, mCompVariants);
 			});
 		}

package/src/sap/ui/fl/apply/_internal/flexState/controlVariants/Switcher.js

@@ -91,7 +91,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.Switcher
 	 * @experimental Since 1.74
 	 * @since 1.74
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -113,14 +113,14 @@ sap.ui.define([
 		 */
 		switchVariant: function(mPropertyBag) {
 			return Promise.resolve().then(function() {
-				//TODO: should be a function in FlexState e.g. getUIChanges()
+				// TODO: should be a function in FlexState e.g. getUIChanges()
 				mPropertyBag.changesMap = mPropertyBag.flexController._oChangePersistence.getChangesMapForComponent().mChanges;
 				var mChangesToBeSwitched = _getControlChangesForVariantSwitch(mPropertyBag);
 
 				return Reverter.revertMultipleChanges(mChangesToBeSwitched.changesToBeReverted, mPropertyBag)
-				//TODO: apply variantChanges() should be moved out of flex controller
-					.then(mPropertyBag.flexController.applyVariantChanges.bind(mPropertyBag.flexController, mChangesToBeSwitched.changesToBeApplied, mPropertyBag.appComponent))
-					.then(VariantManagementState.setCurrentVariant.bind(null, mPropertyBag));
+				// TODO: apply variantChanges() should be moved out of flex controller
+				.then(mPropertyBag.flexController.applyVariantChanges.bind(mPropertyBag.flexController, mChangesToBeSwitched.changesToBeApplied, mPropertyBag.appComponent))
+				.then(VariantManagementState.setCurrentVariant.bind(null, mPropertyBag));
 			});
 		}
 

package/src/sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.VariantManagementState
 	 * @experimental Since 1.74
 	 * @since 1.74
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -69,13 +69,13 @@ sap.ui.define([
 		// check is only executed once and influenced by technical parameters
 		// Default is set via applyVariantManagementChange instead
 		return aCtrlVariantManagementChanges
-			.reverse()
-			.map(function(oVariantManagementChange) {
-				return oVariantManagementChange.getContent().defaultVariant;
-			})
-			.find(function(sDesiredDefaultVariantId) {
-				return aVariantIds.includes(sDesiredDefaultVariantId);
-			});
+		.reverse()
+		.map(function(oVariantManagementChange) {
+			return oVariantManagementChange.getContent().defaultVariant;
+		})
+		.find(function(sDesiredDefaultVariantId) {
+			return aVariantIds.includes(sDesiredDefaultVariantId);
+		});
 	}
 
 	function createVariantManagement(aFlexObjects, aVariants, sReference, sVMReference) {
@@ -98,7 +98,11 @@ sap.ui.define([
 					&& sVMReference === oFlexObject.getSelector().id
 				);
 			});
-			sCurrentVariantReference = getInitialCurrentVariant(sReference, aCtrlVariantManagementChanges, aRelevantVariants) || sVMReference;
+			sCurrentVariantReference = getInitialCurrentVariant(
+				sReference,
+				aCtrlVariantManagementChanges,
+				aRelevantVariants
+			) || sVMReference;
 			ObjectPath.set(
 				[sReference, sVMReference],
 				sCurrentVariantReference,
@@ -211,24 +215,26 @@ sap.ui.define([
 		});
 
 		aFlexObjects
-			.filter(function(oFlexObject) {
-				return oFlexObject.getFileType() === "ctrl_variant_change";
-			})
-			.forEach(function(oVariantChange) {
-				var oVariantEntry = findVariant(oVariantManagementsMap, oVariantChange);
+		.filter(function(oFlexObject) {
+			return oFlexObject.getFileType() === "ctrl_variant_change";
+		})
+		.forEach(function(oVariantChange) {
+			var oVariantEntry = findVariant(oVariantManagementsMap, oVariantChange);
+			if (oVariantEntry) {
 				applyVariantChange(oVariantEntry, oVariantChange, sReference, oVariantManagementsMap);
-			});
+			}
+		});
 
 		aFlexObjects
-			.filter(function(oFlexObject) {
-				return oFlexObject.getFileType() === "ctrl_variant_management_change";
-			})
-			.forEach(function(oVariantManagementChange) {
-				var oVariantManagementEntry = oVariantManagementsMap[oVariantManagementChange.getSelector().id];
-				if (oVariantManagementEntry) {
-					applyVariantManagementChange(oVariantManagementEntry, oVariantManagementChange);
-				}
-			});
+		.filter(function(oFlexObject) {
+			return oFlexObject.getFileType() === "ctrl_variant_management_change";
+		})
+		.forEach(function(oVariantManagementChange) {
+			var oVariantManagementEntry = oVariantManagementsMap[oVariantManagementChange.getSelector().id];
+			if (oVariantManagementEntry) {
+				applyVariantManagementChange(oVariantManagementEntry, oVariantManagementChange);
+			}
+		});
 
 		Object.values(oVariantManagementsMap).forEach(function(oVariantManagement) {
 			// Standard variant should always be at the first position, all others are sorted alphabetically
@@ -314,29 +320,26 @@ sap.ui.define([
 	};
 
 	/**
-	 * Wrapper to add a fake standard variant for a variant management if none exists yet.
+	 * Wrapper to add a runtime-steady object - that survives the invalidation of the FlexState
+	 * For example: a fake standard variant for a variant management if none exists yet.
 	 *
 	 * @param {string} sReference - Flex reference of the app
 	 * @param {string} sComponentId - ID of the component
-	 * @param {string} sVMReference - Variant management reference
-	 * @param {object} oStandardVariantInstance - Variant instance
+	 * @param {object} oFlexObject - Flex object to be added as runtime-steady
 	 *
 	 */
-	VariantManagementState.addFakeStandardVariant = function(sReference, sComponentId, sVMReference, oStandardVariantInstance) {
-		var oVariantsMap = this.getVariantManagementMap().get({ reference: sReference });
-		if (!oVariantsMap[sVMReference]) {
-			FlexState.addFakeStandardVariantToExternalData(sReference, sComponentId, oStandardVariantInstance);
-		}
+	VariantManagementState.addRuntimeSteadyObject = function(sReference, sComponentId, oFlexObject) {
+		FlexState.addRuntimeSteadyObject(sReference, sComponentId, oFlexObject);
 	};
 
 	/**
-	 * Wrapper to reset the fake standard variants for all variant management controls of the given component.
+	 * Wrapper to clear the runtime-steady objects for the given component.
 	 *
 	 * @param {string} sReference - Flex reference of the app
 	 * @param {string} sComponentId - ID of the component
 	 */
-	VariantManagementState.clearFakeStandardVariants = function(sReference, sComponentId) {
-		FlexState.resetFakeStandardVariants(sReference, sComponentId);
+	VariantManagementState.clearRuntimeSteadyObjects = function(sReference, sComponentId) {
+		FlexState.clearRuntimeSteadyObjects(sReference, sComponentId);
 	};
 
 	/**
@@ -426,8 +429,8 @@ sap.ui.define([
 	/**
 	 * Returns the variant management references saved in the FlexState.
 	 *
-	 * @param {string} sReference Flexreference of the current app
-	 * @returns {string[]} Array of flexreferences
+	 * @param {string} sReference - Flex reference of the current app
+	 * @returns {string[]} Array of flex references
 	 */
 	VariantManagementState.getVariantManagementReferences = function(sReference) {
 		var oVariantsMap = oVariantManagementMapDataSelector.get({
@@ -436,6 +439,21 @@ sap.ui.define([
 		return Object.keys(oVariantsMap);
 	};
 
+	/**
+	 * Returns all variants saved in the FlexState.
+	 *
+	 * @param {string} sReference - Flex reference of the current app
+	 * @returns {object[]} Array of variants
+	 */
+	VariantManagementState.getAllVariants = function(sReference) {
+		var oVariantsMap = oVariantManagementMapDataSelector.get({
+			reference: sReference
+		});
+		return Object.keys(oVariantsMap).reduce(function(aPrev, sCurr) {
+			return aPrev.concat(oVariantsMap[sCurr].variants);
+		}, []);
+	};
+
 	/**
 	 * Loads the initial changes of all variant managements.
 	 * If the application is started with valid variant references, they are used.

package/src/sap/ui/fl/apply/_internal/preprocessors/ComponentLifecycleHooks.js

@@ -98,7 +98,7 @@ sap.ui.define([
 		return Promise.resolve(oResult);
 	}
 
-	function propagateChangesForAppComponent (oAppComponent) {
+	function propagateChangesForAppComponent(oAppComponent) {
 		// only manifest with type = "application" will fetch changes
 		var oFlexController = FlexControllerFactory.createForControl(oAppComponent);
 		var oVariantModel;
@@ -131,17 +131,17 @@ sap.ui.define([
 				componentId: sComponentId,
 				asyncHints: vConfig.asyncHints
 			})
-				.then(propagateChangesForAppComponent.bind(this, oComponent))
-				.then(function() {
-					// update any potential embedded component waiting for this app component
-					if (oEmbeddedComponentsPromises[sComponentId]) {
-						oEmbeddedComponentsPromises[sComponentId].forEach(function(oEmbeddedComponent) {
-							var oVariantModel = oComponent.getModel(ControlVariantApplyAPI.getVariantModelName());
-							oEmbeddedComponent.setModel(oVariantModel, ControlVariantApplyAPI.getVariantModelName());
-						});
-						delete oEmbeddedComponentsPromises[sComponentId];
-					}
-				});
+			.then(propagateChangesForAppComponent.bind(this, oComponent))
+			.then(function() {
+				// update any potential embedded component waiting for this app component
+				if (oEmbeddedComponentsPromises[sComponentId]) {
+					oEmbeddedComponentsPromises[sComponentId].forEach(function(oEmbeddedComponent) {
+						var oVariantModel = oComponent.getModel(ControlVariantApplyAPI.getVariantModelName());
+						oEmbeddedComponent.setModel(oVariantModel, ControlVariantApplyAPI.getVariantModelName());
+					});
+					delete oEmbeddedComponentsPromises[sComponentId];
+				}
+			});
 			ComponentLifecycleHooks._componentInstantiationPromises.set(oComponent, oReturnPromise);
 
 			return oReturnPromise;

package/src/sap/ui/fl/apply/_internal/preprocessors/ControllerExtension.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 * @experimental Since 1.27.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.core
@@ -76,7 +76,7 @@ sap.ui.define([
 		if (bAsync) {
 			if (!sComponentId) {
 				Log.warning("No component ID for determining the anchor of the code extensions was passed.");
-				//always return a promise if async
+				// always return a promise if async
 				return Promise.resolve([]);
 			}
 
@@ -88,16 +88,16 @@ sap.ui.define([
 				return Promise.resolve([]);
 			}
 			if (!Utils.isApplication(oAppComponent.getManifestObject())) {
-				//we only consider components whose type is application. Otherwise, we might send request for components that can never have changes.
+				// we only consider components whose type is application. Otherwise, we might send request for components that can never have changes.
 				return Promise.resolve([]);
 			}
 			var sFlexReference = ManifestUtils.getFlexReferenceForControl(oAppComponent);
 
 			var oChangePersistence = ChangePersistenceFactory.getChangePersistenceForComponent(sFlexReference);
 			return oChangePersistence.getChangesForComponent().then(function(aChanges) {
-				var aExtensionModules = aChanges.filter(function (oChange) {
+				var aExtensionModules = aChanges.filter(function(oChange) {
 					return isCodeExt(oChange) && isForController(sControllerName, oChange);
-				}).map(function (oChange) {
+				}).map(function(oChange) {
 					return oChange.getModuleName();
 				});
 

package/src/sap/ui/fl/apply/_internal/preprocessors/EventHistory.js

@@ -14,12 +14,12 @@ sap.ui.define(["sap/ui/core/Core"], function(oCore) {
 	 * @alias sap.ui.fl.apply._internal.preprocessors.EventHistory
 	 * @experimental Since 1.47.0
 	 * @author SAP SE
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal.preprocessors.RegistrationDelegator
 	 */
-	var EventHistory = function () {
+	var EventHistory = function() {
 	};
 
 	EventHistory._aEventIds = [
@@ -33,7 +33,7 @@ sap.ui.define(["sap/ui/core/Core"], function(oCore) {
 	/**
 	 * Starts listening to the events
 	 */
-	EventHistory.start = function () {
+	EventHistory.start = function() {
 		EventHistory._aEventIds.forEach(function(sEventId) {
 			if (EventHistory._aUnsubscribedEventIds.indexOf(sEventId) === -1) {
 				oCore.getEventBus().subscribe("sap.ui", sEventId, EventHistory.saveEvent);
@@ -49,11 +49,11 @@ sap.ui.define(["sap/ui/core/Core"], function(oCore) {
 	 * @param {string} sEventId The identifier of the event
 	 * @param {map} mParameters The parameter map carried by the event
 	 */
-	EventHistory.saveEvent = function (sChannelId, sEventId, mParameters) {
+	EventHistory.saveEvent = function(sChannelId, sEventId, mParameters) {
 		var oEvent = {
 			channelId: sChannelId,
 			eventId: sEventId,
-			parameters: mParameters.getId() //we only need the id. In unified.shell sap.ui.getCore().byId(vControl); will be used.
+			parameters: mParameters.getId() // we only need the id. In unified.shell sap.ui.getCore().byId(vControl); will be used.
 		};
 
 		if (EventHistory._oHistory[sEventId]) {
@@ -75,7 +75,7 @@ sap.ui.define(["sap/ui/core/Core"], function(oCore) {
 	 *
 	 * @return {array} List of events
 	 */
-	EventHistory.getHistoryAndStop = function (sEventId) {
+	EventHistory.getHistoryAndStop = function(sEventId) {
 		oCore.getEventBus().unsubscribe("sap.ui", sEventId, EventHistory.saveEvent);
 		EventHistory._addUnsubscribedEvent(sEventId);
 		return EventHistory._oHistory[sEventId] || [];

package/src/sap/ui/fl/apply/_internal/preprocessors/RegistrationDelegator.js

@@ -44,12 +44,11 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 * @experimental Since 1.43.0
 	 */
 	var RegistrationDelegator = {};
 
-
 	function registerChangesInComponent() {
 		Component._fnOnInstanceCreated = ComponentLifecycleHooks.instanceCreatedHook;
 	}

package/src/sap/ui/fl/apply/_internal/preprocessors/XmlPreprocessor.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 * @experimental Since 1.27.0
 	 */
 	var XmlPreprocessor = function() {};
@@ -64,7 +64,7 @@ sap.ui.define([
 
 			var oAppComponent = Utils.getAppComponentForControl(oComponent);
 			if (!Utils.isApplication(oAppComponent.getManifestObject())) {
-				//we only consider components whose type is application. Otherwise, we might send request for components that can never have changes.
+				// we only consider components whose type is application. Otherwise, we might send request for components that can never have changes.
 				return Promise.resolve(oView);
 			}
 
@@ -76,14 +76,14 @@ sap.ui.define([
 				Log.debug("flex processing view " + mProperties.id + " finished");
 				return oView;
 			})
-			.catch(function () {
+			.catch(function() {
 				Log.warning("Error happens when getting flex cache key! flexibility XML view preprocessing is skipped. " +
 				"The processing will be done later on the JS controls.");
 				return Promise.resolve(oView);
 			});
 		} catch (error) {
 			var sError = "view " + mProperties.id + ": " + error;
-			Log.info(sError); //to allow control usage in applications that do not work with UI flex and components
+			Log.info(sError); // to allow control usage in applications that do not work with UI flex and components
 			// throw new Error(sError); // throw again, when caller handles the promise
 			return Promise.resolve(oView);
 		}