@openui5/sap.ui.rta 1.105.1 → 1.107.0

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

@@ -45,7 +45,7 @@ function(
 	 *
 	 * @namespace
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @private
 	 * @since 1.30

package/src/sap/ui/rta/appVariant/AppVariantManager.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @constructor
 	 * @private
 	 * @since 1.53

package/src/sap/ui/rta/appVariant/AppVariantUtils.js

@@ -416,6 +416,8 @@ sap.ui.define([
 			sErrorMessage = oError.messages.map(function(oError) {
 				return oError.text;
 			}).join("\n");
+		} else if (oError.userMessage) {
+			sErrorMessage = oError.userMessage;
 		} else if (oError.iamAppId) {
 			sErrorMessage = "IAM App Id: " + oError.iamAppId;
 		} else {

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

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

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

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

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

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

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @constructor
 	 * @private
 	 * @since 1.76

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

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

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

@@ -13,7 +13,7 @@ sap.ui.define(["sap/ui/base/ManagedObject"], function(ManagedObject) {
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @constructor
 	 * @private
 	 * @since 1.38

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

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

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

@@ -485,7 +485,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @private
@@ -523,9 +523,9 @@ sap.ui.define([
 
 	/**
 	 * Instance-specific method for generating command
-	 * @param {sap.ui.core.Element|string} vElement - Could be either an element or a slector for the element for which the command is to be created
+	 * @param {sap.ui.core.Element|string} vElement - Could be either an element or a selector for the element for which the command is to be created
 	 * @param {string} sCommand - Command type
-	 * @param {object} mSettings - Initial settings for the new command (command specific settings, looks diffrent for each and every command)
+	 * @param {object} mSettings - Initial settings for the new command (command specific settings, looks different for each and every command)
 	 * @param {sap.ui.dt.DesignTimeMetadata} oDesignTimeMetadata - Contains the action used in the command
 	 * @param {string} sVariantManagementReference - Variant management reference
 	 * @returns {Promise} A promise which will return the created command
@@ -536,9 +536,9 @@ sap.ui.define([
 
 	/**
 	 * Static method for generating command
-	 * @param {sap.ui.core.Element|string} vElement - Could be either an element or a slector for the element for which the command is to be created
+	 * @param {sap.ui.core.Element|string} vElement - Could be either an element or a selector for the element for which the command is to be created
 	 * @param {string} sCommand - Command type
-	 * @param {object} mSettings -  Initial settings for the new command (command specific settings, looks diffrent for each and every command)
+	 * @param {object} mSettings -  Initial settings for the new command (command specific settings, looks different for each and every command)
 	 * @param {sap.ui.dt.DesignTimeMetadata} oDesignTimeMetadata - Contains the action used in the command
 	 * @param {object} [mFlexSettings] - Property bag
 	 * @param {string} [mFlexSettings.layer] - The Layer in which RTA should be started. Default: "CUSTOMER"
@@ -546,6 +546,7 @@ sap.ui.define([
 	 * @param {string} [mFlexSettings.baseId] - Base ID of the app
 	 * @param {string} [mFlexSettings.projectId] - Project ID
 	 * @param {string} [mFlexSettings.scenario] - Key representing the current scenario
+	 * @param {string} [mFlexSettings.generator] - Generator of the change. Will be saved in the change
 	 * @returns {Promise} A promise which will return the created command
 	 */
 	CommandFactory.getCommandFor = function (vElement, sCommand, mSettings, oDesignTimeMetadata, mFlexSettings) {

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.command.BaseCommand
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @private
@@ -96,10 +96,12 @@ sap.ui.define([
 		if (!this._sCompositeId) {
 			this._sCompositeId = FlUtils.createDefaultFileName("composite");
 		}
-		if (oCommand.getPreparedChange && oCommand.getPreparedChange()) {
-			var oChangeDefinition = oCommand.getPreparedChange().getDefinition();
-			if (!oChangeDefinition.support.compositeCommand) {
-				oChangeDefinition.support.compositeCommand = this._sCompositeId;
+		var oPreparedChange = oCommand.getPreparedChange && oCommand.getPreparedChange();
+		if (oPreparedChange) {
+			var oChangeSupportInformation = oPreparedChange.getSupportInformation();
+			if (!oChangeSupportInformation.compositeCommand) {
+				oChangeSupportInformation.compositeCommand = this._sCompositeId;
+				oPreparedChange.setSupportInformation(oChangeSupportInformation);
 			}
 		} else if (oCommand.setCompositeId) {
 			// relevant for app descriptor commands

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

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

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

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

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

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @constructor
 	 * @private
 	 * @since 1.86

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

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @constructor
 	 * @private
 	 * @since 1.50

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

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

package/src/sap/ui/rta/command/CreateContainer.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.105.1
+	 * @version 1.107.0
 	 * @constructor
 	 * @private
 	 * @since 1.34

package/src/sap/ui/rta/command/CustomAdd.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.105.1
+	 * @version 1.107.0
 	 * @constructor
 	 * @private
 	 * @since 1.62

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

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.command.BaseCommand
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @private
@@ -208,7 +208,7 @@ sap.ui.define([
 			mChangeSpecificData = Object.assign({}, mChangeSpecificData, mVariantObj);
 		}
 		mChangeSpecificData.command = sCommand;
-		mChangeSpecificData.generator = rtaLibrary.GENERATOR_NAME;
+		mChangeSpecificData.generator = mFlexSettings.generator || rtaLibrary.GENERATOR_NAME;
 		return ChangesWriteAPI.create({changeSpecificData: mChangeSpecificData, selector: this._validateControlForChange(mFlexSettings)})
 			.then(function(oChange) {
 				// originalSelector is only present when making a change on/inside a template; the selector does not work with the JS propagation hook (the template has no parent),
@@ -217,7 +217,7 @@ sap.ui.define([
 				// ATTENTION! the change gets applied as soon as the parent is available, so there might be possible side effects with lazy loading
 				if (mFlexSettings && mFlexSettings.originalSelector) {
 					oChange.addDependentControl(mFlexSettings.originalSelector, "originalSelector", {modifier: JsControlTreeModifier, appComponent: this.getAppComponent()});
-					oChange.getDefinition().selector = Object.assign(oChange.getDefinition().selector, JsControlTreeModifier.getSelector(this.getSelector().id, this.getAppComponent()));
+					oChange.setSelector(Object.assign(oChange.getSelector(), JsControlTreeModifier.getSelector(this.getSelector().id, this.getAppComponent())));
 					oChange.setContent(Object.assign({}, oChange.getContent(), mFlexSettings.content));
 				}
 				return oChange;

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @constructor
 	 * @private
 	 * @since 1.42
@@ -176,7 +176,8 @@ sap.ui.define([
 				draft: !!mPropertyBag.saveAsDraft,
 				layer: mPropertyBag.layer,
 				removeOtherLayerChanges: !!mPropertyBag.removeOtherLayerChanges,
-				version: mPropertyBag.version
+				version: mPropertyBag.version,
+				condenseAnyLayer: mPropertyBag.condenseAnyLayer
 			});
 		}.bind(this))
 		.then(function() {

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.105.1
+	 * @version 1.107.0
 	 * @constructor
 	 * @private
 	 * @since 1.90

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.105.1
+	 * @version 1.107.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.105.1
+	 * @version 1.107.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.105.1
+	 * @version 1.107.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.105.1
+	 * @version 1.107.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.105.1
+	 * @version 1.107.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.105.1
+	 * @version 1.107.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.105.1
+	 * @version 1.107.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.105.1
+	 * @version 1.107.0
 	 * @constructor
 	 * @private
 	 * @since 1.46

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

@@ -9,14 +9,18 @@ sap.ui.define([
 	"sap/ui/fl/Utils",
 	"sap/ui/rta/command/Settings",
 	"sap/ui/rta/command/CompositeCommand",
-	"sap/ui/core/util/reflection/JsControlTreeModifier"
+	"sap/ui/core/util/reflection/JsControlTreeModifier",
+	"sap/ui/rta/util/showMessageBox",
+	"sap/ui/core/Core"
 ], function(
 	ManagedObject,
 	PersistenceWriteAPI,
 	FlUtils,
 	Settings,
 	CompositeCommand,
-	JsControlTreeModifier
+	JsControlTreeModifier,
+	showMessageBox,
+	Core
 ) {
 	"use strict";
 
@@ -32,12 +36,12 @@ sap.ui.define([
 		var oSelector = oChange.getSelector && oChange.getSelector();
 		var oCommand = new Settings({
 			selector: oSelector,
-			changeType: oChange.getDefinition().changeType,
+			changeType: oChange.getChangeType(),
 			element: JsControlTreeModifier.bySelector(oSelector, oComponent)
 		});
 		oCommand._oPreparedChange = oChange;
 		// check if change belongs to a composite command
-		var sCompositeId = oChange.getDefinition().support.compositeCommand;
+		var sCompositeId = oChange.getSupportInformation().compositeCommand;
 		if (sCompositeId) {
 			if (!mComposite[sCompositeId]) {
 				mComposite[sCompositeId] = new CompositeCommand();
@@ -55,7 +59,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @constructor
 	 * @private
 	 * @since 1.34
@@ -74,7 +78,15 @@ 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.
+				 */
 				modified: {},
+
+				/**
+				 * Fired after a successful execution of a command (also includes undo).
+				 */
 				commandExecuted: {
 					parameters: {
 						command: {type: "object"},
@@ -126,12 +138,14 @@ sap.ui.define([
 	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;
@@ -156,6 +170,7 @@ sap.ui.define([
 	 */
 	Stack.prototype.pushExecutedCommand = function(oCommand) {
 		this.push(oCommand, true);
+		this.fireModified();
 	};
 
 	Stack.prototype.push = function(oCommand, bExecuted) {
@@ -170,7 +185,6 @@ sap.ui.define([
 		if (!bExecuted) {
 			this._toBeExecuted++;
 		}
-		this.fireModified();
 	};
 
 	Stack.prototype.top = function() {
@@ -186,7 +200,6 @@ sap.ui.define([
 
 	Stack.prototype.removeCommand = function(vObject, bSuppressInvalidate) {
 		var oRemovedCommand = this.removeAggregation("commands", vObject, bSuppressInvalidate);
-		this.fireModified();
 		return oRemovedCommand;
 	};
 
@@ -226,6 +239,12 @@ sap.ui.define([
 					oError.index = this._toBeExecuted;
 					oError.command = this.removeCommand(this._toBeExecuted); // remove failing command
 					this._toBeExecuted--;
+					var oRtaResourceBundle = Core.getLibraryResourceBundle("sap.ui.rta");
+					showMessageBox(
+						oRtaResourceBundle.getText("MSG_GENERIC_ERROR_MESSAGE", oError.message),
+						{title: oRtaResourceBundle.getText("HEADER_ERROR")},
+						"error"
+					);
 					return Promise.reject(oError);
 				}.bind(this));
 			}

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

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.command.AppDescriptorCommand
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.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.105.1
+	 * @version 1.107.0
 	 * @constructor
 	 * @private
 	 * @since 1.87

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.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.105.1
+	 * @version 1.107.0
 	 * @constructor
 	 * @private
 	 * @since 1.87