@sapui5/sap.ushell 1.139.0 → 1.141.0

package/src/main/js/sap/ushell/services/VisualizationDataProvider.js

@@ -7,7 +7,7 @@
  *
  * Configured with the LaunchPageAdapter.
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/ushell/resources",
@@ -15,14 +15,14 @@ sap.ui.define([
     "sap/ushell/library",
     "sap/ushell/utils/chipsUtils",
     "sap/base/Log",
-    "sap/ushell/Config"
+    "sap/ushell/utils/LaunchpadError"
 ], (
-    resources,
+    ushellResources,
     jQuery,
     ushellLibrary,
     chipsUtils,
     Log,
-    Config
+    LaunchpadError
 ) => {
     "use strict";
 
@@ -239,8 +239,8 @@ sap.ui.define([
                                 tileSize: oResult.visualizations[sId].size
                             };
                         }
-                    } catch (vError) {
-                        Log.error(`Could not get visualization data from tile ${sId}`, vError, this.S_COMPONENT_NAME);
+                    } catch (oError) {
+                        Log.error(`Could not get visualization data from tile ${sId}`, oError, this.S_COMPONENT_NAME);
                     }
 
                     if (oView) {
@@ -254,13 +254,16 @@ sap.ui.define([
                     page: {}
                 });
             })
-            .catch((error) => {
-                const oError = {
-                    component: this.S_COMPONENT_NAME,
-                    description: resources.i18n.getText("VisualizationDataProvider.CannotLoadData"),
-                    detail: error
-                };
-                return Promise.reject(oError);
+            .catch((oError) => {
+                throw new LaunchpadError(
+                    oError.message,
+                    {
+                        component: this.S_COMPONENT_NAME,
+                        description: ushellResources.i18n.getText("VisualizationDataProvider.CannotLoadData"),
+                        detail: oError.message
+                    },
+                    oError
+                );
             });
 
         return this._oVisualizationDataPromise;
@@ -352,8 +355,8 @@ sap.ui.define([
                 },
                 tileSize: sSize
             };
-        } catch (sError) {
-            Log.error(`The chipInstance '${sBaseChipId}' could not be loaded: `, sError);
+        } catch (oError) {
+            Log.error(`The chipInstance '${sBaseChipId}' could not be loaded: `, oError);
         }
     };
 

package/src/main/js/sap/ushell/services/VisualizationInstantiation.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module deals with the instantiation of visualizations in a platform independent way.
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/ushell/ui/launchpad/VizInstance",
@@ -136,7 +136,7 @@ sap.ui.define([
                     // this event is currently only used to measure the TTI for which only standard VizTypes are relevant
                     EventHub.emit("VizInstanceLoaded", vizData.id);
                 });
-            } catch (error) {
+            } catch (oError) {
                 oVizInstance.setState(LoadState.Failed);
                 // this event is currently only used to measure the TTI for which only standard VizTypes are relevant
                 EventHub.emit("VizInstanceLoaded", vizData.id);
@@ -152,7 +152,7 @@ sap.ui.define([
                     oVizInstance.load(true).then(() => {
                         oVizInstance.setState(LoadState.Loaded);
                     });
-                } catch (error) {
+                } catch (oError) {
                     oVizInstance.setState(LoadState.Failed);
                 }
             });

package/src/main/js/sap/ushell/services/_ContentExtensionAdapterFactory/ContentExtensionAdapterConfig.js

@@ -7,7 +7,7 @@
  *  config handler which is called by the factory to generate an explicit
  *  Adapter configuration
  *
- * @version 1.139.0
+ * @version 1.141.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/services/_ContentExtensionAdapterFactory/FeaturedGroupConfig.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Provide mock feature group data
  *
