Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 18 additions & 1 deletion src/Datatables/Column.php
Original file line number Diff line number Diff line change
Expand Up @@ -255,14 +255,31 @@ public function tooltip(string $tooltip): Column
return $this;
}

/**
* Set the column visibility.
*
* @param bool $visible
* @return Column
*/
public function visible(bool $visible = true): Column
{
if ($visible) {
unset($this->attributes['visible']);
} else {
$this->attributes['visible'] = false;
}

return $this;
}

/**
* Column must be hidden.
*
* @return Column
*/
public function hidden(): Column
{
return $this->booleanAttribute('visible', false);
return $this->visible(false);
}

/**
Expand Down
4 changes: 4 additions & 0 deletions src/Datatables/Datatable.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ public function make(): JsonResponse
}

foreach ($this->getColumns() as $column) {
if (empty($column->data)) {
continue;
}

if ($column->filter) {
$datatable->filterColumn($column->name ?? $column->data, $column->filter);
}
Expand Down
29 changes: 29 additions & 0 deletions tests/Datatables/DatatablesTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,40 @@

namespace Sebastienheyd\Boilerplate\Tests\Datatables;

use Sebastienheyd\Boilerplate\Datatables\Column;
use Sebastienheyd\Boilerplate\Tests\factories\UserFactory;
use Sebastienheyd\Boilerplate\Tests\TestCase;

class DatatablesTest extends TestCase
{
public function testColumnVisibleTrue()
{
$column = Column::add('Name')->data('name')->visible(true);
$result = $column->get();
$this->assertEquals('{data:"name"}', $result);
}

public function testColumnVisibleFalse()
{
$column = Column::add('Name')->data('name')->visible(false);
$result = $column->get();
$this->assertEquals('{data:"name",visible:false}', $result);
}

public function testColumnHidden()
{
$column = Column::add('Name')->data('name')->hidden();
$result = $column->get();
$this->assertEquals('{data:"name",visible:false}', $result);
}

public function testColumnVisibleRemovesHidden()
{
$column = Column::add('Name')->data('name')->hidden()->visible(true);
$result = $column->get();
$this->assertEquals('{data:"name"}', $result);
}

public function testDatatable()
{
UserFactory::create()->admin(true);
Expand Down