@sapui5/sap.ushell_abap 1.94.1 → 1.96.2

package/package.json

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

package/src/main/js/sap/ui2/srvc/ODataWrapper.js

@@ -569,7 +569,7 @@
          * stickiness is only supported in scopes different from PERS.
          * </p>
          * <p>
-         * Currently, session stickiness is affected by the following limitations:
+         * Currently, session stickiness is affected by the following restrictions:
          * <ul>
          * <li>If the client caches the response headers for certain requests, these
          * cached headers will be used instead of the headers sent from the server

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.94.1</version>
+    <version>1.96.2</version>
     <copyright>Copyright (c) 2009-2021 SAP SE. All rights reserved.</copyright>
     <documentation>SAP library: sap.ushell_abap</documentation>
 
@@ -41,17 +41,12 @@
             <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/js/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>
-
-            <!-- Fiori Configuration Cockpit (FCC) Transport UI -->
-            <component>
-                <name>CA-FLP-ABA</name>
-                <modules>
-                    <module>sap/ushell_abap/plugins/fcc-transport-ui/*</module>
-                </modules>
-            </component>
         </ownership>
     </appData>
 </library>

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

@@ -4,8 +4,15 @@ 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

@@ -2,20 +2,24 @@
 
 /**
  * @fileOverview The Unified Shell's AppStateAdapter for the ABAP platform.
- * @version 1.94.1
+ * @version 1.96.2
  */
 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

@@ -9,7 +9,7 @@
  *     <li>provide the resolveHashFragmentFallback function, a fallback method called by ClientSideTargetResolution service.</li>
  *   </ul>
  *
- * @version 1.94.1
+ * @version 1.96.2
  */
 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
