@sapui5/sap.ushell 1.125.0 → 1.126.1

package/src/main/js/sap/ushell/services/ClientSideTargetResolution.js

@@ -29,7 +29,7 @@
  * In the future, the custom resolver mechanism should be probably moved towards modifying (or only adding to the list of Inbounds),
  * this way a single data source has to be altered to support consistently getLinks, isIntentSupported.
  *
- * @version 1.125.0
+ * @version 1.126.1
  */
 sap.ui.define([
     "sap/base/Log",
@@ -74,7 +74,7 @@ sap.ui.define([
     _VirtualInbounds,
     _XAppStateProcessing,
     TechnicalParameters,
-    UshellUtils,
+    ushellUtils,
     UrlParsing,
     Container
 ) {
@@ -230,24 +230,22 @@ sap.ui.define([
      * @since 1.34.0
      */
     ClientSideTargetResolution.prototype.resolveHashFragment = function (sHashFragment) {
-        var that = this;
         var oDeferred = new jQuery.Deferred();
         // NOTE: adapter may not implement fallback function
         var fnBoundFallback = this._oAdapter.resolveHashFragmentFallback && this._oAdapter.resolveHashFragmentFallback.bind(this._oAdapter);
         var aSegments = this._extractInboundFilter(sHashFragment);
 
-        this._oInboundProvider.getInbounds(aSegments).then(
-            function (oInboundIndex) {
-                that._resolveHashFragment(sHashFragment, fnBoundFallback, oInboundIndex)
-                    .done(function (o) {
-                        return oDeferred.resolve(o);
-                    })
-                    .fail(oDeferred.reject.bind(oDeferred));
-            },
-            function () {
-                oDeferred.reject.apply(oDeferred, arguments);
-            }
-        );
+        this._oInboundProvider.getInbounds(aSegments)
+            .then((oInboundIndex) => {
+                return this._resolveHashFragment(sHashFragment, fnBoundFallback, oInboundIndex);
+            })
+            .then((oResolvedHashFragment) => {
+                oDeferred.resolve(oResolvedHashFragment);
+            })
+            .catch((oError) => {
+                oDeferred.reject(oError);
+            });
+
         return oDeferred.promise();
     };
 
@@ -261,22 +259,22 @@ sap.ui.define([
      * @since 1.38.0
      */
     ClientSideTargetResolution.prototype.resolveTileIntent = function (sHashFragment) {
-        var that = this;
         var oDeferred = new jQuery.Deferred();
 
         // NOTE: adapter may not implement fallback function
         var aSegments = this._extractInboundFilter(sHashFragment);
 
-        this._oInboundProvider.getInbounds(aSegments).then(
-            function (oInboundIndex) {
-                that._resolveTileIntent(sHashFragment, undefined, oInboundIndex)
-                    .done(oDeferred.resolve.bind(oDeferred))
-                    .fail(oDeferred.reject.bind(oDeferred));
-            },
-            function () {
-                oDeferred.reject.apply(oDeferred, arguments);
-            }
-        );
+        this._oInboundProvider.getInbounds(aSegments)
+            .then((oInboundIndex) => {
+                return this._resolveTileIntent(sHashFragment, undefined, oInboundIndex);
+            })
+            .then((oResolvedIntent) => {
+                oDeferred.resolve(oResolvedIntent);
+            })
+            .catch((oError) => {
+                oDeferred.reject(oError);
+            });
+
         return oDeferred.promise();
     };
 
@@ -297,15 +295,17 @@ sap.ui.define([
         );
 
         this._resolveTileIntent(sHashFragment, undefined /* fnBoundFallback */, oInboundIndex)
-            .done(oDeferred.resolve.bind(oDeferred))
-            .fail(oDeferred.reject.bind(oDeferred));
+            .then((oResolvedTileIntent) => {
+                oDeferred.resolve(oResolvedTileIntent);
+            })
+            .catch((oError) => {
+                oDeferred.reject(oError);
+            });
 
         return oDeferred.promise();
     };
 
-    ClientSideTargetResolution.prototype._resolveHashFragment = function (sHashFragment, fnBoundFallback, oInboundIndex) {
-        var that = this;
-        var oDeferred = new jQuery.Deferred();
+    ClientSideTargetResolution.prototype._resolveHashFragment = async function (sHashFragment, fnBoundFallback, oInboundIndex) {
         var sFixedHashFragment = sHashFragment.indexOf("#") === 0 ? sHashFragment : "#" + sHashFragment;
         var oShellHash = UrlParsing.parseShellHash(sFixedHashFragment);
 
@@ -313,58 +313,44 @@ sap.ui.define([
             Log.error("Could not parse shell hash '" + sHashFragment + "'",
                 "please specify a valid shell hash",
                 "sap.ushell.services.ClientSideTargetResolution");
-            return oDeferred.reject().promise();
+            throw new Error(`Could not parse shell hash '${sHashFragment}'please specify a valid shell hash`);
         }
 
-        oShellHash.formFactor = UshellUtils.getFormFactor();
+        oShellHash.formFactor = ushellUtils.getFormFactor();
 
-        this._getMatchingInbounds(oShellHash, oInboundIndex, { bExcludeTileInbounds: true })
-            .fail(function (sError) {
-                Log.error("Could not resolve " + sHashFragment,
-                    "_getMatchingInbounds promise rejected with: " + sError,
-                    "sap.ushell.services.ClientSideTargetResolution");
-                oDeferred.reject(sError);
-            })
-            .done(function (aMatchingTargets) {
-                var oMatchingTarget;
-
-                if (aMatchingTargets.length === 0) {
-                    Log.warning(
-                        "Could not resolve " + sHashFragment,
-                        "rejecting promise",
-                        "sap.ushell.services.ClientSideTargetResolution"
-                    );
-                    oDeferred.reject("Could not resolve navigation target");
-                    return;
-                }
+        let aMatchingTargets = await this._getMatchingInbounds(oShellHash, oInboundIndex, { bExcludeTileInbounds: true });
 
-                aMatchingTargets = that._applySapNavigationScopeFilter(aMatchingTargets, oShellHash);
+        if (aMatchingTargets.length === 0) {
+            Log.warning(
+                "Could not resolve " + sHashFragment,
+                "rejecting promise",
+                "sap.ushell.services.ClientSideTargetResolution"
+            );
+            throw new Error(`Could not resolve ${sHashFragment}`);
+        }
 
-                oMatchingTarget = aMatchingTargets[0];
+        aMatchingTargets = this._applySapNavigationScopeFilter(aMatchingTargets, oShellHash);
 
-                if (Log.getLevel() >= Log.Level.DEBUG) {
-                    // replacer for JSON.stringify to show undefined values
-                    var fnUndefinedReplacer = function (sKey, vVal) {
-                        return (this[sKey] === undefined) ? "<undefined>" : vVal;
-                    };
-                    var fnReplacer = function (key, value) {
-                        return (key === "_original") ? undefined : fnUndefinedReplacer.call(this, key, value);
-                    };
-                    var sMatchedTarget = JSON.stringify(oMatchingTarget, fnReplacer, "   ");
+        const oMatchingTarget = aMatchingTargets[0];
 
-                    Log.debug(
-                        "The following target will now be resolved",
-                        sMatchedTarget,
-                        "sap.ushell.services.ClientSideTargetResolution"
-                    );
-                }
+        if (Log.getLevel() >= Log.Level.DEBUG) {
+            // replacer for JSON.stringify to show undefined values
+            var fnUndefinedReplacer = function (sKey, vVal) {
+                return (this[sKey] === undefined) ? "<undefined>" : vVal;
+            };
+            var fnReplacer = function (key, value) {
+                return (key === "_original") ? undefined : fnUndefinedReplacer.call(this, key, value);
+            };
+            var sMatchedTarget = JSON.stringify(oMatchingTarget, fnReplacer, "   ");
 
-                that._resolveSingleMatchingTarget(oMatchingTarget, fnBoundFallback, sFixedHashFragment)
-                    .done(oDeferred.resolve.bind(oDeferred))
-                    .fail(oDeferred.reject.bind(oDeferred));
-            });
+            Log.debug(
+                "The following target will now be resolved",
+                sMatchedTarget,
+                "sap.ushell.services.ClientSideTargetResolution"
+            );
+        }
 
-        return oDeferred.promise();
+        return this._resolveSingleMatchingTarget(oMatchingTarget, fnBoundFallback, sFixedHashFragment);
     };
 
     /**
@@ -394,9 +380,7 @@ sap.ui.define([
         return aFilteredResults.length > 0 ? aFilteredResults : aMatchResults;
     };
 
-    ClientSideTargetResolution.prototype._resolveSingleMatchingTarget = function (oMatchingTarget, fnBoundFallback, sFixedHashFragment) {
-        var that = this;
-        var oDeferred = new jQuery.Deferred();
+    ClientSideTargetResolution.prototype._resolveSingleMatchingTarget = async function (oMatchingTarget, fnBoundFallback, sFixedHashFragment) {
         var oIntent = UrlParsing.parseShellHash(sFixedHashFragment);
         var sIntent = [oIntent.semanticObject, oIntent.action].join("-");
         var sApplicationType = (oMatchingTarget.inbound.resolutionResult || {}).applicationType;
@@ -409,86 +393,77 @@ sap.ui.define([
         var bHasUrlTemplate = !!oMatchingTarget.inbound.templateContext;
         var fnEasyAccessMenuResolver = ApplicationType.getEasyAccessMenuResolver(sIntent, sApplicationType);
         if (fnEasyAccessMenuResolver && !bHasUrlTemplate) {
-            fnEasyAccessMenuResolver(oIntent, oMatchingTarget, fnExternalSystemAliasResolver, ApplicationType.WDA.enableWdaCompatibilityMode)
-                .then(
-                    function (oResolutionResult) {
-                        var oNavModeProperties = NavigationMode.getNavigationMode(
-                            oResolutionResult,
-                            (oMatchingTarget.intentParamsPlusAllDefaults["sap-ushell-navmode"] || [])[0],
-                            (oMatchingTarget.intentParamsPlusAllDefaults["sap-ushell-next-navmode"] || [])[0]
-                        );
-                        UshellUtils.shallowMergeObject(oResolutionResult, oNavModeProperties);
-                        oResolutionResult.inboundPermanentKey = oMatchingTarget.inbound.permanentKey || oMatchingTarget.inbound.id;
-                        oDeferred.resolve(oResolutionResult);
-                    },
-                    function (sError) {
-                        oDeferred.reject(sError);
-                    }
-                );
-            return oDeferred.promise();
+            const oResolutionResult = await fnEasyAccessMenuResolver(oIntent, oMatchingTarget, fnExternalSystemAliasResolver, ApplicationType.WDA.enableWdaCompatibilityMode);
+
+            const oNavModeProperties = NavigationMode.getNavigationMode(
+                oResolutionResult,
+                (oMatchingTarget.intentParamsPlusAllDefaults["sap-ushell-navmode"] || [])[0],
+                (oMatchingTarget.intentParamsPlusAllDefaults["sap-ushell-next-navmode"] || [])[0]
+            );
+            ushellUtils.shallowMergeObject(oResolutionResult, oNavModeProperties);
+            oResolutionResult.inboundPermanentKey = oMatchingTarget.inbound.permanentKey || oMatchingTarget.inbound.id;
+
+            return oResolutionResult;
         }
 
         var oReservedParameters = this._getReservedParameters(oMatchingTarget);
 
         // rename Parameters
         _ParameterMapping.mapParameterNamesAndRemoveObjects(oMatchingTarget);
-        Container.getServiceAsync("AppState").then(function (AppStateService) {
-            _XAppStateProcessing.mixAppStateIntoResolutionResultAndRename(oMatchingTarget, AppStateService)
-                .done(function (oMatchingTarget) {
-                    var fnResultProcessor = function () {
-                        return that._constructFallbackResolutionResult(oMatchingTarget, fnBoundFallback, sFixedHashFragment);
-                    };
-                    if (ApplicationType[sApplicationType]) {
-                        fnResultProcessor = ApplicationType[sApplicationType].generateResolutionResult;
-                    }
 
-                    // remove parameters that should not make it to the URL (in any case!)
-                    delete oMatchingTarget.intentParamsPlusAllDefaults["sap-tag"];
-                    delete oMatchingTarget.mappedIntentParamsPlusSimpleDefaults["sap-tag"];
-                    oMatchingTarget.mappedDefaultedParamNames = oMatchingTarget.mappedDefaultedParamNames.filter(function (sParameterName) {
-                        return sParameterName !== "sap-tag";
-                    });
-
-                    var sBaseUrl = ObjectPath.get("inbound.resolutionResult.url", oMatchingTarget);
-
-                    _PrelaunchOperations.executePrelaunchOperations(oMatchingTarget, oReservedParameters["sap-prelaunch-operations"])
-                        .then(function () {
-                            return fnResultProcessor(oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver);
-                        })
-                        .then(function (oResolutionResult) {
-                            var oNavModeProperties = NavigationMode.getNavigationMode(
-                                oResolutionResult,
-                                (oMatchingTarget.intentParamsPlusAllDefaults["sap-ushell-navmode"] || [])[0],
-                                (oMatchingTarget.intentParamsPlusAllDefaults["sap-ushell-next-navmode"] || [])[0]
-                            );
-                            UshellUtils.shallowMergeObject(oResolutionResult, oNavModeProperties);
+        const AppState = await Container.getServiceAsync("AppState");
+        oMatchingTarget = await _XAppStateProcessing.mixAppStateIntoResolutionResultAndRename(oMatchingTarget, AppState);
 
-                            oResolutionResult.reservedParameters = oReservedParameters;
-                            oResolutionResult.inboundPermanentKey = oMatchingTarget.inbound.permanentKey || oMatchingTarget.inbound.id;
-                            Log.debug(
-                                "Intent was resolved to the following target",
-                                JSON.stringify(oResolutionResult, null, 3),
-                                "sap.ushell.services.ClientSideTargetResolution"
-                            );
-                            UshellUtils.shallowMergeObject(oMatchingTarget.resolutionResult, oResolutionResult);
-                            oDeferred.resolve(oMatchingTarget.resolutionResult);
-                        }, function (vMessage) {
-                            if (typeof vMessage === "string" && vMessage.indexOf("fallback:") >= 0) {
-                                that._constructFallbackResolutionResult.call(this, oMatchingTarget, fnBoundFallback, sFixedHashFragment)
-                                    .then(
-                                        function (oResolutionResult) {
-                                            UshellUtils.shallowMergeObject(oMatchingTarget.resolutionResult, oResolutionResult);
-                                            oDeferred.resolve(oMatchingTarget.resolutionResult);
-                                        },
-                                        oDeferred.reject.bind(oDeferred)
-                                    );
-                            } else {
-                                oDeferred.reject(vMessage);
-                            }
-                        });
-                });
+        // remove parameters that should not make it to the URL (in any case!)
+        delete oMatchingTarget.intentParamsPlusAllDefaults["sap-tag"];
+        delete oMatchingTarget.mappedIntentParamsPlusSimpleDefaults["sap-tag"];
+        oMatchingTarget.mappedDefaultedParamNames = oMatchingTarget.mappedDefaultedParamNames.filter(function (sParameterName) {
+            return sParameterName !== "sap-tag";
         });
-        return oDeferred.promise();
+
+        var sBaseUrl = ObjectPath.get("inbound.resolutionResult.url", oMatchingTarget);
+
+        await _PrelaunchOperations.executePrelaunchOperations(oMatchingTarget, oReservedParameters["sap-prelaunch-operations"]);
+
+        try {
+            let fnResultProcessor;
+            if (ApplicationType[sApplicationType]) {
+                fnResultProcessor = ApplicationType[sApplicationType].generateResolutionResult;
+            } else {
+                fnResultProcessor = () => {
+                    return this._constructFallbackResolutionResult(oMatchingTarget, fnBoundFallback, sFixedHashFragment);
+                };
+            }
+            const oResolutionResult = await fnResultProcessor(oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver);
+
+            const oNavModeProperties = NavigationMode.getNavigationMode(
+                oResolutionResult,
+                (oMatchingTarget.intentParamsPlusAllDefaults["sap-ushell-navmode"] || [])[0],
+                (oMatchingTarget.intentParamsPlusAllDefaults["sap-ushell-next-navmode"] || [])[0]
+            );
+            ushellUtils.shallowMergeObject(oResolutionResult, oNavModeProperties);
+
+            oResolutionResult.reservedParameters = oReservedParameters;
+            oResolutionResult.inboundPermanentKey = oMatchingTarget.inbound.permanentKey || oMatchingTarget.inbound.id;
+
+            Log.debug(
+                "Intent was resolved to the following target",
+                JSON.stringify(oResolutionResult, null, 3),
+                "sap.ushell.services.ClientSideTargetResolution"
+            );
+            ushellUtils.shallowMergeObject(oMatchingTarget.resolutionResult, oResolutionResult);
+
+            return oMatchingTarget.resolutionResult;
+        } catch (vMessage) {
+            if (typeof vMessage === "string" && vMessage.indexOf("fallback:") >= 0) {
+                const oResolutionResult = await this._constructFallbackResolutionResult(oMatchingTarget, fnBoundFallback, sFixedHashFragment);
+                ushellUtils.shallowMergeObject(oMatchingTarget.resolutionResult, oResolutionResult);
+
+                return oMatchingTarget.resolutionResult;
+            }
+
+            throw vMessage;
+        }
     };
 
     /**‚
@@ -542,9 +517,7 @@ sap.ui.define([
         return oReservedParameters;
     };
 
-    ClientSideTargetResolution.prototype._resolveTileIntent = function (sHashFragment, fnBoundFallback, oInboundIndex) {
-        var that = this;
-        var oDeferred = new jQuery.Deferred();
+    ClientSideTargetResolution.prototype._resolveTileIntent = async function (sHashFragment, fnBoundFallback, oInboundIndex) {
         var sFixedHashFragment = sHashFragment.indexOf("#") === 0 ? sHashFragment : "#" + sHashFragment;
         var oShellHash = UrlParsing.parseShellHash(sFixedHashFragment);
 
@@ -554,45 +527,28 @@ sap.ui.define([
                 "please specify a valid shell hash",
                 "sap.ushell.services.ClientSideTargetResolution"
             );
-            return oDeferred.reject("Cannot parse shell hash").promise();
+            throw new Error("Cannot parse shell hash");
         }
 
-        oShellHash.formFactor = UshellUtils.getFormFactor();
+        oShellHash.formFactor = ushellUtils.getFormFactor();
 
-        this._getMatchingInbounds(oShellHash, oInboundIndex, { bExcludeTileInbounds: false })
-            .fail(function (sError) {
-                Log.error(
-                    "Could not resolve " + sHashFragment,
-                    "_getMatchingInbounds promise rejected with: " + sError,
-                    "sap.ushell.services.ClientSideTargetResolution"
-                );
-                oDeferred.reject(sError);
-            })
-            .done(function (aMatchingTargets) {
-                var oMatchingTarget;
-
-                if (aMatchingTargets.length === 0) {
-                    Log.warning(
-                        "Could not resolve " + sHashFragment,
-                        "no matching targets were found",
-                        "sap.ushell.services.ClientSideTargetResolution"
-                    );
-                    oDeferred.reject("No matching targets found");
-                    return;
-                }
+        const aMatchingTargets = await this._getMatchingInbounds(oShellHash, oInboundIndex, { bExcludeTileInbounds: false });
 
-                oMatchingTarget = aMatchingTargets[0];
-                that._resolveSingleMatchingTileIntent(oMatchingTarget, fnBoundFallback, sFixedHashFragment)
-                    .done(oDeferred.resolve.bind(oDeferred))
-                    .fail(oDeferred.reject.bind(oDeferred));
-            });
-        return oDeferred.promise();
+        if (aMatchingTargets.length === 0) {
+            Log.warning(
+                "Could not resolve " + sHashFragment,
+                "no matching targets were found",
+                "sap.ushell.services.ClientSideTargetResolution"
+            );
+            throw new Error("No matching targets found");
+        }
+
+        const oMatchingTarget = aMatchingTargets[0];
+        return this._resolveSingleMatchingTileIntent(oMatchingTarget, fnBoundFallback, sFixedHashFragment);
     };
 
-    ClientSideTargetResolution.prototype._resolveSingleMatchingTileIntent = function (oMatchingTarget, fnBoundFallback, sFixedHashFragment) {
-        var oDeferred = new jQuery.Deferred();
+    ClientSideTargetResolution.prototype._resolveSingleMatchingTileIntent = async function (oMatchingTarget, fnBoundFallback, sFixedHashFragment) {
         var sApplicationType = (oMatchingTarget.inbound.resolutionResult || {}).applicationType;
-        var that = this;
 
         var fnExternalSystemAliasResolver;
         if (this._oAdapter.resolveSystemAlias) {
@@ -601,55 +557,51 @@ sap.ui.define([
 
         // rename Parameters
         _ParameterMapping.mapParameterNamesAndRemoveObjects(oMatchingTarget);
-        Container.getServiceAsync("AppState").then(function (AppStateService) {
-            _XAppStateProcessing.mixAppStateIntoResolutionResultAndRename(oMatchingTarget, AppStateService)
-                .done(function (oMatchingTarget) {
-                    var fnResultProcessor = function () {
-                        return that._constructFallbackResolutionResult(oMatchingTarget, fnBoundFallback, sFixedHashFragment);
-                    };
-                    if (ApplicationType[sApplicationType]) {
-                        fnResultProcessor = ApplicationType[sApplicationType].generateResolutionResult;
-                    }
 
-                    // remove parameters that should not make it to the URL (in any case!)
-                    delete oMatchingTarget.intentParamsPlusAllDefaults["sap-tag"];
-                    delete oMatchingTarget.mappedIntentParamsPlusSimpleDefaults["sap-tag"];
-                    oMatchingTarget.mappedDefaultedParamNames = oMatchingTarget.mappedDefaultedParamNames.filter(function (sParameterName) {
-                        return sParameterName !== "sap-tag";
-                    });
+        const AppState = await Container.getServiceAsync("AppState");
+        oMatchingTarget = await _XAppStateProcessing.mixAppStateIntoResolutionResultAndRename(oMatchingTarget, AppState);
 
-                    var sBaseUrl = ObjectPath.get("inbound.resolutionResult.url", oMatchingTarget);
+        // remove parameters that should not make it to the URL (in any case!)
+        delete oMatchingTarget.intentParamsPlusAllDefaults["sap-tag"];
+        delete oMatchingTarget.mappedIntentParamsPlusSimpleDefaults["sap-tag"];
+        oMatchingTarget.mappedDefaultedParamNames = oMatchingTarget.mappedDefaultedParamNames.filter(function (sParameterName) {
+            return sParameterName !== "sap-tag";
+        });
 
-                    fnResultProcessor(oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver).then(
-                        function (oResolutionResult) {
-                            UshellUtils.shallowMergeObject(oMatchingTarget.resolutionResult, oResolutionResult);
+        var sBaseUrl = ObjectPath.get("inbound.resolutionResult.url", oMatchingTarget);
 
-                            // beware, shallow copy of central object! only modify root properties!
-                            var oTileResolutionResult = fnExtend({}, oMatchingTarget.inbound.tileResolutionResult);
+        let fnResultProcessor;
 
-                            oTileResolutionResult.startupParameters = oMatchingTarget.effectiveParameters;
+        if (ApplicationType[sApplicationType]) {
+            fnResultProcessor = ApplicationType[sApplicationType].generateResolutionResult;
+        } else {
+            fnResultProcessor = () => {
+                return this._constructFallbackResolutionResult(oMatchingTarget, fnBoundFallback, sFixedHashFragment);
+            };
+        }
 
-                            var oNavModeProperties = NavigationMode.getNavigationMode(
-                                oResolutionResult,
-                                (oMatchingTarget.intentParamsPlusAllDefaults["sap-ushell-navmode"] || [])[0],
-                                (oMatchingTarget.intentParamsPlusAllDefaults["sap-ushell-next-navmode"] || [])[0]
-                            );
-                            UshellUtils.shallowMergeObject(oTileResolutionResult, oNavModeProperties);
+        const oResolutionResult = await fnResultProcessor(oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver);
 
-                            oDeferred.resolve(oTileResolutionResult);
-                            Log.debug(
-                                "Tile Intent was resolved to the following target",
-                                JSON.stringify(oTileResolutionResult, null, 3),
-                                "sap.ushell.services.ClientSideTargetResolution"
-                            );
-                        },
-                        function (sMessage) {
-                            oDeferred.reject(sMessage);
-                        }
-                    );
-                });
-        });
-        return oDeferred.promise();
+        ushellUtils.shallowMergeObject(oMatchingTarget.resolutionResult, oResolutionResult);
+
+        // beware, shallow copy of central object! only modify root properties!
+        var oTileResolutionResult = fnExtend({}, oMatchingTarget.inbound.tileResolutionResult);
+
+        oTileResolutionResult.startupParameters = oMatchingTarget.effectiveParameters;
+
+        var oNavModeProperties = NavigationMode.getNavigationMode(
+            oResolutionResult,
+            (oMatchingTarget.intentParamsPlusAllDefaults["sap-ushell-navmode"] || [])[0],
+            (oMatchingTarget.intentParamsPlusAllDefaults["sap-ushell-next-navmode"] || [])[0]
+        );
+        ushellUtils.shallowMergeObject(oTileResolutionResult, oNavModeProperties);
+
+        Log.debug(
+            "Tile Intent was resolved to the following target",
+            JSON.stringify(oTileResolutionResult, null, 3),
+            "sap.ushell.services.ClientSideTargetResolution"
+        );
+        return oTileResolutionResult;
     };
 
     /**
@@ -673,7 +625,7 @@ sap.ui.define([
      *     <li>inbound that matched the hash fragment</li>
      *     <li>oEffectiveParameters, the parameters to be added to the resolved url</li>
      *   </ol>
-     *   This function must return a jQuery promise that is resolved with an object like:
+     *   This function must return a promise that is resolved with an object like:
      *   <pre>
      *   {
      *     applicationType: ...,
@@ -689,7 +641,7 @@ sap.ui.define([
      *   <code>fnBoundFallback</code> parameter was undefined or failed to produce a resolution result.
      * @private
      */
-    ClientSideTargetResolution.prototype._constructFallbackResolutionResult = function (oMatchingTarget, fnBoundFallback, sFixedHashFragment) {
+    ClientSideTargetResolution.prototype._constructFallbackResolutionResult = async function (oMatchingTarget, fnBoundFallback, sFixedHashFragment) {
         // The current flow is to resolve the result with all *uncompressed* default substituted parameters and alters
         // appState compress the url afterwards if needed (the fallback function takes care of this).
         var oEffectiveParameters = {};
@@ -712,7 +664,7 @@ sap.ui.define([
                 "sap.ushell.services.ClientSideTargetResolution"
             );
 
-            return Promise.reject("Cannot resolve hash fragment: no fallback provided.");
+            throw new Error("Cannot resolve hash fragment: no fallback provided.");
         }
 
         // fallback
@@ -723,25 +675,21 @@ sap.ui.define([
         );
 
         // NOTE: the callback function will be invoked with the effective *unmapped* parameter names! as 3rd argument
-        return new Promise(function (fnResolve, fnReject) {
-            fnBoundFallback(
-                sFixedHashFragment,
-                fnExtend({}, oMatchingTarget.inbound), // don't let adapters to change the inbound member
-                oEffectiveParameters
-            )
-                .done(function (oFallbackResolutionResult) {
-                    var oResolutionResult = {};
-                    // propagate properties from the resolution result returned by the fallback function
-                    ["applicationType", "additionalInformation", "url", "applicationDependencies", "text"].forEach(function (sPropName) {
-                        if (oFallbackResolutionResult.hasOwnProperty(sPropName)) {
-                            oResolutionResult[sPropName] = oFallbackResolutionResult[sPropName];
-                        }
-                    });
-
-                    fnResolve(oResolutionResult);
-                })
-                .fail(fnReject.bind(null));
+        const oFallbackResolutionResult = await ushellUtils.promisify(fnBoundFallback(
+            sFixedHashFragment,
+            fnExtend({}, oMatchingTarget.inbound), // don't let adapters to change the inbound member
+            oEffectiveParameters
+        ));
+
+        var oResolutionResult = {};
+        // propagate properties from the resolution result returned by the fallback function
+        ["applicationType", "additionalInformation", "url", "applicationDependencies", "text"].forEach(function (sPropName) {
+            if (oFallbackResolutionResult.hasOwnProperty(sPropName)) {
+                oResolutionResult[sPropName] = oFallbackResolutionResult[sPropName];
+            }
         });
+
+        return oResolutionResult;
     };
 
     /**
@@ -758,8 +706,8 @@ sap.ui.define([
     ClientSideTargetResolution.prototype.getDistinctSemanticObjects = function () {
         var oDeferred = new jQuery.Deferred();
 
-        this._oInboundProvider.getInbounds().then(
-            function (oInboundIndex) {
+        this._oInboundProvider.getInbounds()
+            .then((oInboundIndex) => {
                 var oSemanticObjects = {};
 
                 oInboundIndex.getAllInbounds().forEach(function (oInbound) {
@@ -769,14 +717,12 @@ sap.ui.define([
                     }
                 });
 
-                oDeferred.resolve(
-                    Object.keys(oSemanticObjects).sort()
-                );
-            },
-            function () {
-                oDeferred.reject.apply(oDeferred, arguments);
-            }
-        );
+                oDeferred.resolve(Object.keys(oSemanticObjects).sort());
+            })
+            .catch((oError) => {
+                oDeferred.reject(oError);
+            });
+
         return oDeferred.promise();
     };
 
@@ -825,8 +771,6 @@ sap.ui.define([
      * @since 1.38.0
      */
     ClientSideTargetResolution.prototype.getLinks = function (oArgs) {
-        var that = this;
-
         var oDeferred = new jQuery.Deferred();
         var oCallArgs;
 
@@ -870,16 +814,17 @@ sap.ui.define([
             return oDeferred.reject("invalid arguments for getLinks").promise();
         }
 
-        this._oInboundProvider.getInbounds().then(
-            function (oInboundIndex) {
-                that._getLinks(oCallArgs, oInboundIndex)
-                    .done(oDeferred.resolve.bind(oDeferred))
-                    .fail(oDeferred.reject.bind(oDeferred));
-            },
-            function () {
-                oDeferred.reject.apply(oDeferred, arguments);
-            }
-        );
+        this._oInboundProvider.getInbounds()
+            .then((oInboundIndex) => {
+                return this._getLinks(oCallArgs, oInboundIndex);
+            })
+            .then((aLinks) => {
+                oDeferred.resolve(aLinks);
+            })
+            .catch((oError) => {
+                oDeferred.reject(oError);
+            });
+
         return oDeferred.promise();
     };
 
@@ -956,7 +901,7 @@ sap.ui.define([
      *   }
      *   </pre>
      * @param {object} oInboundIndex An inbound index to retrieve the get semantic object links from.
-     * @returns {object[]} An array of link objects containing (at least) the following properties:
+     * @returns {Promise<object[]>} An array of link objects containing (at least) the following properties:
      *   <pre>
      *   {
      *     intent: "#AnObject-Action?A=B&C=e&C=j",
@@ -968,7 +913,7 @@ sap.ui.define([
      *   </pre>
      * @private
      */
-    ClientSideTargetResolution.prototype._getLinks = function (oArgs, oInboundIndex) {
+    ClientSideTargetResolution.prototype._getLinks = async function (oArgs, oInboundIndex) {
         var sSemanticObject = oArgs.semanticObject;
         var sAction = oArgs.action;
         var mParameters = oArgs.params;
@@ -996,12 +941,12 @@ sap.ui.define([
         }
 
         if (sErrorMessage) {
-            return new jQuery.Deferred().reject(sErrorMessage).promise();
+            throw new Error(sErrorMessage);
         }
 
         if (sSemanticObject === "*") {
             // shortcut: skip matching inbounds and return directly; it can only match "*" and we don't return it anyway
-            return jQuery.when([]);
+            return [];
         }
 
         /**
@@ -1012,172 +957,164 @@ sap.ui.define([
             return sBusinessParams ? "?" + sBusinessParams : "";
         }
 
-        var oDeferred = new jQuery.Deferred();
-        var sFormFactor = UshellUtils.getFormFactor();
+        var sFormFactor = ushellUtils.getFormFactor();
         var oAllIntentParams = UrlParsing.parseParameters(fnConstructBusinessParamsString(mParameters));
         var oShellHash = {
             semanticObject: (sSemanticObject === "" ? undefined : sSemanticObject),
             action: sAction, // undefined: match all actions
-            formFactor: (
-                bIgnoreFormFactor
-                    ? undefined // match any form factor
-                    : sFormFactor
-            ),
+            formFactor: (bIgnoreFormFactor ? undefined : sFormFactor), // undefined: match any form factor
             params: oAllIntentParams
         };
         if (bTreatTechHintAsFilter) {
             oShellHash.treatTechHintAsFilter = true;
         }
 
-        this._getMatchingInbounds(oShellHash, oInboundIndex, oInboundsConstraints)
-            .done(function (aMatchingTargets) {
-                var oUniqueIntents = {};
-                var aResults = aMatchingTargets.map(function (oMatchResult) {
-                    var sAdjustedSemanticObject = sSemanticObject || oMatchResult.inbound.semanticObject;
-                    var sIntent = "#" + sAdjustedSemanticObject + "-" + oMatchResult.inbound.action;
-                    var oNeededParameters;
+        const aMatchingTargets = await this._getMatchingInbounds(oShellHash, oInboundIndex, oInboundsConstraints);
 
-                    // we never return "*" semantic objects from getLinks as they are not parsable links
-                    if (sAdjustedSemanticObject === "*") {
-                        return undefined;
-                    }
+        var oUniqueIntents = {};
+        var aResults = aMatchingTargets
+            .map(function (oMatchResult) {
+                var sAdjustedSemanticObject = sSemanticObject || oMatchResult.inbound.semanticObject;
+                var sIntent = "#" + sAdjustedSemanticObject + "-" + oMatchResult.inbound.action;
+                var oNeededParameters;
 
-                    // we never want to return "*" actions from getLinks as they are non parsable links
-                    if (oMatchResult.inbound.action === "*") {
-                        return undefined;
-                    }
+                // we never return "*" semantic objects from getLinks as they are not parsable links
+                if (sAdjustedSemanticObject === "*") {
+                    return undefined;
+                }
 
-                    if (oMatchResult.inbound && oMatchResult.inbound.hasOwnProperty("hideIntentLink") && oMatchResult.inbound.hideIntentLink === true) {
-                        return undefined;
-                    }
+                // we never want to return "*" actions from getLinks as they are non parsable links
+                if (oMatchResult.inbound.action === "*") {
+                    return undefined;
+                }
 
-                    if (!oUniqueIntents.hasOwnProperty(sIntent)) {
-                        oUniqueIntents[sIntent] = {
-                            matchingInbound: oMatchResult.inbound,
-                            count: 1
-                        };
+                if (oMatchResult.inbound && oMatchResult.inbound.hasOwnProperty("hideIntentLink") && oMatchResult.inbound.hideIntentLink === true) {
+                    return undefined;
+                }
 
-                        if (oMatchResult.inbound.signature.additionalParameters === "ignored") {
-                            // in the result do not show all intent parameters, but only those mentioned by the inbound
-                            oNeededParameters = _Utils.filterObjectKeys(oAllIntentParams, function (sIntentParam) {
-                                return (sIntentParam.indexOf("sap-") === 0) ||
-                                    oMatchResult.inbound.signature.parameters.hasOwnProperty(sIntentParam);
-                            }, false);
-                        } else {
-                            oNeededParameters = oAllIntentParams;
-                        }
+                if (!oUniqueIntents.hasOwnProperty(sIntent)) {
+                    oUniqueIntents[sIntent] = {
+                        matchingInbound: oMatchResult.inbound,
+                        count: 1
+                    };
 
-                        // --- begin of post-match reject reasons
+                    if (oMatchResult.inbound.signature.additionalParameters === "ignored") {
+                        // in the result do not show all intent parameters, but only those mentioned by the inbound
+                        oNeededParameters = _Utils.filterObjectKeys(oAllIntentParams, function (sIntentParam) {
+                            return (sIntentParam.indexOf("sap-") === 0) || oMatchResult.inbound.signature.parameters.hasOwnProperty(sIntentParam);
+                        }, false);
+                    } else {
+                        oNeededParameters = oAllIntentParams;
+                    }
 
-                        if (bWithAtLeastOneUsedParam) {
-                            var bAtLeastOneNonSapParam = Object.keys(oNeededParameters).some(function (sNeededParamName) {
-                                return sNeededParamName.indexOf("sap-") !== 0;
-                            });
-                            if (!bAtLeastOneNonSapParam) {
-                                oUniqueIntents[sIntent].hideReason = "getLinks called with 'withAtLeastOneUsedParam = true', but the inbound had no business parameters defined.";
-                                return undefined;
-                            }
-                        }
+                    // --- begin of post-match reject reasons
 
-                        var bSignatureMeetsParameterOptions = _Utils.inboundSignatureMeetsParameterOptions(
-                            oMatchResult.inbound.signature.parameters,
-                            oArgs.paramsOptions || []
-                        );
-                        if (!bSignatureMeetsParameterOptions) {
-                            oUniqueIntents[sIntent].hideReason = "inbound signature does not meet the requested parameter filter options";
+                    if (bWithAtLeastOneUsedParam) {
+                        var bAtLeastOneNonSapParam = Object.keys(oNeededParameters).some(function (sNeededParamName) {
+                            return sNeededParamName.indexOf("sap-") !== 0;
+                        });
+                        if (!bAtLeastOneNonSapParam) {
+                            oUniqueIntents[sIntent].hideReason = "getLinks called with 'withAtLeastOneUsedParam = true', but the inbound had no business parameters defined.";
                             return undefined;
                         }
+                    }
 
-                        // --- end of post-match reject reasons
-
-                        var oResult = {
-                            intent: sIntent + fnConstructBusinessParamsString(oNeededParameters),
-                            text: oMatchResult.inbound.title
-                        };
+                    var bSignatureMeetsParameterOptions = _Utils.inboundSignatureMeetsParameterOptions(
+                        oMatchResult.inbound.signature.parameters,
+                        oArgs.paramsOptions || []
+                    );
+                    if (!bSignatureMeetsParameterOptions) {
+                        oUniqueIntents[sIntent].hideReason = "inbound signature does not meet the requested parameter filter options";
+                        return undefined;
+                    }
 
-                        if (oMatchResult.inbound.icon) {
-                            oResult.icon = oMatchResult.inbound.icon;
-                        }
-                        if (oMatchResult.inbound.subTitle) {
-                            oResult.subTitle = oMatchResult.inbound.subTitle;
-                        }
-                        if (oMatchResult.inbound.shortTitle) {
-                            oResult.shortTitle = oMatchResult.inbound.shortTitle;
-                        }
+                    // --- end of post-match reject reasons
 
-                        var sInboundTag = ObjectPath.get("inbound.signature.parameters.sap-tag.defaultValue.value", oMatchResult);
-                        if (sInboundTag) {
-                            oResult.tags = [sInboundTag];
-                        }
+                    var oResult = {
+                        intent: sIntent + fnConstructBusinessParamsString(oNeededParameters),
+                        text: oMatchResult.inbound.title
+                    };
 
-                        return oResult;
+                    if (oMatchResult.inbound.icon) {
+                        oResult.icon = oMatchResult.inbound.icon;
+                    }
+                    if (oMatchResult.inbound.subTitle) {
+                        oResult.subTitle = oMatchResult.inbound.subTitle;
+                    }
+                    if (oMatchResult.inbound.shortTitle) {
+                        oResult.shortTitle = oMatchResult.inbound.shortTitle;
                     }
-                    // for debugging purposes
-                    oUniqueIntents[sIntent].count++;
 
-                    return undefined;
-                }).filter(function (oSemanticObjectLink) {
-                    return typeof oSemanticObjectLink === "object";
-                });
+                    var sInboundTag = ObjectPath.get("inbound.signature.parameters.sap-tag.defaultValue.value", oMatchResult);
+                    if (sInboundTag) {
+                        oResult.tags = [sInboundTag];
+                    }
 
-                if (sSortProperty !== "priority") {
-                    aResults.sort(function (oGetSoLinksResult1, oGetSoLinksResult2) {
-                        return oGetSoLinksResult1[sSortProperty] < oGetSoLinksResult2[sSortProperty] ? -1 : 1;
-                    });
+                    return oResult;
                 }
+                // for debugging purposes
+                oUniqueIntents[sIntent].count++;
 
-                if (aResults.length === 0) {
-                    Log.debug("_getLinks returned no results");
-                } else if (Log.getLevel() >= Log.Level.DEBUG) {
-                    if (Log.getLevel() >= Log.Level.TRACE) {
-                        var aResultLines = [];
-                        var aHiddenResultLines = [];
-
-                        aResults.forEach(function (oResult) {
-                            var sIntent = oResult.intent.split("?")[0];
-
-                            if (oUniqueIntents[sIntent].hideReason) {
-                                aHiddenResultLines.push([
-                                    "-", sIntent + "(" + oUniqueIntents[sIntent].hideReason + ")\n",
-                                    " text:", oResult.text + "\n",
-                                    " full intent:", oResult.intent
-                                ].join(" "));
-                            } else {
-                                aResultLines.push([
-                                    "-", sIntent,
-                                    oUniqueIntents[sIntent].count > 1
-                                        ? "(" + (oUniqueIntents[sIntent].count - 1) + " others matched)\n"
-                                        : "\n",
-                                    "text:", oResult.text + "\n",
-                                    "full intent:", oResult.intent
-                                ].join(" "));
-                            }
-                        });
+                return undefined;
+            })
+            .filter(function (oSemanticObjectLink) {
+                return typeof oSemanticObjectLink === "object";
+            });
 
-                        Log.debug(
-                            "_getLinks filtered to the following unique intents:",
-                            "\n" + aResultLines.join("\n"),
-                            "sap.ushell.services.ClientSideTargetResolution"
-                        );
-
-                        Log.debug(
-                            "_getLinks would have also returned the following unique intents, but something prevented this:",
-                            aHiddenResultLines.join("\n"),
-                            "sap.ushell.services.ClientSideTargetResolution"
-                        );
+        if (sSortProperty !== "priority") {
+            aResults.sort(function (oGetSoLinksResult1, oGetSoLinksResult2) {
+                return oGetSoLinksResult1[sSortProperty] < oGetSoLinksResult2[sSortProperty] ? -1 : 1;
+            });
+        }
+
+        if (aResults.length === 0) {
+            Log.debug("_getLinks returned no results");
+        } else if (Log.getLevel() >= Log.Level.DEBUG) {
+            if (Log.getLevel() >= Log.Level.TRACE) {
+                var aResultLines = [];
+                var aHiddenResultLines = [];
+
+                aResults.forEach(function (oResult) {
+                    var sIntent = oResult.intent.split("?")[0];
+
+                    if (oUniqueIntents[sIntent].hideReason) {
+                        aHiddenResultLines.push([
+                            "-", sIntent + "(" + oUniqueIntents[sIntent].hideReason + ")\n",
+                            " text:", oResult.text + "\n",
+                            " full intent:", oResult.intent
+                        ].join(" "));
                     } else {
-                        Log.debug(
-                            "_getLinks filtered to unique intents.",
-                            "Reporting histogram: \n - " + Object.keys(oUniqueIntents).join("\n - "),
-                            "sap.ushell.services.ClientSideTargetResolution"
-                        );
+                        aResultLines.push([
+                            "-", sIntent,
+                            oUniqueIntents[sIntent].count > 1
+                                ? "(" + (oUniqueIntents[sIntent].count - 1) + " others matched)\n"
+                                : "\n",
+                            "text:", oResult.text + "\n",
+                            "full intent:", oResult.intent
+                        ].join(" "));
                     }
-                }
-                oDeferred.resolve(aResults);
-            })
-            .fail(oDeferred.reject.bind(oDeferred));
+                });
 
-        return oDeferred.promise();
+                Log.debug(
+                    "_getLinks filtered to the following unique intents:",
+                    "\n" + aResultLines.join("\n"),
+                    "sap.ushell.services.ClientSideTargetResolution"
+                );
+
+                Log.debug(
+                    "_getLinks would have also returned the following unique intents, but something prevented this:",
+                    aHiddenResultLines.join("\n"),
+                    "sap.ushell.services.ClientSideTargetResolution"
+                );
+            } else {
+                Log.debug(
+                    "_getLinks filtered to unique intents.",
+                    "Reporting histogram: \n - " + Object.keys(oUniqueIntents).join("\n - "),
+                    "sap.ushell.services.ClientSideTargetResolution"
+                );
+            }
+        }
+        return aResults;
     };
 
     /**
@@ -1208,18 +1145,17 @@ sap.ui.define([
      *   }
      *   </pre>
      * @param {string[]} [oConstraints.tags] Tags to which the queried inbounds should belong to.
-     * @returns {jQuery.Promise[]} A sorted array of matching targets.
+     * @returns {Promise<object[]>} A sorted array of matching targets.
      *   A target is a matching result that in addition has a specific priority with respect to other matching targets.
      * @private
      * @since 1.32.0
      */
-    ClientSideTargetResolution.prototype._getMatchingInbounds = function (oShellHash, oInboundIndex, oConstraints) {
+    ClientSideTargetResolution.prototype._getMatchingInbounds = async function (oShellHash, oInboundIndex, oConstraints) {
         var that = this;
         var aTags;
         var iLogId;
         var bExcludeTileInbounds;
         var aPreFilteredInbounds;
-        var oDeferred = new jQuery.Deferred();
 
         if (oConstraints) {
             aTags = oConstraints.tags;
@@ -1268,6 +1204,13 @@ sap.ui.define([
             };
         });
 
+        // output logs before returning
+        function endLogger () {
+            _StagedLogger.end(() => {
+                return { logId: iLogId };
+            });
+        }
+
         var sSemanticObject = oShellHash.semanticObject;
         var sAction = oShellHash.action;
         this._oShellHash = oShellHash;
@@ -1292,73 +1235,60 @@ sap.ui.define([
         }
 
         // initial match
-        _Search
-            .match(oShellHash, aPreFilteredInbounds, {} /* known default */, fnGetContentProviderLookup, Log.getLevel() >= Log.Level.DEBUG)
-            .then(function (oInitialMatchResult) {
-                // resolve References
+        const oInitialMatchResult = await _Search.match(oShellHash, aPreFilteredInbounds, {} /* known default */, fnGetContentProviderLookup, Log.getLevel() >= Log.Level.DEBUG);
 
-                _StagedLogger.log(function () {
-                    return {
-                        logId: iLogId,
-                        stage: 1,
-                        prefix: "\u2718", // heavy black X
-                        lines: Object.keys(oInitialMatchResult.noMatchReasons || {}).map(function (sInbound) {
-                            return sInbound + " " + oInitialMatchResult.noMatchReasons[sInbound];
-                        })
-                    };
-                });
-
-                _StagedLogger.log(function () {
-                    var aLines = oInitialMatchResult.matchResults.map(function (oMatchResult) {
-                        return _Formatter.formatInbound(oMatchResult.inbound);
-                    });
-                    return {
-                        logId: iLogId,
-                        stage: 1,
-                        prefix: aLines.length > 0
-                            ? "\u2705" // green checkmark
-                            : "\u2718", // heavy black X
-                        lines: aLines.length > 0
-                            ? aLines
-                            : ["No inbound was matched"]
-                    };
-                });
+        // ========================= Stage 1 ================================
+        // resolve References
+        _StagedLogger.log(function () {
+            return {
+                logId: iLogId,
+                stage: 1,
+                prefix: "\u2718", // heavy black X
+                lines: Object.keys(oInitialMatchResult.noMatchReasons || {}).map(function (sInbound) {
+                    return sInbound + " " + oInitialMatchResult.noMatchReasons[sInbound];
+                })
+            };
+        });
 
-                var oMissingReferences = {};
-                var bNeedToResolve = false;
-                var aContentProviders = Object.keys(oInitialMatchResult.missingReferences);
-                aContentProviders.forEach(function (sContentProviderId) {
-                    var aReferences = Object.keys(oInitialMatchResult.missingReferences[sContentProviderId]);
-                    bNeedToResolve = bNeedToResolve || aReferences.length > 0;
-                    oMissingReferences[sContentProviderId] = aReferences;
-                });
+        _StagedLogger.log(function () {
+            var aLines = oInitialMatchResult.matchResults.map(function (oMatchResult) {
+                return _Formatter.formatInbound(oMatchResult.inbound);
+            });
+            return {
+                logId: iLogId,
+                stage: 1,
+                prefix: aLines.length > 0
+                    ? "\u2705" // green checkmark
+                    : "\u2718", // heavy black X
+                lines: aLines.length > 0
+                    ? aLines
+                    : ["No inbound was matched"]
+            };
+        });
 
-                aContentProviders = aContentProviders.filter(function (sContentProviderId) {
-                    if (oMissingReferences[sContentProviderId].length > 0) {
-                        return true;
-                    }
-                    delete oMissingReferences[sContentProviderId];
-                    return false;
-                });
+        var oMissingReferences = {};
+        var bNeedToResolve = false;
+        var aContentProviders = Object.keys(oInitialMatchResult.missingReferences);
+        aContentProviders.forEach(function (sContentProviderId) {
+            var aReferences = Object.keys(oInitialMatchResult.missingReferences[sContentProviderId]);
+            bNeedToResolve = bNeedToResolve || aReferences.length > 0;
+            oMissingReferences[sContentProviderId] = aReferences;
+        });
 
-                // no references to resolve
-                if (!bNeedToResolve) {
-                    _StagedLogger.log(function () {
-                        return {
-                            logId: iLogId,
-                            stage: 2,
-                            prefix: "\u2705", // green checkmark
-                            line: "No need to resolve references"
-                        };
-                    });
+        aContentProviders = aContentProviders.filter(function (sContentProviderId) {
+            if (oMissingReferences[sContentProviderId].length > 0) {
+                return true;
+            }
+            delete oMissingReferences[sContentProviderId];
+            return false;
+        });
 
-                    return new jQuery.Deferred().resolve({
-                        matchResults: oInitialMatchResult.matchResults,
-                        referencesToInclude: null
-                    }).promise();
-                }
 
-                // must resolve references
+        // ========================= Stage 2 ================================
+        // resolve references
+        let oInitialMatchWithReferencesResult;
+        if (bNeedToResolve) {
+            try {
                 aContentProviders.forEach(function (sContentProviderId) {
                     _StagedLogger.log(function () {
                         return {
@@ -1371,161 +1301,152 @@ sap.ui.define([
                     });
                 });
 
-                var oReadyToRematchDeferred = new jQuery.Deferred();
-                Container.getServiceAsync("ReferenceResolver")
-                    .then(function (oReferenceResolver) {
-                        var aSystemContextPromises = aContentProviders.map(function (sContentProviderId) {
-                            return this.getSystemContext(sContentProviderId);
-                        }.bind(this));
-                        return Promise.all(aSystemContextPromises)
-                            .then(function (aSystemContexts) {
-                                var aReferencePromises = aContentProviders.map(function (sContentProviderId, iIndex) {
-                                    return new Promise(function (resolve, reject) {
-                                        oReferenceResolver.resolveReferences(oMissingReferences[sContentProviderId], aSystemContexts[iIndex])
-                                            .done(resolve)
-                                            .fail(reject);
-                                    });
-                                });
-                                return Promise.all(aReferencePromises);
-                            });
-                    }.bind(this))
-                    .then(function (aResolvedRefs) {
-                        var oResult = {
-                            matchResults: oInitialMatchResult.matchResults,
-                            referencesToInclude: {}
-                        };
-                        aContentProviders.forEach(function (sContentProviderId, iIndex) {
-                            var oResolvedRefs = aResolvedRefs[iIndex];
-                            oResult.referencesToInclude[sContentProviderId] = oResolvedRefs;
-                            if (Object.keys(oResolvedRefs).length > 0) {
-                                _StagedLogger.log(function () {
-                                    return {
-                                        logId: iLogId,
-                                        stage: 2,
-                                        line: "\u2705 resolved references with contentProviderId = \"" + sContentProviderId + "\" to the following values:",
-                                        prefix: "\u2022", // bullet point
-                                        lines: Object.keys(oResolvedRefs).map(function (sRefName) {
-                                            return sRefName + ": '" + oResolvedRefs[sRefName] + "'";
-                                        })
-                                    };
-                                });
-                            }
-                        });
-                        oReadyToRematchDeferred.resolve(oResult);
-                    })
-                    .catch(function (sError) {
+                const ReferenceResolver = await Container.getServiceAsync("ReferenceResolver");
+
+                const aSystemContexts = await Promise.all(aContentProviders.map((sContentProviderId) => {
+                    return this.getSystemContext(sContentProviderId);
+                }));
+                const aResolvedRefs = await Promise.all(aContentProviders.map(function (sContentProviderId, iIndex) {
+                    return ushellUtils.promisify(ReferenceResolver.resolveReferences(oMissingReferences[sContentProviderId], aSystemContexts[iIndex]));
+                }));
+
+                var oResult = {
+                    matchResults: oInitialMatchResult.matchResults,
+                    referencesToInclude: {}
+                };
+                aContentProviders.forEach(function (sContentProviderId, iIndex) {
+                    var oResolvedRefs = aResolvedRefs[iIndex];
+                    oResult.referencesToInclude[sContentProviderId] = oResolvedRefs;
+                    if (Object.keys(oResolvedRefs).length > 0) {
                         _StagedLogger.log(function () {
                             return {
                                 logId: iLogId,
                                 stage: 2,
-                                prefix: "\u274c", // red X
-                                line: "Failed to resolve references: " + sError
+                                line: "\u2705 resolved references with contentProviderId = \"" + sContentProviderId + "\" to the following values:",
+                                prefix: "\u2022", // bullet point
+                                lines: Object.keys(oResolvedRefs).map(function (sRefName) {
+                                    return sRefName + ": '" + oResolvedRefs[sRefName] + "'";
+                                })
                             };
                         });
-
-                        // don't continue processing, just exit with an empty result set
-                        oDeferred.resolve([]);
-                    });
-                return oReadyToRematchDeferred.promise();
-            }.bind(this))
-            .then(function (oInitialMatchWithReferencesResult) {
-                // re-match with resolved references
-                var oReferences = oInitialMatchWithReferencesResult.referencesToInclude;
-
-                if (!oReferences) {
-                    _StagedLogger.log(function () {
-                        return {
-                            logId: iLogId,
-                            stage: 3,
-                            line: "rematch was skipped (no references to resolve)",
-                            prefix: "\u2705" // green checkmark
-                        };
-                    });
-                    // no references, skip re-match
-                    return new jQuery.Deferred().resolve(oInitialMatchWithReferencesResult).promise();
-                }
-
-                // rematch using the set of the already matched inbounds
-                var aMatchResults = oInitialMatchWithReferencesResult.matchResults;
-                var aMatchingInbounds = aMatchResults.map(function (oMatchResult) {
-                    return oMatchResult.inbound;
+                    }
                 });
-
-                return _Search.match(oShellHash, aMatchingInbounds, oReferences, fnGetContentProviderLookup, 0 /* iDebugLevel */).then(function (oFinalMatchResult) {
-                    _StagedLogger.log(function () {
-                        var aMatchResults = oFinalMatchResult.matchResults || [];
-                        if (aMatchResults.length >= 1) {
-                            return {
-                                logId: iLogId,
-                                stage: 3,
-                                line: "The following inbounds re-matched:",
-                                lines: aMatchResults.map(function (oMatchResult) {
-                                    return _Formatter.formatInbound(oMatchResult.inbound);
-                                }),
-                                prefix: "\u2705" // green checkmark
-                            };
-                        }
-
-                        return {
-                            logId: iLogId,
-                            stage: 3,
-                            line: "No inbounds re-matched",
-                            prefix: "-"
-                        };
-                    });
-
-                    return oFinalMatchResult;
+                oInitialMatchWithReferencesResult = oResult;
+            } catch (sError) {
+                _StagedLogger.log(function () {
+                    return {
+                        logId: iLogId,
+                        stage: 2,
+                        prefix: "\u274c", // red X
+                        line: "Failed to resolve references: " + sError
+                    };
                 });
-            })
-            .then(function (oFinalMatchResult) {
-                // sorting
-
-                var aMatchResultsToSort = oFinalMatchResult.matchResults || [];
-                if (aMatchResultsToSort.length <= 1) {
-                    _StagedLogger.log(function () {
-                        return {
-                            logId: iLogId,
-                            stage: 4,
-                            line: "Nothing to sort"
-                        };
-                    });
 
-                    oDeferred.resolve(aMatchResultsToSort);
-                    return;
-                }
+                // don't continue processing, just exit with an empty result set
+                endLogger();
+                return [];
+            }
+        } else { // no references to resolve
+            _StagedLogger.log(function () {
+                return {
+                    logId: iLogId,
+                    stage: 2,
+                    prefix: "\u2705", // green checkmark
+                    line: "No need to resolve references"
+                };
+            });
 
-                var aSortedMatchResults = _Search.sortMatchingResultsDeterministic(oFinalMatchResult.matchResults || []);
+            oInitialMatchWithReferencesResult = {
+                matchResults: oInitialMatchResult.matchResults,
+                referencesToInclude: null
+            };
+        }
 
-                _StagedLogger.log(function () {
-                    var aLines = aSortedMatchResults.map(function (oMatchResult) {
-                        return _Formatter.formatInbound(oMatchResult.inbound || {}) +
-                            (oMatchResult.matchesVirtualInbound ? " (virtual)" : "")
-                            + "\n[ Sort Criteria ] "
-                            + "\n * 1 * sap-priority: '" + oMatchResult["sap-priority"] + "'"
-                            + "\n * 2 * Sort string: '" + oMatchResult.priorityString
-                            + "\n * 3 * Deterministic blob: '" + _Search.serializeMatchingResult(oMatchResult) + "'";
-                    });
+        // ========================= Stage 3 ================================
+        // re-match with resolved references
+        let oFinalMatchResult;
+        if (oInitialMatchWithReferencesResult.referencesToInclude) {
+            // rematch using the set of the already matched inbounds
+            var aMatchResults = oInitialMatchWithReferencesResult.matchResults;
+            var aMatchingInbounds = aMatchResults.map(function (oMatchResult) {
+                return oMatchResult.inbound;
+            });
 
+            oFinalMatchResult = await _Search.match(oShellHash, aMatchingInbounds, oInitialMatchWithReferencesResult.referencesToInclude, fnGetContentProviderLookup, 0 /* iDebugLevel */);
+            _StagedLogger.log(function () {
+                var aMatchResults = oFinalMatchResult.matchResults || [];
+                if (aMatchResults.length >= 1) {
                     return {
                         logId: iLogId,
-                        stage: 4,
-                        line: "Sorted inbounds as follows:",
-                        lines: aLines,
-                        prefix: ".",
-                        number: true
+                        stage: 3,
+                        line: "The following inbounds re-matched:",
+                        lines: aMatchResults.map(function (oMatchResult) {
+                            return _Formatter.formatInbound(oMatchResult.inbound);
+                        }),
+                        prefix: "\u2705" // green checkmark
                     };
-                });
+                }
 
-                oDeferred.resolve(aSortedMatchResults);
+                return {
+                    logId: iLogId,
+                    stage: 3,
+                    line: "No inbounds re-matched",
+                    prefix: "-"
+                };
+            });
+        } else { // no references, skip re-match
+            _StagedLogger.log(function () {
+                return {
+                    logId: iLogId,
+                    stage: 3,
+                    line: "rematch was skipped (no references to resolve)",
+                    prefix: "\u2705" // green checkmark
+                };
             });
+            oFinalMatchResult = oInitialMatchWithReferencesResult;
+        }
 
-        return oDeferred.promise().then(function (aMatchResults) {
-            // output logs before returning
-            _StagedLogger.end(function () {
-                return { logId: iLogId };
+        // ========================= Stage 4 ================================
+        // sorting
+        var aMatchResultsToSort = oFinalMatchResult.matchResults || [];
+        if (aMatchResultsToSort.length <= 1) {
+            _StagedLogger.log(function () {
+                return {
+                    logId: iLogId,
+                    stage: 4,
+                    line: "Nothing to sort"
+                };
             });
-            return aMatchResults;
+
+            endLogger();
+            return aMatchResultsToSort;
+        }
+
+        var aSortedMatchResults = _Search.sortMatchingResultsDeterministic(oFinalMatchResult.matchResults || []);
+
+        _StagedLogger.log(function () {
+            var aLines = aSortedMatchResults.map(function (oMatchResult) {
+                return _Formatter.formatInbound(oMatchResult.inbound || {}) +
+                    (oMatchResult.matchesVirtualInbound ? " (virtual)" : "")
+                    + "\n[ Sort Criteria ] "
+                    + "\n * 1 * sap-priority: '" + oMatchResult["sap-priority"] + "'"
+                    + "\n * 2 * Sort string: '" + oMatchResult.priorityString
+                    + "\n * 3 * Deterministic blob: '" + _Search.serializeMatchingResult(oMatchResult) + "'";
+            });
+
+            return {
+                logId: iLogId,
+                stage: 4,
+                line: "Sorted inbounds as follows:",
+                lines: aLines,
+                prefix: ".",
+                number: true
+            };
         });
+
+
+        endLogger();
+        return aSortedMatchResults;
     };
 
     /**
@@ -1533,34 +1454,26 @@ sap.ui.define([
      *
      * @param {string} sIntent The intent to be matched.
      * @param {object} oInboundIndex The index of the inbounds to be matched.
-     * @returns {jQuery.Promise} Resolves with a boolean if the intent is supported and rejected if not.
+     * @returns {Promise<boolean>} Resolves with a boolean if the intent is supported and rejected if not.
      *   The promise resolves to true if only one target matches the intent, and false if multiple targets match the intent.
      * @private
      * @since 1.32.0
      */
-    ClientSideTargetResolution.prototype._isIntentSupportedOne = function (sIntent, oInboundIndex) {
-        var oDeferred = new jQuery.Deferred();
+    ClientSideTargetResolution.prototype._isIntentSupportedOne = async function (sIntent, oInboundIndex) {
         var oShellHash = UrlParsing.parseShellHash(sIntent);
         // navigation to '#' is always considered possible
         if (sIntent === "#") {
-            oDeferred.resolve(true);
-            return oDeferred.promise();
+            return true;
         }
         if (oShellHash === undefined) {
-            return oDeferred.reject("Could not parse shell hash '" + sIntent + "'").promise();
+            throw new Error(`Could not parse shell hash '${sIntent}'`);
         }
 
-        oShellHash.formFactor = UshellUtils.getFormFactor();
+        oShellHash.formFactor = ushellUtils.getFormFactor();
 
-        this._getMatchingInbounds(oShellHash, oInboundIndex, { bExcludeTileInbounds: true })
-            .done(function (aTargets) {
-                oDeferred.resolve(aTargets.length > 0);
-            })
-            .fail(function () {
-                oDeferred.reject();
-            });
+        const aTargets = await this._getMatchingInbounds(oShellHash, oInboundIndex, { bExcludeTileInbounds: true });
 
-        return oDeferred.promise();
+        return aTargets.length > 0;
     };
 
     /**
@@ -1581,62 +1494,37 @@ sap.ui.define([
      * @since 1.32.0
      */
     ClientSideTargetResolution.prototype.isIntentSupported = function (aIntents) {
-        var that = this;
         var oDeferred = new jQuery.Deferred();
 
-        this._oInboundProvider.getInbounds().then(
-            function (oInboundIndex) {
-                that._isIntentSupported(aIntents, oInboundIndex)
-                    .done(oDeferred.resolve.bind(oDeferred))
-                    .fail(oDeferred.reject.bind(oDeferred));
-            },
-            function () {
-                oDeferred.reject.apply(oDeferred, arguments);
-            }
-        );
+        this._oInboundProvider.getInbounds()
+            .then((oInboundIndex) => {
+                return this._isIntentSupported(aIntents, oInboundIndex);
+            })
+            .then((oSupportedByIntent) => {
+                oDeferred.resolve(oSupportedByIntent);
+            })
+            .catch((oError) => {
+                oDeferred.reject(oError);
+            });
+
         return oDeferred.promise();
     };
 
-    ClientSideTargetResolution.prototype._isIntentSupported = function (aIntents, oInboundIndex) {
-        var that = this;
-        var oDeferred = new jQuery.Deferred();
-        var mSupportedByIntent = {};
-
-        oDeferred.resolve();
-
-        /**
-         * Sets the result for the given intent as indicated.
-         *
-         * @param {string} sIntent Intent string
-         * @param {boolean} bSupported Supported flag
-         */
-        function setResult (sIntent, bSupported) {
-            mSupportedByIntent[sIntent] = {
-                supported: bSupported
-            };
-        }
-
-        var aRejectErrors = [];
-
-        aIntents.forEach(function (sIntent) {
-            var oNextPromise = that._isIntentSupportedOne(sIntent, oInboundIndex);
-            oNextPromise.fail(function (sErrorMessage) {
-                aRejectErrors.push(sErrorMessage);
-            });
-            oNextPromise.done(function (bResult) {
-                setResult(sIntent, bResult);
-            });
-            oDeferred = jQuery.when(oDeferred, oNextPromise);
-        });
-
-        var oRes = new jQuery.Deferred();
-        oDeferred.done(function () {
-            oRes.resolve(mSupportedByIntent);
-        }).fail(function () {
-            oRes.reject("One or more input intents contain errors: " + aRejectErrors.join(", "));
-        });
+    ClientSideTargetResolution.prototype._isIntentSupported = async function (aIntents, oInboundIndex) {
+        var oSupportedByIntent = {};
+
+        await Promise.all(aIntents.map(async (sIntent) => {
+            try {
+                const bSupported = await this._isIntentSupportedOne(sIntent, oInboundIndex);
+                oSupportedByIntent[sIntent] = {
+                    supported: bSupported
+                };
+            } catch (oError) {
+                throw new Error(`One or more input intents contain errors: ${oError}`);
+            }
+        }));
 
-        return oRes.promise();
+        return oSupportedByIntent;
     };
 
     /**
@@ -1664,26 +1552,19 @@ sap.ui.define([
      */
     ClientSideTargetResolution.prototype.getUserDefaultParameterNames = function (oSystemContext) {
         // the empty objects may in future bear information like sap-system relevance
-        var that = this;
         var oDeferred = new jQuery.Deferred();
 
-        this._oInboundProvider.getInbounds().then(
+        this._oInboundProvider.getInbounds()
+            .then((oInboundIndex) => {
+                return this._getUserDefaultParameterNames(oInboundIndex.getAllInbounds(), oSystemContext);
+            })
+            .then((oRefs) => {
+                oDeferred.resolve(oRefs);
+            })
+            .catch((oError) => {
+                oDeferred.reject(oError);
+            });
 
-            function (oInboundIndex) {
-                that._getUserDefaultParameterNames(oInboundIndex.getAllInbounds(), oSystemContext)
-                    .then(
-                        function (oRef) {
-                            oDeferred.resolve(oRef);
-                        },
-                        function (e) {
-                            oDeferred.reject("Cannot get user default parameters from inbounds: " + e);
-                        }
-                    );
-            },
-            function () {
-                oDeferred.reject.apply(oDeferred, arguments);
-            }
-        );
         return oDeferred.promise();
     };
 
@@ -1779,8 +1660,8 @@ sap.ui.define([
         if (this._oHaveEasyAccessSystemsDeferreds[sMenuType]) {
             return this._oHaveEasyAccessSystemsDeferreds[sMenuType].promise();
         }
-        this._oHaveEasyAccessSystemsDeferreds[sMenuType] = new jQuery.Deferred();
-        var oDeferred = this._oHaveEasyAccessSystemsDeferreds[sMenuType]; // shorter name
+        var oDeferred = new jQuery.Deferred();
+        this._oHaveEasyAccessSystemsDeferreds[sMenuType] = oDeferred;
 
         function isValidEasyAccessMenuInbound (oInbound, sCurrentFormFactor, oValidMenuTypeIntents) {
             if (!oInbound) {
@@ -1817,62 +1698,62 @@ sap.ui.define([
             }, {})
         };
 
-        this._oInboundProvider.getInbounds().then(
-            function (oInboundIndex) { // all inbounds, no segments
+        this._oInboundProvider.getInbounds()
+            .then((oInboundIndex) => { // all inbounds, no segments
                 var oLastPriorityPerSystem = {};
 
-                oInboundIndex.getAllInbounds().filter(function (oInbound) {
-                    return isValidEasyAccessMenuInbound(
-                        oInbound, UshellUtils.getFormFactor(), oValidMenuTypeIntents
-                    );
-                }).forEach(function (oEasyAccessInbound) {
-                    // extract the data for the easy access system list
-                    var sSystemAliasName;
-                    if (fnIsPlainObject(oEasyAccessInbound.signature.parameters["sap-system"]) &&
-                        oEasyAccessInbound.signature.parameters["sap-system"].hasOwnProperty("filter")) {
-                        sSystemAliasName = ObjectPath.get("signature.parameters.sap-system.filter.value", oEasyAccessInbound);
-                    }
-
-                    if (typeof sSystemAliasName === "string") {
-                        /*
-                         * Code below builds the set of easy access system that should be displayed in the sapMenu/userMenu.
-                         * In case multiple inbounds exist with a certain system,
-                         * the app type with the highest priority is used to choose the title (see oActionDefinitions above).
-                         * Note that other app types should still appear in the result set (see 'appType' in the example result from jsdoc).
-                         */
-                        var iCurrentActionPriority = oActionDefinitions[oEasyAccessInbound.action].priority;
-                        var sCurrentActionAppType = oActionDefinitions[oEasyAccessInbound.action].appType;
-
-                        if (!oResultEasyAccessSystemSet[sSystemAliasName]) {
-                            // provide base structure...
-                            oLastPriorityPerSystem[sSystemAliasName] = -1;
-                            oResultEasyAccessSystemSet[sSystemAliasName] = {
-                                appType: {}
-                            };
+                oInboundIndex.getAllInbounds()
+                    .filter(function (oInbound) {
+                        return isValidEasyAccessMenuInbound(oInbound, ushellUtils.getFormFactor(), oValidMenuTypeIntents);
+                    })
+                    .forEach(function (oEasyAccessInbound) {
+                        // extract the data for the easy access system list
+                        var sSystemAliasName;
+                        if (fnIsPlainObject(oEasyAccessInbound.signature.parameters["sap-system"]) &&
+                            oEasyAccessInbound.signature.parameters["sap-system"].hasOwnProperty("filter")) {
+                            sSystemAliasName = ObjectPath.get("signature.parameters.sap-system.filter.value", oEasyAccessInbound);
                         }
 
-                        if (oLastPriorityPerSystem[sSystemAliasName] < iCurrentActionPriority) {
-                            // ...then populate in case
-                            oResultEasyAccessSystemSet[sSystemAliasName].text = oEasyAccessInbound.title;
-                            oLastPriorityPerSystem[sSystemAliasName] = iCurrentActionPriority;
-                        }
+                        if (typeof sSystemAliasName === "string") {
+                            /*
+                            * Code below builds the set of easy access system that should be displayed in the sapMenu/userMenu.
+                            * In case multiple inbounds exist with a certain system,
+                            * the app type with the highest priority is used to choose the title (see oActionDefinitions above).
+                            * Note that other app types should still appear in the result set (see 'appType' in the example result from jsdoc).
+                            */
+                            var iCurrentActionPriority = oActionDefinitions[oEasyAccessInbound.action].priority;
+                            var sCurrentActionAppType = oActionDefinitions[oEasyAccessInbound.action].appType;
+
+                            if (!oResultEasyAccessSystemSet[sSystemAliasName]) {
+                                // provide base structure...
+                                oLastPriorityPerSystem[sSystemAliasName] = -1;
+                                oResultEasyAccessSystemSet[sSystemAliasName] = {
+                                    appType: {}
+                                };
+                            }
 
-                        // keep track of all the app types
-                        oResultEasyAccessSystemSet[sSystemAliasName].appType[sCurrentActionAppType] = true;
-                    } else {
-                        Log.warning(
-                            "Cannot extract sap-system from easy access menu inbound: " + _Formatter.formatInbound(oEasyAccessInbound),
-                            "This parameter is supposed to be a string. Got '" + sSystemAliasName + "' instead.",
-                            "sap.ushell.services.ClientSideTargetResolution"
-                        );
-                    }
-                });
+                            if (oLastPriorityPerSystem[sSystemAliasName] < iCurrentActionPriority) {
+                                // ...then populate in case
+                                oResultEasyAccessSystemSet[sSystemAliasName].text = oEasyAccessInbound.title;
+                                oLastPriorityPerSystem[sSystemAliasName] = iCurrentActionPriority;
+                            }
+
+                            // keep track of all the app types
+                            oResultEasyAccessSystemSet[sSystemAliasName].appType[sCurrentActionAppType] = true;
+                        } else {
+                            Log.warning(
+                                "Cannot extract sap-system from easy access menu inbound: " + _Formatter.formatInbound(oEasyAccessInbound),
+                                "This parameter is supposed to be a string. Got '" + sSystemAliasName + "' instead.",
+                                "sap.ushell.services.ClientSideTargetResolution"
+                            );
+                        }
+                    });
                 oDeferred.resolve(oResultEasyAccessSystemSet);
-            },
-            function () {
-                oDeferred.reject.apply(oDeferred, arguments);
-            }
-        );
+            })
+            .catch((oError) => {
+                oDeferred.reject(oError);
+            });
+
         return oDeferred.promise();
     };
 
@@ -1893,20 +1774,14 @@ sap.ui.define([
      * @private
      * @since 1.78.0
      */
-    ClientSideTargetResolution.prototype.getSystemContext = function (systemId) {
+    ClientSideTargetResolution.prototype.getSystemContext = async function (systemId) {
         var sSystemId = systemId === undefined ? "" : systemId;
 
-        return new Promise(function (resolve, reject) {
-            var oSystemContext;
-            this._oAdapter.resolveSystemAlias(sSystemId)
-                .done(function (oResolvedSystemAlias) {
-                    oSystemContext = _SystemContext.createSystemContextFromSystemAlias(oResolvedSystemAlias);
-                    resolve(oSystemContext);
-                })
-                .fail(function (oError) {
-                    reject(oError);
-                });
-        }.bind(this));
+        const oResolvedSystemAlias = await ushellUtils.promisify(this._oAdapter.resolveSystemAlias(sSystemId));
+
+        const oSystemContext = _SystemContext.createSystemContextFromSystemAlias(oResolvedSystemAlias);
+
+        return oSystemContext;
     };
 
     ClientSideTargetResolution.hasNoAdapter = false;