@sapui5/sap.ushell 1.138.1 → 1.139.0

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

@@ -4,7 +4,6 @@
  * @fileOverview The NavTargetResolutionInternal service.
  */
 sap.ui.define([
-    "sap/ushell/services/AppConfiguration",
     "sap/ushell/utils",
     "sap/ushell/utils/UrlParsing",
     "sap/ushell/utils/UrlShortening",
@@ -16,8 +15,7 @@ sap.ui.define([
     "sap/base/util/isPlainObject",
     "sap/base/Log",
     "sap/ushell/Container"
-], function (
-    appConfiguration,
+], (
     utils,
     UrlParsing,
     UrlShortening,
@@ -29,7 +27,7 @@ sap.ui.define([
     isPlainObject,
     Log,
     Container
-) {
+) => {
     "use strict";
 
     /**
@@ -64,35 +62,35 @@ sap.ui.define([
      * @private
      */
     function NavTargetResolutionInternal (oAdapter, oContainerInterface, sParameters, oServiceConfiguration) {
-        var oServiceConfig = oServiceConfiguration && oServiceConfiguration.config;
-        var fnResolveHashFragment = function (sHashFragment) {
-            var oResolutionPromise = this._isClientSideTargetResolutionEnabled()
+        const oServiceConfig = oServiceConfiguration?.config;
+        const fnResolveHashFragment = function (sHashFragment) {
+            const oResolutionPromise = this._isClientSideTargetResolutionEnabled()
                 ? this._resolveHashFragmentClientSide(sHashFragment)
                 : oAdapter.resolveHashFragment(sHashFragment);
 
             return oResolutionPromise;
         }.bind(this);
-        var aLocalResolvedNavTargets;
+        let aLocalResolvedNavTargets;
         // oAdapter resolver is the "last" custom resolver
-        var aResolvers = [{
+        const aResolvers = [{
             name: "DefaultAdapter",
             isApplicable: function () { return true; },
             resolveHashFragment: fnResolveHashFragment.bind(this)
         }];
-        var oCurrentResolution;
+        let oCurrentResolution;
 
-        var oHttpClient = new HttpClient();
+        const oHttpClient = new HttpClient();
 
         this._isClientSideTargetResolutionEnabled = function () { // need this declaration for fnResolveHashFragment
             return !!(oServiceConfig && oServiceConfig.enableClientSideTargetResolution);
         };
 
         this._nextResolveHashFragment = function (aCustomResolvers, sHashFragment) {
-            var oResolver = aCustomResolvers.pop();
+            const oResolver = aCustomResolvers.pop();
 
             if (oResolver.isApplicable(sHashFragment)) {
-                Log.info("NavTargetResolutionInternal: custom resolver " + oResolver.name + " resolves " + sHashFragment);
-                var fnNextResolve = this._nextResolveHashFragment.bind(this, aCustomResolvers);
+                Log.info(`NavTargetResolutionInternal: custom resolver ${oResolver.name} resolves ${sHashFragment}`);
+                const fnNextResolve = this._nextResolveHashFragment.bind(this, aCustomResolvers);
 
                 return oResolver.resolveHashFragment(sHashFragment, fnNextResolve);
             }
@@ -109,12 +107,12 @@ sap.ui.define([
          * @since 1.34.0
          */
         this._resolveHashFragmentClientSide = function (sHashFragment) {
-            var oHashValidationResult = this._validateHashFragment(sHashFragment);
+            const oHashValidationResult = this._validateHashFragment(sHashFragment);
             if (!oHashValidationResult.success) {
-                return new jQuery.Deferred().reject(sHashFragment + " is not a valid hash fragment").promise();
+                return new jQuery.Deferred().reject(`${sHashFragment} is not a valid hash fragment`).promise();
             }
 
-            var sFragmentNoHash = oHashValidationResult.hashFragmentWithoutHash;
+            const sFragmentNoHash = oHashValidationResult.hashFragmentWithoutHash;
             return this._resolveHashFragmentClientSideAndFixApplicationType(sFragmentNoHash);
         };
 
@@ -128,13 +126,13 @@ sap.ui.define([
          * @since 1.34.0
          */
         this._resolveHashFragmentClientSideAndFixApplicationType = function (sFragmentNoHash) {
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
             Container.getServiceAsync("ClientSideTargetResolution")
-                .then(function (ClientSideTargetResolutionService) {
+                .then((ClientSideTargetResolutionService) => {
                     return ClientSideTargetResolutionService.resolveHashFragment(sFragmentNoHash);
                 })
-                .then(function (oResolutionResult) {
+                .then((oResolutionResult) => {
                     // Ensure backward compatible behavior after incompatible server-side change.
                     if (oResolutionResult && oResolutionResult.applicationType === "SAPUI5") {
                         oResolutionResult.applicationType = "URL";
@@ -163,8 +161,8 @@ sap.ui.define([
          * @since 1.34.0
          */
         this._validateHashFragment = function (sHashFragment) {
-            var sHashFragmentWithoutHash = "";
-            var oValidationResult = {
+            let sHashFragmentWithoutHash = "";
+            const oValidationResult = {
                 success: false
             };
 
@@ -199,27 +197,27 @@ sap.ui.define([
          * @private
          */
         this.expandCompactHash = function (sHashFragment) {
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
             // augment URL with application parameters from sHashFragment
-            var oParsedShellHash = UrlParsing.parseShellHash(sHashFragment);
+            const oParsedShellHash = UrlParsing.parseShellHash(sHashFragment);
             if (oParsedShellHash && oParsedShellHash.params && oParsedShellHash.params["sap-intent-param"]) {
                 Container.getServiceAsync("AppState")
-                    .then(function (AppStateService) {
+                    .then((AppStateService) => {
                         AppStateService.getAppState(oParsedShellHash.params["sap-intent-param"][0])
-                            .done(function (oContainer) {
-                                var sValue = oContainer.getData("sap-intent-param");
-                                var sHashFragmentPotentiallyExpanded = sHashFragment;
+                            .done((oContainer) => {
+                                const sValue = oContainer.getData("sap-intent-param");
+                                let sHashFragmentPotentiallyExpanded = sHashFragment;
 
                                 if (sValue) {
-                                    sHashFragmentPotentiallyExpanded = UrlShortening.expandParamGivenRetrievalFunction(sHashFragment, "sap-intent-param", function () {
+                                    sHashFragmentPotentiallyExpanded = UrlShortening.expandParamGivenRetrievalFunction(sHashFragment, "sap-intent-param", () => {
                                         return sValue;
                                     });
                                 }
 
                                 oDeferred.resolve(sHashFragmentPotentiallyExpanded);
                             })
-                            .fail(function () {
+                            .fail(() => {
                                 oDeferred.resolve(sHashFragment);
                             });
                     })
@@ -230,7 +228,7 @@ sap.ui.define([
             return oDeferred.promise();
         };
 
-        var aWDAGUIAppType = ["NWBC", "WDA", "TR"];
+        const aWDAGUIAppType = ["NWBC", "WDA", "TR"];
 
         /**
          * Adjusts the applicationType "SAPUI5" to "URL" and extracts the component name from a resolution result and
@@ -258,8 +256,8 @@ sap.ui.define([
             }
 
             if (oResolvedHashFragment.applicationType === "URL") {
-                var aMatches = /^SAPUI5\.Component=(.*)/.exec(oResolvedHashFragment.additionalInformation);
-                var sComponentName = aMatches && aMatches[1];
+                const aMatches = /^SAPUI5\.Component=(.*)/.exec(oResolvedHashFragment.additionalInformation);
+                const sComponentName = aMatches && aMatches[1];
                 if (sComponentName) {
                     oResolvedHashFragment.ui5ComponentName = sComponentName;
                 }
@@ -282,7 +280,7 @@ sap.ui.define([
          * @private
          */
         this._getSapSystem = function (sHashFragment, oResolutionResult) {
-            var sSystem;
+            let sSystem;
             if (oResolutionResult && oResolutionResult["sap-system"]) {
                 return oResolutionResult["sap-system"];
             }
@@ -334,19 +332,18 @@ sap.ui.define([
          * @protected
          */
         this.resolveTarget = function (oArgs) {
-            var sHashFragment;
-            var oArgsClone = deepExtend({}, oArgs);
-            var oDeferred = new jQuery.Deferred();
+            const oArgsClone = deepExtend({}, oArgs);
+            const oDeferred = new jQuery.Deferred();
 
             Measurement.average("sap.ushell.navigation.resolveTarget");
 
             utils.storeSapSystemToLocalStorage(oArgsClone);
-            sHashFragment = UrlParsing.constructShellHash(oArgsClone);
+            const sHashFragment = UrlParsing.constructShellHash(oArgsClone);
 
             Container.getServiceAsync("NavTargetResolutionInternal")
-                .then(function (NavTargetResolutionService) {
-                    NavTargetResolutionService.resolveHashFragment("#" + sHashFragment)
-                        .done(function (oResolved) {
+                .then((NavTargetResolutionService) => {
+                    NavTargetResolutionService.resolveHashFragment(`#${sHashFragment}`)
+                        .done((oResolved) => {
                             Measurement.end("sap.ushell.navigation.resolveTarget");
 
                             oDeferred.resolve({
@@ -403,28 +400,28 @@ sap.ui.define([
          * @private
          */
         this.resolveHashFragment = function (sHashFragment) {
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
             Measurement.average("sap.ushell.navigation.resolveHashFragment");
 
             this.expandCompactHash(sHashFragment)
-                .done(function (sHashFragmentPotentiallyExpanded) {
-                    var oErrorDeferred = jQuery.when();
+                .done((sHashFragmentPotentiallyExpanded) => {
+                    let oErrorDeferred = jQuery.when();
 
                     if (sHashFragmentPotentiallyExpanded.indexOf("sap-ushell-enc-test") >= 0) {
-                        var aMatch = /sap-ushell-enc-test=([^&]*)(&.*)?$/.exec(sHashFragmentPotentiallyExpanded);
+                        const aMatch = /sap-ushell-enc-test=([^&]*)(&.*)?$/.exec(sHashFragmentPotentiallyExpanded);
                         if (aMatch) {
-                            var sSapUshellEncTestValue = aMatch[1];
+                            const sSapUshellEncTestValue = aMatch[1];
 
                             if (sSapUshellEncTestValue !== "A%20B%2520C") {
                                 oErrorDeferred = new jQuery.Deferred();
 
                                 Container.getServiceAsync("MessageInternal")
-                                    .then(function (MessageService) {
+                                    .then((MessageService) => {
                                         MessageService.error("This navigation is flagged as erroneous because" +
                                             " (likely the calling procedure) generated a wrong encoded hash." +
                                             " Please track down the encoding error and make sure to use the CrossApplicationNavigation service for navigation.",
-                                            "Navigation encoding wrong");
+                                        "Navigation encoding wrong");
                                         oErrorDeferred.resolve();
                                     })
                                     .catch(oErrorDeferred.reject);
@@ -433,7 +430,7 @@ sap.ui.define([
                             sHashFragmentPotentiallyExpanded = sHashFragmentPotentiallyExpanded.replace(/[&?]sap-ushell-enc-test=([^&]*)$/, "");
                         }
                     }
-                    var oPromise = this._invokeResolveHashChain(sHashFragmentPotentiallyExpanded);
+                    let oPromise = this._invokeResolveHashChain(sHashFragmentPotentiallyExpanded);
 
                     // if method present on adapter, chain through it (adapter has complete freedom to change success into failure etc.)
                     if (typeof oAdapter.processPostResolution === "function") {
@@ -441,7 +438,7 @@ sap.ui.define([
                     }
 
                     jQuery.when(oPromise, oErrorDeferred)
-                        .done(function (oResult) {
+                        .done((oResult) => {
                             this._adjustResolutionResultForUi5Components(oResult);
 
                             if (oResult && oResult.navigationMode !== undefined) {
@@ -454,7 +451,7 @@ sap.ui.define([
 
                             // add a sap-system if not already there
                             if (isPlainObject(oResult) && !oResult.hasOwnProperty("sap-system")) {
-                                var sSapSystem = this._getSapSystem(sHashFragment, oResult);
+                                const sSapSystem = this._getSapSystem(sHashFragment, oResult);
                                 if (sSapSystem) {
                                     oResult["sap-system"] = sSapSystem;
                                 }
@@ -462,20 +459,20 @@ sap.ui.define([
                             Measurement.end("sap.ushell.navigation.resolveHashFragment");
 
                             oDeferred.resolve(oResult);
-                        }.bind(this))
+                        })
                         .fail(oDeferred.reject);
-                }.bind(this))
+                })
                 .fail(oDeferred.reject);
 
-            return oDeferred.promise().done(function (oResult) {
+            return oDeferred.promise().done((oResult) => {
                 return this._recordNavigation("resolveHashFragment", { sHashFragment: sHashFragment }, oResult);
-            }.bind(this));
+            });
         };
 
         this._invokeResolveHashChain = function (sHashFragment) {
-            var oCRs = aResolvers.map(function (a) { return a; });
+            const oCRs = aResolvers.map((a) => { return a; });
 
-            return this._nextResolveHashFragment(oCRs, sHashFragment).done(function (oResolution) {
+            return this._nextResolveHashFragment(oCRs, sHashFragment).done((oResolution) => {
                 oCurrentResolution = oResolution;
             });
         };
@@ -497,7 +494,7 @@ sap.ui.define([
          * @since 1.38.0
          */
         this._getGetLinksResolver = function (oArgs) {
-            var fnGetLinksBound;
+            let fnGetLinksBound;
 
             // decide which method to call
             if (this._isClientSideTargetResolutionEnabled()) {
@@ -515,7 +512,7 @@ sap.ui.define([
                 && oArgs.paramsOptions.length > 0) {
                 Log.warning(
                     "Parameter options supplied to #getLinks will be ignored because FLP is not configured to use sap.ushell.services.ClientSideTargetResolution for target resolution",
-                    "provided parameters options: " + JSON.stringify(oArgs.paramsOptions, null, 4),
+                    `provided parameters options: ${JSON.stringify(oArgs.paramsOptions, null, 4)}`,
                     "sap.ushell.services.NavTargetResolutionInternal"
                 );
             }
@@ -599,19 +596,19 @@ sap.ui.define([
          * @since 1.38.0
          */
         this.getLinks = function (oArgs) {
-            var sSemanticObject = oArgs.semanticObject;
-            var mParameters = oArgs.params;
-            var bIgnoreFormFactor = oArgs.ignoreFormFactor;
-            var oComponent = oArgs.ui5Component;
-            var sAppStateKey = oArgs.appStateKey;
-            var bCompactIntents = oArgs.compactIntents;
-            var oDeferred = new jQuery.Deferred();
+            const sSemanticObject = oArgs.semanticObject;
+            const mParameters = oArgs.params;
+            const bIgnoreFormFactor = oArgs.ignoreFormFactor;
+            const oComponent = oArgs.ui5Component;
+            const sAppStateKey = oArgs.appStateKey;
+            const bCompactIntents = oArgs.compactIntents;
+            const oDeferred = new jQuery.Deferred();
 
             if (/\?/.test(sSemanticObject)) {
                 throw new Error("Parameter must not be part of semantic object");
             }
 
-            var oParameters = (mParameters === undefined) ? undefined : JSON.parse(JSON.stringify(mParameters));
+            let oParameters = (mParameters === undefined) ? undefined : JSON.parse(JSON.stringify(mParameters));
             if (sAppStateKey) {
                 oParameters = oParameters || {};
                 oParameters["sap-xapp-state"] = encodeURIComponent(sAppStateKey);
@@ -619,17 +616,17 @@ sap.ui.define([
 
             // outcome determines whether the process of getting links is delegated to ClientSideTargetResolution or NavTargetResolutionAdapter.
             // additional property, 'tags' does not influence how _getGetLinksResolver behaves
-            var oResolverResult = this._getGetLinksResolver(oArgs);
+            const oResolverResult = this._getGetLinksResolver(oArgs);
 
             // warn that functionality is lost in this case
             if (oResolverResult.warning) {
                 Log.warning("A problem occurred while determining the resolver for getLinks", oResolverResult.warning, "sap.ushell.services.NavTargetResolutionInternal");
             }
 
-            var fnResolverBound = oResolverResult.resolver;
+            const fnResolverBound = oResolverResult.resolver;
 
             if (fnResolverBound) {
-                var fnHandleGetLinksSuccess = function (aSemanticObjectLinks) {
+                const fnHandleGetLinksSuccess = function (aSemanticObjectLinks) {
                     if (bCompactIntents) {
                         this._shortenGetSemanticObjectLinksResults(aSemanticObjectLinks, oComponent)
                             .done(oDeferred.resolve);
@@ -645,7 +642,7 @@ sap.ui.define([
                     // The portal still does server side resolution on the ABAP server.
                     // In here, long parameters are not sent to the server.
                     // So we use the hrefForExternal to obtain a sap-intent-param and actually truncate the original list of parameters...
-                    var oHrefForExternalArg = {
+                    const oHrefForExternalArg = {
                         target: {
                             semanticObject: sSemanticObject,
                             action: "dummyAction"
@@ -653,19 +650,18 @@ sap.ui.define([
                         params: oParameters
                     };
 
-                    Container.getServiceAsync("ShellNavigationInternal")
-                        .then(function (ShellNavigationService) {
-                            ShellNavigationService.hrefForExternal(oHrefForExternalArg, true, oComponent)
-                                .then(function (oResVerboseCompacted) {
-                                    // may contain sap-intent-param (but server does nothing with it)
-                                    var oMaybeCompactedParameters = oResVerboseCompacted.params || oParameters;
-
-                                    fnResolverBound(sSemanticObject, oMaybeCompactedParameters, bIgnoreFormFactor)
-                                        .then(fnHandleGetLinksSuccess)
-                                        .catch(oDeferred.reject);
-                                })
-                                .catch(oDeferred.reject);
-                        });
+                    Container.getServiceAsync("ShellNavigationInternal").then((ShellNavigationService) => {
+                        ShellNavigationService.hrefForExternal(oHrefForExternalArg, true, oComponent)
+                            .then((oResVerboseCompacted) => {
+                                // may contain sap-intent-param (but server does nothing with it)
+                                const oMaybeCompactedParameters = oResVerboseCompacted.params || oParameters;
+
+                                fnResolverBound(sSemanticObject, oMaybeCompactedParameters, bIgnoreFormFactor)
+                                    .then(fnHandleGetLinksSuccess)
+                                    .catch(oDeferred.reject);
+                            })
+                            .catch(oDeferred.reject);
+                    });
                 } else {
                     // 'this' in fnResolverBound will be client side target resolution
                     fnResolverBound(oArgs) // safe to pass oArgs (it's handled at CrossApplicationNavigation level)
@@ -676,9 +672,9 @@ sap.ui.define([
                 oDeferred.resolve([]);
             }
 
-            return oDeferred.promise().done(function (aLinks) {
+            return oDeferred.promise().done((aLinks) => {
                 return this._recordNavigation("getLinks", { oArgs: oArgs }, aLinks);
-            }.bind(this));
+            });
         };
 
         /**
@@ -692,21 +688,21 @@ sap.ui.define([
          * @since 1.38.0
          */
         this.getDistinctSemanticObjects = function () {
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
             if (this._isClientSideTargetResolutionEnabled()) {
                 // Only require service if ClientSideTargetResolution is enabled
 
                 Container.getServiceAsync("ClientSideTargetResolution")
-                    .then(function (ClientSideTargetResolutionService) {
+                    .then((ClientSideTargetResolutionService) => {
                         return ClientSideTargetResolutionService.getDistinctSemanticObjects();
                     })
                     .then(oDeferred.resolve)
                     .catch(oDeferred.reject);
 
-                return oDeferred.promise().done(function (aResults) {
+                return oDeferred.promise().done((aResults) => {
                     return this._recordNavigation("getDistinctSemanticObjects", {}, aResults);
-                }.bind(this));
+                });
             }
 
             // Use the adapter if it implements this functionality
@@ -724,8 +720,8 @@ sap.ui.define([
         };
 
         this._getLinksClientSide = function (oArgs) {
-            var oDeferred = new jQuery.Deferred();
-            var oCallWithExpandedParamsDeferred = new jQuery.Deferred(); // always resolved
+            const oDeferred = new jQuery.Deferred();
+            const oCallWithExpandedParamsDeferred = new jQuery.Deferred(); // always resolved
 
             /*
              * Expand url parameters in case these come compacted.
@@ -735,10 +731,10 @@ sap.ui.define([
              * This is ok as the client is expected to invoke hrefForExternal again to generate a URL which is effectively compacted
              */
             if ((oArgs.params || {}).hasOwnProperty("sap-intent-param")) {
-                var sCompactHash = "#" + oArgs.semanticObject + "-dummyAction?" + UrlParsing.paramsToString(oArgs.params);
+                const sCompactHash = `#${oArgs.semanticObject}-dummyAction?${UrlParsing.paramsToString(oArgs.params)}`;
                 this.expandCompactHash(sCompactHash)
-                    .done(function (sExpandedHash) {
-                        var oParsedHash = UrlParsing.parseShellHash(sExpandedHash);
+                    .done((sExpandedHash) => {
+                        const oParsedHash = UrlParsing.parseShellHash(sExpandedHash);
 
                         oCallWithExpandedParamsDeferred.resolve(oParsedHash.params); // expanded params
                     })
@@ -747,9 +743,9 @@ sap.ui.define([
                 oCallWithExpandedParamsDeferred.resolve(oArgs.params);
             }
 
-            oCallWithExpandedParamsDeferred.done(function () {
+            oCallWithExpandedParamsDeferred.done(() => {
                 Container.getServiceAsync("ClientSideTargetResolution")
-                    .then(function (ClientSideTargetResolutionService) {
+                    .then((ClientSideTargetResolutionService) => {
                         return ClientSideTargetResolutionService.getLinks(oArgs);
                     })
                     .then(oDeferred.resolve)
@@ -771,39 +767,39 @@ sap.ui.define([
          * @since 1.32.0
          */
         this._shortenGetSemanticObjectLinksResults = function (aGetSemanticObjectLinksResults, oComponent) {
-            var aSemanticObjectLinksShortened = [];
-            var i = 0;
-            var iPromisesToResolve = aGetSemanticObjectLinksResults.length;
-            var oDeferred = new jQuery.Deferred();
+            const aSemanticObjectLinksShortened = [];
+            let i = 0;
+            let iPromisesToResolve = aGetSemanticObjectLinksResults.length;
+            const oDeferred = new jQuery.Deferred();
 
             Container.getServiceAsync("ShellNavigationInternal")
-                .then(function (ShellNavigationService) {
-                    aGetSemanticObjectLinksResults.forEach(function (oIntent) {
-                        var oUrlParts = UrlParsing.parseShellHash(oIntent.intent);
-                        var oCompactParamsPromise = ShellNavigationService.compactParams(oUrlParts.params, undefined, oComponent);
+                .then((ShellNavigationService) => {
+                    aGetSemanticObjectLinksResults.forEach((oIntent) => {
+                        const oUrlParts = UrlParsing.parseShellHash(oIntent.intent);
+                        const oCompactParamsPromise = ShellNavigationService.compactParams(oUrlParts.params, undefined, oComponent);
 
                         aSemanticObjectLinksShortened.push(oCompactParamsPromise);
 
                         aSemanticObjectLinksShortened[i]
-                            .done(function (index, oCompactParams) {
+                            .done(((index, oCompactParams) => {
                                 aSemanticObjectLinksShortened[index] = {
                                     text: oIntent.text,
-                                    intent: "#" + oUrlParts.semanticObject + "-" + oUrlParts.action + "?" +
-                                        UrlParsing.paramsToString(oCompactParams)
+                                    intent: `#${oUrlParts.semanticObject}-${oUrlParts.action}?${
+                                        UrlParsing.paramsToString(oCompactParams)}`
                                 };
-                            }.bind(null, i))
-                            .fail(function (iIdx, sMsg) {
+                            }).bind(null, i))
+                            .fail(((iIdx, sMsg) => {
                                 Log.warning(
                                     "Cannot shorten GetSemanticObjectLinks result, using expanded form",
-                                    "Failure message: " + sMsg + "; intent had title ''" + oIntent.title + "'' and link ''" + oIntent.intent + "'",
+                                    `Failure message: ${sMsg}; intent had title ''${oIntent.title}'' and link ''${oIntent.intent}'`,
                                     "sap.ushell.services.NavTargetResolutionInternal"
                                 );
                                 aSemanticObjectLinksShortened[iIdx] = {
                                     text: oIntent.text,
                                     intent: oIntent.intent
                                 };
-                            }.bind(null, i))
-                            .always(function () {
+                            }).bind(null, i))
+                            .always(() => {
                                 iPromisesToResolve--;
 
                                 if (iPromisesToResolve === 0) {
@@ -836,13 +832,13 @@ sap.ui.define([
          * @deprecated since 1.31. Please use {@link #isNavigationSupported} instead. Note that this has a slightly different response!
          */
         this.isIntentSupported = function (aIntents) {
-            var mResult = {};
-            var oDeferred = new jQuery.Deferred();
+            const mResult = {};
+            const oDeferred = new jQuery.Deferred();
 
             if (this._isClientSideTargetResolutionEnabled()) {
                 // NOTE: request ClientSideTargetResolution service only if enabled!
                 Container.getServiceAsync("ClientSideTargetResolution")
-                    .then(function (ClientSideTargetResolutionService) {
+                    .then((ClientSideTargetResolutionService) => {
                         return ClientSideTargetResolutionService.isIntentSupported(aIntents);
                     })
                     .then(oDeferred.resolve)
@@ -857,7 +853,7 @@ sap.ui.define([
             }
 
             // Fallback for no adapter available
-            aIntents.forEach(function (sIntent) {
+            aIntents.forEach((sIntent) => {
                 mResult[sIntent] = { supported: undefined };
             });
             return oDeferred.resolve(mResult).promise();
@@ -882,13 +878,13 @@ sap.ui.define([
          *
          */
         this._isIntentSupported = function (aIntents) {
-            var mResult = {};
-            var oDeferred = new jQuery.Deferred();
+            const mResult = {};
+            const oDeferred = new jQuery.Deferred();
 
             if (this._isClientSideTargetResolutionEnabled()) {
                 // NOTE: request ClientSideTargetResolution service only if enabled!
                 Container.getServiceAsync("ClientSideTargetResolution")
-                    .then(function (ClientSideTargetResolutionService) {
+                    .then((ClientSideTargetResolutionService) => {
                         return ClientSideTargetResolutionService.isIntentSupported(aIntents);
                     })
                     .then(oDeferred.resolve)
@@ -903,7 +899,7 @@ sap.ui.define([
             }
 
             // Fallback for no adapter available
-            aIntents.forEach(function (sIntent) {
+            aIntents.forEach((sIntent) => {
                 mResult[sIntent] = { supported: undefined };
             });
             return oDeferred.resolve(mResult).promise();
@@ -991,22 +987,22 @@ sap.ui.define([
          * @private
          */
         this.isNavigationSupported = function (aIntents) {
-            var oDeferred = new jQuery.Deferred();
-            var aIntentsAsString = [];
-            aIntentsAsString = aIntents.map(function (oArg) {
+            const oDeferred = new jQuery.Deferred();
+            let aIntentsAsString = [];
+            aIntentsAsString = aIntents.map((oArg) => {
                 if (typeof oArg === "string") {
                     return oArg;
                 }
-                return "#" + UrlParsing.constructShellHash(oArg);
+                return `#${UrlParsing.constructShellHash(oArg)}`;
             });
-            this._isIntentSupported(aIntentsAsString).done(function (oResult) {
-                var aResults = aIntentsAsString.map(function (sIntent) { return oResult[sIntent] || { supported: false }; });
+            this._isIntentSupported(aIntentsAsString).done((oResult) => {
+                const aResults = aIntentsAsString.map((sIntent) => { return oResult[sIntent] || { supported: false }; });
                 oDeferred.resolve(aResults);
             }).fail(oDeferred.reject.bind(oDeferred));
 
-            return oDeferred.promise().done(function (aResults) {
+            return oDeferred.promise().done((aResults) => {
                 return this._recordNavigation("isNavigationSupported", { aIntents: aIntents }, aResults);
-            }.bind(this));
+            });
         };
 
         /**
@@ -1020,9 +1016,9 @@ sap.ui.define([
          * @private
          */
         this._recordNavigation = function (sFunctionName, oParameters, vResult) {
-            var oUsageRecorderConfig = oServiceConfig && oServiceConfig.usageRecorder || {};
+            const oUsageRecorderConfig = oServiceConfig?.usageRecorder || {};
             if (oUsageRecorderConfig.enabled) {
-                var sUsageRecorderEndpoint = oUsageRecorderConfig.serviceUrl || "/navigation/api/v2/record";
+                const sUsageRecorderEndpoint = oUsageRecorderConfig.serviceUrl || "/navigation/api/v2/record";
                 oHttpClient.post(sUsageRecorderEndpoint, {
                     headers: {
                         "content-type": "application/json; charset=utf-8"
@@ -1073,7 +1069,7 @@ sap.ui.define([
         // given SO-action strings to a locally supplied configuration member of a resolveLocal setting are locally resolved
         if (oServiceConfig && Array.isArray(oServiceConfig.resolveLocal)) {
             // register a custom resolver which redirects all !allowed to defaultOthersTo
-            aLocalResolvedNavTargets = oServiceConfig.resolveLocal.map(function (oArg) {
+            aLocalResolvedNavTargets = oServiceConfig.resolveLocal.map((oArg) => {
                 return oArg.linkId;
             });
             this.registerCustomResolver({
@@ -1082,15 +1078,15 @@ sap.ui.define([
                     if (sHashFragment === "") {
                         return "#";
                     }
-                    var res = UrlParsing.parseShellHash(sHashFragment.substring(1));
+                    const res = UrlParsing.parseShellHash(sHashFragment.substring(1));
                     if (!res) {
                         return "#";
                     }
-                    sHashFragment = "#" + res.semanticObject + "-" + res.action;
+                    sHashFragment = `#${res.semanticObject}-${res.action}`;
                     return sHashFragment;
                 },
                 _getIndex: function (sOrigHashFragment) {
-                    var sHashFragment = this.cleanHash(sOrigHashFragment);
+                    const sHashFragment = this.cleanHash(sOrigHashFragment);
                     return aLocalResolvedNavTargets.indexOf(sHashFragment.substring(1));
                 },
                 // applicability test
@@ -1099,17 +1095,17 @@ sap.ui.define([
                 },
                 // replace hash, then resolve to app
                 resolveHashFragment: function (sHashFragment) {
-                    var idx = this._getIndex(sHashFragment);
-                    var oDeferred = new jQuery.Deferred();
-                    var oResolvedResult = JSON.parse(JSON.stringify(oServiceConfig.resolveLocal[idx].resolveTo));
+                    const idx = this._getIndex(sHashFragment);
+                    const oDeferred = new jQuery.Deferred();
+                    const oResolvedResult = JSON.parse(JSON.stringify(oServiceConfig.resolveLocal[idx].resolveTo));
 
                     // augment url with application parameters from sHashFragment
-                    var obj = UrlParsing.parseShellHash(sHashFragment);
+                    const obj = UrlParsing.parseShellHash(sHashFragment);
                     if (obj && obj.params) {
-                        var newsh = UrlParsing.paramsToString(obj.params);
-                        if (newsh) {
-                            var hasQM = oResolvedResult.url.indexOf("?") >= 0;
-                            oResolvedResult.url = oResolvedResult.url + (hasQM ? "&" : "?") + newsh;
+                        const sParams = UrlParsing.paramsToString(obj.params);
+                        if (sParams) {
+                            const hasQM = oResolvedResult.url.indexOf("?") >= 0;
+                            oResolvedResult.url = oResolvedResult.url + (hasQM ? "&" : "?") + sParams;
                         }
                     }
 
@@ -1133,11 +1129,11 @@ sap.ui.define([
                 if (sHashFragment === "") {
                     return undefined;
                 }
-                var res = UrlParsing.parseShellHash(sHashFragment.substring(1));
+                const res = UrlParsing.parseShellHash(sHashFragment.substring(1));
                 if (!res) {
                     return undefined;
                 }
-                sHashFragment = "#" + res.semanticObject + "-" + res.action;
+                sHashFragment = `#${res.semanticObject}-${res.action}`;
                 return sHashFragment;
             },
             isApplicable: function (sHashFragment) {
@@ -1159,15 +1155,13 @@ sap.ui.define([
                 return this.aElement;
             },
             resolveHashFragment: function (sHashFragment) {
-                var oDeferred = new jQuery.Deferred();
-                var res;
-                var oLocal;
-                var that = this;
+                const oDeferred = new jQuery.Deferred();
+                const that = this;
                 sHashFragment = this.cleanHash(sHashFragment);
                 if (!sHashFragment) {
                     return false;
                 }
-                var hardCoded = {
+                const hardCoded = {
                     "#Test-config": {
                         applicationType: "URL",
                         url: "/sap/bc/ui5_ui5/ui2/ushell/test-resources/sap/ushell/demoapps/FioriSandboxConfigApp",
@@ -1201,6 +1195,7 @@ sap.ui.define([
                         localStorage[sKey] = sValue;
                     }
                 }
+                let res;
                 if (hardCoded[sHashFragment]) {
                     res = hardCoded[sHashFragment];
                 } else if (sHashFragment === "#Test-clear") {
@@ -1209,7 +1204,8 @@ sap.ui.define([
                     Log.info("NavTargetResolutionInternal: Local storage keys for #Test have been cleared");
                     res = hardCoded["#Test-config"];
                 } else if (sHashFragment === "#Test-local1" || sHashFragment === "#Test-local2" || sHashFragment === "#Test-url") {
-                    res = getFromLocalStorage("sap.ushell." + sHashFragment);
+                    res = getFromLocalStorage(`sap.ushell.${sHashFragment}`);
+                    let oLocal;
                     if (!res || res === "undefined") {
                         oLocal = { applicationType: "URL", navigationMode: "embedded" };
                     } else {
@@ -1219,19 +1215,19 @@ sap.ui.define([
                     // unless explicitly enabled by config
                     if ((window.location.hostname === "localhost") ||
                         (oServiceConfig && oServiceConfig.allowTestUrlComponentConfig)) {
-                        var sPrefix = "sap-ushell-test-" + sHashFragment.substring(6);
-                        var additionalInformation = getURLParameter(sPrefix + "-additionalInformation");
+                        const sPrefix = `sap-ushell-test-${sHashFragment.substring(6)}`;
+                        const additionalInformation = getURLParameter(`${sPrefix}-additionalInformation`);
                         if (additionalInformation) {
                             oLocal.additionalInformation = additionalInformation;
                         }
-                        var url = getURLParameter(sPrefix + "-url");
+                        const url = getURLParameter(`${sPrefix}-url`);
                         if (url) {
                             oLocal.url = localURL(url);
                         }
                     }
                     if (!oLocal.url) {
                         // eslint-disable-next-line max-len
-                        Log.info("NavTargetResolutionInternal: No configured app for " + sHashFragment + " found ( local storage or url params sap-ushell-test-local1-url  sap-ushell-test-local1-additionalInfo  not supplied? ");
+                        Log.info(`NavTargetResolutionInternal: No configured app for ${sHashFragment} found ( local storage or url params sap-ushell-test-local1-url  sap-ushell-test-local1-additionalInfo  not supplied? `);
                         Log.info("NavTargetResolutionInternal: Defaulting to config app ...\n");
                         oDeferred.reject("URL is not resolvable");
                         return oDeferred.promise();
@@ -1244,8 +1240,8 @@ sap.ui.define([
                     return oDeferred.promise();
                 }
                 // eslint-disable-next-line max-len
-                Log.info("NavTargetResolutionInternal: As URL:  http://localhost:8080/sap/bc/ui5_ui5/ui2/ushell/shells/abap/FioriLaunchpad.html?sap-ushell-test-local1-url=" + encodeURIComponent((res && res.url) || "") + "&sap-ushell-test-local1-additionalInformation=" + encodeURIComponent((res && res.additionalInfo) || "") + "#Test-local1");
-                Log.info("NavTargetResolutionInternal: Resolving " + sHashFragment + " to " + JSON.stringify(res));
+                Log.info(`NavTargetResolutionInternal: As URL:  http://localhost:8080/sap/bc/ui5_ui5/ui2/ushell/shells/abap/FioriLaunchpad.html?sap-ushell-test-local1-url=${encodeURIComponent((res && res.url) || "")}&sap-ushell-test-local1-additionalInformation=${encodeURIComponent((res && res.additionalInfo) || "")}#Test-local1`);
+                Log.info(`NavTargetResolutionInternal: Resolving ${sHashFragment} to ${JSON.stringify(res)}`);
                 oDeferred.resolve(res);
                 return oDeferred.promise();
             }