@sapui5/sap.ushell 1.140.0 → 1.141.0

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

@@ -332,8 +332,8 @@ sap.ui.define([
 
                             return valueResult.displayText;
                         })
-                        .catch((error) => {
-                            Log.error(`Can not load value for ${sEntryTitle} entry`, error);
+                        .catch((oError) => {
+                            Log.error(`Can not load value for ${sEntryTitle} entry`, oError);
                             return resources.i18n.getText("loadingErrorMessage");
                         });
                 })
@@ -647,6 +647,7 @@ sap.ui.define([
         _navToDetail: function (sId, oView) {
             const oSplitApp = oView.byId("settingsApp");
 
+            oSplitApp.getCurrentDetailPage().setBusy(false);
             oSplitApp.toDetail(sId);
             oSplitApp.getCurrentDetailPage().setBusy(false);
             if (oSplitApp.getMode() === "ShowHideMode") {
@@ -839,30 +840,30 @@ sap.ui.define([
                 return params || {};
             }
 
-            function onError (errorInformation) {
-                Log.debug("[000] _onError: errorInformation", JSON.stringify(errorInformation), "UserSettings.controller");
+            function onError (vError) {
+                Log.debug("[000] _onError: errorInformation", JSON.stringify(vError), "UserSettings.controller");
                 let sMessage;
                 const sEntryId = oEntry.id;
                 const sEntryTitle = oEntry.title;
 
-                if (!errorInformation) {
+                if (!vError) {
                     sMessage = resources.i18n.getText("userSettings.SavingError.Undefined");
-                } else if (typeof (errorInformation) === "string") {
-                    sMessage = errorInformation;
-                } else if (Array.isArray(errorInformation)) {
-                    errorInformation.forEach((message) => {
+                } else if (typeof (vError) === "string") {
+                    sMessage = vError;
+                } else if (Array.isArray(vError)) {
+                    vError.forEach((message) => {
                         message.setAdditionalText(sEntryTitle);
                         message.setTechnicalDetails({ pluginId: sEntryId });
                         ErrorMessageHelper.addMessage(message);
                     });
                     return;
-                } else if (BaseObject.isObjectA(errorInformation, "sap.ui.core.message.Message")) {
-                    errorInformation.setAdditionalText(sEntryTitle);
-                    errorInformation.setTechnicalDetails({ pluginId: sEntryId });
-                    ErrorMessageHelper.addMessage(errorInformation);
+                } else if (BaseObject.isObjectA(vError, "sap.ui.core.message.Message")) {
+                    vError.setAdditionalText(sEntryTitle);
+                    vError.setTechnicalDetails({ pluginId: sEntryId });
+                    ErrorMessageHelper.addMessage(vError);
                     return;
                 } else {
-                    sMessage = resources.i18n.getText("userSettings.SavingError.WithMessage", [errorInformation.message]);
+                    sMessage = resources.i18n.getText("userSettings.SavingError.WithMessage", [vError.message]);
                 }
 
                 ErrorMessageHelper.addMessage(new Message({
@@ -880,8 +881,8 @@ sap.ui.define([
                 Log.debug(`[000] onSave: oEntry.id: ${oEntry.id}`, "UserSettings.controller");
                 this._isExecuteEntrySavedInUserSettingsController = true;
                 onSavePromise = oEntry.onSave(this.updateUserPreferences.bind(this));
-            } catch (error) {
-                return onError(error);
+            } catch (vError) {
+                return onError(vError);
             }
 
             // jQuery promise
@@ -894,8 +895,8 @@ sap.ui.define([
                             .done((params) => {
                                 resolve(onSuccess(params));
                             })
-                            .fail((sErrorMessage) => {
-                                resolve(onError(sErrorMessage));
+                            .fail((oError) => {
+                                resolve(onError(oError));
                             });
                     });
                 } else {
@@ -937,8 +938,8 @@ sap.ui.define([
                     if (oInvokedEntities[oEntry.id] && oEntry.onCancel) {
                         try {
                             oEntry.onCancel();
-                        } catch (error) {
-                            Log.error("Failed to cancel the following entries", error);
+                        } catch (vError) {
+                            Log.error("Failed to cancel the following entries", vError);
                         }
                     }
                 });

package/src/main/js/sap/ushell/components/shell/Settings/appearance/Appearance.controller.js

@@ -18,7 +18,8 @@ sap.ui.define([
     "sap/ushell/resources",
     "sap/ushell/User",
     "sap/ushell/services/DarkModeSupport",
-    "sap/ushell/Container"
+    "sap/ushell/Container",
+    "sap/ushell/utils/LaunchpadError"
 ], (
     Log,
     BaseObject,
@@ -37,7 +38,8 @@ sap.ui.define([
     ushellResources,
     User,
     DarkModeSupport,
-    Container
+    Container,
+    LaunchpadError
 ) => {
     "use strict";
 
@@ -335,13 +337,16 @@ sap.ui.define([
 
             return Promise.all(aSavePromises)
                 .then((aResults) => {
-                    const aMessages = [];
-                    aResults.forEach((sResult) => {
-                        if (sResult && BaseObject.isObjectA(sResult, "sap.ui.core.message.Message")) {
-                            aMessages.push(sResult);
+                    const aMessages = aResults.reduce((aMessages, vResult) => {
+                        if (vResult && BaseObject.isObjectA(vResult, "sap.ui.core.message.Message")) {
+                            aMessages.push(vResult);
                         }
-                    });
-                    return (aMessages.length > 0) ? Promise.reject(aMessages) : Promise.resolve();
+                        return aMessages;
+                    }, []);
+
+                    if (aMessages.length > 0) {
+                        return Promise.reject(aMessages);
+                    }
                 });
         },
 
@@ -397,18 +402,18 @@ sap.ui.define([
                     .then(() => {
                         return this.onSaveThemesSuccess(oUser);
                     })
-                    .catch((sErrorMessage) => {
-                        if (!sErrorMessage.includes("THEME")) {
+                    .catch((oError) => {
+                        if (!oError.message.includes("THEME")) {
                             return this.onSaveThemesSuccess(oUser);
                         }
                         oUser.setTheme(sOriginalThemeId);
                         oUser.resetChangedProperty("theme");
                         oUser.setThemeSet(sOriginalSetId);
                         oUser.resetChangedProperty("themeSet");
-                        Log.error("Can not save selected theme", sErrorMessage);
+                        Log.error("Can not save selected theme", oError);
                         throw new Message({
                             type: MessageType.Error,
-                            description: sErrorMessage
+                            description: oError.message
                         });
                     });
             }
@@ -446,16 +451,16 @@ sap.ui.define([
                     .then(() => {
                         return this._onSaveContentDensitySuccess(sNewContentDensity);
                     })
-                    .catch((sErrorMessage) => {
-                        if (!sErrorMessage.includes("CONTENT_DENSITY")) {
+                    .catch((oError) => {
+                        if (!oError.message.includes("CONTENT_DENSITY")) {
                             return this._onSaveContentDensitySuccess();
                         }
                         oUser.setContentDensity(sUserContentDensity);
                         oUser.resetChangedProperty("contentDensity");
-                        Log.error("Can not save content density configuration", sErrorMessage);
+                        Log.error("Can not save content density configuration", oError);
                         throw new Message({
                             type: MessageType.Error,
-                            message: sErrorMessage
+                            message: oError.message
                         });
                     });
             }
@@ -469,7 +474,7 @@ sap.ui.define([
             if (sNewSizeBehavior && sNewSizeBehavior !== sCurrentSizeBehavior && oConfigModel.getProperty("/sizeBehaviorConfigurable")) {
                 return new Promise((resolve, reject) => {
                     this.writeToPersonalization("flp.settings.FlpSettings", "sizeBehavior", sNewSizeBehavior)
-                        .done(() => {
+                        .then(() => {
                             Config.emit("/core/home/sizeBehavior", sNewSizeBehavior);
                             // todo move to other place?
                             const aTiles = document.getElementsByClassName(".sapUshellTile");
@@ -478,15 +483,26 @@ sap.ui.define([
                             }
                             resolve();
                         })
-                        .fail((sErrorMessage, parsedErrorInformation) => {
-                            Log.error("Cannot save tile size configuration", sErrorMessage);
-                            const oMessage = new Message({
-                                type: MessageType.Error,
-                                description: sErrorMessage,
-                                message: parsedErrorInformation.message.value,
-                                date: parsedErrorInformation.innererror.timestamp,
-                                httpStatus: parsedErrorInformation.httpStatus
-                            });
+                        .catch((oError) => {
+                            Log.error("Cannot save tile size configuration", oError);
+
+                            let oMessage;
+                            if (oError instanceof LaunchpadError) {
+                                oMessage = new Message({
+                                    type: MessageType.Error,
+                                    description: oError.message,
+                                    message: oError.details?.message.value,
+                                    date: oError.details?.innererror.timestamp,
+                                    httpStatus: oError.details?.httpStatus
+                                });
+                            } else {
+                                oMessage = new Message({
+                                    type: MessageType.Error,
+                                    description: oError.message,
+                                    message: oError.message
+                                });
+                            }
+
                             reject(oMessage);
                         });
                 });
@@ -513,15 +529,15 @@ sap.ui.define([
                     .then(() => {
                         return this.onSaveDarkModeEnabledSuccess(oUser, sNewDarkModeEnabled);
                     })
-                    .catch((sErrorMessage) => {
-                        if (!sErrorMessage.includes("THEME_DARKMODE_AUTO_DETECTION")) {
+                    .catch((oError) => {
+                        if (!oError.message.includes("THEME_DARKMODE_AUTO_DETECTION")) {
                             return this.onSaveDarkModeEnabledSuccess(oUser, sNewDarkModeEnabled);
                         }
                         oUser.setDetectDarkMode(sOldDarkModeEnabled);
                         oUser.resetChangedProperty("detectDarkMode");
-                        Log.error("Can not save dark mode configuration", sErrorMessage);
+                        Log.error("Can not save dark mode configuration", oError);
                         throw new Message({
-                            message: sErrorMessage
+                            message: oError.message
                         });
                     });
             }
@@ -536,19 +552,30 @@ sap.ui.define([
             }
             return new Promise((resolve, reject) => {
                 this.writeToPersonalization("flp.settings.FlpSettings", "showContentProviderInfoOnVisualizations", bCurrentValue)
-                    .done(() => {
+                    .then(() => {
                         Config.emit("/core/contentProviders/providerInfo/showContentProviderInfoOnVisualizations", bCurrentValue);
                         resolve();
                     })
-                    .fail((sErrorMessage, parsedErrorInformation) => {
-                        Log.error("Cannot save system info on tiles configuration", sErrorMessage);
-                        const oMessage = new Message({
-                            type: MessageType.Error,
-                            description: sErrorMessage,
-                            message: parsedErrorInformation.message.value,
-                            date: parsedErrorInformation.innererror.timestamp,
-                            httpStatus: parsedErrorInformation.httpStatus
-                        });
+                    .catch((oError) => {
+                        Log.error("Cannot save system info on tiles configuration", oError);
+
+                        let oMessage;
+                        if (oError instanceof LaunchpadError) {
+                            oMessage = new Message({
+                                type: MessageType.Error,
+                                description: oError.message,
+                                message: oError.details?.message.value,
+                                date: oError.details?.innererror.timestamp,
+                                httpStatus: oError.details?.httpStatus
+                            });
+                        } else {
+                            oMessage = new Message({
+                                type: MessageType.Error,
+                                description: oError.message,
+                                message: oError.message
+                            });
+                        }
+
                         reject(oMessage);
                     });
             });
@@ -564,14 +591,14 @@ sap.ui.define([
          * @returns {Promise} Resolves once the personalization data is written. Rejected if the service fails in doing so.
          */
         writeToPersonalization: function (sContainer, sItem, vValue) {
-            return jQuery.when(
-                this.getPersonalizer(sContainer, sItem).then((oPersonalizer) => {
+            return this.getPersonalizer(sContainer, sItem)
+                .then((oPersonalizer) => {
                     return oPersonalizer.setPersData(vValue);
                 })
-            ).catch((oError) => {
-                Log.error("Personalization service does not work:");
-                Log.error(`${oError.name}: ${oError.message}`);
-            });
+                .catch((oError) => {
+                    Log.error("Personalization service does not work:", oError);
+                    throw oError;
+                });
         },
 
         /**
@@ -581,31 +608,27 @@ sap.ui.define([
          * @param {string} sItem The item ID.
          * @returns {Promise<object>} Resolves with a new or cached Personalizer instance.
          */
-        getPersonalizer: function (sContainer, sItem) {
+        getPersonalizer: async function (sContainer, sItem) {
             const sKey = `${sContainer}-${sItem}`;
 
-            if (this.oPersonalizers[sKey]) {
-                return Promise.resolve(this.oPersonalizers[sKey]);
-            }
-
-            return Container.getServiceAsync("Personalization")
-                .then((oPersonalizationService) => {
-                    const oComponent = Component.getOwnerComponentFor(this.getView());
-                    const oScope = {
-                        keyCategory: oPersonalizationService.constants.keyCategory.FIXED_KEY,
-                        writeFrequency: oPersonalizationService.constants.writeFrequency.LOW,
-                        clientStorageAllowed: true
-                    };
-
-                    if (!this.oPersonalizers[sKey]) {
-                        this.oPersonalizers[sKey] = oPersonalizationService.getPersonalizer({
+            if (!this.oPersonalizers[sKey]) {
+                this.oPersonalizers[sKey] = Container.getServiceAsync("PersonalizationV2")
+                    .then((oPersonalizationService) => {
+                        const oComponent = Component.getOwnerComponentFor(this.getView());
+                        const oScope = {
+                            keyCategory: oPersonalizationService.constants.keyCategory.FIXED_KEY,
+                            writeFrequency: oPersonalizationService.constants.writeFrequency.LOW,
+                            clientStorageAllowed: true
+                        };
+
+                        return oPersonalizationService.getPersonalizer({
                             container: sContainer,
                             item: sItem
                         }, oScope, oComponent);
-                    }
+                    });
+            }
 
-                    return this.oPersonalizers[sKey];
-                });
+            return this.oPersonalizers[sKey];
         },
 
         // applies dark mode after the user has selected a new theme

package/src/main/js/sap/ushell/components/shell/Settings/homepage/HomepageEntry.js

@@ -60,10 +60,10 @@ sap.ui.define([
 
                             return oViewInstance;
                         })
-                        .catch((error) => {
-                            Log.error("Failed to get effective hompage setting.", error,
+                        .catch((oError) => {
+                            Log.error("Failed to get effective hompage setting.", oError,
                                 "sap.ushell.components.ushell.settings.homepage.HomepageEntry");
-                            return Promise.reject();
+                            throw oError;
                         });
                 },
                 onSave: function () {
@@ -80,11 +80,11 @@ sap.ui.define([
                             .then(() => {
                                 Config.emit("/core/home/homePageGroupDisplay", sDisplay);
                             })
-                            .catch((error) => {
+                            .catch((oError) => {
                                 // Log failure if occurs.
-                                Log.error("Failed to save the anchor bar mode in personalization", error,
+                                Log.error("Failed to save the anchor bar mode in personalization", oError,
                                     "sap.ushell.components.ushell.settings.homepage.HomepageEntry");
-                                return Promise.reject(error);
+                                throw oError;
                             });
                     }
                     Log.warning("Save operation for user account settings was not executed, because the homepage view was not initialized");

package/src/main/js/sap/ushell/components/shell/Settings/notifications/NotificationsSetting.controller.js

@@ -114,11 +114,11 @@ sap.ui.define([
             aSettingsToSave.forEach((setting) => {
                 aSaveDeferres.push(this._oNotificationService.saveSettingsEntry(setting));
             });
-            return Promise.all(aSaveDeferres).catch((error) => {
+            return Promise.all(aSaveDeferres).catch((oError) => {
                 Log.error(
-                    "Failed to save the notification settings in the notifivation service.", error,
+                    "Failed to save the notification settings in the notifivation service.", oError,
                     "sap.ushell.components.ushell.settings.notifications.NotificationsSetting");
-                throw error;
+                throw oError;
             });
         },
 

package/src/main/js/sap/ushell/components/shell/Settings/spaces/SpacesSetting.controller.js

@@ -14,7 +14,7 @@ sap.ui.define([
     EventHub,
     Config,
     resources,
-    utils,
+    ushellUtils,
     Log
 ) => {
     "use strict";
@@ -68,7 +68,7 @@ sap.ui.define([
             this.oImportBookmarksFlagListener.off();
         },
 
-        onSave: function (fnUpdateUserPreferences) {
+        onSave: async function (fnUpdateUserPreferences) {
             let bRestart = false;
             let bUpdate = false;
             const aUpdatePromises = [];
@@ -114,10 +114,10 @@ sap.ui.define([
             }
 
             if (bOldHideEmptySpaces !== bNewHideEmptySpaces) {
-                const oHideEmptySpacesPromise = utils.setHideEmptySpacesEnabled(bNewHideEmptySpaces)
-                    .catch((sErrorMessage) => {
+                const oHideEmptySpacesPromise = ushellUtils.setHideEmptySpacesEnabled(bNewHideEmptySpaces)
+                    .catch((oError) => {
                         oModel.setProperty("/hideEmptySpaces/selected", bOldHideEmptySpaces);
-                        return Promise.reject(sErrorMessage);
+                        throw oError;
                     });
                 aUpdatePromises.push(oHideEmptySpacesPromise);
             }
@@ -136,7 +136,8 @@ sap.ui.define([
                             oUser.resetChangedProperty("importBookmarks");
                             resolve();
                         })
-                        .catch((sErrorMessage) => {
+                        .catch((oError) => {
+                            const sErrorMessage = oError.message;
                             if (
                                 !sErrorMessage.includes("SPACES_ENABLEMENT")
                                 && !sErrorMessage.includes("MYHOME_ENABLEMENT")
@@ -153,7 +154,7 @@ sap.ui.define([
                                 oUser.resetChangedProperty("spacesEnabled");
                                 oUser.resetChangedProperty("showMyHome");
                                 oUser.resetChangedProperty("importBookmarks");
-                                reject(sErrorMessage);
+                                reject(oError);
                             }
                         });
                 });

package/src/main/js/sap/ushell/components/shell/Settings/userAccount/UserAccountSelector.controller.js

@@ -103,7 +103,8 @@ sap.ui.define([
                         oUser.resetChangedProperty("isImageConsent");
                         resolve();
                     });
-                    oUserPreferencesPromise.catch((sErrorMessage) => {
+                    oUserPreferencesPromise.catch((oError) => {
+                        const sErrorMessage = oError.message;
                         if (!sErrorMessage.includes("ISIMAGECONSENT")) {
                             oUser.resetChangedProperty("isImageConsent");
                             resolve();
@@ -112,8 +113,8 @@ sap.ui.define([
                             oUser.setImageConsent(bOrigUserImgConsent);
                             oUser.resetChangedProperty("isImageConsent");
                             oModel.setProperty("/isImageConsentForUser", bOrigUserImgConsent);
-                            Log.error(sErrorMessage);
-                            reject(sErrorMessage);
+                            Log.error("Failed to update user image consent", oError);
+                            reject(oError);
                         }
                     });
                 });

package/src/main/js/sap/ushell/components/shell/Settings/userActivities/UserActivitiesSetting.controller.js

@@ -69,12 +69,12 @@ sap.ui.define([
                 .then(() => {
                     Config.emit("/core/shell/model/enableTrackingActivity", enabled);
                 })
-                .catch((error) => {
+                .catch((oError) => {
                     // Log failure if occurs.
                     Log.error(
-                        "Failed to save the user activities tracking in personalization", error,
+                        "Failed to save the user activities tracking in personalization", oError,
                         "sap.ushell.components.ushell.settings.userActivities.UserActivitiesSetting");
-                    return Promise.reject(error);
+                    throw oError;
                 });
         },
 

package/src/main/js/sap/ushell/components/shell/Settings/userDefaults/controller/UserDefaultsSetting.controller.js

@@ -118,10 +118,10 @@ sap.ui.define([
                 .then(() => {
                     oView.setBusy(false);
                 })
-                .catch((err) => {
+                .catch((oError) => {
                     Log.error(
                         "Error during UserDefaultsSetting controller initialization",
-                        err,
+                        oError,
                         "sap.ushell.components.shell.Settings.userDefaults.UserDefaultsSetting"
                     );
                     oView.setBusy(false);

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

@@ -317,10 +317,10 @@ sap.ui.define([
                         return this.onSaveSuccess(oUser, bUpdateLanguage, sSelectedLanguage);
                     })
                     // in case of failure - return to the original language
-                    .catch((errorMessage) => {
-                        Log.debug("[000] onSave:catch:errorMessage", errorMessage, "LanguageRegionSelector.controller");
+                    .catch((oError) => {
+                        Log.debug("[000] onSave:catch:errorMessage", oError, "LanguageRegionSelector.controller");
                         const bSomeNamesInErrorMessage = aPropertyNames.some((sName) => {
-                            return errorMessage.includes(sName);
+                            return oError.message.includes(sName);
                         });
                         if (!bSomeNamesInErrorMessage) {
                             return this.onSaveSuccess(oUser, bUpdateLanguage, sSelectedLanguage);
@@ -339,9 +339,9 @@ sap.ui.define([
                         if (oModelData.isEnableUserProfileSetting) {
                             this._restoreUserSettingPreferenceValues();
                         }
-                        Log.error("Failed to save Language and Region Settings", errorMessage,
+                        Log.error("Failed to save Language and Region Settings", oError,
                             "sap.ushell.components.ushell.settings.userLanguageRegion.LanguageRegionSelector.controller");
-                        throw errorMessage;
+                        throw oError;
                     });
             }
             return Promise.resolve();

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

@@ -5,6 +5,8 @@ sap.ui.define([
     "sap/ui/core/UIComponent",
     "sap/ui/Device",
     "sap/ui/model/json/JSONModel",
+    "sap/ushell/Container",
+    "sap/ushell/EventHub",
     "sap/ushell/renderer/ShellLayout",
     "sap/ushell/utils"
 ], (
@@ -12,6 +14,8 @@ sap.ui.define([
     UIComponent,
     Device,
     JSONModel,
+    Container,
+    EventHub,
     ShellLayout,
     ushellUtils
 ) => {
@@ -82,8 +86,9 @@ sap.ui.define([
         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
-                Element.getElementById("dummySearchInput")?.destroy();
-                oView.byId("shellBar").addSearchField(oSearchField);
+                const oShellBar = oView.byId("shellBar");
+                oShellBar.destroySearchField();
+                oShellBar.addSearchField(oSearchField);
             });
         },
 
@@ -113,6 +118,37 @@ sap.ui.define([
             }
         },
 
+        /**
+         * Sets the focus on the Logo for AccessKeyHandling
+         */
+        setFocusToLogo: function () {
+            this.rootControlLoaded().then((oView) => {
+                oView.byId("shellBar").getBranding()[0]?.focus();
+            });
+        },
+
+        /**
+         * Sets the focus on the App Finder Button for AccessKeyHandling
+         */
+        setFocusToAppFinderButton: function () {
+            this.rootControlLoaded().then((oView) => {
+                const oConfig = Container.getRendererInternal("fiori2").getShellConfig();
+                if (oConfig.moveAppFinderActionToShellHeader) {
+                    Element.getElementById("openCatalogBtn")?.focus();
+                } else {
+                    EventHub.emit("showUserActionsMenu", Date.now());
+                    window.setTimeout(() => {
+                        const aMenuItems = Element.getElementById("sapUshellUserActionsMenuPopover").getMenuItems();
+                        aMenuItems.forEach((item) => {
+                            if (item.getId().includes("openCatalogBtn")) {
+                                item.focus();
+                            }
+                        });
+                    }, 300);
+                }
+            });
+        },
+
         isPhoneState: function () {
             const deviceType = Device.media.getCurrentRange(Device.media.RANGESETS.SAP_STANDARD).name;
             const bEnoughSpaceForSearch = this.getDomRef().getBoundingClientRect().width > this.getSearchWidth();
@@ -153,6 +189,8 @@ sap.ui.define([
             oComponentContainer.isExtraLargeState = this.isExtraLargeState.bind(this);
             oComponentContainer.getNotificationsBtnDomRef = this.getNotificationsBtnDomRef.bind(this);
             oComponentContainer.getProductSwitchDomRef = this.getProductSwitchDomRef.bind(this);
+            oComponentContainer.setFocusToLogo = this.setFocusToLogo.bind(this);
+            oComponentContainer.setFocusToAppFinderButton = this.setFocusToAppFinderButton.bind(this);
         },
 
         exit: function () {

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",
@@ -20,6 +21,7 @@ sap.ui.define([
 ], (
     Device,
     Element,
+    EventBus,
     Controller,
     JSONModel,
     hasher,
@@ -76,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)));
@@ -130,6 +133,10 @@ 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);
             // Used in the new CEP Search to trigger the search event in case the WC is inside the overflow on small screens

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.140.0"
+            "version": "1.141.0"
         },
         "type": "component",
         "ach": "CA-FLP-FE-COR",