@sapui5/sap.ushell 1.138.1 → 1.139.1

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

@@ -2,6 +2,7 @@
 sap.ui.define([
     "sap/ui/Device",
     "sap/ui/core/Element",
+    "sap/ui/core/EventBus",
     "sap/ui/core/mvc/Controller",
     "sap/ui/model/json/JSONModel",
     "sap/ui/thirdparty/hasher",
@@ -14,11 +15,13 @@ sap.ui.define([
     "sap/ushell/gen/ui5/webcomponents/dist/Button",
     "sap/ushell/state/BindingHelper",
     "sap/ushell/state/modules/BackNavigation",
+    "sap/ushell/state/ShellModel",
     "sap/ushell/ui/shell/ShellAppTitle",
     "sap/ushell/utils"
-], function (
+], (
     Device,
     Element,
+    EventBus,
     Controller,
     JSONModel,
     hasher,
@@ -31,9 +34,10 @@ sap.ui.define([
     _Button, // Needed to be able to synchronously load the webcomponent inside the ushell/renderer/Renderer and PostLoadingHeaderEnhancment/Component
     BindingHelper,
     BackNavigation,
+    ShellModel,
     ShellAppTitle,
     ushellUtils
-) {
+) => {
     "use strict";
 
     const _aReservedHeadEndItems = [
@@ -74,6 +78,7 @@ sap.ui.define([
             this._updateHomeUri(Config.last("/core/shellHeader/homeUri"));
 
             this.getView().setModel(this.getConfigurationModel(), "config");
+            this.getView().setModel(ShellModel.getConfigModel(), "shellConfig");
 
             this.prepareShellAppTitle();
             this._aDoables.push(EventHub.on("navigateBack").do(this.pressNavBackButton.bind(this)));
@@ -128,16 +133,39 @@ sap.ui.define([
         },
 
         onSearchButtonClick: function (oEvent) {
+            // Ensure that the event is also fired again if the search was not yet loaded, so we listen to the event once.
+            EventBus.getInstance().subscribeOnce("shell", "searchCompLoaded", () => {
+                this.getOwnerComponent().fireSearchButtonPress(oEvent);
+            });
+            // Used in the old CEP Search to open the search field
             this.getOwnerComponent().fireSearchButtonPress(oEvent);
         },
 
-        onSearchFieldToggle: function (oEvent) {
-            const sStateName = oEvent.getParameter("expanded") ? "EXP_S" : "COL";
-            this.getOwnerComponent().setSearchState(sStateName);
+        _delegateHeadEndItemClick: function (sItemId) {
+            // delegate the click to the actual button, with this it can also be replaced with a custom control
+            const aHeadEndItems = ShellModel.getModel().getProperty("/header/headEndItems");
+            const sItemIdUpperCase = sItemId.toUpperCase();
+
+            const sButtonId = aHeadEndItems.find((sItem) => sItem.toUpperCase() === sItemIdUpperCase);
+            if (!sButtonId) {
+                return;
+            }
+
+            const oButton = Element.getElementById(sButtonId);
+            if (!oButton) {
+                return;
+            }
+
+            if (typeof oButton.firePress === "function") {
+                oButton.firePress();
+            } else if (typeof oButton.fireClick === "function") {
+                oButton.fireClick();
+            }
         },
 
         onProfileClick: function () {
-            EventHub.emit("showUserActionsMenu", Date.now());
+            // delegate the click to the actual button, with this it can also be replaced with a custom control
+            return this._delegateHeadEndItemClick("USERACTIONSMENUHEADERBUTTON");
         },
 
         isHeadEndItem: function (sItemId) {
@@ -172,7 +200,8 @@ sap.ui.define([
         },
 
         onNotificationsClick: function () {
-            EventHub.emit("showNotifications", Date.now());
+            // delegate the click to the actual button, with this it can also be replaced with a custom control
+            return this._delegateHeadEndItemClick("NOTIFICATIONSCOUNTBUTTON");
         },
 
         hasProducts: function (aHeadEndItems) {
@@ -180,17 +209,8 @@ sap.ui.define([
         },
 
         onProductSwitchClick: function () {
-            EventHub.emit("showProducts", Date.now());
-        },
-
-        onLogoClick: function () {
-            Container.getServiceAsync("Navigation").then((oNavigation) => {
-                oNavigation.navigate({
-                    target: {
-                        shellHash: this.getOwnerComponent().getModel().getProperty("/logo/homeUri")
-                    }
-                });
-            });
+            // delegate the click to the actual button, with this it can also be replaced with a custom control
+            return this._delegateHeadEndItemClick("PRODUCTSWITCHBTN");
         },
 
         prepareShellAppTitle: function () {
@@ -203,13 +223,13 @@ sap.ui.define([
                 text: "{shellModel>/application/title}",
                 title: "{shellModel>/application/title}",
                 icon: "{shellModel>/application/icon}",
-                subTitle: "{shellModel>/header/secondTitle}"
+                subTitle: "{shellModel>/application/subTitle}"
             });
             // set the ShellAppTitle to be the last thing to be hidden when screen gets small
             oShellAppTitle.data("hide-order", "9999", true);
             this.getOwnerComponent().setAppTitle(oShellAppTitle);
-            Container.getRendererInternal("fiori2").addHeaderEndItem({id: oShellAppTitle.getId()}, true, false);
-            Container.getRendererInternal("fiori2").addHeaderEndItem({id: oShellBarSpacer.getId()}, true, false);
+            Container.getRendererInternal("fiori2").addHeaderEndItem({ id: oShellAppTitle.getId() }, true, false);
+            Container.getRendererInternal("fiori2").addHeaderEndItem({ id: oShellBarSpacer.getId() }, true, false);
         },
 
         _updateHomeUri: function (sHomeUri) {
@@ -225,7 +245,7 @@ sap.ui.define([
         },
 
         navigateFromShellApplicationNavigationMenu: function (sIntent) {
-            //if the target was not change, do nothing
+            // if the target was not change, do nothing
             if (hasher.getHash() !== sIntent.substr(1)) {
                 // we must make sure the view-port is centered before triggering navigation from shell-app-nav-menu
                 EventHub.emit("centerViewPort", Date.now());

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.ShellBar",
         "applicationVersion": {
-            "version": "1.138.1"
+            "version": "1.139.1"
         },
         "type": "component",
         "ach": "CA-FLP-FE-COR",

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

@@ -17,10 +17,8 @@
     <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 +55,29 @@
             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:searchField>
+            <!-- Create dummy search input for ESearch when ShellBar is enabled for the old ESH. -->
+            <!-- Make it busy to indicate that the search is not yet ready to be used. -->
+            <!-- If the Slot is empty, the Icon is missing; If the Slot content is invisible, the Icon is also missing. -->
+            <m:Input id="dummySearchInput"
+                     busy="true"
+                     busyIndicatorDelay="0"
+                     visible="{shellConfig>/searchAvailable}"/>
+        </thirdparty:searchField>
+        <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"
@@ -72,4 +86,4 @@
             />
         </thirdparty:customData>
     </thirdparty:ShellBar>
-</mvc:View>
+</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.1"
         },
         "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";
 
     /**
@@ -131,7 +131,12 @@ sap.ui.define([
                 // Is smart business visualization
                 await oVizInstance.loaded();
                 this.#getGenericTileInstance(oVizInstance.getContent())?.firePress();
-            } else if (oVisualization.targetURL) {
+            } else if (oVisualization.targetURL && oVisualization.target?.type === "URL") {
+                this.#NavigationHelper.navigate({
+                    target: { url: oVisualization.targetURL },
+                    type: "URL"
+                });
+            } else if (oVisualization.targetURL && oVisualization.target?.semanticObject && oVisualization.target?.action) {
                 this.#NavigationHelper.navigate({
                     target: { shellHash: oVisualization.targetURL },
                     type: "IBN"
@@ -241,7 +246,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 +332,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.1",
             library: "sap.ushell",
             dependencies: {
                 libs: ["sap.m"]
@@ -34,5 +34,4 @@ sap.ui.define([
             this.oUserActionsMenuController.onExit();
         }
     });
-
 });