@sapui5/sap.ushell 1.141.3 → 1.143.0

package/src/main/js/sap/ushell/utils/UrlShortening.js

@@ -5,7 +5,7 @@
  *
  * This module is for internal Shell usage only
  *
- * @version 1.141.3
+ * @version 1.143.0
  */
 sap.ui.define(["sap/base/Log", "sap/ushell/utils/UrlParsing"], (Log, urlParsing) => {
     "use strict";

package/src/main/js/sap/ushell/utils/workpage/WorkPageHost.js

@@ -2,7 +2,7 @@
 
 /**
  * @file WorkPageHost for WorkPageBuilder and DWSPageBuilder
- * @version 1.141.3
+ * @version 1.143.0
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/utils/workpage/WorkPageService.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module communicates with the content API graphql service to retrieve workpage and visualization data.
- * @version 1.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/base/i18n/Localization",

package/src/main/js/sap/ushell/utils/workpage/WorkPageVizInstantiation.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module provides utilities for creating visualization instances for work pages.
- * @version 1.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/ushell/services/VisualizationInstantiation",

package/src/main/js/sap/ushell/utils.js

@@ -585,27 +585,6 @@ sap.ui.define([
         };
     };
 
-    /**
-     * Appends a "sap-shell" parameter to the given URL to indicate the FLP version to legacy applications.
-     * This method should be called only when it is necessary to add the sap-shell parameter to the URL.
-     *
-     * @param {string} sUrl The URL to be amended.
-     * @param {string} sApplicationType The application type for the given URL.
-     * @param {string} sVersion The UI5 version.
-     *
-     * @returns {string} The URL where the parameter should be appended to.
-     * @private
-     */
-    utils.appendSapShellParamSync = function (sUrl, sApplicationType, sVersion) {
-        const sUrlSuffix = sApplicationType === "TR" ? "" : "-NWBC";
-        if (sVersion) {
-            // we pass it either completely or not at all
-            sUrl += sUrl.indexOf("?") >= 0 ? "&" : "?"; // FIXME: This is a bug.
-            sUrl += `sap-shell=${encodeURIComponent(`FLP${sVersion}${sUrlSuffix}`)}`;
-        }
-        return sUrl;
-    };
-
     /**
      * Appends a "sap-shell" parameter to the given URL to indicate the FLP version to legacy applications.
      * This method should be called only when it is necessary to add the sap-shell parameter to the URL.
@@ -668,7 +647,7 @@ sap.ui.define([
      * @private
      */
     utils.getIframeFeaturePolicies = function () {
-        return "autoplay;battery;camera;display-capture;geolocation;gyroscope;magnetometer;microphone;midi;clipboard-write;clipboard-read;fullscreen;serial;";
+        return "autoplay;battery;camera;display-capture;geolocation;gyroscope;magnetometer;microphone;midi;clipboard-write;clipboard-read;fullscreen;serial;local-network-access *;";
     };
 
     /**
@@ -695,19 +674,16 @@ sap.ui.define([
      * @since 1.119.0
      * @private
      */
-    utils.getUi5Version = function () {
-        return new Promise((resolve, reject) => {
-            sap.ui.require(["sap/ui/VersionInfo"], (VersionInfo) => {
-                VersionInfo.load()
-                    .then((oVersionInfo) => {
-                        resolve(_extractUi5Version(oVersionInfo.version));
-                    })
-                    .catch(() => {
-                        Log.error("UI5 version could not be determined.");
-                        resolve("");
-                    });
-            });
-        });
+    utils.getUi5Version = async function () {
+        try {
+            const [VersionInfo] = await this.requireAsync(["sap/ui/VersionInfo"]);
+            const oVersionInfo = await VersionInfo.load();
+
+            return _extractUi5Version(oVersionInfo.version);
+        } catch (oError) {
+            Log.error("UI5 version could not be determined.", oError);
+            return "";
+        }
     };
 
     /**
@@ -1384,28 +1360,32 @@ sap.ui.define([
         return sPrefix + sSeparator + aIds.join(":");
     };
 
-    /**
-     * Checks whether the given intent is the configured root intent (apart from its parameters).
-     * "#Shell-home" should never be hardcoded as it can be configured.
-     *
-     * @param {string} sIntent The intent to check, e.g. <code>#Employee-display</code>.
-     *   The initial hash fragment is ignored during the check.
-     *   For example if <code>#Employee-display</code> matches the root intent, also "Employee-display" does.
-     * @returns {boolean} Whether the given intent is the root intent.
-     * @throws {Error} When a wrong input parameter is given.
-     * @private
-     */
-    utils.isRootIntent = function (sIntent) {
-        if (typeof sIntent !== "string") {
-            throw new Error("The given intent must be a string");
+    utils.getRootIntent = function () {
+        const Container = sap.ui.require("sap/ushell/Container");
+        const oRenderer = Container?.getRendererInternal("fiori2");
+
+        let sConfiguredIntent;
+        if (oRenderer) {
+            try {
+                sConfiguredIntent = oRenderer.getShellConfig().rootIntent;
+                // Might fail when accessing Renderer's config before the view is created
+            } catch { /* fail silently */ }
         }
 
-        // validate configured intent
-        const sRootIntentConfigPath = "renderers.fiori2.componentData.config.rootIntent";
-        const sConfiguredIntent = ObjectPath.get(sRootIntentConfigPath, window["sap-ushell-config"]) || "#Shell-home";
-        const sRootIntentNoHash = sConfiguredIntent.replace("#", "");
-        const sIntentNoHash = sIntent.replace("#", "");
-        return sIntentNoHash === "" || sIntentNoHash === sRootIntentNoHash;
+        if (!sConfiguredIntent) { // fallback to config path if there is no FLP (yet)
+            const sRootIntentConfigPath = "renderers.fiori2.componentData.config.rootIntent";
+            sConfiguredIntent = ObjectPath.get(sRootIntentConfigPath, window["sap-ushell-config"]);
+        }
+
+        if (!sConfiguredIntent) {
+            sConfiguredIntent = "#Shell-home";
+        }
+
+        if (!sConfiguredIntent.startsWith("#")) {
+            sConfiguredIntent = `#${sConfiguredIntent}`;
+        }
+
+        return sConfiguredIntent;
     };
 
     /**
@@ -1421,7 +1401,7 @@ sap.ui.define([
         if (!sIntent) {
             sIntent = window.location.hash;
             if (!sIntent) {
-                sIntent = ObjectPath.get("renderers.fiori2.componentData.config.rootIntent", window["sap-ushell-config"]) || "Shell-home";
+                sIntent = utils.getRootIntent();
             }
         } else if (typeof sIntent !== "string") {
             throw new Error("The given intent must be a string");

package/src/test/js/sap/ushell/bootstrap/sandbox.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's bootstrap code for development sandbox scenarios.
  *
- * @version 1.141.3
+ * @version 1.143.0
  */
 
 (function () {

package/ui5.yaml

@@ -103,8 +103,6 @@ builder:
               - sap/ushell/services/appstate/AppState
               - sap/ushell/services/appstate/AppStatePersistencyMethod
               - sap/ushell/services/PluginManager.js
-              - sap/ushell/services/PluginManager/Extensions.js
-              - sap/ushell/services/PluginManager/HeaderExtensions.js
               - sap/ushell/services/ShellNavigation.js
               - sap/ushell/services/ShellNavigationInternal.js
               - sap/ushell/services/ShellNavigationHashChanger.js
@@ -193,6 +191,7 @@ builder:
               - sap/ushell/adapters/cdm/v3/utilsCdm.js
               - sap/ushell/ui/cards/FrequentActivitiesExtension.js
               - sap/ushell/ui/cards/RecentActivitiesExtension.js
+              - '!sap/f/thirdparty/'
             resolve: false
             renderer: false
       bundleOptions:
@@ -214,6 +213,16 @@ builder:
           - mode: preload
             name: sap/ushell/core-lib-preload
             filters: &core-min-preload
+              - sap/f/gen/ui5/webcomponents/dist/Avatar.js
+              - sap/f/gen/ui5/webcomponents/dist/Button.js
+              - sap/f/gen/ui5/webcomponents_fiori/dist/ShellBar.js
+              - sap/f/gen/ui5/webcomponents_fiori/dist/ShellBarBranding.js
+              - sap/f/gen/ui5/webcomponents_fiori/dist/ShellBarItem.js
+              - sap/f/gen/ui5/webcomponents_fiori/dist/ShellBarSearch.js
+              - sap/f/gen/ui5/webcomponents_fiori/dist/ShellBarSpacer.js
+              - sap/f/thirdparty/ui5/webcomponents_icons_business_suite/AllIcons.js
+              - sap/f/thirdparty/ui5/webcomponents_icons_tnt/AllIcons.js
+              - sap/f/thirdparty/ui5/webcomponents_icons/AllIcons.js
               - sap/f/GridContainer.js
               - sap/f/GridContainerItemLayoutData.js
               - sap/m/**/*.flexibility.js             # include all change handlers
@@ -316,6 +325,7 @@ builder:
               - sap/ushell/components/tiles/cdm/applauncherdynamic/DynamicTile.view.xml
               - sap/ushell/components/tiles/cdm/applauncherdynamic/manifest.json
               - sap/ushell/iconfonts.js
+              - sap/ushell/modules
               - sap/ushell/override.js
               - sap/ushell/renderer/Renderer.js
               - sap/ushell/renderer/RendererRootView.fragment.xml
@@ -369,8 +379,6 @@ builder:
               - sap/ushell/utils/utilsCdm.js
               - '!sap/viz/libs/sap-viz.js'
               - '!sap/ui/unified/'
-              - '!sap/ushell/thirdparty/'
-              - '!sap/ushell/gen/'
             resolve: true
             renderer: true
           - mode: require
@@ -380,25 +388,6 @@ builder:
         optimize: true
         usePredefineCalls: true
         numberOfParts: 4
-    - bundleDefinition:
-        name: sap/ushell/preload-bundles/thirdparty.js
-        sections:
-          - mode: provided
-            filters: *core-min-preload
-            resolve: true
-          - mode: provided
-            filters: *core-min-provided
-            resolve: true
-          - mode: preload
-            filters:
-              - sap/ushell/gen/
-              - sap/ushell/thirdparty/
-              - '!sap/ushell/thirdparty/_dynamics/'
-            resolve: true
-            renderer: false
-      bundleOptions:
-        optimize: true
-        usePredefineCalls: true
     - bundleDefinition:
         name: sap/ushell/preload-bundles/core-ext-light.js
         sections:
@@ -430,11 +419,10 @@ builder:
               - sap/ui/unified/
               - sap/ui/util/
               - sap/ushell/
-              - '!sap/ushell/thirdparty/'
-              - '!sap/ushell/gen/'
               - '!**/*-preload*.js'
               - '!**/*.support.js'
               - '!**/designtime/'
+              - '!sap/f/thirdparty/_dynamics/'
               - '!sap/m/rules/'
               - '!sap/ui/core/messagebundle*.properties'
               - '!sap/ui/core/plugin/'
@@ -474,6 +462,8 @@ builder:
               - sap/ushell/components/tiles/sbtilecontent.js
               # dependency of sap.ushell.ui.QuickAccess
               - sap/ushell/utils/AppType.js
+              # Default ushell modules
+              - sap/ushell/components/shell/Notifications/NotificationsModule.js
             resolve: false
       bundleOptions:
         optimize: true
@@ -511,15 +501,13 @@ builder:
               # FailedTileDialog.fragment.xml has a dependency to sap.ui.layout.form
               - '!sap/ui/layout/'
               - '!sap/viz/libs/sap-viz.js'
-              - '!sap/ushell/thirdparty/'
-              - '!sap/ushell/gen/'
             resolve: true
             renderer: false
       bundleOptions:
         optimize: true
         usePredefineCalls: true
     - bundleDefinition:
-        # bundle for modules used by both work page runtimes (ushell & dws page builder)
+        # bundle for modules used by work page runtime (dws page builder)
         name: sap/ushell/preload-bundles/workpage-rt-common.js
         sections:
           - mode: provided
@@ -536,8 +524,6 @@ builder:
               - sap/ushell/utils/workpage/resources/resources*.properties
               - sap/ushell/utils/tilecard/
               - sap/ushell/utils/tilecard/resources/resources*.properties
-              - '!sap/ushell/thirdparty/'
-              - '!sap/ushell/gen/'
             resolve: false    # avoid including the sap/ui/integration/library module only
             renderer: true
             sort: true
@@ -586,8 +572,6 @@ builder:
               - sap/m/ActionListItem.js                                                 # implicit dependency of sap.viz (chartpopover)
               - sap/ui/layout/form/ResponsiveGridLayout.js                              # implicit dependency of sap.viz (chartpopover)
               - sap/ui/core/format/FileSizeFormat.js                                    # implicit dependency of sap.viz (chart formatter)
-              - '!sap/ushell/thirdparty/'
-              - '!sap/ushell/gen/'
               - '!sap/ui/core/plugin/'
               - '!sap/ui/core/support/'
               - '!sap/ui/core/tmpl/'
@@ -612,6 +596,9 @@ builder:
         usePredefineCalls: true
         numberOfParts: 4
   componentPreload:
+    excludes:
+      # Default ushell modules
+      - sap/ushell/components/shell/Notifications/NotificationsModule.js
     paths:
       - sap/ushell/components/appfinder/Component.js
       - sap/ushell/components/cepsearchresult/app/Component.js
@@ -637,8 +624,6 @@ builder:
       - sap/ushell/components/tiles/cdm/applauncherdynamic/Component.js
       - sap/ushell/components/tiles/applauncher/Component.js
       - sap/ushell/components/tiles/applauncherdynamic/Component.js
-      - sap/ushell/components/workPageBuilder/Component.js
-      - sap/ushell/components/workPageRuntime/Component.js
       - sap/ushell/plugins/appwarmup/Component.js
       - sap/ushell/plugins/ghostapp/Component.js
       # dependencies are covered by the flex-plugins bundle

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

@@ -1,228 +0,0 @@
-// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
-/**
- * @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.141.3
- */
-
-sap.ui.define([
-    "sap/ui/core/UIComponent"
-], (UIComponent) => {
-    "use strict";
-
-    /**
-     * Component of the WorkPagesRuntime view.
-     *
-     * @param {string} sId Component id
-     * @param {object} oSParams Component parameter
-     *
-     * @class
-     * @extends sap.ui.core.UIComponent
-     *
-     * @private
-     * @since 1.99.0
-     * @alias sap.ushell.components.workPageBuilder.Component
-     */
-    return UIComponent.extend("sap.ushell.components.workPageBuilder.Component", /** @lends sap.ushell.components.workPageBuilder.Component.prototype */{
-        metadata: {
-            manifest: "json",
-            library: "sap.ushell",
-            interfaces: ["sap.ui.core.IAsyncContentCreation"],
-            events: {
-                workPageEdited: {},
-                visualizationFilterApplied: {
-                    parameters: {
-                        /**
-                         * An array with objects containing {filterKey: "<key>", filterValue: "<value>"}
-                         */
-                        filters: { type: "array" }
-                    }
-                },
-                closeEditMode: {
-                    parameters: {
-                        /**
-                         * Indicates if the changes have to be saved
-                         */
-                        saveChanges: { type: "boolean" }
-                    }
-                }
-            }
-        },
-
-        init: function () {
-            UIComponent.prototype.init.apply(this, arguments);
-        },
-
-        /**
-         * API to call the getEditMode function on the WorkPageBuilder controller.
-         * @returns {boolean} Returns the value of editMode
-         * @since 1.109.0
-         * @private
-         * @ui5-restricted portal-cf-*
-         */
-        getEditMode: function () {
-            return this.getRootControl().getController().getEditMode();
-        },
-
-        /**
-         * API to call the setEditMode function on the WorkPageBuilder controller.
-         * @param {boolean} bEditMode true or false
-         *
-         * @since 1.109.0
-         * @private
-         * @ui5-restricted portal-cf-*
-         */
-        setEditMode: function (bEditMode) {
-            this.getRootControl().getController().setEditMode(bEditMode);
-        },
-
-        /**
-         * API to call the setPreviewMode function on the WorkPageBuilder controller.
-         * @param {boolean} bPreviewMode true or false
-         *
-         * @since 1.116.0
-         * @private
-         * @ui5-restricted portal-cf-*
-         */
-        setPreviewMode: function (bPreviewMode) {
-            this.getRootControl().getController().setPreviewMode(bPreviewMode);
-        },
-
-        /**
-         * API to call the getPreviewMode function on the WorkPageBuilder controller.
-         * @returns {boolean} Returns the value of previewMode
-         *
-         * @since 1.116.0
-         * @private
-         * @ui5-restricted portal-cf-*
-         */
-        getPreviewMode: function () {
-            return this.getRootControl().getController().getPreviewMode();
-        },
-
-        /**
-         * API to call the getPageData function on the WorkPageBuilder controller.
-         * @returns {{workPage: {contents: object }}} Returns the pageData which might have been modified by the user.
-
-         * @since 1.109.0
-         * @private
-         * @ui5-restricted portal-cf-*
-         */
-        getPageData: function () {
-            return this.getRootControl().getController().getPageData();
-        },
-
-        /**
-         * API to call the setPageData function on the WorkPageBuilder controller.
-         * @param {{workPage: {contents: object, usedVisualizations: {nodes: object}}}} oPageData WorkPage data object
-         * @returns {Promise} A promise resolving when the data was set.
-         *
-         * @since 1.109.0
-         * @private
-         * @ui5-restricted portal-cf-*
-         */
-        setPageData: async function (oPageData) {
-            this.getRootControl().getController().setPageData(oPageData);
-        },
-
-        /**
-         * API to call the setVisualizationDataPaginated function on the WorkPageRuntime controller.
-         * @param {{visualizations: {nodes: object[], totalCount: int}}} oVizNodes Array of Visualizations
-         * @returns {Promise} A promise resolving when the data was set.
-         *
-         * @since 1.115.0
-         * @private
-         * @ui5-restricted portal-cf-*
-         */
-        setVisualizationData: function (oVizNodes) {
-            return this.getRootControl().getController().setVisualizationData(oVizNodes);
-        },
-
-        /**
-         * @typedef {Object} CatalogItem
-         * @property {string} id The ID of the catalog.
-         * @property {string} title The title of the catalog.
-         */
-        /**
-         * @typedef {Object} CategoryTreeItem
-         * @property {string|undefined} id The ID of the category node.
-         * @property {string} title The title of the category node.$
-         * @property {boolean} inactive Indicates if the category node is inactive.
-         * @property {number} [$count] The count of catalogs inside the node.
-         * @property {CatalogItem[]} [nodes] The child nodes of the category node.
-         */
-        /**
-         * Sets the category tree data for the Content Finder model.
-         * The category tree does not support pagination. All tree data must be set at once.
-         *
-         * @param {CategoryTreeItem[]|undefined} aCategoryTree A tree of category objects, undefined to hide the category tree or empty array to show message in DT.
-         * @returns {Promise} A promise resolving when the data was set.
-         *
-         * @since 1.130.0
-         * @private
-         * @ui5-restricted portal-cf-*
-         */
-        setCategoryTree: async function (aCategoryTree) {
-            return this.getRootControl().getController().setCategoryTree(aCategoryTree);
-        },
-
-        /**
-         * API to check if navigation is disabled
-         * @returns {boolean} Returns navigationDisabled
-         * @since 1.110.0
-         * @private
-         * @ui5-restricted portal-cf-*
-         */
-        getNavigationDisabled: function () {
-            return this.getRootControl().getController().getNavigationDisabled();
-        },
-
-        /**
-         * API for enabling/disabling navigation
-         * @param {boolean} bNavigation true or false
-         *
-         * @since 1.110.0
-         * @private
-         * @ui5-restricted portal-cf-*
-         */
-        setNavigationDisabled: function (bNavigation) {
-            this.getRootControl().getController().setNavigationDisabled(bNavigation);
-        },
-
-        /**
-         * Helper method to retrieve the sap.ushell.Container from the current frame or the parent frame.
-         *
-         * @since 1.110.0
-         * @private
-         * @returns {sap.ushell.Container} The ushell container
-         */
-        getUshellContainer: function () {
-            return sap.ui.require("sap/ushell/Container") || window.parent.sap.ui.require("sap/ushell/Container");
-        },
-
-        /**
-         * API for showing/hiding Footer bar
-         * @param {boolean} bVisible true or false
-         *
-         * @since 1.110.0
-         * @private
-         * @ui5-restricted portal-cf-*
-         */
-        setShowFooter: function (bVisible) {
-            this.getRootControl().getController().setShowFooter(bVisible);
-        },
-
-        /**
-         * API for showing/hiding Page title
-         * @param {boolean} bVisible true or false
-         *
-         * @since 1.116.0
-         * @private
-         * @ui5-restricted portal-cf-*
-         */
-        setShowPageTitle: function (bVisible) {
-            this.getRootControl().getController().setShowPageTitle(bVisible);
-        }
-    });
-});