@@ -79,19 +79,20 @@ protected function dispatchAction(): void
7979
8080 protected function applyQueryFilters (Builder $ query , RequestPayload $ payload ): Builder
8181 {
82- return $ query ->when ($ payload ->hasFilters (), function (Builder $ subQuery ) use ($ payload ){
82+ return $ query ->when ($ payload ->hasFilters (), function (Builder $ subQuery ) use ($ payload ) {
8383 // Each column that needs to be sorted
8484 $ payload
8585 ->getFilters ()
8686 // Apply Sorting
8787 ->each (fn (Filter $ filter ) => $ filter ->apply ($ subQuery , $ filter ->getName (), $ filter ->getValue ()));
88+
8889 return $ subQuery ;
8990 });
9091 }
9192
9293 protected function applyQuerySorting (Builder $ query , RequestPayload $ payload ): Builder
9394 {
94- return $ query ->when ($ payload ->hasSorting (), function (Builder $ subQuery ) use ($ payload ) {
95+ return $ query ->when ($ payload ->hasSorting (), function (Builder $ subQuery ) use ($ payload ) {
9596 // Each column that needs to be sorted
9697 $ payload
9798 ->getSorting ()
@@ -108,20 +109,22 @@ protected function applySearch(Builder $query, RequestPayload $payload): Builder
108109
109110 return $ query
110111 // Model is using Scout, we can use it.
111- ->when ($ usingScout && $ payload ->hasSearch (), function (Builder $ subQuery ) use ( $ payload , $ model ) {
112+ ->when ($ usingScout && $ payload ->hasSearch (), function (Builder $ subQuery ) use ( $ model ) {
112113 // Each column that needs to be sorted
113114 /** @var Searchable $model */
114115 $ subQuery ->whereIn ('id ' , $ model ::search ($ this ->data ->getSearch ())->keys ());
116+
115117 return $ subQuery ;
116118 })
117119 // Without Scout
118- ->when (!$ usingScout && $ payload ->hasSearch (), function (Builder $ subQuery ) use ($ payload ) {
120+ ->when (! $ usingScout && $ payload ->hasSearch (), function (Builder $ subQuery ) use ($ payload ) {
119121 // Each column that needs to be sorted
120122 $ subQuery
121- ->where (fn ($ query ) => $ this
123+ ->where (fn ($ query ) => $ this
122124 ->getColumns ()
123125 ->each (fn (Column $ column ) => $ query ->orWhere ($ column ->getName (), 'like ' , "% {$ payload ->getSearch ()}% " ))
124126 );
127+
125128 return $ subQuery ;
126129 });
127130 }
@@ -139,9 +142,10 @@ public function response(?Builder $queryOrModel = null): DatatableResource
139142 $ this ->withQuery ($ queryOrModel );
140143 }
141144
142- $ query = tap ($ this ->getQuery (), function (Builder $ query ) {
145+ $ query = tap ($ this ->getQuery (), function (Builder $ query ) {
143146 $ query = $ this ->applyQueryFilters ($ query , $ this ->data );
144147 $ query = $ this ->applyQuerySorting ($ query , $ this ->data );
148+
145149 return $ this ->applySearch ($ query , $ this ->data );
146150 });
147151
0 commit comments