Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
5869a83
add model and ui
svenvg93 Nov 20, 2025
41b4248
Update UI
svenvg93 Nov 21, 2025
7e34694
Remove thresholds for now
svenvg93 Nov 21, 2025
37938bc
change input
svenvg93 Nov 24, 2025
697022a
getServerLabel
svenvg93 Nov 24, 2025
6d62e82
Merge branch 'alexjustesen:main' into feat/schedule-ui
svenvg93 Nov 25, 2025
fb77dd3
Merge remote-tracking branch 'origin/main' into feat/schedule-ui
svenvg93 Nov 27, 2025
5d235dc
Add lang files
svenvg93 Nov 27, 2025
e33da95
update to main
svenvg93 Nov 30, 2025
9e93ca6
Merge branch 'alexjustesen:main' into feat/schedule-ui
svenvg93 Dec 1, 2025
96ec62f
add updating
svenvg93 Dec 1, 2025
776c010
add enums lang strings
svenvg93 Dec 1, 2025
ee6eb56
update to main
svenvg93 Dec 2, 2025
1bbb165
Merge branch 'alexjustesen:main' into feat/schedule-ui
svenvg93 Dec 3, 2025
3b7cdbe
Merge branch 'main' into feat/schedule-ui
svenvg93 Dec 4, 2025
9350342
use tags
svenvg93 Dec 4, 2025
82d8ca8
Merge branch 'alexjustesen:main' into feat/schedule-ui
svenvg93 Dec 6, 2025
e615cbb
Merge branch 'alexjustesen:main' into feat/schedule-ui
svenvg93 Dec 6, 2025
72d3b29
Merge remote-tracking branch 'origin/main' into feat/schedule-ui
svenvg93 Dec 9, 2025
3692f10
Add schedule name to the resutls table modal
svenvg93 Dec 9, 2025
cee44d8
update table
svenvg93 Dec 9, 2025
f4aac8c
Merge branch 'alexjustesen:main' into feat/schedule-ui
svenvg93 Dec 10, 2025
818f97a
Merge branch 'alexjustesen:main' into feat/schedule-ui
svenvg93 Dec 11, 2025
4da2232
Fix UpdateNextRun at update
svenvg93 Dec 11, 2025
fd0bba9
Add lang strings
svenvg93 Dec 11, 2025
a282d66
update text and remove unneeded colunm
svenvg93 Dec 11, 2025
afccc69
pint
svenvg93 Dec 11, 2025
bb2f6e4
Merge branch 'main' into feat/schedule-ui
svenvg93 Dec 15, 2025
fb5a9ad
Merge branch 'main' into feat/schedule-ui
svenvg93 Dec 16, 2025
2359cab
Merge branch 'main' into feat/schedule-ui
svenvg93 Dec 18, 2025
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
55 changes: 55 additions & 0 deletions app/Actions/CheckCronOverlap.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?php

namespace App\Actions;

use App\Helpers\Cron;
use App\Models\Schedule;
use Filament\Notifications\Notification;
use Lorisleiva\Actions\Concerns\AsAction;

class CheckCronOverlap
{
use AsAction;

public static function run(Schedule $schedule): void
{

// Ensure schedule has a cron expression and is active
if (! $schedule->is_active) {

return;
}

$cronExpression = $schedule->schedule;
$scheduleId = $schedule->id;

// Track overlapping schedules
$overlappingSchedules = [];

// Find other active schedules that have cron expressions
$existingCrons = Schedule::query()
->where('is_active', true)
->where('id', '!=', $scheduleId)
->get(['id', 'schedule'])
->pluck('schedule', 'id');

// Check for overlaps with the modified schedule's cron expression
foreach ($existingCrons as $existingScheduleId => $existingCron) {
if (Cron::hasOverlap($existingCron, $cronExpression)) {
$overlappingSchedules[] = $existingScheduleId;
}
}

// Send a notification if overlaps exist
if (count($overlappingSchedules) > 0) {
$overlapList = implode(', ', $overlappingSchedules);

// Send a single notification for all overlaps
Notification::make()
->title(__('schedules.overlap_detected'))
->warning()
->body(__('schedules.overlap_body', ['ids' => $overlapList]))
->send();
}
}
}
36 changes: 36 additions & 0 deletions app/Actions/ExplainCronExpression.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?php

