@openui5/sap.ui.fl 1.123.1 → 1.124.1

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	 *
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.ovp.AddNewCard
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	 *
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.ovp.ChangeCard
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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

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

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

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

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

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

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

@@ -95,7 +95,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.ui5.AddNewModel
 	 * @since 1.87
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.ui5.AddNewModelEnhanceWith
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.ui5.SetFlexExtensionPointEnabled
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 *
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.ui5.SetMinUI5Version
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
@@ -40,11 +40,55 @@ sap.ui.define([
 		 * @ui5-restricted sap.ui.fl.apply._internal
 		 */
 		applyChange(oManifest, oChange) {
-			// TODO: Should existens of minui5version be checked in manifest and change or is the check during deployment enough and I can expect minui5version to be set in both?
-			var vCurrentVersion = new Version(oManifest["sap.ui5"].dependencies.minUI5Version);
-			if (vCurrentVersion.compareTo(oChange.getContent().minUI5Version) <= 0) {
-				oManifest["sap.ui5"].dependencies.minUI5Version = oChange.getContent().minUI5Version;
+			// General Rules:
+			// Compare major versions with each other and set always highest version.
+			// Major version which is only included in one (base app or change) will be dropped.
+			// If no major version remains throw exception.
+			// If change has more than one entry: Additionally check that for version major 1.x.x that minimum version is 1.120.0.
+			// If result has only one value then reduce to type string.
+
+			var aChangeMinUI5Version = oChange.getContent().minUI5Version;
+			if (!aChangeMinUI5Version) {
+				throw new Error("No minUI5Version in change content provided");
+			}
+			if (typeof aChangeMinUI5Version === "string") {
+				aChangeMinUI5Version = [aChangeMinUI5Version];
+			}
+
+			const mChangeMinUi5Version = {};
+			aChangeMinUI5Version.forEach(function(changeMinUI5Version) {
+				const oVersion = new Version(changeMinUI5Version);
+				if (mChangeMinUi5Version[oVersion.getMajor()]) {
+					throw new Error("Each major version can only be provided once in minUI5Version of change content");
+				}
+				mChangeMinUi5Version[oVersion.getMajor()] = [changeMinUI5Version, oVersion];
+			});
+
+			var {minUI5Version: aMinUI5Version} = oManifest["sap.ui5"].dependencies;
+			if (!aMinUI5Version) {
+				throw new Error("sap.ui5/dependencies/minUI5Version missing in base manifest");
+			}
+			if (typeof aMinUI5Version === "string") {
+				aMinUI5Version = [aMinUI5Version];
 			}
+
+			aMinUI5Version = aMinUI5Version.map(function(sCurrMinUI5Version) {
+				const oCurrMinUI5Version = new Version(sCurrMinUI5Version);
+				const aChangeVersionForMajor = mChangeMinUi5Version[oCurrMinUI5Version.getMajor()];
+				if (!aChangeVersionForMajor) {
+					return null;
+				}
+				const [sChangeMinUI5VersionForMajor, oChangeMinUI5VersionForMajor] = aChangeVersionForMajor;
+
+				return (oCurrMinUI5Version.compareTo(oChangeMinUI5VersionForMajor) <= 0) ?
+					sChangeMinUI5VersionForMajor : sCurrMinUI5Version;
+			}).filter((sMinVersion) => sMinVersion);
+
+			if (aMinUI5Version.length === 0) {
+				throw new Error("Upgrade/Downgrade for different major version not possible");
+			}
+
+			oManifest["sap.ui5"].dependencies.minUI5Version = aMinUI5Version.length === 1 ? aMinUI5Version[0] : aMinUI5Version;
 			return oManifest;
 		}
 

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

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

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

@@ -96,59 +96,59 @@ sap.ui.define([
 	}
 
 	/**
-	 * Navigation filter attached to the ushell ShellNavigation service.
+	 * Navigation filter attached to the ushell ShellNavigationInternal service.
 	 * Each time a shell navigation occurs this function is called.
 	 *
 	 * @param {sap.ui.fl.variants.VariantModel} oModel - Variant Model
 	 * @param {string} sNewHash - New hash
 	 *
-	 * @returns {string} Value that signifies "Continue" navigation in the "ShellNavigation" service of ushell
-	 * (see {@link sap.ushell.services.ShellNavigation})
+	 * @returns {string} Value that signifies "Continue" navigation in the "ShellNavigationInternal" service of ushell
+	 * (see {@link sap.ushell.services.ShellNavigationInternal})
 	 *
 	 * @private
 	 */
 	function _handleVariantIdChangeInURL(oModel, sNewHash) {
 		try {
-			var oURLParsingService = oModel.getUShellService("URLParsing");
+			const oURLParsingService = oModel.getUShellService("URLParsing");
 			if (oURLParsingService) {
-				var oNewParsedHash = oURLParsingService.parseShellHash(sNewHash);
+				const oNewParsedHash = oURLParsingService.parseShellHash(sNewHash);
 				_checkAndUpdateURLParameters(oNewParsedHash, oModel);
 			}
 		} catch (oError) {
 			Log.error(oError.message);
 		}
-		var oShellNavigationService = oModel.getUShellService("ShellNavigation");
-		return oShellNavigationService && oShellNavigationService.NavigationFilterStatus.Continue;
+		const oShellNavigationInternalService = oModel.getUShellService("ShellNavigationInternal");
+		return oShellNavigationInternalService && oShellNavigationInternalService.NavigationFilterStatus.Continue;
 	}
 
 	/**
-	 * Registers navigation filter function for the ushell ShellNavigation service.
+	 * Registers navigation filter function for the ushell ShellNavigationInternal service.
 	 *
 	 * @param {sap.ui.fl.variants.VariantModel} oModel - Variant Model
 	 *
 	 * @private
 	 */
 	function _registerNavigationFilter(oModel) {
-		var oShellNavigationService = oModel.getUShellService("ShellNavigation");
+		const oShellNavigationInternalService = oModel.getUShellService("ShellNavigationInternal");
 		if (!_mVariantIdChangeHandlers[oModel.sFlexReference]) {
 			_mVariantIdChangeHandlers[oModel.sFlexReference] = _handleVariantIdChangeInURL.bind(null, oModel);
-			if (oShellNavigationService) {
-				oShellNavigationService.registerNavigationFilter(_mVariantIdChangeHandlers[oModel.sFlexReference]);
+			if (oShellNavigationInternalService) {
+				oShellNavigationInternalService.registerNavigationFilter(_mVariantIdChangeHandlers[oModel.sFlexReference]);
 			}
 		}
 	}
 
 	/**
-	 * De-registers navigation filter function for the ushell ShellNavigation service.
+	 * De-registers navigation filter function for the ushell ShellNavigationInternal service.
 	 *
 	 * @param {sap.ui.fl.variants.VariantModel} oModel - Variant Model
 	 *
 	 * @private
 	 */
 	function _deRegisterNavigationFilter(oModel) {
-		var oShellNavigationService = oModel.getUShellService("ShellNavigation");
-		if (oShellNavigationService) {
-			oShellNavigationService.unregisterNavigationFilter(_mVariantIdChangeHandlers[oModel.sFlexReference]);
+		const oShellNavigationInternalService = oModel.getUShellService("ShellNavigationInternal");
+		if (oShellNavigationInternalService) {
+			oShellNavigationInternalService.unregisterNavigationFilter(_mVariantIdChangeHandlers[oModel.sFlexReference]);
 			delete _mVariantIdChangeHandlers[oModel.sFlexReference];
 		}
 	}
@@ -166,17 +166,14 @@ sap.ui.define([
 	 * @private
 	 */
 	function setTechnicalURLParameterValues(mPropertyBag) {
-		var oModel = mPropertyBag.model;
-		var oURLParsingService = oModel.getUShellService("URLParsing");
-		var oUshellNavigationService = oModel.getUShellService("Navigation");
-		var oParsedHash = oURLParsingService && oURLParsingService.parseShellHash(hasher.getHash());
+		const oModel = mPropertyBag.model;
+		const oURLParsingService = oModel.getUShellService("URLParsing");
+		const oNavigationService = oModel.getUShellService("Navigation");
+		const oParsedHash = oURLParsingService && oURLParsingService.parseShellHash(hasher.getHash());
 
 		if (oParsedHash && oParsedHash.params) {
-			var mOldHashParams = Object.assign({}, oParsedHash.params);
-			var mTechnicalParameters = oModel.oAppComponent
-				&& oModel.oAppComponent.getComponentData
-				&& oModel.oAppComponent.getComponentData()
-				&& oModel.oAppComponent.getComponentData().technicalParameters;
+			const mOldHashParams = Object.assign({}, oParsedHash.params);
+			const mTechnicalParameters = oModel.oAppComponent?.getComponentData?.()?.technicalParameters;
 			// if mTechnicalParameters are not available we write a warning and continue updating the hash
 			if (!mTechnicalParameters) {
 				Log.warning(
@@ -186,11 +183,15 @@ sap.ui.define([
 			if (mPropertyBag.parameters.length === 0) {
 				delete oParsedHash.params[VariantUtil.VARIANT_TECHNICAL_PARAMETER];
 				// Case when ControlVariantsAPI.clearVariantParameterInURL is called with a parameter
-				mTechnicalParameters && delete mTechnicalParameters[VariantUtil.VARIANT_TECHNICAL_PARAMETER];
+				if (mTechnicalParameters) {
+					delete mTechnicalParameters[VariantUtil.VARIANT_TECHNICAL_PARAMETER];
+				}
 			} else {
 				oParsedHash.params[VariantUtil.VARIANT_TECHNICAL_PARAMETER] = mPropertyBag.parameters;
 				// Technical parameters need to be in sync with the URL hash
-				mTechnicalParameters && (mTechnicalParameters[VariantUtil.VARIANT_TECHNICAL_PARAMETER] = mPropertyBag.parameters);
+				if (mTechnicalParameters) {
+					mTechnicalParameters[VariantUtil.VARIANT_TECHNICAL_PARAMETER] = mPropertyBag.parameters;
+				}
 			}
 
 			if (mPropertyBag.silent) {
@@ -198,7 +199,7 @@ sap.ui.define([
 				hasher.replaceHash(oURLParsingService.constructShellHash(oParsedHash));
 				hasher.changed.active = true; // re-enable changed signal
 			} else if (!deepEqual(mOldHashParams, oParsedHash.params)) {
-				oUshellNavigationService.navigate({
+				oNavigationService.navigate({
 					target: {
 						semanticObject: oParsedHash.semanticObject,
 						action: oParsedHash.action,

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

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 */
 	var Processor;
 

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

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.apply._internal.extensionPoint.Registry
 	 *
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

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

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

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

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

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

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

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

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

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

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

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

@@ -97,7 +97,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexObjects.FlexObjectFactory
 	 * @since 1.100
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.UIChange
 	 * @since 1.109
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted
 	 */

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

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

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 *
 	 * @function
 	 * @since 1.121
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 * @alias module:sap/ui/fl/apply/_internal/flexState/compVariants/getVariantAuthor

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

@@ -6,6 +6,7 @@
 
 sap.ui.define([
 	"sap/base/util/restricted/_omit",
+	"sap/base/util/Deferred",
 	"sap/base/util/each",
 	"sap/base/util/merge",
 	"sap/base/util/ObjectPath",
@@ -13,7 +14,6 @@ sap.ui.define([
 	"sap/ui/core/Component",
 	"sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory",
 	"sap/ui/fl/apply/_internal/flexObjects/States",
-	"sap/ui/fl/apply/_internal/flexState/appDescriptorChanges/prepareAppDescriptorMap",
 	"sap/ui/fl/apply/_internal/flexState/compVariants/prepareCompVariantsMap",
 	"sap/ui/fl/apply/_internal/flexState/DataSelector",
 	"sap/ui/fl/apply/_internal/flexState/InitialPrepareFunctions",
@@ -25,6 +25,7 @@ sap.ui.define([
 	"sap/ui/fl/requireAsync"
 ], function(
 	_omit,
+	Deferred,
 	each,
 	merge,
 	ObjectPath,
@@ -32,7 +33,6 @@ sap.ui.define([
 	Component,
 	FlexObjectFactory,
 	States,
-	prepareAppDescriptorMap,
 	prepareCompVariantsMap,
 	DataSelector,
 	InitialPrepareFunctions,
@@ -45,13 +45,14 @@ sap.ui.define([
 ) {
 	"use strict";
 
+	const sAppDescriptorNamespace = "sap.ui.fl.apply._internal.flexObjects.AppDescriptorChange";
+
 	/**
 	 * Flex state class to persist maps and raw state (cache) for a given component reference.
 	 * The persistence happens inside an object mapped to the component reference, with the following properties:
 	 *
 	 *	{
 	 * 		preparedMaps: {
-	 * 			appDescriptorMap: {},
 	 * 			compVariantsMap: {},
 	 * 		},
 	 * 		storageResponse: {
@@ -87,7 +88,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.FlexState
 	 * @since 1.73
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
@@ -98,7 +99,6 @@ sap.ui.define([
 	var _oChangePersistenceFactory;
 	var _mFlexObjectInfo = {
 		appDescriptorChanges: {
-			prepareFunction: prepareAppDescriptorMap,
 			pathInResponse: []
 		},
 		changes: {
@@ -211,6 +211,20 @@ sap.ui.define([
 		}
 	});
 
+	const oAppDescriptorChangesDataSelector = new DataSelector({
+		id: "appDescriptorChanges",
+		parentDataSelector: oFlexObjectsDataSelector,
+		executeFunction(aFlexObjects) {
+			return aFlexObjects.filter((oFlexObject) => {
+				return oFlexObject.isA(sAppDescriptorNamespace);
+			});
+		},
+		checkInvalidation(mParameters, oUpdateInfo) {
+			const bRelevantType = ["addFlexObject", "removeFlexObject"].includes(oUpdateInfo.type);
+			return bRelevantType && oUpdateInfo.updatedObject?.isA(sAppDescriptorNamespace);
+		}
+	});
+
 	function getInstanceEntryOrThrowError(sReference, sMapName) {
 		if (!_mInstances[sReference]) {
 			initializeEmptyState(sReference);
@@ -237,10 +251,6 @@ sap.ui.define([
 		oFlexObjectsDataSelector.checkUpdate({ reference: sReference });
 	}
 
-	function getAppDescriptorMap(sReference) {
-		return getInstanceEntryOrThrowError(sReference, "appDescriptorChanges");
-	}
-
 	function getCompVariantsMap(sReference) {
 		return getInstanceEntryOrThrowError(sReference, "compVariants");
 	}
@@ -361,32 +371,28 @@ sap.ui.define([
 		return mFilteredReturn;
 	}
 
-	function loadFlexData(mPropertyBag) {
-		_mInitPromises[mPropertyBag.reference] = Loader.loadFlexData(mPropertyBag)
-		.then(async (mResponse) => {
-			if (!mPropertyBag.partialFlexState) {
-				mResponse.authors = await Loader.loadVariantsAuthors(mPropertyBag.reference);
-			}
-			// The following line is used by the Flex Support Tool to set breakpoints - please adjust the tool if you change it!
-			_mInstances[mPropertyBag.reference] = merge({}, {
-				unfilteredStorageResponse: mResponse,
-				preparedMaps: {},
-				componentId: mPropertyBag.componentId,
-				componentData: mPropertyBag.componentData,
-				partialFlexState: mPropertyBag.partialFlexState,
-				version: mPropertyBag.version,
-				allContextsProvided: mPropertyBag.allContextsProvided
-			});
-
-			storeInfoInSession(mPropertyBag.reference, mResponse);
-
-			// no further changes to storageResponse properties allowed
-			Object.freeze(_mInstances[mPropertyBag.reference].storageResponse);
-			Object.freeze(_mInstances[mPropertyBag.reference].unfilteredStorageResponse);
-			return mResponse;
+	async function loadFlexData(mPropertyBag) {
+		const mResponse = await Loader.loadFlexData(mPropertyBag);
+		if (!mPropertyBag.partialFlexState) {
+			mResponse.authors = await Loader.loadVariantsAuthors(mPropertyBag.reference);
+		}
+		// The following line is used by the Flex Support Tool to set breakpoints - please adjust the tool if you change it!
+		_mInstances[mPropertyBag.reference] = merge({}, {
+			unfilteredStorageResponse: mResponse,
+			preparedMaps: {},
+			componentId: mPropertyBag.componentId,
+			componentData: mPropertyBag.componentData,
+			partialFlexState: mPropertyBag.partialFlexState,
+			version: mPropertyBag.version,
+			allContextsProvided: mPropertyBag.allContextsProvided
 		});
 
-		return _mInitPromises[mPropertyBag.reference];
+		storeInfoInSession(mPropertyBag.reference, mResponse);
+
+		// no further changes to storageResponse properties allowed
+		Object.freeze(_mInstances[mPropertyBag.reference].storageResponse);
+		Object.freeze(_mInstances[mPropertyBag.reference].unfilteredStorageResponse);
+		return mResponse;
 	}
 
 	function storeInfoInSession(sReference, mResponse) {
@@ -454,7 +460,9 @@ sap.ui.define([
 			reInitialize: true,
 			componentId: ""
 		};
-		_mInitPromises[sReference] = Promise.resolve();
+		const oNewInitPromise = new Deferred();
+		_mInitPromises[sReference] = oNewInitPromise;
+		oNewInitPromise.resolve();
 		initializeNewInstance({ reference: sReference });
 	}
 
@@ -482,13 +490,18 @@ sap.ui.define([
 	 * @returns {Promise<undefined>} Resolves a promise as soon as FlexState is initialized
 	 */
 	FlexState.initialize = async function(mPropertyBag) {
-		await lazyLoadModules();
 		const mProperties = merge({}, mPropertyBag);
 		enhancePropertyBag(mProperties);
-		var sFlexReference = mProperties.reference;
+		const sFlexReference = mProperties.reference;
+
+		const oOldInitPromise = _mInitPromises[sFlexReference];
+		// TODO: Switch to native promises once lazyLoadModules is removed, todos#2
+		const oNewInitPromise = new Deferred();
+		_mInitPromises[sFlexReference] = oNewInitPromise;
+		await lazyLoadModules();
 
-		if (_mInitPromises[sFlexReference]) {
-			await _mInitPromises[sFlexReference];
+		if (oOldInitPromise) {
+			await oOldInitPromise.promise;
 			checkPartialFlexState(mProperties);
 			checkComponentId(mProperties);
 			checkVersionAndAllContexts(mProperties);
@@ -502,6 +515,24 @@ sap.ui.define([
 		}
 
 		initializeNewInstance(mProperties);
+		oNewInitPromise.resolve();
+	};
+
+	/**
+	 * Waits until the FlexState is initialized
+	 * This is only necessary if <code>FlexState.initialize</code> cannot be called directly
+	 * due to missing information for the backend request (e.g. asyncHints)
+	 *
+	 * @param {string} sFlexReference - Flex reference of the app
+	 * @returns {Promise<undefined>} Promise that resolves as soon as FlexState is initialized
+	 */
+	FlexState.waitForInitialization = function(sFlexReference) {
+		const oInitPromise = _mInitPromises[sFlexReference]?.promise;
+		if (!oInitPromise) {
+			Log.error("FlexState.waitForInitialization was called before FlexState.initialize");
+			return Promise.resolve();
+		}
+		return oInitPromise;
 	};
 
 	/**
@@ -543,7 +574,9 @@ sap.ui.define([
 			_oChangePersistenceFactory._instanceCache[sReference].removeDirtyChanges();
 		}
 
-		await _mInitPromises[sReference];
+		await _mInitPromises[sReference].promise;
+		const oNewInitPromise = new Deferred();
+		_mInitPromises[sReference] = oNewInitPromise;
 		await loadFlexData(mPropertyBag);
 		_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mInstances[sReference].unfilteredStorageResponse);
 		_mInstances[sReference].maxLayer = FlexInfoSession.getByReference(sReference).maxLayer;
@@ -555,6 +588,7 @@ sap.ui.define([
 		if (bUpdated) {
 			oFlexObjectsDataSelector.checkUpdate({ reference: sReference });
 		}
+		oNewInitPromise.resolve();
 	};
 
 	function getChangeCategory(oChangeDefinition) {
@@ -835,7 +869,7 @@ sap.ui.define([
 	};
 
 	FlexState.getAppDescriptorChanges = function(sReference) {
-		return getAppDescriptorMap(sReference).appDescriptorChanges;
+		return oAppDescriptorChangesDataSelector.get({ reference: sReference });
 	};
 
 	FlexState.getUI2Personalization = function(sReference) {
@@ -854,7 +888,7 @@ sap.ui.define([
 	// TODO: also used by the CompVariantState to mutate the storage response, this has to be changed
 	FlexState.getStorageResponse = function(sReference) {
 		if (_mInitPromises[sReference]) {
-			return _mInitPromises[sReference].then(function() {
+			return _mInitPromises[sReference].promise.then(function() {
 				return _mInstances[sReference].unfilteredStorageResponse;
 			});
 		}

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

@@ -102,7 +102,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.Loader
 	 * @since 1.74
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal.flexState
 	 */

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

@@ -78,7 +78,7 @@ function(
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.ManifestUtils
 	 * @since 1.74
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 */
 	var ManifestUtils = {