@openui5/sap.ui.fl 1.128.0 → 1.130.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.128.0
+	 * @version 1.130.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -79,10 +79,11 @@ sap.ui.define([
 	 * @static
 	 */
 	FlVariant.getMappingInfo = function() {
-		return Object.assign(Variant.getMappingInfo(), {
+		return {
+			...Variant.getMappingInfo(),
 			variantReference: "variantReference",
 			variantManagementReference: "variantManagementReference"
-		});
+		};
 	};
 
 	/**

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.128.0
+	 * @version 1.130.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -166,7 +166,7 @@ sap.ui.define([
 	 * @static
 	 */
 	FlexObject.getMappingInfo = function() {
-		return Object.assign({}, {
+		return {
 			"flexObjectMetadata.changeType": "changeType",
 			"flexObjectMetadata.reference": "reference",
 			"flexObjectMetadata.namespace": "namespace",
@@ -192,7 +192,7 @@ sap.ui.define([
 			id: "fileName",
 			content: "content",
 			texts: "texts"
-		});
+		};
 	};
 
 	/**
@@ -213,7 +213,7 @@ sap.ui.define([
 	FlexObject.prototype.setContent = function(oContent, bSkipStateChange) {
 		this.setProperty("content", oContent);
 		if (!bSkipStateChange) {
-			this.setState(States.LifecycleState.DIRTY);
+			this.setState(States.LifecycleState.UPDATED);
 		}
 		return this;
 	};
@@ -223,7 +223,7 @@ sap.ui.define([
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject.FlexObjectMetadata} Additional metadata
 	 */
 	FlexObject.prototype.getFlexObjectMetadata = function() {
-		return Object.assign({}, this.getProperty("flexObjectMetadata"));
+		return { ...this.getProperty("flexObjectMetadata") };
 	};
 
 	/**
@@ -231,7 +231,7 @@ sap.ui.define([
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject.SupportInformation} Support information
 	 */
 	FlexObject.prototype.getSupportInformation = function() {
-		return Object.assign({}, this.getProperty("supportInformation"));
+		return { ...this.getProperty("supportInformation") };
 	};
 
 	function isValidStateChange(sNewState, sCurrentState) {
@@ -241,7 +241,7 @@ sap.ui.define([
 		// flex object state cannot move from NEW to DIRTY directly
 		if (
 			sCurrentState === States.LifecycleState.NEW
-			&& sNewState === States.LifecycleState.DIRTY
+			&& sNewState === States.LifecycleState.UPDATED
 		) {
 			return false;
 		}
@@ -306,6 +306,10 @@ sap.ui.define([
 		return (sSourceSystem !== sSystem || sSourceClient !== sClient);
 	};
 
+	FlexObject.prototype.isValidForDependencyMap = function() {
+		return false;
+	};
+
 	/**
 	 * Getter for the namespace from the FlexObjectMetadata.
 	 * @returns {string} Namespace
@@ -349,17 +353,17 @@ sap.ui.define([
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject} <code>this</code> context for chaining
 	 */
 	FlexObject.prototype.setText = function(sTextId, sNewText, sType, bSkipStateChange) {
-		var oTexts = Object.assign({}, this.getTexts());
-		var oNewText = {
+		const oTexts = { ...this.getTexts() };
+		const oNewText = {
 			value: sNewText
 		};
 		if (sType) {
 			oNewText.type = sType;
 		}
-		oTexts[sTextId] = Object.assign({}, oTexts[sTextId], oNewText);
+		oTexts[sTextId] = { ...oTexts[sTextId], ...oNewText };
 		this.setTexts(oTexts);
 		if (!bSkipStateChange) {
-			this.setState(States.LifecycleState.DIRTY);
+			this.setState(States.LifecycleState.UPDATED);
 		}
 		return this;
 	};
@@ -539,4 +543,4 @@ sap.ui.define([
 		return mFileContent;
 	};
 	return FlexObject;
-});
+});

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

@@ -15,6 +15,7 @@ sap.ui.define([
 	"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",
 	"sap/ui/fl/registry/Settings",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/LayerUtils",
@@ -31,6 +32,7 @@ sap.ui.define([
 	getVariantAuthor,
 	States,
 	UIChange,
+	UpdatableChange,
 	Settings,
 	Layer,
 	LayerUtils,
@@ -38,14 +40,14 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	var FLEX_OBJECT_TYPES = {
-		BASE_FLEX_OBJECT: FlexObject,
+	const FLEX_OBJECT_TYPES = {
 		COMP_VARIANT_OBJECT: CompVariant,
 		FL_VARIANT_OBJECT: FlVariant,
 		CONTROLLER_EXTENSION: ControllerExtensionChange,
 		APP_DESCRIPTOR_CHANGE: AppDescriptorChange,
 		ANNOTATION_CHANGE: AnnotationChange,
-		UI_CHANGE: UIChange
+		UI_CHANGE: UIChange,
+		UPDATABLE_CHANGE: UpdatableChange
 	};
 
 	function getFlexObjectClass(oNewFileContent) {
@@ -59,6 +61,8 @@ sap.ui.define([
 			return FLEX_OBJECT_TYPES.APP_DESCRIPTOR_CHANGE;
 		} else if (oNewFileContent.fileType === "annotation_change") {
 			return FLEX_OBJECT_TYPES.ANNOTATION_CHANGE;
+		} else if (oNewFileContent.fileType === "change" && oNewFileContent.changeType === "defaultVariant") {
+			return FLEX_OBJECT_TYPES.UPDATABLE_CHANGE;
 		}
 		return FLEX_OBJECT_TYPES.UI_CHANGE;
 	}
@@ -102,11 +106,11 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexObjects.FlexObjectFactory
 	 * @since 1.100
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
-	var FlexObjectFactory = {};
+	const FlexObjectFactory = {};
 
 	/**
 	 * Creates a new flex object.
@@ -115,26 +119,23 @@ sap.ui.define([
 	 * @param {class} [ObjectClass] - Object class to be instantiated
 	 * @param {boolean} [bPersisted] - Whether to set the state to PERSISTED after creation
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject} Created flex object
+	 * @private
+	 * @ui5-restricted sap.ui.fl, ux tools
 	 */
 	FlexObjectFactory.createFromFileContent = function(oFileContent, ObjectClass, bPersisted) {
-		var oNewFileContent = Object.assign({}, oFileContent);
+		const oNewFileContent = { ...oFileContent };
 		var FlexObjectClass = ObjectClass || getFlexObjectClass(oNewFileContent);
 		if (!FlexObjectClass) {
 			throw new Error("Unknown file type");
 		}
-		oNewFileContent.support = Object.assign(
-			{
-				generator: "FlexObjectFactory.createFromFileContent"
-			},
-			oNewFileContent.support || {}
-		);
-		var oMappingInfo = FlexObjectClass.getMappingInfo();
-		var mCreationInfo = FlexObject.mapFileContent(oNewFileContent, oMappingInfo);
-		var mProperties = Object.entries(mCreationInfo).reduce(function(mPropertyMap, aProperty) {
+		oNewFileContent.support = { generator: "FlexObjectFactory.createFromFileContent", ...(oNewFileContent.support || {}) };
+		const oMappingInfo = FlexObjectClass.getMappingInfo();
+		const mCreationInfo = FlexObject.mapFileContent(oNewFileContent, oMappingInfo);
+		const mProperties = Object.entries(mCreationInfo).reduce(function(mPropertyMap, aProperty) {
 			ObjectPath.set(aProperty[0].split("."), aProperty[1], mPropertyMap);
 			return mPropertyMap;
 		}, {});
-		var oFlexObject = new FlexObjectClass(mProperties);
+		const oFlexObject = new FlexObjectClass(mProperties);
 		if (bPersisted) {
 			// Set the property directly for the initial state to avoid state change validation
 			oFlexObject.setProperty("state", States.LifecycleState.PERSISTED);
@@ -144,7 +145,7 @@ sap.ui.define([
 
 	FlexObjectFactory.createUIChange = function(mPropertyBag) {
 		mPropertyBag.packageName ||= "$TMP";
-		var mProperties = createBasePropertyBag(mPropertyBag);
+		const mProperties = createBasePropertyBag(mPropertyBag);
 		mProperties.layer ||= mPropertyBag.isUserDependent ? Layer.USER : LayerUtils.getCurrentLayer();
 		mProperties.selector = mPropertyBag.selector;
 		mProperties.jsOnly = mPropertyBag.jsOnly;
@@ -156,13 +157,13 @@ sap.ui.define([
 
 	FlexObjectFactory.createAppDescriptorChange = function(mPropertyBag) {
 		mPropertyBag.compositeCommand ||= mPropertyBag.support && mPropertyBag.support.compositeCommand;
-		var mProperties = createBasePropertyBag(mPropertyBag);
+		const mProperties = createBasePropertyBag(mPropertyBag);
 		return new AppDescriptorChange(mProperties);
 	};
 
 	FlexObjectFactory.createAnnotationChange = function(mPropertyBag) {
 		mPropertyBag.compositeCommand ||= mPropertyBag.support && mPropertyBag.support.compositeCommand;
-		var mProperties = createBasePropertyBag(mPropertyBag);
+		const mProperties = createBasePropertyBag(mPropertyBag);
 		return new AnnotationChange(mProperties);
 	};
 
@@ -185,7 +186,7 @@ sap.ui.define([
 			codeRef: mPropertyBag.codeRef
 		};
 
-		var mProperties = createBasePropertyBag(mPropertyBag);
+		const mProperties = createBasePropertyBag(mPropertyBag);
 		mProperties.flexObjectMetadata.moduleName = mPropertyBag.moduleName;
 		mProperties.controllerName = mPropertyBag.controllerName;
 		return new ControllerExtensionChange(mProperties);
@@ -209,7 +210,7 @@ sap.ui.define([
 	 */
 	FlexObjectFactory.createFlVariant = function(mPropertyBag) {
 		mPropertyBag.generator ||= "FlexObjectFactory.createFlVariant";
-		var mProperties = createBasePropertyBag(mPropertyBag);
+		const mProperties = createBasePropertyBag(mPropertyBag);
 		mProperties.variantManagementReference = mPropertyBag.variantManagementReference;
 		mProperties.variantReference = mPropertyBag.variantReference;
 		mProperties.contexts = mPropertyBag.contexts;
@@ -257,7 +258,7 @@ sap.ui.define([
 	FlexObjectFactory.createCompVariant = function(oFileContent, mAuthors) {
 		oFileContent.generator ||= "FlexObjectFactory.createCompVariant";
 		oFileContent.user = ObjectPath.get("support.user", oFileContent);
-		var mCompVariantContent = createBasePropertyBag(oFileContent);
+		const mCompVariantContent = createBasePropertyBag(oFileContent);
 
 		mCompVariantContent.variantId = oFileContent.variantId || mCompVariantContent.id;
 		mCompVariantContent.contexts = oFileContent.contexts;

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

@@ -9,9 +9,10 @@ sap.ui.define([], function() {
 	return {
 		LifecycleState: {
 			NEW: "NEW",
-			PERSISTED: "NONE",
-			DELETED: "DELETE",
-			DIRTY: "UPDATE"
+			PERSISTED: "PERSISTED",
+			DELETED: "DELETED",
+			DIRTY: "UPDATED", // deprecated, use UPDATED
+			UPDATED: "UPDATED"
 		},
 		ApplyState: {
 			INITIAL: "initial",

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.128.0
+	 * @version 1.130.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -113,13 +113,14 @@ sap.ui.define([
 	 * @static
 	 */
 	UIChange.getMappingInfo = function() {
-		return Object.assign(FlexObject.getMappingInfo(), {
+		return {
+			...FlexObject.getMappingInfo(),
 			selector: "selector",
 			dependentSelectors: "dependentSelector",
 			jsOnly: "jsOnly",
 			variantReference: "variantReference",
 			isChangeOnStandardVariant: "isChangeOnStandardVariant"
-		});
+		};
 	};
 
 	/**
@@ -335,7 +336,7 @@ sap.ui.define([
 			throw new Error("Parameter mPropertyBag is mandatory");
 		}
 
-		var oCurrentDependentSelectors = Object.assign({}, this.getDependentSelectors());
+		var oCurrentDependentSelectors = { ...this.getDependentSelectors() };
 
 		if (oCurrentDependentSelectors[sAlias]) {
 			throw new Error(`Alias '${sAlias}' already exists in the change.`);
@@ -469,7 +470,7 @@ sap.ui.define([
 	 */
 	UIChange.prototype.getExtensionPointInfo = function() {
 		if (isPlainObject(this._oExtensionPointInfo)) {
-			return Object.assign({}, this._oExtensionPointInfo);
+			return { ...this._oExtensionPointInfo };
 		}
 		return this._oExtensionPointInfo;
 	};

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

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @static
 	 */
 	UpdatableChange.getMappingInfo = function() {
-		return Object.assign(UIChange.getMappingInfo(), {});
+		return { ...UIChange.getMappingInfo() };
 	};
 
 	UpdatableChange.prototype.popLatestRevertInfo = function() {

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.128.0
+	 * @version 1.130.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -94,11 +94,12 @@ sap.ui.define([
 	 * @static
 	 */
 	Variant.getMappingInfo = function() {
-		return Object.assign(FlexObject.getMappingInfo(), {
+		return {
+			...FlexObject.getMappingInfo(),
 			favorite: "favorite",
 			executeOnSelection: "executeOnSelection",
 			contexts: "contexts"
-		});
+		};
 	};
 
 	/**

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 *
 	 * @function
 	 * @since 1.121
-	 * @version 1.128.0
+	 * @version 1.130.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/FlexObjectState.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.flexState.FlexObjectState
 	 * @since 1.83
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -58,13 +58,13 @@ sap.ui.define([
 
 	function getCompleteDependency(oChange, sReference) {
 		const mInitialDependencies = FlexObjectState.getCompleteDependencyMap(sReference).mDependencies;
-		return mInitialDependencies[oChange.getId()] && Object.assign({}, mInitialDependencies[oChange.getId()]);
+		return mInitialDependencies[oChange.getId()] && { ...mInitialDependencies[oChange.getId()] };
 	}
 
 	function copyDependencies(oInitialDependency, aNewValidDependencies, oAppComponent, oChange, sReference) {
 		const aNewValidControlDependencies = [];
 		const oDependencyMap = FlexObjectState.getLiveDependencyMap(sReference);
-		const oModifiedDependency = Object.assign({}, oInitialDependency);
+		const oModifiedDependency = { ...oInitialDependency };
 		oInitialDependency.controlsDependencies.forEach((oDependentControlSelector) => {
 			// if the control is already available we don't need to add a dependency to it
 			if (!JsControlTreeModifier.bySelector(oDependentControlSelector, oAppComponent)) {
@@ -231,7 +231,7 @@ sap.ui.define([
 			oSelector.changeTypes ||= [];
 			const mChangesMap = FlexObjectState.getLiveDependencyMap(sFlexReference);
 			let aPromises = [];
-			const mDependencies = Object.assign({}, mChangesMap.mDependencies);
+			const mDependencies = { ...mChangesMap.mDependencies };
 			const {mChanges} = mChangesMap;
 			const aChangesForControl = mChanges[oControl.getId()] || [];
 

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

@@ -89,7 +89,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.FlexState
 	 * @since 1.73
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
@@ -145,11 +145,7 @@ sap.ui.define([
 					);
 					// If the parent variant no longer exists, change the reference to the standard variant
 					if (!bParentVariantExists) {
-						return Object.assign(
-							{},
-							oVariant,
-							{ variantReference: oVariant.variantManagementReference }
-						);
+						return { ...oVariant, variantReference: oVariant.variantManagementReference };
 					}
 					return oVariant;
 				});
@@ -268,10 +264,6 @@ sap.ui.define([
 		oFlexObjectsDataSelector.checkUpdate({ reference: sReference });
 	}
 
-	function getCompVariantsMap(sReference) {
-		return getInstanceEntryOrThrowError(sReference, "compVariants");
-	}
-
 	function buildRuntimePersistence(oFlexStateInstance, aExternalFlexObjects) {
 		const oStorageResponse = oFlexStateInstance.storageResponse;
 		var oRuntimePersistence = {
@@ -306,7 +298,8 @@ sap.ui.define([
 			});
 		});
 
-		_mInstances[sReference].runtimePersistence = Object.assign(oRuntimePersistence, {
+		_mInstances[sReference].runtimePersistence = {
+			...oRuntimePersistence,
 			flexObjects: aChangeDefinitions.map(function(oChangeDef) {
 				var iObjectIndex;
 				// Only keep FlexObjects found in the storage change definitions
@@ -328,7 +321,7 @@ sap.ui.define([
 				Log.error(sErrorText);
 				throw new Error(sErrorText);
 			})
-		});
+		};
 
 		// If the final length is different, an object is no longer there (e.g. new version requested)
 		if (iInitialFlexObjectsLength !== _mInstances[sReference].runtimePersistence.flexObjects.length) {
@@ -348,7 +341,6 @@ sap.ui.define([
 		}
 		if (!_mInstances[sReference].storageResponse) {
 			_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mInstances[sReference].unfilteredStorageResponse);
-			_mInstances[sReference].maxLayer = FlexInfoSession.getByReference(sReference).maxLayer;
 			// Flex objects need to be recreated
 			delete _mInstances[sReference].runtimePersistence;
 			bDataUpdated = true;
@@ -373,9 +365,10 @@ sap.ui.define([
 
 	function filterByMaxLayer(sReference, mResponse) {
 		const mFilteredReturn = merge({}, mResponse);
+		mFilteredReturn.changes = { ...StorageUtils.getEmptyFlexDataResponse(), ...mFilteredReturn.changes };
 		const mFlexObjects = mFilteredReturn.changes;
+		const oFlexInfoSession = FlexInfoSession.getByReference(sReference);
 		if (LayerUtils.isLayerFilteringRequired(sReference)) {
-			const oFlexInfoSession = FlexInfoSession.getByReference(sReference);
 			each(_mFlexObjectInfo, function(iIndex, mFlexObjectInfo) {
 				mFlexObjectInfo.pathInResponse.forEach(function(sPath) {
 					const aFilterByMaxLayer = ObjectPath.get(sPath, mFlexObjects).filter(function(oChangeDefinition) {
@@ -385,6 +378,7 @@ sap.ui.define([
 				});
 			});
 		}
+		_mInstances[sReference].maxLayer = oFlexInfoSession.maxLayer;
 		return mFilteredReturn;
 	}
 
@@ -416,7 +410,7 @@ sap.ui.define([
 		var oResponse = mResponse && mResponse.changes || {};
 		var oFlexInfoSession = FlexInfoSession.getByReference(sReference);
 		if (oResponse.info !== undefined) {
-			oFlexInfoSession = Object.assign(oFlexInfoSession, oResponse.info);
+			oFlexInfoSession = { ...oFlexInfoSession, ...oResponse.info };
 		}
 		FlexInfoSession.setByReference(oFlexInfoSession, sReference);
 	}
@@ -552,6 +546,32 @@ sap.ui.define([
 		return !!_mInstances[sReference];
 	};
 
+	/**
+	 * 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.
+	 *
+	 * @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
+	 */
+	FlexState.updateWithDataProvided = function(mPropertyBag) {
+		if (!_mInstances[mPropertyBag.reference]) {
+			initializeEmptyState(mPropertyBag.reference);
+		}
+		const oInstance = _mInstances[mPropertyBag.reference];
+		Object.entries(mPropertyBag.newData).forEach(([sKey, vValue]) => {
+			oInstance.unfilteredStorageResponse.changes[sKey].push(...vValue);
+		});
+		oInstance.storageResponse = filterByMaxLayer(mPropertyBag.reference, oInstance.unfilteredStorageResponse);
+		oInstance.runtimePersistence.flexObjects =
+		[
+			...oInstance.runtimePersistence.flexObjects,
+			...createFlexObjects(filterByMaxLayer(mPropertyBag.reference, { changes: mPropertyBag.newData }))
+		];
+		oFlexObjectsDataSelector.checkUpdate({ reference: mPropertyBag.reference });
+	};
+
 	/**
 	 * Triggers a call to the backend to fetch new data and update the runtime persistence
 	 *
@@ -566,8 +586,8 @@ sap.ui.define([
 	 */
 	FlexState.update = async function(mPropertyBag) {
 		enhancePropertyBag(mPropertyBag);
-		var sReference = mPropertyBag.reference;
-		var oCurrentRuntimePersistence = _mInstances[sReference].runtimePersistence;
+		const sReference = mPropertyBag.reference;
+		const oCurrentRuntimePersistence = _mInstances[sReference].runtimePersistence;
 
 		const oOldInitPromise = _mInitPromises[sReference].promise;
 		const oNewInitPromise = new Deferred();
@@ -575,8 +595,7 @@ sap.ui.define([
 		await oOldInitPromise;
 		await loadFlexData(mPropertyBag);
 		_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mInstances[sReference].unfilteredStorageResponse);
-		_mInstances[sReference].maxLayer = FlexInfoSession.getByReference(sReference).maxLayer;
-		var bUpdated = updateRuntimePersistence(
+		const bUpdated = updateRuntimePersistence(
 			sReference,
 			_mInstances[sReference].storageResponse,
 			oCurrentRuntimePersistence
@@ -746,7 +765,6 @@ sap.ui.define([
 		if (_mInstances[sReference]) {
 			_mInstances[sReference].preparedMaps = {};
 			_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mInstances[sReference].unfilteredStorageResponse);
-			_mInstances[sReference].maxLayer = FlexInfoSession.getByReference(sReference).maxLayer;
 			// Storage response has changed, recreate the flex objects
 			_mInstances[sReference].runtimePersistence = buildRuntimePersistence(
 				_mInstances[sReference],
@@ -756,97 +774,55 @@ sap.ui.define([
 		}
 	};
 
-	/**
-	 * Adds a dirty flex object to the flex state.
-	 *
-	 * @param {string} sReference - Flexibility reference of the app
-	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oFlexObject - Flexibility object
-	 */
-	FlexState.addDirtyFlexObject = function(sReference, oFlexObject) {
-		if (!_mInstances[sReference]) {
-			initializeEmptyState(sReference);
-		}
-		const sAdaptationLayer = FlexInfoSession.getByReference(sReference).adaptationLayer;
-		const bFlexObjectsOverAdaptationLayer = !!sAdaptationLayer
-			&& LayerUtils.isOverLayer(oFlexObject.getLayer(), sAdaptationLayer);
-		const bAlreadyInRuntimePersistence = _mInstances[sReference].runtimePersistence.flexObjects.includes(oFlexObject);
-		// FIXME: Currently called from the ChangePersistence which might be
-		// independent of FlexState in some test cases
-		// Once the ChangePersistence is no longer used
-		// make sure to remove the safeguard
-		if (!bFlexObjectsOverAdaptationLayer && _mInstances[sReference] && !bAlreadyInRuntimePersistence) {
-			_mInstances[sReference].runtimePersistence.flexObjects.push(oFlexObject);
-			oFlexObjectsDataSelector.checkUpdate(
-				{ reference: sReference },
-				[{ type: "addFlexObject", updatedObject: oFlexObject }]
-			);
-		}
-	};
-
 	/**
 	 * Adds a list of dirty flex objects to the flex state.
 	 *
 	 * @param {string} sReference - Flexibility reference of the app
-	 * @param {array.<sap.ui.fl.apply._internal.flexObjects.FlexObject>} aFlexObjects - Flexibility objects
+	 * @param {array.<sap.ui.fl.apply._internal.flexObjects.FlexObject>} aFlexObjects - Flex objects
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} The flex objects that were added
 	 */
 	FlexState.addDirtyFlexObjects = function(sReference, aFlexObjects) {
 		if (!_mInstances[sReference]) {
 			initializeEmptyState(sReference);
 		}
 		const sAdaptationLayer = FlexInfoSession.getByReference(sReference).adaptationLayer;
-		aFlexObjects = aFlexObjects
+		const aFilteredFlexObjects = aFlexObjects
 		.filter((oFlexObject) => !sAdaptationLayer || !LayerUtils.isOverLayer(oFlexObject.getLayer(), sAdaptationLayer))
 		.filter((oFlexObject) => (
 			!_mInstances[sReference].runtimePersistence.flexObjects
 			.some((oExistingFlexObject) => (oExistingFlexObject.getId() === oFlexObject.getId()))
 		));
 
-		if (aFlexObjects.length > 0 && _mInstances[sReference]) {
+		if (aFilteredFlexObjects.length > 0) {
 			_mInstances[sReference].runtimePersistence.flexObjects =
-				_mInstances[sReference].runtimePersistence.flexObjects.concat(aFlexObjects);
+				_mInstances[sReference].runtimePersistence.flexObjects.concat(aFilteredFlexObjects);
 			oFlexObjectsDataSelector.checkUpdate(
 				{ reference: sReference },
-				aFlexObjects.map(function(oFlexObject) {
+				aFilteredFlexObjects.map(function(oFlexObject) {
 					return { type: "addFlexObject", updatedObject: oFlexObject };
 				})
 			);
 		}
-	};
 
-	FlexState.removeDirtyFlexObject = function(sReference, oFlexObject) {
-		// FIXME: Currently called from the ChangePersistence which might be
-		// independent of FlexState in some test cases
-		// Once the ChangePersistence is no longer used
-		// make sure to remove the safeguard
-		if (_mInstances[sReference]) {
-			const aFlexObjects = _mInstances[sReference].runtimePersistence.flexObjects;
-			const iIndex = aFlexObjects.indexOf(oFlexObject);
-			if (iIndex >= 0) {
-				aFlexObjects.splice(iIndex, 1);
-				oFlexObjectsDataSelector.checkUpdate(
-					{ reference: sReference },
-					[{ type: "removeFlexObject", updatedObject: oFlexObject }]
-				);
-			}
-		}
+		return aFilteredFlexObjects;
 	};
 
 	FlexState.removeDirtyFlexObjects = function(sReference, aFlexObjects) {
+		const aRemovedFlexObjects = [];
 		// FIXME: Currently called from the ChangePersistence which might be
 		// independent of FlexState in some test cases
 		// Once the ChangePersistence is no longer used
 		// make sure to remove the safeguard
 		if (_mInstances[sReference] && aFlexObjects.length > 0) {
-			let bFlexObjectRemoved = false;
 			const aCurrentFlexObjects = _mInstances[sReference].runtimePersistence.flexObjects;
 			aFlexObjects.forEach(function(oFlexObject) {
 				const iIndex = aCurrentFlexObjects.indexOf(oFlexObject);
 				if (iIndex >= 0) {
-					bFlexObjectRemoved = true;
+					aRemovedFlexObjects.push(oFlexObject);
 					aCurrentFlexObjects.splice(iIndex, 1);
 				}
 			});
-			if (bFlexObjectRemoved) {
+			if (aRemovedFlexObjects.length > 0) {
 				oFlexObjectsDataSelector.checkUpdate(
 					{ reference: sReference },
 					aFlexObjects.map(function(oFlexObject) {
@@ -855,6 +831,7 @@ sap.ui.define([
 				);
 			}
 		}
+		return aRemovedFlexObjects;
 	};
 
 	FlexState.getComponentIdForReference = function(sReference) {
@@ -878,7 +855,7 @@ sap.ui.define([
 	};
 
 	FlexState.getCompVariantsMap = function(sReference) {
-		return getCompVariantsMap(sReference);
+		return getInstanceEntryOrThrowError(sReference, "compVariants");
 	};
 
 	FlexState.callPrepareFunction = function(sMapName, mPropertyBag) {