namespace App\Actions;

use Cron\CronExpression;
use Illuminate\Support\HtmlString;
use Lorisleiva\Actions\Concerns\AsAction;
use Orisai\CronExpressionExplainer\DefaultCronExpressionExplainer;
use Orisai\CronExpressionExplainer\Exception\UnsupportedExpression;

class ExplainCronExpression
{
use AsAction;

public function handle(?string $expression)
{
if (blank($expression)) {
return 'No cron expression provided.';
}

try {
$cron = new CronExpression($expression);
} catch (\InvalidArgumentException $e) {
return new HtmlString('The cron expression is invalid.');
}

try {
$explainer = new DefaultCronExpressionExplainer;
} catch (UnsupportedExpression $e) {

return new HtmlString('The cron expression is not supported.');
}

return $explainer->explain($expression);
}
}
57 changes: 57 additions & 0 deletions app/Actions/UpdateNextRun.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<?php

namespace App\Actions;

use App\Models\Schedule;
use Carbon\Carbon;
use Cron\CronExpression;
use Illuminate\Contracts\Queue\ShouldQueue;
use Lorisleiva\Actions\Concerns\AsAction;

class UpdateNextRun implements ShouldQueue
{
use AsAction;

public function handle(Schedule $schedule): void
{
// Disable model events for the entire action
Schedule::withoutEvents(function () use ($schedule) {

// If the schedule is not active, clear the next_run_at field
if (! $schedule->is_active) {
if ($schedule->next_run_at !== null) {
// Update without firing events
$schedule->next_run_at = null;
$schedule->save();
}

return;
}

// Get the cron expression from the schedule column
$expression = $schedule->schedule;

if ($expression) {
// Calculate the next run time based on the cron expression
$nextRun = $this->getNextRunAt($expression);

// Only update if the next_run_at field is different from the calculated next run time
if ($schedule->next_run_at !== $nextRun) {
$schedule->next_run_at = $nextRun;
$schedule->save();
}
}

}); // End of withoutEvents closure
}

// Calculate the next run time based on the cron expression
private function getNextRunAt(string $expression): Carbon
{
// Create a CronExpression instance from the cron expression
$cron = CronExpression::factory($expression);

// Get the next valid run time
return Carbon::parse($cron->getNextRunDate());
}
}
34 changes: 34 additions & 0 deletions app/Enums/ScheduleStatus.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?php

namespace App\Enums;

use Filament\Support\Contracts\HasColor;
use Filament\Support\Contracts\HasLabel;

enum ScheduleStatus: string implements HasColor, HasLabel
{
case Healthy = 'healthy';
case Unhealthy = 'unhealthy';
case Failed = 'failed';
case NotTested = 'not_tested';

public function getColor(): ?string
{
return match ($this) {
self::Healthy => 'success',
self::Unhealthy => 'warning',
self::Failed => 'danger',
self::NotTested => 'gray',
};
}

public function getLabel(): ?string
{
return match ($this) {
self::Healthy => __('enums.schedule_status.healthy'),
self::Unhealthy => __('enums.schedule_status.unhealthy'),
self::Failed => __('enums.schedule_status.failed'),
self::NotTested => __('enums.schedule_status.not_tested'),
};
}
}
3 changes: 3 additions & 0 deletions app/Filament/Resources/Results/Schemas/ResultForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@ public static function schema(): array
TextEntry::make('comment')
->label(__('general.comment'))
->state(fn (Result $result): ?string => $result->comments),
TextEntry::make('schedule.name')
->label(__('results.schedule'))
->state(fn (Result $result): ?string => $result->schedule?->name),
Checkbox::make('scheduled')
->label(__('results.scheduled')),
Checkbox::make('healthy')
Expand Down
12 changes: 12 additions & 0 deletions app/Filament/Resources/Results/Tables/ResultTable.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use App\Filament\Tables\Columns\ResultServerColumn;
use App\Helpers\Number;
use App\Models\Result;
use App\Models\Schedule;
use Filament\Actions\Action;
use Filament\Actions\ActionGroup;
use Filament\Actions\DeleteAction;
Expand Down Expand Up @@ -116,6 +117,7 @@ public static function table(Table $table): Table
->label(__('results.scheduled'))
->boolean()
->toggleable(isToggledHiddenByDefault: true)
->tooltip(fn ($record) => $record->schedule->name ?? null)
->alignment(Alignment::Center),

