@sapui5/sap.ushell 1.138.1 → 1.139.0

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

@@ -11,7 +11,7 @@ sap.ui.define([
     "sap/ushell/ui/shell/ShellHeadItem",
     "sap/ushell/Container",
     "sap/ushell/EventHub"
-], function (
+], (
     Log,
     Element,
     UIComponent,
@@ -23,7 +23,7 @@ sap.ui.define([
     ShellHeadItem,
     Container,
     EventHub
-) {
+) => {
     "use strict";
 
     function getProductSwitchButton () {
@@ -41,7 +41,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.ProductSwitch.Component", {
 
         metadata: {
-            version: "1.138.1",
+            version: "1.139.0",
             library: "sap.ushell.components.shell.ProductSwitch",
             dependencies: {
                 libs: {
@@ -58,47 +58,47 @@ sap.ui.define([
         },
 
         _getModel: function () {
-            var that = this,
-                oModel = new JSONModel();
+            const that = this;
+            const oModel = new JSONModel();
             oModel.loadData(Config.last("/core/productSwitch/url"))
-                .then(function () {
-                    var aProducts = oModel.getData();
+                .then(() => {
+                    const aProducts = oModel.getData();
                     if (aProducts.length === 0) {
                         Log.debug("There are no other profucts configured for your user. ProductSwitch button will be hidden.");
                     } else {
                         that._addProductSwitchButtonToHeader();
                     }
                 })
-                .catch(function (err) {
+                .catch((err) => {
                     Log.debug(err);
                 });
             return oModel;
         },
 
         _openProductSwitch: function () {
-            var oPopover = getProductSwitchPopover(),
-                oLoadPopover = Promise.resolve();
+            let oPopover = getProductSwitchPopover();
+            let oLoadPopover = Promise.resolve();
 
             if (!oPopover) {
-                oLoadPopover = new Promise(function (resolve, reject) {
-                    sap.ui.require(["sap/ui/core/Fragment"], function (Fragment) {
+                oLoadPopover = new Promise((resolve, reject) => {
+                    sap.ui.require(["sap/ui/core/Fragment"], (Fragment) => {
                         Fragment.load({
                             name: "sap.ushell.components.shell.ProductSwitch.ProductSwitch",
                             type: "XML",
                             controller: this
                         }).then(resolve).catch(reject);
-                    }.bind(this), reject);
-                }.bind(this)).then(function (popover) {
+                    }, reject);
+                }).then((popover) => {
                     oPopover = popover;
                     oPopover.setModel(this.oModel);
                     oPopover.setModel(resources.i18nModel, "i18n");
                     if (Device.system.phone) {
                         oPopover.setShowHeader(true);
                     }
-                }.bind(this));
+                });
             }
 
-            oLoadPopover.then(function () {
+            oLoadPopover.then(() => {
                 let oSource;
                 if (Config.last("/core/shellBar/enabled")) {
                     oSource = getShellBarProductSwitchButton();
@@ -116,7 +116,7 @@ sap.ui.define([
         },
 
         onProductItemPress: function (oEvent) {
-            var sTargetUrl = oEvent.getParameter("itemPressed").getTargetSrc();
+            const sTargetUrl = oEvent.getParameter("itemPressed").getTargetSrc();
             getProductSwitchPopover().close();
             WindowUtils.openURL(sTargetUrl, "_blank");
         },
@@ -125,7 +125,7 @@ sap.ui.define([
          * Create and add the product switch button to the header
          */
         _addProductSwitchButtonToHeader: function () {
-            var oProductSwitchButton = new ShellHeadItem({
+            const oProductSwitchButton = new ShellHeadItem({
                 id: "productSwitchBtn",
                 icon: "sap-icon://grid",
                 visible: true,
@@ -139,17 +139,15 @@ sap.ui.define([
             EventHub.on("showProducts").do(this._openProductSwitch.bind(this));
         },
 
-
         exit: function () {
-            var oPopover = getProductSwitchPopover();
+            const oPopover = getProductSwitchPopover();
             if (!oPopover) {
                 oPopover.destroy();
             }
-            var oHeaderButton = getProductSwitchButton();
+            const oHeaderButton = getProductSwitchButton();
             if (oHeaderButton) {
                 oHeaderButton.destroy();
             }
         }
     });
-
 });

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

@@ -5,10 +5,11 @@ sap.ui.define([
     "sap/ushell/components/shell/Search/ESearch",
     "sap/ui/core/UIComponent",
     "sap/ui/core/Component",
+    "sap/ushell/Config",
     "sap/ushell/utils",
     "sap/base/util/ObjectPath",
     "sap/ushell/Container"
-], function (EventBus, ESearch, UIComponent, Component, Utils, ObjectPath, Container) {
+], (EventBus, ESearch, UIComponent, Component, Config, Utils, ObjectPath, Container) => {
     "use strict";
 
     return UIComponent.extend("sap.ushell.components.shell.Search.Component", {
@@ -18,24 +19,31 @@ sap.ui.define([
         },
 
         createContent: function () {
-            var that = this;
-            var bIsSearchCEPEnabled = ObjectPath.get("sap-ushell-config.services.SearchCEP") !== undefined;
+            const that = this;
+            const bIsSearchCEPEnabled = ObjectPath.get("sap-ushell-config.services.SearchCEP") !== undefined;
             // check that search is enabled
-            var oShellCtrl = Container.getRendererInternal("fiori2").getShellController(),
-                oShellView = oShellCtrl.getView(),
-                oShellConfig = (oShellView.getViewData() ? oShellView.getViewData().config : {}) || {};
-            var bSearchEnable = (oShellConfig.enableSearch !== false);
+            const oShellCtrl = Container.getRendererInternal("fiori2").getShellController();
+            const oShellView = oShellCtrl.getView();
+            const oShellConfig = (oShellView.getViewData() ? oShellView.getViewData().config : {}) || {};
+            const bSearchEnable = (oShellConfig.enableSearch !== false);
             if (!bSearchEnable) {
                 EventBus.getInstance().publish("shell", "searchCompLoaded", { delay: 0 });
                 return;
             }
 
-            Container.getFLPPlatform().then(function (sPlatform) {
+            Container.getFLPPlatform().then((sPlatform) => {
                 if (sPlatform === "MYHOME" || (sPlatform === "cFLP" && bIsSearchCEPEnabled === true)) {
-                    Component.create({
-                        manifest: false,
-                        name: "sap.ushell.components.shell.SearchCEP"
-                    });
+                    if (Config.last("/core/shellBar/enabled") && Config.last("/core/searchCEPNew/enabled")) {
+                        Component.create({
+                            id: "searchCEPNew",
+                            name: "sap.ushell.components.shell.SearchCEPNew"
+                        });
+                    } else {
+                        Component.create({
+                            manifest: false,
+                            name: "sap.ushell.components.shell.SearchCEP"
+                        });
+                    }
                 } else {
                     ESearch.createContent(that);
                     EventBus.getInstance().publish("shell", "searchCompLoaded", { delay: 0 });

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

@@ -10,19 +10,19 @@ sap.ui.define([
     "sap/ushell/renderer/search/util",
     "sap/ushell/Container",
     "sap/ushell/Config"
-], function (Element, Library, resources, IconPool, HashChanger, jQuery, util, Container, Config) {
+], (Element, Library, resources, IconPool, HashChanger, jQuery, util, Container, Config) => {
     "use strict";
 
-    var bDoExit = false;
+    let bDoExit = false;
 
-    var loadSearchShellHelper = function (oComponent) {
+    function loadSearchShellHelper (oComponent) {
         if (!oComponent._searchShellHelperPromise) {
-            oComponent._searchShellHelperPromise = new Promise(function (resolve) {
-                Library.load("sap.esh.search.ui").then(function () {
+            oComponent._searchShellHelperPromise = new Promise((resolve) => {
+                Library.load("sap.esh.search.ui").then(() => {
                     sap.ui.require([
                         "sap/esh/search/ui/SearchShellHelperAndModuleLoader",
                         "sap/esh/search/ui/SearchShellHelper"
-                    ], function (SearchShellHelperAndModuleLoader, searchShellHelper) {
+                    ], (SearchShellHelperAndModuleLoader, searchShellHelper) => {
                         searchShellHelper.init();
                         resolve(searchShellHelper);
                     });
@@ -30,25 +30,22 @@ sap.ui.define([
             });
         }
         return oComponent._searchShellHelperPromise;
-    };
+    }
 
     function createContent (oComponent) {
         bDoExit = true;
 
         // loads the searchShellHelper when the search button in the new ShellBar web-component is clicked
         if (Config.last("/core/shellBar/enabled")) {
-            loadSearchShellHelper(oComponent).then(function (searchShellHelper) {
-                searchShellHelper.init();
-            });
             Element.getElementById("shell-header").attachSearchButtonPress((event) => {
-                loadSearchShellHelper(oComponent).then(function (searchShellHelper) {
+                loadSearchShellHelper(oComponent).then((searchShellHelper) => {
                     searchShellHelper.onShellSearchButtonPressed(event);
                 });
             });
         }
 
         // create search Icon
-        var oSearchConfig = {
+        const oSearchConfig = {
             id: "sf",
             tooltip: "{i18n>openSearchBtn}",
             text: "{i18n>searchBtn}",
@@ -56,12 +53,12 @@ sap.ui.define([
             icon: IconPool.getIconURI("search"),
             visible: true,
             press: function (event) {
-                loadSearchShellHelper(oComponent).then(function (searchShellHelper) {
+                loadSearchShellHelper(oComponent).then((searchShellHelper) => {
                     searchShellHelper.onShellSearchButtonPressed(event);
                 });
             }
         };
-        var oShellSearchBtn = Container.getRendererInternal("fiori2")
+        const oShellSearchBtn = Container.getRendererInternal("fiori2")
             .addHeaderEndItem("sap.ushell.ui.shell.ShellHeadItem", oSearchConfig, true, false);
         oShellSearchBtn.data("help-id", "shellHeader-search", true);
         if (util.isSearchFieldExpandedByDefault()) {
@@ -71,7 +68,7 @@ sap.ui.define([
 
         // auto expand search field
         if (util.isSearchFieldExpandedByDefault()) {
-            loadSearchShellHelper(oComponent).then(function (searchShellHelper) {
+            loadSearchShellHelper(oComponent).then((searchShellHelper) => {
                 if (searchShellHelper.expandSearch) {
                     // auto expand
                     searchShellHelper.expandSearch();
@@ -84,13 +81,13 @@ sap.ui.define([
 
         // register hash change handler for tracking navigation
         oComponent.oHashChanger = HashChanger.getInstance();
-        oComponent.oHashChanger.attachEvent("shellHashChanged", function (sShellHash) {
-            var hashChangeInfo = sShellHash.mParameters;
-            setTimeout(function () {
-                Library.load("sap.esh.search.ui").then(function () {
+        oComponent.oHashChanger.attachEvent("shellHashChanged", (sShellHash) => {
+            const hashChangeInfo = sShellHash.mParameters;
+            setTimeout(() => {
+                Library.load("sap.esh.search.ui").then(() => {
                     sap.ui.require([
                         "sap/esh/search/ui/HashChangeHandler"
-                    ], function (HashChangeHandler) {
+                    ], (HashChangeHandler) => {
                         HashChangeHandler.handle(hashChangeInfo);
                     });
                 });
@@ -108,7 +105,7 @@ sap.ui.define([
     function exit () {
         if (bDoExit) {
             Container.getRendererInternal("fiori2").hideHeaderEndItem("sf");
-            var oSearchButton = Element.getElementById("sf");
+            const oSearchButton = Element.getElementById("sf");
             if (oSearchButton) {
                 oSearchButton.destroy();
             }

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

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

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

@@ -14,7 +14,7 @@ sap.ui.define([
     "sap/ushell/components/shell/SearchCEP/SearchCEP.controller",
     "sap/ushell/resources",
     "sap/ushell/utils/UrlParsing"
-], function (
+], (
     Log,
     SearchField,
     Device,
@@ -28,12 +28,12 @@ sap.ui.define([
     SearchCEPController,
     resources,
     UrlParsing
-) {
+) => {
     "use strict";
 
     return UIComponent.extend("sap.ushell.components.shell.SearchCEP.Component", {
         metadata: {
-            version: "1.138.1",
+            version: "1.139.0",
             library: ["sap.ushell", "sap.ushell.components.shell"],
             dependencies: {
                 libs: ["sap.m"]
@@ -44,6 +44,14 @@ sap.ui.define([
             try {
                 this.oRenderer = Container.getRendererInternal("fiori2");
                 this.oShellHeader = Element.getElementById("shell-header");
+
+                // needed to listen for the searchButtonPress event only for the ShellBar
+                // in case the ShellHeader is used it will cause the CEP Search not to be rendered
+                // because no such event exist in the ShellHeader control
+                if (Config.last("/core/shellBar/enabled")) {
+                    this.oShellHeader.attachSearchButtonPress(this.onShellSearchButtonPressed.bind(this));
+                }
+
                 // create search Icon
                 this.oRenderer.addHeaderEndItem({
                     id: "sf",
@@ -60,7 +68,7 @@ sap.ui.define([
                     onkeydown: this._keyDownSearchBtn.bind(this)
                 });
                 // create search field on shell header
-                var oSearchConfig = {
+                const oSearchConfig = {
                     width: "90%",
                     placeholder: resources.i18n.getText("search"),
                     tooltip: resources.i18n.getText("search"),
@@ -71,7 +79,7 @@ sap.ui.define([
                 this.oSF = new SearchField("PlaceHolderSearchField", oSearchConfig);
                 this.oSF.addStyleClass("sapUshellCEPSearchCenter");
 
-                var sScreenSize = this.getScreenSize();
+                const sScreenSize = this.getScreenSize();
                 if (sScreenSize === "S") {
                     this.initSearchSSize();
                 } else if (sScreenSize === "M" || sScreenSize === "L") {
@@ -89,7 +97,7 @@ sap.ui.define([
                 });
                 this.oSearchCEPController.getHomePageApps();
             } catch (error) {
-                Log.info("Failed to create CEP search field content" + error);
+                Log.info(`Failed to create CEP search field content${error}`);
             }
             EventBus.getInstance().publish("shell", "searchCompLoaded", { delay: 0 });
         },
@@ -109,17 +117,16 @@ sap.ui.define([
         },
 
         _onAfterRendering: function (event) {
-
             // align search field vertically
-            var oShellHeaderSearch = jQuery(this.oShellHeader.getDomRef()).find("#shell-header-hdr-search");
+            const oShellHeaderSearch = jQuery(this.oShellHeader.getDomRef()).find("#shell-header-hdr-search");
             oShellHeaderSearch.addClass("CEPShellHeaderPadding");
 
             // add tooltip to Search Placeholder icon
             jQuery(this.oSF.getDomRef()).find("#PlaceHolderSearchField-search").attr("title", resources.i18n.getText("search"));
 
-            var sUrl = Container.getFLPUrl(true),
-                sHash = UrlParsing.getHash(sUrl),
-                sIntent = sHash.split("&/")[0];
+            const sUrl = Container.getFLPUrl(true);
+            const sHash = UrlParsing.getHash(sUrl);
+            const sIntent = sHash.split("&/")[0];
 
             if (this.oSF.getValue()) {
                 // prevent opening popover after navigation to Results page
@@ -174,7 +181,7 @@ sap.ui.define([
         },
 
         getScreenSize: function () {
-            var oScreenSize = Device.media.getCurrentRange(Device.media.RANGESETS.SAP_STANDARD_EXTENDED);
+            const oScreenSize = Device.media.getCurrentRange(Device.media.RANGESETS.SAP_STANDARD_EXTENDED);
             if (oScreenSize.from >= 1440) {
                 return "XL";
             } else if (oScreenSize.from >= 1024) {
@@ -188,9 +195,9 @@ sap.ui.define([
 
         _keyDownSearchBtn: function (event) {
             if (event.code === 13 || event.code === "Enter") {
-                setTimeout(function () {
+                setTimeout(() => {
                     this.oSF.focus();
-                }.bind(this), 500);
+                }, 500);
             }
         }
     });