@sapui5/sap.ushell 1.138.1 → 1.139.0

package/src/main/js/sap/ushell/components/pages/controller/PageRuntime.controller.js

@@ -1,12 +1,13 @@
-//Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 
 /**
  * @file PageRuntime controller for PageRuntime view
- * @version 1.138.1
+ * @version 1.139.0
  */
 sap.ui.define([
     "sap/ui/core/Element",
     "sap/ui/core/EventBus",
+    "sap/ui/core/CustomData",
     "sap/ushell/library",
     "sap/ui/core/mvc/Controller",
     "sap/ui/events/KeyCodes",
@@ -30,11 +31,13 @@ sap.ui.define([
     "sap/ushell/ui/launchpad/ActionItem",
     "sap/ushell/ui/launchpad/Section",
     "sap/ushell/Container",
-    /* jQuery Plugin "firstFocusableDomRef"*/
+    "sap/ushell/navigation/NavigationState",
+    /* jQuery Plugin "firstFocusableDomRef" */
     "sap/ui/dom/jquery/Focusable"
-], function (
+], (
     Element,
     EventBus,
+    CustomData,
     ushellLibrary,
     Controller,
     KeyCodes,
@@ -57,15 +60,16 @@ sap.ui.define([
     Log,
     ActionItem,
     Section,
-    Container
-) {
+    Container,
+    NavigationState
+) => {
     "use strict";
 
     // shortcut for sap.m.LoadState
-    var LoadState = mLibrary.LoadState;
+    const LoadState = mLibrary.LoadState;
 
     // shortcut for sap.ushell.DisplayFormat
-    var DisplayFormat = ushellLibrary.DisplayFormat;
+    const DisplayFormat = ushellLibrary.DisplayFormat;
 
     /**
      * Controller of the PagesRuntime view.
@@ -105,6 +109,7 @@ sap.ui.define([
                 showHideButton: Config.last("/core/catalog/enableHideGroups"),
                 showAddButton: Config.last("/core/catalog/enabled"),
                 personalizationEnabled: Config.last("/core/shell/enablePersonalization"),
+                isNavigationRunning: NavigationState.isNavigationRunning(),
                 addToMyHomeOnly: false,
                 gridContainerGap: [],
                 gridContainerRowSize: []
@@ -113,9 +118,9 @@ sap.ui.define([
 
             this._sMyHomePageId = Config.last("/core/spaces/myHome/myHomePageId");
 
-            this._aConfigListeners = Config.on("/core/home/sizeBehavior").do(function (sSizeBehavior) {
+            this._aConfigListeners = Config.on("/core/home/sizeBehavior").do((sSizeBehavior) => {
                 this._oViewSettingsModel.setProperty("/sizeBehavior", sSizeBehavior);
-            }.bind(this));
+            });
 
             this._oErrorPageModel = new JSONModel({
                 title: "",
@@ -129,14 +134,14 @@ sap.ui.define([
             this.oInitFinishedPromise = Promise.all([
                 this._oVisualizationInstantiationServicePromise,
                 this.getOwnerComponent().getPagesService()
-            ]).then(function (aServices) {
+            ]).then((aServices) => {
                 // bind the model only when the vizInstance service is loaded so that it
                 // can be used in the factory function synchronously
                 this._oVisualizationInstantiationService = aServices[0];
                 this.getView().setModel(aServices[1].getModel());
-            }.bind(this));
+            });
 
-            var oRenderer = Container.getRendererInternal();
+            const oRenderer = Container.getRendererInternal();
             this.bIsHomeIntentRootIntent = ushellUtils.isFlpHomeIntent(oRenderer.getShellConfig().rootIntent);
             this.oErrorPage = this.byId("errorPage");
             this.oEmptyPage = this.byId("emptyPage");
@@ -154,38 +159,40 @@ sap.ui.define([
             this._oEventBus.subscribe("launchpad", "shellFloatingContainerIsDocked", this._handleUshellContainerDocked, this);
             this._oEventBus.subscribe("launchpad", "shellFloatingContainerIsUnDocked", this._handleUshellContainerDocked, this);
 
-            this.oVisualizationInstantiationListener = EventHub.on("VizInstanceLoaded").do(function () {
+            NavigationState.attachNavigationStateChanged(this._handleNavigationStateChanged, this);
+
+            this.oVisualizationInstantiationListener = EventHub.on("VizInstanceLoaded").do(() => {
                 this._setPerformanceMark("FLP-TTI-Homepage");
-                //Should be adjusted after next iteration of the VisualizationInstantiation
+                // Should be adjusted after next iteration of the VisualizationInstantiation
                 if (!this.oVisualizationInstantiationListenerTimeout) {
-                    //Currently there is no good place to mark TTI time, because all visualizations
-                    //are loaded async and update visualizations views directly through setAggregation.
-                    //For this reason, we listen to the loading of the all static and dynamic tiles
-                    //and mark the last time. Timeout in 5 sec in order to avoid the cases when
-                    //personalization or other interaction  replace the TTI time
-                    this.oVisualizationInstantiationListenerTimeout = setTimeout(function () {
+                    // Currently there is no good place to mark TTI time, because all visualizations
+                    // are loaded async and update visualizations views directly through setAggregation.
+                    // For this reason, we listen to the loading of the all static and dynamic tiles
+                    // and mark the last time. Timeout in 5 sec in order to avoid the cases when
+                    // personalization or other interaction  replace the TTI time
+                    this.oVisualizationInstantiationListenerTimeout = setTimeout(() => {
                         this.oVisualizationInstantiationListener.off();
-                    }.bind(this), 5000);
+                    }, 5000);
                 }
-            }.bind(this));
+            });
 
             this.fnBoundSetGridContainerSizes = this._setGridContainerSizes.bind(this);
             Config.on("/core/home/sizeBehavior").do(this.fnBoundSetGridContainerSizes);
             EventHub.on("themeChanged").do(this.fnBoundSetGridContainerSizes);
 
             this.sCurrentTargetPageId = "";
-            this._oInitPromise = this._openFLPPage().then(function () {
+            this._oInitPromise = this._openFLPPage().then(() => {
                 // The NavContainer handles initial focus which lands on the emptyPage instead of the loaded page after first render
                 // Therefore we are focusing the first item on first render in case there is no item focused yet
                 if (!document.activeElement || document.activeElement === document.body) {
-                    var oCurrentPage = this.oPagesNavContainer.getCurrentPage();
-                    var oCurrentLaunchpadPage = oCurrentPage && oCurrentPage.getContent()[0];
-                    var oFirstSection = oCurrentLaunchpadPage && oCurrentLaunchpadPage.getSections()[0];
+                    const oCurrentPage = this.oPagesNavContainer.getCurrentPage();
+                    const oCurrentLaunchpadPage = oCurrentPage && oCurrentPage.getContent()[0];
+                    const oFirstSection = oCurrentLaunchpadPage && oCurrentLaunchpadPage.getSections()[0];
                     if (oFirstSection) {
                         oFirstSection.focus();
                     } else {
                         // jQuery Plugin "firstFocusableDomRef"
-                        var oFocusableDomRef = this.oPagesNavContainer.$().firstFocusableDomRef();
+                        const oFocusableDomRef = this.oPagesNavContainer.$().firstFocusableDomRef();
                         if (oFocusableDomRef) {
                             oFocusableDomRef.focus();
                         }
@@ -195,24 +202,24 @@ sap.ui.define([
                 if (!this.getOwnerComponent().getNavigationDisabled()) {
                     // add listener to the router after the rendering the page in order to avoid page re-rendering
                     this.oContainerRouter = oRenderer.getRouter();
-                    this.oContainerRouter.getRoute("home").attachMatched(this.onRouteMatched.bind(this, true /* bIsHomeRoute*/));
+                    this.oContainerRouter.getRoute("home").attachMatched(this.onRouteMatched.bind(this, true /* bIsHomeRoute */));
                     this.oContainerRouter.getRoute("openFLPPage").attachMatched(this.onRouteMatched.bind(this, false));
                 }
-            }.bind(this));
+            });
         },
 
         /**
          * Set the section grid container gap and row size for different screen sizes
          */
         _setGridContainerSizes: async function () {
-            var sSizeBehavior = Config.last("/core/home/sizeBehavior");
-            var oViewSettingsModel = this.getView().getModel("viewSettings");
+            const sSizeBehavior = Config.last("/core/home/sizeBehavior");
+            const oViewSettingsModel = this.getView().getModel("viewSettings");
 
-            var sTileGapParam = (sSizeBehavior === "Small")
+            const sTileGapParam = (sSizeBehavior === "Small")
                 ? "_sap_ushell_Tile_SpacingXS"
                 : "_sap_ushell_Tile_Spacing";
 
-            var sTileGapParamS = (sSizeBehavior === "Small")
+            const sTileGapParamS = (sSizeBehavior === "Small")
                 ? "_sap_ushell_Tile_SpacingXS"
                 : "_sap_ushell_Tile_SpacingS";
 
@@ -225,11 +232,11 @@ sap.ui.define([
             oViewSettingsModel.setProperty("/gridContainerGap/gridContainerGapL", this._formatNumericThemeParam(sGap));
             oViewSettingsModel.setProperty("/gridContainerGap/gridContainerGapXL", this._formatNumericThemeParam(sGap));
 
-            var sTileWidthParam = (sSizeBehavior === "Small")
+            const sTileWidthParam = (sSizeBehavior === "Small")
                 ? "_sap_ushell_Tile_WidthXS"
                 : "_sap_ushell_Tile_Width";
 
-            var sTileWidthParamS = (sSizeBehavior === "Small")
+            const sTileWidthParamS = (sSizeBehavior === "Small")
                 ? "_sap_ushell_Tile_WidthXS"
                 : "_sap_ushell_Tile_WidthS";
 
@@ -251,7 +258,7 @@ sap.ui.define([
          */
         _formatNumericThemeParam: function (sValue) {
             if (sValue && sValue.indexOf(".") === 0) {
-                sValue = "0" + sValue;
+                sValue = `0${sValue}`;
             }
             return sValue;
         },
@@ -262,10 +269,10 @@ sap.ui.define([
 
         _getMyHomeTitle: function () {
             return Container.getServiceAsync("Menu")
-                .then(function (oMenuService) {
+                .then((oMenuService) => {
                     return oMenuService.getMyHomeSpace();
                 })
-                .then(function (oHomeSpace) {
+                .then((oHomeSpace) => {
                     if (!oHomeSpace || !oHomeSpace.children.length) {
                         return "";
                     }
@@ -278,8 +285,8 @@ sap.ui.define([
          * Creates the action mode button.
          */
         _onFirstPageRendering: function () {
-            var bPersonalizationEnabled = Config.last("/core/shell/enablePersonalization");
-            var bMyHomeEnabled = this._isMyHomeEnabled();
+            const bPersonalizationEnabled = Config.last("/core/shell/enablePersonalization");
+            const bMyHomeEnabled = this._isMyHomeEnabled();
             if (bPersonalizationEnabled) {
                 this._createActionModeButton();
             } else if (bMyHomeEnabled) {
@@ -289,6 +296,11 @@ sap.ui.define([
             EventHub.emit("firstSegmentCompleteLoaded", true);
         },
 
+        _handleNavigationStateChanged: function (oEvent) {
+            const bIsNavigationRunning = oEvent.getParameter("isNavigationRunning");
+            this._oViewSettingsModel.setProperty("/isNavigationRunning", bIsNavigationRunning);
+        },
+
         /**
          * Updates the homeUri in the shell header
          * @param {object} oCurrentSpaceAndPage The current space and page
@@ -299,8 +311,8 @@ sap.ui.define([
         _updateHomeUri: function (oCurrentSpaceAndPage) {
             const sRootIntent = Config.last("/core/shellHeader/rootIntent");
             if (Config.last("/core/spaces/homeNavigationTarget") === "origin_page") {
-                var sNewHash = oCurrentSpaceAndPage ? encodeURI(oCurrentSpaceAndPage.hash) : sRootIntent;
-                Config.emit("/core/shellHeader/homeUri", "#" + sNewHash);
+                const sNewHash = oCurrentSpaceAndPage ? encodeURI(oCurrentSpaceAndPage.hash) : sRootIntent;
+                Config.emit("/core/shellHeader/homeUri", `#${sNewHash}`);
             }
         },
 
@@ -311,8 +323,8 @@ sap.ui.define([
          * @private
          */
         onRouteMatched: function (bIsHomeRoute) {
-            var bIsHomeAppEnabled = Config.last("/core/homeApp/enabled");
-            var bNavigationToHomeApp = bIsHomeAppEnabled && bIsHomeRoute;
+            const bIsHomeAppEnabled = Config.last("/core/homeApp/enabled");
+            const bNavigationToHomeApp = bIsHomeAppEnabled && bIsHomeRoute;
 
             Log.debug("cep/editMode: on Route matched", "Page runtime");
             // Remove home page and display target page
@@ -335,13 +347,13 @@ sap.ui.define([
 
             // Hide "[Edit Current Page]" button of page`s runtime
             // if custom home app is displayed
-            var oActionModeButton = Element.getElementById("ActionModeBtn");
+            const oActionModeButton = Element.getElementById("ActionModeBtn");
             if (!oActionModeButton) {
                 return;
             }
 
-            var oRenderer = Container.getRendererInternal("fiori2");
-            var oStateInfo = this._getStateInfoActionModeButton();
+            const oRenderer = Container.getRendererInternal("fiori2");
+            const oStateInfo = this._getStateInfoActionModeButton();
 
             if (bNavigationToHomeApp) {
                 if (this._moveEditActionToHeader()) {
@@ -394,10 +406,10 @@ sap.ui.define([
             }
             this._sActionModeTextId = sTextId; // For the case when the Action Mode button was not created yet.
 
-            this._getMyHomeTitle().then(function (sTitle) {
-                var oActionModeButton = Element.getElementById("ActionModeBtn");
+            this._getMyHomeTitle().then((sTitle) => {
+                const oActionModeButton = Element.getElementById("ActionModeBtn");
                 if (oActionModeButton) {
-                    var sActionModeText = resources.i18n.getText(sTextId, [sTitle]);
+                    const sActionModeText = resources.i18n.getText(sTextId, [sTitle]);
                     oActionModeButton.setText(sActionModeText);
                     oActionModeButton.setTooltip(sActionModeText);
                 }
@@ -408,8 +420,8 @@ sap.ui.define([
         // Special logic for "Add Tiles to My Home" when personalization is disabled.
         // bMyHomeActive means that the My Home page is the currently visible one.
         _setActionModeLogic: function (bMyHomeActive) {
-            var bEnableEditing = false;
-            var bAddToMyHomeOnly = false;
+            let bEnableEditing = false;
+            let bAddToMyHomeOnly = false;
 
             if (Config.last("/core/shell/enablePersonalization")) {
                 bEnableEditing = true; // Most usual case, the Action Mode button has the text "Edit Current Page"
@@ -436,7 +448,6 @@ sap.ui.define([
         _openFLPPage: function () {
             return PagesAndSpaceId.getPageAndSpaceId()
                 .then(({ pageId, spaceId }) => {
-
                     // this property may be updated by consecutive calls to _openFLPPage and prevents race conditions when opening pages
                     this.sCurrentTargetPageId = pageId;
                     this.sCurrentTargetSpaceId = spaceId;
@@ -456,11 +467,11 @@ sap.ui.define([
                             return this.getOwnerComponent().getPagesService();
                         })
                         .then((pagesService) => {
-                            Log.debug("cep/editMode: load Page: " + pageId, "Page runtime");
+                            Log.debug(`cep/editMode: load Page: ${pageId}`, "Page runtime");
                             return pagesService.loadPage(pageId);
                         })
                         .then(async () => {
-                            Log.debug("cep/editMode: load Page: show action mode button " + pageId, "Page runtime");
+                            Log.debug(`cep/editMode: load Page: show action mode button ${pageId}`, "Page runtime");
                             this._showActionModeButton();
                             if (this.sCurrentTargetPageId === pageId) {
                                 const bMyHomeActive = this._isMyHomeRouteActive();
@@ -535,7 +546,7 @@ sap.ui.define([
          * @since 1.72.0
          */
         _navigate: async function (targetPageId, spaceId, keepActionMode) {
-            const oPageControl = this.oPagesNavContainer.getPages().find(function (oControl) {
+            const oPageControl = this.oPagesNavContainer.getPages().find((oControl) => {
                 return targetPageId === oControl.data("pageId");
             });
 
@@ -561,7 +572,7 @@ sap.ui.define([
             const bMenu = Config.last("/core/menu/enabled");
             const bSideNav = Config.last("/core/sideNavigation/enabled");
             const bSideNavMode = Config.last("/core/sideNavigation/mode");
-            const bShowSpaceInTitle =  !bIsPinned || bIsPinned && !bMenu && bSideNav && bSideNavMode === "Popover";
+            const bShowSpaceInTitle = !bIsPinned || bIsPinned && !bMenu && bSideNav && bSideNavMode === "Popover";
 
             // The properties title and showTitle have to be set per page control and not only
             // once in the view settings model to avoid a flickering during navigation between pages.
@@ -689,11 +700,11 @@ sap.ui.define([
         _copyToClipboard: function () {
             let sError;
             if (this._oErrorPageModel.getProperty("/pageAndSpaceId")) {
-                sError = this._oErrorPageModel.getProperty("/technicalError") + "\n" + this._oErrorPageModel.getProperty("/pageAndSpaceId");
+                sError = `${this._oErrorPageModel.getProperty("/technicalError")}\n${this._oErrorPageModel.getProperty("/pageAndSpaceId")}`;
             } else {
                 sError = this._oErrorPageModel.getProperty("/technicalError");
             }
-            var bResult = ushellUtils.copyToClipboard(sError);
+            const bResult = ushellUtils.copyToClipboard(sError);
             if (bResult) {
                 MessageToast.show(resources.i18n.getText("PageRuntime.CannotLoadPage.CopySuccess"), {
                     closeOnBrowserNavigation: false
@@ -754,7 +765,7 @@ sap.ui.define([
                 reset: this.handleEditModeAction.bind(this, "resetSection"),
                 sectionVisibilityChange: this.handleEditModeAction.bind(this, "changeSectionVisibility"),
                 titleChange: this.handleEditModeAction.bind(this, "changeSectionTitle"),
-                enableVisualizationReordering: "{viewSettings>/personalizationEnabled}",
+                enableVisualizationReordering: "{= ${viewSettings>/personalizationEnabled} && !${viewSettings>/isNavigationRunning} }",
                 areaDragEnter: this.onAreaDragEnter.bind(this),
                 visualizationDrop: this.moveVisualization.bind(this),
                 showSection: "{visible}",
@@ -786,15 +797,19 @@ sap.ui.define([
          */
         _visualizationFactory: function (id, context) {
             if (this._oVisualizationInstantiationService) {
-                var oData = context.getObject();
-                var sPath = context.getPath();
-                var sSectionPath = sPath.replace(/\/visualizations\/\d*\/?$/, "");
-                var sPagePath = sSectionPath.replace(/\/sections\/\d*\/?$/, "");
-                var oPageData = context.getModel().getProperty(sPagePath);
+                const oData = context.getObject();
+                const sPath = context.getPath();
+                const sSectionPath = sPath.replace(/\/visualizations\/\d*\/?$/, "");
+                const sPagePath = sSectionPath.replace(/\/sections\/\d*\/?$/, "");
+                const oPageData = context.getModel().getProperty(sPagePath);
 
-                var oVisualization = this._oVisualizationInstantiationService.instantiateVisualization(oData);
+                const oVisualization = this._oVisualizationInstantiationService.instantiateVisualization(oData);
                 oVisualization.attachPress(this.onVisualizationPress, this);
                 oVisualization.bindEditable("viewSettings>/actionModeActive");
+                oVisualization.bindClickable({
+                    path: "viewSettings>/isNavigationRunning",
+                    formatter: (bIsNavigationRunning) => !bIsNavigationRunning
+                });
                 if (oVisualization.bindRemovable) {
                     oVisualization.bindRemovable("viewSettings>/actionModeEditActive");
                 }
@@ -803,18 +818,18 @@ sap.ui.define([
                 this._addTileActions(oVisualization, (oPageData ? oPageData.id : ""));
 
                 // dynamic decision on displaying the move Tile action
-                oVisualization.attachBeforeActionSheetOpen(function () {
-                    var oButton = this._createMoveTileActionButton(oVisualization, oPageData);
+                oVisualization.attachBeforeActionSheetOpen(() => {
+                    const oButton = this._createMoveTileActionButton(oVisualization, oPageData);
                     if (oButton) {
-                        oVisualization.attachEventOnce("afterActionSheetClose", function () {
+                        oVisualization.attachEventOnce("afterActionSheetClose", () => {
                             oVisualization.removeTileAction(oButton);
                         });
                     }
-                }.bind(this));
+                });
 
                 // the path looks like "/pages/0/sections/0/visualizations/0"
-                var sPagePathIndex = context.getPath().split("/")[2];
-                var bActive = !!StateManager.getPageVisibility("/pages/" + sPagePathIndex);
+                const sPagePathIndex = context.getPath().split("/")[2];
+                const bActive = !!StateManager.getPageVisibility(`/pages/${sPagePathIndex}`);
                 oVisualization.setActive(bActive);
 
                 return oVisualization;
@@ -833,15 +848,15 @@ sap.ui.define([
          * @since 1.85
          */
         _addTileActions: function (oVizInstance, sPageId) {
-            var aAvailableDisplayFormats = oVizInstance.getAvailableDisplayFormats();
-            var bPersonalizationEnabled = Config.last("/core/shell/enablePersonalization");
-            var bMyHomeEnabled = this._isMyHomeEnabled();
-            var bIsMyHome = sPageId === this._sMyHomePageId;
+            const aAvailableDisplayFormats = oVizInstance.getAvailableDisplayFormats();
+            const bPersonalizationEnabled = Config.last("/core/shell/enablePersonalization");
+            const bMyHomeEnabled = this._isMyHomeEnabled();
+            const bIsMyHome = sPageId === this._sMyHomePageId;
 
             if (bPersonalizationEnabled || bIsMyHome) {
-                for (var i = 0; i < aAvailableDisplayFormats.length; i++) {
+                for (let i = 0; i < aAvailableDisplayFormats.length; i++) {
                     oVizInstance.addTileAction(new Button({
-                        text: "{i18n>VisualizationInstance.ConvertTo" + capitalize(aAvailableDisplayFormats[i]) + "Action}",
+                        text: `{i18n>VisualizationInstance.ConvertTo${capitalize(aAvailableDisplayFormats[i])}Action}`,
                         press: [aAvailableDisplayFormats[i], this._updateVisualizationDisplayFormat, this]
                     }));
                 }
@@ -865,13 +880,13 @@ sap.ui.define([
          * @since 1.107.0
          */
         _createMoveTileActionButton: function (oVizInstance, oPageData) {
-            var sPageId = (oPageData ? oPageData.id : "");
-            var bIsMyHome = (sPageId === this._sMyHomePageId);
-            var bPersonalizationEnabled = Config.last("/core/shell/enablePersonalization");
-            var aPersonalizableSections = oPageData.sections.filter(function (oSection) { return !oSection.default; });
-            var bTileIsInDefaultSection = oVizInstance.getParent().getBindingContext().getProperty("default");
+            const sPageId = (oPageData ? oPageData.id : "");
+            const bIsMyHome = (sPageId === this._sMyHomePageId);
+            const bPersonalizationEnabled = Config.last("/core/shell/enablePersonalization");
+            const aPersonalizableSections = oPageData.sections.filter((oSection) => { return !oSection.default; });
+            const bTileIsInDefaultSection = oVizInstance.getParent().getBindingContext().getProperty("default");
             if ((bPersonalizationEnabled || bIsMyHome) && (aPersonalizableSections.length >= (bTileIsInDefaultSection ? 1 : 2))) {
-                var oButton = new Button({
+                const oButton = new Button({
                     text: resources.i18n.getText("moveTile_action"),
                     press: [oVizInstance, this._openMoveVisualizationDialog, this]
                 });
@@ -930,11 +945,11 @@ sap.ui.define([
          * @private
          */
         _addToMyHome: function (oEvent, oVizInstance) {
-            var oVizData = oVizInstance.getBindingContext().getObject();
+            const oVizData = oVizInstance.getBindingContext().getObject();
 
-            return this.getOwnerComponent().getPagesService().then(function (oPagesService) {
+            return this.getOwnerComponent().getPagesService().then((oPagesService) => {
                 return oPagesService.copyVisualization(this._sMyHomePageId, null, oVizData);
-            }.bind(this)).then(function () {
+            }).then(() => {
                 MessageToast.show(resources.i18n.getText("PageRuntime.Message.VisualizationAddedToMyHome"));
             });
         },
@@ -948,37 +963,37 @@ sap.ui.define([
          * @returns {Promise<undefined>} Resolves after the Visualization is moved.
          */
         _confirmSelect: function (oEvent) {
-            var oVizInstanceToBeMovedContextPath = this._oVizInstanceToBeMoved.getBindingContext().getPath();
-            var aVizInstancePathParts = oVizInstanceToBeMovedContextPath.split("/");
+            const oVizInstanceToBeMovedContextPath = this._oVizInstanceToBeMoved.getBindingContext().getPath();
+            const aVizInstancePathParts = oVizInstanceToBeMovedContextPath.split("/");
 
-            var iPageIndex = aVizInstancePathParts[2];
-            var iCurrentSectionIndex = aVizInstancePathParts[4];
-            var iCurrentVizIndex = aVizInstancePathParts[6];
+            const iPageIndex = aVizInstancePathParts[2];
+            const iCurrentSectionIndex = aVizInstancePathParts[4];
+            const iCurrentVizIndex = aVizInstancePathParts[6];
 
-            var sTargetPath = oEvent.getParameter("selectedItem").getBindingContext().getPath();
-            var aTargetPathParts = sTargetPath.split("/");
+            const sTargetPath = oEvent.getParameter("selectedItem").getBindingContext().getPath();
+            const aTargetPathParts = sTargetPath.split("/");
 
-            var iTargetSectionIndex = aTargetPathParts[4];
-            var oSourceSection = this._getAncestorControl(this._oVizInstanceToBeMoved, "sap.ushell.ui.launchpad.Section");
-            var oPage = this._getAncestorControl(this._oVizInstanceToBeMoved, "sap.ushell.ui.launchpad.Page");
-            var aSections = oPage.getSections();
-            var oTargetSection = aSections[iTargetSectionIndex];
-            var sArea = oSourceSection.getItemPosition(this._oVizInstanceToBeMoved).area;
+            const iTargetSectionIndex = aTargetPathParts[4];
+            const oSourceSection = this._getAncestorControl(this._oVizInstanceToBeMoved, "sap.ushell.ui.launchpad.Section");
+            const oPage = this._getAncestorControl(this._oVizInstanceToBeMoved, "sap.ushell.ui.launchpad.Page");
+            const aSections = oPage.getSections();
+            const oTargetSection = aSections[iTargetSectionIndex];
+            const sArea = oSourceSection.getItemPosition(this._oVizInstanceToBeMoved).area;
 
             this._oVizInstanceToBeMoved = null;
-            var oComponent = this.getOwnerComponent();
+            const oComponent = this.getOwnerComponent();
             return oComponent.getPagesService()
-                .then(function (oPagesService) {
+                .then((oPagesService) => {
                     return oPagesService.moveVisualization(iPageIndex, iCurrentSectionIndex, iCurrentVizIndex, iTargetSectionIndex, -1);
                 })
-                .then(function (oResult) {
-                    var oViz = oTargetSection.getVisualizations()[oResult.visualizationIndex];
+                .then((oResult) => {
+                    const oViz = oTargetSection.getVisualizations()[oResult.visualizationIndex];
                     if (oViz) {
                         oTargetSection.focusVisualization(oViz);
                     }
-                    var sMessage = this._getVizMoveMessage(iCurrentSectionIndex, iTargetSectionIndex, sArea, sArea);
+                    const sMessage = this._getVizMoveMessage(iCurrentSectionIndex, iTargetSectionIndex, sArea, sArea);
                     MessageToast.show(sMessage);
-                }.bind(this));
+                });
         },
 
         /**
@@ -986,10 +1001,10 @@ sap.ui.define([
          * @param {sap.ui.base.Event} oEvent SAP UI5 event object.
          */
         _onMoveTileSearch: function (oEvent) {
-            var sValue = oEvent.getParameter("value");
-            var oFilter = new Filter("title", FilterOperator.Contains, sValue);
-            var oDefaultGroupFilter = new Filter("default", FilterOperator.EQ, false);
-            var oBinding = oEvent.getParameter("itemsBinding");
+            const sValue = oEvent.getParameter("value");
+            const oFilter = new Filter("title", FilterOperator.Contains, sValue);
+            const oDefaultGroupFilter = new Filter("default", FilterOperator.EQ, false);
+            const oBinding = oEvent.getParameter("itemsBinding");
             oBinding.filter([oFilter, oDefaultGroupFilter]);
         },
 
@@ -1012,9 +1027,9 @@ sap.ui.define([
          * @since 1.111
          */
         _getVizInstanceById: function (sPageId, sSectionId, sVizRefId) {
-            var oNavContainer = this.byId("pagesNavContainer");
+            const oNavContainer = this.byId("pagesNavContainer");
 
-            var oMatchingPage = oNavContainer.getPages().find(function (oPage) {
+            const oMatchingPage = oNavContainer.getPages().find((oPage) => {
                 return oPage.getBindingContext().getObject().id === sPageId;
             });
 
@@ -1022,8 +1037,8 @@ sap.ui.define([
                 return null;
             }
 
-            var oLaunchpadPage = oMatchingPage.getContent()[0];
-            var oMatchingSection = oLaunchpadPage.getSections().find(function (oSection) {
+            const oLaunchpadPage = oMatchingPage.getContent()[0];
+            const oMatchingSection = oLaunchpadPage.getSections().find((oSection) => {
                 return oSection.getBindingContext().getObject().id === sSectionId;
             });
 
@@ -1031,7 +1046,7 @@ sap.ui.define([
                 return null;
             }
 
-            var oMatchingVisualization = oMatchingSection.getVisualizations().find(function (oVisualization) {
+            const oMatchingVisualization = oMatchingSection.getVisualizations().find((oVisualization) => {
                 return oVisualization.getBindingContext().getObject().id === sVizRefId;
             });
 
@@ -1051,32 +1066,32 @@ sap.ui.define([
          * @since 1.84
          */
         _updateVisualizationDisplayFormat: function (oEvent, sNewDisplayFormatHint) {
-            var oContext = oEvent.getSource().getBindingContext();
-            var sPath = oContext.getPath();
-            var aPathParts = sPath.split("/");
-            var sOldDisplayFormatHint;
-            var iCurrentSectionIndex = aPathParts[4];
-            var iTargetSectionIndex = aPathParts[4];
-
-            var oComponent = this.getOwnerComponent();
+            const oContext = oEvent.getSource().getBindingContext();
+            const sPath = oContext.getPath();
+            const aPathParts = sPath.split("/");
+            let sOldDisplayFormatHint;
+            const iCurrentSectionIndex = aPathParts[4];
+            const iTargetSectionIndex = aPathParts[4];
+
+            const oComponent = this.getOwnerComponent();
             return oComponent.getPagesService()
-                .then(function (oPagesService) {
+                .then((oPagesService) => {
                     sOldDisplayFormatHint = oPagesService.getModel().getProperty(sPath).displayFormatHint;
-                    var oVizData = {
+                    const oVizData = {
                         displayFormatHint: sNewDisplayFormatHint
                     };
                     // pageIndex, sectionIndex, visualizationIndex
                     return oPagesService.updateVisualization(aPathParts[2], aPathParts[4], aPathParts[6], oVizData);
                 })
-                .then(function (oData) {
-                    var oVizInstance = this._getVizInstanceById(oData.pageId, oData.sectionId, oData.vizRefId);
-                    var oSection = this._getAncestorControl(oVizInstance, "sap.ushell.ui.launchpad.Section");
+                .then((oData) => {
+                    const oVizInstance = this._getVizInstanceById(oData.pageId, oData.sectionId, oData.vizRefId);
+                    const oSection = this._getAncestorControl(oVizInstance, "sap.ushell.ui.launchpad.Section");
                     if (oSection) {
                         oSection.focusVisualization(oVizInstance);
                     }
-                    var sMessage = this._getVizMoveMessage(iCurrentSectionIndex, iTargetSectionIndex, sOldDisplayFormatHint, sNewDisplayFormatHint);
+                    const sMessage = this._getVizMoveMessage(iCurrentSectionIndex, iTargetSectionIndex, sOldDisplayFormatHint, sNewDisplayFormatHint);
                     MessageToast.show(sMessage);
-                }.bind(this));
+                });
         },
 
         /**
@@ -1089,21 +1104,21 @@ sap.ui.define([
          * @private
          */
         onVisualizationPress: function (oEvent) {
-            var sScope = oEvent.getParameter("scope");
-            var sAction = oEvent.getParameter("action");
-            var oVisualization = oEvent.getSource();
-            var oContext = oVisualization.getBindingContext();
-            var sPath = oContext.getPath();
-            var aPathParts = sPath.split("/");
-            var oSection = this._getAncestorControl(oVisualization, "sap.ushell.ui.launchpad.Section");
+            const sScope = oEvent.getParameter("scope");
+            const sAction = oEvent.getParameter("action");
+            const oVisualization = oEvent.getSource();
+            const oContext = oVisualization.getBindingContext();
+            const sPath = oContext.getPath();
+            const aPathParts = sPath.split("/");
+            const oSection = this._getAncestorControl(oVisualization, "sap.ushell.ui.launchpad.Section");
 
             if (sScope === "Display" && sAction === "Press") {
                 // This scope & action will probably lead to an application to be loaded
                 // With this the StateManager will refresh the visualization once navigating back to the launchpad
                 StateManager.addVisualizationForRefresh(oVisualization);
             } else if (sScope === "Actions" && sAction === "Remove") {
-                return this.getOwnerComponent().getPagesService().then(function (oPagesService) {
-                    var oOldPosition = oSection.getItemPosition(oVisualization);
+                return this.getOwnerComponent().getPagesService().then((oPagesService) => {
+                    const oOldPosition = oSection.getItemPosition(oVisualization);
                     // pageIndex, sectionIndex, visualizationIndex
                     oPagesService.deleteVisualization(aPathParts[2], aPathParts[4], aPathParts[6]);
                     MessageToast.show(resources.i18n.getText("PageRuntime.Message.VisualizationRemoved"));
@@ -1128,9 +1143,10 @@ sap.ui.define([
             this.oEventHubListener.off();
             this._oEventBus.unsubscribe("launchpad", "shellFloatingContainerIsDocked", this._handleUshellContainerDocked, this);
             this._oEventBus.unsubscribe("launchpad", "shellFloatingContainerIsUnDocked", this._handleUshellContainerDocked, this);
+            NavigationState.detachNavigationStateChanged(this._handleNavigationStateChanged, this);
             StateManager.exit();
 
-            var oActionModeButton = Element.getElementById("ActionModeBtn");
+            const oActionModeButton = Element.getElementById("ActionModeBtn");
             if (oActionModeButton) {
                 oActionModeButton.destroy();
             }
@@ -1143,7 +1159,7 @@ sap.ui.define([
          * @since 1.84.0
          */
         _hideActionModeButton: function () {
-            var oActionModeButton = Element.getElementById("ActionModeBtn");
+            const oActionModeButton = Element.getElementById("ActionModeBtn");
             Log.debug("cep/editMode: hide Action Mode Button", "Page runtime");
             if (oActionModeButton) {
                 oActionModeButton.setVisible(false);
@@ -1157,7 +1173,7 @@ sap.ui.define([
          * @since 1.84.0
          */
         _showActionModeButton: function () {
-            var oActionModeButton = Element.getElementById("ActionModeBtn");
+            const oActionModeButton = Element.getElementById("ActionModeBtn");
             if (oActionModeButton) {
                 oActionModeButton.setVisible(true);
             }
@@ -1171,8 +1187,8 @@ sap.ui.define([
          * @private
          */
         _moveEditActionToHeader: function () {
-            var oRenderer = Container.getRendererInternal("fiori2");
-            var bMoveEditButtonToHeader = oRenderer.getShellConfig().moveEditHomePageActionToShellHeader;
+            const oRenderer = Container.getRendererInternal("fiori2");
+            const bMoveEditButtonToHeader = oRenderer.getShellConfig().moveEditHomePageActionToShellHeader;
             // Move the action to the header only if personalization is enabled.
             // Otherwise, the action "Add Tiles To My Home" is always rendered in user menu and never as a shell button.
             // See _setActionModeLogic() and _setActionButtonText().
@@ -1189,9 +1205,9 @@ sap.ui.define([
          * @since 1.86.0
          */
         _createActionModeButton: function (sPageTitle) {
-            var sButtonText = sPageTitle ? resources.i18n.getText("PageRuntime.EditModeForPage.Activate", [sPageTitle])
+            const sButtonText = sPageTitle ? resources.i18n.getText("PageRuntime.EditModeForPage.Activate", [sPageTitle])
                 : resources.i18n.getText("PageRuntime.EditMode.Activate");
-            var oActionButtonObjectData = {
+            const oActionButtonObjectData = {
                 id: "ActionModeBtn",
                 text: sButtonText,
                 icon: "sap-icon://edit",
@@ -1215,15 +1231,29 @@ sap.ui.define([
          * @since 1.86.0
          */
         _createHeaderActionModeButton: function (oActionButtonObjectData) {
-            sap.ui.require(["sap/ushell/ui/shell/ShellHeadItem"], function (ShellHeadItem) {
-                var oActionsButton = new ShellHeadItem(oActionButtonObjectData);
+            let sRequirePath = "sap/ushell/ui/shell/ShellHeadItem";
+            if (Config.last("/core/shellBar/enabled")) {
+                sRequirePath = "sap/ushell/gen/ui5/webcomponents-fiori/dist/ShellBarItem";
+                if (oActionButtonObjectData.press) {
+                    oActionButtonObjectData.click = oActionButtonObjectData.press;
+                    delete oActionButtonObjectData.press; // remove press handler, since it is not used in ShellBarItem
+                }
+            }
+
+            sap.ui.require([sRequirePath], (ShellHeadItem) => {
+                const oActionsButton = new ShellHeadItem(oActionButtonObjectData);
                 if (Config.last("/core/extension/enableHelp")) {
                     oActionsButton.addStyleClass("help-id-ActionModeBtn"); // xRay help ID
+                    oActionsButton.addCustomData(new CustomData({
+                        key: "help-id",
+                        value: "ActionModeBtn",
+                        writeToDom: true
+                    }));
                 }
-                var oRenderer = Container.getRendererInternal("fiori2");
-                var oStateInfo = this._getStateInfoActionModeButton();
+                const oRenderer = Container.getRendererInternal("fiori2");
+                const oStateInfo = this._getStateInfoActionModeButton();
                 oRenderer.showHeaderEndItem(oActionsButton.getId(), oStateInfo.bCurrentState, oStateInfo.aStates);
-            }.bind(this));
+            });
         },
 
         /**
@@ -1263,7 +1293,7 @@ sap.ui.define([
          * @since 1.74.0
          */
         _createUserActionModeButton: function (oActionModeButtonObjectData) {
-            var oStateInfo = this._getStateInfoActionModeButton();
+            const oStateInfo = this._getStateInfoActionModeButton();
             /*
              * Workaround:
              * For workzone the button is added via currentState. With this it gets destroyed when navigating to a different state.
@@ -1273,21 +1303,21 @@ sap.ui.define([
              */
             new ActionItem(oActionModeButtonObjectData);
 
-            var oAddActionButtonParameters = {
+            const oAddActionButtonParameters = {
                 controlType: "sap.ushell.ui.launchpad.ActionItem",
                 oControlProperties: oActionModeButtonObjectData,
                 bIsVisible: true,
                 bCurrentState: oStateInfo.bCurrentState,
                 aStates: oStateInfo.aStates
             };
-            var oRenderer = Container.getRendererInternal("fiori2");
-            oRenderer.addUserAction(oAddActionButtonParameters).done(function (oActionButton) {
+            const oRenderer = Container.getRendererInternal("fiori2");
+            oRenderer.addUserAction(oAddActionButtonParameters).done((oActionButton) => {
                 // if xRay is enabled
                 if (Config.last("/core/extension/enableHelp")) {
                     oActionButton.addStyleClass("help-id-ActionModeBtn");// xRay help ID
                 }
                 this._setActionButtonText();
-            }.bind(this));
+            });
         },
 
         /**
@@ -1304,14 +1334,14 @@ sap.ui.define([
 
             sap.ui.require([
                 "sap/ushell/components/pages/ActionMode"
-            ], function (ActionMode) {
+            ], (ActionMode) => {
                 if (bActionModeActive) {
                     ActionMode.cancel();
                     return;
                 } else if (bPersonalizationEnabled || bAddToMyHomeOnly || this._isMyHomeRouteActive()) {
                     ActionMode.start(this, bAddToMyHomeOnly ? resources.i18n.getText("PageRuntime.EditMode.ExitAddTilesMode") : null);
                 }
-            }.bind(this));
+            });
         },
 
         /**
@@ -1321,11 +1351,11 @@ sap.ui.define([
          * @since 1.84.0
          */
         _cancelActionMode: function () {
-            var bActionModeActive = this.getView().getModel("viewSettings").getProperty("/actionModeActive");
+            const bActionModeActive = this.getView().getModel("viewSettings").getProperty("/actionModeActive");
             if (bActionModeActive) {
                 sap.ui.require([
                     "sap/ushell/components/pages/ActionMode"
-                ], function (ActionMode) {
+                ], (ActionMode) => {
                     ActionMode.cancel();
                 });
             }
@@ -1340,11 +1370,11 @@ sap.ui.define([
          * @since 1.74.0
          */
         handleEditModeAction: function (sHandler, oEvent) {
-            var oSource = oEvent.getSource();
-            var oParameters = oEvent.getParameters();
+            const oSource = oEvent.getSource();
+            const oParameters = oEvent.getParameters();
             sap.ui.require([
                 "sap/ushell/components/pages/ActionMode"
-            ], function (ActionMode) {
+            ], (ActionMode) => {
                 Log.debug("cep/editMode: handle Edit Mode Action", "Page runtime");
                 ActionMode[sHandler](oEvent, oSource, oParameters);
             });
@@ -1377,27 +1407,27 @@ sap.ui.define([
          * @since 1.75.0
          */
         moveVisualization: function (oEvent) {
-            var oDragged = oEvent.getParameter("draggedControl");
-            var oDropped = oEvent.getParameter("droppedControl");
-            var sDropPosition = oEvent.getParameter("dropPosition");
-            var oBrowserEvent = oEvent.getParameter("browserEvent");
-            var sKeyCode = oBrowserEvent && oBrowserEvent.keyCode;
-            var oPage = this._getAncestorControl(oDragged, "sap.ushell.ui.launchpad.Page");
-            var iPageIndex = parseInt(oDragged.getBindingContext().getPath().split("/")[2], 10);
-            var oCurrentSection = this._getAncestorControl(oDragged, "sap.ushell.ui.launchpad.Section");
-            var iCurrentSectionIndex = oPage.indexOfSection(oCurrentSection);
-            var iCurrentVizIndex = oCurrentSection.indexOfVisualization(oDragged);
-            var oCurrentViz = oCurrentSection.getVisualizations()[iCurrentVizIndex];
-            var oCurrentPos = oCurrentSection.getItemPosition(oCurrentViz);
-            var oTargetSection;
-            var iTargetSectionIndex;
-            var iTargetVizIndex;
-            var oTargetViz;
-            var oTargetPos;
+            const oDragged = oEvent.getParameter("draggedControl");
+            let oDropped = oEvent.getParameter("droppedControl");
+            let sDropPosition = oEvent.getParameter("dropPosition");
+            const oBrowserEvent = oEvent.getParameter("browserEvent");
+            const sKeyCode = oBrowserEvent && oBrowserEvent.keyCode;
+            const oPage = this._getAncestorControl(oDragged, "sap.ushell.ui.launchpad.Page");
+            const iPageIndex = parseInt(oDragged.getBindingContext().getPath().split("/")[2], 10);
+            const oCurrentSection = this._getAncestorControl(oDragged, "sap.ushell.ui.launchpad.Section");
+            const iCurrentSectionIndex = oPage.indexOfSection(oCurrentSection);
+            const iCurrentVizIndex = oCurrentSection.indexOfVisualization(oDragged);
+            const oCurrentViz = oCurrentSection.getVisualizations()[iCurrentVizIndex];
+            const oCurrentPos = oCurrentSection.getItemPosition(oCurrentViz);
+            let oTargetSection;
+            let iTargetSectionIndex;
+            let iTargetVizIndex;
+            let oTargetViz;
+            let oTargetPos;
 
             if (!oDropped) { // Target is an empty area of the section or an inner compactArea dnd (only happens during keyboard dnd)
-                var bUp = oEvent.mParameters.browserEvent.keyCode === KeyCodes.ARROW_UP;
-                var aSection = oPage.getSections();
+                const bUp = oEvent.mParameters.browserEvent.keyCode === KeyCodes.ARROW_UP;
+                const aSection = oPage.getSections();
                 iTargetSectionIndex = iCurrentSectionIndex;
 
                 while (true) {
@@ -1422,7 +1452,7 @@ sap.ui.define([
             } else {
                 // when dropping on the CompactArea, pretend it was dropped after its last item
                 if (oDropped.isA("sap.ushell.ui.launchpad.section.CompactArea")) {
-                    var aItems = oDropped.getItems();
+                    const aItems = oDropped.getItems();
                     if (aItems.length) {
                         oDropped = aItems[aItems.length - 1];
                         sDropPosition = "After";
@@ -1467,10 +1497,10 @@ sap.ui.define([
                 iTargetVizIndex++;
             }
 
-            var oPagesService;
-            var oComponent = this.getOwnerComponent();
+            let oPagesService;
+            const oComponent = this.getOwnerComponent();
             return oComponent.getPagesService()
-                .then(function (oService) {
+                .then((oService) => {
                     oPagesService = oService;
                     oPagesService.enableImplicitSave(false);
                     return oPagesService.moveVisualization(
@@ -1481,29 +1511,29 @@ sap.ui.define([
                         iTargetVizIndex
                     );
                 })
-                .then(function (oResult) {
+                .then((oResult) => {
                     iTargetVizIndex = oResult.visualizationIndex;
                     if (oCurrentPos.area !== oTargetPos.area) {
-                        var oVizData = {
+                        const oVizData = {
                             displayFormatHint: oTargetPos.area
                         };
                         return oPagesService.updateVisualization(iPageIndex, iTargetSectionIndex, iTargetVizIndex, oVizData);
                     }
                     return Promise.resolve();
                 })
-                .then(function () {
+                .then(() => {
                     return oPagesService.savePersonalization();
                 })
-                .then(function () {
-                    var oViz = oTargetSection.getVisualizations()[iTargetVizIndex];
+                .then(() => {
+                    const oViz = oTargetSection.getVisualizations()[iTargetVizIndex];
                     if (oViz) {
                         oTargetSection.focusVisualization(oViz);
                         oViz.invalidate();
                     }
-                    var sMessage = this._getVizMoveMessage(iCurrentSectionIndex, iTargetSectionIndex, oCurrentPos.area, oTargetPos.area);
+                    const sMessage = this._getVizMoveMessage(iCurrentSectionIndex, iTargetSectionIndex, oCurrentPos.area, oTargetPos.area);
                     MessageToast.show(sMessage);
-                }.bind(this))
-                .finally(function () {
+                })
+                .finally(() => {
                     oPagesService.enableImplicitSave(true);
                 });
         },
@@ -1541,7 +1571,7 @@ sap.ui.define([
          * @since 1.75.0
          */
         onDragEnter: function (oEvent) {
-            var oTargetSection = oEvent.getParameter("dragSession").getDropControl();
+            const oTargetSection = oEvent.getParameter("dragSession").getDropControl();
 
             if (oTargetSection.getDefault()) {
                 oEvent.preventDefault();
@@ -1557,16 +1587,16 @@ sap.ui.define([
          * @since 1.84.0
          */
         onAreaDragEnter: function (oEvent) {
-            var sSourceArea = oEvent.getParameter("sourceArea");
-            var sTargetArea = oEvent.getParameter("targetArea");
+            const sSourceArea = oEvent.getParameter("sourceArea");
+            const sTargetArea = oEvent.getParameter("targetArea");
 
             // same area means no change of the display format
             if (sSourceArea === sTargetArea) {
                 return;
             }
 
-            var oVizInstance = oEvent.getParameter("dragControl");
-            var aAvailableDisplayFormats = oVizInstance.getAvailableDisplayFormats();
+            const oVizInstance = oEvent.getParameter("dragControl");
+            const aAvailableDisplayFormats = oVizInstance.getAvailableDisplayFormats();
 
             if (aAvailableDisplayFormats.indexOf(sTargetArea) === -1) {
                 // VizInstance only supports standardWide
@@ -1610,9 +1640,9 @@ sap.ui.define([
          * @private
          */
         _getMyHomePageData: function () {
-            var aPages = this.getView().getModel().getProperty("/pages") || [];
+            const aPages = this.getView().getModel().getProperty("/pages") || [];
             const sMyHomePageId = Config.last("/core/spaces/myHome/myHomePageId");
-            for (var i = 0; i < aPages.length; i++) {
+            for (let i = 0; i < aPages.length; i++) {
                 if (aPages[i] && aPages[i].id === sMyHomePageId) {
                     return aPages[i];
                 }
@@ -1625,10 +1655,10 @@ sap.ui.define([
          * @private
          */
         _isMyHomePageEmpty: function () {
-            var oPage = this._getMyHomePageData();
+            const oPage = this._getMyHomePageData();
             if (oPage && oPage.sections) {
-                return oPage.sections.every(function (oSection) {
-                    var aViz = oSection.visualizations;
+                return oPage.sections.every((oSection) => {
+                    const aViz = oSection.visualizations;
                     return !(aViz && aViz.length); // all sections must be empty
                 });
             }
@@ -1670,7 +1700,7 @@ sap.ui.define([
 
             if (!bIsImportEnabled) {
                 if (this._pMessageStrip) { // do not show the message strip after user dismissed it
-                    this._pMessageStrip.then(function (messageStrip) {
+                    this._pMessageStrip.then((messageStrip) => {
                         messageStrip.setVisible(false);
                     });
                 }
@@ -1687,7 +1717,7 @@ sap.ui.define([
                             });
 
                             // In case the message strip visibility is managed in another place
-                            EventHub.on("importBookmarksFlag").do(function (value) {
+                            EventHub.on("importBookmarksFlag").do((value) => {
                                 oMessageStrip.setVisible(!!value);
                             });
                             oMessageStrip.addStyleClass("sapUiSmallMarginBottom");
@@ -1712,13 +1742,13 @@ sap.ui.define([
          */
         openMyHomeImportDialog: function () {
             if (!this._pLoadImportDialog) {
-                this._pLoadImportDialog = new Promise(function (resolve, reject) {
-                    sap.ui.require(["sap/ushell/components/pages/controller/ImportDialog.controller"], function (ImportDialogController) {
+                this._pLoadImportDialog = new Promise((resolve, reject) => {
+                    sap.ui.require(["sap/ushell/components/pages/controller/ImportDialog.controller"], (ImportDialogController) => {
                         resolve(new ImportDialogController());
                     }, reject);
                 });
             }
-            return this._pLoadImportDialog.then(function (oImportDialogController) {
+            return this._pLoadImportDialog.then((oImportDialogController) => {
                 return oImportDialogController.open();
             });
         },
@@ -1738,7 +1768,7 @@ sap.ui.define([
          */
         onMessageStripClose: function () {
             MyHomeImport.setImportEnabled(false);
-            sap.ui.require(["sap/m/MessageBox"], function (MessageBox) {
+            sap.ui.require(["sap/m/MessageBox"], (MessageBox) => {
                 MessageBox.information(resources.i18n.getText("MyHome.InitialPage.MessageStrip.Popup"));
             });
         },
@@ -1779,8 +1809,6 @@ sap.ui.define([
             if (!aSections || aSections.length === 0) { return ""; }
             if (!oCurrentSection) { return ""; }
 
-            let iIndex;
-
             if (!bActionModeEditActive) {
                 // In display mode: filter out the hidden and empty sections as they are not displayed
                 aSections = aSections.filter((oSection) =>
@@ -1790,7 +1818,7 @@ sap.ui.define([
                 );
             }
 
-            iIndex = aSections.indexOf(oCurrentSection);
+            const iIndex = aSections.indexOf(oCurrentSection);
 
             if (iIndex < 0) { return ""; }
 
@@ -1855,7 +1883,7 @@ sap.ui.define([
          */
         _formatPageTitle: function (pageTitle, spaceTitle, showPageTitle, showSpaceTitle) {
             if (showPageTitle && showSpaceTitle) {
-                return spaceTitle + " - " + pageTitle;
+                return `${spaceTitle} - ${pageTitle}`;
             } else if (showSpaceTitle) {
                 return spaceTitle;
             }