@sapui5/sap.ushell 1.138.1 → 1.139.0

package/src/main/js/sap/ushell/components/shell/Settings/userLanguageRegion/LanguageRegionSelector.controller.js

@@ -11,7 +11,7 @@ sap.ui.define([
     "sap/ui/performance/Measurement",
     "sap/ushell/Config",
     "sap/ushell/Container"
-], function (
+], (
     Log,
     Formatting,
     Locale,
@@ -22,26 +22,25 @@ sap.ui.define([
     Measurement,
     Config,
     Container
-) {
+) => {
     "use strict";
 
     return Controller.extend("sap.ushell.components.shell.Settings.userLanguageRegion.LanguageRegionSelector", {
         onInit: function () {
             this.oUserInfoServicePromise = Container.getServiceAsync("UserInfo");
             this.oUserInfoServicePromise
-                .then(function (UserInfo) {
+                .then((UserInfo) => {
                     this.oUser = Container.getUser();
 
-                    var oLocale = new Locale(Formatting.getLanguageTag());
-                    var oLocaleData = LocaleData.getInstance(oLocale);
-                    var sDatePattern, sTimePattern, sTimeFormat, sNumberFormat, sCalendarWeekNumbering;
+                    const oLocale = new Locale(Formatting.getLanguageTag());
+                    const oLocaleData = LocaleData.getInstance(oLocale);
+                    let sDatePattern; let sTimePattern; let sTimeFormat; let sNumberFormat; let sCalendarWeekNumbering;
 
+                    const bIsEnableSetLanguage = Container.getRendererInternal("fiori2").getShellConfig().enableSetLanguage || false;
+                    const bIsLanguagePersonalized = this.oUser.isLanguagePersonalized();
+                    const bIsEnableSetUserPreference = UserInfo.getUserSettingListEditSupported();// Check if adapter supports user setting editing
 
-                    var bIsEnableSetLanguage = Container.getRendererInternal("fiori2").getShellConfig().enableSetLanguage || false;
-                    var bIsLanguagePersonalized = this.oUser.isLanguagePersonalized();
-                    var bIsEnableSetUserPreference = UserInfo.getUserSettingListEditSupported();//Check if adapter supports user setting editing
-
-                    var aUserPreferenceAndLanguageSettingPromises = [];
+                    const aUserPreferenceAndLanguageSettingPromises = [];
 
                     // todo: ABAP specific code should be moved to ushell_abap
                     // Some preferences are managed by CUA (Central User Administration) and should not be set by the user in FLP settings
@@ -70,7 +69,7 @@ sap.ui.define([
                         sCalendarWeekNumbering = "Default";
                     }
 
-                    var oModel = new JSONModel({
+                    const oModel = new JSONModel({
                         languageList: null,
                         DateFormatList: null,
                         TimeFormatList: null,
@@ -98,17 +97,16 @@ sap.ui.define([
                     }
                     if (aUserPreferenceAndLanguageSettingPromises.length > 0) {
                         this.getView().setBusy(true);
-                        return Promise.all(aUserPreferenceAndLanguageSettingPromises).then(function (aResults) {
-                            var oUserSettingList = bIsEnableSetUserPreference ? aResults[0] : null;
-                            var aLanguageList = null;
+                        return Promise.all(aUserPreferenceAndLanguageSettingPromises).then((aResults) => {
+                            const oUserSettingList = bIsEnableSetUserPreference ? aResults[0] : null;
+                            let aLanguageList = null;
                             if (bIsEnableSetLanguage) {
                                 aLanguageList = aResults.length === 1 ? aResults[0] : aResults[1];
                             }
 
-
                             if (aLanguageList?.length > 1) {
                                 oModel.setProperty("/languageList", aLanguageList);
-                                var bHasDefault = aLanguageList.some(function (oLanguage) {
+                                const bHasDefault = aLanguageList.some((oLanguage) => {
                                     return oLanguage.key === "default";
                                 });
                                 if (!bIsLanguagePersonalized && bHasDefault) {
@@ -122,9 +120,9 @@ sap.ui.define([
                                 oModel.setProperty("/DateFormatList", oUserSettingList.DATE_FORMAT);
                             }
                             if (oUserSettingList?.TIME_ZONE?.length > 0) {
-                                var oDateTimeWithTimezone = DateFormat.getDateTimeWithTimezoneInstance({showDate: false, showTime: false});
-                                var aTimeZones = oUserSettingList.TIME_ZONE.map(function (timeZone) {
-                                    var sTimeZomeText = oDateTimeWithTimezone.format(null, timeZone.description) || timeZone.description;
+                                const oDateTimeWithTimezone = DateFormat.getDateTimeWithTimezoneInstance({showDate: false, showTime: false});
+                                const aTimeZones = oUserSettingList.TIME_ZONE.map((timeZone) => {
+                                    const sTimeZomeText = oDateTimeWithTimezone.format(null, timeZone.description) || timeZone.description;
                                     return {description: sTimeZomeText, value: timeZone.value};
                                 });
                                 oModel.setProperty("/TimeZoneList", aTimeZones);
@@ -133,8 +131,8 @@ sap.ui.define([
                                 oModel.setProperty("/NumberFormatList", oUserSettingList.NUMBER_FORMAT);
                             }
                             if (oUserSettingList?.CALENDAR_WEEK_NUMBERING) {
-                                var aCalendarWeekList = UserInfo.getCalendarWeekNumberingList()
-                                    .map(/* updateSelectedNumbering*/ (numbering) => {
+                                const aCalendarWeekList = UserInfo.getCalendarWeekNumberingList()
+                                    .map(/* updateSelectedNumbering */ (numbering) => {
                                         numbering.selected = numbering.value === oModel.getProperty("/selectedCalendarWeekNumbering");
                                         return numbering;
                                     });
@@ -146,10 +144,10 @@ sap.ui.define([
 
                             this.oView.setModel(oModel);
                             this.getView().setBusy(false);
-                        }.bind(this));
+                        });
                     }
                     this.oView.setModel(oModel);
-                }.bind(this));
+                });
         },
 
         /**
@@ -160,15 +158,15 @@ sap.ui.define([
         _loadLanguagesList: function () {
             Measurement.start("FLP:LanguageRegionSelector._getLanguagesList", "_getLanguagesList", "FLP");
             return this.oUserInfoServicePromise
-                .then(function (UserInfo) {
-                    return new Promise(function (resolve) {
+                .then((UserInfo) => {
+                    return new Promise((resolve) => {
                         Measurement.start("FLP:LanguageRegionSelector._getLanguagesList", "_getLanguagesList", "FLP");
                         UserInfo.getLanguageList()
-                            .done(function (oData) {
+                            .done((oData) => {
                                 Measurement.end("FLP:LanguageRegionSelector._getLanguagesList");
                                 resolve(oData);
                             })
-                            .fail(function (error) {
+                            .fail((error) => {
                                 Measurement.end("FLP:LanguageRegionSelector._getLanguagesList");
                                 Log.error("Failed to load language list.", error,
                                     "sap.ushell.components.ushell.settings.userLanguageRegion.LanguageRegionSelector.controller");
@@ -186,11 +184,11 @@ sap.ui.define([
         _loadUserSettingList: function () {
             Measurement.start("FLP:LanguageRegionSelector._loadUserSettingList", "_loadUserSettingList", "FLP");
             return this.oUserInfoServicePromise
-                .then(function (UserInfo) {
-                    return new Promise(function (resolve) {
+                .then((UserInfo) => {
+                    return new Promise((resolve) => {
                         Measurement.start("FLP:LanguageRegionSelector._loadUserSettingList", "_loadUserSettingList", "FLP");
                         UserInfo.getUserSettingList()
-                            .then(function (oData) {
+                            .then((oData) => {
                                 Measurement.end("FLP:LanguageRegionSelector._loadUserSettingList");
                                 resolve(oData);
                             });
@@ -199,21 +197,21 @@ sap.ui.define([
         },
 
         _resetLanguage: function () {
-            var oUserLanguage = this.oUser.getLanguage(),
-                oModel = this.getView().getModel(),
-                oModelData = oModel.getData();
+            const oUserLanguage = this.oUser.getLanguage();
+            const oModel = this.getView().getModel();
+            const oModelData = oModel.getData();
             // if the user language isn't personalzied - need to return browser language in select
-            var sSelectedLanguage = oModelData.isLanguagePersonalized ? oUserLanguage : "default";
+            const sSelectedLanguage = oModelData.isLanguagePersonalized ? oUserLanguage : "default";
             oModel.setProperty("/selectedLanguage", sSelectedLanguage);
-            //Date and time format are taken from current language
+            // Date and time format are taken from current language
             this._updateTextFields(oUserLanguage);
         },
 
         onCancel: function () {
-            var oModel = this.getView().getModel(),
-                oModelData = oModel.getData(),
-                aLanguageList = oModelData.languageList,
-                isEnableSetLanguage = oModelData.isEnableSetLanguage;
+            const oModel = this.getView().getModel();
+            const oModelData = oModel.getData();
+            const aLanguageList = oModelData.languageList;
+            const isEnableSetLanguage = oModelData.isEnableSetLanguage;
             if (isEnableSetLanguage && aLanguageList) {
                 this._resetLanguage();
             }
@@ -222,7 +220,7 @@ sap.ui.define([
             }
         },
         onSaveSuccess: function (oUser, bUpdateLanguage, sSelectedLanguage) {
-            var oResolvedResult = {
+            const oResolvedResult = {
                 refresh: true
             };
             oUser.resetChangedProperty("dateFormat");
@@ -236,7 +234,7 @@ sap.ui.define([
                 oResolvedResult.obsoleteUrlParams = ["sap-language"];
                 oResolvedResult.clearSapUserContextCookie = true; // Language related content in `sap-usercontext` cookie is invalid now.
             }
-            return oResolvedResult; //refresh the page to apply changes.
+            return oResolvedResult; // refresh the page to apply changes.
         },
 
         /**
@@ -247,22 +245,22 @@ sap.ui.define([
          * @private
          */
         onSave: function (fnUpdateUserPreferences) {
-            var oUser = this.oUser,
-                oModelData = this.getView().getModel().getData(),
-                sSelectedLanguage = oModelData.selectedLanguage,
-                sOriginLanguage = oUser.getLanguage(),
-                bLanguageChanged = sSelectedLanguage && sSelectedLanguage !== (oModelData.isLanguagePersonalized ? sOriginLanguage : "default"),
-                bIsEnableSetUserProfileSetting = oModelData.isEnableUserProfileSetting,
-                bUpdateLanguage = oModelData.isEnableSetLanguage && oModelData.languageList && bLanguageChanged,
-                bUpdate = false,
-                aPropertyNames = [
-                    "DATE_FORMAT",
-                    "TIME_FORMAT",
-                    "NUMBER_FORMAT",
-                    "TIME_ZONE",
-                    "LANGUAGE",
-                    "CALENDAR_WEEK_NUMBERING"
-                ];
+            const oUser = this.oUser;
+            const oModelData = this.getView().getModel().getData();
+            const sSelectedLanguage = oModelData.selectedLanguage;
+            const sOriginLanguage = oUser.getLanguage();
+            const bLanguageChanged = sSelectedLanguage && sSelectedLanguage !== (oModelData.isLanguagePersonalized ? sOriginLanguage : "default");
+            const bIsEnableSetUserProfileSetting = oModelData.isEnableUserProfileSetting;
+            const bUpdateLanguage = oModelData.isEnableSetLanguage && oModelData.languageList && bLanguageChanged;
+            let bUpdate = false;
+            const aPropertyNames = [
+                "DATE_FORMAT",
+                "TIME_FORMAT",
+                "NUMBER_FORMAT",
+                "TIME_ZONE",
+                "LANGUAGE",
+                "CALENDAR_WEEK_NUMBERING"
+            ];
             Log.debug("[000] LanguageRegionSelector:onSave:bUpdateLanguage, bIsEnableSetUserProfileSetting:", bUpdateLanguage, "LanguageRegionSelector.controller");
             if (bUpdateLanguage) {
                 Log.debug("[000] LanguageRegionSelector:onSave:UserInfo: oUser.setLanguage:", sSelectedLanguage, "LanguageRegionSelector.controller");
@@ -314,14 +312,14 @@ sap.ui.define([
             }
             if (bUpdateLanguage || bUpdate) {
                 return fnUpdateUserPreferences()
-                    .then(function () {
+                    .then(() => {
                         Log.debug("[000] onSave:fnUpdateUserPreferences", "LanguageRegionSelector.controller");
                         return this.onSaveSuccess(oUser, bUpdateLanguage, sSelectedLanguage);
-                    }.bind(this))
+                    })
                     // in case of failure - return to the original language
-                    .catch(function (errorMessage) {
+                    .catch((errorMessage) => {
                         Log.debug("[000] onSave:catch:errorMessage", errorMessage, "LanguageRegionSelector.controller");
-                        var bSomeNamesInErrorMessage = aPropertyNames.some(function (sName) {
+                        const bSomeNamesInErrorMessage = aPropertyNames.some((sName) => {
                             return errorMessage.includes(sName);
                         });
                         if (!bSomeNamesInErrorMessage) {
@@ -338,14 +336,13 @@ sap.ui.define([
                         oUser.resetChangedProperty("timeZone");
                         oUser.resetChangedProperty("calendarWeekNumbering");
 
-
                         if (oModelData.isEnableUserProfileSetting) {
                             this._restoreUserSettingPreferenceValues();
                         }
                         Log.error("Failed to save Language and Region Settings", errorMessage,
                             "sap.ushell.components.ushell.settings.userLanguageRegion.LanguageRegionSelector.controller");
                         throw errorMessage;
-                    }.bind(this));
+                    });
             }
             return Promise.resolve();
         },
@@ -355,15 +352,15 @@ sap.ui.define([
          * @private
          */
         _restoreUserSettingPreferenceValues: function () {
-            var oModel = this.getView().getModel();
+            const oModel = this.getView().getModel();
             oModel.setProperty("/selectedDatePattern", Formatting.getABAPDateFormat());
             oModel.setProperty("/selectedTimeFormat", Formatting.getABAPTimeFormat());
             oModel.setProperty("/selectedNumberFormat", this._getABAPNumberFormat());
             oModel.setProperty("/selectedTimeZone", this.oUser.getTimeZone());
             oModel.setProperty("/selectedCalendarWeekNumbering", Formatting.getCalendarWeekNumbering());
             // restore calendar week numbering
-            var aCalendarWeekList = oModel.getProperty("/CalendarWeekNumberingList")
-                .map(/* updateSelectedNumberingWithSavedValue*/ (numbering) => {
+            const aCalendarWeekList = oModel.getProperty("/CalendarWeekNumberingList")
+                .map(/* updateSelectedNumberingWithSavedValue */ (numbering) => {
                     numbering.selected = numbering.value === Formatting.getCalendarWeekNumbering();
                     return numbering;
                 });
@@ -371,17 +368,15 @@ sap.ui.define([
                 "/CalendarWeekNumberingList",
                 aCalendarWeekList
             );
-
         },
 
-
         /**
          * This method call handle the change in the selection language
          * @param {string} oEvent control event
          * @private
          */
         _handleLanguageSelectChange: function (oEvent) {
-            var sSelectedLanguage = oEvent.getSource().getSelectedKey();
+            const sSelectedLanguage = oEvent.getSource().getSelectedKey();
             if (sSelectedLanguage) {
                 this._updateTextFields(sSelectedLanguage);
             }
@@ -393,7 +388,7 @@ sap.ui.define([
          * @private
          */
         _updateTextFields: function (language) {
-            var oLocale;
+            let oLocale;
 
             if (language === this.oUser.getLanguage()) {
                 oLocale = new Locale(Formatting.getLanguageTag());
@@ -401,11 +396,11 @@ sap.ui.define([
                 oLocale = new Locale(language);
             }
 
-            var oModel = this.getView().getModel(),
-                oLocaleData = LocaleData.getInstance(oLocale),
-                sDatePattern = oLocaleData.getDatePattern("medium"),
-                sTimePattern = oLocaleData.getTimePattern("medium"),
-                sTimeFormat = (sTimePattern.indexOf("H") === -1) ? "12h" : "24h";
+            const oModel = this.getView().getModel();
+            const oLocaleData = LocaleData.getInstance(oLocale);
+            const sDatePattern = oLocaleData.getDatePattern("medium");
+            const sTimePattern = oLocaleData.getTimePattern("medium");
+            const sTimeFormat = (sTimePattern.indexOf("H") === -1) ? "12h" : "24h";
             if (!oModel.getData().isEnableUserProfileSetting) {
                 oModel.setProperty("/selectedDatePattern", sDatePattern);
                 oModel.setProperty("/selectedTimeFormat", sTimeFormat);
@@ -422,7 +417,7 @@ sap.ui.define([
          * @private
          */
         _getABAPNumberFormat: function () {
-            var sABAPNumberFormat = Formatting.getABAPNumberFormat();
+            const sABAPNumberFormat = Formatting.getABAPNumberFormat();
             if (sABAPNumberFormat) {
                 return sABAPNumberFormat.trim();
             }
@@ -435,7 +430,7 @@ sap.ui.define([
          * @private
          */
         _handleCalendarWeekNumberingChange: function (oEvent) {
-            var sSelectedItem = oEvent.getSource().getSelectedItem().getCustomData()[0].getValue();
+            const sSelectedItem = oEvent.getSource().getSelectedItem().getCustomData()[0].getValue();
             this.getView().getModel().setProperty("/selectedCalendarWeekNumbering", sSelectedItem);
         }
     });

package/src/main/js/sap/ushell/components/shell/Settings/userLanguageRegion/UserLanguageRegionEntry.js

@@ -5,18 +5,18 @@ sap.ui.define([
     "sap/ui/core/mvc/XMLView",
     "sap/ushell/resources",
     "sap/ushell/Container"
-], function (
+], (
     Log,
     XMLView,
     ushellResources,
     Container
-) {
+) => {
     "use strict";
 
     function getEntry () {
-        var oViewInstance;
+        let oViewInstance;
 
-        var oEntry = {
+        const oEntry = {
             id: "language",
             entryHelpID: "language",
             title: ushellResources.i18n.getText("languageAndRegionTit"),
@@ -24,7 +24,7 @@ sap.ui.define([
             contentResult: null,
             icon: "sap-icon://globe",
             valueArgument: function () {
-                var sUserLanguage = Container.getUser().getLanguageText();
+                let sUserLanguage = Container.getUser().getLanguageText();
                 if (sUserLanguage.indexOf("-") > -1) {
                     sUserLanguage = sUserLanguage.replace("-", " (").concat(")");
                 }
@@ -34,11 +34,11 @@ sap.ui.define([
                 return XMLView.create({
                     id: "languageRegionSelector",
                     viewName: "sap.ushell.components.shell.Settings.userLanguageRegion.LanguageRegionSelector"
-                }).then(function (oView) {
-                    var oViewController = oView.getController();
+                }).then((oView) => {
+                    const oViewController = oView.getController();
                     oViewInstance = oView;
                     return oViewController.oUserInfoServicePromise
-                        .then(function () {
+                        .then(() => {
                             return oViewInstance;
                         });
                 });

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

@@ -4,12 +4,15 @@ sap.ui.define([
     "sap/ui/core/UIComponent",
     "sap/ui/Device",
     "sap/ui/model/json/JSONModel",
-    "sap/ushell/renderer/ShellLayout"
-], function (
+    "sap/ushell/renderer/ShellLayout",
+    "sap/ushell/utils"
+], (
     UIComponent,
     Device,
     JSONModel,
-    ShellLayout) {
+    ShellLayout,
+    ushellUtils
+) => {
     "use strict";
 
     const sSearchOverlayCSS = "sapUshellShellShowSearchOverlay";
@@ -47,6 +50,7 @@ sap.ui.define([
                     show: false
                 }
             });
+
             this.setModel(oModel);
             this.FLPRangeSet = {
                 name: "Ushell",
@@ -62,35 +66,38 @@ sap.ui.define([
 
             // handle initial state of the side content
             const bInitialValue = ShellLayout.hasAdjacentSideContentBeforeMain();
-            this._applySideContent(bInitialValue);
+            ushellUtils.applySideContent.call(this, bInitialValue);
 
             // attach event handler for side content changes
-            ShellLayout.attachAdjacentSideContentBeforeMainChanged(this._handleSideContent, this);
-        },
-
-        _handleSideContent: function (oEvent) {
-            const oParameters = oEvent.getParameters();
-            const bHasAdjacentContentBefore = oParameters.hasAdjacentContentBefore;
-            this._applySideContent(bHasAdjacentContentBefore);
-        },
-
-        _applySideContent: function (bHasAdjacentContentBefore) {
-            this.rootControlLoaded().then((oView) => {
-                oView.toggleStyleClass("sapUshellFixedPadding", bHasAdjacentContentBefore);
-            });
+            ShellLayout.attachAdjacentSideContentBeforeMainChanged(ushellUtils.handleSideContent.bind(this), this);
         },
 
+        /**
+         * Sets the search control in the shell bar. Used by both the Enterprise Search and the CEP Search.
+         * @param {object} oSearchField The search field to be set in the shell bar's search Field slot.
+         * @private
+         */
         setSearch: function (oSearchField) {
             this.rootControlLoaded().then((oView) => {
+                // removes the dummy input in the searchField slot for ESearch case when the search is being init by the SearchShellHelper
+                oView.byId("dummySearchInput")?.destroy();
                 oView.byId("shellBar").addSearchField(oSearchField);
             });
         },
 
-        setSearchState: function (sStateName, maxRemSize, bWithOverlay) {
+        /**
+         * Sets the search state of the shell bar.
+         * @param {string} sStateName The name of the search state to set.
+         * Valid values are "COL" (collapsed), "EXP" (expanded), and "EXP_S" (expanded with search field).
+         * @param {int} iMaxRemSize The maximum size in rem for the search field when expanded.
+         * @param {boolean} bWithOverlay If true, the search overlay will be shown when the search state is set to expanded.
+         * @private
+         */
+        setSearchState: function (sStateName, iMaxRemSize, bWithOverlay) {
             if (SearchState[sStateName] && this.getSearchState() !== sStateName) {
-                if (typeof maxRemSize === "boolean") {
-                    bWithOverlay = maxRemSize;
-                    maxRemSize = undefined;
+                if (typeof iMaxRemSize === "boolean") {
+                    bWithOverlay = iMaxRemSize;
+                    iMaxRemSize = undefined;
                 }
 
                 this.setProperty("searchState", sStateName, false);
@@ -100,7 +107,7 @@ sap.ui.define([
                 document.body.classList.toggle(sSearchOverlayCSS, bShow && bWithOverlay);
 
                 // save for animation after rendering
-                _iSearchWidth = bShow ? maxRemSize || 35 : 0;
+                _iSearchWidth = bShow ? iMaxRemSize || 35 : 0;
             }
         },
 
@@ -142,7 +149,7 @@ sap.ui.define([
         },
 
         exit: function () {
-            ShellLayout.detachAdjacentSideContentBeforeMainChanged(this._handleSideContent, this);
+            ShellLayout.detachAdjacentSideContentBeforeMainChanged(ushellUtils.handleSideContent.bind(this), this);
         }
     });
 });

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

@@ -14,9 +14,10 @@ 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,
     Controller,
@@ -31,9 +32,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 = [
@@ -131,13 +133,31 @@ sap.ui.define([
             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 +192,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 +201,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 +215,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 +237,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.0"
         },
         "type": "component",
         "ach": "CA-FLP-FE-COR",