@sapui5/sap.ushell 1.139.0 → 1.141.0

package/src/main/js/sap/ushell/services/AppLifeCycle.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's AppLifeCycle service enables plug-ins to enquire the which
  *    application is currently displayed and listen to life cycle events.
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/ui/base/EventProvider",
@@ -12,24 +12,24 @@ sap.ui.define([
     "sap/ui/thirdparty/hasher",
     "sap/ui/thirdparty/URI",
     "sap/ushell/AppInfoParameters",
-    "sap/ushell/appIntegration/AppLifeCycle", // require to ensure that MessageBroker is connected
     "sap/ushell/Config",
     "sap/ushell/Container",
     "sap/ushell/EventHub",
     "sap/ushell/services/AppConfiguration",
-    "sap/ushell/TechnicalParameters"
+    "sap/ushell/TechnicalParameters",
+    "sap/ushell/renderer/RendererManagedComponents"
 ], (
     EventProvider,
     Component,
     hasher,
     URI,
     AppInfoParameters,
-    AppLifeCycleAI,
     Config,
     Container,
     EventHub,
     AppConfiguration,
-    TechnicalParameters
+    TechnicalParameters,
+    RendererManagedComponents
 ) => {
     "use strict";
 
@@ -132,15 +132,16 @@ sap.ui.define([
         // CONSTRUCTOR CODE //
         if (window.QUnit === undefined && Container.inAppRuntime() === false) {
             if (Config.last("/core/shell/enableMessageBroker")) {
-                Container.getServiceAsync("MessageBroker").then((oMessageBrokerService) => {
-                    oMessageBrokerService.subscribe(
-                        "FLP",
+                Container.getServiceAsync("MessageBroker").then(async (MessageBroker) => {
+                    await MessageBroker.connect(MessageBroker.ClientAlias.FLP, () => {});
+
+                    MessageBroker.subscribe(
+                        MessageBroker.ClientAlias.FLP,
                         [{
                             channelId: "flp-app-info",
                             version: "1.0"
                         }],
-                        this._handleIncomingMessageBrokerMessage.bind(this, oMessageBrokerService),
-                        () => { }
+                        this._handleIncomingMessageBrokerMessage.bind(this, MessageBroker)
                     );
                 });
             }
@@ -151,10 +152,10 @@ sap.ui.define([
         oNavContainer.attachAfterNavigate(this.onAfterNavigate.bind(this));
     };
 
-    AppLifeCycle.prototype._handleIncomingMessageBrokerMessage = function (oMessageBrokerService, sClientId, sChannelId, sMessageName, data) {
+    AppLifeCycle.prototype._handleIncomingMessageBrokerMessage = function (MessageBroker, sClientId, sChannelId, sMessageName, data) {
         if (sChannelId === "flp-app-info" && sMessageName === "get-current-app-info" && this._oCurrentApplication) {
             this._oCurrentApplication.getAllAppInfo(true).then((appData) => {
-                oMessageBrokerService.publish("flp-app-info", "FLP", Date.now().toString(), sMessageName, [sClientId], appData);
+                MessageBroker.publish("flp-app-info", MessageBroker.ClientAlias.FLP, Date.now().toString(), sMessageName, [sClientId], appData);
             });
         }
     };
@@ -191,16 +192,10 @@ sap.ui.define([
 
         // determine if we're dealing with home page by checking the component instance id
         if (oComponentInstance) {
-            const sComponentInstanceId = oComponentInstance.getId();
             // In the past Homepage and AppFinder were the same component.
             // for compatibility reason bHomePage is
             // also true for the AppFinder
-            bNavToFlpComponent = sComponentInstanceId.indexOf("Shell-home-component") !== -1
-                || sComponentInstanceId.indexOf("pages-component") !== -1
-                || sComponentInstanceId.indexOf("workPageRuntime-component") !== -1
-                || sComponentInstanceId.indexOf("Shell-appfinder-component") !== -1
-                || sComponentInstanceId.indexOf("homeApp-component") !== -1
-                || sComponentInstanceId.indexOf("runtimeSwitcher-component") !== -1;
+            bNavToFlpComponent = RendererManagedComponents.isManagedComponentInstance(oComponentInstance);
         }
 
         // type can either be read from application container or set to UI5 if component instance exists
@@ -218,11 +213,11 @@ sap.ui.define([
         this._setCurrentApplicationObject(sApplicationType, oComponentInstance, bNavToFlpComponent, oApplicationContainer);
     };
 
-    AppLifeCycle.prototype._getAppIntent = function (bRealAppIntent) {
+    AppLifeCycle.prototype._getAppIntent = async function (bRealAppIntent) {
         const sHash = hasher.getHash();
         let oParsedHash;
         if (!sHash) {
-            return Promise.reject("Could not identify current application hash");
+            throw new Error("Could not identify current application hash");
         }
 
         const oService = Container.getServiceAsync("URLParsing");
@@ -285,7 +280,7 @@ sap.ui.define([
              *       "custom.property": { value: "customValue", showInABout: true, label: "Custom Property" }
              *   };
              * @param {boolean} bValues Whether to return the metadata or just the values.
-             * @returns {Promise<object<string, string>|object<string, sap.ushell.services.AppLifeCycle.AppInfoMetadata>>} Object containing the application info parameters with values.
+             * @returns {Promise<Object<string, string>|Object<string, sap.ushell.services.AppLifeCycle.AppInfoMetadata>>} Object containing the application info parameters with values.
              *
              * @private
              */
@@ -337,13 +332,21 @@ sap.ui.define([
         setTimeout(() => {
             this._oEventProvider.fireEvent(S_APP_LOADED_EVENT, this._oCurrentApplication);
             // shell analytics is listening to this event
-            EventHub.emit("FESRAppLoaded", { technicalName: this._oCurrentApplication?.technicalName });
-
+            EventHub.last("trackHashChange");
+            // Do not emit FESRAppLoaded event for Shell-home to prevent the close of the statistical record,
+            // if it is not an application
+            // and thus followed by a PagesRuntimeRendered event to enhance the data and eventually by firstSegmentCompleteLoaded event
+            // to close the record.
+            this._oCurrentApplication.getInfo(["technicalAppComponentId"]).then((oAppInfo) => {
+                if (!RendererManagedComponents.isManagedComponentName(oAppInfo?.technicalAppComponentId)) {
+                    EventHub.emit("FESRAppLoaded", { technicalName: oAppInfo.technicalAppComponentId });
+                }
+            });
             if (window.QUnit === undefined && Container.inAppRuntime() === false) {
                 if (Config.last("/core/shell/enableMessageBroker")) {
-                    Container.getServiceAsync("MessageBroker").then((oMessageBrokerService) => {
-                        this._oCurrentApplication.getAllAppInfo(true).then((data) => {
-                            oMessageBrokerService.publish("flp-app-info", "FLP", Date.now().toString(), "new-app-info", "*", data);
+                    Container.getServiceAsync("MessageBroker").then((MessageBroker) => {
+                        this._oCurrentApplication.getAllAppInfo(true).then((oData) => {
+                            MessageBroker.publish("flp-app-info", MessageBroker.ClientAlias.FLP, "new-app-info", "*", oData);
                         });
                     });
                 }
@@ -435,9 +438,9 @@ sap.ui.define([
     AppLifeCycle.prototype.setAppInfo = function (oAppInfo, bIsNewApp) {
         AppInfoParameters.setCustomAttributes(oAppInfo?.info);
         if (Config.last("/core/shell/enableMessageBroker")) {
-            Container.getServiceAsync("MessageBroker").then((oMessageBrokerService) => {
-                this._oCurrentApplication.getAllAppInfo(true).then((data) => {
-                    oMessageBrokerService.publish("flp-app-info", "FLP", Date.now().toString(), (bIsNewApp === true ? "new-app-info" : "app-info-update"), "*", data);
+            Container.getServiceAsync("MessageBroker").then((MessageBroker) => {
+                this._oCurrentApplication.getAllAppInfo(true).then((oData) => {
+                    MessageBroker.publish("flp-app-info", MessageBroker.ClientAlias.FLP, (bIsNewApp === true ? "new-app-info" : "app-info-update"), "*", oData);
                 });
             });
         }

package/src/main/js/sap/ushell/services/AppState.js

@@ -6,7 +6,7 @@
  * This is *not* an application facing service, but for Shell Internal usage.
  * This service should be accessed by the application via the CrossApplicationNavigation service.
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/ui/base/Object",
@@ -323,7 +323,7 @@ sap.ui.define([
             try {
                 JSON.parse(sKey);
                 return true;
-            } catch (err) {
+            } catch {
                 return false;
             }
         }
@@ -511,7 +511,7 @@ sap.ui.define([
                 })
                 .fail(oDeferred.reject);
         } else {
-            oDeferred.reject(`AppState.makeStatePersistent - adapter does not support persistence method: ${persistencyMethod}`);
+            oDeferred.reject(new Error(`AppState.makeStatePersistent - adapter does not support persistence method: ${persistencyMethod}`));
         }
 
         return oDeferred.promise();

package/src/main/js/sap/ushell/services/Bookmark.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's bookmark service. Allows creating shortcuts on the user's home page.
  *
- * @version 1.139.0
+ * @version 1.141.0
  * @deprecated since 1.120
  */
 sap.ui.define([
@@ -78,7 +78,7 @@ sap.ui.define([
          * @private
          */
         this._addBookmarkToContentNodes = function (oBookmarkParams, aContentNodes, bCustom, sContentProviderId) {
-            const aPromises = aContentNodes.map((oContentNode) => {
+            const aPromises = aContentNodes.map(async (oContentNode) => {
                 if (oContentNode && oContentNode.hasOwnProperty("type") && oContentNode.isContainer) {
                     switch (oContentNode.type) {
                         case ContentNodeType.Page:
@@ -94,10 +94,10 @@ sap.ui.define([
                                 return this.addBookmarkToHomepageGroup(oBookmarkParams, oGroup, bCustom, sContentProviderId);
                             });
                         default:
-                            return Promise.reject(`Bookmark Service: The API needs to be called with a valid content node type. '${oContentNode.type}' is not supported.`);
+                            throw new Error(`Bookmark Service: The API needs to be called with a valid content node type. '${oContentNode.type}' is not supported.`);
                     }
                 }
-                return Promise.reject("Bookmark Service: Not a valid content node.");
+                throw new Error("Bookmark Service: Not a valid content node.");
             });
 
             return Promise.all(aPromises);
@@ -232,9 +232,9 @@ sap.ui.define([
                     return this._addBookmarkToContentNodes(oParameters, aContentNodes, false, sContentProviderId);
                 })
                 .then(oDeferred.resolve)
-                .catch((vError) => {
-                    Log.error("Error during Bookmark creation: ", vError, sModuleName);
-                    oDeferred.reject(vError);
+                .catch((oError) => {
+                    Log.error("Error during Bookmark creation: ", oError, sModuleName);
+                    oDeferred.reject(oError);
                 });
 
             return oDeferred.promise();
@@ -359,11 +359,10 @@ sap.ui.define([
          * @since 1.81.0
          * @private
          */
-        this.addBookmarkToHomepageGroup = function (oParameters, oGroup, bCustom, sContentProviderId) {
+        this.addBookmarkToHomepageGroup = async function (oParameters, oGroup, bCustom, sContentProviderId) {
             // Reject if in launchpad spaces mode
             if (Config.last("/core/spaces/enabled")) {
-                const sError = "Bookmark Service: The API is not available in spaces mode.";
-                return Promise.reject(sError);
+                throw new Error("Bookmark Service: The API is not available in spaces mode.");
             }
 
             // Delegate to launchpage service and publish event
@@ -431,10 +430,10 @@ sap.ui.define([
          * @since 1.75.0
          * @private
          */
-        this.addBookmarkToPage = function (oParameters, sPageId, sContentProviderId) {
+        this.addBookmarkToPage = async function (oParameters, sPageId, sContentProviderId) {
             // Reject of in launchpad home page mode
             if (!Config.last("/core/spaces/enabled")) {
-                return Promise.reject("Bookmark Service: 'addBookmarkToPage' is not valid in launchpad home page mode, use 'addBookmark' instead.");
+                throw new Error("Bookmark Service: 'addBookmarkToPage' is not valid in launchpad home page mode, use 'addBookmark' instead.");
             }
 
             // Reject if personalization is disabled
@@ -442,11 +441,11 @@ sap.ui.define([
             const bEnableMyHome = Config.last("/core/spaces/myHome/enabled");
             const sMyHomePageId = Config.last("/core/spaces/myHome/myHomePageId");
             if (!bEnablePersonalization && (!bEnableMyHome || (bEnableMyHome && sPageId !== sMyHomePageId))) {
-                return Promise.reject("Bookmark Service: Add bookmark is not allowed as the personalization functionality is not enabled.");
+                throw new Error("Bookmark Service: Add bookmark is not allowed as the personalization functionality is not enabled.");
             }
 
             if (oParameters && (typeof oParameters.title !== "string" || typeof oParameters.url !== "string")) {
-                return Promise.reject("Bookmark Service - Invalid bookmark data.");
+                throw new Error("Bookmark Service - Invalid bookmark data.");
             }
 
             // Delegate to pages service
@@ -481,8 +480,7 @@ sap.ui.define([
             // Reject if in launchpad spaces mode
             const oDeferred = new jQuery.Deferred();
             if (Config.last("/core/spaces/enabled")) {
-                const sError = "Bookmark Service: The API 'addBookmarkByGroupId' is not supported in launchpad spaces mode.";
-                return oDeferred.reject(sError).promise();
+                return oDeferred.reject(new Error("Bookmark Service: The API 'addBookmarkByGroupId' is not supported in launchpad spaces mode.")).promise();
             }
 
             this._oLaunchPageServicePromise
@@ -521,9 +519,7 @@ sap.ui.define([
 
             // Reject if in launchpad spaces mode
             if (Config.last("/core/spaces/enabled")) {
-                const sError = "Bookmark Service: The API 'getShellGroupIDs' is not supported in launchpad spaces mode.";
-
-                return oDeferred.reject(sError).promise();
+                return oDeferred.reject(new Error("Bookmark Service: The API 'getShellGroupIDs' is not supported in launchpad spaces mode.")).promise();
             }
 
             this._oLaunchPageServicePromise.then((LaunchPageService) => {
@@ -574,9 +570,9 @@ sap.ui.define([
                                     // TODO: Consider adding the tile to the default group. This would
                                     // enable the user to add tiles if no valid group ID is available.
                                     // Take into account how the consumer app requests the group ids.
-                                    const sError = `Group '${sGroupId}' is unknown`;
-                                    Log.error(sError, null, "sap.ushell.services.Bookmark");
-                                    oDeferred.reject(sError);
+                                    const sErrorMessage = `Group '${sGroupId}' is unknown`;
+                                    Log.error(sErrorMessage, null, "sap.ushell.services.Bookmark");
+                                    oDeferred.reject(new Error(sErrorMessage));
                                 }
                             });
                     } else {
@@ -625,10 +621,9 @@ sap.ui.define([
                             });
 
                             if (!bTileFound) {
-                                const sError = `No tile '${sCatalogTileId}' in catalog '${
-                                    LaunchPageService.getCatalogId(oCatalog)}'`;
-                                Log.error(sError, null, "sap.ushell.services.Bookmark");
-                                oDeferred.reject(sError);
+                                const sErrorMessage = `No tile '${sCatalogTileId}' in catalog '${LaunchPageService.getCatalogId(oCatalog)}'`;
+                                Log.error(sErrorMessage, null, "sap.ushell.services.Bookmark");
+                                oDeferred.reject(new Error(sErrorMessage));
                             }
                         });
                 });
@@ -659,7 +654,6 @@ sap.ui.define([
          */
         this.addCatalogTileToGroup = function (sCatalogTileId, sGroupId, oCatalogData) {
             const oDeferred = new jQuery.Deferred();
-            let sError;
 
             Log.error("Deprecated API call of 'sap.ushell.Bookmark.addCatalogTileToGroup'. Please use 'addBookmark' instead",
                 null,
@@ -668,8 +662,7 @@ sap.ui.define([
 
             // Reject if in launchpad spaces mode
             if (Config.last("/core/spaces/enabled")) {
-                sError = "Bookmark Service: The API 'addCatalogTileToGroup' is not supported in launchpad spaces mode.";
-                return oDeferred.reject(sError).promise();
+                return oDeferred.reject(new Error("Bookmark Service: The API 'addCatalogTileToGroup' is not supported in launchpad spaces mode.")).promise();
             }
 
             this._oLaunchPageServicePromise
@@ -698,9 +691,9 @@ sap.ui.define([
                             if (oSourceCatalog) {
                                 this._doAddCatalogTileToGroup(oDeferred, sCatalogTileId, oSourceCatalog, sGroupId);
                             } else {
-                                sError = `No matching catalog found: ${JSON.stringify(oCatalogData)}`;
-                                Log.error(sError, null, "sap.ushell.services.Bookmark");
-                                oDeferred.reject(sError);
+                                const sErrorMessage = `No matching catalog found: ${JSON.stringify(oCatalogData)}`;
+                                Log.error(sErrorMessage, null, "sap.ushell.services.Bookmark");
+                                oDeferred.reject(new Error(sErrorMessage));
                             }
                         });
                 });
@@ -805,7 +798,8 @@ sap.ui.define([
                     .then((oPagesService) => {
                         return oPagesService.countBookmarks({ url: sUrl, contentProviderId: sContentProviderId });
                     })
-                    .then(oDeferred.resolve, oDeferred.reject);
+                    .then(oDeferred.resolve)
+                    .catch(oDeferred.reject);
             } else {
                 this._oLaunchPageServicePromise
                     .then((LaunchPageService) => {
@@ -842,7 +836,7 @@ sap.ui.define([
          */
         this.countCustomBookmarks = async function (oIdentifier) {
             if (!oIdentifier || !oIdentifier.url || !oIdentifier.vizType) {
-                return Promise.reject("countCustomBookmarks: Some required parameters are missing.");
+                throw new Error("countCustomBookmarks: Some required parameters are missing.");
             }
 
             if (Config.last("/core/spaces/enabled")) {
@@ -879,7 +873,8 @@ sap.ui.define([
                     .then((oPagesService) => {
                         return oPagesService.deleteBookmarks({ url: sUrl, contentProviderId: sContentProviderId });
                     })
-                    .then(oDeferred.resolve, oDeferred.reject);
+                    .then(oDeferred.resolve)
+                    .catch(oDeferred.reject);
             } else {
                 this._oLaunchPageServicePromise.then((LaunchPageService) => {
                     LaunchPageService.deleteBookmarks(sUrl, sContentProviderId)
@@ -917,9 +912,9 @@ sap.ui.define([
          * @private
          * @ui5-restricted ssuite.smartbusiness
          */
-        this.deleteCustomBookmarks = function (oIdentifier) {
+        this.deleteCustomBookmarks = async function (oIdentifier) {
             if (!oIdentifier || !oIdentifier.url || !oIdentifier.vizType) {
-                return Promise.reject("deleteCustomBookmarks: Some required parameters are missing.");
+                throw new Error("deleteCustomBookmarks: Some required parameters are missing.");
             }
             if (Config.last("/core/spaces/enabled")) {
                 return this._oPagesServicePromise
@@ -1004,7 +999,8 @@ sap.ui.define([
                         oParameters.url = sNewUrl;
                         return oPagesService.updateBookmarks({ url: sUrl, contentProviderId: sContentProviderId }, oParameters);
                     })
-                    .then(oDeferred.resolve, oDeferred.reject);
+                    .then(oDeferred.resolve)
+                    .catch(oDeferred.reject);
             } else {
                 Promise.all([
                     this._oLaunchPageServicePromise,
@@ -1077,7 +1073,7 @@ sap.ui.define([
          */
         this.updateCustomBookmarks = async function (oIdentifier, oConfig) {
             if (!oIdentifier || !oIdentifier.url || !oIdentifier.vizType) {
-                return Promise.reject("deleteCustomBookmarks: Some required parameters are missing.");
+                throw new Error("updateCustomBookmarks: Some required parameters are missing.");
             }
 
             const oBookmarkConfig = deepExtend({}, oConfig, {

package/src/main/js/sap/ushell/services/BookmarkV2.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's bookmark service. Allows creating shortcuts on the user's home page.
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/ui/core/EventBus",
@@ -246,9 +246,9 @@ sap.ui.define([
                 const aContentNodes = [].concat(vContainer);
 
                 return this._addBookmarkToContentNodes(oBookmarkConfig, aContentNodes, false, sContentProviderId);
-            } catch (vError) {
-                Log.error("Error during Bookmark creation: ", vError, sModuleName);
-                throw vError;
+            } catch (oError) {
+                Log.error("Error during Bookmark creation: ", oError, sModuleName);
+                throw oError;
             }
         };
 
@@ -463,8 +463,7 @@ sap.ui.define([
         this.addBookmarkByGroupId = async function (oParameters, sGroupId, sContentProviderId) {
             // Reject if in launchpad spaces mode
             if (Config.last("/core/spaces/enabled")) {
-                const sError = "Bookmark Service: The API 'addBookmarkByGroupId' is not supported in launchpad spaces mode.";
-                throw new Error(sError);
+                throw new Error("Bookmark Service: The API 'addBookmarkByGroupId' is not supported in launchpad spaces mode.");
             }
 
             const LaunchPage = await this._getLaunchPageService();
@@ -490,8 +489,7 @@ sap.ui.define([
         this.getShellGroupIDs = async function (bGetAll) {
             // Reject if in launchpad spaces mode
             if (Config.last("/core/spaces/enabled")) {
-                const sError = "Bookmark Service: The API 'getShellGroupIDs' is not supported in launchpad spaces mode.";
-                throw new Error(sError);
+                throw new Error("Bookmark Service: The API 'getShellGroupIDs' is not supported in launchpad spaces mode.");
             }
 
             const LaunchPage = await this._getLaunchPageService();

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/Formatter.js

@@ -13,7 +13,7 @@
  * <p>This is a dependency of ClientSideTargetResolution.  Interfaces exposed
  * by this module may change at any time without notice.</p>
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
 ], () => {

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/InboundIndex.js

@@ -27,7 +27,7 @@
  *
  * @private
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/InboundProvider.js

@@ -34,7 +34,7 @@
  * <p>This is a dependency of ClientSideTargetResolution.  Interfaces exposed
  * by this module may change at any time without notice.</p>
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/ushell/services/ClientSideTargetResolution/VirtualInbounds",

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/PrelaunchOperations.js

@@ -4,7 +4,7 @@
  * @file PrelaunchOperations are executed just before launching the application (post parameter mapping and app state merging) if the
  * <code>sap-prelaunch-operations</code> parameter is specified as a technical parameter.
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -43,8 +43,8 @@ sap.ui.define([
                         .done((oAppState) => {
                             fnResolve(oAppState);
                         })
-                        .fail((sError) => {
-                            fnReject(sError);
+                        .fail((oError) => {
+                            fnReject(oError);
                         });
                 });
             });
@@ -366,8 +366,8 @@ sap.ui.define([
 
         try {
             aPrelaunchOperations = JSON.parse(sPrelaunchOperations);
-        } catch (err) {
-            Log.error("Cannot parse operation array: sap-prelaunch-operations should be in json format.");
+        } catch (oError) {
+            Log.error("Cannot parse operation array: sap-prelaunch-operations should be in json format.", oError);
             return [];
         }
 

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/Search.js

@@ -8,7 +8,7 @@
  * <p>This is a dependency of ClientSideTargetResolution.  Interfaces exposed
  * by this module may change at any time without notice.</p>
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/ushell/utils",

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/StagedLogger.js

@@ -39,7 +39,7 @@
  *
  * This is a dependency of ClientSideTargetResolution. Interfaces exposed by this module may change at any time without notice.
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/base/Log"

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/SystemContext.js

@@ -8,7 +8,7 @@
  * <p>This is a dependency of ClientSideTargetResolution. Interfaces exposed
  * by this module may change at any time without notice.</p>
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/Utils.js

@@ -6,7 +6,7 @@
  * This is a dependency of ClientSideTargetResolution.
  * Interfaces exposed by this module may change at any time without notice.
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/base/util/deepExtend"

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/VirtualInbounds.js

@@ -12,7 +12,7 @@
  * <p>This is a dependency of ClientSideTargetResolution.  Interfaces
  * exposed by this module may change at any time without notice.</p>
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([], () => {
     "use strict";

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/XAppStateProcessing.js

@@ -6,7 +6,7 @@
  * Operations in this module are assumed to be executed after the target mapping has been identified (post search).
  *
  * @private
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/ushell/services/ClientSideTargetResolution/Utils",

package/src/main/js/sap/ushell/services/ClientSideTargetResolution.js

@@ -29,7 +29,7 @@
  * In the future, the custom resolver mechanism should be probably moved towards modifying (or only adding to the list of Inbounds),
  * this way a single data source has to be altered to support consistently getLinks, isIntentSupported.
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -434,6 +434,7 @@ sap.ui.define([
         aMatchingTargets = this._applySapNavigationScopeFilter(aMatchingTargets, oShellHash);
 
         const oMatchingTarget = aMatchingTargets[0];
+        oMatchingTarget.fullHash = sFixedHashFragment;
 
         function fnUndefinedReplacer (sKey, vVal) {
             return (this[sKey] === undefined) ? "<undefined>" : vVal;
@@ -508,6 +509,7 @@ sap.ui.define([
                 (oMatchingTarget.intentParamsPlusAllDefaults["sap-ushell-next-navmode"] || [])[0]
             );
             ushellUtils.shallowMergeObject(oResolutionResult, oNavModeProperties);
+            oResolutionResult.appId = oMatchingTarget.inbound.resolutionResult.appId;
             oResolutionResult.inboundPermanentKey = oMatchingTarget.inbound.permanentKey || oMatchingTarget.inbound.id;
 
             return oResolutionResult;
@@ -551,6 +553,7 @@ sap.ui.define([
             ushellUtils.shallowMergeObject(oResolutionResult, oNavModeProperties);
 
             oResolutionResult.reservedParameters = oReservedParameters;
+            oResolutionResult.appId = oMatchingTarget.inbound.resolutionResult.appId;
             oResolutionResult.inboundPermanentKey = oMatchingTarget.inbound.permanentKey || oMatchingTarget.inbound.id;
 
             if (oMatchingTarget.inbound.resolutionResult?.appInfo) {
@@ -565,15 +568,15 @@ sap.ui.define([
             ushellUtils.shallowMergeObject(oMatchingTarget.resolutionResult, oResolutionResult);
 
             return oMatchingTarget.resolutionResult;
-        } catch (vMessage) {
-            if (typeof vMessage === "string" && vMessage.indexOf("fallback:") >= 0) {
+        } catch (oError) {
+            if (typeof oError.message === "string" && oError.message.indexOf("fallback:") >= 0) {
                 const oResolutionResult = await this._constructFallbackResolutionResult(oMatchingTarget, sFixedHashFragment);
                 ushellUtils.shallowMergeObject(oMatchingTarget.resolutionResult, oResolutionResult);
 
                 return oMatchingTarget.resolutionResult;
             }
 
-            throw vMessage;
+            throw oError;
         }
     };
 
@@ -1396,13 +1399,13 @@ sap.ui.define([
                     }
                 });
                 oInitialMatchWithReferencesResult = oResult;
-            } catch (sError) {
+            } catch (oError) {
                 _StagedLogger.log(() => {
                     return {
                         logId: iLogId,
                         stage: 2,
                         prefix: "\u274c", // red X
-                        line: `Failed to resolve references: ${sError}`
+                        line: `Failed to resolve references: ${oError.message}`
                     };
                 });
 
@@ -1567,14 +1570,10 @@ sap.ui.define([
         const oSupportedByIntent = {};
 
         await Promise.all(aIntents.map(async (sIntent) => {
-            try {
-                const bSupported = await this._isIntentSupportedOne(sIntent, oInboundIndex);
-                oSupportedByIntent[sIntent] = {
-                    supported: bSupported
-                };
-            } catch (oError) {
-                throw new Error(`One or more input intents contain errors: ${oError}`);
-            }
+            const bSupported = await this._isIntentSupportedOne(sIntent, oInboundIndex);
+            oSupportedByIntent[sIntent] = {
+                supported: bSupported
+            };
         }));
 
         return oSupportedByIntent;