@sapui5/sap.ushell 1.140.0 → 1.141.1

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.140.0
+ * @version 1.141.1
  */
 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.140.0
+ * @version 1.141.1
  */
 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

package/src/test/js/sap/ushell/bootstrap/sandbox.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's bootstrap code for development sandbox scenarios.
  *
- * @version 1.140.0
+ * @version 1.141.1
  */
 
 (function () {

package/ui5.yaml

@@ -37,6 +37,27 @@ framework:
       optional: true
 builder:
   bundles:
+    - bundleDefinition:
+        name: sap/ushell/preload-bundles/flex-plugins.js
+        sections:
+          - mode: preload
+            name: sap/ushell/preload-bundles/flex-plugins
+            filters: &preload-flex-plugins
+              - sap/ushell/plugins/BaseRTAPlugin.js # base component class
+              - sap/ushell/appRuntime/ui5/plugins/baseRta/ # reuse files
+              # components are bundled via Component-preload any deps are loaded via this bundle
+              #   - sap/ushell/appRuntime/ui5/plugins/rtaAgent/
+              #   - sap/ushell/appRuntime/ui5/plugins/rtaShell/
+              #   - sap/ushell/plugins/rta/
+              #   - sap/ushell/plugins/rta-personalize/
+              # the related bundle infos have to be maintained for all scenarios in all repos:
+              #   - ushell
+              #   - ushell_abap
+              #   - sap/fiori
+            resolve: false
+      bundleOptions:
+        optimize: true
+        usePredefineCalls: true
     - bundleDefinition:
         name: sap/ushell/bootstrap/appruntime-min.js
         sections:
@@ -46,6 +67,10 @@ builder:
             declareRawModules: false
             resolve: true
             sort: true
+          - mode: bundleInfo
+            name: sap/ushell/preload-bundles/flex-plugins.js
+            filters: *preload-flex-plugins
+            resolve: false
           - mode: preload
             filters:
               - sap/ui/core/Core.js
@@ -54,7 +79,7 @@ builder:
             resolveConditional: false
           - mode: preload
             name: sap/ushell/core-lib111-preload
-            filters:
+            filters: &appruntime-preload
               - sap/ushell/appRuntime/ui5/
               - sap/ushell/appRuntime/ui5/AppRuntimeDefaultConfiguration.json
               - sap/ushell/ui5service/UserStatus.js
@@ -97,6 +122,9 @@ builder:
               - sap/ushell/Fiori20Adapter.js
               - sap/ui/core/Core.js
               - '!sap/viz/libs/sap-viz.js'
+              - '!sap/ushell/appRuntime/ui5/plugins/baseRta/'
+              - '!sap/ushell/appRuntime/ui5/plugins/rtaAgent/'
+              - '!sap/ushell/appRuntime/ui5/plugins/rtaShell/'
             resolve: true
             renderer: true
           - mode: require
@@ -179,6 +207,10 @@ builder:
               - sap/ushell/bootstrap/cdm/cdm-def.js
               - sap/ushell/bootstrap/ui5loader-config.js
             resolve: true
+          - mode: bundleInfo
+            name: sap/ushell/preload-bundles/flex-plugins.js
+            filters: *preload-flex-plugins
+            resolve: false
           - mode: preload
             name: sap/ushell/core-lib-preload
             filters: &core-min-preload
@@ -447,21 +479,6 @@ builder:
         optimize: true
         usePredefineCalls: true
         numberOfParts: 4
-    - bundleDefinition:
-        name: sap/ushell/preload-bundles/flex-plugins.js
-        sections:
-          - mode: provided
-            filters: *core-min-preload
-            resolve: true
-          - mode: preload
-            filters:
-              - sap/ushell/appRuntime/ui5/plugins/baseRta/
-              - sap/ushell/appRuntime/ui5/plugins/rtaAgent/
-              - sap/ushell/appRuntime/ui5/plugins/rtaShell/
-              - sap/ushell/plugins/rta/
-              - sap/ushell/plugins/rta-personalize/
-              - sap/ushell/plugins/BaseRtaPlugin.js
-            renderer: false
     - bundleDefinition:
         name: sap/ushell/preload-bundles/homepage-af-dep.js
         sections:
@@ -624,5 +641,9 @@ builder:
       - sap/ushell/components/workPageRuntime/Component.js
       - sap/ushell/plugins/appwarmup/Component.js
       - sap/ushell/plugins/ghostapp/Component.js
+      # dependencies are covered by the flex-plugins bundle
+      - sap/ushell/appRuntime/ui5/plugins/rtaAgent/Component.js
+      - sap/ushell/appRuntime/ui5/plugins/rtaShell/Component.js
       - sap/ushell/plugins/rta/Component.js
       - sap/ushell/renderer/rendererTargetWrapper/Component.js
+      - sap/ushell/plugins/rta-personalize/Component.js

package/src/main/js/sap/ushell/thirdparty/getEffectiveScrollbarStyle.js

@@ -1,33 +0,0 @@
-sap.ui.define(['exports'], (function (exports) { 'use strict';
-
-	const r="ui5-content-native-scrollbars",o=typeof document>"u",a=()=>o||document.body.classList.contains(r)?"":`
-::-webkit-scrollbar:horizontal {
-	height: var(--sapScrollBar_Dimension);
-}
-
-::-webkit-scrollbar:vertical {
-	width: var(--sapScrollBar_Dimension);
-}
-
-::-webkit-scrollbar {
-	background-color: var(--sapScrollBar_TrackColor);
-	border-left: none;
-}
-
-::-webkit-scrollbar-thumb {
-	border-radius: var(--sapElement_BorderCornerRadius);
-	background-color: var(--sapScrollBar_FaceColor);
-	border: 0.125rem solid var(--sapScrollBar_TrackColor);
-}
-
-::-webkit-scrollbar-thumb:hover {
-	background-color: var(--sapScrollBar_Hover_FaceColor);
-}
-
-::-webkit-scrollbar-corner {
-	background-color: var(--sapScrollBar_TrackColor);
-}`;
-
-	exports.a = a;
-
-}));