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
7 changes: 6 additions & 1 deletion app/Filament/Resources/PluginResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
use Filament\Schemas\Schema;
use Filament\Tables;
use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Support\HtmlString;

class PluginResource extends Resource
Expand Down Expand Up @@ -333,7 +334,11 @@ public static function table(Table $table): Table
])
->filters([
Tables\Filters\SelectFilter::make('status')
->options(PluginStatus::class),
->options(PluginStatus::class)
->query(fn (Builder $query, array $data): Builder => filled($data['value'])
? $query->where('status', $data['value'])
: $query->where('status', '!=', PluginStatus::Draft)
),
Tables\Filters\SelectFilter::make('type')
->options(PluginType::class),
Tables\Filters\TernaryFilter::make('is_official')
Expand Down
8 changes: 0 additions & 8 deletions app/Filament/Resources/PluginResource/Pages/ListPlugins.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@

namespace App\Filament\Resources\PluginResource\Pages;

use App\Enums\PluginStatus;
use App\Filament\Resources\PluginResource;
use Filament\Actions;
use Filament\Resources\Pages\ListRecords;
use Illuminate\Database\Eloquent\Builder;

class ListPlugins extends ListRecords
{
Expand All @@ -18,10 +16,4 @@ protected function getHeaderActions(): array
Actions\CreateAction::make(),
];
}

protected function getTableQuery(): ?Builder
{
return parent::getTableQuery()
->where('status', '!=', PluginStatus::Draft);
}
}
49 changes: 49 additions & 0 deletions tests/Feature/Filament/PluginListDraftFilterTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?php

namespace Tests\Feature\Filament;

use App\Enums\PluginStatus;
use App\Filament\Resources\PluginResource\Pages\ListPlugins;
use App\Models\Plugin;
use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Livewire\Livewire;
use Tests\TestCase;

class PluginListDraftFilterTest extends TestCase
{
use RefreshDatabase;

private User $admin;

protected function setUp(): void
{
parent::setUp();

$this->admin = User::factory()->create(['email' => 'admin@test.com']);
config(['filament.users' => ['admin@test.com']]);
}

public function test_draft_plugins_are_hidden_by_default(): void
{
$draft = Plugin::factory()->draft()->create();
$approved = Plugin::factory()->approved()->create();

Livewire::actingAs($this->admin)
->test(ListPlugins::class)
->assertCanNotSeeTableRecords([$draft])
->assertCanSeeTableRecords([$approved]);
}

public function test_draft_plugins_are_visible_when_filtering_by_draft_status(): void
{
$draft = Plugin::factory()->draft()->create();
$approved = Plugin::factory()->approved()->create();

Livewire::actingAs($this->admin)
->test(ListPlugins::class)
->filterTable('status', PluginStatus::Draft->value)
->assertCanSeeTableRecords([$draft])
->assertCanNotSeeTableRecords([$approved]);
}
}
Loading