@openui5/sap.ui.fl 1.93.3 → 1.96.2

package/src/sap/ui/fl/variants/VariantModel.js

@@ -6,6 +6,7 @@
 
 sap.ui.define([
 	"sap/base/util/restricted/_omit",
+	"sap/base/util/restricted/_isEqual",
 	"sap/base/util/each",
 	"sap/base/util/includes",
 	"sap/base/util/isEmptyObject",
@@ -28,6 +29,7 @@ sap.ui.define([
 	"sap/ui/model/json/JSONModel"
 ], function(
 	_omit,
+	_isEqual,
 	each,
 	includes,
 	isEmptyObject,
@@ -51,6 +53,8 @@ sap.ui.define([
 ) {
 	"use strict";
 
+	var _mUShellServices = {};
+
 	/**
 	 * Handler for "select" event fired from a variant management control.
 	 * Adds to the variant switch promise chain, resolving when new variant (if applicable) has been switched and all source variant dirty changes have been removed.
@@ -58,6 +62,7 @@ sap.ui.define([
 	 * @param {object} mPropertyBag - Object with properties
 	 * @param {string} mPropertyBag.vmReference - Variant management reference
 	 * @param {sap.ui.fl.variants.VariantModel} mPropertyBag.model - Variant model instance
+	 * @returns {Promise<undefined>} Resolves with undefined
 	 *
 	 * @private
 	 */
@@ -172,6 +177,7 @@ sap.ui.define([
 	 *
 	 * @param {function():Promise} fnCallback - Callback function returning a promise
 	 * @param {sap.ui.fl.variants.VariantModel} oModel - Variant model
+	 * @param {string} sVMReference - Variant Management reference
 	 * @returns {Promise} Resolves when the variant model is not busy anymore
 	 * @private
 	 */
@@ -191,6 +197,16 @@ sap.ui.define([
 		return oModel._oVariantSwitchPromise;
 	}
 
+	/**
+	 * Saves the specified Unified Shell service on the model
+	 *
+	 * @param {string} sServiceName Name of the ushell service (e.g. "URLParsing")
+	 * @param {sap.ui.core.service.Service} oService The service object
+	 */
+	function setUShellService(sServiceName, oService) {
+		_mUShellServices[sServiceName] = oService;
+	}
+
 	function revertVariantAndClearData(mPropertyBag) {
 		return Switcher.switchVariant(mPropertyBag)
 			.then(function() {
@@ -259,11 +275,11 @@ sap.ui.define([
 	 * @class Variant model implementation for JSON format.
 	 * @extends sap.ui.model.json.JSONModel
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @param {object} oData - Either the URL where to load the JSON from or a JS object
-	 * @param {sap.ui.fl.FlexController} oFlexController - <code>FlexController</code> instance for the component which uses the variant model
-	 * @param {sap.ui.core.Component} oAppComponent - Application component instance that is currently loading
-	 * @param {boolean} bObserve -Indicates whether to observe the JSON data for property changes (experimental)
+	 * @param {object} mPropertyBag - Map of properties required for the constructor
+	 * @param {sap.ui.fl.FlexController} mPropertyBag.flexController - <code>FlexController</code> instance for the component which uses the variant model
+	 * @param {sap.ui.core.Component} mPropertyBag.appComponent - Application component instance that is currently loading
 	 * @constructor
 	 * @private
 	 * @ui5-restricted
@@ -273,20 +289,24 @@ sap.ui.define([
 	 */
 
 	var VariantModel = JSONModel.extend("sap.ui.fl.variants.VariantModel", /** @lends sap.ui.fl.variants.VariantModel.prototype */ {
-		constructor: function(oData, oFlexController, oAppComponent, bObserve) {
+		constructor: function(oData, mPropertyBag) {
 			// JSON model internal properties
 			this.pSequentialImportCompleted = Promise.resolve();
-			JSONModel.apply(this, arguments);
-			this.bObserve = bObserve;
+			JSONModel.apply(this, [oData]);
+
+			this.sharing = {
+				PRIVATE: "private",
+				PUBLIC: "public"
+			};
 
 			// FlexControllerFactory creates a FlexController instance for an application component,
 			// which creates a ChangePersistence instance.
 			// After retrieving changes for the created ChangePersistence instance,
 			// FlexControllerFactory creates a VariantModel instance for this application component.
-			this.oFlexController = oFlexController;
+			this.oFlexController = mPropertyBag.flexController;
 			this.oChangePersistence = this.oFlexController._oChangePersistence;
 			this.sFlexReference = this.oChangePersistence.getComponentName();
-			this.oAppComponent = oAppComponent;
+			this.oAppComponent = mPropertyBag.appComponent;
 			this._oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.fl");
 			this._oVariantSwitchPromise = Promise.resolve();
 			this._oVariantAppliedListeners = {};
@@ -316,6 +336,7 @@ sap.ui.define([
 						oVariant.originalFavorite = oVariant.favorite;
 						oVariant.originalExecuteOnSelect = oVariant.executeOnSelect;
 						oVariant.originalVisible = oVariant.visible;
+						oVariant.originalContexts = oVariant.contexts;
 					});
 					oData[sKey].originalCurrentVariant = oData[sKey].currentVariant;
 					oData[sKey].originalDefaultVariant = oData[sKey].defaultVariant;
@@ -323,12 +344,43 @@ sap.ui.define([
 
 				this.setData(oData);
 			}
-
-			//initialize hash data - variants map & model should exist at this point
-			URLHandler.initialize({model: this});
 		}
 	});
 
+	/**
+	 * Gets the necessary UShell Services and initializes the URL Handler
+	 * @returns {Promise} Promise resolving when the VariantModel is initialized
+	 */
+	VariantModel.prototype.initialize = function() {
+		return Promise.resolve()
+			.then(function() {
+				var oUShellContainer = Utils.getUshellContainer();
+				if (oUShellContainer) {
+					var aServicePromises = [
+						Utils.getUShellService("UserInfo"),
+						Utils.getUShellService("URLParsing"),
+						Utils.getUShellService("CrossApplicationNavigation"),
+						Utils.getUShellService("ShellNavigation")
+					];
+					return Promise.all(aServicePromises)
+						.then(function(aServices) {
+							setUShellService("UserInfo", aServices[0]);
+							setUShellService("URLParsing", aServices[1]);
+							setUShellService("CrossApplicationNavigation", aServices[2]);
+							setUShellService("ShellNavigation", aServices[3]);
+						})
+						.catch(function(vError) {
+							throw new Error("Error getting service from Unified Shell: " + vError);
+						});
+				}
+				return undefined;
+			})
+			.then(function() {
+				//initialize hash data - variants map & model should exist at this point (set on constructor)
+				URLHandler.initialize({ model: this });
+			}.bind(this));
+	};
+
 	/**
 	 * Updates the storage of the current variant for a given variant management control.
 	 * @param {object} mPropertyBag - Object with parameters as properties
@@ -600,6 +652,7 @@ sap.ui.define([
 			}
 		}.bind(this));
 		oDuplicateVariant.content.layer = mPropertyBag.layer;
+		oDuplicateVariant.content.contexts = mPropertyBag.contexts;
 
 		aVariantChanges = oDuplicateVariant.controlChanges.slice();
 
@@ -637,6 +690,7 @@ sap.ui.define([
 	 * @param {String} mPropertyBag.newVariantReference - <code>variantReference</code> for the new variant
 	 * @param {String} mPropertyBag.sourceVariantReference - <code>variantReference</code> of the source variant
 	 * @param {String} mPropertyBag.generator - Information about who created the change
+	 * @param {object} mPropertyBag.contexts - Context structure containing roles and countries
 	 * @returns {Promise} Promise resolving to dirty changes created during variant copy
 	 * @private
 	 */
@@ -656,7 +710,10 @@ sap.ui.define([
 			change: true,
 			remove: true,
 			visible: true,
-			originalVisible: true
+			originalVisible: true,
+			sharing: mPropertyBag.layer === Layer.USER ? this.sharing.PRIVATE : this.sharing.PUBLIC,
+			contexts: oDuplicateVariantData.content.contexts,
+			originalContexts: oDuplicateVariantData.originalContexts
 		};
 
 		var oVariant = VariantUtil.createVariant({
@@ -775,6 +832,16 @@ sap.ui.define([
 				};
 				aChanges.push(mPropertyBag);
 			}
+			if (!_isEqual(oVariant.originalContexts, oVariant.contexts)) {
+				mPropertyBag = {
+					variantReference: oVariant.key,
+					changeType: "setContexts",
+					layer: sLayer,
+					contexts: oVariant.contexts,
+					originalContexts: oVariant.originalContexts
+				};
+				aChanges.push(mPropertyBag);
+			}
 		});
 		if (oData.originalDefaultVariant !== oData.defaultVariant) {
 			mPropertyBag = {
@@ -797,10 +864,11 @@ sap.ui.define([
 	 * @param {String} sVariantManagementReference - Variant management reference
 	 * @param {String} sLayer - Current layer
 	 * @param {String} sClass - Style class assigned to the management dialog
+	 * @param {Promise<sap.ui.core.ComponentContainer>} oContextSharingComponentPromise - Promise resolving with the ComponentContainer
 	 * @returns {Promise} Promise which resolves when "manage" event is fired from the variant management control
 	 * @public
 	 */
-	VariantModel.prototype.manageVariants = function(oVariantManagementControl, sVariantManagementReference, sLayer, sClass) {
+	VariantModel.prototype.manageVariants = function(oVariantManagementControl, sVariantManagementReference, sLayer, sClass, oContextSharingComponentPromise) {
 		// called from the ControlVariant plugin in Adaptation mode
 		return new Promise(function(resolve) {
 			oVariantManagementControl.attachEventOnce("manage", {
@@ -808,13 +876,78 @@ sap.ui.define([
 				variantManagementReference: sVariantManagementReference,
 				layer: sLayer
 			}, this.fnManageClickRta, this);
-			oVariantManagementControl.openManagementDialog(true, sClass);
+			oVariantManagementControl.openManagementDialog(true, sClass, oContextSharingComponentPromise);
 		}.bind(this));
 	};
 
 	/**
-	 * Sets the passed properties on a variant for the passed variant management reference.
-	 * Also adds or removes a change depending on the parameters passed.
+	 * Sets the variant properties and adds a variant change
+	 * @param {string} sVariantManagementReference - Variant management reference
+	 * @param {object} mPropertyBag - Map of properties
+	 * @returns {sap.fl.Change} Created Change object
+	 */
+	VariantModel.prototype.addVariantChange = function(sVariantManagementReference, mPropertyBag) {
+		var mAdditionalChangeContent = this.setVariantProperties(sVariantManagementReference, mPropertyBag);
+
+		var mNewChangeData = {};
+		var mUpdateVariantsStateParams = {
+			vmReference: sVariantManagementReference,
+			add: true,
+			reference: this.sFlexReference
+		};
+
+		//create new change object
+		mNewChangeData.changeType = mPropertyBag.changeType;
+		mNewChangeData.layer = mPropertyBag.layer;
+		mNewChangeData.generator = mPropertyBag.generator;
+
+		if (mPropertyBag.changeType === "setDefault") {
+			mNewChangeData.fileType = "ctrl_variant_management_change";
+			mNewChangeData.selector = JsControlTreeModifier.getSelector(sVariantManagementReference, mPropertyBag.appComponent);
+		} else {
+			if (mPropertyBag.changeType === "setTitle") {
+				BaseChangeHandler.setTextInChange(mNewChangeData, "title", mPropertyBag.title, "XFLD");
+			}
+			mNewChangeData.fileType = "ctrl_variant_change";
+			mNewChangeData.selector = JsControlTreeModifier.getSelector(mPropertyBag.variantReference, mPropertyBag.appComponent);
+		}
+
+		var oChange = this.oFlexController.createBaseChange(mNewChangeData, mPropertyBag.appComponent);
+		//update change with additional content
+		oChange.setContent(mAdditionalChangeContent);
+
+		mUpdateVariantsStateParams.changeContent = oChange.getDefinition();
+		//update variants state and write change to ChangePersistence
+		VariantManagementState.updateChangesForVariantManagementInMap(mUpdateVariantsStateParams);
+		this.oChangePersistence.addDirtyChange(oChange);
+
+		return oChange;
+	};
+
+	/**
+	 * Sets the variant properties and deletes a variant change
+	 * @param {string} sVariantManagementReference - Variant management reference
+	 * @param {object} mPropertyBag - Property bag
+	 * @param {sap.fl.Change} oChange - Variant change to be deleted
+	 */
+	VariantModel.prototype.deleteVariantChange = function(sVariantManagementReference, mPropertyBag, oChange) {
+		var mUpdateVariantsStateParams = {
+			vmReference: sVariantManagementReference,
+			add: false,
+			reference: this.sFlexReference,
+			changeContent: undefined
+		};
+
+		this.setVariantProperties(sVariantManagementReference, mPropertyBag, true);
+		mUpdateVariantsStateParams.changeContent = oChange.getDefinition();
+		//update variants state and write change to ChangePersistence
+		VariantManagementState.updateChangesForVariantManagementInMap(mUpdateVariantsStateParams);
+		this.oChangePersistence.deleteChange(oChange);
+	};
+
+	/**
+	 * Sets the passed properties on a variant for the passed variant management reference and
+	 * returns the content for change creation
 	 * @param {sap.ui.fl.variants.VariantManagement} sVariantManagementReference - Variant management reference
 	 * @param {Object} mPropertyBag - Map of properties
 	 * @param {String} mPropertyBag.variantReference - Variant reference for which properties should be set
@@ -823,26 +956,24 @@ sap.ui.define([
 	 * @param {String} mPropertyBag.appComponent - App component instance
 	 * @param {String} [mPropertyBag.title] - New app title value for <code>setTitle</code> change type
 	 * @param {boolean} [mPropertyBag.visible] - New visible value for <code>setVisible</code> change type
+	 * @param {object} [mPropertyBag.contexts] - New contexts object (e.g. roles) for <code>setContexts</code> change type
 	 * @param {boolean} [mPropertyBag.favorite] - New favorite value for <code>setFavorite</code> change type
 	 * @param {boolean} [mPropertyBag.executeOnSelect] - New executeOnSelect value for <code>setExecuteOnSelect</code> change type
 	 * @param {String} [mPropertyBag.defaultVariant] - New default variant for <code>setDefault</code> change type
-	 * @param {sap.ui.fl.Change} [mPropertyBag.change] - Change to be deleted
-	 * @param {boolean} [bAddChange] - Indicates whether change needs to be added
-	 * @returns {sap.ui.fl.Change | null} Created change object or <code>null</code> if no change is created
+	 * @param {boolean} [bUpdateCurrentVariant] - Update current variant
+	 * @returns {object} Additional content for change creation
 	 * @public
 	 */
-	VariantModel.prototype.setVariantProperties = function(sVariantManagementReference, mPropertyBag, bAddChange) {
+	VariantModel.prototype.setVariantProperties = function(sVariantManagementReference, mPropertyBag, bUpdateCurrentVariant) {
 		// TODO: this function needs refactoring
 		var iVariantIndex = -1;
 		var oVariant;
-		var oChange = null;
 		var oData = this.getData();
 
 		if (mPropertyBag.variantReference) {
 			iVariantIndex = this.getVariantManagementReference(mPropertyBag.variantReference).variantIndex;
 			oVariant = oData[sVariantManagementReference].variants[iVariantIndex];
 		}
-		var mNewChangeData = {};
 		var mAdditionalChangeContent = {};
 
 		switch (mPropertyBag.changeType) {
@@ -873,6 +1004,12 @@ sap.ui.define([
 				oVariant.visible = mPropertyBag.visible;
 				oVariant.originalVisible = oVariant.visible;
 				break;
+			case "setContexts":
+				mAdditionalChangeContent.contexts = mPropertyBag.contexts;
+				//Update Variant Model
+				oVariant.contexts = mPropertyBag.contexts;
+				oVariant.originalContexts = mPropertyBag.contexts;
+				break;
 			case "setDefault":
 				mAdditionalChangeContent.defaultVariant = mPropertyBag.defaultVariant;
 				//Update Variant Model
@@ -907,7 +1044,7 @@ sap.ui.define([
 					}
 				}
 
-				if (!bAddChange && oData[sVariantManagementReference].currentVariant !== mPropertyBag.defaultVariant) {
+				if (bUpdateCurrentVariant && oData[sVariantManagementReference].currentVariant !== mPropertyBag.defaultVariant) {
 					this.updateCurrentVariant({
 						variantManagementReference: sVariantManagementReference,
 						newVariantReference: mPropertyBag.defaultVariant,
@@ -936,49 +1073,11 @@ sap.ui.define([
 			oVariantContent[sVariantManagementReference].defaultVariant = mPropertyBag.defaultVariant;
 		}
 
-		var mUpdateVariantsStateParams = {
-			vmReference: sVariantManagementReference,
-			add: bAddChange,
-			reference: this.sFlexReference
-		};
-
-		// add change
-		if (bAddChange === true) {
-			//create new change object
-			mNewChangeData.changeType = mPropertyBag.changeType;
-			mNewChangeData.layer = mPropertyBag.layer;
-			mNewChangeData.generator = mPropertyBag.generator;
-
-			if (mPropertyBag.changeType === "setDefault") {
-				mNewChangeData.fileType = "ctrl_variant_management_change";
-				mNewChangeData.selector = JsControlTreeModifier.getSelector(sVariantManagementReference, mPropertyBag.appComponent);
-			} else {
-				if (mPropertyBag.changeType === "setTitle") {
-					BaseChangeHandler.setTextInChange(mNewChangeData, "title", mPropertyBag.title, "XFLD");
-				}
-				mNewChangeData.fileType = "ctrl_variant_change";
-				mNewChangeData.selector = JsControlTreeModifier.getSelector(mPropertyBag.variantReference, mPropertyBag.appComponent);
-			}
-
-			oChange = this.oFlexController.createBaseChange(mNewChangeData, mPropertyBag.appComponent);
-			//update change with additional content
-			oChange.setContent(mAdditionalChangeContent);
-
-			mUpdateVariantsStateParams.changeContent = oChange.getDefinition();
-			//update variants state and write change to ChangePersistence
-			VariantManagementState.updateChangesForVariantManagementInMap(mUpdateVariantsStateParams);
-			this.oChangePersistence.addDirtyChange(oChange);
-		} else if (mPropertyBag.change) { // delete change
-			mUpdateVariantsStateParams.changeContent = mPropertyBag.change.getDefinition();
-			//update variants state and write change to ChangePersistence
-			VariantManagementState.updateChangesForVariantManagementInMap(mUpdateVariantsStateParams);
-			this.oChangePersistence.deleteChange(mPropertyBag.change);
-		}
 		// set data to variant model
 		this.setData(oData);
 		this.checkUpdate(true);
 
-		return oChange;
+		return mAdditionalChangeContent;
 	};
 
 	VariantModel.prototype._ensureStandardVariantExists = function(sVariantManagementReference) {
@@ -1006,6 +1105,8 @@ sap.ui.define([
 						originalExecuteOnSelect: false,
 						visible: true,
 						originalVisible: true,
+						contexts: {},
+						originalContexts: {},
 						author: VariantUtil.DEFAULT_AUTHOR
 					}
 				]
@@ -1032,7 +1133,8 @@ sap.ui.define([
 								favorite: true,
 								visible: true,
 								executeOnSelect: false
-							}
+							},
+							contexts: {}
 						},
 						controlChanges: [],
 						variantChanges: {}
@@ -1043,7 +1145,7 @@ sap.ui.define([
 			// TODO: To be removed in a separate change
 			// try-catch added to prevent FlexState initialize checks, since many tests use fake components / fake responses
 			try {
-				VariantManagementState.addFakeStandardVariant(this.sFlexReference, oStandardVariant);
+				VariantManagementState.addFakeStandardVariant(this.sFlexReference, this.oAppComponent.getId(), oStandardVariant);
 			} catch (oError) {
 				Log.error("Variants Map was not found: " + oError.message);
 			}
@@ -1085,8 +1187,9 @@ sap.ui.define([
 			this.oData[sVariantManagementReference].variants.forEach(function(oVariant) {
 				oVariant.rename = true;
 				oVariant.change = true;
+				oVariant.sharing = this.sharing.PUBLIC;
 				oVariant.remove = isVariantValidForRemove(oVariant, sVariantManagementReference, bDesignTimeModeToBeSet);
-			});
+			}.bind(this));
 		} else if (this.oData[sVariantManagementReference]._isEditable) { // Personalization settings
 			oControl.attachManage({
 				variantManagementReference: sVariantManagementReference
@@ -1102,21 +1205,23 @@ sap.ui.define([
 					case Layer.USER:
 						oVariant.rename = true;
 						oVariant.change = true;
+						oVariant.sharing = this.sharing.PRIVATE;
 						updatePersonalVariantPropertiesWithFlpSettings(oVariant);
 						break;
 					case Layer.PUBLIC:
-						var oUShellContainer = Utils.getUshellContainer();
-						var oUser = oUShellContainer && oUShellContainer.getUser();
+						var oUser = this._oUserInfoService && this._oUserInfoService.getUser();
 						var bUserIsAuthorized = !oUser || oUser.getId().toUpperCase() === oVariant.author.toUpperCase() || Settings.getInstanceOrUndef().isKeyUser();
 						oVariant.remove = bUserIsAuthorized;
 						oVariant.rename = bUserIsAuthorized;
 						oVariant.change = bUserIsAuthorized;
+						oVariant.sharing = this.sharing.PUBLIC;
 						break;
 					default:
 						oVariant.rename = false;
 						oVariant.change = false;
+						oVariant.sharing = this.sharing.PUBLIC;
 				}
-			});
+			}.bind(this));
 		} else {
 			this.oData[sVariantManagementReference].variantsEditable = false;
 			this.oData[sVariantManagementReference].variants.forEach(function(oVariant) {
@@ -1141,7 +1246,7 @@ sap.ui.define([
 			var aChanges = [];
 			aConfigurationChangesContent.forEach(function(oChangeProperties) {
 				oChangeProperties.appComponent = this.oAppComponent;
-				aChanges.push(this.setVariantProperties(oData.variantManagementReference, oChangeProperties, true));
+				aChanges.push(this.addVariantChange(oData.variantManagementReference, oChangeProperties));
 			}.bind(this));
 			this.oChangePersistence.saveDirtyChanges(this.oAppComponent, false, aChanges);
 		};
@@ -1204,6 +1309,7 @@ sap.ui.define([
 				appComponent: oAppComponent,
 				layer: sLayer,
 				title: mParameters.name,
+				contexts: mParameters.contexts,
 				sourceVariantReference: sSourceVariantReference,
 				newVariantReference: sNewVariantReference,
 				generator: mParameters.generator
@@ -1220,7 +1326,7 @@ sap.ui.define([
 							layer: sLayer,
 							variantManagementReference: sVariantManagementReference
 						};
-						var oSetDefaultChange = this.setVariantProperties(sVariantManagementReference, mPropertyBagSetDefault, true);
+						var oSetDefaultChange = this.addVariantChange(sVariantManagementReference, mPropertyBagSetDefault);
 						aCopiedVariantDirtyChanges.push(oSetDefaultChange);
 					}
 					if (bSetExecuteOnSelect) {
@@ -1232,7 +1338,7 @@ sap.ui.define([
 							layer: sLayer,
 							variantManagementReference: sVariantManagementReference
 						};
-						var oSetExecuteChange = this.setVariantProperties(sVariantManagementReference, mPropertyBagSetExecute, true);
+						var oSetExecuteChange = this.addVariantChange(sVariantManagementReference, mPropertyBagSetExecute);
 						aCopiedVariantDirtyChanges.push(oSetExecuteChange);
 					}
 					aNewVariantDirtyChanges = aCopiedVariantDirtyChanges;
@@ -1439,11 +1545,11 @@ sap.ui.define([
 		}.bind(this));
 		return this._oVariantSwitchPromise
 			.then(function() {
-				VariantManagementState.clearFakedStandardVariants(this.sFlexReference);
-				VariantManagementState.resetContent(this.sFlexReference);
+				VariantManagementState.clearFakedStandardVariants(this.sFlexReference, this.oAppComponent.getId());
+				VariantManagementState.resetContent(this.sFlexReference, this.oAppComponent.getId());
 				//re-initialize hash data and remove existing parameters
 				if (!bSkipURLHandling) {
-					URLHandler.initialize({model: this});
+					URLHandler.initialize({ model: this });
 					URLHandler.update({
 						parameters: [],
 						updateHashEntry: true,
@@ -1453,5 +1559,15 @@ sap.ui.define([
 			}.bind(this));
 	};
 
+	/**
+	 * Returns the Unified Shell service saved on the model, if available
+	 *
+	 * @param {string} sServiceName Name of the ushell service (e.g. "UserInfo")
+	 * @returns {sap.ui.core.service.Service} The service object
+	 */
+	VariantModel.prototype.getUShellService = function(sServiceName) {
+		return Utils.getUshellContainer() && _mUShellServices[sServiceName];
+	};
+
 	return VariantModel;
 });

package/src/sap/ui/fl/write/_internal/Storage.js

@@ -7,10 +7,12 @@
 sap.ui.define([
 	"sap/ui/fl/initial/_internal/StorageUtils",
 	"sap/ui/fl/write/_internal/StorageFeaturesMerger",
+	"sap/ui/fl/apply/_internal/flexObjects/States",
 	"sap/base/util/ObjectPath"
 ], function(
 	StorageUtils,
 	StorageFeaturesMerger,
+	States,
 	ObjectPath
 ) {
 	"use strict";
@@ -20,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.Storage
 	 * @since 1.67
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -142,7 +144,7 @@ sap.ui.define([
 				if (oChange.condenserState) {
 					var bDifferentOrder = false;
 					if (oChange.condenserState === "delete") {
-						if (oChange.getState() === "NONE") {
+						if (oChange.getState() === States.PERSISTED) {
 							mCondense.delete.change.push(oChange.getFileName());
 						}
 						iOffset++;
@@ -156,7 +158,7 @@ sap.ui.define([
 						mCondense.reorder.change = aReorderedChanges;
 						bAlreadyReordered = true;
 					}
-					if (oChange.condenserState === "select" && oChange.getProperty("state") === "NEW") {
+					if (oChange.condenserState === "select" && oChange.getState() === States.NEW) {
 						mCondense.create.change[iChangeCreateIndex] = {};
 						mCondense.create.change[iChangeCreateIndex][oChange.getFileName()] = oChange.getDefinition();
 					} else if (oChange.condenserState === "update") {
@@ -168,7 +170,7 @@ sap.ui.define([
 					}
 
 					delete oChange.condenserState;
-				} else if (oChange.getProperty("state") === "NEW") {
+				} else if (oChange.getState() === States.NEW) {
 					mCondense.create[oChange.getFileType()][iChangeCreateIndex] = {};
 					mCondense.create[oChange.getFileType()][iChangeCreateIndex][oChange.getId()] = oChange.getDefinition();
 				}

package/src/sap/ui/fl/write/_internal/StorageFeaturesMerger.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.StorageFeaturesMerger
 	 * @since 1.70
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */