@openui5/sap.ui.rta 1.138.0 → 1.139.0

package/src/sap/ui/rta/toolbar/Fiori.js

@@ -34,7 +34,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Adaptation
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private
@@ -71,13 +71,9 @@ function(
 			const sLogoPath = this.getUshellApi().getLogo();
 
 			if (sLogoPath) {
-				// get all images from the Fiori Header
-				const aHeaderImages = this._oFioriHeader.getDomRef().querySelectorAll("img");
-				// check if one of the images is the logo
-				const oLogo = Array.from(aHeaderImages).find((oImage) => oImage.src.includes(sLogoPath));
+				const oLogo = this.getUshellApi().getLogoDomRef();
 				let iWidth;
 				let iHeight;
-
 				if (oLogo) {
 					iWidth = oLogo.getBoundingClientRect().width;
 					iHeight = oLogo.getBoundingClientRect().height;
@@ -87,7 +83,6 @@ function(
 				this.getControl("iconSpacer").setWidth("8px");
 				this._iLogoWidth = iWidth + 8;
 
-				// first control is the left HBox
 				this.getControl("iconBox").addItem(
 					new Image(`${this.getId()}_fragment--sapUiRta_icon`, {
 						src: sLogoPath,

package/src/sap/ui/rta/toolbar/FioriLike.js

@@ -22,7 +22,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Adaptation
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/OverflowToolbarButton.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.m.OverflowToolbarButton
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/Standalone.js

@@ -22,7 +22,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Adaptation
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/contextBased/SaveAsAdaptation.js

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/translation/Translation.js

@@ -53,7 +53,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/versioning/Versioning.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -64,7 +64,7 @@ sap.ui.define([
 	 * Constructor for a new sap.ui.rta.util.PluginManager
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @constructor
 	 * @private
 	 * @since 1.86

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

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

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

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @namespace sap.ui.rta.util.ReloadManager
 	 * @alias sap.ui.rta.util.ReloadManager
 	 * @since 1.104
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.EventBus
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @private
 	 * @since 1.56.0
 	 * @alias sap.ui.rta.util.ServiceEventBus

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @constructor
 	 * @private
 	 * @since 1.121

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

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.util.changeVisualization.ChangeIndicator
 	 * @author SAP SE
 	 * @since 1.84.0
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @private
 	 */
 	const ChangeIndicator = Control.extend("sap.ui.rta.util.changeVisualization.ChangeIndicator", {

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

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.util.changeVisualization.ChangeIndicatorRegistry
 	 * @author SAP SE
 	 * @since 1.86.0
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @private
 	 */
 	const ChangeIndicatorRegistry = ManagedObject.extend("sap.ui.rta.util.changeVisualization.ChangeIndicatorRegistry", {
@@ -293,10 +293,11 @@ sap.ui.define([
 
 	/**
 	 * Waits for the registered indicators to be rendered.
-	 * @returns {Promise} Resolves when all registered indicators are rendered.
+	 * @returns {Promise} Resolves when all visible indicators are rendered.
 	 */
 	ChangeIndicatorRegistry.prototype.waitForIndicatorRendering = function() {
-		return Promise.all(this.getChangeIndicators().map((oIndicator) => oIndicator.waitForRendering()));
+		const aVisibleIndicators = this.getChangeIndicators().filter((oIndicator) => oIndicator.getVisible());
+		return Promise.all(aVisibleIndicators.map((oIndicator) => oIndicator.waitForRendering()));
 	};
 
 	/**
@@ -348,4 +349,4 @@ sap.ui.define([
 	};
 
 	return ChangeIndicatorRegistry;
-});
+});

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

@@ -84,7 +84,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.util.changeVisualization.ChangeVisualization
 	 * @author SAP SE
 	 * @since 1.84.0
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @private
 	 */
 	const ChangeVisualization = Control.extend("sap.ui.rta.util.changeVisualization.ChangeVisualization", {
@@ -133,7 +133,6 @@ sap.ui.define([
 			});
 			this._oChangeVisualizationModel.setDefaultBindingMode("TwoWay");
 			this._sSelectedChangeCategory = ChangeCategories.ALL;
-			this._bSetModeChanged = false;
 
 			// For the event handlers to work, the function instance has to remain stable
 			this._fnOnClickHandler = _onClick.bind(this);
@@ -266,10 +265,7 @@ sap.ui.define([
 
 		// Filter allRegisteredChanges for independent changes and get the ids
 		const aRegisteredIndependentChanges = aAllRegisteredChanges.filter(function(oChange) {
-			if (!oChange.dependent) {
-				return true;
-			}
-			return false;
+			return !oChange.dependent;
 		});
 
 		const oSortedChanges = this._determineChangeVisibility(
@@ -336,29 +332,21 @@ sap.ui.define([
 		return `${sBaseText} (${sStateText})`;
 	};
 
-	ChangeVisualization.prototype.openChangeCategorySelectionPopover = function(oEvent) {
+	ChangeVisualization.prototype.openChangeCategorySelectionPopover = async function(oEvent) {
 		// Event bubbled through the toolbar, get original source
-		this._oToolbarButton ||= Element.getElementById(oEvent.getParameter("id"));
-		const oPopover = this.getPopover();
+		this._oToolbarButton ||= Element.getElementById(oEvent?.getParameter("id"));
+		const oPopover = this.getPopover?.();
 
 		if (!oPopover) {
-			Fragment.load({
+			const oPopover = await Fragment.load({
 				name: "sap.ui.rta.util.changeVisualization.ChangeIndicatorCategorySelection",
 				id: `${this._oToolbarButton.sId}--ChangeIndicatorCategorySelection`,
 				controller: this
-			})
-			.then(function(oPopover) {
-				this._oToolbarButton.addDependent(oPopover);
-				oPopover.setModel(this._oChangeVisualizationModel, "visualizationModel");
-				oPopover.openBy(this._oToolbarButton);
-				this.setPopover(oPopover);
-				// Currently required because of an binding issue from the control
-				// At the first opening of the popover the controls don't get updated when the bound
-				// model changes. With the reopening this Problem gets fixed
-				// TODO Remove once control owners have fixed the issue
-				oPopover.close();
-				oPopover.openBy(this._oToolbarButton);
-			}.bind(this));
+			});
+			this._oToolbarButton.addDependent(oPopover);
+			oPopover.setModel(this._oChangeVisualizationModel, "visualizationModel");
+			oPopover.openBy(this._oToolbarButton);
+			this.setPopover(oPopover);
 			return;
 		}
 
@@ -633,7 +621,7 @@ sap.ui.define([
 		// Set the tabindex according the sorting
 		// Focus the first visible indicator
 		await this._oChangeIndicatorRegistry.waitForIndicatorRendering();
-		const aVisibleIndicators = [];
+
 		this._oChangeIndicatorRegistry.getChangeIndicators().forEach((oIndicator) => {
 			const oOverlay = OverlayRegistry.getOverlay(oIndicator.getOverlayId());
 			// As setting the focus happens asynchronously after rendering,
@@ -643,12 +631,12 @@ sap.ui.define([
 			}
 			if (oIndicator.getVisible()) {
 				oOverlay.setFocusable(true);
-				aVisibleIndicators.push(oIndicator);
 			} else {
 				oOverlay.setFocusable(false);
 			}
 		});
 
+		const aVisibleIndicators = this._oChangeIndicatorRegistry.getChangeIndicators().filter((oIndicator) => oIndicator.getVisible());
 		if (aVisibleIndicators.length > 0) {
 			aVisibleIndicators.sort(function(oIndicator1, oIndicator2) {
 				const iDeltaY = oIndicator1.getPosY() - oIndicator2.getPosY();

package/src/sap/ui/rta/util/guidedTour/GuidedTour.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @class Constructor for a new sap.ui.rta.util.guidedTour.GuidedTour
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @constructor
 	 * @since 1.136
 	 * @private
@@ -99,6 +99,13 @@ sap.ui.define([
 		}
 	}
 
+	function restorePopoverModality() {
+		// If the affected control was a Popover, we need to restore the modal state
+		if (this._oAffectedControl?.isA("sap.m.Popover")) {
+			this._oAffectedControl.setModal(this._oAffectedControlOriginalModalState);
+		}
+	}
+
 	GuidedTour.prototype.autoStart = async function(oTourContent) {
 		const sResponse = await Utils.showMessageBox(
 			"information",
@@ -152,16 +159,23 @@ sap.ui.define([
 		try {
 			for (const sActionSelector of aActionSelectors) {
 				const oActionControl = await waitForElementVisibility.call(this, sActionSelector);
-				oActionControl.firePress();
+				await oActionControl.firePress();
 			}
 
-			const oAffectedControl = oStepConfig.waitForElement
+			this._oAffectedControl = oStepConfig.waitForElement
 				? await waitForElementVisibility.call(this, sSelector)
 				: Element.getElementById(sSelector);
 
 			// Open the popover if the element is visible
-			if (oAffectedControl && oAffectedControl.getVisible()) {
-				this._oPopover.openBy(oAffectedControl);
+			if (this._oAffectedControl && this._oAffectedControl.getVisible()) {
+				// If the affected control is a Popover, we need to open it modal
+				// because if the affected control is not modal, it could be closed
+				// this would also close the Guided Tour Popover
+				if (this._oAffectedControl.isA("sap.m.Popover")) {
+					this._oAffectedControlOriginalModalState = this._oAffectedControl.getModal();
+					this._oAffectedControl.setModal(true);
+				}
+				this._oPopover.openBy(this._oAffectedControl);
 			} else {
 				skipStep.call(this);
 			}
@@ -184,6 +198,7 @@ sap.ui.define([
 	};
 
 	GuidedTour.prototype.onNextPress = function() {
+		restorePopoverModality.call(this);
 		this.setProperty("forwardDirection", true);
 		this._oPopover.close();
 		const nCurrentStep = this.getCurrentStep();
@@ -200,6 +215,7 @@ sap.ui.define([
 	};
 
 	GuidedTour.prototype.onPreviousPress = function() {
+		restorePopoverModality.call(this);
 		this.setProperty("forwardDirection", false);
 		this._oPopover.close();
 		const nCurrentStep = this.getCurrentStep();
@@ -225,6 +241,7 @@ sap.ui.define([
 	};
 
 	GuidedTour.prototype.onClosePress = async function() {
+		restorePopoverModality.call(this);
 		this._oPopover.close();
 		this.fireTourClosed();
 		this.destroy();

package/src/sap/ui/rta/util/guidedTour/TourMarker.fragment.xml

@@ -36,7 +36,7 @@
 			<OverflowToolbar>
 				<ToolbarSpacer/>
 				<Button
-					id="previewsButton"
+					id="previousButton"
 					text="{i18n>BTN_GUIDED_TOUR_PREV}"
 					visible="{= !${/isFirstStep}}"
 					press=".onPreviousPress" />

package/src/sap/ui/rta/util/guidedTour/content/GeneralTour.js

@@ -129,7 +129,7 @@ sap.ui.define([
 				title: oTextResources.getText("TIT_TOUR_GENERAL_STEP_VERSIONS_DROPDOWN_TITLE"),
 				description: oTextResources.getText("TXT_TOUR_GENERAL_STEP_VERSIONS_DROPDOWN_DESCRIPTION"),
 				listContent: [],
-				markerSelector: "sapUIRta_toolbar_fragment--sapUiRta_versionHistoryDialog--originalVersionList",
+				markerSelector: "sapUIRta_toolbar_fragment--sapUiRta_versionHistoryDialog--popover",
 				waitForElement: true,
 				actionSelectors: ["sapUIRta_toolbar_fragment--sapUiRta_versionButton"]
 			},

package/src/sap/ui/rta/util/whatsNew/WhatsNew.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @class Constructor for a new sap.ui.rta.util.whatsNew.WhatsNew
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @constructor
 	 * @since 1.129
 	 * @private
@@ -73,8 +73,7 @@ sap.ui.define([
 		this.aUnseenFeatures = await WhatsNewUtils.getFilteredFeatures(aDontShowAgainFeatureIds, this.getLayer());
 	};
 
-	WhatsNew.prototype.initializeWhatsNewDialog = async function(aExcludeFeatureIds = []) {
-		const aDontShowAgainFeatureIds = await FeaturesAPI.getSeenFeatureIds({ layer: this.getLayer() });
+	WhatsNew.prototype.initializeWhatsNewDialog = async function(aDontShowAgainFeatureIds, aExcludeFeatureIds = []) {
 		await this.setDontShowAgainFeatureIds(aDontShowAgainFeatureIds);
 		if (this.aUnseenFeatures.length === 0 || this.getLayer() !== "CUSTOMER") {
 			return;