@sapui5/sap.ushell_abap 1.150.1 → 1.152.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sapui5/sap.ushell_abap",
-    "version": "1.150.1",
+    "version": "1.152.0",
     "description": "SAPUI5 Library sap.ushell_abap",
     "author": "SAP SE (https://www.sap.com)",
     "license": "SEE LICENSE IN LICENSE.txt",

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.150.1</version>
+    <version>1.152.0</version>
     <copyright>Copyright (c) 2009-2026 SAP SE, All Rights Reserved</copyright>
     <documentation>SAP library: sap.ushell_abap</documentation>
 

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

@@ -3,7 +3,6 @@
 sap.ui.define([
     "sap/base/util/ObjectPath",
     "sap/base/Log",
-    "sap/ui/thirdparty/jquery",
     "sap/ui/core/format/DateFormat",
     "sap/ushell_abap/pbServices/ui2/ODataService",
     "sap/ushell/services/PersonalizationV2/constants",
@@ -11,7 +10,6 @@ sap.ui.define([
 ], (
     ObjectPath,
     Log,
-    jQuery,
     DateFormat,
     ODataService,
     PersonalizationV2Constants,
@@ -72,7 +70,6 @@ sap.ui.define([
 
     // loads data from backend, when done, oPropertyBag contains the items
     AdapterContainer.prototype.load = function () {
-        const oDeferred = new jQuery.Deferred();
         const that = this;
         const oDataWrapper = this._obtainODataWrapper();
         // load container data with _sContainerKey data into _oPoprertyBag
@@ -84,29 +81,29 @@ sap.ui.define([
             return false;
         });
 
-        oDataWrapper.read(sRelativeUrl, (oData) => {
-            // TODO : align container id?
-            that._oJSONContainer = oData;
-            // overwrite key and category, do not trust server response
-            that._oJSONContainer.category = that._category;
-            that._oJSONContainer.id = that._sContainerKey;
-            that._oJSONContainer.appName = that._sAppName;
-            // response contains items.results (!)
-            that._oJSONContainer.PersContainerItems = (that._oJSONContainer.PersContainerItems && that._oJSONContainer.PersContainerItems.results) || [];
-            oDeferred.resolve(that);
-        }, (sErrorMessage, oParsedError) => {
-            // this error handler used to resolve with an empty personalization container
-            // but was changed to reject the promise so that the caller can react to the error
-            Log.error(sErrorMessage);
+        return new Promise((resolve, reject) => {
+            oDataWrapper.read(sRelativeUrl, (oData) => {
+                // TODO : align container id?
+                that._oJSONContainer = oData;
+                // overwrite key and category, do not trust server response
+                that._oJSONContainer.category = that._category;
+                that._oJSONContainer.id = that._sContainerKey;
+                that._oJSONContainer.appName = that._sAppName;
+                // response contains items.results (!)
+                that._oJSONContainer.PersContainerItems = (that._oJSONContainer.PersContainerItems && that._oJSONContainer.PersContainerItems.results) || [];
+                resolve(that);
+            }, (sErrorMessage, oParsedError) => {
+                // this error handler used to resolve with an empty personalization container
+                // but was changed to reject the promise so that the caller can react to the error
+                Log.error(sErrorMessage);
 
-            oDeferred.reject(new LaunchpadError(sErrorMessage, oParsedError));
+                reject(new LaunchpadError(sErrorMessage, oParsedError));
+            });
         });
-        return oDeferred.promise();
     };
 
     AdapterContainer.prototype.save = function () {
         Log.debug("[000] save", "AdapterContainer");
-        const oDeferred = new jQuery.Deferred();
         const that = this;
         const oDataWrapper = this._obtainODataWrapper();
         const sRelativeURL = sCONTAINERCOLLECTIONNAME;
@@ -115,16 +112,16 @@ sap.ui.define([
             return false;
         });
 
-        oDataWrapper.create(sRelativeURL, this._oJSONContainer, (/* response */) => {
-            oDeferred.resolve(that);
-        }, (sErrorMessage, oParsedError) => {
-            oDeferred.reject(new LaunchpadError(sErrorMessage, oParsedError));
+        return new Promise((resolve, reject) => {
+            oDataWrapper.create(sRelativeURL, this._oJSONContainer, (/* response */) => {
+                resolve(that);
+            }, (sErrorMessage, oParsedError) => {
+                reject(new LaunchpadError(sErrorMessage, oParsedError));
+            });
         });
-        return oDeferred.promise();
     };
 
     AdapterContainer.prototype.del = function () {
-        const oDeferred = new jQuery.Deferred();
         const that = this;
         const oDataWrapper = this._obtainODataWrapper();
         const sRelativeURL = `${sCONTAINERCOLLECTIONNAME}(category='${this._category}',id='${encodeURIComponent(this._sContainerKey)}')`;
@@ -133,13 +130,15 @@ sap.ui.define([
             return false;
         });
 
-        oDataWrapper.del(sRelativeURL, (response) => {
-            oDeferred.resolve(that);
-        }, (sErrorMessage, oParsedError) => {
-            oDeferred.reject(new LaunchpadError(sErrorMessage, oParsedError));
+        const pResult = new Promise((resolve, reject) => {
+            oDataWrapper.del(sRelativeURL, (response) => {
+                resolve(that);
+            }, (sErrorMessage, oParsedError) => {
+                reject(new LaunchpadError(sErrorMessage, oParsedError));
+            });
         });
         this._reset();
-        return oDeferred.promise();
+        return pResult;
     };
 
     AdapterContainer.prototype.getItemKeys = function () {

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

@@ -2,22 +2,22 @@
 
 /**
  * @fileOverview The Unified Shell's AppStateAdapter for the ABAP platform.
- * @version 1.150.1
+ * @version 1.152.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",
     "sap/ui/thirdparty/jquery",
     "sap/base/Log",
-    "sap/ushell/utils",
+    "sap/ushell/utils/LogError",
     "sap/ushell_abap/pbServices/ui2/ODataWrapper",
-    "sap/ushell_abap/pbServices/ui2/Error",
+    "sap/ushell_abap/base/Ui2Error",
     "sap/ushell_abap/pbServices/ui2/ODataService",
     "sap/ushell/Container"
 ], (
     ObjectPath,
     jQuery,
     Log,
-    utils,
+    LogError,
     ODataWrapper,
     SrvcError,
     ODataService,
@@ -102,7 +102,7 @@ sap.ui.define([
         const sRelativeUrl = `GlobalContainers(id='${encodeURIComponent(sKey)}')`;
 
         if (!sKey) {
-            throw new utils.Error("The sKey is mandatory to read the data from the persistence layer");
+            throw new LogError("The sKey is mandatory to read the data from the persistence layer");
         }
 
         // wrap the read operation into a batch request

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

@@ -9,18 +9,19 @@
  *     <li>provide the resolveHashFragmentFallback function, a fallback method called by ClientSideTargetResolution service.</li>
  *   </ul>
  *
- * @version 1.150.1
+ * @version 1.152.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",
     "sap/base/util/isPlainObject",
     "sap/base/util/deepExtend",
+    "sap/ushell/base/promisify",
     "sap/ushell/base/SAPBusinessClientEnablement",
     "sap/ushell/base/UrlParsing",
     "sap/ushell/utils",
     "sap/base/Log",
     "sap/ushell_abap/pbServices/ui2/ODataWrapper",
-    "sap/ushell_abap/pbServices/ui2/Utils",
+    "sap/ushell_abap/base/Ui2Utils",
     "sap/ui/thirdparty/URI",
     "sap/ushell/Config",
     "sap/ushell/Container"
@@ -28,6 +29,7 @@ sap.ui.define([
     ObjectPath,
     isPlainObject,
     deepExtend,
+    promisify,
     SAPBusinessClientEnablement,
     UrlParsing,
     ushellUtils,
@@ -186,7 +188,7 @@ sap.ui.define([
         // this variable *may* reflect an initial segment as received by the oInitialSegmentPromise
         this._aInitialSegment = undefined;
 
-        this._oSystemAliasBuffer = new ushellUtils.Map();
+        this._oSystemAliasBuffer = new Map();
         // Cache URL Template object from start_up response
         this._oURLTemplates = {};
 
@@ -495,7 +497,7 @@ sap.ui.define([
      *
      * @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
+     * @returns {sap.ushell_abap.services.NavigationDataProvider.ABAPInbound[]} Array of enriched inbound objects
      * @since 1.146.0
      * @private
      */
@@ -520,7 +522,7 @@ sap.ui.define([
      * 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[]>}
+     * @returns {Promise<sap.ushell_abap.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
@@ -1292,29 +1294,22 @@ sap.ui.define([
         });
     };
 
-    ClientSideTargetResolutionAdapter.prototype._compactUrl = function (sUrl) {
+    ClientSideTargetResolutionAdapter.prototype._compactUrl = async function (sUrl) {
         const aMatches = sUrl.match(/\?.*/);
         const sMatch = aMatches && aMatches[0];
         const iLengthLimit = this._getWDAUrlShorteningLengthLimit() - 200;
 
-        return new Promise((fnResolve, fnReject) => {
-            if (sMatch && sMatch.length < iLengthLimit) {
-                return fnResolve(sUrl);
-            }
+        if (sMatch && sMatch.length < iLengthLimit) {
+            return sUrl;
+        }
 
-            const oParams = UrlParsing.parseParameters(aMatches[0]);
+        const oParams = UrlParsing.parseParameters(aMatches[0]);
 
-            Container.getServiceAsync("ShellNavigationInternal")
-                .then((oShellNavigationInternal) => {
-                    oShellNavigationInternal.compactParams(oParams, aNotCompactedWDAParameters, undefined /* no Component */)
-                        .done((oCompactedParams) => {
-                            const sReconstructedUrl = `${sUrl.match(/^[^?]*/)[0]}?${UrlParsing.paramsToString(oCompactedParams)}`;
-                            fnResolve(sReconstructedUrl);
-                        })
-                        .fail(fnReject);
-                })
-                .catch(fnReject);
-        });
+        const oShellNavigationInternal = await Container.getServiceAsync("ShellNavigationInternal");
+        const oCompactedParams = await promisify(oShellNavigationInternal.compactParams(oParams, aNotCompactedWDAParameters, undefined /* no Component */));
+
+        const sReconstructedUrl = `${sUrl.match(/^[^?]*/)[0]}?${UrlParsing.paramsToString(oCompactedParams)}`;
+        return sReconstructedUrl;
     };
 
     ClientSideTargetResolutionAdapter.prototype._getWDAUrlShorteningLengthLimit = function () {
@@ -1499,7 +1494,7 @@ sap.ui.define([
      */
     ClientSideTargetResolutionAdapter.prototype._writeSystemAliasToBuffer = function (oSystemAliasData) {
         if (oSystemAliasData && oSystemAliasData.id) {
-            this._oSystemAliasBuffer.put(oSystemAliasData.id, oSystemAliasData);
+            this._oSystemAliasBuffer.set(oSystemAliasData.id, oSystemAliasData);
         }
         return oSystemAliasData;
     };
@@ -1585,7 +1580,7 @@ sap.ui.define([
      * @private
      */
     ClientSideTargetResolutionAdapter.prototype.getSystemAliases = function () {
-        return (this._oSystemAliasBuffer && this._oSystemAliasBuffer.entries) || {};
+        return (this._oSystemAliasBuffer && Object.fromEntries(this._oSystemAliasBuffer)) || {};
     };
 
     /**

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.150.1
+ * @version 1.152.0
  */
 sap.ui.define([
 ], () => {

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The ConfigurationDefaults adapter for the ABAP platform.
- * @version 1.150.1
+ * @version 1.152.0
  */
 sap.ui.define([
     "sap/ushell_abap/bootstrap/abapConstants",

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

@@ -2,10 +2,9 @@
 /**
  * @fileOverview The Unified Shell's container adapter for the ABAP platform.
  *
- * @version 1.150.1
+ * @version 1.152.0
  */
 sap.ui.define([
-    "sap/ui/thirdparty/jquery",
     "sap/ushell/base/SAPBusinessClientEnablement",
     "sap/ushell/System",
     "sap/ushell/User",
@@ -20,7 +19,6 @@ sap.ui.define([
     "sap/ushell/Config",
     "sap/ushell/Container"
 ], (
-    jQuery,
     SAPBusinessClientEnablement,
     System,
     User,
@@ -318,12 +316,11 @@ sap.ui.define([
         /**
          * Does the bootstrap for the ABAP platform (and loads the container's configuration).
          *
-         * @returns {jQuery.Promise} Resolves once the bootstrap is done.
+         * @returns {Promise} Resolves once the bootstrap is done.
          *
          * @since 1.11.0
          */
-        this.load = function () {
-            const oDeferred = new jQuery.Deferred();
+        this.load = async function () {
             const oStartupResult = oProperties.config;
             const oSystemProperties = oStartupResult.systemProperties;
 
@@ -372,48 +369,41 @@ sap.ui.define([
 
             // TODO: remove this from startup sequence
             this._setUserImage(oUser);
-
-            return oDeferred.resolve().promise();
         };
 
         /**
          * Add further remote systems to be logged out
          *
-         * @returns {jQuery.Promise} Resolved after further remote systems are added in to local storage
+         * @returns {Promise} Resolved after further remote systems are added in to local storage
          * @since 1.19.0
          */
-        this.addFurtherRemoteSystems = function () {
-            const oDeferred = new jQuery.Deferred();
-
-            Container.getServiceAsync("PageBuilding")
-                .then((PageBuildingService) => {
-                    PageBuildingService
-                        .getFactory()
-                        .getPageBuildingService()
-                        .readAllCatalogsForUser("type eq 'H' or type eq 'REMOTE'", (oData) => { // success handler
-                            const sSocialMediaUrl = "/sap/opu/odata/sap/SM_CATALOG_SRV/";
-                            if (oData.results) {
-                                oData.results.forEach((oCatalog) => {
-                                    const bIsHANAUrl = /^\/sap\/hba\//.test(oCatalog.baseUrl);
-                                    if (oCatalog.type === "H" || oCatalog.baseUrl === sSocialMediaUrl || bIsHANAUrl) {
-                                        Container.addRemoteSystem(new System({
-                                            alias: oCatalog.systemAlias,
-                                            platform: (bIsHANAUrl || oCatalog.type === "H")
-                                                ? "hana" : "abap",
-                                            baseUrl: oCatalog.type === "H" ? "" : ";o="
-                                        }));
-                                    }
-                                });
-                            }
-                            oDeferred.resolve();
-                        }, (sErrorMessage) => { // error handler
-                            Log.error("Reading REMOTE catalogs failed:", sErrorMessage, "sap.ushell_abap.adapters.abap.ContainerAdapter");
-                            oDeferred.reject(new Error(sErrorMessage));
-                        });
-                })
-                .catch(oDeferred.reject);
-
-            return oDeferred.promise();
+        this.addFurtherRemoteSystems = async function () {
+            const PageBuildingService = await Container.getServiceAsync("PageBuilding");
+            await new Promise((resolve, reject) => {
+                PageBuildingService
+                    .getFactory()
+                    .getPageBuildingService()
+                    .readAllCatalogsForUser("type eq 'H' or type eq 'REMOTE'", (oData) => { // success handler
+                        const sSocialMediaUrl = "/sap/opu/odata/sap/SM_CATALOG_SRV/";
+                        if (oData.results) {
+                            oData.results.forEach((oCatalog) => {
+                                const bIsHANAUrl = /^\/sap\/hba\//.test(oCatalog.baseUrl);
+                                if (oCatalog.type === "H" || oCatalog.baseUrl === sSocialMediaUrl || bIsHANAUrl) {
+                                    Container.addRemoteSystem(new System({
+                                        alias: oCatalog.systemAlias,
+                                        platform: (bIsHANAUrl || oCatalog.type === "H")
+                                            ? "hana" : "abap",
+                                        baseUrl: oCatalog.type === "H" ? "" : ";o="
+                                    }));
+                                }
+                            });
+                        }
+                        resolve();
+                    }, (sErrorMessage) => { // error handler
+                        Log.error("Reading REMOTE catalogs failed:", sErrorMessage, "sap.ushell_abap.adapters.abap.ContainerAdapter");
+                        reject(new Error(sErrorMessage));
+                    });
+            });
         };
 
         /**