@sapui5/sap.ushell 1.117.2 → 1.119.0

package/src/main/js/sap/ushell/components/pages/ActionMode.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview ActionMode for the PageRuntime view
  *
- * @version 1.117.2
+ * @version 1.119.0
  */
 
 sap.ui.define([
@@ -35,7 +35,7 @@ sap.ui.define([
             oController.getView().getModel("viewSettings").setProperty("/actionModeEditActive", true);
         }
         oController.getView().getModel("viewSettings").setProperty("/actionModeActive", true);
-        oController.handleMyHomeActionMode(true).catch(oController._onError.bind(oController));
+        oController.handleMyHomeActionMode(true).catch(oController.navigateToErrorPage.bind(oController));
 
         EventHub.emit("enableMenuBarNavigation", false);
 
@@ -83,7 +83,7 @@ sap.ui.define([
     ActionMode._cleanup = function () {
         this.oController.getView().getModel("viewSettings").setProperty("/actionModeActive", false);
         this.oController.getView().getModel("viewSettings").setProperty("/actionModeEditActive", false);
-        this.oController.handleMyHomeActionMode(false).catch(this.oController._onError.bind(this.oController));
+        this.oController.handleMyHomeActionMode(false).catch(this.oController.navigateToErrorPage.bind(this.oController));
         EventHub.emit("enableMenuBarNavigation", true);
 
         var oActionModeButton = Core.byId("ActionModeBtn");
@@ -136,7 +136,7 @@ sap.ui.define([
      * @param {sap.ui.core.Control} oSource Source control
      * @param {object} oParameters Event parameters
      *
-     * @returns {Promise<void>} A promise that is resolved when the Pages service is retrieved.
+     * @returns {Promise<undefined>} A promise that is resolved when the Pages service is retrieved.
      *
      * @private
      * @since 1.75.0
@@ -170,7 +170,7 @@ sap.ui.define([
      * @param {sap.ui.base.Event} oEvent Event object
      * @param {sap.ui.core.Control} oSource Source control
      *
-     * @returns {Promise<void>} A promise that is resolved when the Pages service is retrieved.
+     * @returns {Promise<undefined>} A promise that is resolved when the Pages service is retrieved.
      *
      * @private
      * @since 1.75.0
@@ -179,7 +179,7 @@ sap.ui.define([
         return sap.ushell.Container.getServiceAsync("Message").then(function (oMessageService) {
             var sTitle = oSource.getTitle();
             var sMsg = sTitle
-                ? resources.i18n.getText("PageRuntime.Message.Section.Delete", sTitle)
+                ? resources.i18n.getText("PageRuntime.Message.Section.Delete", [sTitle])
                 : resources.i18n.getText("PageRuntime.Message.Section.DeleteNoTitle");
             var sMsgTitle = resources.i18n.getText("PageRuntime.Dialog.Title.Delete");
 
@@ -233,7 +233,7 @@ sap.ui.define([
      * @param {sap.ui.base.Event} oEvent Event object
      * @param {sap.ui.core.Control} oSection Source control
      *
-     * @returns {Promise<void>} A promise that is resolved when the Pages service is retrieved.
+     * @returns {Promise<undefined>} A promise that is resolved when the Pages service is retrieved.
      *
      * @private
      * @since 1.75.0
@@ -259,7 +259,7 @@ sap.ui.define([
      * @param {sap.ui.core.Control} oSource Source control
      * @param {object} oParameters Event parameters
      *
-     * @returns {Promise<void>} A promise that is resolved when the Pages service is retrieved.
+     * @returns {Promise<undefined>} A promise that is resolved when the Pages service is retrieved.
      *
      * @private
      * @since 1.75.0
@@ -285,7 +285,7 @@ sap.ui.define([
      * @param {sap.ui.core.Control} oSource Source control
      * @param {object} oParameters Event parameters
      *
-     * @returns {Promise<void>} A promise that is resolved when the Pages service is retrieved.
+     * @returns {Promise<undefined>} A promise that is resolved when the Pages service is retrieved.
      *
      * @private
      * @since 1.75.0
@@ -330,7 +330,7 @@ sap.ui.define([
      * @param {sap.ui.core.Control} oSource Source control
      * @param {object} oParameters Event parameters
      *
-     * @returns {Promise<void>} A promise that is resolved when the Pages service is retrieved.
+     * @returns {Promise<undefined>} A promise that is resolved when the Pages service is retrieved.
      *
      * @private
      * @since 1.75.0

package/src/main/js/sap/ushell/components/pages/Component.js

@@ -5,7 +5,7 @@
  * #Shell-home or #Launchpad-openFLPPage if spaces are enabled (/core/spaces/enabled).
  * In the future it should completely replace the classical homepage.
  *
- * @version 1.117.2
+ * @version 1.119.0
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/pages/MyHomeImport.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview MyHome migrate functionality for the PageRuntime view
  *
- * @version 1.117.2
+ * @version 1.119.0
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/pages/StateManager.js

@@ -88,7 +88,7 @@ sap.ui.define([
      * @since 1.72.0
      */
     StateManager._setCurrentPageVisibility = function (visibility, refresh, navFromErrorPage) {
-        if (this.oPagesRuntimeNavContainer.getCurrentPage().isA("sap.m.MessagePage") && !navFromErrorPage) {
+        if (this.oPagesRuntimeNavContainer.getCurrentPage().isA("sap.m.IllustratedMessage") && !navFromErrorPage) {
             return;
         }
         var oCurrentPage = this.oPagesNavContainer.getCurrentPage();
@@ -258,7 +258,7 @@ sap.ui.define([
      * @since 1.74.0
      */
     StateManager.exit = function () {
-        this.oEventBus.unsubscribe("sap.ushell", "navigated", this._onPageNavigated, this);
+        this.oEventBus.unsubscribe("sap.ushell", "navigated", this._onShellNavigated, this);
         document.removeEventListener("visibilitychange", this._onTabNavigatedBind);
         this.oPagesNavContainer.detachNavigate(this._onPageNavigated, this);
         this.oPagesRuntimeNavContainer.detachNavigate(this._onErrorPageNavigated, this);

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

@@ -128,8 +128,8 @@ sap.ui.define([
          *
          * @param {sap.ushell.services.Pages} pagesService The Pages service instance.
          * @param {object} group The group to which the visualization is added.
-         * @param {number} index the index of the section, the new visualization should be added to.
-         * @param {number} iTargetVizIndex The target visualization index.
+         * @param {int} index the index of the section, the new visualization should be added to.
+         * @param {int} iTargetVizIndex The target visualization index.
          * @param {boolean} defaultGroupImported Indicates if the default group has already been imported.
          * @returns {Promise} A promise resolving when the visualization has been moved.
          * @private
@@ -151,8 +151,8 @@ sap.ui.define([
          * @param {sap.ushell.services.Pages} pagesService The Pages service instance.
          * @param {object} group The group to which the visualization is added.
          * @param {object} tileData The tile data to update.
-         * @param {number} index the index of the section, the new visualization should be added to.
-         * @param {number} vizIndex The visualization index.
+         * @param {int} index the index of the section, the new visualization should be added to.
+         * @param {int} vizIndex The visualization index.
          * @returns {Promise} A promise resolving when the update is done.
          * @param {boolean} defaultGroupImported Indicates if the default group has already been imported.
          * @private
@@ -180,8 +180,8 @@ sap.ui.define([
          *
          * @param {object} group The group to which the visualization is added.
          * @param {object} tile contains important information on how the visualization should be created.
-         * @param {number} vizIndex the index of the new visualization.
-         * @param {number} index the index of the section, the new visualization should be added to.
+         * @param {int} vizIndex the index of the new visualization.
+         * @param {int} index the index of the section, the new visualization should be added to.
          * @param {object} services Ushell services that are need to add the bookmarks and the visualizations.
          * @param {object} contentNode of the current page.
          * @param {boolean} defaultGroupImported Indicates if the default group has already been imported.
@@ -238,7 +238,7 @@ sap.ui.define([
          * Adds visualizations to the existing preset section ('My Apps').
          *
          * @param {object} group contains important information on how the section should be created.
-         * @param {number} index the index of the current iteration.
+         * @param {int} index the index of the current iteration.
          * @param {object} services Ushell services that are needed to add the sections and the visualizations.
          * @param {object} contentNode of the current page.
          * @param {boolean} defaultGroupImported Indicates if the default group has already been imported.
@@ -265,7 +265,7 @@ sap.ui.define([
          * Generates a new section with all its visualizations.
          *
          * @param {object} group contains important information on how the section should be created.
-         * @param {number} index the index of the current iteration.
+         * @param {int} index the index of the current iteration.
          * @param {object} services Ushell services that are needed to add the sections and the visualizations.
          * @param {object} contentNode of the current page.
          * @param {boolean} defaultGroupImported Indicates if the default group has already been imported.
@@ -425,9 +425,9 @@ sap.ui.define([
          * Default section already exists, in case default group is not imported the section index needs to skip the default section.
          * @param {sap.ushell.services.Pages} pagesService The Pages service instance.
          * @param {object} group The group.
-         * @param {number} current The current index.
+         * @param {int} current The current index.
          * @param {boolean} defaultGroupImported Indicates if the default group has been imported.
-         * @returns {number} The section index.
+         * @returns {int} The section index.
          * @private
          */
         _getSectionIndex: function (pagesService, group, current, defaultGroupImported) {
@@ -440,7 +440,7 @@ sap.ui.define([
         /**
          * Determine the index of the 'My Home' preset section ('My Apps').
          * @param {sap.ushell.services.Pages} pagesService The Pages service instance.
-         * @returns {number} The section index.
+         * @returns {int} The section index.
          * @private
          */
         _getPresetSectionIndex: function (pagesService) {
@@ -454,7 +454,7 @@ sap.ui.define([
          * Determine the index of the 'My Home' default section ('Recently added apps').
          *
          * @param {sap.ushell.services.Pages} pagesService The Pages service instance.
-         * @returns {number} The section index.
+         * @returns {int} The section index.
          * @private
          */
         _getDefaultSectionIndex: function (pagesService) {

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

@@ -2,7 +2,7 @@
 
 /**
  * @file PageRuntime controller for PageRuntime view
- * @version 1.117.2
+ * @version 1.119.0
  */
 sap.ui.define([
     "sap/ushell/library",
@@ -25,8 +25,7 @@ sap.ui.define([
     "sap/ushell/components/pages/controller/PagesAndSpaceId",
     "sap/ushell/components/pages/MyHomeImport",
     "sap/ui/thirdparty/hasher",
-    "sap/base/Log", // S/4 my home
-    "sap/ui/core/theming/Parameters",
+    "sap/base/Log",
     "sap/ushell/ui/launchpad/Section"
 ], function (
     ushellLibrary,
@@ -41,7 +40,7 @@ sap.ui.define([
     MessageToast,
     StateManager,
     EventHub,
-    utils,
+    ushellUtils,
     Button,
     capitalize,
     Filter,
@@ -49,8 +48,7 @@ sap.ui.define([
     PagesAndSpaceId,
     MyHomeImport,
     hasher,
-    Log, // S/4 my home
-    Parameters,
+    Log,
     Section
 ) {
     "use strict";
@@ -113,8 +111,7 @@ sap.ui.define([
             }.bind(this));
 
             this._oErrorPageModel = new JSONModel({
-                icon: "sap-icon://documents",
-                text: "",
+                title: "",
                 description: "",
                 details: ""
             });
@@ -130,11 +127,8 @@ sap.ui.define([
                 this.getView().setModel(aServices[1].getModel());
             }.bind(this));
 
-            // S/4 my home
-            EventHub.emit("S4MyHomePlugin", this.byId("pagesNavContainer").getId());
-
             var oRenderer = sap.ushell.Container.getRenderer();
-            this.bIsHomeIntentRootIntent = utils.isFlpHomeIntent(oRenderer.getShellConfig().rootIntent);
+            this.bIsHomeIntentRootIntent = ushellUtils.isFlpHomeIntent(oRenderer.getShellConfig().rootIntent);
             this.oErrorPage = this.byId("errorPage");
             this.oEmptyPage = this.byId("emptyPage");
             this.oPagesNavContainer = this.byId("pagesNavContainer");
@@ -200,7 +194,7 @@ sap.ui.define([
         /**
          * Set the section grid container gap and row size for different screen sizes
          */
-        _setGridContainerSizes: function () {
+        _setGridContainerSizes: async function () {
             var sSizeBehavior = Config.last("/core/home/sizeBehavior");
             var oViewSettingsModel = this.getView().getModel("viewSettings");
 
@@ -212,12 +206,14 @@ sap.ui.define([
                 ? "_sap_ushell_Tile_SpacingXS"
                 : "_sap_ushell_Tile_SpacingS";
 
-            oViewSettingsModel.setProperty("/gridContainerGap/gridContainerGap", this._getNumericThemeParam(sTileGapParam));
-            oViewSettingsModel.setProperty("/gridContainerGap/gridContainerGapXS", this._getNumericThemeParam("_sap_ushell_Tile_SpacingXS"));
-            oViewSettingsModel.setProperty("/gridContainerGap/gridContainerGapS", this._getNumericThemeParam(sTileGapParamS));
-            oViewSettingsModel.setProperty("/gridContainerGap/gridContainerGapM", this._getNumericThemeParam(sTileGapParam));
-            oViewSettingsModel.setProperty("/gridContainerGap/gridContainerGapL", this._getNumericThemeParam(sTileGapParam));
-            oViewSettingsModel.setProperty("/gridContainerGap/gridContainerGapXL", this._getNumericThemeParam(sTileGapParam));
+            const [sGap, sGapXS, sGapS] = await ushellUtils.getThemingParameters([sTileGapParam, "_sap_ushell_Tile_SpacingXS", sTileGapParamS]);
+
+            oViewSettingsModel.setProperty("/gridContainerGap/gridContainerGap", this._formatNumericThemeParam(sGap));
+            oViewSettingsModel.setProperty("/gridContainerGap/gridContainerGapXS", this._formatNumericThemeParam(sGapXS));
+            oViewSettingsModel.setProperty("/gridContainerGap/gridContainerGapS", this._formatNumericThemeParam(sGapS));
+            oViewSettingsModel.setProperty("/gridContainerGap/gridContainerGapM", this._formatNumericThemeParam(sGap));
+            oViewSettingsModel.setProperty("/gridContainerGap/gridContainerGapL", this._formatNumericThemeParam(sGap));
+            oViewSettingsModel.setProperty("/gridContainerGap/gridContainerGapXL", this._formatNumericThemeParam(sGap));
 
             var sTileWidthParam = (sSizeBehavior === "Small")
                 ? "_sap_ushell_Tile_WidthXS"
@@ -227,22 +223,23 @@ sap.ui.define([
                 ? "_sap_ushell_Tile_WidthXS"
                 : "_sap_ushell_Tile_WidthS";
 
-            oViewSettingsModel.setProperty("/gridContainerRowSize/gridContainerRowSize", this._getNumericThemeParam(sTileWidthParam));
-            oViewSettingsModel.setProperty("/gridContainerRowSize/gridContainerRowSizeXS", this._getNumericThemeParam("_sap_ushell_Tile_WidthXS"));
-            oViewSettingsModel.setProperty("/gridContainerRowSize/gridContainerRowSizeS", this._getNumericThemeParam(sTileWidthParamS));
-            oViewSettingsModel.setProperty("/gridContainerRowSize/gridContainerRowSizeM", this._getNumericThemeParam(sTileWidthParam));
-            oViewSettingsModel.setProperty("/gridContainerRowSize/gridContainerRowSizeL", this._getNumericThemeParam(sTileWidthParam));
-            oViewSettingsModel.setProperty("/gridContainerRowSize/gridContainerRowSizeXL", this._getNumericThemeParam(sTileWidthParam));
+            const [sRowSize, sRowSizeXS, sRowSizeS] = await ushellUtils.getThemingParameters([sTileWidthParam, "_sap_ushell_Tile_WidthXS", sTileWidthParamS]);
+
+            oViewSettingsModel.setProperty("/gridContainerRowSize/gridContainerRowSize", this._formatNumericThemeParam(sRowSize));
+            oViewSettingsModel.setProperty("/gridContainerRowSize/gridContainerRowSizeXS", this._formatNumericThemeParam(sRowSizeXS));
+            oViewSettingsModel.setProperty("/gridContainerRowSize/gridContainerRowSizeS", this._formatNumericThemeParam(sRowSizeS));
+            oViewSettingsModel.setProperty("/gridContainerRowSize/gridContainerRowSizeM", this._formatNumericThemeParam(sRowSize));
+            oViewSettingsModel.setProperty("/gridContainerRowSize/gridContainerRowSizeL", this._formatNumericThemeParam(sRowSize));
+            oViewSettingsModel.setProperty("/gridContainerRowSize/gridContainerRowSizeXL", this._formatNumericThemeParam(sRowSize));
         },
 
         /**
          * Returns a .rem value based on the tile gap or width parameter
          *
-         * @param {string} sParam Tile spacing parameter
+         * @param {string} sValue Tile spacing parameter
          * @returns {string} Value in .rem
          */
-        _getNumericThemeParam: function (sParam) {
-            var sValue = Parameters.get(sParam);
+        _formatNumericThemeParam: function (sValue) {
             if (sValue && sValue.indexOf(".") === 0) {
                 sValue = "0" + sValue;
             }
@@ -354,7 +351,7 @@ sap.ui.define([
          * @private
          */
         _setPerformanceMark: function (sMark) {
-            utils.setPerformanceMark(sMark, {
+            ushellUtils.setPerformanceMark(sMark, {
                 bUseUniqueMark: true,
                 bUseLastMark: true
             });
@@ -371,7 +368,7 @@ sap.ui.define([
             this._getMyHomeTitle().then(function (sTitle) {
                 var oActionModeButton = Core.byId("ActionModeBtn");
                 if (oActionModeButton) {
-                    var sActionModeText = resources.i18n.getText(sTextId, sTitle);
+                    var sActionModeText = resources.i18n.getText(sTextId, [sTitle]);
                     oActionModeButton.setText(sActionModeText);
                     oActionModeButton.setTooltip(sActionModeText);
                 }
@@ -409,93 +406,93 @@ sap.ui.define([
          */
         _openFLPPage: function () {
             return PagesAndSpaceId.getPageAndSpaceId()
-                .then(function (ids) {
-                    var sPageId = ids.pageId;
-                    var sSpaceId = ids.spaceId;
+                .then(({pageId, spaceId}) => {
 
                     // this property may be updated by consecutive calls to _openFLPPage and prevents race conditions when opening pages
-                    this.sCurrentTargetPageId = sPageId;
-                    this.sCurrentTargetSpaceId = sSpaceId;
+                    this.sCurrentTargetPageId = pageId;
+                    this.sCurrentTargetSpaceId = spaceId;
 
                     return Promise.all([
                         this.oInitFinishedPromise,
                         sap.ushell.Container.getServiceAsync("Menu")
                     ])
-                        .then(function (aResults) {
-                            var oMenuService = aResults[1];
-                            return oMenuService.isSpacePageAssigned(sSpaceId, sPageId);
+                        .then((aResults) => {
+                            const oMenuService = aResults[1];
+                            return oMenuService.isSpacePageAssigned(spaceId, pageId);
                         })
-                        .then(function (bAssigned) {
+                        .then((bAssigned) => {
                             if (!bAssigned) {
                                 return Promise.reject("The combination of space and page is not assigned to the user.");
                             }
                             return this.getOwnerComponent().getPagesService();
-                        }.bind(this))
-                        .then(function (pagesService) {
-                            Log.debug("cep/editMode: load Page: " + sPageId, "Page runtime");
-                            return pagesService.loadPage(sPageId);
                         })
-                        .then(function () {
-                            Log.debug("cep/editMode: load Page: show action mode button " + sPageId, "Page runtime");
+                        .then((pagesService) => {
+                            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");
                             this._showActionModeButton();
-                            if (this.sCurrentTargetPageId === sPageId) {
-                                var bMyHomeActive = this._isMyHomeRouteActive();
+                            if (this.sCurrentTargetPageId === pageId) {
+                                const bMyHomeActive = this._isMyHomeRouteActive();
 
                                 // Special logic for "Add Tiles to My Home" when personalization is disabled.
                                 this._setActionModeLogic(bMyHomeActive);
 
+                                let oNavigationPromise = Promise.resolve();
                                 // Placeholder page for empty My Home
                                 if (bMyHomeActive && this._isMyHomePageEmpty()) { // If the home page is empty, show the splash screen
-                                    return this._navigateToInitialMyHome();
+                                    oNavigationPromise = this._navigateToInitialMyHome();
+                                } else {
+                                    oNavigationPromise = this._navigate(pageId, spaceId);
                                 }
-                                return this._navigate(sPageId, sSpaceId);
-                            }
-                            return Promise.resolve();
-                        }.bind(this))
-                        .then(this._notifyOnPageRuntimeRendered.bind(this)) // S/4 my home - binding introduced to allow the use of this in the function
-                        .catch(function (error) {
-                            Log.debug("cep/editMode: open FLP Page: Handle errors", "Page runtime");
-                            if (error instanceof Error) {
-                                // E.g. UI5 modules cannot be loaded
-                                this._oErrorPageModel.setProperty("/text", resources.i18n.getText("PageRuntime.GeneralError.Text"));
-                            } else {
-                                var sDescription = resources.i18n.getText("PageRuntime.CannotLoadPage.Description") + JSON.stringify(error);
-
-                                this._oErrorPageModel.setProperty("/icon", "sap-icon://documents");
-                                this._oErrorPageModel.setProperty("/text", resources.i18n.getText("PageRuntime.CannotLoadPage.Text", [sPageId, sSpaceId]));
-                                this._oErrorPageModel.setProperty("/description", "");
-                                this._oErrorPageModel.setProperty("/details", sDescription);
-                            }
-
-                            this.oPagesRuntimeNavContainer.to(this.oErrorPage);
 
-                            this._hideActionModeButton();
-                            this._cancelActionMode();
-
-                            this._notifyOnPageRuntimeRendered();
-                        }.bind(this));
-                }.bind(this))
-                .catch(this._onError.bind(this));
+                                await oNavigationPromise;
+                                return this._onAfterPageNavigated(pageId, spaceId);
+                            }
+                        })
+                        .catch((error) => {
+                            return this.navigateToErrorPage(error, pageId, spaceId);
+                        });
+                })
+                .catch(this.navigateToErrorPage.bind(this));
         },
 
         /**
          * Displays an error message on a MessagePage.
          *
-         * @param {string} error The error message.
+         * @param {Error|string} vError The error message.
+         * @param {string} [sPageId] The page id
+         * @param {string} [sSpaceId] The space id
          * @private
          */
-        _onError: function (error) {
-            this._oErrorPageModel.setProperty("/icon", "sap-icon://documents");
-            this._oErrorPageModel.setProperty("/text", error || "");
+        navigateToErrorPage: function (vError, sPageId, sSpaceId) {
+            Log.debug("cep/editMode: open FLP Page: Handle errors", "Page runtime");
+
+            if (vError instanceof Error) {
+                // E.g. UI5 modules cannot be loaded
+                this._oErrorPageModel.setProperty("/details", vError.toString());
+
+                this._oErrorPageModel.setProperty("/title", resources.i18n.getText("PageRuntime.GeneralError.Text"));
+            } else {
+                this._oErrorPageModel.setProperty("/details", resources.i18n.getText("PageRuntime.CannotLoadPage.Description") + JSON.stringify(vError));
+
+                if (sPageId && sSpaceId) {
+                    this._oErrorPageModel.setProperty("/title", resources.i18n.getText("PageRuntime.CannotLoadPage.Text", [sPageId, sSpaceId]));
+                } else {
+                    this._oErrorPageModel.setProperty("/title", resources.i18n.getText("PageRuntime.GeneralError.Text"));
+                }
+            }
+
+            // reset description
             this._oErrorPageModel.setProperty("/description", "");
-            this._oErrorPageModel.setProperty("/details", "");
 
             this.oPagesRuntimeNavContainer.to(this.oErrorPage);
 
             this._hideActionModeButton();
             this._cancelActionMode();
 
-            this._notifyOnPageRuntimeRendered();
+            this._onAfterPageNavigated();
         },
 
         /**
@@ -604,20 +601,21 @@ sap.ui.define([
          * @since 1.79.0
          * @private
          */
-        _notifyOnPageRuntimeRendered: function () {
-            // S/4 my home
-            try {
-                var sPageId;
-                var oCurrentPage = this.oPagesNavContainer.getCurrentPage();
-                sPageId = oCurrentPage && oCurrentPage.getId();
-                EventHub.emit("S4Plugin_PagesRuntimeRendered", sPageId);
-            } catch (oError) {
-                Log.error("Error while trying to trigger the PagesRuntimeRendered event for the S/4 My Home plugin");
+        _onAfterPageNavigated: function () {
+            if (this.sCurrentTargetPageId && this.sCurrentTargetSpaceId) {
+                // Save new space and page for ShellAnalytics
+                EventHub.emit("PageRendered", {
+                    time: Date.now(),
+                    pageId: this.sCurrentTargetPageId,
+                    spaceId: this.sCurrentTargetSpaceId
+                });
             }
-            EventHub.emit("PagesRuntimeRendered");
-            // "reset" the appRendered event in case the user wants to navigate back to the same app.
-            if (EventHub.last("AppRendered") !== undefined) {
-                EventHub.emit("AppRendered", undefined);
+
+            // track navigation in ShellAnalytics
+            if (!EventHub.last("PagesRuntimeRendered")) {
+                EventHub.emit("PagesRuntimeRendered", true);
+            } else {
+                EventHub.emit("CloseFesrRecord", Date.now());
             }
         },
 
@@ -639,7 +637,7 @@ sap.ui.define([
          * @private
          */
         _copyToClipboard: function () {
-            var bResult = utils.copyToClipboard(this._oErrorPageModel.getProperty("/description"));
+            var bResult = ushellUtils.copyToClipboard(this._oErrorPageModel.getProperty("/description"));
             if (bResult) {
                 MessageToast.show(resources.i18n.getText("PageRuntime.CannotLoadPage.CopySuccess"), {
                     closeOnBrowserNavigation: false
@@ -1124,7 +1122,7 @@ sap.ui.define([
          * @since 1.86.0
          */
         _createActionModeButton: function (sPageTitle) {
-            var sButtonText = sPageTitle ? resources.i18n.getText("PageRuntime.EditModeForPage.Activate", sPageTitle)
+            var sButtonText = sPageTitle ? resources.i18n.getText("PageRuntime.EditModeForPage.Activate", [sPageTitle])
                 : resources.i18n.getText("PageRuntime.EditMode.Activate");
             var oActionButtonObjectData = {
                 id: "ActionModeBtn",

package/src/main/js/sap/ushell/components/pages/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.pages",
         "applicationVersion": {
-            "version": "1.117.2"
+            "version": "1.119.0"
         },
         "i18n": {
             "bundleUrl": "../../renderers/fiori2/resources/resources.properties",