@sapui5/sap.ushell_abap 1.97.1 → 1.98.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sapui5/sap.ushell_abap",
-    "version": "1.97.1",
+    "version": "1.98.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,7 +2,7 @@
 <library xmlns="http://www.sap.com/sap.ui.library.xsd">
     <name>sap.ushell_abap</name>
     <vendor>SAP SE</vendor>
-    <version>1.97.1</version>
+    <version>1.98.0</version>
     <copyright>Copyright (c) 2009-2022 SAP SE. All rights reserved.</copyright>
     <documentation>SAP library: sap.ushell_abap</documentation>
 

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.97.1
+ * @version 1.98.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",

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

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

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Unified Shell's page building adapter for the ABAP platform.
- * @version 1.97.1
+ * @version 1.98.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/NavTargetResolutionAdapter.js

@@ -8,7 +8,7 @@
  * service now calls the ClientSideTargetResolution service in the abap
  * platform.
  *
- * @version 1.97.1
+ * @version 1.98.0
  */
 sap.ui.define([], function () {
     "use strict";

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Unified Shell's page building adapter for the ABAP platform.
- * @version 1.97.1
+ * @version 1.98.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",

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

@@ -2,15 +2,16 @@
 
 /**
  * @fileOverview PagePersistenceAdapter for the ABAP platform.
- * @version 1.97.1
+ * @version 1.98.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

@@ -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.1
+ * @version 1.98.0
  */
 sap.ui.define([
     "sap/ushell_abap/adapters/abap/AdapterContainer",

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Search adapter for the ABAP platform.
- * @version 1.97.1
+ * @version 1.98.0
  */
 sap.ui.define([], function () {
     "use strict";

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The SupportTicket adapter for the ABAP platform.
- * @version 1.97.1
+ * @version 1.98.0
  */
 sap.ui.define([
     "sap/base/util/isEmptyObject",

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

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Unified Shell's Ui5ComponentLoaderAdapter for the ABAP platform
  *
- * @version 1.97.1
+ * @version 1.98.0
  */
 sap.ui.define([
 ], function () {

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

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's container adapter for the HANA platform.
  *
- * @version 1.97.1
+ * @version 1.98.0
  */
 /**
  * @namespace Default namespace for Unified Shell adapters for the HANA platform. They can usually

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

@@ -0,0 +1,6 @@
+// Copyright (c) 2009-2022 SAP SE. All rights reserved.
+if (document.getElementById("sap-ui-bootstrap").async) {
+    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.configure.ushell.js

@@ -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.1
+ * @version 1.98.0
  */
 sap.ui.define([
     "./abap.constants",

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

@@ -855,12 +855,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 +985,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

@@ -13,13 +13,13 @@ sap.ui.define([
      * @namespace
      * @name sap.ushell_abap
      * @author SAP SE
-     * @version 1.97.1
+     * @version 1.98.0
      * @private
      * @ui5-restricted
      */
     sap.ui.getCore().initLibrary({
         name: "sap.ushell_abap",
-        version: "1.97.1",
+        version: "1.98.0",
         dependencies: ["sap.ui.core", "sap.m"],
         noLibraryCSS: true,
         extensions: {

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

@@ -502,6 +502,18 @@ sap.ui.define([
             return oAlterEgo.id;
         };
 
+        /**
+         * Returns this CHIP's reference ID also known as the stable ID
+         *
+         * @returns {string}
+         *  this CHIP's reference ID
+         * @since 1.98.0
+         * @private
+         */
+        this.getReferenceChipId = function () {
+            return oAlterEgo.referenceChipId;
+        };
+
         /**
          * Returns this CHIP instance's implementation of type SAPUI5 as a control. This control
          * represents the root of this CHIP instance's UI from a page builder point of view. Can only

package/ui5.yaml

@@ -1,4 +1,4 @@
-specVersion: '1.0'
+specVersion: '2.4'
 type: library
 metadata:
   name: sap.ushell_abap
@@ -18,6 +18,197 @@ framework:
     - name: sap.ushell
 builder:
   bundles:
+    - bundleDefinition:
+        name: sap/ushell_abap/bootstrap/appruntime-min.js
+        sections:
+          - mode: raw
+            filters:
+              - sap/ushell/appRuntime/ui5/BusyIndicator.js
+            declareRawModules: false
+            resolve: true
+          - mode: raw
+            filters:
+              - sap/ushell/appRuntime/ui5/libsPreload.js
+            declareRawModules: false
+            resolve: true
+          - mode: raw
+            filters:
+              - ui5loader-autoconfig.js
+            declareRawModules: false
+            resolve: true
+            sort: true
+          - mode: preload
+            filters:
+              - sap/ui/core/Core.js
+            renderer: true
+            resolve: true
+            resolveConditional: false
+          - mode: preload
+            name: sap/ushell/appruntime-min-preload
+            filters:
+              - sap/ushell/appRuntime/ui5/
+              - sap/ushell/components/applicationIntegration/application/PostMessageAPIInterface.js
+              - sap/ushell/components/pages/controller/PagesAndSpaceId.js
+              - sap/ushell/ui5service/_ShellUIService/shelluiservice.class.factory.js
+              - sap/ushell/ui5service/UserStatus.js
+              - sap/ushell/Ui5ServiceFactory.js
+              - sap/ushell/utils.js
+              - sap/ushell/utils/clone.js
+              - sap/ushell/utils/type.js
+              - sap/ushell/utils/objectOperations.js
+              - sap/ushell/utils/UrlParsing.js
+              - sap/ushell/utils/WindowUtils.js
+              - sap/ushell/utils/UrlShortening.js
+              - sap/ushell/EventHub.js
+              - sap/ushell/resources.js
+              - sap/ushell/renderers/fiori2/search/HashChangeHandler.js
+              - sap/ushell/System.js
+              - sap/ushell/Ui5NativeServiceFactory.js
+              - sap/ushell/User.js
+              - sap/ushell/services/AppConfiguration.js
+              - sap/ushell/services/AppState.js
+              - sap/ushell/services/_AppState/AppState.js
+              - sap/ushell/services/_AppState/AppStatePersistencyMethod.js
+              - sap/ushell/services/AppLifeCycle.js
+              - sap/ushell/services/Container.js
+              - sap/ushell/services/CrossApplicationNavigation.js
+              - sap/ushell/services/_CrossApplicationNavigation/utils.js
+              - sap/ushell/services/Personalization.js
+              - sap/ushell/services/_Personalization/
+              - sap/ushell/services/PluginManager.js
+              - sap/ushell/services/ShellNavigation.js
+              - sap/ushell/services/ShellNavigationHashChanger.js
+              - sap/ushell/services/URLShortening.js
+              - sap/ushell/services/URLParsing.js
+              - sap/ushell/services/UserInfo.js
+              - sap/ushell/services/Ui5ComponentLoader.js
+              - sap/ushell/services/Ui5ComponentHandle.js
+              - sap/ushell/services/_Ui5ComponentLoader/utils.js
+              - sap/ushell/Config.js
+              - sap/ushell/bootstrap/common/common.create.configcontract.core.js
+              - sap/ushell/_Config/utils.js
+              - sap/ushell/Fiori20AdapterTest.js
+              - sap/ushell/Fiori20Adapter.js
+              - sap/ushell/library.js
+              - sap/ushell/ui/footerbar/AddBookmarkButton*
+              - sap/ushell/ui/footerbar/SendAsEmailButton*
+              - sap/collaboration/components/fiori/sharing/dialog/Component.js
+              - sap/collaboration/components/utils/CommonUtil.js
+              - sap/collaboration/components/utils/MessageQueueUtil.js
+              - sap/ushell/ui/launchpad/ActionItem*
+              - sap/ushell/ui/utils.js
+              - sap/ushell/iconfonts.js
+              - sap/ushell_abap/ui5appruntime/AppInfoAdapter.js
+              - sap/ushell_abap/adapters/abap/AdapterContainer.js
+              - sap/ushell_abap/adapters/abap/PersonalizationAdapter.js
+              - sap/ui2/srvc/ODataWrapper.js
+              - sap/ui2/srvc/ODataService.js
+              - sap/ui2/srvc/utils.js
+              - sap/ui/thirdparty/datajs.js
+              - sap/ui/thirdparty/bignumber.js
+              - sap/ui/thirdparty/URITemplate.js
+              - sap/ui/integration/services/Navigation.js
+              - sap/ui/integration/services/Service.js
+              - sap/ui/integration/services/Data.js
+              - sap/ui/layout/AlignedFlowLayout.js
+              - sap/ui/layout/AlignedFlowLayoutRenderer.js
+              - sap/ui/layout/AssociativeSplitter.js
+              - sap/ui/layout/BlockLayout.js
+              - sap/ui/layout/BlockLayoutCell.js
+              - sap/ui/layout/BlockLayoutCellData.js
+              - sap/ui/layout/BlockLayoutCellRenderer.js
+              - sap/ui/layout/BlockLayoutRenderer.js
+              - sap/ui/layout/BlockLayoutRow.js
+              - sap/ui/layout/BlockLayoutRowRenderer.js
+              - sap/ui/layout/DynamicSideContent.js
+              - sap/ui/layout/DynamicSideContentRenderer.js
+              - sap/ui/layout/FixFlex.js
+              - sap/ui/layout/FixFlexRenderer.js
+              - sap/ui/layout/Grid.js
+              - sap/ui/layout/GridData.js
+              - sap/ui/layout/GridRenderer.js
+              - sap/ui/layout/HorizontalLayout.js
+              - sap/ui/layout/HorizontalLayoutRenderer.js
+              - sap/ui/layout/PaneContainer.js
+              - sap/ui/layout/ResponsiveFlowLayout.js
+              - sap/ui/layout/ResponsiveFlowLayoutData.js
+              - sap/ui/layout/ResponsiveFlowLayoutRenderer.js
+              - sap/ui/layout/ResponsiveSplitter.js
+              - sap/ui/layout/ResponsiveSplitterPage.js
+              - sap/ui/layout/ResponsiveSplitterRenderer.js
+              - sap/ui/layout/ResponsiveSplitterUtilities.js
+              - sap/ui/layout/SplitPane.js
+              - sap/ui/layout/Splitter.js
+              - sap/ui/layout/SplitterLayoutData.js
+              - sap/ui/layout/SplitterRenderer.js
+              - sap/ui/layout/VerticalLayout.js
+              - sap/ui/layout/VerticalLayoutRenderer.js
+              - sap/ui/layout/changeHandler/AddFormContainer.js
+              - sap/ui/layout/changeHandler/AddFormField.js
+              - sap/ui/layout/changeHandler/AddSimpleFormField.js
+              - sap/ui/layout/changeHandler/AddSimpleFormGroup.js
+              - sap/ui/layout/changeHandler/HideSimpleForm.js
+              - sap/ui/layout/changeHandler/MoveSimpleForm.js
+              - sap/ui/layout/changeHandler/RenameFormContainer.js
+              - sap/ui/layout/changeHandler/RenameSimpleForm.js
+              - sap/ui/layout/changeHandler/UnhideSimpleForm.js
+              - sap/ui/layout/cssgrid/CSSGrid.js
+              - sap/ui/layout/cssgrid/CSSGridRenderer.js
+              - sap/ui/layout/cssgrid/GridBasicLayout.js
+              - sap/ui/layout/cssgrid/GridBoxLayout.js
+              - sap/ui/layout/cssgrid/GridBoxLayoutStyleHelper.js
+              - sap/ui/layout/cssgrid/GridItemLayoutData.js
+              - sap/ui/layout/cssgrid/GridLayoutBase.js
+              - sap/ui/layout/cssgrid/GridLayoutDelegate.js
+              - sap/ui/layout/cssgrid/GridResponsiveLayout.js
+              - sap/ui/layout/cssgrid/GridSettings.js
+              - sap/ui/layout/cssgrid/ResponsiveColumnItemLayoutData.js
+              - sap/ui/layout/cssgrid/ResponsiveColumnLayout.js
+              - sap/ui/layout/cssgrid/VirtualGrid.js
+              - sap/ui/layout/flexibility/BlockLayoutCell.flexibility.js
+              - sap/ui/layout/flexibility/Form.flexibility.js
+              - sap/ui/layout/flexibility/FormContainer.flexibility.js
+              - sap/ui/layout/flexibility/FormElement.flexibility.js
+              - sap/ui/layout/flexibility/SimpleForm.flexibility.js
+              - sap/ui/layout/form/ColumnContainerData.js
+              - sap/ui/layout/form/ColumnElementData.js
+              - sap/ui/layout/form/ColumnLayout.js
+              - sap/ui/layout/form/ColumnLayoutRenderer.js
+              - sap/ui/layout/form/Form.js
+              - sap/ui/layout/form/FormContainer.js
+              - sap/ui/layout/form/FormElement.js
+              - sap/ui/layout/form/FormLayout.js
+              - sap/ui/layout/form/FormLayoutRenderer.js
+              - sap/ui/layout/form/FormRenderer.js
+              - sap/ui/layout/form/GridContainerData.js
+              - sap/ui/layout/form/GridElementData.js
+              - sap/ui/layout/form/GridLayout.js
+              - sap/ui/layout/form/GridLayoutRenderer.js
+              - sap/ui/layout/form/ResponsiveGridLayout.js
+              - sap/ui/layout/form/ResponsiveGridLayoutRenderer.js
+              - sap/ui/layout/form/ResponsiveLayout.js
+              - sap/ui/layout/form/ResponsiveLayoutRenderer.js
+              - sap/ui/layout/form/SimpleForm.js
+              - sap/ui/layout/form/SimpleFormRenderer.js
+              - sap/ui/layout/library.js
+              - sap/fe/navigation/NavigationHandler.js
+              - sap/fe/navigation/library.js
+              - sap/fe/navigation/PresentationVariant.js
+              - sap/fe/navigation/SelectionVariant.js
+              - sap/fe/navigation/NavError.js
+              - '!**/*-preload.js'
+              - '!sap/ushell/appRuntime/ui5/BusyIndicator.js'
+              - '!sap/ushell/appRuntime/ui5/libsPreload.js'
+            resolve: false
+            renderer: false
+          - mode: require
+            filters:
+              - sap/ui/core/Core.js
+      bundleOptions:
+        optimize: true
+        usePredefineCalls: true
+        decorateBootstrapModule: true
+        numberOfParts: 4
     - bundleDefinition:
         name: sap/ushell_abap/bootstrap/evo/abap-dbg.js
         sections:
@@ -26,14 +217,18 @@ builder:
               - sap/ushell/bootstrap/ui5loader-config.js
             declareRawModules: false
             resolve: true
+            sort: true
           - mode: raw
             filters:
               - ui5loader-autoconfig.js
             declareRawModules: false
             resolve: true
-          - mode: require
+            sort: true
+          - mode: raw
             filters:
-              - sap/ushell_abap/bootstrap/evo/abap-def
+              - sap/ushell_abap/bootstrap/evo/abap-def-loader.js
+            declareRawModules: false
+            resolve: false
       bundleOptions:
         optimize: false
         usePredefineCalls: true
@@ -45,30 +240,197 @@ builder:
               - sap/ushell/bootstrap/ui5loader-config.js
             declareRawModules: false
             resolve: true
+            sort: true
           - mode: raw
             filters:
               - ui5loader-autoconfig.js
             declareRawModules: false
             resolve: true
+            sort: true
           - mode: preload
             name: sap/ushell/bootstrap/common
             filters:
               - sap/ushell_abap/bootstrap/evo/abap-def.js
               - sap/ui/thirdparty/datajs.js
             resolve: true
-          - mode: require
+          - mode: raw
             filters:
-              - sap/ushell_abap/bootstrap/evo/abap-def
+              - sap/ushell_abap/bootstrap/evo/abap-def-loader.js
+            declareRawModules: false
+            resolve: false
       bundleOptions:
         optimize: true
         usePredefineCalls: true
         decorateBootstrapModule: true
-        addTryCatchRestartWrapper: true
     - bundleDefinition:
         name: sap/ushell_abap/bootstrap/evo/core-ext-light.js
         sections:
           - mode: provided
-            filters: []
+            filters:
+              # bundle sap/ushell_abap/bootstrap/evo/abap.js
+              - sap/ushell/bootstrap/ui5loader-config.js
+              - ui5loader-autoconfig.js
+              - sap/ushell_abap/bootstrap/evo/abap-def.js
+              - sap/ui/thirdparty/datajs.js
+              - sap/ushell_abap/bootstrap/evo/abap-def-loader.js
+              # end bundle sap/ushell_abap/bootstrap/evo/abap.js
+              # bundle sap/ushell_abap/bootstrap/evo/core-min.js
+              - ui5loader-autoconfig.js
+              - sap/ushell_abap/bootstrap/evo/abap-def.js
+              - sap/ushell/bootstrap/ui5loader-config.js
+              - sap/ui/core/ComponentContainer.js
+              - sap/ui/core/CustomData.js
+              - sap/ui/core/EventBus.js
+              - sap/ui/core/IntervalTrigger.js
+              - sap/ui/core/InvisibleMessage.js
+              - sap/ui/core/LayoutData.js
+              - sap/ui/core/Renderer.js
+              - sap/ui/core/ValueStateSupport.js
+              - sap/ui/core/XMLComposite.js
+              - sap/ui/core/XMLTemplateProcessor.js
+              - sap/ui/core/date/Gregorian.js
+              - sap/ui/core/delegate/ItemNavigation.js
+              - sap/ui/core/delegate/ScrollEnablement.js
+              - sap/ui/core/dnd/DragDropInfo.js
+              - sap/ui/core/format/NumberFormat.js
+              - sap/ui/core/mvc/Controller.js
+              - sap/ui/core/mvc/JSView.js
+              - sap/ui/core/mvc/XMLView.js
+              - sap/ui/core/routing/Router.js
+              - sap/ui/core/service/Service.js
+              - sap/ui/core/service/ServiceFactory.js
+              - sap/ui/core/service/ServiceFactoryRegistry.js
+              - sap/ui/model/json/JSONModel.js
+              - sap/ui/model/odata/v2/ODataModel.js
+              - sap/ui/thirdparty/jquery-mobile-custom.js
+              - sap/m/routing/Router.js
+              - sap/m/App.js
+              - sap/m/BusyIndicator.js
+              - sap/m/GenericTile.js
+              - sap/m/GenericTileRenderer.js
+              - sap/m/Image.js
+              - sap/m/ImageContent.js
+              - sap/m/ImageContentRenderer.js
+              - sap/m/Input.js
+              - sap/m/InputBase.js
+              - sap/m/Label.js
+              - sap/m/Link.js
+              - sap/m/LinkRenderer.js
+              - sap/m/MessagePage.js
+              - sap/m/MessageStrip.js
+              - sap/m/NumericContent.js
+              - sap/m/NumericContentRenderer.js
+              - sap/m/Page.js
+              - sap/m/ScrollContainer.js
+              - sap/m/ScrollContainerRenderer.js
+              - sap/m/Table.js
+              - sap/m/TileContent.js
+              - sap/m/TileContentRenderer.js
+              - sap/ushell/library.js
+              - sap/ushell/CanvasShapesManager.js
+              - sap/ushell/Fiori20AdapterTest.js
+              - sap/ushell/SessionHandler.js
+              - sap/ushell/System.js
+              - sap/ushell/User.js
+              - sap/ushell/iconfonts.js
+              - sap/ushell/override.js
+              - sap/ushell/utils/HttpClient.js
+              - sap/ushell/utils/utilsCdm.js
+              - sap/ushell/adapters/cdm/PagesCommonDataModelAdapter.js
+              - sap/ushell/adapters/local/UserInfoAdapter.js
+              - sap/ushell/adapters/local/NavTargetResolutionAdapter.js
+              - sap/ushell/adapters/local/UserDefaultParameterPersistenceAdapter.js
+              - sap/ushell/components/container/ApplicationContainer.js
+              - sap/ushell/components/ComponentKeysHandler.js
+              - sap/ushell/components/pages/controller/PagesAndSpaceId.js
+              - sap/ushell/renderers/fiori2/Renderer.js
+              - sap/ushell/renderers/fiori2/Shell.controller.js
+              - sap/ushell/renderers/fiori2/Shell.view.js
+              - sap/ushell/renderers/fiori2/ShellAsync.view.js
+              - sap/ushell/components/CatalogsManager.js
+              - sap/ushell/components/HomepageManager.js
+              - sap/ushell/services/UserInfo.js
+              - sap/ushell/services/AppLifeCycle.js
+              - sap/ushell/services/AppState.js
+              - sap/ushell/services/ClientSideTargetResolution.js
+              - sap/ushell/services/CommonDataModel.js
+              - sap/ushell/services/Container.js
+              - sap/ushell/services/CrossApplicationNavigation.js
+              - sap/ushell/services/DarkModeSupport.js
+              - sap/ushell/services/LaunchPage.js
+              - sap/ushell/services/Menu.js
+              - sap/ushell/services/NavigationDataProvider.js
+              - sap/ushell/services/NavTargetResolution.js
+              - sap/ushell/services/PageBuilding.js
+              - sap/ushell/services/Pages.js
+              - sap/ushell/services/PagePersistence.js
+              - sap/ushell/services/Personalization.js
+              - sap/ushell/services/PluginManager.js
+              - sap/ushell/services/ReferenceResolver.js
+              - sap/ushell/services/SupportTicket.js
+              - sap/ushell/services/ShellNavigation.js
+              - sap/ushell/services/URLParsing.js
+              - sap/ushell/services/URLShortening.js
+              - sap/ushell/services/Ui5ComponentLoader.js
+              - sap/ushell/services/UserDefaultParameterPersistence.js
+              - sap/ushell/services/UserDefaultParameters.js
+              - sap/ushell/services/UserRecents.js
+              - sap/ushell/services/VisualizationDataProvider.js
+              - sap/ushell/services/VisualizationInstantiation.js
+              - sap/ushell/ui5service/_CardUserRecents/CardUserRecentsBase.js
+              - sap/ushell/ui5service/CardNavigation.js
+              - sap/ushell/ui5service/CardUserFrequents.js
+              - sap/ushell/ui5service/CardUserRecents.js
+              - sap/ushell/ui5service/ShellUIService.js
+              - sap/ushell_abap/library.js
+              - sap/ushell_abap/adapters/abap/AppStateAdapter.js
+              - sap/ushell_abap/adapters/abap/ContainerAdapter.js
+              - sap/ushell_abap/adapters/abap/ClientSideTargetResolutionAdapter.js
+              - sap/ushell_abap/adapters/abap/LaunchPageAdapter.js
+              - sap/ushell_abap/adapters/abap/MenuAdapter.js
+              - sap/ushell_abap/adapters/abap/NavTargetResolutionAdapter.js
+              - sap/ushell_abap/adapters/abap/PageBuildingAdapter.js
+              - sap/ushell_abap/adapters/abap/PagePersistenceAdapter.js
+              - sap/ushell_abap/adapters/abap/PersonalizationAdapter.js
+              - sap/ushell_abap/adapters/abap/Ui5ComponentLoaderAdapter.js
+              - sap/ushell_abap/adapters/abap/UserInfoAdapter.js
+              - sap/ushell_abap/pbServices/ui2/AllCatalogs.js
+              - sap/ushell_abap/pbServices/ui2/Bag.js
+              - sap/ushell_abap/pbServices/ui2/Catalog.js
+              - sap/ushell_abap/pbServices/ui2/Chip.js
+              - sap/ushell_abap/pbServices/ui2/ChipDefinition.js
+              - sap/ushell_abap/pbServices/ui2/chipdefinition.xsd
+              - sap/ushell_abap/pbServices/ui2/ChipInstance.js
+              - sap/ushell_abap/pbServices/ui2/Error.js
+              - sap/ushell_abap/pbServices/ui2/Factory.js
+              - sap/ushell_abap/pbServices/ui2/ODataService.js
+              - sap/ushell_abap/pbServices/ui2/ODataWrapper.js
+              - sap/ushell_abap/pbServices/ui2/Page.js
+              - sap/ushell_abap/pbServices/ui2/PageBuildingService.js
+              - sap/ushell_abap/pbServices/ui2/PageSet.js
+              - sap/ushell_abap/pbServices/ui2/RemoteCatalogService.js
+              - sap/ushell_abap/pbServices/ui2/Utils.js
+              - sap/ushell_abap/pbServices/ui2/contracts/actions.js
+              - sap/ushell_abap/pbServices/ui2/contracts/bag.js
+              - sap/ushell_abap/pbServices/ui2/contracts/configuration.js
+              - sap/ushell_abap/pbServices/ui2/contracts/configurationUi.js
+              - sap/ushell_abap/pbServices/ui2/contracts/fullscreen.js
+              - sap/ushell_abap/pbServices/ui2/contracts/navigation.js
+              - sap/ushell_abap/pbServices/ui2/contracts/preview.js
+              - sap/ushell_abap/pbServices/ui2/contracts/refresh.js
+              - sap/ushell_abap/pbServices/ui2/contracts/search.js
+              - sap/ushell_abap/pbServices/ui2/contracts/types.js
+              - sap/ushell_abap/pbServices/ui2/contracts/url.js
+              - sap/ushell_abap/pbServices/ui2/contracts/visible.js
+              - sap/ushell/ui/ShellHeader.fragment.xml
+              - sap/ushell/ui/ShellLayout.fragment.xml
+              - sap/ushell/services/_VisualizationInstantiation/*.control.xml
+              - sap/ushell/bootstrap/_SchedulingAgent/LoadingConfiguration.json
+              - sap/ushell/bootstrap/_SchedulingAgent/StepConfiguration.json
+              - '!sap/viz/libs/sap-viz.js'
+              # end bundle sap/ushell_abap/bootstrap/evo/core-min.js
+            resolve: true
+            renderer: true
           - mode: preload
             name: sap/fiori/core-ext-light
             filters:
@@ -83,7 +445,6 @@ builder:
               - sap/ui/security/
               - sap/ui/util/
               - sap/ui/thirdparty/
-              - sap/ui/layout/
               - sap/m/
               - sap/ushell/
               - '!**/*-preload.js'
@@ -99,9 +460,6 @@ builder:
               - '!sap/ui/core/**/*.support.js'
               - '!sap/ui/core/rules/'
               - '!sap/ui/core/support/'
-              - '!sap/ui/layout/designtime/'
-              - '!sap/ui/layout/**/*.support.js'
-              - '!sap/ui/layout/rules/'
               - '!sap/m/designtime/'
               - '!sap/m/**/*.support.js'
               - '!sap/m/rules/'
@@ -157,12 +515,11 @@ builder:
               - '!sap/ushell/plugins/'
               - '!sap/ushell/utils/'
               - '!sap/ushell/ui5service/UserStatus.js'
-              - '!**/.library'
-              - '!**/.vscode/'
             resolve: false
       bundleOptions:
         optimize: true
         usePredefineCalls: true
+        numberOfParts: 4
     - bundleDefinition:
         name: sap/ushell_abap/bootstrap/evo/core-min.js
         sections:
@@ -223,9 +580,10 @@ builder:
               - sap/m/Table.js
               - sap/m/TileContent.js
               - sap/m/TileContentRenderer.js
-              - sap/ui/layout/cssgrid/VirtualGrid.js
               - sap/ushell/library.js
+              - sap/ushell/CanvasShapesManager.js
               - sap/ushell/Fiori20AdapterTest.js
+              - sap/ushell/SessionHandler.js
               - sap/ushell/System.js
               - sap/ushell/User.js
               - sap/ushell/iconfonts.js
@@ -238,6 +596,7 @@ builder:
               - sap/ushell/adapters/local/UserDefaultParameterPersistenceAdapter.js
               - sap/ushell/components/container/ApplicationContainer.js
               - sap/ushell/components/ComponentKeysHandler.js
+              - sap/ushell/components/pages/controller/PagesAndSpaceId.js
               - sap/ushell/renderers/fiori2/Renderer.js
               - sap/ushell/renderers/fiori2/Shell.controller.js
               - sap/ushell/renderers/fiori2/Shell.view.js
@@ -287,6 +646,7 @@ builder:
               - sap/ushell_abap/adapters/abap/PageBuildingAdapter.js
               - sap/ushell_abap/adapters/abap/PagePersistenceAdapter.js
               - sap/ushell_abap/adapters/abap/PersonalizationAdapter.js
+              - sap/ushell_abap/adapters/abap/Ui5ComponentLoaderAdapter.js
               - sap/ushell_abap/adapters/abap/UserInfoAdapter.js
               - sap/ushell_abap/pbServices/ui2/AllCatalogs.js
               - sap/ushell_abap/pbServices/ui2/Bag.js
@@ -318,8 +678,7 @@ builder:
               - sap/ushell_abap/pbServices/ui2/contracts/visible.js
               - sap/ushell/ui/ShellHeader.fragment.xml
               - sap/ushell/ui/ShellLayout.fragment.xml
-              - sap/ushell/services/_VisualizationInstantiation/VizInstance.control.xml
-              - sap/ushell/services/_VisualizationInstantiation/VizInstanceAbap.control.xml
+              - sap/ushell/services/_VisualizationInstantiation/*.control.xml
               - sap/ushell/bootstrap/_SchedulingAgent/LoadingConfiguration.json
               - sap/ushell/bootstrap/_SchedulingAgent/StepConfiguration.json
               - '!sap/viz/libs/sap-viz.js'
@@ -327,10 +686,11 @@ builder:
             renderer: true
           - mode: require
             filters:
-              - sap/ui/core/Core
+              - sap/ui/core/Core.js
       bundleOptions:
         optimize: true
         usePredefineCalls: true
+        numberOfParts: 4
     - bundleDefinition:
         name: sap/ui2/srvc/ui2services.js
         sections: