@sapui5/sap.ushell 1.113.0 → 1.115.0

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

@@ -1,7 +1,9 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 prepareModules();
 sap.ui.define([
+    "sap/ui/core/Core",
     "sap/base/Log",
+    "sap/base/util/ObjectPath",
     "sap/base/util/deepExtend",
     "sap/base/util/isEmptyObject",
     "sap/m/library",
@@ -27,9 +29,12 @@ sap.ui.define([
     "sap/ushell/ui5service/UserStatus",
     "sap/ushell/utils/UrlParsing",
     "sap/ushell/utils/WindowUtils",
-    "sap/ushell/appRuntime/ui5/AppRuntimeContext"
+    "sap/ushell/appRuntime/ui5/AppRuntimeContext",
+    "sap/ui/core/Configuration"
 ], function (
+    Core,
     Log,
+    ObjectPath,
     deepExtend,
     isEmptyObject,
     mobileLibrary,
@@ -55,7 +60,8 @@ sap.ui.define([
     UserStatus,
     oUrlParsing,
     WindowUtils,
-    AppRuntimeContext
+    AppRuntimeContext,
+    CoreConfiguration
 ) {
     "use strict";
     /* global apprtBIdiv, apprtBIstyle */
@@ -91,15 +97,30 @@ sap.ui.define([
          * @private
          */
         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%");
             AppCommunicationMgr.init(true);
+
             AppRuntimeService.sendMessageToOuterShell(
                 "sap.ushell.appRuntime.iframeIsBusy", {
                 bValue: true
             });
+
+            this.getPageConfig(oUrlData);
+            _that.setModulePaths();
+            arrPrimisesInit = _that.loadAdditionalLibs();
+
+            if (oUrlData.hasOwnProperty("sap-remote-intent")) {
+                oLocaleDataPromise = AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.UserInfo.getLocaleData", undefined, undefined, 3000, {});
+            }
+
             AppRuntimeContext.setAppLifeCycleAgent(AppLifeCycleAgent);
 
-            this.getPageConfig();
             AppLifeCycleAgent.expandSapIntentParams(_that._getURI()).then(function (oURLParameters) {
                 var sAppId, sAppIntent;
                 if (oURLParameters.hasOwnProperty("sap-remote-intent") === true) {
@@ -114,39 +135,41 @@ sap.ui.define([
                     sAppId = oURLParameters["sap-ui-app-id"];
                 }
 
-                _that.setModulePaths();
                 _that.init();
 
                 // must be included, do not remove
                 // included separately due to synchronization issues with initializing page configuration
-                var oPromise = new Promise(function (fnResolve) {
+                var oPromiseUserInfo = new Promise(function (fnResolve) {
                     sap.ui.require(["sap/ushell/appRuntime/ui5/services/UserInfo"], fnResolve);
                 });
 
-                var oPromiseServicesContainerSCube, oPromiseServicesContainerCFlp;
                 if (AppRuntimeContext.getIsScube() === true) {
-                    oPromiseServicesContainerSCube = _that.initServicesContainer();
-                    oPromiseServicesContainerCFlp = Promise.resolve();
+                    oPromiseSvcsInitSCube = _that.initServicesContainer();
                 } else {
-                    oPromiseServicesContainerSCube = Promise.resolve();
-                    oPromiseServicesContainerCFlp = _that.initServicesContainer();
+                    oPromiseSvcsInitCFlp = _that.initServicesContainer();
                 }
 
-                oPromiseServicesContainerSCube.then(function () {
+                arrPrimisesInit.push(oPromiseSvcsInitSCube);
+                Promise.all(arrPrimisesInit).then(function () {
                     if (AppRuntimeContext.getIsScube() === true) {
                         //trigger load of site async
                         sap.ushell.Container.getServiceAsync("CommonDataModel");
                     }
                     Promise.all([
-                        oPromiseServicesContainerCFlp,
+                        oPromiseSvcsInitCFlp,
                         _that.getAppInfo(sAppId, sAppIntent),
-                        oPromise
+                        oPromiseUserInfo,
+                        oLocaleDataPromise
                     ]).then(function (values) {
-                        var oAppInfo = values[1].oResolvedHashFragment;
-                        var oParsedHash = values[1].oParsedHash;
+                        var oAppInfo = values[1].oResolvedHashFragment,
+                            oParsedHash = values[1].oParsedHash,
+                            oLocaleData = values[3] || {};
+
+                        _that._setUI5LocaleAttributes(oLocaleData);
                         SessionHandlerAgent.init();
                         AccessKeysAgent.init();
                         _that._setInitialAppRoute();
+
                         _that.createApplication(sAppId, oURLParameters, oAppInfo, sAppIntent, oParsedHash)
                             .then(function (oResolutionResult) {
                                 _that.renderApplication(oResolutionResult);
@@ -160,6 +183,39 @@ sap.ui.define([
             });
         };
 
+        this._setUI5LocaleAttributes = function (oLocaleData) {
+            if (Object.keys(oLocaleData).length > 0) {
+                var oFormatSettings = CoreConfiguration.getFormatSettings();
+                if (oLocaleData.dateFormatShort) {
+                    oFormatSettings.setDatePattern("short", oLocaleData.dateFormatShort);
+                }
+                if (oLocaleData.dateFormatMedium) {
+                    oFormatSettings.setDatePattern("medium", oLocaleData.dateFormatMedium);
+                }
+                if (oLocaleData.numberFormatGroup) {
+                    oFormatSettings.setNumberSymbol("group", oLocaleData.numberFormatGroup);
+                }
+                if (oLocaleData.numberFormatDecimal) {
+                    oFormatSettings.setNumberSymbol("decimal", oLocaleData.numberFormatDecimal);
+                }
+                if (oLocaleData.timeFormatShort) {
+                    oFormatSettings.setTimePattern("short", oLocaleData.timeFormatShort);
+                }
+                if (oLocaleData.timeFormatMedium) {
+                    oFormatSettings.setTimePattern("medium", oLocaleData.timeFormatMedium);
+                }
+                if (oLocaleData.calendarMapping) {
+                    oFormatSettings.setLegacyDateCalendarCustomizing(oLocaleData.calendarMapping);
+                }
+                if (oLocaleData.timeZone) {
+                    CoreConfiguration.setTimezone(oLocaleData.timeZone);
+                }
+                if (oLocaleData.currencyFormats) {
+                    oFormatSettings.setCustomCurrencies(oLocaleData.currencyFormats);
+                }
+            }
+        };
+
         this._setInitialAppRoute = function () {
             var oHash = oUrlParsing.parseShellHash(hasher.getHash());
             if (oHash && oHash.appSpecificRoute && oHash.appSpecificRoute.length > 0) {
@@ -325,7 +381,7 @@ sap.ui.define([
         /**
          * @private
          */
-        this.getPageConfig = function () {
+        this.getPageConfig = function (oUrlData) {
             var metaData,
                 shellConfig = {};
 
@@ -343,6 +399,15 @@ sap.ui.define([
                 }
             }
             window["sap-ushell-config"] = deepExtend({}, getDefaultShellConfig(), shellConfig);
+
+            //temp code for allways loading the web assistance plugin in the
+            //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"];
+                }
+            }
         };
 
         /**
@@ -363,6 +428,20 @@ sap.ui.define([
             }
         };
 
+        /**
+         * @private
+         */
+        this.loadAdditionalLibs = function () {
+            var oLibs = ObjectPath.get("ui5.libs", window["sap-ushell-config"]) || {},
+                arrLibs = [];
+            Object.keys(oLibs).forEach(function (sLib) {
+                if (oLibs[sLib] === true) {
+                    arrLibs.push(Core.loadLibrary(sLib, { async: true }));
+                }
+            });
+            return arrLibs;
+        };
+
         /**
          * @private
          */
@@ -555,7 +634,14 @@ sap.ui.define([
                 (AppRuntimeContext.getIsScube() ? Promise.resolve("") : AppLifeCycleAgent.getApplicationParameters(oURLParameters)).then(function (sParams) {
                     oAppInfo.url += sParams;
                     _that.setHashChangedCallback();
-                    sap.ushell.Container.getServiceAsync("Ui5ComponentLoader").then(function (oUi5ComponentLoader) {
+
+                    Promise.all([
+                        sap.ushell.Container.getServiceAsync("Ui5ComponentLoader"),
+                        sap.ushell.Container.getServiceAsync("AppLifeCycle")
+                    ]).then(function (values) {
+                        var oUi5ComponentLoader = values[0];
+                        var oAppLifeCycleService = values[1];
+
                         //remove the "sap.ushell" from libs to be loaded as it is not needed (its already
                         //loaded as part of the appruntime bundle)
                         if (oAppInfo.asyncHints && Array.isArray(oAppInfo.asyncHints.libs)) {
@@ -595,29 +681,30 @@ sap.ui.define([
                                 }
                             }
                             oComponentContainer.setComponent(oResolutionResultWithComponentHandle.componentHandle.getInstance());
-                            AppLifeCycleAgent.setComponent(oComponentContainer);
+                            AppLifeCycleAgent.setCurrentApp(oComponentContainer, sAppIntent || "", oAppProperties.ui5ComponentName);
                             FesrEnhancer.setAppShortId(oResolutionResultWithComponentHandle.componentHandle);
-                            sap.ushell.Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
-                                oAppLifeCycleService.prepareCurrentAppObject(
-                                    "UI5",
-                                    oResolutionResultWithComponentHandle.componentHandle.getInstance(),
-                                    false,
-                                    undefined
-                                );
-                                var oCurrentApp = oAppLifeCycleService.getCurrentApplication();
-                                oCurrentApp.getInfo(["appFrameworkVersion", "appSupportInfo", "appId", "appVersion"]).then(function (oAppInfo) {
-                                    for (var sParameter in oAppInfo) {
-                                        if (oAppInfo[sParameter] === undefined || oAppInfo[sParameter] === "") {
-                                            delete (oAppInfo[sParameter]);
-                                        }
-                                    }
-                                    oAppInfo.appFrameworkId = "UI5";
-                                    oAppInfo.technicalAppComponentId = oAppProperties.ui5ComponentName;
-                                    if (typeof sAppTitle === "string") {
-                                        oAppInfo.appTitle = sAppTitle;
+                            oAppLifeCycleService.prepareCurrentAppObject(
+                                "UI5",
+                                oResolutionResultWithComponentHandle.componentHandle.getInstance(),
+                                false,
+                                undefined
+                            );
+                            var oCurrentApp = oAppLifeCycleService.getCurrentApplication();
+                            oCurrentApp.getInfo(["appFrameworkVersion", "appSupportInfo", "appId", "appVersion"]).then(function (oAppInfo) {
+                                for (var sParameter in oAppInfo) {
+                                    if (oAppInfo[sParameter] === undefined || oAppInfo[sParameter] === "") {
+                                        delete (oAppInfo[sParameter]);
                                     }
+                                }
+                                oAppInfo.appFrameworkId = "UI5";
+                                oAppInfo.technicalAppComponentId = oAppProperties.ui5ComponentName;
+                                if (typeof sAppTitle === "string") {
+                                    oAppInfo.appTitle = sAppTitle;
+                                }
+                                AppLifeCycleAgent.setCurrentAppAttributes(oAppInfo);
+                                setTimeout(function () {
                                     AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.AppLifeCycle.setNewAppInfo", {info: oAppInfo});
-                                });
+                                }, 500);
                             });
                             _that.considerChangingTheDefaultFullWidthVal(oResolutionResultWithComponentHandle);
                             _that.overrideUrlHelperFuncs();
@@ -701,7 +788,9 @@ sap.ui.define([
 
             sap.ushell.Container.getServiceAsync("PluginManager").then(function (PluginManagerService) {
                 registerRTAPluginAgent(PluginManagerService);
-                registerWAPluginAgent(PluginManagerService);
+                if (AppRuntimeContext.getIsScube() === false) {
+                    registerWAPluginAgent(PluginManagerService);
+                }
                 PluginManagerService.loadPlugins("RendererExtensions");
             });
         };
@@ -729,22 +818,13 @@ sap.ui.define([
          * @private
          */
         function registerWAPluginAgent (PluginManagerService) {
-            var scriptURL;
-            if (oPageUriParams.hasOwnProperty("sap-wa-debug") && oPageUriParams["sap-wa-debug"] === "dev") {
-                scriptURL = "https://education3.hana.ondemand.com/education3/web_assistant/framework/FioriAgent.js";
-            } else if (oPageUriParams.hasOwnProperty("sap-wa-debug") && oPageUriParams["sap-wa-debug"] === "prev") {
-                scriptURL = "https://webassistant-outlook.enable-now.cloud.sap/web_assistant/framework/FioriAgent.js";
-            } else { //production script
-                scriptURL = "https://webassistant.enable-now.cloud.sap/web_assistant/framework/FioriAgent.js";
-            }
-
             PluginManagerService.registerPlugins({
                 WAPluginAgent: {
                     component: "sap.ushell.appRuntime.ui5.plugins.scriptAgent",
                     url: sap.ui.require.toUrl("sap/ushell/appRuntime/ui5/plugins/scriptAgent"),
                     config: {
                         "sap-plugin-agent": true,
-                        url: scriptURL
+                        scube: false
                     }
                 }
             });

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

@@ -6,8 +6,8 @@ sap.ui.define([
     "use strict";
 
     function AppRuntimeService () {
-        this.sendMessageToOuterShell = function (sMessageId, oParams, sRequestId) {
-            return AppCommunicationMgr.sendMessageToOuterShell(sMessageId, oParams, sRequestId);
+        this.sendMessageToOuterShell = function (sMessageId, oParams, sRequestId, nTimeout, oDefaultVal) {
+            return AppCommunicationMgr.sendMessageToOuterShell(sMessageId, oParams, sRequestId, nTimeout, oDefaultVal);
         };
     }
 

package/src/main/js/sap/ushell/appRuntime/ui5/plugins/baseRta/Trigger.js

@@ -258,7 +258,7 @@ sap.ui.define([
 			) {
 				return false;
 			}
-			return this._oRTA.canUndo();
+			return this._oRTA.canSave();
 		}
 		return false;
 	};

package/src/main/js/sap/ushell/appRuntime/ui5/plugins/scriptAgent/Component.js

@@ -1,23 +1,43 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 sap.ui.define([
 	"sap/ui/core/Component",
+    "sap/ui/thirdparty/URI",
 	"sap/ui/thirdparty/jquery",
-		"sap/base/Log"
+    "sap/base/Log"
 ],
 function (
-	Component, jQuery, Log
+	Component, URI, jQuery, Log
 ) {
 	"use strict";
 
 	return Component.extend("sap.ushell.appRuntime.ui5.plugins.scriptAgent.Component", {
 		init: function () {
-			var mConfig = this.getComponentData();
+			var mConfig = this.getComponentData(),
+                oPageUriParams = new URI().search(true),
+                scriptURL;
+
+            if (!mConfig.hasOwnProperty("config")) {
+                return;
+            }
+
+            if (mConfig.config.hasOwnProperty("scube")) {
+                if (oPageUriParams.hasOwnProperty("sap-wa-debug") && oPageUriParams["sap-wa-debug"] === "dev") {
+                    scriptURL = "https://education3.hana.ondemand.com/education3/web_assistant/framework/FioriAgent.js";
+                } else if (oPageUriParams.hasOwnProperty("sap-wa-debug") && oPageUriParams["sap-wa-debug"] === "prev") {
+                    scriptURL = "https://webassistant-outlook.enable-now.cloud.sap/web_assistant/framework/FioriAgent.js";
+                } else { //production script
+                    scriptURL = "https://webassistant.enable-now.cloud.sap/web_assistant/framework/FioriAgent.js";
+                }
+            } else {
+                scriptURL = mConfig.config.url;
+            }
+
 			jQuery.ajaxSetup({
 				cache: true
 			});
 
 			try {
-				jQuery.getScript(mConfig.config.url);
+				jQuery.getScript(scriptURL);
 			} catch (ex) {
 				Log.error(ex);
 			}

package/src/main/js/sap/ushell/appRuntime/ui5/services/AppLifeCycleAgent.js

@@ -59,6 +59,7 @@ sap.ui.define([
          * @private
          */
         this.init = function (sModule, ofnCreateApplication, ofnRenderApp, bEnableCache, sAppId, oAppInfo) {
+            this.resetCurrentApp();
             sAppResolutionModule = sModule;
             fnCreateApplication = ofnCreateApplication;
             fnRenderApp = ofnRenderApp;
@@ -133,7 +134,10 @@ sap.ui.define([
             return new Promise(function (fnResolve, fnReject) {
                 var sUrl,
                     sAppId,
-                    sAppIntent;
+                    sAppIntent,
+                    oParsedShellIntent,
+                    sScubeAppIntent = "",
+                    sKeepAliveAppKey;
 
                 AppRuntimeService.sendMessageToOuterShell(
                     "sap.ushell.appRuntime.iframeIsBusy", {
@@ -145,6 +149,10 @@ sap.ui.define([
                 if (AppRuntimeContext.getIsScube()) {
                     sAppIntent = UriParameters.fromURL(sUrl).get("sap-remote-intent");
                     assert(typeof sAppIntent === "string", "AppLifeCycleAgent::create - sAppIntent must be string");
+                    if (oMsg.body.sHash.indexOf("Shell-startIntent") === 0) {
+                        oParsedShellIntent = oUrlParsing.parseShellHash(oMsg.body.sHash);
+                        sScubeAppIntent = oParsedShellIntent.params["sap-shell-so"] + "-" + oParsedShellIntent.params["sap-shell-action"];
+                    }
                 } else {
                     sAppId = UriParameters.fromURL(sUrl).get("sap-ui-app-id");
                     assert(typeof sAppId === "string", "AppLifeCycleAgent::create - sAppId must be string");
@@ -163,6 +171,18 @@ sap.ui.define([
                 }
                 Core.getEventBus().publish("launchpad", "appOpening", {});
                 that.getAppInfo(sAppId, sUrl, sAppIntent).then(function (values) {
+                    if (AppRuntimeContext.getIsScube() && sScubeAppIntent.length > 0) {
+                        sKeepAliveAppKey = Object.keys(oCachedApplications).find(function (sCachedKey) {
+                            return oCachedApplications[sCachedKey].sAppIntent === sScubeAppIntent && oCachedApplications[sCachedKey].ui5ComponentName === values.oResolvedHashFragment.ui5ComponentName;
+                        });
+                        if (sKeepAliveAppKey) {
+                            that.destroy({
+                                body: {
+                                    sCacheId: sKeepAliveAppKey
+                                }
+                            });
+                        }
+                    }
                     that.expandSapIntentParams(new URI(sUrl).query(true)).then(function (oURLParameters) {
                         fnCreateApplication(sAppId, oURLParameters, values.oResolvedHashFragment, sAppIntent, values.oParsedHash)
                             .then(function (oResolutionResult) {
@@ -172,7 +192,9 @@ sap.ui.define([
                                         bValue: false
                                     });
                                 Core.getEventBus().publish("sap.ushell", "appOpened", {});
-                                fnResolve();
+                                fnResolve({
+                                    deletedKeepAliveId: sKeepAliveAppKey
+                                });
                             });
                     });
                 });
@@ -196,7 +218,7 @@ sap.ui.define([
                 }
             }
 
-            if (oRunningApp === undefined) {
+            if (oRunningApp.oApp === undefined) {
                 AppRuntimeService.sendMessageToOuterShell("sap.ushell.appRuntime.isInvalidIframe", {bValue: true});
                 return Promise.resolve();
             }
@@ -204,16 +226,16 @@ sap.ui.define([
             var sStorageKey = oMsg.body.sCacheId;
 
             if (sStorageKey && oCachedApplications[sStorageKey]) {
-                if (oCachedApplications[sStorageKey] === oRunningApp) {
-                    oRunningApp = undefined;
+                if (oCachedApplications[sStorageKey].oApp === oRunningApp.oApp) {
+                    this.resetCurrentApp();
                 }
-                delete oRouterDisableRetriggerApplications[oCachedApplications[sStorageKey].sId];
-                appDestroy(oCachedApplications[sStorageKey]);
+                delete oRouterDisableRetriggerApplications[oCachedApplications[sStorageKey].oApp.sId];
+                appDestroy(oCachedApplications[sStorageKey].oApp);
                 delete oCachedApplications[sStorageKey];
-            } else if (oRunningApp) {
-                delete oRouterDisableRetriggerApplications[oRunningApp.sId];
-                appDestroy(oRunningApp);
-                oRunningApp = undefined;
+            } else if (oRunningApp.oApp) {
+                delete oRouterDisableRetriggerApplications[oRunningApp.oApp.sId];
+                appDestroy(oRunningApp.oApp);
+                this.resetCurrentApp();
             }
             sap.ushell.Container.cleanDirtyStateProviderArray();
             if (oShellUIService) {
@@ -230,10 +252,10 @@ sap.ui.define([
          */
         this.store = function (oMsg) {
             var sStorageKey = oMsg.body.sCacheId,
-                oCachedEntry = oRunningApp,
+                oCachedEntry = this.cloneCurrentAppEntry(oRunningApp),
                 oApp;
 
-            if (oRunningApp === undefined) {
+            if (oRunningApp.oApp === undefined) {
                 AppRuntimeService.sendMessageToOuterShell("sap.ushell.appRuntime.isInvalidIframe", {bValue: true});
                 return Promise.resolve();
             }
@@ -243,8 +265,8 @@ sap.ui.define([
                 oAppBackNavigationFunc[sStorageKey] = oShellUIService._getBackNavigationCallback();
             }
 
-            oApp = oCachedEntry.getComponentInstance();
-            oCachedEntry.setVisible(false);
+            oApp = oCachedEntry.oApp.getComponentInstance();
+            oCachedEntry.oApp.setVisible(false);
 
             // keep application's dirty state providers when stored
             if (sap.ushell.Container) {
@@ -275,15 +297,15 @@ sap.ui.define([
         this.restore = function (oMsg) {
             var sStorageKey = oMsg.body.sCacheId,
                 oCachedEntry = oCachedApplications[sStorageKey],
-                oApp = oCachedEntry.getComponentInstance(),
-                bRouterDisableRetrigger = oRouterDisableRetriggerApplications[oCachedEntry.sId];
+                oApp = oCachedEntry.oApp.getComponentInstance(),
+                bRouterDisableRetrigger = oRouterDisableRetriggerApplications[oCachedEntry.oApp.sId];
 
             hasher.disableCFLPUpdate = true;
             hasher.replaceHash(oMsg.body.sHash);
             hasher.disableCFLPUpdate = false;
 
             Core.getEventBus().publish("launchpad", "appOpening", {});
-            oCachedEntry.setVisible(true);
+            oCachedEntry.oApp.setVisible(true);
 
             // re-register application's dirty state providers when restored
             if (oAppDirtyStateProviders[sStorageKey] && sap.ushell.Container) {
@@ -309,10 +331,14 @@ sap.ui.define([
                     }
                 }
 
-                oRunningApp = oCachedEntry;
+                oRunningApp = this.cloneCurrentAppEntry(oCachedEntry);
             }
             Core.getEventBus().publish("sap.ushell", "appOpened", {});
 
+            setTimeout(function () {
+                AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.AppLifeCycle.setNewAppInfo", {info: oCachedEntry.oAppAttributes});
+            }, 500);
+
             return Promise.resolve();
         };
 
@@ -460,14 +486,45 @@ sap.ui.define([
         /**
          * @private
          */
-        this.setComponent = function (oApp) {
-            oRunningApp = oApp;
+        this.setCurrentApp = function (oApp, sAppIntent, ui5ComponentName) {
+            this.resetCurrentApp();
+            oRunningApp.oApp = oApp;
+            oRunningApp.sAppIntent = sAppIntent;
+            oRunningApp.ui5ComponentName = ui5ComponentName;
             // Initializing the disableKeepAliveRestoreRouterRetrigger flag to true
-            if (oRunningApp) {
-                oRouterDisableRetriggerApplications[oRunningApp.sId] = true;
+            if (oRunningApp.oApp) {
+                oRouterDisableRetriggerApplications[oRunningApp.oApp.sId] = true;
             }
         };
 
+        /**
+         * @private
+         */
+        this.setCurrentAppAttributes = function (oAppInfo) {
+            oRunningApp.oAppAttributes = oAppInfo;
+        };
+
+        /**
+         * @private
+         */
+        this.resetCurrentApp = function () {
+            oRunningApp = {
+                oApp: undefined,
+                sAppIntent: undefined,
+                ui5ComponentName: undefined,
+                oAppAttributes: {}
+            };
+        };
+
+        this.cloneCurrentAppEntry = function (oEntry) {
+            return {
+                oApp: oEntry.oApp,
+                sAppIntent: oEntry.sAppIntent,
+                ui5ComponentName: oEntry.ui5ComponentName,
+                oAppAttributes: oEntry.oAppAttributes
+            };
+        };
+
         /**
          * @private
          */

package/src/main/js/sap/ushell/appRuntime/ui5/services/CrossApplicationNavigation.js

@@ -138,8 +138,19 @@ sap.ui.define([
             );
         };
 
-        this.isNavigationSupported = function (aIntents, oComponent) {
-            //ready also for scube
+        this.isNavigationSupported = function (aIntents, oComponent, bCheckInOuterShellOnly) {
+            var fnCheckInShell = function (aIntentsTmp) {
+                return AppRuntimeService.sendMessageToOuterShell(
+                    "sap.ushell.services.CrossApplicationNavigation.isNavigationSupported", {
+                        aIntents: aIntentsTmp
+                    }
+                );
+            };
+
+            if (bCheckInOuterShellOnly === true) {
+                return fnCheckInShell(aIntents);
+            }
+
             if (AppRuntimeContext.getIsScube()) {
                 var oDeferred = new jQuery.Deferred(),
                     aFilteredIntents;
@@ -161,11 +172,7 @@ sap.ui.define([
                 return oDeferred.promise();
             }
 
-            return AppRuntimeService.sendMessageToOuterShell(
-                "sap.ushell.services.CrossApplicationNavigation.isNavigationSupported", {
-                    aIntents: aIntents
-                }
-            );
+            return fnCheckInShell(aIntents);
         };
 
         this.toExternal = function (oArgs, oComponent) {