@sapui5/sap.ushell 1.138.1 → 1.139.1

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

@@ -6,7 +6,7 @@
  * It exposes interfaces to perform a hash change and/or trigger an external navigation.
  *
  * @deprecated since 1.120. Please use {@link sap.ushell.services.Navigation} instead.
- * @version 1.138.1
+ * @version 1.139.1
  */
 sap.ui.define([
     "sap/ushell/services/AppConfiguration",
@@ -27,7 +27,7 @@ sap.ui.define([
     "sap/base/util/deepClone",
     "sap/ui/base/Object",
     "sap/ushell/api/common/ComponentInstantiation"
-], function (
+], (
     AppConfiguration,
     crossApplicationNavigationUtils,
     typeUtils,
@@ -46,7 +46,7 @@ sap.ui.define([
     deepClone,
     BaseObject,
     ComponentInstantiation
-) {
+) => {
     "use strict";
 
     /**
@@ -118,7 +118,7 @@ sap.ui.define([
      * @public
      */
     function CrossApplicationNavigation (oContainerInterface, sParameters, oServiceConf) {
-        var oServiceConfiguration;
+        let oServiceConfiguration;
         if (oServiceConf && oServiceConf.config) {
             oServiceConfiguration = oServiceConf.config;
         }
@@ -163,9 +163,9 @@ sap.ui.define([
          * @private
          */
         function getTargetWithCurrentSystem (vTarget, oComponent) {
-            var sSystem;
-            var sNextNavMode;
-            var sAppOrigin;
+            let sSystem;
+            let sNextNavMode;
+            let sAppOrigin;
 
             if (typeof vTarget !== "string" && !isPlainObject(vTarget) && vTarget !== undefined) {
                 Log.error("Unexpected input type", null, "sap.ushell.services.CrossApplicationNavigation");
@@ -176,7 +176,7 @@ sap.ui.define([
                 return undefined;
             }
 
-            var oResolution = AppConfiguration.getCurrentApplication();
+            const oResolution = AppConfiguration.getCurrentApplication();
             if (oComponent) {
                 // Take sap-system, sap-ushell-next-navmode and sap-app-origin-hint parameters from the component
                 if (typeof oComponent.getComponentData !== "function" ||
@@ -189,7 +189,7 @@ sap.ui.define([
                         "sap.ushell.services.CrossApplicationNavigation"
                     );
                 } else {
-                    var oComponentStartupParams = oComponent.getComponentData().startupParameters; // assume always present on root component
+                    const oComponentStartupParams = oComponent.getComponentData().startupParameters; // assume always present on root component
                     if (oComponentStartupParams.hasOwnProperty("sap-system")) {
                         sSystem = oComponentStartupParams["sap-system"][0];
                     }
@@ -215,7 +215,7 @@ sap.ui.define([
                 sAppOrigin = oResolution.contentProviderId;
             }
 
-            var vInjectedTarget = crossApplicationNavigationUtils._injectParameters({
+            const vInjectedTarget = crossApplicationNavigationUtils._injectParameters({
                 type: typeUtils,
                 inject: {
                     "sap-system": sSystem,
@@ -315,7 +315,7 @@ sap.ui.define([
 
             if (isPlainObject(vTarget)) {
                 // needs deep copy
-                var oClonedTarget = deepExtend({}, vTarget);
+                const oClonedTarget = deepExtend({}, vTarget);
                 if (oClonedTarget.target && oClonedTarget.target.shellHash) {
                     if (typeof oClonedTarget.target.shellHash === "string") {
                         // process shell hash as a string
@@ -332,11 +332,11 @@ sap.ui.define([
 
                 return oClonedTarget;
             }
-            var sShellHash = vTarget;
+            let sShellHash = vTarget;
 
             if (!/[?&]sap-system=/.test(sShellHash)) {
-                var sSeparator = (sShellHash.indexOf("?") > -1) ? "&" : "?";
-                sShellHash += sSeparator + "sap-ushell-enc-test=" + encodeURIComponent("A B%20C");
+                const sSeparator = (sShellHash.indexOf("?") > -1) ? "&" : "?";
+                sShellHash += `${sSeparator}sap-ushell-enc-test=${encodeURIComponent("A B%20C")}`;
             }
             return sShellHash;
         }
@@ -381,24 +381,22 @@ sap.ui.define([
          * @private
          */
         this._extractInnerAppRoute = function (vIntent) {
-            var that = this;
-
             if (typeof vIntent === "string") {
-                var aParts = vIntent.split("&/"); // ["Object-action", "inner-app/route", ... ]
-                var sIntent = aParts.shift(); // aParts now contains parts of inner-app route
+                const aParts = vIntent.split("&/"); // ["Object-action", "inner-app/route", ... ]
+                const sIntent = aParts.shift(); // aParts now contains parts of inner-app route
 
                 return {
                     intent: sIntent,
                     innerAppRoute: aParts.length > 0
-                        ? "&/" + aParts.join("&/")
+                        ? `&/${aParts.join("&/")}`
                         : ""
                 };
             }
 
             if (Object.prototype.toString.apply(vIntent) === "[object Object]") {
-                var sShellHash = ObjectPath.get("target.shellHash", vIntent);
+                const sShellHash = ObjectPath.get("target.shellHash", vIntent);
                 if (typeof sShellHash === "string") {
-                    var oResult = that._extractInnerAppRoute(sShellHash);
+                    const oResult = this._extractInnerAppRoute(sShellHash);
 
                     // modify the source object
                     vIntent.target.shellHash = oResult.intent;
@@ -410,17 +408,17 @@ sap.ui.define([
                 }
 
                 if (vIntent.hasOwnProperty("appSpecificRoute")) {
-                    var vAppSpecificRoute = vIntent.appSpecificRoute;
+                    const vAppSpecificRoute = vIntent.appSpecificRoute;
 
                     delete vIntent.appSpecificRoute;
 
-                    var bIsStringWithoutSeparator = typeof vAppSpecificRoute === "string"
+                    const bIsStringWithoutSeparator = typeof vAppSpecificRoute === "string"
                         && vAppSpecificRoute.indexOf("&/") !== 0
                         && vAppSpecificRoute.length > 0;
 
                     return {
                         innerAppRoute: bIsStringWithoutSeparator
-                            ? "&/" + vAppSpecificRoute // vAppSpecificRoute guaranteed to be string
+                            ? `&/${vAppSpecificRoute}` // vAppSpecificRoute guaranteed to be string
                             : vAppSpecificRoute, // can be an object
                         intent: vIntent
                     };
@@ -451,8 +449,6 @@ sap.ui.define([
          * @private
          */
         this._injectInnerAppRoute = function (vIntent, sInnerAppRoute) {
-            var that = this;
-
             if (!sInnerAppRoute) {
                 return vIntent;
             }
@@ -462,9 +458,9 @@ sap.ui.define([
             }
 
             if (Object.prototype.toString.apply(vIntent) === "[object Object]") {
-                var sShellHash = ObjectPath.get("target.shellHash", vIntent);
+                const sShellHash = ObjectPath.get("target.shellHash", vIntent);
                 if (typeof sShellHash === "string") {
-                    vIntent.target.shellHash = that._injectInnerAppRoute(
+                    vIntent.target.shellHash = this._injectInnerAppRoute(
                         sShellHash, sInnerAppRoute
                     );
 
@@ -554,7 +550,7 @@ sap.ui.define([
             }
 
             if (bAsync) {
-                var oDeferred = new jQuery.Deferred();
+                const oDeferred = new jQuery.Deferred();
                 this.hrefForExternalAsync(oArgs, oComponent)
                     .then(oDeferred.resolve)
                     .catch(oDeferred.reject);
@@ -569,10 +565,10 @@ sap.ui.define([
 
             // clone because _extractInnerAppRoute may change the original structure
             // (we don't want to create side effects on the original object).
-            var oArgsClone = merge({}, oArgs);
-            var oExtraction = this._extractInnerAppRoute(oArgsClone);
+            let oArgsClone = merge({}, oArgs);
+            const oExtraction = this._extractInnerAppRoute(oArgsClone);
 
-            var vIntentNoAppRoute = oExtraction.intent;
+            const vIntentNoAppRoute = oExtraction.intent;
 
             crossApplicationNavigationUtils.addXAppStateFromParameter(
                 vIntentNoAppRoute,
@@ -590,7 +586,7 @@ sap.ui.define([
 
             oArgsClone = this._injectInnerAppRoute(oArgsClone, oExtraction.innerAppRoute);
 
-            var ShellNavigationInternal = sap.ushell.Container.getService("ShellNavigationInternal"); // LEGACY API (deprecated)
+            const ShellNavigationInternal = sap.ushell.Container.getService("ShellNavigationInternal"); // LEGACY API (deprecated)
 
             if (!ShellNavigationInternal) {
                 Log.debug("Shell not available, no Cross App Navigation");
@@ -673,48 +669,38 @@ sap.ui.define([
          * @since 1.94.0
          * @public
          */
-        this.hrefForExternalAsync = function (oArgs, oComponent) {
+        this.hrefForExternalAsync = async function (oArgs, oComponent) {
             // clone because _extractInnerAppRoute may change the original structure
             // (we don't want to create side effects on the original object).
-            var oArgsClone = merge({}, oArgs);
-            var oExtraction = this._extractInnerAppRoute(oArgsClone);
-
-            var vIntentNoAppRoute = oExtraction.intent;
-
-            return Promise.resolve()
-                .then(function () {
-                    return crossApplicationNavigationUtils.addXAppStateFromParameterAsync(
-                        vIntentNoAppRoute,
-                        "sap-xapp-state-data" /* parameter containing data */
-                    );
-                })
-                .then(function () {
-                    oArgsClone = getTargetWithCurrentSystem(vIntentNoAppRoute, oComponent);
-                    return crossApplicationNavigationUtils.injectStickyParametersAsync({
-                        args: oArgsClone,
-                        appLifeCycle: AppLifeCycleAI,
-                        technicalParameters: TechnicalParameters,
-                        type: typeUtils
-                    });
-                })
-                .then(function (oArgsCloneResult) {
-                    oArgsClone = oArgsCloneResult;
-                    oArgsClone = amendTargetWithSapUshellEncTestParameter(oArgsClone);
-                    oArgsClone = this._injectInnerAppRoute(oArgsClone, oExtraction.innerAppRoute);
-
-                    return sap.ushell.Container.getServiceAsync("ShellNavigationInternal");
-                }.bind(this))
-                .then(function (ShellNavigationInternal) {
-                    return new Promise(function (resolve, reject) {
-                        ShellNavigationInternal.hrefForExternal(oArgsClone, undefined, oComponent)
-                            .then(resolve)
-                            .catch(reject);
-                    });
-                })
-                .catch(function () {
-                    Log.debug("Shell not available, no Cross App Navigation");
-                    return "";
+            let oArgsClone = merge({}, oArgs);
+            const oExtraction = this._extractInnerAppRoute(oArgsClone);
+
+            const vIntentNoAppRoute = oExtraction.intent;
+
+            try {
+                /* parameter containing data */
+                await crossApplicationNavigationUtils.addXAppStateFromParameterAsync(vIntentNoAppRoute, "sap-xapp-state-data");
+                oArgsClone = getTargetWithCurrentSystem(vIntentNoAppRoute, oComponent);
+                const oArgsCloneResult = await crossApplicationNavigationUtils.injectStickyParametersAsync({
+                    args: oArgsClone,
+                    appLifeCycle: AppLifeCycleAI,
+                    technicalParameters: TechnicalParameters,
+                    type: typeUtils
+                });
+                oArgsClone = oArgsCloneResult;
+                oArgsClone = amendTargetWithSapUshellEncTestParameter(oArgsClone);
+                oArgsClone = this._injectInnerAppRoute(oArgsClone, oExtraction.innerAppRoute);
+
+                const ShellNavigationInternal = await sap.ushell.Container.getServiceAsync("ShellNavigationInternal");
+                return new Promise((resolve, reject) => {
+                    ShellNavigationInternal.hrefForExternal(oArgsClone, undefined, oComponent)
+                        .then(resolve)
+                        .catch(reject);
                 });
+            } catch (oError) {
+                Log.debug("Shell not available, no Cross App Navigation");
+                return "";
+            }
         };
 
         /**
@@ -727,9 +713,9 @@ sap.ui.define([
          * @public
          */
         this.expandCompactHash = function (sHashFragment) {
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
-            sap.ushell.Container.getServiceAsync("NavTargetResolutionInternal").then(function (NavTargetResolutionInternal) {
+            sap.ushell.Container.getServiceAsync("NavTargetResolutionInternal").then((NavTargetResolutionInternal) => {
                 NavTargetResolutionInternal.expandCompactHash(sHashFragment)
                     .done(oDeferred.resolve)
                     .fail(oDeferred.reject);
@@ -747,21 +733,18 @@ sap.ui.define([
          * Note that the behavior of this method is subject to change and therefore it may not yield to the expected results
          * especially on mobile devices where "back" is the previous inner-app state if these are put into the history!
          *
-         * @returns {Promise<undefined>} A promise which resolves once the back navigation was triggered
+         * @returns {Promise} A promise which resolves once the back navigation was triggered
          *
          * @public
          */
-        this.backToPreviousApp = function () {
-            return this.isInitialNavigationAsync()
-                .then(function (bIsInitial) {
-                    if (bIsInitial) {
-                        // go back home
-                        return this.toExternal({ target: { shellHash: "#" }, writeHistory: false });
-                    }
+        this.backToPreviousApp = async function () {
+            const bIsInitial = await this.isInitialNavigationAsync();
+            if (bIsInitial) {
+                // go back home
+                return this.toExternal({ target: { shellHash: "#" }, writeHistory: false });
+            }
 
-                    this.historyBack();
-                    return undefined;
-                }.bind(this));
+            this.historyBack();
         };
 
         /**
@@ -773,7 +756,7 @@ sap.ui.define([
          * @public
          */
         this.historyBack = function (iSteps) {
-            var iActualStepsBack = -1;
+            let iActualStepsBack = -1;
             if (iSteps && typeof iSteps === "number") {
                 if (iSteps <= 0) {
                     Log.warning(
@@ -804,8 +787,8 @@ sap.ui.define([
                 "sap.ushell.services.CrossApplicationNavigation"
             );
 
-            var oContainer = ObjectPath.get("sap.ushell.Container");
-            var oShellNavigationInternal = oContainer
+            const oContainer = ObjectPath.get("sap.ushell.Container");
+            const oShellNavigationInternal = oContainer
                 && typeof oContainer.getService === "function"
                 && oContainer.getService("ShellNavigationInternal");
 
@@ -818,7 +801,7 @@ sap.ui.define([
                 return true;
             }
 
-            var bIsInitialNavigation = oShellNavigationInternal.isInitialNavigation();
+            const bIsInitialNavigation = oShellNavigationInternal.isInitialNavigation();
 
             // An undefined value indicates that the ShellNavigationInternal service did not initialize the ShellNavigationHashChanger yet.
             // Hence this is the first navigation in case asked at this point in time.
@@ -839,27 +822,26 @@ sap.ui.define([
          * @since 1.94.0
          * @public
          */
-        this.isInitialNavigationAsync = function () {
-            return sap.ushell.Container.getServiceAsync("ShellNavigationInternal")
-                .then(function (ShellNavigationInternal) {
-                    var bIsInitialNavigation = ShellNavigationInternal.isInitialNavigation();
-
-                    // An undefined value indicates that the ShellNavigationInternal service did not initialize the ShellNavigationHashChanger yet.
-                    // Hence this is the first navigation in case asked at this point in time.
-                    if (typeof bIsInitialNavigation === "undefined") {
-                        return true;
-                    }
-
-                    return bIsInitialNavigation;
-                })
-                .catch(function () {
-                    Log.debug(
-                        "ShellNavigationInternal service not available",
-                        "This will be treated as the initial navigation",
-                        "sap.ushell.services.CrossApplicationNavigation"
-                    );
+        this.isInitialNavigationAsync = async function () {
+            try {
+                const ShellNavigationInternal = await sap.ushell.Container.getServiceAsync("ShellNavigationInternal");
+                const bIsInitialNavigation = ShellNavigationInternal.isInitialNavigation();
+
+                // An undefined value indicates that the ShellNavigationInternal service did not initialize the ShellNavigationHashChanger yet.
+                // Hence this is the first navigation in case asked at this point in time.
+                if (typeof bIsInitialNavigation === "undefined") {
                     return true;
-                });
+                }
+
+                return bIsInitialNavigation;
+            } catch (oError) {
+                Log.debug(
+                    "ShellNavigationInternal service not available",
+                    "This will be treated as the initial navigation",
+                    "sap.ushell.services.CrossApplicationNavigation"
+                );
+                return true;
+            }
         };
 
         /**
@@ -950,65 +932,50 @@ sap.ui.define([
          *
          * @param {object} [oComponent] an optional UI5 component, used to logically attach a possibly generated app state.
          *
-         * @returns {Promise<undefined>} A <code>Promise</code> which resolves once the navigation was triggered. The <code>Promise</code> might never reject or resolve
+         * @returns {Promise} A <code>Promise</code> which resolves once the navigation was triggered. The <code>Promise</code> might never reject or resolve
          * when an error occurs during the navigation.
          *
          * @since 1.15.0
          * @public
          */
-        this.toExternal = function (oArgs, oComponent) {
-            var bWriteHistory = oArgs.writeHistory;
+        this.toExternal = async function (oArgs, oComponent) {
+            const bWriteHistory = oArgs.writeHistory;
             // clone because _extractInnerAppRoute may change the original structure
             // (we don't want to create side effects on the original object).
-            var oArgsClone = merge({}, oArgs);
+            let oArgsClone = merge({}, oArgs);
             // clone again because _extractInnerAppRoute may change the original structure
-            var oNavTarget = merge({}, oArgsClone);
+            const oNavTarget = merge({}, oArgsClone);
             this._processShellHashWithParams(oArgsClone);
-            var oExtraction = this._extractInnerAppRoute(oArgsClone);
-
-            var vIntentNoAppRoute = oExtraction.intent;
-            var oShellNavigationInternal;
-            var oCurrentApplication;
-
-            return Promise.all([
-                sap.ushell.Container.getServiceAsync("AppLifeCycle"),
-                sap.ushell.Container.getServiceAsync("ShellNavigationInternal")
-            ])
-                .then(function (aServices) {
-                    var oAppLifeCycleService = aServices[0];
-                    oShellNavigationInternal = aServices[1];
-                    oCurrentApplication = oAppLifeCycleService.getCurrentApplication();
-                    return oCurrentApplication && oCurrentApplication.getIntent();
-                })
-                .then(function (oIntent) {
-                    this._checkIfAppNeedsToBeReloaded(oNavTarget, oCurrentApplication, oIntent, oShellNavigationInternal.hashChanger);
-                    return crossApplicationNavigationUtils.addXAppStateFromParameterAsync(
-                        vIntentNoAppRoute,
-                        "sap-xapp-state-data" /* parameter containing data */
-                    );
-                }.bind(this))
-                .then(function () {
-                    oArgsClone = getTargetWithCurrentSystem(vIntentNoAppRoute, oComponent);
-                    return crossApplicationNavigationUtils.injectStickyParametersAsync({
-                        args: oArgsClone,
-                        appLifeCycle: AppLifeCycleAI,
-                        technicalParameters: TechnicalParameters,
-                        type: typeUtils
-                    });
-                })
-                .then(function (oArgsCloneResult) {
-                    oArgsClone = oArgsCloneResult;
-                    oArgsClone = amendTargetWithSapUshellEncTestParameter(oArgsClone);
+            const oExtraction = this._extractInnerAppRoute(oArgsClone);
+
+            const vIntentNoAppRoute = oExtraction.intent;
+
+            try {
+                const oAppLifeCycleService = await sap.ushell.Container.getServiceAsync("AppLifeCycle");
+                const oShellNavigationInternal = await sap.ushell.Container.getServiceAsync("ShellNavigationInternal");
+                const oCurrentApplication = oAppLifeCycleService.getCurrentApplication();
+                const oIntent = oCurrentApplication && await oCurrentApplication.getIntent();
+                this._checkIfAppNeedsToBeReloaded(oNavTarget, oCurrentApplication, oIntent, oShellNavigationInternal.hashChanger);
+                /* parameter containing data */
+                await crossApplicationNavigationUtils.addXAppStateFromParameterAsync(vIntentNoAppRoute, "sap-xapp-state-data");
+                oArgsClone = getTargetWithCurrentSystem(vIntentNoAppRoute, oComponent);
+                const oArgsCloneResult = await crossApplicationNavigationUtils.injectStickyParametersAsync({
+                    args: oArgsClone,
+                    appLifeCycle: AppLifeCycleAI,
+                    technicalParameters: TechnicalParameters,
+                    type: typeUtils
+                });
+                oArgsClone = oArgsCloneResult;
+                oArgsClone = amendTargetWithSapUshellEncTestParameter(oArgsClone);
 
-                    delete oArgsClone.writeHistory;
+                delete oArgsClone.writeHistory;
 
-                    oArgsClone = this._injectInnerAppRoute(oArgsClone, oExtraction.innerAppRoute);
+                oArgsClone = this._injectInnerAppRoute(oArgsClone, oExtraction.innerAppRoute);
 
-                    return oShellNavigationInternal.toExternal(oArgsClone, oComponent, bWriteHistory);
-                }.bind(this))
-                .catch(function (oError) {
-                    Log.error("CrossAppNavigation.toExternal failed", oError, "sap.ushell.services.CrossApplicationNavigation");
-                });
+                return await oShellNavigationInternal.toExternal(oArgsClone, oComponent, bWriteHistory);
+            } catch (oError) {
+                Log.error("CrossAppNavigation.toExternal failed", oError, "sap.ushell.services.CrossApplicationNavigation");
+            }
         };
 
         /**
@@ -1030,7 +997,7 @@ sap.ui.define([
 
             if (navTarget.target.shellHash) {
                 // convert shell hash in to semantic object and action form
-                var oHash = UrlParsing.parseShellHash(navTarget.target.shellHash) || {};
+                const oHash = UrlParsing.parseShellHash(navTarget.target.shellHash) || {};
 
                 navTarget.target = {
                     semanticObject: oHash.semanticObject,
@@ -1059,12 +1026,12 @@ sap.ui.define([
 
             // Navigation parameter may not be inside an array and might not be strings
             // So they have to be adjusted in order to be matched against the current parameters
-            var oTargetIntent = { params: {} };
+            const oTargetIntent = { params: {} };
             if (navTarget.params) {
-                Object.keys(navTarget.params).forEach(function (sKey) {
-                    var vValue = navTarget.params[sKey];
-                    var aValue = Array.isArray(vValue) ? vValue : [vValue];
-                    oTargetIntent.params[sKey] = aValue.map(function (vInnerValue) {
+                Object.keys(navTarget.params).forEach((sKey) => {
+                    const vValue = navTarget.params[sKey];
+                    const aValue = Array.isArray(vValue) ? vValue : [vValue];
+                    oTargetIntent.params[sKey] = aValue.map((vInnerValue) => {
                         return vInnerValue.toString();
                     });
                 });
@@ -1101,16 +1068,16 @@ sap.ui.define([
                 "sap.ushell.services.CrossApplicationNavigation"
             );
 
-            var oContainer = ObjectPath.get("sap.ushell.Container");
+            const oContainer = ObjectPath.get("sap.ushell.Container");
             if (oContainer && typeof oContainer.getService === "function") {
-                var oShellNavigationInternal = oContainer.getService("ShellNavigationInternal");
+                const oShellNavigationInternal = oContainer.getService("ShellNavigationInternal");
                 if (oShellNavigationInternal) {
                     return oShellNavigationInternal.hrefForAppSpecificHash(sAppHash);
                 }
             }
             Log.debug("Shell not available, no Cross App Navigation; fallback to app-specific part only");
             // Note: this encoding is to be kept aligned with the encoding in hasher.js ( see _encodePath( ) )
-            return "#" + encodeURI(sAppHash);
+            return `#${encodeURI(sAppHash)}`;
         };
 
         /**
@@ -1130,16 +1097,15 @@ sap.ui.define([
          * @since 1.94.0
          * @public
          */
-        this.hrefForAppSpecificHashAsync = function (sAppHash) {
-            return sap.ushell.Container.getServiceAsync("ShellNavigationInternal")
-                .then(function (ShellNavigationInternal) {
-                    return ShellNavigationInternal.hrefForAppSpecificHash(sAppHash);
-                })
-                .catch(function () {
-                    Log.debug("Shell not available, no Cross App Navigation; fallback to app-specific part only");
-                    // Note: this encoding is to be kept aligned with the encoding in hasher.js ( see _encodePath( ) )
-                    return "#" + encodeURI(sAppHash);
-                });
+        this.hrefForAppSpecificHashAsync = async function (sAppHash) {
+            try {
+                const ShellNavigationInternal = await sap.ushell.Container.getServiceAsync("ShellNavigationInternal");
+                return ShellNavigationInternal.hrefForAppSpecificHash(sAppHash);
+            } catch (oError) {
+                Log.debug("Shell not available, no Cross App Navigation; fallback to app-specific part only");
+                // Note: this encoding is to be kept aligned with the encoding in hasher.js ( see _encodePath( ) )
+                return `#${encodeURI(sAppHash)}`;
+            }
         };
 
         /**
@@ -1170,9 +1136,9 @@ sap.ui.define([
          * @public
          */
         this.getPrimaryIntent = function (sSemanticObject, mParameters) {
-            var oQuery = {};
-            var fnSortPredicate;
-            var rgxDisplayFactSheetAction = /^#\w+-displayFactSheet(?:$|\?.)/;
+            const oQuery = {};
+            let fnSortPredicate;
+            const rgxDisplayFactSheetAction = /^#\w+-displayFactSheet(?:$|\?.)/;
 
             oQuery.tags = ["primaryAction"];
             oQuery.semanticObject = sSemanticObject;
@@ -1181,20 +1147,18 @@ sap.ui.define([
             }
 
             return this.getLinks(oQuery)
-                .then(function (aLinks) {
+                .then((aLinks) => {
                     if (aLinks.length === 0) {
                         delete oQuery.tags;
                         oQuery.action = "displayFactSheet";
 
                         // Priority given to intents with the action "displayFactSheet"
                         fnSortPredicate = function (oLink, oOtherLink) {
-                            var bEitherIsFactSheetAction;
-
                             if (oLink.intent === oOtherLink.intent) {
                                 return 0;
                             }
 
-                            bEitherIsFactSheetAction = rgxDisplayFactSheetAction.test(oLink.intent)
+                            const bEitherIsFactSheetAction = rgxDisplayFactSheetAction.test(oLink.intent)
                                 ^ rgxDisplayFactSheetAction.test(oOtherLink.intent);
 
                             if (bEitherIsFactSheetAction) {
@@ -1217,8 +1181,8 @@ sap.ui.define([
                     };
 
                     return aLinks;
-                }.bind(this))
-                .then(function (aLinks) {
+                })
+                .then((aLinks) => {
                     return aLinks.length === 0 ? null : aLinks.sort(fnSortPredicate)[0];
                 });
         };
@@ -1265,10 +1229,10 @@ sap.ui.define([
          * @public
          */
         this.getSemanticObjectLinks = function (sSemanticObject, mParameters, bIgnoreFormFactor, oComponent, sAppStateKey, bCompactIntents) {
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
             Promise.resolve()
-                .then(function () {
+                .then(() => {
                     return crossApplicationNavigationUtils.injectStickyParametersAsync({
                         args: { params: mParameters },
                         appLifeCycle: AppLifeCycleAI,
@@ -1276,15 +1240,15 @@ sap.ui.define([
                         type: typeUtils
                     });
                 })
-                .then(function (mParametersPlusSapSystem) {
+                .then((mParametersPlusSapSystem) => {
                     mParametersPlusSapSystem = getTargetWithCurrentSystem(mParametersPlusSapSystem, oComponent).params;
                     mParametersPlusSapSystem = amendTargetWithSapUshellEncTestParameter({ params: mParametersPlusSapSystem }).params;
 
                     // deal with multi-arg calls
-                    var vArgs;
+                    let vArgs;
                     if (Array.isArray(sSemanticObject)) {
                         vArgs = [];
-                        sSemanticObject.forEach(function (aArgs) {
+                        sSemanticObject.forEach((aArgs) => {
                             vArgs.push([{
                                 semanticObject: aArgs[0],
                                 params: aArgs[1],
@@ -1311,9 +1275,9 @@ sap.ui.define([
                         vArgs
                     ]);
                 })
-                .then(function (aResults) {
-                    var NavTargetResolutionInternal = aResults[0];
-                    var vArgs = aResults[1];
+                .then((aResults) => {
+                    const NavTargetResolutionInternal = aResults[0];
+                    const vArgs = aResults[1];
                     ushellUtils.invokeUnfoldingArrayArguments(NavTargetResolutionInternal.getLinks.bind(NavTargetResolutionInternal), [vArgs])
                         .done(oDeferred.resolve)
                         .fail(oDeferred.reject);
@@ -1470,16 +1434,15 @@ sap.ui.define([
          * @since 1.38.0
          */
         this.getLinks = function (vArgs) {
-            var aExpandedIntents;
             // the invokeUnfoldingArrayArguments does not want [oArg1, oArg2, oArg3], but [ [oArg1], [oArg2], [oArg3] ], because the
             // logic in that method is based on positional parameters - however we have only one argument (the oArg object in this case).
-            aExpandedIntents = ushellUtils.invokeUnfoldingArrayArguments(this._getLinks.bind(this), [vArgs]);
+            const aExpandedIntents = ushellUtils.invokeUnfoldingArrayArguments(this._getLinks.bind(this), [vArgs]);
 
             return aExpandedIntents;
         };
 
         this._getLinks = function (oNominalArgs) {
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
             // If method gets called without vArgs, the result should be the same as if vArgs was an empty object.
             if (typeof oNominalArgs === "undefined") {
@@ -1487,13 +1450,13 @@ sap.ui.define([
             }
 
             // ensure certain parameters are specified
-            var oNominalArgsClone = deepExtend({}, oNominalArgs);
+            let oNominalArgsClone = deepExtend({}, oNominalArgs);
             oNominalArgsClone.compactIntents = !!oNominalArgsClone.compactIntents;
             oNominalArgsClone.action = oNominalArgsClone.action || undefined;
             oNominalArgsClone.paramsOptions = crossApplicationNavigationUtils.extractGetLinksParameterOptions(oNominalArgsClone.params);
 
             Promise.resolve()
-                .then(function () {
+                .then(() => {
                     return crossApplicationNavigationUtils.injectStickyParametersAsync({
                         args: oNominalArgsClone,
                         appLifeCycle: AppLifeCycleAI,
@@ -1501,9 +1464,9 @@ sap.ui.define([
                         type: typeUtils
                     });
                 })
-                .then(function (oNominalArgsCloneResult) {
+                .then((oNominalArgsCloneResult) => {
                     oNominalArgsClone = oNominalArgsCloneResult;
-                    var mParameterDefinition;
+                    let mParameterDefinition;
                     if (oNominalArgsClone.params) {
                         mParameterDefinition = crossApplicationNavigationUtils.extractGetLinksParameterDefinition(oNominalArgsClone.params);
                     } else {
@@ -1511,7 +1474,7 @@ sap.ui.define([
                     }
 
                     // propagate sap-system into parameters
-                    var mParametersPlusSapSystem = getTargetWithCurrentSystem(
+                    let mParametersPlusSapSystem = getTargetWithCurrentSystem(
                         { params: mParameterDefinition }, oNominalArgsClone.ui5Component
                     ).params;
 
@@ -1527,7 +1490,7 @@ sap.ui.define([
 
                     return sap.ushell.Container.getServiceAsync("NavTargetResolutionInternal");
                 })
-                .then(function (NavTargetResolutionInternal) {
+                .then((NavTargetResolutionInternal) => {
                     NavTargetResolutionInternal.getLinks(oNominalArgsClone)
                         .done(oDeferred.resolve)
                         .fail(oDeferred.reject);
@@ -1548,9 +1511,9 @@ sap.ui.define([
          * @public
          */
         this.getDistinctSemanticObjects = function () {
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
-            sap.ushell.Container.getServiceAsync("NavTargetResolutionInternal").then(function (NavTargetResolutionInternal) {
+            sap.ushell.Container.getServiceAsync("NavTargetResolutionInternal").then((NavTargetResolutionInternal) => {
                 NavTargetResolutionInternal.getDistinctSemanticObjects()
                     .done(oDeferred.resolve)
                     .fail(oDeferred.reject);
@@ -1598,20 +1561,20 @@ sap.ui.define([
          * @deprecated since 1.31. Please use {@link #isNavigationSupported} instead. Note that this has a slightly different response format.
          */
         this.isIntentSupported = function (aIntents, oComponent) {
-            var oDeferred = new jQuery.Deferred();
-            var mOriginalIntentHash = {}; // used for remapping
-            var aClonedIntentsWithSapSystem = aIntents.map(function (sIntent) {
-                var sIntentWithSystem = getTargetWithCurrentSystem(sIntent, oComponent); // returns clone
+            const oDeferred = new jQuery.Deferred();
+            const mOriginalIntentHash = {}; // used for remapping
+            const aClonedIntentsWithSapSystem = aIntents.map((sIntent) => {
+                const sIntentWithSystem = getTargetWithCurrentSystem(sIntent, oComponent); // returns clone
                 mOriginalIntentHash[sIntentWithSystem] = sIntent;
                 return sIntentWithSystem;
             });
 
-            sap.ushell.Container.getServiceAsync("NavTargetResolutionInternal").then(function (NavTargetResolutionInternal) {
+            sap.ushell.Container.getServiceAsync("NavTargetResolutionInternal").then((NavTargetResolutionInternal) => {
                 NavTargetResolutionInternal.isIntentSupported(aClonedIntentsWithSapSystem)
-                    .done(function (mIntentSupportedPlusSapSystem) {
+                    .done((mIntentSupportedPlusSapSystem) => {
                         // Must restore keys to what the application expects, as per NavTargetResolutionInternal contract.
-                        var mIntentSupportedNoSapSystem = {};
-                        Object.keys(mIntentSupportedPlusSapSystem).forEach(function (sKeyPlusSapSystem) {
+                        const mIntentSupportedNoSapSystem = {};
+                        Object.keys(mIntentSupportedPlusSapSystem).forEach((sKeyPlusSapSystem) => {
                             mIntentSupportedNoSapSystem[
                                 mOriginalIntentHash[sKeyPlusSapSystem]
                             ] = mIntentSupportedPlusSapSystem[sKeyPlusSapSystem];
@@ -1726,14 +1689,14 @@ sap.ui.define([
          * @public
          */
         this.isNavigationSupported = function (aIntents, oComponent) {
-            var oDeferred = new jQuery.Deferred();
-            var aClonedIntents = deepClone(aIntents)
-                .map(function (oIntent) {
-                    var oExtraction = this._extractInnerAppRoute(oIntent);
+            const oDeferred = new jQuery.Deferred();
+            const aClonedIntents = deepClone(aIntents)
+                .map((oIntent) => {
+                    const oExtraction = this._extractInnerAppRoute(oIntent);
                     return getTargetWithCurrentSystem(oExtraction.intent, oComponent); // returns only shallow clone
-                }.bind(this));
+                });
 
-            sap.ushell.Container.getServiceAsync("NavTargetResolutionInternal").then(function (NavTargetResolutionInternal) {
+            sap.ushell.Container.getServiceAsync("NavTargetResolutionInternal").then((NavTargetResolutionInternal) => {
                 NavTargetResolutionInternal.isNavigationSupported(aClonedIntents)
                     .done(oDeferred.resolve)
                     .fail(oDeferred.reject);
@@ -1789,9 +1752,7 @@ sap.ui.define([
                                 reject();
                             }
                         })
-                        .fail(() => {
-                            reject();
-                        });
+                        .fail(reject);
                 } else {
                     resolve();
                 }
@@ -1873,7 +1834,7 @@ sap.ui.define([
          */
         this._checkComponentConfig = function (oConfig) {
             if (oConfig) {
-                var iConfigPropertyCount = Object.keys(oConfig).length;
+                const iConfigPropertyCount = Object.keys(oConfig).length;
                 if (iConfigPropertyCount > 1 ||
                     (iConfigPropertyCount === 1 && !oConfig.componentData)) {
                     return "`oConfig` argument should either be an empty object or contain only the `componentData` property.";
@@ -1904,7 +1865,7 @@ sap.ui.define([
                 "sap.ushell.services.CrossApplicationNavigation"
             );
 
-            var AppStateService = sap.ushell.Container.getService("AppState");
+            const AppStateService = sap.ushell.Container.getService("AppState");
 
             if (!BaseObject.isA(oAppComponent, "sap.ui.core.UIComponent")) {
                 throw new Error("The passed oAppComponent must be a UI5 Component.");
@@ -1927,14 +1888,12 @@ sap.ui.define([
          * @private
          * @ui5-restricted SAP-internally public, must not be changed. Not part of public documentation.
          */
-        this.createEmptyAppStateAsync = function (oAppComponent, bTransientEnforced, sPersistencyMethod, oPersistencySettings) {
+        this.createEmptyAppStateAsync = async function (oAppComponent, bTransientEnforced, sPersistencyMethod, oPersistencySettings) {
             if (!BaseObject.isA(oAppComponent, "sap.ui.core.UIComponent")) {
                 return Promise.reject("The passed oAppComponent must be a UI5 Component.");
             }
-            return sap.ushell.Container.getServiceAsync("AppState")
-                .then(function (AppStateService) {
-                    return AppStateService.createEmptyAppState(oAppComponent, bTransientEnforced, sPersistencyMethod, oPersistencySettings);
-                });
+            const AppStateService = await sap.ushell.Container.getServiceAsync("AppState");
+            return AppStateService.createEmptyAppState(oAppComponent, bTransientEnforced, sPersistencyMethod, oPersistencySettings);
         };
 
         /**
@@ -1949,7 +1908,9 @@ sap.ui.define([
          */
         this.getStartupAppState = function (oAppComponent) {
             this._checkComponent(oAppComponent);
-            var sContainerKey = oAppComponent.getComponentData() && oAppComponent.getComponentData()["sap-xapp-state"] && oAppComponent.getComponentData()["sap-xapp-state"][0];
+            const oComponentData = oAppComponent.getComponentData();
+            const sXAppState = oComponentData && oComponentData["sap-xapp-state"];
+            const sContainerKey = sXAppState && sXAppState[0];
             return this.getAppState(oAppComponent, sContainerKey);
         };
 
@@ -1980,17 +1941,16 @@ sap.ui.define([
          */
         this.getAppState = function (oAppComponent, sAppStateKey) {
             // see stakeholders in SFIN etc.
-            var oContainer;
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
             this._checkComponent(oAppComponent);
 
-            sap.ushell.Container.getServiceAsync("AppState").then(function (AppState) {
+            sap.ushell.Container.getServiceAsync("AppState").then((AppState) => {
                 if (typeof sAppStateKey !== "string") {
                     if (sAppStateKey !== undefined) {
                         Log.error("Illegal Argument sAppStateKey ");
                     }
-                    setTimeout(function () {
-                        oContainer = AppState.createEmptyUnmodifiableAppState(oAppComponent);
+                    setTimeout(() => {
+                        const oContainer = AppState.createEmptyUnmodifiableAppState(oAppComponent);
                         oDeferred.resolve(oContainer);
                     }, 0);
                     return;
@@ -2023,8 +1983,7 @@ sap.ui.define([
          * @private
          */
         this.getAppStateData = function (sAppStateKeyOrArray) {
-            return ushellUtils.invokeUnfoldingArrayArguments(this._getAppStateData.bind(this),
-                [sAppStateKeyOrArray]);
+            return ushellUtils.invokeUnfoldingArrayArguments(this._getAppStateData.bind(this), [sAppStateKeyOrArray]);
         };
 
         /**
@@ -2047,19 +2006,19 @@ sap.ui.define([
          * @ui5-restricted SAP Internal usage only, beware! internally public, cannot be changed, but not part of the public documentation.
          */
         this._getAppStateData = function (sAppStateKey) {
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
-            sap.ushell.Container.getServiceAsync("AppState").then(function (AppState) {
+            sap.ushell.Container.getServiceAsync("AppState").then((AppState) => {
                 if (typeof sAppStateKey !== "string") {
                     if (sAppStateKey !== undefined) {
                         Log.error("Illegal Argument sAppStateKey ");
                     }
-                    setTimeout(function () {
+                    setTimeout(() => {
                         oDeferred.resolve(undefined);
                     }, 0);
                 } else {
                     AppState.getAppState(sAppStateKey)
-                        .done(function (oAppState) {
+                        .done((oAppState) => {
                             oDeferred.resolve(oAppState.getData());
                         })
                         .fail(oDeferred.resolve.bind(oDeferred, undefined));
@@ -2079,20 +2038,22 @@ sap.ui.define([
          * @ui5-restricted SAP Internal usage only, beware! internally public, cannot be changed, but not part of the public documentation
          */
         this.saveMultipleAppStates = function (aAppStates) {
-            var aResult = [];
-            var oDeferred = new jQuery.Deferred();
-            aAppStates.forEach(function (oAppState) {
+            const aResult = [];
+            const oDeferred = new jQuery.Deferred();
+            aAppStates.forEach((oAppState) => {
                 aResult.push(oAppState.save());
             });
-            jQuery.when.apply(this, aResult).done(function () {
-                oDeferred.resolve(aResult);
-            }).fail(function () {
-                oDeferred.reject("save failed");
-            });
+            jQuery.when.apply(this, aResult)
+                .done(() => {
+                    oDeferred.resolve(aResult);
+                })
+                .fail(() => {
+                    oDeferred.reject("save failed");
+                });
             return oDeferred.promise();
         };
 
-        /**
+        /*
          * Process navigation parameters to allow "shellHash" together with parameters section, something that is currently not allowed.
          * This functionality is enabled only upon flag that is added to the navigation parameters. e.g.:
          * <pre>
@@ -2110,8 +2071,8 @@ sap.ui.define([
          *
          */
         this._processShellHashWithParams = function (oArgs) {
-            if (oArgs && oArgs.processParams === true && oArgs.target && oArgs.target.shellHash && oArgs.params) {
-                var oHash = UrlParsing.parseShellHash(oArgs.target.shellHash);
+            if (oArgs?.processParams === true && oArgs?.target?.shellHash && oArgs?.params) {
+                const oHash = UrlParsing.parseShellHash(oArgs.target.shellHash);
 
                 oArgs.target = {
                     semanticObject: oHash.semanticObject,
@@ -2135,7 +2096,7 @@ sap.ui.define([
                 null,
                 "sap.ushell.services.CrossApplicationNavigation"
             );
-            var AppStateService = sap.ushell.Container.getService("AppState");
+            const AppStateService = sap.ushell.Container.getService("AppState");
 
             return AppStateService.getSupportedPersistencyMethods();
         };
@@ -2143,15 +2104,13 @@ sap.ui.define([
         /**
          * Method to get an array of sap.ushell.services.AppStatePersistencyMethod.
          *
-         * @returns {string[]} Returns an array of sap.ushell.services.AppStatePersistencyMethod.
+         * @returns {Promise<string[]>} Returns an array of sap.ushell.services.AppStatePersistencyMethod.
          *   An empty array indicates that the platform does not support persistent states
          * @since 1.95
          */
-        this.getSupportedAppStatePersistencyMethodsAsync = function () {
-            return sap.ushell.Container.getServiceAsync("AppState")
-                .then(function (AppStateService) {
-                    return AppStateService.getSupportedPersistencyMethods();
-                });
+        this.getSupportedAppStatePersistencyMethodsAsync = async function () {
+            const oAppStateService = await sap.ushell.Container.getServiceAsync("AppState");
+            return oAppStateService.getSupportedPersistencyMethods();
         };
 
         /**
@@ -2164,8 +2123,8 @@ sap.ui.define([
          * @returns {jQuery.Promise<string>}Resolves a new key.
          */
         this.makeStatePersistent = function (sKey, iPersistencyMethod, oPersistencySettings) {
-            var oDeferred = new jQuery.Deferred();
-            sap.ushell.Container.getServiceAsync("AppState").then(function (AppState) {
+            const oDeferred = new jQuery.Deferred();
+            sap.ushell.Container.getServiceAsync("AppState").then((AppState) => {
                 AppState.makeStatePersistent(sKey, iPersistencyMethod, oPersistencySettings)
                     .done(oDeferred.resolve)
                     .fail(oDeferred.reject);
@@ -2187,14 +2146,16 @@ sap.ui.define([
          * @protected
          */
         this.resolveIntent = function (sHashFragment) {
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
-            sap.ushell.Container.getServiceAsync("NavTargetResolutionInternal").then(function (NavTargetResolutionInternal) {
-                NavTargetResolutionInternal.resolveHashFragment(sHashFragment).then(function (oResult) {
-                    oDeferred.resolve({ url: oResult.url });
-                }).fail(function (sMessage) {
-                    oDeferred.reject(sMessage);
-                });
+            sap.ushell.Container.getServiceAsync("NavTargetResolutionInternal").then((NavTargetResolutionInternal) => {
+                NavTargetResolutionInternal.resolveHashFragment(sHashFragment)
+                    .then((oResult) => {
+                        oDeferred.resolve({ url: oResult.url });
+                    })
+                    .fail((sMessage) => {
+                        oDeferred.reject(sMessage);
+                    });
             });
             return oDeferred.promise();
         };