@openui5/sap.ui.fl 1.140.0 → 1.141.0

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.140.0
+	 * @version 1.141.0
 	 * @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.140.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -13,7 +13,6 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexObjects/ControllerExtensionChange",
 	"sap/ui/fl/apply/_internal/flexObjects/FlexObject",
 	"sap/ui/fl/apply/_internal/flexObjects/FlVariant",
-	"sap/ui/fl/apply/_internal/flexObjects/getVariantAuthor",
 	"sap/ui/fl/apply/_internal/flexObjects/States",
 	"sap/ui/fl/apply/_internal/flexObjects/UIChange",
 	"sap/ui/fl/apply/_internal/flexObjects/UpdatableChange",
@@ -33,7 +32,6 @@ sap.ui.define([
 	ControllerExtensionChange,
 	FlexObject,
 	FlVariant,
-	getVariantAuthor,
 	States,
 	UIChange,
 	UpdatableChange,
@@ -137,7 +135,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexObjects.FlexObjectFactory
 	 * @since 1.100
-	 * @version 1.140.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -262,7 +260,6 @@ sap.ui.define([
 	 * @param {object} [mPropertyBag.layer] - See {@link sap.ui.fl.apply._internal.flexObjects.FlexObject}
 	 * @param {string} [mPropertyBag.reference] - See {@link sap.ui.fl.apply._internal.flexObjects.FlexObject.FlexObjectMetadata}
 	 * @param {string} [mPropertyBag.generator] - See {@link sap.ui.fl.apply._internal.flexObjects.FlexObject.SupportInformation}
-	 * @param {object} [mPropertyBag.authors] - Map of user IDs to full names
 	 * @param {boolean} [mPropertyBag.executeOnSelection] - Apply automatically the content of the variant
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlVariant} Variant instance
 	 */
@@ -280,7 +277,6 @@ sap.ui.define([
 				type: "XFLD"
 			}
 		};
-		mProperties.author = getVariantAuthor(mProperties.supportInformation.user, mProperties.layer, mPropertyBagClone.authors);
 		return new FlVariant(mProperties);
 	};
 
@@ -312,10 +308,9 @@ sap.ui.define([
 	 * @param {object} [oFileContent.executeOnSelection] - see above
 	 *
 	 * @param {string} [oFileContent.persistencyKey] - see <code>sap.ui.fl.apply._internal.flexObjects.CompVariant</code>
-	 * @param {object} [mAuthors] - Map of user IDs and users' names which is used to determine author of the variant
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.CompVariant} Created comp variant object
 	 */
-	FlexObjectFactory.createCompVariant = function(oFileContent, mAuthors) {
+	FlexObjectFactory.createCompVariant = function(oFileContent) {
 		const oFileContentClone = cloneIfObject(oFileContent);
 		oFileContentClone.generator ||= "FlexObjectFactory.createCompVariant";
 		oFileContentClone.user = ObjectPath.get("support.user", oFileContentClone);
@@ -340,7 +335,6 @@ sap.ui.define([
 				mCompVariantContent.content.executeOnSelection
 			);
 		}
-		mCompVariantContent.author = getVariantAuthor(mCompVariantContent.supportInformation.user, mCompVariantContent.layer, mAuthors);
 		return new CompVariant(mCompVariantContent);
 	};
 

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

@@ -28,7 +28,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.140.0
+	 * @version 1.141.0
 	 * @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.140.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -83,7 +83,7 @@ sap.ui.define([
 				this.setVariantId(this.getId());
 			}
 			if (!this.getAuthor()) {
-				this.setAuthor(getVariantAuthor(this.getSupportInformation().user, this.getLayer(), {}));
+				this.setAuthor(getVariantAuthor(this.getSupportInformation().user, this.getLayer(), this.getFlexObjectMetadata().reference));
 			}
 		}
 	});

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

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.VariantChange
 	 * @since 1.135
-	 * @version 1.140.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.VariantManagementChange
 	 * @since 1.135
-	 * @version 1.140.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -6,10 +6,12 @@
 
 sap.ui.define([
 	"sap/ui/core/Lib",
+	"sap/ui/fl/initial/_internal/Loader",
 	"sap/ui/fl/initial/_internal/Settings",
 	"sap/ui/fl/Layer"
 ], function(
 	Lib,
+	Loader,
 	Settings,
 	Layer
 ) {
@@ -21,19 +23,20 @@ sap.ui.define([
 	 *
 	 * @function
 	 * @since 1.121
-	 * @version 1.140.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 * @alias module:sap/ui/fl/apply/_internal/flexState/compVariants/getVariantAuthor
 	 *
 	 * @param {string} sUserId - UserId of variant author
 	 * @param {sap.ui.fl.Layer} sLayer - Layer in which the variant should be stored
-	 * @param {object} mMapIdsNames - Map of user IDs and users' names
+	 * @param {string} sReference - Reference of the application
 	 * @returns {string} The resolved author of variant
 	 */
-	return (sUserId, sLayer, mMapIdsNames) => {
+	return (sUserId, sLayer, sReference) => {
 		const sAuthor = sUserId || "";
 		const oSettings = Settings.getInstanceOrUndef();
+		const mMapIdsNames = Loader.getCachedFlexData(sReference).authors || {};
 
 		if (sLayer === Layer.USER || sAuthor === oSettings?.getUserId()) {
 			return Lib.getResourceBundleFor("sap.ui.fl").getText("VARIANT_SELF_OWNER_NAME");

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

@@ -122,7 +122,7 @@ sap.ui.define([
 			const sParameterValue = getParameterValue(oCurrentDataSelector);
 			// If no parameter value is provided for the last child selector in the chain
 			// skip it, start with its parent and thus return the whole cache entry
-			if (sParameterValue || oCurrentDataSelector !== oLowestDataSelector) {
+			if (sParameterValue !== undefined || oCurrentDataSelector !== oLowestDataSelector) {
 				if (sParameterValue === undefined) {
 					throw new Error(`Parameter '${oCurrentDataSelector.getParameterKey()}' is missing`);
 				}
@@ -243,7 +243,7 @@ sap.ui.define([
 	 */
 	DataSelector.prototype.get = function(mParameters) {
 		var sParameterKey = this.getParameterKey();
-		if (sParameterKey && !(mParameters || {})[sParameterKey]) {
+		if (sParameterKey && mParameters?.[sParameterKey] === undefined) {
 			throw new Error(`Parameter '${sParameterKey}' is missing`);
 		}
 		var vResult = this._getParameterizedCachedResult(mParameters);

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

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.flexState.FlexObjectState
 	 * @since 1.83
-	 * @version 1.140.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -20,7 +20,8 @@ sap.ui.define([
 	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"sap/ui/fl/initial/_internal/FlexInfoSession",
 	"sap/ui/fl/initial/_internal/StorageUtils",
-	"sap/ui/fl/LayerUtils"
+	"sap/ui/fl/LayerUtils",
+	"sap/ui/fl/apply/_internal/init"
 ], function(
 	_omit,
 	Deferred,
@@ -83,14 +84,13 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.FlexState
 	 * @since 1.73
-	 * @version 1.140.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
 	const FlexState = {};
 
 	const _mInstances = {};
-	const _mCachedFlexData = {};
 	const _mInitPromises = {};
 	const _mFlexObjectInfo = {
 		appDescriptorChanges: {
@@ -157,10 +157,6 @@ sap.ui.define([
 		mPropertyBag.componentData ||= (oComponent && oComponent.getComponentData()) || {};
 		mPropertyBag.manifest ||= mPropertyBag.rawManifest || (oComponent && oComponent.getManifestObject()) || {};
 		mPropertyBag.reference ||= ManifestUtils.getFlexReference(mPropertyBag);
-		const oFlexInfoSession = FlexInfoSession.getByReference(mPropertyBag.reference);
-		mPropertyBag.version ||= oFlexInfoSession.version;
-		mPropertyBag.adaptationId ||= oFlexInfoSession.displayedAdaptationId;
-		mPropertyBag.allContextsProvided ||= oFlexInfoSession.allContextsProvided;
 	}
 
 	function createFlexObjects(oStorageResponse) {
@@ -309,7 +305,7 @@ sap.ui.define([
 		return bUpdate;
 	}
 
-	function initializeNewInstance(mPropertyBag) {
+	function initializeNewInstance(mPropertyBag, oFlexData) {
 		var sReference = mPropertyBag.reference;
 		var bDataUpdated = false;
 		if (!_mInstances[sReference].componentData && mPropertyBag.componentId) {
@@ -318,7 +314,7 @@ sap.ui.define([
 			bDataUpdated = true;
 		}
 		if (!_mInstances[sReference].storageResponse) {
-			_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mCachedFlexData[sReference]);
+			_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, oFlexData);
 			// Flex objects need to be recreated
 			delete _mInstances[sReference].runtimePersistence;
 			bDataUpdated = true;
@@ -360,45 +356,13 @@ sap.ui.define([
 		return mFilteredReturn;
 	}
 
-	async function loadAndCacheFlexData(mPropertyBag) {
-		const mResponse = await Loader.loadFlexData(mPropertyBag);
-		if (!mPropertyBag.skipLoadBundle) {
-			mResponse.authors = await Loader.loadVariantsAuthors(mPropertyBag.reference);
-		}
-		_mCachedFlexData[mPropertyBag.reference] = merge({}, mResponse);
-		storeInfoInSession(mPropertyBag.reference, mResponse);
-	}
-
 	function prepareNewInstance(mPropertyBag) {
 		// 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({}, {
 			componentId: mPropertyBag.componentId,
 			componentData: mPropertyBag.componentData,
-			skipLoadBundle: mPropertyBag.skipLoadBundle,
-			version: mPropertyBag.version,
-			allContextsProvided: mPropertyBag.allContextsProvided
+			skipLoadBundle: mPropertyBag.skipLoadBundle
 		});
-
-		// no further changes to storageResponse properties allowed
-		Object.freeze(_mInstances[mPropertyBag.reference].storageResponse);
-	}
-
-	function storeInfoInSession(sReference, mResponse) {
-		var oResponse = mResponse && mResponse.changes || {};
-		var oFlexInfoSession = FlexInfoSession.getByReference(sReference);
-		if (oResponse.info !== undefined) {
-			oFlexInfoSession = { ...oFlexInfoSession, ...oResponse.info };
-		}
-		FlexInfoSession.setByReference(oFlexInfoSession, sReference);
-	}
-
-	function checkPartialFlexState(mInitProperties) {
-		var oFlexInstance = _mInstances[mInitProperties.reference];
-		if (oFlexInstance.skipLoadBundle === true && mInitProperties.skipLoadBundle !== true) {
-			oFlexInstance.skipLoadBundle = false;
-			mInitProperties.partialFlexData = merge({}, _mCachedFlexData[mInitProperties.reference].changes);
-			mInitProperties.reInitialize = true;
-		}
 	}
 
 	function checkComponentIdChanged(mInitProperties) {
@@ -407,36 +371,24 @@ sap.ui.define([
 		return sFlexInstanceComponentId !== mInitProperties.componentId;
 	}
 
-	function checkVersionAndAllContexts(mInitProperties) {
-		var sFlexInstanceVersion = _mInstances[mInitProperties.reference].version;
-		if (!mInitProperties.reInitialize && sFlexInstanceVersion !== mInitProperties.version) {
-			mInitProperties.reInitialize = true;
-		}
-		const bFlexInstanceAllContexts = _mInstances[mInitProperties.reference].allContextsProvided;
-		if (!mInitProperties.reInitialize && bFlexInstanceAllContexts !== mInitProperties.allContextsProvided) {
-			mInitProperties.reInitialize = true;
-		}
-	}
-
-	function rebuildResponseIfMaxLayerChanged(sReference) {
+	function rebuildResponseIfMaxLayerChanged(sReference, oFlexData) {
 		if (_mInstances[sReference]?.maxLayer !== FlexInfoSession.getByReference(sReference).maxLayer) {
-			FlexState.rebuildFilteredResponse(sReference);
+			FlexState.rebuildFilteredResponse(sReference, oFlexData);
 		}
 	}
 
 	function initializeEmptyState(sReference) {
 		_mInstances[sReference] = {
-			storageResponse: { changes: StorageUtils.getEmptyFlexDataResponse() },
 			emptyState: true,
 			// this makes sure that a proper initialize will still work as expected
 			reInitialize: true,
 			componentId: ""
 		};
-		_mCachedFlexData[sReference] = { changes: StorageUtils.getEmptyFlexDataResponse() };
 		const oNewInitPromise = new Deferred();
 		_mInitPromises[sReference] = oNewInitPromise;
 		oNewInitPromise.resolve();
-		initializeNewInstance({ reference: sReference});
+		const oEmptyResponse = Loader.initializeEmptyCache(sReference);
+		initializeNewInstance({ reference: sReference }, oEmptyResponse);
 	}
 
 	FlexState.getRuntimeOnlyData = function(sReference) {
@@ -457,8 +409,6 @@ sap.ui.define([
 	 * @param {object} [mPropertyBag.rawManifest] - Raw JSON manifest that belongs to current component
 	 * @param {string} [mPropertyBag.componentData] - Component data of the current component
 	 * @param {object} [mPropertyBag.asyncHints] - Async hints passed from the app index to the component processing
-	 * @param {string} [mPropertyBag.version] - Number of the version in which the state should be initialized
-	 * @param {string} [mPropertyBag.adaptationId] - Context-based adaptation for which the state should be initialized
 	 * @param {boolean} [mPropertyBag.skipLoadBundle=false] - if true state is initialized partially and does not include flex bundles
 	 * @returns {Promise<undefined>} Resolves a promise as soon as FlexState is initialized
 	 */
@@ -467,29 +417,27 @@ sap.ui.define([
 		enhancePropertyBag(mProperties);
 		const sFlexReference = mProperties.reference;
 
+		// TODO: Probably obsolete, as the init call is awaited in the Loader
 		const oOldInitPromise = _mInitPromises[sFlexReference];
 		const oNewInitPromise = new Deferred();
 		_mInitPromises[sFlexReference] = oNewInitPromise;
 
 		if (oOldInitPromise) {
 			await oOldInitPromise.promise;
-			checkPartialFlexState(mProperties);
-			checkVersionAndAllContexts(mProperties);
-			if (mProperties.reInitialize) {
-				await loadAndCacheFlexData(mProperties);
-				prepareNewInstance(mProperties);
-			} else if (checkComponentIdChanged(mProperties)) {
-				// a changed component ID does not invalidate the cached flex data, only the instance
-				prepareNewInstance(mProperties);
-			} else {
-				rebuildResponseIfMaxLayerChanged(mPropertyBag.reference);
-			}
-		} else {
-			await loadAndCacheFlexData(mProperties);
+		}
+
+		const oFlexData = await Loader.getFlexData(mProperties);
+		if (
+			!_mInstances[mProperties.reference]?.storageResponse
+			|| oFlexData.cacheInvalidated
+			|| checkComponentIdChanged(mProperties)
+		) {
 			prepareNewInstance(mProperties);
+		} else {
+			rebuildResponseIfMaxLayerChanged(mProperties.reference, oFlexData.data);
 		}
 
-		initializeNewInstance(mProperties);
+		initializeNewInstance(mProperties, oFlexData.data);
 		oNewInitPromise.resolve();
 	};
 
@@ -524,27 +472,23 @@ sap.ui.define([
 	};
 
 	/**
-	 * Updates the saved backend response and the runtime persistence with new data.
-	 * The new data must not be already available in the storageResponse or runtimePersistence.
-	 * As of now this does not work with nested structures (comp related objects) or ui2personalization.
+	 * Lazy loads the flex variant for a specific reference and adds it to the runtime persistence
 	 *
 	 * @param {object} mPropertyBag - Contains additional data needed for reading and storing changes
 	 * @param {string} mPropertyBag.reference - Flex reference of the app
-	 * @param {object} mPropertyBag.newData - New Data to be added. Needs to have the structure of the storageResponse.changes object
+	 * @param {string} mPropertyBag.variantReference - The reference of the variant to load.
 	 */
-	FlexState.updateWithDataProvided = function(mPropertyBag) {
+	FlexState.lazyLoadFlVariant = async function(mPropertyBag) {
 		if (!_mInstances[mPropertyBag.reference]) {
 			initializeEmptyState(mPropertyBag.reference);
 		}
+		const oResult = await Loader.loadFlVariant(mPropertyBag);
 		const oInstance = _mInstances[mPropertyBag.reference];
-		Object.entries(mPropertyBag.newData).forEach(([sKey, vValue]) => {
-			_mCachedFlexData[mPropertyBag.reference].changes[sKey].push(...vValue);
-		});
-		oInstance.storageResponse = filterByMaxLayer(mPropertyBag.reference, _mCachedFlexData[mPropertyBag.reference]);
+		oInstance.storageResponse = filterByMaxLayer(mPropertyBag.reference, oResult.completeData);
 		oInstance.runtimePersistence.flexObjects =
 		[
 			...oInstance.runtimePersistence.flexObjects,
-			...createFlexObjects(filterByMaxLayer(mPropertyBag.reference, { changes: mPropertyBag.newData }))
+			...createFlexObjects(filterByMaxLayer(mPropertyBag.reference, { changes: oResult.newData }))
 		];
 		oFlexObjectsDataSelector.checkUpdate({ reference: mPropertyBag.reference });
 	};
@@ -557,11 +501,9 @@ sap.ui.define([
 	 * @param {string} [mPropertyBag.reference] - Flex reference of the app
 	 * @param {object} [mPropertyBag.manifest] - Manifest that belongs to actual component
 	 * @param {string} [mPropertyBag.componentData] - Component data of the current component
-	 * @param {string} [mPropertyBag.version] - Number of the version in which the state should be updated
-	 * @param {string} [mPropertyBag.adaptationId] - Context-based adaptation for which the state should be updated
 	 * @returns {Promise<undefined>} Resolves when the data is loaded and the runtime persistence is updated
 	 */
-	FlexState.update = async function(mPropertyBag) {
+	FlexState.reinitialize = async function(mPropertyBag) {
 		enhancePropertyBag(mPropertyBag);
 		const sReference = mPropertyBag.reference;
 		const oCurrentRuntimePersistence = _mInstances[sReference].runtimePersistence;
@@ -570,9 +512,10 @@ sap.ui.define([
 		const oNewInitPromise = new Deferred();
 		_mInitPromises[sReference] = oNewInitPromise;
 		await oOldInitPromise;
-		await loadAndCacheFlexData(mPropertyBag);
+		mPropertyBag.reInitialize = true;
+		const oResponse = await Loader.getFlexData(mPropertyBag);
 		prepareNewInstance(mPropertyBag);
-		_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mCachedFlexData[sReference]);
+		_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, oResponse.data);
 		const bUpdated = updateRuntimePersistence(
 			sReference,
 			_mInstances[sReference].storageResponse,
@@ -584,31 +527,6 @@ sap.ui.define([
 		oNewInitPromise.resolve();
 	};
 
-	function getChangeCategory(oChangeDefinition) {
-		switch (oChangeDefinition.fileType) {
-			case "change":
-				if (oChangeDefinition.selector && oChangeDefinition.selector.persistencyKey) {
-					return ["comp", "changes"];
-				}
-				if (oChangeDefinition.variantReference) {
-					return "variantDependentControlChanges";
-				}
-				return "changes";
-			case "ctrl_variant":
-				return "variants";
-			case "ctrl_variant_change":
-				return "variantChanges";
-			case "ctrl_variant_management_change":
-				return "variantManagementChanges";
-			case "variant":
-				return ["comp", "variants"];
-			case "annotation_change":
-				return "annotationChanges";
-			default:
-				return "";
-		}
-	}
-
 	/**
 	 * Some save operations don't require a complete new data request, so the storage response gets a live update.
 	 * This will also update the runtime persistence.
@@ -616,43 +534,30 @@ sap.ui.define([
 	 * @param {string} sReference - Flex reference of the app
 	 * @param {object[]} aUpdates - All new FlexObjects in JSON format
 	 */
-	FlexState.updateStorageResponse = function(sReference, aUpdates) {
+	FlexState.update = function(sReference, aUpdates) {
 		const aFlexObjectUpdates = [];
+		StorageUtils.updateStorageResponse(_mInstances[sReference].storageResponse, aUpdates);
+		Loader.updateCachedResponse(sReference, aUpdates);
 		aUpdates.forEach((oUpdate) => {
-			if (oUpdate.type === "ui2") {
-				_mCachedFlexData[sReference].changes.ui2personalization = oUpdate.newData;
-			} else {
-				const vPath = getChangeCategory(oUpdate.flexObject);
-				const sFileName = oUpdate.flexObject.fileName;
-				const aUnfiltered = ObjectPath.get(vPath, _mCachedFlexData[sReference].changes);
-				const aFiltered = ObjectPath.get(vPath, _mInstances[sReference].storageResponse.changes);
-				const iExistingFlexObjectIdx = _mInstances[sReference].runtimePersistence.flexObjects.findIndex(
-					(oFlexObject) => oFlexObject.getId() === sFileName
+			if (oUpdate.type !== "ui2") {
+				// In some scenarios the runtime persistence is already updated
+				const iExistingFlexObjectIndex = _mInstances[sReference].runtimePersistence.flexObjects.findIndex(
+					(oFlexObject) => oFlexObject.getId() === oUpdate.flexObject.fileName
 				);
-				const oExistingFlexObject = _mInstances[sReference].runtimePersistence.flexObjects[iExistingFlexObjectIdx];
+				const oExistingFlexObject = _mInstances[sReference].runtimePersistence.flexObjects[iExistingFlexObjectIndex];
 				switch (oUpdate.type) {
 					case "add":
-						aUnfiltered.push(oUpdate.flexObject);
-						aFiltered.push(oUpdate.flexObject);
-						if (iExistingFlexObjectIdx < 0) {
+						if (iExistingFlexObjectIndex < 0) {
 							throw new Error("Flex response includes unknown flex object");
 						}
 						break;
 					case "delete":
-						aFiltered.splice(aFiltered.findIndex((oFlexObject) => oFlexObject.fileName === sFileName), 1);
-						aUnfiltered.splice(aUnfiltered.findIndex((oFlexObject) => oFlexObject.fileName === sFileName), 1);
-						if (iExistingFlexObjectIdx >= 0) {
-							_mInstances[sReference].runtimePersistence.flexObjects.splice(iExistingFlexObjectIdx, 1);
+						if (iExistingFlexObjectIndex >= 0) {
+							_mInstances[sReference].runtimePersistence.flexObjects.splice(iExistingFlexObjectIndex, 1);
 							aFlexObjectUpdates.push({ type: "removeFlexObject", updatedObject: oExistingFlexObject });
 						}
 						break;
 					case "update":
-						aFiltered.splice(aFiltered.findIndex((oFlexObject) => oFlexObject.fileName === sFileName), 1, oUpdate.flexObject);
-						aUnfiltered.splice(
-							aUnfiltered.findIndex((oFlexObject) => oFlexObject.fileName === sFileName),
-							1,
-							oUpdate.flexObject
-						);
 						if (oExistingFlexObject && oExistingFlexObject.getState() !== States.LifecycleState.PERSISTED) {
 							oExistingFlexObject.setResponse(oUpdate.flexObject);
 							aFlexObjectUpdates.push({ type: "updateFlexObject", updatedObject: oExistingFlexObject });
@@ -662,12 +567,13 @@ sap.ui.define([
 				}
 			}
 		});
-		if (aFlexObjectUpdates.length > 0) {
+		if (aFlexObjectUpdates.length) {
 			oFlexObjectsDataSelector.checkUpdate({ reference: sReference }, aFlexObjectUpdates);
 		}
 	};
 
 	FlexState.clearState = function(sReference) {
+		Loader.clearCache(sReference);
 		if (sReference) {
 			delete _mInstances[sReference];
 			delete _mInitPromises[sReference];
@@ -722,10 +628,11 @@ sap.ui.define([
 	 * and removes the internal maps for the given reference.
 	 *
 	 * @param {string} sReference - Flex reference of the app
+	 * @param {object} oFlexData - Flex data to be used for rebuilding the response
 	 */
-	FlexState.rebuildFilteredResponse = function(sReference) {
+	FlexState.rebuildFilteredResponse = function(sReference, oFlexData) {
 		if (_mInstances[sReference]) {
-			_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mCachedFlexData[sReference]);
+			_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, oFlexData);
 			// Storage response has changed, recreate the flex objects
 			_mInstances[sReference].runtimePersistence = buildRuntimePersistence(
 				_mInstances[sReference],
@@ -808,7 +715,7 @@ sap.ui.define([
 	};
 
 	FlexState.getUI2Personalization = function(sReference) {
-		return merge({}, _mCachedFlexData[sReference].changes.ui2personalization);
+		return merge({}, _mInstances[sReference].storageResponse.changes.ui2personalization);
 	};
 
 	FlexState.callPrepareFunction = function(sMapName, mPropertyBag) {
@@ -816,13 +723,12 @@ sap.ui.define([
 	};
 
 	// TODO: used by the CompVariantState to mutate the storage response, this has to be changed
-	FlexState.getStorageResponse = function(sReference) {
+	FlexState.getStorageResponse = async function(sReference) {
 		if (_mInitPromises[sReference]) {
-			return _mInitPromises[sReference].promise.then(function() {
-				return _mCachedFlexData[sReference];
-			});
+			await _mInitPromises[sReference].promise;
+			return Loader.getCachedFlexData(sReference);
 		}
-		return Promise.resolve();
+		return undefined;
 	};
 
 	FlexState.getComponentData = function(sReference) {
@@ -838,19 +744,5 @@ sap.ui.define([
 		return _mExternalData.smartVariantManagementControls[sReference] || [];
 	};
 
-	/**
-	 * This function is temporary and will be removed once the allContextsProvided property is part of the flex/data requests in ABAP
-	 * The allContextsProvided property is not part of the initial flex/data request and needs to be set later to prevent
-	 * FlexState from being reinitialized
-	 *
-	 * @param {string} sReference - Flexibility reference of the app
-	 * @param {boolean} bAllContextsProvided - Flag to indicate if all contexts are provided
-	 */
-	FlexState.setAllContextsProvided = function(sReference, bAllContextsProvided) {
-		if (_mInstances[sReference] && _mInstances[sReference].allContextsProvided === undefined) {
-			_mInstances[sReference].allContextsProvided = bAllContextsProvided;
-		}
-	};
-
 	return FlexState;
 });

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

@@ -7,7 +7,6 @@ sap.ui.define([
 	"sap/ui/core/Lib",
 	"sap/ui/fl/apply/_internal/controlVariants/Utils",
 	"sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory",
-	"sap/ui/fl/apply/_internal/flexObjects/getVariantAuthor",
 	"sap/ui/fl/apply/_internal/flexObjects/States",
 	"sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler",
 	"sap/ui/fl/Layer"
@@ -15,7 +14,6 @@ sap.ui.define([
 	Lib,
 	ControlVariantUtils,
 	FlexObjectFactory,
-	getVariantAuthor,
 	States,
 	DependencyHandler,
 	Layer
@@ -33,12 +31,6 @@ sap.ui.define([
 	const InitialPrepareFunctions = {};
 
 	InitialPrepareFunctions.variants = function(mPropertyBag) {
-		// Exchange author  of fl variant from userID to user's name
-		mPropertyBag.flexObjects.forEach((oFlexObject) => {
-			if (oFlexObject.getFileType() === "ctrl_variant") {
-				oFlexObject.setAuthor(getVariantAuthor(oFlexObject.getSupportInformation().user, oFlexObject.getLayer(), mPropertyBag.storageResponse.authors));
-			}
-		});
 		const aVariantIds = (mPropertyBag.storageResponse.changes.variants || [])
 		.map(function(oVariantDef) {
 			return oVariantDef.fileName;

package/src/sap/ui/fl/apply/_internal/flexState/UI2Personalization/UI2PersonalizationState.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.UI2Personalization.UI2PersonalizationState
 	 * @since 1.75
-	 * @version 1.140.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.DependencyHandler
 	 * @since 1.74
-	 * @version 1.140.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -41,7 +41,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.ExtensionPointState
 	 * @since 1.79
-	 * @version 1.140.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted
 	 */