@sapui5/sap.ushell 1.139.0 → 1.140.0

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

@@ -1,6 +1,8 @@
 // Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 
 sap.ui.define([
+    "sap/m/Input",
+    "sap/ui/core/Element",
     "sap/ui/core/EventBus",
     "sap/ushell/components/shell/Search/ESearch",
     "sap/ui/core/UIComponent",
@@ -9,7 +11,7 @@ sap.ui.define([
     "sap/ushell/utils",
     "sap/base/util/ObjectPath",
     "sap/ushell/Container"
-], (EventBus, ESearch, UIComponent, Component, Config, Utils, ObjectPath, Container) => {
+], (Input, Element, EventBus, ESearch, UIComponent, Component, Config, Utils, ObjectPath, Container) => {
     "use strict";
 
     return UIComponent.extend("sap.ushell.components.shell.Search.Component", {
@@ -45,6 +47,17 @@ sap.ui.define([
                         });
                     }
                 } else {
+                    // create dummy search input for ESearch when ShellBar is enabled
+                    if (Config.last("/core/shellBar/enabled")) {
+                        const oDummySearchInput = new Input({
+                            id: "dummySearchInput"
+                        });
+
+                        const oShellHeaderContainer = Element.getElementById("shell-header");
+                        const oShellBarComponent = oShellHeaderContainer?.getComponentInstance()?.getRootControl()?.byId("shellBar");
+                        oShellBarComponent?.addSearchField(oDummySearchInput);
+                    }
+
                     ESearch.createContent(that);
                     EventBus.getInstance().publish("shell", "searchCompLoaded", { delay: 0 });
                 }

package/src/main/js/sap/ushell/components/shell/Search/ESearch.js

@@ -10,7 +10,15 @@ sap.ui.define([
     "sap/ushell/renderer/search/util",
     "sap/ushell/Container",
     "sap/ushell/Config"
-], (Element, Library, resources, IconPool, HashChanger, jQuery, util, Container, Config) => {
+], (Element,
+    Library,
+    resources,
+    IconPool,
+    HashChanger,
+    jQuery,
+    util,
+    Container,
+    Config) => {
     "use strict";
 
     let bDoExit = false;

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

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

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

@@ -33,7 +33,7 @@ sap.ui.define([
 
     return UIComponent.extend("sap.ushell.components.shell.SearchCEP.Component", {
         metadata: {
-            version: "1.139.0",
+            version: "1.140.0",
             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.139.0
+ * @version 1.140.0
  */
 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.139.0
+ * @version 1.140.0
  */
 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.139.0
+ * @version 1.140.0
  */
 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.139.0
+ * @version 1.140.0
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -1,37 +1,46 @@
 // Copyright (c) 2009-2025 SAP SE, All Rights Reserved
-
+/**
+ * @fileOverview Search CEP Component for the SAP Fiori Launchpad based on UI5 Web Component ShellBarSearch.
+ * @since 1.140.0
+ **/
 sap.ui.define([
     "sap/ui/core/Element",
     "sap/ui/core/Component",
     "sap/base/Log",
     "sap/ushell/resources",
-    "sap/ushell/utils",
     "sap/ushell/Container",
     "sap/ushell/EventHub",
     "sap/ushell/components/shell/SearchCEPNew/SearchProviders/SearchProvider",
+    "sap/ushell/gen/ui5/webcomponents-fiori/dist/IllustratedMessage",
     "sap/ushell/gen/ui5/webcomponents-fiori/dist/ShellBarSearch",
     "sap/ushell/gen/ui5/webcomponents-fiori/dist/SearchItem",
     "sap/ushell/gen/ui5/webcomponents-fiori/dist/SearchItemGroup",
     "sap/ushell/gen/ui5/webcomponents-fiori/dist/SearchMessageArea",
     "sap/ushell/gen/ui5/webcomponents/dist/Button",
     "sap/ui/model/json/JSONModel",
-    "sap/base/util/deepEqual"
+    "sap/ui/thirdparty/hasher",
+    "sap/ushell/api/performance/Extension",
+    "sap/ushell/utils",
+    "sap/ushell/api/performance/NavigationSource"
 ], (
     Element,
     Component,
     Log,
     resources,
-    ushellUtils,
     Container,
     EventHub,
     SearchProvider,
+    IllustratedMessage,
     ShellBarSearch,
     SearchItem,
     SearchItemGroup,
     SearchMessageArea,
     Button,
     JSONModel,
-    deepEqual
+    hasher,
+    Extension,
+    ushellUtils,
+    NavigationSource
 ) => {
     "use strict";
 
@@ -53,7 +62,7 @@ sap.ui.define([
         searchProviderMap: {
             RecentSearchesList: "recentSearches",
             AppsList: "applications",
-            //evaluate whether to change to FrequentlyUsedItemsList (including products)
+            // evaluate whether to change to FrequentlyUsedItemsList (including products)
             FrequentlyUsedAppsList: "frequentApplications",
             ProductsList: "products",
             ExternalSearchAppsList: "externalSearchApplications"
@@ -76,12 +85,19 @@ sap.ui.define([
 
             this._bIsMyHome = Container.getFLPPlatform(true) === "MYHOME";
 
-            this.oShellHeader = Element.getElementById("shell-header");
-
+            this._oShellHeader = Element.getElementById("shell-header");
             this._initSearchField();
             this._registerDefaultProviders();
+            this._registerHandleHashChange();
+
+            if (this._oShellHeader.isLargeState() || this._oShellHeader.isExtraLargeState()) {
+                this._fetchSuggestions();
+                this._toggleSearchFieldInput(true);
+            }
+
             this._aDoables = [];
-            this._listenToEvents();
+            this._aDoables.push(EventHub.on("updateExtProviderLists").do(this._updateExtProviderLists.bind(this, this._oSearchCEPService)));
+            this._oExtension = new Extension();
         },
 
         /**
@@ -91,10 +107,9 @@ sap.ui.define([
         _initSearchField: function () {
             try {
                 this._oSearchField = new ShellBarSearch({
-                    id: "cepSearchNewInBarJS",
+                    id: "newCEPShellBarSearch",
                     placeholder: resources.i18n.getText("searchAppTitle"),
-                    tooltip: "{i18n>search}",
-                    open: false,
+                    autoOpen: true,
                     showClearIcon: true
                 });
                 this._oSearchField.setModel(this._oResultModel, "searchResults");
@@ -103,19 +118,13 @@ sap.ui.define([
                     factory: this._searchItemGroupFactory.bind(this)
                 });
 
-                this._oSearchField.addMessageArea(new SearchMessageArea({
-                    id: "searchMessageArea",
-                    text: "Message area text placeholder w.o. i18n",
-                    description: "Search for example “All my open Objects”",
-                    visible: true
-                }));
                 this._attachSearchEventHandlers();
-                this.oShellHeader = Element.getElementById("shell-header");
-                this.oShellHeader.setSearch(this._oSearchField);
+                this._oShellHeader.setSearch(this._oSearchField);
             } catch (error) {
                 Log.error("Failed to create CEP search field content", error);
             }
         },
+
         /**
          * Attach all relevant event handlers to the search field
          * @private
@@ -125,6 +134,15 @@ sap.ui.define([
             this._oSearchField.attachInput(this._onInputChange.bind(this));
         },
 
+        /**
+         * Detach all attached event handlers to the search field
+         * @private
+         */
+        _detachSearchEventHandlers: function () {
+            this._oSearchField.detachSearch(this._onSearch.bind(this));
+            this._oSearchField.detachInput(this._onInputChange.bind(this));
+        },
+
         /**
          * Factory for creating search item groups for the search field.
          * @param {string} sId The ID for the search item group.
@@ -144,11 +162,7 @@ sap.ui.define([
                         text: "{searchResults>text}",
                         icon: "{searchResults>icon}",
                         description: "{searchResults>contentProviderLabel}",
-                        delete: (oEvent) => {
-                            // TODO Handle delete action for the item through UserRecents service and recents Activity - add onDelete there
-                            // Removing the item from the shellbarsearch items aggregation only temporarily removes it
-                            oEvent.getSource().getParent().removeItem(oEvent.getSource());
-                        }
+                        deletable: false
                     })
                 }
             });
@@ -166,15 +180,7 @@ sap.ui.define([
         },
 
         /**
-         * Listens to events from the EventHub to update search providers and handle search state changes.
-         * @private
-         * */
-        _listenToEvents: function () {
-            this._aDoables.push(EventHub.on("updateExtProviderLists").do(this._updateExtProviderLists.bind(this, this._oSearchCEPService)));
-        },
-
-        /**
-         * Debounced handler for input changes in the search field.
+         * Debounced handler for input changes in the search field. Waits for 100ms before fetching suggestions.
          * @private
          */
         _onInputChange: function () {
@@ -197,8 +203,9 @@ sap.ui.define([
                     const iQueryLength = (sQuery || "").trim().length;
 
                     if (iQueryLength >= oProvider.minQueryLength && iQueryLength <= oProvider.maxQueryLength) {
-                        return oProvider.execSearch(sQuery, this._getDefaultProviderGroupName(oProvider.id));
+                        return oProvider.execSearch(sQuery, this.searchProviderMap[oProvider.id]);
                     }
+
                     return Promise.resolve([]);
                 });
                 const aSearchResults = await Promise.all(aProviderSearchPromises);
@@ -215,50 +222,68 @@ sap.ui.define([
          * @private
          */
         _updateSearchResults: function (aSearchResults, aProviders) {
-            const aAllResults = aSearchResults.map((aGroupResult, idx) => {
-                return {
-                    headerText: aProviders[idx].title,
-                    items: aGroupResult
-                };
-            });
-            this._oResultModel.setProperty("/allResults", aAllResults);
-
-            const aCountRelevantProviders = ["Applications", "Home Page Applications", "Products"];
-            this._oResultModel.setProperty("/resultCount", aAllResults.reduce((iCount, oGroup) => {
-                return iCount + (oGroup?.items && aCountRelevantProviders.includes(oGroup.headerText) ? oGroup.items.length : 0);
-            }, 0));
-
-            const iEmptyResults = aSearchResults.filter((result) => !result || result.length === 0).length;
-            const aResults = aSearchResults.map((aGroupResult, idx) => {
-                // Workaround, limit the number of results to 11 if less than 3 empty groups, otherwise limit to 4
-                const aSearchResultsLimited = (aGroupResult && aGroupResult.length > 4 && iEmptyResults < 3)
-                    ? aGroupResult.slice(0, 4)
-                    : (aGroupResult || []).slice(0, this.iGroupMaxItemCount);
-                if (aGroupResult && aGroupResult.length > 0) {
-                    return {
-                        headerText: aProviders[idx].title,
-                        items: aSearchResultsLimited
-                    };
-                }
-            });
-            // Check if the results have changed before updating the model, otherwise avoid unnecessary updates to enable autocomplete
-            const aOldResults = this._oResultModel.getProperty("/results");
-            if (aOldResults?.length > 0 && deepEqual(aOldResults[1], aResults[1])) {
-                // No change, do not update model
-                return;
-            }
-            this._oResultModel.setProperty("/results", aResults);
-            this._refreshSearchActionButton();
+            const aAllResultsFormatted = this._getResultsFormatted(aSearchResults, aProviders);
+            this._oResultModel.setProperty("/allResults", aAllResultsFormatted);
+            const iResultCount = this._getResultCount(aAllResultsFormatted);
+            this._oResultModel.setProperty("/resultCount", iResultCount);
+            const aDisplayResults = this._limitResults(aAllResultsFormatted);
+            this._oResultModel.setProperty("/results", aDisplayResults);
+            const bHasApplications = aDisplayResults?.[1]?.items?.length > 0; // Applications
+            const bHasAnyOtherSearchResult = aDisplayResults?.[0]?.items?.length > 0 || // Recent Searches
+                                        aDisplayResults?.[2]?.items?.length > 0 || // Frequently Used Apps
+                                        aDisplayResults?.[3]?.items?.length > 0 || // Products
+                                        aDisplayResults?.[4]?.items?.length > 0; // Search Within
+            this._refreshSearchActionButton(bHasApplications);
+            this._updateSearchMessageArea(bHasApplications, bHasAnyOtherSearchResult);
+            this._updateIllustratedMessage(bHasApplications, bHasAnyOtherSearchResult);
+        },
+
+        /**
+         * Formats the search results into a structure suitable for the search field.
+         * @param {Array<Array>} aSearchResults Array of arrays with search results per provider.
+         * @param {Array<object>} aProviders Array of provider objects.
+         * @returns {Array<object>} Formatted search results.
+         * @private
+         */
+        _getResultsFormatted: function (aSearchResults, aProviders) {
+            return aSearchResults.map((aGroupResult, idx) => ({
+                id: aProviders[idx].id,
+                headerText: aProviders[idx].title,
+                items: aGroupResult
+            }));
         },
 
         /**
-         * Returns the default provider group name for a given provider ID.
-         * @param {string} sProviderId The provider ID.
-         * @returns {string} The group name.
+         * Gets the count of all search results.
+         * @param {Array<object>} aAllResults Array of all formatted search results.
+         * @returns {int} Count of all search results.
          * @private
          */
-        _getDefaultProviderGroupName: function (sProviderId) {
-            return this.searchProviderMap[sProviderId];
+        _getResultCount: function (aAllResults) {
+            const aCountRelevantProviders = ["AppsList", "ProductsList"];
+            return aAllResults.reduce((iCount, oGroup) => {
+                return iCount + (oGroup?.items && aCountRelevantProviders.includes(oGroup.id) ? oGroup.items.length : 0);
+            }, 0);
+        },
+
+        /**
+         * Limits the number of items in each search result group to a maximum of 4 or the configured maximum item count.
+         * @param {Array<object>} aAllResults Array of all formatted search results.
+         * @returns {Array<object>} Array of search result groups with limited items.
+         * @private
+         */
+        _limitResults: function (aAllResults) {
+            const iEmptyResults = aAllResults.filter((result) => !result || result.items.length === 0).length;
+
+            return aAllResults.map((oGroup) => {
+                const aSearchResultsLimited = (oGroup.items && oGroup.items.length > 4 && iEmptyResults < 3)
+                    ? oGroup.items.slice(0, 4)
+                    : oGroup.items.slice(0, this.iGroupMaxItemCount);
+
+                if (aSearchResultsLimited.length > 0) {
+                    return { ...oGroup, items: aSearchResultsLimited };
+                }
+            });
         },
 
         /**
@@ -285,37 +310,51 @@ sap.ui.define([
          */
         _onSearch: async function (oEvent) {
             const oItem = oEvent.getParameter("item");
+
             const oSearchContext = {
                 searchFieldValue: this._oSearchField.getValue ? this._oSearchField.getValue() : this._oSearchField.getParent().getValue(),
                 selectedItemContext: oItem?.getBindingContext ? oItem.getBindingContext("searchResults").getObject() : null
             };
-            //Case 1: If an item is selected, save the search term and navigate to the app or add a recent search term to the search field.
+
+            // Case 1: If an item is selected, save the search term and navigate to the app or add a recent search term to the search field.
             if (oSearchContext?.selectedItemContext !== null) {
                 this._saveSearchTerm(oSearchContext.searchFieldValue);
                 if (oItem.getParent().getHeaderText() === this._oI18nModel.getText("recentSearches")) {
-                    this._navigateToResultPage(oSearchContext.selectedItemContext.text);
-                    this._resetSearchState(true);
-                } else if (this._bIsMyHome || oSearchContext.selectedItemContext) {
-                    // Todo: Remove OR once bIsMyHome is clear and tested
+                    oEvent.preventDefault();
+                    this._oSearchField.setValue(oSearchContext.selectedItemContext.text);
+                    this._fetchSuggestions(oSearchContext.selectedItemContext.text);
+                    this._toggleSearchFieldInput(true);
+                } else if (oSearchContext.selectedItemContext.isEnterpriseSearch) {
+                    oEvent.preventDefault();
+                    this._navigateToResultPage(oSearchContext.searchFieldValue, true);
+                    this._resetSearchState();
+                } else if (oSearchContext.selectedItemContext) {
                     this._navigateToApp(oSearchContext.selectedItemContext, oSearchContext.searchFieldValue);
-                    this._resetSearchState(true);
+                    this._fetchSuggestions();
+                    this._toggleSearchFieldInput(false);
                 }
-                //Case 2: If no item is selected, but an input has been made, save the search term and navigate to the results page.
+                // Case 2: If no item is selected, but an input has been made, save the search term and navigate to the results page.
             } else if (oSearchContext.searchFieldValue !== "" && typeof oSearchContext.searchFieldValue === "string") {
                 this._saveSearchTerm(oSearchContext.searchFieldValue);
-                this._navigateToResultPage(oSearchContext.searchFieldValue);
+                if (this._bIsMyHome) {
+                    // For SAP Start navigate directly to the first application in the suggest list
+                    const aResults = this._oResultModel.getData()?.results;
+                    oSearchContext.selectedItemContext = aResults?.[1]?.items?.[0];
+                    this._navigateToApp(oSearchContext.selectedItemContext, oSearchContext.searchFieldValue);
+                } else {
+                    this._navigateToResultPage(oSearchContext.searchFieldValue);
+                }
                 this._resetSearchState();
-                //Case 3: If no item is selected and no input has been made, reset the search state.
+                // Case 3: If no item is selected and no input has been made, reset the search state.
             } else {
-                // Set Searchfield to open if it is not, it's empty and the input element is existent (meaning it's expanded)
-                // Workaround to show suggestions, remove after FIORITECHP1-33982 done
-                await ushellUtils.awaitTimeout(50);
-                if (!this._oSearchField.getOpen()
-                    && this._oSearchField.getValue() === ""
-                    && this._oSearchField.getDomRef().shadowRoot.querySelector(".ui5-search-field-root")
-                ) {
-                    this._fetchSuggestions("");
-                    this._oSearchField.setOpen(true);
+                this._fetchSuggestions();
+                // In case search event is fired with no item inside the event we close the suggest list if it's open
+                // Cases:
+                //  1. after arrow key navigation in the suggest list, item appears selected and search icon is pressed
+                //  2. after item deletion in the suggest list, the first group name gets auto selected
+                //  3. after a group name is being selected
+                if (this._oSearchField.getOpen()) {
+                    this._oSearchField.setOpen(false);
                 }
             }
         },
@@ -329,6 +368,7 @@ sap.ui.define([
             if (!sTerm) {
                 return;
             }
+
             const UserRecents = await Container.getServiceAsync("UserRecents");
             await UserRecents.addSearchActivity({ sTerm });
         },
@@ -340,21 +380,28 @@ sap.ui.define([
          * @private
          */
         _navigateToApp: function (oResult, sSearchTerm) {
+            if (!oResult) {
+                return;
+            }
+
+            this._oExtension.addNavigationSource(NavigationSource.SearchCEP);
             this._oSearchCEPService.navigate(oResult, sSearchTerm);
         },
 
         /**
          * Navigates to the search results page with the given search term.
          * @param {string} sTerm The search term.
-         * @param {boolean} [bAll] Whether to show all results.
+         * @param {boolean} [bShowAll] Whether to show all results.
          * @private
          */
-        _navigateToResultPage: async function (sTerm, bAll) {
+        _navigateToResultPage: async function (sTerm, bShowAll) {
             let sHash = `#WorkZoneSearchResult-display?searchTerm=${sTerm}&category=app`;
-            if (bAll) {
+
+            if (bShowAll) {
                 sHash = `#Action-search&/top=20&filter={"dataSource":{"type":"Category","id":"All","label":"All","labelPlural":"All"},"searchTerm":"${sTerm}",`
                     + "\"rootCondition\":{\"type\":\"Complex\",\"operator\":\"And\",\"conditions\":[]}}";
             }
+
             const oNavigationService = await Container.getServiceAsync("Navigation");
             await oNavigationService.navigate({
                 target: {
@@ -365,22 +412,23 @@ sap.ui.define([
 
         /**
          * Refreshes the search action button in the shell bar based on the current search state.
+         * @param {boolean} bHasApplications Whether we have applications
          * @private
          */
-        _refreshSearchActionButton: function () {
-            const oActionButton = this._oSearchField.getAction()[0];
+        _refreshSearchActionButton: function (bHasApplications) {
+            if (this._bIsMyHome) {
+                return;
+            }
+
+            const oActionButton = Element.getElementById("showAllSearchResultsBtn");
             if (oActionButton) {
-                this._oSearchField.removeAction(oActionButton);
+                oActionButton.destroy();
             }
 
-            if (this._oSearchField.getValue() !== "" && this._oSearchField.getOpen()) {
+            if (this._oSearchField.getValue() !== "" && this._oSearchField.getOpen() && bHasApplications) {
                 this._oSearchField.addAction(new Button({
-                    text: {
-                        path: "searchResults>/resultCount",
-                        formatter: (iCount) => {
-                            return this._oI18nModel.getText("showAllSearchResults", [iCount || 0]);
-                        }
-                    },
+                    id: "showAllSearchResultsBtn",
+                    text: this._oI18nModel.getText("showAllSearchResults"),
                     click: this._onSearch.bind(this),
                     design: "Transparent"
                 }));
@@ -388,19 +436,97 @@ sap.ui.define([
         },
 
         /**
-         * Resets the search state, clearing the search field and results.
+         * Updates the search message area
+         * @param {boolean} bHasApplications Whether we have applications
+         * @param {boolean} bHasAnyOtherSearchResult Whether we have any other search result besides applications
+         * @private
+         */
+        _updateSearchMessageArea: function (bHasApplications, bHasAnyOtherSearchResult) {
+            const oSearchMessageArea = Element.getElementById("searchMessageArea");
+
+            if (oSearchMessageArea) {
+                oSearchMessageArea.destroy();
+            }
+
+            if (this._oSearchField.getValue() !== "" && !bHasApplications && bHasAnyOtherSearchResult) {
+                this._oSearchField.addMessageArea(new SearchMessageArea({
+                    id: "searchMessageArea",
+                    text: this._oI18nModel.getText("noSearchResults"),
+                    description: this._oI18nModel.getText("tryTheFollowing")
+                }));
+            }
+        },
+
+        /**
+         * Updates the search illustrated message
+         * @param {boolean} bHasApplications Whether we have applications
+         * @param {boolean} bHasAnyOtherSearchResult Whether we have any other search result besides applications
+         * @private
+         */
+        _updateIllustratedMessage: function (bHasApplications, bHasAnyOtherSearchResult) {
+            const oSearchIllustratedMessage = Element.getElementById("searchIllustratedMessage");
+
+            if (oSearchIllustratedMessage) {
+                oSearchIllustratedMessage.destroy();
+            }
+
+            if (this._oSearchField.getValue() === "" && !bHasAnyOtherSearchResult) {
+                // Reset results to empty array so IllustratedMessage shows even if array contains only undefined values
+                this._oResultModel.setProperty("/results", []);
+                this._oSearchField.addIllustration(new IllustratedMessage({
+                    id: "searchIllustratedMessage"
+                }));
+            }
+
+            if (this._oSearchField.getValue() !== "" && !bHasApplications && !bHasAnyOtherSearchResult) {
+                this._oResultModel.setProperty("/results", []);
+                this._oSearchField.addIllustration(new IllustratedMessage({
+                    id: "searchIllustratedMessage",
+                    titleText: this._oI18nModel.getText("noSearchResults"),
+                    subtitleText: this._oI18nModel.getText("searchSomethingElse")
+                }));
+            }
+        },
+
+        /**
+         * Clears the search field value if needed and closes the suggest list if it's open
          * @param {boolean} [bResetValue] Whether to reset the search field value
          * @private
          */
         _resetSearchState: async function (bResetValue) {
+            // Use timeout in order to close the suggest list properly when search is invoked for same search term twice in a row.
             await ushellUtils.awaitTimeout(100);
+
             if (this._oSearchField.getValue() !== "" && bResetValue) {
                 this._oSearchField.setValue("");
             }
             if (this._oSearchField.getOpen()) {
                 this._oSearchField.setOpen(false);
             }
-            this._oResultModel.setProperty("/results", []);
+        },
+
+        /**
+         * Clears search value and fetches all search results when navigation is not to search result page
+         * E.g navigating back, clicking on home button, _navigateToApp call, appFinder open etc.
+         * @private
+         */
+        _registerHandleHashChange: function () {
+            hasher.changed.add(async (sNewHash) => {
+                if (sNewHash !== "" && !(/WorkZoneSearchResult-display|Action-search/.test(sNewHash))) {
+                    await this._resetSearchState(true);
+                    this._fetchSuggestions();
+                }
+            });
+        },
+
+        /**
+         * Toggles the search input field
+         * @param {boolean} bExpand Whether to expand the search input
+         * @private
+         */
+        _toggleSearchFieldInput: function (bExpand) {
+            const oShellHeaderModel = this._oShellHeader.getComponentInstance().getModel();
+            oShellHeaderModel.setProperty("/searchField/show", bExpand);
         },
 
         /**
@@ -408,6 +534,7 @@ sap.ui.define([
          * @private
          */
         exit: function () {
+            this._detachSearchEventHandlers();
             this._oSearchField.destroy();
             this._aDoables.forEach((oDoable) => {
                 oDoable.off();
@@ -417,4 +544,3 @@ sap.ui.define([
         }
     });
 });
-