@sapui5/sap.ushell 1.112.3 → 1.113.0

package/src/main/js/sap/ushell/components/applicationIntegration/AppLifeCycle.js

@@ -1,7 +1,7 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.112.3
+ * @version 1.113.0
  */
 sap.ui.define([
     "sap/ushell/components/applicationIntegration/elements/model",
@@ -1131,7 +1131,7 @@ sap.ui.define([
             Log.info("New application context opened successfully in an existing transaction UI session.");
         };
 
-        this.reuseStateFulContainerAndRestore = function (oApplicationContainer, sToId, oHandler, sFixedShellHash, oTarget) {
+        this.reuseStateFulContainerAndRestore = function (oApplicationContainer, sToId, oHandler, sFixedShellHash, oTarget, bNavigationInSameStatefullContainer) {
             var that = this,
                 //Get the real Storage Id according to the hash maps for the restore
                 sStorageId = oIntentToStorageId[sFixedShellHash];
@@ -1142,7 +1142,7 @@ sap.ui.define([
             }
 
             // invoke the life cycle interface "setInitialConfiguration" for the restored application
-            return oHandler.restore(oApplicationContainer, sStorageId, oTarget)
+            return oHandler.restore(oApplicationContainer, sStorageId, oTarget, bNavigationInSameStatefullContainer)
                 .then(function () {
                     that.showApplicationContainer(oApplicationContainer);
                 }, function (vError) {
@@ -1150,7 +1150,7 @@ sap.ui.define([
                 });
         };
 
-        this.reuseStateFulContainer = function (oApplicationContainer, url, sToId, oHandler, sFixedShellHash, oTarget) {
+        this.reuseStateFulContainer = function (oApplicationContainer, url, sToId, oHandler, sFixedShellHash, oTarget, bNavigationInSameStatefullContainer) {
             var that = this;
 
             //Store the storage id associated with the hash
@@ -1164,7 +1164,7 @@ sap.ui.define([
             this.initAppMetaParams();
 
             // invoke the life cycle interface "setInitialConfiguration" for the restored application
-            return oHandler.create(oApplicationContainer, url, sToId, oTarget)
+            return oHandler.create(oApplicationContainer, url, sToId, oTarget, bNavigationInSameStatefullContainer)
                 .then(function () {
                     that.showApplicationContainer(oApplicationContainer);
                 }, function (vError) {
@@ -1177,7 +1177,12 @@ sap.ui.define([
                 oShellUIService.setHierarchy();
             }
             if (!this.getAppMeta().getIsTitleChanged()) {
-                oShellUIService.setTitle();
+                var sHash = hasher.getHash();
+                if (sHash && sHash.indexOf("Shell-startIntent") === 0) {
+                    oShellUIService.setTitle("", true);
+                } else {
+                    oShellUIService.setTitle();
+                }
             }
             if (!this.getAppMeta().getIsRelatedAppsChanged()) {
                 oShellUIService.setRelatedApps();
@@ -1317,15 +1322,15 @@ sap.ui.define([
             };
         };
 
-        this.handleOpenStateful = function (bIsInitial, bIsInCache, sToId, oInnerControl, oTarget, sFixedShellHash, oKeepAliveMode) {
+        this.handleOpenStateful = function (bIsInitial, bIsInCache, sToId, oInnerControl, oTarget, sFixedShellHash, oKeepAliveMode, bNavigationInSameStatefullContainer) {
             var oHandler = BlueBoxHandler.getHandler(),
                 oPromise;
 
             oInnerControl.setProperty("iframeReusedForApp", true, true);
             if (Storage.get(sToId) && bIsInitial === false) {
-                oPromise = this.reuseStateFulContainerAndRestore(oInnerControl, sToId, oHandler, sFixedShellHash, oTarget);
+                oPromise = this.reuseStateFulContainerAndRestore(oInnerControl, sToId, oHandler, sFixedShellHash, oTarget, bNavigationInSameStatefullContainer);
             } else {
-                oPromise = this.reuseStateFulContainer(oInnerControl, oTarget.url, sToId, oHandler, sFixedShellHash, oTarget);
+                oPromise = this.reuseStateFulContainer(oInnerControl, oTarget.url, sToId, oHandler, sFixedShellHash, oTarget, bNavigationInSameStatefullContainer);
 
                 //creating a new application check if needs to be keep (for the keep alive), and if so store the application
                 if (bIsInCache) {
@@ -1365,7 +1370,8 @@ sap.ui.define([
                 iLastValidTimeDelta,
                 oOldHash,
                 sOldFullAppId,
-                sCurrentPageId;
+                sCurrentPageId,
+                bNavigationInSameStatefullContainer = false;
 
             //get the potential target stateful container and check if it's valid. if not, destroy it
             //before we try to create the new application
@@ -1413,6 +1419,7 @@ sap.ui.define([
                     RelatedServices.store(oOldAppStorageEntry.service);
                 }
                 oPromiseAppClose = this.handleExitApplication(sOldFullAppId, oCurrentAppContainer, undefined, undefined, false);
+                bNavigationInSameStatefullContainer = true;
             }
 
             oPromiseAppClose.then(function () {
@@ -1553,7 +1560,8 @@ sap.ui.define([
                             if (oTarget.appCapabilities && oTarget.appCapabilities.appFrameworkId === "UI5") {
                                 oInnerControl.setProperty("active", true, true);
                             }
-                            oPromiseAsyncAppCreate = that.handleOpenStateful(bIsInitial, bIsInCache, "application" + sAppId, oInnerControl, oTarget, sFixedShellHash, oKeepAliveMode);
+                            oPromiseAsyncAppCreate = that.handleOpenStateful(
+                                bIsInitial, bIsInCache, "application" + sAppId, oInnerControl, oTarget, sFixedShellHash, oKeepAliveMode, bNavigationInSameStatefullContainer);
                         } else if (that.isWebGuiV1StatefulContainer(oTarget.url)) {
                             oPromiseAsyncAppCreate = that.reuseApplicationContainer(oInnerControl, "TR", oTarget.url);
                         }

package/src/main/js/sap/ushell/components/applicationIntegration/Storage.js

@@ -1,7 +1,7 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.112.3
+ * @version 1.113.0
  */
 sap.ui.define([], function () {
     "use strict";

package/src/main/js/sap/ushell/components/applicationIntegration/application/Application.js

@@ -1,7 +1,7 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.112.3
+ * @version 1.113.0
  */
 sap.ui.define([
     "sap/ushell/components/container/ApplicationContainer",
@@ -75,9 +75,9 @@ sap.ui.define([
          * This feature is disabled by default, because it is not consumed by WebDynpro ABAP in version 1.24 (UI Add-on SP10).
          * It can be enabled via launchpad configuration as follows (not a public option, might be changed later):
          *
-         * <code>
+         * <pre>
          *   {
-         *     ervices: {
+         *     services: {
          *       PostMessage: {
          *         config: {
          *           enabled: true
@@ -85,7 +85,7 @@ sap.ui.define([
          *       }
          *     }
          *   }
-         * </code>
+         * </pre>
          *
          * @param {object} oContainer the ApplicationContainer instance
          * @param {Event} oMessage

package/src/main/js/sap/ushell/components/applicationIntegration/application/BlueBoxHandler.js

@@ -1,7 +1,7 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.112.3
+ * @version 1.113.0
  */
 sap.ui.define([
     "sap/ushell/components/applicationIntegration/application/BlueBoxesCache",
@@ -62,7 +62,7 @@ sap.ui.define([
                 },
 
                 //we dont know the app Id we pass te hole url, in the Storage we manage it using sCacheId (this is for the keep alive)
-                create: function (oInnerControl, sUrl, sStorageKey, oTarget) {
+                create: function (oInnerControl, sUrl, sStorageKey, oTarget, bNavigationInSameStatefullContainer) {
                     var oDeferred = new jQuery.Deferred(),
                         oFLPParams,
                         oPostParams;
@@ -79,8 +79,13 @@ sap.ui.define([
                             oInnerControl, "sap.ushell.services.appLifeCycle", "create", oPostParams, true)
                             .then(function () {
                                 oBlueBoxContainer[oInnerControl].currentAppTarget = oTarget;
-                                Core.getEventBus().publish("sap.ushell", "appOpened", oTarget);
-                                oDeferred.resolve();
+                                sap.ushell.Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
+                                    if (bNavigationInSameStatefullContainer === true) {
+                                        oAppLifeCycleService.prepareCurrentAppObject("URL", undefined, false, oInnerControl);
+                                    }
+                                    Core.getEventBus().publish("sap.ushell", "appOpened", oTarget);
+                                    oDeferred.resolve();
+                                });
                             });
                     }
 
@@ -146,22 +151,24 @@ sap.ui.define([
                     });
                     return oPromise;
                 },
-                restore: function (oInnerControl, sStorageKey, oTarget) {
-                    var oPromise;
-
-                    Core.getEventBus().publish("launchpad", "appOpening", oTarget);
-                    oPromise = Application.postMessageToIframeApp(oInnerControl, "sap.ushell.services.appLifeCycle", "restore", {
-                        sCacheId: sStorageKey,
-                        sUrl: oTarget.url,
-                        sHash: hasher.getHash()
-                    }, true);
-
-                    oPromise.then(function () {
-                        oBlueBoxContainer[oInnerControl].currentAppTarget = oTarget;
-                        Core.getEventBus().publish("sap.ushell", "appOpened", oTarget);
+                restore: function (oInnerControl, sStorageKey, oTarget, bNavigationInSameStatefullContainer) {
+                    return new Promise(function (fnResolve) {
+                        Core.getEventBus().publish("launchpad", "appOpening", oTarget);
+                        Application.postMessageToIframeApp(oInnerControl, "sap.ushell.services.appLifeCycle", "restore", {
+                            sCacheId: sStorageKey,
+                            sUrl: oTarget.url,
+                            sHash: hasher.getHash()
+                        }, true).then(function () {
+                            oBlueBoxContainer[oInnerControl].currentAppTarget = oTarget;
+                            sap.ushell.Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
+                                if (bNavigationInSameStatefullContainer === true) {
+                                    oAppLifeCycleService.prepareCurrentAppObject("URL", undefined, false, oInnerControl);
+                                }
+                                Core.getEventBus().publish("sap.ushell", "appOpened", oTarget);
+                                fnResolve();
+                            });
+                        });
                     });
-
-                    return oPromise;
                 }
             },
             oBasicStatefulContainerCapabilities = [

package/src/main/js/sap/ushell/components/applicationIntegration/application/BlueBoxesCache.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/ui/thirdparty/URI",
     "sap/base/Log"

package/src/main/js/sap/ushell/components/applicationIntegration/application/PostMessageAPI.js

@@ -1,8 +1,8 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview defines the post message API for all applications running in iframe within the shell
- * @version 1.112.3
+ * @version 1.113.0
  * @private
  */
 sap.ui.define([
@@ -782,11 +782,18 @@ sap.ui.define([
                         return new jQuery.Deferred().resolve(sSystemAlias).promise();
                     }
                 },
-                setAppInfo: {
+                setNewAppInfo: {
                     executeServiceCallFn: function (oServiceParams) {
                         sap.ushell.Container.getServiceAsync("AppLifeCycle").then(function (AppLifeCycleService) {
-                            AppLifeCycleService.setAppInfo(oServiceParams.oMessageData.body);
-
+                            AppLifeCycleService.setAppInfo(oServiceParams.oMessageData.body, true);
+                        });
+                        return new jQuery.Deferred().resolve().promise();
+                    }
+                },
+                updateCurrentAppInfo: {
+                    executeServiceCallFn: function (oServiceParams) {
+                        sap.ushell.Container.getServiceAsync("AppLifeCycle").then(function (AppLifeCycleService) {
+                            AppLifeCycleService.setAppInfo(oServiceParams.oMessageData.body, false);
                         });
                         return new jQuery.Deferred().resolve().promise();
                     }
@@ -1283,6 +1290,19 @@ sap.ui.define([
                     }
                 }
             }
+        },
+        "sap.ushell.services.ReferenceResolver": {
+            oServiceCalls: {
+                resolveReferences: {
+                    executeServiceCallFn: function (oServiceParams) {
+                        var oDeferred = new jQuery.Deferred();
+                        sap.ushell.Container.getServiceAsync("ReferenceResolver").then(function (ReferenceResolverService) {
+                            ReferenceResolverService.resolveReferences(oServiceParams.oMessageData.body.aReferences).then(oDeferred.resolve, oDeferred.reject);
+                        });
+                        return oDeferred.promise();
+                    }
+                }
+            }
         }
     };
 

package/src/main/js/sap/ushell/components/applicationIntegration/application/PostMessageAPIInterface.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/base/util/deepExtend",

package/src/main/js/sap/ushell/components/applicationIntegration/configuration/AppMeta.js

@@ -1,7 +1,7 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.112.3
+ * @version 1.113.0
  */
 sap.ui.define([
     "sap/base/util/extend",
@@ -136,7 +136,7 @@ sap.ui.define([
             isTitleChanged = true;
             var sTitle = oEvent.getParameters().data;
 
-            if (!sTitle) {
+            if (!sTitle && !(oEvent.getParameters().bAcceptEmptyString === true)) {
                 sTitle = this.getAppMeta().getTitleDefaultValue();
             }
 

package/src/main/js/sap/ushell/components/applicationIntegration/elements/model.js

@@ -1,8 +1,8 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview The models assosicated with the applciation.
- * @version 1.112.3
+ * @version 1.113.0
  */
 sap.ui.define([
     "sap/ushell/EventHub",

package/src/main/js/sap/ushell/components/applicationIntegration/relatedServices/RelatedServices.js

@@ -1,7 +1,7 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the services for the different applications.
- * @version 1.112.3
+ * @version 1.113.0
  */
 sap.ui.define([
     "sap/ui/core/Core"

package/src/main/js/sap/ushell/components/applicationIntegration/relatedShellElements/RelatedShellElements.js

@@ -1,7 +1,7 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the related shell elements of the different applications.
- * @version 1.112.3
+ * @version 1.113.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/cards/Card.controller.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/ushell/components/tiles/utils",

package/src/main/js/sap/ushell/components/cards/Configuration.controller.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/ushell/components/cards/ManifestPropertyHelper",
     "sap/ushell/resources",

package/src/main/js/sap/ushell/components/cards/ManifestPropertyHelper.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview This file contains miscellaneous utility functions.

package/src/main/js/sap/ushell/components/cepsearchresult/app/Component.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
   "sap/ui/core/UIComponent",
@@ -9,22 +9,21 @@ sap.ui.define([
   appendStyleVars([
     "_sap_m_IconTabBar_ShellHeaderShadow",
     "sapUiElementLineHeight",
-    "sapUiShellNavigationBackground",
-    "_sap_m_IconTabBar_HeaderMinHeight"
+    "_sap_m_IconTabBar_HeaderBorderBottom",
+    "_sap_m_IconTabBar_HeaderBackground"
   ]);
 
   /* Utility functions */
 
-  function getSingleIntentParameter (oComponent, sParameterName, defaultValue) {
-    var oComponentData = oComponent.getComponentData && oComponent.getComponentData();
-    if (oComponentData && oComponentData.startupParameters) {
-      var mParams = oComponentData.startupParameters;
-      // try to read the parameter value
-      if (Array.isArray(mParams[sParameterName]) && mParams[sParameterName].length > 0) {
-        return mParams[sParameterName][0] || defaultValue;
+  function getSingleIntentParameter (sParameterName, sDefault) {
+    var sHash = document.location.hash;
+    var aParams = sHash.substring(sHash.indexOf("?") + 1).split("&");
+    for (var i = 0; i < aParams.length; i++) {
+      if (aParams[i].startsWith(sParameterName)) {
+        return decodeURI(aParams[i].split("=")[1]);
       }
     }
-    return defaultValue;
+    return sDefault || "";
   }
 
   /**
@@ -53,8 +52,8 @@ sap.ui.define([
      */
     init: function () {
       // get intent parameter values
-      this._sSearchTerm = getSingleIntentParameter(this, "searchTerm", "");
-      this._sCategory = getSingleIntentParameter(this, "category", "all");
+      this._sSearchTerm = getSingleIntentParameter("searchTerm", "");
+      this._sCategory = getSingleIntentParameter("category", "all");
       this._sEdition = "standard";
       UIComponent.prototype.init.apply(this, arguments);
     },