@sapui5/sap.ushell 1.136.2 → 1.136.4

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

@@ -33,7 +33,7 @@ sap.ui.define([
     NotificationsEntry,
     UserDefaultsEntry,
     ShellHeadItem,
-    Utils,
+    ushellUtils,
     Container,
     StateManager
 ) {
@@ -47,7 +47,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.Settings.Component", {
 
         metadata: {
-            version: "1.136.2",
+            version: "1.136.4",
             library: "sap.ushell",
             dependencies: {
                 libs: {
@@ -66,10 +66,13 @@ sap.ui.define([
          */
         init: function () {
             UIComponent.prototype.init.apply(this, arguments);
+            this._aInitPromises = [];
             var oShellConfig = Container.getRendererInternal("fiori2").getShellConfig();
 
             if (oShellConfig.moveUserSettingsActionToShellHeader) {
-                this.oSettingsBtn = this._addUserSettingsButton();
+                this._aInitPromises.push(this._addUserSettingsButton().then((oUserSettingsButton) => {
+                    this.oSettingsBtn = oUserSettingsButton;
+                }));
             }
 
             this._addStandardEntityToConfig(); // Standard entities
@@ -79,6 +82,8 @@ sap.ui.define([
             }
 
             aDoables.push(EventHub.on("openUserSettings").do(this._openUserSettings.bind(this)));
+
+            this._pInitPromise = Promise.all(this._aInitPromises);
         },
 
         _updateUserPreferencesEntries: function (aEntities) {
@@ -131,7 +136,7 @@ sap.ui.define([
                                     if (!isActive) {
                                         return;
                                     }
-                                    Utils.setPerformanceMark("FLP -- search setting entry is set active");
+                                    ushellUtils.setPerformanceMark("FLP -- search setting entry is set active");
                                     aEntities = Config.last("/core/userPreferences/entries");
                                     aEntities.push(searchEntry);
                                     this._updateUserPreferencesEntries(aEntities);
@@ -202,14 +207,29 @@ sap.ui.define([
          *
          * @returns {sap.ushell.ui.shell.ShellHeadItem} settings button
          */
-        _addUserSettingsButton: function () {
-            var oUserSettingsButton = new ShellHeadItem({
-                id: "userSettingsBtn",
-                icon: "sap-icon://action-settings",
-                text: resources.i18n.getText("userSettings"),
-                ariaHaspopup: "dialog",
-                press: this._openUserSettings.bind(this)
-            });
+        _addUserSettingsButton: async function () {
+            let oUserSettingsButton;
+            if (Config.last("/core/shellBar/enabled")) {
+                const [ShellBarItem] = await ushellUtils.requireAsync(["sap/ushell/gen/ui5/webcomponents-fiori/dist/ShellBarItem"]);
+                oUserSettingsButton = new ShellBarItem({
+                    id: "userSettingsBtn",
+                    icon: "sap-icon://action-settings",
+                    text: resources.i18n.getText("userSettings"),
+                    accessibilityAttributes: {
+                        hasPopup: "dialog"
+                    },
+                    click: this._openUserSettings.bind(this)
+                });
+            } else {
+                oUserSettingsButton = new ShellHeadItem({
+                    id: "userSettingsBtn",
+                    icon: "sap-icon://action-settings",
+                    text: resources.i18n.getText("userSettings"),
+                    ariaHaspopup: "dialog",
+                    press: this._openUserSettings.bind(this)
+                });
+            }
+
 
             // Add to userActions. The actual move happens within the state management
             StateManager.updateAllBaseStates("userActions.items", Operation.Add, oUserSettingsButton.getId());

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

@@ -84,29 +84,15 @@ sap.ui.define([
          *
          * @private
          */
-        onClearHistory: function () {
-            Container.getServiceAsync("UserRecents").then(function (oService) {
-                oService.clearRecentActivities();
-                this._showClearHistoryMessageToast();
-            }.bind(this));
-        },
+        onClearHistory: async function () {
+            const oUserRecentsService = await Container.getServiceAsync("UserRecents");
+            await oUserRecentsService.clearRecentActivities();
 
-        /**
-         * Show a message toast to inform the user that the history has been cleared.
-         *
-         * @private
-         */
-        _showClearHistoryMessageToast: function () {
-            sap.ui.require(["sap/m/MessageToast"], function (MessageToast) {
-                var sMessage = resources.i18n.getText("historyCleared");
-                MessageToast.show(sMessage, {
-                    width: "15em",
-                    my: "center bottom",
-                    at: "center bottom",
-                    of: window,
-                    offset: "0 -50", //-50 to give a bit of room between the box and the bottom of the screen.
-                    collision: "fit fit"
-                });
+            return new Promise((resolve, reject) => {
+                sap.ui.require(["sap/m/MessageToast"], (MessageToast) => {
+                    MessageToast.show(resources.i18n.getText("historyCleared"));
+                    resolve();
+                }, reject);
             });
         }
     });

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

@@ -4,12 +4,15 @@ sap.ui.define([
     "sap/ui/core/UIComponent",
     "sap/ui/Device",
     "sap/ui/model/json/JSONModel",
-    "sap/ushell/renderer/ShellLayout"
+    "sap/ushell/renderer/ShellLayout",
+    "sap/ushell/utils"
 ], function (
     UIComponent,
     Device,
     JSONModel,
-    ShellLayout) {
+    ShellLayout,
+    ushellUtils
+) {
     "use strict";
 
     const sSearchOverlayCSS = "sapUshellShellShowSearchOverlay";
@@ -62,26 +65,16 @@ sap.ui.define([
 
             // handle initial state of the side content
             const bInitialValue = ShellLayout.hasAdjacentSideContentBeforeMain();
-            this._applySideContent(bInitialValue);
+            ushellUtils.applySideContent.call(this, bInitialValue);
 
             // attach event handler for side content changes
-            ShellLayout.attachAdjacentSideContentBeforeMainChanged(this._handleSideContent, this);
-        },
-
-        _handleSideContent: function (oEvent) {
-            const oParameters = oEvent.getParameters();
-            const bHasAdjacentContentBefore = oParameters.hasAdjacentContentBefore;
-            this._applySideContent(bHasAdjacentContentBefore);
-        },
-
-        _applySideContent: function (bHasAdjacentContentBefore) {
-            this.rootControlLoaded().then((oView) => {
-                oView.toggleStyleClass("sapUshellFixedPadding", bHasAdjacentContentBefore);
-            });
+            ShellLayout.attachAdjacentSideContentBeforeMainChanged(ushellUtils.handleSideContent.bind(this), this);
         },
 
         setSearch: function (oSearchField) {
             this.rootControlLoaded().then((oView) => {
+                // removes the dummy input in the searchField slot for ESearch case when the search is being init by the SearchShellHelper
+                oView.byId("dummySearchInput")?.destroy();
                 oView.byId("shellBar").addSearchField(oSearchField);
             });
         },
@@ -142,7 +135,7 @@ sap.ui.define([
         },
 
         exit: function () {
-            ShellLayout.detachAdjacentSideContentBeforeMainChanged(this._handleSideContent, this);
+            ShellLayout.detachAdjacentSideContentBeforeMainChanged(ushellUtils.handleSideContent.bind(this), this);
         }
     });
 });

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

@@ -191,16 +191,6 @@ sap.ui.define([
             EventHub.emit("showProducts", Date.now());
         },
 
-        onLogoClick: function () {
-            Container.getServiceAsync("Navigation").then((oNavigation) => {
-                oNavigation.navigate({
-                    target: {
-                        shellHash: this.getOwnerComponent().getModel().getProperty("/logo/homeUri")
-                    }
-                });
-            });
-        },
-
         prepareLogo: function () {
             const oModel = this.getOwnerComponent().getModel();
             this.getCustomLogoAltText();
@@ -219,7 +209,7 @@ sap.ui.define([
                 text: "{shellModel>/application/title}",
                 title: "{shellModel>/application/title}",
                 icon: "{shellModel>/application/icon}",
-                subTitle: "{shellModel>/header/secondTitle}"
+                subTitle: "{shellModel>/application/subTitle}"
             });
             // set the ShellAppTitle to be the last thing to be hidden when screen gets small
             oShellAppTitle.data("hide-order", "9999", true);

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

package/src/main/js/sap/ushell/components/shell/ShellBar/view/ShellBar.view.xml

@@ -17,10 +17,8 @@
     <thirdparty:ShellBar
         id="shellBar"
         class="sapUshellShellSearch sapUshellShellBar"
-        primaryTitle="{config>/windowTitleExtension}"
         secondaryTitle="{shellModel>/header/secondTitle}"
         searchFieldToggle=".onSearchFieldToggle"
-        logoClick=".onLogoClick"
         showSearchField="{/searchField/show}"
         hideSearchButton="{/searchField/show}"
         contentItemVisibilityChange=".onContentItemVisibilityChange"
@@ -57,13 +55,20 @@
             filters: [{ path: '', test: '.isProfileMenu' }]
         }"
     >
-        <thirdparty:logo>
-            <m:Image
-                src="{/logo/src}"
-                alt="{/logo/alt}"
-                tooltip="{= ${/logo/isRootIntent} ? ${i18n>homeBtn_tooltip_text} : ${i18n>lastPage_tooltip}}"
-            />
-        </thirdparty:logo>
+        <thirdparty:branding>
+            <thirdparty:ShellBarBranding
+                href="{/logo/homeUri}"
+                target="_self"
+                text="{config>/windowTitleExtension}">
+                <thirdparty:logo>
+                    <m:Image
+                        src="{/logo/src}"
+                        alt="{/logo/alt}"
+                        tooltip="{= ${/logo/isRootIntent} ? ${i18n>homeBtn_tooltip_text} : ${i18n>lastPage_tooltip}}"
+                    />
+                </thirdparty:logo>
+            </thirdparty:ShellBarBranding>
+        </thirdparty:branding>
         <thirdparty:customData>
             <core:CustomData
                 key="help-id"
@@ -71,5 +76,10 @@
                 writeToDom="true"
             />
         </thirdparty:customData>
+        <thirdparty:searchField>
+            <!-- content added by the ESearch module (library "sap/esh/search/ui/SearchShellHelper") by calling setSearch method on ShellBar component -->
+            <!-- this is required in order to avoid pre-fetching a lot of fragment.xmls on first render which might not be used -->
+            <m:Input id="dummySearchInput"/>
+        </thirdparty:searchField>
     </thirdparty:ShellBar>
 </mvc:View>

package/src/main/js/sap/ushell/components/shell/SideNavigation/fragment/Popover.fragment.xml

@@ -4,12 +4,12 @@
     xmlns:mvc="sap.ui.core.mvc"
     xmlns:tnt="sap.tnt"
     core:require="{
-        mLibrary: 'sap/m/library'
+        Device: 'sap/ui/Device'
     }">
     <ResponsivePopover
         id="sideNavigationPopover"
         verticalScrolling="false"
-        showHeader="false"
+        showHeader="{= Device.system.phone}"
         placement="Bottom"
         ariaLabelledBy="sideNavigationLabel">
 		<core:InvisibleText id="sideNavigationLabel" text="{i18n>SideNavigation.PopoverLabel}"/>

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.SideNavigation",
         "applicationVersion": {
-            "version": "1.136.2"
+            "version": "1.136.4"
         },
         "i18n": {
             "bundleUrl": "./resources/resources.properties",

package/src/main/js/sap/ushell/components/shell/SideNavigation/modules/Favorites.js

@@ -241,7 +241,7 @@ sap.ui.define([
             // Process visualizations to extract relevant information
             Container.getServiceAsync("VisualizationInstantiation").then((oVisualizationInstantiationService) => {
                 aVisualizations.forEach((oVisualization) => {
-                    if (oVisualization.vizType?.startsWith("X-SAP-UI2-CHIP:SSB")) {
+                    if (oVisualization.vizType?.startsWith("X-SAP-UI2-CHIP:SSB") && !this.#oSmartBusinessVizInstances[oVisualization.id]) {
                         const oVizInstance = oVisualizationInstantiationService.instantiateVisualization(oVisualization);
                         oVizInstance.setActive(true);
                         oVizInstance.loaded().then(() => {

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

@@ -14,7 +14,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.UserActionsMenu.Component", {
 
         metadata: {
-            version: "1.136.2",
+            version: "1.136.4",
             library: "sap.ushell",
             dependencies: {
                 libs: ["sap.m"]

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

@@ -39,7 +39,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.UserImage.Component", {
 
         metadata: {
-            version: "1.136.2",
+            version: "1.136.4",
             library: "sap.ushell.components.shell.UserImage",
             dependencies: {
                 libs: {

package/src/main/js/sap/ushell/components/visualizationOrganizer/Component.js

@@ -40,7 +40,7 @@ sap.ui.define([
     // visualizationOrganizer Component
     return UIComponent.extend("sap.ushell.components.visualizationOrganizer.Component", {
         metadata: {
-            version: "1.136.2",
+            version: "1.136.4",
             library: "sap.ushell",
             dependencies: { libs: ["sap.m"] },
             properties: {

package/src/main/js/sap/ushell/components/workPageBuilder/Component.js

@@ -3,7 +3,7 @@
  * @fileOverview WorkPageBuilder Component
  * This UIComponent gets initialized by the FLP renderer upon visiting a work page if work pages are enabled (/core/workPages/enabled).
  *
- * @version 1.136.2
+ * @version 1.136.4
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/workPageBuilder/controller/WorkPageBuilder.accessibility.js

@@ -2,7 +2,7 @@
 
 /**
  * @file WorkPageBuilder accessibility features
- * @version 1.136.2
+ * @version 1.136.4
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/workPageBuilder/controller/WorkPageBuilder.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file WorkPageBuilder controller for WorkPageBuilder view
- * @version 1.136.2
+ * @version 1.136.4
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/workPageBuilder/controls/WorkPage.js

@@ -36,7 +36,7 @@ sap.ui.define([
      * @extends sap.ui.core.Control
      *
      *
-     * @version 1.136.2
+     * @version 1.136.4
      *
      * @private
      * @experimental

package/src/main/js/sap/ushell/components/workPageBuilder/controls/WorkPageButton.js

@@ -20,7 +20,7 @@ sap.ui.define([
      * @extends sap.ui.core.Control
      *
      *
-     * @version 1.136.2
+     * @version 1.136.4
      *
      * @private
      * @experimental

package/src/main/js/sap/ushell/components/workPageBuilder/controls/WorkPageCell.js

@@ -48,7 +48,7 @@ sap.ui.define([
      * @extends sap.ui.core.Control
      *
      *
-     * @version 1.136.2
+     * @version 1.136.4
      *
      * @private
      * @experimental

package/src/main/js/sap/ushell/components/workPageBuilder/controls/WorkPageColumn.js

@@ -32,7 +32,7 @@ sap.ui.define([
      * @extends sap.ui.core.Control
      *
      *
-     * @version 1.136.2
+     * @version 1.136.4
      *
      * @private
      * @experimental

package/src/main/js/sap/ushell/components/workPageBuilder/controls/WorkPageColumnResizer.js

@@ -17,7 +17,7 @@ sap.ui.define([
      * @extends sap.ui.core.Control
      *
      *
-     * @version 1.136.2
+     * @version 1.136.4
      *
      * @private
      * @experimental

package/src/main/js/sap/ushell/components/workPageBuilder/controls/WorkPageRow.js

@@ -25,7 +25,7 @@ sap.ui.define([
      * @extends sap.ui.core.Control
      *
      *
-     * @version 1.136.2
+     * @version 1.136.4
      *
      * @private
      * @experimental

package/src/main/js/sap/ushell/components/workPageBuilder/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.workPageBuilder",
         "applicationVersion": {
-            "version": "1.136.2"
+            "version": "1.136.4"
         },
         "i18n": "../../utils/workpage/resources/resources.properties",
         "ach": "CA-FLP-FE-UI",

package/src/main/js/sap/ushell/components/workPageBuilder/resources/resources_ms.properties

@@ -15,7 +15,7 @@ WorkPage.Row.OverflowToolbar.DeleteRowButtonTooltip=Padam Bahagian
 WorkPage.Row.DeleteDialog.Title=Padam
 WorkPage.Row.DeleteDialog.ConfirmText=Adakah anda mahu padam bahagian ini dan semua kandungannya?
 WorkPage.Row.DeleteDialog.Button.Confirm=Padam
-WorkPage.Row.DeleteDialog.Button.Cancel=Batal
+WorkPage.Row.DeleteDialog.Button.Cancel=Batalkan
 WorkPage.Row.AddRowButtonTooltip=Tambah Bahagian
 WorkPage.Row.MessageStrip.DeprecatedColumnCount=Dalam masa jalanan, hanya empat lajur pertama boleh dilihat. Sila kurangkan bilangan lajur kepada empat.
 WorkPage.Row.AriaLabel=Bahagian Halaman Kerja

package/src/main/js/sap/ushell/components/workPageRuntime/Component.js

@@ -3,7 +3,7 @@
  * @fileOverview WorkPages Runtime Component
  * This UIComponent gets initialized by the FLP renderer if work pages are enabled (/core/workPages/enabled).
  *
- * @version 1.136.2
+ * @version 1.136.4
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/workPageRuntime/controller/WorkPageRuntime.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file WorkPageRuntime controller for WorkPageRuntime view
- * @version 1.136.2
+ * @version 1.136.4
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/workPageRuntime/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.workPageRuntime",
         "applicationVersion": {
-            "version": "1.136.2"
+            "version": "1.136.4"
         },
         "ach": "CA-FLP-FE-UI",
         "type": "component",

package/src/main/js/sap/ushell/designtime/ApplicationContainer.designtime.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview Provides the Design Time Metadata for the sap.ushell.components.container.ApplicationContainer control
- * @version 1.136.2
+ * @version 1.136.4
  */
 sap.ui.define([], function () {
     "use strict";

package/src/main/js/sap/ushell/gen/ui5/webcomponents/dist/Avatar.js

@@ -99,7 +99,13 @@ sap.ui.define([
     }
   },
   "associations": {},
-  "events": {},
+  "events": {
+    "click": {
+      "allowPreventDefault": false,
+      "enableEventBubbling": true,
+      "parameters": {}
+    }
+  },
   "getters": [],
   "methods": [],
   "defaultAggregation": "image",

package/src/main/js/sap/ushell/gen/ui5/webcomponents/dist/MenuItem.js

@@ -61,6 +61,11 @@ sap.ui.define([
       "type": "string",
       "mapping": "property"
     },
+    "checked": {
+      "type": "boolean",
+      "mapping": "property",
+      "defaultValue": false
+    },
     "accessibilityAttributes": {
       "type": "object",
       "mapping": "property",
@@ -133,6 +138,11 @@ sap.ui.define([
       "enableEventBubbling": false,
       "parameters": {}
     },
+    "check": {
+      "allowPreventDefault": false,
+      "enableEventBubbling": true,
+      "parameters": {}
+    },
     "detailClick": {
       "allowPreventDefault": false,
       "enableEventBubbling": true,

package/src/main/js/sap/ushell/gen/ui5/webcomponents-base.js

@@ -17,7 +17,7 @@ sap.ui.define([
     "_ui5metadata":
 {
   "name": "sap/ushell/gen/ui5/webcomponents-base",
-  "version": "2.11.0-rc.3",
+  "version": "2.13.0-rc.0",
   "dependencies": [
     "sap.ui.core"
   ],

package/src/main/js/sap/ushell/gen/ui5/webcomponents-fiori/dist/ShellBar.js

@@ -80,6 +80,11 @@ sap.ui.define([
       "multiple": true,
       "slot": "assistant"
     },
+    "branding": {
+      "type": "sap.ushell.gen.ui5.webcomponents-fiori.dist.ShellBarBranding",
+      "multiple": true,
+      "slot": "branding"
+    },
     "items": {
       "type": "sap.ushell.gen.ui5.webcomponents-fiori.dist.ShellBarItem",
       "multiple": true

package/src/main/js/sap/ushell/gen/ui5/webcomponents-fiori/dist/ShellBarBranding.js

@@ -0,0 +1,76 @@
+/*!
+ * Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+ */
+sap.ui.define([
+  "sap/ui/core/webc/WebComponent",
+  "sap/ushell/gen/ui5/webcomponents-fiori",
+  "sap/ushell/thirdparty/ShellBarBranding",
+], function(
+  WebComponentBaseClass,
+) {
+  "use strict";
+
+
+  const WrapperClass = WebComponentBaseClass.extend("sap.ushell.gen.ui5.webcomponents-fiori.dist.ShellBarBranding", {
+    metadata:
+{
+  "namespace": "sap/ushell/gen/ui5/webcomponents-fiori",
+  "qualifiedNamespace": "sap.ushell.gen.ui5.webcomponents-fiori",
+  "tag": "ui5-shellbar-branding-16d3c820",
+  "interfaces": [],
+  "properties": {
+    "href": {
+      "type": "string",
+      "mapping": "property"
+    },
+    "target": {
+      "type": "string",
+      "mapping": "property"
+    },
+    "accessibleName": {
+      "type": "string",
+      "mapping": "property"
+    },
+    "text": {
+      "type": "string",
+      "mapping": "textContent"
+    },
+    "width": {
+      "type": "sap.ui.core.CSSSize",
+      "mapping": "style"
+    },
+    "height": {
+      "type": "sap.ui.core.CSSSize",
+      "mapping": "style"
+    }
+  },
+  "aggregations": {
+    "content": {
+      "type": "sap.ui.core.Control",
+      "multiple": true
+    },
+    "logo": {
+      "type": "sap.ui.core.Control",
+      "multiple": true,
+      "slot": "logo"
+    }
+  },
+  "associations": {},
+  "events": {
+    "click": {
+      "allowPreventDefault": false,
+      "enableEventBubbling": true,
+      "parameters": {}
+    }
+  },
+  "getters": [],
+  "methods": [],
+  "defaultAggregation": "content",
+  "designtime": "sap/ushell/gen/ui5/webcomponents-fiori/designtime/ShellBarBranding.designtime"
+}
+  });
+
+
+  return WrapperClass;
+
+});