@@ -1105,33 +1107,46 @@ sap.ui.define([
 
     ClientSideTargetResolutionAdapter.prototype._compactTooLongWdaUrl = function (oResult) {
         var oDeferred = new jQuery.Deferred();
-        if (oResult && oResult.applicationType === "NWBC" &&
-            oResult.url &&
-            oResult.url.indexOf("/ui2/nwbc/~canvas;window=") === 0 &&
-            oResult.url.length > this._getWDAUrlShorteningLengthLimit()
-        ) {
-            this._compactUrl(oResult.url).done(function (sCompactedUrl) {
-                oResult.url = sCompactedUrl;
-                oDeferred.resolve(oResult);
-            }).fail(oDeferred.reject.bind(oDeferred));
-            return oDeferred.promise();
+        var sUrl = oResult && oResult.url;
+
+        if (oResult && oResult.applicationType === "NWBC" && sUrl && sUrl.indexOf("/ui2/nwbc/~canvas;window=") === 0 && sUrl.length > this._getWDAUrlShorteningLengthLimit()) {
+            this._compactUrl(sUrl)
+                .done(function (sCompactedUrl) {
+                    oResult.url = sCompactedUrl;
+                    oDeferred.resolve(oResult);
+                })
+                .fail(oDeferred.reject);
+        } else {
+            // we do not compact
+            oDeferred.resolve(oResult);
         }
-        // we do not compact
-        return oDeferred.resolve(oResult).promise();
+
+        return oDeferred.promise();
     };
 
     ClientSideTargetResolutionAdapter.prototype._compactUrl = function (sUrl) {
-        var m = sUrl.match(/\?.*/);
-        if (!(m && m[0] && m[0].length > this._getWDAUrlShorteningLengthLimit() - 200)) {
-            return new jQuery.Deferred().resolve(sUrl).promise();
-        }
-        var oParams = urlParsing.parseParameters(m[0]);
+        var aMatches = sUrl.match(/\?.*/);
+        var sMatch = aMatches && aMatches[0];
+        var iLengthLimit = this._getWDAUrlShorteningLengthLimit() - 200;
         var oDeferred = new jQuery.Deferred();
-        sap.ushell.Container.getService("ShellNavigation").compactParams(oParams, aNotCompactedWDAParameters, undefined /* no Component */)
-            .done(function (oCompactedParams) {
-                var sReconstructedUrl = sUrl.match(/^[^?]*/)[0] + "?" + urlParsing.paramsToString(oCompactedParams);
-                oDeferred.resolve(sReconstructedUrl);
-            }).fail(oDeferred.reject.bind(oDeferred));
+
+        if (sMatch && sMatch.length < iLengthLimit) {
+            return oDeferred.resolve(sUrl).promise();
+        }
+
+        var oParams = urlParsing.parseParameters(aMatches[0]);
+
+        sap.ushell.Container.getServiceAsync("ShellNavigation")
+            .then(function (ShellNavigationService) {
+                ShellNavigationService.compactParams(oParams, aNotCompactedWDAParameters, undefined /* no Component */)
+                    .done(function (oCompactedParams) {
+                        var sReconstructedUrl = sUrl.match(/^[^?]*/)[0] + "?" + urlParsing.paramsToString(oCompactedParams);
+                        oDeferred.resolve(sReconstructedUrl);
+                    })
+                    .fail(oDeferred.reject);
+            })
+            .catch(oDeferred.reject);
+
         return oDeferred.promise();
     };
 

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.94.1
+ * @version 1.96.2
  */
 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.94.1
+ * @version 1.96.2
  */
 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
@@ -280,40 +289,39 @@ sap.ui.define([
          * @since 1.19.0
          */
         this.addFurtherRemoteSystems = function () {
-            var oDeferredReadCatalogs = new jQuery.Deferred(),
-                oPbs;
-
-            oPbs = sap.ushell.Container.getService("PageBuilding").getFactory().
-                getPageBuildingService();
-
-            oPbs.readAllCatalogsForUser("type eq 'H' or type eq 'REMOTE'",
-                function (oData) { //success handler
-                    var aCatalogs = oData.results,
-                        sSocialMediaUrl = "/sap/opu/odata/sap/SM_CATALOG_SRV/";
-                    if (aCatalogs) {
-                        aCatalogs.forEach(function (oCatalog) {
-                            var bIsHANAUrl = /^\/sap\/hba\//.test(oCatalog.baseUrl);
-                            if (oCatalog.type === "H"
-                                    || oCatalog.baseUrl === sSocialMediaUrl
-                                    || bIsHANAUrl) {
-                                sap.ushell.Container.addRemoteSystem(new System({
-                                    alias: oCatalog.systemAlias,
-                                    platform: (bIsHANAUrl || oCatalog.type === "H")
-                                        ? "hana" : "abap",
-                                    baseUrl: oCatalog.type === "H" ? "" : ";o="
-                                }));
+            var oDeferred = new jQuery.Deferred();
+
+            sap.ushell.Container.getServiceAsync("PageBuilding")
+                .then(function (PageBuildingService) {
+                    PageBuildingService
+                        .getFactory()
+                        .getPageBuildingService()
+                        .readAllCatalogsForUser("type eq 'H' or type eq 'REMOTE'", function (oData) { //success handler
+                            var sSocialMediaUrl = "/sap/opu/odata/sap/SM_CATALOG_SRV/";
+                            if (oData.results) {
+                                oData.results.forEach(function (oCatalog) {
+                                    var bIsHANAUrl = /^\/sap\/hba\//.test(oCatalog.baseUrl);
+                                    if (oCatalog.type === "H" || oCatalog.baseUrl === sSocialMediaUrl || bIsHANAUrl) {
+                                        sap.ushell.Container.addRemoteSystem(new System({
+                                            alias: oCatalog.systemAlias,
+                                            platform: (bIsHANAUrl || oCatalog.type === "H")
+                                                ? "hana" : "abap",
+                                            baseUrl: oCatalog.type === "H" ? "" : ";o="
+                                        }));
+                                    }
+                                });
                             }
+                            oDeferred.resolve();
+                        }, function (sError) { //error handler
+                            jQuery.sap.log.error("Reading REMOTE catalogs failed: "
+                                + sError, null,
+                                "sap.ushell_abap.adapters.abap.ContainerAdapter");
+                            oDeferred.reject();
                         });
-                    }
-                    oDeferredReadCatalogs.resolve();
-                },
-                function (sError) { //error handler
-                    jQuery.sap.log.error("Reading REMOTE catalogs failed: "
-                        + sError, null,
-                        "sap.ushell_abap.adapters.abap.ContainerAdapter");
-                    oDeferredReadCatalogs.reject();
-                });
-            return oDeferredReadCatalogs.promise();
+                })
+                .catch(oDeferred.reject);
+
+            return oDeferred.promise();
         };
 
         /**