@sapui5/sap.ushell 1.117.2 → 1.119.0

package/src/main/js/sap/ushell/performance/ShellAnalytics.js

@@ -3,72 +3,67 @@
  * @fileOverview Provides analytical data like duration for navigation steps in the shell, in FLP,
  *               in particular an array of all statistical records
  *
- * @version 1.117.2
+ * @version 1.119.0
  */
 sap.ui.define([
+    "sap/base/Log",
     "sap/ushell/EventHub",
     "sap/ushell/services/AppConfiguration",
     "sap/ushell/performance/StatisticalRecord",
-    "sap/ushell/utils",
-    "sap/ushell/Config"
-], function (EventHub, AppConfiguration, StatisticalRecord, Utils, Config) {
+    "sap/ushell/utils"
+], function (
+    Log,
+    EventHub,
+    AppConfiguration,
+    StatisticalRecord,
+    Utils
+) {
     "use strict";
 
-    var aStatisticalRecords = [];
-    var aDoable = [];
-    var bHomePageLoaded = false;
-    var bInitialized = false;
+    const sModuleName = "ShellAnalytics";
+    const sLogPrefix = "[FesrFlp]";
 
-    var oStatisticalRecord, // current statistical record
+    let aStatisticalRecords = [];
+    let aDoables = [];
+    let bHomePageLoaded = false;
+    let bInitialized = false;
+
+    let oStatisticalRecord, // current statistical record
         oCurrentApplication,
         lastHashChangeTime;
 
-    var TRIGGERS = {
-        dashboardTileClick: "HOMEPAGE_TILE",
-        dashboardTileLinkClick: "HOMEPAGE_LINK",
-        catalogTileClick: "FINDER_TILE"
-    };
-
-    var NAVIGATION_MODE = {
+    const NAVIGATION_MODE = {
         EXPLACE: "EXPLACE",
         INPLACE: "INPLACE"
     };
 
-    var FLP_APPLICATION_LOOKUP = {
+    const FLP_APPLICATION_LOOKUP = {
         "sap.ushell.components.appfinder": "FLP_FINDER",
         "sap.ushell.components.pages": "FLP_PAGE",
         "sap.ushell.components.homepage": "FLP_HOME"
     };
 
-    var aTriggers = ["dashboardTileClick", "dashboardTileLinkClick", "catalogTileClick"];
-
-    /**
-     * Gets the event bus
-     * @returns {object} oEventBus The event bus
-     */
-    function _getEventBus () {
-        return sap.ui.getCore().getEventBus();
-    }
-
     /**
      * Check if application is FLP homepage
      *
-     * @param {object} application application
+     * @param {object} [oApplication] application
      *
      * @returns {boolean} true for homepage and page runtime and for special case that it is a home application
      */
-    function _isFLPHome (application) {
-
-        return application.id === "FLP_HOME" || application.id === "FLP_PAGE";
+    function _isFLPHome (oApplication) {
+        if (!oApplication) {
+            return false;
+        }
+        return oApplication.id === "FLP_HOME" || oApplication.id === "FLP_PAGE";
     }
 
     /**
      * Is application a home application
-     * @param {object} application application
+     * @param {object} [oApplication] application
      * @returns {boolean} isHomeApp true if given application is a home application
      */
-    function _isHomeApp (application) {
-        return application.isHomeApp;
+    function _isHomeApp (oApplication) {
+        return oApplication && oApplication.isHomeApp;
     }
 
     /**
@@ -81,10 +76,10 @@ sap.ui.define([
 
     /**
      * Gets last closed record
-     * @returns {object} oLastClosedRecord last closed record
+     * @returns {sap.ushell.performance.StatisticalRecord} last closed record
      */
     function getLastClosedRecord () {
-        var aClosedRecords = getAllRecords().filter(function (oRecord) {
+        const aClosedRecords = getAllRecords().filter((oRecord) => {
             return oRecord.isClosed();
         });
         if (aClosedRecords.length > 0) {
@@ -94,18 +89,19 @@ sap.ui.define([
     }
     /**
      * Gets the next record according to the start time in a navigation given a last tracked record
-     * @param {object} oLastTrackedRecord The last tracked record
-     * @returns {object} oNextNavigationRecord The next navigation record or undefined if it does not exist
+     * @param {sap.ushell.performance.StatisticalRecord} [oLastTrackedRecord] The last tracked record
+     * @returns {sap.ushell.performance.StatisticalRecord} oNextNavigationRecord The next navigation record or undefined if it does not exist
      */
     function getNextNavigationRecords (oLastTrackedRecord) {
         if (!oLastTrackedRecord) {
-            return getAllRecords();
+            return getAllRecords().filter((oRecord) => {
+                return oRecord.isClosed();
+            });
         }
 
-        return getAllRecords().filter(function (oRecord) {
+        return getAllRecords().filter((oRecord) => {
             return oLastTrackedRecord.getTimeStart() < oRecord.getTimeStart() && oRecord.isClosed();
         });
-
     }
 
     function getCurrentApplication () {
@@ -113,6 +109,7 @@ sap.ui.define([
     }
 
     function _setCurrentApplication (oApplication) {
+        Log.debug(`${sLogPrefix} ShellAnalytics setCurrentApplication: ${oApplication && oApplication.id}`, null, sModuleName);
         oCurrentApplication = oApplication;
     }
 
@@ -125,43 +122,37 @@ sap.ui.define([
     }
     /**
      * Gets the current statistical record or creates it if it does not exist
-     * @returns {object} oStatisticalRecord The current statistical record
+     * @returns {sap.ushell.performance.StatisticalRecord} The current statistical record
      */
     function _getOrCreateCurrentStatisticalRecord () {
         if (!oStatisticalRecord) {
-            oStatisticalRecord = new StatisticalRecord();
+            const oLastRecord = aStatisticalRecords[aStatisticalRecords.length - 1] || null;
+            oStatisticalRecord = new StatisticalRecord(oLastRecord);
             aStatisticalRecords.push(oStatisticalRecord);
         }
         return oStatisticalRecord;
     }
 
-    /**
-     * Handles home page action
-     * @param {string} sChannel EventBus channel
-     * @param {string} sEvent EventBus event name
-     */
-    function _handleHomepageAction (sChannel, sEvent) {
-        _getOrCreateCurrentStatisticalRecord().setTrigger(TRIGGERS[sEvent]);
-    }
-
     /**
      * Tracks a new target hash with time in a statistical record
-     * @param {object} sNewHash New hash value
+     * @param {string} sNewHash New hash value
      */
     function trackNewTargetHash (sNewHash) {
-        _getOrCreateCurrentStatisticalRecord().setTargetHash(sNewHash);
-        _getOrCreateCurrentStatisticalRecord().setTimeStart(lastHashChangeTime || performance.now());
+        const oRecord = _getOrCreateCurrentStatisticalRecord();
+        oRecord.setTargetHash(sNewHash);
+        oRecord.setTimeStart(lastHashChangeTime || performance.now());
     }
+
     /**
      * Removes the parameters of a technical name that comes
      * with a transaction name and parameters.
      * Removes star at the beginning if it exists.
      * Replaces the string (TCODE) by the string (TR) at the end.
-     * @param {string} sTechnicalName Technical name of a transaction with parameters or WD application
+     * @param {string} [sTechnicalName] Technical name of a transaction with parameters or WD application
      * @returns {string} The transaction name or an empty string if input is not a transaction
      */
     function _removeParametersIfTransaction (sTechnicalName) {
-       var sTechnicalNameWithDefault = sTechnicalName || "";
+       const sTechnicalNameWithDefault = sTechnicalName || "";
        if (sTechnicalNameWithDefault.slice(-7) === "(TCODE)") {
            return sTechnicalNameWithDefault
            .replace(/ .*/, "") // remove all starting with a space
@@ -172,14 +163,14 @@ sap.ui.define([
        return sTechnicalNameWithDefault;
    }
 
-/**
+    /**
      * Gets the current application id from the manifest.
      * @param {object} oCurrentApp The application object from sap.ushell.Container.getServiceAsync("AppLifeCycle")
      * @returns {string} Application id like sap.ushell.components.homepage
      */
     function _getAppIdFromManifest (oCurrentApp) {
-        var sApplicationId = "";
-        var oApplicationManifest = oCurrentApp && oCurrentApp.componentInstance && oCurrentApp.componentInstance.getManifest();
+        let sApplicationId = "";
+        const oApplicationManifest = oCurrentApp.componentInstance && oCurrentApp.componentInstance.getManifest();
         if (oApplicationManifest && oApplicationManifest["sap.app"] && oApplicationManifest["sap.app"].id) {
             sApplicationId = oApplicationManifest["sap.app"].id;
         }
@@ -190,76 +181,74 @@ sap.ui.define([
      * Gets the current application. This can be a UI5, Web Dynpro, SAP GUI or WCF application
      * @returns {Promise<object>} A promise to be resolved after service is loaded. The promise resolves to the current application.
      */
-    function _getCurrentApplication () {
-        return sap.ushell.Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
-            // error case
-            var oCurrentApp = oAppLifeCycleService.getCurrentApplication();
-            if (!oCurrentApp) {
-                return {};
-            }
-            // some preparation
-            var bIsHomeApp = oCurrentApp
-                && oCurrentApp.componentInstance
-                && oCurrentApp.componentInstance.sId
-                && oCurrentApp.componentInstance.sId.includes("homeApp-component");
-            var oPromiseFioriIds;
-            // Method getTechnicalParameter might not exist.
-            if (oCurrentApp.getTechnicalParameter) {
-                oPromiseFioriIds = oCurrentApp.getTechnicalParameter("sap-fiori-id");
-            } else {
-                oPromiseFioriIds = Promise.resolve([]);
-            }
-
-            // get Fiori Id
-            return oPromiseFioriIds.then(function (aFioriIds) {
-                var sApplicationId = aFioriIds && aFioriIds[0];
-                // custom home
-                if (bIsHomeApp) {
-                        return {
-                            type: "UI5",
-                            id: sApplicationId,
-                            isHomeApp: true
-                        };
-                }
-
-                // home page
-                if (oCurrentApp.homePage) {
-                    var sId = FLP_APPLICATION_LOOKUP[_getAppIdFromManifest(oCurrentApp)] || "FLP_HOME";
-                    return {
-                        type: "UI5",
-                        id: sId
-                    };
-                }
-
-                // UI5 app
-                if (oCurrentApp.applicationType === "UI5") {
-                    if (!sApplicationId) {
-                        sApplicationId = _getAppIdFromManifest(oCurrentApp);
-                        //Additional check that it is not flp application
-                        sApplicationId = FLP_APPLICATION_LOOKUP[sApplicationId] || sApplicationId;
-                    }
-                    //sApplicationId from sap.app.id can have comma (there is no validation from manifest validation)
-                    sApplicationId = sApplicationId.replace(/,/g, "");
-                    return {
-                        type: "UI5",
-                        id: sApplicationId
-                    };
-                }
-
-                // application Type WDA / TR / WCF
-                // get technicalName from application configuration
-                var sTechnicalNameFromAppConfiguration = AppConfiguration.getMetadata().technicalName || AppConfiguration.getCurrentApplication().text || oCurrentApp.applicationType;
-                var sTechnicalNameForFESR = _removeParametersIfTransaction(
-                    //need to remove all comma, because fesr has the csv format with comma separation
-                        sTechnicalNameFromAppConfiguration.replace(/,/g, "")
-                    );
+    async function _getCurrentApplication () {
+        const oAppLifeCycleService = await sap.ushell.Container.getServiceAsync("AppLifeCycle");
+        // error case
+        const oCurrentApp = oAppLifeCycleService.getCurrentApplication();
+        if (!oCurrentApp) {
+            return {};
+        }
+        // some preparation
+        const bIsHomeApp = oCurrentApp
+            && oCurrentApp.componentInstance
+            && oCurrentApp.componentInstance.sId
+            && oCurrentApp.componentInstance.sId.includes("homeApp-component");
+        let oPromiseFioriIds;
+        // Method getTechnicalParameter might not exist.
+        if (oCurrentApp.getTechnicalParameter) {
+            oPromiseFioriIds = oCurrentApp.getTechnicalParameter("sap-fiori-id");
+        } else {
+            oPromiseFioriIds = Promise.resolve([]);
+        }
 
+        // get Fiori Id
+        const aFioriIds = await oPromiseFioriIds;
+        let sApplicationId = aFioriIds && aFioriIds[0];
+        // custom home
+        if (bIsHomeApp) {
                 return {
-                    type: oCurrentApp.applicationType,
-                    id: sTechnicalNameForFESR
+                    type: "UI5",
+                    id: sApplicationId,
+                    isHomeApp: true
                 };
-            });
-        });
+        }
+
+        // home page
+        if (oCurrentApp.homePage) {
+            const sId = FLP_APPLICATION_LOOKUP[_getAppIdFromManifest(oCurrentApp)] || "FLP_HOME";
+            return {
+                type: "UI5",
+                id: sId
+            };
+        }
+
+        // UI5 app
+        if (oCurrentApp.applicationType === "UI5") {
+            if (!sApplicationId) {
+                sApplicationId = _getAppIdFromManifest(oCurrentApp);
+                //Additional check that it is not flp application
+                sApplicationId = FLP_APPLICATION_LOOKUP[sApplicationId] || sApplicationId;
+            }
+            //sApplicationId from sap.app.id can have comma (there is no validation from manifest validation)
+            sApplicationId = sApplicationId.replace(/,/g, "");
+            return {
+                type: "UI5",
+                id: sApplicationId
+            };
+        }
+
+        // application Type WDA / TR / WCF
+        // get technicalName from application configuration
+        const sTechnicalNameFromAppConfiguration = AppConfiguration.getMetadata().technicalName || AppConfiguration.getCurrentApplication().text || oCurrentApp.applicationType;
+        const sTechnicalNameForFESR = _removeParametersIfTransaction(
+            //need to remove all comma, because fesr has the csv format with comma separation
+                sTechnicalNameFromAppConfiguration.replace(/,/g, "")
+            );
+
+        return {
+            type: oCurrentApp.applicationType,
+            id: sTechnicalNameForFESR
+        };
     }
 
 
@@ -269,35 +258,31 @@ sap.ui.define([
      * Additionally method check if the homepage loaded the first time (use global bHomePageLoaded variable)
      * and update the record respectively.
      *
-     * @param {object} oSourceApplication source application
+     * @param {object} [oSourceApplication] source application
      * @param {string} oSourceApplication.id Fiori id for ui5 application or sTechnicalName for others
-     * @param {string} oSourceApplication.isHomeApp true, if it is a custom application
-     * @param {object} oTargetApplication target application
+     * @param {boolean} oSourceApplication.isHomeApp true, if it is a custom application
+     * @param {object} [oTargetApplication] target application
      * @param {string} oTargetApplication.id Fiori id for ui5 application or sTechnicalName for others
-     * @param {string} oTargetApplication.isHomeApp true, if it is a custom application
+     * @param {boolean} oTargetApplication.isHomeApp true, if it is a custom application
      * @param {string} oTargetApplication.type Type of the application. For example, UI5
      * @param {string} sNavigationMode navigation mode
-
+     * @param {sap.ushell.performance.StatisticalRecord} oRecord the related Statistical Record
+     *
      */
-    function _closeNavigation (oSourceApplication, oTargetApplication, sNavigationMode) {
-        if (oStatisticalRecord) {
-            oStatisticalRecord.setSourceApplication(oSourceApplication && oSourceApplication.id);
-            oStatisticalRecord.setTargetApplication(oTargetApplication && oTargetApplication.id);
-            oStatisticalRecord.setTargetApplicationType(oTargetApplication && oTargetApplication.type);
-            oStatisticalRecord.setNavigationMode(sNavigationMode);
-            oStatisticalRecord.setTargetIsHomeApp(oTargetApplication && oTargetApplication.isHomeApp);
-            oStatisticalRecord.setSourceIsHomeApp(oSourceApplication && oSourceApplication.isHomeApp);
-
-            if (
-                !bHomePageLoaded && (
-                    _isHomeApp(oTargetApplication) || _isFLPHome(oTargetApplication)
-                )
-            ) {
+    function _closeNavigation (oSourceApplication, oTargetApplication, sNavigationMode, oRecord) {
+        if (oRecord) {
+            oRecord.setSourceApplication(oSourceApplication && oSourceApplication.id);
+            oRecord.setTargetApplication(oTargetApplication && oTargetApplication.id);
+            oRecord.setTargetApplicationType(oTargetApplication && oTargetApplication.type);
+            oRecord.setNavigationMode(sNavigationMode);
+            oRecord.setTargetIsHomeApp(_isHomeApp(oTargetApplication));
+            oRecord.setSourceIsHomeApp(_isHomeApp(oSourceApplication));
+
+            if (!bHomePageLoaded && (_isHomeApp(oTargetApplication) || _isFLPHome(oTargetApplication))) {
                 bHomePageLoaded = true;
-                oStatisticalRecord.setHomepageLoading(true);
+                oRecord.setHomepageLoading(true);
             }
-            oStatisticalRecord.closeRecord();
-            oStatisticalRecord = null;
+            oRecord.closeRecord();
         }
     }
 
@@ -309,15 +294,17 @@ sap.ui.define([
         if (!oStatisticalRecord) {
             return;
         }
-        _getCurrentApplication().then(function (oTargetApplication) {
-            var oCurrentApp = getCurrentApplication();
+        const oRecordTmp = oStatisticalRecord;
+        oStatisticalRecord = null;
+        _getCurrentApplication().then((oTargetApplication) => {
+            const oCurrentApp = getCurrentApplication();
             // correct the target application in stateful case
             if (oEventData && oEventData.technicalName) {
                 oTargetApplication.id = _removeParametersIfTransaction(oEventData.technicalName);
                 oTargetApplication.type = oTargetApplication.id.slice(-4) === "(TR)" ? "GUI" : "NWBC";
             }
             _setCurrentApplication(oTargetApplication);
-            _closeNavigation(oCurrentApp, oTargetApplication, NAVIGATION_MODE.INPLACE);
+            _closeNavigation(oCurrentApp, oTargetApplication, NAVIGATION_MODE.INPLACE, oRecordTmp);
         });
     }
 
@@ -325,8 +312,10 @@ sap.ui.define([
      * Closes explace navigation
      */
     function _closeExplaceNavigation () {
-        var oCurrentApp = getCurrentApplication();
-        _closeNavigation(oCurrentApp, null, NAVIGATION_MODE.EXPLACE);
+        const oRecordTmp = oStatisticalRecord;
+        oStatisticalRecord = null;
+        const oCurrentApp = getCurrentApplication();
+        _closeNavigation(oCurrentApp, null, NAVIGATION_MODE.EXPLACE, oRecordTmp);
     }
 
     /**
@@ -334,7 +323,7 @@ sap.ui.define([
      */
     function _closeNavigationWithError () {
         if (oStatisticalRecord) {
-            var oCurrentApp = getCurrentApplication();
+            const oCurrentApp = getCurrentApplication();
             oStatisticalRecord.setSourceApplication(oCurrentApp ? oCurrentApp.id : undefined);
             oStatisticalRecord.closeRecordWithError();
             oStatisticalRecord = null;
@@ -344,31 +333,23 @@ sap.ui.define([
     /**
      * attaches change listener
      */
-    function _attachHashChangeListener () {
-        sap.ushell.Container.getServiceAsync("ShellNavigation").then(function (oShellNavigation) {
-            oShellNavigation.hashChanger.attachEvent("hashChanged", _trackHashChangeTime);
-            oShellNavigation.hashChanger.attachEvent("shellHashChanged", _trackHashChangeTime);
-        });
+    async function _attachHashChangeListener () {
+        const oShellNavigation = await sap.ushell.Container.getServiceAsync("ShellNavigation");
+        oShellNavigation.hashChanger.attachEvent("hashChanged", _trackHashChangeTime);
+        oShellNavigation.hashChanger.attachEvent("shellHashChanged", _trackHashChangeTime);
     }
     /**
      * detach change listener
      */
-    function _detachHashChangeListener () {
-        sap.ushell.Container.getServiceAsync("ShellNavigation").then(function (oShellNavigation) {
-            oShellNavigation.hashChanger.detachEvent("hashChanged", _trackHashChangeTime);
-            oShellNavigation.hashChanger.detachEvent("shellHashChanged", _trackHashChangeTime);
-
-        });
+    async function _detachHashChangeListener () {
+        const oShellNavigation = await sap.ushell.Container.getServiceAsync("ShellNavigation");
+        oShellNavigation.hashChanger.detachEvent("hashChanged", _trackHashChangeTime);
+        oShellNavigation.hashChanger.detachEvent("shellHashChanged", _trackHashChangeTime);
     }
 
     /**
      * enables shell analytics
-     * the following events are listened to and record the completion of the step
-     *  ShellNavigationInitialized: track the time of hash change
-     *  AppRendered: open app inplace
-     *  openedAppInNewWindow: open app explace
-     *  firstSegmentCompleteLoaded: start home page
-     *  doHashChangeError: error during the resolving
+     * Registers to required events
      */
     function enable () {
         if (bInitialized) {
@@ -376,38 +357,59 @@ sap.ui.define([
         }
         bInitialized = true;
 
-        aTriggers.forEach(function (item) {
-            _getEventBus().subscribe("launchpad", item, _handleHomepageAction);
+        const aEventMappings = [
+            // Track the time of hash change
+            { once: true, eventName: "ShellNavigationInitialized", handler: _attachHashChangeListener },
+            // New hash
+            { eventName: "trackHashChange", handler: trackNewTargetHash },
+            // Error during hash resolving
+            { eventName: "doHashChangeError", handler: _closeNavigationWithError },
+            // Initial Rendering of Classic Homepage
+            { once: true, eventName: "firstSegmentCompleteLoaded", handler: _closeInplaceNavigation },
+            // Initial Rendering of AppFinder
+            { once: true, eventName: "firstCatalogSegmentCompleteLoaded", handler: _closeInplaceNavigation },
+            // Initial Rendering of PagesRuntime
+            { once: true, eventName: "PagesRuntimeRendered", handler: _closeInplaceNavigation },
+            // Initial Rendering of CustomHome
+            { once: true, eventName: "CustomHomeRendered", handler: _closeInplaceNavigation },
+            { eventName: "PageRendered", handler: _addPageData },
+            // Open app inplace
+            { eventName: "AppRendered", handler: _closeInplaceNavigation },
+            // Open app explace
+            { eventName: "openedAppInNewWindow", handler: _closeExplaceNavigation },
+            // Close current Record
+            { eventName: "CloseFesrRecord", handler: _closeInplaceNavigation }
+        ];
+
+        const aNewDoables = aEventMappings.map((oMapping) => {
+            if (oMapping.once) {
+                return EventHub.once(oMapping.eventName).do((...args) => {
+                    Log.debug(`${sLogPrefix} Incoming event: ${oMapping.eventName}`, JSON.stringify(args[0], null, 2), sModuleName);
+                    oMapping.handler(...args);
+                });
+            }
+            return EventHub.on(oMapping.eventName).do((...args) => {
+                Log.debug(`${sLogPrefix} Incoming event: ${oMapping.eventName}`, JSON.stringify(args[0], null, 2), sModuleName);
+                oMapping.handler(...args);
+            });
         });
 
-        var oDoable;
-        //track the time of hash change
-        oDoable = EventHub.once("ShellNavigationInitialized").do(_attachHashChangeListener);
-        aDoable.push(oDoable);
-        //Event handling for all target applications
-        oDoable = EventHub.on("trackHashChange").do(trackNewTargetHash);
-        aDoable.push(oDoable);
-        //open app inplace
-        oDoable = EventHub.on("AppRendered").do(_closeInplaceNavigation);
-        aDoable.push(oDoable);
-        // open custom home
-        oDoable = EventHub.on("CustomHomeRendered").do(_closeInplaceNavigation);
-        aDoable.push(oDoable);
-        //open app explace
-        oDoable = EventHub.on("openedAppInNewWindow").do(_closeExplaceNavigation);
-        aDoable.push(oDoable);
-        // home page start
-        oDoable = EventHub.on("firstSegmentCompleteLoaded").do(_closeInplaceNavigation);
-        aDoable.push(oDoable);
-        //error during the resolving
-        oDoable = EventHub.on("doHashChangeError").do(_closeNavigationWithError);
-        aDoable.push(oDoable);
-        //Render page runtime
-        oDoable = EventHub.on("PagesRuntimeRendered").do(_closeInplaceNavigation);
-        aDoable.push(oDoable);
-        //Stateful container, cached application, etc.
-        oDoable = EventHub.on("CloseFesrRecord").do(_closeInplaceNavigation);
-        aDoable.push(oDoable);
+        aDoables = [...aDoables, ...aNewDoables];
+    }
+
+    /**
+     * Adds data about the target page to the Statistical Record
+     * @param {object} oEventData The eventData
+     * @private
+     * @since 1.118
+     */
+    function _addPageData (oEventData) {
+        const oRecord = _getOrCreateCurrentStatisticalRecord();
+
+        oRecord.enhanceTargetApplicationData({
+            pageId: oEventData.pageId,
+            spaceId: oEventData.spaceId
+        });
     }
 
     /**
@@ -418,13 +420,10 @@ sap.ui.define([
             return;
         }
 
-        aTriggers.forEach(function (item) {
-            _getEventBus().unsubscribe("launchpad", item, _handleHomepageAction);
-        });
-
-        aDoable.forEach(function (oDoable) {
+        aDoables.forEach((oDoable) => {
             oDoable.off();
         });
+        aDoables = [];
 
         _detachHashChangeListener();
         _setCurrentApplication(null);