@sapui5/sap.ushell 1.136.3 → 1.138.1

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

@@ -24,7 +24,7 @@ sap.ui.define([
 
     /**
      * removes properties of an object
-     * @param {*} oObject
+     * @param {object} oObject
      *   Object that is modified and that has its properties deleted
      * @param {string[]} aKeysToRemove The keys of properties to be removed
      */
@@ -40,6 +40,60 @@ sap.ui.define([
             && oInbound.signature.parameters[sParameterName].required === true;
     }
 
+    /**
+     * Tells whether the given parameter is a Webgui business parameter
+     * This method has a polimorphic signature: it can be called with one or two arguments.
+     * If called with one argument both the name and the parameter value
+     * should be passed, separated by "=". The first "=" will be treated as
+     * parameter separator. Otherwise two parameters (name, value) can be passed.
+     *
+     * NOTE: the method determines whether the value is passed based on how
+     * many arguments are passed.
+     *
+     * @param {string} sName
+     *   A parameter name or a name=value string.
+     * @param {string} [sValue]
+     *   An optional parameter value to be used in combination with the
+     *   name specified in <code>sNameMaybeValue</code>.
+     *
+     * @returns {boolean}
+     *   Whether the given parameter is a Webgui business parameter.
+     *
+     * @private
+     */
+    function isWebguiBusinessParameter (sName, sValue) {
+        let aNameValue;
+        // handle case in which sName is in the form "name=value"
+        if (arguments.length === 1) {
+            aNameValue = sName.split(/[=](.+)?/); // split on first "="
+            if (aNameValue.length > 1) {
+                return isWebguiBusinessParameter.apply(null, aNameValue);
+            }
+        }
+
+        return !(
+            sName.indexOf("sap-") === 0 ||
+            sName.indexOf("saml") === 0 ||
+            sName.charAt(0) === "~"
+        );
+    }
+
+    /**
+     * Finds and returns webgui business parameters.
+     *
+     * @param {object} oParams
+     *   set of WebGUI parameters
+     *
+     * @returns {object}
+     *   the set of business parameters
+     *
+     * @private
+     */
+    function getWebguiBusinessParameters (oParams) {
+        const oBusinessParameters = oCSTRUtils.filterObject(oParams, isWebguiBusinessParameter);
+        return oBusinessParameters;
+    }
+
     /**
      * Returns the name of parameters that should not appear in a WebGUI URL.
      *
@@ -96,133 +150,6 @@ sap.ui.define([
         return aBusinessParameters;
     }
 
-    /**
-     * Finds and returns webgui business parameters.
-     *
-     * @param {object} oParams
-     *   set of WebGUI parameters
-     *
-     * @returns {object}
-     *   the set of business parameters
-     *
-     * @private
-     */
-    function getWebguiBusinessParameters (oParams) {
-        const oBusinessParameters = oCSTRUtils.filterObject(oParams, isWebguiBusinessParameter);
-        return oBusinessParameters;
-    }
-
-    /**
-     * Tells whether the given parameter is a Webgui business parameter
-     * This method has a polimorphic signature: it can be called with one or two arguments.
-     * If called with one argument both the name and the parameter value
-     * should be passed, separated by "=". The first "=" will be treated as
-     * parameter separator. Otherwise two parameters (name, value) can be passed.
-     *
-     * NOTE: the method determines whether the value is passed based on how
-     * many arguments are passed.
-     *
-     * @param {string} sName
-     *   A parameter name or a name=value string.
-     * @param {string} [sValue]
-     *   An optional parameter value to be used in combination with the
-     *   name specified in <code>sNameMaybeValue</code>.
-     *
-     * @returns {boolean}
-     *   Whether the given parameter is a Webgui business parameter.
-     *
-     * @private
-     */
-    function isWebguiBusinessParameter (sName, sValue) {
-        let aNameValue;
-        // handle case in which sName is in the form "name=value"
-        if (arguments.length === 1) {
-            aNameValue = sName.split(/[=](.+)?/); // split on first "="
-            if (aNameValue.length > 1) {
-                return isWebguiBusinessParameter.apply(null, aNameValue);
-            }
-        }
-
-        return !(
-            sName.indexOf("sap-") === 0 ||
-            sName.indexOf("saml") === 0 ||
-            sName.charAt(0) === "~"
-        );
-    }
-
-
-    function generateTRResolutionResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
-        const oInbound = oMatchingTarget.inbound;
-        const oResolutionResult = oInbound && oInbound.resolutionResult;
-        let oPromise;
-
-        if (
-            !(!oInbound ||
-            !oResolutionResult ||
-            !(oResolutionResult["sap.gui"]) ||
-            !(oResolutionResult.applicationType === "TR"))
-        ) {
-            oPromise = constructFullWebguiResolutionResult(oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver);
-        } else if (
-            !(!oInbound ||
-                !oResolutionResult ||
-                !(oResolutionResult.applicationType === "TR") ||
-                !(oResolutionResult.url.indexOf("/~canvas;") >= 0) ||
-                !(oResolutionResult.url.indexOf("app/transaction/APB_LPD_CALL_") === -1)) //check no WRAPPED transaction
-        ) {
-            oPromise = constructWebguiNowrapResult(oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver);
-        } else if (
-            !(!oInbound ||
-                !oResolutionResult ||
-                !(oResolutionResult.applicationType === "TR") ||
-                !(oResolutionResult.url.indexOf("/~canvas;") >= 0) ||
-                !(oResolutionResult.url.indexOf("app/transaction/APB_LPD_CALL_") >= 0)) // check WRAPPED transaction
-        ) {
-            oPromise = constructWebguiWrapResult(oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver);
-        } else if (
-            !(// a native webgui URL
-                !oInbound ||
-                !oResolutionResult ||
-                !(oResolutionResult.applicationType === "TR") ||
-                !(oResolutionResult.url.indexOf("/its/webgui") >= 0) ||
-                !(oResolutionResult.url.indexOf("APB_LPD_CALL_") === -1) // a non wrapped URL
-            )
-        ) {
-            oPromise = constructNativeWebguiNowrapResult(oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver);
-        } else if (
-            !(// a native webgui URL
-                !oInbound ||
-                !oResolutionResult ||
-                !(oResolutionResult.applicationType === "TR") ||
-                !(oResolutionResult.url.indexOf("/its/webgui") >= 0) ||
-                !(oResolutionResult.url.indexOf("APB_LPD_CALL_") !== -1) // a WRAPPED URL
-            )
-        ) {
-            oPromise = constructNativeWebguiWrapResult(oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver);
-        }
-
-        if (oPromise) {
-            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);
-                oApplicationTypeUtils.addKeepAliveToURLTemplateResult(oResult);
-                return oResult;
-            });
-        }
-        throw new Error("Cannot generate TR resolution result");
-    }
-
-
     /**
      * Creates a native webgui URL given the a resolution result "from" nothing (but either a
      * Shell-startURL intent or a  appdescriptor information
@@ -246,271 +173,351 @@ sap.ui.define([
      * @private
      */
     function buildNativeWebGuiURI (sTcode, sSapSystem, sSapSystemDataSrc, fnExternalSystemAliasResolver) {
-        let sUrl;
-        let oURI;
         sTcode = encodeURIComponent(sTcode);
-        sUrl = `/gui/sap/its/webgui?%7etransaction=${sTcode}&%7enosplash=1`;
-        oURI = new URI(sUrl);
+        const sUrl = `/gui/sap/its/webgui?%7etransaction=${sTcode}&%7enosplash=1`;
+        const oURI = new URI(sUrl);
         return oSystemAlias.spliceSapSystemIntoURI(oURI, oSystemAlias.LOCAL_SYSTEM_ALIAS, sSapSystem, sSapSystemDataSrc,
             "NATIVEWEBGUI", oSystemAlias.SYSTEM_ALIAS_SEMANTICS.apply, fnExternalSystemAliasResolver);
     }
 
