@sapui5/sap.ushell_abap 1.150.1 → 1.152.0

package/src/main/js/sap/ushell_abap/pbServices/ui2/contracts/actions.js

@@ -6,7 +6,7 @@
  */
 sap.ui.define([
     "sap/ushell_abap/pbServices/ui2/Chip",
-    "sap/ushell_abap/pbServices/ui2/Error",
+    "sap/ushell_abap/base/Ui2Error",
     "sap/base/Log"
 ], (
     Chip,

package/src/main/js/sap/ushell_abap/pbServices/ui2/contracts/bag.js

@@ -5,8 +5,8 @@
  */
 sap.ui.define([
     "sap/ushell_abap/pbServices/ui2/Chip",
-    "sap/ushell_abap/pbServices/ui2/Utils",
-    "sap/ushell_abap/pbServices/ui2/Error"
+    "sap/ushell_abap/base/Ui2Utils",
+    "sap/ushell_abap/base/Ui2Error"
 ], (
     Chip,
     Utils,
@@ -134,7 +134,7 @@ sap.ui.define([
              * @see chip.bag.attachBagsUpdated
              */
             fireBagsUpdated: function (aUpdatedBagIds) {
-                if (!Utils.isArray(aUpdatedBagIds) || aUpdatedBagIds.length < 1) {
+                if (!Array.isArray(aUpdatedBagIds) || aUpdatedBagIds.length < 1) {
                     throw new SrvcError("At least one bag ID must be given", "contract.bag");
                 }
                 if (fnBagsUpdatedHandler) {

package/src/main/js/sap/ushell_abap/pbServices/ui2/contracts/configuration.js

@@ -5,8 +5,8 @@
  */
 sap.ui.define([
     "sap/ushell_abap/pbServices/ui2/Chip",
-    "sap/ushell_abap/pbServices/ui2/Error",
-    "sap/ushell_abap/pbServices/ui2/Utils"
+    "sap/ushell_abap/base/Ui2Error",
+    "sap/ushell_abap/base/Ui2Utils"
 ], (
     Chip,
     SrvcError,
@@ -94,7 +94,7 @@ sap.ui.define([
              * @see chip.configuration.attachBagsUpdated
              */
             fireConfigurationUpdated: function (aUpdatedConfigKeys) {
-                if (!Utils.isArray(aUpdatedConfigKeys) || aUpdatedConfigKeys.length < 1) {
+                if (!Array.isArray(aUpdatedConfigKeys) || aUpdatedConfigKeys.length < 1) {
                     throw new SrvcError("At least one configuration property key must be given",
                         "contract.configuration");
                 }

package/src/main/js/sap/ushell_abap/pbServices/ui2/contracts/configurationUi.js

@@ -4,9 +4,11 @@
  * @fileOverview The <code>configurationUi</code> contract.
  */
 sap.ui.define([
+    "sap/ushell/utils/toDeferred",
     "sap/ushell_abap/pbServices/ui2/Chip",
-    "sap/ushell_abap/pbServices/ui2/Error"
+    "sap/ushell_abap/base/Ui2Error"
 ], (
+    toDeferred,
     Chip,
     SrvcError
 ) => {
@@ -273,7 +275,7 @@ sap.ui.define([
             /**
              * Fires the "save" event on this CHIP instance's configuration UI.
              *
-             * @returns {object}
+             * @returns {jQuery.Promise|undefined}
              *   a <code>jQuery.Deferred</code> object's promise as returned by the "save" event handler
              *
              * @name contract.configurationUi.fireSave
@@ -283,7 +285,13 @@ sap.ui.define([
              * @see chip.configurationUi.attachSave
              */
             fireSave: function () {
-                return fnSaveHandler ? fnSaveHandler() : undefined;
+                if (!fnSaveHandler) {
+                    return;
+                }
+                const vReturnValue = fnSaveHandler();
+                if (vReturnValue) {
+                    return toDeferred(vReturnValue);
+                }
             },
 
             /**

package/src/main/js/sap/ushell_abap/pbServices/ui2/contracts/search.js

@@ -5,8 +5,8 @@
  */
 sap.ui.define([
     "sap/ushell_abap/pbServices/ui2/Chip",
-    "sap/ushell_abap/pbServices/ui2/Error",
-    "sap/ushell_abap/pbServices/ui2/Utils"
+    "sap/ushell_abap/base/Ui2Error",
+    "sap/ushell_abap/base/Ui2Utils"
 ], (
     Chip,
     SrvcError,
@@ -37,7 +37,7 @@ sap.ui.define([
          *   the keywords of this CHIP
          */
         this.setKeywords = function (aNewKeywords) {
-            if (!Utils.isArray(aNewKeywords)) {
+            if (!Array.isArray(aNewKeywords)) {
                 throw new SrvcError(`Not an array: ${aNewKeywords}`, "chip.search");
             }
             aKeywords = aNewKeywords.slice();

package/src/main/js/sap/ushell_abap/pbServices/ui2/contracts/visible.js

@@ -5,7 +5,7 @@
  */
 sap.ui.require([
     "sap/ushell_abap/pbServices/ui2/Chip",
-    "sap/ushell_abap/pbServices/ui2/Error",
+    "sap/ushell_abap/base/Ui2Error",
     "sap/base/Log"
 ], (
     Chip,

package/src/main/js/sap/ushell_abap/services/NavigationDataProvider.js

@@ -0,0 +1,126 @@
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
+
+/**
+ * @fileOverview This module prepares the navigation data.
+ *
+ * It provides the inbound and systemAlias data for both the pages runtime
+ * and the direct app launch by transaction code in module TCodeNavigation.
+ * Only used on the ABAP platform and on local for testing.
+ *
+ * Configured with the ClientSideTargetResolutionAdapter.
+ *
+ * @version 1.152.0
+ */
+sap.ui.define([
+    "sap/ushell/base/promisify",
+    "sap/ushell/resources",
+    "sap/ushell/utils/LaunchpadError"
+], (
+    promisify,
+    ushellResources,
+    LaunchpadError
+) => {
+    "use strict";
+
+    /**
+     * @alias sap.ushell_abap.services.NavigationDataProvider
+     * @class
+     * @classdesc The Unified Shell's NavigationDataProvider service.
+     *
+     * <b>Note:</b> To retrieve a valid instance of this service, it is necessary to call {@link sap.ushell.Container#getServiceAsync}.
+     * <pre>
+     *   sap.ui.require(["sap/ushell/Container"], async function (Container) {
+     *     const NavigationDataProvider = await Container.getServiceAsync("NavigationDataProvider");
+     *     // do something with the NavigationDataProvider service
+     *   });
+     * </pre>
+     *
+     * @hideconstructor
+     *
+     * @since 1.68.0
+     * @private
+     */
+    function NavigationDataProvider (/* adapter, serviceConfiguration */) {
+        this.S_COMPONENT_NAME = "sap.ushell_abap.services.NavigationDataProvider";
+        this._init.apply(this, arguments);
+    }
+
+    /**
+     * Private initializer.
+     *
+     * @param {object} adapter
+     *     the navigation data provider adapter for the frontend server
+     * @param {object} serviceConfiguration
+     *     the navigation data provider service configuration
+     *
+     * @since 1.68.0
+     * @private
+     */
+    NavigationDataProvider.prototype._init = function (adapter, serviceConfiguration) {
+        this.oAdapter = adapter;
+    };
+
+    /**
+     * An object representing navigation data containing inbounds and available system aliases.
+     * @typedef {object} NavigationData
+     * @property {object[]} object.inbounds The inbounds.
+     * @property {object} object.systemAliases The system aliases.
+     */
+
+    /**
+     * @typedef {sap.ushell_abap.adapters.abap.ClientSideTargetResolutionAdapter.TargetMapping & {
+     *   isDefaultLadi: boolean,
+     *   ladiHasTiles: boolean,
+     *   defaultTileParams: string,
+     *   resolutionResult: sap.ushell.services.ClientSideTargetResolution.ResolutionResult
+     * }} sap.ushell.services.NavigationDataProvider.ABAPInbound
+     *
+     * @property {boolean} isDefaultLadi Indicates whether the LADI/Target Mapping is default.
+     * @property {boolean} ladiHasTiles Indicates whether the LADI/Target Mapping has tiles.
+     * @property {string} defaultTileParams The default tile parameters of the LADI/Target Mapping.
+     * @property {sap.ushell.services.ClientSideTargetResolution.ResolutionResult} resolutionResult The inbound resolutionResult containing the abap transaction code.
+     *
+     * @since 1.146.0
+     * @private
+     */
+
+    /**
+     * Loads and returns the relevant navigation data.
+     *
+     * The ClientSideTargetResolutionAdapter's getEnhancedInbounds method is called to retrieve the inbounds,
+     * which includes ABAP-specific properties such as isDefaultLadi and ladiHasTiles.
+     *
+     * @returns {Promise<NavigationData>} The navigation data.
+     *
+     * @since 1.68.0
+     * @private
+     */
+    NavigationDataProvider.prototype.getNavigationData = function () {
+        return new Promise((resolve, reject) => {
+            const oSystemAliases = (this.oAdapter.getSystemAliases && this.oAdapter.getSystemAliases()) || {};
+
+            promisify(this.oAdapter.getEnhancedInbounds())
+                .then((aInbounds) => {
+                    resolve({
+                        systemAliases: oSystemAliases,
+                        inbounds: aInbounds
+                    });
+                })
+                .catch((oError) => {
+                    const oEnhancedError = new LaunchpadError(
+                        oError.message,
+                        {
+                            component: this.S_COMPONENT_NAME,
+                            description: ushellResources.i18n.getText("NavigationDataProvider.CannotLoadData"),
+                            detail: oError
+                        },
+                        oError
+                    );
+                    reject(oEnhancedError);
+                });
+        });
+    };
+
+    NavigationDataProvider.hasNoAdapter = false;
+    return NavigationDataProvider;
+});

package/src/main/js/sap/ushell_abap/ui5appruntime/AppInfoAdapter.js

@@ -5,11 +5,13 @@
 sap.ui.define([
     "sap/base/Log",
     "sap/ui/thirdparty/URI",
-    "sap/ui/thirdparty/jquery"
+    "sap/ui/thirdparty/jquery",
+    "sap/ushell/base/promisify"
 ], (
     Log,
     URI,
-    jQuery
+    jQuery,
+    promisify
 ) => {
     "use strict";
 
@@ -38,30 +40,29 @@ sap.ui.define([
         return new Error("Cannot load app info - no app-id provided and URL parameter 'sap-ui-app-id' not set");
     };
 
-    AppInfoAdapter.prototype._loadAppIndexData = function (sServiceUrl, sAppId) {
+    AppInfoAdapter.prototype._loadAppIndexData = async function (sServiceUrl, sAppId) {
         const sUri = new URI(sServiceUrl).query({
             id: sAppId
         }).toString();
 
-        return new Promise((resolve, reject) => {
-            jQuery.ajax({
+        let oResponseData;
+        try {
+            oResponseData = await promisify(jQuery.ajax({
                 type: "GET",
                 dataType: "json",
                 url: sUri
-            }).done((oResponseData) => {
-                const oAppData = oResponseData[sAppId];
+            }));
+        } catch (oError) {
+            oLogger.error(oError.responseText);
+            throw new Error(`Failed to load UI5 app index data loaded from ${sUri}: ${oError.responseText}`);
+        }
 
-                if (oAppData) {
-                    resolve(oResponseData[sAppId]);
-                } else {
-                    // TODO: extract error messages from app index response
-                    reject(new Error(`UI5 app index data loaded from ${sUri} does not contain app ${sAppId}`));
-                }
-            }).fail((oError) => {
-                oLogger.error(oError.responseText);
-                reject(new Error(`Failed to load UI5 app index data loaded from ${sUri}: ${oError.responseText}`));
-            });
-        });
+        const oAppData = oResponseData[sAppId];
+        if (oAppData) {
+            return oAppData;
+        }
+        // TODO: extract error messages from app index response
+        throw new Error(`UI5 app index data loaded from ${sUri} does not contain app ${sAppId}`);
     };
 
     return new AppInfoAdapter();

package/ui5.yaml

@@ -128,9 +128,10 @@ builder:
               - sap/ui/performance/trace/_InteractionImpl.js
             resolve: true
           - mode: preload
-            # Include sap/ushell/base to avoid loading of chunk
+            # Include sap/ushell/base and sap/ushell_abap/base to avoid loading of chunk
             filters:
               - sap/ushell/base/
+              - sap/ushell_abap/base/
             resolve: false
           - mode: raw
             filters:
@@ -158,6 +159,7 @@ builder:
               - "!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/base/"                          # ... and sap/ushell_abap/base
               - "!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/"
@@ -167,9 +169,10 @@ builder:
               - sap/ushell_abap/bootstrap/BootTask/
             resolve: true
           - mode: preload
-            # Include sap/ushell/base to avoid loading of chunk
+            # Include sap/ushell/base and sap/ushell_abap/base to avoid loading of chunk
             filters:
               - sap/ushell/base/
+              - sap/ushell_abap/base/
             resolve: false
       bundleOptions:
         optimize: true
@@ -262,7 +265,6 @@ builder:
               - sap/ushell/Container.js
               - sap/ushell/ApplicationType/
               - sap/ushell/Fiori20AdapterTest.js
-              - sap/ushell/SessionHandler.js
               - sap/ushell/System.js
               - sap/ushell/User.js
               - sap/ushell/adapters/cdm/PagesCommonDataModelAdapter.js
@@ -320,7 +322,6 @@ builder:
               - sap/ushell/services/Navigation.js
               - sap/ushell/services/NavTargetResolution.js
               - sap/ushell/services/NavTargetResolutionInternal.js
-              - sap/ushell/services/NavigationDataProvider.js
               - sap/ushell/services/PageBuilding.js
               - sap/ushell/services/PagePersistence.js
               - sap/ushell/services/Pages.js
@@ -328,12 +329,12 @@ builder:
               - sap/ushell/services/PersonalizationV2.js
               - sap/ushell/services/PluginManager.js
               - sap/ushell/services/ReferenceResolver.js
+              - sap/ushell/services/SessionHandler.js
               - sap/ushell/services/ShellNavigation.js
               - sap/ushell/services/ShellNavigationInternal.js
               - sap/ushell/services/SpaceContent.js
               - sap/ushell/services/SupportTicket.js
               - sap/ushell/services/URLParsing.js
-              - sap/ushell/services/URLShortening.js
               - sap/ushell/services/Ui5ComponentLoader.js
               - sap/ushell/services/UserDefaultParameterPersistence.js
               - sap/ushell/services/UserDefaultParameters.js
@@ -361,6 +362,7 @@ builder:
               - sap/ushell_abap/adapters/abap/PersonalizationV2Adapter.js
               - sap/ushell_abap/adapters/abap/Ui5ComponentLoaderAdapter.js
               - sap/ushell_abap/adapters/abap/UserInfoAdapter.js
+              - sap/ushell_abap/services/NavigationDataProvider.js
               - sap/ushell_abap/library.js
               - sap/ushell_abap/pbServices/
               - '!sap/viz/libs/sap-viz.js'
@@ -457,7 +459,6 @@ builder:
               - sap/ushell/utils/AppType.js
               # Default ushell modules
               - sap/ushell/components/shell/Notifications/NotificationsModule.js
-              - sap/ushell/components/shell/ProductSwitch/ProductSwitchModule.js
             resolve: false
       bundleOptions:
         optimize: true