@sapui5/sap.ushell_abap 1.145.1 → 1.147.0

package/package.json

@@ -1,21 +1,21 @@
 {
     "name": "@sapui5/sap.ushell_abap",
-    "version": "1.145.1",
+    "version": "1.147.0",
     "description": "SAPUI5 Library sap.ushell_abap",
+    "author": "SAP SE (https://www.sap.com)",
+    "license": "SEE LICENSE IN LICENSE.txt",
     "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
     "keywords": [
         "sapui5",
         "ui5"
     ],
-    "author": "SAP SE (https://www.sap.com)",
-    "license": "SEE LICENSE IN LICENSE.txt",
     "scripts": {
         "build": "cross-env-shell ui5 build --exclude-task=generateLibraryPreload --framework-version $npm_package_version",
         "build-all": "cross-env-shell ui5 build --all --framework-version $npm_package_version",
         "build-themes": "cross-env-shell ui5 build --exclude-task=* --include-task=buildThemes --framework-version $npm_package_version"
     },
     "devDependencies": {
-        "@ui5/cli": "^4.0.24",
+        "@ui5/cli": "^4.0.50",
         "cross-env": "^7.0.3"
     }
 }

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

@@ -2,7 +2,7 @@
 <library xmlns="http://www.sap.com/sap.ui.library.xsd">
     <name>sap.ushell_abap</name>
     <vendor>SAP SE</vendor>
-    <version>1.145.1</version>
+    <version>1.147.0</version>
     <copyright>Copyright (c) 2009-2026 SAP SE, All Rights Reserved</copyright>
     <documentation>SAP library: sap.ushell_abap</documentation>
 
@@ -54,13 +54,14 @@
             <exclude name="sap.ushell_abap.bootstrap.evo.abap-dbg" />
         </jsdoc>
         <jscoverage xmlns="http://www.sap.com/ui5/buildext/jscoverage" >
-            <!-- excludes for JScoverage -->
             <!-- Bundles -->
-            <exclude name="sap.ushell_abap.bootstrap.appruntime-min*" />
-            <exclude name="sap.ushell_abap.bootstrap.evo.abap*" />
-            <exclude name="sap.ushell_abap.bootstrap.evo.core-min*" />
-            <exclude name="sap.ushell_abap.bootstrap.evo.core-ext-light*" />
-            <exclude name="sap.ushell_abap.thirdparty.sap-xhrlib-esm*" />
+            <exclude name="**/*-preload" />
+            <exclude name="**/preload-bundles/**/*" />
+            <exclude name="sap/ushell_abap/bootstrap/appruntime-min*" />
+            <exclude name="sap/ushell_abap/bootstrap/evo/abap*" />
+            <exclude name="sap/ushell_abap/bootstrap/evo/core-min*" />
+            <exclude name="sap/ushell_abap/bootstrap/evo/core-ext-light*" />
+            <exclude name="sap/ushell_abap/thirdparty/sap-xhrlib-esm*" />
         </jscoverage>
         <releasenotes xmlns="http://www.sap.com/ui5/buildext/releasenotes"
             url="../../../test-resources/sap/ushell_abap/relnotes/changes-{major}.{minor}.json"

package/src/main/js/sap/ushell_abap/adapters/abap/AdapterContainer.js