-
     /**
-     * Interpolates the parameters into the given query using transaction
-     * interpolation format.
-     *
-     * The method tries to interpolate the given parameters into the
-     * <code>P_OBJECT</code> query parameter if present in the query
-     * string.  Otherwise the <code>P_OBJECT</code> parameter is added to
-     * the query string.
-     *
-     * <p>Contrarily to standard URLs, the parameter must be injected into the
-     * query parameter double escaped (via encodeURIComponent) and with
-     * the nonstandard delimiters passed as input.
-     *
-     * <p >For example, when using '&' and '=' as delimiters, given the
-     * query string <code>A=B&P_OBJECT=</code>
-     * and the parameter object
-     * <pre>
-     * {
-     *    B: ["C"],
-     *    C: ["D"]
-     * }
-     * </pre>, the interpolated query string
-     * <code>A=B&P_OBJECT=B%2521C%2525C%2521D</code> is returned.
+     * Parses Native Webgui query parameter
      *
-     * <p>
-     * IMPORTANT: the <code>P_OBJECT</code> parameter can take maximum 132
-     * characters in its value. In case the given parameters form a string
-     * that is longer than 132 characters (unescaped), the string will be
-     * splitted over multiple <code>P_OBJx</code> parameters that are added
-     * to the URL.
-     * <br />
-     * For example, the method may return the following interpolated query:
-     * <code>P_OBJ1=rest_of_p_object_value&P_OBJ2=...&P_OBJECT=...some_long_value...</code>
-     * </p>
+     * @param {string} sTransactionQueryParam
+     *   The full ~transaction query parameter with or without question
+     *   mark. E.g., <code>?%7etransaction=*SU01%20p1%3d%3bP2=v2</code>
      *
-     * @param {string} sQuery
-     *   The query string to interpolate the parameters into
-     * @param {object} oParamsToInject
-     *   An object indicating the parameters that need to be interpolated.
-     * @param {string} sQueryParamDelimiter
-     *   The delimiter used to separate parameters and values in <code>sQuery</code>. E.g., "&"
-     * @param {string} sQueryParamAssignDelimiter
-     *   The delimiter used to separate assignments of a value to a parameter in <code>sQuery</code>. E.g., "="
+     * @returns {object}
+     *   An object containing the parsed parts of the URL parameter
      *
-     * @returns {string}
-     *   The interpolated query string.
+     * @private
      */
