@sapui5/sap.ushell 1.138.1 → 1.139.0

package/src/main/js/sap/ushell/components/shell/ShellBar/view/ShellBar.view.xml

@@ -14,13 +14,12 @@
     }"
 >
 <!-- The icons are imported to make sure they are available for e.g. custom shell bar items. -->
+
     <thirdparty:ShellBar
         id="shellBar"
         class="sapUshellShellSearch sapUshellShellBar"
-        primaryTitle="{config>/windowTitleExtension}"
         secondaryTitle="{shellModel>/header/secondTitle}"
         searchFieldToggle=".onSearchFieldToggle"
-        logoClick=".onLogoClick"
         showSearchField="{/searchField/show}"
         hideSearchButton="{/searchField/show}"
         contentItemVisibilityChange=".onContentItemVisibilityChange"
@@ -57,13 +56,20 @@
             filters: [{ path: '', test: '.isProfileMenu' }]
         }"
     >
-        <thirdparty:logo>
-            <m:Image
-                src="{shellModel>/header/logo/src}"
-                alt="{shellModel>/header/logo/alt}"
-                tooltip="{= ${/logo/isRootIntent} ? ${i18n>homeBtn_tooltip_text} : ${i18n>lastPage_tooltip}}"
-            />
-        </thirdparty:logo>
+        <thirdparty:branding>
+            <thirdparty:ShellBarBranding
+                href="{/logo/homeUri}"
+                target="_self"
+                text="{config>/windowTitleExtension}">
+                <thirdparty:logo>
+                    <m:Image
+                        src="{shellModel>/header/logo/src}"
+                        alt="{shellModel>/header/logo/alt}"
+                        tooltip="{= ${/logo/isRootIntent} ? ${i18n>homeBtn_tooltip_text} : ${i18n>lastPage_tooltip}}"
+                    />
+                </thirdparty:logo>
+            </thirdparty:ShellBarBranding>
+        </thirdparty:branding>
         <thirdparty:customData>
             <core:CustomData
                 key="help-id"
@@ -71,5 +77,11 @@
                 writeToDom="true"
             />
         </thirdparty:customData>
+
+        <thirdparty:searchField>
+            <!-- content added by the ESearch module (library "sap/esh/search/ui/SearchShellHelper") by calling setSearch method on ShellBar component -->
+            <!-- this is required in order to avoid pre-fetching a lot of fragment.xmls on first render which might not be used -->
+            <m:Input id="dummySearchInput"/>
+        </thirdparty:searchField>
     </thirdparty:ShellBar>
 </mvc:View>

package/src/main/js/sap/ushell/components/shell/SideNavigation/Component.js

