@openui5/sap.ui.fl 1.104.0 → 1.105.0

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

@@ -0,0 +1,73 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2022 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/flexObjects/FlexObject"
+], function(
+	FlexObject
+) {
+	"use strict";
+
+	/**
+	 * Flexibility AppDescriptorChange Class. Changes a specified part of the manifest.
+	 *
+	 * @class Flexibility AppDescriptor Change Class.
+	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
+	 * @namespace sap.ui.fl.apply._internal.flexObjects.AppDescriptorChange
+	 * @alias sap.ui.fl.apply._internal.flexObjects.AppDescriptorChange
+	 * @since 1.105
+	 * @version 1.105.0
+	 * @private
+	 * @ui5-restricted
+	 */
+	var AppDescriptorChange = FlexObject.extend("sap.ui.fl.apply._internal.flexObjects.AppDescriptorChange", /* @lends sap.ui.fl.apply._internal.flexObjects.AppDescriptorChange.prototype */ {
+		metadata: {
+			properties: {
+				appDescriptorChange: {
+					type: "boolean",
+					defaultValue: true
+				}
+			}
+		}
+	});
+
+	/**
+	 * Returns the mapping between flex object properties and file content properties in the back-end response.
+	 * @returns {object} Mapping information
+	 * @static
+	 */
+	AppDescriptorChange.getMappingInfo = function () {
+		return Object.assign(FlexObject.getMappingInfo(), {
+			appDescriptorChange: "appDescriptorChange"
+		});
+	};
+
+	/**
+	 * Returns the mapping between flex object properties and file content properties in the back-end response.
+	 * Can be overridden to avoid access of static mapping within base methods.
+	 * @returns {object} Mapping information
+	 */
+	AppDescriptorChange.prototype.getMappingInfo = function () {
+		return AppDescriptorChange.getMappingInfo();
+	};
+
+	// ----------------- temporary functions -----------------
+	// The AppDescriptorChange is treated like a normal UI Change.
+	// This functions should be removed as soon as this is not the case anymore.
+	AppDescriptorChange.prototype.getSelector = function() {
+		return {};
+	};
+	AppDescriptorChange.prototype.isValidForDependencyMap = function() {
+		return false;
+	};
+	AppDescriptorChange.prototype.getVariantReference = function() {
+		return undefined;
+	};
+
+	// /temporary functions
+
+	return AppDescriptorChange;
+});

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.104.0
+	 * @version 1.105.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl sap.ui.comp
 	 */
@@ -63,6 +63,14 @@ sap.ui.define([
 					multiple: true,
 					singularName: "revertData",
 					defaultValue: []
+				},
+				/**
+				 * Changes belonging to the variant
+				 */
+				changes: {
+					type: "sap.ui.fl.Change",
+					multiple: true,
+					defaultValue: []
 				}
 			}
 		},
