@sapui5/sap.ushell 1.120.8 → 1.121.0

package/src/main/js/sap/ushell/appRuntime/ui5/AppRuntime.js

@@ -4,7 +4,6 @@ prepareModules();
 sap.ui.define([
     "sap/base/i18n/Formatting",
     "sap/base/i18n/Localization",
-    "sap/ui/core/Core",
     "sap/base/Log",
     "sap/base/util/ObjectPath",
     "sap/base/util/deepExtend",
@@ -12,6 +11,7 @@ sap.ui.define([
     "sap/m/library",
     "sap/ui/core/BusyIndicator",
     "sap/ui/core/ComponentContainer",
+    "sap/ui/core/Lib",
     "sap/ui/core/Popup",
     "sap/ui/core/routing/History",
     "sap/ui/thirdparty/hasher",
@@ -32,13 +32,11 @@ sap.ui.define([
     "sap/ushell/utils/UrlParsing",
     "sap/ushell/utils/WindowUtils",
     "sap/ushell/appRuntime/ui5/AppRuntimeContext",
-    "sap/ui/core/Configuration",
     "sap/ushell/renderer/utils",
     "sap/ushell/appRuntime/ui5/renderers/fiori2/Renderer"
 ], function (
     Formatting,
     Localization,
-    Core,
     Log,
     ObjectPath,
     deepExtend,
@@ -46,6 +44,7 @@ sap.ui.define([
     mobileLibrary,
     BusyIndicator,
     ComponentContainer,
+    Library,
     Popup,
     History,
     hasher,
@@ -66,7 +65,6 @@ sap.ui.define([
     oUrlParsing,
     WindowUtils,
     AppRuntimeContext,
-    CoreConfiguration,
     RendererUtils,
     Renderer
 ) {
@@ -82,6 +80,7 @@ sap.ui.define([
     FesrEnhancer.init();
 
     var _that,
+        Container,
         oPageUriParams = new URI().search(true),
         bURLHelperReplaced = false,
         fnOrigURLHelperRedirect,
@@ -89,7 +88,7 @@ sap.ui.define([
         bHashChangeRegistered = false,
         bPopupCallbackRegistered = false,
         vGetFullWidthParamFromManifest = false,
-        oShellNavigationService;
+        oShellNavigationInternal;
 
     /**
      * Application runtime for UI5 applications running in iframe
@@ -104,8 +103,6 @@ sap.ui.define([
         this.main = function () {
             var arrPrimisesInit,
                 oLocaleDataPromise = Promise.resolve(),
-                oPromiseSvcsInitCFlp = Promise.resolve(),
-                oPromiseSvcsInitSCube = Promise.resolve(),
                 oUrlData = _that._getURI();
 
             jQuery("body").css("height", "100%").css("width", "100%");
@@ -116,7 +113,7 @@ sap.ui.define([
             arrPrimisesInit = _that.loadAdditionalLibs();
 
             if (oUrlData.hasOwnProperty("sap-remote-intent")) {
-                oLocaleDataPromise = AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.UserInfo.getLocaleData", undefined, undefined, 3000, {});
+                oLocaleDataPromise = AppRuntimeService.postMessageToFLP("sap.ushell.services.UserInfo.getLocaleData", undefined, undefined, 3000, {});
             }
 
             AppRuntimeContext.setAppLifeCycleAgent(AppLifeCycleAgent);
@@ -143,27 +140,21 @@ sap.ui.define([
                     sap.ui.require(["sap/ushell/appRuntime/ui5/services/UserInfo"], fnResolve);
                 });
 
-                if (AppRuntimeContext.getIsScube() === true) {
-                    oPromiseSvcsInitSCube = _that.initServicesContainer();
-                } else {
-                    oPromiseSvcsInitCFlp = _that.initServicesContainer();
-                }
-
-                arrPrimisesInit.push(oPromiseSvcsInitSCube);
+                arrPrimisesInit.push(_that.initServicesContainer());
                 Promise.all(arrPrimisesInit).then(function () {
+                    _that.initPostMessages();
                     if (AppRuntimeContext.getIsScube() === true) {
                         //trigger load of site async
-                        sap.ushell.Container.getServiceAsync("CommonDataModel");
+                        Container.getServiceAsync("CommonDataModel");
                     }
                     Promise.all([
-                        oPromiseSvcsInitCFlp,
                         _that.getAppInfo(sAppId, sAppIntent),
                         oPromiseUserInfo,
                         oLocaleDataPromise
                     ]).then(function (values) {
-                        var oAppInfo = values[1].oResolvedHashFragment,
-                            oParsedHash = values[1].oParsedHash,
-                            oLocaleData = values[3] || {};
+                        var oAppInfo = values[0].oResolvedHashFragment,
+                            oParsedHash = values[0].oParsedHash,
+                            oLocaleData = values[2] || {};
 
                         _that._setUI5LocaleAttributes(oLocaleData);
                         SessionHandlerAgent.init();
@@ -217,10 +208,10 @@ sap.ui.define([
         this._setInitialAppRoute = function () {
             var oHash = oUrlParsing.parseShellHash(hasher.getHash());
             if (oHash && oHash.appSpecificRoute && oHash.appSpecificRoute.length > 0) {
-                AppRuntimeService.sendMessageToOuterShell(
+                AppRuntimeService.postMessageToFLP(
                     "sap.ushell.services.CrossApplicationNavigation.setInnerAppRoute", {
-                    appSpecificRoute: oHash.appSpecificRoute
-                });
+                        appSpecificRoute: oHash.appSpecificRoute
+                    });
             }
         };
 
@@ -236,15 +227,21 @@ sap.ui.define([
          */
         this.init = function () {
             Iconfonts.registerFiori2IconFont();
+
             //Handle fullwidth/letterbox configuration
             vGetFullWidthParamFromManifest = this._getURIParams()["sap-manifest-width"];
             AppConfiguration.setFullWidthFromManifest(vGetFullWidthParamFromManifest);
+        };
 
+        /**
+         * @private
+         */
+        this.initPostMessages = function () {
             AppCommunicationMgr.registerCommHandlers({
                 "sap.ushell.appRuntime": {
                     oServiceCalls: {
                         hashChange: {
-                            executeServiceCallFn: function (oServiceParams) {
+                            executeServiceCallFn: async function (oServiceParams) {
                                 var sHash = oServiceParams.oMessageData.body.sHash;
                                 if (typeof sHash === "string") {
                                     var oNewHash = oUrlParsing.parseShellHash(sHash),
@@ -253,55 +250,50 @@ sap.ui.define([
                                         hasher.replaceHash(sHash);
                                     }
                                 }
-                                return new jQuery.Deferred().resolve().promise();
                             }
                         },
                         setDirtyFlag: {
-                            executeServiceCallFn: function (oServiceParams) {
+                            executeServiceCallFn: async function (oServiceParams) {
                                 var bIsDirty = oServiceParams.oMessageData.body.bIsDirty;
-                                if (bIsDirty !== sap.ushell.Container.getDirtyFlag()) {
-                                    sap.ushell.Container.setDirtyFlag(bIsDirty);
+                                if (bIsDirty !== Container.getDirtyFlag()) {
+                                    Container.setDirtyFlag(bIsDirty);
                                 }
-                                return new jQuery.Deferred().resolve().promise();
                             }
                         },
                         getDirtyFlag: {
-                            executeServiceCallFn: function (oServiceParams) {
-                                return new jQuery.Deferred().resolve(sap.ushell.Container.getDirtyFlag()).promise();
+                            executeServiceCallFn: async function (oServiceParams) {
+                                return Container.getDirtyFlag();
                             }
                         },
                         themeChange: {
-                            executeServiceCallFn: function (oServiceParams) {
+                            executeServiceCallFn: async function (oServiceParams) {
                                 var currentThemeId = oServiceParams.oMessageData.body.currentThemeId;
-                                sap.ushell.Container.getUser().setTheme(currentThemeId);
-                                return new jQuery.Deferred().resolve().promise();
+                                Container.getUser().setTheme(currentThemeId);
                             }
                         },
                         buttonClick: {
-                            executeServiceCallFn: function (oServiceParams) {
+                            executeServiceCallFn: async function (oServiceParams) {
                                 Renderer.handleHeaderButtonClick(
                                     oServiceParams.oMessageData.body.buttonId
                                 );
-                                return new jQuery.Deferred().resolve().promise();
                             }
                         },
                         executeLogoutFunctions: {
-                            executeServiceCallFn: function (oServiceParams) {
-                                return sap.ushell.Container.executeAsyncAndSyncLogoutFunctions();
+                            executeServiceCallFn: async function (oServiceParams) {
+                                await Container.executeAsyncAndSyncLogoutFunctions();
                             }
                         },
                         uiDensityChange: {
-                            executeServiceCallFn: function (oServiceParams) {
+                            executeServiceCallFn: async function (oServiceParams) {
                                 var isTouch = oServiceParams.oMessageData.body.isTouch;
                                 jQuery("body")
                                     .toggleClass("sapUiSizeCompact", (isTouch === "0"))
                                     .toggleClass("sapUiSizeCozy", (isTouch === "1"));
-                                return new jQuery.Deferred().resolve().promise();
                             }
                         },
                         handleDirtyStateProvider: {
-                            executeServiceCallFn: function (oServiceParams) {
-                                return new jQuery.Deferred().resolve(sap.ushell.Container.handleDirtyStateProvider(oServiceParams.oMessageData.body.oNavigationContext)).promise();
+                            executeServiceCallFn: async function (oServiceParams) {
+                                return Container.handleDirtyStateProvider(oServiceParams.oMessageData.body.oNavigationContext);
                             }
                         }
                     }
@@ -309,10 +301,9 @@ sap.ui.define([
                 "sap.ushell.services.MessageBroker": {
                     oServiceCalls: {
                         _execute: {
-                            executeServiceCallFn: function (oServiceParams) {
-                                return sap.ushell.Container.getServiceAsync("MessageBroker").then(function (oMessageBrokerService) {
-                                    return oMessageBrokerService.handleMessage(oServiceParams.oMessageData.body);
-                                });
+                            executeServiceCallFn: async function (oServiceParams) {
+                                const oMessageBrokerService = await Container.getServiceAsync("MessageBroker");
+                                await oMessageBrokerService.handleMessage(oServiceParams.oMessageData.body);
                             }
                         }
                     }
@@ -352,8 +343,8 @@ sap.ui.define([
                             var oTargetHashParts = oTargetUrlParts[1] && oTargetUrlParts[1].split("&/"),
                                 oCurrHashParts = oCurrUrlParts[1] && oCurrUrlParts[1].split("&/");
                             if (typeof oTargetHashParts[0] === "string" && typeof oCurrHashParts[0] === "string" && oTargetHashParts[0] !== oCurrHashParts[0]) {
-                                sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oNavService) {
-                                    oNavService.toExternal({
+                                Container.getServiceAsync("Navigation").then(function (oNavService) {
+                                    oNavService.navigate({
                                         target: {
                                             shellHash: oTargetUrlParts[1]
                                         }
@@ -383,9 +374,9 @@ sap.ui.define([
                         intent: "#" + sTargetUrlSplit[1]
                     }]);
                     return sFLPUrl + aResult[0].intent;
-                } else {
-                    return sFLPUrl + "#" + sTargetUrlSplit[1];
                 }
+                return sFLPUrl + "#" + sTargetUrlSplit[1];
+
             }
             return sTargetUrl;
         };
@@ -400,8 +391,8 @@ sap.ui.define([
             //scube scenario. will be removed in the next release of s4 hana cloud
             if (oUrlData.hasOwnProperty("sap-remote-intent")) {
                 var oPlugins = window["sap-ushell-config"].bootstrapPlugins;
-                if (oPlugins && oPlugins.hasOwnProperty("WAPluginAgent") && oPlugins["WAPluginAgent"].hasOwnProperty("config")) {
-                    delete oPlugins["WAPluginAgent"].config["sap-plugin-agent"];
+                if (oPlugins && oPlugins.hasOwnProperty("WAPluginAgent") && oPlugins.WAPluginAgent.hasOwnProperty("config")) {
+                    delete oPlugins.WAPluginAgent.config["sap-plugin-agent"];
                 }
             }
         };
@@ -432,7 +423,7 @@ sap.ui.define([
                 arrLibs = [];
             Object.keys(oLibs).forEach(function (sLib) {
                 if (oLibs[sLib] === true) {
-                    arrLibs.push(Core.loadLibrary(sLib, { async: true }));
+                    arrLibs.push(Library.load(sLib));
                 }
             });
             return arrLibs;
@@ -450,12 +441,13 @@ sap.ui.define([
          */
         this.initServicesContainer = function () {
             return new Promise(function (fnResolve) {
-                sap.ui.require(["sap/ushell/appRuntime/ui5/services/Container"], function (oContainer) {
-                    oContainer.bootstrap("apprt", { apprt: "sap.ushell.appRuntime.ui5.services.adapters" }).then(function () {
+                sap.ui.require(["sap/ushell/appRuntime/ui5/services/Container"], function (oContainerProxy) {
+                    Container = oContainerProxy;
+                    Container.init("apprt", { apprt: "sap.ushell.appRuntime.ui5.services.adapters" }).then(function () {
                         //This section refers for the usecase where clicking on an Iframe link in order to open another Iframe
                         //application in a new tab. If the destination URL equals to the IFrame URL, it means that the destination
                         // Iframe URL is wrong and should be replaced with the FLP URL.
-                        sap.ushell.Container.getFLPUrlAsync().then(function (sFLPURL) {
+                        Container.getFLPUrlAsync().then(function (sFLPURL) {
                             jQuery(document).on("click.appruntime", _that.handleLinkElementOpen.bind(_that, sFLPURL));
                             jQuery(document).on("keydown.appruntime", function (event) {
                                 if (event.code === "Enter") {
@@ -464,10 +456,10 @@ sap.ui.define([
                             });
                         });
 
-                        sap.ushell.Container.getServiceAsync("ShellNavigation").then(function (oService) {
-                            oShellNavigationService = oService;
-                            oShellNavigationService.init(function () { });
-                            AppLifeCycleAgent.setShellNavigationService(oShellNavigationService);
+                        Container.getServiceAsync("ShellNavigationInternal").then(function (oService) {
+                            oShellNavigationInternal = oService;
+                            oShellNavigationInternal.init(function () { });
+                            AppLifeCycleAgent.setShellNavigationService(oShellNavigationInternal);
                             _that._enableHistoryEntryReplacedDetection();
                             fnResolve();
                         });
@@ -547,8 +539,8 @@ sap.ui.define([
                         var oTargetHashParts = newHash.split("&/"),
                             oCurrHashParts = oldHash.split("&/");
                         if (oTargetHashParts[0] !== oCurrHashParts[0]) {
-                            sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oNavService) {
-                                oNavService.toExternal({
+                            Container.getServiceAsync("Navigation").then(function (oNavService) {
+                                oNavService.navigate({
                                     target: {
                                         shellHash: newHash
                                     }
@@ -557,7 +549,7 @@ sap.ui.define([
                             return;
                         }
                     }
-                    AppRuntimeService.sendMessageToOuterShell(
+                    AppRuntimeService.postMessageToFLP(
                         "sap.ushell.appRuntime.hashChange", {
                             newHash: newHash,
                             direction: History.getInstance().getDirection()
@@ -579,8 +571,8 @@ sap.ui.define([
                 if (oURLParameters.hasOwnProperty("sap-history-dir")) {
                     sDirection = oURLParameters["sap-history-dir"];
 
-                    oShellNavigationService.hashChanger.fireEvent("hashReplaced", {
-                        hash: oShellNavigationService.hashChanger.getHash(),
+                    oShellNavigationInternal.hashChanger.fireEvent("hashReplaced", {
+                        hash: oShellNavigationInternal.hashChanger.getHash(),
                         direction: sDirection
                     });
 
@@ -618,10 +610,10 @@ sap.ui.define([
                     RendererUtils.init();
                     if (Popup.attachBlockLayerStateChange) {
                         Popup.attachBlockLayerStateChange(function (oEvent) {
-                            AppRuntimeService.sendMessageToOuterShell(
+                            AppRuntimeService.postMessageToFLP(
                                 "sap.ushell.services.ShellUIService.showShellUIBlocker", {
-                                bShow: oEvent.getParameters().visible
-                            });
+                                    bShow: oEvent.getParameters().visible
+                                });
                         });
                     }
                     bPopupCallbackRegistered = true;
@@ -632,8 +624,8 @@ sap.ui.define([
                     _that.setHashChangedCallback();
 
                     Promise.all([
-                        sap.ushell.Container.getServiceAsync("Ui5ComponentLoader"),
-                        sap.ushell.Container.getServiceAsync("AppLifeCycle")
+                        Container.getServiceAsync("Ui5ComponentLoader"),
+                        Container.getServiceAsync("AppLifeCycle")
                     ]).then(function (values) {
                         var oUi5ComponentLoader = values[0];
                         var oAppLifeCycleService = values[1];
@@ -670,7 +662,7 @@ sap.ui.define([
                                         sAppTitle = oResolutionResultWithComponentHandle.componentHandle.getMetadata().getManifestEntry("/sap.app/title");
                                         if (typeof sAppTitle === "string") {
                                             setTimeout(function () {
-                                                AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.ShellUIService.setTitle", {sTitle: sAppTitle});
+                                                AppRuntimeService.postMessageToFLP("sap.ushell.services.ShellUIService.setTitle", {sTitle: sAppTitle});
                                             }, 2000);
                                         }
                                     }
@@ -732,7 +724,7 @@ sap.ui.define([
                 }
                 AppLifeCycleAgent.setCurrentAppAttributes(oAppInfo);
                 setTimeout(function () {
-                    AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.AppLifeCycle.updateCurrentAppInfo", {info: oAppInfo});
+                    AppRuntimeService.postMessageToFLP("sap.ushell.services.AppLifeCycle.updateCurrentAppInfo", {info: oAppInfo});
                 }, 500);
             });
         };
@@ -751,8 +743,8 @@ sap.ui.define([
             var oComp = oResolutionResultWithComponentHandle.componentHandle.getInstance();
             var metadata = oComp.getMetadata();
             if (metadata) {
-               var vFullwidthUi = oComp.getMetadata().getManifestEntry("/sap.ui/fullWidth");
-               var vFullwidthUi5Config = oComp.getMetadata().getManifestEntry("/sap.ui5/config/fullWidth");
+                var vFullwidthUi = oComp.getMetadata().getManifestEntry("/sap.ui/fullWidth");
+                var vFullwidthUi5Config = oComp.getMetadata().getManifestEntry("/sap.ui5/config/fullWidth");
                 if (vFullwidthUi === true || vFullwidthUi === "true" || vFullwidthUi5Config === true || vFullwidthUi5Config === "true") {
                     EventHub.emit("appWidthChange", true);
                 } else if (vFullwidthUi === false || vFullwidthUi === "false" || vFullwidthUi5Config === false || vFullwidthUi5Config === "false") {
@@ -772,7 +764,7 @@ sap.ui.define([
 
             if (URLHelper) {
                 URLHelper.triggerEmail = function (sTo, sSubject, sBody, sCc, sBcc) {
-                    AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.ShellUIService.sendEmail", {
+                    AppRuntimeService.postMessageToFLP("sap.ushell.services.ShellUIService.sendEmail", {
                         sTo: sTo,
                         sSubject: sSubject,
                         sBody: sBody,
@@ -786,7 +778,7 @@ sap.ui.define([
                 fnOrigURLHelperRedirect = URLHelper.redirect;
                 URLHelper.redirect = function (sURL, bNewWindow) {
                     if (sURL && bNewWindow === true && sURL.indexOf("#") >= 0) {
-                        sap.ushell.Container.getFLPUrlAsync().then(function (sFLPURL) {
+                        Container.getFLPUrlAsync().then(function (sFLPURL) {
                             _that.rebuildNewAppUrl(sURL, sFLPURL).then((sNewURL) => {
                                 fnOrigURLHelperRedirect.call(URLHelper, sNewURL, bNewWindow);
                             });
@@ -807,7 +799,7 @@ sap.ui.define([
             }
             bPluginsLoaded = true;
 
-            sap.ushell.Container.getServiceAsync("PluginManager").then(function (PluginManagerService) {
+            Container.getServiceAsync("PluginManager").then(function (PluginManagerService) {
                 registerRTAPluginAgent(PluginManagerService);
                 if (AppRuntimeContext.getIsScube() === false) {
                     registerWAPluginAgent(PluginManagerService);
@@ -882,6 +874,12 @@ sap.ui.define([
                         module: "sap.ushell.appRuntime.ui5.services.adapters.EmptyAdapter"
                     }
                 },
+                Navigation: {
+                    module: "sap.ushell.appRuntime.ui5.services.Navigation",
+                    adapter: {
+                        module: "sap.ushell.appRuntime.ui5.services.adapters.EmptyAdapter"
+                    }
+                },
                 NavTargetResolution: {
                     module: "sap.ushell.appRuntime.ui5.services.NavTargetResolution",
                     adapter: {
@@ -894,6 +892,12 @@ sap.ui.define([
                         module: "sap.ushell.appRuntime.ui5.services.adapters.EmptyAdapter"
                     }
                 },
+                ShellNavigationInternal: {
+                    module: "sap.ushell.appRuntime.ui5.services.ShellNavigationInternal",
+                    adapter: {
+                        module: "sap.ushell.appRuntime.ui5.services.adapters.EmptyAdapter"
+                    }
+                },
                 ClientSideTargetResolution: {
                     adapter: {
                         module: "sap.ushell.appRuntime.ui5.services.adapters.EmptyAdapter"
@@ -910,7 +914,7 @@ sap.ui.define([
                 },
                 // Until AppRuntime switches to consumption of BookmarkV2, proxy its API to the Bookmark service
                 BookmarkV2: {
-                    module: "sap.ushell.appRuntime.ui5.services.Bookmark",
+                    module: "sap.ushell.appRuntime.ui5.services.BookmarkV2",
                     adapter: {
                         module: "sap.ushell.appRuntime.ui5.services.adapters.EmptyAdapter"
                     }

package/src/main/js/sap/ushell/appRuntime/ui5/AppRuntimeContext.js

@@ -2,8 +2,9 @@
 sap.ui.define([
     "sap/base/assert",
     "sap/ushell/utils/UrlParsing",
-    "sap/base/util/deepClone"
-], function (assert, UrlParsing, deepClone) {
+    "sap/base/util/deepClone",
+    "sap/ushell/appRuntime/ui5/services/Container"
+], function (assert, UrlParsing, deepClone, Container) {
     "use strict";
 
     function AppRuntimeContext () {
@@ -55,7 +56,7 @@ sap.ui.define([
                     };
                 });
 
-                sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oNavService) {
+                Container.getServiceAsync("Navigation").then(function (oNavService) {
                     oNavService.isNavigationSupported(aIntents, undefined, true).then(function (aIntentsSupported) {
                         for (var i = 0; i < aIntentsSupported.length; i++) {
                             if (!aIntentsSupported[i].supported) {

package/src/main/js/sap/ushell/appRuntime/ui5/AppRuntimeService.js

@@ -6,9 +6,17 @@ sap.ui.define([
     "use strict";
 
     function AppRuntimeService () {
+        //returns Deffered.promise and will be deleted in 2.0
         this.sendMessageToOuterShell = function (sMessageId, oParams, sRequestId, nTimeout, oDefaultVal) {
             return AppCommunicationMgr.sendMessageToOuterShell(sMessageId, oParams, sRequestId, nTimeout, oDefaultVal);
         };
+
+        //for 2.0 - returns native Promise
+        this.postMessageToFLP = function (sMessageId, oParams, sRequestId, nTimeout, oDefaultVal) {
+            return new Promise((fnResolve, fnReject) => {
+                AppCommunicationMgr.sendMessageToOuterShell(sMessageId, oParams, sRequestId, nTimeout, oDefaultVal).then(fnResolve, fnReject).catch(fnReject);
+            });
+        };
     }
 
     return new AppRuntimeService();

package/src/main/js/sap/ushell/appRuntime/ui5/SessionHandlerAgent.js

@@ -1,19 +1,17 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 sap.ui.define([
+    "sap/ushell/appRuntime/ui5/services/Container",
     "sap/ushell/appRuntime/ui5/AppCommunicationMgr",
     "sap/ushell/appRuntime/ui5/AppRuntimeService",
     "sap/ui/thirdparty/URI",
-    "sap/base/Log",
-    "sap/ui/thirdparty/jquery"
-], function (AppCommunicationMgr, AppRuntimeService, URI, Log, jQuery) {
+    "sap/base/Log"
+], function (Container, AppCommunicationMgr, AppRuntimeService, URI, Log) {
     "use strict";
 
+    var _that;
     function SessionHandlerAgent () {
 
         this.init = function () {
-
-            var that = this;
-
             //register for logout event from the shell
             AppCommunicationMgr.registerCommHandlers({
                 "sap.ushell.sessionHandler": {
@@ -30,12 +28,12 @@ sap.ui.define([
                         },
                         logout: {
                             executeServiceCallFn: function (oMessageData) {
-                                return that.handleLogoutEvent(oMessageData);
+                                return _that.handleLogoutEvent(oMessageData);
                             }
                         },
                         extendSessionEvent: {
                             executeServiceCallFn: function (oMessageData) {
-                                return that.handleExtendSessionEvent(oMessageData);
+                                return _that.handleExtendSessionEvent(oMessageData);
                             }
                         }
                     }
@@ -47,19 +45,16 @@ sap.ui.define([
         };
 
         this.handleLogoutEvent = function () {
-            var oDeferred = new jQuery.Deferred(),
-                that = this;
-
-            this.detachUserEvents();
-            sap.ushell.Container.getFLPUrl(true).then(function (sFlpURL) {
-                if (that.isSameDomain(sFlpURL, document.URL) === false) {
-                    sap.ushell.Container.logout().then(oDeferred.resolve, oDeferred.resolve);
-                } else {
-                    oDeferred.resolve();
-                }
+            return new Promise((fnResolve, fnReject) => {
+                _that.detachUserEvents();
+                Container.getFLPUrlAsync(true).then(function (sFlpURL) {
+                    if (_that.isSameDomain(sFlpURL, document.URL) === false) {
+                        Container.logout().then(fnResolve, fnReject);
+                    } else {
+                        fnResolve();
+                    }
+                });
             });
-
-            return oDeferred.promise();
         };
 
         this.isSameDomain = function (sURL1, sURL2) {
@@ -67,6 +62,10 @@ sap.ui.define([
                 oUri2,
                 bSame = false;
 
+            if (sURL1 === undefined || sURL2 === undefined) {
+                return false;
+            }
+
             try {
                 oUri1 = new URI(sURL1);
                 oUri2 = new URI(sURL2);
@@ -86,39 +85,38 @@ sap.ui.define([
 
         this.handleExtendSessionEvent = function () {
             //send extend session  to the app
-            sap.ushell.Container.sessionKeepAlive();
-            return new jQuery.Deferred().resolve().promise();
+            Container.sessionKeepAlive();
+            return Promise.resolve();
         };
 
         this.attachUserEvents = function () {
-            jQuery(document).on("mousedown.sessionTimeout mousemove.sessionTimeout", this.userActivityHandler.bind(this));
-            jQuery(document).on("keyup.sessionTimeout", this.userActivityHandler.bind(this));
-            jQuery(document).on("touchstart.sessionTimeout", this.userActivityHandler.bind(this));
+            document.addEventListener("mousedown", this.userActivityHandler);
+            document.addEventListener("mousemove", this.userActivityHandler);
+            document.addEventListener("keyup", this.userActivityHandler);
+            document.addEventListener("touchstart", this.userActivityHandler);
         };
 
         this.detachUserEvents = function () {
-            jQuery(document).off("mousedown.sessionTimeout mousemove.sessionTimeout");
-            jQuery(document).off("keydown.sessionTimeout");
-            jQuery(document).off("touchstart.sessionTimeout");
+            document.removeEventListener("mousedown", this.userActivityHandler);
+            document.removeEventListener("mousemove", this.userActivityHandler);
+            document.removeEventListener("keyup", this.userActivityHandler);
+            document.removeEventListener("touchstart", this.userActivityHandler);
         };
 
         this.userActivityHandler = function (oEventData) {
-            if (this.oUserActivityTimer !== undefined) {
+            if (_that.oUserActivityTimer !== undefined) {
                 return;
             }
 
-            var that = this;
-            this.oUserActivityTimer = setTimeout(function () {
-
+            _that.oUserActivityTimer = setTimeout(function () {
                 //send notify extend session to the Shell
-                AppRuntimeService.sendMessageToOuterShell("sap.ushell.sessionHandler.notifyUserActive", {});
-
-                that.oUserActivityTimer = undefined;
-
-            }, 1000);
+                AppRuntimeService.postMessageToFLP("sap.ushell.sessionHandler.notifyUserActive", {});
+                _that.oUserActivityTimer = undefined;
+            }, 10000);
         };
     }
 
     var sessionHandlerAgent = new SessionHandlerAgent();
+    _that = sessionHandlerAgent;
     return sessionHandlerAgent;
 });

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

@@ -79,8 +79,8 @@ sap.ui.define([
          * @private
          */
         setAppShortId: function (componentHandle) {
-            function getValueFromManifest (oMetaData, sPath) {
-                var vValue = oMetaData.getManifestEntry(sPath) || [];
+            function getValueFromManifest (oComponentHandle, sPath) {
+                var vValue = oComponentHandle.getManifestEntry(sPath) || [];
                 if (!oTypeUtils.isArray(vValue)) {
                     vValue = [vValue];
                 }
@@ -90,9 +90,8 @@ sap.ui.define([
             if (FESR.getActive()) {
                 try {
                     if (componentHandle) {
-                        var oComponentData = componentHandle.getInstance().getComponentData().technicalParameters || {},
-                            oMetaData = componentHandle.getMetadata();
-                        this._currentAppShortId = oComponentData["sap-fiori-id"] || getValueFromManifest(oMetaData, "/sap.fiori/registrationIds");
+                        var oComponentData = componentHandle.getInstance().getComponentData().technicalParameters || {};
+                        this._currentAppShortId = oComponentData["sap-fiori-id"] || getValueFromManifest(componentHandle, "/sap.fiori/registrationIds");
                     } else {
                         this._currentAppShortId = undefined;
                     }