Skip to content

Commit 087e376

Browse files
lrljoegithub-actions[bot]
lrljoe
authored and
github-actions[bot]
committed
Fix styling
1 parent b8e4c37 commit 087e376

File tree

3 files changed

+50
-51
lines changed

3 files changed

+50
-51
lines changed

‎src/Traits/Configuration/ColumnConfiguration.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public function setPrependedColumns(array $prependedColumns): void
1111
$this->prependedColumns = collect($prependedColumns);
1212
$this->hasRunColumnSetup = false;
1313
/*
14-
14+
1515
->filter(fn ($column) => $column instanceof Column)
1616
->map(function (Column $column) {
1717
$column->setTheme($this->getTheme());
@@ -35,7 +35,7 @@ public function setAppendedColumns(array $appendedColumns): void
3535
$this->appendedColumns = collect($appendedColumns);
3636
$this->hasRunColumnSetup = false;
3737
/*
38-
38+
3939
->filter(fn ($column) => $column instanceof Column)
4040
->map(function (Column $column) {
4141
$column->setTheme($this->getTheme());

‎src/Traits/Helpers/ColumnHelpers.php‎

Lines changed: 47 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -16,49 +16,48 @@ public function setColumns(): void
1616
$this->columns = collect($this->getPrependedColumns())->concat($this->columns())->concat(collect($this->getAppendedColumns()));
1717

1818
}
19-
19+
2020
protected function setupColumns(): void
2121
{
22-
if(!$this->hasRunColumnSetup)
23-
{
22+
if (! $this->hasRunColumnSetup) {
2423
$this->columns = $this->columns
25-
->filter(fn ($column) => $column instanceof Column)
26-
->map(function (Column $column) {
27-
$column->setTheme($this->getTheme())
28-
->setHasTableRowUrl($this->hasTableRowUrl())
29-
->setIsReorderColumn($this->getDefaultReorderColumn() == $column->getField());
30-
31-
if ($column instanceof AggregateColumn) {
32-
if ($column->getAggregateMethod() == 'count' && $column->hasDataSource()) {
33-
$this->addExtraWithCount($column->getDataSource());
34-
} elseif ($column->getAggregateMethod() == 'sum' && $column->hasDataSource() && $column->hasForeignColumn()) {
35-
$this->addExtraWithSum($column->getDataSource(), $column->getForeignColumn());
36-
} elseif ($column->getAggregateMethod() == 'avg' && $column->hasDataSource() && $column->hasForeignColumn()) {
37-
$this->addExtraWithAvg($column->getDataSource(), $column->getForeignColumn());
24+
->filter(fn ($column) => $column instanceof Column)
25+
->map(function (Column $column) {
26+
$column->setTheme($this->getTheme())
27+
->setHasTableRowUrl($this->hasTableRowUrl())
28+
->setIsReorderColumn($this->getDefaultReorderColumn() == $column->getField());
29+
30+
if ($column instanceof AggregateColumn) {
31+
if ($column->getAggregateMethod() == 'count' && $column->hasDataSource()) {
32+
$this->addExtraWithCount($column->getDataSource());
33+
} elseif ($column->getAggregateMethod() == 'sum' && $column->hasDataSource() && $column->hasForeignColumn()) {
34+
$this->addExtraWithSum($column->getDataSource(), $column->getForeignColumn());
35+
} elseif ($column->getAggregateMethod() == 'avg' && $column->hasDataSource() && $column->hasForeignColumn()) {
36+
$this->addExtraWithAvg($column->getDataSource(), $column->getForeignColumn());
37+
}
3838
}
39-
}
4039

41-
if ($column->hasField()) {
42-
if ($column->isBaseColumn()) {
43-
$column->setTable($this->getBuilder()->getModel()->getTable());
44-
} else {
45-
$column->setTable($this->getTableForColumn($column));
40+
if ($column->hasField()) {
41+
if ($column->isBaseColumn()) {
42+
$column->setTable($this->getBuilder()->getModel()->getTable());
43+
} else {
44+
$column->setTable($this->getTableForColumn($column));
45+
}
4646
}
47-
}
4847

49-
return $column;
50-
});
48+
return $column;
49+
});
5150

5251
$this->hasRunColumnSetup = true;
5352
}
5453
}
5554

5655
public function getColumns(): Collection
5756
{
58-
if(!$this->hasRunColumnSetup)
59-
{
57+
if (! $this->hasRunColumnSetup) {
6058
$this->setupColumns();
6159
}
60+
6261
return $this->columns;
6362
}
6463

@@ -248,31 +247,31 @@ public function getPrependedColumns(): Collection
248247
public function getAppendedColumns(): Collection
249248
{
250249
return collect($this->appendedColumns ?? $this->appendColumns());
251-
/*->filter(fn ($column) => $column instanceof Column)
252-
->map(function (Column $column) {
253-
$column->setTheme($this->getTheme());
254-
$column->setHasTableRowUrl($this->hasTableRowUrl());
255-
$column->setIsReorderColumn($this->getDefaultReorderColumn() == $column->getField());
256-
if ($column instanceof AggregateColumn) {
257-
if ($column->getAggregateMethod() == 'count' && $column->hasDataSource()) {
258-
$this->addExtraWithCount($column->getDataSource());
259-
} elseif ($column->getAggregateMethod() == 'sum' && $column->hasDataSource() && $column->hasForeignColumn()) {
260-
$this->addExtraWithSum($column->getDataSource(), $column->getForeignColumn());
261-
} elseif ($column->getAggregateMethod() == 'avg' && $column->hasDataSource() && $column->hasForeignColumn()) {
262-
$this->addExtraWithAvg($column->getDataSource(), $column->getForeignColumn());
263-
}
250+
/*->filter(fn ($column) => $column instanceof Column)
251+
->map(function (Column $column) {
252+
$column->setTheme($this->getTheme());
253+
$column->setHasTableRowUrl($this->hasTableRowUrl());
254+
$column->setIsReorderColumn($this->getDefaultReorderColumn() == $column->getField());
255+
if ($column instanceof AggregateColumn) {
256+
if ($column->getAggregateMethod() == 'count' && $column->hasDataSource()) {
257+
$this->addExtraWithCount($column->getDataSource());
258+
} elseif ($column->getAggregateMethod() == 'sum' && $column->hasDataSource() && $column->hasForeignColumn()) {
259+
$this->addExtraWithSum($column->getDataSource(), $column->getForeignColumn());
260+
} elseif ($column->getAggregateMethod() == 'avg' && $column->hasDataSource() && $column->hasForeignColumn()) {
261+
$this->addExtraWithAvg($column->getDataSource(), $column->getForeignColumn());
264262
}
263+
}
265264
266-
if ($column->hasField()) {
267-
if ($column->isBaseColumn()) {
268-
$column->setTable($this->getBuilder()->getModel()->getTable());
269-
} else {
270-
$column->setTable($this->getTableForColumn($column));
271-
}
265+
if ($column->hasField()) {
266+
if ($column->isBaseColumn()) {
267+
$column->setTable($this->getBuilder()->getModel()->getTable());
268+
} else {
269+
$column->setTable($this->getTableForColumn($column));
272270
}
271+
}
273272
274-
return $column;
275-
});*/
273+
return $column;
274+
});*/
276275

277276
}
278277

‎src/Traits/WithColumns.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function bootedWithColumns(): void
4141

4242
// Set Columns
4343
$this->setColumns();
44-
44+
4545
// Fire Lifecycle Hooks for columnsSet
4646
$this->callHook('columnsSet');
4747
$this->callTraitHook('columnsSet');

0 commit comments

Comments
 (0)