@sapui5/sap.ushell 1.114.0 → 1.115.0

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

@@ -226,7 +226,7 @@ sap.ui.define([
      * @param {Function} fnExternalSystemAliasResolver
      *   The alias resolver for remote system names.
      *
-     * @returns {jQuery.Deferred.promise}
+     * @returns {Promise}
      *   A promise that resolved with the URI object
      *
      * @private
@@ -450,57 +450,56 @@ sap.ui.define([
             delete oEffectiveParameters["sap-system-src"];
         }
 
-        return new Promise(function (fnResolve, fnReject) {
-            oSystemAlias.spliceSapSystemIntoURI(oWebguiURI, oInboundResolutionResult.systemAlias, sSapSystem,
-                sSapSystemDataSrc, "NATIVEWEBGUI",
-                oInboundResolutionResult.systemAliasSemantics
-                || oSystemAlias.SYSTEM_ALIAS_SEMANTICS.applied, fnExternalSystemAliasResolver)
-                .fail(fnReject)
-                .done(function (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
-                        .split("&")
-                        .map(function (sQueryParam) {
-                            // interpolate effective parameter in the correct place within the ~transaction parameter
-
-                            var sInterpolatedQueryParam;
-                            if (sQueryParam.indexOf("?%7etransaction") === 0 ||
-                                sQueryParam.indexOf("%7etransaction") === 0) { // found transaction
-
-                                // treat transaction as if it was a query parameter
-                                sInterpolatedQueryParam = injectEffectiveParametersIntoWebguiPobjectParam(
-                                    sQueryParam,
-                                    oEffectiveParameters,
-                                    "%3b", // parameter separator -> ";"
-                                    "%3d" // parameter assign delimiter -> "="
-                                );
-                                return sInterpolatedQueryParam;
-                            }
-
-                            return sQueryParam;
-                        })
-                        .join("&");
-
-                    oWebguiURI.search(sParamsInterpolated);
-
-                    // propagate properties from the inbound in the resolution result
-                    ["additionalInformation", "applicationDependencies"].forEach(function (sPropName) {
-                        if (oInbound.resolutionResult.hasOwnProperty(sPropName)) {
-                            oResolutionResult[sPropName] = oInbound.resolutionResult[sPropName];
+
+        return oSystemAlias.spliceSapSystemIntoURI(oWebguiURI, oInboundResolutionResult.systemAlias, sSapSystem,
+            sSapSystemDataSrc, "NATIVEWEBGUI",
+            oInboundResolutionResult.systemAliasSemantics
+            || oSystemAlias.SYSTEM_ALIAS_SEMANTICS.applied, fnExternalSystemAliasResolver)
+            .then(function (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
+                    .split("&")
+                    .map(function (sQueryParam) {
+                        // interpolate effective parameter in the correct place within the ~transaction parameter
+
+                        var sInterpolatedQueryParam;
+                        if (sQueryParam.indexOf("?%7etransaction") === 0 ||
+                            sQueryParam.indexOf("%7etransaction") === 0) { // found transaction
+
+                            // treat transaction as if it was a query parameter
+                            sInterpolatedQueryParam = injectEffectiveParametersIntoWebguiPobjectParam(
+                                sQueryParam,
+                                oEffectiveParameters,
+                                "%3b", // parameter separator -> ";"
+                                "%3d" // parameter assign delimiter -> "="
+                            );
+                            return sInterpolatedQueryParam;
                         }
-                    });
-                    oResolutionResult.url = oWebguiURI.toString();
-                    oResolutionResult.text = oInbound.title;
-                    oResolutionResult.applicationType = "TR"; // Triggers Native navigation
-                    oApplicationTypeUtils.setSystemAlias(oResolutionResult, oInbound.resolutionResult);
 
-                    fnResolve(oResolutionResult);
+                        return sQueryParam;
+                    })
+                    .join("&");
+
+                oWebguiURI.search(sParamsInterpolated);
+
+                // propagate properties from the inbound in the resolution result
+                ["additionalInformation", "applicationDependencies"].forEach(function (sPropName) {
+                    if (oInbound.resolutionResult.hasOwnProperty(sPropName)) {
+                        oResolutionResult[sPropName] = oInbound.resolutionResult[sPropName];
+                    }
                 });
-        });
+                oResolutionResult.url = oWebguiURI.toString();
+                oResolutionResult.text = oInbound.title;
+                oResolutionResult.applicationType = "TR"; // Triggers Native navigation
+                oApplicationTypeUtils.setSystemAlias(oResolutionResult, oInbound.resolutionResult);
+
+                return oResolutionResult;
+            });
     }
+
     function constructFullWebguiResolutionResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
         var oInbound = oMatchingTarget.inbound,
             oInboundResolutionResult = oInbound && oInbound.resolutionResult,
@@ -516,9 +515,8 @@ sap.ui.define([
             sSapSystemDataSrc = oMappedIntentParamsPlusSimpleDefaults["sap-system-src"][0];
         }
 
-        return new Promise(function (fnResolve, fnReject) {
-            buildNativeWebGuiURI(oInbound.resolutionResult["sap.gui"].transaction, sSapSystem, sSapSystemDataSrc,
-                fnExternalSystemAliasResolver).done(function (oURIWithSystemAlias) {
+        return buildNativeWebGuiURI(oInbound.resolutionResult["sap.gui"].transaction, sSapSystem, sSapSystemDataSrc, fnExternalSystemAliasResolver)
+            .then(function (oURIWithSystemAlias) {
                 oParameterMapping.mapParameterNamesAndRemoveObjects(oMatchingTarget);
                 var oResolutionResult = blendParamsIntoNativeWebGUI(oMatchingTarget.inbound,
                     oMatchingTarget.mappedIntentParamsPlusSimpleDefaults, oURIWithSystemAlias);
@@ -531,10 +529,10 @@ sap.ui.define([
                 oResolutionResult["sap-system"] = sSapSystem;
                 oApplicationTypeUtils.setSystemAlias(oResolutionResult, oInbound.resolutionResult);
 
-                fnResolve(oResolutionResult);
-            }).fail(fnReject);
-        });
+                return oResolutionResult;
+            });
     }
+
     function constructWebguiWrapResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
         var oInbound = oMatchingTarget.inbound,
             oInboundResolutionResult = oInbound && oInbound.resolutionResult;
@@ -564,38 +562,36 @@ sap.ui.define([
             delete oEffectiveParameters["sap-system-src"];
         }
 
-        return new Promise(function (fnResolve, fnReject) {
-            oSystemAlias.spliceSapSystemIntoURI(oWebguiURI, oInboundResolutionResult.systemAlias, sSapSystem,
-                sSapSystemDataSrc, "WEBGUI", oInboundResolutionResult.systemAliasSemantics
-                || oSystemAlias.SYSTEM_ALIAS_SEMANTICS.applied, fnExternalSystemAliasResolver)
-                .fail(fnReject)
-                .done(function (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
-
-                    // Inject effective startup param
-                    sParams = injectEffectiveParametersIntoWebguiPobjectParam(sParams, oEffectiveParameters,
-                        "&", "=");
-
-                    oWebguiURI.search(sParams);
-
-                    // propagate properties from the inbound in the resolution result
-                    ["additionalInformation", "applicationDependencies"].forEach(function (sPropName) {
-                        if (oInbound.resolutionResult.hasOwnProperty(sPropName)) {
-                            oResolutionResult[sPropName] = oInbound.resolutionResult[sPropName];
-                        }
-                    });
+        return oSystemAlias.spliceSapSystemIntoURI(oWebguiURI, oInboundResolutionResult.systemAlias, sSapSystem,
+            sSapSystemDataSrc, "WEBGUI", oInboundResolutionResult.systemAliasSemantics
+            || oSystemAlias.SYSTEM_ALIAS_SEMANTICS.applied, fnExternalSystemAliasResolver)
+            .then(function (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
 
-                    oResolutionResult.url = oWebguiURI.toString();
-                    oResolutionResult.text = oInbound.title;
-                    oResolutionResult.applicationType = "NWBC";
-                    oApplicationTypeUtils.setSystemAlias(oResolutionResult, oInbound.resolutionResult);
+                // Inject effective startup param
+                sParams = injectEffectiveParametersIntoWebguiPobjectParam(sParams, oEffectiveParameters,
+                    "&", "=");
 
-                    fnResolve(oResolutionResult);
+                oWebguiURI.search(sParams);
+
+                // propagate properties from the inbound in the resolution result
+                ["additionalInformation", "applicationDependencies"].forEach(function (sPropName) {
+                    if (oInbound.resolutionResult.hasOwnProperty(sPropName)) {
+                        oResolutionResult[sPropName] = oInbound.resolutionResult[sPropName];
+                    }
                 });
-        });
+
+                oResolutionResult.url = oWebguiURI.toString();
+                oResolutionResult.text = oInbound.title;
+                oResolutionResult.applicationType = "NWBC";
+                oApplicationTypeUtils.setSystemAlias(oResolutionResult, oInbound.resolutionResult);
+
+                return oResolutionResult;
+            });
     }
+
     function constructWebguiNowrapResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
         var oInbound = oMatchingTarget.inbound,
             oInboundResolutionResult = oInbound && oInbound.resolutionResult;
@@ -623,41 +619,38 @@ sap.ui.define([
         var aUnneccessaryParameters = getUnnecessaryWebguiParameters(oEffectiveParameters, oInbound || {});
         removeObjectKey(oEffectiveParameters, aUnneccessaryParameters);
 
-        return new Promise(function (fnResolve, fnReject) {
-            oSystemAlias.spliceSapSystemIntoURI(oWebguiURI, oInboundResolutionResult.systemAlias, sSapSystem,
-                sSapSystemDataSrc, "WEBGUI", oResolutionResult.systemAliasSemantics
-                || oSystemAlias.SYSTEM_ALIAS_SEMANTICS.applied, fnExternalSystemAliasResolver)
-                .fail(fnReject)
-                .done(function (oWebguiURI) {
-                    // important to extract here to get a potentially modified client
-                    var 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
-                    if (sEffectiveStartupParams) {
-                        // append effective parameters to Webgui URL
-                        sParams = sParams + ((sParams.indexOf("?") < 0) ? "?" : "&") + sEffectiveStartupParams;
-                    }
-                    oWebguiURI.search(sParams);
-
-                    // propagate properties from the inbound in the resolution result
-                    ["additionalInformation", "applicationDependencies"].forEach(function (sPropName) {
-                        if (oInbound.resolutionResult.hasOwnProperty(sPropName)) {
-                            oResolutionResult[sPropName] = oInbound.resolutionResult[sPropName];
-                        }
-                    });
-                    oResolutionResult.url = oWebguiURI.toString();
-                    oResolutionResult.text = oInbound.title;
-                    oResolutionResult.applicationType = "NWBC";
-                    oApplicationTypeUtils.setSystemAlias(oResolutionResult, oInbound.resolutionResult);
+        return oSystemAlias.spliceSapSystemIntoURI(oWebguiURI, oInboundResolutionResult.systemAlias, sSapSystem,
+            sSapSystemDataSrc, "WEBGUI", oResolutionResult.systemAliasSemantics
+            || oSystemAlias.SYSTEM_ALIAS_SEMANTICS.applied, fnExternalSystemAliasResolver)
+            .then(function (oWebguiURI) {
+                // important to extract here to get a potentially modified client
+                var 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
+                if (sEffectiveStartupParams) {
+                    // append effective parameters to Webgui URL
+                    sParams = sParams + ((sParams.indexOf("?") < 0) ? "?" : "&") + sEffectiveStartupParams;
+                }
+                oWebguiURI.search(sParams);
 
-                    fnResolve(oResolutionResult);
+                // propagate properties from the inbound in the resolution result
+                ["additionalInformation", "applicationDependencies"].forEach(function (sPropName) {
+                    if (oInbound.resolutionResult.hasOwnProperty(sPropName)) {
+                        oResolutionResult[sPropName] = oInbound.resolutionResult[sPropName];
+                    }
                 });
-        });
+                oResolutionResult.url = oWebguiURI.toString();
+                oResolutionResult.text = oInbound.title;
+                oResolutionResult.applicationType = "NWBC";
+                oApplicationTypeUtils.setSystemAlias(oResolutionResult, oInbound.resolutionResult);
 
+                return oResolutionResult;
+            });
     }
+
     function constructNativeWebguiNowrapResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
         var oInbound = oMatchingTarget.inbound,
             oResolutionResult = oInbound && oInbound.resolutionResult,
@@ -689,19 +682,15 @@ sap.ui.define([
             }
         });
 
-        return new Promise(function (fnResolve, fnReject) {
-            oSystemAlias.spliceSapSystemIntoURI(oWebguiURI, oResolutionResult.systemAlias, sSapSystem,
-                sSapSystemDataSrc, "NATIVEWEBGUI", oResolutionResult.systemAliasSemantics
-                || oSystemAlias.SYSTEM_ALIAS_SEMANTICS.applied, fnExternalSystemAliasResolver)
-                .fail(fnReject)
-                .done(function (oWebguiURI) {
-                    var oResolutionResult = blendParamsIntoNativeWebGUI(oMatchingTarget.inbound,
-                        oMatchingTarget.mappedIntentParamsPlusSimpleDefaults, oWebguiURI);
-
-                    fnResolve(oResolutionResult);
-                });
-        });
+        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,
+                    oMatchingTarget.mappedIntentParamsPlusSimpleDefaults, oWebguiURI);
 
+                return oResolutionResult;
+            });
     }
 
     /**
@@ -1029,6 +1018,9 @@ sap.ui.define([
             "%3d" // assigment
         );
         if (sParamsToInject) {
+            if (Object.keys(oParamsToInject).length > 0) {
+                sParamsToInject += "%3b";
+            }
             aParametersFinal.push(sParamsToInject);
         }
 
@@ -1070,7 +1062,7 @@ sap.ui.define([
             var sSapTcode = oIntent.params["sap-ui2-tcode"] ? oIntent.params["sap-ui2-tcode"][0] : undefined;
 
             buildNativeWebGuiURI( sSapTcode, sSapSystem, sSapSystemDataSrc, fnExternalSystemAliasResolver)
-                .done(function (oURI) {
+                .then(function (oURI) {
                     delete oMatchingTarget.intentParamsPlusAllDefaults["sap-ui2-tcode"];
                     // rename Parameters
                     oParameterMapping.mapParameterNamesAndRemoveObjects(oMatchingTarget);
@@ -1086,7 +1078,7 @@ sap.ui.define([
                     oResolutionResult.url = oApplicationTypeUtils.appendParametersToUrl("sap-iframe-hint=GUI", oResolutionResult.url);
                     fnResolve(oResolutionResult);
                 })
-                .fail(function (sError) {
+                .catch(function (sError) {
                     fnReject(sError);
                 });
         });
@@ -1111,4 +1103,4 @@ sap.ui.define([
 
 
 
-}, /* bExport = */ false);
+});