Skip to content

Fixed a problem when filtering "All" status #185

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

Open
tkoop wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed a problem when filtering "All" status #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d4e0b3
Fixed a problem when filtering "All" status
timkcri Jun 18, 2026
53db4dc
Also fixed job name search
timkcri Jun 19, 2026
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
6 changes: 3 additions & 3 deletions src/Controllers/ShowQueueMonitorController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ public function __invoke(Request $request)
]);

$filters = [
'status' => isset($data['status']) ? (int) $data['status'] : null,
'status' => isset($data['status']) && '' !== $data['status'] ? (int) $data['status'] : null,
'queue' => $data['queue'] ?? 'all',
'name' => $data['name'] ?? null,
'custom_data' => $data['custom_data'] ?? null,
'name' => isset($data['name']) && '' !== $data['name'] ? $data['name'] : null,
'custom_data' => isset($data['custom_data']) && '' !== $data['custom_data'] ? $data['custom_data'] : null,
];

$jobsQuery = QueueMonitor::getModel()->newQuery();
Expand Down
53 changes: 53 additions & 0 deletions tests/RoutesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use romanzipp\QueueMonitor\Enums\MonitorStatus;
use romanzipp\QueueMonitor\Models\Monitor;
use romanzipp\QueueMonitor\Tests\Support\MonitoredJob;
use romanzipp\QueueMonitor\Tests\TestCases\DatabaseTestCase;

class RoutesTest extends DatabaseTestCase
Expand Down Expand Up @@ -40,6 +41,58 @@ public function testIndexEnabled()
->assertViewIs('queue-monitor::jobs');
}

public function testIndexStatusFilterAll()
{
config(['queue-monitor.ui.enabled' => true]);

Monitor::query()->create(['job_id' => mt_rand(), 'status' => MonitorStatus::RUNNING]);
Monitor::query()->create(['job_id' => mt_rand(), 'status' => MonitorStatus::FAILED]);

$this
->get('/jobs?status=')
->assertStatus(200)
->assertViewHas('filters', fn (array $filters) => null === $filters['status'])
->assertViewHas('jobs', fn ($jobs) => 2 === $jobs->total());
}

public function testIndexStatusFilterRunning()
{
config(['queue-monitor.ui.enabled' => true]);

Monitor::query()->create(['job_id' => mt_rand(), 'status' => MonitorStatus::RUNNING]);
Monitor::query()->create(['job_id' => mt_rand(), 'status' => MonitorStatus::FAILED]);

$this
->get('/jobs?status=0')
->assertStatus(200)
->assertViewHas('filters', fn (array $filters) => MonitorStatus::RUNNING === $filters['status'])
->assertViewHas('jobs', fn ($jobs) => 1 === $jobs->total());
}

public function testIndexFiltersByJobNameWithoutRestrictingStatusToRunning()
{
config(['queue-monitor.ui.enabled' => true]);

Monitor::query()->create([
'job_id' => '1',
'name' => MonitoredJob::class,
'status' => MonitorStatus::SUCCEEDED,
'started_at' => now(),
]);

Monitor::query()->create([
'job_id' => '2',
'name' => MonitoredJob::class,
'status' => MonitorStatus::FAILED,
'started_at' => now(),
]);

$this
->get('/jobs?name=MonitoredJob&status=&queue=all')
->assertStatus(200)
->assertViewHas('jobs', fn ($jobs) => 2 === $jobs->total());
}

/*
*--------------------------------------------------------------------------
* Delete Monitor
Expand Down
2 changes: 1 addition & 1 deletion views/partials/table.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

<td class="p-4 text-gray-800 dark:text-gray-300 text-sm leading-5 font-medium border-b border-gray-200 dark:border-gray-600">

{{ $job->getBaseName() }}
<span title="{{ $job->name }}">{{ $job->getBaseName() }}</span>

<span class="ml-1 text-xs text-gray-600 dark:text-gray-400">
#{{ $job->job_id }}
Expand Down