@sapui5/sap.ushell_abap 1.95.0 → 1.96.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sapui5/sap.ushell_abap",
-    "version": "1.95.0",
+    "version": "1.96.3",
     "description": "SAPUI5 Library sap.ushell_abap",
     "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
     "keywords": [

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

@@ -2,8 +2,8 @@
 <library xmlns="http://www.sap.com/sap.ui.library.xsd">
     <name>sap.ushell_abap</name>
     <vendor>SAP SE</vendor>
-    <version>1.95.0</version>
-    <copyright>Copyright (c) 2009-2021 SAP SE. All rights reserved.</copyright>
+    <version>1.96.3</version>
+    <copyright>Copyright (c) 2009-2022 SAP SE. All rights reserved.</copyright>
     <documentation>SAP library: sap.ushell_abap</documentation>
 
     <dependencies>
@@ -41,6 +41,9 @@
             <exclude name="sap.ushell_abap.bootstrap.appruntime-*" />
             <exclude name="sap.ushell_abap.bootstrap.evo.core-*" />
         </jsdoc>
+        <releasenotes xmlns="http://www.sap.com/ui5/buildext/releasenotes"
+            url="../../../test-resources/sap/ushell_abap/relnotes/changes-{major}.{minor}.json"
+            resolve="lib" />
         <ownership xmlns="http://www.sap.com/ui5/buildext/ownership">
             <!-- default component for this library -->
             <component>CA-FLP-FE-UI</component>

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

@@ -1,11 +1,18 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE. All rights reserved.
 
 sap.ui.define([
     "sap/base/util/ObjectPath",
     "sap/base/Log",
     "sap/ui/thirdparty/jquery",
-    "sap/ui/core/format/DateFormat"
-], function (ObjectPath, Log, jQuery, DateFormat) {
+    "sap/ui/core/format/DateFormat",
+    "sap/ushell_abap/pbServices/ui2/ODataService"
+], function (
+    ObjectPath,
+    Log,
+    jQuery,
+    DateFormat,
+    ODataService
+) {
     "use strict";
 
     var sCONTAINERCOLLECTIONNAME = "PersContainers",
@@ -72,7 +79,7 @@ sap.ui.define([
         if (this._category && this._category === "P" && this["sap-cache-id"]) {
             sRelativeUrl = sRelativeUrl + "&sap-cache-id=" + this["sap-cache-id"];
         }
-        sap.ui2.srvc.ODataService.call(this, oDataWrapper, function () {
+        ODataService.call(this, oDataWrapper, function () {
             return false;
         });
 
@@ -101,7 +108,7 @@ sap.ui.define([
             oDataWrapper = this._obtainODataWrapper(),
             sRelativeURL = sCONTAINERCOLLECTIONNAME;
         // serialize the current JSON
-        sap.ui2.srvc.ODataService.call(this, oDataWrapper, function () {
+        ODataService.call(this, oDataWrapper, function () {
             return false;
         });
 
@@ -119,7 +126,7 @@ sap.ui.define([
             oDataWrapper = this._obtainODataWrapper(),
             sRelativeURL = sCONTAINERCOLLECTIONNAME + "(category='" + this._category + "',id='" + encodeURIComponent(this._sContainerKey) + "')";
         // serialize the current JSON
-        sap.ui2.srvc.ODataService.call(this, oDataWrapper, function () {
+        ODataService.call(this, oDataWrapper, function () {
             return false;
         });
 

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

@@ -1,21 +1,25 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE. All rights reserved.
 
 /**
  * @fileOverview The Unified Shell's AppStateAdapter for the ABAP platform.
- * @version 1.95.0
+ * @version 1.96.3
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",
     "sap/ui/thirdparty/jquery",
     "sap/base/Log",
     "sap/ushell/utils",
-    "sap/ui2/srvc/ODataWrapper" // required for "sap.ui2.srvc.createODataWrapper"
+    "sap/ushell_abap/pbServices/ui2/ODataWrapper",
+    "sap/ushell_abap/pbServices/ui2/Error",
+    "sap/ushell_abap/pbServices/ui2/ODataService"
 ], function (
     ObjectPath,
     jQuery,
     Log,
-    utils
-    // ODataWrapper
+    utils,
+    ODataWrapper,
+    SrvcError,
+    ODataService
 ) {
     "use strict";
 
@@ -41,11 +45,11 @@ sap.ui.define([
             "sap-language": sap.ushell.Container.getUser().getLanguage(),
             "sap-client": sap.ushell.Container.getLogonSystem().getClient()
         };
-        this._oWrapper = sap.ui2.srvc.createODataWrapper(oODataWrapperSettings);
+        this._oWrapper = ODataWrapper.createODataWrapper(oODataWrapperSettings);
         function fnDefaultFailure (oMessage) {
-            sap.ui2.srvc.Error(oMessage, "sap.ushell_abap.adapters.abap.AppStateAdapter");
+            throw new SrvcError(oMessage, "sap.ushell_abap.adapters.abap.AppStateAdapter");
         }
-        sap.ui2.srvc.ODataService.call(this, this._oWrapper, fnDefaultFailure);
+        ODataService.call(this, this._oWrapper, fnDefaultFailure);
     };
 
     /**

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE. All rights reserved.
 
 /**
  * @fileOverview ClientSideTargetResolutionAdapter for the abap platform.
@@ -9,7 +9,7 @@
  *     <li>provide the resolveHashFragmentFallback function, a fallback method called by ClientSideTargetResolution service.</li>
  *   </ul>
  *
- * @version 1.95.0
+ * @version 1.96.3
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",
@@ -19,7 +19,8 @@ sap.ui.define([
     "sap/ushell/utils",
     "sap/ushell/utils/UrlParsing",
     "sap/base/Log",
-    "sap/ui2/srvc/ODataWrapper" // required for "sap.ui2.srvc.createODataWrapper"
+    "sap/ushell_abap/pbServices/ui2/ODataWrapper",
+    "sap/ushell_abap/pbServices/ui2/Utils"
 ], function (
     jQuery,
     ObjectPath,
@@ -27,8 +28,9 @@ sap.ui.define([
     fnDeepExtend,
     ushellUtils,
     urlParsing,
-    Log
-    // ODataWrapper
+    Log,
+    ODataWrapper,
+    Utils
 ) {
     "use strict";
 
@@ -133,7 +135,7 @@ sap.ui.define([
         this._oODataWrapper = undefined;
         this._getODataWrapper = function () {
             if (!this._oODataWrapper) {
-                this._oODataWrapper = sap.ui2.srvc.createODataWrapper("/sap/opu/odata/UI2/INTEROP/");
+                this._oODataWrapper = ODataWrapper.createODataWrapper("/sap/opu/odata/UI2/INTEROP/");
             }
             return this._oODataWrapper;
         };
@@ -390,7 +392,7 @@ sap.ui.define([
      * @return {jQuery.Deferred.promise} a jQuery promise that is resolved with a
      */
     ClientSideTargetResolutionAdapter.prototype._requestAllTargetMappings = function () {
-        var mParameterMap = sap.ui2.srvc.getParameterMap();
+        var mParameterMap = Utils.getParameterMap();
         var oDeferred = new jQuery.Deferred();
         var sRequestUrl = "/sap/bc/ui2/start_up?so=%2A&action=%2A&",
             sCacheId = (ObjectPath.create("services.targetMappings", this._oAdapterConfig).cacheId
@@ -413,7 +415,7 @@ sap.ui.define([
         }
         copyParameter("sap-language");
         copyParameter("sap-client");
-        sap.ui2.srvc.get(
+        Utils.get(
             sRequestUrl + "&shellType=" + sap.ushell_abap.getShellType() + "&depth=0" + sCacheId,
             false, /* xml= */
             function (sNavTargetDataResult) {
@@ -766,7 +768,7 @@ sap.ui.define([
             if (Object.prototype.hasOwnProperty.call(oRes.parameters, sEntryName)) {
                 Log.error(
                     "Duplicate property name " + sEntryName + " in " + JSON.stringify(oODataResponse),
-                    "sap.ui2.srvc.ClientSideTargetResolutionAdapter._formatSignature");
+                    "ClientSideTargetResolutionAdapter._formatSignature");
             }
 
             oRes.parameters[sEntryName] = {
@@ -992,7 +994,7 @@ sap.ui.define([
      * Open the batch queue if it is not already open.
      * The method has no effect if the queue is already open
      *
-     * @param {object} oODataWrapper a {@link sap.ui2.srvc.ODataWrapper} object.
+     * @param {object} oODataWrapper a {@link sap.ushell_abap.pbServices.ui2.ODataWrapper} object.
      * @returns {boolean} true iff batch queue was opened by this method
      * @private
      */
@@ -1034,7 +1036,7 @@ sap.ui.define([
         var oDeferred = new jQuery.Deferred(),
             that = this,
             bBatchQueueOpened,
-            sFormFactor = sap.ui2.srvc.getFormFactor();
+            sFormFactor = Utils.getFormFactor();
 
         /**
          * @param {string} sUnencoded an OData URL query parameter

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

@@ -1,8 +1,8 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE. All rights reserved.
 
 /**
  * @fileOverview The ConfigurationDefaults adapter for the ABAP platform.
- * @version 1.95.0
+ * @version 1.96.3
  */
 sap.ui.define([
     "sap/ushell_abap/bootstrap/evo/abap.constants",

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

@@ -1,8 +1,8 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE. All rights reserved.
 /**
  * @fileOverview The Unified Shell's container adapter for the ABAP platform.
  *
- * @version 1.95.0
+ * @version 1.96.3
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",
@@ -10,13 +10,22 @@ sap.ui.define([
     "sap/ushell/User",
     "sap/ushell/utils",
     "sap/ushell_abap/bootstrap/evo/abap.bootstrap.utils",
-    "sap/ui2/srvc/ODataWrapper",
+    "sap/ushell_abap/pbServices/ui2/ODataWrapper",
     "sap/ui/thirdparty/URI",
     "sap/ui/thirdparty/datajs",
     "sap/base/util/ObjectPath"
-], function (jQuery, System, User, utils, abapUtils, ODataWrapper, URI, OData, ObjectPath) {
+], function (
+    jQuery,
+    System,
+    User,
+    utils,
+    abapUtils,
+    ODataWrapper,
+    URI,
+    OData,
+    ObjectPath
+) {
     "use strict";
-    /* jslint nomen:true */
 
     /**
      * This method MUST be called by the Unified Shell's container only, others MUST call
@@ -254,8 +263,8 @@ sap.ui.define([
             // set the SAP Language on the ODataWrapper,
             // if supplied, this will propagated to a sap-language header
             // assuring a consistent window language
-            sap.ui2.srvc.ODataWrapper["sap-language"] = oStartupResult.language;
-            sap.ui2.srvc.ODataWrapper["sap-client"] = oStartupResult.client;
+            ODataWrapper["sap-language"] = oStartupResult.language;
+            ODataWrapper["sap-client"] = oStartupResult.client;
 
             if (oStartupResult.target) {
                 // cache information about initial application resolution