@foreach ($actions as $action)
@if (! $action->isHidden())
{{ $action }}
diff --git a/resources/views/components/button.blade.php b/resources/views/components/button.blade.php
index 340f9cf..49234c9 100644
--- a/resources/views/components/button.blade.php
+++ b/resources/views/components/button.blade.php
@@ -2,5 +2,6 @@
:attributes="\Filament\Support\prepare_inherited_attributes($attributes)"
:dark-mode="config('tables.dark_mode')"
>
+
{{ $slot }}
diff --git a/resources/views/components/icon-button.blade.php b/resources/views/components/icon-button.blade.php
index 1fa3e9d..b48ae7b 100644
--- a/resources/views/components/icon-button.blade.php
+++ b/resources/views/components/icon-button.blade.php
@@ -1,140 +1,274 @@
+@php
+ use Filament\Support\Enums\ActionSize;
+ use Filament\Support\Enums\IconPosition;
+ use Filament\Support\Enums\IconSize;
+@endphp
+
@props([
+ 'badge' => null,
+ 'badgeColor' => 'primary',
'color' => 'primary',
- 'darkMode' => false,
'disabled' => false,
'form' => null,
+ 'grouped' => false,
'icon' => null,
- 'iconPosition' => 'before',
+ 'iconAlias' => null,
+ 'iconPosition' => IconPosition::Before,
+ 'iconSize' => null,
'keyBindings' => null,
+ 'labeledFrom' => null,
+ 'labelSrOnly' => false,
'outlined' => false,
'size' => 'md',
'tag' => 'button',
'tooltip' => null,
'type' => 'button',
- 'labelSrOnly' => false,
])
-
+
@php
- $buttonClasses = array_merge([
- "filament-button filament-button-size-{$size} inline-flex items-center justify-center py-1 gap-1 font-medium rounded-lg border transition-colors outline-none focus:ring-offset-2 focus:ring-2 focus:ring-inset",
- 'dark:focus:ring-offset-0' => $darkMode,
- 'opacity-70 cursor-not-allowed pointer-events-none' => $disabled,
- 'min-h-[2.25rem] px-2 text-sm' => $size === 'md',
- 'min-h-[2rem] px-3 text-sm' => $size === 'sm',
- 'min-h-[2.75rem] px-6 text-lg' => $size === 'lg',
- ], $outlined ? [
- 'shadow focus:ring-white' => $color !== 'secondary',
- 'text-primary-600 border-primary-600 hover:bg-primary-600/20 focus:bg-primary-700/20 focus:ring-offset-primary-700' => $color === 'primary',
- 'text-success-600 border-success-600 hover:bg-success-600/20 focus:bg-success-700/20 focus:ring-offset-success-700' => $color === 'success',
- 'text-danger-600 border-danger-600 hover:bg-danger-600/20 focus:bg-danger-700/20 focus:ring-offset-danger-700' => $color === 'danger',
- 'text-warning-500 border-warning-500 hover:bg-warning-500/20 focus:bg-warning-600/20 focus:ring-offset-warning-600' => $color === 'warning',
- 'text-gray-600 border-gray-600 hover:bg-gray-600/20 focus:bg-gray-700/20 focus:ring-offset-gray-700' => $color === 'gray',
- 'text-gray-800 border-gray-300 hover:bg-gray-50 focus:ring-primary-600 focus:text-primary-600 focus:bg-primary-50 focus:border-primary-600' => $color === 'secondary',
- 'dark:text-primary-500 dark:border-primary-500 dark:hover:bg-primary-500/20 dark:focus:bg-primary-600/20 dark:focus:ring-offset-primary-600' => $color === 'primary' && $darkMode,
- 'dark:text-success-500 dark:border-success-500 dark:hover:bg-success-500/20 dark:focus:bg-success-600/20 dark:focus:ring-offset-success-600' => $color === 'success' && $darkMode,
- 'dark:text-danger-500 dark:border-danger-500 dark:hover:bg-danger-500/20 dark:focus:bg-danger-600/20 dark:focus:ring-offset-danger-600' => $color === 'danger' && $darkMode,
- 'dark:text-warning-500 dark:border-warning-500 dark:hover:bg-warning-500/20 dark:focus:bg-warning-600/20 dark:focus:ring-offset-warning-600' => $color === 'warning' && $darkMode,
- 'dark:text-gray-400 dark:border-gray-400 dark:hover:bg-gray-400/20 dark:focus:bg-gray-600/20 dark:focus:ring-offset-gray-600' => $color === 'gray' && $darkMode,
- 'dark:border-gray-600 dark:hover:border-gray-500 dark:hover:bg-gray-500/20 dark:text-gray-200 dark:focus:text-primary-400 dark:focus:border-primary-400 dark:focus:bg-gray-800/20' => $color === 'secondary' && $darkMode,
- ] : [
- 'text-white shadow focus:ring-white border-transparent' => $color !== 'secondary',
- 'bg-primary-600 hover:bg-primary-500 focus:bg-primary-700 focus:ring-offset-primary-700' => $color === 'primary',
- 'bg-success-600 hover:bg-success-500 focus:bg-success-700 focus:ring-offset-success-700' => $color === 'success',
- 'bg-danger-600 hover:bg-danger-500 focus:bg-danger-700 focus:ring-offset-danger-700' => $color === 'danger',
- 'bg-warning-500 hover:bg-warning-600 focus:bg-warning-700 focus:ring-offset-warning-700' => $color === 'warning',
- 'bg-gray-600 hover:bg-gray-500 focus:bg-gray-700 focus:ring-offset-gray-700' => $color === 'gray',
- 'text-gray-800 bg-white border-gray-300 hover:bg-gray-50 focus:ring-primary-600 focus:text-primary-600 focus:bg-primary-50 focus:border-primary-600' => $color === 'secondary',
- 'dark:bg-gray-800 dark:hover:bg-gray-700 dark:border-gray-600 dark:hover:border-gray-500 dark:text-gray-200 dark:focus:text-primary-400 dark:focus:border-primary-400 dark:focus:bg-gray-800' => $color === 'secondary' && $darkMode,
+ $stringSize = match ($size) {
+ ActionSize::ExtraSmall => 'xs',
+ ActionSize::Small => 'sm',
+ ActionSize::Medium => 'md',
+ ActionSize::Large => 'lg',
+ ActionSize::ExtraLarge => 'xl',
+ default => $size,
+ };
+
+ $buttonClasses = \Illuminate\Support\Arr::toCssClasses([
+ ...[
+ "fi-btn fi-btn-size-{$stringSize} relative grid-flow-col items-center justify-center font-semibold outline-none transition duration-75 focus:ring-2",
+ 'pointer-events-none opacity-70' => $disabled,
+ 'flex-1' => $grouped,
+ 'rounded-lg' => ! $grouped,
+ is_string($color) ? "fi-btn-color-{$color}" : null,
+ match ($size) {
+ ActionSize::ExtraSmall, 'xs' => 'gap-1 px-2 py-1.5 text-xs',
+ ActionSize::Small, 'sm' => 'gap-1 px-2.5 py-1.5 text-sm',
+ ActionSize::Medium, 'md' => 'gap-1.5 px-3 py-2 text-sm',
+ ActionSize::Large, 'lg' => 'gap-1.5 px-3.5 py-2.5 text-sm',
+ ActionSize::ExtraLarge, 'xl' => 'gap-1.5 px-4 py-3 text-sm',
+ },
+ 'hidden' => $labeledFrom,
+ match ($labeledFrom) {
+ 'sm' => 'sm:inline-grid',
+ 'md' => 'md:inline-grid',
+ 'lg' => 'lg:inline-grid',
+ 'xl' => 'xl:inline-grid',
+ '2xl' => '2xl:inline-grid',
+ default => 'inline-grid',
+ },
+ ],
+ ...(
+ $outlined ?
+ [
+ 'fi-btn-outlined ring-1',
+ match ($color) {
+ 'gray' => 'text-gray-950 ring-gray-300 hover:bg-gray-400/10 focus:ring-gray-400/40 dark:text-white dark:ring-gray-700',
+ default => 'text-custom-600 ring-custom-600 hover:bg-custom-400/10 dark:text-custom-400 dark:ring-custom-500',
+ },
+ ] :
+ [
+ 'shadow-sm' => ! $grouped,
+ ...match ($color) {
+ 'gray' => [
+ 'bg-white text-gray-950 hover:bg-gray-50 dark:bg-white/5 dark:text-white dark:hover:bg-white/10',
+ 'ring-1 ring-gray-950/10 dark:ring-white/20' => ! $grouped,
+ ],
+ default => [
+ 'bg-custom-600 text-white hover:bg-custom-500 dark:bg-custom-500 dark:hover:bg-custom-400',
+ 'focus:ring-custom-500/50 dark:focus:ring-custom-400/50' => ! $grouped,
+ ],
+ },
+ ]
+ ),
]);
+ $buttonStyles = \Illuminate\Support\Arr::toCssStyles([
+ \Filament\Support\get_color_css_variables($color, shades: [400, 500, 600]) => $color !== 'gray',
+ ]);
+
+ $iconSize ??= match ($size) {
+ ActionSize::ExtraSmall, ActionSize::Small, 'xs', 'sm' => IconSize::Small,
+ default => IconSize::Medium,
+ };
+
$iconClasses = \Illuminate\Support\Arr::toCssClasses([
- 'filament-button-icon',
- 'w-4 h-4' => $size === 'sm',
- 'w-5 h-5' => $size === 'md',
- 'w-6 h-6' => $size === 'lg',
- ]);
+ 'fi-btn-icon',
+ match ($iconSize) {
+ IconSize::Small, 'sm' => 'h-4 w-4',
+ IconSize::Medium, 'md' => 'h-5 w-5',
+ IconSize::Large, 'lg' => 'h-6 w-6',
+ default => $iconSize,
+ },
+ match ($color) {
+ 'gray' => 'text-gray-400 dark:text-gray-500',
+ default => null,
+ },
+ ]);
+
+ $badgeContainerClasses = 'fi-button-badge-ctn absolute -top-1 start-full z-[1] -ms-1 -translate-x-1/2 rounded-md bg-white rtl:translate-x-1/2 dark:bg-gray-900';
+
+ $labelClasses = \Illuminate\Support\Arr::toCssClasses([
+ 'fi-btn-label',
+ 'sr-only' => $labelSrOnly,
+ ]);
+
+ $wireTarget = $attributes->whereStartsWith(['wire:target', 'wire:click'])->filter(fn ($value): bool => filled($value))->first();
- $hasLoadingIndicator = filled($attributes->get('wire:target')) || filled($attributes->get('wire:click')) || (($type === 'submit') && filled($form));
+ $hasFileUploadLoadingIndicator = $type === 'submit' && filled($form);
+ $hasLoadingIndicator = filled($wireTarget) || $hasFileUploadLoadingIndicator;
if ($hasLoadingIndicator) {
- $loadingIndicatorTarget = html_entity_decode($attributes->get('wire:target', $attributes->get('wire:click', $form)), ENT_QUOTES);
+ $loadingIndicatorTarget = html_entity_decode($wireTarget ?: $form, ENT_QUOTES);
}
@endphp
+@if ($labeledFrom)
+
+@endif
+
@if ($tag === 'button')
@elseif ($tag === 'a')
@@ -146,18 +280,42 @@
x-mousetrap.global.{{ collect($keyBindings)->map(fn (string $keyBinding): string => str_replace('+', '-', $keyBinding))->implode('.') }}
@endif
@if ($tooltip)
- x-tooltip.raw="{{ $tooltip }}"
+ x-tooltip="{
+ content: @js($tooltip),
+ theme: $store.theme,
+ }"
@endif
- {{ $attributes->class($buttonClasses) }}
+ {{
+ $attributes
+ ->class([$buttonClasses])
+ ->style([$buttonStyles])
+ }}
>
- @if ($icon && $iconPosition === 'before')
-
+ @if ($icon && in_array($iconPosition, [IconPosition::Before, 'before']))
+
@endif
- @if ($icon && $iconPosition === 'after')
-
+ @if ($icon && in_array($iconPosition, [IconPosition::After, 'after']))
+
+ @endif
+
+ @if (filled($badge))
+
+
+ {{ $badge }}
+
+
@endif
@endif
+
diff --git a/src/Filament/Columns/ActionGroup.php b/src/Filament/Columns/ActionGroup.php
index b7443fe..8f878a8 100644
--- a/src/Filament/Columns/ActionGroup.php
+++ b/src/Filament/Columns/ActionGroup.php
@@ -2,7 +2,7 @@
namespace HusamTariq\FilamentDatabaseSchedule\Filament\Columns;
-use Filament\Support\Actions\Concerns\InteractsWithRecord;
+use Filament\Actions\Concerns\InteractsWithRecord;
use Filament\Tables\Actions\ActionGroup as ActionsActionGroup;
class ActionGroup extends ActionsActionGroup
@@ -10,13 +10,12 @@ class ActionGroup extends ActionsActionGroup
use InteractsWithRecord;
protected string $view = 'filament-database-schedule::components.action-group';
-
+ public const ICON_BUTTON_VIEW = 'filament-database-schedule::components.action-group';
public function getActions(): array
{
$actions = [];
foreach ($this->actions as $action) {
- //$action->getTooltip();
$actions[$action->getName()] = $action
->view('filament-database-schedule::actions.button-action')->size('md')
->record($this->getRecord());
diff --git a/src/Filament/Columns/ScheduleArguments.php b/src/Filament/Columns/ScheduleArguments.php
index 5817e29..60ded2d 100644
--- a/src/Filament/Columns/ScheduleArguments.php
+++ b/src/Filament/Columns/ScheduleArguments.php
@@ -2,11 +2,12 @@
namespace HusamTariq\FilamentDatabaseSchedule\Filament\Columns;
-use Filament\Tables\Columns\TagsColumn;
-class ScheduleArguments extends TagsColumn
+use Filament\Tables\Columns\TextColumn;
+
+class ScheduleArguments extends TextColumn
{
- // protected string $view = 'filament-database-schedule::columns.schedule-arguments';
+ protected string $view = 'filament-database-schedule::columns.schedule-arguments';
protected bool $withValue = true;
@@ -38,7 +39,7 @@ public function getTags(): array
if (count($tags) === 1 && blank($tags[0])) {
$tags = [];
}
-
+dd($tags);
return $tags;
}
}
diff --git a/src/Filament/Resources/ScheduleResource.php b/src/Filament/Resources/ScheduleResource.php
index 8c17798..9a2c7fd 100644
--- a/src/Filament/Resources/ScheduleResource.php
+++ b/src/Filament/Resources/ScheduleResource.php
@@ -4,16 +4,15 @@
use Awcodes\FilamentTableRepeater\Components\TableRepeater;
use Carbon\Carbon;
-use Closure;
use HusamTariq\FilamentDatabaseSchedule\Filament\Resources\ScheduleResource\Pages;
use HusamTariq\FilamentDatabaseSchedule\Models\Schedule;
use Filament\Forms;
+use Filament\Forms\Form;
use Filament\Forms\Components\Card;
-use Filament\Resources\Form;
use Filament\Resources\Resource;
-use Filament\Resources\Table;
use Filament\Tables;
use Filament\Tables\Columns\Column;
+use Filament\Tables\Table;
use HusamTariq\FilamentDatabaseSchedule\Filament\Columns\ActionGroup;
use HusamTariq\FilamentDatabaseSchedule\Filament\Columns\ScheduleArguments;
use HusamTariq\FilamentDatabaseSchedule\Filament\Columns\ScheduleOptions;
@@ -27,7 +26,7 @@
class ScheduleResource extends Resource
{
- protected static ?string $navigationIcon = 'heroicon-o-collection';
+ protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
public static Collection $commands;
@@ -47,7 +46,7 @@ public static function getModelLabel(): string
return __('filament-database-schedule::schedule.resource.single');
}
- protected static function getNavigationGroup(): ?string
+ public static function getNavigationGroup(): ?string
{
return __('filament-database-schedule::schedule.resource.navigation');
}
@@ -72,7 +71,7 @@ public static function form(Form $form): Form
->reactive()
->searchable()
->required()
- ->afterStateUpdated(function (Closure $set, $state) {
+ ->afterStateUpdated(function ($set, $state) {
$set('params', static::$commands->firstWhere('name', $state)['arguments'] ?? []);
$set('options_with_value', static::$commands->firstWhere('name', $state)['options']["withValue"] ?? []);
}),
@@ -80,23 +79,23 @@ public static function form(Form $form): Form
->placeholder(__('filament-database-schedule::schedule.messages.custom-command-here'))
->label(__('filament-database-schedule::schedule.messages.custom'))
->required()
- ->visible(fn (Closure $get) => $get('command') === 'custom' && config('filament-database-schedule.commands.enable_custom')),
+ ->visible(fn ($get) => $get('command') === 'custom' && config('filament-database-schedule.commands.enable_custom')),
TableRepeater::make('params')->label(__('filament-database-schedule::schedule.fields.arguments'))
->schema([
- Forms\Components\TextInput::make('value')->label(fn (Closure $get) => ucfirst($get('name')))->required(fn (Closure $get) => $get('required')),
+ Forms\Components\TextInput::make('value')->label(fn ($get) => ucfirst($get('name')))->required(fn ($get) => $get('required')),
Forms\Components\Hidden::make('name'),
])->disableItemCreation()->withoutHeader()->disableItemDeletion()->disableItemMovement()
- ->columnSpan('full')->visible(fn (Closure $get) => !empty(static::$commands->firstWhere('name', $get('command'))['arguments'])),
+ ->columnSpan('full')->visible(fn ($get) => !empty(static::$commands->firstWhere('name', $get('command'))['arguments'])),
TableRepeater::make('options_with_value')->label(__('filament-database-schedule::schedule.fields.options_with_value'))
->schema([
- Forms\Components\TextInput::make('value')->label(fn (Closure $get) => ucfirst($get('name')))->required(fn (Closure $get) => $get('required')),
+ Forms\Components\TextInput::make('value')->label(fn ($get) => ucfirst($get('name')))->required(fn ($get) => $get('required')),
Forms\Components\Hidden::make('type')->default('string'),
Forms\Components\Hidden::make('name'),
])->disableItemCreation()->withoutHeader()->disableItemDeletion()->disableItemMovement()->default([])
->columnSpan('full')->visible(fn ($state) => !empty($state)),
Forms\Components\CheckboxList::make('options')->label(__('filament-database-schedule::schedule.fields.options'))
->options(
- fn (Closure $get) =>
+ fn ($get) =>
collect(static::$commands->firstWhere('name', $get('command'))['options']['withoutValue'] ?? [])
->mapWithKeys(function ($value) {
return [$value => $value];
@@ -151,12 +150,41 @@ public static function table(Table $table): Table
ScheduleArguments::make('params')->label(__('filament-database-schedule::schedule.fields.arguments'))->searchable()->sortable(),
ScheduleOptions::make('options')->label(__('filament-database-schedule::schedule.fields.options'))->searchable()->sortable(),
Tables\Columns\TextColumn::make('expression')->label(__('filament-database-schedule::schedule.fields.expression'))->searchable()->sortable(),
- Tables\Columns\TagsColumn::make('environments')->label(__('filament-database-schedule::schedule.fields.environments'))->separator(',')->searchable()->sortable(),
+ Tables\Columns\TextColumn::make('environments')->label(__('filament-database-schedule::schedule.fields.environments'))->separator(',')->searchable()->sortable()->badge()->toggleable(isToggledHiddenByDefault: false),
+ Tables\Columns\TextColumn::make('status')->formatStateUsing(static function ($state): ?string {
+ switch ($state) {
+ case Schedule::STATUS_INACTIVE:
+ return __('filament-database-schedule::schedule.status.inactive');
+ break;
+
+ case Schedule::STATUS_TRASHED:
+ return __('filament-database-schedule::schedule.status.trashed');
+ break;
+
+ case Schedule::STATUS_ACTIVE:
+ return __('filament-database-schedule::schedule.status.active');
+ break;
+
+ default:
+ return $state;
+ }
+ })->icons([
+ 'heroicon-o-x',
+ 'heroicon-o-document' => Schedule::STATUS_INACTIVE,
+ 'heroicon-o-x-circle' => Schedule::STATUS_TRASHED,
+ 'heroicon-o-check-circle' => Schedule::STATUS_ACTIVE,
+ ])
+ ->colors([
+ 'warning' => Schedule::STATUS_INACTIVE,
+ 'success' => Schedule::STATUS_ACTIVE,
+ 'danger' => Schedule::STATUS_TRASHED,
+ ])->label(__('filament-database-schedule::schedule.fields.status'))->searchable()->sortable()->toggleable(isToggledHiddenByDefault: false),
Tables\Columns\TextColumn::make('created_at')->label(__('filament-database-schedule::schedule.fields.created_at'))->searchable()->sortable()
- ->dateTime()->wrap(),
+ ->dateTime()->wrap()->toggleable(isToggledHiddenByDefault: true),
Tables\Columns\TextColumn::make('updated_at')->getStateUsing(fn ($record) => $record->created_at == $record->updated_at ? __('filament-database-schedule::schedule.fields.never') : $record->updated_at)
->wrap()->formatStateUsing(static function (Column $column, $state): ?string {
- $format ??= config('tables.date_time_format');
+ $format ??= Table::$defaultDateTimeDisplayFormat;
+
if (blank($state) || $state == __('filament-database-schedule::schedule.fields.never')) {
return $state;
}
@@ -164,22 +192,8 @@ public static function table(Table $table): Table
return Carbon::parse($state)
->setTimezone($timezone ?? $column->getTimezone())
->translatedFormat($format);
- })->label(__('filament-database-schedule::schedule.fields.updated_at'))->searchable()->sortable(),
- Tables\Columns\BadgeColumn::make('status')->enum([
- Schedule::STATUS_INACTIVE => __('filament-database-schedule::schedule.status.inactive'),
- Schedule::STATUS_TRASHED => __('filament-database-schedule::schedule.status.trashed'),
- Schedule::STATUS_ACTIVE => __('filament-database-schedule::schedule.status.active'),
- ])->icons([
- 'heroicon-o-x',
- 'heroicon-o-document' => Schedule::STATUS_INACTIVE,
- 'heroicon-o-x-circle' => Schedule::STATUS_TRASHED,
- 'heroicon-o-check-circle' => Schedule::STATUS_ACTIVE,
- ])
- ->colors([
- 'warning' => Schedule::STATUS_INACTIVE,
- 'success' => Schedule::STATUS_ACTIVE,
- 'danger' => Schedule::STATUS_TRASHED,
- ])->label(__('filament-database-schedule::schedule.fields.status'))->searchable()->sortable()
+ })->label(__('filament-database-schedule::schedule.fields.updated_at'))->searchable()->sortable()->toggleable(isToggledHiddenByDefault: true),
+
])
->filters([
@@ -187,9 +201,9 @@ public static function table(Table $table): Table
])
->actions([
ActionGroup::make([
- Tables\Actions\EditAction::make()->hidden(fn ($record) => $record->trashed())->tooltip(__('filament-support::actions/edit.single.label')),
- Tables\Actions\RestoreAction::make()->tooltip(__('filament-support::actions/restore.single.label')),
- Tables\Actions\DeleteAction::make()->tooltip(__('filament-support::actions/delete.single.label')),
+ Tables\Actions\EditAction::make()->hidden(fn ($record) => $record->trashed())->tooltip(__('filament-actions::edit.single.label')),
+ Tables\Actions\RestoreAction::make()->tooltip(__('filament-actions::restore.single.label')),
+ Tables\Actions\DeleteAction::make()->tooltip(__('filament-actions::delete.single.label')),
Tables\Actions\ForceDeleteAction::make()->tooltip(__('filament-support::actions/force-delete.single.label')),
Tables\Actions\Action::make('toggle')->disabled(fn ($record) => $record->trashed())
->icon(fn ($record) => $record->status == Schedule::STATUS_ACTIVE ? 'schedule-pause-fill' : 'schedule-play-fill')->color(fn ($record) => $record->status == Schedule::STATUS_ACTIVE ? 'warning' : 'success')->action(function ($record): void {
@@ -203,6 +217,7 @@ public static function table(Table $table): Table
])
])
+ ->defaultPaginationPageOption(config('filament-database-schedule.per_page', 10) ?: config('tables.pagination.default_records_per_page'))
->bulkActions([
Tables\Actions\DeleteBulkAction::make(),
])->defaultSort(config('filament-database-schedule.default_ordering'), config('filament-database-schedule.default_ordering_direction'));
diff --git a/src/Filament/Resources/ScheduleResource/Pages/ListSchedules.php b/src/Filament/Resources/ScheduleResource/Pages/ListSchedules.php
index 59fba97..faca957 100644
--- a/src/Filament/Resources/ScheduleResource/Pages/ListSchedules.php
+++ b/src/Filament/Resources/ScheduleResource/Pages/ListSchedules.php
@@ -4,8 +4,8 @@
use Closure;
use HusamTariq\FilamentDatabaseSchedule\Filament\Resources\ScheduleResource;
-use Filament\Pages\Actions;
use Filament\Resources\Pages\ListRecords;
+use Filament\Actions;
class ListSchedules extends ListRecords
{
@@ -18,35 +18,7 @@ protected function getActions(): array
];
}
- /* protected function getTableRecordsPerPage(): int
- {
- return (int) config('filament-database-schedule.per_page',10);
- }
- */
- protected function getTableRecordsPerPageSelectOptions(): array
- {
- $records_per_page_select_options = parent::getTableRecordsPerPageSelectOptions();
- $per_page = config('filament-database-schedule.per_page',10);
- if(!in_array($per_page,$records_per_page_select_options))
- array_unshift($records_per_page_select_options,$per_page);
- return $records_per_page_select_options;
- }
- protected function getDefaultTableRecordsPerPageSelectOption(): int
- {
- $perPage = session()->get(
- $this->getTablePerPageSessionKey(),
- config('filament-database-schedule.per_page',10) ?: config('tables.pagination.default_records_per_page'),
- );
-
- if (in_array($perPage, $this->getTableRecordsPerPageSelectOptions())) {
- return $perPage;
- }
-
- session()->remove($this->getTablePerPageSessionKey());
-
- return $this->getTableRecordsPerPageSelectOptions()[0];
- }
protected function getTableRecordUrlUsing(): ?Closure
{
diff --git a/src/Filament/Resources/ScheduleResource/Pages/ViewSchedule.php b/src/Filament/Resources/ScheduleResource/Pages/ViewSchedule.php
index 1ec062b..6268c0a 100644
--- a/src/Filament/Resources/ScheduleResource/Pages/ViewSchedule.php
+++ b/src/Filament/Resources/ScheduleResource/Pages/ViewSchedule.php
@@ -3,15 +3,15 @@
namespace HusamTariq\FilamentDatabaseSchedule\Filament\Resources\ScheduleResource\Pages;
use HusamTariq\FilamentDatabaseSchedule\Filament\Resources\ScheduleResource;
-use Filament\Pages\Actions;
-use Filament\Resources\Pages\Concerns\HasRecordBreadcrumb;
+use Filament\Tables;
+use Filament\Forms;
+use Filament\Resources\Pages\Page;
use Filament\Resources\Pages\Concerns\HasRelationManagers;
use Filament\Resources\Pages\Concerns\InteractsWithRecord;
-use Filament\Resources\Pages\Page;
-use Filament\Tables\Concerns\InteractsWithTable;
+use Livewire\Attributes\Url;
+
use Filament\Tables\Contracts\HasTable;
use Illuminate\Database\Eloquent\Builder;
-use Filament\Tables;
use HusamTariq\FilamentDatabaseSchedule\Filament\Columns\ScheduleArguments;
use HusamTariq\FilamentDatabaseSchedule\Filament\Columns\ScheduleOptions;
use HusamTariq\FilamentDatabaseSchedule\Models\ScheduleHistory;
@@ -20,22 +20,37 @@ class ViewSchedule extends Page implements HasTable
{
protected static string $resource = ScheduleResource::class;
- protected static string $view = 'filament::resources.pages.list-records';
+ protected static string $view = 'filament-panels::resources.pages.list-records';
use InteractsWithRecord;
- use HasRecordBreadcrumb;
use HasRelationManagers;
- use InteractsWithTable;
+ #[Url]
+ public ?string $activeTab = null;
+ /**
+ * @return array
+ */
+ public function getTabs(): array
+ {
+ return [];
+ }
+ use Forms\Concerns\InteractsWithForms;
+ use Tables\Concerns\InteractsWithTable {
+ makeTable as makeBaseTable;
+ }
+ use Tables\Concerns\InteractsWithTable {
+ makeTable as makeBaseTable;
+ }
protected function getActions(): array
{
return [];
}
- protected function getTitle(): string
+ public function getTitle(): string
{
return __('filament-database-schedule::schedule.resource.history');
}
+
public function mount($record): void
{
static::authorizeResourceAccess();
@@ -44,6 +59,7 @@ public function mount($record): void
abort_unless(static::getResource()::canView($this->getRecord()), 403);
}
+
protected function getRelationManagers(): array
{
return [];
@@ -52,7 +68,7 @@ protected function getRelationManagers(): array
protected function getTableQuery(): Builder
{
- return ScheduleHistory::where('schedule_id',$this->record->id)->latest();
+ return ScheduleHistory::where('schedule_id', $this->record->id)->latest();
}
protected function getTableColumns(): array
@@ -60,24 +76,17 @@ protected function getTableColumns(): array
return [
Tables\Columns\Layout\Split::make([
Tables\Columns\TextColumn::make('command')->label(__('filament-database-schedule::schedule.fields.command')),
- ScheduleArguments::make('params')->withValue(false)->label(__('filament-database-schedule::schedule.fields.arguments')),
- ScheduleOptions::make('options')->withValue(false)->label(__('filament-database-schedule::schedule.fields.options')),
- Tables\Columns\TextColumn::make('created_at')->label(__('filament-database-schedule::schedule.fields.expression'))
- ->dateTime(),
+ ScheduleArguments::make('params')->withValue(false)->label(__('filament-database-schedule::schedule.fields.arguments')),
+ ScheduleOptions::make('options')->withValue(false)->label(__('filament-database-schedule::schedule.fields.options')),
+ Tables\Columns\TextColumn::make('created_at')->label(__('filament-database-schedule::schedule.fields.expression'))
+ ->dateTime(),
+ ]), Tables\Columns\Layout\Panel::make([
- ]),Tables\Columns\Layout\Panel::make([
-
- Tables\Columns\TextColumn::make('output'),
+ Tables\Columns\TextColumn::make('output')->extraAttributes(["class"=>"!max-w-max"],true),
])->collapsible(),
];
}
-
- /* protected function isTablePaginationEnabled(): bool
- {
- return false;
- } */
-
}
diff --git a/src/FilamentDatabaseSchedulePlugin.php b/src/FilamentDatabaseSchedulePlugin.php
new file mode 100644
index 0000000..8e421d6
--- /dev/null
+++ b/src/FilamentDatabaseSchedulePlugin.php
@@ -0,0 +1,42 @@
+configure();
+
+ return $static;
+ }
+
+
+ public function getId(): string
+ {
+ return static::$name;
+ }
+
+ public function register(Panel $panel): void
+ {
+ $panel
+ ->resources([
+ ScheduleResource::class,
+ ])
+ ;
+ }
+
+ public function boot(Panel $panel): void
+ {
+ //
+ }
+}
diff --git a/src/FilamentDatabaseScheduleServiceProvider.php b/src/FilamentDatabaseScheduleServiceProvider.php
index 7d85abb..52bc012 100644
--- a/src/FilamentDatabaseScheduleServiceProvider.php
+++ b/src/FilamentDatabaseScheduleServiceProvider.php
@@ -3,44 +3,58 @@
namespace HusamTariq\FilamentDatabaseSchedule;
use BladeUI\Icons\Factory;
-use Filament\PluginServiceProvider;
use HusamTariq\FilamentDatabaseSchedule\Console\Commands\PhpUnitTestJobCommand;
use HusamTariq\FilamentDatabaseSchedule\Console\Commands\ScheduleClearCacheCommand;
use HusamTariq\FilamentDatabaseSchedule\Console\Commands\TestJobCommand;
use HusamTariq\FilamentDatabaseSchedule\Console\Scheduling\Schedule;
use Illuminate\Support\Facades\Schema;
-use HusamTariq\FilamentDatabaseSchedule\Filament\Resources\ScheduleResource;
+use Filament\Support\Assets\Css;
+use Filament\Support\Assets\Js;
+use Filament\Support\Facades\FilamentAsset;
+use Composer\InstalledVersions;
use HusamTariq\FilamentDatabaseSchedule\Observer\ScheduleObserver;
use Spatie\LaravelPackageTools\Package;
use Illuminate\Console\Scheduling\Schedule as BaseSchedule;
+use Spatie\LaravelPackageTools\PackageServiceProvider;
-class FilamentDatabaseScheduleServiceProvider extends PluginServiceProvider
+class FilamentDatabaseScheduleServiceProvider extends PackageServiceProvider
{
public static string $name = 'filament-database-schedule';
+ private static string $version = 'dev';
- protected array $resources = [
- ScheduleResource::class,
- ];
+ public function configurePackage(Package $package): void
+ {
+ $package
+ ->name(static::$name)
+ ->hasConfigFile()
+ ->hasMigrations()
+ ->hasViews()
+ ->hasCommands()
+ ->hasTranslations();
+ }
- protected array $pages = [
- // CustomPage::class,
- ];
+ public function packageBooted(): void
+ {
+ FilamentAsset::register($this->getAssets(), package: $this->getAssetPackageName());
+ }
- protected array $widgets = [
- // CustomWidget::class,
- ];
+ protected function getAssetPackageName(): ?string
+ {
+ return static::$name;
+ }
- protected array $styles = [
- 'plugin-filament-database-schedule' => __DIR__ . '/../resources/dist/filament-database-schedule.css',
- ];
+ protected function getAssets(): array
+ {
+ static::$version = InstalledVersions::getVersion('husam-tariq/filament-database-schedule');
+ $assetId = $this->getAssetPackageName() . static::$version;
- protected array $scripts = [
- 'plugin-filament-database-schedule' => __DIR__ . '/../resources/dist/filament-database-schedule.js',
- ];
- // protected array $beforeCoreScripts = [
- // 'plugin-filament-database-schedule' => __DIR__ . '/../resources/dist/filament-database-schedule.js',
- // ];
+ return [
+ Js::make($assetId, __DIR__ . '/../resources/dist/filament-database-schedule.js'),
+ Css::make($assetId, __DIR__ . '/../resources/dist/filament-database-schedule.css'),
+ ];
+
+ }
public function register()
{
@@ -59,7 +73,7 @@ public function boot()
$this->publishes([
__DIR__ . '/../resources/svg' => public_path('vendor/' . static::$name),
], static::$name);
- }
+ }
$this->loadMigrationsFrom(__DIR__ . '/../database/migrations');
$this->publishes([
__DIR__ . '/../database/migrations/' => database_path('migrations'),
@@ -82,18 +96,9 @@ public function boot()
TestJobCommand::class,
PhpUnitTestJobCommand::class,
ScheduleClearCacheCommand::class,
- ]);
+ ]);
parent::boot();
}
-
- public function configurePackage(Package $package): void
- {
- $package
- ->name(static::$name)
- ->hasConfigFile()
- ->hasMigrations()
- ->hasViews()
- ->hasCommands()
- ->hasTranslations();
- }
+
+
}
diff --git a/src/Http/Services/CommandService.php b/src/Http/Services/CommandService.php
index 308a6f1..c796d73 100644
--- a/src/Http/Services/CommandService.php
+++ b/src/Http/Services/CommandService.php
@@ -11,16 +11,23 @@ public static function get(): Collection
{
$commands = collect(app(Kernel::class)->all())->sortKeys();
$commandsKeys = $commands->keys()->toArray();
- foreach (config('filament-database-schedule.commands.exclude') as $exclude) {
- $commandsKeys = preg_grep("/^$exclude/", $commandsKeys, PREG_GREP_INVERT);
+ if(config('filament-database-schedule.commands.show_supported_only')){
+ foreach (config('filament-database-schedule.commands.supported') as $supported) {
+ $commandsKeys = preg_grep("/^$supported/", $commandsKeys);
+ }
+ }else{
+ foreach (config('filament-database-schedule.commands.exclude') as $exclude) {
+ $commandsKeys = preg_grep("/^$exclude/", $commandsKeys, PREG_GREP_INVERT);
+ }
}
+
return $commands->only($commandsKeys)
->map(function ($command) {
return [
'name' => $command->getName(),
'description' => $command->getDescription(),
'signature' => $command->getSynopsis(),
- 'full_name' =>$command->getName().' - '.$command->getDescription(),
+ 'full_name' =>$command->getName().' ('.$command->getDescription().")",
'arguments' => static::getArguments($command),
'options' => static::getOptions($command),
];