Skip to content

Columns() Setup Improvements #2089

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 22, 2024
Merged

Columns() Setup Improvements #2089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b8e4c37
Initial Commit
lrljoe Nov 22, 2024
087e376
Fix styling
lrljoe Nov 22, 2024
934cdab
Clean Up Commented Code
lrljoe Nov 22, 2024
5eaf1c1
Fix styling
lrljoe Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 4 additions & 34 deletions src/Traits/Configuration/ColumnConfiguration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,44 +8,14 @@ trait ColumnConfiguration
{
public function setPrependedColumns(array $prependedColumns): void
{
$this->prependedColumns = collect($prependedColumns)
->filter(fn ($column) => $column instanceof Column)
->map(function (Column $column) {
$column->setTheme($this->getTheme());
$column->setHasTableRowUrl($this->hasTableRowUrl());
$column->setIsReorderColumn($this->getDefaultReorderColumn() == $column->getField());

if ($column->hasField()) {
if ($column->isBaseColumn()) {
$column->setTable($this->getBuilder()->getModel()->getTable());
} else {
$column->setTable($this->getTableForColumn($column));
}
}

return $column;
});
$this->prependedColumns = collect($prependedColumns);
$this->hasRunColumnSetup = false;
}

public function setAppendedColumns(array $appendedColumns): void
{
$this->appendedColumns = collect($appendedColumns)
->filter(fn ($column) => $column instanceof Column)
->map(function (Column $column) {
$column->setTheme($this->getTheme());
$column->setHasTableRowUrl($this->hasTableRowUrl());
$column->setIsReorderColumn($this->getDefaultReorderColumn() == $column->getField());

if ($column->hasField()) {
if ($column->isBaseColumn()) {
$column->setTable($this->getBuilder()->getModel()->getTable());
} else {
$column->setTable($this->getTableForColumn($column));
}
}

return $column;
});
$this->appendedColumns = collect($appendedColumns);
$this->hasRunColumnSetup = false;
}

public function unsetCollapsedStatuses(): void
Expand Down
94 changes: 33 additions & 61 deletions src/Traits/Helpers/ColumnHelpers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,19 @@ trait ColumnHelpers
*/
public function setColumns(): void
{
$this->prependedColumns = $this->getPrependedColumns();
$columns = collect($this->getPrependedColumns())->concat($this->columns())->concat(collect($this->getAppendedColumns()));
$this->columns = $columns->filter(fn ($column) => $column instanceof Column);
}

$columns = collect($this->columns())
protected function setupColumns(): void
{
$this->columns = $this->columns
->filter(fn ($column) => $column instanceof Column)
->map(function (Column $column) {
$column->setTheme($this->getTheme());
$column->setHasTableRowUrl($this->hasTableRowUrl());
$column->setIsReorderColumn($this->getDefaultReorderColumn() == $column->getField());
$column->setTheme($this->getTheme())
->setHasTableRowUrl($this->hasTableRowUrl())
->setIsReorderColumn($this->getDefaultReorderColumn() == $column->getField());

if ($column instanceof AggregateColumn) {
if ($column->getAggregateMethod() == 'count' && $column->hasDataSource()) {
$this->addExtraWithCount($column->getDataSource());
Expand All @@ -42,13 +47,15 @@ public function setColumns(): void
return $column;
});

$this->appendedColumns = $this->getAppendedColumns();

$this->columns = collect([...$this->prependedColumns, ...$columns, ...$this->appendedColumns]);
$this->hasRunColumnSetup = true;
}

public function getColumns(): Collection
{
if (! $this->hasRunColumnSetup) {
$this->setupColumns();
}

return $this->columns;
}

Expand Down Expand Up @@ -206,63 +213,12 @@ public function getColspanCount(): int

public function getPrependedColumns(): Collection
{
return collect($this->prependedColumns ?? $this->prependColumns())
->filter(fn ($column) => $column instanceof Column)
->map(function (Column $column) {
$column->setTheme($this->getTheme());
$column->setHasTableRowUrl($this->hasTableRowUrl());
$column->setIsReorderColumn($this->getDefaultReorderColumn() == $column->getField());
if ($column instanceof AggregateColumn) {
if ($column->getAggregateMethod() == 'count' && $column->hasDataSource()) {
$this->addExtraWithCount($column->getDataSource());
} elseif ($column->getAggregateMethod() == 'sum' && $column->hasDataSource() && $column->hasForeignColumn()) {
$this->addExtraWithSum($column->getDataSource(), $column->getForeignColumn());
} elseif ($column->getAggregateMethod() == 'avg' && $column->hasDataSource() && $column->hasForeignColumn()) {
$this->addExtraWithAvg($column->getDataSource(), $column->getForeignColumn());
}
}

if ($column->hasField()) {
if ($column->isBaseColumn()) {
$column->setTable($this->getBuilder()->getModel()->getTable());
} else {
$column->setTable($this->getTableForColumn($column));
}
}

return $column;
});
return $this->prependedColumns ?? collect($this->prependColumns());
}

public function getAppendedColumns(): Collection
{
return collect($this->appendedColumns ?? $this->appendColumns())
->filter(fn ($column) => $column instanceof Column)
->map(function (Column $column) {
$column->setTheme($this->getTheme());
$column->setHasTableRowUrl($this->hasTableRowUrl());
$column->setIsReorderColumn($this->getDefaultReorderColumn() == $column->getField());
if ($column instanceof AggregateColumn) {
if ($column->getAggregateMethod() == 'count' && $column->hasDataSource()) {
$this->addExtraWithCount($column->getDataSource());
} elseif ($column->getAggregateMethod() == 'sum' && $column->hasDataSource() && $column->hasForeignColumn()) {
$this->addExtraWithSum($column->getDataSource(), $column->getForeignColumn());
} elseif ($column->getAggregateMethod() == 'avg' && $column->hasDataSource() && $column->hasForeignColumn()) {
$this->addExtraWithAvg($column->getDataSource(), $column->getForeignColumn());
}
}

if ($column->hasField()) {
if ($column->isBaseColumn()) {
$column->setTable($this->getBuilder()->getModel()->getTable());
} else {
$column->setTable($this->getTableForColumn($column));
}
}

return $column;
});

return $this->appendedColumns ?? collect($this->appendColumns());
}

public function getCollapsedAlwaysColumns(): Collection
Expand All @@ -287,4 +243,20 @@ public function shouldCollapseAlways(): bool

return $this->shouldAlwaysCollapse;
}

/**
* Prepend columns.
*/
public function prependColumns(): array
{
return [];
}

/**
* Append columns.
*/
public function appendColumns(): array
{
return [];
}
}
22 changes: 4 additions & 18 deletions src/Traits/WithColumns.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,18 @@ trait WithColumns

protected Collection $columns;

protected Collection $prependedColumns;
protected ?Collection $prependedColumns;

protected Collection $appendedColumns;
protected ?Collection $appendedColumns;

protected ?bool $shouldAlwaysCollapse;

protected ?bool $shouldMobileCollapse;

protected ?bool $shouldTabletCollapse;

protected bool $hasRunColumnSetup = false;

/**
* Sets up Columns
*/
Expand Down Expand Up @@ -55,22 +57,6 @@ public function bootedWithColumns(): void
*/
abstract public function columns(): array;

/**
* Prepend columns.
*/
public function prependColumns(): array
{
return [];
}

/**
* Append columns.
*/
public function appendColumns(): array
{
return [];
}

/**
* Add Columns to View
*/
Expand Down
Loading