@openui5/sap.ui.fl 1.138.0 → 1.140.0

package/src/sap/ui/fl/write/_internal/fieldExtensibility/SingleTenantABAPExtensibilityVariant.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.SingleTenantABAPExtensibilityVariant
 	 * @since 1.87
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @public
 	 */
 	const SingleTenantABAPExtensibilityVariant = ABAPExtensibilityVariant.extend(sNamespace, {

package/src/sap/ui/fl/write/_internal/fieldExtensibility/UriParser.js

@@ -134,7 +134,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.UriParser
 	 * @since 1.87.0
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 */
 	var UriParser = {};

package/src/sap/ui/fl/write/_internal/fieldExtensibility/Utils.js

@@ -245,7 +245,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.Utils
 	 * @since 1.87.0
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 */
 	var Utils = {};

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/CAPAccess.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @since 1.93
 	 * @private
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 */
 	var CAPAccess = {};
 

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/dialog/CustomFieldCAPDialog.js

@@ -82,7 +82,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.dialog.CustomFieldCAPDialog
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @since 1.93
 	 * @private
 	 * @ui5-restricted

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/booleanEditor/BooleanEditor.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.booleanEditor.BooleanEditor
 	 * @author SAP SE
 	 * @since 1.93
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/rangeEditor/RangeEditor.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.rangeEditor.RangeEditor
 	 * @author SAP SE
 	 * @since 1.93
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/timeEditor/TimeEditor.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.timeEditor.TimeEditor
 	 * @author SAP SE
 	 * @since 1.93
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

package/src/sap/ui/fl/write/_internal/flexState/FlexObjectManager.js

@@ -8,20 +8,19 @@ sap.ui.define([
 	"sap/base/util/restricted/_omit",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/fl/apply/_internal/changes/Reverter",
-	"sap/ui/fl/apply/_internal/flexObjects/CompVariant",
 	"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/changes/UIChangesState",
-	"sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger",
 	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
 	"sap/ui/fl/apply/_internal/flexState/FlexObjectState",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"sap/ui/fl/initial/_internal/Settings",
 	"sap/ui/fl/initial/api/Version",
 	"sap/ui/fl/write/_internal/condenser/Condenser",
-	"sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState",
+	"sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantManagementState",
+	"sap/ui/fl/write/_internal/flexState/compVariants/CompVariantManager",
 	"sap/ui/fl/write/_internal/Storage",
 	"sap/ui/fl/write/_internal/Versions",
 	"sap/ui/fl/Layer",
@@ -31,12 +30,10 @@ sap.ui.define([
 	_omit,
 	JsControlTreeModifier,
 	Reverter,
-	CompVariant,
 	FlexObjectFactory,
 	States,
 	DependencyHandler,
 	UIChangesState,
-	CompVariantMerger,
 	VariantManagementState,
 	FlexObjectState,
 	FlexState,
@@ -44,7 +41,8 @@ sap.ui.define([
 	Settings,
 	Version,
 	Condenser,
-	CompVariantState,
+	CompVariantManagementState,
+	CompVariantManager,
 	Storage,
 	Versions,
 	Layer,
@@ -59,44 +57,12 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.flexState.FlexObjectManager
 	 * @since 1.83
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
 	const FlexObjectManager = {};
 
-	function getCompVariantEntities(mPropertyBag) {
-		const aEntities = [];
-		const mCompEntities = FlexState.getCompVariantsMap(mPropertyBag.reference);
-		for (const sPersistencyKey in mCompEntities) {
-			const mCompVariantsOfPersistencyKey = mCompEntities[sPersistencyKey];
-			for (const sId in mCompVariantsOfPersistencyKey.byId) {
-				aEntities.push(mCompVariantsOfPersistencyKey.byId[sId]);
-			}
-		}
-		return LayerUtils.filterChangeOrChangeDefinitionsByCurrentLayer(aEntities, mPropertyBag.currentLayer);
-	}
-
-	// Enhance CompVariantsMap with external data and standard variant after FlexState was cleared and reinitialized
-	function updateCompEntities(mPropertyBag) {
-		const mCompEntities = FlexState.getCompVariantsMap(mPropertyBag.reference);
-		const oDataToRestore = FlexState.getInitialNonFlCompVariantData(mPropertyBag.reference);
-		if (oDataToRestore) {
-			Object.keys(oDataToRestore).forEach((sPersistencyKey) => {
-				mCompEntities._initialize(
-					sPersistencyKey,
-					oDataToRestore[sPersistencyKey].variants,
-					oDataToRestore[sPersistencyKey].controlId
-				);
-				CompVariantMerger.merge(
-					sPersistencyKey,
-					mCompEntities[sPersistencyKey],
-					oDataToRestore[sPersistencyKey].standardVariant
-				);
-			});
-		}
-	}
-
 	function removeFlexObjectFromDependencyHandler(sReference, oFlexObject) {
 		if (oFlexObject.isValidForDependencyMap()) {
 			DependencyHandler.removeChangeFromMap(FlexObjectState.getLiveDependencyMap(sReference), oFlexObject.getId());
@@ -185,11 +151,6 @@ sap.ui.define([
 		// and have the same reference (relevant for app variants)
 		const aRelevantChanges = FlexState.getFlexObjectsDataSelector().get({reference: sReference})
 		.filter((oChange) => {
-			// CompVariants are currently saved separately and should not be part of the condense request
-			// TODO: Remove CompVariant special handling todos#5
-			if (oChange instanceof CompVariant) {
-				return false;
-			}
 			if (sLayer === Layer.CUSTOMER && aDraftFilenames) {
 				return oChange.getState() === States.LifecycleState.PERSISTED && aDraftFilenames.includes(oChange.getId());
 			}
@@ -367,7 +328,7 @@ sap.ui.define([
 	 */
 	FlexObjectManager.filterHiddenFlexObjects = function(aFlexObjects, sReference) {
 		const aFilteredFlexObjects = VariantManagementState.filterHiddenFlexObjects(aFlexObjects, sReference);
-		return CompVariantState.filterHiddenFlexObjects(aFilteredFlexObjects, sReference);
+		return CompVariantManager.filterHiddenFlexObjects(aFilteredFlexObjects, sReference);
 	};
 
 	/**
@@ -392,10 +353,10 @@ sap.ui.define([
 			const oAppComponent = Utils.getAppComponentForSelector(mPropertyBag.selector);
 			mPropertyBag.componentId = oAppComponent.getId();
 			await FlexState.update(mPropertyBag);
-			updateCompEntities(mPropertyBag);
 		}
 
-		let aRelevantFlexObjects = UIChangesState.getVariantIndependentUIChanges(mPropertyBag.reference);
+		let aRelevantFlexObjects = UIChangesState.getVariantIndependentUIChanges(mPropertyBag.reference)
+		.concat(CompVariantManagementState.getCompEntities(mPropertyBag));
 
 		// getInitialUIChanges will only add variant related UIChanges from the initial variants,
 		// with includeCtrlVariants set all variant related flex objects are added
@@ -433,7 +394,7 @@ sap.ui.define([
 			});
 		}
 
-		return aRelevantFlexObjects.concat(getCompVariantEntities(mPropertyBag));
+		return aRelevantFlexObjects;
 	};
 
 	/**
@@ -446,7 +407,7 @@ sap.ui.define([
 	 */
 	FlexObjectManager.hasDirtyFlexObjects = function(mPropertyBag) {
 		const sReference = ManifestUtils.getFlexReferenceForSelector(mPropertyBag.selector);
-		return FlexObjectState.getDirtyFlexObjects(sReference).length > 0 || CompVariantState.hasDirtyChanges(sReference);
+		return FlexObjectState.getDirtyFlexObjects(sReference).length > 0;
 	};
 
 	/**
@@ -515,13 +476,13 @@ sap.ui.define([
 	FlexObjectManager.saveFlexObjects = async function(mPropertyBag) {
 		const oAppComponent = Utils.getAppComponentForSelector(mPropertyBag.selector);
 		const sReference = ManifestUtils.getFlexReferenceForControl(mPropertyBag.selector);
-		await CompVariantState.persistAll(sReference);
 
 		const bConsiderDraftHandling = mPropertyBag.layer === Layer.CUSTOMER;
 		const oVersionModel = bConsiderDraftHandling && Versions.getVersionsModel({
 			reference: sReference,
 			layer: mPropertyBag.layer
 		});
+		const bVersioningEnabled = oVersionModel && oVersionModel.getProperty("/versioningEnabled");
 		if (mPropertyBag.removeOtherLayerChanges && mPropertyBag.layer) {
 			await removeOtherLayerChanges(oAppComponent, mPropertyBag.layer, sReference);
 		}
@@ -538,11 +499,11 @@ sap.ui.define([
 			skipUpdateCache: mPropertyBag.skipUpdateCache,
 			condenseAnyLayer: mPropertyBag.condenseAnyLayer,
 			appComponent: oAppComponent,
-			parentVersion: oVersionModel ? oVersionModel.getProperty("/persistedVersion") : undefined,
-			draftFilenames: oVersionModel ? oVersionModel.getProperty("/draftFilenames") : undefined
+			parentVersion: bVersioningEnabled ? oVersionModel.getProperty("/persistedVersion") : undefined,
+			draftFilenames: bVersioningEnabled ? oVersionModel.getProperty("/draftFilenames") : undefined
 		});
 
-		if (bConsiderDraftHandling) {
+		if (bConsiderDraftHandling && bVersioningEnabled) {
 			Versions.updateAfterSave({
 				reference: sReference,
 				layer: mPropertyBag.layer,

package/src/sap/ui/fl/write/_internal/flexState/UI2Personalization/UI2PersonalizationState.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.flexState.UI2Personalization.UI2PersonalizationState
 	 * @since 1.120
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/write/_internal/flexState/changes/UIChangeManager.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.flexState.changes.UIChangeManager
 	 * @since 1.129
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */