@sapui5/sap.ushell 1.136.2 → 1.138.0

package/src/main/js/sap/ushell/NWBCInterface.js

@@ -1,22 +1,22 @@
-//Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 /**
  * @fileOverview NWBCInterface for NWBC client
  *
- * @version 1.136.2
+ * @version 1.138.0
  */
 sap.ui.define([
     "sap/ushell/EventHub",
     "sap/ushell/Config"
-], function (
+], (
     EventHub,
     Config
-) {
+) => {
     "use strict";
 
     /**
      * The NWBCInterface provides interfaces for the NWBC client to access FLP functionality
      */
-    var NWBCInterface = {};
+    const NWBCInterface = {};
 
     /**
      * Notifies FLP that the user is active in the NWBC client application so FLP
@@ -38,7 +38,7 @@ sap.ui.define([
      * @since 1.80.0
      */
     NWBCInterface.getSessionTimeoutMinutes = function () {
-        var sessionTimeoutMinutes = 0;
+        let sessionTimeoutMinutes = 0;
         if (Config.last("/core/shell/sessionTimeoutIntervalInMinutes") > 0) {
             sessionTimeoutMinutes = Config.last("/core/shell/sessionTimeoutIntervalInMinutes");
         }
@@ -54,8 +54,8 @@ sap.ui.define([
      * @since 1.103.0
      */
     NWBCInterface.isAnyAppKeptAlive = function () {
-        return new Promise(function (fnResolve) {
-            sap.ui.require(["sap/ushell/appIntegration/KeepAliveApps"], function (KeepAliveApps) {
+        return new Promise((fnResolve) => {
+            sap.ui.require(["sap/ushell/appIntegration/KeepAliveApps"], (KeepAliveApps) => {
                 fnResolve(KeepAliveApps.length() > 0);
             });
         });

package/src/main/js/sap/ushell/SessionHandler.js

@@ -273,7 +273,7 @@ sap.ui.define([
             const timeSinceLastActionInMilliseconds = this._getCurrentDate() - new Date(this.getTimestampFromStorage());
             const timeSinceLastActionInMinutes = timeSinceLastActionInMilliseconds / (1000 * 60);
 
-            //Setting the timeout to be sessionTimeoutIntervalInMinutes / 2 (hence the 30 instead of 60)
+            // Setting the timeout to be sessionTimeoutIntervalInMinutes / 2 (hence the 30 instead of 60)
             const iTimeout = this.oConfig.sessionTimeoutIntervalInMinutes * 30 * 1000;
 
             // Last user action happened during the last sessionTimeoutIntervalInMinutes (e.g., 30 min)
@@ -332,7 +332,7 @@ sap.ui.define([
                 // Expose remaining seconds in model for display
 
                 Log.debug(`SessionHandler.monitorCountdown :: Remaining seconds : ${iRemainingTimeInSeconds
-                    } - iTimeOver : ${iTimeOver}`, "", "SessionHandler");
+                } - iTimeOver : ${iTimeOver}`, "", "SessionHandler");
 
                 this.oModel.setProperty("/SessionRemainingTimeInSeconds", iRemainingTimeInSeconds);
                 // Check again some time later
@@ -803,7 +803,7 @@ sap.ui.define([
          * The time stamp is updated once a second or less.
          * @private
          */
-        this.userActivityHandler = function (/*oEventData*/) {
+        this.userActivityHandler = function (/* oEventData */) {
             if (this.oUserActivityTimer !== undefined) {
                 return;
             }
@@ -855,6 +855,11 @@ sap.ui.define([
 
                 const oLoading = new LoadingDialog({ text: "" });
 
+                const oTimeout = window.setTimeout(async () => {
+                    bIsLogoutProcessStarted = true;
+                    _logout(oLoading);
+                }, 4000);
+
                 // post the logout event to isolated
                 PostMessageManager.sendRequestToAllApplications("sap.ushell.sessionHandler.logout", {}, true).then(async () => {
                     if (bIsLogoutProcessStarted === false) {
@@ -863,11 +868,6 @@ sap.ui.define([
                         _logout(oLoading);
                     }
                 });
-
-                const oTimeout = window.setTimeout(async () => {
-                    bIsLogoutProcessStarted = true;
-                    _logout(oLoading);
-                }, 4000);
             });
         };
     }

package/src/main/js/sap/ushell/System.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The <code>sap.ushell.System</code> object with related functions.
  */
-sap.ui.define([], function () {
+sap.ui.define([], () => {
     "use strict";
 
     /**
@@ -21,9 +21,9 @@ sap.ui.define([], function () {
      * @since 1.15.0
      * @public
      */
-    var System = function (oData) {
+    function System (oData) {
         this._oData = oData;
-    };
+    }
 
     /**
      * Returns this system's alias.
@@ -212,17 +212,17 @@ sap.ui.define([], function () {
      */
     System.prototype.adjustUrl = function (sUrl) {
         if (sUrl.indexOf("/") !== 0 || sUrl === "/") {
-            throw new Error("Invalid URL: " + sUrl);
+            throw new Error(`Invalid URL: ${sUrl}`);
         }
         if (this._oData.baseUrl === ";o=") {
             if (this._oData.alias) {
-                sUrl = sUrl + ";o=" + this._oData.alias;
+                sUrl = `${sUrl};o=${this._oData.alias}`;
             }
         } else if (this._oData.baseUrl) {
             sUrl = this._oData.baseUrl.replace(/\/$/, "") + sUrl;
         }
         if (this._oData.client) {
-            sUrl += (sUrl.indexOf("?") >= 0 ? "&" : "?") + "sap-client=" + this._oData.client;
+            sUrl += `${sUrl.indexOf("?") >= 0 ? "&" : "?"}sap-client=${this._oData.client}`;
         }
         return sUrl;
     };

package/src/main/js/sap/ushell/TechnicalParameters.js

@@ -42,15 +42,89 @@
  * parameters. If the application tries to access an internal parameter (e.g.,
  * sap-ui-app-id-hint) via the API, the application receives an error message.
  *
- * @version 1.136.2
+ * @version 1.138.0
  * @private
  */
 sap.ui.define([
     "sap/ushell/utils/type"
-], function (oTypeUtils) {
+], (oTypeUtils) => {
     "use strict";
 
-    var oTechnicalParameters = {
+    /**
+     * Helper method to deny access to a technical value
+     *
+     * @param {string} sParameterName
+     *  The name of the technical parameter
+     *
+     * @returns {Promise<string>}
+     *  A promise that always rejects with an error message.
+     *
+     * @private
+     */
+    function denyParameterValue (sParameterName) {
+        return Promise.reject(`${sParameterName} is reserved for shell internal usage only`);
+    }
+
+    /**
+     * Helper method to obtain a technical value directly from the application component.
+     * This is the case if the current type of the application is not "UI5".
+     *
+     * @param {string} sParameterName
+     * the name of the parameter
+     * @param {object} oApplicationComponent
+     * the component of the given application
+     *
+     * @returns {*}
+     * results for the given parameter name from the application component
+     */
+    function getValueFromComponent (sParameterName, oApplicationComponent) {
+        if (oApplicationComponent) {
+            const oComponentData = oApplicationComponent.getComponentData() || {};
+            const aTechnicalParameters = oComponentData.technicalParameters || {};
+            return aTechnicalParameters[sParameterName];
+        }
+
+        return undefined;
+    }
+
+    /**
+     * Helper method to obtain a technical value from the application component manifest.
+     * This is the case if the current type of the application is "UI5".
+     *
+     * @param {string} sPath
+     * the path where to find the parameter
+     * @param {object} oApplicationComponent
+     * the component of the given application
+     *
+     * @returns {Array<*>}
+     * returns an array of results for the given path from the application component manifest
+     */
+    function getValueFromManifest (sPath, oApplicationComponent) {
+        let vValue = oApplicationComponent.getManifestEntry(sPath);
+        if (vValue && !oTypeUtils.isArray(vValue)) {
+            vValue = [vValue];
+        }
+        return vValue;
+    }
+
+    /**
+     * Helper method to obtain a technical value from the application container.
+     * This is the case if the current type of the application is not "UI5".
+     *
+     * @param {string} sParameterName
+     * the name of the parameter
+     * @param {object} oApplicationContainer
+     * the container of the given application
+     *
+     * @returns {*}
+     * results for the given parameter name from the application container
+     */
+    function getValueFromContainer (sParameterName, oApplicationContainer) {
+        const aReservedParameters = oApplicationContainer.getReservedParameters();
+        return aReservedParameters && aReservedParameters[sParameterName];
+    }
+
+    const oTechnicalParameters = {
         // Used by cross application navigation to define the target app.
         "sap-navigation-scope": {
             // Describes where the parameter value should be taken from in ClientSideTargetResolution
@@ -63,7 +137,7 @@ sap.ui.define([
             // when it appears before the inner app route in the URL.
             isIntentParameter: true,
             getValue: function (sParameterName, oApplicationComponent, oApplicationContainer, sApplicationType) {
-                return new Promise(function (fnSuccess, fnFail) {
+                return new Promise((fnSuccess, fnFail) => {
                     if (sApplicationType === "UI5") {
                         fnSuccess(getValueFromComponent(sParameterName, oApplicationComponent));
                     } else {
@@ -78,7 +152,7 @@ sap.ui.define([
             injectFrom: "startupParameter",
             isIntentParameter: true,
             getValue: function (sParameterName, oApplicationComponent, oApplicationContainer, sApplicationType) {
-                return new Promise(function (fnSuccess, fnFail) {
+                return new Promise((fnSuccess, fnFail) => {
                     if (sApplicationType === "UI5") {
                         fnSuccess(getValueFromComponent(sParameterName, oApplicationComponent) || getValueFromManifest("/sap.fiori/registrationIds", oApplicationComponent));
                     } else {
@@ -134,7 +208,7 @@ sap.ui.define([
             injectFrom: "startupParameter",
             isIntentParameter: true,
             getValue: function (sParameterName, oApplicationComponent, oApplicationContainer, sApplicationType) {
-                return new Promise(function (fnSuccess, fnFail) {
+                return new Promise((fnSuccess, fnFail) => {
                     if (sApplicationType === "UI5") {
                         fnSuccess(getValueFromComponent(sParameterName, oApplicationComponent) || getValueFromManifest("/sap.app/ach", oApplicationComponent));
                     } else {
@@ -169,80 +243,6 @@ sap.ui.define([
         }
     };
 
-    /**
-     * Helper method to deny access to a technical value
-     *
-     * @param {string} sParameterName
-     *  The name of the technical parameter
-     *
-     * @returns {Promise<string>}
-     *  A promise that always rejects with an error message.
-     *
-     * @private
-     */
-    function denyParameterValue (sParameterName) {
-        return Promise.reject(sParameterName + " is reserved for shell internal usage only");
-    }
-
-    /**
-     * Helper method to obtain a technical value directly from the application component.
-     * This is the case if the current type of the application is not "UI5".
-     *
-     * @param {string} sParameterName
-     * the name of the parameter
-     * @param {object} oApplicationComponent
-     * the component of the given application
-     *
-     * @returns {*}
-     * results for the given parameter name from the application component
-     */
-    function getValueFromComponent (sParameterName, oApplicationComponent) {
-        if (oApplicationComponent) {
-            var oComponentData = oApplicationComponent.getComponentData() || {};
-            var aTechnicalParameters = oComponentData.technicalParameters || {};
-            return aTechnicalParameters[sParameterName];
-        }
-
-        return undefined;
-    }
-
-    /**
-     * Helper method to obtain a technical value from the application component manifest.
-     * This is the case if the current type of the application is "UI5".
-     *
-     * @param {string} sPath
-     * the path where to find the parameter
-     * @param {object} oApplicationComponent
-     * the component of the given application
-     *
-     * @returns {Array<*>}
-     * returns an array of results for the given path from the application component manifest
-     */
-    function getValueFromManifest (sPath, oApplicationComponent) {
-        var vValue = oApplicationComponent.getManifestEntry(sPath);
-        if (vValue && !oTypeUtils.isArray(vValue)) {
-            vValue = [vValue];
-        }
-        return vValue;
-    }
-
-    /**
-     * Helper method to obtain a technical value from the application container.
-     * This is the case if the current type of the application is not "UI5".
-     *
-     * @param {string} sParameterName
-     * the name of the parameter
-     * @param {object} oApplicationContainer
-     * the container of the given application
-     *
-     * @returns {*}
-     * results for the given parameter name from the application container
-     */
-    function getValueFromContainer (sParameterName, oApplicationContainer) {
-        var aReservedParameters = oApplicationContainer.getReservedParameters();
-        return aReservedParameters && aReservedParameters[sParameterName];
-    }
-
     /**
      * Method to obtain the value of a technical parameter
      *
@@ -263,15 +263,15 @@ sap.ui.define([
      * @private
      */
     function getParameterValue (sParameterName, oApplicationComponent, oApplicationContainer, sApplicationType) {
-            if (!oTechnicalParameters[sParameterName]) {
-                return Promise.reject(sParameterName + " is not a known technical parameter");
-            }
+        if (!oTechnicalParameters[sParameterName]) {
+            return Promise.reject(`${sParameterName} is not a known technical parameter`);
+        }
 
-            return oTechnicalParameters[sParameterName].getValue(
-                sParameterName,
-                oApplicationComponent,
-                oApplicationContainer,
-                sApplicationType);
+        return oTechnicalParameters[sParameterName].getValue(
+            sParameterName,
+            oApplicationComponent,
+            oApplicationContainer,
+            sApplicationType);
     }
     /**
      * Takes the filter options and returns the matching technical parameter description.
@@ -284,18 +284,18 @@ sap.ui.define([
             oFilterOptions = {};
         }
 
-        return Object.keys(oTechnicalParameters).filter(function (oTechnicalParameterName) {
-            var oParameter = oTechnicalParameters[oTechnicalParameterName];
-            return Object.keys(oFilterOptions).every(function (sFilterName) {
-                var vDesiredPropertyValue = oFilterOptions[sFilterName];
-                var bHasParameter = oParameter.hasOwnProperty(sFilterName);
+        return Object.keys(oTechnicalParameters).filter((oTechnicalParameterName) => {
+            const oParameter = oTechnicalParameters[oTechnicalParameterName];
+            return Object.keys(oFilterOptions).every((sFilterName) => {
+                const vDesiredPropertyValue = oFilterOptions[sFilterName];
+                const bHasParameter = oParameter.hasOwnProperty(sFilterName);
                 if (bHasParameter) {
                     return oParameter[sFilterName] === vDesiredPropertyValue;
                 }
                 return false;
             });
-        }).map(function (sMatchingParameter) {
-            return Object.keys(oTechnicalParameters[sMatchingParameter]).reduce(function (oParameterDescription, sParameterAttributeName) {
+        }).map((sMatchingParameter) => {
+            return Object.keys(oTechnicalParameters[sMatchingParameter]).reduce((oParameterDescription, sParameterAttributeName) => {
                 oParameterDescription[sParameterAttributeName] = oTechnicalParameters[sMatchingParameter][sParameterAttributeName];
                 return oParameterDescription;
             }, {
@@ -351,5 +351,4 @@ sap.ui.define([
         getParameterNames: getParameterNames,
         isTechnicalParameter: isTechnicalParameter
     };
-
 }, false /* bExport= */);

package/src/main/js/sap/ushell/UI5ComponentType.js

@@ -6,7 +6,7 @@
  * BCP 2170190261
  */
 
-sap.ui.define([], function () {
+sap.ui.define([], () => {
     "use strict";
 
     /**