searchbar and editor fix: 2

Icinga · Nov 13, 2024 · 684ce55 · 684ce55
1 parent f17493c
commit 684ce55
Showing 1 changed file with 9 additions and 34 deletions.
diff --git a/application/controllers/RedundancygroupController.php b/application/controllers/RedundancygroupController.php
@@ -109,8 +109,6 @@ public function membersAction(): \Generator
             ]
         );
 
-        $searchBar->getSuggestionUrl()->setParam('id', $this->groupId);
-
         if ($searchBar->hasBeenSent() && ! $searchBar->isValid()) {
             if ($searchBar->hasBeenSubmitted()) {
                 $filter = $this->getFilter();
@@ -173,10 +171,8 @@ public function childrenAction()
             ]
         );
 
-        $searchBar->getSuggestionUrl()->setPath('icingadb/redundancygroup/children-complete');
-        $searchBar->getEditorUrl()->setPath('icingadb/redundancygroup/children-search-editor');
-
-        $searchBar->getSuggestionUrl()->setParam('id', $this->groupId);
+        $searchBar->getSuggestionUrl()->setParam('isChildrenTab');
+        $searchBar->getEditorUrl()->setParam('isChildrenTab');
 
         if ($searchBar->hasBeenSent() && ! $searchBar->isValid()) {
             if ($searchBar->hasBeenSubmitted()) {
@@ -214,27 +210,9 @@ public function childrenAction()
 
     public function completeAction(): void
     {
-        $this->prepareComplete();
-    }
+        $isChildrenTab = $this->params->shift('isChildrenTab');
+        $column = $isChildrenTab ? 'parent' : 'child';
 
-    public function childrenCompleteAction(): void
-    {
-        $this->prepareComplete(true);
-    }
-
-    public function searchEditorAction(): void
-    {
-        $this->prepareSearchEditor();
-    }
-
-    public function childrenSearchEditorAction(): void
-    {
-        $this->prepareSearchEditor(true);
-    }
-
-    private function prepareComplete(bool $forChildren = false): void
-    {
-        $column = $forChildren ? 'parent' : 'child';
         $suggestions = (new ObjectSuggestions())
             ->setModel(DependencyNode::class)
             ->setBaseFilter(Filter::equal("$column.redundancy_group.id", $this->groupId))
@@ -243,9 +221,10 @@ private function prepareComplete(bool $forChildren = false): void
         $this->getDocument()->add($suggestions);
     }
 
-    private function prepareSearchEditor(bool $forChildren = false): void
+    public function searchEditorAction(): void
     {
-        $redirectUrl = $forChildren
+        $isChildrenTab = $this->params->shift('isChildrenTab');
+        $redirectUrl = $isChildrenTab
             ? Links::redundancyGroupChildren($this->group)
             : Links::redundancyGroupMembers($this->group);
 
@@ -259,12 +238,8 @@ private function prepareSearchEditor(bool $forChildren = false): void
             ]
         );
 
-        if ($editor->getSuggestionUrl()) {
-            $editor->getSuggestionUrl()->setParam('id', $this->groupId);
-        }
-
-        if ($forChildren) {
-            $editor->getSuggestionUrl()->setPath('icingadb/redundancygroup/children-complete');
+        if ($isChildrenTab) {
+            $editor->getSuggestionUrl()->setParam('isChildrenTab');
         }
 
         $this->getDocument()->add($editor);