- * @version 1.139.0
+ * @version 1.141.0
  * @private
  */
 sap.ui.define([

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

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Cross Application Navigation utility functions
  *
- * @version 1.139.0
+ * @version 1.141.0
  * @deprecated since 1.120
  */
 sap.ui.define([
@@ -193,10 +193,10 @@ sap.ui.define([
     Utils.safeParseToObject = function (sObject) {
         try {
             return JSON.parse(sObject);
-        } catch (e) {
+        } catch (oError) {
             Log.error(
                 "Cannot parse the given string to object",
-                sObject
+                oError
             );
         }
 

package/src/main/js/sap/ushell/services/_PageReferencing/PageReferencer.js

@@ -4,7 +4,7 @@
  * @file This module is responsible to create reference pages,
  * which are shareable JSON representations of layout and navigation targets in the specific format.
  *
- * @version 1.139.0
+ * @version 1.141.0
  * @private
  */
 sap.ui.define([
@@ -42,7 +42,7 @@ sap.ui.define([
                     oResult[sHash] = aResolutionResult[index].inboundPermanentKey;
                 });
                 fnResolve(oResult);
-            }, fnReject);
+            }).catch(fnReject);
         });
     }
 

package/src/main/js/sap/ushell/services/_Personalization/ContextContainer.js

@@ -138,9 +138,9 @@ sap.ui.define([
         const oPrior = this._oService._pendingContainerOperations_flushAddNext(this._sContainerKey, oDeferred);
         // get adapter container & load
         oPrior.always(() => {
-            that._oAdapterContainer.load().fail(() => {
+            that._oAdapterContainer.load().fail((oError) => {
                 // TODO
-                oDeferred.reject();
+                oDeferred.reject(oError);
             }).done(() => {
                 that._copyFromAdapter();
                 if (that._isExpired()) {
@@ -237,14 +237,14 @@ sap.ui.define([
         oPrior.always(() => {
             try {
                 that._oAdapterContainer.save() // promise
-                    .fail(() => {
-                        oSaveDeferred.reject();
+                    .fail((oError) => {
+                        oSaveDeferred.reject(oError);
                     })
                     .done(() => {
                         oSaveDeferred.resolve();
                     });
-            } catch (e) {
-                oSaveDeferred.reject();
+            } catch (oError) {
+                oSaveDeferred.reject(oError);
             }
         });
         return oSaveDeferred.promise();
@@ -277,10 +277,10 @@ sap.ui.define([
             oPrior.always(() => {
                 try {
                     that._oAdapterContainer.save() // promise
-                        .fail(() => { oSaveDeferred.reject(); })
+                        .fail((oError) => { oSaveDeferred.reject(oError); })
                         .done(() => { oSaveDeferred.resolve(); });
-                } catch (e) {
-                    oSaveDeferred.reject();
+                } catch (oError) {
+                    oSaveDeferred.reject(oError);
                 }
             });
         }
@@ -306,7 +306,7 @@ sap.ui.define([
         this._copyToAdapterUpdatingValidity();
         const oSaveDeferred = new jQuery.Deferred();
         const oPrior = this._oService._pendingContainerOperations_flushAddNext(this._sContainerKey, oSaveDeferred);
-        oPrior.fail(() => { oSaveDeferred.reject(); })
+        oPrior.fail((oError) => { oSaveDeferred.reject(oError); })
             .done(() => { oSaveDeferred.resolve(); });
         return oSaveDeferred.promise();
     };

package/src/main/js/sap/ushell/services/_Personalization/PersonalizationContainer.js

@@ -45,8 +45,8 @@ sap.ui.define([
         // get adapter container & load
         this._oAdapterContainer = oAdapter.getAdapterContainer(this._sContainerKey);
         this.load()
-            .fail(() => {
-                oDeferred.reject();
+            .fail((oError) => {
+                oDeferred.reject(oError);
             })
             .done(() => {
                 oDeferred.resolve(that);
@@ -134,9 +134,9 @@ sap.ui.define([
         this._init();
         // get adapter container & load
         this._oAdapterContainer.load()
-            .fail(() => {
+            .fail((oError) => {
                 // TODO
-                oDeferred.reject();
+                oDeferred.reject(oError);
             })
             .done(() => {
                 aItemAndVaraintSetKeys = that._oAdapterContainer.getItemKeys().splice(0);
@@ -194,15 +194,15 @@ sap.ui.define([
         function fnSaveSuccess () {
             oSaveContainer.resolve();
         }
-        function fnSaveError () {
-            oSaveContainer.reject();
+        function fnSaveError (oError) {
+            oSaveContainer.reject(oError);
         }
         try {
             oInnerPromise = this._oAdapterContainer.save(); // promise
             oInnerPromise.fail(fnSaveError);
             oInnerPromise.done(fnSaveSuccess);
-        } catch (e) {
-            oSaveContainer.reject();
+        } catch (oError) {
+            oSaveContainer.reject(oError);
         }
         return oSaveContainer.promise();
     };

package/src/main/js/sap/ushell/services/_Personalization/Personalizer.js

@@ -80,9 +80,9 @@ sap.ui.define([
 
         oDeferred = new jQuery.Deferred();
         this._getContainer(this._sPersContainer)
-            .fail(() => {
+            .fail((oError) => {
                 // TODO
-                oDeferred.reject();
+                oDeferred.reject(oError);
             })
             .done((oContainer) => {
                 oDeferred.resolve(oContainer.getItemValue(that._sPersItem));
@@ -111,24 +111,24 @@ sap.ui.define([
 
         oDeferred = new jQuery.Deferred();
         this._getContainer(this._sPersContainer)
-            .fail(() => {
+            .fail((oError) => {
                 // TODO
-                oDeferred.reject();
+                oDeferred.reject(oError);
             })
             .done((oContainer) => {
                 oContainer.setItemValue(that._sPersItem, oValue);
                 oContainer.save()
-                    .fail(() => {
+                    .fail((oError) => {
                         // TODO
-                        oDeferred.reject();
+                        oDeferred.reject(oError);
                     })
                     .done(() => {
                         oDeferred.resolve();
                     });
             });
 
-        oDeferred.fail(() => {
-            Log.error(`Fail to set Personalization data for Personalizer container: ${that._sPersContainer}`);
+        oDeferred.fail((oError) => {
+            Log.error(`Fail to set Personalization data for Personalizer container: ${that._sPersContainer}`, oError);
         });
         return oDeferred.promise();
     };
@@ -148,16 +148,16 @@ sap.ui.define([
 
         oDeferred = new jQuery.Deferred();
         this._getContainer(this._sPersContainer)
-            .fail(() => {
+            .fail((oError) => {
                 // TODO
-                oDeferred.reject();
+                oDeferred.reject(oError);
             })
             .done((oContainer) => {
                 oContainer.delItem(that._sPersItem);
                 oContainer.save()
-                    .fail(() => {
+                    .fail((oError) => {
                         // TODO
-                        oDeferred.reject();
+                        oDeferred.reject(oError);
                     })
                     .done(() => {
                         oDeferred.resolve();
@@ -165,8 +165,8 @@ sap.ui.define([
             });
 
         const oMessagingPromise = oDeferred.promise();
-        oMessagingPromise.fail(function () {
-            Log.error(`Fail to delete Personalization data for Personalizer container: ${this._sPersContainer}`);
+        oMessagingPromise.fail((oError) => {
+            Log.error(`Fail to delete Personalization data for Personalizer container: ${this._sPersContainer}`, oError);
         });
         return oMessagingPromise;
     };

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

@@ -178,7 +178,7 @@ sap.ui.define([
         }
         try {
             return JSON.parse(oObject);
-        } catch (e) {
+        } catch (oError) {
             return undefined;
         }
     }
@@ -189,7 +189,7 @@ sap.ui.define([
         }
         try {
             return JSON.parse(JSON.stringify(oObject));
-        } catch (e) {
+        } catch (oError) {
             return undefined;
         }
     }

package/src/main/js/sap/ushell/services/appstate/AppState.js

@@ -10,8 +10,8 @@ sap.ui.define([
         this._oServiceInstance._saveAppState(this._sKey, this._sData, this._sAppName, this._sACHComponent,
             this._bTransient, this._sPersistencyMethod, this._oPersistencySettings).done(() => {
             oDeferred.resolve();
-        }).fail((sMsg) => {
-            oDeferred.reject(sMsg);
+        }).fail((oError) => {
+            oDeferred.reject(oError);
         });
         return oDeferred.promise();
     }
@@ -20,8 +20,8 @@ sap.ui.define([
         const oDeferred = new jQuery.Deferred();
         this._oServiceInstance._deleteAppState(this._sKey).done(() => {
             oDeferred.resolve();
-        }).fail((sMsg) => {
-            oDeferred.reject(sMsg);
+        }).fail((oError) => {
+            oDeferred.reject(oError);
         });
         return oDeferred.promise();
     }
@@ -61,8 +61,8 @@ sap.ui.define([
             this.setData = function (oData) {
                 try {
                     this._sData = JSON.stringify(oData);
-                } catch (e) {
-                    Log.error("Data can not be serialized", "sap.ushell.services.AppState.AppState");
+                } catch (oError) {
+                    Log.error("Data can not be serialized", oError, "sap.ushell.services.AppState.AppState");
                     this._sData = undefined;
                 }
             };
@@ -85,8 +85,8 @@ sap.ui.define([
         }
         try {
             o = JSON.parse(this._sData);
-        } catch (ex) {
-            Log.error(`Could not parse [${this._sData}]${ex}`);
+        } catch (oError) {
+            Log.error(`Could not parse [${this._sData}]`, oError);
         }
         return o;
     };

package/src/main/js/sap/ushell/services/appstate/WindowAdapter.js

@@ -154,8 +154,8 @@ sap.ui.define([
                     return oDeferred.promise();
                 }
             }
-        } catch (error) {
-            if (error.code === CROSS_ORIGIN_EXCEPTION_ERROR_CODE) {
+        } catch (oError) {
+            if (oError.code === CROSS_ORIGIN_EXCEPTION_ERROR_CODE) {
                 Log.warning("AppState.js - loadAppState: Opener is not of the same origin and cannot be used for AppState resolving.");
             } else {
                 Log.warning("AppState.js - loadAppState: Opener is a FLP but AppState could not get resolved from there.");
@@ -171,7 +171,7 @@ sap.ui.define([
             }).fail(oDeferred.reject.bind(oDeferred));
             return oDeferred.promise();
         }
-        oDeferred.reject("AppState.js - loadAppState: Application State could not be loaded");
+        oDeferred.reject(new Error("AppState.js - loadAppState: Application State could not be loaded"));
         return oDeferred.promise();
     };
 

package/src/main/js/sap/ushell/state/StrategyFactory/HeadEndItemsStrategy.js

@@ -3,10 +3,12 @@
 sap.ui.define([
     "sap/base/Log",
     "sap/ui/core/Element",
+    "sap/ushell/Config",
     "sap/ushell/api/NewExperience"
 ], (
     Log,
     Element,
+    Config,
     NewExperience
 ) => {
     "use strict";
@@ -61,6 +63,11 @@ sap.ui.define([
          * @private
          */
         #exceedsMaxLength (aList) {
+            // The ShellBar WebComponent does not have any limit for the content, compared to the ShellHeader.
+            // Therefore we do not need to check for this anymore.
+            if (Config.last("/core/shellBar/enabled")) {
+                return false;
+            }
             const aListWithoutDuplicates = [...new Set(aList)];
             const aReservedIds = [
                 "endItemsOverflowBtn"

package/src/main/js/sap/ushell/state/modules/BackNavigation.js

@@ -2,16 +2,14 @@
 
 /**
  * @fileOverview handle all the current back navigation.
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/ui/core/library",
-    "sap/ui/core/routing/History",
-    "sap/ushell/Container"
+    "sap/ui/core/routing/History"
 ], (
     coreLibrary,
-    Ui5History,
-    Container
+    Ui5History
 ) => {
     "use strict";
 
@@ -20,7 +18,6 @@ sap.ui.define([
 
     function BackNavigation () {
         // handle the history service
-        let bDefaultBrowserBack = false;
         let fnCustomBackNavigation;
 
         this.isBackNavigation = function () {
@@ -28,40 +25,27 @@ sap.ui.define([
         };
 
         this.navigateBack = async function () {
-            if (bDefaultBrowserBack === true) {
-                window.history.back();
-            } else if (fnCustomBackNavigation) {
+            if (fnCustomBackNavigation) {
                 fnCustomBackNavigation();
-            } else {
-                const Navigation = await Container.getServiceAsync("Navigation");
-                const bIsInitialNavigation = await Navigation.isInitialNavigation();
-
-                if (bIsInitialNavigation) {
-                    // go back home
-                    return Navigation.navigate({ target: { shellHash: "#" }, writeHistory: false });
-                }
-
-                window.history.back();
+                return;
             }
+
+            window.history.back();
         };
 
         this.setNavigateBack = function (inFnBKImp) {
-            bDefaultBrowserBack = false;
             fnCustomBackNavigation = inFnBKImp;
         };
 
         this.resetNavigateBack = function () {
-            bDefaultBrowserBack = true;
             fnCustomBackNavigation = undefined;
         };
 
         this.restore = function (oInServices) {
-            bDefaultBrowserBack = oInServices.bDefaultBrowserBack;
             fnCustomBackNavigation = oInServices.fnCustomBackNavigation;
         };
 
         this.store = function (oServices) {
-            oServices.bDefaultBrowserBack = bDefaultBrowserBack;
             oServices.fnCustomBackNavigation = fnCustomBackNavigation;
         };
 
@@ -73,7 +57,6 @@ sap.ui.define([
          * @private
          */
         this.reset = function () {
-            bDefaultBrowserBack = false;
             fnCustomBackNavigation = undefined;
         };
     }

package/src/main/js/sap/ushell/state/modules/ContentDensity.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview handles content density.
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/ui/Device",

package/src/main/js/sap/ushell/state/modules/Favicon.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview handles favicon.
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/ui/core/Theming",

package/src/main/js/sap/ushell/state/modules/HeaderLogo.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview handles the logo within the header.
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/base/i18n/Localization",
@@ -135,8 +135,8 @@ sap.ui.define([
                             sAltText = oConfigAltTexts.default;
                         }
                     }
-                } catch (err) {
-                    Log.warning("Custom logo image ALT text is not a JSON string.", sConfigAltTexts);
+                } catch (oError) {
+                    Log.warning(`Custom logo image ALT text is not a JSON string: '${sConfigAltTexts}'`, oError);
                     sAltText = sConfigAltTexts; // Still, a customer may provide a "[Company name] logo" instead of JSON
                 }
             }

package/src/main/js/sap/ushell/support/plugins/flpConfig/FlpConfigurationPlugin.js

@@ -9,7 +9,7 @@
  * Fiori launchpad in a tree table separated by IconTabFilters for the first level properties of the configuration object.
  * Also it provides a search for last level properties.
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/ui/core/Element",

package/src/main/js/sap/ushell/themes/base/ActionMode.less

@@ -6,7 +6,7 @@
   width: inherit;
   height: inherit;
   position: absolute;
-  z-index: 2;
+  z-index: 3;
   border-radius: 0.25rem;
 }
 

package/src/main/js/sap/ushell/themes/base/ToolAreaItem.less

@@ -15,7 +15,7 @@
   transition: left 500ms ease;
 
   &.sapUshellToolAreaTextHidden {
-    width: 3.0625rem;
+    width: 4.25rem;
 
     .sapUshellToolAreaItemText {
       display: none;