@sapui5/sap.ushell 1.140.0 → 1.141.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sapui5/sap.ushell",
-    "version": "1.140.0",
+    "version": "1.141.0",
     "description": "SAPUI5 Library sap.ushell",
     "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
     "keywords": [
@@ -15,7 +15,7 @@
         "build-themes": "cross-env-shell ui5 build --exclude-task=* --include-task=buildThemes --framework-version $npm_package_version"
     },
     "devDependencies": {
-        "@ui5/cli": "^3.11.6",
+        "@ui5/cli": "^4.0.24",
         "cross-env": "^7.0.3"
     }
 }

package/src/main/js/sap/ushell/.library

@@ -2,7 +2,7 @@
 <library xmlns="http://www.sap.com/sap.ui.library.xsd">
     <name>sap.ushell</name>
     <vendor>SAP SE</vendor>
-    <version>1.140.0</version>
+    <version>1.141.0</version>
     <copyright>Copyright (c) 2009-2025 SAP SE, All Rights Reserved</copyright>
     <documentation>SAP library: sap.ushell</documentation>
 

package/src/main/js/sap/ushell/AppInfoParameters.js

@@ -540,7 +540,7 @@ sap.ui.define([
         /**
          * Retrieves the FLP URL with the current hash included.
          *
-         * @returns {Promise<string>} Resolves the FLP URL with hash.
+         * @returns {string} Resolves the FLP URL with hash.
          * @since 1.133.0
          * @private
          */

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

@@ -53,7 +53,6 @@ sap.ui.define([
 
         let sTargetNavigationMode;
         let bIsReusableContainer;
-        // todo: [FLPCOREANDUX-10024] fix this
         let sUi5Version;
         if (oApplicationContainer) {
             sTargetNavigationMode = oApplicationContainer.getTargetNavigationMode();

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

@@ -353,11 +353,11 @@ sap.ui.define([
         Object.keys(oParamsToInject).forEach((sKey) => {
             oParamsToInjectUpperCase[sKey.toUpperCase()] = oParamsToInject[sKey];
         });
-        // NOTE: privparamsToString treats delimiters verbatim and encodes
+        // NOTE: urlParametersToString treats delimiters verbatim and encodes
         //       the parameters if necessary.
         //       Therefore we pass the delimiters already encoded!
         //
-        let sParamsToInject = oApplicationTypeUtils.getURLParsing().privparamsToString(
+        let sParamsToInject = oApplicationTypeUtils.getURLParsing().urlParametersToString(
             oParamsToInjectUpperCase,
             "%3b", // parameters delimiter
             "%3d" // assigment
@@ -759,9 +759,9 @@ sap.ui.define([
         const sPobjectPlusDelimiter = `P_OBJECT${sQueryParamAssignDelimiter}`;
         const iMaxGUIParamLength = 132;
 
-        // NOTE: the result of privparamsToString does not encode
+        // NOTE: the result of urlParametersToString does not encode
         //       delimiters, hence we pass them encoded.
-        let sParamsToInject = oApplicationTypeUtils.getURLParsing().privparamsToString(
+        let sParamsToInject = oApplicationTypeUtils.getURLParsing().urlParametersToString(
             oParamsToInject,
             "%25", // a.k.a. "%", instead of &
             "%21" // a.k.a. "!", instead of =
@@ -1082,8 +1082,8 @@ sap.ui.define([
                     oResolutionResult.url = oApplicationTypeUtils.appendParametersToUrl("sap-iframe-hint=GUI", oResolutionResult.url);
                     fnResolve(oResolutionResult);
                 })
-                .catch((sError) => {
-                    fnReject(sError);
+                .catch((oError) => {
+                    fnReject(oError);
                 });
         });
     }

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

@@ -61,7 +61,7 @@ sap.ui.define([
      *
      * @private
      */
-    function _resolveSystemAlias (sSystemAlias, sSystemDataSrc, fnExternalResolver) {
+    async function _resolveSystemAlias (sSystemAlias, sSystemDataSrc, fnExternalResolver) {
         // Check local storage first
         const bSystemDataSrcProvided = typeof sSystemDataSrc === "string";
         const aSystemIds = [sSystemAlias];
@@ -78,19 +78,19 @@ sap.ui.define([
             try {
                 oSystemData = JSON.parse(sSerializedSystemData);
             } catch (oError) {
-                return Promise.reject(`Cannot parse system data from local storage at key '${sKey}'. Data: ${sSerializedSystemData}`);
+                throw new Error(`Cannot parse system data from local storage at key '${sKey}'. Data: ${sSerializedSystemData}`);
             }
-            return Promise.resolve(oSystemData);
+            return oSystemData;
         } else if (bSystemDataSrcProvided) {
             // Fail in this case, because the navigation **must** be done in
             // the context of the source system.
-            return Promise.reject(`Cannot find data for system '${sSystemAlias}' in local storage using key '${sKey}'`);
+            throw new Error(`Cannot find data for system '${sSystemAlias}' in local storage using key '${sKey}'`);
         }
 
         // Check adapter
         // Prepare to call resolveSystemAlias, ensure method is there.
         if (!fnExternalResolver) {
-            return Promise.reject("fallback: the adapter does not implement resolveSystemAlias");
+            throw new Error("fallback: the adapter does not implement resolveSystemAlias");
         }
 
         return new Promise((fnResolve, fnReject) => {
@@ -98,8 +98,8 @@ sap.ui.define([
                 .done((oResolvedSystemAlias) => {
                     fnResolve(oResolvedSystemAlias);
                 })
-                .catch((vError) => {
-                    fnReject(vError);
+                .fail((oError) => {
+                    fnReject(oError);
                 });
         });
     }
@@ -439,15 +439,12 @@ sap.ui.define([
         const oPromise = new Promise((fnResolve, fnReject) => {
             // Interpolate oURI
             _resolveSystemAlias(sSystemAlias, sSystemDataSrc, fnExternalSystemAliasResolver)
-                .catch((sErrorMessage) => {
-                    fnReject(sErrorMessage);
-                })
                 .then((oResolvedSystemAlias) => {
                     const oValidation = validateResolvedSystemAlias(oResolvedSystemAlias);
                     if (!oValidation.isValid) {
                         reportResolvedSystemAliasValidationErrors(oValidation);
-                        fnReject("Invalid system alias definition");
-                        return;
+
+                        throw new Error("Invalid system alias definition");
                     }
 
                     let sSystemAliasDataName = _selectSystemAliasDataName(oResolvedSystemAlias, new URI(window.location.toString()).protocol());
@@ -472,10 +469,7 @@ sap.ui.define([
                     oURIWithProtocol.hostname(oSystemAliasData.host);
                     oURIWithProtocol.port(oSystemAliasData.port);
 
-                    _interpolatePathPrefixIntoURI(oURIWithProtocol, sURIType, oSystemAliasData.pathPrefix, fnExternalSystemAliasResolver)
-                        .catch((sErrorMessage) => {
-                            fnReject(sErrorMessage);
-                        })
+                    return _interpolatePathPrefixIntoURI(oURIWithProtocol, sURIType, oSystemAliasData.pathPrefix, fnExternalSystemAliasResolver)
                         .then((oURIWithPathPrefix) => {
                             // add sap-client and sap-language in case we have data for them
                             sQuery = oURIWithPathPrefix.query();
@@ -521,6 +515,9 @@ sap.ui.define([
 
                             fnResolve(oURIWithPathPrefix);
                         });
+                })
+                .catch((oError) => {
+                    fnReject(oError);
                 });
         });
 
@@ -627,9 +624,6 @@ sap.ui.define([
              */
             fnResolve(
                 _resolveSystemAlias(sSystemAlias, sSapSystemDataSrc, fnExternalSystemAliasResolver) // must check if the URL was given absolute because of the systemAlias
-                    .catch((sError) => {
-                        fnReject(sError);
-                    })
                     .then((oResolvedSystemAlias) => {
                         const sSystemAliasDataName = _selectSystemAliasDataName(
                             oResolvedSystemAlias, new URI(window.location.toString()).protocol()
@@ -656,6 +650,9 @@ sap.ui.define([
                         }
                         return oURI;
                     })
+                    .catch((oError) => {
+                        fnReject(oError);
+                    })
             );
         });
         return oResultPromise;
@@ -718,12 +715,12 @@ sap.ui.define([
                 } else {
                     // must use local path prefix
                     _resolveSystemAlias("" /* local system alias */, undefined, fnExternalSystemAliasResolver)
-                        .catch((sErrorMessage) => {
-                            fnReject(sErrorMessage);
-                        })
                         .then((oResolvedLocalSystemAlias) => {
                             const oResolvedLocalSystemAliasData = oResolvedLocalSystemAlias[sSystemAliasDataName];
                             fnResolve(oResolvedLocalSystemAliasData.pathPrefix);
+                        })
+                        .catch((oError) => {
+                            fnReject(oError);
                         });
                 }
             }).then((sSystemAliasPathPrefix) => {
@@ -911,14 +908,14 @@ sap.ui.define([
             // 'applied' semantics
 
             _stripURI(oURI, sSystemAlias, undefined /* sSystemDataSrc */, sURIType, fnExternalSystemAliasResolver)
-                .catch((sErrorMessage) => {
-                    fnReject(sErrorMessage);
-                })
                 .then((oStrippedURI) => {
                     fnResolve({
                         targetUri: oStrippedURI,
                         alias: sSapSystem
                     });
+                })
+                .catch((oError) => {
+                    fnReject(oError);
                 });
         })
             .then((oApply) => {

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

@@ -58,13 +58,19 @@ sap.ui.define([
                 fnResolve(sBaseUrl);
             } else {
                 oSystemAlias.spliceSapSystemIntoURI(
-                    oURI, oInboundResolutionResult.systemAlias, sSapSystem, sSapSystemDataSrc,
-                    "URL", oInboundResolutionResult.systemAliasSemantics || oSystemAlias.SYSTEM_ALIAS_SEMANTICS.applied,
-                    fnExternalSystemAliasResolver)
+                    oURI,
+                    oInboundResolutionResult.systemAlias,
+                    sSapSystem,
+                    sSapSystemDataSrc,
+                    "URL",
+                    oInboundResolutionResult.systemAliasSemantics || oSystemAlias.SYSTEM_ALIAS_SEMANTICS.applied,
+                    fnExternalSystemAliasResolver
+                )
                     .then((oSapSystemURI) => {
                         const sSapSystemUrl = oSapSystemURI.toString();
                         fnResolve(sSapSystemUrl);
-                    }, fnReject);
+                    })
+                    .catch(fnReject);
             }
         }))
             .then((sUrlWithoutParameters) => {
@@ -80,7 +86,7 @@ sap.ui.define([
                 return rFLPURLDetectionRegex.test(sUrlWithoutParameters) || (bAppendParams === true)
                     ? oApplicationTypeUtils.appendParametersToIntentURL(oEffectiveParameters, sUrlWithoutParameters)
                     : oApplicationTypeUtils.appendParametersToUrl(sParameters, sUrlWithoutParameters);
-            }, Promise.reject.bind(Promise))
+            })
             .then((sUrlWithParameters) => {
                 // propagate properties from the inbound in the resolution result
                 ["additionalInformation", "applicationDependencies", "systemAlias"].forEach((sPropName) => {
@@ -94,7 +100,7 @@ sap.ui.define([
                 oResolutionResult.applicationType = "URL";
 
                 return Promise.resolve(oResolutionResult);
-            }, Promise.reject.bind(Promise));
+            });
     }
 
     return {