@sapui5/sap.ushell 1.140.0 → 1.141.1

package/src/main/js/sap/ushell/utils/DynamicTileRequest.js

@@ -80,8 +80,8 @@ sap.ui.define([
                         this.#sUrlWithResolvedUserDefaults = sUrlResolvedUserDefaults;
                     }
                 })
-                .catch((vError) => {
-                    Log.error("Was not able to create a DynamicTileRequest:", vError, sModuleName);
+                .catch((oError) => {
+                    Log.error("Was not able to create a DynamicTileRequest:", oError, sModuleName);
                 });
 
             this._oInitialRefreshPromise = this.#oUserDefaultsPromise.then(() => {
@@ -161,9 +161,9 @@ sap.ui.define([
                 this.#bResolveSemanticDateRanges = oResult.hasSemanticDateRanges;
 
                 return oResult.url;
-            } catch (vError) {
-                Log.error("Could not resolve semantic date ranges:", vError, sModuleName);
-                return Promise.reject(vError);
+            } catch (oError) {
+                Log.error("Could not resolve semantic date ranges:", oError, sModuleName);
+                throw oError;
             }
         }
 
@@ -252,7 +252,7 @@ sap.ui.define([
             let vResult;
             try {
                 vResult = JSON.parse(oResult.responseText);
-            } catch (err) {
+            } catch {
                 throw new Error("Was not able to parse response of dynamic tile request");
             }
 

package/src/main/js/sap/ushell/utils/HttpClient.js

@@ -32,8 +32,9 @@
 sap.ui.define([
     "sap/ui/core/Supportability",
     "sap/ui/thirdparty/URI",
-    "sap/ushell/utils"
-], (Supportability, URI, utils) => {
+    "sap/ushell/utils",
+    "sap/ushell/utils/LaunchpadError"
+], (Supportability, URI, utils, LaunchpadError) => {
     "use strict";
 
     // JSDoc Type definitions
@@ -245,81 +246,79 @@ sap.ui.define([
      * @since 1.88.0
      * @private
      */
-    HttpClient.prototype._executeRequest = function (sRequestMethod, sResourcePath, oData) {
-        const oInvalidURLError = new Error("The provided resource path is not a valid URL.");
-
+    HttpClient.prototype._executeRequest = async function (sRequestMethod, sResourcePath, oData) {
         const oDefaultHeaders = {};
         const bSapStatisticsEnabled = Supportability.isStatisticsEnabled();
         if (bSapStatisticsEnabled) {
             oDefaultHeaders["sap-statistics"] = bSapStatisticsEnabled;
         }
 
-        try {
-            // Build URI and create XHR
-            let oCompleteResourceURI;
-            const oResourceURI = new URI(sResourcePath);
-            if (!oResourceURI.is("url")) {
-                return Promise.reject(oInvalidURLError);
-            }
+        // Build URI and create XHR
+        let oCompleteResourceURI;
+        const oResourceURI = new URI(sResourcePath);
+        if (!oResourceURI.is("url")) {
+            throw new Error("The provided resource path is not a valid URL.");
+        }
 
-            if (this._oBasePath) {
-                oCompleteResourceURI = oResourceURI.absoluteTo(this._oBasePath);
-            } else {
-                oCompleteResourceURI = oResourceURI;
-            }
+        if (this._oBasePath) {
+            oCompleteResourceURI = oResourceURI.absoluteTo(this._oBasePath);
+        } else {
+            oCompleteResourceURI = oResourceURI;
+        }
+
+        const oXhr = new XMLHttpRequest();
+
+        // Add unique id to the request & cache it in ongoing requests
+        oXhr._sapUshellHttpClientId = utils.generateUniqueId(Object.keys(this._oOngoingRequests));
+        this._oOngoingRequests[oXhr._sapUshellHttpClientId] = oXhr;
 
-            const oXhr = new XMLHttpRequest();
-
-            // Add unique id to the request & cache it in ongoing requests
-            oXhr._sapUshellHttpClientId = utils.generateUniqueId(Object.keys(this._oOngoingRequests));
-            this._oOngoingRequests[oXhr._sapUshellHttpClientId] = oXhr;
-
-            // Merge additional headers
-            const oHeaders = Object.assign({}, oDefaultHeaders, this._oDefaultOptions.headers, oData && oData.headers);
-
-            return this._getCSRFTokenHeader(sRequestMethod, oCompleteResourceURI)
-                .then((oCSRFHeader) => {
-                    // Merge x-csrf-token header
-                    Object.assign(oHeaders, oCSRFHeader);
-
-                    return new Promise((resolve, reject) => {
-                        // Configure and submit XHR
-
-                        const sCompleteResourceURI = oCompleteResourceURI.href();
-
-                        oXhr.onload = this._onLoad.bind(this, resolve, reject, {
-                            xhr: oXhr,
-                            method: sRequestMethod,
-                            url: sCompleteResourceURI,
-                            data: oData
-                        });
-                        oXhr.onerror = function () {
-                            reject.call(this, this._getFormattedResponse(oXhr));
-                        }.bind(this);
-                        oXhr.onabort = function () {
-                            oXhr.bAborted = true;
-                            reject.call(this, this._getFormattedResponse(oXhr));
-                        }.bind(this);
-                        oXhr.onloadend = function () {
-                            // Delete finished requests from the ongoing requests queue
-                            delete this._oOngoingRequests[oXhr._sapUshellHttpClientId];
-                        }.bind(this);
-
-                        oXhr.open(sRequestMethod, sCompleteResourceURI);
-                        Object.keys(oHeaders).forEach((sKey) => {
-                            oXhr.setRequestHeader(sKey, oHeaders[sKey]);
-                        });
-
-                        let sBody = oData && oData.data || "";
-                        if (typeof sBody !== "string") {
-                            sBody = JSON.stringify(sBody);
-                        }
-                        oXhr.send(sBody);
+        // Merge additional headers
+        const oHeaders = Object.assign({}, oDefaultHeaders, this._oDefaultOptions.headers, oData && oData.headers);
+
+        return this._getCSRFTokenHeader(sRequestMethod, oCompleteResourceURI)
+            .then((oCSRFHeader) => {
+                // Merge x-csrf-token header
+                Object.assign(oHeaders, oCSRFHeader);
+
+                return new Promise((resolve, reject) => {
+                    // Configure and submit XHR
+
+                    const sCompleteResourceURI = oCompleteResourceURI.href();
+
+                    oXhr.onload = this._onLoad.bind(this, resolve, reject, {
+                        xhr: oXhr,
+                        method: sRequestMethod,
+                        url: sCompleteResourceURI,
+                        data: oData
                     });
+                    oXhr.onerror = function () {
+                        const oResponse = this._getFormattedResponse(oXhr);
+                        const oError = new LaunchpadError(`Failed to execute HTTP request: ${oResponse.status} (${oResponse.status})`, oResponse);
+                        reject(oError);
+                    }.bind(this);
+                    oXhr.onabort = function () {
+                        oXhr.bAborted = true;
+                        const oResponse = this._getFormattedResponse(oXhr);
+                        const oError = new LaunchpadError(`Failed to execute HTTP request: ${oResponse.status} (${oResponse.status})`, oResponse);
+                        reject(oError);
+                    }.bind(this);
+                    oXhr.onloadend = function () {
+                        // Delete finished requests from the ongoing requests queue
+                        delete this._oOngoingRequests[oXhr._sapUshellHttpClientId];
+                    }.bind(this);
+
+                    oXhr.open(sRequestMethod, sCompleteResourceURI);
+                    Object.keys(oHeaders).forEach((sKey) => {
+                        oXhr.setRequestHeader(sKey, oHeaders[sKey]);
+                    });
+
+                    let sBody = oData && oData.data || "";
+                    if (typeof sBody !== "string") {
+                        sBody = JSON.stringify(sBody);
+                    }
+                    oXhr.send(sBody);
                 });
-        } catch (error) {
-            return Promise.reject(oInvalidURLError);
-        }
+            });
     };
 
     /**
@@ -441,7 +440,8 @@ sap.ui.define([
             return fnResolve(oFormattedResponse);
         }
 
-        return fnReject(oFormattedResponse);
+        const oError = new LaunchpadError(`Failed to execute HTTP request: ${oFormattedResponse.status} (${oFormattedResponse.status})`, oFormattedResponse);
+        fnReject(oError);
     };
 
     /**

package/src/main/js/sap/ushell/utils/LaunchpadError.js

@@ -0,0 +1,21 @@
+// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+
+/**
+ * @fileOverview Custom Error class to transport more details
+ */
+sap.ui.define([
+], (
+) => {
+    "use strict";
+
+    class LaunchpadError extends Error {
+        constructor (sMessage, oDetails, oOriginalError) {
+            super(sMessage);
+            this.name = "LaunchpadError";
+            this.details = oDetails;
+            this.originalError = oOriginalError;
+        }
+    }
+
+    return LaunchpadError;
+});

package/src/main/js/sap/ushell/utils/UrlParsing.js

@@ -17,13 +17,15 @@ sap.ui.define([
     "sap/base/Log",
     "sap/base/util/deepEqual",
     "sap/base/util/merge",
-    "sap/ushell/TechnicalParameters"
+    "sap/ushell/TechnicalParameters",
+    "sap/ushell/utils"
 ], (
     URI,
     Log,
     deepEqual,
     merge,
-    TechnicalParameters
+    TechnicalParameters,
+    ushellUtils
 ) => {
     "use strict";
 
@@ -160,14 +162,10 @@ sap.ui.define([
      * @since 1.94.0
      * @protected
      */
-    UrlParsing.isIntentUrlAsync = function (sUrl) {
-        return new Promise((resolve, reject) => {
-            // in the app runtime this returns the URL of the outer FLP
-            sap.ui.require("sap/ushell/Container").getFLPUrlAsync(true).done(resolve).fail(reject);
-        })
-            .then((sFlpUrl) => {
-                return this._isIntentUrl(sUrl, sFlpUrl);
-            });
+    UrlParsing.isIntentUrlAsync = async function (sUrl) {
+        const [Container] = await ushellUtils.requireAsync(["sap/ushell/Container"]);
+        const sFlpUrl = await Container.getFLPUrlAsync(true);
+        return this._isIntentUrl(sUrl, sFlpUrl);
     };
 
     /**
@@ -228,8 +226,8 @@ sap.ui.define([
                 oKey = vKeys.next();
             }
             return oParamObject;
-        } catch (err) {
-            Log.error("URL parsing - malformed URL parameters string:", sParams);
+        } catch (oError) {
+            Log.error(`URL parsing - malformed URL parameters string: ${sParams}`, oError);
             return {};
         }
     };
@@ -323,7 +321,7 @@ sap.ui.define([
      * @since 1.94.0
      * @private
      */
-    UrlParsing.privparamsToString = function (oParams, sDelimiter, sAssign) {
+    UrlParsing.urlParametersToString = function (oParams, sDelimiter, sAssign) {
         return _urlParametersToString(oParams, sDelimiter, sAssign);
     };
 
@@ -708,6 +706,7 @@ sap.ui.define([
                 contextRaw: oHash.contextRaw
             },
             params: oSortedParams
+            // ignore appSpecificRoute
         });
     };
 

package/src/main/js/sap/ushell/utils/UrlShortening.js

@@ -5,7 +5,7 @@
  *
  * This module is for internal Shell usage only
  *
- * @version 1.140.0
+ * @version 1.141.1
  */
 sap.ui.define(["sap/base/Log", "sap/ushell/utils/UrlParsing"], (Log, urlParsing) => {
     "use strict";
@@ -71,7 +71,7 @@ sap.ui.define(["sap/base/Log", "sap/ushell/utils/UrlParsing"], (Log, urlParsing)
             }
             try {
                 oValue = JSON.parse(value);
-            } catch (ex) {
+            } catch (oError) {
                 Log.error("This cannot happen: sap-xapp-state parameter value is neither key nor JSON parseable");
                 return value;
             }

package/src/main/js/sap/ushell/utils/WindowUtils.js

@@ -6,11 +6,13 @@
 sap.ui.define([
     "sap/base/Log",
     "sap/ui/util/isCrossOriginURL",
-    "sap/ushell/utils"
+    "sap/ushell/utils",
+    "sap/ushell/utils/UrlParsing"
 ], (
     Log,
     isCrossOriginURL,
-    ushellUtils
+    ushellUtils,
+    UrlParsing
 ) => {
     "use strict";
 
@@ -174,7 +176,7 @@ sap.ui.define([
                 delete oNewUrlParameter[sParam];
             });
         }
-        const sParamString = ushellUtils.urlParametersToString(oNewUrlParameter);
+        const sParamString = UrlParsing.urlParametersToString(oNewUrlParameter);
         return sParamString !== "" ? `?${sParamString}` : "";
     };
 

package/src/main/js/sap/ushell/utils/chipsUtils.js

@@ -141,7 +141,7 @@ sap.ui.define([
         try {
             sTileConfig = oChip.getConfigurationParameter(sConfigParameterId);
             oTileConfig = JSON.parse(sTileConfig);
-        } catch (e) {
+        } catch {
             // most likely this is not a static or dynamic applauncher
             return;
         }
@@ -201,11 +201,11 @@ sap.ui.define([
         const sConfigParam = oChipInstance.getConfigurationParameter("tileConfiguration");
         try {
             oParsedTileConfiguration = JSON.parse(sConfigParam || "{}");
-        } catch (oEx) {
+        } catch (oError) {
             Log.error(`Tile with ID '${oChipInstance.getId()
             }' has a corrupt configuration containing a 'tileConfiguration' value '${sConfigParam
             }' which could not be parsed. If present, a (stringified) JSON is expected as value.`,
-            oEx.message,
+            oError,
             "sap.ushell_abap.adapters.abap.LaunchPageAdapter"
             );
             return {}; // the FLP must react robust on broken single tiles
@@ -410,7 +410,9 @@ sap.ui.define([
 
                 this.addBagDataToChipInstance(oChipInstance, oBags);
                 return new Promise((resolve, reject) => {
-                    oChipInstance.load(resolve, reject);
+                    oChipInstance.load(resolve, (sErrorMessage) => {
+                        reject(new Error(sErrorMessage));
+                    });
                 })
                     .then(() => {
                         return oChipInstance;
@@ -445,7 +447,7 @@ sap.ui.define([
                     oBag.setText(sPropertyId, oBagData.texts[sPropertyId]);
                 }
             } catch (oError) {
-                Log.error(`chipsUtils.addBagDataToChipInstance: ${oError.toString()}`);
+                Log.error("chipsUtils.addBagDataToChipInstance:", oError);
             }
         }
     };

package/src/main/js/sap/ushell/utils/tilecard/TileCard.js

@@ -313,9 +313,9 @@ sap.ui.define([
                 throw new Error("No custom tile and no descriptor value");
             }
             oLogger.debug("TileCard was initialized.", JSON.stringify(oData));
-        } catch (ex) {
+        } catch (oError) {
             oLogger.debug("TileCard cannot be initialized.", JSON.stringify(oData));
-            oLogger.info("TileCard initialization failed", ex.message);
+            oLogger.info("TileCard initialization failed", oError);
             oResult = {
                 descriptor: {
                     value: errorTile

package/src/main/js/sap/ushell/utils/tilecard/TileCardExtension.js

@@ -117,19 +117,19 @@ sap.ui.define([
    * Otherwise ""
    *
    * @param {object} oData the data of the DynamicTileRequest.
-   * @param {string} sError the error text if normaization fails
+   * @param {string} sErrorText the error text if normaization fails
    *
    * @returns {string} the text for the details.
    *
    * @private
    * @since 1.123.0
    */
-    function getIndicatorDetails (oData, sError) {
+    function getIndicatorDetails (oData, sErrorText) {
         if (oData.info) {
             return oData.info;
         }
         if (oData.number === "#") {
-            return sError;
+            return sErrorText;
         }
         return "";
     }
@@ -205,14 +205,14 @@ sap.ui.define([
    * but all other attributes are ignored.
    *
    * @param {object} oData the data of the DynamicTileRequest.
-   * @param {string} sError the error text if normaization fails
+   * @param {string} sErrorText the error text if normaization fails
    *
    * @returns {object} the normalized data.
    *
    * @private
    * @since 1.123.0
    */
-    function normalizeTileData (oData, sError) {
+    function normalizeTileData (oData, sErrorText) {
         if (!isNaN(oData)) {
             oData = {
                 number: oData
@@ -234,7 +234,7 @@ sap.ui.define([
         oData._data = {};
         oData._data.number = getIndicatorNumber(oData);
         oData._data.details = {};
-        oData._data.details.text = getIndicatorDetails(oData, sError);
+        oData._data.details.text = getIndicatorDetails(oData, sErrorText);
         oData._data.details.state = getValueState(oData.infoState);
         oData._data.state = getIndicatorState(oData);
         oData._data.trend = oData.stateArrow || null;
@@ -348,8 +348,8 @@ sap.ui.define([
                             }
                         }
                     );
-                } catch (ex) {
-                    oLogger.error("Dynamic tileCard normalization failed.", ex);
+                } catch (oError) {
+                    oLogger.error("Dynamic tileCard normalization failed.", oError);
                     if (!bTimedOut) {
                         resolve(this._oErrorResponse);
                     }
@@ -374,7 +374,7 @@ sap.ui.define([
                 { status: 200 }
             );
         })
-            .catch((ex) => {
+            .catch((oError) => {
                 return new Response(
                     new Blob(
                         ["{}"],

package/src/main/js/sap/ushell/utils/utilsCdm.js

@@ -276,17 +276,16 @@ sap.ui.define([
                             }
                         });
                     }
-                } catch (oError1) {
+                } catch (oError) {
                     // this is here until validation on the CDM site is done
                     Log.error(
-                        `Error in application ${sApplicationKey}: ${oError1}`,
-                        oError1.stack
+                        `Error in application ${sApplicationKey}:`,
+                        oError
                     );
                 }
             });
-        } catch (oError2) {
-            Log.error(oError2);
-            Log.error(oError2.stack);
+        } catch (oError) {
+            Log.error("formatSite failed:", oError);
             return [];
         }
 

package/src/main/js/sap/ushell/utils/workpage/DestinationResolver.js

@@ -2,10 +2,13 @@
 
 sap.ui.define([
     "./WorkPageService",
-    "sap/ushell/Config"
+    "sap/ushell/Config",
+    "sap/ushell/utils/LaunchpadError"
 ], (
     WorkPageService,
-    Config) => {
+    Config,
+    LaunchpadError
+) => {
     "use strict";
     const ERROR_CODES = {
         NO_DESTINATION_FOUND: "NO_DESTINATION_FOUND",
@@ -62,8 +65,8 @@ sap.ui.define([
                             this.#providers.set(provider.id, aLogicalDestinationMaps);
                         });
                         return resolve(this.#providers);
-                    }).catch((sReason) => {
-                        reject(sReason);
+                    }).catch((oError) => {
+                        reject(oError);
                     });
                 });
             }
@@ -88,10 +91,10 @@ sap.ui.define([
                                 return resolve(aDestinationMappings);
                             }
                             // DestinationResolver: The service did not return any destination or content provider
-                            return reject(DestinationResolver.ERROR_CODES.COULD_NOT_RETRIEVE_DESTINATIONS);
+                            return reject(new LaunchpadError("Failed to fetch destinations", { reason: DestinationResolver.ERROR_CODES.COULD_NOT_RETRIEVE_DESTINATIONS }));
                         } catch (oError) {
                             // DestinationResolver: Couldn't Load Destinations from Service
-                            return reject(DestinationResolver.ERROR_CODES.COULD_NOT_RETRIEVE_DESTINATIONS);
+                            return reject(new LaunchpadError("Failed to fetch destinations", { reason: DestinationResolver.ERROR_CODES.COULD_NOT_RETRIEVE_DESTINATIONS }, oError));
                         }
                     });
                 } catch (oError) {
@@ -112,7 +115,7 @@ sap.ui.define([
         resolveCardDestination (sDestinationName, oCard) {
             return new Promise((resolve, reject) => {
                 if (!sDestinationName || !oCard) {
-                    return reject(ERROR_CODES.NO_CARD_OR_DESTINATION_NAME);
+                    return reject(new LaunchpadError("Could not resolver card destination", { reason: ERROR_CODES.NO_CARD_OR_DESTINATION_NAME }));
                 }
                 this._getContentProviderDestinationMappings().then((mProviders) => {
                     const sResolvedUrl = mProviders.get(oCard.getReferenceId())?.get(sDestinationName);
@@ -120,17 +123,18 @@ sap.ui.define([
                     if (sResolvedUrl) {
                         return resolve(sResolvedUrl);
                     } else if (sResolvedUrl === "") {
-                        return reject(ERROR_CODES.RESOLVED_URL_EMPTY);
+                        return reject(new LaunchpadError("Could not resolver card destination", { reason: ERROR_CODES.RESOLVED_URL_EMPTY }));
                     }
                     // DestinationResolver: No Destinations Found
-                    return reject(DestinationResolver.ERROR_CODES.NO_DESTINATION_FOUND);
-                }).catch((sReason) => {
+                    return reject(new LaunchpadError("Could not resolver card destination", { reason: DestinationResolver.ERROR_CODES.NO_DESTINATION_FOUND }));
+                }).catch((oError) => {
                     if (!this._sSiteId) {
                         // Fallback for designtime usecase. If there is no site ID, it's likely that the host is used in the design time.
                         // Resolve with a fallback logic
                         return resolve(`${location.origin}/dynamic_dest/${sDestinationName}`);
                     }
-                    return reject(sReason);
+
+                    reject(oError);
                 });
             });
         }

package/src/main/js/sap/ushell/utils/workpage/WorkPageHost.js

@@ -2,10 +2,11 @@
 
 /**
  * @file WorkPageHost for WorkPageBuilder and DWSPageBuilder
- * @version 1.140.0
+ * @version 1.141.1
  */
 
 sap.ui.define([
+    "sap/base/Log",
     "sap/ui/integration/Host",
     "sap/ui/model/json/JSONModel",
     "sap/ushell/Container",
@@ -15,6 +16,7 @@ sap.ui.define([
     "sap/m/IllustratedMessageType",
     "sap/m/IllustratedMessageSize"
 ], (
+    Log,
     Host,
     JSONModel,
     Container,
@@ -53,16 +55,17 @@ sap.ui.define([
          * @param {sap.ui.integration.widgets.Card} oCard The card instance.
          * @returns {Promise<string>} Promise with the target destination
          */
-        oHost.setResolveDestination((sDestinationName, oCard) => {
+        oHost.setResolveDestination(async (sDestinationName, oCard) => {
             if (!sDestinationName || !oCard) {
-                return Promise.reject("No destination name or card instance given.");
+                throw new Error("No destination name or card instance given.");
             }
 
             // try to resolve the destination for a given card. Handle errors like no destination found or service issues.
             // In case of an error, collect the unresolvable destinations and show some information about the error on the
             // card. This can only be done after the next stateChanged event. Hence the showBlockingMessage call is done in
             // the corresponding event handler.
-            return oHost._destinationResolver.resolveCardDestination(sDestinationName, oCard).catch((sReason) => {
+            return oHost._destinationResolver.resolveCardDestination(sDestinationName, oCard).catch((oError) => {
+                const sReason = oError.details?.reason;
                 oHost._mUnresolvedDestinations.set(oCard, { error: sReason, destinationName: sDestinationName });
             });
         });
@@ -247,20 +250,16 @@ sap.ui.define([
          * @private
          * @alias sap.ushell.utils.workpage.WorkPageHost#getContextValue
          */
-        oHost.getContextValue = function (sPath) {
-            try {
-                if (!sPath) {
-                    return Promise.reject();
-                }
-                if (sPath.charAt(0) === "/") {
-                    return oHost.getContextValue(sPath.substring(1));
-                }
-                return oHost.getContext().then(() => {
-                    return oHost._oHostContextModel.getProperty(`/${sPath}/value`);
-                });
-            } catch (ex) {
-                return Promise.resolve();
+        oHost.getContextValue = async function (sPath) {
+            if (!sPath) {
+                throw new Error("Invalid context path");
+            }
+            if (sPath.charAt(0) === "/") {
+                return oHost.getContextValue(sPath.substring(1));
             }
+            return oHost.getContext().then(() => {
+                return oHost._oHostContextModel.getProperty(`/${sPath}/value`);
+            });
         };
 
         /**
@@ -332,10 +331,10 @@ sap.ui.define([
                     try {
                         const oBundle = await oHost._getBundle();
                         oHost._oHostContext = oHost._applyHostContext(oUserInfoService, oBundle);
-                    } catch (error) {
+                    } catch (oError) {
                         oHost._oHostContext = oHost._applyHostContext(oUserInfoService);
                     }
-                } catch (error) {
+                } catch (oError) {
                     oHost._oHostContext = {};
                 }
             }