Skip to content

Commit 1af1da1

Browse files
authored
[Bug] Added server id to start speedtest action (alexjustesen#1805)
* added server id to start speedtest action * replaced deprecated modal button label * code quality
1 parent 4723309 commit 1af1da1

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

app/Actions/Ookla/StartSpeedtest.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,17 @@ class StartSpeedtest
1313
{
1414
use AsAction;
1515

16-
public function handle(bool $scheduled = false): void
16+
public function handle(bool $scheduled = false, ?int $serverId = null): void
1717
{
1818
$result = Result::create([
1919
'service' => ResultService::Ookla,
2020
'status' => ResultStatus::Started,
2121
'scheduled' => $scheduled,
2222
]);
2323

24-
$serverId = SelectSpeedtestServer::run();
24+
if (blank($serverId)) {
25+
$serverId = SelectSpeedtestServer::run();
26+
}
2527

2628
if (! blank($serverId)) {
2729
$result->update([

app/Filament/Pages/Dashboard.php

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,27 +50,31 @@ protected function getHeaderActions(): array
5050
->color('gray')
5151
->hidden(fn (): bool => ! config('speedtest.public_dashboard'))
5252
->url(shouldOpenInNewTab: true, url: '/'),
53-
Action::make('ookla_speedtest')
53+
54+
Action::make('speedtest')
5455
->form([
5556
Forms\Components\Select::make('server_id')
5657
->label('Select Server')
57-
->helperText('Leave blank to run the speedtest without specifying a server.')
58-
->options(fn (callable $get) => app(GetOoklaSpeedtestServers::class)->handle($get('server_search')))
58+
->helperText('Leave empty to run the speedtest without specifying a server.')
59+
->options(fn (): array => GetOoklaSpeedtestServers::run())
5960
->searchable(),
6061
])
6162
->action(function (array $data) {
6263
$serverId = $data['server_id'] ?? null;
6364

64-
StartSpeedtest::run(serverId: $serverId);
65+
StartSpeedtest::run(
66+
scheduled: false,
67+
serverId: $serverId,
68+
);
6569

6670
Notification::make()
6771
->title('Speedtest started')
6872
->success()
6973
->send();
7074
})
7175
->modalHeading('Run Speedtest')
72-
->modalButton('Run Speedtest')
7376
->modalWidth('lg')
77+
->modalSubmitActionLabel('Start')
7478
->button()
7579
->color('primary')
7680
->label('Run Speedtest')

0 commit comments

Comments
 (0)