@@ -89,7 +97,8 @@ sap.ui.define([
 	 */
 	 CompVariant.getMappingInfo = function () {
 		return Object.assign(Variant.getMappingInfo(), {
-			persistencyKey: "selector.persistencyKey"
+			persistencyKey: "selector.persistencyKey",
+			variantId: "variantId"
 		});
 	};
 
@@ -168,24 +177,6 @@ sap.ui.define([
 		return this.getFlexObjectMetadata().packageName;
 	};
 
-	/**
-	 * Sets the transport request.
-	 * Used by the SmartVariantManagement control.
-	 * @param {string} sRequest Transport request
-	 */
-	CompVariant.prototype.setRequest = function (sRequest) {
-		this._sRequest = sRequest;
-	};
-
-	/**
-	 * Gets the transport request.
-	 * Used by the SmartVariantManagement control.
-	 * @returns {string} Transport request
-	 */
-	CompVariant.prototype.getRequest = function () {
-		return this._sRequest;
-	};
-
 	/**
 	 * Checks if the object is a variant from smart variant management.
 	 * Used by the SmartVariantManagement control.

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

@@ -0,0 +1,81 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2022 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/flexObjects/FlexObject"
+], function(
+	FlexObject
+) {
+	"use strict";
+
+	/**
+	 * Flexibility ControllerExtensionChange class.
+	 *
+	 * @param {object} mPropertyBag - Initial object properties
+	 *
+	 * @class ControllerExtensionChange instance
+	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
+	 * @alias sap.ui.fl.apply._internal.flexObjects.ControllerExtensionChange
+	 * @since 1.105
+	 * @version 1.105.0
+	 * @private
+	 * @ui5-restricted sap.ui.fl
+	 */
+	var ControllerExtensionChange = FlexObject.extend("sap.ui.fl.apply._internal.flexObjects.ControllerExtensionChange", /** @lends sap.ui.fl.apply._internal.flexObjects.ControllerExtensionChange.prototype */ {
+		metadata: {
+			properties: {
+				controllerName: {
+					type: "string"
+				}
+			}
+		}
+	});
+
+	/**
+	 * Returns the mapping between flex object properties and file content properties in the back-end response.
+	 * @returns {object} Mapping information
+	 * @static
+	 */
+	ControllerExtensionChange.getMappingInfo = function() {
+		return Object.assign(FlexObject.getMappingInfo(), {
+			controllerName: "selector.controllerName"
+		});
+	};
+
+	/**
+	 * Returns the mapping between flex object properties and file content properties in the back-end response.
+	 * Can be overridden to avoid access of static mapping within base methods.
+	 * @returns {object} Mapping information
+	 */
+	ControllerExtensionChange.prototype.getMappingInfo = function() {
+		return ControllerExtensionChange.getMappingInfo();
+	};
+
+	// ----------------- temporary functions -----------------
+	// The controller extension is still treated like a normal UI Change.
+	// This functions should be removed as soon as this is not the case anymore.
+	ControllerExtensionChange.prototype.getSelector = function() {
+		return {
+			controllerName: this.getControllerName()
+		};
+	};
+	ControllerExtensionChange.prototype.getVariantReference = function() {
+		return undefined;
+	};
+	ControllerExtensionChange.prototype.isValidForDependencyMap = function() {
+		return false;
+	};
+	ControllerExtensionChange.prototype.setInitialApplyState = function() {
+	};
+	// addXML also uses getModuleName, but as soon as those changes are also migrated getFlexObjectMetadata().moduleName can be used
+	ControllerExtensionChange.prototype.getModuleName = function() {
+		return this.getFlexObjectMetadata().moduleName;
+	};
+
+	// /temporary functions
+
+	return ControllerExtensionChange;
+});

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

@@ -0,0 +1,111 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	"sap/ui/core/Core",
+	"sap/ui/fl/apply/_internal/controlVariants/Utils",
+	"sap/ui/fl/apply/_internal/flexObjects/Variant"
+], function(
+	Core,
+	ControlVariantUtils,
+	Variant
+) {
+	"use strict";
+
+	/**
+	 * Flexibility variant class. Stores variant content, changes and related information.
+	 *
+	 * @param {object} mPropertyBag - Initial object properties
+	 *
+	 * @class FlVariant instance
+	 * @extends sap.ui.fl.apply._internal.flexObjects.Variant
+	 * @namespace sap.ui.fl.apply._internal.flexObjects.FlVariant
+	 * @alias sap.ui.fl.apply._internal.flexObjects.FlVariant
+	 * @since 1.104
+	 * @version 1.105.0
+	 * @private
+	 * @ui5-restricted sap.ui.fl
+	 */
+	var FlVariant = Variant.extend("sap.ui.fl.apply._internal.flexObjects.FlVariant", /* @lends sap.ui.fl.apply._internal.flexObjects.FlVariant.prototype */ {
+		metadata: {
+			properties: {
+				/**
+				 * ID of the base variant this variant was created from.
+				 */
+				variantReference: {
+					type: "string"
+				},
+				/**
+				 * Local ID of the variant management control this variant belongs to.
+				 * TODO: move variantManagementReference to selector (is always the local ID)
+				 */
+				variantManagementReference: {
+					type: "string"
+				},
+				/**
+				 * Indicates if the variant should be shown to the user.
+				 */
+				visible: {
+					type: "boolean",
+					defaultValue: true
+				}
+			}
+		},
+		constructor: function(sId, mSettings) {
+			if (typeof sId !== "string" && sId !== undefined) {
+				mSettings = sId;
+				sId = mSettings && mSettings.id;
+			}
+			mSettings.fileType = "ctrl_variant";
+			if (mSettings.favorite === undefined) {
+				mSettings.favorite = true;
+			}
+
+			Variant.apply(this, arguments);
+
+			if (!this.getName() && mSettings.content && mSettings.content.title) {
+				this.setName(mSettings.content.title);
+			}
+
+			var aTitleKeyMatch = this.getName().match(/.i18n>(\w+)./);
+			if (aTitleKeyMatch) {
+				this.setName(Core.getLibraryResourceBundle("sap.ui.fl").getText(aTitleKeyMatch[1]));
+			}
+
+			var oSupportInfo = this.getSupportInformation();
+			if (this.getId() === this.getVariantManagementReference()) {
+				this.setStandardVariant(true);
+				if (!oSupportInfo.user) {
+					oSupportInfo.user = ControlVariantUtils.DEFAULT_AUTHOR;
+					this.setSupportInformation(oSupportInfo);
+				}
+			}
+		}
+	});
+
+	/**
+	 * Returns the mapping between flex object properties and file content properties in the back-end response.
+	 * @returns {object} Mapping information
+	 * @static
+	 */
+	FlVariant.getMappingInfo = function () {
+		return Object.assign(Variant.getMappingInfo(), {
+			variantReference: "variantReference",
+			variantManagementReference: "variantManagementReference"
+		});
+	};
+
+	/**
+	 * Returns the mapping between flex object properties and file content properties in the back-end response.
+	 * Can be overridden to avoid access of static mapping within base methods.
+	 * @returns {object} Mapping information
+	 */
+	FlVariant.prototype.getMappingInfo = function () {
+		return FlVariant.getMappingInfo();
+	};
+
+	return FlVariant;
+});

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