-    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.
-        let sParamsToInject = oApplicationTypeUtils.getURLParsing().privparamsToString(
-            oParamsToInject,
-            "%25", // a.k.a. "%", instead of &
-            "%21" // a.k.a. "!", instead of =
-        );
+    function parseWebguiTransactionQueryParam (sTransactionQueryParam) {
+        const sTransactionValueRe = "^(.+?)(%20|(%20)(.+))?$";
+        const reTransactionValue = new RegExp(sTransactionValueRe, "i");
+        const oParsed = {
+            hasParameters: null, // whether actual parameters are passed to the transaction
+            transactionParamName: "", // ?%7etransaction or %7etransaction
+            transactionCode: "", // SU01 or *SU01
+            parameters: [] // { name: ..., value: ... }
+        };
 
-        if (!sParamsToInject) {
-            return sQuery;
-        }
+        const aParamNameValues = sTransactionQueryParam.split("=");
 
-        // Parse away existing parameters in P_OBJECT
-        let sParamsToInjectPrefix = "";
-        amendGuiParam("P_OBJECT", sQuery, sQueryParamDelimiter, sQueryParamAssignDelimiter,
-            (sParamNameAndValueDoubleEncoded) => {
-                const sParamValueDoubleEncoded = sParamNameAndValueDoubleEncoded.replace(sPobjectPlusDelimiter, "");
-                sParamsToInjectPrefix = decodeURIComponent(sParamValueDoubleEncoded);
-                if (sParamsToInjectPrefix.length > 0) {
-                    sParamsToInjectPrefix = `${sParamsToInjectPrefix}%25`;
-                }
+        if (aParamNameValues.length > 2) {
+            return {
+                error: "Found more than one assignment ('=') in the transaction query parameter",
+                details: `Only one '=' sign is expected in ${sTransactionQueryParam}`
+            };
+        }
 
-                return sPobjectPlusDelimiter; // just leave the P_OBJECT= placeholder if found
-            });
-        sParamsToInject = sParamsToInjectPrefix + sParamsToInject;
+        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.`
+            };
+        }
 
-        // Generate the injected parameters
-        const oParamsSections = {
-            pObjX: "",
-            pObject: ""
-        };
-        sParamsToInject
-            .match(new RegExp(`.{1,${iMaxGUIParamLength}}`, "g"))
-            .map((sParamGroupEncoded) => {
-                return encodeURIComponent(sParamGroupEncoded);
-            })
-            .forEach((sParamGroupDoubleEncoded, iGroupIdx) => {
-                // parameter name should be P_OBJECT or P_OBJx for further parameters
-                let sParamName = "P_OBJECT";
-                let sParamSection = "pObject";
-                if (iGroupIdx > 0) {
-                    sParamName = `P_OBJ${iGroupIdx}`;
-                    sParamSection = "pObjX";
-                }
+        oParsed.transactionParamName = aParamNameValues[0];
+        const sTransactionValue = aParamNameValues[1];
 
-                const sSectionDelimiter = oParamsSections[sParamSection].length === 0 ? "" : sQueryParamDelimiter;
+        const aMatch = sTransactionValue.match(reTransactionValue);
+        if (!aMatch) {
+            return {
+                error: "Cannot parse ~transaction query parameter value.",
+                details: `${sTransactionValue} should match /${sTransactionValueRe}/`
+            };
+        }
 
-                oParamsSections[sParamSection] = oParamsSections[sParamSection] + sSectionDelimiter + sParamName
-                    + sQueryParamAssignDelimiter + sParamGroupDoubleEncoded;
-            });
+        oParsed.transactionCode = aMatch[1];
+        if (aMatch[2] && aMatch[2] !== "%20") { // if !== "%20" -> matches (%20)(.+)
+            // must parse parameters
+            const sTransactionParams = aMatch[4] || "";
+            sTransactionParams
+                .split("%3b") // i.e., "="
+                .forEach((sNameAndValue) => {
+                    const aNameAndValue = sNameAndValue.split("%3d");
+                    const sParamName = aNameAndValue[0];
 
-        sInjectedParams = [oParamsSections.pObjX, oParamsSections.pObject]
-            .filter((sParamSection) => {
-                return sParamSection.length > 0;
-            })
-            .join(sQueryParamDelimiter);
+                    if (sParamName && typeof sParamName === "string" && sParamName.length > 0) { // no empty names
+                        oParsed.parameters.push({
+                            name: sParamName,
+                            value: aNameAndValue[1]
+                        });
+                    }
+                });
+        }
 
-        // Place the injected params in the right place in the query
-        const oAmendResult = amendGuiParam("P_OBJECT", sQuery, sQueryParamDelimiter,
-            sQueryParamAssignDelimiter, (sFoundParamNameAndValue) => {
-                return sInjectedParams;
-            });
+        // post parsing adjustments
 
-        if (oAmendResult.found) {
-            return oAmendResult.query;
+        // detect whether the transaction name had a '*' or if the * was
+        // added because of parameters.
+        // NOTE: **SU01 would be a valid tcode
+        oParsed.hasParameters = false;
+        if (oParsed.parameters.length > 0) {
+            oParsed.hasParameters = true;
+
+            // must remove the starting "*" from the transaction code if
+            // any is found (was added because of parameters).
+            oParsed.transactionCode = oParsed.transactionCode.replace(/^[*]/, "");
         }
 
-        // amendment not performed: just append the concatenation
-        return sQuery + (sQuery.length === 0 ? "" : sQueryParamDelimiter) + sInjectedParams;
+        return oParsed;
     }
 
     /**
-     * Amends a specified GUI param through a given callback function.
+     * extract the DYNP_SKIP_SEL_SCREEN parameter that indicates whether to
+     * how the selection screen even if parameters are sent
      *
-     * @param {string} sTargetParamName
-     *   The target WebGui parameter to find
-     * @param {string} sQuery
-     *   The query string to find the parameter in
-     * @param {string} sQueryParamDelimiter
-     *   The delimiter used to separate parameters and values in <code>sQuery</code>. E.g., "&"
-     * @param {string} sQueryParamAssignDelimiter
-     *   The delimiter used to separate assignments of a value to a parameter in <code>sQuery</code>. E.g., "="
-     * @param {function} fnAmend
-     *   A callback used to amend the <code>sTargetParamName</code>
-     *   parameter of the query string. It is a function that should return
-     *   the value to assign to the target parameter in the query string,
-     *   should this target parameter be present.
-     *   <p>When this function returns <code>undefined</code>, the target
-     *   parameter will be removed from the query string</p>
+     * @param {object} oParamsToInject the parameters to inject.
+     * @returns {string} the DYNP_SKIP_SEL_SCREEN value.
      *
-     * @returns {object}
-     *   An object representing the result of the amend operation. It is like:
-     *   <pre>
-     *   {
-     *      found: <boolean> // whether the target parameter was found
-     *      query: <string>  // the amended query string or the original
-     *                       // query string if the target parameter was not found
-     *   }
-     *   </pre>
+     * @private
      */
-    function amendGuiParam (sTargetParamName, sQuery, sQueryParamDelimiter, sQueryParamAssignDelimiter, fnAmend) {
-        let bFound = false;
-        const sParamSearchPrefix = sTargetParamName + sQueryParamAssignDelimiter; // Param=
+    function getExplicitSkipSelectionScreenParameter (oParamsToInject) {
+        let sSkipValue = "";
+        if (oParamsToInject.hasOwnProperty("DYNP_SKIP_SEL_SCREEN")) {
+            const sParamVal = oParamsToInject.DYNP_SKIP_SEL_SCREEN[0];
+            delete oParamsToInject.DYNP_SKIP_SEL_SCREEN;
+            if (sParamVal === "" ||
+                sParamVal === " " ||
+                sParamVal === "0" ||
+                sParamVal === 0 ||
+                (typeof sParamVal === "string" && sParamVal.toLowerCase() === "false")) {
+                sSkipValue = "0";
+            } else if (sParamVal === "1" ||
+                sParamVal === 1 ||
+                (typeof sParamVal === "string" && sParamVal.toLowerCase() === "true")) {
+                sSkipValue = "1";
+            }
+        }
+        return sSkipValue;
+    }
 
-        const sAmendedQuery = sQuery
-            .split(sQueryParamDelimiter)
-            .map((sParam) => {
+    /**
+     * Interpolates the given parameters into the webgui ~transaction parameter.
+     *
+     * The method tries to intepolate the given parameters after the
+     * transaction code present in the given ~transaction parameter.
+     *
+     * <p>For example, given the query string
+     * <code>?%7etransaction=SU01</code>
+     *
+     * and the parameter object
+     * <pre>
+     * {
+     *    B: ["C"],
+     *    C: ["D"]
+     * }
+     * </pre>, the following string is returned:
+     * <code>?%7etransaction=*SU01%20B%3dC%3bC%3dD</code
+     *
+     * @param {string} sTransactionQueryParam
+     *   The whole ~transaction parameter. Must start with "?%7etransaction" or "%7etransaction".
+     *   For example <ul
+     *   <li><code>%7etransaction=*SU01%20AAAA%3d4321</code> (with AAAA=4321 parameter)</li>
+     *   <li><code>?%7etransaction=SU01</code> (no parameters)</li>
+     *   </ul>
+     * @param {object} oParamsToInject
+     *   An object ating the parameters that need to be interpolated
+     *   into <code>sTransactionQueryParam</code>.
+     *
+     * @returns {string}
+     *   The interpolated ~transaction parameter (the leading ? is
+     *   preserved if passed).  The transaction code will have the form
+     *   <code>*[CODE]%20[PARAMETERS]]</code> only when the transaction
+     *   will be called with parameters, otherwise the format would be
+     *   <code>[CODE]</code>.
+     */
+    function injectEffectiveParametersIntoWebguiQueryParam (sTransactionQueryParam, oParamsToInject) {
+        const oParsedTransactionQueryParam = parseWebguiTransactionQueryParam(sTransactionQueryParam);
+        if (oParsedTransactionQueryParam.error) {
+            Log.error(
+                oParsedTransactionQueryParam.error,
+                oParsedTransactionQueryParam.details,
+                "sap.ushell.services.ClientSideTargetResolution"
+            );
+            return sTransactionQueryParam;
+        }
 
-                if (sParam.indexOf(sParamSearchPrefix) !== 0) {
-                    return sParam;
-                }
+        // Inject parameters
+        const aParametersFinal = oParsedTransactionQueryParam.parameters.map((oParameter) => {
+            return `${oParameter.name.toUpperCase()}%3d${oParameter.value}`;
+        });
 
-                bFound = true;
+        const sSkipValue = getExplicitSkipSelectionScreenParameter(oParamsToInject);
 
-                return fnAmend(sParam);
-            })
-            .filter((sParam) => {
-                return typeof sParam !== "undefined";
-            })
-            .join(sQueryParamDelimiter);
+        // Turn all names upper case
+        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!
+        //
+        let sParamsToInject = oApplicationTypeUtils.getURLParsing().privparamsToString(
+            oParamsToInjectUpperCase,
+            "%3b", // parameters delimiter
+            "%3d" // assigment
+        );
+        if (sParamsToInject) {
+            if (Object.keys(oParamsToInject).length > 0) {
+                sParamsToInject += "%3b";
+            }
+            aParametersFinal.push(sParamsToInject);
+        }
 
-        return {
-            found: bFound,
-            query: sAmendedQuery
-        };
+        // Note: do not rely on oParsedTransactionQueryParam as we may
+        // still have injected parameters here.
+        const bHasParameters = aParametersFinal.length > 0;
+
+        return `${oParsedTransactionQueryParam.transactionParamName}=${
+            bHasParameters && (sSkipValue === "" || sSkipValue === "1") ? "*" : ""
+        }${oParsedTransactionQueryParam.transactionCode}${bHasParameters ? "%20" : ""}${aParametersFinal.join("%3b")}`;
     }
 
+    /**
+     * Finds and returns webgui non-business parameters.
+     *
+     * @param {object} oParams
+     *   set of WebGUI parameters
+     *
+     * @returns {object}
+     *   the set of non-business parameters
+     *
+     * @private
+     */
+    function getWebguiNonBusinessParameters (oParams) {
+        const oNonBusinessParams = oCSTRUtils.filterObject(oParams, (sKey, sVal) => {
+            return !isWebguiBusinessParameter(sKey, sVal);
+        });
 
-    function constructNativeWebguiWrapResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
-        const oInbound = oMatchingTarget.inbound;
-        const oInboundResolutionResult = oInbound && oInbound.resolutionResult;
-        const oResolutionResult = {};
+        return oNonBusinessParams;
+    }
 
-        // splice parameters into Webgui url
-        const oWebguiURI = new URI(sBaseUrl);
+    /**
+     * blends parameters of oMatchingTarget into the oWebguiURI,
+     * then sets the altered URI constructing a resolution result in oMatchingTarget
+     *
+     * @param {object} oInbound
+     *   The original inbound
+     *
+     * @param {object} oMappedIntentParamsPlusSimpleDefaults
+     *   The set of mapped parameters including simple default parameters
+     *
+     * @param {function} oWebguiURI
+     *   A (native) WebGui URI Object
+     *
+     * @returns {object} oResolutionResult
+     *
+     * Note: the method mutates oWebguiURI
+     * @private
+     */
+    function blendParamsIntoNativeWebGUI (oInbound, oMappedIntentParamsPlusSimpleDefaults, oWebguiURI) {
+        const oForbiddenParameters = {
+            "sap-wd-run-sc": true,
+            "sap-wd-auto-detect": true,
+            "sap-ep-version": true,
+            "sap-system": true
+        };
+
+        const oResolutionResult = {};
 
         // construct effective parameters
 
         // NOTE: do not include defaultedParameterNames for wrapped URLs,
         // as they may cause a crash the called application.
-        const oEffectiveParameters = deepExtend({}, oMatchingTarget.mappedIntentParamsPlusSimpleDefaults);
-
+        const oEffectiveParameters = deepExtend({}, oMappedIntentParamsPlusSimpleDefaults);
         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
+        // before deleting forbidden parameters, back-up sap-system and sap-system-src
         oResolutionResult["sap-system"] = sSapSystem;
-        delete oEffectiveParameters["sap-system"];
-
-        // in the Webgui case, the sap-system-src intent parameter is *not* part of the final url
         if (typeof sSapSystemDataSrc === "string") {
             oResolutionResult["sap-system-src"] = sSapSystemDataSrc;
-            delete oEffectiveParameters["sap-system-src"];
         }
 
+        // remove "forbidden" parameters
+        Object.keys(oEffectiveParameters).forEach((sParamName) => {
+            if (oForbiddenParameters[sParamName.toLowerCase()]) {
+                delete oEffectiveParameters[sParamName];
+            }
+        });
 
-        return oSystemAlias.spliceSapSystemIntoURI(oWebguiURI, oInboundResolutionResult.systemAlias, sSapSystem,
-            sSapSystemDataSrc, "NATIVEWEBGUI",
-            oInboundResolutionResult.systemAliasSemantics
-            || oSystemAlias.SYSTEM_ALIAS_SEMANTICS.applied, fnExternalSystemAliasResolver)
-            .then((oWebguiURI) => {
-                // Reconstruct the final url
-                // ASSUMPTION: there are no relevant parameters in the Webgui url, but only Webgui parameters.
+        const aUnneccessaryParameters = getUnnecessaryWebguiParameters(oEffectiveParameters, oInbound || {});
+        removeObjectKey(oEffectiveParameters, aUnneccessaryParameters);
+
+        const oEffectiveParametersToAppend = getWebguiNonBusinessParameters(oEffectiveParameters);
+        removeObjectKey(oEffectiveParameters, Object.keys(oEffectiveParametersToAppend));
 
-                const sParams = oWebguiURI.search(); // Webgui parameters
-                const sParamsInterpolated = sParams
-                    .split("&")
-                    .map((sQueryParam) => {
-                        // interpolate effective parameter in the correct place within the ~transaction parameter
+        // Reconstruct the final url
+        // ASSUMPTION: there are no relevant parameters in the Webgui url, but only Webgui parameters.
 
-                        let sInterpolatedQueryParam;
-                        if (sQueryParam.indexOf("?%7etransaction") === 0 ||
-                            sQueryParam.indexOf("%7etransaction") === 0) { // found transaction
+        const sParams = oWebguiURI.search(); // Webgui parameters
+        let sParamsInterpolated = sParams
+            .split("&")
+            .map((sQueryParam) => {
+                let aNonBusinessParam;
+                // interpolate effective parameter in the correct
+                // place within the ~transaction parameter
 
-                            // treat transaction as if it was a query parameter
-                            sInterpolatedQueryParam = injectEffectiveParametersIntoWebguiPobjectParam(
-                                sQueryParam,
-                                oEffectiveParameters,
-                                "%3b", // parameter separator -> ";"
-                                "%3d" // parameter assign delimiter -> "="
-                            );
-                            return sInterpolatedQueryParam;
+                if (!isWebguiBusinessParameter(sQueryParam)) { // non-business parameters go in the end
+                    // we need name = value
+                    if (sQueryParam.indexOf("=") >= 0) {
+                        aNonBusinessParam = sQueryParam.split("=");
+                        if (!oEffectiveParametersToAppend.hasOwnProperty(aNonBusinessParam[0])) {
+                            // effective parameters have precedence
+                            oEffectiveParametersToAppend[
+                                aNonBusinessParam[0] // name
+                            ] = aNonBusinessParam[1]; // value
                         }
+                    } else {
+                        Log.error(
+                            "Found no '=' separator of Webgui non-business parameter. Parameter will be skipped.",
+                            `'${sQueryParam}'`,
+                            "sap.ushell.services.ClientSideTargetResolution"
+                        );
+                    }
 
-                        return sQueryParam;
-                    })
-                    .join("&");
+                    return undefined; // do not append the parameter
+                }
 
-                oWebguiURI.search(sParamsInterpolated);
+                if (sQueryParam.indexOf("?%7etransaction") === 0 ||
+                    sQueryParam.indexOf("%7etransaction") === 0) { // found transaction
+                    // treat transaction as if it was a query parameter
+                    return injectEffectiveParametersIntoWebguiQueryParam(sQueryParam, oEffectiveParameters);
+                }
+                return sQueryParam;
+            })
+            .filter((sParam) => {
+                return typeof sParam !== "undefined";
+            }) // remove skipped parameters
+            .join("&");
 
-                // propagate properties from the inbound in the resolution result
-                ["additionalInformation", "applicationDependencies"].forEach((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);
+        // append non business parameters
+        const sEffectiveParamsToAppend =
+            oApplicationTypeUtils.getURLParsing().paramsToString(oEffectiveParametersToAppend);
+        sParamsInterpolated = [
+            sParamsInterpolated,
+            sEffectiveParamsToAppend.replace("~", "%7e") // encodeURIComponent escapes all characters except:
+            // alphabetic, decimal digits, - _ . ! ~ * ' ( )'
+        ].join("&");
 
-                return oResolutionResult;
-            });
+        oWebguiURI.search(sParamsInterpolated);
+
+        // propagate properties from the inbound in the resolution result
+        ["additionalInformation", "applicationDependencies", "sap.platform.runtime"].forEach((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) {
@@ -546,64 +553,6 @@ sap.ui.define([
             });
     }
 
-    function constructWebguiWrapResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
-        const oInbound = oMatchingTarget.inbound;
-        const oInboundResolutionResult = oInbound && oInbound.resolutionResult;
-
-        const oResolutionResult = {};
-
-        // splice parameters into Webgui url
-        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.
-        const oEffectiveParameters = deepExtend({}, oMatchingTarget.mappedIntentParamsPlusSimpleDefaults);
-
-        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;
-        delete oEffectiveParameters["sap-system"];
-
-        if (typeof sSapSystemDataSrc === "string") {
-            oResolutionResult["sap-system-src"] = sSapSystemDataSrc;
-            delete oEffectiveParameters["sap-system-src"];
-        }
-
-        return oSystemAlias.spliceSapSystemIntoURI(oWebguiURI, oInboundResolutionResult.systemAlias, sSapSystem,
-            sSapSystemDataSrc, "WEBGUI", oInboundResolutionResult.systemAliasSemantics
-            || oSystemAlias.SYSTEM_ALIAS_SEMANTICS.applied, fnExternalSystemAliasResolver)
-            .then((oWebguiURI) => {
-                // Reconstruct the final url
-                // ASSUMPTION: there are no relevant parameters in the Webgui url, but only Webgui parameters.
-                let 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((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) {
         const oInbound = oMatchingTarget.inbound;
         const oInboundResolutionResult = oInbound && oInbound.resolutionResult;
@@ -705,354 +654,383 @@ sap.ui.define([
     }
 
     /**
-     * blends parameters of oMatchingTarget into the oWebguiURI,
-     * then sets the altered URI constructing a resolution result in oMatchingTarget
-     *
-     * @param {object} oInbound
-     *   The original inbound
-     *
-     * @param {object} oMappedIntentParamsPlusSimpleDefaults
-     *   The set of mapped parameters including simple default parameters
-     *
-     * @param {function} oWebguiURI
-     *   A (native) WebGui URI Object
+     * Amends a specified GUI param through a given callback function.
      *
-     * @returns {object} oResolutionResult
+     * @param {string} sTargetParamName
+     *   The target WebGui parameter to find
+     * @param {string} sQuery
+     *   The query string to find the parameter in
+     * @param {string} sQueryParamDelimiter
+     *   The delimiter used to separate parameters and values in <code>sQuery</code>. E.g., "&"
+     * @param {string} sQueryParamAssignDelimiter
+     *   The delimiter used to separate assignments of a value to a parameter in <code>sQuery</code>. E.g., "="
+     * @param {function} fnAmend
+     *   A callback used to amend the <code>sTargetParamName</code>
+     *   parameter of the query string. It is a function that should return
+     *   the value to assign to the target parameter in the query string,
+     *   should this target parameter be present.
+     *   <p>When this function returns <code>undefined</code>, the target
+     *   parameter will be removed from the query string</p>
      *
-     * Note: the method mutates oWebguiURI
-     * @private
+     * @returns {object}
+     *   An object representing the result of the amend operation. It is like:
+     *   <pre>
+     *   {
+     *      found: <boolean> // whether the target parameter was found
+     *      query: <string>  // the amended query string or the original
+     *                       // query string if the target parameter was not found
+     *   }
+     *   </pre>
      */
-    function blendParamsIntoNativeWebGUI (oInbound, oMappedIntentParamsPlusSimpleDefaults, oWebguiURI) {
-        const oForbiddenParameters = {
-            "sap-wd-run-sc": true,
-            "sap-wd-auto-detect": true,
-            "sap-ep-version": true,
-            "sap-system": true
-        };
-
-        const oResolutionResult = {};
-
-        // construct effective parameters
-
-        // NOTE: do not include defaultedParameterNames for wrapped URLs,
-        // as they may cause a crash the called application.
-        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") {
-            oResolutionResult["sap-system-src"] = sSapSystemDataSrc;
-        }
-
-        // remove "forbidden" parameters
-        Object.keys(oEffectiveParameters).forEach((sParamName) => {
-            if (oForbiddenParameters[sParamName.toLowerCase()]) {
-                delete oEffectiveParameters[sParamName];
-            }
-        });
-
-        const aUnneccessaryParameters = getUnnecessaryWebguiParameters(oEffectiveParameters, oInbound || {});
-        removeObjectKey(oEffectiveParameters, aUnneccessaryParameters);
-
-        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.
-
-        const sParams = oWebguiURI.search(); // Webgui parameters
-        let sParamsInterpolated = sParams
-            .split("&")
-            .map((sQueryParam) => {
-                let aNonBusinessParam;
-                // interpolate effective parameter in the correct
-                // place within the ~transaction parameter
-
-                if (!isWebguiBusinessParameter(sQueryParam)) { // non-business parameters go in the end
-                    // we need name = value
-                    if (sQueryParam.indexOf("=") >= 0) {
-
-                        aNonBusinessParam = sQueryParam.split("=");
-                        if (!oEffectiveParametersToAppend.hasOwnProperty(aNonBusinessParam[0])) {
-                            // effective parameters have precedence
-                            oEffectiveParametersToAppend[
-                                aNonBusinessParam[0] // name
-                            ] = aNonBusinessParam[1]; // value
-                        }
-
-                    } else {
-                        Log.error(
-                            "Found no '=' separator of Webgui non-business parameter. Parameter will be skipped.",
-                            `'${sQueryParam}'`,
-                            "sap.ushell.services.ClientSideTargetResolution"
-                        );
-                    }
+    function amendGuiParam (sTargetParamName, sQuery, sQueryParamDelimiter, sQueryParamAssignDelimiter, fnAmend) {
+        let bFound = false;
+        const sParamSearchPrefix = sTargetParamName + sQueryParamAssignDelimiter; // Param=
 
-                    return undefined; // do not append the parameter
+        const sAmendedQuery = sQuery
+            .split(sQueryParamDelimiter)
+            .map((sParam) => {
+                if (sParam.indexOf(sParamSearchPrefix) !== 0) {
+                    return sParam;
                 }
 
-                let sInterpolatedQueryParam;
-                if (sQueryParam.indexOf("?%7etransaction") === 0 ||
-                    sQueryParam.indexOf("%7etransaction") === 0) { // found transaction
+                bFound = true;
 
-                    // treat transaction as if it was a query parameter
-                    sInterpolatedQueryParam = injectEffectiveParametersIntoWebguiQueryParam(
-                        sQueryParam,
-                        oEffectiveParameters,
-                        "%3b", // parameter separator -> ";"
-                        "%3d" // parameter assign delimiter -> "="
-                    );
-                    return sInterpolatedQueryParam;
-                }
-                return sQueryParam;
+                return fnAmend(sParam);
             })
             .filter((sParam) => {
                 return typeof sParam !== "undefined";
-            }) // remove skipped parameters
-            .join("&");
-
-        // append non business parameters
-        const sEffectiveParamsToAppend =
-            oApplicationTypeUtils.getURLParsing().paramsToString(oEffectiveParametersToAppend);
-        sParamsInterpolated = [
-            sParamsInterpolated,
-            sEffectiveParamsToAppend.replace("~", "%7e") // encodeURIComponent escapes all characters except:
-            // alphabetic, decimal digits, - _ . ! ~ * ' ( )'
-        ].join("&");
-
-        oWebguiURI.search(sParamsInterpolated);
-
-        // propagate properties from the inbound in the resolution result
-        ["additionalInformation", "applicationDependencies", "sap.platform.runtime"].forEach((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);
+            })
+            .join(sQueryParamDelimiter);
 
-        return oResolutionResult;
+        return {
+            found: bFound,
+            query: sAmendedQuery
+        };
     }
 
     /**
-     * Finds and returns webgui non-business parameters.
+     * Interpolates the parameters into the given query using transaction
+     * interpolation format.
      *
-     * @param {object} oParams
-     *   set of WebGUI parameters
+     * The method tries to interpolate the given parameters into the
+     * <code>P_OBJECT</code> query parameter if present in the query
+     * string.  Otherwise the <code>P_OBJECT</code> parameter is added to
+     * the query string.
      *
-     * @returns {object}
-     *   the set of non-business parameters
+     * <p>Contrarily to standard URLs, the parameter must be injected into the
+     * query parameter double escaped (via encodeURIComponent) and with
+     * the nonstandard delimiters passed as input.
      *
-     * @private
-     */
-    function getWebguiNonBusinessParameters (oParams) {
-        let oNonBusinessParams;
-
-        oNonBusinessParams = oCSTRUtils.filterObject(oParams, (sKey, sVal) => {
-            return !isWebguiBusinessParameter(sKey, sVal);
-        });
-
-        return oNonBusinessParams;
-    }
-
-    /**
-     * Parses Native Webgui query parameter
+     * <p >For example, when using '&' and '=' as delimiters, given the
+     * query string <code>A=B&P_OBJECT=</code>
+     * and the parameter object
+     * <pre>
+     * {
+     *    B: ["C"],
+     *    C: ["D"]
+     * }
+     * </pre>, the interpolated query string
+     * <code>A=B&P_OBJECT=B%2521C%2525C%2521D</code> is returned.
      *
-     * @param {string} sTransactionQueryParam
-     *   The full ~transaction query parameter with or without question
-     *   mark. E.g., <code>?%7etransaction=*SU01%20p1%3d%3bP2=v2</code>
+     * <p>
+     * IMPORTANT: the <code>P_OBJECT</code> parameter can take maximum 132
+     * characters in its value. In case the given parameters form a string
+     * that is longer than 132 characters (unescaped), the string will be
+     * splitted over multiple <code>P_OBJx</code> parameters that are added
+     * to the URL.
+     * <br />
+     * For example, the method may return the following interpolated query:
+     * <code>P_OBJ1=rest_of_p_object_value&P_OBJ2=...&P_OBJECT=...some_long_value...</code>
+     * </p>
      *
-     * @returns {object}
-     *   An object containing the parsed parts of the URL parameter
+     * @param {string} sQuery
+     *   The query string to interpolate the parameters into
+     * @param {object} oParamsToInject
+     *   An object indicating the parameters that need to be interpolated.
+     * @param {string} sQueryParamDelimiter
+     *   The delimiter used to separate parameters and values in <code>sQuery</code>. E.g., "&"
+     * @param {string} sQueryParamAssignDelimiter
+     *   The delimiter used to separate assignments of a value to a parameter in <code>sQuery</code>. E.g., "="
      *
-     * @private
+     * @returns {string}
+     *   The interpolated query string.
      */
-    function parseWebguiTransactionQueryParam (sTransactionQueryParam) {
-        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: ... }
-        };
+    function injectEffectiveParametersIntoWebguiPobjectParam (sQuery, oParamsToInject, sQueryParamDelimiter, sQueryParamAssignDelimiter) {
+        const sPobjectPlusDelimiter = `P_OBJECT${sQueryParamAssignDelimiter}`;
+        const iMaxGUIParamLength = 132;
 
-        const aParamNameValues = sTransactionQueryParam.split("=");
+        // NOTE: the result of privparamsToString does not encode
+        //       delimiters, hence we pass them encoded.
+        let sParamsToInject = oApplicationTypeUtils.getURLParsing().privparamsToString(
+            oParamsToInject,
+            "%25", // a.k.a. "%", instead of &
+            "%21" // a.k.a. "!", instead of =
+        );
 
-        if (aParamNameValues.length > 2) {
-            return {
-                error: "Found more than one assignment ('=') in the transaction query parameter",
-                details: `Only one '=' sign is expected in ${sTransactionQueryParam}`
-            };
+        if (!sParamsToInject) {
+            return sQuery;
         }
 
-        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.`
-            };
+        // Parse away existing parameters in P_OBJECT
+        let sParamsToInjectPrefix = "";
+        amendGuiParam("P_OBJECT", sQuery, sQueryParamDelimiter, sQueryParamAssignDelimiter,
+            (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
+            });
+        sParamsToInject = sParamsToInjectPrefix + sParamsToInject;
+
+        // Generate the injected parameters
+        const oParamsSections = {
+            pObjX: "",
+            pObject: ""
+        };
+        sParamsToInject
+            .match(new RegExp(`.{1,${iMaxGUIParamLength}}`, "g"))
+            .map((sParamGroupEncoded) => {
+                return encodeURIComponent(sParamGroupEncoded);
+            })
+            .forEach((sParamGroupDoubleEncoded, iGroupIdx) => {
+                // parameter name should be P_OBJECT or P_OBJx for further parameters
+                let sParamName = "P_OBJECT";
+                let sParamSection = "pObject";
+                if (iGroupIdx > 0) {
+                    sParamName = `P_OBJ${iGroupIdx}`;
+                    sParamSection = "pObjX";
+                }
+
+                const sSectionDelimiter = oParamsSections[sParamSection].length === 0 ? "" : sQueryParamDelimiter;
+
+                oParamsSections[sParamSection] = oParamsSections[sParamSection] + sSectionDelimiter + sParamName
+                    + sQueryParamAssignDelimiter + sParamGroupDoubleEncoded;
+            });
+
+        const sInjectedParams = [oParamsSections.pObjX, oParamsSections.pObject]
+            .filter((sParamSection) => {
+                return sParamSection.length > 0;
+            })
+            .join(sQueryParamDelimiter);
+
+        // Place the injected params in the right place in the query
+        const oAmendResult = amendGuiParam("P_OBJECT", sQuery, sQueryParamDelimiter,
+            sQueryParamAssignDelimiter, (sFoundParamNameAndValue) => {
+                return sInjectedParams;
+            });
+
+        if (oAmendResult.found) {
+            return oAmendResult.query;
         }
 
