@openui5/sap.ui.fl 1.141.2 → 1.143.0

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.141.2
+	 * @version 1.143.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -37,7 +37,6 @@ sap.ui.define([
 			}
 		},
 
-		// eslint-disable-next-line object-shorthand
 		constructor: function(...aArgs) {
 			FlexObject.apply(this, aArgs);
 			this.setFileType("ctrl_variant_management_change");

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

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

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

@@ -85,7 +85,6 @@ sap.ui.define([
 				}
 			}
 		},
-		// eslint-disable-next-line object-shorthand
 		constructor: function(...aArgs) {
 			ManagedObject.apply(this, aArgs);
 			this._mInitialized = {};

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.141.2
+	 * @version 1.143.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -164,7 +164,7 @@ sap.ui.define([
 	 * @returns {object} Dependency Map
 	 */
 	FlexObjectState.getLiveDependencyMap = function(sReference) {
-		return FlexState.getRuntimeOnlyData(sReference).liveDependencyMap || DependencyHandler.createEmptyDependencyMap();
+		return FlexState.getRuntimeOnlyData(sReference)?.liveDependencyMap || DependencyHandler.createEmptyDependencyMap();
 	};
 
 	/**
@@ -231,7 +231,7 @@ sap.ui.define([
 			const mChangesMap = FlexObjectState.getLiveDependencyMap(sFlexReference);
 			let aPromises = [];
 			const mDependencies = { ...mChangesMap.mDependencies };
-			const {mChanges} = mChangesMap;
+			const { mChanges } = mChangesMap;
 			const aChangesForControl = mChanges[oControl.getId()] || [];
 
 			// filter out already applied changes and, if given, filter by change type
@@ -273,7 +273,7 @@ sap.ui.define([
 		}
 
 		return oAllDirtyFlexObjectsDataSelector
-		.get({reference: sReference})
+		.get({ reference: sReference })
 		.filter((oFlexObject) => isNewChangeDeleted(oFlexObject));
 	};
 

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

@@ -14,6 +14,7 @@ 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/changes/DependencyHandler",
 	"sap/ui/fl/apply/_internal/flexState/DataSelector",
 	"sap/ui/fl/apply/_internal/flexState/InitialPrepareFunctions",
 	"sap/ui/fl/initial/_internal/Loader",
@@ -32,6 +33,7 @@ sap.ui.define([
 	Component,
 	FlexObjectFactory,
 	States,
+	DependencyHandler,
 	DataSelector,
 	InitialPrepareFunctions,
 	Loader,
@@ -51,23 +53,7 @@ sap.ui.define([
 	 *
 	 *	{
 	 * 		storageResponse: {
-	 * 			changes: {
-	 * 				annotationChanges: [...],
-	 * 				appDescriptorChanges: [...],
-	 * 				changes: [...],
-	 * 				comp: {
-	 * 					variants: [...],
-	 * 					changes: [...],
-	 * 					defaultVariants: [...],
-	 * 					standardVariants: [...]
-	 * 				}
-	 * 				variants: [...],
-	 * 				variantChanges: [...],
-	 * 				variantDependentControlChanges: [...],
-	 * 				variantManagementChanges: [...],
-	 * 				ui2personalization: {...}
-	 * 			},
-	 * 			loadModules: <boolean>
+	 * 			changes: {...}, // see Loader.js
 	 * 		},
 	 * 		runtimePersistence: {
 	 * 			flexObjects: [...],
@@ -84,7 +70,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.FlexState
 	 * @since 1.73
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
@@ -226,6 +212,7 @@ sap.ui.define([
 		var oRuntimePersistence = {
 			flexObjects: createFlexObjects(oStorageResponse),
 			runtimeOnlyData: {
+				liveDependencyMap: DependencyHandler.createEmptyDependencyMap(),
 				flexObjects: []
 			}
 		};
@@ -333,7 +320,7 @@ sap.ui.define([
 		}
 
 		if (bDataUpdated) {
-			oFlexObjectsDataSelector.checkUpdate({ reference: sReference});
+			oFlexObjectsDataSelector.checkUpdate({ reference: sReference });
 		}
 	}
 
@@ -377,12 +364,15 @@ sap.ui.define([
 		}
 	}
 
-	function initializeEmptyState(sReference) {
+	function initializeEmptyState(sReference, sComponentId) {
+		if (!sComponentId) {
+			throw new Error(`No FlexState instance created for reference ${sReference} - missing component ID`);
+		}
 		_mInstances[sReference] = {
 			emptyState: true,
 			// this makes sure that a proper initialize will still work as expected
 			reInitialize: true,
-			componentId: ""
+			componentId: sComponentId
 		};
 		const oNewInitPromise = new Deferred();
 		_mInitPromises[sReference] = oNewInitPromise;
@@ -392,10 +382,14 @@ sap.ui.define([
 	}
 
 	FlexState.getRuntimeOnlyData = function(sReference) {
+		return _mInstances[sReference]?.runtimePersistence?.runtimeOnlyData;
+	};
+
+	FlexState.addFlexObjectsToRuntimeOnlyData = function(sReference, sComponentId, aFlexObjects) {
 		if (!_mInstances[sReference]) {
-			initializeEmptyState(sReference);
+			initializeEmptyState(sReference, sComponentId);
 		}
-		return _mInstances[sReference].runtimePersistence.runtimeOnlyData;
+		_mInstances[sReference].runtimePersistence.runtimeOnlyData.flexObjects.push(...aFlexObjects);
 	};
 
 	/**
@@ -409,7 +403,8 @@ 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 {boolean} [mPropertyBag.skipLoadBundle=false] - if true state is initialized partially and does not include flex bundles
+	 * @param {boolean} [mPropertyBag.skipLoadBundle=false] - If true state is initialized partially and does not include flex bundles
+	 * @param {boolean} [mPropertyBag.forceInvalidation=false] - Make sure that the cache is invalidated during initialization
 	 * @returns {Promise<undefined>} Resolves a promise as soon as FlexState is initialized
 	 */
 	FlexState.initialize = async function(mPropertyBag) {
@@ -430,6 +425,7 @@ sap.ui.define([
 		if (
 			!_mInstances[mProperties.reference]?.storageResponse
 			|| oFlexData.cacheInvalidated
+			|| mProperties.forceInvalidation
 			|| checkComponentIdChanged(mProperties)
 		) {
 			prepareNewInstance(mProperties);
@@ -476,11 +472,12 @@ sap.ui.define([
 	 *
 	 * @param {object} mPropertyBag - Contains additional data needed for reading and storing changes
 	 * @param {string} mPropertyBag.reference - Flex reference of the app
+	 * @param {string} mPropertyBag.componentId - ID of the component
 	 * @param {string} mPropertyBag.variantReference - The reference of the variant to load.
 	 */
 	FlexState.lazyLoadFlVariant = async function(mPropertyBag) {
 		if (!_mInstances[mPropertyBag.reference]) {
-			initializeEmptyState(mPropertyBag.reference);
+			initializeEmptyState(mPropertyBag.reference, mPropertyBag.componentId);
 		}
 		const oResult = await Loader.loadFlVariant(mPropertyBag);
 		const oInstance = _mInstances[mPropertyBag.reference];
@@ -597,6 +594,9 @@ sap.ui.define([
 	 * @param {object} oFlexObject - Flex object to be added as runtime-steady
 	 */
 	FlexState.addRuntimeSteadyObject = function(sReference, sComponentId, oFlexObject) {
+		if (!_mInstances[sReference]) {
+			initializeEmptyState(sReference, sComponentId);
+		}
 		// with setting the state to persisted it is made sure that they not show up as a dirty flex object
 		oFlexObject.setState(States.LifecycleState.PERSISTED);
 		_mExternalData.flexObjects[sReference] ||= {};
@@ -647,11 +647,12 @@ sap.ui.define([
 	 *
 	 * @param {string} sReference - Flexibility reference of the app
 	 * @param {array.<sap.ui.fl.apply._internal.flexObjects.FlexObject>} aFlexObjects - Flex objects
+	 * @param {string} [sComponentId] - ID of the component, required if an empty state needs to be initialized
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} The flex objects that were added
 	 */
-	FlexState.addDirtyFlexObjects = function(sReference, aFlexObjects) {
+	FlexState.addDirtyFlexObjects = function(sReference, aFlexObjects, sComponentId) {
 		if (!_mInstances[sReference]) {
-			initializeEmptyState(sReference);
+			initializeEmptyState(sReference, sComponentId);
 		}
 		const sAdaptationLayer = FlexInfoSession.getByReference(sReference).adaptationLayer;
 		const aFilteredFlexObjects = aFlexObjects

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.141.2
+	 * @version 1.143.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.141.2
+	 * @version 1.143.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.141.2
+	 * @version 1.143.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -73,9 +73,9 @@ sap.ui.define([
 			if (bOriginalSelectorNeedsToBeAdjusted) {
 				oChange.originalSelectorToBeAdjusted = mOriginalSelector;
 			} else {
-				oChange.setDependentSelectors({originalSelector: mOriginalSelector});
+				oChange.setDependentSelectors({ originalSelector: mOriginalSelector });
 			}
-			oChange.setContent({boundAggregation: oExtensionPoint.closestAggregationBinding});
+			oChange.setContent({ boundAggregation: oExtensionPoint.closestAggregationBinding });
 		} else {
 			mSelector = merge(mSelector, {
 				id: oExtensionPoint.targetControl.getId(),

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.flexState.changes.UIChangesState
 	 * @since 1.121
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -80,11 +80,11 @@ sap.ui.define([
 	});
 
 	UIChangesState.getVMIndependentCompleteDependencyMap = function(sReference) {
-		return oVMIndependentCompleteDependencyMapDataSelector.get({reference: sReference});
+		return oVMIndependentCompleteDependencyMapDataSelector.get({ reference: sReference });
 	};
 
 	UIChangesState.getVariantIndependentUIChanges = function(sReference) {
-		return oVMIndependentUIChangesDataSelector.get({reference: sReference});
+		return oVMIndependentUIChangesDataSelector.get({ reference: sReference });
 	};
 
 	/**
@@ -94,7 +94,7 @@ sap.ui.define([
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} All UI Changes
 	 */
 	UIChangesState.getAllUIChanges = function(sReference) {
-		return oAllUIChangesDataSelector.get({reference: sReference});
+		return oAllUIChangesDataSelector.get({ reference: sReference });
 	};
 
 	return UIChangesState;

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

@@ -28,7 +28,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.compVariants.CompVariantManagementState
 	 * @since 1.129
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -320,8 +320,8 @@ sap.ui.define([
 			mPropertyBag.variants?.map((oVariant) => {
 				oVariant.reference = mPropertyBag.reference;
 				oVariant.fileName = escapeSpecialIdCharacters(oVariant.id); // external oData Variants may have an invalid ID for ManagedObjects
-				oVariant.selector = {persistencyKey: mPropertyBag.persistencyKey};
-				oVariant.texts = {variantName: {value: oVariant.name}};
+				oVariant.selector = { persistencyKey: mPropertyBag.persistencyKey };
+				oVariant.texts = { variantName: { value: oVariant.name } };
 				return oVariant;
 			})
 			.map((oVariant) => FlexObjectFactory.createFromFileContent(oVariant, CompVariant, true))

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

@@ -79,7 +79,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.Switcher
 	 * @since 1.74
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -114,8 +114,8 @@ sap.ui.define([
 				}
 			});
 
-			await Reverter.revertMultipleChanges(mChangesToBeSwitched.changesToBeReverted, {...mPropertyBag, skipSetQueued: true});
-			await Applier.applyMultipleChanges(mChangesToBeSwitched.changesToBeApplied, {...mPropertyBag, skipSetQueued: true});
+			await Reverter.revertMultipleChanges(mChangesToBeSwitched.changesToBeReverted, { ...mPropertyBag, skipSetQueued: true });
+			await Applier.applyMultipleChanges(mChangesToBeSwitched.changesToBeApplied, { ...mPropertyBag, skipSetQueued: true });
 			VariantManagementState.setCurrentVariant(mPropertyBag);
 		}
 

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

@@ -53,7 +53,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.VariantManagementState
 	 * @since 1.74
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -418,11 +418,11 @@ sap.ui.define([
 	});
 
 	VariantManagementState.getDependencyMap = function(sReference) {
-		return oUIChangesDependencyMapDataSelector.get({reference: sReference});
+		return oUIChangesDependencyMapDataSelector.get({ reference: sReference });
 	};
 
 	VariantManagementState.getVariantDependentFlexObjects = function(sReference) {
-		return oVariantDependentFlexObjectsDataSelector.get({reference: sReference});
+		return oVariantDependentFlexObjectsDataSelector.get({ reference: sReference });
 	};
 
 	VariantManagementState.getChangeInformationProvider = function(oFlexObject) {
@@ -479,8 +479,8 @@ sap.ui.define([
 	 * @param {string} sReference - Flex reference of the app
 	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} aFlexObjects - Flex objects to be added as runtime-only
 	 */
-	VariantManagementState.addRuntimeOnlyFlexObjects = function(sReference, aFlexObjects) {
-		aFlexObjects.forEach((oFlexObject) => FlexState.getRuntimeOnlyData(sReference).flexObjects.push(oFlexObject));
+	VariantManagementState.addRuntimeOnlyFlexObjects = function(sReference, sComponentId, aFlexObjects) {
+		FlexState.addFlexObjectsToRuntimeOnlyData(sReference, sComponentId, aFlexObjects);
 		// Only called during destruction, no need to recalculate new state immediately
 		FlexState.getFlexObjectsDataSelector().clearCachedResult({ reference: sReference });
 	};
@@ -495,7 +495,8 @@ sap.ui.define([
 	VariantManagementState.loadVariant = async function(mPropertyBag) {
 		await FlexState.lazyLoadFlVariant({
 			variantReference: mPropertyBag.variantReference,
-			reference: mPropertyBag.reference
+			reference: mPropertyBag.reference,
+			componentId: mPropertyBag.componentId
 		});
 	};
 
@@ -821,7 +822,7 @@ sap.ui.define([
 		);
 		oVariantManagementMapDataSelector.checkUpdate(
 			{ reference: mPropertyBag.reference },
-			[{ type: "switchVariant"}]
+			[{ type: "switchVariant" }]
 		);
 	};
 

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 *
 	 * @name sap.ui.fl.apply._internal.init
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @since 1.141.0
 	 * @private
 	 */