@sapui5/sap.ushell 1.138.1 → 1.140.0

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

@@ -4,13 +4,13 @@
  * @fileOverview This module is a iframe safe version of the AppConfiguration service.
  * The inner frame service has to be required explicitly or accessed via the global on the original path.
  * The require calls to the original file will NOT be replaced.
- * @version 1.138.1
+ * @version 1.140.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",
     "sap/m/library",
     "sap/ui/core/IconPool",
-    "sap/ushell/appRuntime/ui5/AppRuntimeService",
+    "sap/ushell/appRuntime/ui5/AppCommunicationMgr",
     "sap/ushell/EventHub",
     "sap/ushell/appRuntime/ui5/renderers/fiori2/RendererExtensions",
     "sap/ushell/resources",
@@ -19,7 +19,7 @@ sap.ui.define([
     ObjectPath,
     mobileLibrary,
     IconPool,
-    AppRuntimeService,
+    AppCommunicationMgr,
     EventHub,
     RendererExtensions,
     resources,
@@ -48,7 +48,6 @@ sap.ui.define([
 
         EventHub.on("appWidthChange").do((bValue) => {
             const oBody = document.body;
-            oBody.classList.toggle("sapUiSizeCompact", bValue);
             oBody.classList.toggle("sapUShellApplicationContainerLimitedWidth", !bValue);
             oBody.classList.toggle("sapUShellApplicationContainer", !bValue);
         });
@@ -75,7 +74,7 @@ sap.ui.define([
             if (vGetFullWidthParamFromManifest === true || vGetFullWidthParamFromManifest === "true") {
                 EventHub.emit("appWidthChange", bValue);
             } else {
-                AppRuntimeService.postMessageToFLP("sap.ushell.services.AppConfiguration.setApplicationFullWidth", {
+                AppCommunicationMgr.postMessageToFLP("sap.ushell.services.AppConfiguration.setApplicationFullWidth", {
                     bValue: bValue
                 });
             }

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

@@ -3,15 +3,15 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.AppLifeCycle}.
  *
- * @version 1.138.1
+ * @version 1.140.0
  */
 sap.ui.define([
     "sap/base/Log",
-    "sap/ushell/appRuntime/ui5/AppRuntimeService",
+    "sap/ushell/appRuntime/ui5/AppCommunicationMgr",
     "sap/ushell/services/AppLifeCycle"
 ], (
     Log,
-    AppRuntimeService,
+    AppCommunicationMgr,
     AppLifeCycle
 ) => {
     "use strict";
@@ -41,7 +41,7 @@ sap.ui.define([
          */
         this.reloadCurrentApp = async function () {
             try {
-                await AppRuntimeService.postMessageToFLP("sap.ushell.services.AppLifeCycle.reloadCurrentApp", {});
+                await AppCommunicationMgr.postMessageToFLP("sap.ushell.services.AppLifeCycle.reloadCurrentApp", {});
             } catch (err) {
                 Log.error("reloadCurrentApp failed: ", err);
             }

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

@@ -11,12 +11,12 @@ sap.ui.define([
     "sap/ui/core/BusyIndicator",
     "sap/ushell/EventHub",
     "sap/ui/thirdparty/hasher",
+    "sap/ushell/utils",
     "sap/ushell/utils/UrlParsing",
     "sap/ushell/resources",
     "sap/ushell/appRuntime/ui5/services/Container",
     "sap/ushell/appRuntime/ui5/AppRuntimeContext",
     "sap/ushell/appRuntime/ui5/AppCommunicationMgr",
-    "sap/ushell/appRuntime/ui5/AppRuntimeService",
     "sap/ushell/appRuntime/ui5/performance/FesrEnhancer"
 ], (
     Log,
@@ -29,12 +29,12 @@ sap.ui.define([
     BusyIndicator,
     EventHub,
     hasher,
-    oUrlParsing,
+    ushellUtils,
+    UrlParsing,
     resources,
     Container,
     AppRuntimeContext,
     AppCommunicationMgr,
-    AppRuntimeService,
     FesrEnhancer
 ) => {
     "use strict";
@@ -75,35 +75,31 @@ sap.ui.define([
             this.addAppInfoToCache(sAppId, oAppInfo);
 
             // register this create & destroy as a appLifeCycleCommunication handler
-            AppCommunicationMgr.registerCommHandlers({
-                "sap.ushell.services.appLifeCycle": {
-                    oServiceCalls: {
-                        create: {
-                            executeServiceCallFn: function (oMessageData) {
-                                const oMsg = JSON.parse(oMessageData.oMessage.data);
-                                return that.create(oMsg);
-                            }
-                        },
-                        destroy: {
-                            executeServiceCallFn: function (oMessageData) {
-                                const oMsg = JSON.parse(oMessageData.oMessage.data);
-                                return that.destroy(oMsg);
-                            }
-                        },
-                        store: {
-                            executeServiceCallFn: function (oMessageData) {
-                                const oMsg = JSON.parse(oMessageData.oMessage.data);
-                                return that.store(oMsg);
-                            }
-                        },
-                        restore: {
-                            executeServiceCallFn: function (oMessageData) {
-                                const oMsg = JSON.parse(oMessageData.oMessage.data);
-                                return that.restore(oMsg);
-                            }
-                        }
+            const oRequestHandlers = {
+                "sap.ushell.services.appLifeCycle.create": {
+                    async handler (oMessageBody, oMessageEvent) {
+                        return that.create(oMessageBody);
+                    }
+                },
+                "sap.ushell.services.appLifeCycle.destroy": {
+                    async handler (oMessageBody, oMessageEvent) {
+                        return that.destroy(oMessageBody);
+                    }
+                },
+                "sap.ushell.services.appLifeCycle.store": {
+                    async handler (oMessageBody, oMessageEvent) {
+                        return that.store(oMessageBody);
+                    }
+                },
+                "sap.ushell.services.appLifeCycle.restore": {
+                    async handler (oMessageBody, oMessageEvent) {
+                        return that.restore(oMessageBody);
                     }
                 }
+            };
+
+            Object.keys(oRequestHandlers).forEach((sServiceRequest) => {
+                AppCommunicationMgr.setRequestHandler(sServiceRequest, oRequestHandlers[sServiceRequest].handler);
             });
 
             EventHub.on("disableKeepAliveRestoreRouterRetrigger").do((oData) => {
@@ -141,97 +137,92 @@ sap.ui.define([
                     bLogoutSupport: true
                 }
             };
-            AppRuntimeService.postMessageToFLP(
+            AppCommunicationMgr.postMessageToFLP(
                 "sap.ushell.services.appLifeCycle.setup",
                 (window["sap-ushell-config"]?.ui5appruntime?.config?.stateful === false) ? oAppRuntimeMinSetup : oAppRuntimeFullSetup
             );
         };
 
         /**
-         * @param {object} oMsg the message containing the URL and the hash.
+         * @param {object} oMessageBody the message containing the URL and the hash.
          * @returns {Promise} after the application was created.
          * @private
          */
-        this.create = function (oMsg) {
-            return new Promise((fnResolve, fnReject) => {
-                let sAppId;
-                let sAppIntent;
-                let oParsedShellIntent;
-                let sScubeAppIntent = "";
-
-                FesrEnhancer.startInteraction();
-
-                const sUrl = oMsg.body.sUrl;
-                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");
+        this.create = async function (oMessageBody) {
+            let sAppId;
+            let sAppIntent;
+            let oParsedShellIntent;
+            let sScubeAppIntent = "";
+
+            FesrEnhancer.startInteraction();
+
+            const sUrl = oMessageBody.sUrl;
+            if (AppRuntimeContext.getIsScube()) {
+                sAppIntent = UriParameters.fromURL(sUrl).get("sap-remote-intent");
+                assert(typeof sAppIntent === "string", "AppLifeCycleAgent::create - sAppIntent must be string");
+                if (oMessageBody.sHash.indexOf("Shell-startIntent") === 0) {
+                    oParsedShellIntent = UrlParsing.parseShellHash(oMessageBody.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");
+            }
 
-                hasher.disableCFLPUpdate = true;
-                hasher.replaceHash("");
-                hasher.replaceHash(oMsg.body.sHash);
-                hasher.disableCFLPUpdate = false;
+            hasher.disableCFLPUpdate = true;
+            hasher.replaceHash("");
+            hasher.replaceHash(oMessageBody.sHash);
+            hasher.disableCFLPUpdate = false;
 
-                // BusyIndicator work in hidden iframe only in chrome
-                if (Device.browser.chrome) {
-                    BusyIndicator.show(0);
-                }
-                if (oShellUIService) {
-                    oShellUIService._resetBackNavigationCallback();
+            // BusyIndicator work in hidden iframe only in chrome
+            if (Device.browser.chrome) {
+                BusyIndicator.show(0);
+            }
+            if (oShellUIService) {
+                oShellUIService._resetBackNavigationCallback();
+            }
+            EventBus.getInstance().publish("launchpad", "appOpening", {});
+            const oAppInfo = await that.getAppInfo(sAppId, sUrl, sAppIntent);
+            /**
+             * In S/Cube, the ResolvedHashFragment is fully available
+             * In other cases, we need to use the name property
+             */
+            const sUi5ComponentName = oAppInfo.oResolvedHashFragment?.ui5ComponentName || oAppInfo.oResolvedHashFragment?.name;
+
+            const sKeepAliveAppKey = Object.keys(oCachedApplications).find((sCachedKey) => {
+                if (AppRuntimeContext.getIsScube() && sScubeAppIntent.length > 0) {
+                    return oCachedApplications[sCachedKey].sAppIntent === sScubeAppIntent
+                        && oCachedApplications[sCachedKey].ui5ComponentName === sUi5ComponentName;
                 }
-                EventBus.getInstance().publish("launchpad", "appOpening", {});
-                that.getAppInfo(sAppId, sUrl, sAppIntent).then((oAppInfo) => {
-                    /**
-                     * In S/Cube, the ResolvedHashFragment is fully available
-                     * In other cases, we need to use the name property
-                     */
-                    const sUi5ComponentName = oAppInfo.oResolvedHashFragment?.ui5ComponentName || oAppInfo.oResolvedHashFragment?.name;
-
-                    const sKeepAliveAppKey = Object.keys(oCachedApplications).find((sCachedKey) => {
-                        if (AppRuntimeContext.getIsScube() && sScubeAppIntent.length > 0) {
-                            return oCachedApplications[sCachedKey].sAppIntent === sScubeAppIntent
-                                && oCachedApplications[sCachedKey].ui5ComponentName === sUi5ComponentName;
-                        }
 
-                        return oCachedApplications[sCachedKey].ui5ComponentName
-                            && oCachedApplications[sCachedKey].ui5ComponentName === sUi5ComponentName;
-                    });
+                return oCachedApplications[sCachedKey].ui5ComponentName
+                    && oCachedApplications[sCachedKey].ui5ComponentName === sUi5ComponentName;
+            });
 
-                    if (sKeepAliveAppKey) {
-                        that.destroy({
-                            body: {
-                                sCacheId: sKeepAliveAppKey
-                            }
-                        }, true);
-                    }
+            if (sKeepAliveAppKey) {
+                that.destroy({
+                    sCacheId: sKeepAliveAppKey
+                }, true);
+            }
 
-                    that.expandSapIntentParams(new URI(sUrl).query(true)).then((oURLParameters) => {
-                        fnCreateApplication(sAppId, oURLParameters, oAppInfo.oResolvedHashFragment, sAppIntent, oAppInfo.oParsedHash)
-                            .then((oCreateApplicationResult) => {
-                                fnRenderApp(oCreateApplicationResult);
-                                EventBus.getInstance().publish("sap.ushell", "appOpened", {});
-                                fnResolve({
-                                    deletedKeepAliveId: sKeepAliveAppKey
-                                });
-                            });
-                    });
-                });
-            });
+            const oURLParameters = await that.expandSapIntentParams(new URI(sUrl).query(true));
+
+            const oCreateApplicationResult = await fnCreateApplication(sAppId, oURLParameters, oAppInfo.oResolvedHashFragment, sAppIntent, oAppInfo.oParsedHash);
+            fnRenderApp(oCreateApplicationResult);
+
+            EventBus.getInstance().publish("sap.ushell", "appOpened", {});
+
+            return {
+                deletedKeepAliveId: sKeepAliveAppKey
+            };
         };
 
         /**
-         * @param {object} oMsg the message containing the cache id.
+         * @param {object} oMessageBody the message containing the cache id.
          * @returns {Promise} after the application was destroyed.
          * @private
          */
-        this.destroy = function (oMsg) {
+        this.destroy = async function (oMessageBody) {
             function appDestroy (oApplication) {
                 const sAppId = oApplication.sId || "<unknown>";
                 try {
@@ -245,11 +236,11 @@ sap.ui.define([
                 }
             }
 
-            const sStorageKey = oMsg.body.sCacheId;
+            const sStorageKey = oMessageBody.sCacheId;
 
             if (oRunningApp.oApp === undefined && sStorageKey === undefined) {
-                AppRuntimeService.postMessageToFLP("sap.ushell.appRuntime.isInvalidIframe", {bValue: true});
-                return Promise.resolve();
+                AppCommunicationMgr.postMessageToFLP("sap.ushell.appRuntime.isInvalidIframe", { bValue: true });
+                return;
             }
 
             if (sStorageKey && oCachedApplications[sStorageKey]) {
@@ -269,23 +260,22 @@ sap.ui.define([
                 oShellUIService._resetBackNavigationCallback();
             }
             FesrEnhancer.setAppShortId();
-            EventBus.getInstance().publish("sap.ushell", "appClosed", {});
 
-            return Promise.resolve();
+            EventBus.getInstance().publish("sap.ushell", "appClosed", {});
         };
 
         /**
-         * @param {object} oMsg the message containing the cache id.
+         * @param {object} oMessageBody the message containing the cache id.
          * @returns {Promise} after the application was stored.
          * @private
          */
-        this.store = function (oMsg) {
-            const sStorageKey = oMsg.body.sCacheId;
+        this.store = async function (oMessageBody) {
+            const sStorageKey = oMessageBody.sCacheId;
             const oCachedEntry = this.cloneCurrentAppEntry(oRunningApp);
 
             if (oRunningApp.oApp === undefined) {
-                AppRuntimeService.postMessageToFLP("sap.ushell.appRuntime.isInvalidIframe", {bValue: true});
-                return Promise.resolve();
+                AppCommunicationMgr.postMessageToFLP("sap.ushell.appRuntime.isInvalidIframe", { bValue: true });
+                return;
             }
 
             oCachedApplications[sStorageKey] = oCachedEntry;
@@ -312,25 +302,24 @@ sap.ui.define([
                     }
                 }
             }
-            EventBus.getInstance().publish("sap.ushell", "appClosed", {});
 
-            return Promise.resolve();
+            EventBus.getInstance().publish("sap.ushell", "appClosed", {});
         };
 
         /**
-         * @param {object} oMsg the message containing the cache id and the hash.
+         * @param {object} oMessageBody the message containing the cache id and the hash.
          * @returns {Promise} after the application was restored.
          * @private
          */
-        this.restore = function (oMsg) {
-            const sStorageKey = oMsg.body.sCacheId;
+        this.restore = async function (oMessageBody) {
+            const sStorageKey = oMessageBody.sCacheId;
             const oCachedEntry = oCachedApplications[sStorageKey];
             const oApp = oCachedEntry.oApp.getComponentInstance();
             const bRouterDisableRetrigger = oRouterDisableRetriggerApplications[oCachedEntry.oApp.sId];
 
             hasher.disableCFLPUpdate = true;
             hasher.replaceHash("");
-            hasher.replaceHash(oMsg.body.sHash);
+            hasher.replaceHash(oMessageBody.sHash);
             hasher.disableCFLPUpdate = false;
 
             EventBus.getInstance().publish("launchpad", "appOpening", {});
@@ -365,10 +354,8 @@ sap.ui.define([
             EventBus.getInstance().publish("sap.ushell", "appOpened", {});
 
             setTimeout(() => {
-                AppRuntimeService.postMessageToFLP("sap.ushell.services.AppLifeCycle.setNewAppInfo", {info: oCachedEntry.oAppAttributes});
+                AppCommunicationMgr.postMessageToFLP("sap.ushell.services.AppLifeCycle.setNewAppInfo", { info: oCachedEntry.oAppAttributes });
             }, 500);
-
-            return Promise.resolve();
         };
 
         /**
@@ -376,22 +363,20 @@ sap.ui.define([
          * @returns {Promise} with the updated URL parameters.
          * @private
          */
-        this.expandSapIntentParams = function (oUrlParameters) {
-            return new Promise((fnResolve, fnReject) => {
-                if (oUrlParameters.hasOwnProperty("sap-intent-param")) {
-                    const sAppStateKey = oUrlParameters["sap-intent-param"];
-                    AppRuntimeService.postMessageToFLP("sap.ushell.services.CrossApplicationNavigation.getAppStateData", { sAppStateKey: sAppStateKey })
-                        .then((sParameters) => {
-                            delete oUrlParameters["sap-intent-param"];
-                            const oUrlParametersExpanded = extend({}, oUrlParameters, (new URI(`?${sParameters}`)).query(true), true);
-                            fnResolve(oUrlParametersExpanded);
-                        }, (sError) => {
-                            fnResolve(oUrlParameters);
-                        });
-                } else {
-                    fnResolve(oUrlParameters);
+        this.expandSapIntentParams = async function (oUrlParameters) {
+            if (oUrlParameters.hasOwnProperty("sap-intent-param")) {
+                const sAppStateKey = oUrlParameters["sap-intent-param"];
+                try {
+                    const sParameters = await AppCommunicationMgr.postMessageToFLP("sap.ushell.services.CrossApplicationNavigation.getAppStateData", { sAppStateKey: sAppStateKey });
+                    delete oUrlParameters["sap-intent-param"];
+                    const oUrlParametersExpanded = extend({}, oUrlParameters, (new URI(`?${sParameters}`)).query(true), true);
+                    return oUrlParametersExpanded;
+                } catch {
+                    // fail silently
                 }
-            });
+            }
+
+            return oUrlParameters;
         };
 
         /**
@@ -400,10 +385,9 @@ sap.ui.define([
          * @returns {Promise<string>} a promise with the application parameters string.
          * @private
          */
-        this.addAppParamsToIntent = function (sUrl, sAppIntent) {
-            return that.expandSapIntentParams(new URI(sUrl).query(true)).then((oURLParameters) => {
-                return that.getApplicationParameters(oURLParameters);
-            });
+        this.addAppParamsToIntent = async function (sUrl, sAppIntent) {
+            const oURLParameters = await that.expandSapIntentParams(new URI(sUrl).query(true));
+            return that.getApplicationParameters(oURLParameters);
         };
 
         /**
@@ -411,47 +395,44 @@ sap.ui.define([
          * @returns {Promise<string>} a promise with the application parameters.
          * @private
          */
-        this.getApplicationParameters = function (oURLParameters) {
-            return new Promise((fnResolve) => {
-                let oStartupParameters;
-                let sSapIntentParam;
-                let sStartupParametersWithoutSapIntentParam;
-
-                function buildFinalParamsString (sSimpleParams, sIntentParams) {
-                    let sParams = "";
-                    if (sSimpleParams && sSimpleParams.length > 0) {
-                        sParams = (sSimpleParams.startsWith("?") ? "" : "?") + sSimpleParams;
-                    }
-                    if (sIntentParams && sIntentParams.length > 0) {
-                        sParams += (sParams.length > 0 ? "&" : "?") + sIntentParams;
-                    }
-                    return sParams;
+        this.getApplicationParameters = async function (oURLParameters) {
+            let oStartupParameters;
+            let sSapIntentParam;
+            let sStartupParametersWithoutSapIntentParam;
+
+            function buildFinalParamsString (sSimpleParams, sIntentParams) {
+                let sParams = "";
+                if (sSimpleParams && sSimpleParams.length > 0) {
+                    sParams = (sSimpleParams.startsWith("?") ? "" : "?") + sSimpleParams;
+                }
+                if (sIntentParams && sIntentParams.length > 0) {
+                    sParams += (sParams.length > 0 ? "&" : "?") + sIntentParams;
                 }
+                return sParams;
+            }
 
-                if (oURLParameters.hasOwnProperty("sap-startup-params")) {
-                    oStartupParameters = (new URI(`?${oURLParameters["sap-startup-params"]}`)).query(true);
-                    if (oStartupParameters.hasOwnProperty("sap-intent-param")) {
-                        sSapIntentParam = oStartupParameters["sap-intent-param"];
-                        delete oStartupParameters["sap-intent-param"];
-                    }
-                    sStartupParametersWithoutSapIntentParam = (new URI("?")).query(oStartupParameters).toString();
-
-                    // Handle the case when the parameters that were sent to the application were more than 1000 characters and in
-                    // the URL we see a shorten value of the parameters
-                    if (sSapIntentParam) {
-                        AppRuntimeService.postMessageToFLP("sap.ushell.services.CrossApplicationNavigation.getAppStateData", { sAppStateKey: sSapIntentParam })
-                            .then((sMoreParams) => {
-                                fnResolve(buildFinalParamsString(sStartupParametersWithoutSapIntentParam, sMoreParams));
-                            }, (sError) => {
-                                fnResolve(buildFinalParamsString(sStartupParametersWithoutSapIntentParam));
-                            });
-                    } else {
-                        fnResolve(buildFinalParamsString(sStartupParametersWithoutSapIntentParam));
+            if (oURLParameters.hasOwnProperty("sap-startup-params")) {
+                oStartupParameters = (new URI(`?${oURLParameters["sap-startup-params"]}`)).query(true);
+                if (oStartupParameters.hasOwnProperty("sap-intent-param")) {
+                    sSapIntentParam = oStartupParameters["sap-intent-param"];
+                    delete oStartupParameters["sap-intent-param"];
+                }
+                sStartupParametersWithoutSapIntentParam = (new URI("?")).query(oStartupParameters).toString();
+
+                // Handle the case when the parameters that were sent to the application were more than 1000 characters and in
+                // the URL we see a shorten value of the parameters
+                if (sSapIntentParam) {
+                    try {
+                        const sMoreParams = await AppCommunicationMgr.postMessageToFLP("sap.ushell.services.CrossApplicationNavigation.getAppStateData", { sAppStateKey: sSapIntentParam });
+                        return buildFinalParamsString(sStartupParametersWithoutSapIntentParam, sMoreParams);
+                    } catch {
+                        // fail silently
                     }
-                } else {
-                    fnResolve("");
                 }
-            });
+                return buildFinalParamsString(sStartupParametersWithoutSapIntentParam);
+            }
+
+            return "";
         };
 
         /**
@@ -461,53 +442,45 @@ sap.ui.define([
          * @returns {Promise<object>} a promise containing the resolved hash fragment and the parsed hash.
          * @private
          */
-        this.getAppInfo = function (sAppId, sUrl, sAppIntent) {
-            return new Promise((fnResolve) => {
-                function fnGetAppInfo () {
-                    oAppResolution.getAppInfo(sAppId, sUrl).then((oAppInfo) => {
-                        that.addAppInfoToCache(sAppId, oAppInfo);
-                        fnResolve({
-                            oResolvedHashFragment: oAppInfo
-                        });
-                    });
-                }
+        this.getAppInfo = async function (sAppId, sUrl, sAppIntent) {
+            async function fnGetAppInfo () {
+                const oAppInfo = await oAppResolution.getAppInfo(sAppId, sUrl);
+                that.addAppInfoToCache(sAppId, oAppInfo);
+
+                return {
+                    oResolvedHashFragment: oAppInfo
+                };
+            }
 
-                if (sAppIntent) {
-                    that.addAppParamsToIntent(sUrl, sAppIntent).then((sParams) => {
-                        if (sParams.length > 0) {
-                            // remove un-needed parameters from the parameters list before the target resolution
-                            sParams = new URI(sParams)
-                                .removeSearch("sap-remote-system")
-                                .removeSearch("sap-ushell-defaultedParameterNames")
-                                .toString();
-                        }
-                        Container.getServiceAsync("NavTargetResolutionInternal").then((oNavTargetResolution) => {
-                            oNavTargetResolution.resolveHashFragmentLocal(`#${sAppIntent}${sParams}`)
-                                .done((oResolvedHashFragment) => {
-                                    const oParsedHash = oUrlParsing.parseShellHash(`#${sAppIntent}${sParams}`);
-                                    fnResolve({
-                                        oResolvedHashFragment: oResolvedHashFragment,
-                                        oParsedHash: oParsedHash
-                                    });
-                                })
-                                .fail((sMsg) => {
-                                    // oDeferred.reject(sMsg);
-                                });
-                        });
-                    });
-                } else if (bEnableAppResolutionCache === true && oAppResolutionCache[sAppId]) {
-                    fnResolve({
-                        oResolvedHashFragment: JSON.parse(JSON.stringify(oAppResolutionCache[sAppId]))
-                    });
-                } else if (oAppResolution) {
-                    fnGetAppInfo();
-                } else {
-                    sap.ui.require([sAppResolutionModule.replace(/\./g, "/")], (oObj) => {
-                        oAppResolution = oObj;
-                        fnGetAppInfo();
-                    });
+            if (sAppIntent) {
+                let sParams = await that.addAppParamsToIntent(sUrl, sAppIntent);
+                if (sParams.length > 0) {
+                    // remove un-needed parameters from the parameters list before the target resolution
+                    sParams = new URI(sParams)
+                        .removeSearch("sap-remote-system")
+                        .removeSearch("sap-ushell-defaultedParameterNames")
+                        .toString();
                 }
-            });
+                const NavTargetResolutionInternal = await Container.getServiceAsync("NavTargetResolutionInternal");
+                const oDeferred = NavTargetResolutionInternal.resolveHashFragmentLocal(`#${sAppIntent}${sParams}`);
+                const oResolvedHashFragment = await ushellUtils.promisify(oDeferred);
+
+                const oParsedHash = UrlParsing.parseShellHash(`#${sAppIntent}${sParams}`);
+                return {
+                    oResolvedHashFragment: oResolvedHashFragment,
+                    oParsedHash: oParsedHash
+                };
+            } else if (bEnableAppResolutionCache === true && oAppResolutionCache[sAppId]) {
+                return {
+                    oResolvedHashFragment: JSON.parse(JSON.stringify(oAppResolutionCache[sAppId]))
+                };
+            } else if (oAppResolution) {
+                return fnGetAppInfo();
+            }
+
+            const [oModule] = await ushellUtils.requireAsync([sAppResolutionModule.replace(/\./g, "/")]);
+            oAppResolution = oModule;
+            return fnGetAppInfo();
         };
 
         /**