@sapui5/sap.ushell_abap 1.106.0 → 1.107.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sapui5/sap.ushell_abap",
-    "version": "1.106.0",
+    "version": "1.107.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.106.0</version>
+    <version>1.107.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.106.0
+ * @version 1.107.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.106.0
+ * @version 1.107.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",
@@ -263,6 +263,100 @@ sap.ui.define([
         });
     };
 
+
+   /**
+     * Checks the Resolve Link/Start Up result for Application Dependencies and if present modifies the results
+     * Additionaly amends the post parameters if present
+     * @param {object} oResult oResult
+     *
+     * @returns {object} Results
+     * @private
+     */
+    ClientSideTargetResolutionAdapter.prototype._adjustNavTargetResult = function (oResult) {
+        if (oResult) {
+            var sUrl = oResult.url,
+                oUri,
+                oAdjustedResult = {
+                    applicationType: oResult.applicationType,
+                    additionalInformation: oResult.applicationData
+                },
+                sComponentName,
+                aMatches,
+                oAppDependencies,
+                oSelf;
+
+            if (oResult.text) {
+                oAdjustedResult.text = oResult.text;
+            }
+            if ((oResult.applicationType === "URL" || oResult.applicationType === "SAPUI5")) {
+                aMatches = /^SAPUI5\.Component=(.*)/.exec(oResult.applicationData);
+                sComponentName = aMatches && aMatches[1];
+
+                if (sComponentName || oResult.applicationDependencies) {
+                    if (sComponentName) {
+                        oAdjustedResult.ui5ComponentName = sComponentName;
+                    }
+                    // we only want to assign oAsyncHints if parsing succeeds, otherwise we're happy with undefined
+                    if (oResult.applicationDependencies) {
+                        try {
+                            oAppDependencies = JSON.parse(oResult.applicationDependencies);
+                            oSelf = oAppDependencies.self;
+                            if (!oAdjustedResult.ui5ComponentName && oSelf.name) {
+                                oAdjustedResult.ui5ComponentName = oSelf.name;
+                                oAdjustedResult.additionalInformation = "SAPUI5.Component=" + oAdjustedResult.ui5ComponentName;
+                            }
+                            if (oSelf && oSelf.url && typeof oSelf.url === "string") {
+                                var URI = sap.ui.require("sap/ui/thirdparty/URI");
+                                oUri = sUrl && new URI(sUrl);
+
+                                if (oUri) {
+                                    if (oSelf.url.toUpperCase().indexOf(oUri.path().toUpperCase()) !== 0) {
+                                        //no applicationDependencies in this case as they belong to the wrong app
+                                        Log.debug("Component URL defined in target mapping "
+                                                + "does not match the URL retrieved from application index. "
+                                                + "The URL of the application index is used for further processing.",
+                                        "Target mapping URL: " + oResult.url + "\nApplication index URL: " + oSelf.url,
+                                        "sap.ushell_abap.bootstrap.abap");
+                                    }
+                                    oUri.path(oSelf.url);
+                                    sUrl = oUri.toString();
+                                    Log.debug("ResolveLink result's component url has been replaced with the url specified " +
+                                        "in Application Dependencies, which includes cache buster token");
+                                } else {
+                                    sUrl = oSelf.url;
+                                }
+                            }
+
+                            oAdjustedResult.applicationDependencies = oAppDependencies;
+                        } catch (oError) {
+                            Log.error(
+                                "Parsing of applicationDependencies attribute in resolveLink result failed for SAPUI5 component '"
+                                + sComponentName + "'",
+                                oError,
+                                "sap.ushell_abap.bootstrap.abap"
+                            );
+                        }
+                    }
+
+                    // add cache-buster token to URL
+                    // although we stub the registerModulePath() method,
+                    // we have to replace it in the URL already, because the AppConfiguration service
+                    // loads the component's resource bundle already before the module path is registered
+                    // by the ApplicationContainer
+                    //
+                    // we only do this for SAPUI5 applications - if a plain URL or NWBC app is launched,
+                    // we keep it as it is
+                    // see internal BCP inicdent 1580137234 2015
+                    sUrl = Utils.addCacheBusterTokenUsingUshellConfig(sUrl);
+                }
+            }
+
+            oAdjustedResult.url = sUrl;
+            return oAdjustedResult;
+        }
+    };
+
+
     /**
      * Provides fallback resolution for {@link sap.ushell.services.ClientSideTargetResolution#resolveHashFragment}
      * in case the resolution result cannot be determined on the client.
@@ -416,7 +510,7 @@ sap.ui.define([
         copyParameter("sap-language");
         copyParameter("sap-client");
         Utils.get(
-            sRequestUrl + "&shellType=" + sap.ushell_abap.getShellType() + "&depth=0" + sCacheId,
+            sRequestUrl + "&shellType=" + ushellUtils.getShellType() + "&depth=0" + sCacheId,
             false, /* xml= */
             function (sNavTargetDataResult) {
                 var oNavTargetDataResult = JSON.parse(sNavTargetDataResult);
@@ -505,7 +599,7 @@ sap.ui.define([
             });
 
             // take component name from applicationDependencies if not supplied
-            oTarget.resolutionResult = sap.ushell_abap.bootstrap.adjustNavTargetResult(oFakeResolutionResult);
+            oTarget.resolutionResult = ClientSideTargetResolutionAdapter.prototype._adjustNavTargetResult(oFakeResolutionResult);
             oTarget.resolutionResult.additionalInformation = oTarget.resolutionResult.additionalInformation || "";
 
             // enable usage of the app ID hint
@@ -1006,20 +1100,6 @@ sap.ui.define([
         return true;
     };
 
-    /**
-     * Returns the current shell type, without relying on the existence of {@link sap.ushell_abap#getShellType}.
-     *
-     * @returns {string} the shell type ("NWBC" or "FLP"). Defaults to "FLP" in case the adapter is not running on the ABAP platform.
-     * @private
-     * @see sap.ushell_abap.adapters.abap.LaunchPageAdapter.prototype._getShellType
-     */
-    ClientSideTargetResolutionAdapter.prototype._getShellType = function () {
-        if (sap && sap.ushell_abap && typeof sap.ushell_abap.getShellType === "function") {
-            return sap.ushell_abap.getShellType();
-        }
-        return "FLP";
-    };
-
     /**
      * Resolves the URL hash fragment.
      *
@@ -1054,7 +1134,7 @@ sap.ui.define([
         bBatchQueueOpened = this._openBatchQueueUnlessOpen(this._getODataWrapper());
 
         this._oODataWrapper.read("ResolveLink?linkId='"
-            + encodeODataQueryParameter(sFragmentNoHash) + "'&shellType='" + that._getShellType() + "'"
+            + encodeODataQueryParameter(sFragmentNoHash) + "'&shellType='" + ushellUtils.getShellType() + "'"
             + (sFormFactor ?
                 "&formFactor='" + encodeODataQueryParameter(sFormFactor) + "'" : ""),
             function (oResult) {
@@ -1078,7 +1158,7 @@ sap.ui.define([
                     }
 
                     oResult = oResult.results[0];
-                    oAdjustedResult = sap.ushell_abap.bootstrap.adjustNavTargetResult(oResult);
+                    oAdjustedResult = ClientSideTargetResolutionAdapter.prototype._adjustNavTargetResult(oResult);
                     oAdjustedResult.url = sap.ushell_abap.bootstrap.addPostParametersToNavTargetResultUrl(
                         oResult.postParameters, oAdjustedResult.url);
 

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

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

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's page building adapter for the ABAP platform.
  *
  * @deprecated since 1.100
- * @version 1.106.0
+ * @version 1.107.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/URI",
@@ -21,7 +21,8 @@ sap.ui.define([
     "sap/ushell_abap/pbServices/ui2/Error",
     "sap/base/Log",
     "sap/m/library",
-    "sap/ushell/ui/tile/StaticTile"
+    "sap/ushell/ui/tile/StaticTile",
+    "sap/ushell/utils"
 ], function (
     URI,
     ManifestPropertyHelper,
@@ -37,7 +38,8 @@ sap.ui.define([
     SrvcError,
     Log,
     mobileLibrary,
-    StaticTile
+    StaticTile,
+    ushellUtils
 ) {
     "use strict";
 
@@ -583,7 +585,7 @@ sap.ui.define([
             }
             oTargetMappingsConfig = ObjectPath.create("services.targetMappings", oAdapterConfig);
             sCacheId = oTargetMappingsConfig.cacheId || "";
-            sUrl = "/sap/bc/ui2/start_up?so=%2A&action=%2A&tm-compact=true&shellType=" + that._getShellType() + "&depth=0";
+            sUrl = "/sap/bc/ui2/start_up?so=%2A&action=%2A&tm-compact=true&shellType=" + ushellUtils.getShellType() + "&depth=0";
 
             if (sCacheId) {
                 sUrl += (sUrl.indexOf("?") < 0 ? "?" : "&") + "sap-cache-id=" + sCacheId;
@@ -3669,20 +3671,6 @@ sap.ui.define([
         };
     };
 
-    /**
-     * Returns the current shell type, without relying on the existence of {@link sap.ushell_abap#getShellType}.
-     *
-     * @returns {string} the shell type ("NWBC" or "FLP"). Defaults to "FLP" in case the adapter is not running on the ABAP platform.
-     * @private
-     * @see sap.ushell_abap.adapters.abap.ClientSideTargetResolutionAdapter.prototype._getShellType
-     */
-    LaunchPageAdapter.prototype._getShellType = function () {
-        if (sap && sap.ushell_abap && typeof sap.ushell_abap.getShellType === "function") {
-            return sap.ushell_abap.getShellType();
-        }
-        return "FLP";
-    };
-
     /**
      * Returns raw catalog tile data that can be used to instantiate the tile
      *

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

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview PagePersistenceAdapter for the ABAP platform.
- * @version 1.106.0
+ * @version 1.107.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",

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.106.0
+ * @version 1.107.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.106.0
+ * @version 1.107.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.106.0
+ * @version 1.107.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.106.0
+ * @version 1.107.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.106.0
+ * @version 1.107.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-dev.js

@@ -1,7 +1,6 @@
 // Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 sap.ui.define([
     "./abap.configure.ushell",
-    "./abap.ui5.boot.handler",
     "./abap.load.launchpad",
     "./boottask",
     "sap/ushell/bootstrap/common/common.configure.ui5",
@@ -10,7 +9,6 @@ sap.ui.define([
     "sap/ushell/bootstrap/common/common.load.bootstrapExtension"
 ], function (
     fnConfigureUshell,
-    oUi5BootHandler,
     fnLoadLaunchpad,
     oBoottask,
     fnConfigureUi5,
@@ -20,19 +18,22 @@ sap.ui.define([
 ) {
     "use strict";
 
-    var oUShellConfig,
-        oUi5BootPromise = oUi5BootHandler.createUi5BootPromise();
+    var oUShellConfig;
 
     window["sap-ui-debug"] = bDebugSources; //use in LaunchPageAdapter
     oUShellConfig = fnConfigureUshell();
     fnConfigureUi5({
         ushellConfig: oUShellConfig,
         libs: fnExtractUi5LibsFromUshellConfig(oUShellConfig),
-        theme: "sap_belize",
-        bootTask: oUi5BootHandler.resolveBootPromise,
+        theme: "sap_fiori_3",
+        platform: "abap",
+        platformAdapters: {
+                abap: "sap.ushell_abap.adapters.abap",
+                hana: "sap.ushell_abap.adapters.hana"
+            },
+        bootTask: oBoottask.start,
         onInitCallback: fnLoadLaunchpad
     });
 
     fnLoadBootstrapExtension(oUShellConfig);
-    oBoottask.start(oUi5BootPromise);
 });

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

@@ -1,7 +1,6 @@
 // Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 sap.ui.define([
     "./abap.configure.ushell",
-    "./abap.ui5.boot.handler",
     "./abap.load.launchpad",
     "./boottask",
     "sap/ushell/bootstrap/common/common.configure.ui5",
@@ -11,19 +10,17 @@ sap.ui.define([
     "sap/ushell/bootstrap/common/common.load.core-min"
 ], function (
     fnConfigureUshell,
-    Ui5BootHandler,
     fnLoadLaunchpad,
-    Boottask,
+    oBoottask,
     fnConfigureUi5,
     fnExtractUi5LibsFromUshellConfig,
     fnLoadBootstrapExtension,
     bDebugSources,
-    CoreMinLoader
+    fnLoadCoreMin
 ) {
     "use strict";
 
-    var oUShellConfig,
-        oUi5BootPromise = Ui5BootHandler.createUi5BootPromise();
+    var oUShellConfig;
 
     window["sap-ui-debug"] = bDebugSources; //use in LaunchPageAdapter
     oUShellConfig = fnConfigureUshell();
@@ -31,12 +28,15 @@ sap.ui.define([
         ushellConfig: oUShellConfig,
         libs: fnExtractUi5LibsFromUshellConfig(oUShellConfig),
         theme: "sap_belize",
-        bootTask: Ui5BootHandler.resolveBootPromise,
+        platform: "abap",
+        platformAdapters: {
+                abap: "sap.ushell_abap.adapters.abap",
+                hana: "sap.ushell_abap.adapters.hana"
+            },
+        bootTask: oBoottask.start,
         onInitCallback: fnLoadLaunchpad
     });
 
-    CoreMinLoader.load("sap.ushell_abap.bootstrap.evo");
-
+    fnLoadCoreMin.load("sap.ushell_abap.bootstrap.evo");
     fnLoadBootstrapExtension(oUShellConfig);
-    Boottask.start(oUi5BootPromise);
 });

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

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

@@ -2,6 +2,7 @@
 sap.ui.define([
     "sap/base/util/UriParameters",
     "sap/base/Log",
+    "./boottask",
     "sap/ushell_abap/pbServices/ui2/contracts/bag",
     "sap/ushell_abap/pbServices/ui2/contracts/configuration",
     "sap/ushell_abap/pbServices/ui2/contracts/configurationUi",
@@ -15,7 +16,8 @@ sap.ui.define([
     "sap/ushell_abap/pbServices/ui2/contracts/types"
 ], function (
     UriParameters,
-    Log
+    Log,
+    Boottask
     /*
     ui2ContractsBag,
     ui2Configuration,
@@ -32,9 +34,7 @@ sap.ui.define([
 ) {
     "use strict";
 
-    return loadLaunchpadContent;
-
-    function loadLaunchpadContent () {
+    return function () {
         // check if framing control of ui5 should be active (meta tag set)
         var oFramingControl = window["sap-ushell-framing-control"],
             oUI5Configuration,
@@ -77,5 +77,6 @@ sap.ui.define([
             IconFonts.registerFiori2IconFont();
         });
 
-    }
+        Boottask.afterBootstrap();
+    };
 });

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

@@ -3,12 +3,14 @@ sap.ui.define([
     "./abap.bootstrap.utils",
     "sap/base/util/ObjectPath",
     "sap/base/Log",
-    "sap/ushell_abap/pbServices/ui2/Utils"
+    "sap/ushell_abap/pbServices/ui2/Utils",
+    "sap/ushell/utils"
 ], function (
     oAbapUtils,
     ObjectPath,
     Log,
-    Utils
+    Utils,
+    ushellUtils
 ) {
     "use strict";
 
@@ -51,7 +53,7 @@ sap.ui.define([
         }
 
         aParametertsFromUrl.forEach(copyParameter);
-        sRequestUrl += "shellType=" + sap.ushell_abap.getShellType() + "&depth=0";
+        sRequestUrl += "shellType=" + ushellUtils.getShellType() + "&depth=0";
         if (oStartupConfig) {
             sRequestUrl += oAbapUtils.getCacheIdAsQueryParameter(oStartupConfig);
             oXHR = oAbapUtils.createAndOpenXHR(sRequestUrl, oStartupConfig); // XMLHttpRequest + headers

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

@@ -12,8 +12,6 @@ sap.ui.define([
     "sap/ui/performance/trace/initTraces",
     "sap/base/util/ObjectPath",
     "sap/base/Log",
-    "sap/ushell/Container",
-    "sap/ui/Device",
     "sap/ushell_abap/pbServices/ui2/Utils"
 ],
 function (
@@ -28,8 +26,6 @@ function (
     initTraces,
     ObjectPath,
     Log,
-    Container,
-    Device,
     Utils
 ) {
     "use strict";
@@ -47,18 +43,6 @@ function (
     //start define the global sap.ushell_abap
     //**************************************
 
-    /**
-     * Determine the shell type considering NWBC
-     * Version 6.0+ client case.
-     *
-     * @return {string}
-     *   the shell type ("NWBC" or "FLP"), based on whether NWBC v6.0+
-     *   Client is detected.
-     */
-    sap.ushell_abap.getShellType = function () {
-        return oUshellUtils.hasNativeNavigationCapability() ? "NWBC" : "FLP";
-    };
-
     /**
      * Adds the given post parameters to a url
      *
@@ -80,96 +64,6 @@ function (
         return sUrl;
     };
 
-    /**
-     * Checks the Resolve Link/Start Up result for Application Dependencies and if present modifies the results
-     * Additionaly amends the post parameters if present
-     * @param {object}
-     *
-     * @private
-     */
-    sap.ushell_abap.bootstrap.adjustNavTargetResult = function (oResult) {
-        if (oResult) {
-            var sUrl = oResult.url,
-                oUri,
-                oAdjustedResult = {
-                    applicationType: oResult.applicationType,
-                    additionalInformation: oResult.applicationData
-                },
-                sComponentName,
-                aMatches,
-                oAppDependencies,
-                oSelf;
-
-            if (oResult.text) {
-                oAdjustedResult.text = oResult.text;
-            }
-            if ((oResult.applicationType === "URL" || oResult.applicationType === "SAPUI5")) {
-                aMatches = /^SAPUI5\.Component=(.*)/.exec(oResult.applicationData);
-                sComponentName = aMatches && aMatches[1];
-
-                if (sComponentName || oResult.applicationDependencies) {
-                    if (sComponentName) {
-                        oAdjustedResult.ui5ComponentName = sComponentName;
-                    }
-                    // we only want to assign oAsyncHints if parsing succeeds, otherwise we're happy with undefined
-                    if (oResult.applicationDependencies) {
-                        try {
-                            oAppDependencies = JSON.parse(oResult.applicationDependencies);
-                            oSelf = oAppDependencies.self;
-                            if (!oAdjustedResult.ui5ComponentName && oSelf.name) {
-                                oAdjustedResult.ui5ComponentName = oSelf.name;
-                                oAdjustedResult.additionalInformation = "SAPUI5.Component=" + oAdjustedResult.ui5ComponentName;
-                            }
-                            if (oSelf && oSelf.url && typeof oSelf.url === "string") {
-                                var URI = sap.ui.require("sap/ui/thirdparty/URI");
-                                oUri = sUrl && new URI(sUrl);
-
-                                if (oUri) {
-                                    if (oSelf.url.toUpperCase().indexOf(oUri.path().toUpperCase()) !== 0) {
-                                        //no applicationDependencies in this case as they belong to the wrong app
-                                        Log.debug("Component URL defined in target mapping "
-                                                + "does not match the URL retrieved from application index. "
-                                                + "The URL of the application index is used for further processing.",
-                                        "Target mapping URL: " + oResult.url + "\nApplication index URL: " + oSelf.url,
-                                        "sap.ushell_abap.bootstrap.abap");
-                                    }
-                                    oUri.path(oSelf.url);
-                                    sUrl = oUri.toString();
-                                    Log.debug("ResolveLink result's component url has been replaced with the url specified " +
-                                        "in Application Dependencies, which includes cache buster token");
-                                } else {
-                                    sUrl = oSelf.url;
-                                }
-                            }
-
-                            oAdjustedResult.applicationDependencies = oAppDependencies;
-                        } catch (oError) {
-                            Log.error(
-                                "Parsing of applicationDependencies attribute in resolveLink result failed for SAPUI5 component '"
-                                + sComponentName + "'",
-                                oError,
-                                "sap.ushell_abap.bootstrap.abap"
-                            );
-                        }
-                    }
-
-                    // add cache-buster token to URL
-                    // although we stub the registerModulePath() method,
-                    // we have to replace it in the URL already, because the AppConfiguration service
-                    // loads the component's resource bundle already before the module path is registered
-                    // by the ApplicationContainer
-                    //
-                    // we only do this for SAPUI5 applications - if a plain URL or NWBC app is launched,
-                    // we keep it as it is
-                    // see internal BCP inicdent 1580137234 2015
-                    sUrl = Utils.addCacheBusterTokenUsingUshellConfig(sUrl);
-                }
-            }
-
-            oAdjustedResult.url = sUrl;
-            return oAdjustedResult;
-        }
-    };
 
     //**************************************
     //end define the global sap.ushell_abap
@@ -207,16 +101,16 @@ function (
          * @return {boolean}
          * @private
          */
-        function isStandaloneHash (sHash) {
-            if (!sHash) {
+        function isStandaloneHash (sCurrentHash) {
+            if (!sCurrentHash) {
                 return false;
             }
-            return sHash.indexOf("Shell-home") === 0
-                || sHash.indexOf("Launchpad-openFLPPage") === 0
-                || sHash.indexOf("Shell-appfinder") === 0
-                || sHash.indexOf("Shell-catalog") === 0
-                || sHash.indexOf("shell-catalog") === 0
-                || sHash.indexOf("Action-search") === 0;
+            return sCurrentHash.indexOf("Shell-home") === 0
+                || sCurrentHash.indexOf("Launchpad-openFLPPage") === 0
+                || sCurrentHash.indexOf("Shell-appfinder") === 0
+                || sCurrentHash.indexOf("Shell-catalog") === 0
+                || sCurrentHash.indexOf("shell-catalog") === 0
+                || sCurrentHash.indexOf("Action-search") === 0;
         }
         /*
          * We allow to switch off the initial target resolution via configuration; use case is
@@ -643,9 +537,6 @@ function (
      *   the result as a JSON object
      */
     function processStartup (oStartupResult) {
-        // TODO: split in merging with config => do first,
-        // THEN merge with Configuration file ( if relevant)
-        // THEN process => apply to ui5 services etc.
         var mParameterMap = Utils.getParameterMap(),
             sRequestLocale = oAbapUtils.getUrlParameterValue("sap-locale", mParameterMap),
             oUi5UserInfo = {},
@@ -821,116 +712,90 @@ function (
         return oPromise;
     }
 
-    /**
-     * Performs the actual bootstrap when the start-up request is finished and SAPUI5 has started
-     * the boot task.
-     * @param {object} oStartupCallResult
-     *     the result of the start-up service
-     * @param {function} fnCallback
-     *     the callback function of the SAPUI5 boot task
-     */
-    function bootstrap (oStartupCallResult, fnCallback) {
+
+    function afterBootstrap () {
         var sShellHash = getShellHash();
 
-        // Note: processStartup creates window["sap-ushell-config"]
-        processStartup(oStartupCallResult);
+        if (isHomepageHash(sShellHash) && window["sap-ushell-config"].ushell &&
+            window["sap-ushell-config"].ushell.spaces && window["sap-ushell-config"].ushell.spaces.enabled) {
+            _loadPage(sShellHash); // earliest point available to load page object
+        }
+        var oFrameLogonManager = oXhrLogonLib.FrameLogonManager.getInstance();
+        sap.ushell.Container.oFrameLogonManager = oFrameLogonManager;
 
-        sap.ushell.bootstrap("abap", {
-            abap: "sap.ushell_abap.adapters.abap",
-            hana: "sap.ushell_abap.adapters.hana"
-        }).done(function () {
-            if (isHomepageHash(sShellHash) && window["sap-ushell-config"].ushell &&
-                window["sap-ushell-config"].ushell.spaces && window["sap-ushell-config"].ushell.spaces.enabled) {
-                _loadPage(sShellHash); // earliest point available to load page object
-            }
-            var oFrameLogonManager = oXhrLogonLib.FrameLogonManager.getInstance();
-            sap.ushell.Container.oFrameLogonManager = oFrameLogonManager;
-        }).always(function () {
-            if (isDirectStart(sShellHash)) { // only set on direct app start (not #Shell-home)
-                var fnResolve, fnReject;
-                window["sap-ushell-async-libs-promise-directstart"] = new Promise(function (resolve, reject) {
-                    fnResolve = resolve;
-                    fnReject = reject;
-                });
-                window["sap-ushell-async-libs-promise-directstart"].catch(function (sMsg) { // always provide catch handler
-                    /*silently ignore*/
-                });
-                // resolve the shell hash and try to load a UI5 component for it; if successful,
-                // the application context for the component will be attached to the resolution result
-                // for non-UI5 targets, it will be empty
-                sap.ushell.Container.getServiceAsync("NavTargetResolution").then(function (oNavTargetResolution) {
-                    oNavTargetResolution.resolveHashFragment("#" + getShellHash())
-                    .done(function (oResolutionResult) {
-                        var oAppConfiguration = sap.ui.require("sap/ushell/services/AppConfiguration");
-                        oAppConfiguration.setCurrentApplication(oResolutionResult);
-
-                        if (oResolutionResult && oResolutionResult.ui5ComponentName) {
-                            // create UI5 component early
-                            sap.ushell.Container.getServiceAsync("Ui5ComponentLoader").then(function (oUi5ComponentLoader) {
-                                oUi5ComponentLoader.createComponent(
-                                    oResolutionResult,
-                                    getParsedShellHash(sShellHash),
-                                    createWaitForRendererCreatedPromise(),
-                                    "Application"
-                                )
-                                    .done(function (oResolutionResultWithComponentHandle) {
-                                        fnResolve({
-                                            resolvedHashFragment: oResolutionResultWithComponentHandle,
-                                            dependenciesLoaded: true
-                                        });
-                                    })
-                                    .fail(function (vError) {
-                                        fnReject(vError);
+        if (isDirectStart(sShellHash)) { // only set on direct app start (not #Shell-home)
+            var fnResolve, fnReject;
+            window["sap-ushell-async-libs-promise-directstart"] = new Promise(function (resolve, reject) {
+                fnResolve = resolve;
+                fnReject = reject;
+            });
+            window["sap-ushell-async-libs-promise-directstart"].catch(function (sMsg) { // always provide catch handler
+                /*silently ignore*/
+            });
+            // resolve the shell hash and try to load a UI5 component for it; if successful,
+            // the application context for the component will be attached to the resolution result
+            // for non-UI5 targets, it will be empty
+            sap.ushell.Container.getServiceAsync("NavTargetResolution").then(function (oNavTargetResolution) {
+                oNavTargetResolution.resolveHashFragment("#" + getShellHash())
+                .done(function (oResolutionResult) {
+                    var oAppConfiguration = sap.ui.require("sap/ushell/services/AppConfiguration");
+                    oAppConfiguration.setCurrentApplication(oResolutionResult);
+
+                    if (oResolutionResult && oResolutionResult.ui5ComponentName) {
+                        // create UI5 component early
+                        sap.ushell.Container.getServiceAsync("Ui5ComponentLoader").then(function (oUi5ComponentLoader) {
+                            oUi5ComponentLoader.createComponent(
+                                oResolutionResult,
+                                getParsedShellHash(sShellHash),
+                                createWaitForRendererCreatedPromise(),
+                                "Application"
+                            )
+                                .done(function (oResolutionResultWithComponentHandle) {
+                                    fnResolve({
+                                        resolvedHashFragment: oResolutionResultWithComponentHandle,
+                                        dependenciesLoaded: true
                                     });
-                            });
-                        } else {
-                            // non-ui5 app
-                            fnResolve({
-                                resolvedHashFragment: oResolutionResult,
-                                dependenciesLoaded: false
-                            });
-                        }
-                    }).fail(function (sMsg) {
-                        fnReject(sMsg);
-                    });
-
+                                })
+                                .fail(function (vError) {
+                                    fnReject(vError);
+                                });
+                        });
+                    } else {
+                        // non-ui5 app
+                        fnResolve({
+                            resolvedHashFragment: oResolutionResult,
+                            dependenciesLoaded: false
+                        });
+                    }
+                }).fail(function (sMsg) {
+                    fnReject(sMsg);
                 });
-            }
 
-            // tell SAPUI5 that this boot task is done once the container has loaded
-            fnCallback();
-        });
+            });
+        }
     }
 
-    /**
-     * Loads the personalizations using the Personalization service.
-     *
-     * @returns {object} The personalization object.
-     * @private
-     */
-    function _loadPersonalization () {
-       return sap.ushell.Container.getServiceAsync("Personalization").then(function (oPersonalizationService) {
-           var oPersId = {
-               container: "sap.ushell.cdm3-1.personalization",
-               item: "data"
-           };
-
-           var oScope = {
-               validity: "Infinity",
-               keyCategory: oPersonalizationService.constants.keyCategory.GENERATED_KEY,
-               writeFrequency: oPersonalizationService.constants.writeFrequency.HIGH,
-               clientStorageAllowed: false
-           };
-
-           return oPersonalizationService.getPersonalizer(oPersId, oScope).getPersData();
-       });
-    }
 
     function _loadPage (sShellHash) {
         if (sShellHash && sShellHash.indexOf("Shell-appfinder") === 0) {
             return;
         }
-        _loadPersonalization();
+
+        sap.ushell.Container.getServiceAsync("Personalization").then(function (oPersonalizationService) {
+            var oPersId = {
+                container: "sap.ushell.cdm3-1.personalization",
+                item: "data"
+            };
+
+            var oScope = {
+                validity: "Infinity",
+                keyCategory: oPersonalizationService.constants.keyCategory.GENERATED_KEY,
+                writeFrequency: oPersonalizationService.constants.writeFrequency.HIGH,
+                clientStorageAllowed: false
+            };
+
+            return oPersonalizationService.getPersonalizer(oPersId, oScope).getPersData();
+        });
 
         sap.ui.require([ "sap/ushell/components/pages/controller/PagesAndSpaceId" ], function (oPagesAndSpaceId) {
             var oIdPromise = oPagesAndSpaceId._getPageAndSpaceId(sShellHash);
@@ -949,20 +814,17 @@ function (
 
     /**
      * Performs a start-up request and synchronizes it with the SAPUI5 boot task.
-     * @Param {object} oUi5BootPromise Boot Promise
+     * @Param {object} fnCallback To be called for UI5 Core during boot process
      */
-    function start (oUi5BootPromise) {
-        var oStartupPromise;
-
+    function start (fnCallback) {
         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) {
+        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;
             var oLaunchPageAdapterConfig = ObjectPath.get("sap-ushell-config.services.LaunchPage.adapter.config") || ObjectPath.create("sap-ushell-config.services.LaunchPage.adapter.config");
@@ -1003,21 +865,18 @@ function (
             Log.error("start_up request failed: " + sMessage, null,
                 "sap.ushell_abap.bootstrap");
             return Promise.resolve({});
-        });
-
-        Promise.all([oStartupPromise, oUi5BootPromise]).then(function (aPromiseResults) {
-            bootstrap.apply(null, aPromiseResults);
+        }).then(function (oStartupResult) {
+            // Note: processStartup creates window["sap-ushell-config"]
+            processStartup(oStartupResult);
+            fnCallback();
         });
     }
 
     oBoottask.start = start;
-    oBoottask.bootstrap = bootstrap;
-
+    oBoottask.afterBootstrap = afterBootstrap;
     oBoottask._getShellHash = getShellHash; //only for testing
     oBoottask._getFullShellHash = getFullShellHash; //only for testing
     oBoottask._createWaitForRendererCreatedPromise = createWaitForRendererCreatedPromise; //only for testing
     oBoottask._loadPage = _loadPage; // only for testing
-
     return oBoottask;
-
 });

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

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

package/ui5.yaml

@@ -582,6 +582,14 @@ builder:
               - sap/m/Page.js
               - sap/m/ScrollContainer.js
               - sap/m/ScrollContainerRenderer.js
+              - sap/m/SearchField.js
+              - sap/m/SearchFieldRenderer.js
+              - sap/m/SelectDialog.js
+              - sap/m/SelectDialogBase.js
+              - sap/m/Suggest.js
+              - sap/m/SuggestionItem.js
+              - sap/m/SuggestionList.js
+              - sap/m/SuggestionListRenderer.js
               - sap/m/Table.js
               - sap/m/TileContent.js
               - sap/m/TileContentRenderer.js

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

@@ -1,84 +0,0 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
-
-sap.ui.define([
-    "sap/base/Log",
-    "sap/ushell_abap/pbServices/ui2/Utils"
-], function (
-    Log,
-    Utils
-) {
-    "use strict";
-
-    var oBootHandler = {},
-        oBootPromise,
-        fnResolve; //resolver of the Promise
-
-    /**
-     * Overwrites jQuery.sap.registerModulePath to add a cache buster token on each call to the
-     * URL prefix path.
-     *
-     * Note:
-     * The sap-ushell-config defines the rules for adding a token to the URL.
-     * This is a temporary solution. Ideally UI5 will provide this functionality.
-     *
-     * @private
-     */
-    function overwriteRegisterModulePath () {
-        var fnRegisterModulePath = jQuery.sap.registerModulePath;
-
-        function normalizeUrlAndAddCacheBusterToken (sUrlPrefix) {
-            // Removing cache buster token (if available) of url and normalize the url afterwards
-            var sNormalizedUrl = Utils.removeCBAndNormalizeUrl(sUrlPrefix),
-                sUrlPrefixModified = Utils.addCacheBusterTokenUsingUshellConfig(sNormalizedUrl);
-            return sUrlPrefixModified;
-        }
-
-        jQuery.sap.registerModulePath = function (sModuleName, vUrlPrefix) {
-            // since 1.28, registerModulePath can take either a URL string or an object of form {url: "url", "final": true}
-            if (typeof vUrlPrefix === "object") {
-                vUrlPrefix.url = normalizeUrlAndAddCacheBusterToken(vUrlPrefix.url);
-            } else if (typeof vUrlPrefix === "string") {
-                vUrlPrefix = normalizeUrlAndAddCacheBusterToken(vUrlPrefix);
-            }
-            // any other types are just passed through
-
-            fnRegisterModulePath(sModuleName, vUrlPrefix);
-        };
-    }
-
-    /**
-     * Work around to use promise for booting the ui5.
-     * Singleton.
-     * Createed promise will be resolved after calling the resolveBootPromise method
-     *
-     * @returns {Promise}
-     *   Promise will resolved after calling the resolveBootPromise
-     */
-    oBootHandler.createUi5BootPromise = function () {
-        if (!oBootPromise) {
-            oBootPromise = new Promise(function (resolve, reject) {
-                fnResolve = resolve;
-            });
-        }
-        return oBootPromise;
-    };
-
-    /**
-     * The SAPUI5 boot task when bootstrapping Unified Shell for ABAP. The resolve the promise, which was created before by
-     * createUi5BootPromise method. If createUi5BootPromise was not called before, that fnCallback will be called.
-     * @param {function} fnCallback
-     *     the function by which SAPUI5 is notified that this task is finished
-     */
-    oBootHandler.resolveBootPromise = function (fnCallback) {
-        overwriteRegisterModulePath();
-        // add nice logging for sap/net/xhr.js
-        XMLHttpRequest.logger = Log.getLogger("sap.net.xhr");
-        if (fnResolve) {
-            fnResolve(fnCallback);
-        } else {
-            fnCallback();
-        }
-    };
-
-    return oBootHandler;
-});