@openui5/sap.ui.fl 1.114.0 → 1.115.1

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.Storage
 	 * @since 1.67
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

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

@@ -8,7 +8,6 @@ sap.ui.define([
 	"sap/ui/fl/registry/Settings",
 	"sap/ui/fl/ChangePersistenceFactory",
 	"sap/ui/fl/write/_internal/Storage",
-	"sap/ui/fl/Utils",
 	"sap/ui/fl/write/api/Version",
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/model/BindingMode"
@@ -16,7 +15,6 @@ sap.ui.define([
 	Settings,
 	ChangePersistenceFactory,
 	Storage,
-	Utils,
 	Version,
 	JSONModel,
 	BindingMode
@@ -30,103 +28,112 @@ sap.ui.define([
 	var BACKEND_REQUEST_LIMIT = MODEL_SIZE_LIMIT + 1;
 
 	function createModel(bVersioningEnabled, aVersions) {
+		var oModel = _prepareVersionsModel(bVersioningEnabled, aVersions);
+
+		oModel.setDefaultBindingMode(BindingMode.OneWay);
+		oModel.setSizeLimit(MODEL_SIZE_LIMIT);
+		// TODO: currently called by sap.ui.rta.RuntimeAuthoring but should be by a ChangesState
+		oModel.setDirtyChanges = function (bDirtyChanges) {
+			oModel.setProperty("/dirtyChanges", bDirtyChanges);
+			oModel.updateDraftVersion();
+			oModel.updateBindings(true);
+		};
+
+		oModel.updateDraftVersion = function () {
+			var aVersions = oModel.getProperty("/versions");
+			var bVersioningEnabled = oModel.getProperty("/versioningEnabled");
+			var bDirtyChanges = oModel.getProperty("/dirtyChanges");
+			var bBackendDraft = oModel.getProperty("/backendDraft");
+			var bDraftAvailable = bVersioningEnabled && (bDirtyChanges || bBackendDraft);
+			oModel.setProperty("/draftAvailable", bDraftAvailable);
+
+			if (bDirtyChanges) {
+				oModel.setProperty("/displayedVersion", Version.Number.Draft);
+			}
+
+			// add draft
+			if (!_doesDraftExistInVersions(aVersions) && bDraftAvailable) {
+				aVersions.splice(0, 0, {version: Version.Number.Draft, type: Version.Type.Draft, filenames: [], isPublished: false});
+			}
+
+			// remove draft
+			if (_doesDraftExistInVersions(aVersions) && !bDraftAvailable) {
+				aVersions.shift();
+				oModel.setProperty("/displayedVersion", oModel.getProperty("/persistedVersion"));
+			}
+
+			var bActivateEnabled = oModel.getProperty("/displayedVersion") !== oModel.getProperty("/activeVersion");
+			oModel.setProperty("/activateEnabled", bActivateEnabled);
+		};
+
+		return oModel;
+	}
+
+	function _prepareVersionsModel(bVersioningEnabled, aVersions, oVersionsModel) {
+		var sPersistedBasisForDisplayedVersion;
+		var bPublishVersionEnabled = false;
+		var sActiveVersion = Version.Number.Original;
 		var bBackendDraft = _doesDraftExistInVersions(aVersions);
 		var aDraftFilenames = [];
 
-		var sActiveVersion = Version.Number.Original;
-		var bPublishVersionEnabled = false;
+		if (aVersions.length > 0) {
+			sPersistedBasisForDisplayedVersion = aVersions[0].version;
+		} else {
+			sPersistedBasisForDisplayedVersion = Version.Number.Original;
+		}
 
-		return Utils.getUShellService("URLParsing")
-			.then(function (oURLParsingService) {
-				var sPersistedBasisForDisplayedVersion = Utils.getParameter(
-					Version.UrlParameter,
-					oURLParsingService
-				);
-				if (!sPersistedBasisForDisplayedVersion) {
-					if (aVersions.length > 0) {
-						sPersistedBasisForDisplayedVersion = aVersions[0].version;
-					} else {
-						sPersistedBasisForDisplayedVersion = Version.Number.Original;
-					}
+		aVersions.forEach(function (oVersion) {
+			if (oVersion.version === Version.Number.Draft) {
+				oVersion.type = Version.Type.Draft;
+				oVersion.isPublished = false;
+				aDraftFilenames = oVersion.filenames;
+			} else {
+				if (sActiveVersion === Version.Number.Original) {
+					// no active version found yet; the first non-draft version is always the active version
+					oVersion.type = Version.Type.Active;
+					sActiveVersion = oVersion.version;
+				} else {
+					oVersion.type = Version.Type.Inactive;
+				}
+				//If the current selected version is not yet published, enable the publish button
+				//Original versions are not part of back end response, so publish button is not enabled by default value
+				if ((oVersion.version === sPersistedBasisForDisplayedVersion) && (oVersion.isPublished === false)) {
+					bPublishVersionEnabled = true;
 				}
+			}
+		});
 
-				aVersions.forEach(function (oVersion) {
-					if (oVersion.version === Version.Number.Draft) {
-						oVersion.type = Version.Type.Draft;
-						oVersion.isPublished = false;
-						aDraftFilenames = oVersion.filenames;
-					} else {
-						if (sActiveVersion === Version.Number.Original) {
-							// no active version found yet; the first non-draft version is always the active version
-							oVersion.type = Version.Type.Active;
-							sActiveVersion = oVersion.version;
-						} else {
-							oVersion.type = Version.Type.Inactive;
-						}
-						//If the current selected version is not yet published, enable the publish button
-						//Original versions are not part of back end response, so publish button is not enabled by default value
-						if ((oVersion.version === sPersistedBasisForDisplayedVersion) && (oVersion.isPublished === false)) {
-							bPublishVersionEnabled = true;
-						}
-					}
-				});
-
-				// TODO: need to update wording or add description
-				var oModel = new JSONModel({
-					publishVersionEnabled: bPublishVersionEnabled,
-					versioningEnabled: bVersioningEnabled,
-					versions: aVersions,
-					activeVersion: sActiveVersion,
-					backendDraft: bBackendDraft,
-					dirtyChanges: false,
-					draftAvailable: bBackendDraft,
-					activateEnabled: bBackendDraft,
-					persistedVersion: sPersistedBasisForDisplayedVersion,
-					displayedVersion: sPersistedBasisForDisplayedVersion,
-					draftFilenames: aDraftFilenames
-				});
-
-				oModel.setDefaultBindingMode(BindingMode.OneWay);
-				oModel.setSizeLimit(MODEL_SIZE_LIMIT);
-
-				// TODO: currently called by sap.ui.rta.RuntimeAuthoring but should be by a ChangesState
-				oModel.setDirtyChanges = function (bDirtyChanges) {
-					oModel.setProperty("/dirtyChanges", bDirtyChanges);
-					oModel.updateDraftVersion();
-					oModel.updateBindings(true);
-				};
-
-				oModel.updateDraftVersion = function () {
-					var aVersions = oModel.getProperty("/versions");
-					var bVersioningEnabled = oModel.getProperty("/versioningEnabled");
-					var bDirtyChanges = oModel.getProperty("/dirtyChanges");
-					var bBackendDraft = oModel.getProperty("/backendDraft");
-					var bDraftAvailable = bVersioningEnabled && (bDirtyChanges || bBackendDraft);
-					oModel.setProperty("/draftAvailable", bDraftAvailable);
-
-					if (bDirtyChanges) {
-						oModel.setProperty("/displayedVersion", Version.Number.Draft);
-					}
-
-					// add draft
-					if (!_doesDraftExistInVersions(aVersions) && bDraftAvailable) {
-						aVersions.splice(0, 0, {version: Version.Number.Draft, type: Version.Type.Draft, filenames: [], isPublished: false});
-					}
-
-					// remove draft
-					if (_doesDraftExistInVersions(aVersions) && !bDraftAvailable) {
-						aVersions.shift();
-						oModel.setProperty("/displayedVersion", oModel.getProperty("/persistedVersion"));
-					}
-
-					var bActivateEnabled = oModel.getProperty("/displayedVersion") !== oModel.getProperty("/activeVersion");
-					oModel.setProperty("/activateEnabled", bActivateEnabled);
-				};
-
-				return oModel;
+		if (oVersionsModel) {
+			oVersionsModel.setProperty("/publishVersionEnabled", bPublishVersionEnabled);
+			oVersionsModel.setProperty("/versioningEnabled", bVersioningEnabled);
+			oVersionsModel.setProperty("/versions", aVersions);
+			oVersionsModel.setProperty("/backendDraft", bBackendDraft);
+			oVersionsModel.setProperty("/dirtyChanges", false);
+			oVersionsModel.setProperty("/draftAvailable", bBackendDraft);
+			oVersionsModel.setProperty("/activateEnabled", bBackendDraft);
+			oVersionsModel.setProperty("/activeVersion", sActiveVersion);
+			oVersionsModel.setProperty("/persistedVersion", sPersistedBasisForDisplayedVersion);
+			oVersionsModel.setProperty("/displayedVersion", sPersistedBasisForDisplayedVersion);
+			oVersionsModel.setProperty("/draftFilenames", aDraftFilenames);
+			oVersionsModel.updateBindings(true);
+		} else {
+			oVersionsModel = new JSONModel({
+				publishVersionEnabled: bPublishVersionEnabled,
+				versioningEnabled: bVersioningEnabled,
+				versions: aVersions,
+				backendDraft: bBackendDraft,
+				dirtyChanges: false,
+				draftAvailable: bBackendDraft,
+				activateEnabled: bBackendDraft,
+				activeVersion: sActiveVersion,
+				persistedVersion: sPersistedBasisForDisplayedVersion,
+				displayedVersion: sPersistedBasisForDisplayedVersion,
+				draftFilenames: aDraftFilenames
 			});
-	}
+		}
 
+		return oVersionsModel;
+	}
 	// TODO: the handling should move to the FlexState as soon as it is ready
 	function _removeDirtyChanges(mPropertyBag, oDirtyChangeInfo) {
 		// remove all dirty changes
@@ -170,12 +177,22 @@ sap.ui.define([
 		});
 	}
 
+	function _updateVersionModelWhenDiscardOrActivate(oModel, iNewVersion) {
+		oModel.setProperty("/backendDraft", false);
+		oModel.setProperty("/dirtyChanges", false);
+		oModel.setProperty("/draftAvailable", false);
+		oModel.setProperty("/activateEnabled", false);
+		oModel.setProperty("/displayedVersion", iNewVersion);
+		oModel.setProperty("/persistedVersion", iNewVersion);
+		oModel.updateBindings(true);
+	}
+
 	/**
 	 *
 	 *
 	 * @namespace sap.ui.fl.write._internal.Versions
 	 * @since 1.74
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -248,6 +265,25 @@ sap.ui.define([
 		_mInstances = {};
 	};
 
+	/**
+	 * Update version model with backend information.
+	 *
+	 * @param {object} mPropertyBag - Property Bag
+	 * @param {string} mPropertyBag.reference - ID of the application for which the versions are requested
+	 * @param {string} mPropertyBag.layer - Layer for which the versions should be retrieved
+	 * @returns {Promise<sap.ui.fl.Version>} Promise resolving with the updated version model for the application from the backend
+	 */
+	Versions.updateModelFromBackend = function(mPropertyBag) {
+		if (Versions.hasVersionsModel(mPropertyBag)) {
+			mPropertyBag.limit = BACKEND_REQUEST_LIMIT;
+			return Storage.versions.load(mPropertyBag)
+			.then(function (aVersions) {
+				var oVersionsModel = Versions.getVersionsModel(mPropertyBag);
+				return _prepareVersionsModel(oVersionsModel.getProperty("/versioningEnabled"), aVersions, oVersionsModel);
+			});
+		}
+	};
+
 	/**
 	 * Updates dirty changes and the backendDraft property of the model after a saveAll was called.
 	 *
@@ -258,7 +294,6 @@ sap.ui.define([
 	 * @param {array} [mPropertyBag.draftFilenames] - Array with filesnames which was saved as draft
 	 */
 	Versions.onAllChangesSaved = function (mPropertyBag) {
-		mPropertyBag.reference = Utils.normalizeReference(mPropertyBag.reference);
 		var oModel = Versions.getVersionsModel(mPropertyBag);
 		var bVersioningEnabled = oModel.getProperty("/versioningEnabled");
 		var bDirtyChanges = oModel.getProperty("/dirtyChanges");
@@ -318,16 +353,10 @@ sap.ui.define([
 				aVersions.shift();
 			}
 			aVersions.splice(0, 0, oVersion);
-			oModel.setProperty("/publishVersionEnabled", true);
-			oModel.setProperty("/backendDraft", false);
-			oModel.setProperty("/dirtyChanges", false);
-			oModel.setProperty("/draftAvailable", false);
-			oModel.setProperty("/publishVersionEnabled", true);
-			oModel.setProperty("/activateEnabled", false);
 			oModel.setProperty("/activeVersion", oVersion.version);
-			oModel.setProperty("/displayedVersion", oVersion.version);
-			oModel.setProperty("/persistedVersion", oVersion.version);
-			oModel.updateBindings(true);
+			oModel.setProperty("/publishVersionEnabled", true);
+			oModel.setProperty("/draftFilenames", []);
+			_updateVersionModelWhenDiscardOrActivate(oModel, oVersion.version);
 		});
 	};
 
@@ -343,20 +372,14 @@ sap.ui.define([
 	 */
 	Versions.discardDraft = function(mPropertyBag) {
 		var oModel = Versions.getVersionsModel(mPropertyBag);
-		var aVersions = oModel.getProperty("/versions");
 		var oDirtyChangesInfo = _getDirtyChangesInfo(mPropertyBag);
 		var bBackendDraftExists = oModel.getProperty("/backendDraft");
 		var oDiscardPromise = bBackendDraftExists ? Storage.versions.discardDraft(mPropertyBag) : Promise.resolve();
 
 		return oDiscardPromise.then(function () {
+			var aVersions = oModel.getProperty("/versions");
 			aVersions.shift();
-			oModel.setProperty("/backendDraft", false);
-			oModel.setProperty("/dirtyChanges", false);
-			oModel.setProperty("/draftAvailable", false);
-			oModel.setProperty("/activateEnabled", false);
-			oModel.setProperty("/displayedVersion", oModel.getProperty("/activeVersion"));
-			oModel.setProperty("/persistedVersion", oModel.getProperty("/activeVersion"));
-			oModel.updateBindings(true);
+			_updateVersionModelWhenDiscardOrActivate(oModel, oModel.getProperty("/activeVersion"));
 			// in case of a existing draft known by the backend;
 			// we remove dirty changes only after successful DELETE request
 			var bDirtyChangesRemoved = _removeDirtyChanges(mPropertyBag, oDirtyChangesInfo);
@@ -380,7 +403,7 @@ sap.ui.define([
 	 */
 	Versions.publish = function(mPropertyBag) {
 		var oModel = Versions.getVersionsModel({
-			reference: Utils.normalizeReference(mPropertyBag.reference),
+			reference: mPropertyBag.reference,
 			layer: mPropertyBag.layer
 		});
 		return Storage.versions.publish(mPropertyBag)

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.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

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

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariantFactory
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @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.114.0
+	 * @version 1.115.1
 	 * @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.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/write/_internal/condenser/Condenser.js

@@ -51,7 +51,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.condenser.Condenser
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 */
 	var Condenser = {};
 
@@ -498,7 +498,18 @@ sap.ui.define([
 		});
 	}
 
-	function handleChangeUpdate(aCondenserInfos, aReducedChanges) {
+	/**
+	 * Adding a change of the same classification to the map will only add it as updateChange to the condenser info,
+	 * which means that the condenser info holds the first (updateChange) and the last (change) change of the same classification.
+	 * If there is an updateChange attached to the condenser info object and that change is already persisted,
+	 * that change will be used over the newest change.
+	 *
+	 * @param {object[]} aCondenserInfos - Condenser info objects
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} aReducedChanges - Array of reduced changes
+	 * @param {object[]} aReducedIndexRelatedChangesPerContainer - Array with index related reduced changes per container
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} Updated reduced changes
+	 */
+	function handleChangeUpdate(aCondenserInfos, aReducedChanges, aReducedIndexRelatedChangesPerContainer) {
 		aCondenserInfos.forEach(function(oCondenserInfo) {
 			var oUpdateChange = oCondenserInfo.updateChange;
 			if (
@@ -508,17 +519,26 @@ sap.ui.define([
 				&& !_isEqual(oUpdateChange.getContent(), oCondenserInfo.change.getContent())
 				&& oUpdateChange.getState() !== States.LifecycleState.NEW
 			) {
-				var oCondensedChange = oCondenserInfo.change;
-				if (oUpdateChange.getId() !== oCondensedChange.getId()) {
-					var oNewContent = oCondensedChange.getContent();
+				var oLastChange = oCondenserInfo.change;
+				if (oUpdateChange.getId() !== oLastChange.getId()) {
+					var oNewContent = oLastChange.getContent();
 					oUpdateChange.setContent(oNewContent);
-					oCondensedChange.condenserState = "delete";
+					oUpdateChange.setRevertData(oLastChange.getRevertData());
+					oLastChange.condenserState = "delete";
 					aReducedChanges = aReducedChanges.map(function(oChange) {
-						if (oChange.getId() === oCondensedChange.getId()) {
+						if (oChange.getId() === oLastChange.getId()) {
 							return oUpdateChange;
 						}
 						return oChange;
 					});
+					aReducedIndexRelatedChangesPerContainer.forEach(function(aReducedIndexRelatedChanges, iIndex) {
+						aReducedIndexRelatedChangesPerContainer[iIndex] = aReducedIndexRelatedChanges.map(function(oChange) {
+							if (oChange.getId() === oLastChange.getId()) {
+								return oUpdateChange;
+							}
+							return oChange;
+						});
+					});
 				} else {
 					oUpdateChange.setState(States.LifecycleState.DIRTY);
 				}
@@ -613,9 +633,16 @@ sap.ui.define([
 				Measurement.end("Condenser_sort");
 
 				if (bSuccess) {
+					// during the simulation more changes can become obsolete
+					aReducedChanges = aReducedChanges.filter(function(oChange) {
+						return oChange.condenserState !== "delete";
+					});
+					aCondenserInfos = aCondenserInfos.filter(function(oCondenserInfo) {
+						return oCondenserInfo.change.condenserState !== "delete";
+					});
 					// until now aReducedChanges still has the newer changes.
 					// after replacing them with the older change they have to be sorted again
-					aReducedChanges = handleChangeUpdate(aCondenserInfos, aReducedChanges);
+					aReducedChanges = handleChangeUpdate(aCondenserInfos, aReducedChanges, aReducedIndexRelatedChangesPerContainer);
 					sortByInitialOrder(aChanges, aReducedChanges);
 					// sort the different containers independently
 					aReducedIndexRelatedChangesPerContainer.forEach(function(aReducedIndexRelatedChanges) {

package/src/sap/ui/fl/write/_internal/condenser/UIReconstruction.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.condenser.UIReconstruction
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 */
 	var UIReconstruction = {};
 
@@ -205,6 +205,11 @@ sap.ui.define([
 
 		var aSortedUIElementIds = mUISimulatedStates[sContainerKey][sAggregationName];
 		if (isEqual(aTargetUIElementIds, aSortedUIElementIds)) {
+			aCondenserInfos.forEach(function(oCondenserInfo) {
+				if (oCondenserInfo.sameIndex) {
+					oCondenserInfo.change.condenserState = "delete";
+				}
+			});
 			return true;
 		}
 		return false;
@@ -332,12 +337,14 @@ sap.ui.define([
 			var aInitialElementIds = mUIReconstructions[sContainerKey][sAggregationName][Utils.INITIAL_UI];
 			var bCorrectSortingFound = true;
 
-			// Verify whether the algorithm should be ready before ;)
 			if (
 				containsNoPlaceholder(aTargetElementIds)
 				|| containsOnlyCreateChanges(aCondenserInfos)
 			) {
 				sortAscendingByTargetIndex(aCondenserInfos);
+				// this should always be the correct sorting, but the function still needs to be called to
+				// remove obsolete changes during the simulation of Move
+				bCorrectSortingFound = isEqualReconstructedUI(sContainerKey, sAggregationName, aInitialElementIds, aTargetElementIds, aCondenserInfos);
 			} else if (!isEqualReconstructedUI(sContainerKey, sAggregationName, aInitialElementIds, aTargetElementIds, aCondenserInfos)) {
 				bCorrectSortingFound = false;
 				var iTimes = aCondenserInfos.length;
@@ -359,7 +366,15 @@ sap.ui.define([
 				throw Error("no correct sorting found for the container: " + sContainerKey);
 			}
 
+			aCondenserInfos = aCondenserInfos.filter(function(oCondenserInfo) {
+				return oCondenserInfo.change.condenserState !== "delete";
+			});
+
 			aSortedIndexRelatedChangesPerContainer.push(aCondenserInfos.map(function(oCondenserInfo) {
+				if (oCondenserInfo.revertIndex > -1) {
+					oCondenserInfo.setIndexInRevertData(oCondenserInfo.change, oCondenserInfo.revertIndex);
+					oCondenserInfo.sourceIndex = oCondenserInfo.revertIndex;
+				}
 				return oCondenserInfo.change;
 			}));
 		});

package/src/sap/ui/fl/write/_internal/condenser/classifications/Destroy.js

@@ -49,14 +49,17 @@ sap.ui.define([
 		 * @param {string[]} aInitialUIElementIds - Array with the Ids of the initial elements in the container
 		 */
 		simulate: function(aContainerElements, oCondenserInfo, aInitialUIElementIds) {
-			var iIndex = aContainerElements.indexOf(oCondenserInfo.affectedControl);
-			if (iIndex === -1) {
+			var iCurrentSourceIndex = aContainerElements.indexOf(oCondenserInfo.affectedControl);
+			if (iCurrentSourceIndex === -1) {
 				var sUnknown = CondenserUtils.PLACEHOLDER + aInitialUIElementIds.indexOf(oCondenserInfo.affectedControl);
-				iIndex = aContainerElements.indexOf(sUnknown);
+				iCurrentSourceIndex = aContainerElements.indexOf(sUnknown);
 			}
 
-			if (iIndex > -1) {
-				aContainerElements.splice(iIndex, 1);
+			// to enable a revert in the same session the previous index has to be saved during the simulation
+			oCondenserInfo.revertIndex = iCurrentSourceIndex;
+
+			if (iCurrentSourceIndex > -1) {
+				aContainerElements.splice(iCurrentSourceIndex, 1);
 			}
 		}
 	};

package/src/sap/ui/fl/write/_internal/condenser/classifications/Move.js

@@ -83,6 +83,12 @@ sap.ui.define([
 			} else {
 				aContainerElements.splice(iTargetIndex, 0, aContainerElements.splice(iCurrentSourceIndex, 1)[0]);
 			}
+
+			// changes with the same current source and target can be deleted, if the simulation is successful
+			oCondenserInfo.sameIndex = iCurrentSourceIndex === iTargetIndex;
+
+			// to enable a revert in the same session the previous index has to be saved during the simulation
+			oCondenserInfo.revertIndex = iCurrentSourceIndex;
 		}
 	};
 });

package/src/sap/ui/fl/write/_internal/connectors/BackendConnector.js

@@ -74,7 +74,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.BackendConnector
 	 * @since 1.72
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.connectors
 	 */

package/src/sap/ui/fl/write/_internal/connectors/KeyUserConnector.js

@@ -12,7 +12,10 @@ sap.ui.define([
 	"sap/ui/fl/initial/_internal/connectors/Utils",
 	"sap/ui/fl/write/_internal/connectors/Utils",
 	"sap/base/util/restricted/_pick",
-	"sap/ui/fl/write/_internal/FlexInfoSession"
+	"sap/ui/fl/write/_internal/FlexInfoSession",
+	"sap/ui/core/BusyIndicator",
+	"sap/base/Log",
+	"sap/m/MessageBox"
 ], function (
 	merge,
 	Layer,
@@ -21,7 +24,10 @@ sap.ui.define([
 	InitialUtils,
 	WriteUtils,
 	_pick,
-	FlexInfoSession
+	FlexInfoSession,
+	BusyIndicator,
+	Log,
+	MessageBox
 ) {
 	"use strict";
 
@@ -32,7 +38,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.KeyUserConnector
 	 * @since 1.70
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */
@@ -48,7 +54,8 @@ sap.ui.define([
 			VERSIONS: {
 				GET: PREFIX + InitialConnector.API_VERSION + "/versions/",
 				ACTIVATE: PREFIX + InitialConnector.API_VERSION + "/versions/activate/",
-				DISCARD: PREFIX + InitialConnector.API_VERSION + "/versions/draft/"
+				DISCARD: PREFIX + InitialConnector.API_VERSION + "/versions/draft/",
+				PUBLISH: PREFIX + InitialConnector.API_VERSION + "/versions/publish/"
 			},
 			TRANSLATION: {
 				UPLOAD: PREFIX + InitialConnector.API_VERSION + "/translation/texts",
@@ -151,6 +158,29 @@ sap.ui.define([
 			_enhancePropertyBagWithTokenInfo(mPropertyBag);
 			var sVersionsUrl = InitialUtils.getUrl(KeyUserConnector.ROUTES.VERSIONS.DISCARD, mPropertyBag);
 			return WriteUtils.sendRequest(sVersionsUrl, "DELETE", mPropertyBag);
+		},
+		publish: function (mPropertyBag) {
+			var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.fl");
+			var fnHandleAllErrors = function (oError) {
+				BusyIndicator.hide();
+				var sMessage = oResourceBundle.getText("MSG_CF_PUBLISH_ERROR", oError ? [oError.message || oError] : undefined);
+				var sTitle = oResourceBundle.getText("HEADER_TRANSPORT_ERROR");
+				Log.error("publish version error" + oError);
+				MessageBox.show(sMessage, {
+					icon: MessageBox.Icon.ERROR,
+					title: sTitle,
+					styleClass: mPropertyBag.styleClass
+				});
+				return "Error";
+			};
+
+			_enhancePropertyBagWithTokenInfo(mPropertyBag);
+			var mParameters = {version: mPropertyBag.version};
+			var sVersionsUrl = InitialUtils.getUrl(KeyUserConnector.ROUTES.VERSIONS.PUBLISH, mPropertyBag, mParameters);
+			return WriteUtils.sendRequest(sVersionsUrl, "POST", mPropertyBag).then(function () {
+				BusyIndicator.hide();
+				return oResourceBundle.getText("MSG_CF_PUBLISH_SUCCESS");
+			})['catch'](fnHandleAllErrors);
 		}
 	};
 

package/src/sap/ui/fl/write/_internal/connectors/LrepConnector.js

@@ -166,7 +166,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.LrepConnector
 	 * @since 1.67
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/NeoLrepConnector.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.NeoLrepConnector
 	 * @since 1.81
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/ObjectPathConnector.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.ObjectPathConnector
 	 * @since 1.73
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */