@openui5/sap.ui.rta 1.136.4 → 1.139.0

package/src/sap/ui/rta/command/ExtendControllerCommand.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @constructor
 	 * @private
 	 * @since 1.135

package/src/sap/ui/rta/command/FlexCommand.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.command.BaseCommand
 	 *
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private
@@ -121,8 +121,7 @@ sap.ui.define([
 				this.setSelector(oSelector);
 			}
 
-			const oChange = await this._createChange(mFlexSettings, sVariantManagementReference, sCommand);
-			this._oPreparedChange = oChange;
+			this._oPreparedChange = await this._createChange(mFlexSettings, sVariantManagementReference, sCommand);
 			return true;
 		} catch (oError) {
 			Log.error(oError.message || oError.name);

package/src/sap/ui/rta/command/LREPSerializer.js

@@ -5,16 +5,12 @@
  */
 sap.ui.define([
 	"sap/ui/base/ManagedObject",
-	"sap/ui/rta/command/FlexCommand",
-	"sap/ui/rta/command/ManifestCommand",
 	"sap/ui/fl/Utils",
 	"sap/ui/dt/ElementUtil",
 	"sap/base/Log",
 	"sap/ui/fl/write/api/PersistenceWriteAPI"
 ], function(
 	ManagedObject,
-	FlexCommand,
-	ManifestCommand,
 	FlUtils,
 	ElementUtil,
 	Log,
@@ -27,7 +23,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @constructor
 	 * @private
 	 * @since 1.42
@@ -61,78 +57,7 @@ sap.ui.define([
 	LREPSerializer.prototype._lastPromise = Promise.resolve();
 
 	LREPSerializer.prototype.setCommandStack = function(oCommandStack) {
-		if (this.getCommandStack()) {
-			this.getCommandStack().removeCommandExecutionHandler(this._fnHandleCommandExecuted);
-		}
 		this.setProperty("commandStack", oCommandStack);
-		oCommandStack.addCommandExecutionHandler(this._fnHandleCommandExecuted);
-	};
-	LREPSerializer.prototype.init = function() {
-		this._fnHandleCommandExecuted = this.handleCommandExecuted.bind(this);
-	};
-	LREPSerializer.prototype.exit = function() {
-		this.getCommandStack().removeCommandExecutionHandler(this._fnHandleCommandExecuted);
-	};
-	LREPSerializer.prototype._isPersistedChange = function(oPreparedChange) {
-		return !!this.getCommandStack()._aPersistedChanges
-			&& this.getCommandStack()._aPersistedChanges.indexOf(oPreparedChange.getId()) !== -1;
-	};
-
-	LREPSerializer.prototype.handleCommandExecuted = function(oEvent) {
-		return (function(oEvent) {
-			const oParams = oEvent;
-			this._lastPromise = this._lastPromise.catch(function() {
-				// _lastPromise chain must not be interrupted
-			}).then(function() {
-				const aCommands = this.getCommandStack().getSubCommands(oParams.command);
-				let oAppComponent;
-				const aFlexObjects = [];
-				if (oParams.undo) {
-					aCommands.forEach(function(oCommand) {
-						// for revertable changes which don't belong to LREP (variantSwitch) or runtime only changes
-						if (!(oCommand instanceof FlexCommand || oCommand instanceof ManifestCommand)
-							|| oCommand.getRuntimeOnly()) {
-							return;
-						}
-						const oChange = oCommand.getPreparedChange();
-						oAppComponent = oCommand.getAppComponent();
-						if (oAppComponent) {
-							aFlexObjects.push(oChange);
-						}
-					});
-					if (oAppComponent) {
-						return PersistenceWriteAPI.remove({
-							flexObjects: aFlexObjects,
-							selector: oAppComponent
-						});
-					}
-					return Promise.resolve();
-				}
-				const aManifestCreateAndAdd = [];
-				aCommands.forEach(function(oCommand) {
-					// Runtime only changes should not be added to the persistence
-					if (oCommand.getRuntimeOnly()) {
-						return;
-					}
-					if (oCommand instanceof FlexCommand) {
-						oAppComponent = oCommand.getAppComponent();
-						if (oAppComponent) {
-							const oPreparedChange = oCommand.getPreparedChange();
-							if (!this._isPersistedChange(oPreparedChange)) {
-								aFlexObjects.push(oCommand.getPreparedChange());
-							}
-						}
-					} else if (oCommand instanceof ManifestCommand) {
-						aManifestCreateAndAdd.push(oCommand.createAndStoreChange());
-					}
-				}.bind(this));
-				if (oAppComponent) {
-					PersistenceWriteAPI.add({flexObjects: aFlexObjects, selector: oAppComponent});
-				}
-				return Promise.all(aManifestCreateAndAdd);
-			}.bind(this));
-			return this._lastPromise;
-		}.bind(this))(oEvent);
 	};
 
 	/**
@@ -230,19 +155,11 @@ sap.ui.define([
 	LREPSerializer.prototype.clearCommandStack = function(bRemoveChanges) {
 		const oCommandStack = this.getCommandStack();
 
-		// Detach the event 'commandExecuted' here to stop the communication of LREPSerializer with Flex
-		if (!bRemoveChanges) {
-			oCommandStack.detachCommandExecuted(this.handleCommandExecuted.bind(this));
-		}
 		return this._triggerUndoChanges(bRemoveChanges)
 		.then(function() {
 			oCommandStack.removeAllCommands();
-			// Attach the event 'commandExecuted' here to start the communication of LREPSerializer with Flex
-			if (!bRemoveChanges) {
-				oCommandStack.attachCommandExecuted(this.handleCommandExecuted.bind(this));
-			}
 			return true;
-		}.bind(this));
+		});
 	};
 
 	return LREPSerializer;

package/src/sap/ui/rta/command/LocalReset.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @constructor
 	 * @private
 	 * @since 1.90

package/src/sap/ui/rta/command/ManifestCommand.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.command.BaseCommand
 	 *
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/command/Move.js

@@ -17,7 +17,7 @@ function(
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @constructor
 	 * @private
 	 * @since 1.34

package/src/sap/ui/rta/command/Property.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @constructor
 	 * @private
 	 * @since 1.34

package/src/sap/ui/rta/command/Remove.js

@@ -12,7 +12,7 @@ sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @constructor
 	 * @private
 	 * @since 1.42

package/src/sap/ui/rta/command/Rename.js

@@ -12,7 +12,7 @@ sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @constructor
 	 * @private
 	 * @since 1.34

package/src/sap/ui/rta/command/Resize.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @constructor
 	 * @private
 	 * @since 1.101

package/src/sap/ui/rta/command/Reveal.js

@@ -12,7 +12,7 @@ sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @constructor
 	 * @private
 	 * @since 1.44

package/src/sap/ui/rta/command/Settings.js

@@ -12,7 +12,7 @@ sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @constructor
 	 * @private
 	 * @since 1.44

package/src/sap/ui/rta/command/Split.js

@@ -14,7 +14,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @constructor
 	 * @private
 	 * @since 1.46

package/src/sap/ui/rta/command/Stack.js

@@ -5,22 +5,26 @@
  */
 sap.ui.define([
 	"sap/ui/base/ManagedObject",
+	"sap/ui/core/util/reflection/JsControlTreeModifier",
+	"sap/ui/core/Lib",
 	"sap/ui/fl/write/api/PersistenceWriteAPI",
 	"sap/ui/fl/Utils",
-	"sap/ui/rta/command/Settings",
 	"sap/ui/rta/command/CompositeCommand",
-	"sap/ui/core/util/reflection/JsControlTreeModifier",
-	"sap/ui/rta/util/showMessageBox",
-	"sap/ui/core/Lib"
+	"sap/ui/rta/command/FlexCommand",
+	"sap/ui/rta/command/ManifestCommand",
+	"sap/ui/rta/command/Settings",
+	"sap/ui/rta/util/showMessageBox"
 ], function(
 	ManagedObject,
+	JsControlTreeModifier,
+	Lib,
 	PersistenceWriteAPI,
 	FlUtils,
-	Settings,
 	CompositeCommand,
-	JsControlTreeModifier,
-	showMessageBox,
-	Lib
+	FlexCommand,
+	ManifestCommand,
+	Settings,
+	showMessageBox
 ) {
 	"use strict";
 
@@ -88,7 +92,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @constructor
 	 * @private
 	 * @since 1.34
@@ -112,7 +116,16 @@ sap.ui.define([
 				lastCommandExecuted: {
 					type: "object",
 					defaultValue: Promise.resolve()
+				},
+
+				/**
+				 * Promise is resolved when last command of the stack is unexecuted
+				 */
+				lastCommandUnExecuted: {
+					type: "object",
+					defaultValue: Promise.resolve()
 				}
+
 			},
 			aggregations: {
 				commands: {
@@ -122,20 +135,9 @@ sap.ui.define([
 			},
 			events: {
 				/**
-				 * Fired if the Stack changes because of a change execution or if all commands get removed.
-				 * In case of change execution the modified event will be fired after the commandExecuted event.
+				 * Fired if the Stack changes because of a change execution or if commands get removed.
 				 */
-				modified: {},
-
-				/**
-				 * Fired after a successful execution of a command (also includes undo).
-				 */
-				commandExecuted: {
-					parameters: {
-						command: {type: "object"},
-						undo: {type: "boolean"}
-					}
-				}
+				modified: {}
 			}
 		}
 	});
@@ -173,33 +175,11 @@ sap.ui.define([
 		return Promise.resolve(oStack);
 	};
 
-	/**
-	* @param {function} fnHandler Handler are called when commands are executed or undone. They get parameter
-	* like the commandExecuted event and the stack will wait for any processing
-	* until they are done.
-	*/
-	Stack.prototype.addCommandExecutionHandler = function(fnHandler) {
-		this._aCommandExecutionHandler.push(fnHandler);
-	};
-
-	Stack.prototype.removeCommandExecutionHandler = function(fnHandler) {
-		var i = this._aCommandExecutionHandler.indexOf(fnHandler);
-		if (i > -1) {
-			this._aCommandExecutionHandler.splice(i, 1);
-		}
-	};
-
 	Stack.prototype.init = function() {
 		this._aCommandExecutionHandler = [];
 		this._toBeExecuted = -1;
 	};
 
-	Stack.prototype._waitForCommandExecutionHandler = function(mParam) {
-		return Promise.all(this._aCommandExecutionHandler.map(function(fnHandler) {
-			return fnHandler(mParam);
-		}));
-	};
-
 	Stack.prototype._getCommandToBeExecuted = function() {
 		return this.getCommands()[this._toBeExecuted];
 	};
@@ -256,36 +236,88 @@ sap.ui.define([
 		return this.getCommands().length === 0;
 	};
 
+	async function addCommandChangesToPersistence(oCommand) {
+		let oAppComponent;
+		const aSubCommands = this.getSubCommands(oCommand);
+		const aManifestPromises = [];
+		let aChanges = aSubCommands.map((oSubCommand) => {
+			// Filter out runtime only changes
+			if (oSubCommand.getRuntimeOnly()) {
+				return undefined;
+			}
+			// Manifest changes are stored separately
+			if (oSubCommand instanceof ManifestCommand) {
+				aManifestPromises.push(oSubCommand.createAndStoreChange());
+				return undefined;
+			}
+			if (oSubCommand instanceof FlexCommand) {
+				oAppComponent = oSubCommand.getAppComponent();
+				if (oAppComponent) {
+					return oSubCommand.getPreparedChange();
+				}
+			}
+			return undefined;
+		}).filter(Boolean);
+		await Promise.all(aManifestPromises);
+		// Filter out persisted changes
+		if (this._aPersistedChanges) {
+			aChanges = aChanges.filter((oChange) => this._aPersistedChanges.indexOf(oChange.getId()) === -1);
+		}
+		if (oAppComponent) {
+			PersistenceWriteAPI.add({
+				flexObjects: aChanges,
+				selector: oAppComponent
+			});
+		}
+	}
+
+	function removeCommandChangesFromPersistence(oCommand) {
+		let oAppComponent;
+		const aFlexObjects = [];
+		const aSubCommands = this.getSubCommands(oCommand);
+		aSubCommands.forEach((oSubCommand) => {
+			// for revertable changes which don't belong to LREP (variantSwitch) or runtime only changes
+			if (!(oSubCommand instanceof FlexCommand || oSubCommand instanceof ManifestCommand)
+				|| oSubCommand.getRuntimeOnly()) {
+				return;
+			}
+			const oChange = oSubCommand.getPreparedChange();
+			oAppComponent = oSubCommand.getAppComponent();
+			if (oAppComponent) {
+				aFlexObjects.push(oChange);
+			}
+		});
+		if (oAppComponent) {
+			PersistenceWriteAPI.remove({
+				flexObjects: aFlexObjects,
+				selector: oAppComponent
+			});
+		}
+	}
+
 	Stack.prototype.execute = function() {
 		this.setLastCommandExecuted(
-			this.getLastCommandExecuted().catch(function() {
+			this.getLastCommandExecuted().catch(() => {
 			// continue also if previous command failed
-			}).then(function() {
+			}).then(async () => {
 				var oCommand = this._getCommandToBeExecuted();
 				if (oCommand) {
-					var mParam = {
-						command: oCommand,
-						undo: false
-					};
-					return oCommand.execute()
-
-					.then(this._waitForCommandExecutionHandler.bind(this, mParam))
-
-					.then(function() {
+					try {
+						await addCommandChangesToPersistence.call(this, oCommand);
+						await oCommand.execute();
 						this._toBeExecuted--;
 						const aDiscardedChanges = oCommand.getDiscardedChanges?.();
 						if (aDiscardedChanges) {
 							handleDiscardedChanges.call(this, aDiscardedChanges, false);
 						}
-						this.fireCommandExecuted(mParam);
 						this.fireModified();
-					}.bind(this))
-
-					.catch(function(oError) {
-						oError ||= new Error("Executing of the change failed.");
+					} catch (oCaughtError) {
+						const oError = oCaughtError || new Error("Executing of the change failed.");
 						oError.index = this._toBeExecuted;
 						oError.command = this.removeCommand(this._toBeExecuted); // remove failing command
 						this._toBeExecuted--;
+						// Remove Flex Changes for failed command from persistence
+						removeCommandChangesFromPersistence.call(this, oError.command);
 						var oRtaResourceBundle = Lib.getResourceBundleFor("sap.ui.rta");
 						// AddXMLAtExtensionPoint errors explain to the user what they did wrong, so they shouldn't open an incident
 						const sErrorMessage = oCommand.isA("sap.ui.rta.command.AddXMLAtExtensionPoint") ?
@@ -295,41 +327,37 @@ sap.ui.define([
 							{title: oRtaResourceBundle.getText("HEADER_ERROR")},
 							"error"
 						);
-						return Promise.reject(oError);
-					}.bind(this));
+						throw oError;
+					}
 				}
 				return undefined;
-			}.bind(this))
+			})
 		);
 		return this.getLastCommandExecuted();
 	};
 
 	Stack.prototype._unExecute = function() {
-		if (this.canUndo()) {
-			this._bUndoneCommands = true;
-			this._toBeExecuted++;
-			var oCommand = this._getCommandToBeExecuted();
-			const aDiscardedChanges = oCommand.getDiscardedChanges?.();
-			if (oCommand) {
-				var mParam = {
-					command: oCommand,
-					undo: true
-				};
-				return oCommand.undo()
-
-				.then(this._waitForCommandExecutionHandler.bind(this, mParam))
-
-				.then(function() {
-					if (aDiscardedChanges) {
-						handleDiscardedChanges.call(this, aDiscardedChanges, true);
+		this.setLastCommandUnExecuted(
+			this.getLastCommandUnExecuted().catch(() => {
+			// continue also if previous undo failed
+			}).then(async () => {
+				if (this.canUndo()) {
+					this._bUndoneCommands = true;
+					this._toBeExecuted++;
+					var oCommand = this._getCommandToBeExecuted();
+					const aDiscardedChanges = oCommand.getDiscardedChanges?.();
+					if (oCommand) {
+						await oCommand.undo();
+						removeCommandChangesFromPersistence.call(this, oCommand);
+						if (aDiscardedChanges) {
+							handleDiscardedChanges.call(this, aDiscardedChanges, true);
+						}
+						this.fireModified();
 					}
-					this.fireCommandExecuted(mParam);
-					this.fireModified();
-				}.bind(this));
-			}
-			return Promise.resolve();
-		}
-		return Promise.resolve();
+				}
+			})
+		);
+		return this.getLastCommandUnExecuted();
 	};
 
 	Stack.prototype.canUndo = function() {

package/src/sap/ui/rta/command/compVariant/CompVariantContent.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @constructor
 	 * @private
 	 * @since 1.102

package/src/sap/ui/rta/command/compVariant/CompVariantSaveAs.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @constructor
 	 * @private
 	 * @since 1.87

package/src/sap/ui/rta/command/compVariant/CompVariantSwitch.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @constructor
 	 * @private
 	 * @since 1.87

package/src/sap/ui/rta/command/compVariant/CompVariantUpdate.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @constructor
 	 * @private
 	 * @since 1.87

package/src/sap/ui/rta/command/manifest/AddLibrary.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.command.ManifestCommand
 	 *
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/enablement/elementActionTest.js

@@ -61,7 +61,7 @@ sap.ui.define([
 	 * E.g. <code>elementActionTest.only("Remove");</code>
 	 *
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 *
 	 * @static
 	 * @since 1.42

package/src/sap/ui/rta/library.js

@@ -22,14 +22,14 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.rta
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @since 1.50
 	 * @private
 	 */
 	var thisLib = Lib.init({
 		name: "sap.ui.rta",
 		apiVersion: 2,
-		version: "1.136.4",
+		version: "1.139.0",
 		dependencies: ["sap.ui.core", "sap.m", "sap.ui.fl", "sap.ui.dt"],
 		types: [],
 		interfaces: [],