Search: Prevented negated terms filling in UI inputs

[bookstack] / app / Search / SearchOptions.php

diff --git a/app/Search/SearchOptions.php b/app/Search/SearchOptions.php
index 98f731ee75f3f7ae8b90fc4ffb245b172645be94..7f9db2a64302b7dbea4f860a2919ec5b0dbd3de3 100644 (file)
--- a/app/Search/SearchOptions.php
+++ b/app/Search/SearchOptions.php
@@ -11,9 +11,13 @@ use Illuminate\Http\Request;
 
 class SearchOptions
 {
+    /** @var SearchOptionSet<TermSearchOption> */
     public SearchOptionSet $searches;
+    /** @var SearchOptionSet<ExactSearchOption> */
     public SearchOptionSet $exacts;
+    /** @var SearchOptionSet<TagSearchOption> */
     public SearchOptionSet $tags;
+    /** @var SearchOptionSet<FilterSearchOption> */
     public SearchOptionSet $filters;
 
     public function __construct()
@@ -240,9 +244,9 @@ class SearchOptions
         }
 
         // Negated items
-        array_push($options, ...$this->exacts->negated());
-        array_push($options, ...$this->tags->negated());
-        array_push($options, ...$this->filters->negated());
+        array_push($options, ...$this->exacts->negated()->all());
+        array_push($options, ...$this->tags->negated()->all());
+        array_push($options, ...$this->filters->negated()->all());
 
         return implode(' ', array_map(fn(SearchOption $o) => $o->toString(), $options));
     }