-        oParsed.transactionParamName = aParamNameValues[0];
-        sTransactionValue = aParamNameValues[1];
+        // amendment not performed: just append the concatenation
+        return sQuery + (sQuery.length === 0 ? "" : sQueryParamDelimiter) + sInjectedParams;
+    }
 
-        const aMatch = sTransactionValue.match(reTransactionValue);
-        if (!aMatch) {
-            return {
-                error: "Cannot parse ~transaction query parameter value.",
-                details: `${sTransactionValue} should match /${sTransactionValueRe}/`
-            };
+    function constructWebguiWrapResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
+        const oInbound = oMatchingTarget.inbound;
+        const oInboundResolutionResult = oInbound && oInbound.resolutionResult;
+
+        const oResolutionResult = {};
+
+        // splice parameters into Webgui url
+        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.
+        const oEffectiveParameters = deepExtend({}, oMatchingTarget.mappedIntentParamsPlusSimpleDefaults);
+
+        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;
+        delete oEffectiveParameters["sap-system"];
+
+        if (typeof sSapSystemDataSrc === "string") {
+            oResolutionResult["sap-system-src"] = sSapSystemDataSrc;
+            delete oEffectiveParameters["sap-system-src"];
         }
 
-        oParsed.transactionCode = aMatch[1];
-        if (aMatch[2] && aMatch[2] !== "%20") { // if !== "%20" -> matches (%20)(.+)
-            // must parse parameters
-            const sTransactionParams = aMatch[4] || "";
-            sTransactionParams
-                .split("%3b") // i.e., "="
-                .forEach((sNameAndValue) => {
-                    const aNameAndValue = sNameAndValue.split("%3d");
-                    const sParamName = aNameAndValue[0];
+        return oSystemAlias.spliceSapSystemIntoURI(oWebguiURI, oInboundResolutionResult.systemAlias, sSapSystem,
+            sSapSystemDataSrc, "WEBGUI", oInboundResolutionResult.systemAliasSemantics
+            || oSystemAlias.SYSTEM_ALIAS_SEMANTICS.applied, fnExternalSystemAliasResolver)
+            .then((oWebguiURI) => {
+                // Reconstruct the final url
+                // ASSUMPTION: there are no relevant parameters in the Webgui url, but only Webgui parameters.
+                let sParams = oWebguiURI.search(); // Webgui parameters
 
-                    if (sParamName && typeof sParamName === "string" && sParamName.length > 0) { // no empty names
-                        oParsed.parameters.push({
-                            name: sParamName,
-                            value: aNameAndValue[1]
-                        });
+                // Inject effective startup param
+                sParams = injectEffectiveParametersIntoWebguiPobjectParam(sParams, oEffectiveParameters,
+                    "&", "=");
+
+                oWebguiURI.search(sParams);
+
+                // propagate properties from the inbound in the resolution result
+                ["additionalInformation", "applicationDependencies"].forEach((sPropName) => {
+                    if (oInbound.resolutionResult.hasOwnProperty(sPropName)) {
+                        oResolutionResult[sPropName] = oInbound.resolutionResult[sPropName];
                     }
                 });
-        }
 
-        // post parsing adjustments
+                oResolutionResult.url = oWebguiURI.toString();
+                oResolutionResult.text = oInbound.title;
+                oResolutionResult.applicationType = "NWBC";
+                oApplicationTypeUtils.setSystemAlias(oResolutionResult, oInbound.resolutionResult);
 
-        // detect whether the transaction name had a '*' or if the * was
-        // added because of parameters.
-        // NOTE: **SU01 would be a valid tcode
-        oParsed.hasParameters = false;
-        if (oParsed.parameters.length > 0) {
-            oParsed.hasParameters = true;
+                return oResolutionResult;
+            });
+    }
 
-            // must remove the starting "*" from the transaction code if
-            // any is found (was added because of parameters).
-            oParsed.transactionCode = oParsed.transactionCode.replace(/^[*]/, "");
-        }
+    function constructNativeWebguiWrapResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
+        const oInbound = oMatchingTarget.inbound;
+        const oInboundResolutionResult = oInbound && oInbound.resolutionResult;
+        const oResolutionResult = {};
 
-        return oParsed;
-    }
+        // splice parameters into Webgui url
+        const oWebguiURI = new URI(sBaseUrl);
 
+        // construct effective parameters
 
-    /**
-     * Interpolates the given parameters into the webgui ~transaction parameter.
-     *
-     * The method tries to intepolate the given parameters after the
-     * transaction code present in the given ~transaction parameter.
-     *
-     * <p>For example, given the query string
-     * <code>?%7etransaction=SU01</code>
-     *
-     * and the parameter object
-     * <pre>
-     * {
-     *    B: ["C"],
-     *    C: ["D"]
-     * }
-     * </pre>, the following string is returned:
-     * <code>?%7etransaction=*SU01%20B%3dC%3bC%3dD</code
-     *
-     * @param {string} sTransactionQueryParam
-     *   The whole ~transaction parameter. Must start with "?%7etransaction" or "%7etransaction".
-     *   For example <ul
-     *   <li><code>%7etransaction=*SU01%20AAAA%3d4321</code> (with AAAA=4321 parameter)</li>
-     *   <li><code>?%7etransaction=SU01</code> (no parameters)</li>
-     *   </ul>
-     * @param {object} oParamsToInject
-     *   An object ating the parameters that need to be interpolated
-     *   into <code>sTransactionQueryParam</code>.
-     *
-     * @returns {string}
-     *   The interpolated ~transaction parameter (the leading ? is
-     *   preserved if passed).  The transaction code will have the form
-     *   <code>*[CODE]%20[PARAMETERS]]</code> only when the transaction
-     *   will be called with parameters, otherwise the format would be
-     *   <code>[CODE]</code>.
-     */
-    function injectEffectiveParametersIntoWebguiQueryParam (sTransactionQueryParam, oParamsToInject) {
-        const oParsedTransactionQueryParam = parseWebguiTransactionQueryParam(sTransactionQueryParam);
-        if (oParsedTransactionQueryParam.error) {
-            Log.error(
-                oParsedTransactionQueryParam.error,
-                oParsedTransactionQueryParam.details,
-                "sap.ushell.services.ClientSideTargetResolution"
-            );
-            return sTransactionQueryParam;
-        }
+        // NOTE: do not include defaultedParameterNames for wrapped URLs,
+        // as they may cause a crash the called application.
+        const oEffectiveParameters = deepExtend({}, oMatchingTarget.mappedIntentParamsPlusSimpleDefaults);
 
-        // Inject parameters
-        const aParametersFinal = oParsedTransactionQueryParam.parameters.map((oParameter) => {
-            return `${oParameter.name.toUpperCase()}%3d${oParameter.value}`;
-        });
+        const sSapSystem = oEffectiveParameters["sap-system"] && oEffectiveParameters["sap-system"][0];
+        const sSapSystemDataSrc = oEffectiveParameters["sap-system-src"] && oEffectiveParameters["sap-system-src"][0];
 
-        const sSkipValue = getExplicitSkipSelectionScreenParameter(oParamsToInject);
+        // in the Webgui case, the sap-system intent parameter is *not* part of the final url
+        oResolutionResult["sap-system"] = sSapSystem;
+        delete oEffectiveParameters["sap-system"];
 
-        // Turn all names upper case
-        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!
-        //
-        let sParamsToInject = oApplicationTypeUtils.getURLParsing().privparamsToString(
-            oParamsToInjectUpperCase,
-            "%3b", // parameters delimiter
-            "%3d" // assigment
-        );
-        if (sParamsToInject) {
-            if (Object.keys(oParamsToInject).length > 0) {
-                sParamsToInject += "%3b";
-            }
-            aParametersFinal.push(sParamsToInject);
+        // in the Webgui case, the sap-system-src intent parameter is *not* part of the final url
+        if (typeof sSapSystemDataSrc === "string") {
+            oResolutionResult["sap-system-src"] = sSapSystemDataSrc;
+            delete oEffectiveParameters["sap-system-src"];
         }
 
-        // Note: do not rely on oParsedTransactionQueryParam as we may
-        // still have injected parameters here.
-        const bHasParameters = aParametersFinal.length > 0;
+        return oSystemAlias.spliceSapSystemIntoURI(oWebguiURI, oInboundResolutionResult.systemAlias, sSapSystem,
+            sSapSystemDataSrc, "NATIVEWEBGUI",
+            oInboundResolutionResult.systemAliasSemantics
+            || oSystemAlias.SYSTEM_ALIAS_SEMANTICS.applied, fnExternalSystemAliasResolver)
+            .then((oWebguiURI) => {
+                // Reconstruct the final url
+                // ASSUMPTION: there are no relevant parameters in the Webgui url, but only Webgui parameters.
 
-        return `${oParsedTransactionQueryParam.transactionParamName}=${
-            bHasParameters && (sSkipValue === "" || sSkipValue === "1") ? "*" : ""
-        }${oParsedTransactionQueryParam.transactionCode}${bHasParameters ? "%20" : ""}${aParametersFinal.join("%3b")}`;
+                const sParams = oWebguiURI.search(); // Webgui parameters
+                const sParamsInterpolated = sParams
+                    .split("&")
+                    .map((sQueryParam) => {
+                        // interpolate effective parameter in the correct place within the ~transaction parameter
+
+                        let 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((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;
+            });
     }
 
-    /**
-     * extract the DYNP_SKIP_SEL_SCREEN parameter that indicates whether to
-     * how the selection screen even if parameters are sent
-     *
-     * @private
-     */
-    function getExplicitSkipSelectionScreenParameter (oParamsToInject) {
-        let sSkipValue = "";
-        if (oParamsToInject.hasOwnProperty("DYNP_SKIP_SEL_SCREEN")) {
-            const sParamVal = oParamsToInject.DYNP_SKIP_SEL_SCREEN[0];
-            delete oParamsToInject.DYNP_SKIP_SEL_SCREEN;
-            if (sParamVal === "" ||
-                sParamVal === " " ||
-                sParamVal === "0" ||
-                sParamVal === 0 ||
-                (typeof sParamVal === "string" && sParamVal.toLowerCase() === "false")) {
-                sSkipValue = "0";
-            } else if (sParamVal === "1" ||
-                sParamVal === 1 ||
-                (typeof sParamVal === "string" && sParamVal.toLowerCase() === "true")) {
-                sSkipValue = "1";
-            }
+    function generateTRResolutionResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
+        const oInbound = oMatchingTarget.inbound;
+        const oResolutionResult = oInbound && oInbound.resolutionResult;
+        let oPromise;
+
+        if (
+            !(!oInbound ||
+            !oResolutionResult ||
+            !(oResolutionResult["sap.gui"]) ||
+            !(oResolutionResult.applicationType === "TR"))
+        ) {
+            oPromise = constructFullWebguiResolutionResult(oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver);
+        } else if (
+            !(!oInbound ||
+                !oResolutionResult ||
+                !(oResolutionResult.applicationType === "TR") ||
+                !(oResolutionResult.url.indexOf("/~canvas;") >= 0) ||
+                !(oResolutionResult.url.indexOf("app/transaction/APB_LPD_CALL_") === -1)) // check no WRAPPED transaction
+        ) {
+            oPromise = constructWebguiNowrapResult(oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver);
+        } else if (
+            !(!oInbound ||
+                !oResolutionResult ||
+                !(oResolutionResult.applicationType === "TR") ||
+                !(oResolutionResult.url.indexOf("/~canvas;") >= 0) ||
+                !(oResolutionResult.url.indexOf("app/transaction/APB_LPD_CALL_") >= 0)) // check WRAPPED transaction
+        ) {
+            oPromise = constructWebguiWrapResult(oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver);
+        } else if (
+            !(// a native webgui URL
+                !oInbound ||
+                !oResolutionResult ||
+                !(oResolutionResult.applicationType === "TR") ||
+                !(oResolutionResult.url.indexOf("/its/webgui") >= 0) ||
+                !(oResolutionResult.url.indexOf("APB_LPD_CALL_") === -1) // a non wrapped URL
+            )
+        ) {
+            oPromise = constructNativeWebguiNowrapResult(oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver);
+        } else if (
+            !(// a native webgui URL
+                !oInbound ||
+                !oResolutionResult ||
+                !(oResolutionResult.applicationType === "TR") ||
+                !(oResolutionResult.url.indexOf("/its/webgui") >= 0) ||
+                !(oResolutionResult.url.indexOf("APB_LPD_CALL_") !== -1) // a WRAPPED URL
+            )
+        ) {
+            oPromise = constructNativeWebguiWrapResult(oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver);
         }
-        return sSkipValue;
+
+        if (oPromise) {
+            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);
+                oApplicationTypeUtils.addKeepAliveToURLTemplateResult(oResult);
+                return oResult;
+            });
+        }
+        throw new Error("Cannot generate TR resolution result");
     }
 
     /**
@@ -1068,6 +1046,10 @@ sap.ui.define([
      *   The matching target, an oInbound.resolutionResult["sap.platform.runtime"] member will be propagated
      *
      *   a System Alias in the TM will not be used
+     *
+     * @param {function} fnExternalSystemAliasResolver
+     *   the external system alias resolver.
+     *
      * @returns {Promise}
      *   A promise that resolved with the Matching Target(!) amended with the resolution result generated from
      *   the given intent, or rejects with an error message.
@@ -1110,7 +1092,7 @@ sap.ui.define([
         generateTRResolutionResult: generateTRResolutionResult,
         resolveEasyAccessMenuIntentWebgui: resolveEasyAccessMenuIntentWebgui,
 
-        //temp for webgui bug fix
+        // temp for webgui bug fix
         getUnnecessaryWebguiParameters: getUnnecessaryWebguiParameters,
         removeObjectKey: removeObjectKey,
         getExplicitSkipSelectionScreenParameter: getExplicitSkipSelectionScreenParameter,