TextColumn::make('created_at')
Expand Down Expand Up @@ -204,6 +206,16 @@ public static function table(Table $table): Table
})
->attribute('data->server->id'),

SelectFilter::make('schedule_id')
->label('Schedule')
->multiple()
->attribute('schedule_id')
->options(function (): array {
return Schedule::query()
->orderBy('name')
->pluck('name', 'id')
->toArray();
}),
TernaryFilter::make('scheduled')
->label(__('results.scheduled'))
->nullable()
Expand Down
24 changes: 24 additions & 0 deletions app/Filament/Resources/Schedules/Pages/CreateSchedule.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php

namespace App\Filament\Resources\Schedules\Pages;

use App\Filament\Resources\Schedules\ScheduleResource;
use Filament\Resources\Pages\CreateRecord;
use Illuminate\Support\Facades\Auth;

class CreateSchedule extends CreateRecord
{
protected static string $resource = ScheduleResource::class;

protected function mutateFormDataBeforeCreate(array $data): array
{
$data['created_by'] = Auth::id();

return $data;
}

protected function getRedirectUrl(): string
{
return $this->getResource()::getUrl('index');
}
}
24 changes: 24 additions & 0 deletions app/Filament/Resources/Schedules/Pages/EditSchedule.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php

namespace App\Filament\Resources\Schedules\Pages;

use App\Filament\Resources\Schedules\ScheduleResource;
use Filament\Actions\DeleteAction;
use Filament\Resources\Pages\EditRecord;

class EditSchedule extends EditRecord
{
protected static string $resource = ScheduleResource::class;

protected function getHeaderActions(): array
{
return [
DeleteAction::make(),
];
}

protected function getRedirectUrl(): string
{
return $this->getResource()::getUrl('index');
}
}
19 changes: 19 additions & 0 deletions app/Filament/Resources/Schedules/Pages/ListSchedules.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?php

namespace App\Filament\Resources\Schedules\Pages;

use App\Filament\Resources\Schedules\ScheduleResource;
use Filament\Actions\CreateAction;
use Filament\Resources\Pages\ListRecords;

class ListSchedules extends ListRecords
{
protected static string $resource = ScheduleResource::class;

protected function getHeaderActions(): array
{
return [
CreateAction::make(),
];
}
}
67 changes: 67 additions & 0 deletions app/Filament/Resources/Schedules/ScheduleResource.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?php

namespace App\Filament\Resources\Schedules;

use App\Filament\Resources\Schedules\Pages\CreateSchedule;
use App\Filament\Resources\Schedules\Pages\EditSchedule;
use App\Filament\Resources\Schedules\Pages\ListSchedules;
use App\Filament\Resources\Schedules\Schemas\ScheduleForm;
use App\Filament\Resources\Schedules\Tables\ScheduleTable;
use App\Models\Schedule;
use Filament\Resources\Resource;
use Filament\Schemas\Schema;
use Filament\Tables\Table;
use Illuminate\Support\Facades\Auth;

class ScheduleResource extends Resource
{
protected static ?string $model = Schedule::class;

protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-calendar';

protected static string|\UnitEnum|null $navigationGroup = 'Settings';

public static function getNavigationLabel(): string
{
return __('schedules.title');
}

public static function getModelLabel(): string
{
return __('schedules.singular');
}

public static function getPluralModelLabel(): string
{
return __('schedules.title');
}

public static function canAccess(): bool
{
return Auth::check() && Auth::user()->is_admin;
}

public static function shouldRegisterNavigation(): bool
{
return Auth::check() && Auth::user()->is_admin;
}

public static function form(Schema $schema): Schema
{
return $schema->components(ScheduleForm::schema());
}

public static function table(Table $table): Table
{
return ScheduleTable::table($table);
}

public static function getPages(): array
{
return [
'index' => ListSchedules::route('/'),
'create' => CreateSchedule::route('/create'),
'edit' => EditSchedule::route('/{record}/edit'),
];
}
}
Loading