@openui5/sap.ui.rta 1.101.0 → 1.102.0

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

@@ -68,7 +68,7 @@ sap.ui.define([
 	 * Constructor for a new sap.ui.rta.util.PluginManager
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 * @constructor
 	 * @private
 	 * @since 1.86
@@ -213,7 +213,7 @@ sap.ui.define([
 			if (
 				oFlexSettings.layer === Layer.CUSTOMER
 				&& oSettings
-				&& !oSettings.isVersioningEnabled(oFlexSettings.layer)
+				&& oSettings.isPublicLayerAvailable()
 			) {
 				this._mDefaultPlugins["localReset"] = new LocalResetPlugin({
 					commandFactory: this._oCommandFactory

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

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * Constructor for a new sap.ui.rta.util.PopupManager
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 * @constructor
 	 * @private
 	 * @since 1.48

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

@@ -19,7 +19,7 @@ function(
 	 *
 	 * @extends sap.ui.core.EventBus
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 * @private
 	 * @since 1.56.0
 	 * @alias sap.ui.rta.util.ServiceEventBus

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

@@ -4,43 +4,59 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/rta/RuntimeAuthoring",
+	"sap/base/Log",
 	"sap/ui/core/Control",
-	"sap/ui/fl/Utils",
-	"sap/ui/fl/Layer",
-	"sap/ui/fl/write/api/FeaturesAPI",
 	"sap/ui/core/UIComponent",
-	"sap/base/Log",
+	"sap/ui/fl/write/api/FeaturesAPI",
 	"sap/ui/fl/write/api/PersistenceWriteAPI",
-	"sap/ui/rta/util/showMessageBox"
+	"sap/ui/fl/Layer",
+	"sap/ui/fl/Utils",
+	"sap/ui/rta/util/showMessageBox",
+	"sap/ui/rta/RuntimeAuthoring"
 ], function(
-	RuntimeAuthoring,
+	Log,
 	Control,
-	FlexUtils,
-	Layer,
-	FeaturesAPI,
 	UIComponent,
-	Log,
+	FeaturesAPI,
 	PersistenceWriteAPI,
-	showMessageBox
+	Layer,
+	FlexUtils,
+	showMessageBox,
+	RuntimeAuthoring
 ) {
 	"use strict";
 
 	function checkKeyUser(sLayer) {
 		if (Layer.CUSTOMER === sLayer) {
 			return FeaturesAPI.isKeyUser()
-				.then(function (bIsKeyUser) {
+				.then(function(bIsKeyUser) {
 					if (!bIsKeyUser) {
-						throw new Error("Key user rights have not been granted to the current user");
+						var oError = Error("Key user rights have not been granted to the current user");
+						oError.reason = "isKeyUser";
+						throw oError;
 					}
 				});
 		}
 		return Promise.resolve();
 	}
 
+	function checkFlexEnabled(oAppComponent) {
+		var oManifest = oAppComponent.getManifest() || {};
+		var vFlexEnabled = oManifest["sap.ui5"] && oManifest["sap.ui5"].flexEnabled;
+
+		if (vFlexEnabled === false) {
+			var oError = Error("This app is not enabled for key user adaptation");
+			oError.reason = "flexEnabled";
+			throw oError;
+		}
+	}
+
 	/**
 	 * Starter util for UI adaptation.
 	 * With this API you are also able to modify the UI adaptation plugins list and or add some event handler functions to be called on start, failed and stop events.
+	 * The function also checks for the Key User authorization and the <code>flexEnabled</code> flag in the manifest.
+	 * If either check is not passed successfully the function returns a rejected Promise.
+	 *
 	 * @param {object} mOptions - Object with properties
 	 * @param {sap.ui.core.Control|sap.ui.core.UIComponent} mOptions.rootControl - Control instance to get the AppComponent. This then is used to start UI adaptation.
 	 * @param {function} [loadPlugins] - Callback function that enables the modification of the default plugin list of UI adaptation. UI adaptation is passed to this function and it should return a promise
@@ -51,78 +67,84 @@ sap.ui.define([
 	 * @private
 	 */
 	function adaptationStarter(mOptions, loadPlugins, onStart, onFailed, onStop) {
-		if (!(mOptions.rootControl instanceof Control) && !(mOptions.rootControl instanceof UIComponent)) {
-			return Promise.reject(new Error("An invalid root control was passed"));
-		}
-
 		var oRta;
-		return checkKeyUser(mOptions.flexSettings.layer)
-			.then(function () {
-				mOptions.rootControl = FlexUtils.getAppComponentForControl(mOptions.rootControl);
 
-				oRta = new RuntimeAuthoring(mOptions);
+		return Promise.resolve().then(function() {
+			if (!(mOptions.rootControl instanceof Control) && !(mOptions.rootControl instanceof UIComponent)) {
+				var oError = Error("An invalid root control was passed");
+				oError.reason = "rootControl";
+				throw oError;
+			}
+			mOptions.rootControl = FlexUtils.getAppComponentForControl(mOptions.rootControl);
+		})
+		.then(checkKeyUser.bind(undefined, mOptions.flexSettings.layer))
+		.then(function() {
+			return checkFlexEnabled(mOptions.rootControl);
+		})
+		.then(function() {
+			oRta = new RuntimeAuthoring(mOptions);
 
-				if (onStart) {
-					oRta.attachEvent("start", onStart);
-				}
-				if (onFailed) {
-					oRta.attachEvent("failed", onFailed);
-				}
-				var fnOnStop = onStop || function () {
-					oRta.destroy();
-				};
-				oRta.attachEvent("stop", fnOnStop);
+			if (onStart) {
+				oRta.attachEvent("start", onStart);
+			}
+			if (onFailed) {
+				oRta.attachEvent("failed", onFailed);
+			}
+			var fnOnStop = onStop || function() {
+				oRta.destroy();
+			};
+			oRta.attachEvent("stop", fnOnStop);
 
-				if (loadPlugins) {
-					return loadPlugins(oRta);
-				}
-			})
-			.then(function() {
-				return oRta.start();
-			})
-			.then(function() {
-				if (mOptions.flexSettings.layer === "CUSTOMER") {
-					var mPropertyBag = {
-						oComponent: mOptions.rootControl,
-						selector: mOptions.rootControl,
-						invalidateCache: false,
-						includeVariants: true,
-						includeCtrlVariants: true,
-						currentLayer: Layer.CUSTOMER
-					};
+			if (loadPlugins) {
+				return loadPlugins(oRta);
+			}
+		})
+		.then(function() {
+			return oRta.start();
+		})
+		.then(function() {
+			if (mOptions.flexSettings.layer === "CUSTOMER") {
+				var mPropertyBag = {
+					oComponent: mOptions.rootControl,
+					selector: mOptions.rootControl,
+					invalidateCache: false,
+					includeVariants: true,
+					includeCtrlVariants: true,
+					currentLayer: Layer.CUSTOMER
+				};
 
-					PersistenceWriteAPI.getChangesWarning(mPropertyBag)
-						.then(function(oWarningMessage) {
-							if (oWarningMessage.showWarning) {
-								var oRtaResourceBundle = sap.ui.getCore().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"
-									};
+				PersistenceWriteAPI.getChangesWarning(mPropertyBag)
+					.then(function(oWarningMessage) {
+						if (oWarningMessage.showWarning) {
+							var oRtaResourceBundle = sap.ui.getCore().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"
-								);
-							}
-						});
-				}
-				return oRta;
-			})
-			.catch(function(vError) {
-				if (vError !== "Reload triggered") {
-					Log.error("UI Adaptation could not be started", vError.message);
-				}
-				throw vError;
-			});
+							showMessageBox(
+								oRtaResourceBundle.getText(oMessageProps.text),
+								{
+									title: oRtaResourceBundle.getText(oMessageProps.title)
+								},
+								"warning"
+							);
+						}
+					});
+			}
+			return oRta;
+		})
+		.catch(function(vError) {
+			if (vError !== "Reload triggered") {
+				Log.error("UI Adaptation could not be started", vError.message);
+			}
+			throw vError;
+		});
 	}
 	return adaptationStarter;
 });

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

@@ -48,7 +48,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.util.changeVisualization.ChangeIndicator
 	 * @author SAP SE
 	 * @since 1.84.0
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 * @private
 	 */
 	var ChangeIndicator = Control.extend("sap.ui.rta.util.changeVisualization.ChangeIndicator", {
@@ -142,6 +142,9 @@ sap.ui.define([
 
 			this._fnHoverTrue = this._toggleHoverStyleClasses.bind(this, true);
 			this._fnHoverFalse = this._toggleHoverStyleClasses.bind(this, false);
+			// is needed to prevent that multiple events listeners are attached
+			// to the same overlay because setVisible is called multiple times
+			this._bEventAttachedToElement = false;
 		}
 	});
 
@@ -175,10 +178,13 @@ sap.ui.define([
 		var oOverlay = Core.byId(this.getOverlayId());
 		// needed because the change indicator cleanup is only triggered on save and exit
 		if (oOverlay) {
-			if (bVisible) {
+			if (bVisible && !this._bEventAttachedToElement) {
 				handleBrowserEventsOnElement.call(this, oOverlay, "attachBrowserEvent");
-			} else {
+				this._bEventAttachedToElement = true;
+			}
+			if (!bVisible) {
 				handleBrowserEventsOnElement.call(this, oOverlay, "detachBrowserEvent");
+				this._bEventAttachedToElement = false;
 				if (this.getAggregation("_popover")) {
 					this.getAggregation("_popover").destroy();
 				}

package/src/sap/ui/rta/util/changeVisualization/ChangeIndicatorPopover.fragment.xml

@@ -5,7 +5,7 @@
 	<Popover
 		showHeader="false"
 		placement="PreferredTopOrFlip"
-		class="sapUiRtaPopover">
+		class="sapUiRtaPopover sapUiRtaChangeVisualizationPopover">
 		<Table
 			ariaLabelledBy="Changes"
 			items="{details>/}"

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.util.changeVisualization.ChangeIndicatorRegistry
 	 * @author SAP SE
 	 * @since 1.86.0
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 * @private
 	 */
 	var ChangeIndicatorRegistry = ManagedObject.extend("sap.ui.rta.util.changeVisualization.ChangeIndicatorRegistry", {
@@ -168,11 +168,6 @@ sap.ui.define([
 			}
 		};
 
-		// Only register changes that are valid for visualization
-		if (oNewChangeInformation.commandCategory === undefined) {
-			return;
-		}
-
 		this._oChanges[oChange.getId()] = oNewChangeInformation;
 	};
 

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

@@ -93,7 +93,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.util.changeVisualization.ChangeVisualization
 	 * @author SAP SE
 	 * @since 1.84.0
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 * @private
 	 */
 	var ChangeVisualization = Control.extend("sap.ui.rta.util.changeVisualization.ChangeVisualization", {
@@ -170,9 +170,7 @@ sap.ui.define([
 
 	ChangeVisualization.prototype.exit = function() {
 		this._oChangeIndicatorRegistry.destroy();
-		if (this.oRootOverlay) {
-			this.oRootOverlay.getDomRef().removeEventListener("click", this._fnOnClickHandler, { capture: true });
-		}
+		this._toggleRootOverlayClickHandler(false);
 	};
 
 	ChangeVisualization.prototype._reset = function() {
@@ -587,6 +585,25 @@ sap.ui.define([
 		aVisibleIndicators[0].focus();
 	};
 
+	ChangeVisualization.prototype._toggleRootOverlayClickHandler = function (bEnable) {
+		var oRootOverlayDomRef = this.oRootOverlay && this.oRootOverlay.getDomRef();
+		if (oRootOverlayDomRef) {
+			if (bEnable) {
+				oRootOverlayDomRef.addEventListener(
+					"click",
+					this._fnOnClickHandler,
+					{ capture: true }
+				);
+			} else {
+				oRootOverlayDomRef.removeEventListener(
+					"click",
+					this._fnOnClickHandler,
+					{ capture: true }
+				);
+			}
+		}
+	};
+
 	/**
 	 * Triggers the mode switch (on/off).
 	 *
@@ -599,14 +616,10 @@ sap.ui.define([
 
 		if (this.getIsActive()) {
 			this.setIsActive(false);
-			if (this.oRootOverlay) {
-				this.oRootOverlay.getDomRef().removeEventListener("click", this._fnOnClickHandler, { capture: true });
-			}
+			this._toggleRootOverlayClickHandler(false);
 			return;
 		}
-		if (this.oRootOverlay) {
-			this.oRootOverlay.getDomRef().addEventListener("click", this._fnOnClickHandler, { capture: true });
-		}
+		this._toggleRootOverlayClickHandler(true);
 		if (!this.getRootControlId()) {
 			this.setRootControlId(oRootControl);
 		}

package/src/sap/ui/rta/themes/sap_hcb/Toolbar.standalone.less

@@ -1,9 +0,0 @@
-/* type: standalone */
-.sapUiRtaToolbar.type_standalone.color_default .sapMBtn .sapMBtnContent,
-.sapUiRtaToolbar.type_standalone.color_default .sapMBtn .sapMBtnTransparent .sapMBtnIcon {
-	color: inherit;
-	}
-	.sapUiRtaToolbar.type_standalone.color_default .sapMBtn.sapMBtnDisabled .sapMBtnContent,
-	.sapUiRtaToolbar.type_standalone.color_default .sapMBtn.sapMBtnDisabled .sapMBtnIcon {
-		color: inherit;
-		}