@openui5/sap.ui.rta 1.115.1 → 1.117.0

package/src/sap/ui/rta/util/adaptationStarter.js

@@ -33,14 +33,14 @@ sap.ui.define([
 	function checkKeyUser(sLayer) {
 		if (Layer.CUSTOMER === sLayer) {
 			return FeaturesAPI.isKeyUser()
-				.then(function(bIsKeyUser) {
-					if (!bIsKeyUser) {
-						var oRtaResourceBundle = Core.getLibraryResourceBundle("sap.ui.rta");
-						var oError = new Error(oRtaResourceBundle.getText("MSG_NO_KEY_USER_RIGHTS_ERROR_MESSAGE"));
-						oError.reason = "isKeyUser";
-						throw oError;
-					}
-				});
+			.then(function(bIsKeyUser) {
+				if (!bIsKeyUser) {
+					var oRtaResourceBundle = Core.getLibraryResourceBundle("sap.ui.rta");
+					var oError = new Error(oRtaResourceBundle.getText("MSG_NO_KEY_USER_RIGHTS_ERROR_MESSAGE"));
+					oError.reason = "isKeyUser";
+					throw oError;
+				}
+			});
 		}
 		return Promise.resolve();
 	}
@@ -123,36 +123,39 @@ sap.ui.define([
 				};
 
 				PersistenceWriteAPI.getChangesWarning(mPropertyBag)
-					.then(function(oWarningMessage) {
-						if (oWarningMessage.showWarning) {
-							var oRtaResourceBundle = Core.getLibraryResourceBundle("sap.ui.rta");
-							var oMessageProps = oWarningMessage.warningType === "mixedChangesWarning"
-								? {
-									text: "MSG_ADAPTATION_STARTER_MIXED_CHANGES_WARNING",
-									title: "TIT_ADAPTATION_STARTER_MIXED_CHANGES_TITLE"
-								}
-								: {
-									text: "MSG_ADAPTATION_STARTER_NO_CHANGES_IN_P_WARNING",
-									title: "TIT_ADAPTATION_STARTER_NO_CHANGES_IN_P_TITLE"
-								};
+				.then(function(oWarningMessage) {
+					if (oWarningMessage.showWarning) {
+						var oRtaResourceBundle = Core.getLibraryResourceBundle("sap.ui.rta");
+						var oMessageProps = oWarningMessage.warningType === "mixedChangesWarning"
+							? {
+								text: "MSG_ADAPTATION_STARTER_MIXED_CHANGES_WARNING",
+								title: "TIT_ADAPTATION_STARTER_MIXED_CHANGES_TITLE"
+							}
+							: {
+								text: "MSG_ADAPTATION_STARTER_NO_CHANGES_IN_P_WARNING",
+								title: "TIT_ADAPTATION_STARTER_NO_CHANGES_IN_P_TITLE"
+							};
 
-							showMessageBox(
-								oRtaResourceBundle.getText(oMessageProps.text),
-								{
-									title: oRtaResourceBundle.getText(oMessageProps.title)
-								},
-								"warning"
-							);
-						}
-					});
+						showMessageBox(
+							oRtaResourceBundle.getText(oMessageProps.text),
+							{
+								title: oRtaResourceBundle.getText(oMessageProps.title)
+							},
+							"warning"
+						);
+					}
+				});
 			}
 			return oRta;
 		})
 		.catch(function(vError) {
-			if (vError !== "Reload triggered") {
+			if (
+				vError !== "Reload triggered"
+				&& !(FlexUtils.getUshellContainer() && vError.reason === "flexEnabled") // FLP Plugin already handles this error
+			) {
 				var oRtaResourceBundle = Core.getLibraryResourceBundle("sap.ui.rta");
 				showMessageBox(
-					oRtaResourceBundle.getText("MSG_GENERIC_ERROR_MESSAGE", vError.message),
+					oRtaResourceBundle.getText("MSG_GENERIC_ERROR_MESSAGE", [vError.message]),
 					{title: oRtaResourceBundle.getText("MSG_ADAPTATION_COULD_NOT_START")},
 					"error"
 				);

package/src/sap/ui/rta/util/changeVisualization/ChangeIndicator.js

@@ -5,29 +5,31 @@
  */
 
 sap.ui.define([
-	"sap/ui/core/Fragment",
-	"sap/ui/model/json/JSONModel",
-	"sap/ui/core/Control",
 	"sap/ui/core/format/DateFormat",
+	"sap/ui/core/Control",
+	"sap/ui/core/Core",
+	"sap/ui/core/Fragment",
+	"sap/ui/core/StaticArea",
 	"sap/ui/events/KeyCodes",
-	"sap/ui/rta/util/changeVisualization/commands/getCommandVisualization",
-	"sap/ui/fl/Utils",
 	"sap/ui/fl/util/resolveBinding",
-	"sap/ui/rta/util/changeVisualization/ChangeVisualizationUtils",
-	"sap/ui/core/Core",
-	"sap/ui/rta/util/changeVisualization/ChangeCategories"
+	"sap/ui/fl/Utils",
+	"sap/ui/model/json/JSONModel",
+	"sap/ui/rta/util/changeVisualization/commands/getCommandVisualization",
+	"sap/ui/rta/util/changeVisualization/ChangeCategories",
+	"sap/ui/rta/util/changeVisualization/ChangeVisualizationUtils"
 ], function(
-	Fragment,
-	JSONModel,
-	Control,
 	DateFormat,
+	Control,
+	Core,
+	Fragment,
+	StaticArea,
 	KeyCodes,
-	getCommandVisualization,
-	FlUtils,
 	resolveBinding,
-	ChangeVisualizationUtils,
-	Core,
-	ChangeCategories
+	FlUtils,
+	JSONModel,
+	getCommandVisualization,
+	ChangeCategories,
+	ChangeVisualizationUtils
 ) {
 	"use strict";
 
@@ -40,7 +42,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.util.changeVisualization.ChangeIndicator
 	 * @author SAP SE
 	 * @since 1.84.0
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 * @private
 	 */
 	var ChangeIndicator = Control.extend("sap.ui.rta.util.changeVisualization.ChangeIndicator", {
@@ -173,6 +175,8 @@ sap.ui.define([
 		// the indicator should be centered only if the element has a small enough height to improve the design and visibility
 		if (iOverlayHeight < iIndicatorHeight * 5) {
 			oIndicator.addStyleClass("sapUiRtaChangeIndicatorVerticallyCentered");
+		} else {
+			oIndicator.removeStyleClass("sapUiRtaChangeIndicatorVerticallyCentered");
 		}
 	}
 
@@ -308,7 +312,7 @@ sap.ui.define([
 		if (oDomRef) {
 			oDomRef.parentNode.removeChild(oDomRef);
 		}
-		this.placeAt(Core.getStaticAreaRef());
+		this.placeAt(StaticArea.getDomRef());
 
 		this.setProperty("overlayId", sOverlayId);
 		return this;
@@ -397,7 +401,7 @@ sap.ui.define([
 
 	ChangeIndicator.prototype._toggleDetailPopover = function() {
 		if (!this.getAggregation("_popover")) {
-			//store the tabindex (tabindex will be removed on opening the popover)
+			// store the tabindex (tabindex will be removed on opening the popover)
 			this._iOldTabIndex = this.getDomRef().getAttribute("tabindex");
 			Fragment.load({
 				name: "sap.ui.rta.util.changeVisualization.ChangeIndicatorPopover",

package/src/sap/ui/rta/util/changeVisualization/ChangeIndicatorRegistry.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.util.changeVisualization.ChangeIndicatorRegistry
 	 * @author SAP SE
 	 * @since 1.86.0
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 * @private
 	 */
 	var ChangeIndicatorRegistry = ManagedObject.extend("sap.ui.rta.util.changeVisualization.ChangeIndicatorRegistry", {
@@ -60,7 +60,7 @@ sap.ui.define([
 				}
 			}
 		},
-		constructor: function () {
+		constructor: function() {
 			ManagedObject.prototype.constructor.apply(this, arguments);
 
 			// List of entries with indicator data, grouped by Change ID
@@ -71,7 +71,7 @@ sap.ui.define([
 		}
 	});
 
-	ChangeIndicatorRegistry.prototype.exit = function () {
+	ChangeIndicatorRegistry.prototype.exit = function() {
 		this.reset();
 	};
 
@@ -80,8 +80,8 @@ sap.ui.define([
 	 *
 	 * @returns {object[]} Change indicator data for all registered changes
 	 */
-	ChangeIndicatorRegistry.prototype.getAllRegisteredChanges = function () {
-		return values(this._oRegisteredChanges || {}).map(function (oChange) {
+	ChangeIndicatorRegistry.prototype.getAllRegisteredChanges = function() {
+		return values(this._oRegisteredChanges || {}).map(function(oChange) {
 			return Object.assign({}, oChange);
 		});
 	};
@@ -91,7 +91,7 @@ sap.ui.define([
 	 *
 	 * @returns {string[]} Array with both design time and runtime registered changes
 	 */
-	ChangeIndicatorRegistry.prototype.getRegisteredChangeIds = function () {
+	ChangeIndicatorRegistry.prototype.getRegisteredChangeIds = function() {
 		return Object.keys(this._oRegisteredChanges || {});
 	};
 
@@ -101,7 +101,7 @@ sap.ui.define([
 	 * @param {string} sChangeId - ID of the registered change
 	 * @returns {object} Registered change
 	 */
-	ChangeIndicatorRegistry.prototype.getRegisteredChange = function (sChangeId) {
+	ChangeIndicatorRegistry.prototype.getRegisteredChange = function(sChangeId) {
 		return this._oRegisteredChanges[sChangeId] && Object.assign({}, this._oRegisteredChanges[sChangeId]);
 	};
 
@@ -111,11 +111,11 @@ sap.ui.define([
 	 *
 	 * @returns {object} List of selectors with change indicator data.
 	 */
-	ChangeIndicatorRegistry.prototype.getSelectorsWithRegisteredChanges = function () {
+	ChangeIndicatorRegistry.prototype.getSelectorsWithRegisteredChanges = function() {
 		var oChangeIndicators = {};
 		var sPreviousAffectedElementId;
 
-		function addSelector (sSelectorId, sAffectedElementId, oChangeIndicatorData, bDependent) {
+		function addSelector(sSelectorId, sAffectedElementId, oChangeIndicatorData, bDependent) {
 			if (oChangeIndicators[sSelectorId] === undefined) {
 				oChangeIndicators[sSelectorId] = [];
 			}
@@ -133,21 +133,21 @@ sap.ui.define([
 		}
 
 		values(this._oRegisteredChanges)
-			.forEach(function (oChangeIndicatorData) {
-				oChangeIndicatorData.visualizationInfo.displayElementIds
-				.forEach(function (sId, iIndex) {
-					addSelector(sId, oChangeIndicatorData.visualizationInfo.affectedElementIds[iIndex], oChangeIndicatorData, false);
-				});
+		.forEach(function(oChangeIndicatorData) {
+			oChangeIndicatorData.visualizationInfo.displayElementIds
+			.forEach(function(sId, iIndex) {
+				addSelector(sId, oChangeIndicatorData.visualizationInfo.affectedElementIds[iIndex], oChangeIndicatorData, false);
 			});
+		});
 
 		return oChangeIndicators;
 	};
 
-	ChangeIndicatorRegistry.prototype.getRelevantChangesWithSelector = function () {
+	ChangeIndicatorRegistry.prototype.getRelevantChangesWithSelector = function() {
 		var oSelectors = this.getSelectorsWithRegisteredChanges();
 		var aRelevantChanges = [];
 		Object.keys(oSelectors).forEach(function(sSelectorId) {
-			var aRelevantChangesForSelector = oSelectors[sSelectorId].filter(function (oChange) {
+			var aRelevantChangesForSelector = oSelectors[sSelectorId].filter(function(oChange) {
 				return !oChange.dependent;
 			});
 			aRelevantChanges = aRelevantChanges.concat(aRelevantChangesForSelector);
@@ -161,7 +161,7 @@ sap.ui.define([
 	 * @param {string} sSelectorId - ID of the indicator
 	 * @returns {object} Registered change indicator
 	 */
-	ChangeIndicatorRegistry.prototype.getChangeIndicator = function (sSelectorId) {
+	ChangeIndicatorRegistry.prototype.getChangeIndicator = function(sSelectorId) {
 		return this._oChangeIndicators[sSelectorId];
 	};
 
@@ -170,7 +170,7 @@ sap.ui.define([
 	 *
 	 * @returns {object[]} Registered change indicators
 	 */
-	ChangeIndicatorRegistry.prototype.getChangeIndicators = function () {
+	ChangeIndicatorRegistry.prototype.getChangeIndicators = function() {
 		return values(this._oChangeIndicators || {});
 	};
 
@@ -191,7 +191,7 @@ sap.ui.define([
 			if (sCommandName === "settings" && includes(Object.keys(aCategories), mChangeVisualizationInfo.descriptionPayload.category)) {
 				sChangeCategory = mChangeVisualizationInfo.descriptionPayload.category;
 			} else {
-				sChangeCategory = Object.keys(aCategories).find(function (sChangeCategoryName) {
+				sChangeCategory = Object.keys(aCategories).find(function(sChangeCategoryName) {
 					return includes(aCategories[sChangeCategoryName], sCommandName);
 				});
 				if (!sChangeCategory) {
@@ -228,33 +228,33 @@ sap.ui.define([
 				return undefined;
 			}
 			return aSelectorList
-				.map(function(vSelector) {
-					var oElement = typeof vSelector.getId === "function"
-						? vSelector
-						: JsControlTreeModifier.bySelector(vSelector, oAppComponent);
-					return oElement && oElement.getId();
-				})
-				.filter(Boolean);
+			.map(function(vSelector) {
+				var oElement = typeof vSelector.getId === "function"
+					? vSelector
+					: JsControlTreeModifier.bySelector(vSelector, oAppComponent);
+				return oElement && oElement.getId();
+			})
+			.filter(Boolean);
 		}
 
 		return getInfoFromChangeHandler(oAppComponent, oChange)
-			.then(function(oInfoFromChangeHandler) {
-				var mVisualizationInfo = oInfoFromChangeHandler || {};
-				var aChangeSelectors = oChange.getSelector && oChange.getSelector() && [oChange.getSelector()];
-				var aAffectedElementSelectors = mVisualizationInfo.affectedControls || aChangeSelectors || [];
-				// If there is an original selector (e.g. control is inside a template),
-				// the indicator should be displayed on the host control (change selector)
-				var oChangeOriginalSelector = oChange.getOriginalSelector && oChange.getOriginalSelector();
-				var aDisplayElementSelectors = oChangeOriginalSelector ? aChangeSelectors : aAffectedElementSelectors;
+		.then(function(oInfoFromChangeHandler) {
+			var mVisualizationInfo = oInfoFromChangeHandler || {};
+			var aChangeSelectors = oChange.getSelector && oChange.getSelector() && [oChange.getSelector()];
+			var aAffectedElementSelectors = mVisualizationInfo.affectedControls || aChangeSelectors || [];
+			// If there is an original selector (e.g. control is inside a template),
+			// the indicator should be displayed on the host control (change selector)
+			var oChangeOriginalSelector = oChange.getOriginalSelector && oChange.getOriginalSelector();
+			var aDisplayElementSelectors = oChangeOriginalSelector ? aChangeSelectors : aAffectedElementSelectors;
 
-				return {
-					affectedElementIds: getSelectorIds(aAffectedElementSelectors),
-					dependentElementIds: getSelectorIds(mVisualizationInfo.dependentControls) || [],
-					displayElementIds: getSelectorIds(mVisualizationInfo.displayControls || getSelectorIds(aDisplayElementSelectors)),
-					updateRequired: mVisualizationInfo.updateRequired,
-					descriptionPayload: mVisualizationInfo.descriptionPayload || {}
-				};
-			});
+			return {
+				affectedElementIds: getSelectorIds(aAffectedElementSelectors),
+				dependentElementIds: getSelectorIds(mVisualizationInfo.dependentControls) || [],
+				displayElementIds: getSelectorIds(mVisualizationInfo.displayControls || getSelectorIds(aDisplayElementSelectors)),
+				updateRequired: mVisualizationInfo.updateRequired,
+				descriptionPayload: mVisualizationInfo.descriptionPayload || {}
+			};
+		});
 	}
 
 	function getInfoFromChangeHandler(oAppComponent, oChange) {
@@ -270,19 +270,19 @@ sap.ui.define([
 				modifier: JsControlTreeModifier,
 				layer: oChange.getLayer()
 			})
-				.then(function(oChangeHandler) {
-					if (
-						oChangeHandler && typeof oChangeHandler.getChangeVisualizationInfo === "function"
+			.then(function(oChangeHandler) {
+				if (
+					oChangeHandler && typeof oChangeHandler.getChangeVisualizationInfo === "function"
 						&& oChange.isSuccessfullyApplied && oChange.isSuccessfullyApplied()
-					) {
-						return oChangeHandler.getChangeVisualizationInfo(oChange, oAppComponent);
-					}
-					return undefined;
-				})
-				.catch(function(vErr) {
-					Log.error(vErr);
-					return undefined;
-				});
+				) {
+					return oChangeHandler.getChangeVisualizationInfo(oChange, oAppComponent);
+				}
+				return undefined;
+			})
+			.catch(function(vErr) {
+				Log.error(vErr);
+				return undefined;
+			});
 		}
 
 		return Promise.resolve();
@@ -294,19 +294,19 @@ sap.ui.define([
 	 * @param {string} sSelectorId - The ID of the selector for which the change indicator is registered
 	 * @param {object} oChangeIndicator - The change indicator to register
 	 */
-	ChangeIndicatorRegistry.prototype.registerChangeIndicator = function (sSelectorId, oChangeIndicator) {
+	ChangeIndicatorRegistry.prototype.registerChangeIndicator = function(sSelectorId, oChangeIndicator) {
 		this._oChangeIndicators[sSelectorId] = oChangeIndicator;
 	};
 
 	/**
 	 * Resets the change and change indicator registries.
 	 */
-	ChangeIndicatorRegistry.prototype.reset = function () {
-		Object.keys(this._oRegisteredChanges).forEach(function (sKeyToRemove) {
+	ChangeIndicatorRegistry.prototype.reset = function() {
+		Object.keys(this._oRegisteredChanges).forEach(function(sKeyToRemove) {
 			this.removeRegisteredChange(sKeyToRemove);
 		}.bind(this));
 
-		values(this._oChangeIndicators).forEach(function (oIndicator) {
+		values(this._oChangeIndicators).forEach(function(oIndicator) {
 			oIndicator.destroy();
 		});
 		this._oChangeIndicators = {};
@@ -317,7 +317,7 @@ sap.ui.define([
 	 *
 	 * @param {string} sChangeId - ID of the registered change
 	 */
-	ChangeIndicatorRegistry.prototype.removeRegisteredChange = function (sChangeId) {
+	ChangeIndicatorRegistry.prototype.removeRegisteredChange = function(sChangeId) {
 		delete this._oRegisteredChanges[sChangeId];
 	};
 
@@ -325,7 +325,7 @@ sap.ui.define([
 	 * Removes changes with the updateRequired flag from the registry so the change can be re-registered and
 	 * the visualizationInfo is updated => if an element has an unstable id this updates the id information in the registry (e.g simple forms)
 	 */
-	ChangeIndicatorRegistry.prototype.removeOutdatedRegisteredChanges = function () {
+	ChangeIndicatorRegistry.prototype.removeOutdatedRegisteredChanges = function() {
 		this.getAllRegisteredChanges().forEach(function(oChange) {
 			if (oChange.visualizationInfo && oChange.visualizationInfo.updateRequired) {
 				this.removeRegisteredChange(oChange.change.getId());
@@ -337,7 +337,7 @@ sap.ui.define([
 	 * Removes changes without any displayElementIds from the registry so the change can be re-registered and
 	 * the visualizationInfo is updated => if an element is inside a dialog which hasn't been opened yet
 	 */
-	ChangeIndicatorRegistry.prototype.removeRegisteredChangesWithoutVizInfo = function () {
+	ChangeIndicatorRegistry.prototype.removeRegisteredChangesWithoutVizInfo = function() {
 		this.getAllRegisteredChanges().forEach(function(oChange) {
 			if (oChange.visualizationInfo && oChange.visualizationInfo.displayElementIds.length === 0) {
 				this.removeRegisteredChange(oChange.change.getId());