@sapui5/sap.ushell 1.139.0 → 1.140.0

package/src/main/js/sap/ushell/performance/FesrEnhancer.js

@@ -11,13 +11,15 @@ sap.ui.define([
     "sap/base/util/deepExtend",
     "sap/ui/performance/trace/FESR",
     "sap/ushell/EventHub",
-    "sap/ushell/performance/ShellAnalytics"
+    "sap/ushell/performance/ShellAnalytics",
+    "sap/ushell/renderer/RendererManagedComponents"
 ], (
     Log,
     deepExtend,
     FESR,
     EventHub,
-    ShellAnalytics
+    ShellAnalytics,
+    RendererManagedComponents
 ) => {
     "use strict";
 
@@ -66,6 +68,8 @@ sap.ui.define([
         }
     };
 
+    const oRendererManagedComponents = new RendererManagedComponents();
+
     const oFesrEnhancer = {
         _fnOriginalOnBeforeCreated: null,
         _oLastTrackedRecord: null,
@@ -265,17 +269,18 @@ sap.ui.define([
 
         /**
          * Shortens a value at the end according to the formatting key and
-         * does not shortens the postfix
+         * does not shorten the postfix
          * which is considered part of the length.
          *
          * @param {string|int} vValue the Value
          * @param {string} sFormatKey The formatting key
+         * @param {int} [iModifiedMaxLength=0] The modified max length to be used for shortening
          * @returns {sShortenedValue} The shortened value
          *
          * @private
          * @since 1.121.0
          */
-        shortenWithPostfix: function (vValue, sFormatKey) {
+        shortenWithPostfix: function (vValue, sFormatKey, iModifiedMaxLength = 0) {
             const oFormatter = oFieldFormatting[sFormatKey];
             // if no formatter pass through the value
             if (oFormatter) {
@@ -288,12 +293,14 @@ sap.ui.define([
                         // add it again.
                         const oPostfixFormatter = {
                             ...oFormatter,
-                            maxLength: oFormatter.maxLength - oFormatter.postfix.length
+                            maxLength: oFormatter.maxLength - oFormatter.postfix.length + iModifiedMaxLength
                         };
+                        // Format the value without postfix
                         const sShortenedWithoutPostfix = this.shortenAccordingToFormatter(
                             vValue.slice(0, -1 * oPostfixFormatter.postfix.length),
                             oPostfixFormatter
                         );
+                        // return the shortened value with postfix
                         return sShortenedWithoutPostfix + oPostfixFormatter.postfix;
                     }
                 }
@@ -302,11 +309,38 @@ sap.ui.define([
             return vValue;
         },
 
+        /**
+         * Sanitizes the value according to the given format key.
+         * Only supported fields are sanitized.
+         * If the value is a string and contains a colon, it is shortened
+         * to the maximum length defined in the formatter, keeping the postfix.
+         * @param {string|int} vValue The value to be sanitized
+         * @param {string} sFormatKey The format key to be used for sanitization
+         * @returns {string|int|undefined} The sanitized value or undefined if the field is not supported or the value is falsy
+         * @private
+         * @since 1.139.0
+         */
+        sanitizeValue: function (vValue, sFormatKey) {
+            // only keep supported fields and actual values
+            if (aSupportedFields.includes(sFormatKey) && vValue) {
+                // shorten if max Length is provided else keep it as it is
+                if (typeof (vValue) === "string" && vValue.includes(":")) {
+                    // strip the postfix and shorten the first part
+                    // and add the second part again.
+                    const [sPrefix, sPostfix] = vValue.split(":");
+                    return `${this.shortenWithPostfix(sPrefix, sFormatKey, -5)}:${sPostfix}`;
+                }
+                // shorten the value according to the formatter
+                return this.shortenWithPostfix(vValue, sFormatKey);
+            }
+        },
+
         /**
          * Sanitizes the enhancement according to object oFieldFormatting.
          * Only attributes in array aSupportedFields are treated.
          * Attributes are shortened if max length is given.
          * Postfix is taking into account if given.
+         * It deletes attributes whose values are undefined.
          *
          * @param {object} oEnhancement Enhancement to be sanitized
          * @returns {object} santized Enhancement
@@ -317,10 +351,9 @@ sap.ui.define([
         sanitizeEnhancement: function (oEnhancement) {
             return Object.keys(oEnhancement).reduce((oResult, sKey) => {
                 const vValue = oEnhancement[sKey];
-                // only keep supported fields and actual values
-                if (aSupportedFields.includes(sKey) && vValue) {
-                    // shorten if max Length is provided else keep it as it is
-                    oResult[sKey] = this.shortenWithPostfix(vValue, sKey);
+                const sSanitizedValue = this.sanitizeValue(vValue, sKey);
+                if (sSanitizedValue !== undefined) {
+                    oResult[sKey] = sSanitizedValue;
                 }
                 return oResult;
             }, {});
@@ -404,16 +437,21 @@ sap.ui.define([
                 } else {
                     // case app finder, pages, and homepage
                     switch (oFesrHandle.appNameLong) {
-                        case "sap.ushell.components.homepage":
-                        case "sap.ushell.components.pages":
-                            sDeterminedScenario = SCENARIOS.HOME_INITIAL;
-                            break;
                         case "sap.ushell.components.appfinder":
                             sDeterminedScenario = SCENARIOS.FINDER_INITIAL;
                             break;
                         default:
-                            // application direct start
-                            sDeterminedScenario = SCENARIOS.APP_INITIAL;
+                            if (oRendererManagedComponents.isComponentName(oFesrHandle.appNameLong)) {
+                                // managed renderer component, e.g. "sap.ushell.components.pages", or menu
+                                if (oLastClosedRecord.getStep() === SCENARIOS.APP_INITIAL) {
+                                    sDeterminedScenario = SCENARIOS.APP_INITIAL;
+                                } else {
+                                    sDeterminedScenario = SCENARIOS.HOME_INITIAL;
+                                }
+                            } else {
+                                // application direct start / menu without web component
+                                sDeterminedScenario = SCENARIOS.APP_INITIAL;
+                            }
                     }
                 }
 

package/src/main/js/sap/ushell/performance/ShellAnalytics.js

@@ -3,7 +3,7 @@
  * @fileOverview Provides analytical data like duration for navigation steps in the shell, in FLP,
  *               in particular an array of all statistical records
  *
- * @version 1.139.0
+ * @version 1.140.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/performance/StatisticalRecord.js

@@ -3,12 +3,13 @@
  * @fileOverview Class for statistical record
  *               It should contain data like step, duration after a navigation in the shell, can have status open.
  *               The closing of a record is logged in debug mode
- * @version 1.139.0
+ * @version 1.140.0
  */
 sap.ui.define([
     "sap/base/Log",
-    "sap/ui/performance/trace/Interaction"
-], (Log, Interaction) => {
+    "sap/ui/performance/trace/Interaction",
+    "sap/ushell/api/performance/Extension"
+], (Log, Interaction, Extension) => {
     "use strict";
 
     const sModuleName = "StatisticalRecord";
@@ -20,6 +21,8 @@ sap.ui.define([
         ERROR: "ERROR"
     };
 
+    const oExtension = new Extension();
+
     class StatisticalRecord {
         // ==================== For debugging ====================
         /**
@@ -167,7 +170,13 @@ sap.ui.define([
          *
          * @returns {string} sStep The navigation step
          */
+        // eslint-disable-next-line complexity
         #calculateStep () {
+            Log.debug(`${sLogPrefix} Calculating Step`, null, sModuleName);
+            const oNavigationSource = oExtension.getNavigationSource();
+            // padded navigation source with a colon to separate it from the step
+            // e.g. ":siBa" or the empty string if no navigation source is defined
+            const sPaddedNavigationSource = oNavigationSource ? `:${oNavigationSource.id}` : "";
             const bIsTargetHome = this.#targetIsHomeApp || this.#isFLPHome(this.#targetApplication);
             const bIsSourceHome = this.#sourceIsHomeApp || this.#isFLPHome(this.#sourceApplication);
 
@@ -190,35 +199,35 @@ sap.ui.define([
             // if source and target application are not the homepage it is an app to app navigation.
             // if homepage is started the source application is undefined
             if (!bIsTargetHome && !bIsSourceHome) {
-                return `A2A@${this.#sourceApplication}`;
+                return `A2A@${this.#sourceApplication}${sPaddedNavigationSource}`;
             }
 
             // back to the homepage from some app
             if (this.#sourceApplication && bIsTargetHome && !bIsSourceHome) {
-                return `FLP_BACK@${this.#sourceApplication}`;
+                return `FLP_BACK@${this.#sourceApplication}${sPaddedNavigationSource}`;
             }
 
             // if navigation within home
             if (bIsSourceHome && bIsTargetHome) {
                 if (["FLP_FINDER", "FLP_HOME"].includes(this.#targetApplication)) {
-                    return `${this.#targetApplication}@H2H`;
+                    return `${this.#targetApplication}@H2H${sPaddedNavigationSource}`;
                 }
                 // back to custom home
                 if (this.#targetIsHomeApp) {
-                    return `${this.#targetApplication}@H2H`;
+                    return `${this.#targetApplication}@H2H${sPaddedNavigationSource}`;
                 }
                 // to a page
-                return `${this.#targetApplicationData.pageId}@H2H`;
+                return `${this.#targetApplicationData.pageId}@H2H${sPaddedNavigationSource}`;
             }
 
             // start app from flp home
             if (this.#isFLPHome(this.#sourceApplication)) {
-                return "FLP@HOMEPAGE_TILE";
+                return `FLP@HOMEPAGE_TILE${sPaddedNavigationSource}`;
             }
 
             // start app from custom home
             if (this.#sourceIsHomeApp) {
-                return "APPSTART@CUSTOMHOME";
+                return `APPSTART@CUSTOMHOME${sPaddedNavigationSource}`;
             }
             return "";
         }

package/src/main/js/sap/ushell/plugins/BaseRTAPlugin.js

@@ -83,8 +83,10 @@ sap.ui.define([
             }
             if (bVisible) {
                 this.oActionButton.showForAllApps();
+                this.oActionButton.showOnHome();
             } else {
                 this.oActionButton.hideForAllApps();
+                this.oActionButton.hideOnHome();
             }
         },
 

package/src/main/js/sap/ushell/plugins/appwarmup/Component.js

@@ -87,7 +87,7 @@ sap.ui.define(
         const sComponentName = "sap.ushell.plugins.appwarmup.Component";
         return Component.extend(sComponentName, {
             metadata: {
-                version: "1.139.0",
+                version: "1.140.0",
                 library: "sap.ushell"
             },
 

package/src/main/js/sap/ushell/plugins/rta/i18n/i18n_de.properties

@@ -10,4 +10,4 @@ TIT_UNSUPPORTED_BROWSER=Ihr Browser wird nicht unterst\u00FCtzt.
 
 HEADER_FLEX_DISABLED=Informationen
 
-MSG_FLEX_DISABLED=Diese Anwendung ist nicht f\u00FCr die Anpassung aktiviert. Weitere Informationen finden Sie unter (https\://help.sap.com/viewer/4fc8d03390c342da8a60f8ee387bca1a/latest/de-DE/ef97b2485aa34a8890f4d51e5c2b15a8.html).
+MSG_FLEX_DISABLED=Diese Anwendung ist nicht f\u00FCr die Anpassung aktiviert. Weitere Informationen finden Sie [hier](https\://help.sap.com/viewer/4fc8d03390c342da8a60f8ee387bca1a/latest/de-DE/ef97b2485aa34a8890f4d51e5c2b15a8.html).

package/src/main/js/sap/ushell/plugins/rta/i18n/i18n_vi.properties

@@ -1,6 +1,6 @@
 
 RTA_BUTTON_TEXT=Thi\u0301ch \u01B0\u0301ng UI
-ERROR_TITLE=Kh\u00F4ng th\u00EA\u0309 b\u0103\u0301t \u0111\u00E2\u0300u thi\u0301ch \u01B0\u0301ng UI
+ERROR_TITLE=Kh\u00F4ng th\u00EA\u0309 b\u0103\u0301t \u0111\u00E2\u0300u \u0111i\u1EC1u ch\u1EC9nh UI
 
 APP_TITLE=RTA FLP Plugin
 

package/src/main/js/sap/ushell/renderer/NavContainer.js

@@ -67,6 +67,11 @@ sap.ui.define([
         renderer: NavContainerRenderer
     });
 
+    NavContainer.prototype.init = function () {
+        Control.prototype.init.apply(this, arguments);
+        this.setBusyIndicatorDelay(4000);
+    };
+
     /**
      * Overrides the default implementation of the addAggregation method.
      * Adds a page to the NavContainer. The page is initially hidden.
@@ -184,6 +189,7 @@ sap.ui.define([
             from: oCurrentPage
         });
 
+        this.setBusy(false);
         this.getPages().forEach((oPage) => {
             this._setPageVisibility(oPage, oPage.getId() === sPageId);
         });
@@ -232,6 +238,7 @@ sap.ui.define([
      * Restores the last focused element.
      *
      * @private
+     * @param {string} sPageId The ID of the page to restore focus for.
      * @deprecated since 1.120. Only relevant for classic homepage.
      */
     NavContainer.prototype._restoreFocus = async function (sPageId) {

package/src/main/js/sap/ushell/renderer/Renderer.js

@@ -106,9 +106,9 @@ sap.ui.define([
      */
     const Renderer = UIComponent.extend("sap.ushell.renderer.Renderer", /** @lends sap.ushell.renderer.Renderer.prototype */ {
         metadata: {
-            version: "1.139.0",
+            version: "1.140.0",
             dependencies: {
-                version: "1.139.0",
+                version: "1.140.0",
                 libs: ["sap.ui.core", "sap.m"],
                 components: []
             },
@@ -2302,7 +2302,7 @@ sap.ui.define([
 
                 delete oProperties.press;
                 delete oProperties.ariaLabel;
-                //TODO Move to async import once the infrastructure gets updated with the latest browser version
+                // TODO Move to async import once the infrastructure gets updated with the latest browser version
                 const ShellBarItem = sap.ui.require("sap/ushell/gen/ui5/webcomponents-fiori/dist/ShellBarItem");
                 return new ShellBarItem(oProperties);
             }

package/src/main/js/sap/ushell/renderer/RendererManagedComponents.js

@@ -0,0 +1,200 @@
+// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+/**
+ * @fileOverview
+ * This module contains the list of renderer managed components for the SAP Fiori renderer.
+ */
+
+sap.ui.define([
+], (
+) => {
+    "use strict";
+
+    /**
+     * A type definition for the renderer managed components.
+     * @typedef {object} sap.ushell.renderer.RendererManagedComponents
+     * @property {string} id - The unique identifier of the renderer managed component.
+     * @property {string} [componentName] - The name of the component managed by the renderer.
+     * @example "id: pages" -> the default is sap.ushell.components.pages
+     * @property {string} [componentInstanceId] - The instance id of the component managed by the renderer.
+     * @example "id: pages" -> the default is pages-component
+     * @property {string} [flpName] - The name of the component used in FESR
+     * @example "id: pages" -> FLP_PAGE
+     * @property {string} [componentId] - The id of the compoent managed by the renderer.
+     * @example "id: pages" -> the default is pages-component-container
+     * @since 1.139.0
+     *
+     */
+
+    /**
+     * @class
+     * @classdesc Class for renderer managed components.
+     * This class provides methods to manage the array of renderer managed components
+     * It will provide the default values for the component names, instance ids, and ids.
+     *
+     * @since 1.139.0
+     * @private
+     */
+    class RendererManagedComponents {
+        /**
+         * The list of renderer managed components
+         * It will be completed with default values.
+         * @type {sap.ushell.renderer.RendererManagedComponents[]}
+         * @private
+         * @since 1.139.0
+         */
+        #rendererManagedComponents = [
+            {
+                id: "home",
+                componentName: "sap.ushell.components.homepage",
+                componentInstanceId: "Shell-home-component",
+                componentId: "Shell-home-component",
+                flpName: "FLP_HOME"
+            },
+            {
+                id: "pages",
+                flpName: "FLP_PAGE"
+            },
+            {
+                id: "workPageRuntime"
+            },
+            {
+                id: "appFinder",
+                componentInstanceId: "Shell-appfinder-component",
+                flpName: "FLP_FINDER"
+            },
+            {
+                id: "homeApp"
+            },
+            {
+                id: "runtimeSwitcher"
+            },
+            {
+                id: "homeAppComponentWrapper",
+                componentInstanceId: "homeApp-component-wrapper-container"
+            },
+            {
+                id: "ShellBar",
+                componentName: "sap.ushell.components.shell.ShellBar"
+            }
+        ];
+
+        /**
+         * Creates an instance of RendererManagedComponents.
+         * This constructor initializes the renderer managed components with default values.
+         * @public
+         * @since 1.139.0
+         */
+        constructor () {
+            this.#rendererManagedComponents = this.#rendererManagedComponents.map((oComponent) => {
+                if (!oComponent.componentName) {
+                    oComponent.componentName = `sap.ushell.components.${oComponent.id}`;
+                }
+                if (!oComponent.componentInstanceId) {
+                    oComponent.componentInstanceId = `${oComponent.id}-component`;
+                }
+                if (!oComponent.componentId) {
+                    oComponent.componentId = `${oComponent.id}-component-container`;
+                }
+                if (!oComponent.flpName) {
+                    oComponent.flpName = "FLP_PAGE";
+                }
+                return oComponent;
+            });
+        }
+
+        /**
+         * Returns the list of renderer managed components.
+         * @returns {sap.ushell.renderer.RendererManagedComponents[]} The list of renderer managed components.
+         * @public
+         * @since 1.139.0
+         */
+        getComponents () {
+            return this.#rendererManagedComponents;
+        }
+
+        /**
+         * Returns true if the component name is managed by the renderer.
+         * @param {string} sComponentName The component name to check.
+         * @returns {boolean} True if the FLP name is managed by the renderer,
+         * false otherwise.
+         * @public
+         * @since 1.139.0
+         */
+        isComponentName (sComponentName) {
+            return this.#rendererManagedComponents.some((oComponent) => oComponent.componentName === sComponentName);
+        }
+
+        /**
+         * Returns true is component instance id is managed by the renderer.
+         * @param {string} sComponentInstanceId The component instance id to check.
+         * @returns {boolean} True if the component instance id is managed by the renderer,
+         * false otherwise.
+         * @public
+         * @since 1.139.0
+         */
+        isComponentInstanceId (sComponentInstanceId) {
+            return this.#rendererManagedComponents.some((oComponent) => sComponentInstanceId.endsWith(oComponent.componentInstanceId));
+        }
+
+        /**
+         * Returns true if the component id is managed by the renderer.
+         * @param {string} sComponentId The component id to check.
+         * @returns {boolean} True if the component id is managed by the renderer,
+         * false otherwise.
+         * @public
+         * @since 1.139.0
+         */
+        isComponentId (sComponentId) {
+            return this.#rendererManagedComponents.some((oComponent) => sComponentId.endsWith(oComponent.componentId));
+        }
+
+        /**
+         * Returns the renderer managed component name by id.
+         * @param {string} sId The id of the renderer managed component.
+         * @returns {string|null} The renderer managed component name or null if not found.
+         * @public
+         * @since 1.139.0
+         */
+        getComponentNameById (sId) {
+            const oComponent = this.#rendererManagedComponents.find((oCurrentComponent) => oCurrentComponent.id === sId);
+            return oComponent ? oComponent.componentName : null;
+        }
+
+        /**
+         * Returns the renderer managed component instance id by id.
+         * @param {string} sId The id of the renderer managed component.
+         * @returns {string|null} The renderer managed component instance id or null if not found.
+         * @public
+         * @since 1.139.0
+         */
+        getComponentInstanceIdById (sId) {
+            const oComponent = this.#rendererManagedComponents.find((oCurrentComponent) => oCurrentComponent.id === sId);
+            return oComponent ? oComponent.componentInstanceId : null;
+        }
+
+        /**
+         * Returns the renderer managed component id by id.
+         * @param {string} sId The id of the renderer managed component.
+         * @returns {string|null} The renderer managed component id or null if not found.
+         * @public
+         * @since 1.139.0
+         */
+        getComponentIdById (sId) {
+            const oComponent = this.#rendererManagedComponents.find((oCurrentComponent) => oCurrentComponent.id === sId);
+            return oComponent ? oComponent.componentId : null;
+        }
+
+        /**
+         * Returns the renderer managed component flpName by id.
+         * @param {string} sId The id of the renderer managed component.
+         * @returns {string|null} The renderer managed component flpName or null if not found.
+         * @public
+         * @since 1.139.0
+         */
+        getFlpNameById (sId) {
+            const oComponent = this.#rendererManagedComponents.find((oCurrentComponent) => oCurrentComponent.id === sId);
+            return oComponent ? oComponent.flpName : null;
+        }
+    }
+    return RendererManagedComponents;
+});

package/src/main/js/sap/ushell/renderer/Shell.controller.js

@@ -1218,12 +1218,6 @@ sap.ui.define([
                 return oDeferred.promise();
             }
 
-            const oDashboard = Element.getElementById("sapUshellDashboardPage");
-            if (oDashboard) {
-                oDashboard.setBlocked(true);
-                oDashboard.setBusy(true);
-            }
-
             const fnResolveInteraction = this._notifyAsyncStep();
 
             this._doHashChange(sFixedShellHash, sInnerAppRoute, sFixedOldShellHash)
@@ -1234,11 +1228,6 @@ sap.ui.define([
                     Log.debug(`${sLogFesrPrefix} Interaction End`, "doHashChange", sModuleName);
                     fnResolveInteraction();
 
-                    if (oDashboard) {
-                        oDashboard.setBlocked(false);
-                        oDashboard.setBusy(false);
-                    }
-
                     NavigationState.endNavigation();
 
                     oDeferred.resolve();
@@ -1985,12 +1974,6 @@ sap.ui.define([
         },
 
         onAfterNavigate: function (oEvent) {
-            const oDashboard = Element.getElementById("sapUshellDashboardPage");
-            if (oDashboard) {
-                oDashboard.setBlocked(false);
-                oDashboard.setBusy(false);
-            }
-
             EventBus.getInstance().publish("sap.ushell", "navigated", {});
         },
 

package/src/main/js/sap/ushell/renderer/Shell.view.js

@@ -489,15 +489,18 @@ sap.ui.define([
             const addDanglingControl = this.addDanglingControl.bind(this);
             let oUserActionsMenuAvatar;
             if (Config.last("/core/shellBar/enabled")) {
-                sap.ui.require(["sap/ushell/gen/ui5/webcomponents/dist/Avatar"], (AvatarWC) => {
+                sap.ui.require(["sap/ushell/gen/ui5/webcomponents/dist/Avatar", "sap/m/Image"], (AvatarWC, Image) => {
                     oUserActionsMenuAvatar = new AvatarWC({
                         id: "userActionsMenuHeaderButton",
-                        icon: "{configModel>/userImage/personPlaceHolder}",
+                        icon: "sap-icon://person-placeholder",
                         initials: oUser.getInitials(),
                         tooltip: sTooltip,
                         click: function () {
                             EventHub.emit("showUserActionsMenu", Date.now());
-                        }
+                        },
+                        image: new Image({
+                            src: "{configModel>/userImage/personPlaceHolder}"
+                        })
                     });
                     oUserActionsMenuAvatar.setModel(oConfigModel, "configModel");
                     addDanglingControl(oUserActionsMenuAvatar);

package/src/main/js/sap/ushell/renderer/resources/resources_es.properties

@@ -127,7 +127,7 @@ NavigationUnsupported=La navegaci\u00F3n de destino no se admite. Compruebe la c
 preserveFormerResultErrorDetails=El estado de lista de resultados anterior (como elementos seleccionados o desglosados) no puede restablecerse por problemas t\u00E9cnicos.\n\nLa informaci\u00F3n siguiente puede ser \u00FAtil para el administrador del sistema\:\nEl estado de los elementos de lista de resultados no puede restablecerse porque faltan datos clave o son err\u00F3neos para una o m\u00E1s entidades existentes.\nVerifique la siguiente lista de claves de conector y aseg\u00FArese de que todos los atributos clave est\u00E9n incluidos en su modelo de b\u00FAsqueda como atributos de respuesta para el conector correspondiente\: {0}\n
 
 
-open_appFinderBtn=Busc.Aplic.
+open_appFinderBtn=Buscador de aplicaciones
 new_group_name=Indicar nombre de grupo
 added_tile_to_group=se ha desplazado a
 add_group_at=A\u00F1adir grupo