@sapui5/sap.ushell_abap 1.144.1 → 1.146.0

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

@@ -2,26 +2,26 @@
 
 sap.ui.define([
     "sap/ushell_abap/bootstrap/evo/abap.xhrlogon.LibLoader",
-    "./abap.bootstrap.utils",
-    "./abap.request.startup",
-    "./abap.request.pageset",
-    "./abap.xhrlogon.handler",
-    "./abap.theme.handler",
+    "sap/ushell_abap/bootstrap/evo/abap.bootstrap.utils",
+    "sap/ushell_abap/bootstrap/evo/abap.request.startup",
+    "sap/ushell_abap/bootstrap/evo/abap.request.pageset",
+    "sap/ushell_abap/bootstrap/evo/abap.xhrlogon.handler",
+    "sap/ushell_abap/bootstrap/evo/abap.theme.handler",
     "sap/ushell/EventHub",
     "sap/ui/performance/trace/initTraces",
     "sap/base/util/ObjectPath",
     "sap/base/Log",
     "sap/ushell_abap/pbServices/ui2/Utils",
     "sap/ushell/bootstrap/common/common.util",
-    "./SAPCompanionConditionSetter",
+    "sap/ushell_abap/bootstrap/evo/SAPCompanionConditionSetter",
     "sap/ushell/utils/UrlParsing"
 ], (
-    oXhrLibLoader,
-    oAbapUtils,
-    oStartupHandler,
-    oPageSetHandler,
-    oXhrHandler,
-    oThemeHandler,
+    abapXhrlogonLibLoader,
+    abapBootstrapUtils,
+    abapRequestStartup,
+    abapRequestPageset,
+    abapXhrlogonHandler,
+    abapThemeHandler,
     EventHub,
     initTraces,
     ObjectPath,
@@ -113,7 +113,7 @@ sap.ui.define([
      */
     // TODO Refactor: Align with URLParsing.getShellHash
     function getFullShellHash () {
-        const sHref = oAbapUtils.getLocationHref();
+        const sHref = abapBootstrapUtils.getLocationHref();
         const iHashIndex = sHref.indexOf("#");
         if (iHashIndex < 0) {
             return "";
@@ -367,7 +367,7 @@ sap.ui.define([
     function determineUrlTheme (sSystemThemeRoot) {
         let aThemeParts;
 
-        const sThemeUrlParameter = oAbapUtils.getUrlParameterValue("sap-theme") || oAbapUtils.getUrlParameterValue("sap-ui-theme");
+        const sThemeUrlParameter = abapBootstrapUtils.getUrlParameterValue("sap-theme") || abapBootstrapUtils.getUrlParameterValue("sap-ui-theme");
         if (sThemeUrlParameter) {
             if (sThemeUrlParameter.indexOf("@") > 0) {
                 aThemeParts = sThemeUrlParameter.split("@", 2);
@@ -424,7 +424,7 @@ sap.ui.define([
         const iIndex = theme.indexOf("@");
         if (iIndex >= 0) {
             const sThemeRoot = sTheme.slice(iIndex + 1);
-            return oThemeHandler.isThemeRootSafe(sThemeRoot);
+            return abapThemeHandler.isThemeRootSafe(sThemeRoot);
         }
         return true;
     }
@@ -498,7 +498,7 @@ sap.ui.define([
      */
     function processStartup (oStartupResult) {
         const mParameterMap = ui2Utils.getParameterMap();
-        const sRequestLocale = oAbapUtils.getUrlParameterValue("sap-locale", mParameterMap);
+        const sRequestLocale = abapBootstrapUtils.getUrlParameterValue("sap-locale", mParameterMap);
         const oUshellConfig = {
             services: {}
         };
@@ -665,7 +665,7 @@ sap.ui.define([
             addInitialKey(/(\?|&)(sap-system=[A-Z0-9]+)/, sHash);
             addInitialKey(/(\?|&|[/])(sap-iapp-state=[A-Z0-9]+)/, sFullHash);
 
-            oRequestPromise = oStartupHandler.requestDirectStart(oStartupResult, oRequestSegment, oInitialKeys);
+            oRequestPromise = abapRequestStartup.requestDirectStart(oStartupResult, oRequestSegment, oInitialKeys);
 
             oAppStateConfig.initialAppStatesPromise = oRequestPromise.then((oDirectStart) => {
                 addInitialAppState(oInitialAppStates, oDirectStart, oInitialKeys, "sap-intent-param", "iparState");
@@ -704,7 +704,7 @@ sap.ui.define([
             function fnOnRendererCreated () {
                 Log.info("Direct application start: resolving component waitFor promise after shell renderer created event fired.");
                 resolve();
-                getContainer().detachRendererCreatedEvent(fnOnRendererCreated);
+                getContainer().detachRendererCreatedInternal(fnOnRendererCreated);
             }
 
             EventHub.once("ShellNavigationInitialized").do(() => {
@@ -714,7 +714,7 @@ sap.ui.define([
                     resolve();
                 } else {
                     // the renderer should be created when the shell navigation is initialized, just to but be robust
-                    getContainer().attachRendererCreatedEvent(fnOnRendererCreated);
+                    getContainer().attachRendererCreatedInternal(fnOnRendererCreated);
                 }
             });
         });
@@ -733,7 +733,7 @@ sap.ui.define([
             window["sap-ushell-config"].ushell.spaces && window["sap-ushell-config"].ushell.spaces.enabled) {
             oBoottask._loadPage(sShellHash); // earliest point available to load page object
         }
-        oXhrLibLoader.getLib().then((oXhrLogonLib) => {
+        abapXhrlogonLibLoader.getLib().then((oXhrLogonLib) => {
             const oFrameLogonManager = oXhrLogonLib.FrameLogonManager.getInstance();
             getContainer().oFrameLogonManager = oFrameLogonManager;
         });
@@ -781,16 +781,12 @@ sap.ui.define([
                     return getContainer().getServiceAsync("NavTargetResolutionInternal");
                 })
                 .then((oNavTargetResolutionInternal) => {
-                    const oParsedHash = UrlParsing.parseShellHash(sShellHash);
-
                     oNavTargetResolutionInternal.resolveHashFragment(UrlParsing.ensureLeadingHash(sShellHash))
                         .done((oResolutionResult) => {
                             sap.ui.require(["sap/ushell/services/AppConfiguration"], (AppConfiguration) => {
                                 AppConfiguration.setCurrentApplication(oResolutionResult);
 
                                 if (oResolutionResult && oResolutionResult.ui5ComponentName) {
-                                    const sBasicHash = UrlParsing.constructBasicHash(oParsedHash);
-                                    oResolutionResult.ui5ComponentId = `application-${sBasicHash}-component`;
                                     // create UI5 component early
                                     getContainer().getServiceAsync("Ui5ComponentLoader").then((oUi5ComponentLoader) => {
                                         oUi5ComponentLoader.createComponent(
@@ -879,14 +875,14 @@ sap.ui.define([
      * @param {object} fnCallback To be called for UI5 Core during boot process
      */
     function start (fnCallback) {
-        oXhrHandler.initXhrLogon(window["sap-ushell-config"]);
+        abapXhrlogonHandler.initXhrLogon(window["sap-ushell-config"]);
 
         // initialize UI5 performance tracing (FESR) before first request is sent, so that this is also instrumented
         initTraces();
 
         // fire start-up request if direct start also indicates suppression of pageset request
         // must be kept before success handler of requestStartUp
-        oStartupHandler.requestStartupConfig()
+        abapRequestStartup.requestStartupConfig()
             .catch((oError) => {
                 Log.error("start_up request failed:", oError, "sap.ushell_abap.bootstrap");
                 return {};
@@ -918,9 +914,9 @@ sap.ui.define([
                 if (isHomepageHash(sHash) && !ObjectPath.get("sap-ushell-config.ushell.spaces.enabled")) {
                     // do not create cache entries for PageSet and compact TMs
                     // otherwise the FLP will freeze when returning to HOME from the cold started app (???)
-                    oPageSetHandler.requestPageSet(oStartupResult);
+                    abapRequestPageset.requestPageSet(oStartupResult);
                 }
-                const oTMPromise = oStartupHandler.requestFullTM(oStartupResult);
+                const oTMPromise = abapRequestStartup.requestFullTM(oStartupResult);
                 oClientSideTargetResolutionAdapterConfig.navTargetDataPromise = oTMPromise;
                 // Do not issue the separate compact request for the launchpage adapter, as it was done in the earlier FLP versions.
                 // Reuse the existing full target mappings request that is sent in any case.

package/src/main/js/sap/ushell_abap/components/TCodeNavigation/MessageCode.js

@@ -31,7 +31,7 @@ sap.ui.define([
          * @private
          * @ui5-restricted sap.esh.search.ui
          */
-        NAVFLP_HOME_FAILED: "NAV_FLP_HOME_FAILED",
+        NAV_FLP_HOME_FAILED: "NAV_FLP_HOME_FAILED",
 
         /**
          * No matching inbound was found for the transaction code.
@@ -51,6 +51,23 @@ sap.ui.define([
          */
         MANDATORY_PARAMETER_MISSING: "MANDATORY_PARAMETER_MISSING",
 
+        /**
+         * The default LADI inbound is missing for the transaction code.
+         *
+         * @since 1.146.0
+         * @private
+         * @ui5-restricted sap.esh.search.ui
+         */
+        DEFAULT_LADI_MISSING: "DEFAULT_LADI_MISSING",
+
+        /**
+         * No tiles are assigned to the default LADI inbound for the transaction code.
+         * @since 1.146.0
+         * @private
+         * @ui5-restricted sap.esh.search.ui
+         */
+        DEFAULT_LADI_HAS_TILES_MISSING: "DEFAULT_LADI_HAS_TILES_MISSING",
+
         /**
          * An unknown error occurred during navigation.
          *

package/src/main/js/sap/ushell_abap/components/TCodeNavigation.js

@@ -46,7 +46,7 @@ sap.ui.define([
      * @since 1.140.0
      * @private
      * @ui5-restricted sap.esh.search.ui
-     */ // TODO add technical name of esearch component / team name
+     */
     class TCodeNavigation {
         // Performance extension for tracking navigation sources
         static #oExtension = new Extension("TCodeNavigation");
@@ -92,7 +92,7 @@ sap.ui.define([
                         if (!bResult) {
                             throw new TCodeNavigationError(
                                 `Navigation to FLP home failed: ${sFLPUrl}`,
-                                { code: MessageCode.NAVFLP_HOME_FAILED }
+                                { code: MessageCode.NAV_FLP_HOME_FAILED }
                             );
                         }
                     } else {
@@ -204,26 +204,37 @@ sap.ui.define([
             // Finds the first "app" that matches the given transaction code and doesn't have mandatory parameters.
             // "App" in this sense mean: combination of inbound and default tile (the default tile might bring values for defined mandatory parameters,
             // therefore, both artefacts are combined and checked together).
-            const aTranscationCodeInbounds = oNavigationData.inbounds.filter((oInbound) =>
+            const aTransactionCodeInbounds = oNavigationData.inbounds.filter((oInbound) =>
                 oInbound.resolutionResult?.appInfo?.["abap.transaction"] === sTCode
             );
-
-            // filter inbounds which are default for ladi and have tiles
-            const aLadiInbounds = aTranscationCodeInbounds.filter((oInbound) =>
-                oInbound.isDefaultLadi && oInbound.ladiHasTiles);
-            // currently, it is not possible to ensure that there is only one default ladi inbound for a transaction code,
-            // therefore, we sort them by ladiid and uuid and take the first one
-            const aSortedInbounds = aLadiInbounds.sort(this.compareInboundsAccordingToUuidAndLadiid);
-
-            if (aSortedInbounds.length === 0) {
+            if (aTransactionCodeInbounds.length === 0) {
                 throw new TCodeNavigationError(
                     `No matching inbound found for transaction code: ${sTCode}`,
                     { code: MessageCode.NO_INBOUND_FOUND }
                 );
             }
+            // filter inbounds which are default for ladi and have tiles
+            const aDefaultLadiInbounds = aTransactionCodeInbounds.filter((oInbound) => oInbound.isDefaultLadi);
+            if (aDefaultLadiInbounds.length === 0) {
+                throw new TCodeNavigationError(
+                    `Default LADI inbound is missing for transaction code: ${sTCode}`,
+                    { code: MessageCode.DEFAULT_LADI_MISSING }
+                );
+            }
+            const aDefaultLadiHasTilesInbounds = aDefaultLadiInbounds.filter((oInbound) => oInbound.ladiHasTiles);
 
-            // filter inbound where all mandatory parameters have values of the default tile
+            if (aDefaultLadiHasTilesInbounds.length === 0) {
+                throw new TCodeNavigationError(
+                    `No tiles are assigned to the default LADI inbound for transaction code: ${sTCode}`,
+                    { code: MessageCode.DEFAULT_LADI_HAS_TILES_MISSING }
+                );
+            }
 
+            // currently, it is not possible to ensure that there is only one default ladi inbound for a transaction code,
+            // therefore, we sort them by ladiid and uuid and take the first one
+            const aSortedInbounds = aDefaultLadiHasTilesInbounds.sort(this.compareInboundsAccordingToUuidAndLadiid);
+
+            // filter inbound where all mandatory parameters have values of the default tile
             const aValidInbounds = aSortedInbounds.filter((oInbound) => {
                 const oDefaultTileParams = UrlParsing.parseParameters(`?${oInbound?.defaultTileParams}`);
                 const oInboundParams = oInbound.signature?.parameters || {};

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

@@ -30,7 +30,7 @@ sap.ui.define([
     const ushellAbapLib = Library.init({
         name: "sap.ushell_abap",
         apiVersion: 2,
-        version: "1.144.1",
+        version: "1.146.0",
         dependencies: ["sap.ui.core", "sap.m"],
         noLibraryCSS: true,
         extensions: {