Skip to content

Commit aed67de

Browse files
nikuscsgithub-actions[bot]
authored andcommitted
Fix styling
1 parent c616470 commit aed67de

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

src/Datatables/Concerns/InteractsWithQueryBuilder.php

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,13 @@ protected function resolveQueryOrModel(mixed $queryOrModel = null): Builder
114114
*/
115115
protected function applyQueryFilters(Builder $query, RequestPayload $payload): Builder
116116
{
117-
return $query->when($payload->hasFilters(), function (Builder $subQuery) use($payload){
117+
return $query->when($payload->hasFilters(), function (Builder $subQuery) use ($payload) {
118118
// Each column that needs to be sorted
119119
$payload
120120
->getFilters()
121121
// Apply Sorting
122122
->each(fn (Filter $filter) => $filter->apply($subQuery, $filter->getName(), $filter->getValue()));
123+
123124
return $subQuery;
124125
});
125126
}
@@ -133,7 +134,7 @@ protected function applyQueryFilters(Builder $query, RequestPayload $payload): B
133134
*/
134135
protected function applyQuerySorting(Builder $query, RequestPayload $payload): Builder
135136
{
136-
return $query->when($payload->hasSorting(), function (Builder $subQuery) use($payload) {
137+
return $query->when($payload->hasSorting(), function (Builder $subQuery) use ($payload) {
137138
// Each column that needs to be sorted
138139
$payload
139140
->getSorting()
@@ -153,24 +154,26 @@ protected function applyQuerySorting(Builder $query, RequestPayload $payload): B
153154
protected function applySearch(Builder $query, RequestPayload $payload): Builder
154155
{
155156
$model = $this->getQuery()->getModel();
156-
$usingScout = in_array(Searchable::class,class_uses($model::class));
157+
$usingScout = in_array(Searchable::class, class_uses($model::class));
157158

158159
return $query
159160
// Model is using Scout, we can use it.
160-
->when($usingScout && $payload->hasSearch(), function (Builder $subQuery) use($payload, $model) {
161+
->when($usingScout && $payload->hasSearch(), function (Builder $subQuery) use ($model) {
161162
// Each column that needs to be sorted
162163
/** @var Searchable $model */
163164
$subQuery->whereIn('id', $model::search($this->data->getSearch())->keys());
165+
164166
return $subQuery;
165167
})
166168
// Without Scout
167-
->when(!$usingScout && $payload->hasSearch(), function (Builder $subQuery) use($payload) {
169+
->when(! $usingScout && $payload->hasSearch(), function (Builder $subQuery) use ($payload) {
168170
// Each column that needs to be sorted
169171
$subQuery
170-
->where(fn($query) => $this
172+
->where(fn ($query) => $this
171173
->getColumns()
172174
->each(fn (Column $column) => $query->orWhere($column->getName(), 'like', "%{$payload->getSearch()}%"))
173175
);
176+
174177
return $subQuery;
175178
});
176179
}
@@ -198,7 +201,7 @@ protected function transformPagination(LengthAwarePaginator $paginator): array
198201
// Here we can properly control how much pages on each side
199202
if ($isLongPagination) {
200203
$windowTruncated = collect($window)
201-
->map(function ($item, $key) use ($leftSideMaximumPages,$rightSideMaximumPages, $middleMaximumPages) {
204+
->map(function ($item, $key) use ($leftSideMaximumPages, $rightSideMaximumPages, $middleMaximumPages) {
202205
if ($key == 'first') {
203206
return collect($item)->slice(0, $leftSideMaximumPages)->toArray();
204207
}
@@ -210,6 +213,7 @@ protected function transformPagination(LengthAwarePaginator $paginator): array
210213
if ($key === 'slider' && is_array($item)) {
211214
return collect($item)->slice(0, $middleMaximumPages)->toArray();
212215
}
216+
213217
return $item;
214218
})
215219
->toArray();
@@ -259,14 +263,15 @@ protected function transformPagination(LengthAwarePaginator $paginator): array
259263
'per_page' => $paginator->perPage(),
260264
'to' => $paginator->lastItem(),
261265
'total' => $paginator->total(),
262-
]
266+
],
263267
];
264268
}
265269

266270
/**
267271
* Process an action once is dispatched from the frontend to the backend
268272
*
269273
* @return void
274+
*
270275
* @throws Exception
271276
*/
272277
protected function dispatchAction(): void
@@ -287,6 +292,7 @@ protected function dispatchAction(): void
287292
*
288293
* @param Builder|null $queryOrModel
289294
* @return array|Collection
295+
*
290296
* @throws Exception
291297
*/
292298
public function response(?Builder $queryOrModel = null): array|Collection
@@ -304,7 +310,7 @@ public function response(?Builder $queryOrModel = null): array|Collection
304310

305311
$query = $this->getQuery();
306312

307-
$this->query = tap($query,function() use(&$query) {
313+
$this->query = tap($query, function () use (&$query) {
308314
$this->applyQueryFilters($query, $this->data);
309315
$this->applyQuerySorting($query, $this->data);
310316
$this->applySearch($query, $this->data);

src/VanillaComponentsServiceProvider.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace Flavorly\VanillaComponents;
44

5-
use Flavorly\VanillaComponents\Commands\VanillaComponentsCommand;
65
use Spatie\LaravelPackageTools\Package;
76
use Spatie\LaravelPackageTools\PackageServiceProvider;
87

0 commit comments

Comments
 (0)