npm - @openui5/sap.ui.rta - Versions diffs - 1.120.7 → 1.121.0 - Mend

@openui5/sap.ui.rta 1.120.7 → 1.121.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (164) hide show

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

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

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

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

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

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

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

@@ -4,7 +4,6 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/core/Core",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/fl/Utils",
 	"sap/ui/fl/write/api/ContextSharingAPI",
@@ -12,7 +11,6 @@ sap.ui.define([
 	"sap/ui/rta/library",
 	"sap/ui/rta/Utils"
 ], function(
-	Core,
 	JsControlTreeModifier,
 	flUtils,
 	ContextSharingAPI,
@@ -28,7 +26,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 * @constructor
 	 * @private
 	 * @since 1.86
@@ -107,7 +105,10 @@ sap.ui.define([
 	 */
 	ControlVariantSaveAs.prototype.execute = function() {
 		var sSourceVariantReference = this.getSourceVariantReference();
-		this._aControlChanges = this.oModel.getVariant(sSourceVariantReference, this.sVariantManagementReference).controlChanges;
+		// once a change is saved to a variant it will automatically be restored by the VariantModel
+		this._aControlChangesWithoutVariant = this.oModel.getVariant(sSourceVariantReference, this.sVariantManagementReference)
+		.controlChanges
+		.filter((oFlexObject) => !oFlexObject.getSavedToVariant());
 		var mParams = this.getNewVariantParameters();
 		mParams.layer = this.sLayer;
 		mParams.newVariantReference = this.sNewVariantReference;
@@ -150,7 +151,8 @@ sap.ui.define([
 			return this.oModel.removeVariant(mPropertyBag, true)
 			.then(function() {
-				return this.oModel.addAndApplyChangesOnVariant(this._aControlChanges);
+				const aRelevantChanges = this._aControlChangesWithoutVariant;
+				return this.oModel.addAndApplyChangesOnVariant(aRelevantChanges);
 			}.bind(this))
 			.then(function() {
 				this._aPreparedChanges = null;

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

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

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 * @constructor
 	 * @private
 	 * @since 1.50
@@ -40,6 +40,12 @@ sap.ui.define([
 				},
 				discardVariantContent: {
 					type: "boolean"
+				},
+				/**
+				 * Discarded changes when user switches from a dirty variant choosing "discard"
+				 */
+				discardedChanges: {
+					type: "array"
 				}
 			},
 			associations: {},
@@ -55,7 +61,7 @@ sap.ui.define([
 	function discardVariantContent(sVReference) {
 		return this.oModel.eraseDirtyChangesOnVariant(this.sVariantManagementReference, sVReference)
 		.then(function(aDirtyChanges) {
-			this._aSourceVariantDirtyChanges = aDirtyChanges;
+			this.setDiscardedChanges(aDirtyChanges);
 		}.bind(this));
 	}
@@ -101,9 +107,9 @@ sap.ui.define([
 		.then(function() {
 			// When discarding, dirty changes on source variant need to be applied AFTER the switch
 			if (this.getDiscardVariantContent()) {
-				return this.oModel.addAndApplyChangesOnVariant(this._aSourceVariantDirtyChanges)
+				return this.oModel.addAndApplyChangesOnVariant(this.getDiscardedChanges())
 				.then(function() {
-					this._aSourceVariantDirtyChanges = null;
+					this.setDiscardedChanges([]);
 					this.oModel.checkUpdate(true);
 				}.bind(this));
 			}

package/src/sap/ui/rta/command/CreateContainer.js CHANGED Viewed

@@ -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.120.7
+	 * @version 1.121.0
 	 * @constructor
 	 * @private
 	 * @since 1.34

package/src/sap/ui/rta/command/CustomAdd.js CHANGED Viewed

@@ -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.120.7
+	 * @version 1.121.0
 	 * @constructor
 	 * @private
 	 * @since 1.62

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

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.command.BaseCommand
 	 *
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 * @constructor
 	 * @private
 	 * @since 1.42
@@ -154,7 +154,8 @@ sap.ui.define([
 	};
 	/**
 	 * Serializes and saves all changes to LREP
-	 * In case of Base Applications (no App Variants) the App Descriptor Changes and UI Changes are saved in different Flex Persistence instances,
+	 * In case of Base Applications (no App Variants) the App Descriptor Changes
+	 * and UI Changes are saved in different Flex Persistence instances,
 	 * so we have to call save twice. For App Variants all the changes are saved in one place.
 	 * @param {object} mPropertyBag - Property bag
 	 * @param {boolean} mPropertyBag.saveAsDraft - save the changes as a draft
@@ -186,7 +187,7 @@ sap.ui.define([
 			});
 		}.bind(this))
 		.then(function() {
-			Log.info("UI adaptation successfully transfered changes to layered repository");
+			Log.info("UI adaptation successfully wrote changes to the persistence");
 			this.getCommandStack().setSaved(true);
 			this.getCommandStack().removeAllCommands();
 		}.bind(this));

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

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

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

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

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

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

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

@@ -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.120.7
+	 * @version 1.121.0
 	 * @constructor
 	 * @private
 	 * @since 1.42

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

@@ -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.120.7
+	 * @version 1.121.0
 	 * @constructor
 	 * @private
 	 * @since 1.34

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

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

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

@@ -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.120.7
+	 * @version 1.121.0
 	 * @constructor
 	 * @private
 	 * @since 1.44

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

@@ -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.120.7
+	 * @version 1.121.0
 	 * @constructor
 	 * @private
 	 * @since 1.44

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

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

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

@@ -53,13 +53,27 @@ sap.ui.define([
 		}
 	}
+	// If changes are discarded (e.g. after a variant switch), the corresponding commands are not relevant for save
+	function handleDiscardedChanges(aDiscardedChanges, bSaveRelevant) {
+		const aAllExecutedCommands = this.getAllExecutedCommands();
+		aDiscardedChanges.forEach((oChange) => {
+			aAllExecutedCommands.some((oExecutedCommand) => {
+				if (oExecutedCommand.getPreparedChange?.().getId() === oChange.getId()) {
+					oExecutedCommand.setRelevantForSave(bSaveRelevant);
+					return true;
+				}
+				return false;
+			});
+		});
+	}
 	/**
 	 * Basic implementation for the command stack pattern.
 	 *
 	 * @class
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 * @constructor
 	 * @private
 	 * @since 1.34
@@ -236,6 +250,10 @@ sap.ui.define([
 				.then(function() {
 					this._toBeExecuted--;
+					const aDiscardedChanges = oCommand.getDiscardedChanges?.();
+					if (aDiscardedChanges) {
+						handleDiscardedChanges.call(this, aDiscardedChanges, false);
+					}
 					this.fireCommandExecuted(mParam);
 					this.fireModified();
 				}.bind(this))
@@ -264,6 +282,7 @@ sap.ui.define([
 			this._bUndoneCommands = true;
 			this._toBeExecuted++;
 			var oCommand = this._getCommandToBeExecuted();
+			const aDiscardedChanges = oCommand.getDiscardedChanges?.();
 			if (oCommand) {
 				var mParam = {
 					command: oCommand,
@@ -274,6 +293,9 @@ sap.ui.define([
 				.then(this._waitForCommandExecutionHandler.bind(this, mParam))
 				.then(function() {
+					if (aDiscardedChanges) {
+						handleDiscardedChanges.call(this, aDiscardedChanges, true);
+					}
 					this.fireCommandExecuted(mParam);
 					this.fireModified();
 				}.bind(this));

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.command.AppDescriptorCommand
 	 *
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @private

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

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

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

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

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

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

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

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