@sapui5/sap.ushell 1.134.1 → 1.135.0

package/src/main/js/sap/ushell/ApplicationType/guiResolution.js

@@ -5,17 +5,21 @@ sap.ui.define([
     "sap/ui/thirdparty/URI",
     "sap/ushell/ApplicationType/systemAlias",
     "sap/ushell/ApplicationType/utils",
+    "sap/ushell/Config",
+    "sap/ushell/Container",
     "sap/ushell/services/ClientSideTargetResolution/ParameterMapping",
     "sap/ushell/services/ClientSideTargetResolution/Utils"
-], function (
+], (
     Log,
     deepExtend,
     URI,
     oSystemAlias,
     oApplicationTypeUtils,
+    Config,
+    Container,
     oParameterMapping,
     oCSTRUtils
-) {
+) => {
     "use strict";
 
     /**
@@ -25,7 +29,7 @@ sap.ui.define([
      * @param {string[]} aKeysToRemove The keys of properties to be removed
      */
     function removeObjectKey (oObject, aKeysToRemove) {
-        aKeysToRemove.forEach(function (sKeyToRemove) {
+        aKeysToRemove.forEach((sKeyToRemove) => {
             delete oObject[sKeyToRemove];
         });
     }
@@ -51,22 +55,22 @@ sap.ui.define([
      *    should not be included in a WebGUI URL.
      */
     function getUnnecessaryWebguiParameters (oEffectiveParameters, oInbound) {
-        var bIsRequired = isRequiredParameter("DYNP_OKCODE", oInbound)
+        const bIsRequired = isRequiredParameter("DYNP_OKCODE", oInbound)
             || isRequiredParameter("DYNP_NO1ST", oInbound);
 
-        var aBusinessParameters = [];
+        let aBusinessParameters = [];
 
         if (bIsRequired) {
             return [];
         }
 
-        var oBusinessParameters = getWebguiBusinessParameters(oEffectiveParameters);
+        const oBusinessParameters = getWebguiBusinessParameters(oEffectiveParameters);
 
         function upperCaseString (s) {
             return s.toUpperCase();
         }
 
-        var aNormalizedBusinessParameters = Object.keys(oBusinessParameters)
+        const aNormalizedBusinessParameters = Object.keys(oBusinessParameters)
             .map(upperCaseString)
             .sort();
 
@@ -76,13 +80,13 @@ sap.ui.define([
                 return false;
             }
 
-            return aArray1.every(function (vUnused, iIdx) {
+            return aArray1.every((vUnused, iIdx) => {
                 return aArray1[iIdx] === aArray2[iIdx];
             });
         }
 
         // check unnecessary parameter combinations
-        if (arraysEqual(["DYNP_NO1ST","DYNP_OKCODE"], aNormalizedBusinessParameters)
+        if (arraysEqual(["DYNP_NO1ST", "DYNP_OKCODE"], aNormalizedBusinessParameters)
             || arraysEqual(["DYNP_OKCODE"], aNormalizedBusinessParameters)
             || arraysEqual(["DYNP_NO1ST"], aNormalizedBusinessParameters)
         ) {
@@ -104,7 +108,7 @@ sap.ui.define([
      * @private
      */
     function getWebguiBusinessParameters (oParams) {
-        var oBusinessParameters = oCSTRUtils.filterObject(oParams, isWebguiBusinessParameter);
+        const oBusinessParameters = oCSTRUtils.filterObject(oParams, isWebguiBusinessParameter);
         return oBusinessParameters;
     }
 
@@ -130,7 +134,7 @@ sap.ui.define([
      * @private
      */
     function isWebguiBusinessParameter (sName, sValue) {
-        var aNameValue;
+        let aNameValue;
         // handle case in which sName is in the form "name=value"
         if (arguments.length === 1) {
             aNameValue = sName.split(/[=](.+)?/); // split on first "="
@@ -148,9 +152,9 @@ sap.ui.define([
 
 
     function generateTRResolutionResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
-        var oInbound = oMatchingTarget.inbound,
-            oResolutionResult = oInbound && oInbound.resolutionResult,
-            oPromise;
+        const oInbound = oMatchingTarget.inbound;
+        const oResolutionResult = oInbound && oInbound.resolutionResult;
+        let oPromise;
 
         if (
             !(!oInbound ||
@@ -198,9 +202,16 @@ sap.ui.define([
         }
 
         if (oPromise) {
-            return oPromise.then(function (oResult) {
+            return oPromise.then(async (oResult) => {
                 if (oResult.url) {
                     oResult.url = oApplicationTypeUtils.appendParametersToUrl("sap-iframe-hint=GUI", oResult.url);
+                    if (Config.last("/core/extension/dap/enabled")) {
+                        const oPluginManager = await Container.getServiceAsync("PluginManager");
+                        const bDapInstalled = oPluginManager.isPluginConfigured(Config.last("/core/extension/dap/pluginName"));
+                        oResult.url = oApplicationTypeUtils.appendParametersToUrl(`sap-load-dap=${bDapInstalled}`, oResult.url);
+                    } else {
+                        oResult.url = oApplicationTypeUtils.appendParametersToUrl("sap-load-dap=false", oResult.url);
+                    }
                 }
                 oResult.extendedInfo = oApplicationTypeUtils.getExtendedInfo(oMatchingTarget);
                 oApplicationTypeUtils.checkOpenWithPost(oMatchingTarget, oResult);
@@ -235,9 +246,10 @@ sap.ui.define([
      * @private
      */
     function buildNativeWebGuiURI (sTcode, sSapSystem, sSapSystemDataSrc, fnExternalSystemAliasResolver) {
-        var sUrl, oURI;
+        let sUrl;
+        let oURI;
         sTcode = encodeURIComponent(sTcode);
-        sUrl = "/gui/sap/its/webgui?%7etransaction=" + sTcode + "&%7enosplash=1";
+        sUrl = `/gui/sap/its/webgui?%7etransaction=${sTcode}&%7enosplash=1`;
         oURI = new URI(sUrl);
         return oSystemAlias.spliceSapSystemIntoURI(oURI, oSystemAlias.LOCAL_SYSTEM_ALIAS, sSapSystem, sSapSystemDataSrc,
             "NATIVEWEBGUI", oSystemAlias.SYSTEM_ALIAS_SEMANTICS.apply, fnExternalSystemAliasResolver);
@@ -291,15 +303,14 @@ sap.ui.define([
      * @returns {string}
      *   The interpolated query string.
      */
-    function injectEffectiveParametersIntoWebguiPobjectParam (sQuery, oParamsToInject,
-                                                              sQueryParamDelimiter, sQueryParamAssignDelimiter) {
-        var sInjectedParams,
-            sPobjectPlusDelimiter = "P_OBJECT" + sQueryParamAssignDelimiter,
-            iMaxGUIParamLength = 132;
+    function injectEffectiveParametersIntoWebguiPobjectParam (sQuery, oParamsToInject, sQueryParamDelimiter, sQueryParamAssignDelimiter) {
+        let sInjectedParams;
+        const sPobjectPlusDelimiter = `P_OBJECT${sQueryParamAssignDelimiter}`;
+        const iMaxGUIParamLength = 132;
 
         // NOTE: the result of privparamsToString does not encode
         //       delimiters, hence we pass them encoded.
-        var sParamsToInject = oApplicationTypeUtils.getURLParsing().privparamsToString(
+        let sParamsToInject = oApplicationTypeUtils.getURLParsing().privparamsToString(
             oParamsToInject,
             "%25", // a.k.a. "%", instead of &
             "%21" // a.k.a. "!", instead of =
@@ -310,55 +321,55 @@ sap.ui.define([
         }
 
         // Parse away existing parameters in P_OBJECT
-        var sParamsToInjectPrefix = "";
+        let sParamsToInjectPrefix = "";
         amendGuiParam("P_OBJECT", sQuery, sQueryParamDelimiter, sQueryParamAssignDelimiter,
-            function (sParamNameAndValueDoubleEncoded) {
-            var sParamValueDoubleEncoded = sParamNameAndValueDoubleEncoded.replace(sPobjectPlusDelimiter, "");
-            sParamsToInjectPrefix = decodeURIComponent(sParamValueDoubleEncoded);
-            if (sParamsToInjectPrefix.length > 0) {
-                sParamsToInjectPrefix = sParamsToInjectPrefix + "%25";
-            }
+            (sParamNameAndValueDoubleEncoded) => {
+                const sParamValueDoubleEncoded = sParamNameAndValueDoubleEncoded.replace(sPobjectPlusDelimiter, "");
+                sParamsToInjectPrefix = decodeURIComponent(sParamValueDoubleEncoded);
+                if (sParamsToInjectPrefix.length > 0) {
+                    sParamsToInjectPrefix = `${sParamsToInjectPrefix}%25`;
+                }
 
-            return sPobjectPlusDelimiter; // just leave the P_OBJECT= placeholder if found
-        });
+                return sPobjectPlusDelimiter; // just leave the P_OBJECT= placeholder if found
+            });
         sParamsToInject = sParamsToInjectPrefix + sParamsToInject;
 
         // Generate the injected parameters
-        var oParamsSections = {
+        const oParamsSections = {
             pObjX: "",
             pObject: ""
         };
         sParamsToInject
-            .match(new RegExp(".{1," + iMaxGUIParamLength + "}", "g"))
-            .map(function (sParamGroupEncoded) {
+            .match(new RegExp(`.{1,${iMaxGUIParamLength}}`, "g"))
+            .map((sParamGroupEncoded) => {
                 return encodeURIComponent(sParamGroupEncoded);
             })
-            .forEach(function (sParamGroupDoubleEncoded, iGroupIdx) {
+            .forEach((sParamGroupDoubleEncoded, iGroupIdx) => {
                 // parameter name should be P_OBJECT or P_OBJx for further parameters
-                var sParamName = "P_OBJECT";
-                var sParamSection = "pObject";
+                let sParamName = "P_OBJECT";
+                let sParamSection = "pObject";
                 if (iGroupIdx > 0) {
-                    sParamName = "P_OBJ" + iGroupIdx;
+                    sParamName = `P_OBJ${iGroupIdx}`;
                     sParamSection = "pObjX";
                 }
 
-                var sSectionDelimiter = oParamsSections[sParamSection].length === 0 ? "" : sQueryParamDelimiter;
+                const sSectionDelimiter = oParamsSections[sParamSection].length === 0 ? "" : sQueryParamDelimiter;
 
                 oParamsSections[sParamSection] = oParamsSections[sParamSection] + sSectionDelimiter + sParamName
                     + sQueryParamAssignDelimiter + sParamGroupDoubleEncoded;
             });
 
         sInjectedParams = [oParamsSections.pObjX, oParamsSections.pObject]
-            .filter(function (sParamSection) {
+            .filter((sParamSection) => {
                 return sParamSection.length > 0;
             })
             .join(sQueryParamDelimiter);
 
         // Place the injected params in the right place in the query
-        var oAmendResult = amendGuiParam("P_OBJECT", sQuery, sQueryParamDelimiter,
-            sQueryParamAssignDelimiter, function (sFoundParamNameAndValue) {
-            return sInjectedParams;
-        });
+        const oAmendResult = amendGuiParam("P_OBJECT", sQuery, sQueryParamDelimiter,
+            sQueryParamAssignDelimiter, (sFoundParamNameAndValue) => {
+                return sInjectedParams;
+            });
 
         if (oAmendResult.found) {
             return oAmendResult.query;
@@ -398,12 +409,12 @@ sap.ui.define([
      *   </pre>
      */
     function amendGuiParam (sTargetParamName, sQuery, sQueryParamDelimiter, sQueryParamAssignDelimiter, fnAmend) {
-        var bFound = false,
-            sParamSearchPrefix = sTargetParamName + sQueryParamAssignDelimiter; // Param=
+        let bFound = false;
+        const sParamSearchPrefix = sTargetParamName + sQueryParamAssignDelimiter; // Param=
 
-        var sAmendedQuery = sQuery
+        const sAmendedQuery = sQuery
             .split(sQueryParamDelimiter)
-            .map(function (sParam) {
+            .map((sParam) => {
 
                 if (sParam.indexOf(sParamSearchPrefix) !== 0) {
                     return sParam;
@@ -413,7 +424,7 @@ sap.ui.define([
 
                 return fnAmend(sParam);
             })
-            .filter(function (sParam) {
+            .filter((sParam) => {
                 return typeof sParam !== "undefined";
             })
             .join(sQueryParamDelimiter);
@@ -426,21 +437,21 @@ sap.ui.define([
 
 
     function constructNativeWebguiWrapResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
-        var oInbound = oMatchingTarget.inbound,
-            oInboundResolutionResult = oInbound && oInbound.resolutionResult,
-            oResolutionResult = {};
+        const oInbound = oMatchingTarget.inbound;
+        const oInboundResolutionResult = oInbound && oInbound.resolutionResult;
+        const oResolutionResult = {};
 
         // splice parameters into Webgui url
-        var oWebguiURI = new URI(sBaseUrl);
+        const oWebguiURI = new URI(sBaseUrl);
 
         // construct effective parameters
 
         // NOTE: do not include defaultedParameterNames for wrapped URLs,
         // as they may cause a crash the called application.
-        var oEffectiveParameters = deepExtend({}, oMatchingTarget.mappedIntentParamsPlusSimpleDefaults);
+        const oEffectiveParameters = deepExtend({}, oMatchingTarget.mappedIntentParamsPlusSimpleDefaults);
 
-        var sSapSystem = oEffectiveParameters["sap-system"] && oEffectiveParameters["sap-system"][0];
-        var sSapSystemDataSrc = oEffectiveParameters["sap-system-src"] && oEffectiveParameters["sap-system-src"][0];
+        const sSapSystem = oEffectiveParameters["sap-system"] && oEffectiveParameters["sap-system"][0];
+        const sSapSystemDataSrc = oEffectiveParameters["sap-system-src"] && oEffectiveParameters["sap-system-src"][0];
 
         // in the Webgui case, the sap-system intent parameter is *not* part of the final url
         oResolutionResult["sap-system"] = sSapSystem;
@@ -457,17 +468,17 @@ sap.ui.define([
             sSapSystemDataSrc, "NATIVEWEBGUI",
             oInboundResolutionResult.systemAliasSemantics
             || oSystemAlias.SYSTEM_ALIAS_SEMANTICS.applied, fnExternalSystemAliasResolver)
-            .then(function (oWebguiURI) {
+            .then((oWebguiURI) => {
                 // Reconstruct the final url
                 // ASSUMPTION: there are no relevant parameters in the Webgui url, but only Webgui parameters.
 
-                var sParams = oWebguiURI.search(); // Webgui parameters
-                var sParamsInterpolated = sParams
+                const sParams = oWebguiURI.search(); // Webgui parameters
+                const sParamsInterpolated = sParams
                     .split("&")
-                    .map(function (sQueryParam) {
+                    .map((sQueryParam) => {
                         // interpolate effective parameter in the correct place within the ~transaction parameter
 
-                        var sInterpolatedQueryParam;
+                        let sInterpolatedQueryParam;
                         if (sQueryParam.indexOf("?%7etransaction") === 0 ||
                             sQueryParam.indexOf("%7etransaction") === 0) { // found transaction
 
@@ -488,7 +499,7 @@ sap.ui.define([
                 oWebguiURI.search(sParamsInterpolated);
 
                 // propagate properties from the inbound in the resolution result
-                ["additionalInformation", "applicationDependencies"].forEach(function (sPropName) {
+                ["additionalInformation", "applicationDependencies"].forEach((sPropName) => {
                     if (oInbound.resolutionResult.hasOwnProperty(sPropName)) {
                         oResolutionResult[sPropName] = oInbound.resolutionResult[sPropName];
                     }
@@ -503,24 +514,24 @@ sap.ui.define([
     }
 
     function constructFullWebguiResolutionResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
-        var oInbound = oMatchingTarget.inbound,
-            oInboundResolutionResult = oInbound && oInbound.resolutionResult,
-            oMappedIntentParamsPlusSimpleDefaults = oMatchingTarget.mappedIntentParamsPlusSimpleDefaults || {};
+        const oInbound = oMatchingTarget.inbound;
+        const oInboundResolutionResult = oInbound && oInbound.resolutionResult;
+        const oMappedIntentParamsPlusSimpleDefaults = oMatchingTarget.mappedIntentParamsPlusSimpleDefaults || {};
 
-        var sSapSystem = oInboundResolutionResult.systemAlias;
+        let sSapSystem = oInboundResolutionResult.systemAlias;
         if (oMappedIntentParamsPlusSimpleDefaults["sap-system"]) {
             sSapSystem = oMappedIntentParamsPlusSimpleDefaults["sap-system"][0];
         }
 
-        var sSapSystemDataSrc;
+        let sSapSystemDataSrc;
         if (oMappedIntentParamsPlusSimpleDefaults["sap-system-src"]) {
             sSapSystemDataSrc = oMappedIntentParamsPlusSimpleDefaults["sap-system-src"][0];
         }
 
         return buildNativeWebGuiURI(oInbound.resolutionResult["sap.gui"].transaction, sSapSystem, sSapSystemDataSrc, fnExternalSystemAliasResolver)
-            .then(function (oURIWithSystemAlias) {
+            .then((oURIWithSystemAlias) => {
                 oParameterMapping.mapParameterNamesAndRemoveObjects(oMatchingTarget);
-                var oResolutionResult = blendParamsIntoNativeWebGUI(oMatchingTarget.inbound,
+                const oResolutionResult = blendParamsIntoNativeWebGUI(oMatchingTarget.inbound,
                     oMatchingTarget.mappedIntentParamsPlusSimpleDefaults, oURIWithSystemAlias);
                 if (oResolutionResult && oMatchingTarget.inbound && oMatchingTarget.inbound.resolutionResult
                     && oMatchingTarget.inbound.resolutionResult["sap.platform.runtime"]) {
@@ -536,23 +547,23 @@ sap.ui.define([
     }
 
     function constructWebguiWrapResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
-        var oInbound = oMatchingTarget.inbound,
-            oInboundResolutionResult = oInbound && oInbound.resolutionResult;
+        const oInbound = oMatchingTarget.inbound;
+        const oInboundResolutionResult = oInbound && oInbound.resolutionResult;
 
-        var oResolutionResult = {};
+        const oResolutionResult = {};
 
         // splice parameters into Webgui url
-        var oWebguiURI = new URI(sBaseUrl);
+        const oWebguiURI = new URI(sBaseUrl);
 
         // construct effective parameters
 
 
         // NOTE: do not include defaultedParameterNames for wrapped URLs,
         // as they may cause a crash the called application.
-        var oEffectiveParameters = deepExtend({}, oMatchingTarget.mappedIntentParamsPlusSimpleDefaults);
+        const oEffectiveParameters = deepExtend({}, oMatchingTarget.mappedIntentParamsPlusSimpleDefaults);
 
-        var sSapSystem = oEffectiveParameters["sap-system"] && oEffectiveParameters["sap-system"][0];
-        var sSapSystemDataSrc = oEffectiveParameters["sap-system-src"] && oEffectiveParameters["sap-system-src"][0];
+        const sSapSystem = oEffectiveParameters["sap-system"] && oEffectiveParameters["sap-system"][0];
+        const sSapSystemDataSrc = oEffectiveParameters["sap-system-src"] && oEffectiveParameters["sap-system-src"][0];
 
         // in the Webgui case, the sap-system intent parameter is *not* part of the final url
         oResolutionResult["sap-system"] = sSapSystem;
@@ -566,10 +577,10 @@ sap.ui.define([
         return oSystemAlias.spliceSapSystemIntoURI(oWebguiURI, oInboundResolutionResult.systemAlias, sSapSystem,
             sSapSystemDataSrc, "WEBGUI", oInboundResolutionResult.systemAliasSemantics
             || oSystemAlias.SYSTEM_ALIAS_SEMANTICS.applied, fnExternalSystemAliasResolver)
-            .then(function (oWebguiURI) {
+            .then((oWebguiURI) => {
                 // Reconstruct the final url
                 // ASSUMPTION: there are no relevant parameters in the Webgui url, but only Webgui parameters.
-                var sParams = oWebguiURI.search(); // Webgui parameters
+                let sParams = oWebguiURI.search(); // Webgui parameters
 
                 // Inject effective startup param
                 sParams = injectEffectiveParametersIntoWebguiPobjectParam(sParams, oEffectiveParameters,
@@ -578,7 +589,7 @@ sap.ui.define([
                 oWebguiURI.search(sParams);
 
                 // propagate properties from the inbound in the resolution result
-                ["additionalInformation", "applicationDependencies"].forEach(function (sPropName) {
+                ["additionalInformation", "applicationDependencies"].forEach((sPropName) => {
                     if (oInbound.resolutionResult.hasOwnProperty(sPropName)) {
                         oResolutionResult[sPropName] = oInbound.resolutionResult[sPropName];
                     }
@@ -594,19 +605,19 @@ sap.ui.define([
     }
 
     function constructWebguiNowrapResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
-        var oInbound = oMatchingTarget.inbound,
-            oInboundResolutionResult = oInbound && oInbound.resolutionResult;
+        const oInbound = oMatchingTarget.inbound;
+        const oInboundResolutionResult = oInbound && oInbound.resolutionResult;
 
-        var oResolutionResult = {};
+        const oResolutionResult = {};
 
         // splice parameters into Webgui url
-        var oWebguiURI = new URI(sBaseUrl);
+        const oWebguiURI = new URI(sBaseUrl);
 
         // construct effective parameters excluding defaults (!)
-        var oEffectiveParameters = deepExtend({}, oMatchingTarget.mappedIntentParamsPlusSimpleDefaults);
+        const oEffectiveParameters = deepExtend({}, oMatchingTarget.mappedIntentParamsPlusSimpleDefaults);
 
-        var sSapSystem = oEffectiveParameters["sap-system"] && oEffectiveParameters["sap-system"][0];
-        var sSapSystemDataSrc = oEffectiveParameters["sap-system-src"] && oEffectiveParameters["sap-system-src"][0];
+        const sSapSystem = oEffectiveParameters["sap-system"] && oEffectiveParameters["sap-system"][0];
+        const sSapSystemDataSrc = oEffectiveParameters["sap-system-src"] && oEffectiveParameters["sap-system-src"][0];
 
         // in the Webgui case, the sap-system intent parameter is *not* part of the final url
         oResolutionResult["sap-system"] = sSapSystem;
@@ -617,20 +628,20 @@ sap.ui.define([
             delete oEffectiveParameters["sap-system-src"];
         }
 
-        var aUnneccessaryParameters = getUnnecessaryWebguiParameters(oEffectiveParameters, oInbound || {});
+        const aUnneccessaryParameters = getUnnecessaryWebguiParameters(oEffectiveParameters, oInbound || {});
         removeObjectKey(oEffectiveParameters, aUnneccessaryParameters);
 
         return oSystemAlias.spliceSapSystemIntoURI(oWebguiURI, oInboundResolutionResult.systemAlias, sSapSystem,
             sSapSystemDataSrc, "WEBGUI", oResolutionResult.systemAliasSemantics
             || oSystemAlias.SYSTEM_ALIAS_SEMANTICS.applied, fnExternalSystemAliasResolver)
-            .then(function (oWebguiURI) {
+            .then((oWebguiURI) => {
                 // important to extract here to get a potentially modified client
-                var sEffectiveStartupParams
+                const sEffectiveStartupParams
                     = oApplicationTypeUtils.getURLParsing().paramsToString(oEffectiveParameters);
 
                 // Reconstruct the final url
                 // ASSUMPTION: there are no relevant parameters in the Webgui url, but only Webgui parameters.
-                var sParams = oWebguiURI.search(); // Webgui parameters
+                let sParams = oWebguiURI.search(); // Webgui parameters
                 if (sEffectiveStartupParams) {
                     // append effective parameters to Webgui URL
                     sParams = sParams + ((sParams.indexOf("?") < 0) ? "?" : "&") + sEffectiveStartupParams;
@@ -638,7 +649,7 @@ sap.ui.define([
                 oWebguiURI.search(sParams);
 
                 // propagate properties from the inbound in the resolution result
-                ["additionalInformation", "applicationDependencies"].forEach(function (sPropName) {
+                ["additionalInformation", "applicationDependencies"].forEach((sPropName) => {
                     if (oInbound.resolutionResult.hasOwnProperty(sPropName)) {
                         oResolutionResult[sPropName] = oInbound.resolutionResult[sPropName];
                     }
@@ -653,30 +664,30 @@ sap.ui.define([
     }
 
     function constructNativeWebguiNowrapResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
-        var oInbound = oMatchingTarget.inbound,
-            oResolutionResult = oInbound && oInbound.resolutionResult,
-            oForbiddenParameters = {
-                "sap-wd-run-sc": true,
-                "sap-wd-auto-detect": true,
-                "sap-ep-version": true,
-                "sap-system": true,
-                "sap-system-src": true
-            };
+        const oInbound = oMatchingTarget.inbound;
+        const oResolutionResult = oInbound && oInbound.resolutionResult;
+        const oForbiddenParameters = {
+            "sap-wd-run-sc": true,
+            "sap-wd-auto-detect": true,
+            "sap-ep-version": true,
+            "sap-system": true,
+            "sap-system-src": true
+        };
 
         // splice parameters into Webgui url
-        var oWebguiURI = new URI(sBaseUrl);
+        const oWebguiURI = new URI(sBaseUrl);
 
         // construct effective parameters
 
         // NOTE: do not include defaultedParameterNames for wrapped URLs,
         // as they may cause a crash the called application.
-        var oEffectiveParameters = deepExtend({}, oMatchingTarget.mappedIntentParamsPlusSimpleDefaults);
+        const oEffectiveParameters = deepExtend({}, oMatchingTarget.mappedIntentParamsPlusSimpleDefaults);
 
-        var sSapSystem = oEffectiveParameters["sap-system"] && oEffectiveParameters["sap-system"][0];
-        var sSapSystemDataSrc = oEffectiveParameters["sap-system-src"] && oEffectiveParameters["sap-system-src"][0];
+        const sSapSystem = oEffectiveParameters["sap-system"] && oEffectiveParameters["sap-system"][0];
+        const sSapSystemDataSrc = oEffectiveParameters["sap-system-src"] && oEffectiveParameters["sap-system-src"][0];
 
         // remove "forbidden" parameters
-        Object.keys(oEffectiveParameters).forEach(function (sParamName) {
+        Object.keys(oEffectiveParameters).forEach((sParamName) => {
             if (oForbiddenParameters[sParamName.toLowerCase()]) {
                 delete oEffectiveParameters[sParamName];
             }
@@ -685,8 +696,8 @@ sap.ui.define([
         return oSystemAlias.spliceSapSystemIntoURI(oWebguiURI, oResolutionResult.systemAlias, sSapSystem,
             sSapSystemDataSrc, "NATIVEWEBGUI", oResolutionResult.systemAliasSemantics
             || oSystemAlias.SYSTEM_ALIAS_SEMANTICS.applied, fnExternalSystemAliasResolver)
-            .then(function (oWebguiURI) {
-                var oResolutionResult = blendParamsIntoNativeWebGUI(oMatchingTarget.inbound,
+            .then((oWebguiURI) => {
+                const oResolutionResult = blendParamsIntoNativeWebGUI(oMatchingTarget.inbound,
                     oMatchingTarget.mappedIntentParamsPlusSimpleDefaults, oWebguiURI);
 
                 return oResolutionResult;
@@ -712,22 +723,22 @@ sap.ui.define([
      * @private
      */
     function blendParamsIntoNativeWebGUI (oInbound, oMappedIntentParamsPlusSimpleDefaults, oWebguiURI) {
-        var oForbiddenParameters = {
-                "sap-wd-run-sc": true,
-                "sap-wd-auto-detect": true,
-                "sap-ep-version": true,
-                "sap-system": true
-            };
+        const oForbiddenParameters = {
+            "sap-wd-run-sc": true,
+            "sap-wd-auto-detect": true,
+            "sap-ep-version": true,
+            "sap-system": true
+        };
 
-        var oResolutionResult = {};
+        const oResolutionResult = {};
 
         // construct effective parameters
 
         // NOTE: do not include defaultedParameterNames for wrapped URLs,
         // as they may cause a crash the called application.
-        var oEffectiveParameters = deepExtend({}, oMappedIntentParamsPlusSimpleDefaults);
-        var sSapSystem = oEffectiveParameters["sap-system"] && oEffectiveParameters["sap-system"][0];
-        var sSapSystemDataSrc = oEffectiveParameters["sap-system-src"] && oEffectiveParameters["sap-system-src"][0];
+        const oEffectiveParameters = deepExtend({}, oMappedIntentParamsPlusSimpleDefaults);
+        const sSapSystem = oEffectiveParameters["sap-system"] && oEffectiveParameters["sap-system"][0];
+        const sSapSystemDataSrc = oEffectiveParameters["sap-system-src"] && oEffectiveParameters["sap-system-src"][0];
         // before deleting forbidden parameters, back-up sap-system and sap-system-src
         oResolutionResult["sap-system"] = sSapSystem;
         if (typeof sSapSystemDataSrc === "string") {
@@ -735,26 +746,26 @@ sap.ui.define([
         }
 
         // remove "forbidden" parameters
-        Object.keys(oEffectiveParameters).forEach(function (sParamName) {
+        Object.keys(oEffectiveParameters).forEach((sParamName) => {
             if (oForbiddenParameters[sParamName.toLowerCase()]) {
                 delete oEffectiveParameters[sParamName];
             }
         });
 
-        var aUnneccessaryParameters = getUnnecessaryWebguiParameters(oEffectiveParameters, oInbound || {});
+        const aUnneccessaryParameters = getUnnecessaryWebguiParameters(oEffectiveParameters, oInbound || {});
         removeObjectKey(oEffectiveParameters, aUnneccessaryParameters);
 
-        var oEffectiveParametersToAppend = getWebguiNonBusinessParameters(oEffectiveParameters);
+        const oEffectiveParametersToAppend = getWebguiNonBusinessParameters(oEffectiveParameters);
         removeObjectKey(oEffectiveParameters, Object.keys(oEffectiveParametersToAppend));
 
         // Reconstruct the final url
         // ASSUMPTION: there are no relevant parameters in the Webgui url, but only Webgui parameters.
 
-        var sParams = oWebguiURI.search(); // Webgui parameters
-        var sParamsInterpolated = sParams
+        const sParams = oWebguiURI.search(); // Webgui parameters
+        let sParamsInterpolated = sParams
             .split("&")
-            .map(function (sQueryParam) {
-                var aNonBusinessParam;
+            .map((sQueryParam) => {
+                let aNonBusinessParam;
                 // interpolate effective parameter in the correct
                 // place within the ~transaction parameter
 
@@ -773,7 +784,7 @@ sap.ui.define([
                     } else {
                         Log.error(
                             "Found no '=' separator of Webgui non-business parameter. Parameter will be skipped.",
-                            "'" + sQueryParam + "'",
+                            `'${sQueryParam}'`,
                             "sap.ushell.services.ClientSideTargetResolution"
                         );
                     }
@@ -781,7 +792,7 @@ sap.ui.define([
                     return undefined; // do not append the parameter
                 }
 
-                var sInterpolatedQueryParam;
+                let sInterpolatedQueryParam;
                 if (sQueryParam.indexOf("?%7etransaction") === 0 ||
                     sQueryParam.indexOf("%7etransaction") === 0) { // found transaction
 
@@ -796,13 +807,13 @@ sap.ui.define([
                 }
                 return sQueryParam;
             })
-            .filter(function (sParam) {
+            .filter((sParam) => {
                 return typeof sParam !== "undefined";
             }) // remove skipped parameters
             .join("&");
 
         // append non business parameters
-        var sEffectiveParamsToAppend =
+        const sEffectiveParamsToAppend =
             oApplicationTypeUtils.getURLParsing().paramsToString(oEffectiveParametersToAppend);
         sParamsInterpolated = [
             sParamsInterpolated,
@@ -813,7 +824,7 @@ sap.ui.define([
         oWebguiURI.search(sParamsInterpolated);
 
         // propagate properties from the inbound in the resolution result
-        ["additionalInformation", "applicationDependencies", "sap.platform.runtime"].forEach(function (sPropName) {
+        ["additionalInformation", "applicationDependencies", "sap.platform.runtime"].forEach((sPropName) => {
             if (oInbound.resolutionResult.hasOwnProperty(sPropName)) {
                 oResolutionResult[sPropName] = oInbound.resolutionResult[sPropName];
             }
@@ -838,9 +849,9 @@ sap.ui.define([
      * @private
      */
     function getWebguiNonBusinessParameters (oParams) {
-        var oNonBusinessParams;
+        let oNonBusinessParams;
 
-        oNonBusinessParams = oCSTRUtils.filterObject(oParams, function (sKey, sVal) {
+        oNonBusinessParams = oCSTRUtils.filterObject(oParams, (sKey, sVal) => {
             return !isWebguiBusinessParameter(sKey, sVal);
         });
 
@@ -860,53 +871,53 @@ sap.ui.define([
      * @private
      */
     function parseWebguiTransactionQueryParam (sTransactionQueryParam) {
-        var sTransactionValueRe = "^(.+?)(%20|(%20)(.+))?$",
-            reTransactionValue = new RegExp(sTransactionValueRe, "i"),
-            sTransactionValue,
-            oParsed = {
-                hasParameters: null, // whether actual parameters are passed to the transaction
-                transactionParamName: "", // ?%7etransaction or %7etransaction
-                transactionCode: "", // SU01 or *SU01
-                parameters: [] // { name: ..., value: ... }
-            };
+        const sTransactionValueRe = "^(.+?)(%20|(%20)(.+))?$";
+        const reTransactionValue = new RegExp(sTransactionValueRe, "i");
+        let sTransactionValue;
+        const oParsed = {
+            hasParameters: null, // whether actual parameters are passed to the transaction
+            transactionParamName: "", // ?%7etransaction or %7etransaction
+            transactionCode: "", // SU01 or *SU01
+            parameters: [] // { name: ..., value: ... }
+        };
 
-        var aParamNameValues = sTransactionQueryParam.split("=");
+        const aParamNameValues = sTransactionQueryParam.split("=");
 
         if (aParamNameValues.length > 2) {
             return {
-                "error": "Found more than one assignment ('=') in the transaction query parameter",
-                "details": "Only one '=' sign is expected in " + sTransactionQueryParam
+                error: "Found more than one assignment ('=') in the transaction query parameter",
+                details: `Only one '=' sign is expected in ${sTransactionQueryParam}`
             };
         }
 
         if (aParamNameValues.length < 2 || typeof aParamNameValues[1]
             === "undefined" || aParamNameValues[1].length === 0) {
             return {
-                "error": "The transaction query parameter must specify at least the transaction name",
-                "details": "Got " + sTransactionQueryParam + " instead."
+                error: "The transaction query parameter must specify at least the transaction name",
+                details: `Got ${sTransactionQueryParam} instead.`
             };
         }
 
         oParsed.transactionParamName = aParamNameValues[0];
         sTransactionValue = aParamNameValues[1];
 
-        var aMatch = sTransactionValue.match(reTransactionValue);
+        const aMatch = sTransactionValue.match(reTransactionValue);
         if (!aMatch) {
             return {
-                "error": "Cannot parse ~transaction query parameter value.",
-                "details": sTransactionValue + " should match /" + sTransactionValueRe + "/"
+                error: "Cannot parse ~transaction query parameter value.",
+                details: `${sTransactionValue} should match /${sTransactionValueRe}/`
             };
         }
 
         oParsed.transactionCode = aMatch[1];
         if (aMatch[2] && aMatch[2] !== "%20") { // if !== "%20" -> matches (%20)(.+)
             // must parse parameters
-            var sTransactionParams = aMatch[4] || "";
+            const sTransactionParams = aMatch[4] || "";
             sTransactionParams
                 .split("%3b") // i.e., "="
-                .forEach(function (sNameAndValue) {
-                    var aNameAndValue = sNameAndValue.split("%3d"),
-                        sParamName = aNameAndValue[0];
+                .forEach((sNameAndValue) => {
+                    const aNameAndValue = sNameAndValue.split("%3d");
+                    const sParamName = aNameAndValue[0];
 
                     if (sParamName && typeof sParamName === "string" && sParamName.length > 0) { // no empty names
                         oParsed.parameters.push({
@@ -971,7 +982,7 @@ sap.ui.define([
      *   <code>[CODE]</code>.
      */
     function injectEffectiveParametersIntoWebguiQueryParam (sTransactionQueryParam, oParamsToInject) {
-        var oParsedTransactionQueryParam = parseWebguiTransactionQueryParam(sTransactionQueryParam);
+        const oParsedTransactionQueryParam = parseWebguiTransactionQueryParam(sTransactionQueryParam);
         if (oParsedTransactionQueryParam.error) {
             Log.error(
                 oParsedTransactionQueryParam.error,
@@ -982,22 +993,22 @@ sap.ui.define([
         }
 
         // Inject parameters
-        var aParametersFinal = oParsedTransactionQueryParam.parameters.map(function (oParameter) {
-            return oParameter.name.toUpperCase() + "%3d" + oParameter.value;
+        const aParametersFinal = oParsedTransactionQueryParam.parameters.map((oParameter) => {
+            return `${oParameter.name.toUpperCase()}%3d${oParameter.value}`;
         });
 
         const sSkipValue = getExplicitSkipSelectionScreenParameter(oParamsToInject);
 
         // Turn all names upper case
-        var oParamsToInjectUpperCase = {};
-        Object.keys(oParamsToInject).forEach(function (sKey) {
+        const oParamsToInjectUpperCase = {};
+        Object.keys(oParamsToInject).forEach((sKey) => {
             oParamsToInjectUpperCase[sKey.toUpperCase()] = oParamsToInject[sKey];
         });
         // NOTE: privparamsToString treats delimiters verbatim and encodes
         //       the parameters if necessary.
         //       Therefore we pass the delimiters already encoded!
         //
-        var sParamsToInject = oApplicationTypeUtils.getURLParsing().privparamsToString(
+        let sParamsToInject = oApplicationTypeUtils.getURLParsing().privparamsToString(
             oParamsToInjectUpperCase,
             "%3b", // parameters delimiter
             "%3d" // assigment
@@ -1011,11 +1022,11 @@ sap.ui.define([
 
         // Note: do not rely on oParsedTransactionQueryParam as we may
         // still have injected parameters here.
-        var bHasParameters = aParametersFinal.length > 0;
+        const bHasParameters = aParametersFinal.length > 0;
 
-        return oParsedTransactionQueryParam.transactionParamName + "=" +
-            (bHasParameters && (sSkipValue === "" || sSkipValue === "1") ? "*" : "") +
-            oParsedTransactionQueryParam.transactionCode + (bHasParameters ? "%20" : "") + aParametersFinal.join("%3b");
+        return `${oParsedTransactionQueryParam.transactionParamName}=${
+            bHasParameters && (sSkipValue === "" || sSkipValue === "1") ? "*" : ""
+        }${oParsedTransactionQueryParam.transactionCode}${bHasParameters ? "%20" : ""}${aParametersFinal.join("%3b")}`;
     }
 
     /**
@@ -1024,11 +1035,11 @@ sap.ui.define([
      *
      * @private
      */
-    function getExplicitSkipSelectionScreenParameter(oParamsToInject) {
+    function getExplicitSkipSelectionScreenParameter (oParamsToInject) {
         let sSkipValue = "";
         if (oParamsToInject.hasOwnProperty("DYNP_SKIP_SEL_SCREEN")) {
-            let sParamVal = oParamsToInject["DYNP_SKIP_SEL_SCREEN"][0];
-            delete oParamsToInject["DYNP_SKIP_SEL_SCREEN"];
+            const sParamVal = oParamsToInject.DYNP_SKIP_SEL_SCREEN[0];
+            delete oParamsToInject.DYNP_SKIP_SEL_SCREEN;
             if (sParamVal === "" ||
                 sParamVal === " " ||
                 sParamVal === "0" ||
@@ -1064,20 +1075,20 @@ sap.ui.define([
      * @private
      */
     function resolveEasyAccessMenuIntentWebgui (oIntent, oMatchingTarget, fnExternalSystemAliasResolver) {
-        return new Promise(function (fnResolve, fnReject) {
-            var sSapSystemDataSrc;
+        return new Promise((fnResolve, fnReject) => {
+            let sSapSystemDataSrc;
             if (oIntent.params["sap-system-src"]) {
                 sSapSystemDataSrc = oIntent.params["sap-system-src"][0];
             }
-            var sSapSystem = oIntent.params["sap-system"] ? oIntent.params["sap-system"][0] : undefined;
-            var sSapTcode = oIntent.params["sap-ui2-tcode"] ? oIntent.params["sap-ui2-tcode"][0] : undefined;
+            const sSapSystem = oIntent.params["sap-system"] ? oIntent.params["sap-system"][0] : undefined;
+            const sSapTcode = oIntent.params["sap-ui2-tcode"] ? oIntent.params["sap-ui2-tcode"][0] : undefined;
 
-            buildNativeWebGuiURI( sSapTcode, sSapSystem, sSapSystemDataSrc, fnExternalSystemAliasResolver)
-                .then(function (oURI) {
+            buildNativeWebGuiURI(sSapTcode, sSapSystem, sSapSystemDataSrc, fnExternalSystemAliasResolver)
+                .then((oURI) => {
                     delete oMatchingTarget.intentParamsPlusAllDefaults["sap-ui2-tcode"];
                     // rename Parameters
                     oParameterMapping.mapParameterNamesAndRemoveObjects(oMatchingTarget);
-                    var oResolutionResult = blendParamsIntoNativeWebGUI(oMatchingTarget.inbound,
+                    const oResolutionResult = blendParamsIntoNativeWebGUI(oMatchingTarget.inbound,
                         oMatchingTarget.mappedIntentParamsPlusSimpleDefaults, oURI);
                     if (oResolutionResult && oMatchingTarget.inbound && oMatchingTarget.inbound.resolutionResult
                         && oMatchingTarget.inbound.resolutionResult["sap.platform.runtime"]) {
@@ -1089,7 +1100,7 @@ sap.ui.define([
                     oResolutionResult.url = oApplicationTypeUtils.appendParametersToUrl("sap-iframe-hint=GUI", oResolutionResult.url);
                     fnResolve(oResolutionResult);
                 })
-                .catch(function (sError) {
+                .catch((sError) => {
                     fnReject(sError);
                 });
         });