@sapui5/sap.ushell 1.119.2 → 1.120.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sapui5/sap.ushell",
-    "version": "1.119.2",
+    "version": "1.120.0",
     "description": "SAPUI5 Library sap.ushell",
     "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
     "keywords": [

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

@@ -2,7 +2,7 @@
 <library xmlns="http://www.sap.com/sap.ui.library.xsd">
     <name>sap.ushell</name>
     <vendor>SAP SE</vendor>
-    <version>1.119.2</version>
+    <version>1.120.0</version>
     <copyright>Copyright (c) 2009-2023 SAP SE, All Rights Reserved</copyright>
     <documentation>SAP library: sap.ushell</documentation>
 
@@ -63,7 +63,7 @@
         <packaging xmlns="http://www.sap.com/ui5/buildext/packaging" version="2.0">
             <module-infos>
                 <raw-module name="sap/ushell/bootstrap/ui5loader-config.js" depends="ui5loader.js" />
-                <raw-module name="sap/ushell/renderers/fiori2/search/sinaNext/sina/sinaFactory.js"
+                <raw-module name="sap/ushell/renderer/search/sinaNext/sina/sinaFactory.js"
                     requiresTopLevelScope="false" />
                 <raw-module name="sap/ushell/appRuntime/ui5/AppRuntime.js"
                     requiresTopLevelScope="false" />
@@ -122,7 +122,7 @@
             <component>
                 <name>HAN-AS-INA-UI</name>
                 <modules>
-                    <module>sap/ushell/renderers/fiori2/search/*</module>
+                    <module>sap/ushell/renderer/search/*</module>
                     <module>tools/sinaNext/*</module> <!-- that path might be wrong -->
                 </modules>
             </component>

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

@@ -39,7 +39,8 @@ sap.ui.define([
     "sap/ushell/Ui5ServiceFactory",
     "sap/ushell/utils",
     "sap/ushell/utils/UrlParsing",
-    "sap/ushell/renderers/fiori2/ShellLayout"
+    "sap/ushell/renderer/ShellLayout",
+    "sap/base/util/Deferred"
 ], function (
     assert,
     Log,
@@ -57,9 +58,10 @@ sap.ui.define([
     EventHub,
     System,
     oUi5ServiceFactory,
-    utils,
+    ushellUtils,
     UrlParsing,
-    ShellLayout
+    ShellLayout,
+    Deferred
 ) {
     "use strict";
 
@@ -107,7 +109,19 @@ sap.ui.define([
      * @returns {object} the service configuration
      */
     function getServiceConfig (sServiceName) {
-        return (oConfig.services && oConfig.services[sServiceName]) || {};
+        var oServices = oConfig.services;
+        if (!oServices) {
+            return {};
+        }
+        // Special case: Notifications and NotificationsV2 configurations are interchangeable.
+        // Notifications service configuration has priority
+        if (sServiceName === "Notifications" || sServiceName === "NotificationsV2") {
+            if (oServices.Notifications && oServices.NotificationsV2) {
+                Log.error("Notifications and NotificationsV2 services should not be configured at the same time. NotificationsV2 configuration is ignored.");
+            }
+            return oServices.Notifications || oServices.NotificationsV2 || {};
+        }
+        return oServices[sServiceName] || {};
     }
 
     /**
@@ -126,15 +140,19 @@ sap.ui.define([
         var oAdapterConfig = getServiceConfig(sName).adapter || {};
         var sAdapterName;
 
-        function getAdapterInstanceAsync (AdapterModule) {
-            return new Promise(function (resolve, reject) {
-                sap.ui.require([AdapterModule], function (AdapterClass) {
-                    var oAdapterInstance = new AdapterClass(oSystem, sParameter,
-                        { config: oAdapterConfig.config || {} }
-                    );
-                    resolve(oAdapterInstance);
-                }, reject);
-            });
+        async function getAdapterInstanceAsync (AdapterModule) {
+            let AdapterClass;
+            try {
+                [AdapterClass] = await ushellUtils.requireAsync([AdapterModule]);
+            } catch (oError) {
+                if (AdapterModule.endsWith("PersonalizationV2Adapter")) {
+                    const sNewAdapterModule = AdapterModule.replace("PersonalizationV2Adapter", "PersonalizationAdapter");
+                    return getAdapterInstanceAsync(sNewAdapterModule);
+                }
+                throw oError;
+            }
+            var oAdapterInstance = new AdapterClass(oSystem, sParameter, { config: oAdapterConfig.config || {} });
+            return oAdapterInstance;
         }
 
         if (bUseConfiguredAdapterOnly === true) {
@@ -157,7 +175,17 @@ sap.ui.define([
          */
         return (function () {
             function getAdapterInstance (AdapterModule) {
-                var AdapterClass = sap.ui.requireSync(AdapterModule); // LEGACY API (deprecated)
+                var AdapterClass;
+                try {
+                    AdapterClass = sap.ui.requireSync(AdapterModule); // LEGACY API (deprecated)
+                } catch (oError) {
+                    if (AdapterModule.endsWith("PersonalizationV2Adapter")) {
+                        const sNewAdapterModule = AdapterModule.replace("PersonalizationV2Adapter", "PersonalizationAdapter");
+                        AdapterClass = sap.ui.requireSync(sNewAdapterModule); // LEGACY API (deprecated)
+                    } else {
+                        throw oError;
+                    }
+                }
                 return new AdapterClass(oSystem, sParameter,
                     { config: oAdapterConfig.config || {} }
                 );
@@ -169,8 +197,9 @@ sap.ui.define([
     /**
      * @class
      * @alias sap.ushell.Container
-     * @classdesc The Unified Shell's container which manages renderers, services, and adapters. The container is designed to be a singleton. Instead of creating an instance
-     * please access the central instance via namespace <code>sap.ushell.Container</code>.
+     * @classdesc The Unified Shell's container.
+     * Manages renderers, services, and adapters.
+     * The container is designed to be a singleton, therefore instead of creating an instance, access the central one via <code>sap.ushell.Container</code>.
      *
      * @see sap.ushell.bootstrap
      * @since 1.15.0
@@ -188,15 +217,17 @@ sap.ui.define([
         var mRemoteSystems = {};
         var oGlobalDirtyDeferred;
         var fnStorageEventListener;
-        var oLocalStorage = utils.getLocalStorage();
-        var mServicesByName = new utils.Map();
-        var mServicesByNamePromise = new utils.Map();
+        var oLocalStorage = ushellUtils.getLocalStorage();
+        var mServicesByName = new ushellUtils.Map();
+        var mServicesByNamePromise = new ushellUtils.Map();
         var sSessionTerminationKey;
         var that = this;
 
         var oAdapter;
         var bInitialized = false;
 
+        var oContainerReadyDeferred = new Deferred();
+
         this.init = function (sPlatform, mAdapterPackagesByPlatform) {
             sap.ushell.Container = oContainerInstance;
             return this._init(sPlatform, mAdapterPackagesByPlatform)
@@ -208,6 +239,7 @@ sap.ui.define([
                     sSessionTerminationKey = "sap.ushell.Container." + oAdapter.getSystem().getPlatform() + ".sessionTermination";
                     afterInit();
                     bInitialized = true;
+                    oContainerReadyDeferred.resolve();
                     return;
                 });
         };
@@ -258,6 +290,7 @@ sap.ui.define([
          * @returns {sap.ui.core.Control|Promise<sap.ui.core.Control>|sap.ui.core.ComponentContainer|Promise<sap.ui.core.ComponentContainer>} the renderer or Promise (in asynchronous mode)
          * @since 1.15.0
          * @public
+         * @deprecated since 1.120.0
          */
         this.createRenderer = function (sRendererName, bAsync) {
             // shift params if necessary
@@ -271,7 +304,7 @@ sap.ui.define([
             var oRendererConfig;
 
             Measurement.start("FLP:Container.InitLoading", "Initial Loading", "FLP");
-            utils.setPerformanceMark("FLP - renderer created");
+            ushellUtils.setPerformanceMark("FLP - renderer created");
             sRendererName = sRendererName || oConfig.defaultRenderer;
             if (!sRendererName) {
                 throw new Error("Missing renderer name");
@@ -280,6 +313,12 @@ sap.ui.define([
             sComponentName = oRendererConfig.module || (sRendererName.indexOf(".") < 0
                 ? "sap.ushell.renderers." + sRendererName + ".Renderer"
                 : sRendererName);
+
+            // this migration only fails for launchpads overwriting the resource path of the renderer
+            if (sComponentName === "sap.ushell.renderers.fiori2.Renderer") {
+                sComponentName = "sap.ushell.renderer.Renderer";
+            }
+
             if (oRendererConfig.componentData && oRendererConfig.componentData.config) {
                 oComponentData.config = oRendererConfig.componentData.config;
             }
@@ -317,7 +356,7 @@ sap.ui.define([
                         Module,
                         "sap/ui/core/ComponentContainer",
                         "sap/ui/core/UIComponent",
-                        "sap/ui/core/routing/Router" // As fiori2.Renderer does not use manifest-first the router needs to be loaded async beforehand
+                        "sap/ui/core/routing/Router" // As ushell.Renderer does not use manifest-first the router needs to be loaded async beforehand
                     ], function (RendererClass, ComponentContainer, UIComponent) {
                         var oRenderer = new RendererClass({ componentData: oComponentData });
 
@@ -403,6 +442,142 @@ sap.ui.define([
             return getRendererInstance(sModule);
         };
 
+        /**
+         * Creates a new renderer instance for the given renderer name.
+         *
+         * Names without a dot are interpreted as package names within the default naming convention and will be expanded to
+         * <code>"sap.ushell.renderers." + sRendererName + ".Renderer"</code>.
+         * Names containing a dot are used "as is".
+         *
+         * The resulting name must point to a SAPUI5 object which is first required and then instantiated (without arguments).
+         * The object is expected to be a UI component (i.e. extend <code>sap.ui.core.UIComponent</code>), which is then automatically
+         * wrapped into a <code>sap.ui.core.ComponentContainer</code> control by this method.
+         * The <code>sap.ui.core.ComponentContainer</code> is created with <code>height</code> and <code>width</code>
+         * set to "100%" to accommodate the complete available space.
+         * Besides UIComponents a control (i.e. extend <code>sap.ui.core.Control</code>) is accepted, too.
+         *
+         * The returned renderer is supposed to be added to a direct child (for example <code>div</code>) of the <code>body</code>
+         * of the page and there should be no other parts of the page consuming space outside the renderer.
+         * Use CSS class <code>sapUShellFullHeight</code> at <code>html</code>, <code>body</code> and at the element
+         * to which the renderer is added to allow the renderer to use 100% height.
+         *
+         * @param {string} [sRendererName] The renderer name, such as "standard" or "acme.foo.bar.MyRenderer";
+         *   it is taken from the configuration property <code>defaultRenderer</code> if not given here.
+         *
+         * @returns {sap.ui.core.Control|Promise<sap.ui.core.Control>|sap.ui.core.ComponentContainer|Promise<sap.ui.core.ComponentContainer>} the renderer or Promise (in asynchronous mode)
+         * @since 1.120.0
+         * @private
+         */
+        this.createRendererInternal = async function (sRendererName) {
+            var oComponentData = { async: true };
+            var sComponentName;
+            var oRendererConfig;
+
+            Measurement.start("FLP:Container.InitLoading", "Initial Loading", "FLP");
+            ushellUtils.setPerformanceMark("FLP - renderer created");
+            sRendererName = sRendererName || oConfig.defaultRenderer;
+            if (!sRendererName) {
+                throw new Error("Missing renderer name");
+            }
+            oRendererConfig = (oConfig.renderers && oConfig.renderers[sRendererName]) || {};
+            sComponentName = oRendererConfig.module || (sRendererName.indexOf(".") < 0
+                ? "sap.ushell.renderers." + sRendererName + ".Renderer"
+                : sRendererName);
+
+            // this migration only fails for launchpads overwriting the resource path of the renderer
+            if (sComponentName === "sap.ushell.renderers.fiori2.Renderer") {
+                sComponentName = "sap.ushell.renderer.Renderer";
+            }
+
+            if (oRendererConfig.componentData && oRendererConfig.componentData.config) {
+                oComponentData.config = oRendererConfig.componentData.config;
+            }
+
+            function replacePlaceAt (RendererControl) {
+                // Some applications place the shell directly into the body element.
+                // However, this breaks the layout with separate UI Areas.
+                // Wrap the control into the #canvas div in this case.
+                RendererControl.placeAt = function (sRef, vPosition) {
+                    var oContainer = sRef;
+                    var canvasId = "canvas";
+                    var body = document.body;
+                    if (sRef === body.id) {
+                        oContainer = document.createElement("div");
+                        oContainer.setAttribute("id", canvasId);
+                        oContainer.classList.add("sapUShellFullHeight");
+                        switch (vPosition) {
+                            case "first":
+                                if (body.firstChild) {
+                                    body.insertBefore(oContainer, body.firstChild);
+                                    break;
+                                }
+                            /* falls through */
+                            case "only":
+                                body.innerHTML = "";
+                            /* falls through */
+                            default:
+                                body.appendChild(oContainer);
+                        }
+                        sRef = canvasId;
+                        vPosition = "";
+                    }
+                    ShellLayout.applyLayout(sRef);
+                    EventHub.emit("ShellLayoutApplied", Date.now());
+                    Control.prototype.placeAt.call(this, sRef, vPosition);
+                };
+            }
+
+            function replaceDestroy (oControl) {
+                var fnOriginalDestroy = oControl.destroy;
+                oControl.destroy = function () {
+                    if (oControl.isA("sap.ui.core.ComponentContainer")) {
+                        return Promise.resolve(oControl.getComponentInstance().destroy()).then(function () {
+                            return fnOriginalDestroy.apply(oControl, arguments);
+                        });
+                    }
+                    return Promise.resolve(fnOriginalDestroy.apply(oControl, arguments));
+                };
+            }
+
+            var sModule = sComponentName.replace(/\./g, "/");
+            const [
+                RendererClass,
+                ComponentContainer,
+                UIComponent
+            ] = await ushellUtils.requireAsync([
+                sModule,
+                "sap/ui/core/ComponentContainer",
+                "sap/ui/core/UIComponent",
+                "sap/ui/core/routing/Router" // As ushell.Renderer does not use manifest-first the router needs to be loaded async beforehand
+            ]);
+            var oRenderer = new RendererClass({ componentData: oComponentData });
+
+            if (oRenderer instanceof UIComponent) {
+                var oComponentContainer = new ComponentContainer({
+                    component: oRenderer,
+                    height: "100%",
+                    width: "100%",
+                    async: true
+                });
+                replacePlaceAt(oComponentContainer);
+                replaceDestroy(oComponentContainer);
+                oRenderers[sRendererName] = oRenderer;
+
+                await oRenderer.rootControlLoaded();
+                oEventProvider.fireEvent("rendererCreated", { renderer: oRenderer });
+                return oComponentContainer;
+            } else if (oRenderer instanceof Control) {
+                replacePlaceAt(oRenderer);
+                replaceDestroy(oRenderer);
+                oRenderers[sRendererName] = oRenderer;
+
+                oEventProvider.fireEvent("rendererCreated", { renderer: oRenderer });
+                return oRenderer;
+            }
+
+            throw new Error("Unsupported renderer type!");
+        };
+
         /**
          * Gets a renderer instance for the given renderer name, that was created by the createRenderer method.
          *
@@ -414,6 +589,7 @@ sap.ui.define([
          *   if no renderer name can be determined and a single renderer instance has been created, this single instance is returned.
          * @since 1.30.0
          * @public
+         * @deprecated since 1.120.0
          */
         this.getRenderer = function (sRendererName) {
             var oRendererControl;
@@ -443,6 +619,46 @@ sap.ui.define([
             return oRendererControl;
         };
 
+        /**
+         * Gets a renderer instance for the given renderer name, that was created by the createRenderer method.
+         *
+         * @param {string} [sRendererName] The renderer name, such as "standard" or "fiori2";
+         *   it is taken from the configuration property <code>defaultRenderer</code> if not given here.
+         * @returns {sap.ui.core.Control|sap.ui.core.Component} the renderer with the specified name; the returned object is either a control
+         *   (i.e. extend <code>sap.ui.core.Control</code>) or a UI component (i.e. extend <code>sap.ui.core.UIComponent</code>),
+         *   i.e. this method unwraps the renderer component from its <code>sap.ui.core.ComponentContainer</code>;
+         *   if no renderer name can be determined and a single renderer instance has been created, this single instance is returned.
+         * @since 1.120.0
+         * @private
+         */
+        this.getRendererInternal = function (sRendererName) {
+            var oRendererControl;
+
+            sRendererName = sRendererName || oConfig.defaultRenderer;
+
+            if (sRendererName) {
+                oRendererControl = oRenderers[sRendererName];
+            } else {
+                var aRendererNames = Object.keys(oRenderers);
+                if (aRendererNames.length === 1) {
+                    oRendererControl = oRenderers[aRendererNames[0]];
+                } else {
+                    Log.warning(
+                        "getRendererInternal() - cannot determine renderer, because no default renderer is configured and multiple instances exist.",
+                        null,
+                        S_COMPONENT_NAME);
+                }
+            }
+
+            // unwrap the component instance in case of components
+            if (oRendererControl && oRendererControl.isA("sap.ui.core.ComponentContainer")) { // TODO: pending dependency migration
+                return oRendererControl.getComponentInstance();
+            }
+
+            // maybe undefined
+            return oRendererControl;
+        };
+
         /**
          * An enumeration for the application work protect mode state.
          * @type {sap.ushell.Container.DirtyState}
@@ -589,7 +805,7 @@ sap.ui.define([
                         );
                     } else {
                         iPending += 1;
-                        utils.localStorageSetItem(sStorageKey,
+                        ushellUtils.localStorageSetItem(sStorageKey,
                             this.DirtyState.PENDING, true);
                         Log.debug(
                             "getGlobalDirty() Requesting status for: " + sStorageKey,
@@ -622,14 +838,31 @@ sap.ui.define([
          * Returns the logon system.
          *
          * @returns {sap.ushell.System} object providing information about the system where the container is logged in.
-         *   Since 1.15.0 the return value is of type <code>sap.ushell.System</code>
+         *
          * @since 1.15.0
          * @private
+         * @ui5-restricted sap.fl
          */
         this.getLogonSystem = function () {
+            if (!oAdapter) {
+                Log.error("getLogonSystem: Container is not yet initialized - system cannot be determined!");
+            }
             return oAdapter.getSystem();
         };
 
+        /**
+         * Returns a Promise that resolves when the Container instance has been initialized completely.
+         *
+         * @returns {Promise} Promise that resolves after init.
+         *
+         * @since 1.120.0
+         * @private
+         * @ui5-restricted sap.fl
+         */
+        this.ready = function () {
+            return oContainerReadyDeferred.promise;
+        };
+
         /**
          * Returns the logged-in user.
          *
@@ -861,7 +1094,7 @@ sap.ui.define([
          * Its adapter is an instance of <code>my.own.FooAdapter</code> constructed with the parameters logon system,
          * "runtimeConfig" and <code>{config: {foo: "bar"}}</code>.
          *
-         * Please note that the api will throw a runtime error (or reject for async mode)
+         * Note that the api will throw a runtime error (or reject for async mode)
          * if the service name does not reflect a service available.
          *
          * @param {string} sServiceName The service name, such as "Menu"
@@ -1172,7 +1405,7 @@ sap.ui.define([
                 Log.debug("Added " + oRemoteSystem, null, "sap.ushell.Container");
             }
             mRemoteSystems[sAlias] = oRemoteSystem;
-            utils.localStorageSetItem(sRemoteSystemPrefix + sAlias, oRemoteSystem);
+            ushellUtils.localStorageSetItem(sRemoteSystemPrefix + sAlias, oRemoteSystem);
         };
 
         /**
@@ -1187,7 +1420,7 @@ sap.ui.define([
             if (sAlias && sAlias.toUpperCase() === "LOCAL") {
                 return true;
             }
-            var oURI = new URI(utils.getLocationHref());
+            var oURI = new URI(ushellUtils.getLocationHref());
             var sClient = this.getLogonSystem().getClient() || "";
             if (oSystem.getBaseUrl() === oURI.origin() && oSystem.getClient() === sClient) {
                 return true;
@@ -1357,7 +1590,7 @@ sap.ui.define([
                     window.removeEventListener("storage", fnStorageEventListener);
                 }
 
-                utils.localStorageSetItem(sSessionTerminationKey, "pending");
+                ushellUtils.localStorageSetItem(sSessionTerminationKey, "pending");
                 that._suppressOData();
                 var mSystems = that._getRemoteSystems();
                 Object.keys(mSystems).forEach(function (sAlias) {
@@ -1393,6 +1626,7 @@ sap.ui.define([
          * This member represents the default native implementation of logout.
          * If SessionHandler was created, we register the alternate logout function using registerLogout function.
          *
+         * @function
          * @returns {jQuery.Deferred} A <code>jQuery.promise</code> to be resolved when logout is finished, even when it fails.
          * @since 1.15.0
          * @public
@@ -1506,7 +1740,7 @@ sap.ui.define([
          * @private
          */
         this.getFLPUrl = function (bIncludeHash) {
-            var sUrl = utils.getLocationHref();
+            var sUrl = ushellUtils.getLocationHref();
             var iHashPosition = sUrl.indexOf(UrlParsing.getShellHash(sUrl));
 
             if (iHashPosition === -1 || bIncludeHash === true) {
@@ -1599,7 +1833,6 @@ sap.ui.define([
                     setTimeout(window["sap.ushell.bootstrap.callback"]);
                 }
 
-
                 // Register all injectable ui5services
                 registerInjectableUi5Services([
                     "Personalization",
@@ -1693,15 +1926,15 @@ sap.ui.define([
                 }
 
                 function prepareNWBC () {
-                    if (utils.hasFLPReady2NotificationCapability()) {
+                    if (ushellUtils.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);
+                            ushellUtils.getPrivateEpcm().doEventFlpReady2(oNWBCInterface);
                         });
-                    } else if (utils.hasFLPReadyNotificationCapability()) {
+                    } else if (ushellUtils.hasFLPReadyNotificationCapability()) {
                         // Notify SAP Business Client (NWBC), that the Container and its Services, are ready to be used.
-                        utils.getPrivateEpcm().doEventFlpReady();
+                        ushellUtils.getPrivateEpcm().doEventFlpReady();
                     }
                 }
 
@@ -1726,7 +1959,6 @@ sap.ui.define([
             return oPromise;
         };
 
-
         function afterInit () {
             // register event handler for storage events issued by other UShell windows
             if (typeof oAdapter.logoutRedirect === "function") {
@@ -1749,7 +1981,7 @@ sap.ui.define([
                     if (oStorageEvent.key.indexOf(sRemoteSystemPrefix) === 0
                         && oStorageEvent.newValue
                         && oStorageEvent.newValue !== oLocalStorage.getItem(oStorageEvent.key)) {
-                        utils.localStorageSetItem(oStorageEvent.key, oStorageEvent.newValue);
+                        ushellUtils.localStorageSetItem(oStorageEvent.key, oStorageEvent.newValue);
                     }
                     if (oStorageEvent.key === sSessionTerminationKey) {
                         if (oStorageEvent.newValue === "pending") {
@@ -1767,7 +1999,6 @@ sap.ui.define([
             }
         }
 
-
         /**
          * Expose functions for unit testing.
          * Internal use only.
@@ -1789,8 +2020,8 @@ sap.ui.define([
          * @private
          */
         this.resetServices = function () {
-            mServicesByName = new utils.Map();
-            mServicesByNamePromise = new utils.Map();
+            mServicesByName = new ushellUtils.Map();
+            mServicesByNamePromise = new ushellUtils.Map();
         };
 
         /**
@@ -1803,11 +2034,13 @@ sap.ui.define([
          */
         this.reset = function () {
             this.resetServices();
-            oLocalStorage = utils.getLocalStorage();
+            oLocalStorage = ushellUtils.getLocalStorage();
             isDirty = false;
             aRegisteredDirtyMethods = [];
             oRenderers = {};
             this.fnAsyncDirtyStateProvider = undefined;
+            bInitialized = false;
+            oContainerReadyDeferred = new Deferred();
         };
     }
 
@@ -1830,7 +2063,6 @@ sap.ui.define([
         });
     }
 
-
     oContainerInstance = new Container();
 
     /**
@@ -1889,6 +2121,5 @@ sap.ui.define([
         return oDeferred.promise();
     };
 
-
     return oContainerInstance;
 });

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.119.2
+ * @version 1.120.0
  */
 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.119.2
+ * @version 1.120.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -135,7 +135,8 @@ sap.ui.define([
         },
 
         _getMetadataConfiguration: function (oComp) {
-            var vAppConfig = oComp.getMetadata("config").getConfig(Fiori20AdapterConfiguration.S_FIORI20ADAPTER_METADATA_PARAM_NAME);
+            var oUI5Config = oComp.getManifestEntry("/sap.ui5/config") || {};
+            var vAppConfig = oUI5Config[Fiori20AdapterConfiguration.S_FIORI20ADAPTER_METADATA_PARAM_NAME];
             var bAppConfig;
             var oAppConfig;
 

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

@@ -2,7 +2,7 @@
 /**
  * @fileOverview NWBCInterface for NWBC client
  *
- * @version 1.119.2
+ * @version 1.120.0
  */
 sap.ui.define([
     "sap/ushell/EventHub",

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

@@ -173,6 +173,13 @@ sap.ui.define([
         };
 
         this._registerCommHandlers = function () {
+            var fnExtendSession = () => {
+                if (bInitialized === true) {
+                    that.userActivityHandler();
+                }
+                return new jQuery.Deferred().resolve().promise();
+            };
+
             AppLifeCycle.registerShellCommunicationHandler({
                 "sap.ushell.sessionHandler": {
                     oRequestCalls: {
@@ -187,12 +194,10 @@ sap.ui.define([
                     },
                     oServiceCalls: {
                         notifyUserActive: {
-                            executeServiceCallFn: function (/*oServiceParams*/) {
-                                if (bInitialized === true) {
-                                    that.userActivityHandler();
-                                }
-                                return new jQuery.Deferred().resolve().promise();
-                            }
+                            executeServiceCallFn: fnExtendSession
+                        },
+                        extendSessionEvent: {
+                            executeServiceCallFn: fnExtendSession
                         }
                     }
                 }

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

@@ -40,7 +40,7 @@
  * 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.119.2
+ * @version 1.120.0
  * @private
  */
 sap.ui.define([