@@ -6,7 +6,7 @@ sap.ui.define([
     "sap/ui/thirdparty/jquery",
     "sap/ui/core/format/DateFormat",
     "sap/ushell_abap/pbServices/ui2/ODataService",
-    "sap/ushell/services/_Personalization/constants",
+    "sap/ushell/services/PersonalizationV2/constants",
     "sap/ushell/utils/LaunchpadError"
 ], (
     ObjectPath,
@@ -14,7 +14,7 @@ sap.ui.define([
     jQuery,
     DateFormat,
     ODataService,
-    constants,
+    PersonalizationV2Constants,
     LaunchpadError
 ) => {
     "use strict";
@@ -368,9 +368,8 @@ sap.ui.define([
         if (!oScope) {
             return "U";
         }
-        const oConstants = constants;
-        if (oScope.keyCategory && oScope.keyCategory === oConstants.keyCategory.FIXED_KEY &&
-                oScope.writeFrequency && oScope.writeFrequency === oConstants.writeFrequency.LOW &&
+        if (oScope.keyCategory && oScope.keyCategory === PersonalizationV2Constants.keyCategory.FIXED_KEY &&
+                oScope.writeFrequency && oScope.writeFrequency === PersonalizationV2Constants.writeFrequency.LOW &&
                     oScope.clientStorageAllowed && oScope.clientStorageAllowed === true) {
             return "P";
         }

package/src/main/js/sap/ushell_abap/adapters/abap/AppStateAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Unified Shell's AppStateAdapter for the ABAP platform.
- * @version 1.145.1
+ * @version 1.147.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",

package/src/main/js/sap/ushell_abap/adapters/abap/ClientSideTargetResolutionAdapter.js

@@ -9,12 +9,13 @@
  *     <li>provide the resolveHashFragmentFallback function, a fallback method called by ClientSideTargetResolution service.</li>
  *   </ul>
  *
- * @version 1.145.1
+ * @version 1.147.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",
     "sap/base/util/isPlainObject",
     "sap/base/util/deepExtend",
+    "sap/ushell/base/SAPBusinessClientEnablement",
     "sap/ushell/utils",
     "sap/ushell/utils/UrlParsing",
     "sap/base/Log",
@@ -26,6 +27,7 @@ sap.ui.define([
     ObjectPath,
     isPlainObject,
     deepExtend,
+    SAPBusinessClientEnablement,
     ushellUtils,
     UrlParsing,
     Log,
@@ -70,7 +72,6 @@ sap.ui.define([
      * @property {string} postParameters The post parameters of the source.
      * @property {string} url The URL of the source.
      * @property {string} systemAlias The system alias of the source.
-     * @property {sap.ushell.services.ClientSideTargetResolution.DeviceTypes} [formfactors] The form factors of the source.
      * @property {sap.ushell.services.ClientSideTargetResolution.DeviceTypes} [formFactors] The form factors of the source.
      * @property {sap.ushell.services.ClientSideTargetResolution.Signature} signature The signature of the source.
      * @property {object} parameterMappings The parameter mappings of the source.
@@ -80,9 +81,6 @@ sap.ui.define([
      * @property {string} catalogId The catalog ID of the source.
      * @property {string} tmChipId The TM chip ID of the source.
      * @property {string} tcode The transaction code of the LADI/Target Mapping.
-     * @property {string} isDefaultLadi Indicates whether the LADI/Target Mapping is default.
-     * @property {string} ladiHasTiles Indicates whether the LADI/Target Mapping has tiles.
-     * @property {string} defaultTileParams The default tile parameters of the LADI/Target Mapping.
      *
      * @since 1.135.0
      * @private
@@ -309,10 +307,10 @@ sap.ui.define([
                                     if (oAppDependencies.url.toUpperCase().indexOf(oUri.path().toUpperCase()) !== 0) {
                                         // No applicationDependencies in this case as they belong to the wrong app
                                         Log.debug("Component URL defined in target mapping "
-                                                + "does not match the URL retrieved from application index. "
-                                                + "The URL of the application index is used for further processing.",
-                                        `Target mapping URL: ${oResult.url}\nApplication index URL: ${oAppDependencies.url}`,
-                                        "sap.ushell_abap.bootstrap.abap");
+                                            + "does not match the URL retrieved from application index. "
+                                            + "The URL of the application index is used for further processing.",
+                                            `Target mapping URL: ${oResult.url}\nApplication index URL: ${oAppDependencies.url}`,
+                                            "sap.ushell_abap.bootstrap.abap");
                                     }
                                     oUri.path(oAppDependencies.url);
                                     sUrl = oUri.toString();
@@ -326,8 +324,7 @@ sap.ui.define([
                             oAdjustedResult.applicationDependencies = oAppDependencies;
                         } catch (oError) {
                             Log.error(
-                                `Parsing of applicationDependencies attribute in resolveLink result failed for SAPUI5 component '${
-                                    sComponentName}'`,
+                                `Parsing of applicationDependencies attribute in resolveLink result failed for SAPUI5 component '${sComponentName}'`,
                                 oError,
                                 "sap.ushell_abap.bootstrap.abap"
                             );
@@ -401,8 +398,8 @@ sap.ui.define([
         return new Promise((fnResolve, fnReject) => {
             this._oInitialSegmentPromise.then((aInitialSegmentAndTargetMappings) => {
                 if (aInitialSegmentAndTargetMappings === null) {
-                // When this promise resolved with null it means that target mappings won't be taken from an initial segment ever
-                // in the future (mostly likely because this is not needed, e.g., no direct start).
+                    // When this promise resolved with null it means that target mappings won't be taken from an initial segment ever
+                    // in the future (mostly likely because this is not needed, e.g., no direct start).
                     return;
                 }
 
@@ -412,7 +409,9 @@ sap.ui.define([
                         "",
                         "sap.ushell_abap.adapters.abap.ClientSideTargetResolutionAdapter"
                     );
-                    this._aInbounds = this._formatDirectStart(this._aTargetMappings);
+
+                    ({ aResult: this._aInbounds, oResultABAP: this._oInboundsABAP } = this._formatDirectStart(this._aTargetMappings));
+
                     fnResolve(this._aInbounds);
                 } else {
                     Log.debug(
@@ -432,8 +431,7 @@ sap.ui.define([
                         "sap.ushell_abap.adapters.abap.ClientSideTargetResolutionAdapter"
                     );
 
-                    // convert (once) when needed
-                    this._aInbounds = this._formatDirectStart(this._aTargetMappings);
+                    ({ aResult: this._aInbounds, oResultABAP: this._oInboundsABAP } = this._formatDirectStart(this._aTargetMappings));
 
                     // we don't want to check for the initial segment in the future anymore, since we've got all the inbounds now.
                     this.getInbounds = function () {
@@ -447,6 +445,60 @@ sap.ui.define([
         });
     };
 
+    /**
+     * Creates a new array of inbound objects enriched with ABAP-specific properties.
+     *
+     * This method merges the ABAP-specific properties (stored in `this._oInboundsABAP`)
+     * into the corresponding inbound objects within the main `this._aInbounds` array.
+     * The merge is performed by matching the `id` of each inbound.
+     *
+     * @param {sap.ushell.services.ClientSideTargetResolution.Inbound[]} aBasicInbounds Array of basic inbound objects
+     * @param {object} oABAPInboundParams Object containing ABAP-specific properties indexed by inbound ID
+     * @returns {sap.ushell.services.NavigationDataProvider.ABAPInbound[]} Array of enriched inbound objects
+     * @since 1.146.0
+     * @private
+     */
+    ClientSideTargetResolutionAdapter.prototype._createEnhancedInbounds = function (aBasicInbounds, oABAPInboundParams) {
+        return aBasicInbounds.map((oInbound) => {
+            const sInboundId = oInbound.id;
+            const oMatchingAbapProps = oABAPInboundParams[sInboundId];
+
+            if (oMatchingAbapProps) {
+                return {
+                    ...oInbound,
+                    ...oMatchingAbapProps
+                };
+            }
+            return oInbound;
+        });
+    };
+
+    /**
+     * Enriches the main inbounds array with ABAP-specific properties.
+     *
+     * This function should be called after `getInbounds` has resolved, as `getInbounds`
+     * is responsible for initially populating both `_aInbounds` and `_oInboundsABAP`.
+     *
+     * @returns {Promise<sap.ushell.services.NavigationDataProvider.ABAPInbound[]> | Promise<sap.ushell.services.ClientSideTargetResolution.Inbound[]>}
+     *   A Promise that resolves with the newly created array of enriched inbounds.
+     * @private
+     * @since 1.146.0
+     */
+    ClientSideTargetResolutionAdapter.prototype.getEnhancedInbounds = async function () {
+        if (this._aInboundsEnhanced) {
+            return this._aInboundsEnhanced;
+        }
+
+        const aBasicInbounds = await this.getInbounds();
+        if (this._oInboundsABAP && Object.keys(this._oInboundsABAP).length > 0) {
+            this._aInboundsEnhanced = this._createEnhancedInbounds(aBasicInbounds, this._oInboundsABAP);
+            return this._aInboundsEnhanced;
+        }
+
+        Log.warning("getEnhancedInbounds called but no ABAP-specific properties are available. Basic Inbounds are used.", null, S_COMPONENT);
+        return aBasicInbounds;
+    };
+
     /**
      * Test whether aSubSegment is completely contained in aSegment
      *
@@ -537,9 +589,6 @@ sap.ui.define([
             oTarget.title = oSrc.text;
             oTarget.permanentKey = `X-SAP-UI2-PAGE:${oSrc.catalogId}:${oSrc.tmChipId}`;
             oTarget.contentProviderId = "";
-            oTarget.isDefaultLadi = oSrc.isDefaultLadi || false;
-            oTarget.ladiHasTiles = oSrc.ladiHasTiles || false;
-            oTarget.defaultTileParams = oSrc.defaultTileParams || "";
 
             // resolution result
             const oFakeResolutionResult = {};
@@ -573,7 +622,6 @@ sap.ui.define([
             // ClientSideTargetResolution will de-interpolate the URL before applying sap-system
             oTarget.resolutionResult.systemAlias = oSrc.systemAlias || ""; // NOTE: "" is the local system alias
 
-            oTarget.deviceTypes = oSrc.formfactors;
             oTarget.resolutionResult["sap.ui"] = {};
             oTarget.resolutionResult["sap.ui"].technology = oTarget.resolutionResult.applicationType;
             if (oTarget.resolutionResult["sap.ui"].technology === "SAPUI5") {
@@ -679,27 +727,56 @@ sap.ui.define([
 
             if (oSrc.tcode) {
                 oTarget.resolutionResult.appInfo = {
-                    "abap.transaction": oSrc.tcode
+                    transaction: oSrc.tcode
                 };
             }
 
             return oTarget;
         }
 
-        const aRes = [];
+        function mapABAPAttributes (sSrcId, oSrc) {
+            const oABAPAttributes = {};
+            const aMatch = sSrcId.match(/^([^-]+)-([^~]+)/);
+            if (!aMatch) {
+                Log.warning(
+                    `The target mapping id ${sSrcId} is not valid`,
+                    "this target mapping will be discarded",
+                    "sap.ushell_abap.adapters.abap.ClientSideTargetResolutionAdapter"
+                );
+                return undefined;
+            }
+            oABAPAttributes.id = sSrcId;
+            oABAPAttributes.isDefaultLadi = oSrc.isDefaultLadi || false;
+            oABAPAttributes.ladiHasTiles = oSrc.ladiHasTiles || false;
+            oABAPAttributes.defaultTileParams =
+                oSrc.defaultTileParams || "";
+            return oABAPAttributes;
+        }
+
+        // main processing of inbounds and inbounds with ABAP specific attributes returning all results
+        const aResult = [];
+        let oInbound = {};
+        const oResultABAP = {};
+        let oInboundABAP = {};
         Object.keys(oDirectStartResponse).forEach((sKey) => {
-            const r = mapOne(sKey, oDirectStartResponse[sKey]);
-            if (r) {
-                aRes.push(r);
+            oInbound = mapOne(sKey, oDirectStartResponse[sKey]);
+            if (oInbound) {
+                aResult.push(oInbound);
+
+                oInboundABAP = mapABAPAttributes(sKey, oDirectStartResponse[sKey]);
+                if (oInboundABAP) {
+                    oResultABAP[oInboundABAP.id] = oInboundABAP;
+                }
             }
         });
-        return aRes;
+
+        return { aResult, oResultABAP };
     };
 
     /**
      * Extracts a valid <code>applicationType</code> field for ClientSideTargetResolution from the given object.
      *
-     * @param {string} sTargetMappingId A unique identified
+     * @param {string} sTargetMappingId A unique identifier
      * @param {object} oResolutionResult The (pre-resolution) resolutionResult of the navigation target.
      * @returns {string} One of the following application types compatible with ClientSideTargetResolution service:
      *   "TR", "SAPUI5", "WDA", "URL".
@@ -1104,52 +1181,49 @@ sap.ui.define([
         }
 
         return new Promise((fnResolve, fnReject) => {
-            this._oODataWrapper.read(`ResolveLink?linkId='${
-                encodeODataQueryParameter(sFragmentNoHash)}'&shellType='${ushellUtils.getShellType()}'${
-                sFormFactor ?
-                    `&formFactor='${encodeODataQueryParameter(sFormFactor)}'` : ""}`,
-            (oResult) => {
-                let i;
-                let sDetails = "";
-                let oAdjustedResult;
-
-                if (oResult.results.length) {
-                    if (oResult.results.length > 1) {
-                    // console log because of multiple targets
-                        for (i = 0; i < oResult.results.length; i += 1) {
-                            delete oResult.results[i].__metadata; // simplify output
-                            sDetails += (i === 0 ? "used target: " : "\nignored target: ")
-                                + JSON.stringify(oResult.results[i]);
+            this._oODataWrapper.read(`ResolveLink?linkId='${encodeODataQueryParameter(sFragmentNoHash)}'&shellType='${SAPBusinessClientEnablement.getShellType()}'${sFormFactor ?
+                `&formFactor='${encodeODataQueryParameter(sFormFactor)}'` : ""}`,
+                (oResult) => {
+                    let i;
+                    let sDetails = "";
+                    let oAdjustedResult;
+
+                    if (oResult.results.length) {
+                        if (oResult.results.length > 1) {
+                            // console log because of multiple targets
+                            for (i = 0; i < oResult.results.length; i += 1) {
+                                delete oResult.results[i].__metadata; // simplify output
+                                sDetails += (i === 0 ? "used target: " : "\nignored target: ")
+                                    + JSON.stringify(oResult.results[i]);
+                            }
+                            Log.error("INTEROP service's ResolveLink operation "
+                                + `returned ${oResult.results.length} targets for hash '#${sFragmentNoHash}', first one is used.`,
+                                sDetails,
+                                "sap.ushell_abap.adapters.abap.ClientSideTargetResolutionAdapter");
                         }
-                        Log.error("INTEROP service's ResolveLink operation "
-                            + `returned ${oResult.results.length} targets for hash '#${
-                                sFragmentNoHash}', first one is used.`,
-                        sDetails,
-                        "sap.ushell_abap.adapters.abap.ClientSideTargetResolutionAdapter");
-                    }
 
-                    oResult = oResult.results[0];
-                    oAdjustedResult = ClientSideTargetResolutionAdapter.prototype._adjustNavTargetResult(oResult);
-                    oAdjustedResult.url = _addPostParametersToNavTargetResultUrl(
-                        oResult.postParameters, oAdjustedResult.url);
+                        oResult = oResult.results[0];
+                        oAdjustedResult = ClientSideTargetResolutionAdapter.prototype._adjustNavTargetResult(oResult);
+                        oAdjustedResult.url = _addPostParametersToNavTargetResultUrl(
+                            oResult.postParameters, oAdjustedResult.url);
 
-                    // Fix application type to ensure backward compatible behavior after incompatible server-side change.
-                    if (oAdjustedResult && oAdjustedResult.applicationType === "SAPUI5") {
-                        oAdjustedResult.applicationType = "URL";
-                    }
+                        // Fix application type to ensure backward compatible behavior after incompatible server-side change.
+                        if (oAdjustedResult && oAdjustedResult.applicationType === "SAPUI5") {
+                            oAdjustedResult.applicationType = "URL";
+                        }
 
-                    that._compactTooLongWdaUrl(oAdjustedResult).then((oCompactedResult) => {
-                        fnResolve(oCompactedResult);
-                    }).catch((oError) => {
-                        Log.error(`Could not resolve link '${sFragmentNoHash}' due to compactation failure`, oError);
-                        fnReject(oError);
-                    });
-                } else {
-                    fnReject(new Error(`Could not resolve link '${sFragmentNoHash}'`));
-                }
-            }, (sErrorMessage) => {
-                fnReject(new Error(sErrorMessage));
-            });
+                        that._compactTooLongWdaUrl(oAdjustedResult).then((oCompactedResult) => {
+                            fnResolve(oCompactedResult);
+                        }).catch((oError) => {
+                            Log.error(`Could not resolve link '${sFragmentNoHash}' due to compactation failure`, oError);
+                            fnReject(oError);
+                        });
+                    } else {
+                        fnReject(new Error(`Could not resolve link '${sFragmentNoHash}'`));
+                    }
+                }, (sErrorMessage) => {
+                    fnReject(new Error(sErrorMessage));
+                });
 
             if (bBatchQueueOpened) {
                 that._getODataWrapper().submitBatchQueue(() => { }, (sErrorMessage) => {

package/src/main/js/sap/ushell_abap/adapters/abap/CommonDataModelAdapter.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Unified Shell's CommonDataModelAdapter for the ABAP platform, it is used to avoid 404 when no adapter is found
  *
- * @version 1.145.1
+ * @version 1.147.0
  */
 sap.ui.define([
 ], () => {

package/src/main/js/sap/ushell_abap/adapters/abap/ConfigurationDefaultsAdapter.js

@@ -2,12 +2,15 @@
 
 /**
  * @fileOverview The ConfigurationDefaults adapter for the ABAP platform.
- * @version 1.145.1
+ * @version 1.147.0
  */
 sap.ui.define([
-    "sap/ushell_abap/bootstrap/evo/abap.constants",
+    "sap/ushell_abap/bootstrap/abapConstants",
     "sap/base/util/deepClone"
-], (oAbapConstants, fnDeepClone) => {
+], (
+    abapConstants,
+    deepClone
+) => {
     "use strict";
 
     /**
@@ -18,7 +21,7 @@ sap.ui.define([
          * @returns {Promise} Resolved promise contains all default configuration for abap platform
          */
         this.getDefaultConfig = function () {
-            return Promise.resolve(fnDeepClone(oAbapConstants.defaultUshellConfig));
+            return Promise.resolve(deepClone(abapConstants.defaultUshellConfig));
         };
     };
 });

package/src/main/js/sap/ushell_abap/adapters/abap/ContainerAdapter.js

@@ -2,14 +2,15 @@
 /**
  * @fileOverview The Unified Shell's container adapter for the ABAP platform.
  *
- * @version 1.145.1
+ * @version 1.147.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",
+    "sap/ushell/base/SAPBusinessClientEnablement",
     "sap/ushell/System",
     "sap/ushell/User",
     "sap/ushell/utils",
-    "sap/ushell_abap/bootstrap/evo/abap.bootstrap.utils",
+    "sap/ushell_abap/bootstrap/XhrFactory",
     "sap/ushell_abap/pbServices/ui2/ODataWrapper",
     "sap/ui/thirdparty/URI",
     "sap/ui/thirdparty/datajs",
@@ -19,10 +20,11 @@ sap.ui.define([
     "sap/ushell/Container"
 ], (
     jQuery,
+    SAPBusinessClientEnablement,
     System,
     User,
     utils,
-    abapUtils,
+    XhrFactory,
     ODataWrapper,
     URI,
     datajs,
@@ -190,6 +192,7 @@ sap.ui.define([
                         return;
                     }
                     oUserProfileIdHistory[oUserProfileParameter.id] = oUserProfileParameter.id;
+
                     if (oUserProfileParameter.id === "CONTENT_DENSITY") {
                         oStartupResult.contentDensity = oUserProfileParameter.value;
                         oStartupResult.setContentDensityPermitted = (
@@ -197,6 +200,7 @@ sap.ui.define([
                                 oUserProfileParameter.editState === 3
                         ) || false;
                     }
+
                     if (oUserProfileParameter.id === "TRACKING_USAGE_ANALYTICS") {
                         if (typeof oUserProfileParameter.value === "string") {
                             // check if string is 'true' OR 'false' -> if 'yes' set the explicit boolean value
@@ -213,10 +217,12 @@ sap.ui.define([
                             oStartupResult.trackUsageAnalytics = undefined;
                         }
                     }
+
                     // FLP Spaces MyHome - whether the user has opted not to import bookmarks from classical FLP
                     if (oUserProfileParameter.id === "MYHOME_IMPORT_FROM_CLASSIC") {
                         oStartupResult.importBookmarks = oUserProfileParameter.value;
                     }
+
                     // FLP Spaces MyHome - whether the user has opted not to show the My Home page
                     if (oUserProfileParameter.id === "MYHOME_ENABLEMENT") {
                         switch (oUserProfileParameter.value) {
@@ -231,6 +237,7 @@ sap.ui.define([
                                 break;
                         }
                     }
+
                     // Dark Mode Auto Detection - whether the user has disabled it
                     if (oUserProfileParameter.id === "THEME_DARKMODE_AUTO_DETECTION") {
                         switch (oUserProfileParameter.value) {
@@ -245,6 +252,11 @@ sap.ui.define([
                                 break;
                         }
                     }
+
+                    // The theme set the user has chosen
+                    if (oUserProfileParameter.id === "THEME_SET") {
+                        oStartupResult.bootThemeSet = oUserProfileParameter.value || "";
+                    }
                 });
             }
         };
@@ -283,6 +295,7 @@ sap.ui.define([
                 "setAccessibilityPermitted",
                 "bootTheme",
                 "themeRoot",
+                "bootThemeSet",
                 "ranges",
                 "setThemePermitted",
                 "importBookmarks",
@@ -419,7 +432,7 @@ sap.ui.define([
          */
         this.sessionKeepAlive = function () {
             const sPageSetsUrl = "/sap/opu/odata/UI2/PAGE_BUILDER_PERS";
-            const oXHR = abapUtils.createAndOpenXHR(sPageSetsUrl, null, "HEAD");
+            const oXHR = XhrFactory.createAndOpen(sPageSetsUrl, null, "HEAD");
             oXHR.onreadystatechange = function () {
                 if (this.readyState === /* DONE */4) {
                     Log.debug("server session was extended");
@@ -438,12 +451,8 @@ sap.ui.define([
          */
         this.logout = async function (bLogonSystem) {
             if (bLogonSystem) {
-                if (utils.hasNativeLogoutCapability()) {
-                    const sFullLogOffUrl = (new URI(S_LOGOFF_URL))
-                        .absoluteTo(this.getCurrentUrl())
-                        .search("") // NOTE: remove query parameters
-                        .toString();
-                    window.external.getPrivateEpcm().doLogOff(sFullLogOffUrl);
+                if (SAPBusinessClientEnablement.hasNativeLogoutCapability()) {
+                    SAPBusinessClientEnablement.doLogout(S_LOGOFF_URL);
                 } else {
                     this.logoutRedirect();
                 }