@openui5/sap.ui.fl 1.104.0 → 1.105.0

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

@@ -24,6 +24,16 @@ sap.ui.define([
 		v4: "v4"
 	};
 
+	function _extractName(sQualifiedName) {
+		if (sQualifiedName && sQualifiedName.split) {
+			var aSegments = sQualifiedName.split("."); //If separator does not occur, the returned array contains one element consisting of the entire string
+
+			return aSegments[aSegments.length - 1];
+		}
+
+		return null;
+	}
+
 	/**
 	 * Extracts error messages from request failure response
 	 *
@@ -31,7 +41,7 @@ sap.ui.define([
 	 * @param {object} oXHR - request object
 	 * @returns {array} errorMessages
 	 */
-	 function _getMessagesFromXHR(oXHR) {
+	function _getMessagesFromXHR(oXHR) {
 		var aMessages = [];
 
 		try {
@@ -54,12 +64,23 @@ sap.ui.define([
 		return aMessages;
 	}
 
+	/**
+	 * Get binding path of a given control. In case of SmartTable or SmartFilterBar the target entity set is relevant.
+	 *
+	 * @private
+	 * @param {sap.ui.base.ManagedObject} oControl - Control to add extensions
+	 * @param {string} sBindingPath - binding path of control resp. target entity set
+	 * @returns {string} sBindingPath - binding path resp. target entity set of control or <code>null</code>
+	 */
 	function _getBindingPath(oControl) {
-		var sBindingPath = null;
-		var oBindingContext = oControl.getBindingContext ? oControl.getBindingContext() : null;
+		var sBindingPath = _extractName(_getEntitySet(oControl));
 
-		if (oBindingContext && oBindingContext.getPath) {
-			sBindingPath = oBindingContext.getPath();
+		if (!sBindingPath) {
+			var oBindingContext = oControl.getBindingContext ? oControl.getBindingContext() : null;
+
+			if (oBindingContext && oBindingContext.getPath) {
+				sBindingPath = oBindingContext.getPath();
+			}
 		}
 
 		if (!sBindingPath) {
@@ -75,11 +96,22 @@ sap.ui.define([
 	 * @private
 	 * @param {sap.ui.model.odata.v2.ODataModel} oModel - oData model
 	 * @param {string} sBindingPath - binding path of control
+	 * @param {string} sEntityType - entity type of control (i.e. SmartFilterBar)
 	 * @returns {Promise<string>} Resolves with the entity set name to which the control is bound or <code>null</code>
 	 */
-	function _getBoundEntitySetFromV2Model(oModel, sBindingPath) {
+	function _getBoundEntitySetFromV2Model(oModel, sBindingPath, sEntityType) {
 		return oModel.metadataLoaded().then(function() {
-			var oEntitySet = oModel.oMetadata._getEntitySetByPath(sBindingPath);
+			var oEntitySet = null;
+
+			if (sEntityType) {
+				var oEntityType = oModel.oMetadata._getEntityTypeByName(sEntityType);
+				oEntitySet = oModel.oMetadata._getEntitySetByType(oEntityType);
+			}
+
+			if (!oEntitySet) {
+				oEntitySet = oModel.oMetadata._getEntitySetByPath(sBindingPath);
+			}
+
 			return oEntitySet ? oEntitySet.name : null;
 		});
 	}
@@ -92,7 +124,7 @@ sap.ui.define([
 	 * @param {string} sBindingPath - binding path of control
 	 * @returns {Promise<string>} Resolves with the entity set name to which the control is bound or <code>null</code>
 	 */
-	 function _getBoundEntitySetFromV4Model(oModel, sBindingPath) {
+	function _getBoundEntitySetFromV4Model(oModel, sBindingPath) {
 		var oMetaModel = oModel.getMetaModel();
 		var sMetaPath = oMetaModel.getMetaPath(sBindingPath);
 
@@ -113,11 +145,21 @@ sap.ui.define([
 	 * @private
 	 * @param {sap.ui.model.odata.v2.ODataModel} oModel - oData model
 	 * @param {string} sBindingPath - binding path of control
+	 * @param {string} sEntityType - entity type of control (i.e. SmartFilterBar)
 	 * @returns {Promise<string>} Resolves with the entity type name to which the control is bound or <code>null</code>
 	 */
-	function _getBoundEntityTypeFromV2Model(oModel, sBindingPath) {
+	function _getBoundEntityTypeFromV2Model(oModel, sBindingPath, sEntityType) {
 		return oModel.metadataLoaded().then(function() {
-			var oEntityType = oModel.oMetadata._getEntityTypeByPath(sBindingPath);
+			var oEntityType = null;
+
+			if (sEntityType) {
+				oEntityType = oModel.oMetadata._getEntityTypeByName(sEntityType);
+			}
+
+			if (!oEntityType) {
+				oEntityType = oModel.oMetadata._getEntityTypeByPath(sBindingPath);
+			}
+
 			return oEntityType ? oEntityType.name : null;
 		});
 	}
@@ -130,16 +172,23 @@ sap.ui.define([
 	 * @param {string} sBindingPath - binding path of control
 	 * @returns {Promise<string>} Resolves with the entity type name to which the control is bound or <code>null</code>
 	 */
-	 function _getBoundEntityTypeFromV4Model(oModel, sBindingPath) {
+	function _getBoundEntityTypeFromV4Model(oModel, sBindingPath) {
 		var oMetaModel = oModel.getMetaModel();
 		var sMetaPath = oMetaModel.getMetaPath(sBindingPath);
 
 		return oMetaModel.requestObject(sMetaPath).then(function(oEntitySet) {
-			var aSegments = oEntitySet.$Type.split(".");
-			return aSegments[aSegments.length - 1];
+			return _extractName(oEntitySet.$Type);
 		});
 	}
 
+	function _getEntitySet(oControl) {
+		return oControl.getEntitySet ? oControl.getEntitySet() : null;
+	}
+
+	function _getEntityType(oControl) {
+		return oControl.getEntityType ? oControl.getEntityType() : null;
+	}
+
 	function _getServiceUri(oModel) {
 		var sServiceUri = null;
 
@@ -200,7 +249,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.Utils
 	 * @experimental Since 1.87.0
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 */
 	var Utils = {};
 
@@ -216,7 +265,8 @@ sap.ui.define([
 			var oModel = _getModel(oControl);
 			var sServiceUri = _getServiceUri(oModel);
 			var sBindingPath = _getBindingPath(oControl);
-			return Boolean(sServiceUri && sBindingPath);
+			var sEntityType = _getEntityType(oControl);
+			return Boolean(sServiceUri && (sBindingPath || sEntityType));
 		}
 
 		Log.warning("No Control passed");
@@ -269,7 +319,7 @@ sap.ui.define([
 		var sProtocolType = _getProtocolType(oModel);
 
 		if (sProtocolType === mProtocolType.v2) {
-			return _getBoundEntitySetFromV2Model(oModel, _getBindingPath(oControl));
+			return _getBoundEntitySetFromV2Model(oModel, _getBindingPath(oControl), _getEntityType(oControl));
 		} else if (sProtocolType === mProtocolType.v4) {
 			return _getBoundEntitySetFromV4Model(oModel, _getBindingPath(oControl));
 		}
@@ -289,7 +339,7 @@ sap.ui.define([
 		var sProtocolType = _getProtocolType(oModel);
 
 		if (sProtocolType === mProtocolType.v2) {
-			return _getBoundEntityTypeFromV2Model(oModel, _getBindingPath(oControl));
+			return _getBoundEntityTypeFromV2Model(oModel, _getBindingPath(oControl), _getEntityType(oControl));
 		} else if (sProtocolType === mProtocolType.v4) {
 			return _getBoundEntityTypeFromV4Model(oModel, _getBindingPath(oControl));
 		}
@@ -344,7 +394,7 @@ sap.ui.define([
 	 * @param {Map} mParameters Map of given parameters
 	 * @returns {string} encoded URI parameters
 	 */
-	 Utils.getUriParameters = function(mParameters) {
+	Utils.getUriParameters = function(mParameters) {
 		if (!mParameters) {
 			return "";
 		}

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @experimental Since 1.93
 	 * @private
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 */
 	var CAPAccess = {};
 

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

@@ -80,7 +80,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.dialog.CustomFieldCAPDialog
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 * @since 1.93
 	 * @experimental Since 1.93
 	 * @private

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.104.0
+	 * @version 1.105.0
 	 *
 	 * @private
 	 * @experimental 1.93

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.104.0
+	 * @version 1.105.0
 	 *
 	 * @private
 	 * @experimental 1.93

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.104.0
+	 * @version 1.105.0
 	 *
 	 * @private
 	 * @experimental 1.93

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

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
@@ -12,6 +12,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/ChangesController",
 	"sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState",
 	"sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger",
+	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
 	"sap/ui/fl/ChangePersistenceFactory",
 	"sap/ui/fl/LayerUtils",
 	"sap/ui/fl/apply/_internal/flexState/compVariants/Utils",
@@ -24,6 +25,7 @@ sap.ui.define([
 	ChangesController,
 	CompVariantState,
 	CompVariantMerger,
+	VariantManagementState,
 	ChangePersistenceFactory,
 	LayerUtils,
 	CompVariantsUtils,
@@ -34,7 +36,7 @@ sap.ui.define([
 	/**
 	 * @namespace sap.ui.fl.apply._internal.flexState.FlexObjectState
 	 * @since 1.83
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -87,17 +89,52 @@ sap.ui.define([
 		return ChangePersistenceFactory.getChangePersistenceForComponent(mPropertyBag.reference);
 	}
 
+	/**
+	 * Removes variant-dependent changes belonging to variants which are currently not selected
+	 *
+	 * @param {array} aChanges - List of changes to check
+	 * @param {sap.ui.fl.Control} oControl - Control for which the changes are being checked
+	 * @returns {sap.ui.fl.Change[]} List of variant-dependent changes belonging to the currently selected variants
+	 */
+	 function filterChangesByCurrentVariants(aChanges, oControl) {
+		// 1. Get current variant references
+		var oComponent = Utils.getAppComponentForControl(oControl);
+		var oModel = oComponent.getModel(Utils.VARIANT_MODEL_NAME);
+		var sFlexReference = oModel && oModel.sFlexReference;
+		var aVariantManagementReferences = VariantManagementState.getVariantManagementReferences(sFlexReference);
+
+		if (aVariantManagementReferences.length === 0) {
+			return aChanges;
+		}
+
+		var aCurrentVariantReferences = aVariantManagementReferences.map(function(sVMReference) {
+			return oModel.getCurrentVariantReference(sVMReference);
+		});
+
+		// 2. Remove variant-dependent changes not assigned to a current variant reference
+		return aChanges.filter(function(oChange) {
+			return aCurrentVariantReferences.some(function(sCurrentVariantReference) {
+				return oChange.getVariantReference() === sCurrentVariantReference
+					|| !oChange.getVariantReference();
+			});
+		});
+	}
+
 	function getChangePersistenceEntities(mPropertyBag) {
 		var oChangePersistence = getChangePersistence(mPropertyBag);
 
 		return oChangePersistence.getChangesForComponent(_omit(mPropertyBag, ["invalidateCache", "selector"]), mPropertyBag.invalidateCache)
-		.then(function(aPersistedChanges) {
-			var aDirtyChanges = [];
-			if (mPropertyBag.includeDirtyChanges) {
-				aDirtyChanges = oChangePersistence.getDirtyChanges();
-			}
-			return aPersistedChanges.concat(aDirtyChanges);
-		});
+			.then(function(aPersistedChanges) {
+				var aDirtyChanges = [];
+				if (mPropertyBag.includeDirtyChanges) {
+					aDirtyChanges = oChangePersistence.getDirtyChanges();
+				}
+				var aChanges = aPersistedChanges.concat(aDirtyChanges);
+				if (mPropertyBag.onlyCurrentVariants) {
+					return filterChangesByCurrentVariants(aChanges, mPropertyBag.selector);
+				}
+				return aChanges;
+			});
 	}
 
 	function saveChangePersistenceEntities(mPropertyBag, oAppComponent) {

package/src/sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
@@ -259,7 +259,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.flexState.compVariants.CompVariantState
 	 * @since 1.83
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/write/_internal/transport/TransportSelection.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @private
 	 * @alias sap.ui.fl.write._internal.transport.TransportSelection
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 * @since 1.74.0
 	 * Helper object to select an ABAP transport for an LREP object. This is not a generic utility to select a transport request, but part
 	 *        of the SmartVariant control.

package/src/sap/ui/fl/write/_internal/transport/Transports.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * Entity that handles ABAP transport related information.
 	 * @alias sap.ui.fl.write._internal.transport.Transports
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 * @since 1.74.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.transport
@@ -49,7 +49,9 @@ sap.ui.define([
 		 * 					"localonly" tells the consumer if only local development is valid and no transport selection should take place.
 		 * 					"transports" is an array of objects with attributes "transportId", "owner", "description", "locked"(true/false).
 		 * 					"errorCode" can have the values "INVALID_PACKAGE" or "NO_TRANSPORTS" or is an empty string if there is no error.
-		 * @public
+		 *
+		 * @private
+		 * @ui5-restricted sap.ui.fl.write._internal.transport
 		 */
 		getTransports: function (mParameters) {
 			if (FlexUtils.getClient()) {
@@ -82,7 +84,9 @@ sap.ui.define([
 		 * @param {string} mParameters.changeIds Array of change ID objects with attributes "namespace", "fileName", "fileType"
 		 * @param {string} mParameters.reference Application ID of the changes which should be transported
 		 * @returns {Promise} without parameters
-		 * @public
+		 *
+		 * @private
+		 * @ui5-restricted sap.ui.fl.write._internal.transport
 		 */
 		makeChangesTransportable: function (mParameters) {
 			if (!mParameters.transportId) {
@@ -113,6 +117,9 @@ sap.ui.define([
 		 * @param {Array} aLocalChanges List of changes which data have to be extracted
 		 * @param {Array} [aAppVariantDescriptors] List of app variant descriptors which data have to be extracted
 		 * @returns {Array} Returns an array of object containing all required data to transport the existing local changes
+		 *
+		 * @private
+		 * @ui5-restricted sap.ui.fl.write._internal.transport
 		 */
 		convertToChangeTransportData: function (aLocalChanges, aAppVariantDescriptors) {
 			var aTransportData = [];

package/src/sap/ui/fl/write/api/AppVariantWriteAPI.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */

package/src/sap/ui/fl/write/api/ChangesWriteAPI.js

@@ -1,37 +1,39 @@
-/*
- * ! OpenUI5
+/*!
+ * 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/base/util/includes",
+	"sap/base/util/restricted/_omit",
+	"sap/base/Log",
+	"sap/ui/core/util/reflection/JsControlTreeModifier",
+	"sap/ui/core/Component",
+	"sap/ui/core/Element",
+	"sap/ui/fl/apply/_internal/appVariant/DescriptorChangeTypes",
 	"sap/ui/fl/apply/_internal/changes/Applier",
 	"sap/ui/fl/apply/_internal/changes/Reverter",
+	"sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory",
 	"sap/ui/fl/apply/_internal/ChangesController",
-	"sap/ui/fl/apply/_internal/appVariant/DescriptorChangeTypes",
 	"sap/ui/fl/descriptorRelated/api/DescriptorChangeFactory",
 	"sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerStorage",
-	"sap/ui/fl/write/_internal/appVariant/AppVariantInlineChangeFactory",
-	"sap/base/Log",
-	"sap/ui/core/Component",
-	"sap/ui/core/Element",
-	"sap/ui/core/util/reflection/JsControlTreeModifier",
-	"sap/base/util/includes",
-	"sap/base/util/restricted/_omit"
+	"sap/ui/fl/write/_internal/appVariant/AppVariantInlineChangeFactory"
 ], function(
+	includes,
+	_omit,
+	Log,
+	JsControlTreeModifier,
+	Component,
+	Element,
+	DescriptorChangeTypes,
 	Applier,
 	Reverter,
+	FlexObjectFactory,
 	ChangesController,
-	DescriptorChangeTypes,
 	DescriptorChangeFactory,
 	ChangeHandlerStorage,
-	AppVariantInlineChangeFactory,
-	Log,
-	Component,
-	Element,
-	JsControlTreeModifier,
-	includes,
-	_omit
+	AppVariantInlineChangeFactory
 ) {
 	"use strict";
 
@@ -93,6 +95,10 @@ sap.ui.define([
 					});
 			}
 
+			if (mPropertyBag.changeSpecificData.changeType === "codeExt") {
+				return FlexObjectFactory.createControllerExtensionChange(mPropertyBag.changeSpecificData);
+			}
+
 			// flex change
 			if (mPropertyBag.selector.name && mPropertyBag.selector.view) {
 				oFlexController = ChangesController.getFlexControllerInstance(mPropertyBag.selector.view);

package/src/sap/ui/fl/write/api/ContextSharingAPI.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */

package/src/sap/ui/fl/write/api/ControlPersonalizationWriteAPI.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */

package/src/sap/ui/fl/write/api/ExtensionPointRegistryAPI.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */

package/src/sap/ui/fl/write/api/FeaturesAPI.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
@@ -19,7 +19,6 @@ sap.ui.define([
 	 * Provides an API to determine which features are available for flexibility.
 	 *
 	 * @namespace sap.ui.fl.write.api.FeaturesAPI
-	 * @experimental Since 1.70
 	 * @since 1.70
 	 * @public
 	 *
@@ -77,7 +76,7 @@ sap.ui.define([
 		 * feature should be visible to the current user. This only applies if key user adaptation
 		 * should be handled standalone without an SAP Fiori launchpad.
 		 *
-		 * @returns {Promise<boolean>} Resolves to a boolean indicating if key user is available
+		 * @returns {Promise<boolean>} Resolves to a boolean indicating if the key user role is assigned to the user
 		 * @public
 		 */
 		isKeyUser: function () {
@@ -92,7 +91,8 @@ sap.ui.define([
 		 *
 		 * @param {string} sLayer - Layer to check for the draft versioning
 		 * @returns {Promise<boolean>} Resolves to a boolean indicating if versioning is enabled
-		 * @public
+		 * @private
+		 * @ui5-restricted sap.ui.rta
 		 */
 		isVersioningEnabled: function (sLayer) {
 			return Settings.getInstance()
@@ -106,7 +106,8 @@ sap.ui.define([
 		 *
 		 * @param {sap.ui.fl.Layer} sLayer - Current layer
 		 * @returns {Promise<boolean>} Resolves to a boolean indicating if the key user is also an admin
-		 * @public
+		 * @private
+		 * @ui5-restricted sap.ui.rta
 		 */
 		isKeyUserTranslationEnabled: function (sLayer) {
 			if (sLayer === Layer.CUSTOMER) {
@@ -123,7 +124,8 @@ sap.ui.define([
 		 *
 		 * @param {string} sLayer - Layer to get correct connector
 		 * @returns {Promise<boolean>} Resolves to a boolean indicating if context sharing is enabled
-		 * @public
+		 * @private
+		 * @ui5-restricted sap.ui.fl.write.api.ContextSharingAPI
 		 */
 		isContextSharingEnabled: function (sLayer) {
 			if (sLayer !== Layer.CUSTOMER) {

package/src/sap/ui/fl/write/api/FieldExtensibility.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write.api.FieldExtensibility
 	 * @since 1.87
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.rta
 	 */

package/src/sap/ui/fl/write/api/LocalResetAPI.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */

package/src/sap/ui/fl/write/api/PersistenceWriteAPI.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
@@ -16,12 +16,10 @@ sap.ui.define([
 	"sap/ui/fl/write/_internal/flexState/FlexObjectState",
 	"sap/ui/fl/write/_internal/Storage",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
-	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
 	"sap/ui/fl/write/api/FeaturesAPI",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/LayerUtils",
-	"sap/ui/fl/registry/Settings",
-	"sap/ui/fl/Utils"
+	"sap/ui/fl/registry/Settings"
 ], function(
 	includes,
 	_omit,
@@ -34,12 +32,10 @@ sap.ui.define([
 	FlexObjectState,
 	Storage,
 	ManifestUtils,
-	VariantManagementState,
 	FeaturesAPI,
 	Layer,
 	LayerUtils,
-	Settings,
-	FlUtils
+	Settings
 ) {
 	"use strict";
 
@@ -84,37 +80,6 @@ sap.ui.define([
 			});
 	}
 
-	/**
-	 * Removes variant-dependent changes belonging to variants which are currently not selected
-	 *
-	 * @param {array} aChanges - List of changes to check
-	 * @param {sap.ui.fl.Control} oControl - Control for which the changes are being checked
-	 * @returns {sap.ui.fl.Change[]} List of variant-dependent changes belonging to the currently selected variants
-	 */
-	function filterChangesByCurrentVariants(aChanges, oControl) {
-		// 1. Get current variant references
-		var oComponent = FlUtils.getAppComponentForControl(oControl);
-		var oModel = oComponent.getModel(FlUtils.VARIANT_MODEL_NAME);
-		var sFlexReference = oModel && oModel.sFlexReference;
-		var aVariantManagementReferences = VariantManagementState.getVariantManagementReferences(sFlexReference);
-
-		if (aVariantManagementReferences.length === 0) {
-			return aChanges;
-		}
-
-		var aCurrentVariantReferences = aVariantManagementReferences.map(function(sVMReference) {
-			return oModel.getCurrentVariantReference(sVMReference);
-		});
-
-		// 2. Remove variant-dependent changes not assigned to a current variant reference
-		return aChanges.filter(function(oChange) {
-			return aCurrentVariantReferences.some(function(sCurrentVariantReference) {
-				return oChange.getVariantReference() === sCurrentVariantReference
-					|| !oChange.getVariantReference();
-			});
-		});
-	}
-
 	/**
 	 * Determines if user-specific changes or variants are present in the flex persistence.
 	 *
@@ -414,13 +379,7 @@ sap.ui.define([
 		}
 
 		//TODO: Check the mPropertyBag.selector parameter name - the methods called on FlexObjectState expect a control
-		return FlexObjectState.getFlexObjects(mPropertyBag)
-			.then(function(aChanges) {
-				if (mPropertyBag.onlyCurrentVariants) {
-					return filterChangesByCurrentVariants(aChanges, mPropertyBag.selector);
-				}
-				return aChanges;
-			});
+		return FlexObjectState.getFlexObjects(mPropertyBag);
 	};
 
 	return PersistenceWriteAPI;