@sapui5/sap.ushell 1.140.0 → 1.141.1

package/src/main/js/sap/ushell/components/appfinder/CatalogView.js

@@ -215,7 +215,7 @@ sap.ui.define([
                                     oEvent.preventDefault();
                                     AccessKeysHandler.setIsFocusHandledByAnotherHandler(true);
                                     ComponentKeysHandlerInstance.setFocusOnCatalogTile();
-                                } catch (e) {
+                                } catch {
                                     // continue regardless of error
                                 }
                             },
@@ -224,7 +224,7 @@ sap.ui.define([
                                     oEvent.preventDefault();
                                     AccessKeysHandler.setIsFocusHandledByAnotherHandler(true);
                                     ComponentKeysHandlerInstance.setFocusOnCatalogTile();
-                                } catch (e) {
+                                } catch {
                                     // continue regardless of error
                                 }
                             },
@@ -238,7 +238,7 @@ sap.ui.define([
                                     } else {
                                         ComponentKeysHandlerInstance.appFinderFocusMenuButtons(oEvent);
                                     }
-                                } catch (e) {
+                                } catch {
                                     // continue regardless of error
                                 }
                             }

package/src/main/js/sap/ushell/components/appfinder/EasyAccess.controller.js

@@ -13,7 +13,8 @@ sap.ui.define([
     "sap/ui/model/json/JSONModel",
     "sap/ushell/ui/launchpad/AccessibilityCustomData",
     "sap/ushell/Config",
-    "sap/ushell/Container"
+    "sap/ushell/Container",
+    "sap/ushell/utils/LaunchpadError"
 ], (
     Localization,
     Element,
@@ -21,13 +22,14 @@ sap.ui.define([
     View,
     Log,
     ODataUtils,
-    OData,
+    datajs,
     jQuery,
     resources,
     JSONModel,
     AccessibilityCustomData,
     Config,
-    Container
+    Container,
+    LaunchpadError
 ) => {
     "use strict";
 
@@ -116,15 +118,17 @@ sap.ui.define([
                     return;
                 }
                 oHierarchyFolders.setBusy(true);
-                this.getMenuItems(this.menuName, this.systemId, entity.id, entity.level).then(function (path, response) {
-                    this.easyAccessModel.setProperty(`${path}/folders`, response.folders);
-                    this.easyAccessModel.setProperty(`${path}/apps`, response.apps);
-                    oHierarchyFolders.updatePageBindings(path, forward);
-                    oHierarchyApps.getController().updatePageBindings(path);
-                    oHierarchyFolders.setBusy(false);
-                }.bind(this, path), (error) => {
-                    this.handleGetMenuItemsError(error);
-                });
+                this.getMenuItems(this.menuName, this.systemId, entity.id, entity.level)
+                    .then(function (path, response) {
+                        this.easyAccessModel.setProperty(`${path}/folders`, response.folders);
+                        this.easyAccessModel.setProperty(`${path}/apps`, response.apps);
+                        oHierarchyFolders.updatePageBindings(path, forward);
+                        oHierarchyApps.getController().updatePageBindings(path);
+                        oHierarchyFolders.setBusy(false);
+                    }.bind(this, path))
+                    .catch((error) => {
+                        this.handleGetMenuItemsError(error);
+                    });
             });
         },
 
@@ -170,37 +174,39 @@ sap.ui.define([
                 this.oView.splitApp.getCurrentDetailPage().setBusy(true);
                 this.easyAccessSearchResultsModel.setProperty("/apps", []);
                 this.easyAccessSearchResultsModel.setProperty("/total", 0);
-                this._getSearchResults(searchTerm, this.searchResultFrom).then((response) => {
-                    // Solution for Internal incident #1770582955: After doing 'search' the results are coming from
-                    // the backend and the 'bookmarkCount' property is not part of the properties there.
-                    // Hence, we need to copy its previous content to the new results
-                    Container.getServiceAsync("BookmarkV2").then((oBookmarkService) => {
-                        response.results.forEach((element) => {
-                            oBookmarkService.countBookmarks(element.url).then((count) => {
-                                element.bookmarkCount = count;
+                this._getSearchResults(searchTerm, this.searchResultFrom)
+                    .then((response) => {
+                        // Solution for Internal incident #1770582955: After doing 'search' the results are coming from
+                        // the backend and the 'bookmarkCount' property is not part of the properties there.
+                        // Hence, we need to copy its previous content to the new results
+                        Container.getServiceAsync("BookmarkV2").then((oBookmarkService) => {
+                            response.results.forEach((element) => {
+                                oBookmarkService.countBookmarks(element.url).then((count) => {
+                                    element.bookmarkCount = count;
+                                });
                             });
-                        });
 
-                        this.easyAccessSearchResultsModel.setProperty("/apps", response.results);
-                        this.easyAccessSearchResultsModel.setProperty("/total", response.count);
+                            this.easyAccessSearchResultsModel.setProperty("/apps", response.results);
+                            this.easyAccessSearchResultsModel.setProperty("/total", response.count);
 
-                        this.searchResultFrom = response.results.length; // for the paging mechanism -> update the next search results
-                        if (isFirstTime) {
-                            this.oView.splitApp.addDetailPage(HierarchyAppsView);
-                        }
-                        // we must initiate an update to the result text / messagePage to rerun its formatter function
-                        // which resides on the Hierarchy-Apps View
-                        HierarchyAppsView.updateResultSetMessage(parseInt(response.count, 10), true);
+                            this.searchResultFrom = response.results.length; // for the paging mechanism -> update the next search results
+                            if (isFirstTime) {
+                                this.oView.splitApp.addDetailPage(HierarchyAppsView);
+                            }
+                            // we must initiate an update to the result text / messagePage to rerun its formatter function
+                            // which resides on the Hierarchy-Apps View
+                            HierarchyAppsView.updateResultSetMessage(parseInt(response.count, 10), true);
 
+                            this.oView.splitApp.getCurrentDetailPage().setBusy(false);
+                            if (this.oView.splitApp.getCurrentDetailPage() !== HierarchyAppsView) {
+                                this.oView.splitApp.toDetail(`${this.getView().getId()}hierarchyAppsSearchResults`);
+                            }
+                        });
+                    })
+                    .catch((error) => {
+                        this.handleGetMenuItemsError(error);
                         this.oView.splitApp.getCurrentDetailPage().setBusy(false);
-                        if (this.oView.splitApp.getCurrentDetailPage() !== HierarchyAppsView) {
-                            this.oView.splitApp.toDetail(`${this.getView().getId()}hierarchyAppsSearchResults`);
-                        }
                     });
-                }, (error) => {
-                    this.handleGetMenuItemsError(error);
-                    this.oView.splitApp.getCurrentDetailPage().setBusy(false);
-                });
 
                 return HierarchyAppsView;
             });
@@ -212,22 +218,24 @@ sap.ui.define([
             }
             const oSubHeaderModel = this.oView.getModel("subHeaderModel");
             const sSearchTerm = oSubHeaderModel.getProperty("/search/searchTerm");
-            this._getSearchResults(sSearchTerm, this.searchResultFrom).then((response) => {
-                const aCurrentResults = this.easyAccessSearchResultsModel.getProperty("/apps");
-                // Due to a bug -> need to copy the array by reference in order for the binding to the model will behave as expected
-                const aNewResults = aCurrentResults.slice();
-                Array.prototype.push.apply(aNewResults, response.results);
-                this.easyAccessSearchResultsModel.setProperty("/apps", aNewResults);
-                if (this.oView.splitApp.getCurrentDetailPage().setShowMoreResultsBusy) {
-                    this.oView.splitApp.getCurrentDetailPage().setShowMoreResultsBusy(false);
-                }
-                this.searchResultFrom = aNewResults.length; // for the paging mechanism -> update the next search results
-            }, (error) => {
-                this.handleGetMenuItemsError(error);
-                if (this.oView.splitApp.getCurrentDetailPage().setShowMoreResultsBusy) {
-                    this.oView.splitApp.getCurrentDetailPage().setShowMoreResultsBusy(true);
-                }
-            });
+            this._getSearchResults(sSearchTerm, this.searchResultFrom)
+                .then((response) => {
+                    const aCurrentResults = this.easyAccessSearchResultsModel.getProperty("/apps");
+                    // Due to a bug -> need to copy the array by reference in order for the binding to the model will behave as expected
+                    const aNewResults = aCurrentResults.slice();
+                    Array.prototype.push.apply(aNewResults, response.results);
+                    this.easyAccessSearchResultsModel.setProperty("/apps", aNewResults);
+                    if (this.oView.splitApp.getCurrentDetailPage().setShowMoreResultsBusy) {
+                        this.oView.splitApp.getCurrentDetailPage().setShowMoreResultsBusy(false);
+                    }
+                    this.searchResultFrom = aNewResults.length; // for the paging mechanism -> update the next search results
+                })
+                .catch((error) => {
+                    this.handleGetMenuItemsError(error);
+                    if (this.oView.splitApp.getCurrentDetailPage().setShowMoreResultsBusy) {
+                        this.oView.splitApp.getCurrentDetailPage().setShowMoreResultsBusy(true);
+                    }
+                });
         },
 
         _getSearchResults: function (searchTerm, from) {
@@ -242,8 +250,8 @@ sap.ui.define([
             oCallOdataServicePromise.done((data) => {
                 oDeferred.resolve(data);
             });
-            oCallOdataServicePromise.fail((error) => {
-                oDeferred.reject(error);
+            oCallOdataServicePromise.fail((oError) => {
+                oDeferred.reject(oError);
             });
 
             return oDeferred.promise();
@@ -336,27 +344,29 @@ sap.ui.define([
         },
 
         loadMenuItemsFirstTime: function (menuName, oSystem) {
-            return this.getMenuItems(menuName, oSystem.systemId, "", 0).then((response) => {
-                response.text = oSystem.systemName || oSystem.systemId;
-                this.easyAccessModel.setData(response);
-                Promise.all([
-                    this.oView.pHierarchyFolders,
-                    this.oView.pHierarchyApps
-                ]).then((aResults) => {
-                    aResults[0].setBusy(false);
-                    aResults[1].setBusy(false);
-                });
-                this.navigateHierarchy("", false);
-            }, (error) => {
-                this.handleGetMenuItemsError(error);
-                Promise.all([
-                    this.oView.pHierarchyFolders,
-                    this.oView.pHierarchyApps
-                ]).then((aResults) => {
-                    aResults[0].updatePageBindings("/", false);
-                    aResults[1].getController().updatePageBindings("/");
+            return this.getMenuItems(menuName, oSystem.systemId, "", 0)
+                .then((response) => {
+                    response.text = oSystem.systemName || oSystem.systemId;
+                    this.easyAccessModel.setData(response);
+                    Promise.all([
+                        this.oView.pHierarchyFolders,
+                        this.oView.pHierarchyApps
+                    ]).then((aResults) => {
+                        aResults[0].setBusy(false);
+                        aResults[1].setBusy(false);
+                    });
+                    this.navigateHierarchy("", false);
+                })
+                .catch((oError) => {
+                    this.handleGetMenuItemsError(oError);
+                    Promise.all([
+                        this.oView.pHierarchyFolders,
+                        this.oView.pHierarchyApps
+                    ]).then((aResults) => {
+                        aResults[0].updatePageBindings("/", false);
+                        aResults[1].getController().updatePageBindings("/");
+                    });
                 });
-            });
         },
 
         handleGetMenuItemsError: function (error) {
@@ -381,7 +391,7 @@ sap.ui.define([
             try {
                 const oBody = JSON.parse(oError.response.body);
                 return oBody.error.message.value;
-            } catch (oTryError) {
+            } catch (oParseError) {
                 return null;
             }
         },
@@ -419,27 +429,27 @@ sap.ui.define([
             const oDeferred = new jQuery.Deferred();
 
             if (menuType !== "SAP_MENU" && menuType !== "USER_MENU") {
-                oDeferred.reject("Invalid menuType parameter");
+                oDeferred.reject(new Error("Invalid menuType parameter"));
                 return oDeferred.promise();
             }
 
             if (typeof systemId !== "string" || systemId === "") {
-                oDeferred.reject("Invalid systemId parameter");
+                oDeferred.reject(new Error("Invalid systemId parameter"));
                 return oDeferred.promise();
             }
 
             if (typeof entityId !== "string") {
-                oDeferred.reject("Invalid entityId parameter");
+                oDeferred.reject(new Error("Invalid entityId parameter"));
                 return oDeferred.promise();
             }
 
             if (typeof entityLevel !== "number") {
-                oDeferred.reject("Invalid entityLevel parameter");
+                oDeferred.reject(new Error("Invalid entityLevel parameter"));
                 return oDeferred.promise();
             }
 
             if (numberOfNextLevels && typeof numberOfNextLevels !== "number") {
-                oDeferred.reject("Invalid numberOfNextLevels parameter");
+                oDeferred.reject(new Error("Invalid numberOfNextLevels parameter"));
                 return oDeferred.promise();
             }
 
@@ -470,8 +480,8 @@ sap.ui.define([
             oCallOdataServicePromise.done((data) => {
                 oDeferred.resolve(data);
             });
-            oCallOdataServicePromise.fail((error) => {
-                oDeferred.reject(error);
+            oCallOdataServicePromise.fail((oError) => {
+                oDeferred.reject(oError);
             });
 
             return oDeferred.promise();
@@ -487,32 +497,33 @@ sap.ui.define([
             const oLogonSystem = Container.getLogonSystem();
             const iSapClient = oLogonSystem && oLogonSystem.getClient();
 
-            sap.ui.require(["sap/ui/thirdparty/datajs"], () => {
-                OData.read(
-                    {
-                        requestUri: oRequest.requestUri,
-                        headers: {
-                            "Cache-Control": "no-cache, no-store, must-revalidate",
-                            Pragma: "no-cache",
-                            Expires: "0",
-                            "Accept-Language": Localization.getLanguage() || "",
-                            "sap-client": iSapClient || "",
-                            "sap-language": sLanguage || ""
-                        }
-                    },
-                    // Success handler
-                    (oResult, oResponseData) => {
-                        if (oResult && oResult.results && oResponseData && oResponseData.statusCode === 200) {
-                            const oReturnedModel = fSuccessHandler.bind(this, oResult, oSuccessHandlerParameters || {})();
-                            oDeferred.resolve(oReturnedModel);
-                        }
-                    },
-                    // Fail handler
-                    (oMessage) => {
-                        oDeferred.reject(oMessage);
+            datajs.read(
+                {
+                    requestUri: oRequest.requestUri,
+                    headers: {
+                        "Cache-Control": "no-cache, no-store, must-revalidate",
+                        Pragma: "no-cache",
+                        Expires: "0",
+                        "Accept-Language": Localization.getLanguage() || "",
+                        "sap-client": iSapClient || "",
+                        "sap-language": sLanguage || ""
                     }
-                );
-            });
+                },
+                // Success handler
+                (oResult, oResponseData) => {
+                    if (oResult && oResult.results && oResponseData && oResponseData.statusCode === 200) {
+                        const oReturnedModel = fSuccessHandler.bind(this, oResult, oSuccessHandlerParameters || {})();
+                        oDeferred.resolve(oReturnedModel);
+                    }
+                },
+                // Fail handler
+                (oDataJsError) => {
+                    const oError = new LaunchpadError(`Failed to fetch data: ${oDataJsError.message}`, {
+                        dataJsError: oDataJsError
+                    });
+                    oDeferred.reject(oError);
+                }
+            );
 
             return oDeferred.promise();
         },

package/src/main/js/sap/ushell/components/appfinder/HierarchyAppsView.js

@@ -137,8 +137,8 @@ sap.ui.define([
 
                 this.linkTemplate = new Link({
                     text: "{crumbs>text}",
-                    press: function (e) {
-                        const crumbData = e.oSource.getBinding("text").getContext().getObject();
+                    press: function (oEvent) {
+                        const crumbData = oEvent.oSource.getBinding("text").getContext().getObject();
                         oViewData.navigateHierarchy(crumbData.path, false);
                     }
                 });

package/src/main/js/sap/ushell/components/appfinder/HierarchyFolders.controller.js

@@ -28,18 +28,20 @@ sap.ui.define([
             this.oDialog = null;
             this.getView().setModel(this.getView().getViewData().easyAccessSystemsModel, "easyAccessSystems");
             this.getView().setModel(this.getView().getViewData().subHeaderModel, "subHeaderModel");
-            this.getSelectedSystem().then((oSystem) => {
-                if (oSystem) {
-                    this.setSystemSelected(oSystem);
-                } else {
+            this.getSelectedSystem()
+                .then((oSystem) => {
+                    if (oSystem) {
+                        this.setSystemSelected(oSystem);
+                    } else {
+                        this.setSystemSelected(undefined);
+                        // if no system selected -> 'select system' dialog will automatically appear
+                        this.onSystemSelectionPress();
+                    }
+                })
+                .catch(() => {
                     this.setSystemSelected(undefined);
-                    // if no system selected -> 'select system' dialog will automatically appear
                     this.onSystemSelectionPress();
-                }
-            }, function () {
-                this.setSystemSelected(undefined);
-                this.onSystemSelectionPress();
-            });
+                });
         },
 
         onExit: function () {
@@ -139,13 +141,13 @@ sap.ui.define([
                             oDeferred.resolve();
                         }
                     })
-                    .catch((error) => {
+                    .catch((oError) => {
                         Log.error(
                             "Failed to get selected system from the personalization",
-                            error,
+                            oError,
                             "sap.ushell.components.appfinder.HierarchyFolders"
                         );
-                        oDeferred.reject();
+                        oDeferred.reject(oError);
                     });
             });
             return oDeferred.promise();
@@ -153,10 +155,10 @@ sap.ui.define([
 
         setSystemSelectedInPersonalization: function (oSystem) {
             this.getPersonalizer().then((oPersonalizer) => {
-                oPersonalizer.setPersData(oSystem).catch((error) => {
+                oPersonalizer.setPersData(oSystem).catch((oError) => {
                     Log.error(
                         "Failed to save selected system in the personalization",
-                        error,
+                        oError,
                         "sap.ushell.components.appfinder.HierarchyFolders"
                     );
                 });

package/src/main/js/sap/ushell/components/appfinder/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.appfinder",
         "applicationVersion": {
-            "version": "1.140.0"
+            "version": "1.141.1"
         },
         "i18n": {
             "bundleUrl": "../../renderer/resources/resources.properties",

package/src/main/js/sap/ushell/components/cards/Configuration.controller.js

@@ -8,8 +8,9 @@ sap.ui.define([
     "sap/base/strings/formatMessage",
     "sap/ui/model/json/JSONModel",
     "sap/ui/thirdparty/jquery",
-    "sap/base/Log"
-], (Localization, Locale, manifestPropertyHelper, resources, Controller, formatter, JSONModel, jQuery, Log) => {
+    "sap/base/Log",
+    "sap/ushell/utils/LaunchpadError"
+], (Localization, Locale, manifestPropertyHelper, resources, Controller, formatter, JSONModel, jQuery, Log, LaunchpadError) => {
     "use strict";
 
     return Controller.extend("sap.ushell.components.cards.Configuration", {
@@ -54,8 +55,9 @@ sap.ui.define([
 
             try {
                 oManifest = JSON.parse(sManifest);
-            } catch (e) {
-                this._logErrorAndReject({ error: resources.i18n.getText("configuration.invalidJSONProvided") }, oDeferred);
+            } catch (oError) {
+                Log.error(resources.i18n.getText("configuration.invalidJSONProvided"), oError, "card.Configuration.controller");
+                oDeferred.reject(oError);
                 return oDeferred;
             }
 
@@ -66,8 +68,9 @@ sap.ui.define([
                 .then(this._saveTitle.bind(this, oExtractedCardData.bagProperties.display_title_text))
                 .then(this._updateTileModel.bind(this, oExtractedCardData))
                 .then(oDeferred.resolve)
-                .catch((error) => {
-                    this._logErrorAndReject(error, oDeferred);
+                .catch((oError) => {
+                    Log.error("save failed", oError, "card.Configuration.controller");
+                    oDeferred.reject(oError);
                 });
 
             return oDeferred.promise();
@@ -94,11 +97,15 @@ sap.ui.define([
                         tileConfiguration: tileConfiguration
                     },
                     resolve,
-                    (oError, oErrorInfo) => {
-                        reject({
-                            error: oError,
-                            errorInfo: oErrorInfo
-                        });
+                    (sErrorMessage, oErrorInfo) => {
+                        const oError = new LaunchpadError(
+                            sErrorMessage,
+                            {
+                                error: sErrorMessage,
+                                errorInfo: oErrorInfo
+                            }
+                        );
+                        reject(oError);
                     }
                 );
             });
@@ -121,11 +128,14 @@ sap.ui.define([
             const oPromise = new Promise((resolve, reject) => {
                 oTilePropertiesBag.save(
                     resolve,
-                    (oError, oErrorInfo) => {
-                        reject({
-                            error: oError,
-                            errorInfo: oErrorInfo
-                        });
+                    (mErrorMessages, mErrorInfo) => {
+                        const sFirstFailedBag = Object.keys(mErrorMessages)[0];
+
+                        reject(new LaunchpadError(`Bag save failed: ${mErrorMessages[sFirstFailedBag]}`, {
+                            info: mErrorInfo[sFirstFailedBag],
+                            otherMessages: mErrorMessages,
+                            otherInfo: mErrorInfo
+                        }));
                     }
                 );
             });
@@ -149,11 +159,15 @@ sap.ui.define([
                     oChipInstance.title.setTitle(
                         title,
                         resolve,
-                        (oError, oErrorInfo) => {
-                            reject({
-                                error: oError,
-                                errorInfo: oErrorInfo
-                            });
+                        (sErrorMessage, oErrorInfo) => {
+                            const oEnhancedError = new LaunchpadError(
+                                sErrorMessage,
+                                {
+                                    error: sErrorMessage,
+                                    errorInfo: oErrorInfo
+                                }
+                            );
+                            reject(oEnhancedError);
                         }
                     );
                 } else {
@@ -178,18 +192,6 @@ sap.ui.define([
             oTileModel.setProperty("/data/display_subtitle_text", cardData.bagProperties.display_subtitle_text);
         },
 
-        /**
-         * Log an error to the console and reject a deferred with the error
-         *
-         * @param {object} error The error object
-         * @param {object} deferred A deferred to reject
-         * @private
-         */
-        _logErrorAndReject: function (error, deferred) {
-            Log.error(error.error, null, "card.Configuration.controller");
-            deferred.reject(error.error, error.errorInfo);
-        },
-
         /**
          * Fill the card's CHIP bag with texts extracted from the card's manifest
          *

package/src/main/js/sap/ushell/components/cards/ManifestPropertyHelper.js

@@ -5,9 +5,11 @@
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",
-    "sap/ushell/utils",
     "sap/ushell/utils/UrlParsing"
-], (ObjectPath, utils, urlParsing) => {
+], (
+    ObjectPath,
+    UrlParsing
+) => {
     "use strict";
 
     const ManifestPropertyHelper = {
@@ -48,7 +50,7 @@ sap.ui.define([
             }
 
             if (oSemanticParameters) {
-                sSemanticParameters = utils.urlParametersToString(oSemanticParameters);
+                sSemanticParameters = UrlParsing.urlParametersToString(oSemanticParameters);
             }
 
             if (sTargetUrl) {
@@ -211,7 +213,7 @@ sap.ui.define([
          * @private
          */
         _parseParameters: function (parameters) {
-            const oParameters = urlParsing.parseParameters(`?${parameters}`);
+            const oParameters = UrlParsing.parseParameters(`?${parameters}`);
 
             // the service returns arrays for the values in case there are multiple values for the same URL parameter
             // however, we support only one value per parameter

package/src/main/js/sap/ushell/components/cepsearchresult/app/util/Edition.js

@@ -31,7 +31,7 @@ sap.ui.define([
                         resolve(EditionClass);
                     },
                     () => {
-                        reject();
+                        reject(new Error(`Failed to load Edition: 'Edition${sEditionToUpper}'`));
                     }
                 );
             });
@@ -155,7 +155,7 @@ sap.ui.define([
     Edition.prototype.translate = function (sTranslationKey) {
         try {
             return utilResources.bundle.getText(sTranslationKey);
-        } catch (ex) {
+        } catch (oError) {
             return sTranslationKey;
         }
     };

package/src/main/js/sap/ushell/components/cepsearchresult/app/util/controls/categories/People.js

@@ -37,7 +37,7 @@ sap.ui.define([
                 try {
                     const aTexts = oData.split(" ");
                     return (aTexts[0].charAt(0) + aTexts[aTexts.length - 1].charAt(0)).toUpperCase();
-                } catch (ex) {
+                } catch (oError) {
                     return "";
                 }
             }