@sapui5/sap.ushell 1.121.2 → 1.122.1

package/src/main/js/sap/ushell/api/workpage/Runtime.js

@@ -6,23 +6,29 @@ sap.ui.define([
     "./Designtime",
     "sap/ushell/utils/workpage/WorkPageVizInstantiation",
     "sap/ushell/utils/workpage/WorkPageService",
+    "sap/ushell/utils/workpage/WorkPageHost",
     "sap/ushell/EventHub"
 ], function (
     Designtime,
     WorkPageVizInstantiation,
     WorkPageService,
+    WorkPageHost,
     EventHub
 ) {
     "use strict";
 
 
     /**
-     * Runtime API Facade for work page builder.
+     * @alias sap.ushell.api.workpage.Runtime
+     * @class
+     * @classdesc Runtime API Facade for work page builder.
      *
      * This class <b>MUST</b> only be used in a running unified shell context, i.e. only after the unified shell
      * container has been initialized.
      *
-     * @namespace sap.ushell.api.workpage
+     * @hideconstructor
+     * @augments sap.ushell.api.workpage.Designtime
+     *
      * @since 1.121.0
      * @private
      * @ui5-restricted dws-packages
@@ -33,6 +39,14 @@ sap.ui.define([
 
         _oWorkPageService;
 
+        /**
+         * Returns the singleton instance of the Runtime API.
+         * @returns {Promise<sap.ushell.api.workpage.Runtime>} A promise that resolves with the runtime instance.
+         *
+         * @since 1.121.0
+         * @private
+         * @ui5-restricted dws-packages
+         */
         static async getInstance () {
             if (!Runtime.#instance) {
                 const oWorkPageVizInstantiation = await WorkPageVizInstantiation.getInstance();
@@ -49,7 +63,9 @@ sap.ui.define([
         }
 
         /**
-         * @typedef {object} SiteData Additional visualization properties retrieved from the CDM Runtime Site
+         * @typedef {object} sap.ushell.api.workpage.Runtime.SiteData
+         * Additional visualization properties retrieved from the CDM Runtime Site
+         *
          * @property {object} [target] The harmonized navigation target of the visualization
          * @property {string} [targetURL] The target URL of the visualization
          * @property {object} [dataSource] The data source for the indicator data source of the visualization
@@ -60,16 +76,18 @@ sap.ui.define([
          */
 
         /**
-         * @typedef {object} ExtendedVisualization An extension of a visualization retrieved from the content API
+         * @typedef {object} sap.ushell.api.workpage.Runtime.ExtendedVisualization
+         * An extension of a visualization retrieved from the content API
+         *
          * @property {string} id The id of the visualization
          * @property {string} type The type of the visualization
          * @property {object} descriptor The descriptor of the visualization
          * @property {object} descriptorResources The descriptor resources of the visualization
-         * @property {SiteData} [_siteData] The additional app properties retrieved from the CDM Runtime Site
+         * @property {sap.ushell.api.workpage.Runtime.SiteData} [_siteData] The additional app properties retrieved from the CDM Runtime Site
          *
          * @private
          * @ui5-restricted dws-packages
-        */
+         */
 
         /**
          * Load the WorkPage data for the given page id and the visualizations used on that WorkPage.
@@ -77,8 +95,11 @@ sap.ui.define([
          * app in the <code>_siteData</code> property.
          *
          * @param {string} sPageId The WorkPage id.
-         * @returns {Promise<{ workPage: {usedVisualizations: { nodes: ExtendedVisualization[] }, editable: boolean}}>}
+         * @returns {Promise<{ workPage: { usedVisualizations: { nodes: sap.ushell.api.workpage.Runtime.ExtendedVisualization[] }, editable: boolean } }>}
          *  A promise resolving with the loaded work page and visualizations, enhanced with app data retrieved from the CDM Runtime Site.
+         *
+         * @private
+         * @ui5-restricted dws-packages
          */
         fetchPageData (sPageId) {
             return this._oWorkPageService.loadWorkPageAndVisualizations(sPageId);
@@ -87,10 +108,27 @@ sap.ui.define([
         /**
          * Event that should be fired after the content for the first page has been added.
          * This will trigger loading of lazy shell components like menu bar, user settings, search, ...
+         *
+         * @private
+         * @ui5-restricted dws-packages
          */
         fireAfterContentAdded () {
             EventHub.emit("CenterViewPointContentRendered");
         }
+
+        /**
+         * Creates a new work page host instance.
+         *
+         * @param {string} sId the ID of the host.
+         * @param {object} [mSettings] the settings of the host instance.
+         * @returns {sap.ui.integration.Host} a new work page host instance.
+         *
+         * @private
+         * @ui5-restricted dws-packages
+         */
+        createHost (sId, mSettings) {
+            return new WorkPageHost(sId, mSettings);
+        }
     }
 
     return Runtime;

package/src/main/js/sap/ushell/appRuntime/ui5/AppRuntime.js

@@ -886,6 +886,12 @@ sap.ui.define([
                         module: "sap.ushell.appRuntime.ui5.services.adapters.EmptyAdapter"
                     }
                 },
+                NavTargetResolutionInternal: {
+                    module: "sap.ushell.appRuntime.ui5.services.NavTargetResolutionInternal",
+                    adapter: {
+                        module: "sap.ushell.appRuntime.ui5.services.adapters.EmptyAdapter"
+                    }
+                },
                 ShellNavigation: {
                     module: "sap.ushell.appRuntime.ui5.services.ShellNavigation",
                     adapter: {

package/src/main/js/sap/ushell/appRuntime/ui5/plugins/baseRta/AppLifeCycleUtils.js

@@ -5,17 +5,17 @@
 sap.ui.define([], function () {
 	"use strict";
 
-	var AppLifeCycleUtils = {
+	const AppLifeCycleUtils = {
 		/**
 		 * Gets the app life cycle service.
 		 * @returns {Promise<object>} Resolves to the app life cycle service
 		 * @private
 		 */
 		getAppLifeCycleService: function () {
-			var oContainer = AppLifeCycleUtils.getContainer();
+			const oContainer = AppLifeCycleUtils.getContainer();
 			return oContainer.getServiceAsync("AppLifeCycle")
 				.catch(function (vError) {
-					var sError = "Error getting AppLifeCycle service from ushell container: " + vError;
+					const sError = "Error getting AppLifeCycle service from ushell container: " + vError;
 					throw new Error(sError);
 				});
 		},
@@ -26,7 +26,7 @@ sap.ui.define([], function () {
 		 * @private
 		 */
 		getContainer: function () {
-			var oContainer = sap.ui.require("sap/ushell/Container");
+			const oContainer = sap.ui.require("sap/ushell/Container");
 			if (!oContainer) {
 				throw new Error(
 					"Illegal state: shell container not available; this component must be executed in a unified shell runtime context.");

package/src/main/js/sap/ushell/appRuntime/ui5/plugins/baseRta/Renderer.js

@@ -11,58 +11,26 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	var Renderer = {
+	const Renderer = {
 
-		/**
-		 * Returns the shell renderer instance in a reliable way,
-		 * i.e. independent from the initialization time of the plug-in.
-		 * This means that the current renderer is returned immediately, if it
-		 * is already created (plug-in is loaded after renderer creation) or it
-		 * listens to the "rendererCreated" event (plug-in is loaded
-		 * before the renderer is created).
-		 *
-		 * @param {object} oComponent - Object with information about the current application
-		 * @returns {promise} Resolves with the renderer instance or rejected with an error message.
-		 */
-		getRenderer: function (oComponent) {
-			var oContainer = AppLifeCycleUtils.getContainer();
+		createActionButton: async function (oComponent, onClickHandler, bIsVisible) {
+			const oContainer = AppLifeCycleUtils.getContainer();
+			const ExtensionService = await oContainer.getServiceAsync("Extension");
 
-			return new Promise(function (resolve, reject) {
-				var oRenderer = oContainer.getRenderer();
-				if (oRenderer) {
-					oComponent.oRenderer = oRenderer;
-					resolve(oRenderer);
-				} else {
-					// renderer not initialized yet, listen to rendererCreated event
-					oComponent._onRendererCreated = function (oEvent) {
-						oRenderer = oEvent.getParameter("renderer");
-						if (oRenderer) {
-							oComponent.oRenderer = oRenderer;
-							resolve(oRenderer);
-						} else {
-							reject("Illegal state: shell renderer not available after recieving 'rendererCreated' event.");
-						}
-					};
-					oContainer.attachRendererCreatedEvent(oComponent._onRendererCreated, oComponent);
-				}
-			});
-		},
-
-		createActionButton: function (oComponent, onClickHandler, bIsVisible) {
-			return this.getRenderer(oComponent)
-				.then(function (oRenderer) {
-					//Button will only be added once even when more instances of this component are created
-					oRenderer.addActionButton("sap.ushell.ui.launchpad.ActionItem", {
-						id: oComponent.mConfig.id,
-						text: oComponent.mConfig.i18n.getText(oComponent.mConfig.text),
-						icon: oComponent.mConfig.icon,
-						press: onClickHandler,
-						visible: bIsVisible
-					}, true, false, [oRenderer.LaunchpadState.App]);
-				})
-				.catch(function (sErrorMessage) {
-					Log.error(sErrorMessage, undefined, oComponent.mConfig.sComponentName);
+			try {
+				const oUserAction = await ExtensionService.createUserAction({
+					id: oComponent.mConfig.id,
+					text: oComponent.mConfig.i18n.getText(oComponent.mConfig.text),
+					icon: oComponent.mConfig.icon,
+					press: onClickHandler,
+					visible: bIsVisible
+				}, {
+					controlType: "sap.ushell.ui.launchpad.ActionItem"
 				});
+				oUserAction.showForAllApps();
+			} catch (sErrorMessage) {
+				Log.error(sErrorMessage, undefined, oComponent.mConfig.sComponentName);
+			}
 		},
 
 		exit: function () {}

package/src/main/js/sap/ushell/appRuntime/ui5/plugins/rtaAgent/Component.js

@@ -1,26 +1,26 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 sap.ui.define([
+	"sap/base/Log",
 	"sap/ui/core/Component",
 	"sap/ui/core/EventBus",
 	"sap/ui/fl/write/api/FeaturesAPI",
-	"sap/ushell/appRuntime/ui5/plugins/baseRta/CheckConditions",
+	"sap/ushell/api/RTA",
 	"sap/ushell/appRuntime/ui5/plugins/baseRta/AppLifeCycleUtils",
-	"sap/ushell/appRuntime/ui5/plugins/baseRta/Renderer",
-	"sap/ushell/appRuntime/ui5/plugins/baseRta/Trigger",
-	"sap/base/Log"
-], function(
+	"sap/ushell/appRuntime/ui5/plugins/baseRta/CheckConditions",
+	"sap/ushell/appRuntime/ui5/plugins/baseRta/Trigger"
+], function (
+	Log,
 	Component,
 	EventBus,
 	FeaturesAPI,
-	CheckConditions,
+	RtaApi,
 	AppLifeCycleUtils,
-	Renderer,
-	Trigger,
-	Log
+	CheckConditions,
+	Trigger
 ) {
 	"use strict";
 
-	var oPostMessageInterface;
+	let oPostMessageInterface;
 
 	function getInitialConfiguration () {
 		return {
@@ -111,11 +111,6 @@ sap.ui.define([
 
 			.then(function (oAppLifeCycleService) {
 				oAppLifeCycleService.attachAppLoaded(this._onAppLoaded, this);
-				return Renderer.getRenderer(this);
-			}.bind(this))
-
-			.then(function (oRenderer) {
-				this.oRenderer = oRenderer;
 			}.bind(this))
 
 			.then(postShowAdaptUIMessageToFLP)
@@ -142,7 +137,7 @@ sap.ui.define([
 									"appClosed",
 									onAppClosed.bind(this)
 								);
-								this.oRenderer.addTopHeaderPlaceHolder();
+								RtaApi.addTopHeaderPlaceHolder();
 								this.oTrigger.triggerStartRta(this);
 								return oPostMessageInterface.createPostMessageResult();
 							}.bind(this)
@@ -163,7 +158,7 @@ sap.ui.define([
 						if (CheckConditions.checkRestartRTA(this.mConfig.layer)) {
 							return postSwitchToolbarVisibilityMessageToFLP(false)
 								.then(function () {
-									this.oRenderer.addTopHeaderPlaceHolder();
+									RtaApi.addTopHeaderPlaceHolder();
 									return this.oTrigger.triggerStartRta(this);
 								}.bind(this));
 						}
@@ -206,7 +201,7 @@ sap.ui.define([
 			EventBus.getInstance().unsubscribe("sap.ushell", "appClosed", onAppClosed.bind(this));
 			postSwitchToolbarVisibilityMessageToFLP(true);
 			this.oTrigger.exitRta();
-			this.oRenderer.removeTopHeaderPlaceHolder();
+			RtaApi.removeTopHeaderPlaceHolder();
 		},
 
 		exit: function () {

package/src/main/js/sap/ushell/appRuntime/ui5/plugins/rtaShell/Component.js

@@ -2,19 +2,21 @@
 sap.ui.define([
 	"sap/ui/core/Component",
 	"sap/ui/core/Element",
-	"sap/ushell/appRuntime/ui5/plugins/baseRta/Renderer",
+	"sap/ui/thirdparty/jquery",
+	"sap/ushell/api/RTA",
 	"sap/ushell/appRuntime/ui5/plugins/baseRta/AppLifeCycleUtils",
-	"sap/ui/thirdparty/jquery"
+	"sap/ushell/appRuntime/ui5/plugins/baseRta/Renderer"
 ], function(
 	Component,
 	Element,
-	Renderer,
+	jQuery,
+	RtaApi,
 	AppLifeCycleUtils,
-	jQuery
+	Renderer
 ) {
 	"use strict";
 
-	var oPostMessageInterface;
+	let oPostMessageInterface;
 
 	function getInitialConfiguration () {
 		return {
@@ -27,15 +29,13 @@ sap.ui.define([
 		};
 	}
 
-	function switchToolbarVisibility (oRenderer, bVisible) {
-		if (oRenderer) {
-			oRenderer.setHeaderVisibility(bVisible, false);
-		}
+	function switchToolbarVisibility (bVisible) {
+		RtaApi.setShellHeaderVisibility(bVisible, false);
 	}
 
-	function postStartUIAdaptationToApp (oRenderer) {
+	function postStartUIAdaptationToApp () {
 		return new Promise(function (resolve, reject) {
-			switchToolbarVisibility(oRenderer, false);
+			switchToolbarVisibility(false);
 			oPostMessageInterface.postMessageToApp(
 				"user.postapi.rtaPlugin",
 				"startUIAdaptation"
@@ -74,10 +74,10 @@ sap.ui.define([
 						},
 						switchToolbarVisibility: {
 							executeServiceCallFn: function (oServiceParams) {
-								var bVisible = oServiceParams.oMessageData.body.visible;
-								switchToolbarVisibility(this.oRenderer, bVisible);
+								const bVisible = oServiceParams.oMessageData.body.visible;
+								switchToolbarVisibility(bVisible);
 								return oPostMessageInterface.createPostMessageResult();
-							}.bind(this)
+							}
 						}
 					},
 					outCalls: {
@@ -95,17 +95,11 @@ sap.ui.define([
 			this.mConfig.i18n = this.getModel("i18n").getResourceBundle();
 
 			return new jQuery.Deferred(function (oDeffered) {
-				Renderer.getRenderer(this)
-				.then(function (oRenderer) {
-					this.oRenderer = oRenderer;
-				}.bind(this))
-				.then(function () {
-					return Renderer.createActionButton(
-						this,
-						postStartUIAdaptationToApp.bind(undefined, this.oRenderer),
-						this.mConfig.visible
-					);
-				}.bind(this))
+				Renderer.createActionButton(
+					this,
+					postStartUIAdaptationToApp.bind(undefined),
+					this.mConfig.visible
+				)
 				.then(function () {
 					return AppLifeCycleUtils.getAppLifeCycleService();
 				})
@@ -121,7 +115,7 @@ sap.ui.define([
 		},
 
 		_changeActionButtonVisibility: function (bVisible) {
-			var vControl = Element.getElementById(this.mConfig.id);
+			const vControl = Element.getElementById(this.mConfig.id);
 			if (vControl) {
 				vControl.setVisible(bVisible);
 			}
@@ -135,17 +129,11 @@ sap.ui.define([
 		},
 
 		exit: function () {
-			if (this.oRenderer) {
-				switchToolbarVisibility(this.oRenderer, false);
-			}
+			switchToolbarVisibility(false);
 			return AppLifeCycleUtils.getAppLifeCycleService()
-				.then(function (oAppLifeCycleService) {
-					oAppLifeCycleService.detachAppLoaded(this._onAppLoaded, this);
-					if (this._onRendererCreated) {
-						var oContainer = AppLifeCycleUtils.getContainer();
-						oContainer.detachRendererCreatedEvent(this._onRendererCreated, this);
-					}
-				}.bind(this));
+			.then(function (oAppLifeCycleService) {
+				oAppLifeCycleService.detachAppLoaded(this._onAppLoaded, this);
+			}.bind(this));
 		}
 	});
 });

package/src/main/js/sap/ushell/appRuntime/ui5/services/AppLifeCycleAgent.js

@@ -441,7 +441,7 @@ sap.ui.define([
                                 .removeSearch("sap-ushell-defaultedParameterNames")
                                 .toString();
                         }
-                        Container.getServiceAsync("NavTargetResolution").then(function (oNavTargetResolution) {
+                        Container.getServiceAsync("NavTargetResolutionInternal").then(function (oNavTargetResolution) {
                             oNavTargetResolution.resolveHashFragmentLocal("#" + sAppIntent + sParams)
                                 .done(function (oResolvedHashFragment) {
                                     var oParsedHash = oUrlParsing.parseShellHash("#" + sAppIntent + sParams);
@@ -557,9 +557,8 @@ sap.ui.define([
                 if (window.confirm(sDatalossMessage)) {
                     Container.setDirtyFlag(false);
                     return true;
-                } else {
-                    return false;
                 }
+                return false;
             }
             return true;
         };

package/src/main/js/sap/ushell/appRuntime/ui5/services/CrossApplicationNavigation.js

@@ -126,8 +126,8 @@ sap.ui.define([
             //ready also for scube
             if (AppRuntimeContext.getIsScube()) {
                 var oDeferred = new jQuery.Deferred();
-                Container.getServiceAsync("NavTargetResolution").then(function (NavTargetResolution) {
-                    NavTargetResolution.isIntentSupported(aIntents, oComponent).done(oDeferred.resolve, oDeferred.reject);
+                Container.getServiceAsync("NavTargetResolutionInternal").then(function (NavTargetResolutionInternal) {
+                    NavTargetResolutionInternal.isIntentSupported(aIntents, oComponent).done(oDeferred.resolve, oDeferred.reject);
                 });
                 return oDeferred.promise();
             }
@@ -167,8 +167,8 @@ sap.ui.define([
                     }
                     return oArg;
                 });
-                Container.getServiceAsync("NavTargetResolution").then(function (NavTargetResolution) {
-                    NavTargetResolution.isNavigationSupported(aFilteredIntents, oComponent).done(oDeferred.resolve, oDeferred.reject);
+                Container.getServiceAsync("NavTargetResolutionInternal").then(function (NavTargetResolutionInternal) {
+                    NavTargetResolutionInternal.isNavigationSupported(aFilteredIntents, oComponent).done(oDeferred.resolve, oDeferred.reject);
                 });
                 return oDeferred.promise();
             }

package/src/main/js/sap/ushell/appRuntime/ui5/services/NavTargetResolution.js

@@ -52,7 +52,6 @@ sap.ui.define([
         this.resolveHashFragment = function (sHashFragment) {
             if (AppRuntimeContext.getIsScube()) {
                 var oDeferred = new jQuery.Deferred();
-
                 this.resolveHashFragmentLocal(sHashFragment)
                     .done(oDeferred.resolve)
                     .fail(function () {
@@ -71,10 +70,10 @@ sap.ui.define([
 
         this.isIntentSupportedLocal = this.isIntentSupported;
         this.isIntentSupported = function (aIntents) {
-            var oDeferred = new jQuery.Deferred(),
-                aPromises = [],
-                oResult1,
-                oResult2;
+            var oDeferred = new jQuery.Deferred();
+            var aPromises = [];
+            var oResult1;
+            var oResult2;
 
             aPromises.push(AppRuntimeContext.getIsScube() ? this.isIntentSupportedLocal(aIntents) : Promise.resolve(undefined));
             aPromises.push(AppRuntimeService.postMessageToFLP(

package/src/main/js/sap/ushell/appRuntime/ui5/services/NavTargetResolutionInternal.js

@@ -0,0 +1,113 @@
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+
+sap.ui.define([
+    "sap/ushell/services/NavTargetResolutionInternal",
+    "sap/ushell/appRuntime/ui5/AppRuntimeService",
+    "sap/ushell/appRuntime/ui5/AppRuntimeContext",
+    "sap/ui/thirdparty/jquery"
+], function (
+    NavTargetResolutionInternal,
+    AppRuntimeService,
+    AppRuntimeContext,
+    jQuery
+) {
+    "use strict";
+
+    function NavTargetResolutionInternalProxy (oAdapter, oContainerInterface, sParameters, oServiceConfiguration) {
+        NavTargetResolutionInternal.call(this, oAdapter, oContainerInterface, sParameters, oServiceConfiguration);
+
+        this.getDistinctSemanticObjectsLocal = this.getDistinctSemanticObjects;
+        this.getDistinctSemanticObjects = function () {
+            var oDeferred = new jQuery.Deferred(),
+                aPromises = [],
+                arrResult;
+
+            aPromises.push(AppRuntimeContext.getIsScube() ? this.getDistinctSemanticObjectsLocal() : Promise.resolve([]));
+            aPromises.push(AppRuntimeService.postMessageToFLP(
+                    "sap.ushell.services.NavTargetResolutionInternal.getDistinctSemanticObjects"
+                ));
+            Promise.allSettled(aPromises).then(function (aResults) {
+                arrResult = aResults[0].status === "fulfilled" ? aResults[0].value : [];
+                arrResult = arrResult.concat(aResults[1].status === "fulfilled" ? aResults[1].value : []);
+                arrResult = arrResult.filter(function (item, pos, self) {
+                    return self.indexOf(item) === pos;
+                }).sort();
+                oDeferred.resolve(arrResult);
+            });
+
+            return oDeferred.promise();
+        };
+
+        this.expandCompactHash = function (sHashFragment) {
+            if (sHashFragment && sHashFragment.indexOf("sap-intent-param") > 0) {
+                return AppRuntimeService.sendMessageToOuterShell(
+                    "sap.ushell.services.NavTargetResolutionInternal.expandCompactHash", {
+                        sHashFragment: sHashFragment
+                    });
+            }
+            return new jQuery.Deferred().resolve(sHashFragment).promise();
+        };
+
+        this.resolveHashFragmentLocal = this.resolveHashFragment;
+        this.resolveHashFragment = function (sHashFragment) {
+            if (AppRuntimeContext.getIsScube()) {
+                var oDeferred = new jQuery.Deferred();
+
+                this.resolveHashFragmentLocal(sHashFragment)
+                    .done(oDeferred.resolve)
+                    .fail(function () {
+                        return AppRuntimeService.postMessageToFLP(
+                            "sap.ushell.services.NavTargetResolutionInternal.resolveHashFragment", {
+                                sHashFragment: sHashFragment
+                            }).then(oDeferred.resolve, oDeferred.reject);
+                    });
+                return oDeferred.promise();
+            }
+                return AppRuntimeService.sendMessageToOuterShell(
+                    "sap.ushell.services.NavTargetResolutionInternal.resolveHashFragment", {
+                        sHashFragment: sHashFragment
+                    });
+
+        };
+
+        this.isIntentSupportedLocal = this.isIntentSupported;
+        this.isIntentSupported = function (aIntents) {
+            var oDeferred = new jQuery.Deferred(),
+                aPromises = [],
+                oResult1,
+                oResult2;
+
+            aPromises.push(AppRuntimeContext.getIsScube() ? this.isIntentSupportedLocal(aIntents) : Promise.resolve(undefined));
+            aPromises.push(AppRuntimeService.postMessageToFLP(
+                "sap.ushell.services.NavTargetResolutionInternal.isIntentSupported", {
+                    aIntents: aIntents
+                }));
+            Promise.allSettled(aPromises).then(function (aResults) {
+                oResult1 = aResults[0].status === "fulfilled" ? aResults[0].value : undefined;
+                oResult2 = aResults[1].status === "fulfilled" ? aResults[1].value : undefined;
+                if (oResult1 && oResult2) {
+                    Object.keys(oResult1).forEach(function (sIntent) {
+                        oResult1[sIntent].supported = oResult1[sIntent].supported || oResult2[sIntent].supported;
+                    });
+                } else if (oResult1 || oResult2) {
+                    oResult1 = oResult1 || oResult2;
+                } else {
+                    oResult1 = {};
+                    aIntents.forEach(function (sIntent) {
+                        oResult1[sIntent] = { supported: undefined };
+                    });
+                }
+                oDeferred.resolve(oResult1);
+            });
+
+            return oDeferred.promise();
+        };
+        this._isIntentSupportedLocal = this.isIntentSupportedLocal;
+        this._isIntentSupported = this.isIntentSupported;
+    }
+
+    NavTargetResolutionInternalProxy.prototype = NavTargetResolutionInternal.prototype;
+    NavTargetResolutionInternalProxy.hasNoAdapter = NavTargetResolutionInternal.hasNoAdapter;
+
+    return NavTargetResolutionInternalProxy;
+}, true);

package/src/main/js/sap/ushell/appRuntime/ui5/services/Navigation.js

@@ -154,8 +154,8 @@ sap.ui.define([
                     }
                     return oArg;
                 });
-                return Container.getServiceAsync("NavTargetResolution").then(function (NavTargetResolution) {
-                    return NavTargetResolution.isNavigationSupported(aFilteredIntents, oComponent);
+                return Container.getServiceAsync("NavTargetResolutionInternal").then(function (NavTargetResolutionInternal) {
+                    return NavTargetResolutionInternal.isNavigationSupported(aFilteredIntents, oComponent);
                 });
             }
 

package/src/main/js/sap/ushell/appRuntime/ui5/services/ShellNavigation.js

@@ -17,7 +17,7 @@ sap.ui.define([
                 return;
             }
             if (AppRuntimeContext.getIsScube()) {
-                Container.getServiceAsync("NavTargetResolution").then(function (oNavTargetResolution) {
+                Container.getServiceAsync("NavTargetResolutionInternal").then(function (oNavTargetResolution) {
                     var sTargetHash = UrlParsing.constructShellHash(oArgs);
                     oNavTargetResolution.isIntentSupportedLocal([sTargetHash]).then(function (oSupported) {
                         if (oSupported[sTargetHash].supported === true) {

package/src/main/js/sap/ushell/appRuntime/ui5/services/ShellNavigationInternal.js

@@ -17,7 +17,7 @@ sap.ui.define([
                 return;
             }
             if (AppRuntimeContext.getIsScube()) {
-                return Container.getServiceAsync("NavTargetResolution").then(function (oNavTargetResolution) {
+                return Container.getServiceAsync("NavTargetResolutionInternal").then(function (oNavTargetResolution) {
                     var sTargetHash = UrlParsing.constructShellHash(oArgs);
                     return oNavTargetResolution.isIntentSupportedLocal([sTargetHash]).then(function (oSupported) {
                         if (oSupported[sTargetHash].supported === true) {

package/src/main/js/sap/ushell/appRuntime/ui5/services/adapters/Ui5ComponentLoaderAdapter.js

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

package/src/main/js/sap/ushell/bootstrap/_SchedulingAgent/logger.js

@@ -45,7 +45,7 @@
  * }, false);
  * </pre>
  *
- * @version 1.121.2
+ * @version 1.122.1
  */
 
 sap.ui.define([