@sapui5/sap.ushell_abap 1.148.2 → 1.149.1

package/src/main/js/sap/ushell_abap/bootstrap/XhrLogonEventHandler.js

@@ -1,11 +1,15 @@
 // Copyright (c) 2009-2026 SAP SE, All Rights Reserved
-
+/**
+ * @fileoverview This module provides a helper class to handle events from the XHR logon lib.
+ */
 sap.ui.define([
+    "sap/base/Log",
     "sap/base/util/ObjectPath",
-    "sap/base/Log"
+    "sap/ushell/Config"
 ], (
+    Log,
     ObjectPath,
-    Log
+    Config
 ) => {
     "use strict";
 
@@ -14,9 +18,11 @@ sap.ui.define([
     const S_RELOAD_QUERY_PARAM = "sap-ushell-reloaded";
 
     /**
-     * Helper class for handling events from XHR logon frame provider
-     * @param {Window} [oWindow=window] - the window object to use for reloading the page
-     * @param {string} [sXhrLogonMode="reload"] - the XHR logon mode, either "reload" or "logoffAndRedirect"
+     * @alias sap.ushell_abap.bootstrap.XhrLogonEventHandler
+     * @class
+     * @classdesc Helper class for handling events from XHR logon frame provider
+     * @param {Window} [oWindow=window] the window object to use for reloading the page
+     * @param {string} [sXhrLogonMode="reload"] the XHR logon mode, either "reload" or "logoffAndRedirect"
      *
      * @private
      */
@@ -26,6 +32,14 @@ sap.ui.define([
         this._bPending = false;
     }
 
+    /**
+     * Handles an XHR logon event.
+     *
+     * @param {Event} oEvent The event object.
+     * @returns {boolean} Always returns true.
+     *
+     * @private
+     */
     XhrLogonEventHandler.prototype.handleEvent = function (oEvent) {
         if (this._bPending) {
             // only handle first logon event
@@ -65,9 +79,9 @@ sap.ui.define([
      * ensures that the reload is always triggering a GET request. This is important because with SAML logon,
      * window.location.reload() would trigger a POST request with an outdated SAML assertion;
      * the ABAP server does not a redirect to the IDP login page in that case.
-     *
-     * @param {string} sCurrentLocationSearch - current location search string
+     * @param {string} sCurrentLocationSearch current location search string
      * @returns {string} an updated location search string triggering a page reload
+     *
      * @private
      */
     XhrLogonEventHandler.prototype._getUpdatedLocationSearchForReload = function (sCurrentLocationSearch) {
@@ -125,7 +139,7 @@ sap.ui.define([
      */
     XhrLogonEventHandler.prototype._logoffAndRedirect = function () {
         const sLocationHref = this.getLocationHref();
-        const sClientId = ObjectPath.get("sap-ushell-config.services.Container.adapter.config.client");
+        const sClientId = ObjectPath.get("services.Container.adapter.config.client", Config.getRawBootstrapConfig());
 
         const sUrl = new URI("/sap/public/bc/icf/logoff")
             .absoluteTo(sLocationHref)
@@ -136,7 +150,6 @@ sap.ui.define([
 
     /**
      * Checks if the page is currently being reloaded by the XHR logon which triggers this by setting query-parameter sap-ushell-reloaded
-     *
      * @returns {boolean} true if the page is reloaded, false otherwise
      *
      * @private
@@ -145,6 +158,12 @@ sap.ui.define([
         return new RegExp(["[?&]", S_RELOAD_QUERY_PARAM].join("")).test(this._oWindow.location.search);
     };
 
+    /**
+     * Handles authentication required scenario when UI5 is not yet loaded.
+     * @param {function} fnReload The function to call to reload the page.
+     *
+     * @private
+     */
     XhrLogonEventHandler.prototype._handleAuthenticationRequiredNoUi5 = function (fnReload) {
         // In reload mode, this should not happen (can only occur in very early XHR requests, i.e. start_up).
         // But then the session should still be valid. So if we get in here, the HTML page itself has been cached or
@@ -183,6 +202,8 @@ sap.ui.define([
      * @param {object} oMessageText text key and default text for the dialog message
      * @param {function} fnReload function that is executed to do the actual reload
      * @param {function} fnFallbackIfUi5NotLoaded a fallback function which is executed if UI5 not yet loaded
+     *
+     * @private
      */
     XhrLogonEventHandler.prototype._showErrorAndReload = function (oTitleText, oMessageText, fnReload, fnFallbackIfUi5NotLoaded) {
         let sTitle;
@@ -238,6 +259,8 @@ sap.ui.define([
      * @param {object} oText text key and default text
      * @param {object} oResources i18n resources
      * @returns {string} the translated text if the key exists or the provided fallback text
+     *
+     * @private
      */
     XhrLogonEventHandler.prototype._getText = function (oText, oResources) {
         const sText = oResources.i18n.getText(oText.key);

package/src/main/js/sap/ushell_abap/bootstrap/XhrLogonLibLoader.js

@@ -1,5 +1,7 @@
 // Copyright (c) 2009-2026 SAP SE, All Rights Reserved
-
+/**
+ * @fileoverview This module loads the XHR logon library.
+ */
 sap.ui.define([
 ], (
 ) => {
@@ -7,6 +9,16 @@ sap.ui.define([
 
     const sUiDebugKey = "sap-ui-debug";
 
+    /**
+     * @alias sap.ushell_abap.bootstrap.XhrLogonLibLoader
+     * @namespace
+     * @description This module loads the XHR logon library.
+     * The lib is loaded automatically when this module is required.
+     * No call to {@link sap.ushell_abap.bootstrap.XhrLogonLibLoader#getLib} is required.
+     *
+     * @since 1.147.0
+     * @private
+     */
     class XhrLogonLibLoader {
         #pLib;
 
@@ -14,6 +26,13 @@ sap.ui.define([
             this.#pLib = this.#loadLib();
         }
 
+        /**
+         * Determines whether to load the XHR logon library in debug mode.
+         * @returns {boolean} true if the XHR logon lib should be loaded in debug mode, false otherwise
+         *
+         * @since 1.147.0
+         * @private
+         */
         #isDebug () {
             let sStoredSapUiDebugValue;
             let bDebugSources = /[?&]sap-ui-debug=(true|x|X)(&|$)/.test(this.getWindowLocationSearch());
@@ -28,20 +47,49 @@ sap.ui.define([
             return bDebugSources;
         }
 
+        /**
+         * Loads the XHR logon library.
+         * @returns {Promise<object>} Resolves the XHR logon library.
+         *
+         * @since 1.147.0
+         * @private
+         */
         #loadLib () {
             const sFileName = `sap/ushell_abap/thirdparty/sap-xhrlib-esm${this.#isDebug() ? "-dbg" : ""}.js`;
             const sPath = sap.ui.require.toUrl(sFileName);
             return import(sPath).then((oModule) => oModule.xhrlib);
         }
 
+        /**
+         * Returns a promise that resolves the XHR logon library.
+         * @returns {Promise<object>} Resolves the XHR logon library.
+         *
+         * @since 1.147.0
+         * @private
+         */
         getLib () {
             return this.#pLib;
         }
 
+        /**
+         * Returns the window.location.search string.
+         * Extracted as a method to allow stubbing in tests.
+         * @returns {string} The query string portion of the URL
+         *
+         * @since 1.147.0
+         * @private
+         */
         getWindowLocationSearch () {
             return window.location.search;
         }
 
+        /**
+         * Resets the internal state of the loader.
+         * Only for testing purposes.
+         *
+         * @since 1.147.0
+         * @private
+         */
         reset () {
             this.#pLib = this.#loadLib();
         }

package/src/main/js/sap/ushell_abap/bootstrap/abap-def-dev.js

@@ -2,6 +2,7 @@
 /**
  * @fileoverview This module is the root of the ABAP bootstrap
  * to be used ONLY in DEVELOPMENT ENVIRONMENT.
+ * @deprecated since 1.136. Use the bootManifest instead.
  */
 sap.ui.define([
     "sap/base/config",

package/src/main/js/sap/ushell_abap/bootstrap/abap-def-loader.js

@@ -1,4 +1,8 @@
 // Copyright (c) 2009-2026 SAP SE, All Rights Reserved
+/**
+ * @fileoverview This module is the root of the ABAP bootstrap.
+ * @deprecated since 1.136. Use the bootManifest instead.
+ */
 (function () {
     "use strict";
 

package/src/main/js/sap/ushell_abap/bootstrap/abap-def.js

@@ -1,6 +1,7 @@
 // Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 /**
  * @fileoverview This module is the root of the ABAP bootstrap.
+ * @deprecated since 1.136. Use the bootManifest instead.
  */
 sap.ui.define([
     "sap/base/config",

package/src/main/js/sap/ushell_abap/bootstrap/abapConstants.js

@@ -1,4 +1,7 @@
 // Copyright (c) 2009-2026 SAP SE, All Rights Reserved
+/**
+ * @fileoverview This module provides constants for the ABAP platform.
+ */
 sap.ui.define([
 ], (
 ) => {

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.js

@@ -5,6 +5,8 @@
  *
  * In a development environment, this script serves as the root of the ABAP bootstrap.
  * And it will load all bootstrap modules and the SAPUI5 modules each as a single requested resource (no preloads and no bundling).
+ *
+ * @deprecated since 1.136. Use the bootManifest instead.
  */
 (function () {
     "use strict";

package/src/main/js/sap/ushell_abap/components/TCodeNavigation.js

@@ -8,7 +8,7 @@ sap.ui.define([
     "sap/ushell/api/performance/NavigationSource",
     "sap/ushell_abap/components/TCodeNavigation/TCodeNavigationError",
     "sap/ushell_abap/components/TCodeNavigation/MessageCode",
-    "sap/ushell/utils/UrlParsing"
+    "sap/ushell/base/UrlParsing"
 ], (
     Container,
     Log,

package/src/main/js/sap/ushell_abap/integration/WebSsoBridge.js

@@ -0,0 +1,57 @@
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
+
+sap.ui.define([
+    "sap/ushell/Container",
+    "sap/base/Log"
+], (
+    Container,
+    Log
+) => {
+    "use strict";
+
+    /**
+     * @alias sap.ushell_abap.integration.WebSsoBridge
+     * @namespace
+     * @description ushell API for WebSSO Process, used by Joule Plug-In in S/4 HANA Private Cloud scenarios.
+     *
+     * @since 1.136.18
+     * @private
+     */
+    class WebSsoBridge {
+        async init () {
+            try {
+                const oMessageBrokerService = await Container.getServiceAsync("MessageBroker");
+
+                // Ensure that client ID is free and can be used - by disconnecting first (mainly relevant for tests)
+                try {
+                    await oMessageBrokerService.disconnect("WebSsoBridge");
+                } catch { /* when "disconnect" fails, it hasn't been connected before... Which is a valid scenario. Therefore, nothing is done here. */ }
+
+                await oMessageBrokerService.connect("WebSsoBridge", () => { /* No generic handling needed. */ });
+
+                await oMessageBrokerService.subscribe("WebSsoBridge", [{ channelId: "com.sap.joule.flp.websso" }], async (sSenderId, sChannelId, sMessageName) => {
+                    let oData;
+                    try {
+                        const response = await fetch(`${location.origin + location.pathname}/websso/url`);
+                        if (response.status >= 200 && response.status < 300) {
+                            oData = await response.json();
+                            oData.status = "success";
+                        }
+                    } catch (oError) {
+                        Log.error(`Retrieving WebSSO URL from ABAP backend failed. Error: ${oError}`, "sap.ushell_abap.integration.WebSsoBridge");
+                    }
+
+                    if (oData === undefined) {
+                        oData = {
+                            status: "error"
+                        };
+                    }
+                    await oMessageBrokerService.publish("com.sap.joule.flp.websso", "WebSsoBridge", "UrlResponse", "*", oData);
+                });
+            } catch (oGlobalError) {
+                Log.error(`Init of WebSSO Bridge failed. Error: ${oGlobalError}`, "sap.ushell_abap.integration.WebSsoBridge");
+            }
+        }
+    }
+    return new WebSsoBridge();
+});

package/src/main/js/sap/ushell_abap/library.js

@@ -32,7 +32,7 @@ sap.ui.define([
     const ushellAbapLib = Library.init({
         name: "sap.ushell_abap",
         apiVersion: 2,
-        version: "1.148.2",
+        version: "1.149.1",
         dependencies: [
             "sap.ui.core",
             "sap.m",

package/src/main/js/sap/ushell_abap/pbServices/ui2/Contracts.js

@@ -5,15 +5,15 @@
  */
 
 sap.ui.define([
-    "sap/ushell/utils"
+    "sap/ushell/base/requireAsync"
 ], (
-    ushellUtils
+    requireAsync
 ) => {
     "use strict";
 
     class Contracts {
         async load () {
-            await ushellUtils.requireAsync([
+            await requireAsync([
                 "sap/ushell_abap/pbServices/ui2/contracts/bag",
                 "sap/ushell_abap/pbServices/ui2/contracts/configuration",
                 "sap/ushell_abap/pbServices/ui2/contracts/configurationUi",

package/src/main/js/sap/ushell_abap/pbServices/ui2/PageBuildingService.js

@@ -821,37 +821,25 @@ sap.ui.define([
          * - CHIP instances and their CHIPs, <br>
          * - bags and properties (page, CHIP and CHIP instance bags), <br>
          * - RemoteCatalog data.
-         * <p>
-         * Via the parameter <code>sCustomExpand</code> you can specify a different $expand statement.
          *
          * @param {string} sId
          *   ID of the page to be read
          * @param {function(object)} fnSuccess
          *   a callback function that is executed if the request succeeds, taking the processed data
-         * @param {function(string, object=)} [fnFailure]
+         * @param {function(string, object)} [fnFailure]
          *   error handler taking an error message and, since version 1.28.6, an
          *   optional object containing the complete error information as delivered
          *   by the ODataService. See fnFailure parameter of {@link ODataWrapper#onError}
          *   for more details.
-         * @param {string} [sCustomExpand="Bags/Properties,PageChipInstances/Chip/ChipBags/ChipProperties,PageChipInstances/RemoteCatalog,PageChipInstances/ChipInstanceBags/ChipInstanceProperties"]
-         *   (since 1.30.0) can be used to overwrite the default $expand value. If "" is used, the
-         *   entire $expand parameter will be skipped
          * @since 1.2.0
          */
-        this.readPage = function (sId, fnSuccess, fnFailure, sCustomExpand) {
-            let sUrl = `Pages('${encodeURIComponent(sId)}')`;
+        this.readPage = function (sId, fnSuccess, fnFailure) {
             if (!sId) {
                 throw new SrvcError("Missing page ID", "PageBuildingService");
             }
 
-            if (sCustomExpand === undefined) {
-                // use default expand
-                sUrl += "?$expand=Bags/Properties,PageChipInstances/Chip/ChipBags/ChipProperties,"
-                    + "PageChipInstances/RemoteCatalog,"
-                    + "PageChipInstances/ChipInstanceBags/ChipInstanceProperties";
-            } else if (sCustomExpand !== "") {
-                sUrl += `?$expand=${sCustomExpand}`;
-            }
+            const sUrl = `Pages('${encodeURIComponent(sId)}')?$expand=PageChipInstances/Chip/ChipBags/ChipProperties,`
+                + "PageChipInstances/RemoteCatalog,PageChipInstances/ChipInstanceBags/ChipInstanceProperties";
 
             oWrapper.read(sUrl, fnSuccess, fnFailure);
         };

package/src/main/js/sap/ushell_abap/pbServices/ui2/Utils.js

@@ -9,11 +9,13 @@
 sap.ui.define([
     "sap/ui/thirdparty/URI",
     "sap/base/Log",
+    "sap/ushell/Config",
     "sap/ushell_abap/pbServices/ui2/Error",
     "sap/ui/Device"
 ], (
     URI,
     Log,
+    Config,
     SrvcError,
     Device
 ) => {
@@ -334,8 +336,7 @@ sap.ui.define([
      */
     Utils.addCacheBusterTokenUsingUshellConfig = function (sUrl) {
         // TODO move to sap.ushell.utils
-        const oCacheBusting = window["sap-ushell-config"] &&
-            window["sap-ushell-config"].cacheBusting;
+        const oCacheBusting = Config.getRawBootstrapConfig()?.cacheBusting;
         const oPatterns = oCacheBusting && oCacheBusting.patterns;
         let sCacheBusterUrl = sUrl;
         let aParameterMap = [];

package/ui5.yaml

@@ -47,14 +47,6 @@ builder:
         # as the boot should ALWAYS include bootstrap
         # It rather ensures that the ushell can always be used via library
         sections:
-          - mode: provided
-            filters: &exclude-external-libs
-              - "**/"                         # assume everything as provided ...
-              - "!sap/ushell_abap/"           # ... except the modules from sap/ushell_abap
-              - "**/designtime/"              # also exclude all designtime ...
-              - "**/*.designtime.js"          #
-              - "**/support/"                 # ... and support files
-              - "**/*.support.js"             #
           - mode: preload
             filters:
               - sap/ushell_abap/bootstrap/
@@ -316,10 +308,13 @@ builder:
             # filter to ensure that no other dependencies sneak into the boot bundle
             # and break the assumptions that only base and bootstrap modules are used during boot
             filters:
-              - "**/"                           # assume everything as provided ...
-              - "!sap/ushell/bootstrap/"        # ... except the modules from sap/ushell/bootstrap
-              - "!sap/ushell/base/"             # ... and sap/ushell/base
-              - "!sap/ushell_abap/bootstrap/"   # ... and abap related bootstrap parts
+              - "**/"                                             # assume everything as provided ...
+              - "!sap/ushell/bootstrap/"                          # ... except the modules from sap/ushell/bootstrap
+              - "!sap/ushell/base/"                               # ... and sap/ushell/base
+              - "!sap/ushell_abap/bootstrap/"                     # ... and abap related bootstrap parts
+              - "!sap/ushell_abap/thirdparty/sap-xhrlib-esm*.js" # ... and thirdparty that contains ESM modules which
+              - "!sap/ui/integration/thirdparty/"                 # can't be bundled anyways and would cause build errors
+              - "!sap/ui/vk/thirdparty/"
           - mode: preload
             filters:
               - sap/ushell_abap/bootstrap/ConfigurationProvider.js
@@ -649,7 +644,15 @@ builder:
               - sap/ushell/adapters/cdm/v3/StaticGroupsAdapter.js
             resolve: false
           - mode: provided
-            filters: *exclude-external-libs
+            filters: &exclude-external-libs
+              - "**/"                             # assume everything as provided ...
+              - "!sap/ushell_abap/"               # ... except the modules from sap/ushell_abap
+              - "**/designtime/"                  # also exclude all designtime ...
+              - "**/*.designtime.js"              #
+              - "**/support/"                     # ... and support files
+              - "**/*.support.js"                 #
+              - "!sap/ui/integration/thirdparty/" # Do not include thirdparty that contains ESM modules which
+              - "!sap/ui/vk/thirdparty/"          # can't be bundled anyways and would cause build errors
         # Include Chunks --------------------------
           - mode: bundleInfo
             name: sap/ushell_abap/library-preload-bootstrap.js
@@ -670,6 +673,8 @@ builder:
               - "!sap/ushell_abap/bootstrap/evo/abap.js"
               - "!sap/ushell_abap/bootstrap/appruntime-min*.js"
               - "!sap/ushell_abap/bootstrap/evo/core-min*.js"
+              # Exclude thirdparty that contains ESM modules which can't be bundled and would cause build errors
+              - "!sap/ushell_abap/thirdparty/sap-xhrlib-esm*.js"
             resolve: true
             renderer: true
       bundleOptions: