@sapui5/sap.ushell 1.113.0 → 1.114.1

package/src/main/js/sap/ushell/components/cepsearchresult/app/{cards/searchresultwidget → util}/controls/Highlighter.js

@@ -30,42 +30,22 @@ sap.ui.define([],
       this._aRegExTerms = [];
       this._bUseExternalStyles = !!oConfig.useExternalStyles; // default is false
       this._oObserver = null;
-
+      this._sQuerySelector = oConfig.querySelector;
       if (Array.isArray(oDomRef)) {
         this._oDomRef = oDomRef;
       } else {
         this._oDomRef = [oDomRef];
       }
 
-      this._oDomRef.forEach(this.validate, this);
-
       if (oConfig.shouldBeObserved) {
         this._addMutationObserver();
       }
     };
 
-    Highlighter.prototype.validate = function (oDomRef) {
-      // If we try to instantiate Highlighter instance for DOM ref, for which we already
-      // have an instance - we throw an error
-      if (HighlighterUtil.CURRENTLY_HIGHLIGHTED_DOM_REFS.indexOf(oDomRef) === -1) {
-        HighlighterUtil.CURRENTLY_HIGHLIGHTED_DOM_REFS.forEach(function (oDom) {
-          if (this._bIsDomNodeDescendant(oDomRef, oDom)) {
-            throw new Error("Desired DOM Ref is parent of DOM Ref which is being highlighted.");
-          } else if (this._bIsDomNodeDescendant(oDom, oDomRef)) {
-            throw new Error("Desired DOM Ref is child of DOM Ref which is being highlighted.");
-          }
-        }, this);
-        HighlighterUtil.CURRENTLY_HIGHLIGHTED_DOM_REFS.push(oDomRef);
-      } else {
-        throw new Error("Highlighter instance is already created for this DOM Reference");
-      }
-    };
-
     Highlighter.prototype.highlight = function (sTerms) {
       var aTerms;
 
       if (!sTerms) {
-        this._restorePreviouslyHighlightedNodes();
         this._aRegExTerms = [];
         this._aOldTerms = [];
         return;
@@ -79,10 +59,6 @@ sap.ui.define([],
       this._aOldTerms = aTerms;
       this._cacheRegExTerms();
 
-      if (this._aPreviouslyHighlightedNodes && this._aPreviouslyHighlightedNodes.length > 0) {
-        this._restorePreviouslyHighlightedNodes();
-      }
-
       this._toggleMutationObserver(false);
       this._oDomRef.forEach(function (oDomRef) {
         this._highlightSubTree(oDomRef);
@@ -125,10 +101,15 @@ sap.ui.define([],
 
     Highlighter.prototype._highlightSubTree = function (oRootNode) {
       var oNode,
-        i;
-
-      for (i = 0; i < oRootNode.childNodes.length; i++) {
-        oNode = oRootNode.childNodes[i];
+        i,
+        childNodes;
+      if (oRootNode === this._oDomRef[0] && this._sQuerySelector) {
+        childNodes = this._oDomRef[0].querySelectorAll(this._sQuerySelector);
+      } else {
+        childNodes = oRootNode.childNodes;
+      }
+      for (i = 0; i < childNodes.length; i++) {
+        oNode = childNodes[i];
         this._processNode(oNode);
       }
     };
@@ -136,12 +117,7 @@ sap.ui.define([],
     Highlighter.prototype._processNode = function (oNode) {
       var sText, oRegEx, i, j, oMatches, sCurrentMatch,
         oCurrentMatch, aBlockedIndices, iCurrMatchIndex,
-        oHighligtedNode;
-
-      if (oNode.nodeName === "IFRAME") {
-        this._highlightSubTree(oNode.contentDocument.body);
-        return;
-      }
+        oHighlightedNode;
 
       if (oNode.nodeType === document.ELEMENT_NODE) {
         this._highlightSubTree(oNode);
@@ -173,8 +149,8 @@ sap.ui.define([],
         }
 
         if (Object.keys(oMatches).length !== 0) {
-          oHighligtedNode = this._createHighlightedNode(oMatches, sText);
-          this._replaceNode(oNode, oHighligtedNode);
+          oHighlightedNode = this._createHighlightedNode(oMatches, sText);
+          this._replaceNode(oNode, oHighlightedNode);
         }
       }
     };
@@ -200,13 +176,13 @@ sap.ui.define([],
       });
     };
 
-    Highlighter.prototype._replaceNode = function (oNode, oHighligtedNode) {
+    Highlighter.prototype._replaceNode = function (oNode, oHighlightedNode) {
 
-      if (oNode.parentNode) {
-        oNode.parentNode.replaceChild(oHighligtedNode, oNode);
+      if (oNode.parentNode && oNode.parentNode.closest && oNode.parentNode.closest(this._sQuerySelector)) {
+        oNode.parentNode.replaceChild(oHighlightedNode, oNode);
 
         // we cache which nodes are replaced with such as highlighted spans
-        this._aPreviouslyHighlightedNodes.push(oHighligtedNode); // Highlighted Node with span
+        this._aPreviouslyHighlightedNodes.push(oHighlightedNode); // Highlighted Node with span
         this._aPreviouslyOriginalNodes.push(oNode); // Original Node
       }
     };
@@ -241,7 +217,7 @@ sap.ui.define([],
 
       // split the <code>sText</code> into tokens,
       // including both the tokens to highlight
-      // and the remaing parts of the <code>sText</code> string
+      // and the remaining parts of the <code>sText</code> string
       for (var i = 0; i < aIndices.length; i++) {
         var iTokenIndex = Number(aIndices[i]),
           sToken = oTokensToHighlight[iTokenIndex],
@@ -280,7 +256,6 @@ sap.ui.define([],
     Highlighter.prototype._addMutationObserver = function () {
       this._instantiateMutationObserver();
       this._toggleMutationObserver(true);
-
     };
 
     Highlighter.prototype._removeMutationObserver = function () {
@@ -295,7 +270,7 @@ sap.ui.define([],
           this._oObserver.observe(oDomRef, this.oObserverConfig);
         }, this);
 
-      } else {
+      } else if (this._oObserver) {
         this._oObserver.disconnect();
       }
     };

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

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

package/src/main/js/sap/ushell/components/cepsearchresult/app/{cards/searchresultwidget → util}/controls/Paginator.js

@@ -6,7 +6,7 @@ sap.ui.define([
   "sap/ui/core/Control",
   "sap/m/ToggleButton",
   "sap/ui/core/delegate/ItemNavigation",
-  "../../../util/appendStyleVars",
+  "../appendStyleVars",
   "sap/ui/dom/includeStylesheet"
   ], function (
   Control,
@@ -20,12 +20,11 @@ sap.ui.define([
   // Append the style vars for css
   appendStyleVars([
     "sapUiBaseText",
-    "sapUiButtonBackground",
     "sapUiLinkActiveColor"
   ]);
 
   // Include the css for the control once
-  includeStylesheet(sap.ui.require.toUrl("sap/ushell/components/cepsearchresult/app/cards/searchresultwidget/controls/Paginator.css"));
+  includeStylesheet(sap.ui.require.toUrl("sap/ushell/components/cepsearchresult/app/util/controls/Paginator.css"));
 
   /**
    * Paginator for the Search Result List
@@ -33,7 +32,7 @@ sap.ui.define([
    * @private
    */
   var Paginator = Control.extend(
-    "sap.ushell.components.cepsearchresult.app.cards.searchresultwidget.controls.Paginator", /** @lends sap.ushell.components.cepsearchresult.app.cards.serchresult.controls.Paginator.prototype */ {
+    "sap.ushell.components.cepsearchresult.app.util.controls.Paginator", /** @lends sap.ushell.components.cepsearchresult.app.cards.serchresult.controls.Paginator.prototype */ {
     metadata: {
       properties: {
         pageSize: {
@@ -67,7 +66,8 @@ sap.ui.define([
     },
     renderer: function (rm, oControl) {
       rm.openStart("div", oControl);
-      rm.class("sapUiCEPCatPag");
+      rm.attr("tabIndex", "0");
+      rm.class("sapUiCEPSearchPag");
       rm.openEnd();
       var aButtons = oControl.getAggregation("_buttons") || [];
       for (var i = 0; i < aButtons.length; i++) {
@@ -85,6 +85,7 @@ sap.ui.define([
     this.fireSelectPage({
       page: iValue,
       startIndex: iPageIndex * iPageSize,
+      pageSize: iPageSize,
       endIndex: (iPageIndex + 1) * iPageSize - 1
     });
   };
@@ -145,21 +146,21 @@ sap.ui.define([
         text: "" + i,
         pressed: i === iCurrentPage,
         enabled: i !== iCurrentPage,
-        visible: true,
+        visible: iPages > 1,
         press: (function (oPaginator, iPage) {
           return function () {
             oPaginator._setCurrentPageWithEvent(iPage);
           };
         })(this, i)
       });
-      oButton.addStyleClass("sapUiCEPCatPagNumber");
+      oButton.addStyleClass("sapUiCEPSearchPagNumber");
       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),
+        visible: iCurrentSegmentEnd < iPages - 1,
         press: function () {
           this._setCurrentPageWithEvent(iCurrentSegmentEnd + 1);
         }.bind(this)
@@ -196,26 +197,22 @@ sap.ui.define([
     }
   };
 
-  Paginator.prototype._initNavigation = function () {
+  Paginator.prototype._initKeyboardNavigation = function () {
     // remove old
     this._removeKeyboardNavigation();
 
     // create new
     this._oItemNavigation = new ItemNavigation();
 
+    var aNavigationItems = Array.from(this.getDomRef().querySelectorAll(".sapMBtn"));
     this._oItemNavigation
       .setCycling(false)
       .setTableMode(true, true)
       .setColumns(this.getAggregation("_buttons").length)
       .setRootDomRef(this.getDomRef())
-      .setPageSize(this.getPageSize());
+      .setPageSize(this.getPageSize())
+      .setItemDomRefs(aNavigationItems);
 
-    var aNavigationItems = Array.from(this.getDomRef().querySelectorAll(".sapMBtn"));
-    this._oItemNavigation.setItemDomRefs(aNavigationItems);
-    // eslint-disable-next-line eqeqeq
-    if (this._oItemNavigation.getFocusedIndex() == -1) {
-      this._oItemNavigation.setFocusedIndex(this.getCurrentPage() - 1 + 1); //first button is the arrow button
-    }
     this.addDelegate(this._oItemNavigation);
   };
 
@@ -227,7 +224,7 @@ sap.ui.define([
 
   // After rendering handing
   Paginator.prototype.onAfterRendering = function () {
-    this._initNavigation();
+    this._initKeyboardNavigation();
   };
 
   // Destroy

package/src/main/js/sap/ushell/components/cepsearchresult/app/util/controls/categories/All.js

@@ -0,0 +1,65 @@
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+
+sap.ui.define(
+  ["../Category"],
+  function (Category) {
+    "use strict";
+    var All = Category.extend(
+      "sap.ushell.components.cepsearchresult.app.util.controls.categories.All", /** @lends sap.ushell.components.cepsearchresult.app.util.controls.categories.All.prototype */ {
+      metadata: {
+        aggregations: {
+          _content: {
+            type: "sap.ui.core.Control",
+            multiple: true
+          }
+        }
+      },
+      renderer: function (rm, oControl) {
+        rm.openStart("div", oControl);
+        rm.class("sapUiCEPSearchCatGroup");
+        rm.openEnd();
+        var aContent = oControl.getAggregation("_content");
+        aContent.forEach(function (oContent) {
+          rm.renderControl(oContent);
+        });
+        rm.close("div");
+      }
+    });
+
+    All.prototype.addContent = function () {
+      var aSubCategories = this._oCategoryConfig.subCategories;
+      aSubCategories.forEach(function (oSubCategory) {
+        oSubCategory.instance = this._oEdition.createCategoryInstance(oSubCategory.name);
+        oSubCategory.instance.setFooter("viewAll");
+        oSubCategory.instance.setPageSize(oSubCategory.pageSize);
+        oSubCategory.instance.attachBeforeSearch(function (oEvent) {
+          this.fireBeforeSearch(oEvent.getParameters());
+        }.bind(this));
+        oSubCategory.instance.attachAfterSearch(function (oEvent) {
+          this.fireAfterSearch(oEvent.getParameters());
+        }.bind(this));
+        oSubCategory.instance.attachItemNavigate(function (oEvent) {
+          this.fireItemNavigateSearch(oEvent.getParameters());
+        }.bind(this));
+        oSubCategory.instance.attachViewAll(function (oEvent) {
+          this.fireViewAll(oEvent.getParameters());
+        }.bind(this));
+        this.addAggregation("_content", oSubCategory.instance);
+      }.bind(this));
+    };
+
+    All.prototype.resetData = function () {
+      this.getAggregation("_content").forEach(function (oCategory) {
+        oCategory.resetData();
+      });
+    };
+
+    All.prototype.search = function (sSearchTerm, iSkip, iTop) {
+      this.getAggregation("_content").forEach(function (oCategory) {
+        oCategory.setVisible(this.getVisible());
+        oCategory.search(sSearchTerm, iSkip, iTop);
+      }.bind(this));
+    };
+
+    return All;
+  });

package/src/main/js/sap/ushell/components/cepsearchresult/app/util/controls/categories/Application.js

@@ -0,0 +1,190 @@
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+
+sap.ui.define(
+  [
+    "../Category",
+    "sap/ushell/services/VisualizationInstantiation",
+    "sap/m/CustomListItem",
+    "../../jsSearch",
+    "sap/ui/core/Core"
+  ],
+  function (
+    Category,
+    VisualizationInstantiation,
+    CustomListItem,
+    JSSearchFactory,
+    Core
+  ) {
+    "use strict";
+    var Application = Category.extend(
+      "sap.ushell.components.cepsearchresult.app.util.controls.categories.Application", /** @lends sap.ushell.components.cepsearchresult.app.util.controls.categories.Application.prototype */ {
+      renderer: Category.getMetadata().getRenderer()
+    }
+    );
+
+    var oInstanceFactory = new VisualizationInstantiation();
+    var iTileActivationTime = 1200;
+
+    Application.prototype.getViewSettings = function () {
+      return {
+        views: [
+          {
+            key: "list",
+            icon: "sap-icon://text-align-justified"
+          },
+          {
+            key: "tile",
+            icon: "sap-icon://grid"
+          }
+        ],
+        default: "tile"
+      };
+    };
+
+    Application.prototype.createListItemTemplate = function () {
+      var oListItem = Category.prototype.createListItemTemplate.apply(this);
+      oListItem.attachModelContextChange(this.createTile.bind(this));
+      return oListItem.addStyleClass("list app");
+    };
+
+    Application.prototype.createTileItemTemplate = function () {
+      var oListItem = new CustomListItem({}).addStyleClass("sapUiCEPSearchCatLI");
+      oListItem.attachModelContextChange(this.createTile.bind(this));
+      return oListItem.addStyleClass("tile app");
+    };
+
+    Application.prototype.createTile = function (oEvent) {
+      var oItem = oEvent.getSource();
+      if (oItem.getBindingContext("data")) {
+        var oVizData = oItem.getBindingContext("data").getObject().visualization,
+          oViz = oInstanceFactory.instantiateVisualization(oVizData);
+        if (this.getCurrentView() === "tile") {
+          oViz.addStyleClass(oVizData.displayFormatHint);
+          this.activateTile(oViz);
+          oItem.destroyContent();
+        } else {
+          if (oItem.getContent().length > 1) {
+            oItem.removeContent(1);
+          }
+          oViz.addStyleClass("hiddentile");
+        }
+        oItem.addContent(oViz);
+      }
+    };
+
+    Application.prototype.activateTile = function (oViz) {
+      setTimeout(function () {
+        if (sap.ushell.Container) {
+          sap.ushell.Container.getServiceAsync("ReferenceResolver").then(function () {
+            oViz.setActive(true, false);
+          });
+        }
+      }, iTileActivationTime);
+    };
+
+    Application.prototype.itemNavigate = function (oEvent) {
+      var oItem = oEvent.getSource();
+      if (oItem.isA("sap.m.ObjectIdentifier")) {
+        oItem = oItem.getParent().getParent().getParent();
+      }
+      var oViz = oItem.getContent()[1];
+      if (oViz && oViz.getDomRef() && oViz.getDomRef().querySelector("a")) {
+        oViz.getDomRef().querySelector("a").click();
+      }
+    };
+
+    Application.prototype.fetchData = function (sSearchTerm, iSkip, iTop) {
+      return this.getData(sSearchTerm, iSkip, iTop);
+    };
+
+    Application.prototype.fetchCount = function (sSearchTerm, iSkip, iTop) {
+      return this.getData(sSearchTerm, iSkip, iTop);
+    };
+
+    Application.prototype.normalize = function (aApps) {
+      if (!Array.isArray(aApps)) {
+        aApps = [];
+      }
+      var aResultApps = [];
+      aApps.forEach(function (oApp) {
+        oApp.visualizations.forEach(function (oVis) {
+          var label = oVis.title;
+          if (oVis.subtitle) {
+            label = label + " - " + oVis.subtitle;
+          }
+          aResultApps.push({
+            title: (oVis.vizConfig && oVis.vizConfig["sap.app"] && oVis.vizConfig["sap.app"].title) || oVis.title || oApp.title,
+            description: (oVis.vizConfig && oVis.vizConfig["sap.app"] && oVis.vizConfig["sap.app"].subTitle) || oVis.subtitle || oApp.subtitle,
+            keywords: oVis.keywords ? oVis.keywords.join(" ") : "",
+            icon: oVis.icon || "",
+            label: label,
+            visualization: oVis,
+            url: oVis.targetURL
+          });
+        });
+      });
+      return aResultApps;
+    };
+
+    Application.prototype.filter = function (aResult, sSearchTerm, iSkip, iTop) {
+      // eslint-disable-next-line new-cap
+      this.searchEngine = new JSSearchFactory({
+        objects: aResult,
+        fields: ["text", "title", "keywords"],
+        shouldNormalize: !String.prototype.normalize,
+        algorithm: {
+          id: "contains-ranked",
+          options: [50, 49, 40, 39, 5, 4, 51]
+        }
+      });
+      // format of the result is { results:[{object:{aResult[i]}}], totalCount:number}
+      if (sSearchTerm) {
+        //search only works with searchTerm today
+        var oResult = this.searchEngine.search({
+          searchFor: sSearchTerm,
+          top: iTop,
+          skip: iSkip
+        });
+        return {
+          data: oResult.results.map(function (o) {
+            return o.object;
+          }),
+          count: oResult.totalCount
+        };
+      }
+      // no searchTerm needs to create a unified result for { results:[{object:{aResult[i]}}], totalCount:number}
+      var oTargetResult = {
+        data: [],
+        count: aResult.length
+      };
+      // sort alphabetically
+      aResult.sort(function (a, b) {
+        return a.title.localeCompare(b.title);
+      }).splice(iSkip, iTop).forEach(function (o) {
+        oTargetResult.data.push(o);
+      });
+      return oTargetResult;
+    };
+
+    Application.prototype.getData = function (sSearchTerm, iSkip, iTop) {
+      var oResult = {
+        data: [],
+        totalCount: 0
+      };
+      // embedded in flp
+      if (sap.ushell.Container && sap.ushell.Container.getServiceAsync) {
+        return sap.ushell.Container.getServiceAsync("SearchableContent")
+          .then(function (Service) {
+            Service._changeVizType = function () {
+            };
+            return Service.getApps()
+              .then(function (aResult) {
+                aResult = this.normalize(aResult);
+                return this.filter(aResult, sSearchTerm, iSkip, iTop);
+              }.bind(this));
+          }.bind(this));
+      }
+      return Promise.resolve(oResult);
+    };
+    return Application;
+  });