@openui5/sap.ui.fl 1.92.0 → 1.95.0

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

@@ -17,6 +17,7 @@ sap.ui.define([
 	"sap/ui/core/Icon",
 	"sap/ui/layout/HorizontalLayout",
 	"sap/ui/layout/Grid",
+	'sap/base/Log',
 	"sap/m/SearchField",
 	"sap/m/RadioButton",
 	"sap/m/ColumnListItem",
@@ -57,6 +58,7 @@ sap.ui.define([
 	Icon,
 	HorizontalLayout,
 	Grid,
+	Log,
 	SearchField,
 	RadioButton,
 	ColumnListItem,
@@ -330,7 +332,6 @@ sap.ui.define([
 	VariantManagement.MAX_NAME_LEN = 100;
 	VariantManagement.COLUMN_FAV_IDX = 0;
 	VariantManagement.COLUMN_NAME_IDX = 1;
-	VariantManagement.COLUMN_EXEC_IDX = 3;
 
 	/*
 	 * Constructs and initializes the <code>VariantManagement</code> control.
@@ -415,6 +416,44 @@ sap.ui.define([
 		this.oVariantInvisibleText.toStatic();
 
 		this.addDependent(this.oVariantLayout);
+
+		this._fRegisteredApplyAutomaticallyOnStandardVariant = null;
+	};
+
+	/**
+	 * Registration of a callback function. The provided callback function is executed to check if apply automatically on standard variant should be considered.
+	 * @private
+	 * @ui5-restricted sap.fe
+	 * @since 1.93
+	 * @param {function} fCallBack Called when standard variant must be applied. It determines if apply automatically on standard variant should be considered.
+	 * @returns {this} Reference to this in order to allow method chaining.
+	 */
+	VariantManagement.prototype.registerApplyAutomaticallyOnStandardVariant = function(fCallBack) {
+		this._fRegisteredApplyAutomaticallyOnStandardVariant = fCallBack;
+
+		return this;
+	};
+
+	/**
+	 * Retrieves the apply automatically state for a variant.
+	 * @private
+	 * @ui5-restricted sap.mdc
+	 * @since 1.93
+	 * @param {object} oVariant the inner variant object
+	 * @returns {boolean} apply automatically state
+	 */
+	VariantManagement.prototype.getApplyAutomaticallyOnVariant = function(oVariant) {
+		var bExecuteOnSelection = oVariant.executeOnSelect;
+
+		if (this._fRegisteredApplyAutomaticallyOnStandardVariant && this.getDisplayTextForExecuteOnSelectionForStandardVariant() && (oVariant.key === this.getStandardVariantKey())) {
+			try {
+				bExecuteOnSelection = this._fRegisteredApplyAutomaticallyOnStandardVariant();
+			} catch (ex) {
+				Log.error("callback for determination of apply automatically on standard variant failed");
+			}
+		}
+
+		return bExecuteOnSelection;
 	};
 
 	/**
@@ -425,12 +464,10 @@ sap.ui.define([
 	 * @returns {object} Configuration information for the <code>sap.m.IOverflowToolbarContent</code> interface.
 	 */
 	VariantManagement.prototype.getOverflowToolbarConfig = function() {
-		var oConfig = {
+		return {
 			canOverflow: false,
 			invalidationEvents: ["save", "manage", "select"]
 		};
-
-		return oConfig;
 	};
 
 	/**
@@ -459,6 +496,7 @@ sap.ui.define([
 		var oModel = new JSONModel({
 			showExecuteOnSelection: false,
 			showSetAsDefault: true,
+			showPublic: false,
 			editable: true,
 			popoverTitle: this._oRb.getText("VARIANT_MANAGEMENT_VARIANTS")
 		});
@@ -466,7 +504,7 @@ sap.ui.define([
 
 		this._bindProperties();
 
-		this._updateInnerModelWithShowSaveAsProperty();
+		this._updateInnerModelWithSettingsInfo();
 	};
 
 	VariantManagement.prototype._bindProperties = function() {
@@ -480,12 +518,29 @@ sap.ui.define([
 		});
 	};
 
-	VariantManagement.prototype._updateInnerModelWithShowSaveAsProperty = function() {
+	VariantManagement.prototype._updateInnerModelWithSettingsInfo = function() {
 		flSettings.getInstance().then(function (oSettings) {
 			this.getModel(VariantManagement.INNER_MODEL_NAME).setProperty("/showSaveAs", oSettings.isVariantPersonalizationEnabled());
+			this.getModel(VariantManagement.INNER_MODEL_NAME).setProperty("/showPublic", oSettings.isPublicFlVariantEnabled());
 		}.bind(this));
 	};
 
+	VariantManagement.prototype._getShowPublic = function() {
+		var oModel = this.getModel(VariantManagement.INNER_MODEL_NAME);
+		if (oModel) {
+			return oModel.getProperty("/showPublic");
+		}
+
+		return false;
+	};
+
+	VariantManagement.prototype._setShowPublic = function(bValue) {
+		var oInnerModel = this.getModel(VariantManagement.INNER_MODEL_NAME);
+		if (oInnerModel) {
+			oInnerModel.setProperty("/showPublic", bValue);
+		}
+	};
+
 	VariantManagement.prototype._getShowExecuteOnSelection = function() {
 		var oModel = this.getModel(VariantManagement.INNER_MODEL_NAME);
 		if (oModel) {
@@ -502,7 +557,6 @@ sap.ui.define([
 		}
 	};
 
-
 	VariantManagement.prototype.setExecuteOnSelection = function(bValue) {
 		var oModel = this.getModel(this._sModelName);
 		if (oModel && this.oContext) {
@@ -812,9 +866,7 @@ sap.ui.define([
 	};
 
 	VariantManagement.prototype.getFocusDomRef = function() {
-		if (this.oVariantPopoverTrigger) {
-			return this.oVariantPopoverTrigger.getFocusDomRef();
-		}
+		return this.oVariantPopoverTrigger.getFocusDomRef();
 	};
 
 	VariantManagement.prototype.onclick = function(oEvent) {
@@ -1156,6 +1208,15 @@ sap.ui.define([
 				width: "100%"
 			});
 
+			this.oPublic = new CheckBox(this.getId() + "-public", {
+				text: this._oRb.getText("VARIANT_MANAGEMENT_SETASPUBLIC"),
+				visible: {
+					path: "/showPublic",
+					model: VariantManagement.INNER_MODEL_NAME
+				},
+				width: "100%"
+			});
+
 			this.oExecuteOnSelect = new CheckBox(this.getId() + "-execute", {
 				text: this._oRb.getText("VARIANT_MANAGEMENT_EXECUTEONSELECT"),
 				visible: {
@@ -1185,6 +1246,7 @@ sap.ui.define([
 						this._checkVariantNameConstraints(this.oInputName);
 
 						if (this.oInputName.getValueState() === "Error") {
+							this.oInputName.focus();
 							return;
 						}
 
@@ -1203,6 +1265,9 @@ sap.ui.define([
 				oSaveAsDialogOptionsGrid.addContent(this.oDefault);
 			}
 
+
+			oSaveAsDialogOptionsGrid.addContent(this.oPublic);
+
 			if (this._getShowExecuteOnSelection()) {
 				oSaveAsDialogOptionsGrid.addContent(this.oExecuteOnSelect);
 			}
@@ -1213,6 +1278,7 @@ sap.ui.define([
 					this._bSaveOngoing = false;
 
 					if (this._sStyleClass) {
+						this._setShowPublic(this._bShowPublic);
 						this.oSaveAsDialog.removeStyleClass(this._sStyleClass);
 						this._sStyleClass = undefined;
 					}
@@ -1257,22 +1323,22 @@ sap.ui.define([
 	VariantManagement.prototype.openSaveAsDialogForKeyUser = function (sRtaStyleClassName) {
 		this._openSaveAsDialog(sRtaStyleClassName);
 		this.oSaveAsDialog.addStyleClass(sRtaStyleClassName);
-		this._sStyleClass = sRtaStyleClassName;
+		this._sStyleClass = sRtaStyleClassName; // indicates that dialog is running in key user scenario
+
+		this._bShowPublic = this._getShowPublic();
+		this._setShowPublic(false);
 	};
 
 	VariantManagement.prototype._openSaveAsDialog = function() {
 		this._createSaveAsDialog();
 
 		this.oInputName.setValue(this.getSelectedVariantText(this.getCurrentVariantKey()));
-		//this.oSaveSave.setEnabled(false);
-
 		this.oInputName.setEnabled(true);
 		this.oInputName.setValueState(ValueState.None);
 		this.oInputName.setValueStateText(null);
 
-		//this._checkVariantNameConstraints(this.oInputName);
-
 		this.oDefault.setSelected(false);
+		this.oPublic.setSelected(false);
 		this.oExecuteOnSelect.setSelected(false);
 
 		if (this.oVariantPopOver) {
@@ -1328,7 +1394,8 @@ sap.ui.define([
 			name: sName,
 			overwrite: false,
 			def: this.oDefault.getSelected(),
-			execute: this.oExecuteOnSelect.getSelected()
+			execute: this.oExecuteOnSelect.getSelected(),
+			"public": this._sStyleClass ? undefined : this.oPublic.getSelected()
 		});
 	};
 
@@ -1425,13 +1492,25 @@ sap.ui.define([
 						header: new Text({
 							text: this._oRb.getText("VARIANT_MANAGEMENT_NAME")
 						}),
-						width: "14rem"
+						width: "16rem"
+					}), new Column({
+						header: new Text({
+							text: this._oRb.getText("VARIANT_MANAGEMENT_VARIANTTYPE"),
+							wrappingType: "Hyphenated"
+						}),
+						visible: {
+							path: "/showPublic",
+							model: VariantManagement.INNER_MODEL_NAME
+						},
+						demandPopin: true,
+						popinDisplay: PopinDisplay.Inline,
+						minScreenWidth: ScreenSize.Tablet
 					}), new Column({
 						header: new Text({
 							text: this._oRb.getText("VARIANT_MANAGEMENT_DEFAULT"),
 							wrappingType: "Hyphenated"
 						}),
-						hAlign: TextAlign.Begin,
+						hAlign: TextAlign.Center,
 						demandPopin: true,
 						popinDisplay: PopinDisplay.Block,
 						minScreenWidth: ScreenSize.Tablet,
@@ -1492,6 +1571,13 @@ sap.ui.define([
 				title: this._oRb.getText("VARIANT_MANAGEMENT_MANAGEDIALOG"),
 				beginButton: this.oManagementSave,
 				endButton: this.oManagementCancel,
+				afterClose: function() {
+					if (this._sStyleClass) {
+						this._setShowPublic(this._bShowPublic);
+						this.oManagementDialog.removeStyleClass(this._sStyleClass);
+						this._sStyleClass = undefined;
+					}
+				}.bind(this),
 				content: [
 					this.oManagementTable
 				],
@@ -1601,7 +1687,6 @@ sap.ui.define([
 			type: ButtonType.Transparent,
 			press: fPress,
 			tooltip: this._oRb.getText("VARIANT_MANAGEMENT_DELETE"),
-			// visible: "{:= ${remove} ? true : false }}"
 			visible: oItem.remove
 		});
 
@@ -1648,9 +1733,18 @@ sap.ui.define([
 			});
 		}
 
-		var oTemplate = new ColumnListItem({
+		return new ColumnListItem({
 			cells: [
-				oFavoriteIcon, oNameControl, new RadioButton({
+				oFavoriteIcon, oNameControl, new Text({
+					text: {
+						path: "sharing",
+						model: this._sModelName,
+						formatter: function(sValue) {
+							return this._oRb.getText(sValue === "private" ? "VARIANT_MANAGEMENT_PRIVATE" : "VARIANT_MANAGEMENT_PUBLIC");
+						}.bind(this)
+					},
+					textAlign: "Center"
+				}), new RadioButton({
 					groupName: this.getId(),
 					select: fSelectRB,
 					selected: {
@@ -1666,11 +1760,8 @@ sap.ui.define([
 				}), oDeleteButton, new Text({
 					text: '{' + this._sModelName + ">key}"
 				})
-
 			]
 		});
-
-		return oTemplate;
 	};
 
 	VariantManagement.prototype._openManagementDialog = function(sClass) {
@@ -1701,6 +1792,9 @@ sap.ui.define([
 			});
 		}
 		if (sClass) {
+			this._sStyleClass = sClass;
+			this._bShowPublic = this._getShowPublic();
+			this._setShowPublic(false);
 			this.oManagementDialog.addStyleClass(sClass);
 		}
 		this.oManagementDialog.open();
@@ -1725,16 +1819,12 @@ sap.ui.define([
 			return;
 		}
 
-		if (bToInActive) {
-			if (oIcon.hasStyleClass("sapUiFlVarMngmtFavColor")) {
-				oIcon.removeStyleClass("sapUiFlVarMngmtFavColor");
-				oIcon.addStyleClass("sapUiFlVarMngmtFavNonInteractiveColor");
-			}
-		} else {
-			if (oIcon.hasStyleClass("sapUiFlVarMngmtFavNonInteractiveColor")) {
-				oIcon.removeStyleClass("sapUiFlVarMngmtFavNonInteractiveColor");
-				oIcon.addStyleClass("sapUiFlVarMngmtFavColor");
-			}
+		if (bToInActive && oIcon.hasStyleClass("sapUiFlVarMngmtFavColor")) {
+			oIcon.removeStyleClass("sapUiFlVarMngmtFavColor");
+			oIcon.addStyleClass("sapUiFlVarMngmtFavNonInteractiveColor");
+		} else if (oIcon.hasStyleClass("sapUiFlVarMngmtFavNonInteractiveColor")) {
+			oIcon.removeStyleClass("sapUiFlVarMngmtFavNonInteractiveColor");
+			oIcon.addStyleClass("sapUiFlVarMngmtFavColor");
 		}
 	};
 
@@ -1813,8 +1903,8 @@ sap.ui.define([
 		var oModel;
 		var sKey = oItem.key;
 
-		// do not allow the deletion of the last entry
-		if (this.oManagementTable.getItems().length === 1) {
+		// do not allow the deletion of the standard
+		if (this.getStandardVariantKey() === sKey) {
 			return;
 		}
 
@@ -2090,6 +2180,11 @@ sap.ui.define([
 		}
 		this.oDefault = undefined;
 
+		if (this.oPublic && !this.oPublic._bIsBeingDestroyed) {
+			this.oPublic.destroy();
+		}
+		this.oPublic = undefined;
+
 		if (this.oExecuteOnSelect && !this.oExecuteOnSelect._bIsBeingDestroyed) {
 			this.oExecuteOnSelect.destroy();
 		}
@@ -2115,6 +2210,8 @@ sap.ui.define([
 		if (this._sStyleClass) {
 			this._sStyleClass = undefined;
 		}
+
+		this._fRegisteredApplyAutomaticallyOnStandardVariant = null;
 	};
 
 	return VariantManagement;

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

@@ -58,6 +58,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
 	 */
@@ -259,7 +260,7 @@ sap.ui.define([
 	 * @class Variant model implementation for JSON format.
 	 * @extends sap.ui.model.json.JSONModel
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 * @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
@@ -279,6 +280,11 @@ sap.ui.define([
 			JSONModel.apply(this, arguments);
 			this.bObserve = bObserve;
 
+			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,
@@ -572,14 +578,23 @@ sap.ui.define([
 			variantChanges: {}
 		};
 
-		var iCurrentLayerComp = LayerUtils.compareAgainstCurrentLayer(oSourceVariant.content.layer, !this._bDesignTimeMode ? Layer.USER : "");
+		var iCurrentLayerComp = LayerUtils.compareAgainstCurrentLayer(oSourceVariant.content.layer, mPropertyBag.layer);
 
 		Object.keys(oSourceVariant.content).forEach(function(sKey) {
 			if (sKey === "fileName") {
 				oDuplicateVariant.content[sKey] = sNewVariantReference;
 			} else if (sKey === "variantReference") {
-				if (iCurrentLayerComp === 0) {
-					oDuplicateVariant.content[sKey] = oSourceVariant.content["variantReference"];
+				if (iCurrentLayerComp === 1) {
+					// in case a user variant should be saved as a PUBLIC variant, but refers to a PUBLIC variant,
+					// the references dependencies must be followed one more time
+					var oSourceVariantsSource = this.getVariant(oSourceVariant.content.variantReference);
+					if (oSourceVariantsSource.content.layer === mPropertyBag.layer) {
+						oDuplicateVariant.content[sKey] = oSourceVariantsSource.content.variantReference;
+					} else {
+						oDuplicateVariant.content[sKey] = oSourceVariant.content.variantReference;
+					}
+				} else if (iCurrentLayerComp === 0) {
+					oDuplicateVariant.content[sKey] = oSourceVariant.content.variantReference;
 				} else if (iCurrentLayerComp === -1) {
 					oDuplicateVariant.content[sKey] = sSourceVariantReference;
 				}
@@ -589,16 +604,19 @@ sap.ui.define([
 			} else {
 				oDuplicateVariant.content[sKey] = oSourceVariant.content[sKey];
 			}
-		});
-		oDuplicateVariant.content["layer"] = mPropertyBag.layer;
+		}.bind(this));
+		oDuplicateVariant.content.layer = mPropertyBag.layer;
 
 		aVariantChanges = oDuplicateVariant.controlChanges.slice();
 
 		var oDuplicateChangeData = {};
 		var oDuplicateChangeContent;
 		oDuplicateVariant.controlChanges = aVariantChanges.reduce(function(aSameLayerChanges, oChange) {
-			if (LayerUtils.compareAgainstCurrentLayer(oChange.layer, !this._bDesignTimeMode ? Layer.USER : "") === 0) {
+			// copy all changes in the same layer and higher layers (PUBLIC variant can copy USER layer changes)
+			if (LayerUtils.compareAgainstCurrentLayer(oChange.layer, mPropertyBag.layer) >= 0) {
 				oDuplicateChangeData = merge({}, oChange);
+				// ensure that the layer is set to the current variants (USER may becomes PUBLIC)
+				oDuplicateChangeData.layer = mPropertyBag.layer;
 				oDuplicateChangeData.variantReference = oDuplicateVariant.content.fileName;
 				if (!oDuplicateChangeData.support) {
 					oDuplicateChangeData.support = {};
@@ -610,7 +628,7 @@ sap.ui.define([
 				aSameLayerChanges.push(new Change(oDuplicateChangeContent));
 			}
 			return aSameLayerChanges;
-		}.bind(this), []);
+		}, []);
 
 		return oDuplicateVariant;
 	};
@@ -644,7 +662,8 @@ sap.ui.define([
 			change: true,
 			remove: true,
 			visible: true,
-			originalVisible: true
+			originalVisible: true,
+			sharing: mPropertyBag.layer === Layer.USER ? this.sharing.PRIVATE : this.sharing.PUBLIC
 		};
 
 		var oVariant = VariantUtil.createVariant({
@@ -784,6 +803,7 @@ sap.ui.define([
 	 * @param {sap.ui.fl.variants.VariantManagement} oVariantManagementControl - Variant management control
 	 * @param {String} sVariantManagementReference - Variant management reference
 	 * @param {String} sLayer - Current layer
+	 * @param {String} sClass - Style class assigned to the management dialog
 	 * @returns {Promise} Promise which resolves when "manage" event is fired from the variant management control
 	 * @public
 	 */
@@ -1030,7 +1050,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);
 			}
@@ -1072,8 +1092,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
@@ -1085,15 +1106,28 @@ sap.ui.define([
 			this.oData[sVariantManagementReference].variants.forEach(function(oVariant) {
 				oVariant.remove = isVariantValidForRemove(oVariant, sVariantManagementReference, bDesignTimeModeToBeSet);
 				// Check for end-user variant
-				if (oVariant.layer === Layer.USER) {
-					oVariant.rename = true;
-					oVariant.change = true;
-					updatePersonalVariantPropertiesWithFlpSettings(oVariant);
-				} else {
-					oVariant.rename = false;
-					oVariant.change = false;
+				switch (oVariant.layer) {
+					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 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) {
@@ -1167,12 +1201,12 @@ sap.ui.define([
 				changeInstance: true
 			});
 
-			if (mParameters["overwrite"]) {
+			if (mParameters.overwrite) {
 				// handle triggered "Save" button
 				return this.oFlexController.saveSequenceOfDirtyChanges(this._getDirtyChangesFromVariantChanges(aSourceVariantChanges), oAppComponent);
 			}
 
-			var sLayer = mParameters.layer || Layer.USER;
+			var sLayer = mParameters.layer || (mParameters.public ? Layer.PUBLIC : Layer.USER);
 
 			// handle triggered "SaveAs" button
 			var sNewVariantReference = mParameters.newVariantReference || Utils.createDefaultFileName();
@@ -1180,7 +1214,7 @@ sap.ui.define([
 				variantManagementReference: sVariantManagementReference,
 				appComponent: oAppComponent,
 				layer: sLayer,
-				title: mParameters["name"],
+				title: mParameters.name,
 				sourceVariantReference: sSourceVariantReference,
 				newVariantReference: sNewVariantReference,
 				generator: mParameters.generator
@@ -1416,7 +1450,7 @@ sap.ui.define([
 		}.bind(this));
 		return this._oVariantSwitchPromise
 			.then(function() {
-				VariantManagementState.clearFakedStandardVariants(this.sFlexReference);
+				VariantManagementState.clearFakedStandardVariants(this.sFlexReference, this.oAppComponent.getId());
 				VariantManagementState.resetContent(this.sFlexReference);
 				//re-initialize hash data and remove existing parameters
 				if (!bSkipURLHandling) {

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.Storage
 	 * @since 1.67
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -149,7 +149,7 @@ sap.ui.define([
 					} else if (mPropertyBag.condensedChanges.length) {
 						bDifferentOrder = mPropertyBag.allChanges[index].getFileName() !== mPropertyBag.condensedChanges[index - iOffset].getFileName();
 					}
-					if (oChange.condenserState === "select" && bDifferentOrder && !bAlreadyReordered) {
+					if ((oChange.condenserState === "select" || oChange.condenserState === "update") && bDifferentOrder && !bAlreadyReordered) {
 						var aReorderedChanges = mPropertyBag.condensedChanges.slice(index - iOffset).map(function(oChange) {
 							return oChange.getFileName();
 						});

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

@@ -16,14 +16,16 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.StorageFeaturesMerger
 	 * @since 1.70
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */
 
 	var DEFAULT_FEATURES = {
 		isKeyUser: false,
+		isKeyUserTranslationEnabled: false,
 		isVariantSharingEnabled: false,
+		isPublicFlVariantEnabled: false,
 		isVariantPersonalizationEnabled: true,
 		isAtoAvailable: false,
 		isAtoEnabled: false,
@@ -58,6 +60,7 @@ sap.ui.define([
 		 */
 		mergeResults: function(aResponses) {
 			var oResult = DEFAULT_FEATURES;
+
 			aResponses.forEach(function (oResponse) {
 				Object.keys(oResponse.features).forEach(function (sKey) {
 					if (sKey !== "isVersioningEnabled") {

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

@@ -154,7 +154,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.Versions
 	 * @since 1.74
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/write/_internal/appVariant/AppVariant.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariant
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/write/_internal/appVariant/AppVariantFactory.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariantFactory
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/write/_internal/appVariant/AppVariantInlineChange.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariantInlineChange
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/write/_internal/appVariant/AppVariantInlineChangeFactory.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariantInlineChangeFactory
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -926,5 +926,24 @@ sap.ui.define([
 		return _createAppVariantInlineChange(mPropertyBag);
 	};
 
+	/**
+	 * Creates an inline change of change type <code>appdescr_fiori_setAbstract</code>.
+	 *
+	 * @param {object} mPropertyBag - Parameters of the change type
+	 * @param {string} mPropertyBag.changeType - Inline change type of an app variant
+	 * @param {object} mPropertyBag.content - Content of an inline change
+	 * @param {boolean} mPropertyBag.content.abstract - Abstract property to be disabled (only allowd value is <code>false</code>)
+	 *
+	 * @return {Promise} Resolving when the descriptor inline change was created successfully (without back-end access)
+	 *
+	 * @private
+	 * @ui5-restricted WebIDE
+	 */
+	 AppVariantInlineChangeFactory.create_fiori_setAbstract = function(mPropertyBag) {
+		Utils.checkParameterAndType(mPropertyBag.content, "abstract", "boolean");
+		Utils.checkParameterAndType(mPropertyBag, "changeType", "string");
+		return _createAppVariantInlineChange(mPropertyBag);
+	};
+
 	return AppVariantInlineChangeFactory;
 });