@sapui5/sap.ushell_abap 1.97.0 → 1.99.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sapui5/sap.ushell_abap",
-    "version": "1.97.0",
+    "version": "1.99.0",
     "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.97.0</version>
-    <copyright>Copyright (c) 2009-2021 SAP SE. All rights reserved.</copyright>
+    <version>1.99.0</version>
+    <copyright>Copyright (c) 2009-2022 SAP SE, All Rights Reserved</copyright>
     <documentation>SAP library: sap.ushell_abap</documentation>
 
     <dependencies>

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

@@ -1,4 +1,4 @@
-// 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",

package/src/main/js/sap/ushell_abap/adapters/abap/AppStateAdapter.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 AppStateAdapter for the ABAP platform.
- * @version 1.97.0
+ * @version 1.99.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",

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.97.0
+ * @version 1.99.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",

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.97.0
+ * @version 1.99.0
  */
 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.97.0
+ * @version 1.99.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",

package/src/main/js/sap/ushell_abap/adapters/abap/LaunchPageAdapter.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 page building adapter for the ABAP platform.
- * @version 1.97.0
+ * @version 1.99.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/URI",
@@ -2594,6 +2594,31 @@ sap.ui.define([
             return sId;
         };
 
+        /**
+         * Returns the stable id of the catalog tile.
+         * Note: If no stable id can be retrieved (For example for technical catalog tiles) or the reference is broken
+         * a fallback to the normal id is in place.
+         *
+         * @param {sap.ui2.ChipInstance} oTile the tile or the catalog tile
+         * @returns {string} the stable id
+         * @private
+         * @since 1.98.0
+         */
+        this.getStableCatalogTileId = function (oTile) {
+            var oChip = oTile.getChip();
+            var sStableId = oChip.getReferenceChipId();
+
+            if (sStableId === "O") {
+                // The reference is broken. We do not want to return the value indicating that
+                sStableId = null;
+            }
+            if (!sStableId) {
+                sStableId = this.getCatalogTileId(oTile);
+            }
+
+            return sStableId;
+        };
+
         /**
          * Returns the catalog tile's title. May be called for a catalog tile or (since 1.32.0) for a group tile.
          *
@@ -3665,8 +3690,16 @@ sap.ui.define([
 
                 oResponse.results.forEach(function (oCatalog) {
                     oCatalog.Chips.results.forEach(function (oChip) {
-                        if (!oCatalogTileIndex[oChip.id]) {
-                            oCatalogTileIndex[oChip.id] = oChip;
+                        var sChipId;
+
+                        if (Config.last("/core/stableIDs/enabled") && oChip.referenceChipId) {
+                            sChipId = oChip.referenceChipId;
+                        } else {
+                            sChipId = oChip.id;
+                        }
+
+                        if (!oCatalogTileIndex[sChipId]) {
+                            oCatalogTileIndex[sChipId] = oChip;
                         }
                     });
                 });

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview MenuAdapter for the ABAP platform.

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview The NavTargetResolution adapter for the ABAP platform.
@@ -8,7 +8,7 @@
  * service now calls the ClientSideTargetResolution service in the abap
  * platform.
  *
- * @version 1.97.0
+ * @version 1.99.0
  */
 sap.ui.define([], function () {
     "use strict";

package/src/main/js/sap/ushell_abap/adapters/abap/PageBuildingAdapter.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 page building adapter for the ABAP platform.
- * @version 1.97.0
+ * @version 1.99.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",

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

@@ -1,16 +1,17 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview PagePersistenceAdapter for the ABAP platform.
- * @version 1.97.0
+ * @version 1.99.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",
     "sap/ui/model/odata/v2/ODataModel",
     "sap/ui/model/odata/ODataMetadata",
     "sap/ushell/resources",
-    "sap/ushell/utils/chipsUtils"
-], function (ObjectPath, ODataModel, ODataMetadata, resources, chipsUtils) {
+    "sap/ushell/utils/chipsUtils",
+    "sap/ushell/Config"
+], function (ObjectPath, ODataModel, ODataMetadata, resources, chipsUtils, Config) {
 
     "use strict";
 
@@ -2437,7 +2438,7 @@ sap.ui.define([
         },
         defaultCountMode: "None",
         skipMetadataAnnotationParsing: true,
-        useBatch: false
+        useBatch: true
     });
 
     // If we have the metdata cache backe in action, we will need to revert to the previous implementation
@@ -2594,6 +2595,8 @@ sap.ui.define([
      * @private
      */
     PagePersistenceAdapter.prototype._convertODataToReferenceData = function (page, URLParsing) {
+        var oUnstableVisualizations = {};
+        var bStableIDsEnabled = Config.last("/core/stableIDs/enabled");
         var oData = {
             page: {
                 id: page.id,
@@ -2614,9 +2617,8 @@ sap.ui.define([
                                 id: oViz.id,
                                 itemIndex: oViz.itemIndex,
                                 targetMappingId: oViz.targetMappingId,
-                                // rename both when our frontend names match backend names
-                                vizId: oViz.catalogTileId, // our "vizId" should be renamed to "catalogTileId"
-                                inboundPermanentKey: oViz.targetMappingId, // our "inboundPermanentKey" should be renamed to "targetMappingId"
+                                vizId: bStableIDsEnabled ? oViz.catalogTileIdStable : oViz.catalogTileId,
+                                inboundPermanentKey: bStableIDsEnabled ? oViz.targetMappingIdStable : oViz.targetMappingId,
                                 displayFormatHint: oViz.displayFormatHint
                             };
                         }).sort(function (firstViz, secondViz) {
@@ -2628,13 +2630,13 @@ sap.ui.define([
                 })
             },
             // mapping from vizReference to visualization
-            visualizations: page.vizReferences.results.reduce(function (oVisualizations, oViz) {
-                var oSimplifiedChip = this._getSimplifiedChip(oViz);
-                oVisualizations[oViz.id] = {
-                    vizType: oViz.tileType,
-                    title: oViz.title,
-                    subTitle: oViz.subTitle,
-                    icon: oViz.iconUrl,
+            visualizations: page.vizReferences.results.reduce(function (oVisualizations, oVisualizationData) {
+                var oSimplifiedChip = this._getSimplifiedChip(oVisualizationData);
+                var oVisualization = {
+                    vizType: oVisualizationData.tileType,
+                    title: oVisualizationData.title,
+                    subTitle: oVisualizationData.subTitle,
+                    icon: oVisualizationData.iconUrl,
                     info: chipsUtils.getInfoFromSimplifiedChip(oSimplifiedChip),
                     keywords: chipsUtils.getKeywordsFromSimplifiedChip(oSimplifiedChip),
                     size: chipsUtils.getTileSizeFromSimplifiedChip(oSimplifiedChip),
@@ -2648,6 +2650,20 @@ sap.ui.define([
                         chip: oSimplifiedChip
                     }
                 };
+
+                if (bStableIDsEnabled) {
+                    // TO DO: Move this line to the object declaration after the FeatureSwitch is removed!
+                    oVisualization.vizId = oVisualizationData.catalogTileIdStable;
+
+                    oVisualizations[oVisualizationData.catalogTileIdStable] = oVisualization;
+
+                    if (oVisualizationData.fromPersonalization && oVisualizationData.id !== oVisualizationData.catalogTileIdStable) {
+                        oUnstableVisualizations[oVisualizationData.id] = oVisualization;
+                    }
+                } else {
+                    oVisualizations[oVisualizationData.id] = oVisualization;
+                }
+
                 return oVisualizations;
             }.bind(this), {}),
             // mapping from tileTypes to vizTypes
@@ -2671,6 +2687,10 @@ sap.ui.define([
             }, {})
         };
 
+        if (bStableIDsEnabled) {
+            oData.unstableVisualizations = Object.keys(oUnstableVisualizations).length > 0 ? oUnstableVisualizations : null;
+        }
+
         return oData;
     };
 

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 /**
  * @fileOverview The Unified Shell's personalization adapter for the ABAP
  *               platform.
@@ -7,7 +7,7 @@
  *               Container header properties transported via pseudo-items are mapped to the
  *               respective header properties in setItem/getItem/delItem
  *
- * @version 1.97.0
+ * @version 1.99.0
  */
 sap.ui.define([
     "sap/ushell_abap/adapters/abap/AdapterContainer",

package/src/main/js/sap/ushell_abap/adapters/abap/SearchAdapter.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 Search adapter for the ABAP platform.
- * @version 1.97.0
+ * @version 1.99.0
  */
 sap.ui.define([], function () {
     "use strict";

package/src/main/js/sap/ushell_abap/adapters/abap/SupportTicketAdapter.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 SupportTicket adapter for the ABAP platform.
- * @version 1.97.0
+ * @version 1.99.0
  */
 sap.ui.define([
     "sap/base/util/isEmptyObject",

package/src/main/js/sap/ushell_abap/adapters/abap/Ui5ComponentLoaderAdapter.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 Ui5ComponentLoaderAdapter for the ABAP platform
  *
- * @version 1.97.0
+ * @version 1.99.0
  */
 sap.ui.define([
 ], function () {

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/ushell_abap/pbServices/ui2/ODataWrapper",

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

@@ -1,9 +1,9 @@
-// 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 HANA platform.
  *
- * @version 1.97.0
+ * @version 1.99.0
  */
 /**
  * @namespace Default namespace for Unified Shell adapters for the HANA platform. They can usually

package/src/main/js/sap/ushell_abap/bootstrap/evo/XhrLogonEventHandler.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "./abap.bootstrap.utils",

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap-def-dev.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 sap.ui.define([
     "./abap.configure.ushell",
     "./abap.ui5.boot.handler",

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap-def-loader.js

@@ -0,0 +1,7 @@
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+var sAsyncLoader = document.getElementById("sap-ui-bootstrap").getAttribute("data-sap-ui-async");
+if (sAsyncLoader && sAsyncLoader.toLowerCase() === "true") {
+    sap.ui.require(["sap/ushell_abap/bootstrap/evo/abap-def"]);
+} else {
+    sap.ui.requireSync("sap/ushell_abap/bootstrap/evo/abap-def");
+}

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap-def.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 sap.ui.define([
     "./abap.configure.ushell",
     "./abap.ui5.boot.handler",

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.bootstrap.utils.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 //TODO should be replaced by sap/ushell/utils
 sap.ui.define([
     "sap/ushell/utils",

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.configure.ushell.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview
@@ -14,7 +14,7 @@
  * It furthermore calculates if FLP pages get activated and if needed sets up
  * the configuration environment to run these.
  *
- * @version 1.97.0
+ * @version 1.99.0
  */
 sap.ui.define([
     "./abap.constants",

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.constants.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 sap.ui.define([
 
 ], function () {

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.get.server.config.Urls.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview a Getter to return an array of valid configuration URL

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 /*
  * ABAP Bootstrap script for EVO scenario for LOCAL TESTING only.

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.load.launchpad.js

@@ -1,9 +1,7 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/base/util/UriParameters",
     "sap/base/Log",
-    "sap/ushell_abap/pbServices/ui2/Chip",
-    "sap/ushell_abap/pbServices/ui2/Error",
     "sap/ushell_abap/pbServices/ui2/Bag",
     "sap/ushell_abap/pbServices/ui2/contracts/bag",
     "sap/ushell_abap/pbServices/ui2/contracts/configuration",
@@ -18,10 +16,7 @@ sap.ui.define([
     "sap/ushell_abap/pbServices/ui2/contracts/types"
 ], function (
     UriParameters,
-
-    Log,
-    Chip,
-    SrvcError
+    Log
     /*
     ui2Bag,
     ui2ContractsBag,
@@ -75,15 +70,6 @@ sap.ui.define([
             return;
         }
 
-        //TODO inserted to support chips requesting this contract unecessarily
-        Chip.addContract("navigation", function (oChipInstance) {
-            this.navigateToUrl = function (sUrl, oSettings) {
-                throw new SrvcError("'navigation' contract not implemented!",
-                    "sap.ushell.adapters.abap.LaunchPageAdapter");
-            };
-        });
-
-
         sap.ui.require(["sap/ushell/iconfonts"], function (IconFonts) {
             window.sap.ushell.Container.createRenderer("fiori2", true).then(
                 function (oContent) {
@@ -94,5 +80,4 @@ sap.ui.define([
         });
 
     }
-
 });

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.request.pageset.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "./abap.bootstrap.utils",

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.request.server.config.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview Requests and parses the configuration associated to one or more server

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.request.startup.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 sap.ui.define([
     "./abap.bootstrap.utils",
     "sap/base/util/ObjectPath",

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.theme.handler.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.ui5.boot.handler.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.validate.Url.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview Validates a given Url

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.xhr.handler.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/ushell/bootstrap/common/common.load.xhrlogon",
     "sap/ushell/bootstrap/common/common.configure.xhrlogon",

package/src/main/js/sap/ushell_abap/bootstrap/evo/boottask.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/ushell/bootstrap/common/common.load.xhrlogon",
@@ -15,8 +15,7 @@ sap.ui.define([
     "sap/base/Log",
     "sap/ushell/services/Container",
     "sap/ui/Device",
-    "sap/ushell_abap/pbServices/ui2/Utils",
-    "sap/ushell_abap/pbServices/ui2/Chip" // TODO remove when FLPD is adapted (needs to be loaded early in FLPD scenario)
+    "sap/ushell_abap/pbServices/ui2/Utils"
 ],
 function (
     oXhrLogonLib,
@@ -33,8 +32,7 @@ function (
     Log,
     Container,
     Device,
-    Utils,
-    Chip
+    Utils
 ) {
     "use strict";
 
@@ -855,12 +853,6 @@ function (
     function bootstrap (oStartupCallResult, aServerConfig, fnCallback) {
         var sShellHash = getShellHash();
 
-        // UI5 has to be informed that our bootstrap has started.
-        // otherwise:
-        //   It assumes - in case of a slow startup request, that the page has been rendered already.
-        //   So it calls the FESR enhancement hook and we have no statistical record to report.
-        initTraces();
-
         // Note: processStartup creates window["sap-ushell-config"]
         processStartup(oStartupCallResult);
 
@@ -991,10 +983,12 @@ function (
 
         oXhrHandler.initXhrLogon(window["sap-ushell-config"]);
 
+        // initialize UI5 performance tracing (FESR) before first request is sent, so that this is also instrumented
+        initTraces();
+
         //TODO: this may move before TargetMappings & pageset firing (in case of contention of network connections)
         //fire start-up request if direct start also indicates suppression of pageset request
         //must be kept before success handler of requestStartUp
-
         oStartupPromise = oStartupHandler.requestStartupConfig().then(function (oStartupResult) {
             var sHash = getShellHash();
             (ObjectPath.get("sap-ushell-config.services.Container.adapter") || ObjectPath.create("sap-ushell-config.services.Container.adapter")).config = oStartupResult;

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/ui/core/library",
@@ -13,13 +13,13 @@ sap.ui.define([
      * @namespace
      * @name sap.ushell_abap
      * @author SAP SE
-     * @version 1.97.0
+     * @version 1.99.0
      * @private
      * @ui5-restricted
      */
     sap.ui.getCore().initLibrary({
         name: "sap.ushell_abap",
-        version: "1.97.0",
+        version: "1.99.0",
         dependencies: ["sap.ui.core", "sap.m"],
         noLibraryCSS: true,
         extensions: {

package/src/main/js/sap/ushell_abap/pbServices/ui2/AllCatalogs.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview A wrapper for a page's <code>allCatalogs</code> collection loaded from the page

package/src/main/js/sap/ushell_abap/pbServices/ui2/Bag.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview A wrapper for a property bag loaded from the page building service.
@@ -709,10 +709,5 @@ sap.ui.define([
         Log.debug("Created: " + this, null, "sap.ushell_abap.pbServices.ui2.Bag");
     };
 
-    // TODO remove when FLPD is adapted (uses this function in global namespace)
-    sap.ui2 = sap.ui2 || {};
-    sap.ui2.srvc = sap.ui2.srvc || {};
-    sap.ui2.srvc.bag = Bag;
-
     return Bag;
 }, true);

package/src/main/js/sap/ushell_abap/pbServices/ui2/Catalog.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2021 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview A wrapper for a catalog loaded from the page building service.