@sapui5/sap.ushell 1.136.3 → 1.136.5

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.contentFinder",
         "applicationVersion": {
-            "version": "1.136.3"
+            "version": "1.136.5"
         },
         "i18n": "./resources/resources.properties",
         "ach": "CA-FLP-FE-UI",

package/src/main/js/sap/ushell/components/contentFinderStandalone/Component.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview ContentFinder standalone Component
  *
- * @version 1.136.3
+ * @version 1.136.5
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/contentFinderStandalone/controller/ContentFinderStandalone.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Controller for ContentFinderDialog standalone root view
- * @version 1.136.3
+ * @version 1.136.5
  */
 sap.ui.define([
     "sap/ui/core/mvc/Controller",

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.contentFinderStandalone",
         "applicationVersion": {
-            "version": "1.136.3"
+            "version": "1.136.5"
         },
         "i18n": "./resources/resources.properties",
         "ach": "CA-FLP-FE-UI",

package/src/main/js/sap/ushell/components/factsheet/Component.js

@@ -17,7 +17,7 @@ sap.ui.define([
 
         // use inline declaration instead of component.json to save 1 round trip
         metadata: {
-            version: "1.136.3",
+            version: "1.136.5",
             library: "sap.ushell",
             dependencies: {
                 libs: ["sap.m", "sap.ui.vbm", "sap.suite.ui.commons", "sap.ui.layout", "sap.viz"],

package/src/main/js/sap/ushell/components/homepage/ActionMode.js

@@ -20,7 +20,7 @@
  *  - Deactivation handler
  *  - Rendering tile action menu
  *
- * @version 1.136.3
+ * @version 1.136.5
  *
  * @deprecated since 1.112
  */

package/src/main/js/sap/ushell/components/homepage/DashboardContent.view.js

@@ -5,7 +5,7 @@
  * with a header of type <code>sap.ushell.ui.launchpad.AnchorNavigationBar</code>
  * and content of type <code>sap.ushell.ui.launchpad.DashboardGroupsContainer</code>.
  *
- * @version 1.136.3
+ * @version 1.136.5
  *
  * @deprecated since 1.112
  * @private
@@ -283,7 +283,16 @@ sap.ui.define([
          * @since 1.86.0
          */
         _createActionModeButtonInHeader: function (oActionButtonObjectData) {
-            sap.ui.require(["sap/ushell/ui/shell/ShellHeadItem"], function (ShellHeadItem) {
+            var sRequirePath = "sap/ushell/ui/shell/ShellHeadItem";
+            if (Config.last("/core/shellBar/enabled")) {
+                sRequirePath = "sap/ushell/gen/ui5/webcomponents-fiori/dist/ShellBarItem";
+                if (oActionButtonObjectData.press) {
+                    oActionButtonObjectData.click = oActionButtonObjectData.press;
+                    delete oActionButtonObjectData.press; // remove press handler, since it is not used in ShellBarItem
+                }
+            }
+
+            sap.ui.require([sRequirePath], (ShellHeadItem) => {
                 this.oTileActionsButton = new ShellHeadItem(oActionButtonObjectData);
                 if (Config.last("/core/extension/enableHelp")) {
                     this.oTileActionsButton.addStyleClass("help-id-ActionModeBtn"); // xRay help ID
@@ -293,7 +302,7 @@ sap.ui.define([
                 } else {
                     this.oRenderer.showHeaderEndItem(this.oTileActionsButton.getId(), false, ["home"]);
                 }
-            }.bind(this));
+            });
         },
 
         /**

package/src/main/js/sap/ushell/components/homepage/DashboardGroupsBox.js

@@ -6,7 +6,7 @@
  * Exposes the public function <code>createGroupsBox</code>
  * @see sap.ushell.components.homepage.DashboardContent.view
  *
- * @version 1.136.3
+ * @version 1.136.5
  * @since 1.35.0
  *
  * @deprecated since 1.112

package/src/main/js/sap/ushell/components/homepage/DashboardUIActions.js

@@ -5,7 +5,7 @@
  * Extends <code>sap.ui.base.Object</code><br>
  * Exposes the public function <code>initializeUIActions</code>
  *
- * @version 1.136.3
+ * @version 1.136.5
  * @since 1.35.0
  *
  * @deprecated since 1.112

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

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

package/src/main/js/sap/ushell/components/pages/ActionMode.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview ActionMode for the PageRuntime view
  *
- * @version 1.136.3
+ * @version 1.136.5
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/pages/Component.js

@@ -5,7 +5,7 @@
  * #Shell-home or #Launchpad-openFLPPage if spaces are enabled (/core/spaces/enabled).
  * In the future it should completely replace the classical homepage.
  *
- * @version 1.136.3
+ * @version 1.136.5
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/pages/MyHomeImport.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview MyHome migrate functionality for the PageRuntime view
  *
- * @version 1.136.3
+ * @version 1.136.5
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/pages/controller/PageRuntime.controller.js

@@ -2,11 +2,12 @@
 
 /**
  * @file PageRuntime controller for PageRuntime view
- * @version 1.136.3
+ * @version 1.136.5
  */
 sap.ui.define([
     "sap/ui/core/Element",
     "sap/ui/core/EventBus",
+    "sap/ui/core/CustomData",
     "sap/ushell/library",
     "sap/ui/core/mvc/Controller",
     "sap/ui/events/KeyCodes",
@@ -35,6 +36,7 @@ sap.ui.define([
 ], function (
     Element,
     EventBus,
+    CustomData,
     ushellLibrary,
     Controller,
     KeyCodes,
@@ -1188,7 +1190,7 @@ sap.ui.define([
          * @private
          * @since 1.86.0
          */
-        _createActionModeButton: function (sPageTitle) {
+        _createActionModeButton: async function (sPageTitle) {
             var sButtonText = sPageTitle ? resources.i18n.getText("PageRuntime.EditModeForPage.Activate", [sPageTitle])
                 : resources.i18n.getText("PageRuntime.EditMode.Activate");
             var oActionButtonObjectData = {
@@ -1200,7 +1202,7 @@ sap.ui.define([
             Log.debug("cep/editMode: create Action Mode Button", "Page runtime");
             if (this._moveEditActionToHeader()) {
                 oActionButtonObjectData.tooltip = sButtonText;
-                this._createHeaderActionModeButton(oActionButtonObjectData);
+                await this._createHeaderActionModeButton(oActionButtonObjectData);
             } else {
                 this._createUserActionModeButton(oActionButtonObjectData);
             }
@@ -1214,16 +1216,30 @@ sap.ui.define([
          * @private
          * @since 1.86.0
          */
-        _createHeaderActionModeButton: function (oActionButtonObjectData) {
-            sap.ui.require(["sap/ushell/ui/shell/ShellHeadItem"], function (ShellHeadItem) {
-                var oActionsButton = new ShellHeadItem(oActionButtonObjectData);
-                if (Config.last("/core/extension/enableHelp")) {
-                    oActionsButton.addStyleClass("help-id-ActionModeBtn"); // xRay help ID
+        _createHeaderActionModeButton: async function (oActionButtonObjectData) {
+            var sRequirePath = "sap/ushell/ui/shell/ShellHeadItem";
+            if (Config.last("/core/shellBar/enabled")) {
+                sRequirePath = "sap/ushell/gen/ui5/webcomponents-fiori/dist/ShellBarItem";
+                if (oActionButtonObjectData.press) {
+                    oActionButtonObjectData.click = oActionButtonObjectData.press;
+                    delete oActionButtonObjectData.press; // remove press handler, since it is not used in ShellBarItem
                 }
-                var oRenderer = Container.getRendererInternal("fiori2");
-                var oStateInfo = this._getStateInfoActionModeButton();
-                oRenderer.showHeaderEndItem(oActionsButton.getId(), oStateInfo.bCurrentState, oStateInfo.aStates);
-            }.bind(this));
+            }
+
+            const [ShellHeadItem] = await ushellUtils.requireAsync([sRequirePath]);
+
+            const oActionsButton = new ShellHeadItem(oActionButtonObjectData);
+            if (Config.last("/core/extension/enableHelp")) {
+                oActionsButton.addStyleClass("help-id-ActionModeBtn"); // xRay help ID
+                oActionsButton.addCustomData(new CustomData({
+                    key: "help-id",
+                    value: "ActionModeBtn",
+                    writeToDom: true
+                }));
+            }
+            var oRenderer = Container.getRendererInternal("fiori2");
+            var oStateInfo = this._getStateInfoActionModeButton();
+            oRenderer.showHeaderEndItem(oActionsButton.getId(), oStateInfo.bCurrentState, oStateInfo.aStates);
         },
 
         /**

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

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

package/src/main/js/sap/ushell/components/runtimeSwitcher/controller/RuntimeSwitcher.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file RuntimeSwitcher's controller for RuntimeSwitcher's view
- * @version 1.136.3
+ * @version 1.136.5
  */
 sap.ui.define([
     "sap/ui/core/mvc/Controller",

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.runtimeSwitcher",
         "applicationVersion": {
-            "version": "1.136.3"
+            "version": "1.136.5"
         },
         "ach": "CA-FLP-FE-COR",
         "type": "component",

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.FloatingContainer",
         "applicationVersion": {
-            "version": "1.136.3"
+            "version": "1.136.5"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.MenuBar",
         "applicationVersion": {
-            "version": "1.136.3"
+            "version": "1.136.5"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",

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

@@ -4,7 +4,7 @@
  * @fileOverview Controller for the NavigationBarMenu Popover. It is responsible for Popover handling, model binding, persistence
  * logic to pin, unpin and rearrange pinned spaces as well as executing navigation.
  *
- * @version 1.136.3
+ * @version 1.136.5
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/components/shell/NavigationBarMenu/controller/NavigationBarMenuButton.controller.js

@@ -4,7 +4,7 @@
  * @fileOverview Controller for the NavigationBarMenu Popover. It is responsible for Popover handling, model binding, persistence
  * logic to pin, unpin and rearrange pinned spaces as well as executing navigation.
  *
- * @version 1.136.3
+ * @version 1.136.5
  * @private
  */
 sap.ui.define([

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.NavigationBarMenu",
         "applicationVersion": {
-            "version": "1.136.3"
+            "version": "1.136.5"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",

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

@@ -62,7 +62,7 @@ sap.ui.define([
 
     return UIComponent.extend("sap.ushell.components.shell.Notifications.Component", {
         metadata: {
-            version: "1.136.3",
+            version: "1.136.5",
             library: "sap.ushell.components.shell.Notifications",
             dependencies: {
                 libs: ["sap.m"]

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

@@ -15,6 +15,7 @@ sap.ui.define([
     "sap/ushell/state/ShellModel",
     "sap/ushell/state/StateManager",
     "sap/ushell/Container",
+    "sap/ushell/utils",
     "sap/ushell/utils/UrlParsing"
 ], function (
     Localization,
@@ -31,6 +32,7 @@ sap.ui.define([
     ShellModel,
     StateManager,
     Container,
+    ushellUtils,
     UrlParsing
 ) {
     "use strict";
@@ -64,19 +66,24 @@ sap.ui.define([
             library: "sap.ushell"
         },
         init: function () {
+            this._aInitPromises = [];
             var oShellConfig = Container.getRendererInternal("fiori2").getShellConfig();
 
-            aCreatedControlIds.push(this._createBackButton());
+            this._aInitPromises.push(this._createBackButton().then((sBtnId) => {
+                aCreatedControlIds.push(sBtnId);
+            }));
             aCreatedControlIds.push(this._createOverflowButton());
 
             if (oShellConfig.moveAppFinderActionToShellHeader && Config.last("/core/catalog/enabled") && !oShellConfig.disableAppFinder) {
-                aCreatedControlIds.push(this._createAppFinderButton());
+                this._aInitPromises.push(this._createAppFinderButton().then((sBtnId) => {
+                    aCreatedControlIds.push(sBtnId);
+                }));
             }
 
             if (oShellConfig.moveContactSupportActionToShellHeader) {
-                this._createSupportButton().then(function (sBtnId) {
+                this._aInitPromises.push(this._createSupportButton().then((sBtnId) => {
                     aCreatedControlIds.push(sBtnId);
-                });
+                }));
             }
 
             this._createShellNavigationMenu();
@@ -84,14 +91,16 @@ sap.ui.define([
             var oShellHeader = Element.getElementById("shell-header");
             oShellHeader.updateAggregation("headItems");
             oShellHeader.updateAggregation("headEndItems");
+
+            this._pInitPromise = Promise.all(this._aInitPromises);
         },
 
-        _createBackButton: function () {
+        _createBackButton: async function () {
             var sBackButtonIcon = Localization.getRTL() ? "feeder-arrow" : "nav-back";
             const sCurrentShellMode = StateManager.getShellMode();
             var oBackButton;
             if (Config.last("/core/shellBar/enabled")) {
-                const Button = sap.ui.require("sap/ushell/gen/ui5/webcomponents/dist/Button");
+                const [Button] = await ushellUtils.requireAsync(["sap/ushell/gen/ui5/webcomponents/dist/Button"]);
                 oBackButton = new Button({
                     id: "backBtn",
                     tooltip: resources.i18n.getText("backBtn_tooltip"),
@@ -148,6 +157,11 @@ sap.ui.define([
         },
 
         _createOverflowButton: function () {
+            if (Config.last("/core/shellBar/enabled")) {
+                // overflow is handled by the ShellBar component
+                return;
+            }
+
             var oEndItemsOverflowBtn = new ShellHeadItem({
                 id: "endItemsOverflowBtn",
                 tooltip: {
@@ -170,8 +184,25 @@ sap.ui.define([
             return oEndItemsOverflowBtn.getId();
         },
 
-        _createAppFinderButton: function () {
-            var oOpenCatalogButton = new ShellHeadItem({
+        _createHeaderItem: async function (oSettings) {
+            if (Config.last("/core/shellBar/enabled")) {
+                const [ShellBarItem] = await ushellUtils.requireAsync(["sap/ushell/gen/ui5/webcomponents-fiori/dist/ShellBarItem"]);
+                // Create a ShellBarItem for the shell header
+                oSettings.click = oSettings.press; // web components use click instead of press
+                delete oSettings.press; // remove press to avoid confusion
+
+                oSettings.accessibilityAttributes = oSettings.accessibilityAttributes || {};
+                oSettings.accessibilityAttributes.hasPopup = oSettings.accessibilityAttributes.hasPopup ?? oSettings.ariaHaspopup;
+                delete oSettings.ariaHaspopup; // web components do not support ariaHaspopup
+                delete oSettings.ariaLabel; // web components do not support ariaLabel
+
+                return new ShellBarItem(oSettings);
+            }
+            return new ShellHeadItem(oSettings);
+        },
+
+        _createAppFinderButton: async function () {
+            var oOpenCatalogButton = await this._createHeaderItem({
                 id: "openCatalogBtn",
                 text: resources.i18n.getText("open_appFinderBtn"),
                 ariaLabel: resources.i18n.getText("open_appFinderBtn"),
@@ -198,8 +229,8 @@ sap.ui.define([
         },
 
         _createSupportButton: function () {
-            return new Promise(function (fnResolve) {
-                sap.ui.require(["sap/ushell/ui/footerbar/ContactSupportButton"], function (ContactSupportButton) {
+            return new Promise((fnResolve) => {
+                sap.ui.require(["sap/ushell/ui/footerbar/ContactSupportButton"], async (ContactSupportButton) => {
                     var sButtonName = "ContactSupportBtn";
                     var oSupportButton = Element.getElementById(sButtonName);
                     if (!oSupportButton) {
@@ -211,9 +242,9 @@ sap.ui.define([
                             visible: true
                         });
 
-                        var sIcon = oTempButton.getIcon();
-                        var sText = oTempButton.getText();
-                        oSupportButton = new ShellHeadItem({
+                        const sIcon = oTempButton.getIcon();
+                        const sText = oTempButton.getText();
+                        oSupportButton = await this._createHeaderItem({
                             id: sButtonName,
                             icon: sIcon,
                             tooltip: sText,

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

@@ -41,7 +41,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.ProductSwitch.Component", {
 
         metadata: {
-            version: "1.136.3",
+            version: "1.136.5",
             library: "sap.ushell.components.shell.ProductSwitch",
             dependencies: {
                 libs: {

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

@@ -4,7 +4,7 @@
         "id": "sap.ushell.components.shell.Search",
 
         "applicationVersion": {
-            "version": "1.136.3"
+            "version": "1.136.5"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",

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

@@ -31,7 +31,7 @@ sap.ui.define([
 
     return UIComponent.extend("sap.ushell.components.shell.SearchCEP.Component", {
         metadata: {
-            version: "1.136.3",
+            version: "1.136.5",
             library: ["sap.ushell", "sap.ushell.components.shell"],
             dependencies: {
                 libs: ["sap.m"]

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/FrequentActivityProvider.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview
- * @version 1.136.3
+ * @version 1.136.5
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/RecentSearchProvider.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview
- * @version 1.136.3
+ * @version 1.136.5
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/SearchProvider.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module is the search provider main interface
- * @version 1.136.3
+ * @version 1.136.5
  */
 sap.ui.define([
     "sap/ushell/resources",

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/SearchServiceProvider.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module handles the navigation service search actions
- * @version 1.136.3
+ * @version 1.136.5
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -33,7 +33,7 @@ sap.ui.define([
     NotificationsEntry,
     UserDefaultsEntry,
     ShellHeadItem,
-    Utils,
+    ushellUtils,
     Container,
     StateManager
 ) {
@@ -47,7 +47,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.Settings.Component", {
 
         metadata: {
-            version: "1.136.3",
+            version: "1.136.5",
             library: "sap.ushell",
             dependencies: {
                 libs: {
@@ -66,10 +66,13 @@ sap.ui.define([
          */
         init: function () {
             UIComponent.prototype.init.apply(this, arguments);
+            this._aInitPromises = [];
             var oShellConfig = Container.getRendererInternal("fiori2").getShellConfig();
 
             if (oShellConfig.moveUserSettingsActionToShellHeader) {
-                this.oSettingsBtn = this._addUserSettingsButton();
+                this._aInitPromises.push(this._addUserSettingsButton().then((oUserSettingsButton) => {
+                    this.oSettingsBtn = oUserSettingsButton;
+                }));
             }
 
             this._addStandardEntityToConfig(); // Standard entities
@@ -79,6 +82,8 @@ sap.ui.define([
             }
 
             aDoables.push(EventHub.on("openUserSettings").do(this._openUserSettings.bind(this)));
+
+            this._pInitPromise = Promise.all(this._aInitPromises);
         },
 
         _updateUserPreferencesEntries: function (aEntities) {
@@ -131,7 +136,7 @@ sap.ui.define([
                                     if (!isActive) {
                                         return;
                                     }
-                                    Utils.setPerformanceMark("FLP -- search setting entry is set active");
+                                    ushellUtils.setPerformanceMark("FLP -- search setting entry is set active");
                                     aEntities = Config.last("/core/userPreferences/entries");
                                     aEntities.push(searchEntry);
                                     this._updateUserPreferencesEntries(aEntities);
@@ -202,14 +207,29 @@ sap.ui.define([
          *
          * @returns {sap.ushell.ui.shell.ShellHeadItem} settings button
          */
-        _addUserSettingsButton: function () {
-            var oUserSettingsButton = new ShellHeadItem({
-                id: "userSettingsBtn",
-                icon: "sap-icon://action-settings",
-                text: resources.i18n.getText("userSettings"),
-                ariaHaspopup: "dialog",
-                press: this._openUserSettings.bind(this)
-            });
+        _addUserSettingsButton: async function () {
+            let oUserSettingsButton;
+            if (Config.last("/core/shellBar/enabled")) {
+                const [ShellBarItem] = await ushellUtils.requireAsync(["sap/ushell/gen/ui5/webcomponents-fiori/dist/ShellBarItem"]);
+                oUserSettingsButton = new ShellBarItem({
+                    id: "userSettingsBtn",
+                    icon: "sap-icon://action-settings",
+                    text: resources.i18n.getText("userSettings"),
+                    accessibilityAttributes: {
+                        hasPopup: "dialog"
+                    },
+                    click: this._openUserSettings.bind(this)
+                });
+            } else {
+                oUserSettingsButton = new ShellHeadItem({
+                    id: "userSettingsBtn",
+                    icon: "sap-icon://action-settings",
+                    text: resources.i18n.getText("userSettings"),
+                    ariaHaspopup: "dialog",
+                    press: this._openUserSettings.bind(this)
+                });
+            }
+
 
             // Add to userActions. The actual move happens within the state management
             StateManager.updateAllBaseStates("userActions.items", Operation.Add, oUserSettingsButton.getId());

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

@@ -191,16 +191,6 @@ sap.ui.define([
             EventHub.emit("showProducts", Date.now());
         },
 
-        onLogoClick: function () {
-            Container.getServiceAsync("Navigation").then((oNavigation) => {
-                oNavigation.navigate({
-                    target: {
-                        shellHash: this.getOwnerComponent().getModel().getProperty("/logo/homeUri")
-                    }
-                });
-            });
-        },
-
         prepareLogo: function () {
             const oModel = this.getOwnerComponent().getModel();
             this.getCustomLogoAltText();
@@ -219,7 +209,7 @@ 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);
@@ -245,7 +235,7 @@ sap.ui.define([
                 name: "sapUiGlobalLogo",
                 callback: () => {
                     // When no Logo can be retrieved yet, null is returned by ThemingParameters.get() - and a rerender is triggered.
-                    this.getOwnerComponent.invalidate();
+                    this.getOwnerComponent().invalidate();
                 }
             });