@sapui5/sap.ushell 1.111.0 → 1.112.0

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

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.111.0
+ * @version 1.112.0
  */
 sap.ui.define([
     "sap/ushell/components/applicationIntegration/elements/model",
@@ -24,7 +24,8 @@ sap.ui.define([
     "sap/ushell/EventHub",
     "sap/ushell/utils/UrlParsing",
     "sap/ui/core/Core",
-    "sap/ui/thirdparty/hasher"
+    "sap/ui/thirdparty/hasher",
+    "sap/ushell/services/_MessageBroker/MessageBrokerEngine"
 ], function (
     ElementsModel,
     Storage,
@@ -46,7 +47,8 @@ sap.ui.define([
     EventHub,
     oUrlParsing,
     Core,
-    hasher
+    hasher,
+    MessageBrokerEngine
 ) {
     "use strict";
 
@@ -88,6 +90,10 @@ sap.ui.define([
                 RESTRICTED: "restricted"
             };
 
+        //connect FLP to the message broker
+        if (window.QUnit === undefined) {
+            MessageBrokerEngine.connect("FLP");
+        }
         this.shellElements = function () {
             return RelatedShellElements;
         };
@@ -1367,7 +1373,8 @@ sap.ui.define([
             if (oTargetAppContainer && BlueBoxHandler.isStatefulContainerSupported(oTargetAppContainer)) {
                 iLastValidTimeDelta = new Date().getTime() - oTargetAppContainer.getIsIframeValidTime().time;
                 if ((BlueBoxHandler.isIframeBusySupported(oTargetAppContainer) && oTargetAppContainer.getIsIframeBusy() === true) ||
-                    (BlueBoxHandler.isIframeIsValidSupported(oTargetAppContainer) && iLastValidTimeDelta >= 3500)) {
+                    (BlueBoxHandler.isIframeIsValidSupported(oTargetAppContainer) && iLastValidTimeDelta >= 3500) ||
+                    oTargetAppContainer.getIsInvalidIframe() === true) {
                     Log.warning(
                         "Destroying statefull container iframe due to unresponsiveness (" + oTargetAppContainer.getId() + ")",
                         "reason: " + (oTargetAppContainer.getIsIframeBusy() === true ? "iframe is still creating a different app" :
@@ -1540,6 +1547,12 @@ sap.ui.define([
                         // going to be reused, we prompt the container to load the new application context.
                         var oPromiseAsyncAppCreate = new jQuery.Deferred().resolve().promise();
                         if (bReuseStatefulContainer) {
+                            //for scube - make sure the container is active before we open the app
+                            //to allow post messages form the iframe to flp that are sent
+                            //as part of the target resolution process
+                            if (oTarget.appCapabilities && oTarget.appCapabilities.appFrameworkId === "UI5") {
+                                oInnerControl.setProperty("active", true, true);
+                            }
                             oPromiseAsyncAppCreate = that.handleOpenStateful(bIsInitial, bIsInCache, "application" + sAppId, oInnerControl, oTarget, sFixedShellHash, oKeepAliveMode);
                         } 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
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.111.0
+ * @version 1.112.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
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.111.0
+ * @version 1.112.0
  */
 sap.ui.define([
     "sap/ushell/components/container/ApplicationContainer",
@@ -27,6 +27,9 @@ sap.ui.define([
         this.handleMessageEvent = function (oContainer, oMessage, oMessageStatus, bIsGlobalMessageListener) {
             var oMessageData = oMessage.data;
 
+            if (bIsGlobalMessageListener === undefined) {
+                bIsGlobalMessageListener = false;
+            }
             if (typeof oMessageData === "string") {
                 // it's possible that the data attribute is passed as string (IE9)
                 try {
@@ -111,13 +114,22 @@ sap.ui.define([
                 null,
                 "sap.ushell.components.container.ApplicationContainer");
 
+            if (bIsGlobalMessageListener === undefined) {
+                bIsGlobalMessageListener = false;
+            }
+
             //validate that service is valid
             if (oMessageData.type !== "request" || !sService) {
                 return;
             }
 
+            //message broker messages should be processed only by FLP's default listener
             if (sService === "sap.ushell.services.MessageBroker") {
-                sService = sService.concat("._execute");
+                if (bIsGlobalMessageListener === true) {
+                    sService = sService.concat("._execute");
+                } else {
+                    return;
+                }
             }
 
             for (var oEntryCommHandlerKey in oShellCommunicationHandlersObj) {
@@ -155,7 +167,7 @@ sap.ui.define([
             }
 
             // custom trusted callback
-            if ((!bIsGlobalMessageListener || bIsGlobalMessageListener === false) && !ApplicationContainer.prototype._isTrustedPostMessageSource(oContainer, oMessage)) {
+            if (bIsGlobalMessageListener === false && !ApplicationContainer.prototype._isTrustedPostMessageSource(oContainer, oMessage)) {
                 // log w/ warning level, message would normally processed by us
                 Log.warning("Received message from untrusted origin '" + oMessage.origin + "': "
                     + JSON.stringify(oMessage.data),
@@ -544,29 +556,28 @@ sap.ui.define([
         };
 
 
-        //Add default event handler that will be used mainly by plugins running in an iframe,
+        //Add default event handler that will be used also by plugins running in an iframe,
         //that needs to comunicate with the Message Broker. The handler will currently be limited
         //to process only message broker events.
         function handleMessageEventForDetaultListener (oMessage) {
-            try {
-                //if the post message arrived from one of the iframes that FLP opened (applications),
-                //we do not need to process the message becasue there is already an handler that will
-                //handle those message
-                var iIndex = jQuery("#viewPortContainer").find("iframe").toArray().findIndex(function (oIframe) {
-                    return oIframe.contentWindow === oMessage.source;
-                });
-                if (iIndex > -1) {
-                    return;
-                }
+            var that = this;
 
+            try {
                 var oMessageData = oMessage.data;
-                if (typeof oMessageData === "string") {
-                    // it's possible that the data attribute is passed as string (IE9)
+                //limit to handle only message broker events. other events are ignored.
+                if (typeof oMessageData === "string" && oMessageData.indexOf("sap.ushell.services.MessageBroker") > 0) {
                     try {
                         oMessageData = JSON.parse(oMessage.data);
-                        //limit to handle only message broker events. other apis are ignored.
                         if (typeof oMessageData === "object" && oMessageData.type === "request" && oMessageData.service === "sap.ushell.services.MessageBroker") {
-                            this.handleMessageEvent(undefined, oMessage, {}, true);
+                            sap.ushell.Container.getServiceAsync("MessageBroker").then(function (MessageBrokerService) {
+                                var sVal = MessageBrokerService.getAcceptedOrigins().find(function (sOrigin) {
+                                    return sOrigin === oMessage.origin;
+                                });
+                                if (sVal === undefined) {
+                                    return;
+                                }
+                                that.handleMessageEvent(undefined, oMessage, {}, true);
+                            });
                         }
                     } catch (e) {
                         return;

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

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.111.0
+ * @version 1.112.0
  */
 sap.ui.define([
     "sap/ushell/components/applicationIntegration/application/BlueBoxesCache",

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.111.0
+ * @version 1.112.0
  * @private
  */
 sap.ui.define([
@@ -231,7 +231,11 @@ sap.ui.define([
                         oHash.appSpecificRoute = oServiceParams.oMessageData.body.appSpecificRoute;
                         sNewHash = "#" + UrlParsing.constructShellHash(oHash);
                         hasher.disableBlueBoxHashChangeTrigger = true;
-                        hasher.replaceHash(sNewHash);
+                        if (oServiceParams.oMessageData.body.writeHistory === true || oServiceParams.oMessageData.body.writeHistory === "true") {
+                            hasher.setHash(sNewHash);
+                        } else {
+                            hasher.replaceHash(sNewHash);
+                        }
                         hasher.disableBlueBoxHashChangeTrigger = false;
                         return new jQuery.Deferred().resolve().promise();
                     }
@@ -777,6 +781,15 @@ sap.ui.define([
 
                         return new jQuery.Deferred().resolve(sSystemAlias).promise();
                     }
+                },
+                setAppInfo: {
+                    executeServiceCallFn: function (oServiceParams) {
+                        sap.ushell.Container.getServiceAsync("AppLifeCycle").then(function (AppLifeCycleService) {
+                            AppLifeCycleService.setAppInfo(oServiceParams.oMessageData.body);
+
+                        });
+                        return new jQuery.Deferred().resolve().promise();
+                    }
                 }
             }
         },
@@ -870,6 +883,12 @@ sap.ui.define([
                         oServiceParams.oContainer.setProperty("isIframeBusy", oServiceParams.oMessageData.body.bValue, true);
                         return new jQuery.Deferred().resolve().promise();
                     }
+                },
+                isInvalidIframe: {
+                    executeServiceCallFn: function (oServiceParams) {
+                        oServiceParams.oContainer.setProperty("isInvalidIframe", oServiceParams.oMessageData.body.bValue, true);
+                        return new jQuery.Deferred().resolve().promise();
+                    }
                 }
             }
         },

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

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.111.0
+ * @version 1.112.0
  */
 sap.ui.define([
     "sap/base/util/extend",
@@ -70,7 +70,7 @@ sap.ui.define([
                 var oTitles = Config.last("/core/shell/model/currentSpaceAndPage");
                 if (oTitles !== undefined) {
                     oHierarchy.splice(0, 0, { // insert at 0 index because the hierarchy is shown as stack
-                        icon: "sap-icon://circle-task-2",
+                        icon: "sap-icon://space-navigation",
                         title: oTitles.pageTitle,
                         subtitle: oTitles.pageTitle !== oTitles.spaceTitle ? oTitles.spaceTitle : undefined, // Do not show the same string twice if space name is the same as page name
                         intent: "#" + oTitles.hash
@@ -157,7 +157,7 @@ sap.ui.define([
          */
         this._getDefaultFavIcon = function (oParameters) {
             var favIcon = oParameters.get("sapUiShellFavicon");
-            if (favIcon) {
+            if (favIcon) { // custom theme favicon
                 var match = /url[\s]*\('?"?([^'")]*)'?"?\)/.exec(favIcon);
                 if (match) {
                     favIcon = match[1];
@@ -166,7 +166,12 @@ sap.ui.define([
                 }
             }
 
-            if (!favIcon) {
+            var sConfigFavicon = Config.last("/core/shell/favIcon");
+            if (sConfigFavicon && (favIcon === null)) { // configuration favicon
+                return sConfigFavicon;
+            }
+
+            if (!favIcon) { // default favicon
                 var sModulePath = sap.ui.require.toUrl("sap/ushell");
                 return sModulePath + "/themes/base/img/launchpad_favicon.ico";
             }

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The models assosicated with the applciation.
- * @version 1.111.0
+ * @version 1.112.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
 /**
  * @fileOverview handle all the services for the different applications.
- * @version 1.111.0
+ * @version 1.112.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
 /**
  * @fileOverview handle all the related shell elements of the different applications.
- * @version 1.111.0
+ * @version 1.112.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/cepsearchresult/app/Main.controller.js

@@ -23,19 +23,13 @@ sap.ui.define([
       var oCard = this.getView().byId("searchResultWidget");
       if (!this.oHost) {
         this.oHost = new Host({
-          actions: [
-            {
-              type: 'Navigation',
-              action: this.handleCardAction.bind(this)
-            }
-          ],
           id: "searchAppHost",
           resolveDestination: function (sName) {
             return null; // TODO
           }
         });
         oCard.setHost(this.oHost);
-        // oCard.attachAction(this.handleCardAction.bind(this));
+        this.oHost.attachAction(this.handleCardAction.bind(this));
       }
     },
     initSearchResultManager: function () {

package/src/main/js/sap/ushell/components/cepsearchresult/app/cards/searchresultwidget/controls/Paginator.css

@@ -1,9 +1,20 @@
 .sapUiCEPCatPag .sapMBtnDisabled.sapUiCEPCatPagNumber {
   opacity: 1 !important;
 }
-
-.sapUiCEPCatPag .sapMBtnDisabled.sapUiCEPCatPagNumber .sapMBtnText{
-  background-color: var(--sapUiButtonBackground) !important;
+.sapUiCEPCatPag .sapMBtn:hover .sapMBtnDefault {
+  border-color: transparent !important;
+  box-shadow: unset !important;
+}
+.sapUiCEPCatPag .sapMBtn .sapMBtnDefault {
+  background-color: transparent !important;
+  border-color: transparent;
+  font-family:inherit !important;
+}
+.sapUiCEPCatPag .sapMBtnDisabled .sapMBtnDefault {
   color: var(--sapUiBaseText) !important;
+  font-weight: bold;
   border-color: transparent;
 }
+.sapUiCEPCatPag .sapMBtnDefault, .sapUiCEPCatPag .sapMBtn:not(.sapMBtnDisabled) .sapUiIcon {
+  color: var(--sapUiLinkActiveColor) !important;
+}

package/src/main/js/sap/ushell/components/cepsearchresult/app/cards/searchresultwidget/controls/Paginator.js

@@ -6,7 +6,7 @@ sap.ui.define([
   "sap/ui/core/Control",
   "sap/m/ToggleButton",
   "sap/ui/core/delegate/ItemNavigation",
-  "sap/ushell/components/cepsearchresult/app/util/appendStyleVars",
+  "../../../util/appendStyleVars",
   "sap/ui/dom/includeStylesheet"
   ], function (
   Control,
@@ -20,7 +20,8 @@ sap.ui.define([
   // Append the style vars for css
   appendStyleVars([
     "sapUiBaseText",
-    "sapUiButtonBackground"
+    "sapUiButtonBackground",
+    "sapUiLinkActiveColor"
   ]);
 
   // Include the css for the control once
@@ -41,7 +42,7 @@ sap.ui.define([
         },
         count: {
           type: "int",
-          defaultValue: 100
+          defaultValue: 0
         },
         currentPage: {
           type: "int",
@@ -49,7 +50,7 @@ sap.ui.define([
         },
         segmentSize: {
           type: "int",
-          defaultValue: 6
+          defaultValue: 7
         }
 
       },
@@ -97,10 +98,14 @@ sap.ui.define([
     // get some vars to avoid getter calls for all calculations
     var iPageSize = this.getPageSize();
     var iPages = Math.ceil(this.getCount() / iPageSize);
-    var iCurrentPage = this.getCurrentPage();
+    var iCurrentPage = Math.min(this.getCurrentPage(), iPages);
     var iSegmentSize = this.getSegmentSize();
-    var iSegments = Math.ceil(iPages / iSegmentSize);
-    var iCurrentSegment = Math.ceil(iCurrentPage / iSegmentSize);
+    var iCurrentSegmentStart = Math.max(iCurrentPage - Math.floor(iSegmentSize / 2), 1);
+    var iCurrentSegmentEnd = Math.min(iCurrentSegmentStart + iSegmentSize - 1, iPages);
+    if (iCurrentSegmentEnd === iPages) {
+      iCurrentSegmentStart = Math.max(iPages - iSegmentSize + 1, 1);
+    }
+
 
      // left arrow
     var oLeftArrow = new Button({
@@ -113,14 +118,34 @@ sap.ui.define([
     });
     this.addAggregation("_buttons", oLeftArrow);
 
+    // first page
+    if (iCurrentSegmentStart > 1) {
+      var oFirstPage = new Button({
+        text: "1",
+        enabled: iCurrentPage > 1,
+        visible: iCurrentPage > 1,
+        press: function () {
+          this._setCurrentPageWithEvent(1);
+        }.bind(this)
+      });
+      this.addAggregation("_buttons", oFirstPage);
+      var oPrevSegmentPage = new Button({
+        text: iCurrentSegmentStart === 3 ? 2 : "...",
+        enabled: iCurrentPage >= iCurrentSegmentStart,
+        visible: iPages > iSegmentSize && iCurrentSegmentStart > 2,
+        press: function () {
+          this._setCurrentPageWithEvent(iCurrentSegmentStart - 1);
+        }.bind(this)
+      });
+      this.addAggregation("_buttons", oPrevSegmentPage);
+    }
     // numbered paging buttons, starts with 1
-    for (var i = 1; i <= iPages; i++) {
+    for (var i = iCurrentSegmentStart; i <= iCurrentSegmentEnd; i++) {
       var oButton = new Button({
         text: "" + i,
         pressed: i === iCurrentPage,
         enabled: i !== iCurrentPage,
-        visible: iPages > 1 && (Math.ceil(i / iSegmentSize) === iCurrentSegment ||
-          (iCurrentSegment === iSegments && i > iPages - iSegmentSize)),
+        visible: true,
         press: (function (oPaginator, iPage) {
           return function () {
             oPaginator._setCurrentPageWithEvent(iPage);
@@ -130,6 +155,26 @@ sap.ui.define([
       oButton.addStyleClass("sapUiCEPCatPagNumber");
       this.addAggregation("_buttons", oButton);
     }
+    if (iCurrentSegmentEnd < iPages) {
+      var oNextSegmentPage = new Button({
+        text: iCurrentSegmentEnd === iPages - 2 ? iPages - 1 : "...",
+        enabled: true,
+        visible: iPages > 1 && iCurrentPage <= iPages - (iSegmentSize / 2),
+        press: function () {
+          this._setCurrentPageWithEvent(iCurrentSegmentEnd + 1);
+        }.bind(this)
+      });
+      this.addAggregation("_buttons", oNextSegmentPage);
+      var oLastPage = new Button({
+        text: "" + iPages,
+        enabled: iCurrentPage !== iPages,
+        visible: iPages > 1,
+        press: function () {
+          this._setCurrentPageWithEvent(iPages);
+        }.bind(this)
+      });
+      this.addAggregation("_buttons", oLastPage);
+    }
 
     // right arrow
     var oRightArrow = new Button({
@@ -162,7 +207,8 @@ sap.ui.define([
       .setCycling(false)
       .setTableMode(true, true)
       .setColumns(this.getAggregation("_buttons").length)
-      .setRootDomRef(this.getDomRef());
+      .setRootDomRef(this.getDomRef())
+      .setPageSize(this.getPageSize());
 
     var aNavigationItems = Array.from(this.getDomRef().querySelectorAll(".sapMBtn"));
     this._oItemNavigation.setItemDomRefs(aNavigationItems);

package/src/main/js/sap/ushell/components/container/ApplicationContainer.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The UI integration's SAPUI5 control which supports application embedding.
- * @version 1.111.0
+ * @version 1.112.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -76,7 +76,8 @@ sap.ui.define([
         bKeepMessagesForPlugins = false,
         arrMessagesForPlugins = [],
         arrMessagesIdx = 0,
-        iIframeIdx = 0;
+        iIframeIdx = 0,
+        oMessageBrokerServicePromise;
 
     //These params should be excluded from the URL for WDA & WebGUI apps
     var URL_PARAMS_FILTER = ["sap-ach", "sap-fiori-id", "sap-hide-intent-link", "sap-priority", "sap-tag",
@@ -1123,6 +1124,14 @@ sap.ui.define([
             }
         }
 
+        //add the url origin to the allowed origins list of the message broker
+        if (oMessageBrokerServicePromise) {
+            oMessageBrokerServicePromise.then(function (oMessageBrokerService) {
+                oMessageBrokerService.addAcceptedOrigin(new URI(sUrl).origin());
+            });
+        }
+
+        //preperations to open the iframe with POST (vs the default GET)
         if (sApplicationType === "TR") {
             oContainer.setProperty("iframePostAllParams", true, true);
         }
@@ -1570,7 +1579,8 @@ sap.ui.define([
                 frameworkId: { defaultValue: "", type: "string" },
                 iframeReusedForApp: { defaultValue: false, type: "boolean" },
                 isIframeValidTime: { defaultValue: {time: 0}, type: "object" },
-                isIframeBusy: { defaultValue: false, type: "boolean" }
+                isIframeBusy: { defaultValue: false, type: "boolean" },
+                isInvalidIframe: { defaultValue: false, type: "boolean" }
             },
             events: {
                 applicationConfiguration: {}
@@ -1666,6 +1676,9 @@ sap.ui.define([
 
             that._messageEventListener = ApplicationContainer.prototype._handleMessageEvent.bind(null, that);
             addEventListener("message", that._messageEventListener);
+            if (!oMessageBrokerServicePromise && sap.ushell.Container && sap.ushell.Container.getServiceAsync) {
+                oMessageBrokerServicePromise = sap.ushell.Container.getServiceAsync("MessageBroker");
+            }
         },
 
         onAfterRendering: function (/*oEvent*/) {