@sapui5/sap.ushell 1.116.0 → 1.117.1

package/src/main/js/sap/ushell/renderers/fiori2/Shell.controller.js

@@ -19,10 +19,8 @@ sap.ui.define([
     "sap/ui/thirdparty/hasher",
     "sap/ui/thirdparty/jquery",
     "sap/ui/util/Storage",
-    "sap/ushell/ApplicationType",
     "sap/ushell/bootstrap/SchedulingAgent",
     "sap/ushell/components/_HeaderManager/ControlManager",
-    "sap/ushell/components/applicationIntegration/application/BlueBoxHandler",
     "sap/ushell/components/applicationIntegration/AppLifeCycle",
     "sap/ushell/components/applicationIntegration/relatedServices/RelatedServices",
     "sap/ushell/components/HeaderManager",
@@ -37,7 +35,8 @@ sap.ui.define([
     "sap/ushell/utils",
     "sap/ushell/utils/WindowUtils",
     "sap/ushell/renderers/fiori2/ShellLayout",
-    "sap/ushell/renderers/fiori2/utils"
+    "sap/ushell/renderers/fiori2/utils",
+    "sap/base/util/ObjectPath"
 ], function (
     History,
     Log,
@@ -57,10 +56,8 @@ sap.ui.define([
     hasher,
     jQuery,
     Storage,
-    ApplicationType,
     SchedulingAgent,
     HeaderControlManager,
-    BlueBoxHandler,
     AppLifeCycleAI,
     RelatedServices,
     HeaderManager,
@@ -75,7 +72,8 @@ sap.ui.define([
     utils,
     WindowUtils,
     ShellLayout,
-    RendererUtils
+    RendererUtils,
+    ObjectPath
 ) {
     "use strict";
 
@@ -217,8 +215,6 @@ sap.ui.define([
         },
 
         onInit: function () {
-            var that = this;
-
             var oRouter = Component.getOwnerComponentFor(this.getView()).getRouter();
 
             // TODO We still need to think about implementing a custom router to move the display handler from
@@ -311,26 +307,7 @@ sap.ui.define([
 
                 this.oShellNavigation.registerNavigationFilter(this.handleDataLoss.bind(this));
 
-                this.oShellNavigation.hashChanger.attachEvent("hashChanged", function (oHashChange) {
-                    //FIX for internal incident #1980317281 - In general, hash structure in FLP is splitted into 3 parts:
-                    //A - application identification & B - Application parameters & C - Internal application area
-                    // Now, when an IFrame changes its hash, it sends PostMessage up to the FLP. The FLP does 2 things: Change its URL
-                    // and send a PostMessage back to the IFrame. This fix, initiated in the PostMessageAPI.js, blocks only
-                    // the message back to the IFrame.
-                    if (window.hasher.disableBlueBoxHashChangeTrigger === true) {
-                        return;
-                    }
-                    if (oHashChange.mParameters && that.oShellNavigation.hashChanger.isInnerAppNavigation(oHashChange.mParameters.newHash, oHashChange.mParameters.oldHash)) {
-                        AppLifeCycleAI.postMessageToIframeApp("sap.ushell.appRuntime", "innerAppRouteChange", {
-                            oHash: oHashChange.mParameters
-                        });
-                    }
-
-                    AppLifeCycleAI.postMessageToIframeApp("sap.ushell.appRuntime", "hashChange", {
-                        sHash: oHashChange.mParameters.fullHash
-                    });
-                });
-
+                AppLifeCycleAI.registerHandleHashChange(this.oShellNavigation);
                 // enable the direct app start and tests to wait for the initialization
                 EventHub.emit("ShellNavigationInitialized");
             }.bind(this);
@@ -360,7 +337,7 @@ sap.ui.define([
                 if (sap.ushell.Container && sap.ushell.Container.getDirtyFlag()
                     // workaround: skip data-loss-warning in IE when app is NWBC-based (as there is a separate implementation)
                     && !(Device.browser.name === Device.browser.BROWSER.INTERNET_EXPLORER
-                        && AppLifeCycleAI.getCurrentApplication().container.getApplicationType() === ApplicationType.NWBC.type)
+                        && AppLifeCycleAI.getCurrentApplication().container.getApplicationType() === "NWBC")
                 ) {
                     if (!ushellResources.browserI18n) {
                         ushellResources.browserI18n = ushellResources.getTranslationModel(window.navigator.language).getResourceBundle();
@@ -636,7 +613,6 @@ sap.ui.define([
             UserActivityLog.deactivate();
             oShellModel.destroy();
             AppLifeCycleAI.shellElements().clean();
-            AppLifeCycleAI.destroy();
             oShellModel = undefined;
         },
 
@@ -863,11 +839,6 @@ sap.ui.define([
             // eslint-disable-next-line no-alert
             if (window.confirm(ushellResources.i18n.getText("dataLossInternalMessage"))) {
                 sap.ushell.Container.setDirtyFlag(false);
-
-                AppLifeCycleAI.postMessageToIframeApp("sap.ushell.appRuntime", "setDirtyFlag", {
-                    bIsDirty: false
-                });
-
                 if (RelatedServices.isBackNavigation() === true) {
                     RelatedServices.resetBackNavigationFlag();
                 }
@@ -1200,15 +1171,9 @@ sap.ui.define([
                             }
                             if (bComponentLoaded || !sTargetUi5ComponentName) {
                                 var oDeferredAppDestroy = new jQuery.Deferred();
-                                if ((oResolvedHashFragment.applicationType === "URL"
-                                        || oResolvedHashFragment.applicationType === "GUI"
-                                        || oResolvedHashFragment.applicationType === "TR"
-                                        || oResolvedHashFragment.applicationType === "NWBC"
-                                        || oResolvedHashFragment.applicationType === "WDA"
-                                        || oResolvedHashFragment.applicationType === "WCF")
-                                    //&& oResolvedHashFragment.appCapabilities && oResolvedHashFragment.appCapabilities.appFrameworkId === "UI5" &&
+                                if ((oResolvedHashFragment.applicationType === "URL" || utils.isSAPLegacyApplicationType(oResolvedHashFragment.applicationType))
                                     && oInMemoryApplicationInstance.isInstanceSupported === false && oInMemoryApplicationInstance.appId) {
-                                    AppLifeCycleAI.destroy(
+                                    AppLifeCycleAI.destroyApplication(
                                         oInMemoryApplicationInstance.appId, oInMemoryApplicationInstance.container, oDeferredAppDestroy
                                     );
                                 } else {
@@ -1223,8 +1188,7 @@ sap.ui.define([
                                 });
                                 return;
                             }
-                            AppLifeCycleAI.destroy(oInMemoryApplicationInstance.appId, oInMemoryApplicationInstance.container);
-
+                            AppLifeCycleAI.destroyApplication(oInMemoryApplicationInstance.appId, oInMemoryApplicationInstance.container);
                             AppLifeCycleAI.removeApplication(sIntent);
                             AppConfiguration.setApplicationInInitMode();
 
@@ -1721,8 +1685,7 @@ sap.ui.define([
                                 return aAppStateKeysArray;
                             };
 
-                            if (sAppType === "GUI" || sAppType === "TR" || sAppType === "NWBC" || sAppType === "WDA" || sAppType === "WCF" ||
-                                sFrameworkId === "GUI" || sFrameworkId === "WDA" || sFrameworkId === "NWBC" || sFrameworkId === "WCF") {
+                            if (utils.isSAPLegacyApplicationType(sAppType, sFrameworkId)) {
                                 sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
                                     aKeysArray = getParamKeys(sUrlWithSapUserAndShellParam, aInfoArray);
                                     if (aKeysArray.length > 0) {
@@ -1861,7 +1824,8 @@ sap.ui.define([
         _handleEmbeddedNavMode: function (sFixedShellHash, oParsedShellHash, oMetadata, oResolvedHashFragment, sOldFixedShellHash) {
             // Performance Debug
             Measurement.start("FLP:ShellController._handleEmbeddedNavMode", "_handleEmbeddedNavMode", "FLP");
-            var oConfig = this._getConfig();
+            var that = this,
+                oConfig = this._getConfig();
 
             this.resetShellUIServiceHandlers();
 
@@ -1905,10 +1869,16 @@ sap.ui.define([
             );
 
             if (this.currentAppBeforeNav) {
-                var oPreviousStatefulContainer;
-                oPreviousStatefulContainer = BlueBoxHandler.getWebGuiV1StatefulContainer(this.currentAppBeforeNav.url);
-                if (oPreviousStatefulContainer) {
-                    oPreviousStatefulContainer.onApplicationOpened(oResolvedHashFragment.applicationType);
+                if (utils.isTRApplicationType(this.currentAppBeforeNav.applicationType, ObjectPath.get("appCapabilities.appFrameworkId", this.currentAppBeforeNav)) &&
+                    !utils.isTRApplicationType(oResolvedHashFragment.applicationType)) {
+                    sap.ui.require([
+                        "sap/ushell/components/applicationIntegration/application/BlueBoxHandler",
+                        "sap/ushell/components/applicationIntegration/application/WebGUIStatefulHandler"], function (BlueBoxHandler, WebGUIStatefulHandler) {
+                        var oPreviousStatefulContainer = BlueBoxHandler.getBlueBoxByUrl(that.currentAppBeforeNav.url);
+                        if (oPreviousStatefulContainer && oPreviousStatefulContainer.getStatefulType() === BlueBoxHandler.STATEFUL_TYPES.GUI_V1) {
+                            WebGUIStatefulHandler.guiStatefulCloseCurrentApp(oPreviousStatefulContainer);
+                        }
+                    });
                 }
             }
 
@@ -1955,33 +1925,36 @@ sap.ui.define([
             }
 
             var oAppContainer = AppLifeCycleAI.getAppContainer(sAppId, oResolvedNavigationTarget, this._isColdStart(), oShellHash, sFixedShellHash);
+            var bContainerFromCachePool = false;
+            if (oAppContainer.getIsFetchedFromCache && oAppContainer.getIsFetchedFromCache()) {
+                bContainerFromCachePool = true;
+            }
 
-            AppLifeCycleAI.publishNavigationStateEvents(oAppContainer, oResolvedNavigationTarget, this.onAppAfterRendering.bind(this, oResolvedNavigationTarget));
+            if (!bContainerFromCachePool) {
+                AppLifeCycleAI.publishNavigationStateEvents(oAppContainer, oResolvedNavigationTarget, this.onAppAfterRendering.bind(this, oResolvedNavigationTarget));
 
-            var sAppType = oAppContainer.getApplicationType();
-            var sFrameworkId = oAppContainer.getFrameworkId();
-            if (sAppType === "GUI" || sAppType === "TR" || sAppType === "WDA" || sAppType === "NWBC" || sAppType === "WCF" ||
-                sFrameworkId === "GUI" || sFrameworkId === "WDA" || sFrameworkId === "NWBC" || sFrameworkId === "WCF") {
-                oAppContainer.addStyleClass("sapUShellApplicationContainerShiftedIframe");
-            }
+                if (utils.isSAPLegacyApplicationType(oAppContainer.getApplicationType(), oAppContainer.getFrameworkId())) {
+                    oAppContainer.addStyleClass("sapUShellApplicationContainerShiftedIframe");
+                }
 
-            if (!bFullWidth) {
-                oAppContainer.addStyleClass("sapUShellApplicationContainerLimitedWidth");
-            }
+                if (!bFullWidth) {
+                    oAppContainer.addStyleClass("sapUShellApplicationContainerLimitedWidth");
+                }
 
-            if (this._isFloatingContainerDocked() && window.matchMedia("(min-width: 106.4rem)").matches) {
-                oAppContainer.addStyleClass("sapUShellDockingContainer");
-                oAppContainer.removeStyleClass("sapUShellApplicationContainerLimitedWidth");
-            } else if (this._isFloatingContainerDocked()) {
-                oAppContainer.removeStyleClass("sapUShellApplicationContainerLimitedWidth");
-            }
+                if (this._isFloatingContainerDocked() && window.matchMedia("(min-width: 106.4rem)").matches) {
+                    oAppContainer.addStyleClass("sapUShellDockingContainer");
+                    oAppContainer.removeStyleClass("sapUShellApplicationContainerLimitedWidth");
+                } else if (this._isFloatingContainerDocked()) {
+                    oAppContainer.removeStyleClass("sapUShellApplicationContainerLimitedWidth");
+                }
 
-            oAppContainer.toggleStyleClass("sapUshellDefaultBackground", !oMetadata.hideLightBackground);
+                oAppContainer.toggleStyleClass("sapUshellDefaultBackground", !oMetadata.hideLightBackground);
 
-            AppLifeCycleAI.getAppMeta()._applyContentDensityByPriority();
+                AppLifeCycleAI.getAppMeta()._applyContentDensityByPriority();
 
-            // Add inner control for next request
-            AppLifeCycleAI.addControl(oAppContainer);
+                // Add inner control for next request
+                AppLifeCycleAI.addControl(oAppContainer);
+            }
 
             utils.setPerformanceMark("FLP - addAppContainer");
 
@@ -2082,9 +2055,6 @@ sap.ui.define([
                 // navigate to the previous URL since in this state the hash that has failed to load is in the URL.
                 this.bEnableHashChange = bEnableHashChange;
                 sap.ushell.Container.setDirtyFlag(bPreviousPageDirty);
-                AppLifeCycleAI.postMessageToIframeApp("sap.ushell.appRuntime", "setDirtyFlag", {
-                    bIsDirty: bPreviousPageDirty
-                });
                 this._windowHistoryBack(1);
             }
         },
@@ -2165,6 +2135,8 @@ sap.ui.define([
             var sAppPart = sAppHash ? "&/" + sAppHash : null;
 
             this.logOpenAppAction(oResolvedHashFragment, sAppPart);
+
+            this._notifyUITracer(oResolvedHashFragment);
         },
 
         externalSearchTriggered: function (sChannelId, sEventId, oData) {
@@ -2252,6 +2224,37 @@ sap.ui.define([
             }
         },
 
+        /**
+         * Notifies the UITracer service about the navigation (app launch) by emitting
+         * a corresponding event on the event hub.
+         *
+         * @param {object} oResolvedHashFragment - the result of the NavTargetResolution service
+         */
+        _notifyUITracer: function (oResolvedHashFragment) {
+            try {
+                var sApplicationId = oResolvedHashFragment.ui5ComponentName;
+                if (oResolvedHashFragment.reservedParameters) {
+                    sApplicationId =
+                        oResolvedHashFragment.reservedParameters["sap-fiori-id"] ||
+                        oResolvedHashFragment.reservedParameters["sap-ui-app-id-hint"];
+                }
+                EventHub.emit("UITracer.trace", {
+                    reason: "NavigateApp",
+                    source: "Intent",
+                    data: {
+                        applicationId: sApplicationId || "",
+                        applicationType: oResolvedHashFragment.applicationType || "",
+                        hash: oResolvedHashFragment.sFixedShellHash || "",
+                        targetNavigationMode: oResolvedHashFragment.targetNavigationMode || "",
+                        providerId: oResolvedHashFragment.contentProviderId || "",
+                        targetUrl: oResolvedHashFragment.url || ""
+                    }
+                });
+            } catch (ex) {
+                Log.warning("Could not emit UITracer.trace event", ex, "sap.ushell.renderers.fiori2.Shell.controller");
+            }
+        },
+
         // Special logic for Search.
         // The search activity must be logged even after a user makes different searches in a single #Action-search session.
         // Therefore, the logging should occur on the search event and not by the navigation to the search application.

package/src/main/js/sap/ushell/renderers/fiori2/Shell.view.js

@@ -114,9 +114,9 @@
                 var oDomRef = document.getElementById(ShellLayoutMapping.BackgroundImage);
                 var sBackgroundHtml = [
                     // "Shell Canvas" category in ThemeDesigner
-                    "<div class='sapUiShellBackgroundImage sapUiGlobalBackgroundImageForce sapUshellShellBG sapContrastPlus'></div>",
+                    "<div class='sapUiShellBackgroundImage sapUiGlobalBackgroundImageForce sapContrastPlus'></div>",
                     // "Application Background" category in ThemeDesigner
-                    "<div class='sapMShellBG sapUshellShellBG sapUiGlobalBackgroundImage'></div>"
+                    "<div class='sapMShellBG sapUiGlobalBackgroundImage'></div>"
                 ].join("\n");
                 oDomRef.insertAdjacentHTML("afterbegin", sBackgroundHtml);
             });

package/src/main/js/sap/ushell/renderers/fiori2/ShellAsync.view.js

@@ -113,7 +113,7 @@ sap.ui.define([
                     // "Shell Canvas" category in ThemeDesigner
                     "<div class='sapUiShellBackgroundImage sapUiGlobalBackgroundImageForce sapUshellShellBG sapContrastPlus'></div>",
                     // "Application Background" category in ThemeDesigner
-                    "<div class='sapMShellBG sapUshellShellBG sapUiGlobalBackgroundImage'></div>"
+                    "<div class='sapMShellBG sapUiGlobalBackgroundImage'></div>"
                 ].join("\n");
                 oDomRef.insertAdjacentHTML("afterbegin", sBackgroundHtml);
             });