@sapui5/sap.ushell 1.118.0 → 1.119.2

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

@@ -1,12 +1,5 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
-/**
- * @namespace Namespace for Unified Shell.
- * @name sap.ushell
- * @since 1.15.0
- * @public
- */
-
 /**
  * @namespace Default namespace for Unified Shell services.
  * @name sap.ushell.services
@@ -32,7 +25,6 @@ sap.ui.define([
     "sap/base/Log",
     "sap/base/util/deepExtend",
     "sap/base/util/extend",
-    "sap/base/util/ObjectPath",
     "sap/base/util/uid",
     "sap/ui/base/EventProvider",
     "sap/ui/core/Control",
@@ -44,7 +36,6 @@ sap.ui.define([
     "sap/ui/util/Mobile",
     "sap/ushell/EventHub",
     "sap/ushell/System",
-    "sap/ushell/Ui5NativeServiceFactory",
     "sap/ushell/Ui5ServiceFactory",
     "sap/ushell/utils",
     "sap/ushell/utils/UrlParsing",
@@ -54,7 +45,6 @@ sap.ui.define([
     Log,
     deepExtend,
     extend,
-    ObjectPath,
     uid,
     EventProvider,
     Control,
@@ -66,7 +56,6 @@ sap.ui.define([
     MobileSupport,
     EventHub,
     System,
-    Ui5NativeServiceFactory,
     oUi5ServiceFactory,
     utils,
     UrlParsing,
@@ -84,8 +73,8 @@ sap.ui.define([
     // Map with platform-specific packages for the service adapters.
     // This map is passed in bootstrap and is valid for the given logon platform
     var mPlatformPackages;
-    var sFirstInitStack; // keep stack trace of first initialization call for debugging purposes
     var aAsyncLogoutEventFunctions = []; //async logout even functions that return a promise
+    var oContainerInstance;
 
     // Try to close window. Note: Most browsers do NOT allow closing windows by JS if they were opened manually.
     function closeWindow () {
@@ -190,22 +179,42 @@ sap.ui.define([
      * @hideconstructor
      * @param {object} oAdapter the platform-specific adapter corresponding to this service
      */
