@sapui5/sap.ushell 1.115.1 → 1.117.0

package/src/main/js/sap/ushell/adapters/local/SupportTicketAdapter.js

@@ -3,11 +3,10 @@
 /**
  * @fileOverview The SupportTicket adapter for the local platform.
  *
- * @version 1.115.1
+ * @version 1.117.0
  */
 sap.ui.define([
-    "sap/ui/thirdparty/jquery"
-], function (jQuery) {
+], function () {
     "use strict";
 
     var SupportTicketAdapter = function (oSystem, sParameter, oAdapterConfiguration) {

package/src/main/js/sap/ushell/adapters/local/Ui5ComponentLoaderAdapter.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's Ui5ComponentLoaderAdapter for the local platform
  *
- * @version 1.115.1
+ * @version 1.117.0
  */
 sap.ui.define([
 ], function () {

package/src/main/js/sap/ushell/adapters/local/UserDefaultParameterPersistenceAdapter.js

@@ -6,7 +6,7 @@
  *               TODO will be replaced by true persistence within this SP!
  *               This adapter delegates to the Personalization Adapter
  *
- * @version 1.115.1
+ * @version 1.117.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",

package/src/main/js/sap/ushell/adapters/local/UserInfoAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The UserInfo adapter for the demo platform.
- * @version 1.115.1
+ * @version 1.117.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",
@@ -34,7 +34,17 @@ sap.ui.define([
          */
         function generateThemeConfiguration (oAdapterThemesConfiguration) {
             var defaultConfig = [
-                { id: "sap_belize", name: "SAP Belize" }
+                { id: "sap_horizon", name: "SAP Morning Horizon" },
+                { id: "sap_horizon_dark", name: "SAP Evening Horizon" },
+                { id: "sap_horizon_hcb", name: "SAP HCB (SAP Horizon)" },
+                { id: "sap_horizon_hcw", name: "SAP HCW (SAP Horizon)" },
+                { id: "sap_fiori_3", name: "SAP Quartz Light" },
+                { id: "sap_fiori_3_dark", name: "SAP Quartz Dark" },
+                { id: "sap_belize_plus", name: "SAP Belize Plus" },
+                { id: "sap_belize", name: "SAP Belize" },
+                { id: "theme1_id", name: "Custom Theme" },
+                { id: "sap_fiori_3_hcb", name: "SAP Quartz HCB" },
+                { id: "sap_fiori_3_hcw", name: "SAP Quartz HCW" }
             ];
             var externalConfig = ObjectPath.get("config.themes", oAdapterThemesConfiguration);
 

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

@@ -1,16 +1,17 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
-    "sap/ushell/appRuntime/ui5/AppRuntimePostMessage",
+    "sap/base/util/deepExtend",
     "sap/ui/thirdparty/jquery",
     "sap/base/util/ObjectPath",
-    "sap/base/Log"
-], function (AppRuntimePostMessageAPI, jQuery, ObjectPath, Log) {
+    "sap/base/Log",
+    "sap/ushell/components/applicationIntegration/application/PostMessageAPIInterface"
+], function (deepExtend, jQuery, ObjectPath, Log, PostMessageAPIInterface) {
     "use strict";
 
     var CURR_OBJ_ID = "sap.ushell.appRuntime.ui5.AppCommunicationMgr";
 
-    var oShellCommunicationHandlersObj,
+    var oPostMessageAPIs = {},
         arrPostResultPromises = [],
         iPostIDCount = 0;
 
@@ -18,7 +19,6 @@ sap.ui.define([
         this.init = function (bInitIframeValidMsg) {
             var that = this;
 
-            oShellCommunicationHandlersObj = AppRuntimePostMessageAPI.getHandlers();
             that.handleMessageEvent = AppCommunicationMgr.prototype._handleMessageEvent.bind(that, that);
             addEventListener("message", that.handleMessageEvent);
 
@@ -28,12 +28,17 @@ sap.ui.define([
                     that.sendMessageToOuterShell("sap.ushell.appRuntime.iframeIsValid");
                 }, 2500);
             }
+            PostMessageAPIInterface.init(false, this.registerCommHandlers.bind(this));
         };
 
         this.destroy = function () {
             removeEventListener("message", this.handleMessageEvent);
         };
 
+        this.registerCommHandlers = function (oCommunication) {
+            deepExtend(oPostMessageAPIs, oCommunication);
+        };
+
         this._handleMessageResponse = function (oMessageData) {
             if (oMessageData.request_id && arrPostResultPromises[oMessageData.request_id]) {
                 var oResPromise = arrPostResultPromises[oMessageData.request_id];
@@ -105,7 +110,7 @@ sap.ui.define([
             };
 
             try {
-                oMatchHandler = oShellCommunicationHandlersObj[sServiceName];
+                oMatchHandler = oPostMessageAPIs[sServiceName];
                 oServiceCall = oMatchHandler && oMatchHandler.oServiceCalls[sServiceAction];
                 if (oServiceCall && oServiceCall.executeServiceCallFn) {
                     oServiceCall.executeServiceCallFn(oServiceParams).then(

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

@@ -15,7 +15,6 @@ sap.ui.define([
     "sap/ui/thirdparty/jquery",
     "sap/ui/thirdparty/URI",
     "sap/ushell/appRuntime/ui5/AppCommunicationMgr",
-    "sap/ushell/appRuntime/ui5/AppRuntimePostMessageAPI",
     "sap/ushell/appRuntime/ui5/AppRuntimeService",
     "sap/ushell/appRuntime/ui5/performance/FesrEnhancer",
     "sap/ushell/appRuntime/ui5/renderers/fiori2/AccessKeysAgent",
@@ -30,7 +29,8 @@ sap.ui.define([
     "sap/ushell/utils/UrlParsing",
     "sap/ushell/utils/WindowUtils",
     "sap/ushell/appRuntime/ui5/AppRuntimeContext",
-    "sap/ui/core/Configuration"
+    "sap/ui/core/Configuration",
+    "sap/ushell/renderers/fiori2/utils"
 ], function (
     Core,
     Log,
@@ -46,7 +46,6 @@ sap.ui.define([
     jQuery,
     URI,
     AppCommunicationMgr,
-    AppRuntimePostMessageAPI,
     AppRuntimeService,
     FesrEnhancer,
     AccessKeysAgent,
@@ -61,7 +60,8 @@ sap.ui.define([
     oUrlParsing,
     WindowUtils,
     AppRuntimeContext,
-    CoreConfiguration
+    CoreConfiguration,
+    RendererUtils
 ) {
     "use strict";
     /* global apprtBIdiv, apprtBIstyle */
@@ -221,7 +221,7 @@ sap.ui.define([
             if (oHash && oHash.appSpecificRoute && oHash.appSpecificRoute.length > 0) {
                 AppRuntimeService.sendMessageToOuterShell(
                     "sap.ushell.services.CrossApplicationNavigation.setInnerAppRoute", {
-                    appSpecificRoute: decodeURIComponent(oHash.appSpecificRoute)
+                    appSpecificRoute: oHash.appSpecificRoute
                 });
             }
         };
@@ -242,7 +242,7 @@ sap.ui.define([
             vGetFullWidthParamFromManifest = this._getURIParams()["sap-manifest-width"];
             AppConfiguration.setFullWidthFromManifest(vGetFullWidthParamFromManifest);
 
-            AppRuntimePostMessageAPI.registerCommHandlers({
+            AppCommunicationMgr.registerCommHandlers({
                 "sap.ushell.appRuntime": {
                     oServiceCalls: {
                         hashChange: {
@@ -287,6 +287,11 @@ sap.ui.define([
                                 return new jQuery.Deferred().resolve().promise();
                             }
                         },
+                        executeLogoutFunctions: {
+                            executeServiceCallFn: function (oServiceParams) {
+                                return sap.ushell.Container.executeAsyncAndSyncLogoutFunctions();
+                            }
+                        },
                         uiDensityChange: {
                             executeServiceCallFn: function (oServiceParams) {
                                 var isTouch = oServiceParams.oMessageData.body.isTouch;
@@ -337,7 +342,7 @@ sap.ui.define([
                             // and we will be the one to handle the opening of the link (with 'window.open').
                             event.preventDefault();
                         }
-                    } else if (oTarget.target === undefined || oTarget.target === "") {
+                    } else if (oTarget.target === undefined || oTarget.target === "" || oTarget.target === "_top" || oTarget.target === "_self") {
                         //if the new hash is different than the current one, this is a cross application navigation
                         // and we will use the ushell service for that in order to properly create a new browser history
                         // entry
@@ -619,7 +624,7 @@ sap.ui.define([
                     /* eslint-enable no-new */
                     AppLifeCycleAgent.setShellUIService(oShellUIService);
 
-                    sap.ushell.renderers.fiori2.utils.init();
+                    RendererUtils.init();
                     if (Popup.attachBlockLayerStateChange) {
                         Popup.attachBlockLayerStateChange(function (oEvent) {
                             AppRuntimeService.sendMessageToOuterShell(
@@ -673,7 +678,9 @@ sap.ui.define([
                                     if (sHash && sHash.indexOf("Shell-startIntent") === 0) {
                                         sAppTitle = oResolutionResultWithComponentHandle.componentHandle.getMetadata().getManifestEntry("/sap.app/title");
                                         if (typeof sAppTitle === "string") {
-                                            AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.ShellUIService.setTitle", {sTitle: sAppTitle});
+                                            setTimeout(function () {
+                                                AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.ShellUIService.setTitle", {sTitle: sAppTitle});
+                                            }, 2000);
                                         }
                                     }
                                 } catch (error) {
@@ -703,7 +710,7 @@ sap.ui.define([
                                 }
                                 AppLifeCycleAgent.setCurrentAppAttributes(oAppInfo);
                                 setTimeout(function () {
-                                    AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.AppLifeCycle.setNewAppInfo", {info: oAppInfo});
+                                    AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.AppLifeCycle.updateCurrentAppInfo", {info: oAppInfo});
                                 }, 500);
                             });
                             _that.considerChangingTheDefaultFullWidthVal(oResolutionResultWithComponentHandle);
@@ -986,9 +993,9 @@ function prepareModules () {
             });
         }
         sap.ui.define("sap/ushell/components/applicationIntegration/AppLifeCycle", [], function () { return {}; });
-        sap.ui.define("sap/ushell/services/_AppState/WindowAdapter", [], function () { return function () {}; });
-        sap.ui.define("sap/ushell/services/_AppState/SequentializingAdapter", [], function () { return function () {}; });
-        sap.ui.define("sap/ushell/services/_AppState/Sequentializer", [], function () { return function () {}; });
+        sap.ui.define("sap/ushell/services/appstate/WindowAdapter", [], function () { return function () {}; });
+        sap.ui.define("sap/ushell/services/appstate/SequentializingAdapter", [], function () { return function () {}; });
+        sap.ui.define("sap/ushell/services/appstate/Sequentializer", [], function () { return function () {}; });
         sap.ui.define("sap/ushell/services/Configuration", [], function () {
             function Configuration () {
                 this.attachSizeBehaviorUpdate = function () {};

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

@@ -1,7 +1,9 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 sap.ui.define([
-    "sap/base/assert"
-], function (assert) {
+    "sap/base/assert",
+    "sap/ushell/utils/UrlParsing",
+    "sap/ushell/utils/clone"
+], function (assert, UrlParsing, clone) {
     "use strict";
 
     function AppRuntimeContext () {
@@ -32,6 +34,45 @@ sap.ui.define([
         this.checkDataLossAndContinue = function () {
             return (_AppLifeCycleAgent ? _AppLifeCycleAgent.checkDataLossAndContinue() : true);
         };
+
+        this.checkIntentsConversionForScube = function (aAppsIntents) {
+            var that = this;
+
+            if (!this.getIsScube() || !aAppsIntents || aAppsIntents.length === 0) {
+                return Promise.resolve(aAppsIntents);
+            }
+
+            return new Promise(function (fnResolve) {
+                var aAppsIntentsCopy = clone(aAppsIntents);
+                var aIntents = [];
+                var oParsedHash;
+
+                aIntents = aAppsIntentsCopy.map(function (oApp) {
+                    return {
+                        target: {
+                            shellHash: oApp.intent
+                        }
+                    };
+                });
+
+                sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
+                    oCrossAppNavService.isNavigationSupported(aIntents, undefined, true).then(function (aIntentsSupported) {
+                        for (var i = 0; i < aIntentsSupported.length; i++) {
+                            if (!aIntentsSupported[i].supported) {
+                                oParsedHash = UrlParsing.parseShellHash(aAppsIntentsCopy[i].intent);
+                                oParsedHash.params["sap-shell-so"] = oParsedHash.semanticObject;
+                                oParsedHash.params["sap-shell-action"] = oParsedHash.action;
+                                oParsedHash.params["sap-remote-system"] = that.getRemoteSystemId();
+                                oParsedHash.semanticObject = "Shell";
+                                oParsedHash.action = "startIntent";
+                                aAppsIntentsCopy[i].intent = "#" + UrlParsing.constructShellHash(oParsedHash);
+                            }
+                        }
+                        fnResolve(aAppsIntentsCopy);
+                    });
+                });
+            });
+        };
     }
 
     return new AppRuntimeContext();

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

@@ -1,11 +1,11 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 sap.ui.define([
-    "sap/ushell/appRuntime/ui5/AppRuntimePostMessageAPI",
+    "sap/ushell/appRuntime/ui5/AppCommunicationMgr",
     "sap/ushell/appRuntime/ui5/AppRuntimeService",
     "sap/ui/thirdparty/URI",
     "sap/base/Log",
     "sap/ui/thirdparty/jquery"
-], function (AppRuntimePostMessageAPI, AppRuntimeService, URI, Log, jQuery) {
+], function (AppCommunicationMgr, AppRuntimeService, URI, Log, jQuery) {
     "use strict";
 
     function SessionHandlerAgent () {
@@ -15,16 +15,18 @@ sap.ui.define([
             var that = this;
 
             //register for logout event from the shell
-            AppRuntimePostMessageAPI.registerCommunicationHandler("sap.ushell.sessionHandler", {
-                oServiceCalls: {
-                    logout: {
-                        executeServiceCallFn: function (oMessageData) {
-                            return that.handleLogoutEvent(oMessageData);
-                        }
-                    },
-                    extendSessionEvent: {
-                        executeServiceCallFn: function (oMessageData) {
-                            return that.handleExtendSessionEvent(oMessageData);
+            AppCommunicationMgr.registerCommHandlers({
+                "sap.ushell.sessionHandler": {
+                    oServiceCalls: {
+                        logout: {
+                            executeServiceCallFn: function (oMessageData) {
+                                return that.handleLogoutEvent(oMessageData);
+                            }
+                        },
+                        extendSessionEvent: {
+                            executeServiceCallFn: function (oMessageData) {
+                                return that.handleExtendSessionEvent(oMessageData);
+                            }
                         }
                     }
                 }

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

@@ -140,9 +140,8 @@ sap.ui.define([
 				BusyIndicator.hide();
 				if (vError.reason === "flexEnabled") {
 					this.handleFlexDisabledOnStart();
-				} else if (vError === "Reload triggered") {
-					this.sStatus = STATUS_STOPPED;
 				}
+				this.sStatus = STATUS_STOPPED;
 			}.bind(this));
 	};
 

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

@@ -11,6 +11,14 @@ function (
 	"use strict";
 
 	return Component.extend("sap.ushell.appRuntime.ui5.plugins.scriptAgent.Component", {
+        metadata: {
+            version: "1.0.0",
+            dependencies: {
+                libs: [ "sap.m" ],
+                components: []
+            }
+        },
+
 		init: function () {
 			var mConfig = this.getComponentData(),
                 oPageUriParams = new URI().search(true),
@@ -32,19 +40,11 @@ function (
                 scriptURL = mConfig.config.url;
             }
 
-			jQuery.ajaxSetup({
-				cache: true
-			});
-
 			try {
 				jQuery.getScript(scriptURL);
 			} catch (ex) {
 				Log.error(ex);
 			}
-
-			jQuery.ajaxSetup({
-				cache: false
-			});
 		}
 	});
 });

package/src/main/js/sap/ushell/appRuntime/ui5/renderers/fiori2/RendererExtensions.js

@@ -1,32 +1,16 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
-    "sap/base/util/ObjectPath",
     "sap/base/util/uid",
-    "sap/ushell/EventHub",
     "sap/ushell/appRuntime/ui5/AppRuntimeService",
-    "sap/ui/core/Core"
+    "sap/ushell/appRuntime/ui5/AppRuntimeContext"
 ], function (
-    ObjectPath,
     fnGetUid,
-    EventHub,
     AppRuntimeService,
-    Core
+    AppRuntimeContext
 ) {
     "use strict";
 
-    function _init (oController) {
-        setTimeout(function () {
-            Core.getEventBus().publish("sap.ushell", "rendererLoaded", { rendererName: "fiori2" });
-        }, 0);
-        EventHub.emit("RendererLoaded", { rendererName: "fiori2" });
-    }
-    function _publishExternalEvent (sEventName, oData) {
-        setTimeout(function () {
-            Core.getEventBus().publish("sap.ushell.renderers.fiori2.Renderer", sEventName, oData);
-        }, 0);
-    }
-
     function _addSubHeader (oItem, sLaunchpadState1, sLaunchpadState2) {
         //sap.ushell.Container.getRenderer("fiori2").showSubHeader(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
     }
@@ -104,7 +88,11 @@ sap.ui.define([
         //sap.ushell.Container.getRenderer("fiori2").hideHeaderEndItem(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
     }
     function _getConfiguration () {
-        //return sap.ushell.Container.getRenderer("fiori2").getModelConfiguration();
+        if (AppRuntimeContext.getIsScube()) {
+            return {
+                enablePersonalization: true
+            };
+        }
         return {};
     }
     function _setHeaderItemVisibility (sItem, sLaunchpadState, bToLocal, bIsVisible) {
@@ -167,13 +155,5 @@ sap.ui.define([
     }
 
     var RendererExtensions1 = new RendererExtensions();
-    var oUtils = {
-        publishExternalEvent: _publishExternalEvent,
-        init: _init
-    };
-
-    ObjectPath.set("sap.ushell.renderers.fiori2.utils", oUtils);
-    ObjectPath.set("sap.ushell.renderers.fiori2.RendererExtensions", RendererExtensions1);
-
     return RendererExtensions1;
 });

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

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
-    "sap/ushell/appRuntime/ui5/AppRuntimePostMessageAPI",
+    "sap/ushell/appRuntime/ui5/AppCommunicationMgr",
     "sap/ushell/appRuntime/ui5/AppRuntimeService",
     "sap/base/util/extend",
     "sap/base/util/UriParameters",
@@ -18,7 +18,7 @@ sap.ui.define([
     "sap/base/assert",
     "sap/ushell/resources"
 ], function (
-    AppRuntimePostMessageAPI,
+    AppCommunicationMgr,
     AppRuntimeService,
     extend,
     UriParameters,
@@ -69,7 +69,7 @@ sap.ui.define([
             this.addAppInfoToCache(sAppId, oAppInfo);
 
             // register this create & destroy as a appLifeCycleCommunication handler
-            AppRuntimePostMessageAPI.registerCommHandlers({
+            AppCommunicationMgr.registerCommHandlers({
                 "sap.ushell.services.appLifeCycle": {
                     oServiceCalls: {
                         create: {
@@ -110,7 +110,10 @@ sap.ui.define([
                     isStateful: true,
                     isKeepAlive: true,
                     isIframeValid: true,
-                    isIframeBusy: true
+                    isIframeBusy: true,
+                    session: {
+                        bLogoutSupport: true
+                    }
                 });
 
             //handle dirty state confirmation dialog within the iframe and not
@@ -180,7 +183,7 @@ sap.ui.define([
                                 body: {
                                     sCacheId: sKeepAliveAppKey
                                 }
-                            });
+                            }, true);
                         }
                     }
                     that.expandSapIntentParams(new URI(sUrl).query(true)).then(function (oURLParameters) {
@@ -204,7 +207,7 @@ sap.ui.define([
         /**
          * @private
          */
-        this.destroy = function (oMsg) {
+        this.destroy = function (oMsg, bDestroyKeepAlive) {
             function appDestroy (oApplication) {
                 var sAppId = oApplication.sId || "<unkown>";
                 try {
@@ -218,7 +221,7 @@ sap.ui.define([
                 }
             }
 
-            if (oRunningApp.oApp === undefined) {
+            if (oRunningApp.oApp === undefined && bDestroyKeepAlive !== true) {
                 AppRuntimeService.sendMessageToOuterShell("sap.ushell.appRuntime.isInvalidIframe", {bValue: true});
                 return Promise.resolve();
             }

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

@@ -3,10 +3,11 @@
 sap.ui.define([
     "sap/ushell/services/AppState",
     "sap/ushell/appRuntime/ui5/AppRuntimeService",
-    "sap/ushell/services/_AppState/AppState",
+    "sap/ushell/services/appstate/AppState",
     "sap/ushell/utils",
-    "sap/ui/thirdparty/jquery"
-], function (AppState, AppRuntimeService, AppStateAppState, utils, jQuery) {
+    "sap/ui/thirdparty/jquery",
+    "sap/ushell/appRuntime/ui5/AppRuntimeContext"
+], function (AppState, AppRuntimeService, AppStateAppState, utils, jQuery, AppRuntimeContext) {
     "use strict";
 
     function AppStateProxy (oAdapter, oContainerInterface, sParameter, oConfig) {
@@ -14,6 +15,9 @@ sap.ui.define([
 
         this.createEmptyAppStateOrig = this.createEmptyAppState;
         this.createEmptyAppState = function (oComponent, bTransientEnforced, sPersistencyMethod, oPersistencySettings) {
+            if (AppRuntimeContext.getIsScube()) {
+                bTransientEnforced = false;
+            }
             var oAppState = this.createEmptyAppStateOrig(oComponent, bTransientEnforced, sPersistencyMethod, oPersistencySettings);
             if (typeof bTransientEnforced === "boolean" && oAppState._bTransient !== bTransientEnforced) {
                 oAppState._bTransient = bTransientEnforced;

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

@@ -2,8 +2,9 @@
 
 sap.ui.define([
     "sap/ushell/services/Bookmark",
-    "sap/ushell/appRuntime/ui5/AppRuntimeService"
-], function (Bookmark, AppRuntimeService) {
+    "sap/ushell/appRuntime/ui5/AppRuntimeService",
+    "sap/ushell/appRuntime/ui5/AppRuntimeContext"
+], function (Bookmark, AppRuntimeService, AppRuntimeContext) {
     "use strict";
 
     function BookmarkProxy (oContainerInterface, sParameters, oServiceConfiguration) {
@@ -12,11 +13,21 @@ sap.ui.define([
         //addBookmark(oParameters, vContainer?) : object - jQuery.Deferred promise
         //Adds a bookmark tile to one of the user's classic homepage groups or to multiple provided content nodes.
         this.addBookmark = function (oParameters, vContainer) {
-            return AppRuntimeService.sendMessageToOuterShell(
-                "sap.ushell.services.Bookmark.addBookmarkUI5", {
-                oParameters: oParameters,
-                vContainer: vContainer
-            });
+            var fnAddBookmark = function () {
+                return AppRuntimeService.sendMessageToOuterShell(
+                    "sap.ushell.services.Bookmark.addBookmarkUI5", {
+                        oParameters: oParameters,
+                        vContainer: vContainer
+                    });
+            };
+
+            if (oParameters.url.startsWith("#")) {
+                return AppRuntimeContext.checkIntentsConversionForScube([{ intent: oParameters.url }]).then(function (aIntentResult) {
+                    oParameters.url = aIntentResult[0].intent;
+                    return fnAddBookmark();
+                });
+            }
+            return fnAddBookmark();
         };
 
         this.getShellGroupIDs = function () {