@@ -4,7 +4,6 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/base/Log",
 	"sap/base/util/deepClone",
 	"sap/base/util/isEmptyObject",
 	"sap/base/util/isPlainObject",
@@ -16,7 +15,6 @@ sap.ui.define([
 	"sap/ui/fl/registry/Settings",
 	"sap/ui/fl/Utils"
 ], function(
-	Log,
 	deepClone,
 	isEmptyObject,
 	isPlainObject,
@@ -71,7 +69,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @since 1.100
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -137,17 +135,14 @@ sap.ui.define([
 		constructor: function() {
 			ManagedObject.apply(this, arguments);
 			var oFlexObjectMetadata = this.getFlexObjectMetadata();
-			if (oFlexObjectMetadata.reference) {
-				oFlexObjectMetadata.namespace = (
-					oFlexObjectMetadata.namespace
-					|| Utils.createNamespace(
-						{ reference: oFlexObjectMetadata.reference },
-						this.getFileType()
-					)
-				);
+			var sReference = oFlexObjectMetadata.reference;
+			if (sReference) {
+				if (!oFlexObjectMetadata.namespace) {
+					oFlexObjectMetadata.namespace = Utils.createNamespace({ reference: sReference }, this.getFileType());
+				}
 
 				if (!oFlexObjectMetadata.projectId) {
-					oFlexObjectMetadata.projectId = oFlexObjectMetadata.reference.replace(".Component", "");
+					oFlexObjectMetadata.projectId = sReference.replace(".Component", "");
 				}
 			}
 			this.setFlexObjectMetadata(oFlexObjectMetadata);
@@ -338,14 +333,19 @@ sap.ui.define([
 	 * Sets the new text for the given text ID or creates new text with the given ID.
 	 * @param {string} sTextId - Text ID which was used as part of the <code>texts</code> property
 	 * @param {string} sNewText - New text for the given text ID
+	 * @param {string} [sType] - Translation text type, e.g. XBUT, XTIT, XTOL, XFLD
 	 * @param {boolean} [bSkipStateChange] - If set to <code>true</code>, doesn't set the state to dirty
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject} <code>this</code> context for chaining
 	 */
-	FlexObject.prototype.setText = function (sTextId, sNewText, bSkipStateChange) {
+	FlexObject.prototype.setText = function (sTextId, sNewText, sType, bSkipStateChange) {
 		var oTexts = Object.assign({}, this.getTexts());
-		oTexts[sTextId] = Object.assign({}, oTexts[sTextId], {
+		var oNewText = {
 			value: sNewText
-		});
+		};
+		if (sType) {
+			oNewText.type = sType;
+		}
+		oTexts[sTextId] = Object.assign({}, oTexts[sTextId], oNewText);
 		this.setTexts(oTexts);
 		if (!bSkipStateChange) {
 			this.setState(States.DIRTY);
@@ -353,6 +353,42 @@ sap.ui.define([
 		return this;
 	};
 
+	// ----------------- legacy functions -----------------
+
+	/**
+	 * Sets the transport request.
+	 * Also used by the SmartVariantManagement control.
+	 * @param {string} sRequest - Transport request
+	 */
+	FlexObject.prototype.setRequest = function (sRequest) {
+		this._sRequest = sRequest;
+	};
+
+	/**
+	 * Gets the transport request.
+	 * Also used by the SmartVariantManagement control.
+	 * @returns {string} Transport request
+	 */
+	FlexObject.prototype.getRequest = function () {
+		return this._sRequest || "";
+	};
+
+	// ----------------------------------------------------
+
+	// ----------------- temporary functions -------------
+
+	/**
+	 * Necessary due to consumers like Visual Editor still
+	 * calling this function with e.g. Variants
+	 * Should be removed after all consumers are adjusted.
+	 * @returns {object} file content as JSON object
+	 */
+	FlexObject.prototype.getDefinition = function() {
+		return this.convertToFileContent();
+	};
+
+	// ----------------------------------------------------
+
 	function capitalize(sKey) {
 		return sKey.length ? sKey.charAt(0).toUpperCase() + sKey.slice(1) : sKey;
 	}
@@ -436,8 +472,6 @@ sap.ui.define([
 				Object.entries(vValue).forEach(function(aEntry) {
 					fnMapProperty(aEntry[0], aEntry[1], sNewPath);
 				});
-			} else {
-				Log.error("Missing mapping info for property " + sNewPath);
 			}
 		};
 

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

@@ -7,18 +7,24 @@ sap.ui.define([
 	"sap/base/util/restricted/_pick",
 	"sap/base/util/ObjectPath",
 	"sap/ui/core/Core",
+	"sap/ui/fl/apply/_internal/flexObjects/AppDescriptorChange",
 	"sap/ui/fl/apply/_internal/flexObjects/CompVariant",
+	"sap/ui/fl/apply/_internal/flexObjects/ControllerExtensionChange",
 	"sap/ui/fl/apply/_internal/flexObjects/FlexObject",
+	"sap/ui/fl/apply/_internal/flexObjects/FlVariant",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/Utils"
 ], function(
 	_pick,
 	ObjectPath,
 	Core,
+	AppDescriptorChange,
 	CompVariant,
+	ControllerExtensionChange,
 	FlexObject,
+	FlVariant,
 	Layer,
-	flUtils
+	Utils
 ) {
 	"use strict";
 
@@ -31,22 +37,58 @@ sap.ui.define([
 	 */
 	var FLEX_OBJECT_TYPES = {
 		BASE_FLEX_OBJECT: FlexObject,
-		COMP_VARIANT_OBJECT: CompVariant
+		COMP_VARIANT_OBJECT: CompVariant,
+		FL_VARIANT_OBJECT: FlVariant,
+		CONTROLLER_EXTENSION: ControllerExtensionChange,
+		APP_DESCRIPTOR_CHANGE: AppDescriptorChange
 	};
 
 	function getFlexObjectClass(oNewFileContent) {
 		if (oNewFileContent.fileType === "variant") {
 			return FLEX_OBJECT_TYPES.COMP_VARIANT_OBJECT;
+		} else if (oNewFileContent.fileType === "ctrl_variant") {
+			return FLEX_OBJECT_TYPES.FL_VARIANT_OBJECT;
+		} else if (oNewFileContent.changeType === "codeExt") {
+			return FLEX_OBJECT_TYPES.CONTROLLER_EXTENSION;
+		} else if (oNewFileContent.appDescriptorChange) {
+			return FLEX_OBJECT_TYPES.APP_DESCRIPTOR_CHANGE;
 		}
 		return FLEX_OBJECT_TYPES.BASE_FLEX_OBJECT;
 	}
 
+	function createBasePropertyBag(mProperties) {
+		var sChangeType = mProperties.type || mProperties.changeType;
+		var sFileName = mProperties.fileName || mProperties.id || Utils.createDefaultFileName(sChangeType);
+		return {
+			id: sFileName,
+			layer: mProperties.layer,
+			content: mProperties.content,
+			texts: mProperties.texts,
+			supportInformation: {
+				service: mProperties.ODataService,
+				command: mProperties.command,
+				compositeCommand: mProperties.compositeCommand,
+				generator: mProperties.generator,
+				sapui5Version: Core.getConfiguration().getVersion().toString(),
+				sourceSystem: mProperties.sourceSystem,
+				sourceClient: mProperties.sourceClient,
+				originalLanguage: mProperties.originalLanguage,
+				user: mProperties.user
+			},
+			flexObjectMetadata: {
+				changeType: sChangeType,
+				reference: mProperties.reference,
+				packageName: mProperties.packageName
+			}
+		};
+	}
+
 	/**
 	 * Helper class to create any flex object.
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexObjects.FlexObjectFactory
 	 * @since 1.100
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -82,6 +124,67 @@ sap.ui.define([
 		return oFlexObject;
 	};
 
+	FlexObjectFactory.createAppDescriptorChange = function(mPropertyBag) {
+		mPropertyBag.compositeCommand = mPropertyBag.compositeCommand || mPropertyBag.support && mPropertyBag.support.compositeCommand;
+		var mProperties = createBasePropertyBag(mPropertyBag);
+		return new AppDescriptorChange(mProperties);
+	};
+
+	/**
+	 * Creates a new ControllerExtensionChange.
+	 *
+	 * @param {object} mPropertyBag - File content
+	 * @param {string} mPropertyBag.codeRef - Name of the extension file
+	 * @param {string} mPropertyBag.controllerName - Name of the Controller
+	 * @param {string} mPropertyBag.namespace - See {@link sap.ui.fl.apply._internal.flexObjects.FlexObject.FlexObjectMetadata}
+	 * @param {string} mPropertyBag.reference - See {@link sap.ui.fl.apply._internal.flexObjects.FlexObject.FlexObjectMetadata}
+	 * @param {string} mPropertyBag.moduleName - Location of the extension file
+	 * @param {string} mPropertyBag.generator - See {@link sap.ui.fl.apply._internal.flexObjects.FlexObject.SupportInformation}
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.ControllerExtensionChange} Created ControllerExtensionChange instance
+	 */
+	FlexObjectFactory.createControllerExtensionChange = function(mPropertyBag) {
+		mPropertyBag.generator = mPropertyBag.generator || "FlexObjectFactory.createControllerExtensionChange";
+		mPropertyBag.changeType = "codeExt";
+		mPropertyBag.content = {
+			codeRef: mPropertyBag.codeRef
+		};
+
+		var mProperties = createBasePropertyBag(mPropertyBag);
+		mProperties.flexObjectMetadata.moduleName = mPropertyBag.moduleName;
+		mProperties.controllerName = mPropertyBag.controllerName;
+		return new ControllerExtensionChange(mProperties);
+	};
+
+	/**
+	 * Creates a new <code>sap.ui.fl.apply._internal.flexObjects.FlVariant</code>.
+	 *
+	 * @param {object} mPropertyBag - Properties for the variant
+	 * @param {string} mPropertyBag.id - ID of the new variant
+	 * @param {string} mPropertyBag.variantName - Name of the new variant
+	 * @param {string} mPropertyBag.variantManagementReference - Reference to the variant management control
+	 * @param {string} [mPropertyBag.variantReference] - Reference to another variant that is the basis for the new variant
+	 * @param {string} [mPropertyBag.user] - Author of the variant
+	 * @param {object} [mPropertyBag.contexts] - See {@link sap.ui.fl.apply._internal.flexObjects.Variant}
+	 * @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}
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlVariant} Variant instance
+	 */
+	FlexObjectFactory.createFlVariant = function(mPropertyBag) {
+		mPropertyBag.generator = mPropertyBag.generator || "FlexObjectFactory.createFlVariant";
+		var mProperties = createBasePropertyBag(mPropertyBag);
+		mProperties.variantManagementReference = mPropertyBag.variantManagementReference;
+		mProperties.variantReference = mPropertyBag.variantReference;
+		mProperties.contexts = mPropertyBag.contexts;
+		mProperties.texts = {
+			variantName: {
+				value: mPropertyBag.variantName,
+				type: "XFLD"
+			}
+		};
+		return new FlVariant(mProperties);
+	};
+
 	/**
 	 * Creates a new flex object of type <code>CompVariant</code>.
 	 *
@@ -114,38 +217,15 @@ sap.ui.define([
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.CompVariant} Created comp variant object
 	 */
 	FlexObjectFactory.createCompVariant = function (oFileContent) {
-		var sFileName = oFileContent.fileName
-			|| oFileContent.id
-			|| flUtils.createDefaultFileName(oFileContent.fileType);
+		oFileContent.generator = oFileContent.generator || "FlexObjectFactory.createCompVariant";
+		oFileContent.user = ObjectPath.get("support.user", oFileContent);
+		var mCompVariantContent = createBasePropertyBag(oFileContent);
 
-		var mCompVariantContent = {
-			id: sFileName,
-			variantId: oFileContent.variantId || sFileName,
-			content: oFileContent.content || {},
-			contexts: oFileContent.contexts || {},
-			layer: oFileContent.layer,
-			favorite: oFileContent.favorite,
-			texts: oFileContent.texts,
-			persistencyKey: oFileContent.persistencyKey
-				|| ObjectPath.get("selector.persistencyKey", oFileContent),
-			persisted: oFileContent.persisted,
-			supportInformation: {
-				service: oFileContent.ODataService,
-				command: oFileContent.command,
-				generator: oFileContent.generator || "FlexObjectFactory.createCompVariant",
-				user: ObjectPath.get("support.user", oFileContent),
-				sapui5Version: Core.getConfiguration().getVersion().toString(),
-				sourceSystem: oFileContent.sourceSystem,
-				sourceClient: oFileContent.sourceClient,
-				originalLanguage: oFileContent.originalLanguage
-			},
-			flexObjectMetadata: {
-				changeType: oFileContent.type,
-				reference: oFileContent.reference,
-				packageName: oFileContent.packageName,
-				creation: oFileContent.creation
-			}
-		};
+		mCompVariantContent.variantId = oFileContent.variantId || mCompVariantContent.id;
+		mCompVariantContent.contexts = oFileContent.contexts;
+		mCompVariantContent.favorite = oFileContent.favorite;
+		mCompVariantContent.persisted = oFileContent.persisted;
+		mCompVariantContent.persistencyKey = oFileContent.persistencyKey || ObjectPath.get("selector.persistencyKey", oFileContent);
 
 		if (oFileContent.layer === Layer.VENDOR || oFileContent.layer === Layer.CUSTOMER_BASE) {
 			mCompVariantContent.favorite = true;

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

@@ -16,7 +16,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.104.0
+	 * @version 1.105.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -57,16 +57,6 @@ sap.ui.define([
 				variantId: {
 					type: "string"
 				}
-			},
-			aggregations: {
-				/**
-				 * Changes belonging to the variant
-				 */
-				changes: {
-					type: "sap.ui.fl.Change",
-					multiple: true,
-					defaultValue: []
-				}
 			}
 		},
 		constructor: function() {
@@ -88,8 +78,7 @@ sap.ui.define([
 			favorite: "favorite",
 			executeOnSelection: "executeOnSelection",
 			standardVariant: "standardVariant",
-			contexts: "contexts",
-			variantId: "variantId"
+			contexts: "contexts"
 		});
 	};
 
@@ -111,12 +100,12 @@ sap.ui.define([
 	};
 
 	/**
-	 * Sets the variant name on the correponding <code>texts</code> FlexObject property
+	 * Sets the variant name on the corresponding <code>texts</code> FlexObject property
 	 * @param {string} sName - Variant name
 	 * @param {boolean} [bSkipStateChange] - If set to <code>true</code>, doesn't set the state to dirty
 	 */
 	Variant.prototype.setName = function(sName, bSkipStateChange) {
-		this.setText("variantName", sName, bSkipStateChange);
+		this.setText("variantName", sName, "XFLD", bSkipStateChange);
 	};
 
 	return Variant;