Bugfix/rev 3435 scope search

src/Controllers/ThrustHasManyController.php

@@ -5,6 +5,7 @@
 use Illuminate\Routing\Controller;
 use BadChoice\Thrust\Facades\Thrust;
 use BadChoice\Thrust\ChildResource;
+use BadChoice\Thrust\Html\Index;
 
 class ThrustHasManyController extends Controller
 {
@@ -24,10 +25,18 @@ public function index($resourceName, $id, $relationship)
             'parent_id'               => $id,
             'isChild'                 => $resource instanceof ChildResource && $backHasManyURLParams,
             'hasManyBackUrlParams'    => $backHasManyURLParams,
+            'searchUrl'               => "/thrust/{$hasManyField->resourceName}/hasMany/{$id}/search/"
 //            "object"                  => $object,
 //            "title"                   => $object->{$resource->nameField},
 //            "children"                => $object->{$relationship},
 //            "belongsToManyField"      => $hasManyField,
         ]);
     }
+
+    public function search($resourceName, $id, $searchText)
+    {
+        request()->merge(['search' => $searchText]);
+        $resource = Thrust::make($resourceName)->parentId($id);
+        return (new Index($resource::$searchResource ? new $resource::$searchResource: $resource))->show();
+    }
 }

src/Controllers/ThrustSearchController.php

@@ -12,6 +12,6 @@ public function index($resourceName, $searchText)
     {
         request()->merge(['search' => $searchText]);
         $resource = Thrust::make($resourceName);
-        return (new Index($resource))->show();
+        return (new Index($resource::$searchResource ? new $resource::$searchResource: $resource))->show();
     }
 }

src/Resource.php

@@ -43,6 +43,11 @@ abstract class Resource
      */
     public static $search = [];
 
+    /**
+     * Defines the resource to search from this resource. If not defined, searches on itself
+     * When defined, the search is global for the resource
+     */
+    public static $searchResource;
 
     /**
      * @var Defines the global gate ability for the actions to be performed,

src/ResourceFilters/Search.php

@@ -8,11 +8,11 @@ class Search
 {
     public static function apply($query, $searchText, $searchFields)
     {
-        $searchFields = collect($searchFields);
-        $firstField   = $searchFields->shift();
-        static::applyField($query, $firstField, $searchText);
+        return $query->where(function ($query) use($searchText, $searchFields){
+            $searchFields = collect($searchFields);
+            $firstField   = $searchFields->shift();
+            static::applyField($query, $firstField, $searchText);
 
-        return $query->orWhere(function ($query) use($searchText, $searchFields){
             return $searchFields->reduce(function($query, $searchField) use($searchText) {
                 return static::applyFieldSimple($query, $searchField, $searchText);
             }, $query);

src/resources/views/components/searchScript.blade.php

@@ -1,5 +1,5 @@
 <script>
-    $('#searcher').searcher('/thrust/{{$resourceName}}/search/', {
+    $('#searcher').searcher('{{$searchUrl ?? "/thrust/{$resourceName}/search/"}}', {
         'onFound' : function(){
             addListeners();
         },

src/routes.php

@@ -47,6 +47,7 @@
     Route::delete('{resourceName}/{id}/belongsToMany/{relationship}/{detachId}', 'ThrustBelongsToManyController@delete')->name('thrust.belongsToMany.delete');
 
     Route::get('{resourceName}/{id}/hasMany/{relationship}', 'ThrustHasManyController@index')->name('thrust.hasMany');
+    Route::get('{resourceName}/hasMany/{parent_id}/search/{search}', 'ThrustHasManyController@search')->name('thrust.hasMany.search');
 
     Route::get('{resourceName}/{id}/related/{relationship}', 'ThrustRelationshipController@search')->name('thrust.relationship.search');