@sapui5/sap.ushell 1.136.3 → 1.138.0

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

@@ -12,13 +12,13 @@ sap.ui.define([
     "sap/ui/performance/trace/FESR",
     "sap/ushell/EventHub",
     "sap/ushell/performance/ShellAnalytics"
-], function (
+], (
     Log,
     deepExtend,
     FESR,
     EventHub,
     ShellAnalytics
-) {
+) => {
     "use strict";
 
     const sModuleName = "FesrEnhancer";
@@ -169,7 +169,6 @@ sap.ui.define([
             this._oLastFesrHandle = oFesrHandle;
         },
 
-
         /**
          * Hook for {@link sap.ui.performance.trace.FESR#onBeforeCreated} which enhances the "oUi5FesrHandle" with FLP-specific information.
          * The handler will try to detect selected scenarios related to the FLP like open homepage or app to app navigation.
@@ -241,7 +240,6 @@ sap.ui.define([
             return oFesrHandle;
         },
 
-
         /**
          * Shortens a value according to the formatter ignoring postfix.
          *
@@ -253,7 +251,7 @@ sap.ui.define([
          * @since 1.121.0
          */
         shortenAccordingToFormatter: function (vValue, oFormatter) {
-            var sShortenendValue = "";
+            let sShortenendValue = "";
 
             // shorten if max Length is provided else keep it as it is
             if (oFormatter && oFormatter.maxLength) {
@@ -283,7 +281,7 @@ sap.ui.define([
             if (oFormatter) {
                 // if no postfix in formatter do simple shortening
                 if (oFormatter.postfix) {
-                    //if no postfix in value do simple shortening
+                    // if no postfix in value do simple shortening
                     if (vValue.endsWith(oFormatter.postfix)) {
                         // take away postfix
                         // do the shortening
@@ -320,7 +318,7 @@ sap.ui.define([
             return Object.keys(oEnhancement).reduce((oResult, sKey) => {
                 const vValue = oEnhancement[sKey];
                 // only keep supported fields and actual values
-                if (aSupportedFields.includes(sKey) && !!vValue) {
+                if (aSupportedFields.includes(sKey) && vValue) {
                     // shorten if max Length is provided else keep it as it is
                     oResult[sKey] = this.shortenWithPostfix(vValue, sKey);
                 }
@@ -481,7 +479,7 @@ sap.ui.define([
 
             if (sStepName === SCENARIOS.CUSTOM_HOME_INITIAL) {
                 // special case: home app
-                oResult.stepName = sStepName + "@" + oFesrHandle.appNameShort;
+                oResult.stepName = `${sStepName}@${oFesrHandle.appNameShort}`;
             } else {
                 // ordinary case
                 oResult.stepName = sStepName;
@@ -547,7 +545,7 @@ sap.ui.define([
             if (oRelatedRecord.getTargetApplicationType() === "UI5") {
                 oResult.interactionType = INTERACTION_TYPE.APP_START;
             } else {
-                //Not UI5 applications handle the start flag themselves and we need to avoid duplication in the statistic
+                // Not UI5 applications handle the start flag themselves and we need to avoid duplication in the statistic
                 oResult.interactionType = INTERACTION_TYPE.STEP_IN_APP;
             }
             return oResult;

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.136.3
+ * @version 1.138.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -12,14 +12,14 @@ sap.ui.define([
     "sap/ushell/performance/StatisticalRecord",
     "sap/ushell/utils",
     "sap/ushell/Container"
-], function (
+], (
     Log,
     EventHub,
     AppConfiguration,
     StatisticalRecord,
     Utils,
     Container
-) {
+) => {
     "use strict";
 
     const sModuleName = "ShellAnalytics";
@@ -31,9 +31,9 @@ sap.ui.define([
     let bInitialized = false;
     let bCloseExplaceStarted = false;
 
-    let oStatisticalRecord, // current statistical record
-        oCurrentApplication,
-        lastHashChangeTime;
+    let oStatisticalRecord; // current statistical record
+    let oCurrentApplication;
+    let lastHashChangeTime;
 
     const NAVIGATION_MODE = {
         EXPLACE: "EXPLACE",
@@ -128,7 +128,6 @@ sap.ui.define([
      * @returns {sap.ushell.performance.StatisticalRecord} The current statistical record
      */
     function _getOrCreateCurrentStatisticalRecord () {
-
         if (!oStatisticalRecord) {
             const oLastRecord = aStatisticalRecords[aStatisticalRecords.length - 1] || null;
             oStatisticalRecord = new StatisticalRecord(oLastRecord);
@@ -165,17 +164,17 @@ sap.ui.define([
      * @returns {string} The transaction name or an empty string if input is not a transaction
      */
     function _removeParametersIfTransaction (sTechnicalName) {
-       const sTechnicalNameWithDefault = sTechnicalName || "";
-       if (sTechnicalNameWithDefault.slice(-7) === "(TCODE)") {
+        const sTechnicalNameWithDefault = sTechnicalName || "";
+        if (sTechnicalNameWithDefault.slice(-7) === "(TCODE)") {
             return sTechnicalNameWithDefault
-            .replace(/ .*/, "") // Remove all after the first space, therefore removing " (TCODE)" as well.
-            .replace(/^\*/, "") // Remove star at the beginning.
-            .replace(/,/g, "") // Remove all commas, because fesr has the csv format with comma separation.
-            .substring(0, 15) // Trim down to 15 char.
-            .concat(" (TR)"); // Add type.
-       }
-       return sTechnicalNameWithDefault;
-   }
+                .replace(/ .*/, "") // Remove all after the first space, therefore removing " (TCODE)" as well.
+                .replace(/^\*/, "") // Remove star at the beginning.
+                .replace(/,/g, "") // Remove all commas, because fesr has the csv format with comma separation.
+                .substring(0, 15) // Trim down to 15 char.
+                .concat(" (TR)"); // Add type.
+        }
+        return sTechnicalNameWithDefault;
+    }
 
     /**
      * Gets the current application id from the manifest.
@@ -220,11 +219,11 @@ sap.ui.define([
         let sApplicationId = aFioriIds && aFioriIds[0];
         // custom home
         if (bIsHomeApp) {
-                return {
-                    type: "UI5",
-                    id: sApplicationId,
-                    isHomeApp: true
-                };
+            return {
+                type: "UI5",
+                id: sApplicationId,
+                isHomeApp: true
+            };
         }
 
         // home page
@@ -240,10 +239,10 @@ sap.ui.define([
         if (oCurrentApp.applicationType === "UI5") {
             if (!sApplicationId) {
                 sApplicationId = _getAppIdFromManifest(oCurrentApp);
-                //Additional check that it is not flp application
+                // 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 from sap.app.id can have comma (there is no validation from manifest validation)
             sApplicationId = sApplicationId.replace(/,/g, "");
             return {
                 type: "UI5",
@@ -262,8 +261,6 @@ sap.ui.define([
         };
     }
 
-
-
     /**
      * Closes Navigation by closing the statistical record with updated data.
      * Additionally method check if the homepage loaded the first time (use global bHomePageLoaded variable)
@@ -297,6 +294,16 @@ sap.ui.define([
         }
     }
 
+    async function isClassicUIAppType (sAppType) {
+        const AppLifeCycle = await Container.getServiceAsync("AppLifeCycle");
+        const { ApplicationType } = AppLifeCycle;
+        return [
+            ApplicationType.WDA,
+            ApplicationType.NWBC,
+            ApplicationType.TR
+        ].includes(sAppType);
+    }
+
     /**
      * Closes the inplace navigation
      * @param {object} oEventData data for the event
@@ -321,16 +328,6 @@ sap.ui.define([
         });
     }
 
-    async function isClassicUIAppType (sAppType) {
-        const AppLifeCycle = await Container.getServiceAsync("AppLifeCycle");
-        const { ApplicationType } = AppLifeCycle;
-        return [
-            ApplicationType.WDA,
-            ApplicationType.NWBC,
-            ApplicationType.TR
-          ].includes(sAppType);
-    }
-
     /**
      * Closes explace navigation
      */
@@ -371,6 +368,21 @@ sap.ui.define([
         oShellNavigationInternal.hashChanger.detachEvent("shellHashChanged", _trackHashChangeTime);
     }
 
+    /**
+     * 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
+        });
+    }
+
     /**
      * enables shell analytics
      * Registers to required events
@@ -421,21 +433,6 @@ sap.ui.define([
         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
-        });
-    }
-
     /**
      * disables shell analytics
      */
@@ -465,5 +462,4 @@ sap.ui.define([
         getLastClosedRecord: getLastClosedRecord,
         getNextNavigationRecords: getNextNavigationRecords
     };
-
 }, /* bExport= */ false);

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

@@ -3,12 +3,12 @@
  * @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.136.3
+ * @version 1.138.0
  */
 sap.ui.define([
     "sap/base/Log",
     "sap/ui/performance/trace/Interaction"
-], function (Log, Interaction) {
+], (Log, Interaction) => {
     "use strict";
 
     const sModuleName = "StatisticalRecord";
@@ -78,7 +78,6 @@ sap.ui.define([
          */
         #sourceIsHomeApp = null;
 
-
         /**
          * The target application
          * @type {string}
@@ -172,12 +171,12 @@ sap.ui.define([
             const bIsTargetHome = this.#targetIsHomeApp || this.#isFLPHome(this.#targetApplication);
             const bIsSourceHome = this.#sourceIsHomeApp || this.#isFLPHome(this.#sourceApplication);
 
-            //In case when targetApplication and sourceApplication not defined, can not resolve the step
+            // In case when targetApplication and sourceApplication not defined, can not resolve the step
             if (!this.#targetApplication && !this.#sourceApplication) {
                 return "";
             }
 
-            //load home page
+            // load home page
             if (!this.#sourceApplication && bIsTargetHome) {
                 // entire phase of loading gets this Step name internally,
                 // will be replaced later by original step or FLP@LOAD for external use
@@ -191,25 +190,25 @@ sap.ui.define([
             // 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 (!bIsTargetHome && !bIsSourceHome) {
-                return "A2A@" + this.#sourceApplication;
+                return `A2A@${this.#sourceApplication}`;
             }
 
             // back to the homepage from some app
             if (this.#sourceApplication && bIsTargetHome && !bIsSourceHome) {
-                return "FLP_BACK@" + this.#sourceApplication;
+                return `FLP_BACK@${this.#sourceApplication}`;
             }
 
             // if navigation within home
             if (bIsSourceHome && bIsTargetHome) {
                 if (["FLP_FINDER", "FLP_HOME"].includes(this.#targetApplication)) {
-                    return this.#targetApplication + "@H2H";
+                    return `${this.#targetApplication}@H2H`;
                 }
                 // back to custom home
                 if (this.#targetIsHomeApp) {
-                    return this.#targetApplication + "@H2H";
+                    return `${this.#targetApplication}@H2H`;
                 }
                 // to a page
-                return this.#targetApplicationData.pageId + "@H2H";
+                return `${this.#targetApplicationData.pageId}@H2H`;
             }
 
             // start app from flp home
@@ -474,5 +473,4 @@ sap.ui.define([
     }
 
     return StatisticalRecord;
-
 }, /* bExport= */ false);

package/src/main/js/sap/ushell/plugins/BaseRTAPlugin.js

@@ -1,137 +1,136 @@
 // Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 sap.ui.define([
-	"sap/ui/core/Component",
-	"sap/ui/core/Element",
-	"sap/ushell/appRuntime/ui5/plugins/baseRta/AppLifeCycleUtils",
-	"sap/ushell/appRuntime/ui5/plugins/baseRta/CheckConditions",
-	"sap/ushell/appRuntime/ui5/plugins/baseRta/Trigger"
-], function (
-	Component,
-	Element,
-	AppLifeCycleUtils,
-	CheckConditions,
-	Trigger
-) {
-	"use strict";
-
-	var BaseRTAPlugin = Component.extend("sap.ushell.plugins.BaseRTAPlugin", {
-		sType: null,
-
-		init: function (mConfig) {
-			this.mConfig = mConfig;
-			this.mConfig.i18n = this.getModel("i18n").getResourceBundle();
-			this.mConfig.loadPlugins = this._loadPlugins.bind(this);
-			this.mConfig.onStartHandler = this._onStartHandler.bind(this);
-			this.mConfig.onErrorHandler = this._onErrorHandler.bind(this);
-			this.mConfig.onStopHandler = this._onStopHandler.bind(this);
-
-			this.oTrigger = new Trigger(this.mConfig);
-
-			this._oPluginPromise = (async () => {
-				await this.oTrigger.getInitPromise();
-				if (
-					this.mConfig.checkRestartRTA
+    "sap/ui/core/Component",
+    "sap/ui/core/Element",
+    "sap/ushell/appRuntime/ui5/plugins/baseRta/AppLifeCycleUtils",
+    "sap/ushell/appRuntime/ui5/plugins/baseRta/CheckConditions",
+    "sap/ushell/appRuntime/ui5/plugins/baseRta/Trigger"
+], (
+    Component,
+    Element,
+    AppLifeCycleUtils,
+    CheckConditions,
+    Trigger
+) => {
+    "use strict";
+
+    const BaseRTAPlugin = Component.extend("sap.ushell.plugins.BaseRTAPlugin", {
+        sType: null,
+
+        init: function (mConfig) {
+            this.mConfig = mConfig;
+            this.mConfig.i18n = this.getModel("i18n").getResourceBundle();
+            this.mConfig.loadPlugins = this._loadPlugins.bind(this);
+            this.mConfig.onStartHandler = this._onStartHandler.bind(this);
+            this.mConfig.onErrorHandler = this._onErrorHandler.bind(this);
+            this.mConfig.onStopHandler = this._onStopHandler.bind(this);
+
+            this.oTrigger = new Trigger(this.mConfig);
+
+            this._oPluginPromise = (async () => {
+                await this.oTrigger.getInitPromise();
+                if (
+                    this.mConfig.checkRestartRTA
 					&& CheckConditions.checkRestartRTA(this.mConfig.layer)
-				) {
-					await this.oTrigger.triggerStartRta(this);
-				}
-				const oAppLifeCycleService = await AppLifeCycleUtils.getAppLifeCycleService();
-				await oAppLifeCycleService.attachAppLoaded(this._onAppLoaded, this);
-			})();
-		},
-
-		getPluginPromise: function () {
-			return this._oPluginPromise;
-		},
-
-		exit: function () {
-			this._oPluginPromise = this._oPluginPromise
-				.then(AppLifeCycleUtils.getAppLifeCycleService)
-				.then(function (oAppLifeCycleService) {
-					oAppLifeCycleService.detachAppLoaded(this._onAppLoaded, this);
-					if (this._onRendererCreated) {
-						var oContainer = AppLifeCycleUtils.getContainer();
-						oContainer.detachRendererCreatedEvent(this._onRendererCreated, this);
-					}
-				}.bind(this));
-		},
-
-		_onAppLoaded: async function () {
-			if (await CheckConditions.checkRtaPrerequisites()) {
-				if (CheckConditions.checkRestartRTA(this.mConfig.layer)) {
-					this.oTrigger.triggerStartRta(this);
-				}
-				this._setButtonVisibility(true);
-			} else {
-				this._setButtonVisibility(false);
-			}
-		},
-
-		/**
+                ) {
+                    await this.oTrigger.triggerStartRta(this);
+                }
+                const oAppLifeCycleService = await AppLifeCycleUtils.getAppLifeCycleService();
+                await oAppLifeCycleService.attachAppLoaded(this._onAppLoaded, this);
+            })();
+        },
+
+        getPluginPromise: function () {
+            return this._oPluginPromise;
+        },
+
+        exit: function () {
+            this._oPluginPromise = this._oPluginPromise
+                .then(AppLifeCycleUtils.getAppLifeCycleService)
+                .then((oAppLifeCycleService) => {
+                    oAppLifeCycleService.detachAppLoaded(this._onAppLoaded, this);
+                    if (this._onRendererCreated) {
+                        const oContainer = AppLifeCycleUtils.getContainer();
+                        oContainer.detachRendererCreatedEvent(this._onRendererCreated, this);
+                    }
+                });
+        },
+
+        _onAppLoaded: async function () {
+            if (await CheckConditions.checkRtaPrerequisites()) {
+                if (CheckConditions.checkRestartRTA(this.mConfig.layer)) {
+                    this.oTrigger.triggerStartRta(this);
+                }
+                this._setButtonVisibility(true);
+            } else {
+                this._setButtonVisibility(false);
+            }
+        },
+
+        /**
 		 * Event handler for the "Adapt" button of the RTA FLP Plugin
 		 * Checks the supported browsers and starts the RTA
 		 * @returns {Promise} Resolves when rta is triggered
 		 * @private
 		 */
-		_onAdapt: function () {
-			return this.oTrigger.triggerStartRta(this);
-		},
-
-		_setButtonVisibility: function (bVisible) {
-			if (!this.oActionButton) {
-				return;
-			}
-			if (bVisible) {
-				this.oActionButton.showForAllApps();
-			} else {
-				this.oActionButton.hideForAllApps();
-			}
-		},
-
-		/**
+        _onAdapt: function () {
+            return this.oTrigger.triggerStartRta(this);
+        },
+
+        _setButtonVisibility: function (bVisible) {
+            if (!this.oActionButton) {
+                return;
+            }
+            if (bVisible) {
+                this.oActionButton.showForAllApps();
+            } else {
+                this.oActionButton.hideForAllApps();
+            }
+        },
+
+        /**
 		 * Leaves the RTA adaptation mode
 		 * @private
 		 */
-		_exitAdaptation: function () {
-			if (this._switchToDefaultMode) {
-				this._switchToDefaultMode();
-			}
-			this.oTrigger.exitRta();
-		},
-
-		/**
+        _exitAdaptation: function () {
+            if (this._switchToDefaultMode) {
+                this._switchToDefaultMode();
+            }
+            this.oTrigger.exitRta();
+        },
+
+        /**
 		 * This function is called when the start event of RTA was fired
 		 * @private
 		 */
-		_onStartHandler: function () {},
+        _onStartHandler: function () {},
 
-		/**
+        /**
 		 * This function is called when the failed event of RTA was fired
 		 * @private
 		 */
-		_onErrorHandler: function () {
-			this._exitAdaptation();
-		},
+        _onErrorHandler: function () {
+            this._exitAdaptation();
+        },
 
-		/**
+        /**
 		 * This function is called when the stop event of RTA was fired
 		 * @private
 		 */
-		_onStopHandler: function () {
-			this._exitAdaptation();
-		},
+        _onStopHandler: function () {
+            this._exitAdaptation();
+        },
 
-		/**
+        /**
 		 * This function should be overridden when custom plugins are needed
 		 *
 		 * @private
 		 * @returns {Promise} Returns a resolved Promise
 		 */
-		_loadPlugins: function () {
-			return Promise.resolve();
-		}
-
-	});
-	return BaseRTAPlugin;
+        _loadPlugins: function () {
+            return Promise.resolve();
+        }
 
+    });
+    return BaseRTAPlugin;
 }, true /* bExport */);