@openui5/sap.ui.fl 1.139.0 → 1.141.0

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

@@ -13,7 +13,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/changes/Applier",
 	"sap/ui/fl/apply/_internal/extensionPoint/Registry",
 	"sap/ui/fl/apply/_internal/flexState/changes/ExtensionPointState",
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"sap/ui/fl/Utils"
 ], function(
 	merge,
@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 */
 	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.139.0
+	 * @version 1.141.0
 	 *
 	 * @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.139.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -20,7 +20,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.139.0
+	 * @version 1.141.0
 	 * @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.139.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.comp
 	 */
@@ -60,14 +60,8 @@ sap.ui.define([
 				revertData: {
 					type: "sap.ui.base.ManagedObject", // "sap.ui.fl.apply._internal.flexObjects.CompVariantRevertData"
 					multiple: true,
-					singularName: "revertData"
-				},
-				/**
-				 * Changes belonging to the variant
-				 */
-				changes: {
-					type: "sap.ui.base.ManagedObject", // "sap.ui.fl.apply._internal.flexObjects.FlexObject"
-					multiple: true
+					singularName: "revertData",
+					defaultValue: []
 				}
 			}
 		},
@@ -79,7 +73,16 @@ sap.ui.define([
 			// fileType "variant" is only for compVariant
 			this.setFileType("variant");
 
-			if (mPropertyBag.favorite !== undefined) {
+			// set executeOnSelection
+			if (!mPropertyBag.executeOnSelection) {
+				this.setExecuteOnSelection(!!(mPropertyBag.content?.executeOnSelect || mPropertyBag.content?.executeOnSelection));
+			}
+			const bIsStandardVariant = this.getVariantId() === CompVariant.STANDARD_VARIANT_ID || !!this.getContent()?.standardvariant;
+
+			if (bIsStandardVariant) {
+				this.setFavorite(true);
+				this.setStandardVariant(true);
+			} else if (mPropertyBag.favorite !== undefined) {
 				this.setFavorite(!!mPropertyBag.favorite);
 			} else if (mPropertyBag.layer === Layer.VENDOR || mPropertyBag.layer === Layer.CUSTOMER_BASE) {
 				this.setFavorite(true);

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

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

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @constant
 	 * @typedef {object} sap.ui.fl.apply._internal.flexObjects.FlexObject.FlexObjectMetadata
 	 * @property {string} changeType - Type of the flexObject
-	 * @property {string} reference - Application component name
+	 * @property {string} reference - Flexibility reference of the app
 	 * @property {string} namespace - Namespace of the flex object file
 	 * @property {string} creation - Timestamp of creation date
 	 * @property {string} projectId - Project ID of the flex object file
@@ -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.139.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.139.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.139.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.139.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.139.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.139.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.139.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);
@@ -252,19 +252,19 @@ sap.ui.define([
 			return vResult;
 		}
 		var oParentDataSelector = this.getParentDataSelector();
-		var oParentData = oParentDataSelector && oParentDataSelector.get(mParameters);
+		var aParentData = oParentDataSelector?.get(mParameters);
 
 		var vParameterValue = (mParameters || {})[sParameterKey];
 		if (!this._mInitialized[vParameterValue] && this.getInitFunction()) {
 			this.getInitFunction()(
-				oParentData,
+				aParentData,
 				vParameterValue
 			);
 			this._mInitialized[vParameterValue] = true;
 		}
 
 		var vNewResult = this.getExecuteFunction()(
-			oParentData,
+			aParentData,
 			mParameters
 		);
 		this._setParameterizedCachedResult(mParameters, vNewResult);

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
 	"sap/ui/fl/apply/_internal/flexState/DataSelector",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"sap/ui/fl/Utils"
 ], function(
 	merge,
@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.flexState.FlexObjectState
 	 * @since 1.83
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -210,12 +210,12 @@ sap.ui.define([
 	};
 
 	/**
-	 * Waits for all the changes for all controls that are passed to be processed and a variant switch to be done.
+	 * Waits for all the changes for all controls that are passed to be processed.
 	 *
 	 * @param {object[]} aSelectorInformation - An array containing an object with {@link sap.ui.fl.Selector} and further configuration
 	 * @param {sap.ui.fl.Selector} aSelectorInformation.selector - A {@link sap.ui.fl.Selector}
 	 * @param {string[]} [aSelectorInformation.changeTypes] - An array containing the change types that will be considered. If empty no filtering will be done
-	 * @returns {Promise} Resolves when a variant switch is done and all changes on controls have been processed
+	 * @returns {Promise} Resolves when all changes on controls have been processed
 	 */
 	FlexObjectState.waitForFlexObjectsToBeApplied = async function(aSelectorInformation) {
 		const oAppComponent = Utils.getAppComponentForSelector(aSelectorInformation[0].selector);
@@ -224,7 +224,6 @@ sap.ui.define([
 		}
 		const sFlexReference = ManifestUtils.getFlexReferenceForControl(oAppComponent);
 
-		await VariantManagementState.waitForVariantSwitch(sFlexReference);
 		await Promise.all(aSelectorInformation.map((oSelector) => {
 			const oControl = oSelector.selector.id && Element.getElementById(oSelector.selector.id) || oSelector.selector;
 
@@ -260,34 +259,21 @@ sap.ui.define([
 		}));
 	};
 
-	function getCompVariantEntities(sReference) {
-		const aEntities = [];
-		const mCompEntities = FlexState.getCompVariantsMap(sReference);
-		for (const sPersistencyKey in mCompEntities) {
-			const mCompVariantsOfPersistencyKey = mCompEntities[sPersistencyKey];
-			for (const sId in mCompVariantsOfPersistencyKey.byId) {
-				aEntities.push(mCompVariantsOfPersistencyKey.byId[sId]);
-			}
-		}
-		return aEntities;
-	}
-
-	function isNewChangeDeleted(oFlexObject) {
-		return !(oFlexObject.getState() === States.LifecycleState.DELETED && oFlexObject._sPreviousState === States.LifecycleState.NEW);
-	}
-
 	/**
 	 * Collects modified changes from the different states within the <code>sap.ui.fl</code> library.
-	 * TODO: remove special CompVariant handling todos#5
 	 *
 	 * @param {object} sReference - Flex Reference
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} All dirty Flex objects
 	 */
 	FlexObjectState.getDirtyFlexObjects = function(sReference) {
-		const aCompVariantEntities = getCompVariantEntities(sReference);
-		return oAllDirtyFlexObjectsDataSelector.get({reference: sReference})
-		.concat(aCompVariantEntities.filter((oFlexObject) => oFlexObject.getState() !== States.LifecycleState.PERSISTED))
-		// change is not dirty when it is created and deleted in the same session
+		function isNewChangeDeleted(oFlexObject) {
+			// Also consider the fileType in case it is a compVariant("variant") because there the state is already set to DELETED
+			return !(oFlexObject.getState() === States.LifecycleState.DELETED && oFlexObject._sPreviousState === States.LifecycleState.NEW)
+				|| (oFlexObject.getState() === States.LifecycleState.DELETED && oFlexObject.getFileType() === "variant");
+		}
+
+		return oAllDirtyFlexObjectsDataSelector
+		.get({reference: sReference})
 		.filter((oFlexObject) => isNewChangeDeleted(oFlexObject));
 	};