@sapui5/sap.ushell 1.113.0 → 1.115.0

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

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.113.0
+ * @version 1.115.0
  */
 sap.ui.define([
     "sap/ushell/components/container/ApplicationContainer",
@@ -560,8 +560,6 @@ sap.ui.define([
         //that needs to comunicate with the Message Broker. The handler will currently be limited
         //to process only message broker events.
         function handleMessageEventForDetaultListener (oMessage) {
-            var that = this;
-
             try {
                 var oMessageData = oMessage.data;
                 //limit to handle only message broker events. other events are ignored.
@@ -569,8 +567,8 @@ sap.ui.define([
                     try {
                         oMessageData = JSON.parse(oMessage.data);
                         if (typeof oMessageData === "object" && oMessageData.type === "request" && oMessageData.service === "sap.ushell.services.MessageBroker") {
-                            sap.ushell.Container.getServiceAsync("MessageBroker").then(function (MessageBrokerService) {
-                                var sVal = MessageBrokerService.getAcceptedOrigins().find(function (sOrigin) {
+                            sap.ushell.Container.getServiceAsync("MessageBroker").then(function (oMessageBrokerService) {
+                                var sVal = oMessageBrokerService.getAcceptedOrigins().find(function (sOrigin) {
                                     return sOrigin === oMessage.origin;
                                 });
                                 if (sVal === undefined) {
@@ -587,7 +585,14 @@ sap.ui.define([
                 Log.error(e.message, e.stack);
             }
         }
-        addEventListener("message", handleMessageEventForDetaultListener.bind(this));
+
+        if (sap.ushell && sap.ushell.Container && sap.ushell.Container.getServiceAsync) {
+            sap.ushell.Container.getServiceAsync("MessageBroker").then(function (oMessageBrokerService) {
+                if (oMessageBrokerService.isEnabled()) {
+                    addEventListener("message", handleMessageEventForDetaultListener.bind(that));
+                }
+            });
+        }
     }
 
     /**
@@ -763,7 +768,7 @@ sap.ui.define([
             } else {
                 var sMessage = JSON.stringify(oMessage);
 
-                Log.debug("Sending postMessage " + sMessage + " to iframe with id '" + oIFrame.id + "'");
+                Log.debug("Sending postMessage " + sMessage + " to iframe with domain '" + sTargetDomain + "'");
                 if (bWaitForResponse) {
                     window.addEventListener("message", fnProcessClientMessage, false);
                     if (bFromContainer === true) {

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

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.113.0
+ * @version 1.115.0
  */
 sap.ui.define([
     "sap/ushell/components/applicationIntegration/application/BlueBoxesCache",
@@ -77,14 +77,14 @@ sap.ui.define([
                         Core.getEventBus().publish("launchpad", "appOpening", oTarget);
                         Application.postMessageToIframeApp(
                             oInnerControl, "sap.ushell.services.appLifeCycle", "create", oPostParams, true)
-                            .then(function () {
+                            .then(function (oResult) {
                                 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);
-                                    oDeferred.resolve();
+                                    oDeferred.resolve(oResult && oResult.body && oResult.body.result);
                                 });
                             });
                     }
@@ -364,7 +364,7 @@ sap.ui.define([
         };
 
         this._getBlueBoxCacheKey = function (sUrl) {
-            return BlueBoxesCache.getBlueBoxCacheKey(sUrl);
+            return BlueBoxesCache.getBlueBoxCacheKeyValues(sUrl).sKey;
         };
 
         this.deleteStateFul = function (sUrl) {

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

@@ -16,12 +16,15 @@ sap.ui.define([
     }
 
     function add (sUrl, oIframe) {
-        var sKey = getBlueBoxCacheKey(sUrl);
-        oCacheStorage[sKey] = oIframe;
+        var oKeyValues = getBlueBoxCacheKeyValues(sUrl);
+        oCacheStorage[oKeyValues.sKey] = {
+            oContainer: oIframe,
+            oKeyValues: oKeyValues
+        };
     }
 
     function remove (sUrl) {
-        var sKey = getBlueBoxCacheKey(sUrl);
+        var sKey = getBlueBoxCacheKeyValues(sUrl).sKey;
         if (oCacheStorage[sKey]) {
             delete oCacheStorage[sKey];
         }
@@ -31,15 +34,15 @@ sap.ui.define([
         if (sUrl === undefined || getSize() === 0) {
             return undefined;
         }
-        var sKey = getBlueBoxCacheKey(sUrl);
+        var sKey = getBlueBoxCacheKeyValues(sUrl).sKey;
 
-        return (sKey !== undefined ? oCacheStorage[sKey] : undefined);
+        return (sKey && oCacheStorage.hasOwnProperty(sKey) ? oCacheStorage[sKey].oContainer : undefined);
     }
 
     function getById (sId) {
         for (var sKey in oCacheStorage) {
             if (oCacheStorage.hasOwnProperty(sKey)) {
-                var oEntry = oCacheStorage[sKey];
+                var oEntry = oCacheStorage[sKey].oContainer;
 
                 if (oEntry.sId === sId) {
                     return oEntry;
@@ -50,7 +53,7 @@ sap.ui.define([
         return undefined;
     }
 
-    function getBlueBoxCacheKey (sUrl) {
+    function getBlueBoxCacheKeyValues (sUrl) {
         var oUri,
             sOrigin,
             oParams,
@@ -58,11 +61,18 @@ sap.ui.define([
             sUI5Version = "",
             sKeepAlive = "",
             sTestUniqueId = "",
-            sBlueBoxCacheKey;
+            oRes = {
+                sKey: "",
+                sOrigin: "",
+                sIframeHint: "",
+                sUI5Version: "",
+                sKeepAlive: ""
+            };
 
         //special cases
         if (sUrl === undefined || sUrl === "" || sUrl === "../") {
-            return sUrl;
+            oRes.sKey = sUrl;
+            return oRes;
         }
 
         try {
@@ -79,16 +89,19 @@ sap.ui.define([
                 }
             }
             oParams = oUri.query(true);
-            if (oParams["sap-iframe-hint"]) {
-                sIframeHint = "@" + oParams["sap-iframe-hint"];
+            if (oParams.hasOwnProperty("sap-iframe-hint")) {
+                oRes.sIframeHint = oParams["sap-iframe-hint"];
+                sIframeHint = "@" + oRes.sIframeHint;
             }
-            if (oParams["sap-ui-version"]) {
-                sUI5Version = "@" + oParams["sap-ui-version"];
+            if (oParams.hasOwnProperty("sap-ui-version")) {
+                oRes.sUI5Version = oParams["sap-ui-version"];
+                sUI5Version = "@" + oRes.sUI5Version;
             }
-            if ((sIframeHint === "@GUI" || sIframeHint === "@WDA" || sIframeHint === "@WCF") && oParams["sap-keep-alive"]) {
-                sKeepAlive = "@" + oParams["sap-keep-alive"] + "-" + sUrl.split("#")[0];
+            if ((sIframeHint === "@GUI" || sIframeHint === "@WDA" || sIframeHint === "@WCF") && oParams.hasOwnProperty("sap-keep-alive")) {
+                oRes.sKeepAlive = oParams["sap-keep-alive"];
+                sKeepAlive = "@" + oRes.sKeepAlive + "-" + sUrl;
             }
-            if (oParams["sap-testcflp-iframeid"]) {
+            if (oParams.hasOwnProperty("sap-testcflp-iframeid")) {
                 sTestUniqueId = "@" + oParams["sap-testcflp-iframeid"];
             }
         } catch (ex) {
@@ -99,9 +112,10 @@ sap.ui.define([
             sOrigin = sUrl;
         }
 
-        sBlueBoxCacheKey = sOrigin + sIframeHint + sUI5Version + sKeepAlive + sTestUniqueId;
+        oRes.sOrigin = sOrigin;
+        oRes.sKey = sOrigin + sIframeHint + sUI5Version + sKeepAlive + sTestUniqueId;
 
-        return sBlueBoxCacheKey;
+        return oRes;
     }
 
     return {
@@ -111,6 +125,6 @@ sap.ui.define([
         remove: remove,
         get: get,
         getById: getById,
-        getBlueBoxCacheKey: getBlueBoxCacheKey
+        getBlueBoxCacheKeyValues: getBlueBoxCacheKeyValues
     };
 }, /* bExport= */ false);

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview defines the post message API for all applications running in iframe within the shell
- * @version 1.113.0
+ * @version 1.115.0
  * @private
  */
 sap.ui.define([
@@ -23,7 +23,8 @@ sap.ui.define([
     "sap/m/library",
     "sap/ui/thirdparty/hasher",
     "sap/ushell/resources",
-    "sap/ushell/ui/shell/ShellHeadItem"
+    "sap/ushell/ui/shell/ShellHeadItem",
+    "sap/ui/core/Configuration"
 ], function (
     utils,
     coreLib,
@@ -42,7 +43,8 @@ sap.ui.define([
     mobileLibrary,
     hasher,
     resources,
-    ShellHeadItem
+    ShellHeadItem,
+    CoreConfiguration
 ) {
     "use strict";
 
@@ -536,15 +538,17 @@ sap.ui.define([
                         return oDeferred.promise();
                     }
                 },
-                makeStatePersistent: function (oServiceParams) {
-                    var oDeferred = new jQuery.Deferred();
-                    sap.ushell.Container.getServiceAsync("AppState").then(function (oAppStateService) {
-                        oAppStateService.makeStatePersistent(
-                            oServiceParams.oMessageData.body.sKey,
-                            oServiceParams.oMessageData.body.iPersistencyMethod,
-                            oServiceParams.oMessageData.body.oPersistencySettings).then(oDeferred.resolve, oDeferred.reject);
-                    });
-                    return oDeferred.promise();
+                makeStatePersistent: {
+                   executeServiceCallFn: function (oServiceParams) {
+                       var oDeferred = new jQuery.Deferred();
+                       sap.ushell.Container.getServiceAsync("AppState").then(function (oAppStateService) {
+                           oAppStateService.makeStatePersistent(
+                               oServiceParams.oMessageData.body.sKey,
+                               oServiceParams.oMessageData.body.iPersistencyMethod,
+                               oServiceParams.oMessageData.body.oPersistencySettings).then(oDeferred.resolve, oDeferred.reject);
+                       });
+                       return oDeferred.promise();
+                   }
                 }
             }
         },
@@ -910,6 +914,15 @@ sap.ui.define([
                         return oDeferred.promise();
                     }
                 },
+                getShellUserInfo: {
+                    executeServiceCallFn: function (oServiceParams) {
+                        var oDeferred = new jQuery.Deferred();
+                        sap.ushell.Container.getServiceAsync("UserInfo").then(function (oUserInfoService) {
+                            oUserInfoService.getShellUserInfo().then(oDeferred.resolve, oDeferred.reject);
+                        });
+                        return oDeferred.promise();
+                    }
+                },
                 getLanguageList: {
                     executeServiceCallFn: function (oServiceParams) {
                         var oDeferred = new jQuery.Deferred();
@@ -941,6 +954,29 @@ sap.ui.define([
                         EventHub.emit("openThemeManager", Date.now());
                         return new jQuery.Deferred().resolve().promise();
                     }
+                },
+                getLocaleData: {
+                    executeServiceCallFn: function (oServiceParams) {
+                        var oLocaleData = {},
+                            oFormatSettings = CoreConfiguration.getFormatSettings();
+                        // get date format
+                        oLocaleData.dateFormatShort = oFormatSettings.getDatePattern("short");
+                        oLocaleData.dateFormatMedium = oFormatSettings.getDatePattern("medium");
+                        // get number format
+                        oLocaleData.numberFormatGroup = oFormatSettings.getNumberSymbol("group");
+                        oLocaleData.numberFormatDecimal = oFormatSettings.getNumberSymbol("decimal");
+                        // get time format
+                        oLocaleData.timeFormatShort = oFormatSettings.getTimePattern("short");
+                        oLocaleData.timeFormatMedium = oFormatSettings.getTimePattern("medium");
+                        // get calendar customizing
+                        oLocaleData.calendarMapping = oFormatSettings.getLegacyDateCalendarCustomizing();
+                        // get timezone
+                        oLocaleData.timeZone = CoreConfiguration.getTimezone();
+                        // get currency formats
+                        oLocaleData.currencyFormats = oFormatSettings.getCustomCurrencies();
+
+                        return new jQuery.Deferred().resolve(oLocaleData).promise();
+                    }
                 }
             }
         },
@@ -1256,14 +1292,19 @@ sap.ui.define([
                 _execute: {
                     executeServiceCallFn: function (oServiceParams) {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ui.require(["sap/ushell/services/_MessageBroker/MessageBrokerEngine"], function (MessageBrokerEngine) {
-                            MessageBrokerEngine.processPostMessage(oServiceParams)
-                                .then(function (oResolvedData) {
-                                    oDeferred.resolve(oResolvedData);
-                                })
-                                .catch(function (sError) {
-                                    oDeferred.reject(sError);
+
+                        sap.ushell.Container.getServiceAsync("MessageBroker").then(function (oMessageBrokerService) {
+                            if (oMessageBrokerService.isEnabled()) {
+                                sap.ui.require(["sap/ushell/services/_MessageBroker/MessageBrokerEngine"], function (MessageBrokerEngine) {
+                                    MessageBrokerEngine.processPostMessage(oServiceParams)
+                                        .then(function (oResolvedData) {
+                                            oDeferred.resolve(oResolvedData);
+                                        })
+                                        .catch(function (sError) {
+                                            oDeferred.reject(sError);
+                                        });
                                 });
+                            }
                         });
                         return oDeferred.promise();
                     }
@@ -1448,7 +1489,7 @@ sap.ui.define([
                 oValue;
 
             sap.ushell.Container.getServiceAsync("AppState").then(function (oAppStateService) {
-                oNewState = oAppStateService.createEmptyAppState(undefined, false);
+                oNewState = oAppStateService.createEmptyAppState();
                 if (oServiceParams.oMessageData.body.sData !== undefined) {
                     try {
                         oValue = JSON.parse(oServiceParams.oMessageData.body.sData);

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

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.113.0
+ * @version 1.115.0
  */
 sap.ui.define([
     "sap/base/util/extend",

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The models assosicated with the applciation.
- * @version 1.113.0
+ * @version 1.115.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-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the services for the different applications.
- * @version 1.113.0
+ * @version 1.115.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-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the related shell elements of the different applications.
- * @version 1.113.0
+ * @version 1.115.0
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -2,7 +2,8 @@
 
 sap.ui.define([
   "sap/ui/core/UIComponent",
-  "sap/ushell/components/cepsearchresult/app/util/appendStyleVars"
+  "sap/ushell/components/cepsearchresult/app/util/appendStyleVars",
+  "./util/Edition"
 ], function (UIComponent, appendStyleVars) {
   "use strict";
 
@@ -13,19 +14,6 @@ sap.ui.define([
     "_sap_m_IconTabBar_HeaderBackground"
   ]);
 
-  /* Utility functions */
-
-  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 sDefault || "";
-  }
-
   /**
    * Component of the Search Result Application.
    *
@@ -40,70 +28,9 @@ sap.ui.define([
    * @since 1.110.0
    * @alias sap.ushell.components.cepsearchresult.app.Component
    */
-  var Component = UIComponent.extend("sap.ushell.components.cepsearchresult.app.Component", /** @lends sap.ushell.components.cepsearchresult.app.Component */{
+  return UIComponent.extend("sap.ushell.components.cepsearchresult.app.Component", /** @lends sap.ushell.components.cepsearchresult.app.Component */{
     metadata: {
       manifest: "json"
-    },
-
-    /**
-     * Initializes the component and defaults its intent parameters
-     *
-     * @private
-     */
-    init: function () {
-      // get intent parameter values
-      this._sSearchTerm = getSingleIntentParameter("searchTerm", "");
-      this._sCategory = getSingleIntentParameter("category", "all");
-      this._sEdition = "standard";
-      UIComponent.prototype.init.apply(this, arguments);
-    },
-
-    /**
-     * Returns the search term the component was initialized with by the corresponding intent.
-     *
-     * @private
-     * @returns {string} the current search term.
-     */
-    getSearchTerm: function () {
-      return this._sSearchTerm;
-    },
-
-    /**
-     * Returns the category the component was initialized with by the corresponding intent.
-     *
-     * @private
-     * @returns {string} the current category.
-     */
-    getCategory: function () {
-      return this._sCategory;
-    },
-
-    /**
-     * Returns the search configuration for the component "standard", "advanced".
-     *
-     * @private
-     * @returns {string} the current searchConfig.
-     */
-    getSearchConfig: function () {
-      if (window["sap-ushell-config"] &&
-        window["sap-ushell-config"].ushell &&
-        window["sap-ushell-config"].ushell.cepSearchConfig) {
-        this._sEdition = window["sap-ushell-config"].ushell.cepSearchConfig;
-      }
-
-      var oComponentData = this.getComponentData();
-      if (oComponentData && oComponentData.searchConfig) {
-        this._sEdition = oComponentData.searchConfig;
-      }
-      return this._sEdition;
-    },
-
-    changeEdition: function (sEdition) {
-      this._sEdition = sEdition;
-      if (this.getRootControl() && this.getRootControl().getController()) {
-        this.getRootControl().getController().initSearchResultManager();
-      }
     }
   });
-  return Component;
 });