@sapui5/sap.ushell 1.120.7 → 1.121.0

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

@@ -2,16 +2,10 @@
  * Copyright (c) 2009-2023 SAP SE, All Rights Reserved
  */
 
-sap.ui.define([
-	"sap/base/util/ObjectPath"
-], function (
-	ObjectPath
-) {
+sap.ui.define([], function () {
 	"use strict";
 
-
 	var AppLifeCycleUtils = {
-
 		/**
 		 * Gets the app life cycle service.
 		 * @returns {Promise<object>} Resolves to the app life cycle service
@@ -32,7 +26,7 @@ sap.ui.define([
 		 * @private
 		 */
 		getContainer: function () {
-			var oContainer = ObjectPath.get("sap.ushell.Container");
+			var 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/Trigger.js

@@ -5,11 +5,15 @@
 sap.ui.define([
 	"sap/ui/thirdparty/hasher",
 	"sap/ui/core/BusyIndicator",
+	"sap/ui/core/EventBus",
+	"sap/ui/core/Lib",
 	"sap/ushell/appRuntime/ui5/plugins/baseRta/BaseRTAPluginStatus",
 	"sap/ushell/appRuntime/ui5/plugins/baseRta/AppLifeCycleUtils"
 ], function (
 	hasher,
 	BusyIndicator,
+	EventBus,
+	Lib,
 	PluginStatus,
 	AppLifeCycleUtils
 ) {
@@ -90,13 +94,13 @@ sap.ui.define([
 
 	Trigger.prototype._startRta = function () {
 		this.sStatus = STATUS_STARTING;
-		sap.ui.getCore().getEventBus().subscribe(
+		EventBus.getInstance().subscribe(
 			"sap.ushell.renderers.fiori2.Renderer",
 			"appClosed",
 			this._onAppClosed,
 			this
 		);
-		sap.ui.getCore().getEventBus().subscribe(
+		EventBus.getInstance().subscribe(
 			"sap.ushell",
 			"appKeepAliveDeactivate",
 			this._onAppClosed,
@@ -108,7 +112,7 @@ sap.ui.define([
 		return getRootControl()
 			.then(function (oReturnedRootControl) {
 				oRootControl = oReturnedRootControl;
-				return sap.ui.getCore().loadLibrary("sap.ui.rta", { async: true });
+				return Lib.load({name: "sap.ui.rta"});
 			})
 			.then(requireStartAdaptation.bind(this))
 			.then(function (startAdaptation) {
@@ -270,8 +274,8 @@ sap.ui.define([
 			this.oStoppingPromise = null;
 			this._oRTA = null;
 		}
-		sap.ui.getCore().getEventBus().unsubscribe("sap.ushell.renderers.fiori2.Renderer", "appClosed", this._onAppClosed, this);
-		sap.ui.getCore().getEventBus().unsubscribe("sap.ushell", "appKeepAliveDeactivate", this._onAppClosed, this);
+		EventBus.getInstance().unsubscribe("sap.ushell.renderers.fiori2.Renderer", "appClosed", this._onAppClosed, this);
+		EventBus.getInstance().unsubscribe("sap.ushell", "appKeepAliveDeactivate", this._onAppClosed, this);
 	};
 
 	Trigger.prototype._onAppClosed = function () {

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

@@ -1,14 +1,16 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 sap.ui.define([
 	"sap/ui/core/Component",
+	"sap/ui/core/EventBus",
 	"sap/ui/fl/write/api/FeaturesAPI",
 	"sap/ushell/appRuntime/ui5/plugins/baseRta/CheckConditions",
 	"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 (
+], function(
 	Component,
+	EventBus,
 	FeaturesAPI,
 	CheckConditions,
 	AppLifeCycleUtils,
@@ -135,7 +137,7 @@ sap.ui.define([
 					inCalls: {
 						startUIAdaptation: {
 							executeServiceCallFn: function () {
-								sap.ui.getCore().getEventBus().subscribe(
+								EventBus.getInstance().subscribe(
 									"sap.ushell",
 									"appClosed",
 									onAppClosed.bind(this)
@@ -201,14 +203,14 @@ sap.ui.define([
 		},
 
 		_exitAdaptation: function () {
-			sap.ui.getCore().getEventBus().unsubscribe("sap.ushell", "appClosed", onAppClosed.bind(this));
+			EventBus.getInstance().unsubscribe("sap.ushell", "appClosed", onAppClosed.bind(this));
 			postSwitchToolbarVisibilityMessageToFLP(true);
 			this.oTrigger.exitRta();
 			this.oRenderer.removeTopHeaderPlaceHolder();
 		},
 
 		exit: function () {
-			sap.ui.getCore().getEventBus().unsubscribe("sap.ushell", "appClosed", onAppClosed.bind(this));
+			EventBus.getInstance().unsubscribe("sap.ushell", "appClosed", onAppClosed.bind(this));
 			postSwitchToolbarVisibilityMessageToFLP(true);
 			this._oPluginPromise = this._oPluginPromise
 				.then(AppLifeCycleUtils.getAppLifeCycleService.bind(AppLifeCycleUtils))

package/src/main/js/sap/ushell/appRuntime/ui5/plugins/rtaAgent/i18n/i18n_en.properties

@@ -1,17 +1,10 @@
-# Resource bundle for runtime authoring ushell plug-in in the cFLP (IFrame part)
-# 
 
-#XTIT: Application title of the FLP plugin in app descriptor
 APP_TITLE=RTA cFLP Agent Plug-In
 
-#XTIT: Title of an error message box explaining that adaptation cannot be started
 ERROR_TITLE=UI adaptation cannot be started
 
-#XMSG: Technical error
 TECHNICAL_ERROR=Technical error. Please contact the support team.
 
-#XHED: Title of a dialog explaining that adaptation will be closed
 HEADER_FLEX_DISABLED=Information
 
-#XMSG: Dialog message for flex not enabled
 MSG_FLEX_DISABLED=This application is not enabled for adaptation. For more information, see [here](https\://help.sap.com/viewer/4fc8d03390c342da8a60f8ee387bca1a/latest/en-US/ef97b2485aa34a8890f4d51e5c2b15a8.html).

package/src/main/js/sap/ushell/appRuntime/ui5/plugins/rtaAgent/i18n/i18n_en_US_saprigi.properties

@@ -1,10 +1,10 @@
 
-APP_TITLE=\u206A\u206A\u206A\u200D\u200D\u200B\u200D\u200D\u200D\u200D\u200C\u200C\u200C\u200D\u200D\u200C\u200B\u200C\u200C\u200B\u200C\u200B\u200D\u200C\u200D\u200C\u200B\u200B\u200C\u200C\u200C\u200D\u200B\u200D\u200D\u200C\u200D\u200D\u200C\u200B\u200B\u200C\u200C\u206ARTA cFLP Agent Plug-In\u206A\u206A
+APP_TITLE=\u206A\u206A\u206A\u200D\u200C\u200C\u200B\u200C\u200D\u200D\u200D\u200C\u200C\u200D\u200B\u200B\u200B\u200D\u200C\u200C\u200B\u200B\u200C\u200D\u200D\u200D\u200B\u200B\u200C\u200B\u200C\u200C\u200C\u200D\u200B\u200C\u200C\u200B\u200B\u200D\u200B\u200D\u200C\u206ARTA cFLP Agent Plugin\u206A\u206A
 
-ERROR_TITLE=\u206A\u206A\u206A\u200C\u200C\u200B\u200D\u200B\u200B\u200D\u200D\u200C\u200B\u200C\u200D\u200D\u200C\u200C\u200B\u200C\u200B\u200B\u200D\u200C\u200C\u200D\u200D\u200B\u200B\u200B\u200B\u200D\u200D\u200C\u200C\u200D\u200D\u200D\u200D\u200B\u200C\u200C\u206AUI adaptation cannot be started\u206A\u206A
+ERROR_TITLE=\u206A\u206A\u206A\u200C\u200C\u200D\u200B\u200B\u200C\u200B\u200C\u200C\u200B\u200D\u200D\u200C\u200C\u200B\u200C\u200B\u200B\u200D\u200D\u200C\u200B\u200D\u200B\u200D\u200D\u200D\u200D\u200C\u200B\u200B\u200D\u200B\u200B\u200C\u200D\u200B\u200B\u200D\u200C\u206AUI Adaptation cannot be started\u206A\u206A
 
-TECHNICAL_ERROR=\u206A\u206A\u206A\u200C\u200B\u200C\u200B\u200B\u200D\u200C\u200D\u200C\u200C\u200B\u200B\u200B\u200D\u200B\u200B\u200B\u200D\u200D\u200B\u200D\u200B\u200C\u200C\u200D\u200C\u200B\u200D\u200D\u200B\u200D\u200D\u200D\u200B\u200B\u200C\u200D\u200C\u200C\u206ATechnical error. Please contact the support team.\u206A\u206A
+TECHNICAL_ERROR=\u206A\u206A\u206A\u200C\u200C\u200C\u200D\u200D\u200C\u200C\u200C\u200D\u200D\u200C\u200C\u200C\u200C\u200C\u200D\u200C\u200B\u200D\u200B\u200B\u200B\u200C\u200D\u200C\u200B\u200D\u200D\u200C\u200C\u200D\u200C\u200C\u200B\u200C\u200D\u200D\u200D\u200D\u200D\u206ATechnical error. Please contact the support team.\u206A\u206A
 
-HEADER_FLEX_DISABLED=\u206A\u206A\u206A\u200C\u200D\u200C\u200C\u200D\u200C\u200D\u200C\u200D\u200D\u200B\u200B\u200B\u200C\u200B\u200D\u200C\u200C\u200D\u200B\u200B\u200D\u200D\u200B\u200D\u200C\u200D\u200D\u200D\u200B\u200D\u200D\u200C\u200C\u200D\u200B\u200D\u200B\u200C\u206AInformation\u206A\u206A
+HEADER_FLEX_DISABLED=\u206A\u206A\u206A\u200D\u200D\u200C\u200B\u200C\u200C\u200C\u200C\u200C\u200C\u200D\u200B\u200D\u200D\u200C\u200D\u200C\u200B\u200C\u200C\u200C\u200D\u200C\u200D\u200C\u200D\u200D\u200B\u200C\u200B\u200D\u200D\u200B\u200C\u200B\u200D\u200C\u200B\u200C\u200B\u206AInformation\u206A\u206A
 
-MSG_FLEX_DISABLED=\u206A\u206A\u206A\u200C\u200C\u200C\u200C\u200C\u200D\u200B\u200B\u200D\u200C\u200B\u200B\u200D\u200D\u200C\u200B\u200D\u200C\u200D\u200B\u200D\u200C\u200D\u200B\u200D\u200B\u200C\u200B\u200B\u200B\u200D\u200C\u200C\u200C\u200C\u200B\u200D\u200C\u200C\u200D\u200C\u206AThis application is not enabled for adaptation. For more information, see [here](https\://help.sap.com/viewer/4fc8d03390c342da8a60f8ee387bca1a/latest/en-US/ef97b2485aa34a8890f4d51e5c2b15a8.html).\u206A\u206A
+MSG_FLEX_DISABLED=\u206A\u206A\u206A\u200D\u200D\u200B\u200C\u200C\u200D\u200B\u200B\u200C\u200B\u200D\u200B\u200C\u200D\u200D\u200D\u200D\u200B\u200C\u200D\u200B\u200D\u200B\u200D\u200B\u200D\u200C\u200D\u200D\u200D\u200B\u200B\u200D\u200C\u200C\u200B\u200D\u200D\u200D\u206AThis application is not enabled for adaptation. For more information, see [here](https\://help.sap.com/viewer/4fc8d03390c342da8a60f8ee387bca1a/latest/en-US/ef97b2485aa34a8890f4d51e5c2b15a8.html).\u206A\u206A

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

@@ -1,12 +1,13 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 sap.ui.define([
 	"sap/ui/core/Component",
+	"sap/ui/core/Element",
 	"sap/ushell/appRuntime/ui5/plugins/baseRta/Renderer",
 	"sap/ushell/appRuntime/ui5/plugins/baseRta/AppLifeCycleUtils",
 	"sap/ui/thirdparty/jquery"
-],
-function (
+], function(
 	Component,
+	Element,
 	Renderer,
 	AppLifeCycleUtils,
 	jQuery
@@ -120,7 +121,7 @@ function (
 		},
 
 		_changeActionButtonVisibility: function (bVisible) {
-			var vControl = sap.ui.getCore().byId(this.mConfig.id);
+			var vControl = Element.getElementById(this.mConfig.id);
 			if (vControl) {
 				vControl.setVisible(bVisible);
 			}

package/src/main/js/sap/ushell/appRuntime/ui5/plugins/rtaShell/i18n/i18n_en.properties

@@ -1,8 +1,4 @@
-# Resource bundle for runtime authoring ushell plug-in in the cFLP (Shell part)
-# 
 
-#XTIT: Application title of the FLP plugin in app descriptor
 APP_TITLE=RTA cFLP Shell Plug-In
 
-#XTIT: Title of the button starting key user ui adaptation
 RTA_BUTTON_TEXT=Adapt UI

package/src/main/js/sap/ushell/appRuntime/ui5/plugins/rtaShell/i18n/i18n_en_US_saprigi.properties

@@ -1,4 +1,4 @@
 
-APP_TITLE=\u206A\u206A\u206A\u200D\u200D\u200C\u200C\u200D\u200B\u200C\u200D\u200B\u200C\u200D\u200C\u200C\u200C\u200D\u200B\u200C\u200B\u200B\u200D\u200B\u200C\u200C\u200B\u200B\u200C\u200C\u200C\u200C\u200C\u200D\u200B\u200C\u200B\u200B\u200D\u200B\u200D\u200C\u206ARTA cFLP Shell Plug-In\u206A\u206A
+APP_TITLE=\u206A\u206A\u206A\u200D\u200C\u200D\u200B\u200D\u200B\u200C\u200D\u200B\u200B\u200D\u200B\u200D\u200C\u200B\u200C\u200D\u200D\u200C\u200B\u200D\u200D\u200D\u200B\u200C\u200D\u200B\u200B\u200C\u200B\u200C\u200B\u200D\u200C\u200C\u200D\u200D\u200D\u200C\u200C\u206ARTA cFLP Shell Plugin\u206A\u206A
 
-RTA_BUTTON_TEXT=\u206A\u206A\u206A\u200C\u200C\u200C\u200B\u200B\u200D\u200B\u200B\u200C\u200B\u200D\u200D\u200D\u200B\u200C\u200B\u200B\u200D\u200D\u200D\u200C\u200D\u200B\u200B\u200D\u200B\u200C\u200B\u200B\u200C\u200C\u200C\u200D\u200C\u200D\u200C\u200D\u200D\u200B\u200D\u200B\u206AAdapt UI\u206A\u206A
+RTA_BUTTON_TEXT=\u206A\u206A\u206A\u200C\u200B\u200C\u200C\u200D\u200B\u200C\u200B\u200B\u200D\u200B\u200D\u200B\u200B\u200D\u200C\u200D\u200C\u200D\u200C\u200C\u200D\u200D\u200D\u200C\u200B\u200D\u200D\u200B\u200D\u200C\u200C\u200D\u200B\u200B\u200C\u200D\u200B\u200B\u200C\u200C\u206AAdapt UI\u206A\u206A

package/src/main/js/sap/ushell/appRuntime/ui5/renderers/fiori2/AccessKeysAgent.js

@@ -43,7 +43,7 @@ sap.ui.define([
                         postBody.key = ",";
                     }
 
-                    AppRuntimeService.sendMessageToOuterShell(
+                    AppRuntimeService.postMessageToFLP(
                         "sap.ushell.services.ShellUIService.processHotKey",
                         postBody);
                 }

package/src/main/js/sap/ushell/appRuntime/ui5/renderers/fiori2/Renderer.js

@@ -98,7 +98,7 @@ sap.ui.define([
         };
 
         this.showHeaderItem = function (aIds/*, bCurrentState, aStates*/) {
-            AppRuntimeService.sendMessageToOuterShell(
+            AppRuntimeService.postMessageToFLP(
                 "sap.ushell.services.Renderer.showHeaderItem", {
                 aIds: aIds,
                 bCurrentState: true,
@@ -107,7 +107,7 @@ sap.ui.define([
         };
 
         this.showHeaderEndItem = function (aIds/*, bCurrentState, aStates*/) {
-            AppRuntimeService.sendMessageToOuterShell(
+            AppRuntimeService.postMessageToFLP(
                 "sap.ushell.services.Renderer.showHeaderEndItem", {
                 aIds: aIds,
                 bCurrentState: true,
@@ -116,7 +116,7 @@ sap.ui.define([
         };
 
         this.hideHeaderItem = function (aIds/*, bCurrentState, aStates*/) {
-            AppRuntimeService.sendMessageToOuterShell(
+            AppRuntimeService.postMessageToFLP(
                 "sap.ushell.services.Renderer.hideHeaderItem", {
                 aIds: aIds,
                 bCurrentState: true,
@@ -125,7 +125,7 @@ sap.ui.define([
         };
 
         this.hideHeaderEndItem = function (aIds/*, bCurrentState, aStates*/) {
-            AppRuntimeService.sendMessageToOuterShell(
+            AppRuntimeService.postMessageToFLP(
                 "sap.ushell.services.Renderer.hideHeaderEndItem", {
                 aIds: aIds,
                 bCurrentState: true,
@@ -139,7 +139,7 @@ sap.ui.define([
             } else if (oControlProperties.press !== undefined) {
                 this._addButtonHandler(oControlProperties.id, oControlProperties.press);
             }
-            return AppRuntimeService.sendMessageToOuterShell(
+            return AppRuntimeService.postMessageToFLP(
                 sAPI, {
                 sId: oControlProperties.id,
                 sTooltip: oControlProperties.tooltip,
@@ -151,14 +151,14 @@ sap.ui.define([
         };
 
         this.setHeaderTitle = function (sTitle) {
-            AppRuntimeService.sendMessageToOuterShell(
+            AppRuntimeService.postMessageToFLP(
                 "sap.ushell.services.Renderer.setHeaderTitle",
                 { sTitle: sTitle }
             );
         };
 
         this.setHeaderVisibility = function (bVisible, bCurrentState, aStates) {
-            AppRuntimeService.sendMessageToOuterShell(
+            AppRuntimeService.postMessageToFLP(
                 "sap.ushell.services.Renderer.setHeaderVisibility", {
                 bVisible: bVisible,
                 bCurrentState: bCurrentState,
@@ -171,14 +171,14 @@ sap.ui.define([
                 this._addButtonHandler(params.id, params.press);
                 delete params.press;
             }
-            return AppRuntimeService.sendMessageToOuterShell(
+            return AppRuntimeService.postMessageToFLP(
                 "sap.ushell.services.Renderer.createShellHeadItem", {
                 params: params
             });
         };
 
         this.showActionButton = function (aIds, bCurrentState, aStates) {
-            AppRuntimeService.sendMessageToOuterShell(
+            AppRuntimeService.postMessageToFLP(
                 "sap.ushell.services.Renderer.showActionButton", {
                 aIds: aIds,
                 bCurrentState: bCurrentState,
@@ -187,7 +187,7 @@ sap.ui.define([
         };
 
         this.hideActionButton = function (aIds, bCurrentState, aStates) {
-            AppRuntimeService.sendMessageToOuterShell(
+            AppRuntimeService.postMessageToFLP(
                 "sap.ushell.services.Renderer.hideActionButton", {
                 aIds: aIds,
                 bCurrentState: bCurrentState,
@@ -201,14 +201,14 @@ sap.ui.define([
                 delete oParameters.oControlProperties.press;
             }
 
-            return AppRuntimeService.sendMessageToOuterShell(
+            return AppRuntimeService.postMessageToFLP(
                 "sap.ushell.services.Renderer.addUserAction", {
                 oParameters: oParameters
             });
         };
 
         this.addTopHeaderPlaceHolder = function () {
-            if (jQuery('#rmheader').length === 0) {
+            if (jQuery("#rmheader").length === 0) {
                 jQuery("body").prepend("<div id='rmheader' class='sapUshellHeaderPlaceHolder'></div>");
                 jQuery("body").find(".sapAppRuntimeBaseStyle").css("height", "calc(100% - 2.75rem)");
             }
@@ -220,7 +220,7 @@ sap.ui.define([
         };
 
         this.updateHeaderItem = function (sId, oControlProperties) {
-            return AppRuntimeService.sendMessageToOuterShell(
+            AppRuntimeService.postMessageToFLP(
                 "sap.ushell.services.Renderer.updateHeaderItem", {
                     sId: sId,
                     oControlProperties: oControlProperties
@@ -228,7 +228,7 @@ sap.ui.define([
         };
 
         this.destroyButton = function (aIds) {
-            return AppRuntimeService.sendMessageToOuterShell(
+            AppRuntimeService.postMessageToFLP(
                 "sap.ushell.services.Renderer.destroyButton", {
                     aIds: aIds
                 });

package/src/main/js/sap/ushell/appRuntime/ui5/renderers/fiori2/RendererExtensions.js

@@ -53,7 +53,7 @@ sap.ui.define([
             });
         });
 
-        return AppRuntimeService.sendMessageToOuterShell(
+        AppRuntimeService.postMessageToFLP(
             "sap.ushell.services.Renderer.addOptionsActionSheetButton", aButtonsDesc);
     }
 
@@ -73,7 +73,7 @@ sap.ui.define([
             });
         });
 
-        return AppRuntimeService.sendMessageToOuterShell(
+        AppRuntimeService.postMessageToFLP(
             "sap.ushell.services.Renderer.removeOptionsActionSheetButton", aButtonIds);
     }
 

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

@@ -38,11 +38,18 @@ sap.ui.define([
             oBody.classList.toggle("sapUShellApplicationContainer", !bValue);
         });
 
+        // Letter boxing is set on the document.body, so it should be managed correspondingly on the setApplicationWidth event.
+        // This part is used by the My Inbox application only, because it uses sap/ushell/services/AppConfiguration even in iframe.
+        // To the contrary, in the embedded scenario, the CSS class is set on the application container and not on document.body.
+        EventHub.on("setApplicationFullWidth").do(function (oData) {
+            document.body.classList.toggle("sapUShellApplicationContainerLimitedWidth", !oData.bValue);
+        });
+
         this.setApplicationFullWidth = function (bValue) {
             if (vGetFullWidthParamFromManifest === true || vGetFullWidthParamFromManifest === "true") {
                 EventHub.emit("appWidthChange", bValue);
             } else {
-                AppRuntimeService.sendMessageToOuterShell(
+                AppRuntimeService.postMessageToFLP(
                     "sap.ushell.services.AppConfiguration.setApplicationFullWidth", {
                     bValue: bValue
                 });

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

@@ -1,39 +1,41 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
-    "sap/ushell/appRuntime/ui5/AppCommunicationMgr",
-    "sap/ushell/appRuntime/ui5/AppRuntimeService",
+    "sap/base/Log",
     "sap/base/util/extend",
     "sap/base/util/UriParameters",
+    "sap/base/assert",
+    "sap/ui/core/EventBus",
     "sap/ui/thirdparty/URI",
     "sap/ui/Device",
     "sap/ui/core/BusyIndicator",
-    "sap/ushell/appRuntime/ui5/performance/FesrEnhancer",
     "sap/ushell/EventHub",
-    "sap/base/Log",
     "sap/ui/thirdparty/hasher",
-    "sap/ui/core/Core",
     "sap/ushell/utils/UrlParsing",
+    "sap/ushell/resources",
+    "sap/ushell/appRuntime/ui5/services/Container",
     "sap/ushell/appRuntime/ui5/AppRuntimeContext",
-    "sap/base/assert",
-    "sap/ushell/resources"
+    "sap/ushell/appRuntime/ui5/AppCommunicationMgr",
+    "sap/ushell/appRuntime/ui5/AppRuntimeService",
+    "sap/ushell/appRuntime/ui5/performance/FesrEnhancer"
 ], function (
-    AppCommunicationMgr,
-    AppRuntimeService,
+    Log,
     extend,
     UriParameters,
+    assert,
+    EventBus,
     URI,
     Device,
     BusyIndicator,
-    FesrEnhancer,
     EventHub,
-    Log,
     hasher,
-    Core,
     oUrlParsing,
+    resources,
+    Container,
     AppRuntimeContext,
-    assert,
-    resources
+    AppCommunicationMgr,
+    AppRuntimeService,
+    FesrEnhancer
 ) {
 
     "use strict";
@@ -53,7 +55,7 @@ sap.ui.define([
             fnRenderApp,
             oShellUIService,
             sDatalossMessage,
-            oShellNavigationService;
+            oShellNavigationInternal;
 
         /**
          * @private
@@ -114,7 +116,7 @@ sap.ui.define([
             }
             sDatalossMessage = resources.browserI18n.getText("dataLossExternalMessage");
             window.onbeforeunload = function () {
-                if (sap.ushell && sap.ushell.Container && sap.ushell.Container.getDirtyFlag()) {
+                if (Container.getDirtyFlag()) {
                     return sDatalossMessage;
                 }
                 return undefined;
@@ -138,7 +140,7 @@ sap.ui.define([
                     bLogoutSupport: true
                 }
             };
-            AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.appLifeCycle.setup",
+            AppRuntimeService.postMessageToFLP("sap.ushell.services.appLifeCycle.setup",
                 (window["sap-ushell-config"]?.ui5appruntime?.config?.stateful === false) ? oAppRuntimeMinSetup : oAppRuntimeFullSetup);
         };
 
@@ -181,7 +183,7 @@ sap.ui.define([
                 if (oShellUIService) {
                     oShellUIService._resetBackNavigationCallback();
                 }
-                Core.getEventBus().publish("launchpad", "appOpening", {});
+                EventBus.getInstance().publish("launchpad", "appOpening", {});
                 that.getAppInfo(sAppId, sUrl, sAppIntent).then(function (values) {
                     if (AppRuntimeContext.getIsScube() && sScubeAppIntent.length > 0) {
                         sKeepAliveAppKey = Object.keys(oCachedApplications).find(function (sCachedKey) {
@@ -199,7 +201,7 @@ sap.ui.define([
                         fnCreateApplication(sAppId, oURLParameters, values.oResolvedHashFragment, sAppIntent, values.oParsedHash)
                             .then(function (oCreateApplicationResult) {
                                 fnRenderApp(oCreateApplicationResult);
-                                Core.getEventBus().publish("sap.ushell", "appOpened", {});
+                                EventBus.getInstance().publish("sap.ushell", "appOpened", {});
                                 fnResolve({
                                     deletedKeepAliveId: sKeepAliveAppKey
                                 });
@@ -227,7 +229,7 @@ sap.ui.define([
             }
 
             if (oRunningApp.oApp === undefined && bDestroyKeepAlive !== true) {
-                AppRuntimeService.sendMessageToOuterShell("sap.ushell.appRuntime.isInvalidIframe", {bValue: true});
+                AppRuntimeService.postMessageToFLP("sap.ushell.appRuntime.isInvalidIframe", {bValue: true});
                 return Promise.resolve();
             }
 
@@ -245,12 +247,12 @@ sap.ui.define([
                 appDestroy(oRunningApp.oApp);
                 this.resetCurrentApp();
             }
-            sap.ushell.Container.cleanDirtyStateProviderArray();
+            Container.cleanDirtyStateProviderArray();
             if (oShellUIService) {
                 oShellUIService._resetBackNavigationCallback();
             }
             FesrEnhancer.setAppShortId();
-            Core.getEventBus().publish("sap.ushell", "appClosed", {});
+            EventBus.getInstance().publish("sap.ushell", "appClosed", {});
 
             return Promise.resolve();
         };
@@ -264,7 +266,7 @@ sap.ui.define([
                 oApp;
 
             if (oRunningApp.oApp === undefined) {
-                AppRuntimeService.sendMessageToOuterShell("sap.ushell.appRuntime.isInvalidIframe", {bValue: true});
+                AppRuntimeService.postMessageToFLP("sap.ushell.appRuntime.isInvalidIframe", {bValue: true});
                 return Promise.resolve();
             }
 
@@ -277,10 +279,8 @@ sap.ui.define([
             oCachedEntry.oApp.setVisible(false);
 
             // keep application's dirty state providers when stored
-            if (sap.ushell.Container) {
-                oAppDirtyStateProviders[sStorageKey] = sap.ushell.Container.getAsyncDirtyStateProviders();
-                sap.ushell.Container.cleanDirtyStateProviderArray();
-            }
+            oAppDirtyStateProviders[sStorageKey] = Container.getAsyncDirtyStateProviders();
+            Container.cleanDirtyStateProviderArray();
 
             if (oApp) {
                 if (oApp.isKeepAliveSupported && oApp.isKeepAliveSupported() === true) {
@@ -294,7 +294,7 @@ sap.ui.define([
                     }
                 }
             }
-            Core.getEventBus().publish("sap.ushell", "appClosed", {});
+            EventBus.getInstance().publish("sap.ushell", "appClosed", {});
 
             return Promise.resolve();
         };
@@ -313,12 +313,12 @@ sap.ui.define([
             hasher.replaceHash(oMsg.body.sHash);
             hasher.disableCFLPUpdate = false;
 
-            Core.getEventBus().publish("launchpad", "appOpening", {});
+            EventBus.getInstance().publish("launchpad", "appOpening", {});
             oCachedEntry.oApp.setVisible(true);
 
             // re-register application's dirty state providers when restored
-            if (oAppDirtyStateProviders[sStorageKey] && sap.ushell.Container) {
-                sap.ushell.Container.setAsyncDirtyStateProviders(oAppDirtyStateProviders[sStorageKey]);
+            if (oAppDirtyStateProviders[sStorageKey]) {
+                Container.setAsyncDirtyStateProviders(oAppDirtyStateProviders[sStorageKey]);
             }
             if (oShellUIService) {
                 oShellUIService.setBackNavigation(oAppBackNavigationFunc[sStorageKey]);
@@ -342,10 +342,10 @@ sap.ui.define([
 
                 oRunningApp = this.cloneCurrentAppEntry(oCachedEntry);
             }
-            Core.getEventBus().publish("sap.ushell", "appOpened", {});
+            EventBus.getInstance().publish("sap.ushell", "appOpened", {});
 
             setTimeout(function () {
-                AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.AppLifeCycle.setNewAppInfo", {info: oCachedEntry.oAppAttributes});
+                AppRuntimeService.postMessageToFLP("sap.ushell.services.AppLifeCycle.setNewAppInfo", {info: oCachedEntry.oAppAttributes});
             }, 500);
 
             return Promise.resolve();
@@ -358,7 +358,7 @@ sap.ui.define([
             return new Promise(function (fnResolve, fnReject) {
                 if (oUrlParameters.hasOwnProperty("sap-intent-param")) {
                     var sAppStateKey = oUrlParameters["sap-intent-param"];
-                    AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.CrossApplicationNavigation.getAppStateData", { sAppStateKey: sAppStateKey })
+                    AppRuntimeService.postMessageToFLP("sap.ushell.services.CrossApplicationNavigation.getAppStateData", { sAppStateKey: sAppStateKey })
                         .then(function (sParameters) {
                             delete oUrlParameters["sap-intent-param"];
                             var oUrlParametersExpanded = extend({}, oUrlParameters, (new URI("?" + sParameters)).query(true), true);
@@ -412,7 +412,7 @@ sap.ui.define([
                     //Handle the case when the parameters that were sent to the application were more than 1000 characters and in
                     //the URL we see a shorten value of the parameters
                     if (sSapIntentParam) {
-                        AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.CrossApplicationNavigation.getAppStateData", { sAppStateKey: sSapIntentParam })
+                        AppRuntimeService.postMessageToFLP("sap.ushell.services.CrossApplicationNavigation.getAppStateData", { sAppStateKey: sSapIntentParam })
                             .then(function (sMoreParams) {
                                 fnResolve(buildFinalParamsString(sStartupParametersWithoutSapIntentParam, sMoreParams));
                             }, function (sError) {
@@ -441,7 +441,7 @@ sap.ui.define([
                                 .removeSearch("sap-ushell-defaultedParameterNames")
                                 .toString();
                         }
-                        sap.ushell.Container.getServiceAsync("NavTargetResolution").then(function (oNavTargetResolution) {
+                        Container.getServiceAsync("NavTargetResolution").then(function (oNavTargetResolution) {
                             oNavTargetResolution.resolveHashFragmentLocal("#" + sAppIntent + sParams)
                                 .done(function (oResolvedHashFragment) {
                                     var oParsedHash = oUrlParsing.parseShellHash("#" + sAppIntent + sParams);
@@ -545,17 +545,17 @@ sap.ui.define([
          * @private
          */
         this.setShellNavigationService = function (oService) {
-            oShellNavigationService = oService;
+            oShellNavigationInternal = oService;
         };
 
         /**
          * @private
          */
         this.checkDataLossAndContinue = function () {
-            if (sap.ushell && sap.ushell.Container && sap.ushell.Container.getDirtyFlag(oShellNavigationService.getNavigationContext())) {
+            if (Container.getDirtyFlag(oShellNavigationInternal.getNavigationContext())) {
                 // eslint-disable-next-line no-alert
                 if (window.confirm(sDatalossMessage)) {
-                    sap.ushell.Container.setDirtyFlag(false);
+                    Container.setDirtyFlag(false);
                     return true;
                 } else {
                     return false;

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

@@ -27,25 +27,24 @@ sap.ui.define([
         };
 
         this.getAppState = function (sKey) {
-            var oDeferred = new jQuery.Deferred();
+            let that = this;
+            const oDeferred = new jQuery.Deferred();
 
-            AppRuntimeService.sendMessageToOuterShell(
+            AppRuntimeService.postMessageToFLP(
                 "sap.ushell.services.AppState.getAppState", {
                 sKey: sKey
-            }).done(function (oState) {
-                sap.ushell.Container.getServiceAsync("AppState").then(function (AppStateService) {
-                    var oAppStateAppState = new AppStateAppState(
-                        AppStateService,
-                        oState._sKey,
-                        oState._bModifiable,
-                        oState._sData,
-                        oState._sAppName,
-                        oState._sACHComponent,
-                        oState._bTransient,
-                        oState._iPersistencyMethod,
-                        oState._oPersistencySettings);
-                    oDeferred.resolve(oAppStateAppState);
-                });
+            }).then(function (oState) {
+                const oAppStateAppState = new AppStateAppState(
+                    that,
+                    oState._sKey,
+                    oState._bModifiable,
+                    oState._sData,
+                    oState._sAppName,
+                    oState._sACHComponent,
+                    oState._bTransient,
+                    oState._iPersistencyMethod,
+                    oState._oPersistencySettings);
+                oDeferred.resolve(oAppStateAppState);
             });
 
             return oDeferred.promise();