wip

Author: BastianLedererIcinga

application/controllers/EventRuleController.php

@@ -204,6 +204,7 @@ public function searchEditorAction(): void
         $filter = $this->params->get('object_filter', $this->session->get('object_filter'));
         $hook = $this->resolveSourceHook($ruleId);
 
+        $parsedFilter = null;
         if ($filter) {
             try {
                 $parsedFilter = json_decode($filter, true, flags: JSON_THROW_ON_ERROR);

library/Notifications/Hook/V2/SourceHook.php

@@ -63,20 +63,20 @@ public function getJsonPaths(Condition $condition): array;
     /**
      * Get suggestions for a value field
      *
-     * @param $column
-     * @param $searchTerm
+     * @param string $column
+     * @param string $searchTerm
      * @param Chain $searchFilter
      *
      * @return Traversable Values to be suggested as `search` => `label`
      */
-    public function getValueSuggestions($column, $searchTerm, Chain $searchFilter): Traversable;
+    public function getValueSuggestions(string $column, string $searchTerm, Chain $searchFilter): Traversable;
 
     /**
      * Get suggestions for a column field
      *
-     * @param $searchTerm
+     * @param string $searchTerm
      *
      * @return Traversable Columns to be suggested as `search` => `label`
      */
-    public function getColumnSuggestions($searchTerm): Traversable;
+    public function getColumnSuggestions(string $searchTerm): Traversable;
 }

library/Notifications/Web/Control/SearchEditor/RuleFilterSuggestions.php

@@ -7,6 +7,7 @@
 
 use Generator;
 use Icinga\Module\Notifications\Hook\V2\SourceHook;
+use ipl\Html\HtmlElement;
 use ipl\Stdlib\Filter;
 use ipl\Web\Control\SearchBar\Suggestions;
 use Psr\Http\Message\ServerRequestInterface;
@@ -25,19 +26,31 @@ public function __construct(SourceHook $hook)
     }
 
     /**
-     * These suggestions aren't used by any searchbar, so they don't need  aqickfilter
+     * These suggestions aren't used by any searchbar, so this function is never called
      */
     protected function createQuickSearchFilter($searchTerm)
     {
     }
 
     protected function fetchValueSuggestions($column, $searchTerm, Filter\Chain $searchFilter): Traversable
     {
-        return $this->hook->getValueSuggestions($column, $searchTerm, $searchFilter);
+        yield from $this->hook->getValueSuggestions($column, $searchTerm, $searchFilter);
     }
 
     protected function fetchColumnSuggestions($searchTerm): Traversable
     {
-        return $this->hook->getColumnSuggestions($searchTerm);
+        $currentGroup = null;
+        foreach ($this->hook->getColumnSuggestions($searchTerm) as $item) {
+            if (isset($item['group']) && $item['group'] !== $currentGroup) {
+                $currentGroup = $item['group'];
+                $this->addHtml(HtmlElement::create(
+                    'li',
+                    ['class' => static::SUGGESTION_TITLE_CLASS],
+                    $currentGroup
+                ));
+            }
+
+            yield $item['search'] => $item['label'];
+        }
     }
 }