@openui5/sap.ui.fl 1.129.0 → 1.130.1

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

@@ -0,0 +1,78 @@
+
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	"sap/ui/fl/util/changePropertyValueByPath",
+	"sap/ui/fl/util/DescriptorChangeCheck"
+], function(
+	changePropertyValueByPath,
+	DescriptorChangeCheck
+) {
+	"use strict";
+
+	const SUPPORTED_OPERATIONS = ["UPDATE", "UPSERT", "DELETE", "INSERT"];
+	const SUPPORTED_PROPERTIES = ["settings/*"];
+
+	const SUPPORTED_TYPES = {
+		settings: typeof {}
+	};
+
+	const RESOURCE_MODEL = "sap.ui.model.resource.ResourceModel";
+
+	/**
+	* Descriptor change merger for change type <code>appdescr_ui5_changeModel</code>.
+	* Changes the settings object of the model by changing the manifest value <code>sap.ui5/models/modelId</code>.
+	*
+	* Available for both runtime and build {@link sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild}.
+	*
+	* @namespace
+	* @alias sap.ui.fl.apply._internal.changes.descriptor.app.ChangeModel
+	* @version 1.130.1
+	* @private
+	* @ui5-restricted sap.ui.fl.apply._internal
+	*/
+	const ChangeModel = /** @lends sap.ui.fl.apply._internal.changes.descriptor.app.ChangeModel */ {
+
+		/**
+		 * Applies the <code>appdescr_ui5_changeModel</code> change to the manifest.
+		 *
+		 * @param {object} oManifest - Original manifest
+		 * @param {sap.ui.fl.apply._internal.flexObjects.AppDescriptorChange} oChange - Change with type <code>appdescr_ui5_changeModel</code>
+		 * @param {object} oChange.content - Details of the change
+		 * @param {string} oChange.content.modelId - ID of <code>sap.ui5/models/modelId</code> that is being changed
+		 * @param {object|array} oChange.content.entityPropertyChange - Entity property change or an array of multiple entity property changes
+		 * @param {string} oChange.content.entityPropertyChange.propertyPath - Path to the property which should be changed. Supported properties: <code>settings</code>
+		 * @param {string} oChange.content.entityPropertyChange.operation - Operation that is performed on the property defined under propertyPath. Possible values: <code>UPDATE</code> and <code>UPSERT</code>
+		 * @param {string} oChange.content.entityPropertyChange.propertyValue - New value of the <code>model</code> property defined under propertyPath
+		 * @returns {object} Updated manifest with changed <code>sap.ui5/models/model</code>
+		 *
+		 * @private
+		 * @ui5-restricted sap.ui.fl.apply._internal
+		 */
+		applyChange(oManifest, oChange) {
+			const oModels = oManifest["sap.ui5"].models;
+			const oChangeContent = oChange.getContent();
+			DescriptorChangeCheck.checkEntityPropertyChange(oChangeContent, SUPPORTED_PROPERTIES, SUPPORTED_OPERATIONS, null, null, SUPPORTED_TYPES);
+			if (oModels) {
+				const oModel = oModels[oChangeContent.modelId];
+				if (oModel) {
+					if (oModel.type === RESOURCE_MODEL) {
+						throw new Error(`Model '${oChangeContent.modelId}' is of type '${RESOURCE_MODEL}'. Changing models of type '${RESOURCE_MODEL}' are not supported.`);
+					}
+					changePropertyValueByPath(oChangeContent.entityPropertyChange, oModel);
+				} else {
+					throw new Error(`Nothing to update. Model with ID "${oChangeContent.modelId}" does not exist in the manifest.json.`);
+				}
+			} else {
+				throw new Error("sap.ui5/models section have not been found in manifest.json.");
+			}
+			return oManifest;
+		}
+	};
+
+	return ChangeModel;
+});

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.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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.129.0
+	 * @version 1.130.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal, sap.ui.fl.write._internal
 	 */

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

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.1
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

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

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.AnnotationChange
 	 * @since 1.128
-	 * @version 1.129.0
+	 * @version 1.130.1
 	 * @private
 	 * @ui5-restricted
 	 */

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

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,
@@ -39,13 +41,13 @@ sap.ui.define([
 	"use strict";
 
 	const FLEX_OBJECT_TYPES = {
-		BASE_FLEX_OBJECT: FlexObject,
 		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,7 +106,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexObjects.FlexObjectFactory
 	 * @since 1.100
-	 * @version 1.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.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/FlexObjectState.js

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

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.129.0
+	 * @version 1.130.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
@@ -264,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 = {
@@ -345,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;
@@ -370,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) {
@@ -382,6 +378,7 @@ sap.ui.define([
 				});
 			});
 		}
+		_mInstances[sReference].maxLayer = oFlexInfoSession.maxLayer;
 		return mFilteredReturn;
 	}
 
@@ -549,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
 	 *