@@ -4,7 +4,6 @@ sap.ui.define([
     "sap/m/VBox",
     "sap/ui/core/ComponentContainer",
     "sap/ui/core/Fragment",
-    "sap/ui/core/mvc/XMLView",
     "sap/ui/core/UIComponent",
     "sap/ui/Device",
     "sap/ui/model/json/JSONModel",
@@ -12,12 +11,11 @@ sap.ui.define([
     "sap/ushell/Container",
     "sap/ushell/state/ShellModel",
     "sap/ushell/EventHub"
-], function (
+], (
     mLibrary,
     VBox,
     ComponentContainer,
     Fragment,
-    XMLView,
     UIComponent,
     Device,
     JSONModel,
@@ -25,7 +23,7 @@ sap.ui.define([
     Container,
     ShellModel,
     EventHub
-) {
+) => {
     "use strict";
 
     const FlexRendertype = mLibrary.FlexRendertype;
@@ -57,16 +55,14 @@ sap.ui.define([
             this._addHamburgerButton();
 
             const oViewConfiguration = new JSONModel({
-                //We need to initialize with a non-empty key to avoid flickering of the selection.
+                // We need to initialize with a non-empty key to avoid flickering of the selection.
                 selectedKey: "NONE",
                 enableSideNavigation: true,
                 expanded: true,
                 renderMode: this.sSideNavigationMode
             });
             Config.on("/core/sideNavigation/mode").do(this._handleRenderModeChange.bind(this));
-            if (!Device.media.hasRangeSet(Device.media.RANGESETS.SAP_3STEPS)) {
-                Device.media.initRangeSet(Device.media.RANGESETS.SAP_3STEPS);
-            }
+
             Device.resize.attachHandler(this._handleRenderModeChange.bind(this));
 
             this.setModel(oViewConfiguration, "viewConfiguration");
@@ -78,7 +74,7 @@ sap.ui.define([
             const oModel = this.getModel("viewConfiguration");
             let sValue = Config.last("/core/sideNavigation/mode");
 
-            if (Device.media.getCurrentRange(Device.media.RANGESETS.SAP_3STEPS).name !== "L") {
+            if (Device.media.getCurrentRange(Device.media.RANGESETS.SAP_STANDARD).name !== "Desktop") {
                 sValue = "Popover";
                 oModel.setProperty("/expanded", true);
             }
@@ -162,7 +158,7 @@ sap.ui.define([
             switch (this.sSideNavigationMode) {
                 case "Docked":
                     this.toggleSideNavigationExpansion();
-                    this.rootControlLoaded().then(function (oSideNavigation) {
+                    this.rootControlLoaded().then((oSideNavigation) => {
                         const oNavContainer = oSideNavigation.byId("navContainer");
                         if (oNavContainer.getCurrentPage() !== "sideNavigation") {
                             oNavContainer.to(oSideNavigation.byId("sideNavigation"));
@@ -181,7 +177,7 @@ sap.ui.define([
                         });
                     }
 
-                    this._pPopover.then(function (oPopover) {
+                    this._pPopover.then((oPopover) => {
                         if (oPopover.isOpen()) {
                             oPopover.close();
                         } else {

package/src/main/js/sap/ushell/components/shell/SideNavigation/controller/SideNavigation.controller.js

@@ -8,7 +8,7 @@ sap.ui.define([
     "sap/ushell/EventHub",
     "sap/ushell/Config",
     "sap/base/Log"
-], function (
+], (
     ObjectPath,
     EventBus,
     Controller,
@@ -17,7 +17,7 @@ sap.ui.define([
     EventHub,
     Config,
     Log
-) {
+) => {
     "use strict";
 
     /**
@@ -178,7 +178,7 @@ sap.ui.define([
         onExit: function () {
             this.oEnableMenuBarNavigationListener.off();
             EventBus.getInstance().unsubscribe("sap.ushell", "appOpened", this._selectIndexAfterRouteChange, this);
-            this._aDoables.forEach(function (oConfigListener) {
+            this._aDoables.forEach((oConfigListener) => {
                 oConfigListener.off();
             });
             this._aDoables = [];

package/src/main/js/sap/ushell/components/shell/SideNavigation/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.SideNavigation",
         "applicationVersion": {
-            "version": "1.138.1"
+            "version": "1.139.0"
         },
         "i18n": {
             "bundleUrl": "./resources/resources.properties",

package/src/main/js/sap/ushell/components/shell/SideNavigation/modules/AllSpaces.js

@@ -6,13 +6,13 @@ sap.ui.define([
     "sap/ui/core/Fragment",
     "sap/ui/core/Component",
     "sap/ushell/Container"
-], function (
+], (
     NavigationListItem,
     CustomData,
     Fragment,
     Component,
     Container
-) {
+) => {
     "use strict";
 
     /**
@@ -24,7 +24,6 @@ sap.ui.define([
      * @private
      */
     class AllSpaces {
-
         /**
          * The promise that resolves once the fragment is loaded.
          * @type {Promise<[sap.ui.core.Fragment, sap.ui.core.Component]>}
@@ -72,7 +71,7 @@ sap.ui.define([
                     value: "MenuEntry-All-Spaces",
                     writeToDom: true
                 })],
-                icon: "sap-icon://dimension",
+                icon: "sap-icon://BusinessSuiteInAppSymbols/icon-all-spaces-pin",
                 selectable: false,
                 press: async () => {
                     oSideNavAPI.getNavContainerFacade().to(await this.#pFragmentLoaded);

package/src/main/js/sap/ushell/components/shell/SideNavigation/modules/AppFinder.js

@@ -3,10 +3,10 @@
 sap.ui.define([
     "sap/tnt/NavigationListItem",
     "sap/ui/core/CustomData"
-], function (
+], (
     NavigationListItem,
     CustomData
-) {
+) => {
     "use strict";
 
     /**

package/src/main/js/sap/ushell/components/shell/SideNavigation/modules/Favorites.js

@@ -13,7 +13,7 @@ sap.ui.define([
     "sap/ushell/Config",
     "sap/ushell/Container",
     "sap/ushell/components/shell/SideNavigation/modules/NavigationHelper"
-], function (
+], (
     GenericTile,
     mobileLibrary,
     NavigationListGroup,
@@ -26,7 +26,7 @@ sap.ui.define([
     Config,
     Container,
     NavigationHelper
-) {
+) => {
     "use strict";
 
     /**
@@ -241,7 +241,7 @@ sap.ui.define([
             // Process visualizations to extract relevant information
             Container.getServiceAsync("VisualizationInstantiation").then((oVisualizationInstantiationService) => {
                 aVisualizations.forEach((oVisualization) => {
-                    if (oVisualization.vizType?.startsWith("X-SAP-UI2-CHIP:SSB")) {
+                    if (oVisualization.vizType?.startsWith("X-SAP-UI2-CHIP:SSB") && !this.#oSmartBusinessVizInstances[oVisualization.id]) {
                         const oVizInstance = oVisualizationInstantiationService.instantiateVisualization(oVisualization);
                         oVizInstance.setActive(true);
                         oVizInstance.loaded().then(() => {
@@ -327,6 +327,11 @@ sap.ui.define([
                 icon: "{= !%{favorites>vizType} ? 'sap-icon://folder' : '' }",
                 href: "{favorites>targetURL}",
                 selectable: false,
+                // There should be atleast one visualization with a title to show the folder
+                visible: {
+                    path: "favorites>visualizations",
+                    formatter: (aVisualizations) => aVisualizations?.some((oItem) => !!oItem.title)
+                },
                 items: {
                     path: "favorites>visualizations",
                     template: new NavigationListItem({

package/src/main/js/sap/ushell/components/shell/SideNavigation/modules/GenericFixedNavigationListProvider.js

@@ -4,11 +4,11 @@ sap.ui.define([
     "sap/ui/model/json/JSONModel",
     "sap/ui/model/Sorter",
     "sap/tnt/NavigationList"
-], function (
+], (
     JSONModel,
     Sorter,
     NavigationList
-) {
+) => {
     "use strict";
 
     /**

package/src/main/js/sap/ushell/components/shell/SideNavigation/modules/GenericNavigationListProvider.js

@@ -3,10 +3,10 @@
 sap.ui.define([
     "sap/ushell/Config",
     "sap/tnt/NavigationList"
-], function (
+], (
     Config,
     NavigationList
-) {
+) => {
     "use strict";
     /**
      * The NavigationList for the item aggregation of the SideNavigation.

package/src/main/js/sap/ushell/components/shell/SideNavigation/modules/MyHome.js

@@ -7,14 +7,14 @@ sap.ui.define([
     "sap/ushell/Config",
     "sap/ushell/components/shell/SideNavigation/modules/NavigationHelper",
     "sap/ushell/utils/UrlParsing"
-], function (
+], (
     NavigationListItem,
     CustomData,
     hasher,
     Config,
     NavigationHelper,
     UrlParsing
-) {
+) => {
     "use strict";
 
     /**

package/src/main/js/sap/ushell/components/shell/SideNavigation/modules/NavigationHelper.js

@@ -3,10 +3,10 @@
 sap.ui.define([
     "sap/ushell/Container",
     "sap/ushell/utils/WindowUtils"
-], function (
+], (
     Container,
     WindowUtils
-) {
+) => {
     "use strict";
 
     /**
@@ -23,9 +23,9 @@ sap.ui.define([
         * @since 1.133.0
         */
         _performNavigation (oTarget) {
-            return Container.getServiceAsync("Navigation").then(function (oNavigationService) {
+            return Container.getServiceAsync("Navigation").then((oNavigationService) => {
                 const oParams = {};
-                oTarget.parameters?.forEach(function (oParameter) {
+                oTarget.parameters?.forEach((oParameter) => {
                     if (oParameter.name && oParameter.value) {
                         oParams[oParameter.name] = [oParameter.value];
                     }

package/src/main/js/sap/ushell/components/shell/SideNavigation/modules/RecentActivity.js

@@ -8,7 +8,7 @@ sap.ui.define([
     "sap/ushell/EventHub",
     "sap/ui/model/Filter",
     "sap/ui/model/FilterOperator"
-], function (
+], (
     NavigationListItem,
     CustomData,
     Container,
@@ -16,7 +16,7 @@ sap.ui.define([
     EventHub,
     Filter,
     FilterOperator
-) {
+) => {
     "use strict";
 
     /**
@@ -78,10 +78,10 @@ sap.ui.define([
             this.oItemReady = new Promise((resolve) => {
                 this._prepareModel(resolve);
             });
-            EventHub.on("newUserRecentsItem").do(async function () {
+            EventHub.on("newUserRecentsItem").do(async () => {
                 const aUpdatedRecentItems = await this._getRecentActivityItems();
                 this.oRootItem.getModel("recents").setData(aUpdatedRecentItems);
-            }.bind(this));
+            });
         }
 
         /**

package/src/main/js/sap/ushell/components/shell/SideNavigation/modules/Spaces.js

@@ -14,7 +14,7 @@ sap.ui.define([
     "sap/ushell/Container",
     "sap/ushell/components/shell/SideNavigation/modules/NavigationHelper",
     "sap/ushell/utils/UrlParsing"
-], function (
+], (
     ObjectPath,
     NavigationListGroup,
     NavigationListItem,
@@ -28,7 +28,7 @@ sap.ui.define([
     Container,
     NavigationHelper,
     UrlParsing
-) {
+) => {
     "use strict";
 
     /**
@@ -68,7 +68,6 @@ sap.ui.define([
          */
         #oNavigationHelper;
 
-
         /**
          * Model to maintain the expanded state of the navigation list items.
          * @type {sap.ui.model.json.JSONModel}
@@ -235,13 +234,13 @@ sap.ui.define([
         #hasSpaceIdAndPageId (oSideNavigationEntry, sSpaceId, sPageId, sAppIdHint) {
             const aParameters = ObjectPath.get("target.parameters", oSideNavigationEntry) || [];
 
-            const bSpaceIdFound = aParameters.some(function (oParameter) {
+            const bSpaceIdFound = aParameters.some((oParameter) => {
                 return oParameter.name === "spaceId" && oParameter.value === sSpaceId;
             });
-            const bPageIdFound = aParameters.some(function (oParameter) {
+            const bPageIdFound = aParameters.some((oParameter) => {
                 return oParameter.name === "pageId" && oParameter.value === sPageId;
             });
-            const bAppIdHintFound = aParameters.some(function (oParameter) {
+            const bAppIdHintFound = aParameters.some((oParameter) => {
                 return oParameter.name === "sap-ui-app-id-hint" && oParameter.value === sAppIdHint;
             });
             const bNoPageAndNoApp = !sPageId && !sAppIdHint;

package/src/main/js/sap/ushell/components/shell/SideNavigation/modules/SpacesNavigationListProvider.js

@@ -5,12 +5,12 @@ sap.ui.define([
     "sap/ui/model/Filter",
     "sap/ui/model/FilterOperator",
     "sap/ushell/components/shell/SideNavigation/modules/Spaces"
-], function (
+], (
     NavigationList,
     Filter,
     FilterOperator,
     Spaces
-) {
+) => {
     "use strict";
 
     /**
@@ -67,7 +67,6 @@ sap.ui.define([
                 this.oRootItem.bindAggregation("items", oBindingInfo);
                 return this.oSpaces;
             });
-
         }
 
         /**

package/src/main/js/sap/ushell/components/shell/UserActionsMenu/Component.js

@@ -3,18 +3,18 @@ sap.ui.define([
     "sap/ui/core/EventBus",
     "sap/ui/core/UIComponent",
     "sap/ushell/components/shell/UserActionsMenu/UserActionsMenu.controller"
-], function (
+], (
     EventBus,
     UIComponent,
     UserActionsMenuController
-) {
+) => {
     "use strict";
 
     // UserActionsMenu Component
     return UIComponent.extend("sap.ushell.components.shell.UserActionsMenu.Component", {
 
         metadata: {
-            version: "1.138.1",
+            version: "1.139.0",
             library: "sap.ushell",
             dependencies: {
                 libs: ["sap.m"]
@@ -34,5 +34,4 @@ sap.ui.define([
             this.oUserActionsMenuController.onExit();
         }
     });
-
 });