@sapui5/sap.ushell 1.136.3 → 1.138.1

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

@@ -3,20 +3,20 @@ sap.ui.define([
     "sap/base/Log",
     "sap/base/util/deepExtend",
     "sap/ushell/ApplicationType/utils"
-], function (
+], (
     Log,
     deepExtend,
     oApplicationTypeUtils
-) {
+) => {
     "use strict";
 
     function generateUI5ResolutionResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
-        var oInbound = oMatchingTarget.inbound;
-        var oResolutionResult = {};
+        const oInbound = oMatchingTarget.inbound;
+        const oResolutionResult = {};
 
         // propagate properties from the inbound in the resolution result
         // NOTE: we **propagate** applicationType here, as we want to handle URLs as well
-        ["applicationType", "additionalInformation", "applicationDependencies"].forEach(function (sPropName) {
+        ["applicationType", "additionalInformation", "applicationDependencies"].forEach((sPropName) => {
             if (oInbound.resolutionResult.hasOwnProperty(sPropName)) {
                 oResolutionResult[sPropName] = oInbound.resolutionResult[sPropName];
             }
@@ -29,12 +29,11 @@ sap.ui.define([
         // - the component is part of the dist layer
         if (oResolutionResult.applicationDependencies
             && typeof oResolutionResult.url === "undefined") {
-
             oResolutionResult.url = ""; // relative url
         }
 
         // Because of a lazy loading of application properties, we don't want to reject the promise for undefined
-        //url. therefore, we set it to empty string
+        // url. therefore, we set it to empty string
         if (typeof oResolutionResult.url === "undefined") {
             oResolutionResult.url = "";
             // eslint-disable-next-line no-undef
@@ -42,7 +41,7 @@ sap.ui.define([
         }
 
         // construct effective parameters including defaults
-        var oEffectiveParameters = deepExtend({}, oMatchingTarget.mappedIntentParamsPlusSimpleDefaults);
+        const oEffectiveParameters = deepExtend({}, oMatchingTarget.mappedIntentParamsPlusSimpleDefaults);
 
         /*
          * Deal with reserved parameters
@@ -51,7 +50,7 @@ sap.ui.define([
          * to a separate section of the resolution result.
          */
         oResolutionResult.reservedParameters = {};
-        var oReservedParameters = {
+        const oReservedParameters = {
             // Not set or read by RTA
             // We still treat this as a technical parameter to avoid issues with existing usages (e.g. bookmarks) which might
             // leak this parameter into the startupParameters
@@ -68,17 +67,16 @@ sap.ui.define([
             // Used by RTA to determine draft app which user starts to adapt but don't want to activate immediately.
             "sap-ui-fl-version": true
         };
-        Object.keys(oReservedParameters).forEach(function (sName) {
-            var sValue = oEffectiveParameters[sName];
+        Object.keys(oReservedParameters).forEach((sName) => {
+            const sValue = oEffectiveParameters[sName];
             if (sValue) {
                 delete oEffectiveParameters[sName];
                 oResolutionResult.reservedParameters[sName] = sValue;
             }
-
         });
         // don't list reserved parameters as defaulted
         oMatchingTarget.mappedDefaultedParamNames = oMatchingTarget.mappedDefaultedParamNames
-            .filter(function (sDefaultedParameterName) {
+            .filter((sDefaultedParameterName) => {
                 return !oReservedParameters[sDefaultedParameterName];
             });
 
@@ -86,8 +84,8 @@ sap.ui.define([
             oEffectiveParameters["sap-ushell-defaultedParameterNames"] = [JSON.stringify(oMatchingTarget.mappedDefaultedParamNames)];
         }
 
-        var sSapSystem = oEffectiveParameters["sap-system"] && oEffectiveParameters["sap-system"][0];
-        var sSapSystemSrc = oEffectiveParameters["sap-system-src"] && oEffectiveParameters["sap-system-src"][0];
+        const sSapSystem = oEffectiveParameters["sap-system"] && oEffectiveParameters["sap-system"][0];
+        const sSapSystemSrc = oEffectiveParameters["sap-system-src"] && oEffectiveParameters["sap-system-src"][0];
 
         // contrarily to the WDA case, in the SAPUI5 case sap-system and
         // sap-system-src are part of the final URL
@@ -99,7 +97,7 @@ sap.ui.define([
         oMatchingTarget.effectiveParameters = oEffectiveParameters;
 
         // prepare a proper URL!
-        var sUrlParams = oApplicationTypeUtils.getURLParsing().paramsToString(oEffectiveParameters);
+        const sUrlParams = oApplicationTypeUtils.getURLParsing().paramsToString(oEffectiveParameters);
         if (sUrlParams) {
             // append parameters to URL
             oResolutionResult.url = oResolutionResult.url + ((oResolutionResult.url.indexOf("?") < 0) ? "?" : "&") + sUrlParams;

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

@@ -5,25 +5,25 @@ sap.ui.define([
     "sap/ushell/ApplicationType/systemAlias",
     "sap/ushell/ApplicationType/utils",
     "sap/ushell/Config"
-], function (
+], (
     deepExtend,
     URI,
     oSystemAlias,
     oApplicationTypeUtils,
     Config
-) {
+) => {
     "use strict";
 
     function generateURLResolutionResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
-        var oInbound = oMatchingTarget.inbound;
-        var oInboundResolutionResult = oInbound && oInbound.resolutionResult;
-        var oResolutionResult = {};
+        const oInbound = oMatchingTarget.inbound;
+        const oInboundResolutionResult = oInbound && oInbound.resolutionResult;
+        const oResolutionResult = {};
 
         // splice parameters into url
-        var oURI = new URI(sBaseUrl);
+        const oURI = new URI(sBaseUrl);
 
         // construct effective parameters including defaults
-        var oEffectiveParameters = deepExtend({}, oMatchingTarget.mappedIntentParamsPlusSimpleDefaults);
+        const oEffectiveParameters = deepExtend({}, oMatchingTarget.mappedIntentParamsPlusSimpleDefaults);
 
         // a special hack to work around the AA modelling of Tile Intents in the export
         // the special intent Shell-launchURL with a dedicated parameter sap-external-url
@@ -35,8 +35,8 @@ sap.ui.define([
             delete oEffectiveParameters["sap-external-url"];
         }
 
-        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];
 
         // do not include the sap-system parameter in the URL
         oResolutionResult["sap-system"] = sSapSystem;
@@ -48,7 +48,7 @@ sap.ui.define([
             delete oEffectiveParameters["sap-system-src"];
         }
 
-        return (new Promise(function (fnResolve, fnReject) {
+        return (new Promise((fnResolve, fnReject) => {
             if (
                 oApplicationTypeUtils.absoluteUrlDefinedByUser(
                     oURI, oInboundResolutionResult.systemAlias,
@@ -61,31 +61,29 @@ sap.ui.define([
                     oURI, oInboundResolutionResult.systemAlias, sSapSystem, sSapSystemDataSrc,
                     "URL", oInboundResolutionResult.systemAliasSemantics || oSystemAlias.SYSTEM_ALIAS_SEMANTICS.applied,
                     fnExternalSystemAliasResolver)
-                    .then(function (oSapSystemURI) {
-                        var sSapSystemUrl = oSapSystemURI.toString();
+                    .then((oSapSystemURI) => {
+                        const sSapSystemUrl = oSapSystemURI.toString();
                         fnResolve(sSapSystemUrl);
                     }, fnReject);
             }
         }))
-            .then(function (sUrlWithoutParameters) {
-                var bAppendParams = false,
-                    sParameters,
-                    sFLPURLDetectionPattern = Config.last("/core/navigation/flpURLDetectionPattern"),
-                    rFLPURLDetectionRegex = new RegExp(sFLPURLDetectionPattern);
+            .then((sUrlWithoutParameters) => {
+                let bAppendParams = false;
+                const sFLPURLDetectionPattern = Config.last("/core/navigation/flpURLDetectionPattern");
+                const rFLPURLDetectionRegex = new RegExp(sFLPURLDetectionPattern);
 
                 if (oEffectiveParameters && oEffectiveParameters.hasOwnProperty("sap-params-append")) {
                     delete oEffectiveParameters["sap-params-append"];
                     bAppendParams = true;
                 }
-                sParameters = oApplicationTypeUtils.getURLParsing().paramsToString(oEffectiveParameters);
+                const sParameters = oApplicationTypeUtils.getURLParsing().paramsToString(oEffectiveParameters);
                 return rFLPURLDetectionRegex.test(sUrlWithoutParameters) || (bAppendParams === true)
                     ? oApplicationTypeUtils.appendParametersToIntentURL(oEffectiveParameters, sUrlWithoutParameters)
                     : oApplicationTypeUtils.appendParametersToUrl(sParameters, sUrlWithoutParameters);
-
             }, Promise.reject.bind(Promise))
-            .then(function (sUrlWithParameters) {
+            .then((sUrlWithParameters) => {
                 // propagate properties from the inbound in the resolution result
-                ["additionalInformation", "applicationDependencies", "systemAlias"].forEach(function (sPropName) {
+                ["additionalInformation", "applicationDependencies", "systemAlias"].forEach((sPropName) => {
                     if (oInbound.resolutionResult.hasOwnProperty(sPropName)) {
                         oResolutionResult[sPropName] = oInbound.resolutionResult[sPropName];
                     }