@@ -563,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();
@@ -572,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
@@ -743,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],
@@ -834,7 +855,7 @@ sap.ui.define([
 	};
 
 	FlexState.getCompVariantsMap = function(sReference) {
-		return getCompVariantsMap(sReference);
+		return getInstanceEntryOrThrowError(sReference, "compVariants");
 	};
 
 	FlexState.callPrepareFunction = function(sMapName, mPropertyBag) {

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.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.1
 	 * @private
 	 */
 	var ManifestUtils = {

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.129.0
+	 * @version 1.130.1
 	 * @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.129.0
+	 * @version 1.130.1
 	 * @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.129.0
+	 * @version 1.130.1
 	 * @private
 	 * @ui5-restricted
 	 */

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.129.0
+	 * @version 1.130.1
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -0,0 +1,108 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	"sap/ui/fl/apply/_internal/flexState/FlexState",
+	"sap/ui/fl/apply/_internal/flexState/DataSelector",
+	"sap/ui/fl/apply/_internal/flexObjects/CompVariant"
+], function(
+	FlexState,
+	DataSelector,
+	CompVariant
+) {
+	"use strict";
+
+	/**
+	 * Handler class provide data of smart control variant changes and its map.
+	 *
+	 * @namespace sap.ui.fl.apply._internal.flexState.compVariants.CompVariantManagementState
+	 * @since 1.129
+	 * @version 1.130.1
+	 * @private
+	 * @ui5-restricted
+	 */
+	const CompVariantManagementState = {};
+
+	const sUpdatableChangeNameSpace = "sap.ui.fl.apply._internal.flexObjects.UpdatableChange";
+
+	const isSetDefaultChange = (oFlexObject) => {
+		return oFlexObject?.isA(sUpdatableChangeNameSpace)
+			&& oFlexObject.getFileType() === "change"
+			&& oFlexObject.getChangeType() === "defaultVariant";
+	};
+
+	const oSetDefaultDataSelector = new DataSelector({
+		id: "compSetDefault",
+		parameterKey: "persistencyKey",
+		parentDataSelector: FlexState.getFlexObjectsDataSelector(),
+		executeFunction(aFlexObjects, mPropertyBag) {
+			return aFlexObjects.filter((oFlexObject) =>
+				isSetDefaultChange(oFlexObject)
+				&& String(oFlexObject.getSelector()?.persistencyKey) === mPropertyBag.persistencyKey
+			);
+		},
+		checkInvalidation(mParameters, oUpdateInfo) {
+			const bRelevantType = ["addFlexObject", "removeFlexObject"].includes(oUpdateInfo.type);
+			return bRelevantType && isSetDefaultChange(oUpdateInfo.updatedObject);
+		}
+	});
+
+	/**
+	 * Access to the variant management set default selector.
+	 *
+	 * @returns {object} The data selector for the variant set default changes
+	 *
+	 * @private
+	 * @ui5-restricted sap.ui.fl.qunit
+	 */
+	CompVariantManagementState.getSetDefaultDataSelector = function() {
+		return oSetDefaultDataSelector;
+	};
+
+	/**
+	 * Returns the default variant ID for a given variant management
+	 *
+	 * @param {object} mPropertyBag Object with the necessary properties
+	 * @param {string} mPropertyBag.persistencyKey - Persistency key of the variant management
+	 * @param {string} mPropertyBag.reference - Component reference
+	 * @param {sap.ui.fl.apply._internal.flexObjects.CompVariant[]} mPropertyBag.variants - Array of variants which exist for the given variant management
+	 *
+	 * @returns {string | undefined} ID of the default variant
+	 *
+	 * @private
+	 * @ui5-restricted sap.ui.fl
+	 */
+	CompVariantManagementState.getDefaultVariantId = (mPropertyBag) => {
+		const aVariants = mPropertyBag.variants;
+		const aVariantIds = aVariants.map((oVariant) => oVariant.getVariantId());
+		aVariantIds.push(CompVariant.STANDARD_VARIANT_ID);
+
+		mPropertyBag.persistencyKey = String(mPropertyBag.persistencyKey);
+		const aDefaultChanges = [...oSetDefaultDataSelector.get(mPropertyBag)].reverse();
+		const aDefaultVariantIds = aDefaultChanges.map((oChange) => oChange.getContent().defaultVariantName);
+
+		return aDefaultVariantIds.find((sDefaultVariantId) => aVariantIds.includes(sDefaultVariantId)) || "";
+	};
+
+	/**
+	 * Returns the 'defaultVariant' changes for a given variant management
+	 *
+	 * @param {object} mPropertyBag Object with the necessary properties
+	 * @param {string} mPropertyBag.persistencyKey - Persistency key of the variant management
+	 * @param {string} mPropertyBag.reference - Component reference
+	 *
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.UpdatableChange[]} 'defaultVariant' changes of the variant management
+	 *
+	 * @private
+	 * @ui5-restricted sap.ui.fl
+	 */
+	CompVariantManagementState.getDefaultChanges = (mPropertyBag) => {
+		mPropertyBag.persistencyKey = String(mPropertyBag.persistencyKey);
+		return oSetDefaultDataSelector.get(mPropertyBag);
+	};
+
+	return CompVariantManagementState;
+});

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

@@ -125,7 +125,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.compVariants.CompVariantMerger
 	 * @since 1.86
-	 * @version 1.129.0
+	 * @version 1.130.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -215,7 +215,7 @@ sap.ui.define([
 		 *
 		 * @function
 		 * @since 1.89
-		 * @version 1.129.0
+		 * @version 1.130.1
 		 * @private
 		 * @ui5-restricted sap.ui.fl
 		 *

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

@@ -75,7 +75,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.Switcher
 	 * @since 1.74
-	 * @version 1.129.0
+	 * @version 1.130.1
 	 * @private
 	 * @ui5-restricted
 	 */