@sapui5/sap.ushell 1.139.0 → 1.141.0

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.139.0
+ * @version 1.141.0
  */
 
 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 = {};
                 }
             }

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module communicates with the content API graphql service to retrieve workpage and visualization data.
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/base/i18n/Localization",
@@ -55,18 +55,22 @@ sap.ui.define([
      * @returns {Promise} A promise, that is resolved if the page data is valid, else it is rejected.
      * @private
      */
-    WorkPage.prototype._validateData = function (oPageData) {
+    WorkPage.prototype._validateData = async function (oPageData) {
         Log.debug("cep/editMode: load Page: validate", "Work Page service");
+
         if (oPageData.errors && oPageData.errors.length > 0) {
-            return Promise.reject(oPageData.errors
+            const sErrorMessage = oPageData.errors
                 .map((oError) => { return oError.message; })
-                .join(",\n"));
+                .join(",\n");
+            throw new Error(sErrorMessage);
         }
+
         if (!ObjectPath.get("data.workPage", oPageData)) {
             Log.debug("cep/editMode: load Page: validate: reject: data is empty", "Work Page service");
-            return Promise.reject("Work Page data is empty");
+            throw new Error("Work Page data is empty");
         }
-        return Promise.resolve(oPageData);
+
+        return oPageData;
     };
 
     /**
@@ -355,7 +359,7 @@ sap.ui.define([
             headers
         }).then((oResponse) => {
             if (oResponse.status < 200 || oResponse.status >= 300) {
-                return Promise.reject(`HTTP request failed with status: ${oResponse.status} - ${oResponse.statusText}`);
+                throw new Error(`HTTP request failed with status: ${oResponse.status} - ${oResponse.statusText}`);
             }
             return JSON.parse(oResponse.responseText || "{}");
         });

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module provides utilities for creating visualization instances for work pages.
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/ushell/services/VisualizationInstantiation",

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

@@ -15,7 +15,6 @@ sap.ui.define([
     "sap/ui/thirdparty/jquery",
     "sap/ui/thirdparty/URI",
     "sap/base/util/deepClone",
-    "sap/ushell/utils/UrlParsing",
     "sap/ushell/utils/objectOperations",
     "sap/ushell/utils/type",
     "sap/ushell/renderer/History",
@@ -32,7 +31,6 @@ sap.ui.define([
     jQuery,
     URI,
     deepClone,
-    urlParsing,
     ushellObjectOperations,
     ushellType,
     History,
@@ -114,8 +112,8 @@ sap.ui.define([
 
         try {
             sStringifiedSapSystemData = JSON.stringify(oSapSystemData);
-        } catch (e) {
-            Log.error(`Cannot stringify and store expanded system data: ${e}`);
+        } catch (oError) {
+            Log.error("Cannot stringify and store expanded system data:", oError);
         }
 
         if (sStringifiedSapSystemData) {
@@ -261,8 +259,8 @@ sap.ui.define([
                 oEvent.initStorageEvent("storage", false, false, sKey, "", sValue, "", localStorage);
                 dispatchEvent(oEvent);
             }
-        } catch (e) {
-            Log.warning(`Error calling localStorage.setItem(): ${e}`, null, "sap.ushell.utils");
+        } catch (oError) {
+            Log.warning("Error calling localStorage.setItem():", oError, "sap.ushell.utils");
         }
     };
 
@@ -487,8 +485,8 @@ sap.ui.define([
             try {
                 sFeaturesHex = oPrivateEpcm.getNwbcFeatureBits();
                 Log.debug(`Detected epcm getNwbcFeatureBits returned feature bits: ${sFeaturesHex}`);
-            } catch (e) {
-                Log.error("failed to get feature bit vector via call getNwbcFeatureBits on private epcm object", e.stack, "sap.ushell.utils");
+            } catch (oError) {
+                Log.error("failed to get feature bit vector via call getNwbcFeatureBits on private epcm object", oError, "sap.ushell.utils");
             }
         }
         return (parseInt(sFeaturesHex, 16) & iFeatureBit) > 0;
@@ -567,7 +565,7 @@ sap.ui.define([
                     const sDecodedParam = decodeURIComponent(aParams[1]);
                     aAppStateNamesArray.push("sap-xapp-state-data");
                     aAppStateKeysArray.push(sDecodedParam);
-                } catch (error) {
+                } catch (oError) {
                     Log.error("Invalid encoding of the sap-xapp-state-data parameter in the url: ", aParams[1]);
                 }
             }
@@ -868,13 +866,13 @@ sap.ui.define([
 
         try {
             fnSuccess();
-        } catch (e) {
-            sMessage = e.message || e.toString();
+        } catch (oError) {
+            sMessage = oError.message || oError.toString();
             Log.error(`Call to success handler failed: ${sMessage}`,
-                e.stack, // may be undefined: supported in Chrome, FF; not supported in Safari, IE
+                oError, // may be undefined: supported in Chrome, FF; not supported in Safari, IE
                 "sap.ushell.utils");
             if (fnFailure) {
-                fnFailure(sMessage);
+                fnFailure(oError);
             }
         }
     };
@@ -1131,55 +1129,35 @@ sap.ui.define([
      *
      * @param {function} fnFunction The function to call
      * @param {object[]} aArguments A list of arguments or a list of calls with their arguments
-     * @returns {jQuery.Promise} Resolves once all handlers are done.
+     * @returns {Promise} Resolves once all handlers are done.
      */
-    utils.invokeUnfoldingArrayArguments = function (fnFunction, aArguments) {
-        const that = this;
-        let thePromise;
-
+    utils.invokeUnfoldingArrayArguments = async function (fnFunction, aArguments) {
         if (!Array.isArray(aArguments[0])) {
-            return fnFunction.apply(this, aArguments);
+            return utils.promisify(fnFunction.apply(this, aArguments));
         }
 
         const aArgArray = aArguments[0];
         if (aArgArray.length === 0) {
-            return new jQuery.Deferred().resolve([]).promise();
+            return [];
         }
 
-        const oDeferred = new jQuery.Deferred();
-        const aPromises = [];
-        const aRes = [];
-        thePromise = new jQuery.Deferred().resolve();
-
-        aArgArray.forEach((nThArgs, iIndex) => {
+        const aPromise = aArgArray.map(async (nThArgs) => {
             if (!Array.isArray(nThArgs)) {
-                const sErrorMsg = "Expected Array as nTh Argument of multivalue invocation: "
+                const sErrorMessage = "Expected Array as nTh Argument of multivalue invocation: "
                     + "first Argument must be array of array of arguments: single valued f(p1,p2), f(p1_2,p2_2), f(p1_3,p2_3) : "
                     + "multivalued : f([[p1,p2],[p1_2,p2_2],[p1_3,p2_3]]";
-                Log.error(sErrorMsg);
-                throw new Error(sErrorMsg);
+                Log.error(sErrorMessage);
+                throw new Error(sErrorMessage);
             }
             // nThArgs is an array of the arguments
-            const pr = fnFunction.apply(that, nThArgs);
-            const pr2 = new jQuery.Deferred();
-
-            pr.done(function () {
-                const a = Array.prototype.slice.call(arguments);
-                aRes[iIndex] = a;
-                pr2.resolve();
-            }).fail(pr2.reject.bind(pr2));
-            aPromises.push(pr2.promise());
-            thePromise = jQuery.when(thePromise, pr2);
-        });
-
-        jQuery.when.apply(jQuery, aPromises).done(() => {
-            oDeferred.resolve(aRes);
-        }).fail(() => {
-            oDeferred.reject("failure");
+            return utils.promisify(fnFunction.apply(this, nThArgs))
+                .then((vResult) => {
+                    // this a relict from the past when jQuery was used, which allows to resolve multiple values
+                    return [vResult];
+                });
         });
 
-        // invoke directly
-        return oDeferred.promise();
+        return Promise.all(aPromise);
     };
 
     utils._getCurrentDate = function () {
@@ -1406,23 +1384,6 @@ sap.ui.define([
         return sPrefix + sSeparator + aIds.join(":");
     };
 
-    /**
-     * Combines members of a JavaScript object into a parameter string.
-     * Parameters are ordered in an arbitrary manner which might change.
-     *
-     * @param {object} parameters The parameter object, e.g. <code>{ ABC: [1, "1 2"], DEF: ["4"] }</code>.
-     * @param {string} delimiter The parameter delimiter. Default is "&".
-     * @param {string} assign The parameter assignment. Default is "=".
-     * @returns {string} The result parameter string, e.g. <code>ABC=1&ABC=1%202&DEF=4</code>.
-     *   The result is *not* prefixed with a "?". Parameter values are URI encoded.
-     * @since 1.63.0
-     * @private
-     */
-    utils.urlParametersToString = function (parameters, delimiter, assign) {
-        // Implementation was moved to UrlParsing to resolve circular dependency of modules
-        return urlParsing.privparamsToString(parameters, delimiter, assign);
-    };
-
     /**
      * Checks whether the given intent is the configured root intent (apart from its parameters).
      * "#Shell-home" should never be hardcoded as it can be configured.
@@ -1523,7 +1484,7 @@ sap.ui.define([
             oTemporaryDomElement.select();
             document.execCommand("copy");
             bSuccessful = true;
-        } catch (oException) {
+        } catch (oError) {
             bSuccessful = false;
         } finally {
             oTemporaryDomElement.parentNode.removeChild(oTemporaryDomElement);
@@ -1688,6 +1649,25 @@ sap.ui.define([
         return Promise.resolve(vValue);
     };
 
+    /**
+     * Casts any value to a jQuery.Deferred object.
+     * @param {any} vValue The value to cast
+     * @returns {jQuery.Promise} The created Deferred object
+     *
+     * @since 1.141.0
+     * @private
+     */
+    utils.toDeferred = function (vValue) {
+        const oDeferred = new jQuery.Deferred();
+
+        const pPromise = this.promisify(vValue);
+        pPromise
+            .then(oDeferred.resolve.bind(oDeferred))
+            .catch(oDeferred.reject.bind(oDeferred));
+
+        return oDeferred.promise();
+    };
+
     /**
      * Wraps the sap.ui.require into a promise
      * @param {string[]} aModuleNames A list of module names