@sapui5/sap.ushell 1.116.0 → 1.117.0

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

@@ -131,8 +131,9 @@ sap.ui.define([
          * @private
          */
         _onBeforeCreatedHandler: function (oUi5FesrHandle, oUi5Interaction) {
-            var oDetectedScenario = this._detectScenario(oUi5FesrHandle, oUi5Interaction),
-                sApplicationId = this._getLastTrackedApplicationId();
+            var oDetectedScenario = this._detectScenario(oUi5FesrHandle, oUi5Interaction);
+            var sApplicationId = this._getLastTrackedApplicationId();
+
             if (sApplicationId) {
                 // Add the latest remembered Fiori ID to every record until a different Fiori ID is set.
                 // This is needed to relate interactions tracked afterwards to the started app.
@@ -184,40 +185,39 @@ sap.ui.define([
                 var oLastRecord = ShellAnalytics.getLastClosedRecord();
                 this._setLastTrackedRecord(oLastRecord);
                 // case home app: Home app is detected in a special way.
-                if (!!oLastRecord && oLastRecord.isHomeApp) {
+                if (!!oLastRecord && oLastRecord.isTargetHomeApp) {
                     return createResultObject(SCENARIOS.CUSTOM_HOME_INITIAL);
                 }
                 // case app finder, pages, and homepage
                 switch (oUi5FesrHandle.appNameLong) {
                     case "sap.ushell.components.homepage":
-                        return createResultObject(SCENARIOS.HOME_INITIAL);
                     case "sap.ushell.components.pages":
                         return createResultObject(SCENARIOS.HOME_INITIAL);
                     case "sap.ushell.components.appfinder":
                         return createResultObject(SCENARIOS.FINDER_INITIAL);
                     default:
-                    // application direct start
-                    return createResultObject(SCENARIOS.APP_INITIAL, oLastRecord);
+                        // application direct start
+                        return createResultObject(SCENARIOS.APP_INITIAL, oLastRecord);
                 }
             }
 
-            var oLastTrackedRecord = this._getLastTrackedRecord(),
-                aNavigationRecords = ShellAnalytics.getNextNavigationRecords(oLastTrackedRecord),
-                sScenario,
+            var oLastTrackedRecord = this._getLastTrackedRecord();
+            var aNavigationRecords = ShellAnalytics.getNextNavigationRecords(oLastTrackedRecord);
+            var sScenario,
                 oNavigationRecord;
+
             if (aNavigationRecords.length === 1) {
                 oNavigationRecord = aNavigationRecords[0];
                 // consider that if there was navigation the saved navigation and new navigation has different time
-                if ((oNavigationRecord && oLastTrackedRecord && !oNavigationRecord.isEqual(oLastTrackedRecord))
-                    || (!oLastTrackedRecord && oNavigationRecord)) {
+                if ((oNavigationRecord && oLastTrackedRecord && !oNavigationRecord.isEqual(oLastTrackedRecord)) || (!oLastTrackedRecord && oNavigationRecord)) {
                     this._setLastTrackedRecord(oNavigationRecord);
-                    // specify navigatio scenario further when during loading
+                    // specify navigation scenario further when during loading
                     sScenario = oNavigationRecord.step === SCENARIOS.HOME_LOADING ? SCENARIOS.HOME_LOADING : SCENARIOS.NAVIGATION;
                     return createResultObject(sScenario, oNavigationRecord);
                 }
             } else if (aNavigationRecords.length > 1) {
-                 aNavigationRecords.pop();
-                 oNavigationRecord = aNavigationRecords[0];
+                aNavigationRecords.pop();
+                oNavigationRecord = aNavigationRecords[0];
                 this._setLastTrackedRecord(oNavigationRecord);
                 sScenario = oNavigationRecord.step === SCENARIOS.HOME_LOADING ? SCENARIOS.HOME_LOADING : SCENARIOS.NAVIGATION;
                 return createResultObject(sScenario, oNavigationRecord);
@@ -261,8 +261,7 @@ sap.ui.define([
             }
 
             // unknown scenario
-            Log.warning("[fesrEnhFlp] Unknown scenario at the end of execution, unnecessary code executed",
-                null, "sap.ushell.performance.FesrEnhancer");
+            Log.warning("[fesrEnhFlp] Unknown scenario at the end of execution, unnecessary code executed", null, "sap.ushell.performance.FesrEnhancer");
             return oIntermediateResult;
         },
 
@@ -276,8 +275,8 @@ sap.ui.define([
          * @returns {object} The enhanced version using the given information for scenario initial start.
          */
         _enhanceInitialStart: function (oIntermediateResult, sStepName, sPerformanceMarkName) {
-            var oMark,
-                oEnhancedFesrHandle = deepExtend({}, oIntermediateResult);
+            var oMark;
+            var oEnhancedFesrHandle = deepExtend({}, oIntermediateResult);
 
             // set step name
             if (sStepName === SCENARIOS.CUSTOM_HOME_INITIAL) {
@@ -301,7 +300,7 @@ sap.ui.define([
                     return oEnhancedFesrHandle;
                 }
                 // empty page
-                 oMark = this._getPerformanceEntries("FLP-Pages-Service-loadPage-end", false)[0];
+                oMark = this._getPerformanceEntries("FLP-Pages-Service-loadPage-end", false)[0];
                 if (oMark) {
                     // in case of empty page, the time load page end is most accurate
                     oEnhancedFesrHandle.timeToInteractive = oMark.startTime;
@@ -333,7 +332,7 @@ sap.ui.define([
                 oEnhancedFesrHandle.stepName = oRelatedRecord.step || oIntermediateResult.stepName;
             }
             oEnhancedFesrHandle.appNameShort = oRelatedRecord.targetApplication || "";
-            if (oRelatedRecord.applicationType === "UI5") {
+            if (oRelatedRecord.targetApplicationType === "UI5") {
                 oEnhancedFesrHandle.interactionType = INTERACTION_TYPE.APP_START;
             }
 
@@ -362,7 +361,7 @@ sap.ui.define([
             oEnhancedFesrHandle.stepName = sStepName;
             oEnhancedFesrHandle.appNameShort = oIntermediateResult.appNameShort;
 
-            if (oRelatedRecord.applicationType === "UI5") {
+            if (oRelatedRecord.targetApplicationType === "UI5") {
                 oEnhancedFesrHandle.interactionType = INTERACTION_TYPE.APP_START;
             } else {
                 //Not UI5 applications handle the start flag theirself and we need to avoid duplication in the statistic

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

@@ -3,7 +3,7 @@
  * @fileOverview Provides analytical data like duration for navigation steps in the shell, in FLP,
  *               in particular an array of all statistical records
  *
- * @version 1.116.0
+ * @version 1.117.0
  */
 sap.ui.define([
     "sap/ushell/EventHub",
@@ -14,13 +14,14 @@ sap.ui.define([
 ], function (EventHub, AppConfiguration, StatisticalRecord, Utils, Config) {
     "use strict";
 
-    var aStatisticalRecords = [],
-        aDoable = [],
-        oStatisticalRecord, // current statistical record
+    var aStatisticalRecords = [];
+    var aDoable = [];
+    var bHomePageLoaded = false;
+    var bInitialized = false;
+
+    var oStatisticalRecord, // current statistical record
         oCurrentApplication,
-        lastHashChangeTime,
-        bHomePageLoaded = false,
-        bInitialized = false;
+        lastHashChangeTime;
 
     var TRIGGERS = {
         dashboardTileClick: "HOMEPAGE_TILE",
@@ -50,23 +51,29 @@ sap.ui.define([
     }
 
     /**
-     * Check if application id is homepage
+     * Check if application is FLP homepage
      *
-     * @param {string} sApplicationId fiori id
-     * @param {boolean} isHomeApp true if it is a home app
+     * @param {object} application application
      *
      * @returns {boolean} true for homepage and page runtime and for special case that it is a home application
      */
-    function _isHomePage (sApplicationId, isHomeApp) {
-        if (isHomeApp) {
-            return true;
+    function _isFLPHome (application) {
+
+        return application.id === "FLP_HOME" || application.id === "FLP_PAGE";
     }
-        return sApplicationId && (sApplicationId === "FLP_HOME" || sApplicationId === "FLP_PAGE");
+
+    /**
+     * Is application a home application
+     * @param {object} application application
+     * @returns {boolean} isHomeApp true if given application is a home application
+     */
+    function _isHomeApp (application) {
+        return application.isHomeApp;
     }
 
     /**
      * Gets all statistical records
-     * @returns {array} aStatisticalRecords Array of statistical records
+     * @returns {sap.ushell.performance.StatisticalRecord[]} Array of statistical records
      */
     function getAllRecords () {
         return aStatisticalRecords;
@@ -86,7 +93,7 @@ sap.ui.define([
         return null;
     }
     /**
-     * Gets the next record acording to the start time in a navigation given a last tracked record
+     * 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
      */
@@ -151,7 +158,7 @@ sap.ui.define([
      * 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
-     * @returns {stirng} The transaction name or an empty string if input is not a transaction
+     * @returns {string} The transaction name or an empty string if input is not a transaction
      */
     function _removeParametersIfTransaction (sTechnicalName) {
        var sTechnicalNameWithDefault = sTechnicalName || "";
@@ -196,7 +203,7 @@ sap.ui.define([
                 && oCurrentApp.componentInstance.sId
                 && oCurrentApp.componentInstance.sId.includes("homeApp-component");
             var oPromiseFioriIds;
-            // Method getTechnicalParamter might not exists.
+            // Method getTechnicalParameter might not exist.
             if (oCurrentApp.getTechnicalParameter) {
                 oPromiseFioriIds = oCurrentApp.getTechnicalParameter("sap-fiori-id");
             } else {
@@ -204,8 +211,8 @@ sap.ui.define([
             }
 
             // get Fiori Id
-            return oPromiseFioriIds.then(function (aFiorids) {
-                var sApplicationId = aFiorids && aFiorids[0];
+            return oPromiseFioriIds.then(function (aFioriIds) {
+                var sApplicationId = aFioriIds && aFioriIds[0];
                 // custom home
                 if (bIsHomeApp) {
                         return {
@@ -262,21 +269,30 @@ sap.ui.define([
      * Additionally method check if the homepage loaded the first time (use global bHomePageLoaded variable)
      * and update the record respectively.
      *
-     * @param {string} sSourceApplication source application id
+     * @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 {string} oTargetApplication.id Fiori id for ui5 application or sTechnicalName for others
+     * @param {string} 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
+
      */
-    function _closeNavigation (sSourceApplication, oTargetApplication, sNavigationMode) {
+    function _closeNavigation (oSourceApplication, oTargetApplication, sNavigationMode) {
         if (oStatisticalRecord) {
-            var sTargetApplication = oTargetApplication ? oTargetApplication.id : null;
-            oStatisticalRecord.setSourceApplication(sSourceApplication);
-            oStatisticalRecord.setTargetApplication(sTargetApplication);
-            oStatisticalRecord.setApplicationType(oTargetApplication ? oTargetApplication.type : null);
+            oStatisticalRecord.setSourceApplication(oSourceApplication && oSourceApplication.id);
+            oStatisticalRecord.setTargetApplication(oTargetApplication && oTargetApplication.id);
+            oStatisticalRecord.setTargetApplicationType(oTargetApplication && oTargetApplication.type);
             oStatisticalRecord.setNavigationMode(sNavigationMode);
-            oStatisticalRecord.setIsHomeApp(oTargetApplication && oTargetApplication.isHomeApp);
-            if (!bHomePageLoaded && _isHomePage(sTargetApplication, oTargetApplication && oTargetApplication.isHomeApp)) {
+            oStatisticalRecord.setTargetIsHomeApp(oTargetApplication && oTargetApplication.isHomeApp);
+            oStatisticalRecord.setSourceIsHomeApp(oSourceApplication && oSourceApplication.isHomeApp);
+
+            if (
+                !bHomePageLoaded && (
+                    _isHomeApp(oTargetApplication) || _isFLPHome(oTargetApplication)
+                )
+            ) {
                 bHomePageLoaded = true;
                 oStatisticalRecord.setHomepageLoading(true);
             }
@@ -301,7 +317,7 @@ sap.ui.define([
                 oTargetApplication.type = oTargetApplication.id.slice(-4) === "(TR)" ? "GUI" : "NWBC";
             }
             _setCurrentApplication(oTargetApplication);
-            _closeNavigation(oCurrentApp ? oCurrentApp.id : undefined, oTargetApplication, NAVIGATION_MODE.INPLACE);
+            _closeNavigation(oCurrentApp, oTargetApplication, NAVIGATION_MODE.INPLACE);
         });
     }
 
@@ -310,7 +326,7 @@ sap.ui.define([
      */
     function _closeExplaceNavigation () {
         var oCurrentApp = getCurrentApplication();
-        _closeNavigation(oCurrentApp ? oCurrentApp.id : undefined, null, NAVIGATION_MODE.EXPLACE);
+        _closeNavigation(oCurrentApp, null, NAVIGATION_MODE.EXPLACE);
     }
 
     /**
@@ -380,7 +396,7 @@ sap.ui.define([
         //open app explace
         oDoable = EventHub.on("openedAppInNewWindow").do(_closeExplaceNavigation);
         aDoable.push(oDoable);
-        // home page starten
+        // home page start
         oDoable = EventHub.on("firstSegmentCompleteLoaded").do(_closeInplaceNavigation);
         aDoable.push(oDoable);
         //error during the resolving
@@ -392,7 +408,6 @@ sap.ui.define([
         //Stateful container, cached application, etc.
         oDoable = EventHub.on("CloseFesrRecord").do(_closeInplaceNavigation);
         aDoable.push(oDoable);
-
     }
 
     /**

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

@@ -3,7 +3,7 @@
  * @fileOverview Class for statistical record
  *               It should contain data like step, duration after a navigation in the shell, can have status open.
  *               The closing of a record is logged in debug mode
- * @version 1.116.0
+ * @version 1.117.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -17,8 +17,6 @@ sap.ui.define([
         ERROR: "ERROR"
     };
 
-
-
     /**
      * Constructor for statistical record
      * @returns oStatisticalRecord The constructed statistical record.
@@ -33,7 +31,7 @@ sap.ui.define([
      * @returns oStatisticalRecord.navigationMode The navigation mode, can be in place or ex place
      * @returns oStatisticalRecord.step The navigation step, e.g. "FLP@LOAD"
      * @returns oStatisticalRecord.homepageLoading True when homepage was loaded the first time
-     * @returns oStatisticalRecord.applicationType The type of the target application. For example UI5, TR, etc.
+     * @returns oStatisticalRecord.targetApplicationType The type of the target application. For example UI5, TR, etc.
      */
     function StatisticalRecord () {
         this.status = STATUS.OPEN;
@@ -50,7 +48,7 @@ sap.ui.define([
         this.targetApplication = undefined;
         this.navigationMode = null;
         this.homepageLoading = false;
-        this.applicationType = null;
+        this.targetApplicationType = null;
     }
 
     /**
@@ -59,41 +57,53 @@ sap.ui.define([
      * @returns {string} sStep The navigation step
      */
     StatisticalRecord.prototype._calculateStep = function () {
+        var bIsTargetHomePage = this._isTargetHomeApp() || this._isFLPHome(this.targetApplication);
+        var bIsSourceHomePage = this._isSourceHomeApp() || this._isFLPHome(this.sourceApplication);
+
         //In case when targetApplication and sourceApplication not defined, can not resolve the step
-        if (this.targetApplication === undefined && this.sourceApplication === undefined) {
+        if (!this.targetApplication && !this.sourceApplication) {
             return "";
         }
 
         //load home page
-        if (this.sourceApplication === undefined && this._isHomePage(this.targetApplication)) {
+        if (!this.sourceApplication && bIsTargetHomePage) {
             // entire phase of loading gets this Step name internally,
             // will be replaced later by original step or FLP@LOAD for external use
             return "FLP@DURING_LOAD";
         }
 
-        if (this.sourceApplication === undefined && !this._isHomePage(this.targetApplication)) {
+        if (!this.sourceApplication && !bIsTargetHomePage) {
             return "FLP@DEEP_LINK";
         }
 
         // if source and target application are not the homepage it is an app to app navigation.
         // if homepage is started the source application is undefined
-        if (this.sourceApplication && !this._isHomePage(this.targetApplication) && !this._isHomePage(this.sourceApplication)) {
+        if (!bIsTargetHomePage && !bIsSourceHomePage) {
             return "A2A@" + this.sourceApplication;
         }
+
         // back to the homepage from some app
-        if (this.sourceApplication && this._isHomePage(this.targetApplication) && !this._isHomePage(this.sourceApplication)) {
+        if (this.sourceApplication && bIsTargetHomePage && !bIsSourceHomePage) {
             return "FLP_BACK@" + this.sourceApplication;
         }
 
-        if (this._isHomePage(this.sourceApplication)) {
+        // custom home start or stays on homepage
+        if (bIsSourceHomePage && bIsTargetHomePage) {
+            return "HOME@HOME";
+        }
+
+        // start app from flp home
+        if (this._isFLPHome(this.sourceApplication)) {
             return "FLP@HOMEPAGE_TILE";
         }
 
+        // start app from custom home
+        if (this._isSourceHomeApp()) {
+            return "APPSTART@CUSTOMHOME";
+        }
         return "";
     };
 
-
-
     /**
      * Compares two statistical records
      * @param {object} otherRecord The other record
@@ -215,39 +225,63 @@ sap.ui.define([
     };
 
     /**
-     * Set the application type
-     * @param {string} applicationType application type, for example UI5, TR, etc.
+     * Sets the target application type
+     * @param {string} targetApplicationType target application type, for example UI5, TR, etc.
+     * @since 1.117.0
      */
-    StatisticalRecord.prototype.setApplicationType = function (applicationType) {
-        this.applicationType = applicationType;
+    StatisticalRecord.prototype.setTargetApplicationType = function (targetApplicationType) {
+        this.targetApplicationType = targetApplicationType;
     };
 
     /**
-     * Setter for isHomeApp
+     * Set the property isTargetHomeApp
      * @param {boolean} bHomeApp true or false
      * @private
-     * @since 1.105.0
+     * @since 1.117.0
      */
-    StatisticalRecord.prototype.setIsHomeApp = function (bHomeApp) {
-        this.isHomeApp = !!bHomeApp;
+    StatisticalRecord.prototype.setTargetIsHomeApp = function (bHomeApp) {
+        this.isTargetHomeApp = !!bHomeApp;
     };
 
     /**
-     * check if application id is homepage
-     *
-     * @param {string} sApplicationId fiori id
-     *
-     * @returns {boolean} true for homepage and page runtime and for special case that it is a home application
+     * Set the property for isSourceHomeApp
+     * @param {boolean} bHomeApp true or false
      * @private
-     * @since 1.105.0
+     * @since 1.117.0
      */
-     StatisticalRecord.prototype._isHomePage = function (sApplicationId) {
-        if (this.isHomeApp) {
-            return true;
-        }
+    StatisticalRecord.prototype.setSourceIsHomeApp = function (bHomeApp) {
+        this.isSourceHomeApp = !!bHomeApp;
+    };
+
+    /**
+     * Getter for isSourceHomeApp
+     * @returns {boolean} true, if source is a home app.
+     * @since 1.117.0
+     */
+    StatisticalRecord.prototype._isSourceHomeApp = function () {
+        return this.isSourceHomeApp;
+    };
+
+    /**
+     * is application FLP Home
+     * @param {string} sApplicationId the id of the application
+     * @returns {boolean} true, if appplication is FLP Home.
+     * @since 1.117.0
+     */
+    StatisticalRecord.prototype._isFLPHome = function (sApplicationId) {
         return sApplicationId && (sApplicationId === "FLP_HOME" || sApplicationId === "FLP_PAGE");
     };
 
+    /**
+     * Getter for isTargetHomeApp
+     * @returns {boolean} true, if target is a home app.
+     * @since 1.117.0
+     */
+    StatisticalRecord.prototype._isTargetHomeApp = function () {
+        return this.isTargetHomeApp;
+    };
+
+
     return StatisticalRecord;
 
 }, /* bExport= */ false);

package/src/main/js/sap/ushell/plugins/appwarmup/Component.js

@@ -87,7 +87,7 @@ sap.ui.define(
         var sComponentName = "sap.ushell.plugins.appwarmup.Component";
         return Component.extend(sComponentName, {
             metadata: {
-                version: "1.116.0",
+                version: "1.117.0",
                 library: "sap.ushell"
             },
 

package/src/main/js/sap/ushell/renderers/fiori2/Renderer.js

@@ -80,9 +80,9 @@ sap.ui.define([
      */
     var Renderer = UIComponent.extend("sap.ushell.renderers.fiori2.Renderer", {
         metadata: {
-            version: "1.116.0",
+            version: "1.117.0",
             dependencies: {
-                version: "1.116.0",
+                version: "1.117.0",
                 libs: ["sap.ui.core", "sap.m"],
                 components: []
             },