Merge remote-tracking branch 'upstream/2.x' into 2.x

moonshine-software · Jul 3, 2024 · 455be3b · 455be3b
2 parents 261dfef + 19c94fc
commit 455be3b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/src/Components/Dropdown.php b/src/Components/Dropdown.php
@@ -29,8 +29,8 @@ public function __construct(
         protected bool $isSearchable = false,
         public string $placement = 'bottom-start',
     ) {
-        if(empty($this->searchPlaceholder)){
-            $this->searchPlaceholder =  __('moonshine::ui.search');
+        if(empty($this->searchPlaceholder)) {
+            $this->searchPlaceholder = __('moonshine::ui.search');
         }
     }
 

diff --git a/src/Http/Controllers/RelationModelFieldController.php b/src/Http/Controllers/RelationModelFieldController.php
@@ -58,17 +58,18 @@ public function search(RelationModelFieldRequest $request): Response
         }
 
         $query = $model->newModelQuery();
+        $term = $request->input('query');
 
         if (is_closure($field->asyncSearchQuery())) {
             $query = value(
                 $field->asyncSearchQuery(),
                 $query,
                 $request,
-                $field
+                $field,
+                $term
             );
         }
 
-        $term = $request->input('query');
         $values = $request->input($field->column(), '') ?? '';
 
         $except = is_array($values)
@@ -78,7 +79,7 @@ public function search(RelationModelFieldRequest $request): Response
         $offset = $request->input('offset', 0);
 
         $query->when(
-            $term,
+            (is_null($field->asyncSearchQuery()) || $field->isAsyncSearchReplaceQuery() === false) && $term,
             fn (Builder $q) => $q->where(
                 $searchColumn,
                 DBOperators::byModel($q->getModel())->like(),

diff --git a/src/Traits/Fields/WithAsyncSearch.php b/src/Traits/Fields/WithAsyncSearch.php
@@ -24,6 +24,8 @@ trait WithAsyncSearch
 
     protected ?Closure $asyncSearchQuery = null;
 
+    protected bool $asyncSearchReplaceQuery = false;
+
     protected ?Closure $asyncSearchValueCallback = null;
 
     protected array $withImage = [];
@@ -111,6 +113,11 @@ public function asyncSearchQuery(): ?Closure
         return $this->asyncSearchQuery;
     }
 
+    public function isAsyncSearchReplaceQuery(): bool
+    {
+        return $this->asyncSearchReplaceQuery;
+    }
+
     public function asyncSearchValueCallback(): ?Closure
     {
         return $this->asyncSearchValueCallback;
@@ -169,6 +176,7 @@ public function asyncSearch(
         ?Closure $asyncSearchValueCallback = null,
         ?string $associatedWith = null,
         ?string $url = null,
+        bool $replaceQuery = false,
     ): static {
         $this->asyncSearch = true;
         $this->searchable = true;
@@ -178,6 +186,7 @@ public function asyncSearch(
         $this->asyncSearchValueCallback = $asyncSearchValueCallback ?? $this->formattedValueCallback();
         $this->associatedWith = $associatedWith;
         $this->asyncUrl = $url;
+        $this->asyncSearchReplaceQuery = $replaceQuery;
 
         if ($this->associatedWith) {
             $this->customAttributes([
@@ -199,13 +208,14 @@ public function asyncSearch(
     /**
      * @param  ?Closure(Builder $query, mixed $value, self $field): Builder  $asyncSearchQuery
      */
-    public function associatedWith(string $column, ?Closure $asyncSearchQuery = null): static
+    public function associatedWith(string $column, ?Closure $asyncSearchQuery = null, bool $replaceQuery = false): static
     {
         $searchQuery = static fn (Builder $query, Request $request) => $query->where($column, $request->input($column));
 
         return $this->asyncSearch(
             asyncSearchQuery: is_null($asyncSearchQuery) ? $searchQuery : $asyncSearchQuery,
-            associatedWith: $column
+            associatedWith: $column,
+            replaceQuery: $replaceQuery
         );
     }
 }