@sapui5/sap.ushell 1.134.1 → 1.136.0

package/src/main/js/sap/ushell/ApplicationType/urlTemplateResolution.js

@@ -221,18 +221,11 @@ sap.ui.define([
 
                     var oPromisePostTemplateProcessing = new Promise(function (fnResolve) {
                         Container.getServiceAsync("URLTemplate").then(function (URLTemplate) {
-                            if (Config.last("/core/navigation/enableAppLifeCycleFallback")) {
-                                sap.ui.require(["sap/ushell/components/applicationIntegration/application/BlueBoxesCache"], function (BlueBoxesCache) {
-                                    var bForNewIframe = (BlueBoxesCache.get(oResult.url) === undefined);
-                                    URLTemplate.handlePostTemplateProcessing(oResult.url, oTemplateContext.siteAppSection, bForNewIframe).then(fnResolve);
-                                });
-                            } else {
-                                sap.ui.require(["sap/ushell/components/applicationIntegration/ApplicationContainerCache"], function (ApplicationContainerCache) {
-                                    // todo: [FLPCOREANDUX-10024] should this really be necessary?
-                                    var bForNewIframe = !ApplicationContainerCache.findFreeContainerByUrl(oResult.url);
-                                    URLTemplate.handlePostTemplateProcessing(oResult.url, oTemplateContext.siteAppSection, bForNewIframe).then(fnResolve);
-                                });
-                            }
+                            sap.ui.require(["sap/ushell/appIntegration/ApplicationContainerCache"], function (ApplicationContainerCache) {
+                                // todo: [FLPCOREANDUX-10024] should this really be necessary?
+                                var bForNewIframe = !ApplicationContainerCache.findFreeContainerByUrl(oResult.url);
+                                URLTemplate.handlePostTemplateProcessing(oResult.url, oTemplateContext.siteAppSection, bForNewIframe).then(fnResolve);
+                            });
                         });
                     });
 

package/src/main/js/sap/ushell/ApplicationType/wdaResolution.js

@@ -5,15 +5,17 @@ sap.ui.define([
     "sap/ui/thirdparty/URI",
     "sap/ushell/ApplicationType/systemAlias",
     "sap/ushell/ApplicationType/utils",
+    "sap/ushell/Config",
     "sap/ushell/Container"
-], function (
+], (
     deepExtend,
     ObjectPath,
     URI,
     oSystemAlias,
     oApplicationTypeUtils,
+    Config,
     Container
-) {
+) => {
     "use strict";
 
     /**
@@ -37,7 +39,7 @@ sap.ui.define([
      */
     async function constructWDAURLParameters (oParams, aMappedDefaultedParameterNames) {
         return new Promise(async (fnResolve, fnReject) => {
-            var oEffectiveParameters = deepExtend({}, oParams);
+            const oEffectiveParameters = deepExtend({}, oParams);
 
             // construct effective parameters including defaults
             if (aMappedDefaultedParameterNames.length > 0) {
@@ -51,6 +53,13 @@ sap.ui.define([
             // in the WDA case, the sap-system intent parameter is *not* part of the final url
             delete oEffectiveParameters["sap-system"];
 
+            if (Config.last("/core/extension/dap/enabled")) {
+                const oPluginManager = await Container.getServiceAsync("PluginManager");
+                oEffectiveParameters["sap-load-dap"] = oPluginManager.isPluginConfigured(Config.last("/core/extension/dap/pluginName"));
+            } else {
+                oEffectiveParameters["sap-load-dap"] = false;
+            }
+
             // compact our intent url parameters if required
             if (oEffectiveParameters["sap-xapp-state-data"]) {
                 const oAppStateService = await Container.getServiceAsync("AppState");
@@ -68,12 +77,12 @@ sap.ui.define([
                 undefined /* no Component*/,
                 true /*transient*/
             )
-                .fail(function (sError) {
+                .fail((sError) => {
                     fnReject(sError);
                 })
-                .then(function (oEffectiveCompactedIntentParams) {
+                .then((oEffectiveCompactedIntentParams) => {
                     // important to extract after compaction to get a potentially modified client
-                    var sEffectiveStartupParams = oApplicationTypeUtils.getURLParsing().paramsToString(oEffectiveCompactedIntentParams);
+                    const sEffectiveStartupParams = oApplicationTypeUtils.getURLParsing().paramsToString(oEffectiveCompactedIntentParams);
                     fnResolve(sEffectiveStartupParams);
                 });
         });
@@ -99,7 +108,7 @@ sap.ui.define([
      */
     function appendParametersToURI (oURI, sUrlParameters) {
         // ASSUMPTION: there are no relevant parameters in the WDA url, but only WDA parameters.
-        var sParams = oURI.search();
+        let sParams = oURI.search();
         if (sUrlParameters) {
             sParams = sParams + ((sParams.indexOf("?") < 0) ? "?" : "&") + sUrlParameters;
         }
@@ -145,12 +154,12 @@ sap.ui.define([
      * @private
      */
     function buildWdaURI (sApplicationId, sConfigId, bIsWDAInCompatibilityMode, oOtherParameters, fnExternalSystemAliasResolver) {
-        var sSapSystem,
-            sSapSystemDataSrc,
-            sUrl,
-            oURI,
-            sUrlParameters,
-            oUrlParameters = deepExtend({}, oOtherParameters);
+        let sSapSystem;
+        let sSapSystemDataSrc;
+        let sUrl;
+        let oURI;
+        let sUrlParameters;
+        const oUrlParameters = deepExtend({}, oOtherParameters);
 
         // Add config id if provided
         if (sConfigId) {
@@ -185,8 +194,7 @@ sap.ui.define([
     }
 
     function buildCompatibleWdaURL (sApplicationId, sUrlParameters) {
-        return "/ui2/nwbc/~canvas;window=app/wda/" + sApplicationId + "/" +
-            "?" + sUrlParameters;
+        return `/ui2/nwbc/~canvas;window=app/wda/${sApplicationId}/?${sUrlParameters}`;
     }
 
     /**
@@ -221,12 +229,12 @@ sap.ui.define([
      */
     function buildStandaloneWdaURL (sNamespaceAndApplicationId, sUrlParameters) {
 
-        var bNoNamespace = sNamespaceAndApplicationId.indexOf("/") !== 0;
+        const bNoNamespace = sNamespaceAndApplicationId.indexOf("/") !== 0;
         if (bNoNamespace) {
-            sNamespaceAndApplicationId = "sap/" + sNamespaceAndApplicationId;
+            sNamespaceAndApplicationId = `sap/${sNamespaceAndApplicationId}`;
         }
 
-        return "/webdynpro/" + sNamespaceAndApplicationId + "?" + sUrlParameters;
+        return `/webdynpro/${sNamespaceAndApplicationId}?${sUrlParameters}`;
     }
 
     /**
@@ -255,7 +263,7 @@ sap.ui.define([
      * @private
      */
     function createWDAResolutionResult (oInbound, sFinalWDAURL, sSapSystem, sSapSystemDataSrc) {
-        var oResolutionResult = {
+        const oResolutionResult = {
             "sap-system": sSapSystem,
             url: sFinalWDAURL,
             text: oInbound.title,
@@ -269,40 +277,40 @@ sap.ui.define([
         oApplicationTypeUtils.setSystemAlias(oResolutionResult, oInbound.resolutionResult);
 
         // propagate properties from the inbound in the resolution result
-        ["additionalInformation", "applicationDependencies"].forEach(function (sPropName) {
+        ["additionalInformation", "applicationDependencies"].forEach((sPropName) => {
             if (oInbound.resolutionResult.hasOwnProperty(sPropName)) {
                 oResolutionResult[sPropName] = oInbound.resolutionResult[sPropName];
             }
         });
 
-        oResolutionResult.url = oApplicationTypeUtils.appendParametersToUrl("sap-iframe-hint=" +
-            ((oResolutionResult.url.indexOf("/ui2/nwbc/") >= 0) ? "NWBC" : "WDA"), oResolutionResult.url);
+        oResolutionResult.url = oApplicationTypeUtils.appendParametersToUrl(`sap-iframe-hint=${
+            (oResolutionResult.url.indexOf("/ui2/nwbc/") >= 0) ? "NWBC" : "WDA"}`, oResolutionResult.url);
 
         return oResolutionResult;
     }
 
     function constructFullWDAResolutionResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
-        var oInboundResolutionResult = ObjectPath.get("inbound.resolutionResult", oMatchingTarget);
-        var oMappedIntentParamsPlusSimpleDefaults = oMatchingTarget.mappedIntentParamsPlusSimpleDefaults || {};
+        const oInboundResolutionResult = ObjectPath.get("inbound.resolutionResult", oMatchingTarget);
+        const oMappedIntentParamsPlusSimpleDefaults = oMatchingTarget.mappedIntentParamsPlusSimpleDefaults || {};
 
-        var sSapSystem = oInboundResolutionResult.systemAlias;
+        let sSapSystem = oInboundResolutionResult.systemAlias;
         if (oMappedIntentParamsPlusSimpleDefaults["sap-system"]) {
             sSapSystem = oMappedIntentParamsPlusSimpleDefaults["sap-system"][0];
         }
 
-        var sSapSystemDataSrc;
+        let sSapSystemDataSrc;
         if (oMappedIntentParamsPlusSimpleDefaults["sap-system-src"]) {
             sSapSystemDataSrc = oMappedIntentParamsPlusSimpleDefaults["sap-system-src"][0];
         }
 
-        var oOtherParams = {
+        const oOtherParams = {
             "sap-system": [ sSapSystem ]
         };
         if (typeof sSapSystemDataSrc === "string") {
             oOtherParams["sap-system-src"] = [ sSapSystemDataSrc ];
         }
 
-        var bCompatibilityMode = oInboundResolutionResult["sap.wda"].compatibilityMode;
+        let bCompatibilityMode = oInboundResolutionResult["sap.wda"].compatibilityMode;
         if (bCompatibilityMode === undefined) {
             bCompatibilityMode = true;
         }
@@ -316,28 +324,28 @@ sap.ui.define([
                 fnExternalSystemAliasResolver
             ),
             constructWDAURLParameters(oMappedIntentParamsPlusSimpleDefaults, oMatchingTarget.mappedDefaultedParamNames)
-        ]).then(function (aResults) {
-            var oWdaURIWithSystemAlias = aResults[0];
-            var sUrlParameters = aResults[1];
+        ]).then((aResults) => {
+            const oWdaURIWithSystemAlias = aResults[0];
+            const sUrlParameters = aResults[1];
 
-            var sFinalWDAURL = appendParametersToURI(oWdaURIWithSystemAlias, sUrlParameters);
-            var sCalcSapSystem = oMappedIntentParamsPlusSimpleDefaults["sap-system"] && oMappedIntentParamsPlusSimpleDefaults["sap-system"][0];
-            var sCalcSapSystemDataSrc = oMappedIntentParamsPlusSimpleDefaults["sap-system-src"] && oMappedIntentParamsPlusSimpleDefaults["sap-system-src"][0];
+            const sFinalWDAURL = appendParametersToURI(oWdaURIWithSystemAlias, sUrlParameters);
+            const sCalcSapSystem = oMappedIntentParamsPlusSimpleDefaults["sap-system"] && oMappedIntentParamsPlusSimpleDefaults["sap-system"][0];
+            const sCalcSapSystemDataSrc = oMappedIntentParamsPlusSimpleDefaults["sap-system-src"] && oMappedIntentParamsPlusSimpleDefaults["sap-system-src"][0];
 
-            var oResolutionResult = createWDAResolutionResult(oMatchingTarget.inbound, sFinalWDAURL, sCalcSapSystem, sCalcSapSystemDataSrc);
+            const oResolutionResult = createWDAResolutionResult(oMatchingTarget.inbound, sFinalWDAURL, sCalcSapSystem, sCalcSapSystemDataSrc);
             return oResolutionResult;
         });
     }
 
     function constructWDAResolutionResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
-        var oInbound = oMatchingTarget.inbound,
-            oInboundResolutionResult = oInbound && oInbound.resolutionResult,
-            oMappedIntentParamsPlusSimpleDefaults = oMatchingTarget.mappedIntentParamsPlusSimpleDefaults;
+        const oInbound = oMatchingTarget.inbound;
+        const oInboundResolutionResult = oInbound && oInbound.resolutionResult;
+        const oMappedIntentParamsPlusSimpleDefaults = oMatchingTarget.mappedIntentParamsPlusSimpleDefaults;
 
         // splice parameters into WDA url
-        var oWDAURI = new URI(sBaseUrl);
-        var sSapSystem = oMappedIntentParamsPlusSimpleDefaults["sap-system"] && oMappedIntentParamsPlusSimpleDefaults["sap-system"][0];
-        var sSapSystemDataSrc = oMappedIntentParamsPlusSimpleDefaults["sap-system-src"] && oMappedIntentParamsPlusSimpleDefaults["sap-system-src"][0];
+        const oWDAURI = new URI(sBaseUrl);
+        const sSapSystem = oMappedIntentParamsPlusSimpleDefaults["sap-system"] && oMappedIntentParamsPlusSimpleDefaults["sap-system"][0];
+        const sSapSystemDataSrc = oMappedIntentParamsPlusSimpleDefaults["sap-system-src"] && oMappedIntentParamsPlusSimpleDefaults["sap-system-src"][0];
 
         return Promise.all([
             oSystemAlias.spliceSapSystemIntoURI(
@@ -350,24 +358,24 @@ sap.ui.define([
                 fnExternalSystemAliasResolver
             ),
             constructWDAURLParameters(oMappedIntentParamsPlusSimpleDefaults, oMatchingTarget.mappedDefaultedParamNames)
-        ]).then(function (aResults) {
-            var oWDAURIWithSapSystem = aResults[0];
-            var sUrlParameters = aResults[1];
-            var sFinalWDAURL = appendParametersToURI(oWDAURIWithSapSystem, sUrlParameters);
+        ]).then((aResults) => {
+            const oWDAURIWithSapSystem = aResults[0];
+            const sUrlParameters = aResults[1];
+            const sFinalWDAURL = appendParametersToURI(oWDAURIWithSapSystem, sUrlParameters);
 
-            var oResolutionResult = createWDAResolutionResult(oInbound, sFinalWDAURL, sSapSystem, sSapSystemDataSrc);
+            const oResolutionResult = createWDAResolutionResult(oInbound, sFinalWDAURL, sSapSystem, sSapSystemDataSrc);
 
             return oResolutionResult;
-        }, function (sError) {
+        }, (sError) => {
             return Promise.reject(sError);
         });
     }
 
     function resolveEasyAccessMenuIntentWDA (oIntent, oMatchingTarget, fnExternalSystemAliasResolver, bEnableWdaCompatibilityMode) {
-        var sAppId = oIntent.params["sap-ui2-wd-app-id"][0];
-        var sConfId = (ObjectPath.get("params.sap-ui2-wd-conf-id", oIntent) || [])[0];
+        const sAppId = oIntent.params["sap-ui2-wd-app-id"][0];
+        const sConfId = (ObjectPath.get("params.sap-ui2-wd-conf-id", oIntent) || [])[0];
 
-        var oOtherParams = Object.keys(oIntent.params).reduce(function (oResultParams, sParamName) {
+        const oOtherParams = Object.keys(oIntent.params).reduce((oResultParams, sParamName) => {
             if (sParamName !== "sap-ui2-wd-app-id" && sParamName !== "sap-ui2-wd-conf-id") {
                 oResultParams[sParamName] = oIntent.params[sParamName];
             }
@@ -375,10 +383,10 @@ sap.ui.define([
         }, {});
 
         return buildWdaURI(sAppId, sConfId, bEnableWdaCompatibilityMode, oOtherParams /* may include sap-system and/or sap-system-src */, fnExternalSystemAliasResolver)
-            .then(function (oURI) {
-                var sSapSystemDataSrc = oIntent.params.hasOwnProperty("sap-system-src") && oIntent.params["sap-system-src"][0];
-                var sSapSystem = oIntent.params.hasOwnProperty("sap-system") && oIntent.params["sap-system"][0] || "";
-                var oResolutionResult = {
+            .then((oURI) => {
+                const sSapSystemDataSrc = oIntent.params.hasOwnProperty("sap-system-src") && oIntent.params["sap-system-src"][0];
+                const sSapSystem = oIntent.params.hasOwnProperty("sap-system") && oIntent.params["sap-system"][0] || "";
+                const oResolutionResult = {
                     url: oURI.toString(),
                     applicationType: "WDA",
                     text: sAppId,
@@ -394,18 +402,18 @@ sap.ui.define([
                 if (oMatchingTarget && oMatchingTarget.inbound && oMatchingTarget.inbound.resolutionResult && oMatchingTarget.inbound.resolutionResult["sap.platform.runtime"]) {
                     oResolutionResult["sap.platform.runtime"] = oMatchingTarget.inbound.resolutionResult["sap.platform.runtime"];
                 }
-                oResolutionResult.url = oApplicationTypeUtils.appendParametersToUrl("sap-iframe-hint=" +
-                    ((oResolutionResult.url.indexOf("/ui2/nwbc/") >= 0) ? "NWBC" : "WDA"), oResolutionResult.url);
+                oResolutionResult.url = oApplicationTypeUtils.appendParametersToUrl(`sap-iframe-hint=${
+                    (oResolutionResult.url.indexOf("/ui2/nwbc/") >= 0) ? "NWBC" : "WDA"}`, oResolutionResult.url);
 
                 return oResolutionResult;
             });
     }
 
     function generateWDAResolutionResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
-        return new Promise(function (fnResolve, fnReject) {
-            var oInbound = oMatchingTarget.inbound;
-            var oResolutionResult = oInbound && oInbound.resolutionResult;
-            var oPromise;
+        return new Promise((fnResolve, fnReject) => {
+            const oInbound = oMatchingTarget.inbound;
+            const oResolutionResult = oInbound && oInbound.resolutionResult;
+            let oPromise;
 
             if (oInbound && oResolutionResult) {
                 if (oResolutionResult["sap.wda"]) {
@@ -416,7 +424,7 @@ sap.ui.define([
             }
 
             if (oPromise) {
-                oPromise.then(function (oResult) {
+                oPromise.then((oResult) => {
                     oResult.extendedInfo = oApplicationTypeUtils.getExtendedInfo(oMatchingTarget);
                     oApplicationTypeUtils.checkOpenWithPost(oMatchingTarget, oResult);
                     oApplicationTypeUtils.addKeepAliveToURLTemplateResult(oResult);

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

@@ -188,7 +188,7 @@ sap.ui.define([
         var sModule = sAdapterName.replace(/\./g, "/");
 
         /**
-         * @deprecated As of version 1.100
+         * @deprecated since 1.100
          * @private
          */
         function getAdapterInstanceSync (AdapterModule) {
@@ -209,7 +209,7 @@ sap.ui.define([
         }
 
         /**
-         * @deprecated As of version 1.100
+         * @deprecated since 1.100
          * @private
          */
         if (!bAsync) {
@@ -264,7 +264,7 @@ sap.ui.define([
 
             /**
              * No globals anymore in 2.0...
-             * @deprecated As of version 1.120
+             * @deprecated since 1.120
              */
             ObjectPath.set("sap.ushell.Container", oContainerInstance);
 
@@ -346,7 +346,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
+         * @deprecated since 1.120
          * @alias sap.ushell.Container#createRenderer
          */
         this.createRenderer = function (sRendererName, bAsync) {
@@ -1278,7 +1278,7 @@ sap.ui.define([
          * @see sap.ushell.services.ContainerInterface
          *
          *
-         * @deprecated As of version 1.120
+         * @deprecated since 1.120
          * @since 1.120
          * @private
          * @alias sap.ushell.Container#_getServiceSync
@@ -1354,7 +1354,7 @@ sap.ui.define([
 
             if (!mServicesByName.containsKey(sKey)) {
                 /**
-                 * @deprecated As of version 1.100
+                 * @deprecated since 1.100
                  * @private
                  */
                 if (!bAsync) {
@@ -1455,11 +1455,11 @@ sap.ui.define([
                     // create and pass adapter for logon system as first parameter
                     var oServiceAdapter = createAdapter(sServiceName, oAdapter.getSystem(),
                         sParameter, true, ServiceClass.useConfiguredAdapterOnly);
-                        return oServiceAdapter.then(function (serviceAdapter) {
-                            var oServiceInstance = createService(ServiceClass, serviceAdapter);
-                            mServicesByName.put(sKey, oServiceInstance);
-                            return oServiceInstance;
-                        });
+                    return oServiceAdapter.then(function (serviceAdapter) {
+                        var oServiceInstance = createService(ServiceClass, serviceAdapter);
+                        mServicesByName.put(sKey, oServiceInstance);
+                        return oServiceInstance;
+                    });
                 }
 
                 mServicesByName.put(sKey, oService);

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

@@ -219,9 +219,7 @@ sap.ui.define([
         // When off is called, it immediately removes any subscribed listener that was already called.
         return function () {
             aSubscriberGroup.forEach(function (oListener) {
-                if (oListener.called) {
-                    unsubscribe(oHub, sEvent, oListener.fn);
-                }
+                unsubscribe(oHub, sEvent, oListener.fn);
             });
 
             // note: offs any current and future listener

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

@@ -5,12 +5,13 @@
  *
  * The Fiori20 adapter automatically re-styles old (Fiori 1) applications to match Fiori2 design requirements.
  *
- * @version 1.134.1
+ * @version 1.136.0
  */
 sap.ui.define([
     "sap/ui/base/Object",
     "sap/ui/core/Component",
     "sap/ui/core/UIComponent",
+    "sap/ui/core/ComponentHooks",
     "sap/ui/model/resource/ResourceModel",
     "sap/m/Fiori20Adapter",
     "sap/ui/thirdparty/hasher",
@@ -19,6 +20,7 @@ sap.ui.define([
     BaseObject,
     Component,
     UIComponent,
+    ComponentHooks,
     ResourceModel,
     SapMFiori20Adapter,
     hasher,
@@ -26,7 +28,7 @@ sap.ui.define([
 ) {
     "use strict";
 
-    UIComponent._fnOnInstanceDestroy = function (oComponent) {
+    ComponentHooks.onUIComponentInstanceDestroy.register(function (oComponent) {
         if (oComponent._fioriAdapter) {
             oComponent._fioriAdapter.destroy();
         }
@@ -34,7 +36,7 @@ sap.ui.define([
         if (oComponent._oShellUIService) {
             oComponent._oShellUIService.destroy();
         }
-    };
+    });
 
     /**
      * Fetches application information from app-descriptor or metadata

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

@@ -2,9 +2,9 @@
 
 /**
  * @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.
+ * This file is kept small in size on purpose as it is always required in productive code even when Fiori2 adaptation is not required.
  *
- * @version 1.134.1
+ * @version 1.136.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -14,6 +14,7 @@ sap.ui.define([
     "sap/ui/core/library",
     "sap/ui/core/service/ServiceFactoryRegistry",
     "sap/ui/core/UIComponent",
+    "sap/ui/core/ComponentHooks",
     "sap/ushell/Fiori20Adapter"
 ], function (
     Log,
@@ -23,6 +24,7 @@ sap.ui.define([
     coreLibrary,
     ServiceFactoryRegistry,
     UIComponent,
+    ComponentHooks,
     Fiori20Adapter
 ) {
     "use strict";
@@ -220,7 +222,7 @@ sap.ui.define([
         }
     };
 
-    UIComponent._fnOnInstanceInitialized = function (oComponent) {
+    ComponentHooks.onUIComponentInstanceInitialized.register(function (oComponent) {
         const oRootControl = oComponent.getAggregation("rootControl");
 
         if (!oRootControl
@@ -284,5 +286,5 @@ sap.ui.define([
             }
         };
         oRootControl.addEventDelegate(oDelegate);
-    };
+    });
 });

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

@@ -1,6 +1,6 @@
 // Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 /**
- * @deprecated As of version 1.120
+ * @deprecated since 1.120
  * @fileoverview Classical home page layout
  */
 sap.ui.define([
@@ -373,8 +373,8 @@ sap.ui.define([
             }
             var collidedGroupRect = collidedGroup.getDomRef().querySelector(".sapUshellLineModeContainer").getBoundingClientRect();
             var bCozyLayout = !document.body.classList.contains("sapUiSizeCompact");
-                // the reason for devision in 31 is related to link height - which is 34, then each link overlaps with its neighbours by 3px
-                // so the absolute height needed to calculate the intersected link is 31, with cozy layout the height is 48 (45 after reducing the overlap)
+            // the reason for devision in 31 is related to link height - which is 34, then each link overlaps with its neighbours by 3px
+            // so the absolute height needed to calculate the intersected link is 31, with cozy layout the height is 48 (45 after reducing the overlap)
             var nRow = Math.floor((moveY - collidedGroupRect.top) / (bCozyLayout ? 45 : 31));
             var aCollidedLinkAreas = this.collidedLinkAreas[collidedGroup.getId()];
             var column;

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

@@ -2,12 +2,15 @@
 /**
  * @fileOverview NWBCInterface for NWBC client
  *
- * @version 1.134.1
+ * @version 1.136.0
  */
 sap.ui.define([
     "sap/ushell/EventHub",
     "sap/ushell/Config"
-], function (EventHub, Config) {
+], function (
+    EventHub,
+    Config
+) {
     "use strict";
 
     /**
@@ -52,15 +55,9 @@ sap.ui.define([
      */
     NWBCInterface.isAnyAppKeptAlive = function () {
         return new Promise(function (fnResolve) {
-            if (Config.last("/core/navigation/enableAppLifeCycleFallback")) {
-                sap.ui.require(["sap/ushell/components/applicationIntegration/Storage"], function (Storage) {
-                    fnResolve(Storage.length() > 0);
-                });
-            } else {
-                sap.ui.require(["sap/ushell/components/applicationIntegration/KeepAliveApps"], function (KeepAliveApps) {
-                    fnResolve(KeepAliveApps.length() > 0);
-                });
-            }
+            sap.ui.require(["sap/ushell/appIntegration/KeepAliveApps"], function (KeepAliveApps) {
+                fnResolve(KeepAliveApps.length() > 0);
+            });
         });
     };