@sapui5/sap.ushell_abap 1.151.1 → 1.153.0

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

@@ -5,19 +5,17 @@
  */
 sap.ui.define([
     "sap/base/Log",
-    "sap/ui/thirdparty/jquery",
+    "sap/ushell/base/requireAsync",
     "sap/ushell_abap/bootstrap/XhrFactory",
     "sap/ushell_abap/base/Ui2Utils"
 ], (
     Log,
-    jQuery,
+    requireAsync,
     XhrFactory,
     ui2Utils
 ) => {
     "use strict";
 
-    /* global OData */
-
     const S_PAGE_SETS_FALLBACK_URL_BASE = "/sap/opu/odata/UI2/PAGE_BUILDER_PERS";
     const S_PAGE_SETS_FALLBACK_EXPAND = "Pages/PageChipInstances/Chip/ChipBags/ChipProperties,"
             + "Pages/PageChipInstances/RemoteCatalog,"
@@ -114,25 +112,6 @@ sap.ui.define([
             return sServiceUrl;
         }
 
-        /**
-         * Processes the OData response.
-         * @param {jQuery.Deferred} oDeferred the deferred object updating the cache in OData.read
-         * @param {int} iStatus the status code
-         * @param {string} sCsrfToken the CSRF token
-         * @param {string} sResponse the response message
-         *
-         * @private
-         */
-        #processOData (oDeferred, iStatus, sCsrfToken, sResponse) {
-            if (iStatus === 200) {
-                oDeferred.resolve(JSON.parse(sResponse).d, sCsrfToken);
-            } else {
-                // rejecting the deferred will make the request later (in the ushell adapter) fail, so
-                // the error handling there takes effect
-                oDeferred.reject(new Error(`PageSet request failed: ${sResponse}`));
-            }
-        }
-
         /**
          * Determines the URL for the PageSets OData service from the startup service result. If the URL is not set
          * a hard-coded fallback URL is returned and set in the startupResult.
@@ -160,35 +139,24 @@ sap.ui.define([
         }
 
         /**
-         * Creates the Deferred in the OData.read cache to keep the result of the request with the
-         * given URL.
-         * @param {string} sUrl the URL to be requested
-         * @returns {jQuery.Deferred} the deferred object which will be resolved with the response of the request
+         * Performs an OData GET request using a plain XHR.
+         * @param {string} sUrl the url to be requested
+         * @param {object} oStartupResult the startup result object, containing the base URL and the CSRF token
+         * @returns {Promise<object>} Resolves the response
          *
          * @private
          */
-        #createODataDeferred (sUrl) {
-            const oDeferred = new jQuery.Deferred();
+        #sendODataRequest (sUrl, oStartupResult) {
+            const oDeferred = Promise.withResolvers();
+
             // creating the deferred objects here should ensure that the ushell adapters later read
             // the responses from the "cache", even if UI5 bootstrap is faster than the
             // OData requests
-            sap.ui.require(["sap/ui/thirdparty/datajs"], (datajs) => {
-                OData.read.$cache = OData.read.$cache || new ui2Utils.Map();
-                OData.read.$cache.put(sUrl, oDeferred.promise());
+            requireAsync(["sap/ui/thirdparty/datajs"]).then(([datajs]) => {
+                datajs.read.$cache = datajs.read.$cache || new ui2Utils.Map();
+                datajs.read.$cache.put(sUrl, oDeferred.promise);
             });
-            return oDeferred;
-        }
 
-        /**
-         * Performs an OData GET request using a plain XHR.
-         * @param {string} sUrl the url to be requested
-         * @param {object} oStartupResult the startup result object, containing the base URL and the CSRF token
-         * @param {function(number, object, function)} fnCallback callback function to be called when the request finished,
-         *  taking the status code, the CSRF token and the response message
-         *
-         * @private
-         */
-        #requestOData (sUrl, oStartupResult, fnCallback) {
             const oXhr = XhrFactory.createAndOpen(sUrl, oStartupResult);
             // set sap-statistics header, see
             // http://help.sap.com/saphelp_nw74/helpdata/de/40/93b81292194d6a926e105c10d5048d/content.htm
@@ -199,18 +167,25 @@ sap.ui.define([
                 if (this.readyState !== /* DONE */4) {
                     return; // not yet DONE
                 }
-                fnCallback(oXhr.status, undefined /* csrf token */, oXhr.responseText);
+
+                if (oXhr.status === 200) {
+                    oDeferred.resolve([JSON.parse(oXhr.responseText).d, undefined /* sCsrfToken */]);
+                } else {
+                    // rejecting the deferred will make the request later (in the ushell adapter) fail, so
+                    // the error handling there takes effect
+                    oDeferred.reject(new Error(`PageSet request failed: ${oXhr.responseText}`));
+                }
             };
+
             oXhr.send();
+
+            return oDeferred.promise;
         }
 
-        requestPageSets (oStartupResult) {
+        async requestPageSets (oStartupResult) {
             const sPageSetServiceUrl = this.#getAndAdjustPageSetServiceURL(oStartupResult);
-            const oDeferred = this.#createODataDeferred(sPageSetServiceUrl);// TODO make as Promise.all
 
-            this.#requestOData(sPageSetServiceUrl, oStartupResult, (iStatus, sCsrfToken, sResponse) => {
-                this.#processOData(oDeferred, iStatus, sCsrfToken, sResponse);
-            });
+            await this.#sendODataRequest(sPageSetServiceUrl, oStartupResult);
         }
 
         /**

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

@@ -7,11 +7,9 @@
  */
 sap.ui.define([
     "sap/base/Log",
-    "sap/base/util/Deferred",
     "sap/ushell/bootstrap/Config"
 ], (
     Log,
-    Deferred,
     BootstrapConfig
 ) => {
     "use strict";
@@ -43,7 +41,7 @@ sap.ui.define([
         }
 
         run () {
-            const oDeferred = new Deferred();
+            const oDeferred = Promise.withResolvers();
 
             function fnKeepTrying () {
                 if (this.#counter < this.#timeoutCounter) {

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

@@ -5,10 +5,12 @@
 sap.ui.define([
     "sap/base/Log",
     "sap/base/util/ObjectPath",
+    "sap/ui/core/Lib",
     "sap/ushell/Config"
 ], (
     Log,
     ObjectPath,
+    Lib,
     Config
 ) => {
     "use strict";
@@ -220,11 +222,8 @@ sap.ui.define([
             const Action = MessageBox.Action;
             const Icon = MessageBox.Icon;
 
-            const ushellResources = sap.ui.require("sap/ushell/resources");
-            if (ushellResources) {
-                sTitle = this._getText(oTitleText, ushellResources);
-                sMessage = this._getText(oMessageText, ushellResources);
-            }
+            sTitle = this._getText(oTitleText);
+            sMessage = this._getText(oMessageText);
 
             // Overwrite sap.ui.core.BusyIndicator.show to not open a busy indicator.
             // In case the MessageBox (to show the error message and to offer the end user to reload the FLP) gets shown, we want
@@ -262,8 +261,8 @@ sap.ui.define([
      *
      * @private
      */
-    XhrLogonEventHandler.prototype._getText = function (oText, oResources) {
-        const sText = oResources.i18n.getText(oText.key);
+    XhrLogonEventHandler.prototype._getText = function (oText) {
+        const sText = Lib.getResourceBundleFor("sap.ushell").getText(oText.key);
 
         // ui5 resource bundle returns the text key if no text defined we need the fallback,
         // because translations might be missing in lower releases

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

@@ -56,6 +56,13 @@ sap.ui.define([
                         enabled: true
                     }
                 },
+                settings: {
+                    customEntries: [{
+                        name: "sap.ushell_abap.components.settings.TransactionCode",
+                        url: sap.ui.require.toUrl("sap/ushell_abap/components/settings/TransactionCode"),
+                        manifest: sap.ui.require.toUrl("sap/ushell_abap/components/settings/TransactionCode/manifest.json")
+                    }]
+                },
                 customPreload: getCustomPreloadConfig()
             },
             renderers: {
@@ -189,6 +196,18 @@ sap.ui.define([
                             enabled: false
                         }
                     }
+                },
+                MessageBroker: {
+                    config: {
+                        ClientLoader: {
+                            enabled: true,
+                            mappings: {
+                                "sap.ushell.api.RTA": {
+                                    module: "module:sap/ushell/api/RTA"
+                                }
+                            }
+                        }
+                    }
                 }
             },
             xhrLogon: {

package/src/main/js/sap/ushell_abap/components/settings/TransactionCode/Component.js

@@ -0,0 +1,90 @@
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
+/**
+ * @fileOverview The ABAP platform's transaction code settings entry component.
+ *
+ * @version 1.153.0
+ */
+sap.ui.define([
+    "sap/ui/core/UIComponent",
+    "sap/ushell_abap/utils/UserPersonalization",
+    "sap/ushell/Config"
+], (
+    UIComponent,
+    UserPersonalization,
+    Config
+) => {
+    "use strict";
+
+    /**
+     * @alias sap.ushell_abap.components.settings.TransactionCode.Component
+     * @class
+     * @classdesc Provides the transaction code entry for the user settings dialog.
+     *
+     * @extends sap.ui.core.Component
+     *
+     * @since 1.153.0
+     * @private
+     */
+    return UIComponent.extend("sap.ushell_abap.components.settings.TransactionCode.Component", {
+        metadata: {
+            manifest: "json",
+            library: "sap.ushell_abap",
+            interfaces: ["sap.ui.core.IAsyncContentCreation"]
+        },
+
+        /**
+         * Returns the transaction code settings entry, or <code>undefined</code> when the
+         * administrator has not activated the feature.
+         *
+         * @returns {Promise<object|undefined>} The settings entry, or undefined when not applicable.
+         *
+         * @since 1.153.0
+         * @private
+         */
+        getEntry: async function () {
+            if (!Config.last("/abap/ui/displayTransaction")) {
+                await this.destroy();
+                return;
+            }
+
+            const oResourceBundle = await this.getModel("i18n").getResourceBundle();
+
+            return {
+                id: "transactionCodeSettingsEntry",
+                entryHelpID: "transactionCodeSettingsEntry",
+                title: oResourceBundle.getText("FlpSettings_transactionCode_sectionTitle"),
+                valueResult: null,
+                contentResult: null,
+                icon: "sap-icon://syntax",
+                groupingEnablement: true,
+                groupingId: "appearance",
+                groupingTabHelpId: "transactionCodeSettingsEntry",
+                groupingTabTitle: oResourceBundle.getText("FlpSettings_transactionCode_sectionTitle"),
+                valueArgument: async () => {
+                    const bEnabled = await UserPersonalization.getDisplayTransactionCode();
+                    return oResourceBundle.getText(bEnabled
+                        ? "FlpSettings_transactionCode_shown"
+                        : "FlpSettings_transactionCode_hidden");
+                },
+                contentFunc: async () => {
+                    return new sap.ui.core.ComponentContainer({
+                        component: this,
+                        height: "100%",
+                        width: "100%",
+                        async: true
+                    });
+                },
+                onSave: async (fnUpdateUserPreferences) => {
+                    await this.rootControlLoaded();
+                    const oView = this.getRootControl();
+                    return oView.getController().onSave(fnUpdateUserPreferences);
+                },
+                onCancel: async () => {
+                    await this.rootControlLoaded();
+                    const oView = this.getRootControl();
+                    oView.getController().onCancel();
+                }
+            };
+        }
+    });
+});

package/src/main/js/sap/ushell_abap/components/settings/TransactionCode/TransactionCode.controller.js

@@ -0,0 +1,109 @@
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
+/**
+ * @fileOverview Controller of the ABAP transaction code user settings entry.
+ *
+ * @version 1.153.0
+ */
+sap.ui.define([
+    "sap/base/Log",
+    "sap/ui/core/message/Message",
+    "sap/ui/core/message/MessageType",
+    "sap/ui/core/mvc/Controller",
+    "sap/ui/model/json/JSONModel",
+    "sap/ushell/utils/LaunchpadError",
+    "sap/ushell_abap/utils/UserPersonalization"
+], (
+    Log,
+    Message,
+    MessageType,
+    Controller,
+    JSONModel,
+    LaunchpadError,
+    UserPersonalization
+) => {
+    "use strict";
+
+    /**
+     * Controller of the ABAP transaction code user settings entry.
+     *
+     * @since 1.153.0
+     * @private
+     */
+    return Controller.extend("sap.ushell_abap.components.settings.TransactionCode.TransactionCode", {
+        onInit: function () {
+            const oView = this.getView();
+
+            const oConfigModel = new JSONModel({
+                transactionCodeSelected: false
+            });
+            oView.setModel(oConfigModel, "config");
+
+            // The effective setting may read user personalization, so it is resolved asynchronously.
+            UserPersonalization.getDisplayTransactionCode().then((bEnabled) => {
+                oConfigModel.setProperty("/transactionCodeSelected", bEnabled);
+            });
+        },
+
+        /**
+         * Resets the toggle to the persisted value.
+         *
+         * @returns {Promise<undefined>} Resolves once the persisted value was applied.
+         *
+         * @since 1.153.0
+         * @private
+         */
+        onCancel: async function () {
+            const oConfigModel = this.getView().getModel("config");
+            const bEnabled = await UserPersonalization.getDisplayTransactionCode();
+
+            oConfigModel.setProperty("/transactionCodeSelected", bEnabled);
+        },
+
+        /**
+         * Persists the toggle value.
+         *
+         * @returns {Promise<object|undefined>} Resolves with <code>{ refresh: true }</code> when the
+         *   value changed, otherwise with undefined. Rejects with a message on failure.
+         *
+         * @since 1.153.0
+         * @private
+         */
+        onSave: async function () {
+            const bOldValue = await UserPersonalization.getDisplayTransactionCode();
+            const bCurrentValue = this.getView().getModel("config").getProperty("/transactionCodeSelected");
+            if (bCurrentValue === bOldValue) {
+                return;
+            }
+
+            try {
+                await UserPersonalization.setDisplayTransactionCode(bCurrentValue);
+                /**
+                 * force browser refresh for now
+                 * replace by dynamic update in follow up
+                 */
+                return { refresh: true };
+            } catch (oError) {
+                Log.error("Cannot save transaction code on tiles configuration", oError);
+
+                let oMessage;
+                if (oError instanceof LaunchpadError) {
+                    oMessage = new Message({
+                        type: MessageType.Error,
+                        description: oError.message,
+                        message: oError.details?.message.value,
+                        date: oError.details?.innererror.timestamp,
+                        httpStatus: oError.details?.httpStatus
+                    });
+                } else {
+                    oMessage = new Message({
+                        type: MessageType.Error,
+                        description: oError.message,
+                        message: oError.message
+                    });
+                }
+
+                throw oMessage;
+            }
+        }
+    });
+});

package/src/main/js/sap/ushell_abap/components/settings/TransactionCode/TransactionCode.view.xml

@@ -0,0 +1,16 @@
+<mvc:View
+    xmlns="sap.m"
+    xmlns:mvc="sap.ui.core.mvc"
+    controllerName="sap.ushell_abap.components.settings.TransactionCode.TransactionCode">
+    <Panel>
+        <CheckBox
+            id="transactionCodeCheckBox"
+            text="{i18n>FlpSettings_transactionCode_label}"
+            selected="{config>/transactionCodeSelected}" />
+        <VBox class="sapUshellFlpSettingsDescriptionBorder">
+            <Text
+                class="sapUshellFlpSettingsDescription sapUshellFlpSettingsWide"
+                text="{i18n>FlpSettings_transactionCode_description}" />
+        </VBox>
+    </Panel>
+</mvc:View>

package/src/main/js/sap/ushell_abap/components/settings/TransactionCode/i18n/i18n.properties

@@ -0,0 +1,17 @@
+#This is the resource bundle for TransactionCode UserSetting
+#__ldi.translation.uuid=2b979b60-ab52-11f1-ab3b-0800200c9a66
+
+#XTIT: Section title in the user settings dialog for the transaction code toggle
+FlpSettings_transactionCode_sectionTitle=Additional App Information
+
+#XFLD: Summary label shown in user settings when the transaction code display is active
+FlpSettings_transactionCode_shown=State: On
+
+#XFLD: Summary label shown in user settings when the transaction code display is inactive
+FlpSettings_transactionCode_hidden=Default: Off
+
+#XFLD: Checkbox label for the "Show Transaction Code on Tiles" toggle in user settings
+FlpSettings_transactionCode_label=Display Transaction Code on Apps
+
+#XMSG: Description paragraph below the checkbox in user settings
+FlpSettings_transactionCode_description=Enable to display the app's transaction directly on tile, in the navigation menu, in the app finder.

package/src/main/js/sap/ushell_abap/components/settings/TransactionCode/manifest.json

@@ -0,0 +1,96 @@
+{
+    "_version": "1.21.0",
+    "sap.app": {
+        "id": "sap.ushell_abap.components.settings.TransactionCode",
+        "applicationVersion": {
+            "version": "1.153.0"
+        },
+        "ach": "CA-FLP-ABA",
+        "type": "component",
+        "title": "Transaction Code Settings Entry"
+    },
+    "sap.ui": {
+        "technology": "UI5"
+    },
+    "sap.ui5": {
+        "componentName": "sap.ushell_abap.components.settings.TransactionCode",
+        "dependencies": {
+            "minUI5Version": "1.72",
+            "libs": {
+                "sap.ui.core": {},
+                "sap.m": {},
+                "sap.ushell": {}
+            }
+        },
+        "rootView": {
+            "viewName": "sap.ushell_abap.components.settings.TransactionCode.TransactionCode",
+            "id": "userSettingsTransactionCodeView",
+            "type": "XML",
+            "async": true
+        },
+        "models": {
+            "i18n": {
+                "type": "sap.ui.model.resource.ResourceModel",
+                "settings": {
+                    "bundleName": "sap.ushell_abap.components.settings.TransactionCode.i18n.i18n",
+                    "async": true,
+                    "supportedLocales": [
+                        "",
+                        "ar",
+                        "bg",
+                        "ca",
+                        "cnr",
+                        "cs",
+                        "cy",
+                        "da",
+                        "de",
+                        "el",
+                        "en",
+                        "en-GB",
+                        "en-US-sappsd",
+                        "en-US-saprigi",
+                        "en-US-saptrc",
+                        "es",
+                        "es-MX",
+                        "et",
+                        "fi",
+                        "fr",
+                        "fr-CA",
+                        "hi",
+                        "hr",
+                        "hu",
+                        "id",
+                        "it",
+                        "iw",
+                        "ja",
+                        "kk",
+                        "ko",
+                        "lt",
+                        "lv",
+                        "mk",
+                        "ms",
+                        "nl",
+                        "no",
+                        "pl",
+                        "pt",
+                        "pt-PT",
+                        "ro",
+                        "ru",
+                        "sh",
+                        "sk",
+                        "sl",
+                        "sr",
+                        "sv",
+                        "th",
+                        "tr",
+                        "uk",
+                        "vi",
+                        "zh-CN",
+                        "zh-TW"
+                    ],
+                    "fallbackLocale": "en"
+                }
+            }
+        }
+    }
+}

package/src/main/js/sap/ushell_abap/integration/fileshares/NavTargetResolutionFileShareSupport.js

@@ -3,10 +3,12 @@
 sap.ui.define([
     "sap/base/Log",
     "sap/ui/core/Manifest",
+    "sap/ushell/base/promisify",
     "sap/ushell/Container"
 ], (
     Log,
     Manifest,
+    promisify,
     Container
 ) => {
     "use strict";
@@ -46,7 +48,7 @@ sap.ui.define([
     NavTargetResolutionFileShareSupport.getDataSource = function () {
         if (!NavTargetResolutionFileShareSupport._getDataSourcePromise) {
             NavTargetResolutionFileShareSupport._getDataSourcePromise = Container.getServiceAsync("NavTargetResolutionInternal").then((oNavTargetResolutionService) => {
-                return oNavTargetResolutionService.resolveHashFragment(FILE_SHARE_INTENT); // jQuery promise is implicitly converted to native
+                return promisify(oNavTargetResolutionService.resolveHashFragment(FILE_SHARE_INTENT));
             }).then((oResolvedHashFragment) => {
                 const sManifestUrl = oResolvedHashFragment && oResolvedHashFragment.applicationDependencies && oResolvedHashFragment.applicationDependencies.manifest;
                 if (sManifestUrl) {

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.151.1",
+        version: "1.153.0",
         dependencies: [
             "sap.ui.core",
             "sap.m",

package/src/main/js/sap/ushell_abap/messagebundle.properties

@@ -5,3 +5,5 @@
 samlCloseBtn=Close
 #XTIT: Title of the SAML authentication dialog
 samlDialogTitle=Authentication Information
+#XFLD: Placeholder text shown on a tile when the transaction code has not been configured
+tileTransactionCodeNotMaintained=No Transaction