@sapui5/sap.ushell_abap 1.140.0 → 1.141.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sapui5/sap.ushell_abap",
-    "version": "1.140.0",
+    "version": "1.141.0",
     "description": "SAPUI5 Library sap.ushell_abap",
     "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
     "keywords": [
@@ -15,7 +15,7 @@
         "build-themes": "cross-env-shell ui5 build --exclude-task=* --include-task=buildThemes --framework-version $npm_package_version"
     },
     "devDependencies": {
-        "@ui5/cli": "^3.11.6",
+        "@ui5/cli": "^4.0.24",
         "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.140.0</version>
+    <version>1.141.0</version>
     <copyright>Copyright (c) 2009-2025 SAP SE, All Rights Reserved</copyright>
     <documentation>SAP library: sap.ushell_abap</documentation>
 

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

@@ -6,14 +6,16 @@ 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/_Personalization/constants",
+    "sap/ushell/utils/LaunchpadError"
 ], (
     ObjectPath,
     Log,
     jQuery,
     DateFormat,
     ODataService,
-    constants
+    constants,
+    LaunchpadError
 ) => {
     "use strict";
 
@@ -92,11 +94,12 @@ sap.ui.define([
             // response contains items.results (!)
             that._oJSONContainer.PersContainerItems = (that._oJSONContainer.PersContainerItems && that._oJSONContainer.PersContainerItems.results) || [];
             oDeferred.resolve(that);
-        }, (sErrorMessage) => {
+        }, (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(sErrorMessage);
+
+            oDeferred.reject(new LaunchpadError(sErrorMessage, oParsedError));
         });
         return oDeferred.promise();
     };