-    function Container (oAdapter) {
+    function Container () {
         var oEventProvider = new EventProvider();
         var isDirty = false;
         var aRegisteredDirtyMethods = [];
         var oRenderers = {};
-        var sRemoteSystemPrefix = "sap.ushell.Container." + oAdapter.getSystem().getPlatform() + ".remoteSystem.";
+        var sRemoteSystemPrefix;
         var mRemoteSystems = {};
         var oGlobalDirtyDeferred;
         var fnStorageEventListener;
         var oLocalStorage = utils.getLocalStorage();
         var mServicesByName = new utils.Map();
         var mServicesByNamePromise = new utils.Map();
-        var sSessionTerminationKey = "sap.ushell.Container." + oAdapter.getSystem().getPlatform() + ".sessionTermination";
+        var sSessionTerminationKey;
         var that = this;
 
-        // BEWARE: constructor code below!
+        var oAdapter;
+        var bInitialized = false;
+
+        this.init = function (sPlatform, mAdapterPackagesByPlatform) {
+            sap.ushell.Container = oContainerInstance;
+            return this._init(sPlatform, mAdapterPackagesByPlatform)
+                .then(function (oCreatedAdapter) {
+                    oAdapter = oCreatedAdapter;
+                })
+                .then(function () {
+                    sRemoteSystemPrefix = "sap.ushell.Container." + oAdapter.getSystem().getPlatform() + ".remoteSystem.";
+                    sSessionTerminationKey = "sap.ushell.Container." + oAdapter.getSystem().getPlatform() + ".sessionTermination";
+                    afterInit();
+                    bInitialized = true;
+                    return;
+                });
+        };
+
+        this.isInitialized = function () {
+            return bInitialized;
+        };
 
         /**
          * Cancels the logon procedure in the current frame, if any.
@@ -1450,7 +1459,7 @@ sap.ui.define([
          * This method is not a public API, it must only be called by shell internal services.
          *
          * @param {string} sPath the URL path for which the custom timeout will be applied
-         * @param {number} iTimeout the timeout value in milliseconds
+         * @param {int} iTimeout the timeout value in milliseconds
          * @since 1.46.3
          * @private
          */
@@ -1492,7 +1501,7 @@ sap.ui.define([
          * Returns the current URL of the FLP up to (and not including) the Hash Fragment
          *
          * @param {boolean} [bIncludeHash=false] defines if the hash is added to the result.
-         * @returns {String} URL.
+         * @returns {string} URL.
          * @since 1.56
          * @private
          */
@@ -1524,7 +1533,7 @@ sap.ui.define([
         /**
          * Returns indication is we are in AppRuntime (for special use cases handling)
          *
-         * @returns {Boolean}.
+         * @returns {boolean}.
          * @since 1.87
          * @private
          */
@@ -1541,7 +1550,7 @@ sap.ui.define([
 
         /**
          * Returns FLP's platform as specified in the configuration
-         *
+         * @param {boolean} bSync return Platform string sync
          * @returns {object|Promise} if async - a Promise that returns the FLP Platform's value
          * @since 1.96
          * @private
@@ -1566,38 +1575,199 @@ sap.ui.define([
             "addRemoteSystemForServiceUrl", function (sChannelId, sEventId, oData) {
                 that.addRemoteSystemForServiceUrl(oData);
             });
-        // register event handler for storage events issued by other UShell windows
-        if (typeof oAdapter.logoutRedirect === "function") {
-            fnStorageEventListener = function (oStorageEvent) {
-                function closeAndRedirectWindow () {
-                    // Most browsers do not allow closing windows via JS that aren't opened via JS
-                    // hence we additionally redirect to get these manually opened windows redirected at least.
-                    // NOTE: It is important to NOT redirect to  "/sap/public/bc/icf/logoff"
-                    // because on iPad Safari e.g. the event is not processed until the window gets the focus.
-                    // This would terminate any new session opened in between.
-                    that._closeWindow();
-                    that._redirectWindow();
-                }
-                if (sap.ushell.Container !== that) {
-                    // In integration test suite, old listeners remain which do not belong to the current sap.ushell.Container instance.
-                    // IE sends events also to own window. Then these old listeners react as if a remote window logged out...
-                    return;
+
+        /**
+         * Initializes the Unified Shell Container.
+         *
+         * @param {string} sPlatform the target platform, such as "abap" or "cdm".
+         * @param {Object<string, string>} [mAdapterPackagesByPlatform={}] the map with platform specific package names for the service adapters.
+         *   You only need to specify these package names if they differ from the standard name <code>"sap.ushell.adapters." + sPlatform</code>.
+         * @returns {Promise} a promise that is resolved once the container is available
+         * @since 1.119
+         * @private
+         */
+        this._init = function (sPlatform, mAdapterPackagesByPlatform) {
+            var oPromise = new Promise(function (fnResolve) {
+                // Init mobile support for the case when sap.m.App is not used
+                MobileSupport.init();
+                // remember the configuration independently of window["sap-ushell-config"]
+                oConfig = extend({}, window["sap-ushell-config"]);
+                // remember the platform package names
+                mPlatformPackages = mAdapterPackagesByPlatform;
+
+                if (typeof window["sap.ushell.bootstrap.callback"] === "function") {
+                    setTimeout(window["sap.ushell.bootstrap.callback"]);
                 }
-                if (oStorageEvent.key === sSessionTerminationKey) {
-                    if (oStorageEvent.newValue === "pending") {
-                        that._suppressOData();
-                        if (oEventProvider.fireEvent("Logout", true)) {
-                            closeAndRedirectWindow();
-                        } else {
-                            // defer UShell closeWindow to let NWBC receive message asynchronously
-                            setTimeout(closeAndRedirectWindow, 1000);
+
+
+                // Register all injectable ui5services
+                registerInjectableUi5Services([
+                    "Personalization",
+                    "URLParsing",
+                    "CrossApplicationNavigation"
+                ], true);
+
+                registerInjectableUi5Services(["Configuration"], false);
+
+                // Waterfall:
+                //   1. Create "Container" adapter
+                //   2. Load "PluginManager" and "CommonDataModel" services
+                //   3. Load plugins
+                //   4. Register plugins
+                var system = new System({
+                    // this is the initial logon system object
+                    alias: "",
+                    platform: oConfig.platform || sPlatform
+                });
+                createAdapter("Container", system, null, true /* async */)
+                    .then(function (oCreatedAdapter) {
+                        oAdapter = oCreatedAdapter;
+                        return oAdapter.load();
+                    })
+                    .then(function () {
+                        // returns true if CDM Plugins are to be loaded
+                        function _bLoadCDM () {
+                            var oUshellConfig = window["sap-ushell-config"];
+                            if (!oUshellConfig || !oUshellConfig.services) {
+                                return false;
+                            }
+                            var oUShellPluginManagerConfig = oUshellConfig.services.PluginManager;
+                            var oPluginManagerConfig = oUShellPluginManagerConfig && oUShellPluginManagerConfig.config;
+                            return oPluginManagerConfig && oPluginManagerConfig.loadPluginsFromSite;
                         }
+
+                        // Load CommonDataModel and PluginManager in parallel
+                        var asyncServices = [this.getServiceAsync("PluginManager")];
+                        if (_bLoadCDM()) {
+                            //If we have CDM add the scope id to the response configuration
+                            oConfigSetting.CDMPromise = this.getServiceAsync("CommonDataModel");
+                            asyncServices.push(oConfigSetting.CDMPromise);
+                        }
+                        Promise.all(asyncServices)
+                            .then(function (aServices) {
+                                handlePlugins(aServices);
+                            })
+                            .then(lastSteps);
+
+                        // preload given UI Services to allow sync access (via getService()) w/o triggering a sync request (CSP safeguarding of Neo Platform)
+                        var servicesForPreloading = [];
+                        if (oConfig.preloadServices !== undefined && Array.isArray(oConfig.preloadServices)) {
+                            oConfig.preloadServices.forEach(function (serviceName) {
+                                servicesForPreloading.push(this.getServiceAsync(serviceName));
+                            }.bind(this));
+                            Log.error("Ushell Config's preloadServices should not be used!");
+                        }
+
+                        var oShellNavigationServicePromise = this.getServiceAsync("ShellNavigation")
+                            .then(function (ShellNavigationService) {
+                                this._oShellNavigationService = ShellNavigationService;
+                            }.bind(this));
+
+                        servicesForPreloading.push(oShellNavigationServicePromise);
+
+                        Promise.all(servicesForPreloading)
+                            .then(function () {
+                                fnResolve(oAdapter); // Note that resolve might be called before the plugins are registered
+                            });
+                    }.bind(this));
+
+                function handlePlugins (aServices) {
+                    var oPluginManager = aServices[0];
+                    var oCDM = aServices[1];
+                    var getPlugins = oCDM ? oCDM.getPlugins() : jQuery.when({});
+
+                    getPlugins.then(function (oCDMSitePlugins) {
+                        var oAllPlugins = deepExtend({}, oConfig.bootstrapPlugins, oCDMSitePlugins);
+                        oPluginManager.registerPlugins(oAllPlugins);
+                    });
+                }
+
+                function lastSteps () {
+                    prepareNWBC();
+
+                    // Config should be required after bootstrap when sap-ushell-config is calculated
+                    sap.ui.require(["sap/ushell/Config"], function (Config) {
+                        handleDarkMode(Config);
+                        initUITracer(Config);
+                    });
+                }
+
+                function prepareNWBC () {
+                    if (utils.hasFLPReady2NotificationCapability()) {
+                        // Notify SAP Business Client (NWBC), that the Container and its Services, are ready to be used and
+                        // send additional interface
+                        sap.ui.require(["sap/ushell/NWBCInterface"], function (oNWBCInterface) {
+                            utils.getPrivateEpcm().doEventFlpReady2(oNWBCInterface);
+                        });
+                    } else if (utils.hasFLPReadyNotificationCapability()) {
+                        // Notify SAP Business Client (NWBC), that the Container and its Services, are ready to be used.
+                        utils.getPrivateEpcm().doEventFlpReady();
                     }
                 }
-            };
-            window.addEventListener("storage", fnStorageEventListener);
+
+                function handleDarkMode (Config) {
+                    if (Config.last("/core/darkMode/enabled")) {
+                        sap.ushell.Container.getServiceAsync("DarkModeSupport").then(function (DarkModeSupportService) {
+                            if (DarkModeSupportService && DarkModeSupportService.setup) { // Many qUnits mock getServiceAsync without DarkModeSupport
+                                DarkModeSupportService.setup();
+                            }
+                        });
+                    }
+                }
+
+                function initUITracer (Config) {
+                    var bTraceEnabled = !!(new URLSearchParams(window.location.search)).get("sap-ui-xx-ushell-UITraceEnabled");
+                    if (Config.last("/core/uiTracer/enabled") || bTraceEnabled) {
+                        sap.ushell.Container.getServiceAsync("UITracer");
+                    }
+                }
+            }.bind(this));
+
+            return oPromise;
+        };
+
+
+        function afterInit () {
+            // register event handler for storage events issued by other UShell windows
+            if (typeof oAdapter.logoutRedirect === "function") {
+                fnStorageEventListener = function (oStorageEvent) {
+                    function closeAndRedirectWindow () {
+                        // Most browsers do not allow closing windows via JS that aren't opened via JS
+                        // hence we additionally redirect to get these manually opened windows redirected at least.
+                        // NOTE: It is important to NOT redirect to  "/sap/public/bc/icf/logoff"
+                        // because on iPad Safari e.g. the event is not processed until the window gets the focus.
+                        // This would terminate any new session opened in between.
+                        that._closeWindow();
+                        that._redirectWindow();
+                    }
+                    if (sap.ushell.Container !== that) {
+                        // In integration test suite, old listeners remain which do not belong to the current sap.ushell.Container instance.
+                        // IE sends events also to own window. Then these old listeners react as if a remote window logged out...
+                        return;
+                    }
+                    // IE9 seems to get the events, but not the values in another window!?
+                    if (oStorageEvent.key.indexOf(sRemoteSystemPrefix) === 0
+                        && oStorageEvent.newValue
+                        && oStorageEvent.newValue !== oLocalStorage.getItem(oStorageEvent.key)) {
+                        utils.localStorageSetItem(oStorageEvent.key, oStorageEvent.newValue);
+                    }
+                    if (oStorageEvent.key === sSessionTerminationKey) {
+                        if (oStorageEvent.newValue === "pending") {
+                            that._suppressOData();
+                            if (oEventProvider.fireEvent("Logout", true)) {
+                                closeAndRedirectWindow();
+                            } else {
+                                // defer UShell closeWindow to let NWBC receive message asynchronously
+                                setTimeout(closeAndRedirectWindow, 1000);
+                            }
+                        }
+                    }
+                };
+                window.addEventListener("storage", fnStorageEventListener);
+            }
         }
 
+
         /**
          * Expose functions for unit testing.
          * Internal use only.
@@ -1610,6 +1780,35 @@ sap.ui.define([
                 createAdapter: createAdapter
             };
         };
+        /**
+         * Resets the internal service instance store.
+         * NOTE:
+         * Only meant to be used in QUnit tests!
+         *
+         * @since 1.119
+         * @private
+         */
+        this.resetServices = function () {
+            mServicesByName = new utils.Map();
+            mServicesByNamePromise = new utils.Map();
+        };
+
+        /**
+         * Resets internal state of the Container instance.
+         * NOTE:
+         * Only meant to be used in QUnit tests!
+         *
+         * @since 1.119
+         * @private
+         */
+        this.reset = function () {
+            this.resetServices();
+            oLocalStorage = utils.getLocalStorage();
+            isDirty = false;
+            aRegisteredDirtyMethods = [];
+            oRenderers = {};
+            this.fnAsyncDirtyStateProvider = undefined;
+        };
     }
 
     /**
@@ -1631,7 +1830,9 @@ sap.ui.define([
         });
     }
 
-    ObjectPath.create("sap.ushell");
+
+    oContainerInstance = new Container();
+
     /**
      * Initializes the Unified Shell Container.
      *
@@ -1676,149 +1877,18 @@ sap.ui.define([
      *   You only need to specify these package names if they differ from the standard name <code>"sap.ushell.adapters." + sPlatform</code>.
      * @returns {jQuery.Promise} a promise that is resolved once the container is available
      * @since 1.15.0
+     * @ui5-global-only
      * @public
      */
     sap.ushell.bootstrap = function (sPlatform, mAdapterPackagesByPlatform) {
         var oDeferred = new jQuery.Deferred();
-
-        // Init mobile support for the case when sap.m.App is not used
-        MobileSupport.init();
-
-        if (sap.ushell.Container !== undefined) {
-            var oError = new Error("Unified shell container is already initialized - cannot initialize twice.\nStacktrace of first initialization:" + sFirstInitStack);
-            Log.error(oError,
-                oError.stack, // stacktrace not only available for all browsers
-                S_COMPONENT_NAME);
-            throw oError;
-        }
-        sFirstInitStack = (new Error()).stack; // remember stack trace of the first init for debugging
-
-        // remember the configuration independently of window["sap-ushell-config"]
-        oConfig = extend({}, window["sap-ushell-config"]);
-        // remember the platform package names
-        mPlatformPackages = mAdapterPackagesByPlatform;
-
-        if (typeof window["sap.ushell.bootstrap.callback"] === "function") {
-            setTimeout(window["sap.ushell.bootstrap.callback"]);
-        }
-
-        // Register all injectable ui5services
-        registerInjectableUi5Services([
-            "Personalization",
-            "URLParsing",
-            "CrossApplicationNavigation"
-        ], true);
-
-        registerInjectableUi5Services(["Configuration"], false);
-
-        // Waterfall:
-        //   1. Create "Container" adapter
-        //   2. Load "PluginManager" and "CommonDataModel" services
-        //   3. Load plugins
-        //   4. Register plugins
-        var system = new System({
-            // this is the initial logon system object
-            alias: "",
-            platform: oConfig.platform || sPlatform
-        });
-        createAdapter("Container", system, null, true /* async */).then(function (adapter) {
-            adapter.load().then(function () {
-                // returns true if CDM Plugins are to be loaded
-                function _bLoadCDM () {
-                    var oUshellConfig = window["sap-ushell-config"];
-                    if (!oUshellConfig || !oUshellConfig.services) {
-                        return false;
-                    }
-                    var oUShellPluginManagerConfig = oUshellConfig.services.PluginManager;
-                    var oPluginManagerConfig = oUShellPluginManagerConfig && oUShellPluginManagerConfig.config;
-                    return oPluginManagerConfig && oPluginManagerConfig.loadPluginsFromSite;
-                }
-
-                sap.ushell.Container = new Container(adapter);
-
-                // Load CommonDataModel and PluginManager in parallel
-                var asyncServices = [sap.ushell.Container.getServiceAsync("PluginManager")];
-                if (_bLoadCDM()) {
-                    //If we have CDM add the scope id to the response configuration
-                    oConfigSetting.CDMPromise = sap.ushell.Container.getServiceAsync("CommonDataModel");
-                    asyncServices.push(oConfigSetting.CDMPromise);
-                }
-                Promise.all(asyncServices).then(function (aServices) {
-                    handlePlugins(aServices);
-                }).then(lastSteps);
-
-                // preload given UI Services to allow sync access (via getService()) w/o triggering a sync request (CSP safeguarding of Neo Platform)
-                var servicesForPreloading = [];
-                if (oConfig.preloadServices !== undefined && Array.isArray(oConfig.preloadServices)) {
-                    oConfig.preloadServices.forEach(function (serviceName) {
-                        servicesForPreloading.push(sap.ushell.Container.getServiceAsync(serviceName));
-                    });
-                    Log.error("Ushell Config's preloadServices should not be used!");
-                }
-
-                var oShellNavigationServicePromise = sap.ushell.Container.getServiceAsync("ShellNavigation")
-                    .then(function (ShellNavigationService) {
-                        sap.ushell.Container._oShellNavigationService = ShellNavigationService;
-                    });
-
-                servicesForPreloading.push(oShellNavigationServicePromise);
-
-                Promise.all(servicesForPreloading).then(function () {
-                    oDeferred.resolve(); // Note that resolve might be called before the plugins are registered
-                });
+        oContainerInstance.init(sPlatform, mAdapterPackagesByPlatform)
+            .then(function () {
+                oDeferred.resolve();
             });
-
-            function handlePlugins (aServices) {
-                var oPluginManager = aServices[0];
-                var oCDM = aServices[1];
-                var getPlugins = oCDM ? oCDM.getPlugins() : jQuery.when({});
-
-                getPlugins.then(function (oCDMSitePlugins) {
-                    var oAllPlugins = deepExtend({}, oConfig.bootstrapPlugins, oCDMSitePlugins);
-                    oPluginManager.registerPlugins(oAllPlugins);
-                });
-            }
-
-            function lastSteps () {
-                prepareNWBC();
-
-                // Config should be required after bootstrap when sap-ushell-config is calculated
-                sap.ui.require(["sap/ushell/Config"], function (Config) {
-                    handleDarkMode(Config);
-                    initUITracer(Config);
-                });
-            }
-
-            function prepareNWBC () {
-                if (utils.hasFLPReady2NotificationCapability()) {
-                    // Notify SAP Business Client (NWBC), that the Container and its Services, are ready to be used and
-                    // send additional interface
-                    sap.ui.require(["sap/ushell/NWBCInterface"], function (oNWBCInterface) {
-                        utils.getPrivateEpcm().doEventFlpReady2(oNWBCInterface);
-                    });
-                } else if (utils.hasFLPReadyNotificationCapability()) {
-                    // Notify SAP Business Client (NWBC), that the Container and its Services, are ready to be used.
-                    utils.getPrivateEpcm().doEventFlpReady();
-                }
-            }
-
-            function handleDarkMode (Config) {
-                if (Config.last("/core/darkMode/enabled")) {
-                    sap.ushell.Container.getServiceAsync("DarkModeSupport").then(function (DarkModeSupportService) {
-                        if (DarkModeSupportService && DarkModeSupportService.setup) { // Many qUnits mock getServiceAsync without DarkModeSupport
-                            DarkModeSupportService.setup();
-                        }
-                    });
-                }
-            }
-
-            function initUITracer(Config) {
-                var bTraceEnabled = !!(new URLSearchParams(window.location.search)).get("sap-ui-xx-ushell-UITraceEnabled");
-                if (Config.last("/core/uiTracer/enabled") || bTraceEnabled) {
-                    sap.ushell.Container.getServiceAsync("UITracer");
-                }
-            }
-        });
         return oDeferred.promise();
     };
+
+
+    return oContainerInstance;
 });

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

@@ -301,7 +301,7 @@ sap.ui.define([
      * - "off": indicates that #off was called on behalf of the whole group.
      *   Indicating that if a handler was already called it shouldn't be called ever again.
      *
-     * @return {object} a Doable
+     * @returns {object} a Doable
      */
     function on (oHub, sEvent) {
         var aSubscriberGroup = [];

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

@@ -5,7 +5,7 @@
  *
  * The Fiori20 adapter automatically re-styles old (Fiori 1) applications to match Fiori2 design requirements.
  *
- * @version 1.118.0
+ * @version 1.119.2
  */
 sap.ui.define([
     "sap/ui/base/Object",

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

@@ -4,7 +4,7 @@
  * @fileOverview The purpose Fiori20AdapterTest in this file is to decide whether to load the Fiori20Adapter at all.
  * This file is kept small in size on purpose as it is always required in productive code even when Fiori 2 adaptation is not required.
  *
- * @version 1.118.0
+ * @version 1.119.2
  */
 sap.ui.define([
     "sap/base/Log",
@@ -97,7 +97,7 @@ sap.ui.define([
         },
 
         /**
-         * @return {object} object
+         * @returns {object} object
          *
          * @private
          */

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

@@ -925,8 +925,8 @@ sap.ui.define([
         },
 
         /**
-         * @param {number} moveX
-         * @param {number} moveY
+         * @param {int} moveX
+         * @param {int} moveY
          * @param {string} collidedObjectType: One of the following strings "Group", "TabBar"
          * @returns {{
          *     collidedObjectType: String,
@@ -1418,7 +1418,7 @@ sap.ui.define([
          * @param tiles
          * @param startRow
          * @param endRow
-         * @returns {number}
+         * @returns {int}
          * Fills the given matrix row with tiles.
          */
         fillRowsInLine: function (matrix, tiles, row, bIsLinkTiles) {

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

@@ -2,7 +2,7 @@
 /**
  * @fileOverview NWBCInterface for NWBC client
  *
- * @version 1.118.0
+ * @version 1.119.2
  */
 sap.ui.define([
     "sap/ushell/EventHub",
@@ -29,7 +29,7 @@ sap.ui.define([
     /**
      * Provides FLP session timeout value
      *
-     * @return {number} session time out in minutes
+     * @returns {int} session time out in minutes
      *
      * @private
      * @since 1.80.0
@@ -45,7 +45,7 @@ sap.ui.define([
     /**
      * Provides indication if there is currently a kept alive app in FLP
      *
-     * @return {Promise} boolean value of true or false is such app exists
+     * @returns {Promise} boolean value of true or false is such app exists
      *
      * @private
      * @since 1.103.0