@openui5/sap.ui.rta 1.134.0 → 1.135.0

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

@@ -20,15 +20,15 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	var Utils = {};
+	const Utils = {};
 
-	var sModulePath = `${sap.ui.require.toUrl("sap/ui/rta/appVariant/manageApps/")}webapp`;
-	var oI18n = ResourceBundle.create({
+	const sModulePath = `${sap.ui.require.toUrl("sap/ui/rta/appVariant/manageApps/")}webapp`;
+	const oI18n = ResourceBundle.create({
 		url: `${sModulePath}/i18n/i18n.properties`
 	});
 
 	Utils._checkNavigationSupported = function(oNavigationParams) {
-		var oUShellContainer = FlUtils.getUshellContainer();
+		const oUShellContainer = FlUtils.getUshellContainer();
 		return oUShellContainer.getServiceAsync("Navigation")
 		.then(function(oNavigationService) {
 			return oNavigationService.getLinks([oNavigationParams]);
@@ -52,7 +52,7 @@ sap.ui.define([
 
 	Utils._calculateCurrentStatus = function(sAppVariantInfoId, sAppVarStatus) {
 		// Get the id of a new created app variant
-		var sNewAppVariantId = AppVariantUtils.getNewAppVariantId();
+		const sNewAppVariantId = AppVariantUtils.getNewAppVariantId();
 
 		if (sAppVarStatus === "R") {
 			return oI18n.getText("MAA_OPERATION_IN_PROGRESS");
@@ -65,7 +65,7 @@ sap.ui.define([
 	};
 
 	Utils._checkMenuItemOptions = function(oPreparedObject, bAdaptUIButtonEnabled) {
-		var oAppVarObject = {};
+		const oAppVarObject = {};
 
 		if (oPreparedObject.isKeyUser) {
 			if (oPreparedObject.isOriginal) {
@@ -112,21 +112,19 @@ sap.ui.define([
 	};
 
 	Utils._getNavigationInfo = function(oPreparedObject) {
-		var oNavigationObject = {};
+		let oNavigationObject = {};
 
-		var sSemanticObject = oPreparedObject.startWith.semanticObject;
-		var sAction = oPreparedObject.startWith.action;
-		var oParams = oPreparedObject.startWith.parameters;
+		const sSemanticObject = oPreparedObject.startWith.semanticObject;
+		const sAction = oPreparedObject.startWith.action;
+		const oParams = oPreparedObject.startWith.parameters;
 
-		var oNavigationParams = {
+		const oNavigationParams = {
 			semanticObject: sSemanticObject,
 			action: sAction,
 			params: oParams
 		};
 
 		return this._checkNavigationSupported(oNavigationParams).then(function(aResult) {
-			var oDeleteButtonProperties;
-
 			if (aResult[0].length && oPreparedObject.isKeyUser) {
 				oNavigationObject.adaptUIButtonEnabled = true;
 
@@ -138,7 +136,7 @@ sap.ui.define([
 				oNavigationObject.adaptUIButtonEnabled = false;
 			}
 
-			oDeleteButtonProperties = this._checkMenuItemOptions(oPreparedObject, oNavigationObject.adaptUIButtonEnabled);
+			const oDeleteButtonProperties = this._checkMenuItemOptions(oPreparedObject, oNavigationObject.adaptUIButtonEnabled);
 
 			oNavigationObject.semanticObject = sSemanticObject;
 			oNavigationObject.action = sAction;
@@ -174,9 +172,9 @@ sap.ui.define([
 	};
 
 	Utils.getAppVariantOverviewAttributes = function(oAppVariantInfo, bKeyUser) {
-		var oAppVariantAttributes;
+		let oAppVariantAttributes;
 		// Adding the tooltip to every icon which is shown on the App Variant Overview Dialog
-		var sIconUrl = oAppVariantInfo.iconUrl;
+		const sIconUrl = oAppVariantInfo.iconUrl;
 		if (sIconUrl && IconPool.isIconURI(sIconUrl)) {
 			// eslint-disable-next-line prefer-destructuring
 			oAppVariantInfo.iconText = sIconUrl.split("//")[1];
@@ -197,7 +195,7 @@ sap.ui.define([
 		// Populate the app variant attributes with the cloud system information
 		oAppVariantAttributes.isS4HanaCloud = bIsS4HanaCloud;
 
-		var oPreparedObject = {
+		const oPreparedObject = {
 			isKeyUser: bKeyUser,
 			isOriginal: oAppVariantInfo.isOriginal,
 			isS4HanaCloud: bIsS4HanaCloud,
@@ -213,16 +211,16 @@ sap.ui.define([
 		}
 
 		oAppVariantAttributes.adaptUIButtonEnabled = false;
-		var oDeleteButtonProperties = this._checkMenuItemOptions(oPreparedObject, false);
+		const oDeleteButtonProperties = this._checkMenuItemOptions(oPreparedObject, false);
 		oAppVariantAttributes = { ...oAppVariantAttributes, ...oDeleteButtonProperties };
 		return Promise.resolve(oAppVariantAttributes);
 	};
 
 	Utils.getAppVariantOverview = function(sReferenceAppId, bKeyUser) {
 		// Customer* means the layer can be either CUSTOMER or CUSTOMER_BASE. This layer determination takes place in backend.
-		var sLayer = bKeyUser ? "CUSTOMER*" : "VENDOR";
+		const sLayer = bKeyUser ? "CUSTOMER*" : "VENDOR";
 
-		var mPropertyBag = {
+		const mPropertyBag = {
 			selector: {
 				appId: sReferenceAppId
 			},
@@ -230,8 +228,8 @@ sap.ui.define([
 		};
 
 		return AppVariantWriteAPI.listAllAppVariants(mPropertyBag).then(function(oResult) {
-			var aAppVariantOverviewInfo = [];
-			var aAppVariantInfo;
+			const aAppVariantOverviewInfo = [];
+			let aAppVariantInfo;
 			if (oResult.response && oResult.response.items) {
 				aAppVariantInfo = oResult.response.items;
 			} else {
@@ -250,7 +248,7 @@ sap.ui.define([
 		}.bind(this));
 	};
 
-	Utils.getDescriptor = function(mPropertyBag) {
+	Utils.getManifest = function(mPropertyBag) {
 		return AppVariantWriteAPI.getManifest(mPropertyBag).then(function(oResult) {
 			return oResult.response;
 		});

package/src/sap/ui/rta/appVariant/manageApps/webapp/controller/ManageApps.controller.js

@@ -36,19 +36,19 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	var _sIdRunningApp;
-	var _bKeyUser;
-	var _sLayer;
-	var _oCrossAppNavService;
-	var sModulePath;
-	var oI18n;
+	let _sIdRunningApp;
+	let _bKeyUser;
+	let _sLayer;
+	let _oCrossAppNavService;
+	let sModulePath;
+	let oI18n;
 
 	return Controller.extend("sap.ui.rta.appVariant.manageApps.webapp.controller.ManageApps", {
 		onInit() {
 			_sIdRunningApp = this.getOwnerComponent().getIdRunningApp();
 			_bKeyUser = this.getOwnerComponent().getIsOverviewForKeyUser();
 			_sLayer = this.getOwnerComponent().getLayer();
-			var oUShellContainer = FlUtils.getUshellContainer();
+			const oUShellContainer = FlUtils.getUshellContainer();
 
 			if (!oI18n) {
 				this._createResourceBundle();
@@ -79,7 +79,7 @@ sap.ui.define([
 			}.bind(this))
 			.catch(function(oError) {
 				AppVariantUtils.closeOverviewDialog();
-				var oErrorInfo = AppVariantUtils.buildErrorInfo("MSG_MANAGE_APPS_FAILED", oError);
+				const oErrorInfo = AppVariantUtils.buildErrorInfo("MSG_MANAGE_APPS_FAILED", oError);
 				oErrorInfo.overviewDialog = true;
 				BusyIndicator.hide();
 				return AppVariantUtils.showRelevantDialog(oErrorInfo, false);
@@ -100,15 +100,15 @@ sap.ui.define([
 		},
 
 		_highlightNewCreatedAppVariant(aAppVariantOverviewAttributes) {
-			var oTable = this.byId("Table1");
+			const oTable = this.byId("Table1");
 			if (!oTable) {
 				return Promise.resolve();
 			}
 			oTable.focus();
 
-			aAppVariantOverviewAttributes.forEach(function(oAppVariantDescriptor, index) {
-				if (oAppVariantDescriptor.currentStatus === oI18n.getText("MAA_NEW_APP_VARIANT")
-					|| oAppVariantDescriptor.currentStatus === oI18n.getText("MAA_OPERATION_IN_PROGRESS")
+			aAppVariantOverviewAttributes.forEach(function(oAppVariantManifest, index) {
+				if (oAppVariantManifest.currentStatus === oI18n.getText("MAA_NEW_APP_VARIANT")
+					|| oAppVariantManifest.currentStatus === oI18n.getText("MAA_OPERATION_IN_PROGRESS")
 				) {
 					if (oTable.getItems().length >= index) {
 						oTable.getItems()[index].focus();
@@ -120,11 +120,11 @@ sap.ui.define([
 		},
 
 		_arrangeOverviewDataAndBindToModel(aAppVariantOverviewAttributes) {
-			var aAdaptingAppAttributes = aAppVariantOverviewAttributes.filter(function(oAppVariantProperty) {
+			const aAdaptingAppAttributes = aAppVariantOverviewAttributes.filter(function(oAppVariantProperty) {
 				return oAppVariantProperty.appId === _sIdRunningApp;
 			});
 
-			var oAdaptingAppAttributes = aAdaptingAppAttributes[0];
+			const oAdaptingAppAttributes = aAdaptingAppAttributes[0];
 			if (oAdaptingAppAttributes && oAdaptingAppAttributes.appVarStatus !== "R") {
 				oAdaptingAppAttributes.currentStatus = oI18n.getText("MAA_CURRENTLY_ADAPTING");
 			}
@@ -135,11 +135,11 @@ sap.ui.define([
 
 			aAppVariantOverviewAttributes.unshift(oAdaptingAppAttributes);
 
-			var aReferenceAppAttributes = aAppVariantOverviewAttributes.filter(function(oAppVariantProperty) {
+			const aReferenceAppAttributes = aAppVariantOverviewAttributes.filter(function(oAppVariantProperty) {
 				return oAppVariantProperty.isOriginal;
 			});
 
-			var oReferenceAppAttributes = aReferenceAppAttributes[0];
+			const oReferenceAppAttributes = aReferenceAppAttributes[0];
 
 			aAppVariantOverviewAttributes = aAppVariantOverviewAttributes.filter(function(oAppVariantProperty) {
 				return !oAppVariantProperty.isOriginal;
@@ -149,11 +149,11 @@ sap.ui.define([
 
 			// Bind the app variant overview to JSON model
 
-			var oModelData = {
+			const oModelData = {
 				appVariants: aAppVariantOverviewAttributes
 			};
 
-			var oModel = Model.createModel(oModelData);
+			const oModel = Model.createModel(oModelData);
 			this.getView().setModel(oModel);
 
 			return Promise.resolve(aAppVariantOverviewAttributes);
@@ -216,8 +216,8 @@ sap.ui.define([
 		},
 
 		onMenuAction(oEvent) {
-			var oItem = oEvent.getParameter("item");
-			var sItemPath = "";
+			let oItem = oEvent.getParameter("item");
+			let sItemPath = "";
 
 			while (oItem instanceof MenuItem) {
 				sItemPath = `${oItem.getText()} > ${sItemPath}`;
@@ -242,11 +242,11 @@ sap.ui.define([
 		},
 
 		handleUiAdaptation(oEvent) {
-			var sSemanticObject = this.getModelProperty("semanticObject", oEvent.getSource().getBindingContext());
-			var sAction = this.getModelProperty("action", oEvent.getSource().getBindingContext());
-			var oParams = this.getModelProperty("params", oEvent.getSource().getBindingContext());
+			const sSemanticObject = this.getModelProperty("semanticObject", oEvent.getSource().getBindingContext());
+			const sAction = this.getModelProperty("action", oEvent.getSource().getBindingContext());
+			const oParams = this.getModelProperty("params", oEvent.getSource().getBindingContext());
 
-			var oNavigationParams;
+			let oNavigationParams;
 			if (sSemanticObject && sAction && oParams) {
 				oNavigationParams = {
 					target: {
@@ -271,23 +271,23 @@ sap.ui.define([
 		},
 
 		copyId(oEvent) {
-			var sCopiedId = this.getModelProperty("appId", oEvent.getSource().getBindingContext());
+			const sCopiedId = this.getModelProperty("appId", oEvent.getSource().getBindingContext());
 			AppVariantUtils.copyId(sCopiedId);
 			MessageToast.show(oI18n.getText("MAA_COPY_ID_SUCCESS"));
 		},
 
 		deleteAppVariant(oEvent) {
-			var oInfo = {};
+			const oInfo = {};
 			if (!oI18n) {
 				this._createResourceBundle();
 			}
-			var sMessage = oI18n.getText("MSG_APP_VARIANT_DELETE_CONFIRMATION");
+			const sMessage = oI18n.getText("MSG_APP_VARIANT_DELETE_CONFIRMATION");
 			oInfo.text = sMessage;
 			oInfo.deleteAppVariant = true;
 
-			var sAppVarId = this.getModelProperty("appId", oEvent.getSource().getBindingContext());
-			var sCurrentStatus = this.getModelProperty("currentStatus", oEvent.getSource().getBindingContext());
-			var bCurrentlyAdapting = sCurrentStatus === oI18n.getText("MAA_CURRENTLY_ADAPTING");
+			const sAppVarId = this.getModelProperty("appId", oEvent.getSource().getBindingContext());
+			const sCurrentStatus = this.getModelProperty("currentStatus", oEvent.getSource().getBindingContext());
+			const bCurrentlyAdapting = sCurrentStatus === oI18n.getText("MAA_CURRENTLY_ADAPTING");
 
 			return AppVariantUtils.showRelevantDialog(oInfo)
 			.then(function() {

package/src/sap/ui/rta/appVariant/manageApps/webapp/i18n/i18n_fr_CA.properties

@@ -1,9 +1,9 @@
 
 MAA_DIALOG_ICON=Ic\u00F4ne
 MAA_DIALOG_DESCRIPTION=Description
-MAA_DIALOG_COPY_ID_ACTION=Copier l'action d'ID
+MAA_DIALOG_COPY_ID_ACTION=Action Copier l'ID
 MAA_DIALOG_ADAPT_UI_ACTION=Adapter l'action d'IU
-MAA_DIALOG_SAVE_AS_ACTION=Enregistrer en tant qu'action
+MAA_DIALOG_SAVE_AS_ACTION=Action Enregistrer sous
 MAA_DIALOG_ACTIONS=Actions
 MAA_DIALOG_DELETE_APPVAR=Supprimer la variante d'application
 MAA_DIALOG_ADAPT_UI=Adapter l'IU

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.134.0
+	 * @version 1.135.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.134.0
+	 * @version 1.135.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.134.0
+	 * @version 1.135.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.134.0
+	 * @version 1.135.0
 	 * @constructor
 	 * @private
 	 * @since 1.76

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

@@ -5,10 +5,18 @@
  */
 sap.ui.define([
 	"sap/ui/fl/write/api/ChangesWriteAPI",
+	"sap/ui/fl/write/api/FeaturesAPI",
+	"sap/ui/fl/write/api/LocalResetAPI",
+	"sap/ui/fl/write/api/PersistenceWriteAPI",
+	"sap/ui/fl/LayerUtils",
 	"sap/ui/rta/command/FlexCommand",
 	"sap/ui/rta/library"
 ], function(
 	ChangesWriteAPI,
+	FeaturesAPI,
+	LocalResetAPI,
+	PersistenceWriteAPI,
+	LayerUtils,
 	FlexCommand,
 	rtaLibrary
 ) {
@@ -21,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.command.FlexCommand
 	 *
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.135.0
 	 *
 	 * @constructor
 	 * @private
@@ -40,6 +48,10 @@ sap.ui.define([
 				},
 				content: {
 					type: "any"
+				},
+				changesToDelete: {
+					type: "object[]",
+					defaultValue: []
 				}
 			},
 			events: {}
@@ -47,6 +59,7 @@ sap.ui.define([
 	});
 
 	AnnotationCommand.prototype._createChange = function(mFlexSettings, sVariantManagementReference, sCommand) {
+		this._aToBeResetChanges = [];
 		const mChangeSpecificData = {
 			...this._getChangeSpecificData(),
 			...mFlexSettings,
@@ -55,6 +68,36 @@ sap.ui.define([
 			jsOnly: this.getJsOnly(),
 			generator: mFlexSettings.generator || rtaLibrary.GENERATOR_NAME
 		};
+
+		if (this.getChangesToDelete().length) {
+			// If available, all changes of the current layer must be deleted via the LocalResetAPI
+			// Changes in a lower layer can't be deleted via the LocalResetAPI and must be deleted via the deactivate change
+			const aToBeDeactivatedChanges = [];
+			if (FeaturesAPI.isLocalResetEnabled()) {
+				this.getChangesToDelete().forEach((oFlexObject) => {
+					if (LayerUtils.compareAgainstCurrentLayer(oFlexObject.getLayer(), mFlexSettings.layer) === -1) {
+						aToBeDeactivatedChanges.push(oFlexObject);
+					} else {
+						this._aToBeResetChanges.push(oFlexObject);
+					}
+				});
+			} else {
+				aToBeDeactivatedChanges.push(...this.getChangesToDelete());
+			}
+
+			if (aToBeDeactivatedChanges.length) {
+				this._oDeactivateChange = ChangesWriteAPI.create({
+					changeSpecificData: {
+						changeType: "deactivateChanges",
+						content: { changeIds: aToBeDeactivatedChanges.map((oFlexObject) => oFlexObject.getId()) },
+						generator: mFlexSettings.generator || rtaLibrary.GENERATOR_NAME,
+						layer: mFlexSettings.layer
+					},
+					selector: this.getAppComponent()
+				});
+			}
+		}
+
 		return ChangesWriteAPI.create({
 			changeSpecificData: mChangeSpecificData,
 			annotationChange: true,
@@ -62,12 +105,29 @@ sap.ui.define([
 		});
 	};
 
-	AnnotationCommand.prototype.execute = function() {
-		return Promise.resolve();
+	AnnotationCommand.prototype.execute = async function() {
+		// Annotation changes can only be applied during app start, so execute and undo only have to take care of reset / deactivate changes
+		if (this._aToBeResetChanges.length) {
+			await LocalResetAPI.resetChanges(this._aToBeResetChanges, this.getAppComponent(), true);
+		}
+		if (this._oDeactivateChange) {
+			PersistenceWriteAPI.add({
+				selector: this.getAppComponent(),
+				flexObjects: [this._oDeactivateChange]
+			});
+		}
 	};
 
-	AnnotationCommand.prototype.undo = function() {
-		return Promise.resolve();
+	AnnotationCommand.prototype.undo = async function() {
+		if (this._aToBeResetChanges.length) {
+			await LocalResetAPI.restoreChanges(this._aToBeResetChanges, this.getAppComponent(), true);
+		}
+		if (this._oDeactivateChange) {
+			PersistenceWriteAPI.remove({
+				selector: this.getAppComponent(),
+				flexObjects: [this._oDeactivateChange]
+			});
+		}
 	};
 
 	/**

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.135.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.134.0
+	 * @version 1.135.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.134.0
+	 * @version 1.135.0
 	 * @constructor
 	 * @private
 	 * @since 1.46