WIP rewok getJsonPaths

Author: BastianLedererIcinga

application/controllers/EventRuleController.php

@@ -231,14 +231,14 @@ function (Condition $condition) use ($hook) {
                     if (! $hook->isValidCondition($condition)) {
                         throw new SearchException($this->translate('Is not a valid column'));
                     }
-
-                    $condition->metaData()->set('jsonPaths', $hook->getJsonPaths($condition));
                 }
             )
             ->on(Form::ON_SUBMIT, function (SearchEditor $form) use ($ruleId, $hook) {
+                $filter = $form->getFilter();
+
                 $this->session->set(
                     'object_filter',
-                    (new RuleSerializer($form->getFilter()))->getJson()
+                    (new RuleSerializer($filter, $hook->getJsonPaths($this->collectColumns($filter))))->getJson()
                 );
                 $this->redirectNow(Links::eventRule($ruleId)->setParam('_filterOnly'));
             });
@@ -358,4 +358,19 @@ private function fetchRule(int $ruleId): Rule
 
         return $rule;
     }
+
+    private function collectColumns(Filter\Rule $rule): array
+    {
+        if ($rule instanceof Filter\Chain) {
+            $result = [];
+            foreach ($rule as $element) {
+                $result = array_merge($result, $this->collectColumns($element));
+            }
+
+            return array_unique($result);
+        } else {
+            /** @var $rule Condition */
+            return [$rule->getColumn()];
+        }
+    }
 }

library/Notifications/Hook/V2/SourceHook.php

@@ -52,13 +52,13 @@ public function isValidCondition(Condition $condition): bool;
     public function enrichCondition(Condition $condition): void;
 
     /**
-     * Get all jsonPaths for the condition's column
+     * All JsonPaths for all given columns
      *
-     * @param Condition $condition
+     * @param array<string> $columns
      *
-     * @return array<string>
+     * @return array<array<string>>
      */
-    public function getJsonPaths(Condition $condition): array;
+    public function getJsonPaths(array $columns): array;
 
     /**
      * Get suggestions for a value field

library/Notifications/Util/RuleSerializer.php

@@ -16,14 +16,18 @@ class RuleSerializer
     /** @var Filter\Condition|Filter\Chain */
     protected Filter\Rule $filter;
 
+    protected array $jsonPaths;
+
     /**
      * Create an object that can be used to serialize a rule to JSON
      *
      * @param Filter\Rule $filter
+     * @param array $jsonPaths
      */
-    public function __construct(Filter\Rule $filter)
+    public function __construct(Filter\Rule $filter, array $jsonPaths)
     {
         $this->filter = $filter;
+        $this->jsonPaths = $jsonPaths;
     }
 
     /**
@@ -100,7 +104,7 @@ protected function serializeCondition(Filter\Condition $condition): array
 
         return [
             'op' => $op,
-            'attributes' => $condition->metaData()->get('jsonPaths'),
+            'attributes' => $this->jsonPaths[$condition->getColumn()],
             ...$value,
         ];
     }

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

@@ -36,11 +36,13 @@ public function __construct(SourceHook $hook)
                     $provider = $this->hook->getColumnSuggestions($this->getSearchTerm() ?? '');
                     $this->setGroupingCallback(fn($x) => $x['group']);
                 } else {
-                    $provider = $this->hook->getValueSuggestions(
-                        $this->column,
-                        $this->getSearchTerm() ?? '',
-                        $this->searchFilter
-                    );
+                    $provider = $this->column
+                            ? $this->hook->getValueSuggestions(
+                            $this->column,
+                            $this->getSearchTerm() ?? '',
+                            $this->searchFilter
+                        )
+                            : [];
                 }
 
                 yield from $provider;