@sapui5/sap.ushell 1.120.7 → 1.121.0

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

@@ -1,30 +1,37 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
+    "sap/ui/core/Element",
+    "sap/ui/core/EventBus",
     "sap/ui/core/UIComponent",
     "sap/m/SearchField",
-    "sap/m/Button",
-    "sap/m/ResponsivePopover",
-    "sap/ui/core/Fragment",
-    "sap/ui/model/json/JSONModel",
     "sap/ushell/components/shell/SearchCEP/SearchCEP.controller",
     "sap/base/Log",
     "sap/ushell/resources",
     "sap/ui/core/IconPool",
-    "sap/ushell/renderer/search/util",
-    "sap/ushell/ui/shell/ShellHeadItem",
     "sap/ui/Device",
-    "sap/ui/core/Core",
     "sap/ui/thirdparty/jquery",
-    "sap/ushell/utils/UrlParsing"
-], function (UIComponent, SearchField, Button, ResponsivePopover, Fragment, JSONModel, SearchCEPController,
-             Log, resources, IconPool, util, ShellHeadItem, Device, Core, jQuery, UrlParsing
+    "sap/ushell/utils/UrlParsing",
+    "sap/ushell/Container"
+], function (
+    Element,
+    EventBus,
+    UIComponent,
+    SearchField,
+    SearchCEPController,
+    Log,
+    resources,
+    IconPool,
+    Device,
+    jQuery,
+    UrlParsing,
+    Container
 ) {
     "use strict";
 
     return UIComponent.extend("sap.ushell.components.shell.SearchCEP.Component", {
         metadata: {
-            version: "1.120.7",
+            version: "1.121.0",
             library: ["sap.ushell", "sap.ushell.components.shell"],
             dependencies: {
                 libs: ["sap.m"]
@@ -33,8 +40,8 @@ sap.ui.define([
 
         createContent: function () {
             try {
-                this.oRenderer = sap.ushell.Container.getRenderer("fiori2");
-                this.oShellHeader = Core.byId("shell-header");
+                this.oRenderer = Container.getRendererInternal("fiori2");
+                this.oShellHeader = Element.getElementById("shell-header");
                 // create search Icon
                 this.oRenderer.addHeaderEndItem({
                     id: "sf",
@@ -45,7 +52,7 @@ sap.ui.define([
                     visible: true,
                     press: this.onShellSearchButtonPressed.bind(this)
                 }, true, false);
-                this.oShellSearchBtn = Core.byId("sf");
+                this.oShellSearchBtn = Element.getElementById("sf");
                 this.oShellSearchBtn.data("help-id", "shellHeader-search", true);
                 this.oShellSearchBtn.addEventDelegate({
                     onkeydown: this._keyDownSearchBtn.bind(this)
@@ -81,7 +88,7 @@ sap.ui.define([
             } catch (error) {
                 Log.info("Failed to create CEP search field content" + error);
             }
-            Core.getEventBus().publish("shell", "searchCompLoaded", { delay: 0 });
+            EventBus.getInstance().publish("shell", "searchCompLoaded", { delay: 0 });
         },
 
         initSearchSSize: function () {
@@ -102,7 +109,7 @@ sap.ui.define([
             // add tooltip to Search Placeholder icon
             jQuery(this.oSF.getDomRef()).find("#PlaceHolderSearchField-search").attr("title", resources.i18n.getText("search"));
 
-            var sUrl = sap.ushell.Container.getFLPUrl(true),
+            var sUrl = Container.getFLPUrl(true),
                 sHash = UrlParsing.getHash(sUrl),
                 sIntent = sHash.split("&/")[0];
 
@@ -126,7 +133,7 @@ sap.ui.define([
                 // eslint-disable-next-line no-undef
                 jQuery(this.oSF.getDomRef()).find("input").attr("inputmode", "search");
             }
-            if (Core.byId("CEPSearchField")) {
+            if (Element.getElementById("CEPSearchField")) {
                 this.oSearchCEPController.onSuggest(event);
             } else {
                 this.oSearchCEPController.onInit();
@@ -134,7 +141,7 @@ sap.ui.define([
         },
 
         onSearch: function (event) {
-            if (Core.byId("CEPSearchField")) {
+            if (Element.getElementById("CEPSearchField")) {
                 this.oSearchCEPController.onSearch(event);
             }
         },

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

@@ -1,6 +1,8 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
+    "sap/base/i18n/Localization",
+    "sap/ui/core/Element",
     "sap/ui/core/mvc/Controller",
     "sap/ui/model/json/JSONModel",
     "sap/ui/core/Fragment",
@@ -8,17 +10,16 @@ sap.ui.define([
     "sap/m/Text",
     "sap/m/StandardListItem",
     "sap/ushell/components/shell/SearchCEP/SearchProviders/SearchProvider",
-    "sap/base/Log",
-    "sap/ushell/utils/WindowUtils",
     "sap/ui/thirdparty/jquery",
     "sap/ushell/resources",
     "sap/ui/Device",
-    "sap/ui/core/Configuration",
-    "sap/base/util/UriParameters",
-    "sap/ui/core/Core",
     "sap/ushell/EventHub",
-    "sap/m/Avatar"
+    "sap/m/Avatar",
+    "sap/ushell/Container",
+    "sap/ushell/Config"
 ], function (
+    Localization,
+    Element,
     Controller,
     JSONModel,
     Fragment,
@@ -26,16 +27,13 @@ sap.ui.define([
     Text,
     StandardListItem,
     SearchProvider,
-    Log,
-    WindowUtils,
     jQuery,
     resources,
     Device,
-    Configuration,
-    UriParameters,
-    Core,
     EventHub,
-    Avatar
+    Avatar,
+    Container,
+    Config
 ) {
     "use strict";
 
@@ -46,7 +44,7 @@ sap.ui.define([
             this._bIsMyHome = false;
             this._bEscPressed = false;
             this.bGrowingReset = false;
-            this._SearchCEPService = sap.ushell.Container.getServiceAsync("SearchCEP");
+            this._SearchCEPService = Container.getServiceAsync("SearchCEP");
 
             this._SearchCEPService.then(function (oSearchCEPService) {
                 this._registerDefaultProviders(oSearchCEPService);
@@ -55,9 +53,9 @@ sap.ui.define([
 
             this._toggleSearchPopover(false);
 
-            this._oPlaceHolderSF = Core.byId("PlaceHolderSearchField");
+            this._oPlaceHolderSF = Element.getElementById("PlaceHolderSearchField");
 
-            var sPlatform = sap.ushell.Container.getFLPPlatform(true);
+            var sPlatform = Container.getFLPPlatform(true);
 
             if (sPlatform === "MYHOME") {
                 this._bIsMyHome = true;
@@ -96,7 +94,7 @@ sap.ui.define([
             var sSearchTerm = oEvent.getParameter("query"),
                 bEscPressed = oEvent.getParameter("escPressed"),
                 bClearButtonPressed = oEvent.getParameter("clearButtonPressed"),
-                oSearchResultList = Core.byId("SearchResultList");
+                oSearchResultList = Element.getElementById("SearchResultList");
 
             if (bEscPressed) {
                 this._bEscPressed = bEscPressed;
@@ -156,7 +154,7 @@ sap.ui.define([
         onBeforeOpen: function () {
 
             var bCollapse = false,
-                oShellHeader = Core.byId("shell-header"),
+                oShellHeader = Element.getElementById("shell-header"),
                 sSearchState = oShellHeader.getSearchState();
 
             if (sSearchState === "COL") {
@@ -180,19 +178,12 @@ sap.ui.define([
             document.getElementById("CEPSearchField").style.height = nPlaceHolderSFHeight + "px";
             // add tooltip to CEP Search icon
             document.getElementById("CEPSearchField-search").title = resources.i18n.getText("search");
-            // add tooltip to truncated list items
-            var aListItemsTitles = document.querySelectorAll(".searchCEPList .sapMSLIDiv:not(.sapMGrowingListTriggerText)>.sapMSLITitleOnly");
-            aListItemsTitles.forEach(function (oDiv) {
-                if (oDiv.scrollWidth > oDiv.offsetWidth) {
-                    oDiv.parentNode.parentNode.title = oDiv.innerText;
-                }
-            });
         },
 
         onAfterClose: function (oEvent) {
 
-            var oSFicon = Core.byId("sf"),
-                oShellHeader = Core.byId("shell-header"),
+            var oSFicon = Element.getElementById("sf"),
+                oShellHeader = Element.getElementById("shell-header"),
                 sScreenSize = this._getScreenSize(),
                 aLists = this._oPopover.getContent()[1].getItems();
 
@@ -351,7 +342,7 @@ sap.ui.define([
                         // focus last item
                         oListItems[oListItems.length - 1].focus();
                     } else {
-                        Core.byId(aPreviousLists[idx].getId() + "-trigger").focus();
+                        Element.getElementById(aPreviousLists[idx].getId() + "-trigger").focus();
                     }
                     break;
                 }
@@ -394,9 +385,9 @@ sap.ui.define([
 
             var oCurrentControl = oControl.getDomRef(),
                 sHiddenSpanId = jQuery(oCurrentControl).attr("aria-labelledby"),
-                sText = Core.byId(sHiddenSpanId).getProperty("text");
+                sText = Element.getElementById(sHiddenSpanId).getProperty("text");
 
-            jQuery(Core.byId(sHiddenSpanId).getDomRef()).text(sListName + ". " + sText);
+            jQuery(Element.getElementById(sHiddenSpanId).getDomRef()).text(sListName + ". " + sText);
         },
 
         _getDefaultProviderGroupName: function (sProviderId) {
@@ -441,19 +432,14 @@ sap.ui.define([
                 growingScrollToLoad: false,
                 items: {
                     path: "resultModel>/" + oConfiguration.name,
-                    factory: this._createListItem.bind(this)
+                    factory: this._createListItem.bind(this, oConfiguration.name)
                 },
                 growingStarted: this._listUpdateStart.bind(this),
                 updateStarted: this._listUpdateStart.bind(this),
+                updateFinished: this._listUpdateFinished.bind(this),
                 itemPress: this._itemPress.bind(this)
             }).addStyleClass("searchCEPList sapUshellCEPListDivider");
 
-            switch (oConfiguration.id) {
-                case "SearchResultList":
-                    oList.attachUpdateFinished(this._resultListUpdateFinish.bind(this));
-                    break;
-            }
-
             oList.setModel(oModel, "resultModel");
             oList._providerConfig = oConfiguration;
             oList._getProviderConfig = function () {
@@ -468,14 +454,31 @@ sap.ui.define([
             return oList;
         },
 
-        _createListItem: function (sId, oContext) {
+        _createListItem: function (sConfigurationName, sId, oContext) {
+        var oParams = {
+                iconDensityAware: false,
+                title: oContext.getProperty("text"),
+                type: "Active"
+            },
 
-            var oParams = {
-                    type: "Active",
-                    title: oContext.getProperty("text"),
-                    iconDensityAware: false
-                },
-                sIconPath = oContext.getProperty("icon");
+            sIconPath = oContext.getProperty("icon"),
+            sScreenSize = this._getScreenSize(),
+            sProviderLabel = oContext.getProperty("contentProviderLabel"),
+            aDisplayingLists = ["SearchResultList","FrequentlyUsedAppsList"],
+            bEnabled = Config.last("/core/contentProviders/providerInfo/enabled"),
+            bShowContentProviderInfoOnVisualizations = Config.last("/core/contentProviders/providerInfo/showContentProviderInfoOnVisualizations");
+
+            if (bEnabled && bShowContentProviderInfoOnVisualizations &&
+                aDisplayingLists.includes(sConfigurationName) &&
+                sProviderLabel !== undefined && sProviderLabel !== "") {
+
+                sProviderLabel = sProviderLabel.toUpperCase();
+                if (sScreenSize === "S") {
+                    oParams.description = sProviderLabel;
+                } else {
+                    oParams.title += " - " + sProviderLabel;
+                }
+            }
 
             var oAvatar = new Avatar("", {
                 displaySize: "XS",
@@ -494,6 +497,9 @@ sap.ui.define([
             }
 
             var oListItem = new StandardListItem(oParams);
+            if (sScreenSize === "S" && oParams.description !== undefined) {
+                oListItem.addStyleClass("sapCEPSearchListItemMobileHeight");
+            }
             oListItem.addStyleClass("sapUiTinyMarginBeginEnd");
 
             return oListItem;
@@ -542,11 +548,12 @@ sap.ui.define([
                 iActualItems = oEvent.getParameter("actual"),
                 sReason = oEvent.getParameter("reason"),
                 iThreshold = this.bGrowingReset ? oConfiguration.maxItemCount : oConfiguration.defaultItemCount;
+
             /*
-            * Currently UI5 List fires both deprecated and its new alternative events (growingStarted -> updateStarted).
-            * updateStarted fires before growingStarted, so all of its changes are overwritten.
-            * For the time being we should handle both events in the same way.
-            */
+             * Currently UI5 List fires both deprecated and its new alternative events (growingStarted -> updateStarted).
+             * updateStarted fires before growingStarted, so all of its changes are overwritten.
+             * For the time being we should handle both events in the same way.
+             */
             if (iActualItems && iActualItems > 0) {
                 if (sReason) {
                     // updateStart
@@ -570,25 +577,40 @@ sap.ui.define([
             }
         },
 
-        _resultListUpdateFinish: function (oEvent) {
+        _listUpdateFinished: function (oEvent) {
 
             var oList = oEvent.getSource(),
                 oConfiguration = oList._getProviderConfig(),
-                sQuery = oList.getModel("resultModel").getProperty("/query");
-
-            if (oConfiguration.highlightResult && oConfiguration.highlightResult === true) {
-                var oResults = oList.$().find(".sapMSLITitleOnly");
+                oListItemsTitles;
 
-                jQuery.each(oResults, function (oConfiguration, index) {
-                    var sRegex = new RegExp(sQuery, "gi"),
-                        // remove <b> from previous highlighting
-                        sCleanText = oResults[index].innerHTML.replace(/<[^>]*>/g, ""),
-                        sBoldTitle = sCleanText.replace(sRegex, function (oConfiguration, sPart) {
-                            return this._getBoldTitle(oConfiguration, sPart);
-                        }.bind(this, oConfiguration));
-                    oResults[index].innerHTML = this._getHighlightedHtml(oConfiguration, sBoldTitle);
-                }.bind(this, oConfiguration));
+            if (this._getScreenSize() === "S") {
+                oListItemsTitles = oList.$().find(".sapMSLITitle, .sapMSLIDescription");
+            } else {
+                oListItemsTitles = oList.$().find(".sapMSLITitleOnly");
             }
+
+            jQuery.each(oListItemsTitles, function (index) {
+                var oDiv = oListItemsTitles[index];
+
+                // add tooltips for long truncated titles
+                if (oDiv.scrollWidth > oDiv.offsetWidth) {
+                    oDiv.parentNode.parentNode.title = oDiv.innerText;
+                }
+                // highlight search results
+                if (oConfiguration.id === "SearchResultList") {
+                    var sQuery = oList.getModel("resultModel").getProperty("/query");
+
+                    if (oConfiguration.highlightResult && oConfiguration.highlightResult === true) {
+                        var sRegex = new RegExp(sQuery, "gi"),
+                            // remove <b> from previous highlighting
+                            sCleanText = oDiv.innerHTML.replace(/<[^>]*>/g, ""),
+                            sBoldTitle = sCleanText.replace(sRegex, function (sPart) {
+                                return this._getBoldTitle(oConfiguration, sPart);
+                            }.bind(this));
+                        oDiv.innerHTML = this._getHighlightedHtml(oConfiguration, sBoldTitle);
+                    }
+                }
+            }.bind(this));
         },
 
         _getBoldTitle: function (oConfiguration, sPart) {
@@ -727,7 +749,7 @@ sap.ui.define([
                     }
 
                     this._oPopover.setContentWidth(nPlaceHolderSFWidth + "px");
-                    if (Configuration.getRTL() === true) {
+                    if (Localization.getRTL() === true) {
                         var nOffsetX = this._oPopover.getOffsetX();
                         this._oPopover.setOffsetX(-1 * nOffsetX);
                     }
@@ -817,8 +839,8 @@ sap.ui.define([
                 }
                 setTimeout(function () {
                     if (this._getScreenSize() === "S" || this._getScreenSize() === "M") {
-                        Core.byId("shell-header").setSearchState("COL", 35, false);
-                        Core.byId("sf").setVisible(true);
+                        Element.getElementById("shell-header").setSearchState("COL", 35, false);
+                        Element.getElementById("sf").setVisible(true);
                     }
                     if (oElement) {
                         oElement.focus();
@@ -833,7 +855,7 @@ sap.ui.define([
 
         _initializeSearchField: function () {
 
-            this.oSF = Core.byId("CEPSearchField");
+            this.oSF = Element.getElementById("CEPSearchField");
             var nPlaceHolderSFWidth = document.getElementById("PlaceHolderSearchField").clientWidth;
 
             this.oSF.setWidth(nPlaceHolderSFWidth + "px");
@@ -846,7 +868,7 @@ sap.ui.define([
         _saveSearchTerm: function (sTerm) {
 
             if (sTerm) {
-                sap.ushell.Container.getServiceAsync("UserRecents")
+                Container.getServiceAsync("UserRecents")
                     .then(function (UserRecentsService) {
                         UserRecentsService.addSearchActivity({ sTerm: sTerm });
                     });
@@ -937,7 +959,7 @@ sap.ui.define([
                     sTerm + "\",\"rootCondition\":{\"type\":\"Complex\",\"operator\":\"And\",\"conditions\":[]}}";
             }
 
-            var pNavServicePromise = sap.ushell.Container.getServiceAsync("Navigation");
+            var pNavServicePromise = Container.getServiceAsync("Navigation");
             pNavServicePromise.then(function (oNavigationService) {
                 oNavigationService.navigate({
                     target: {

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

@@ -2,11 +2,12 @@
 
 /**
  * @fileOverview
- * @version 1.120.7
+ * @version 1.121.0
  */
 sap.ui.define([
-    "sap/base/Log"
-], function (Log) {
+    "sap/base/Log",
+    "sap/ushell/Container"
+], function (Log, Container) {
     "use strict";
 
     /**
@@ -37,7 +38,7 @@ sap.ui.define([
      * @private
      */
     FrequentActivityProvider.prototype.execSearch = function (sQuery, sGroupName) {
-        return sap.ushell.Container.getServiceAsync("UserRecents").then(function (UserRecentsService) {
+        return Container.getServiceAsync("UserRecents").then(function (UserRecentsService) {
             return UserRecentsService.getFrequentActivity().then(function (oRecents) {
                 var aFinalResult = [],
                     oMapping = {

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

@@ -2,11 +2,12 @@
 
 /**
  * @fileOverview
- * @version 1.120.7
+ * @version 1.121.0
  */
 sap.ui.define([
-    "sap/base/Log"
-], function (Log) {
+    "sap/base/Log",
+    "sap/ushell/Container"
+], function (Log, Container) {
     "use strict";
 
     /**
@@ -37,7 +38,7 @@ sap.ui.define([
      * @private
      */
     RecentSearchProvider.prototype.execSearch = function () {
-        return sap.ushell.Container.getServiceAsync("UserRecents").then(function (UserRecentsService) {
+        return Container.getServiceAsync("UserRecents").then(function (UserRecentsService) {
             return UserRecentsService.getRecentSearches().then(function (aRecents) {
                 var aFinalResult = [];
                 if (Array.isArray(aRecents) && aRecents.length > 0) {

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.120.7
+ * @version 1.121.0
  */
 sap.ui.define([
     "sap/ushell/resources",

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

@@ -2,18 +2,20 @@
 
 /**
  * @fileOverview This module handles the navigation service search actions
- * @version 1.120.7
+ * @version 1.121.0
  */
 sap.ui.define([
     "sap/base/Log",
     "sap/ushell/Config",
     "sap/ushell/resources",
-    "sap/base/util/ObjectPath"
+    "sap/base/util/ObjectPath",
+    "sap/ushell/Container"
 ], function (
     Log,
     Config,
     resources,
-    ObjectPath
+    ObjectPath,
+    Container
 ) {
     "use strict";
 
@@ -93,10 +95,10 @@ sap.ui.define([
                 break;
         }
 
-        return sap.ushell.Container.getServiceAsync("SearchCEP").then(function (SearchCEPService) {
+        return Container.getServiceAsync("SearchCEP").then(function (SearchCEPService) {
             return SearchCEPService.suggest(oParams).then(function (oResult) {
                 var bIsSearchCEPEnabled = ObjectPath.get("sap-ushell-config.services.SearchCEP") !== undefined,
-                    sPlatform = sap.ushell.Container.getFLPPlatform(true),
+                    sPlatform = Container.getFLPPlatform(true),
                     bIsCEPStandard = bIsSearchCEPEnabled === true && sPlatform === "cFLP",
                     aFinalResult = [],
                     bESSearchEnabled = ObjectPath.get("sap-ushell-config.renderers.fiori2.componentData.config.searchBusinessObjects"),
@@ -138,7 +140,7 @@ sap.ui.define([
     function _addESToResult (aResult, sQuery) {
         var sHash = "#Action-search&/top=20&filter={\"dataSource\":{\"type\":\"Category\",\"id\":\"All\",\"label\":\"All\",\"labelPlural\":\"All\"},\"searchTerm\":\"" +
             sQuery + "\",\"rootCondition\":{\"type\":\"Complex\",\"operator\":\"And\",\"conditions\":[]}}",
-            sUrl = sap.ushell.Container.getFLPUrl() + sHash,
+            sUrl = Container.getFLPUrl() + sHash,
             oESearch = {
                 "text": resources.i18n.getText("enterprise_search"),
                 "description": resources.i18n.getText("enterprise_search"),

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

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
-    "sap/ui/core/Core",
+    "sap/ui/core/Element",
     "sap/ui/core/mvc/XMLView",
     "sap/ui/core/UIComponent",
     "sap/ui/model/json/JSONModel",
@@ -21,7 +21,7 @@ sap.ui.define([
     "sap/ushell/ui/shell/ShellHeadItem",
     "sap/ushell/utils"
 ], function (
-    Core,
+    Element,
     XMLView,
     UIComponent,
     JSONModel,
@@ -48,7 +48,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.Settings.Component", {
 
         metadata: {
-            version: "1.120.7",
+            version: "1.121.0",
             library: "sap.ushell",
             dependencies: {
                 libs: {
@@ -67,7 +67,7 @@ sap.ui.define([
          */
         init: function () {
             UIComponent.prototype.init.apply(this, arguments);
-            var oShellConfig = sap.ushell.Container.getRenderer("fiori2").getShellConfig();
+            var oShellConfig = sap.ushell.Container.getRendererInternal("fiori2").getShellConfig();
             if (oShellConfig.moveUserSettingsActionToShellHeader) {
                 this.oSettingsBtn = this._addUserSettingsButton();
             }
@@ -130,7 +130,7 @@ sap.ui.define([
                 aEntities.push(UserDefaultsEntry.getEntry()); // User Defaults
             }
 
-            aEntities = sap.ushell.Container.getRenderer("fiori2").reorderUserPrefEntries(aEntities);
+            aEntities = sap.ushell.Container.getRendererInternal("fiori2").reorderUserPrefEntries(aEntities);
             Config.emit("/core/userPreferences/entries", aEntities);
         },
 
@@ -171,7 +171,7 @@ sap.ui.define([
                     }));
                     oSettingView.setModel(resources.i18nModel, "i18n");
                     var sControlId = oEvent.controlId || "shell-header";
-                    Core.byId(sControlId).addDependent(oSettingView);
+                    Element.getElementById(sControlId).addDependent(oSettingView);
                     return oSettingView.byId("userSettingsDialog");
                 }.bind(this));
             }
@@ -195,7 +195,7 @@ sap.ui.define([
                 press: this._openUserSettings.bind(this)
             });
             //Use ElementsModel, because button should be added only for specific states without propagation
-            sap.ushell.Container.getRenderer("fiori2").oShellModel.addHeaderEndItem(
+            sap.ushell.Container.getRendererInternal("fiori2").oShellModel.addHeaderEndItem(
                 [oUserSettingsButton.getId()],
                 false,
                 ["home", "app", "minimal", "standalone", "embedded", "embedded-home", "merged", "merged-home"],

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

@@ -26,7 +26,7 @@ sap.ui.define([
     /**
      * Filter messages of the MessageManager based on the target
      *
-     * @returns {array} An array of messages to be displayed
+     * @returns {object[]} An array of messages to be displayed
      * @private
      */
     function filterMessagesToDisplay () {

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

@@ -2,7 +2,7 @@
 
 sap.ui.define([
     "sap/base/Log",
-    "sap/ui/core/Core",
+    "sap/ui/core/Element",
     "sap/ui/core/mvc/Controller",
     "sap/ui/core/Fragment",
     "sap/ui/model/json/JSONModel",
@@ -18,7 +18,7 @@ sap.ui.define([
     "sap/base/util/deepClone"
 ], function (
     Log,
-    Core,
+    Element,
     Controller,
     Fragment,
     JSONModel,
@@ -520,7 +520,7 @@ sap.ui.define([
                     this._mLoadedEntryContent.set(oEntry.id, new Promise(function (resolve) {
                         oEntry.contentFunc()
                             .then(function (oContentResult) {
-                                if (BaseObject.isA(oContentResult, "sap.ui.core.Control")) {
+                                if (BaseObject.isObjectA(oContentResult, "sap.ui.core.Control")) {
                                     resolve(oContentResult);
                                 } else {
                                     this._createErrorContent(resources.i18n.getText("loadingErrorMessage")).then(resolve);
@@ -556,7 +556,7 @@ sap.ui.define([
                     name: "sap.ushell.components.shell.Settings.ContentWrapper",
                     controller: {
                         onTabSelected: function (oEvent) {
-                            var oIconTabBar = Core.byId(oEvent.getParameter("id"));
+                            var oIconTabBar = Element.getElementById(oEvent.getParameter("id"));
                             var oIconTabFilter = oEvent.getParameter("item");
                             var iTabIndex = oIconTabBar.indexOfItem(oIconTabFilter);
                             var oTabEntryContext = oEntry.tabs[iTabIndex];
@@ -694,7 +694,7 @@ sap.ui.define([
 
         /**
          * Reloads FLP if instructions for it are found in results parameter.
-         * @param {Array} aResults Array that contains the results.
+         * @param {object[]} aResults Array that contains the results.
          * @returns {boolean} bReloaded true if FLP was reloaded
          */
         _maybeReload: function (aResults) {
@@ -828,7 +828,7 @@ sap.ui.define([
                         ErrorMessageHelper.addMessage(message);
                     });
                     return;
-                } else if (BaseObject.isA(errorInformation, "sap.ui.core.message.Message")) {
+                } else if (BaseObject.isObjectA(errorInformation, "sap.ui.core.message.Message")) {
                     errorInformation.setAdditionalText(sEntryTitle);
                     errorInformation.setTechnicalDetails({ pluginId: sEntryId });
                     ErrorMessageHelper.addMessage(errorInformation);