@@ -114,8 +117,8 @@ sap.ui.define([
 
         oDataWrapper.create(sRelativeURL, this._oJSONContainer, (/* response */) => {
             oDeferred.resolve(that);
-        }, (sErrorMessage) => {
-            oDeferred.reject(sErrorMessage);
+        }, (sErrorMessage, oParsedError) => {
+            oDeferred.reject(new LaunchpadError(sErrorMessage, oParsedError));
         });
         return oDeferred.promise();
     };
@@ -132,8 +135,8 @@ sap.ui.define([
 
         oDataWrapper.del(sRelativeURL, (response) => {
             oDeferred.resolve(that);
-        }, (sErrorMessage) => {
-            oDeferred.reject(sErrorMessage);
+        }, (sErrorMessage, oParsedError) => {
+            oDeferred.reject(new LaunchpadError(sErrorMessage, oParsedError));
         });
         this._reset();
         return oDeferred.promise();
@@ -276,7 +279,7 @@ sap.ui.define([
             sItemValue = this._oJSONContainer.PersContainerItems[oItemRef.index].value;
             try {
                 oItemValue = JSON.parse(sItemValue);
-            } catch (e) {
+            } catch {
                 // Workaround for
                 // GW Bug "true" => "X" and false => "" at the backend
                 // can be removed once Correction of Note 2013368 is implemented in landscape

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.140.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",
@@ -47,8 +47,8 @@ sap.ui.define([
             "sap-client": Container.getLogonSystem().getClient()
         };
         this._oWrapper = ODataWrapper.createODataWrapper(oODataWrapperSettings);
-        function fnDefaultFailure (oMessage) {
-            throw new SrvcError(oMessage, "sap.ushell_abap.adapters.abap.AppStateAdapter");
+        function fnDefaultFailure (sErrorMessage) {
+            throw new SrvcError(sErrorMessage, "sap.ushell_abap.adapters.abap.AppStateAdapter");
         }
         ODataService.call(this, this._oWrapper, fnDefaultFailure);
     }
@@ -83,8 +83,8 @@ sap.ui.define([
         this._oWrapper.create(sRelativeUrl, oPayload, (/* response */) => {
             oDeferred.resolve();
         }, (sErrorMessage) => {
-            oDeferred.reject(sErrorMessage);
-            Log.error(sErrorMessage);
+            Log.error(`AppState save failed: ${sErrorMessage}`);
+            oDeferred.reject(new Error(sErrorMessage));
         });
 
         return oDeferred.promise();
@@ -111,12 +111,12 @@ sap.ui.define([
         this._oWrapper.read(sRelativeUrl, (response) => {
             oDeferredRead.resolve(response.id, response.value);
         }, (sErrorMessage) => {
-            Log.error(sErrorMessage);
-            oDeferredRead.reject(sErrorMessage);
+            Log.error(`AppState load failed: ${sErrorMessage}`);
+            oDeferredRead.reject(new Error(sErrorMessage));
         }, false);
         this._oWrapper.submitBatchQueue(() => { }, (sErrorMessage) => {
-            Log.error(sErrorMessage);
-            oDeferredRead.reject(sErrorMessage);
+            Log.error(`AppState load failed: ${sErrorMessage}`);
+            oDeferredRead.reject(new Error(sErrorMessage));
         });
 
         return oDeferredRead.promise();

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

@@ -9,7 +9,7 @@
  *     <li>provide the resolveHashFragmentFallback function, a fallback method called by ClientSideTargetResolution service.</li>
  *   </ul>
  *
- * @version 1.140.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",
@@ -214,8 +214,8 @@ sap.ui.define([
                     that._storeFromFullStartupResponse(oFullStartupResult);
                     fnResolve(); // resolve the full promise
                 })
-                .catch((sMsg) => {
-                    fnReject(sMsg); // reject the full promise
+                .catch((oError) => {
+                    fnReject(oError); // reject the full promise
                 });
         };
 
@@ -271,10 +271,10 @@ sap.ui.define([
                     "sap.ushell_abap.adapters.abap.ClientSideTargetResolutionAdapter"
                 );
             }
-        }).catch((sReason) => {
+        }).catch((oError) => {
             Log.error(
                 "Initial segment promise was rejected.",
-                sReason,
+                oError,
                 "sap.ushell_abap.adapters.abap.ClientSideTargetResolutionAdapter"
             );
         });
@@ -450,26 +450,26 @@ sap.ui.define([
             });
 
             // must wait on the full target mappings promise to complete before returning
-            this._oNavTargetPromise.then(() => {
-                Log.debug(
-                    "Got inbounds from full start_up response",
-                    "",
-                    "sap.ushell_abap.adapters.abap.ClientSideTargetResolutionAdapter"
-                );
+            this._oNavTargetPromise
+                .then(() => {
+                    Log.debug(
+                        "Got inbounds from full start_up response",
+                        "",
+                        "sap.ushell_abap.adapters.abap.ClientSideTargetResolutionAdapter"
+                    );
 
-                // convert (once) when needed
-                this._aInbounds = this._formatDirectStart(this._aTargetMappings);
+                    // convert (once) when needed
+                    this._aInbounds = 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 () {
-                    // replace implementation of this method (no conversion in future calls anymore!)
-                    return Promise.resolve(this._aInbounds);
-                };
+                    // 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 () {
+                        // replace implementation of this method (no conversion in future calls anymore!)
+                        return Promise.resolve(this._aInbounds);
+                    };
 
-                fnResolve(this._aInbounds);
-            }, (sMsg) => {
-                fnReject(sMsg);
-            });
+                    fnResolve(this._aInbounds);
+                })
+                .catch(fnReject);
         });
     };
 
@@ -528,12 +528,12 @@ sap.ui.define([
                 (sNavTargetDataResult) => {
                     const oNavTargetDataResult = JSON.parse(sNavTargetDataResult);
                     if (!oNavTargetDataResult) {
-                        fnReject("Malformed Full TM Result");
+                        fnReject(new Error("Malformed Full TM Result"));
                     }
                     fnResolve(oNavTargetDataResult);
                 },
-                (sMessage) => {
-                    fnReject(sMessage);
+                (sErrorMessage) => {
+                    fnReject(new Error(sErrorMessage));
                 }
             );
         });
@@ -1204,18 +1204,21 @@ sap.ui.define([
 
                     that._compactTooLongWdaUrl(oAdjustedResult).then((oCompactedResult) => {
                         fnResolve(oCompactedResult);
-                    }).catch((sMsg) => {
-                        fnReject(`Could not resolve link '${sFragmentNoHash}' due to compactation failure${sMsg}`);
+                    }).catch((oError) => {
+                        Log.error(`Could not resolve link '${sFragmentNoHash}' due to compactation failure`, oError);
+                        fnReject(oError);
                     });
                 } else {
-                    fnReject(`Could not resolve link '${sFragmentNoHash}'`);
+                    fnReject(new Error(`Could not resolve link '${sFragmentNoHash}'`));
                 }
-            }, (sMessage) => {
-                fnReject(sMessage);
+            }, (sErrorMessage) => {
+                fnReject(new Error(sErrorMessage));
             });
 
             if (bBatchQueueOpened) {
-                that._getODataWrapper().submitBatchQueue(() => { }, fnReject);
+                that._getODataWrapper().submitBatchQueue(() => { }, (sErrorMessage) => {
+                    fnReject(new Error(sErrorMessage));
+                });
             }
         });
     };
@@ -1342,8 +1345,8 @@ sap.ui.define([
                         "sap.ushell_abap.adapters.abap.ClientSideTargetResolutionAdapter"
                     );
                     that._readSystemAliasViaInterop(sSystemAlias)
-                        .catch((sError) => {
-                            fnReject(sError);
+                        .catch((oError) => {
+                            fnReject(oError);
                         })
                         .then((oOdataSystemAliasData) => {
                             oSystemAliasData = that._fixSystemAlias(oOdataSystemAliasData);
@@ -1379,7 +1382,7 @@ sap.ui.define([
 
                 // must wait at least on the small start_up response before using INTEROP
 
-                this._oInitialSegmentPromise.then(fnRetryBufferOrUseInterop, fnRetryBufferOrUseInterop);
+                this._oInitialSegmentPromise.finally(fnRetryBufferOrUseInterop);
             }
         });
     };
@@ -1517,8 +1520,8 @@ sap.ui.define([
                 (oSystemAliasData) => {
                     fnResolve(oSystemAliasData);
                 },
-                (sMessage) => {
-                    fnReject(sMessage);
+                (sErrorMessage) => {
+                    fnReject(new Error(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.140.0
+ * @version 1.141.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.140.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/ushell_abap/bootstrap/evo/abap.constants",

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

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Unified Shell's container adapter for the ABAP platform.
  *
- * @version 1.140.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",
@@ -25,7 +25,7 @@ sap.ui.define([
     abapUtils,
     ODataWrapper,
     URI,
-    OData,
+    datajs,
     deepClone,
     ObjectPath,
     Log,
@@ -391,11 +391,9 @@ sap.ui.define([
                                 });
                             }
                             oDeferred.resolve();
-                        }, (sError) => { // error handler
-                            Log.error(`Reading REMOTE catalogs failed: ${
-                                sError}`, null,
-                            "sap.ushell_abap.adapters.abap.ContainerAdapter");
-                            oDeferred.reject();
+                        }, (sErrorMessage) => { // error handler
+                            Log.error("Reading REMOTE catalogs failed:", sErrorMessage, "sap.ushell_abap.adapters.abap.ContainerAdapter");
+                            oDeferred.reject(new Error(sErrorMessage));
                         });
                 })
                 .catch(oDeferred.reject);
@@ -513,13 +511,13 @@ sap.ui.define([
             }
 
             if (isUserImageEnabled() && oUser && oUser.isJamActive && oUser.isJamActive()) {
-                OData.read("/sap/bc/ui2/smi/rest_tunnel/Jam/api/v1/OData/Self?$format=json", (oResponseData) => {
+                datajs.read("/sap/bc/ui2/smi/rest_tunnel/Jam/api/v1/OData/Self?$format=json", (oResponseData) => {
                     const sJamUserId = oResponseData.results.Id;
                     const sJamUserImageUrl = `/sap/bc/ui2/smi/rest_tunnel/Jam/api/v1/OData/Members('${sJamUserId}')/ProfilePhoto/$value`;
 
                     oUser.setImage(sJamUserImageUrl);
-                }, () => {
-                    Log.error("Could not recieve JAM user data");
+                }, (oDataJsError) => {
+                    Log.error("Could not receive JAM user data");
                 });
             }
         };