Skip to content
Open
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
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
},
"require-dev": {
"laravel/pint": "^1.21",
"laravel/telescope": "^5.14",
"orchestra/testbench": "^9.9|^10.0",
"pestphp/pest": "^3.7",
"pestphp/pest-plugin-livewire": "^3.0"
Expand Down
90 changes: 24 additions & 66 deletions src/EclipseWorldServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
use Eclipse\World\Console\Commands\ImportCommand;
use Eclipse\World\Console\Commands\ImportPostsCommand;
use Eclipse\World\Console\Commands\ImportTariffCodesCommand;
use Eclipse\World\Filament\Resources\CountryResource;
use Eclipse\World\Filament\Resources\CurrencyResource;
use Eclipse\World\Filament\Resources\PostResource;
use Eclipse\World\Filament\Resources\RegionResource;
use Eclipse\World\Filament\Resources\TariffCodeResource;
use Eclipse\World\Filament\Clusters\World\Resources\CountryResource;
use Eclipse\World\Filament\Clusters\World\Resources\CurrencyResource;
use Eclipse\World\Filament\Clusters\World\Resources\PostResource;
use Eclipse\World\Filament\Clusters\World\Resources\RegionResource;
use Eclipse\World\Filament\Clusters\World\Resources\TariffCodeResource;
use Spatie\LaravelPackageTools\Package;
use Spatie\LaravelPackageTools\PackageServiceProvider;

Expand Down Expand Up @@ -39,69 +39,27 @@ public function boot(): void
$this->app->booted(function () {
$manage = config('filament-shield.resources.manage', []);

$pluginManage = [
CountryResource::class => [
'viewAny',
'view',
'create',
'update',
'restore',
'restoreAny',
'delete',
'deleteAny',
'forceDelete',
'forceDeleteAny',
],
RegionResource::class => [
'viewAny',
'view',
'create',
'update',
'restore',
'restoreAny',
'delete',
'deleteAny',
'forceDelete',
'forceDeleteAny',
],
CurrencyResource::class => [
'viewAny',
'view',
'create',
'update',
'restore',
'restoreAny',
'delete',
'deleteAny',
'forceDelete',
'forceDeleteAny',
],
TariffCodeResource::class => [
'viewAny',
'view',
'create',
'update',
'restore',
'restoreAny',
'delete',
'deleteAny',
'forceDelete',
'forceDeleteAny',
],
PostResource::class => [
'viewAny',
'view',
'create',
'update',
'restore',
'restoreAny',
'delete',
'deleteAny',
'forceDelete',
'forceDeleteAny',
],
$standardPermissions = [
'viewAny',
'view',
'create',
'update',
'restore',
'restoreAny',
'delete',
'deleteAny',
'forceDelete',
'forceDeleteAny',
];

$pluginManage = array_fill_keys([
CountryResource::class,
RegionResource::class,
CurrencyResource::class,
TariffCodeResource::class,
PostResource::class,
], $standardPermissions);

$manage = array_replace_recursive($manage, $pluginManage);
config()->set('filament-shield.resources.manage', $manage);
});
Expand Down
91 changes: 82 additions & 9 deletions src/Filament/Clusters/World/Resources/CountryResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Eclipse\World\Filament\Clusters\World\Resources;

use Closure;
use Eclipse\Common\Filament\Concerns\HasCachedAbilityChecks;
use Eclipse\World\Filament\Clusters\World;
use Eclipse\World\Filament\Clusters\World\Resources\CountryResource\Pages\ListCountries;
use Eclipse\World\Models\Country;
Expand All @@ -28,11 +29,14 @@
use Filament\Tables\Filters\TrashedFilter;
use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletingScope;
use TangoDevIt\FilamentEmojiPicker\EmojiPickerAction;

class CountryResource extends Resource
{
use HasCachedAbilityChecks;

protected static ?string $model = Country::class;

protected static ?string $slug = 'countries';
Expand All @@ -41,6 +45,51 @@ class CountryResource extends Resource

protected static ?string $cluster = World::class;

public static function canUpdateAny(): bool
{
return static::canOnce('update_country');
}

public static function canDeleteAny(): bool
{
return static::canOnce('delete_country');
}

public static function canRestoreAny(): bool
{
return static::canOnce('restore_country');
}

public static function canForceDeleteAny(): bool
{
return static::canOnce('force_delete_country');
}

public static function canBulkDelete(): bool
{
return static::canOnce('delete_any_country');
}

public static function canEdit(Model $record): bool
{
return static::canUpdateAny();
}

public static function canDelete(Model $record): bool
{
return static::canDeleteAny() && ! $record->trashed();
}

public static function canRestore(Model $record): bool
{
return static::canRestoreAny() && $record->trashed();
}

public static function canForceDelete(Model $record): bool
{
return static::canForceDeleteAny() && $record->trashed();
}

public static function form(Schema $schema): Schema
{
return $schema
Expand Down Expand Up @@ -146,7 +195,6 @@ function ($get) {
public static function table(Table $table): Table
{
return $table
->defaultPaginationPageOption(50)
->defaultSort('name')
->striped()
->columns([
Expand Down Expand Up @@ -185,7 +233,7 @@ public static function table(Table $table): Table

TextColumn::make('special_regions')
->label(__('eclipse-world::countries.table.special_regions.label'))
->getStateUsing(fn ($record) => $record->getSpecialRegionsAt()->pluck('name')->join(', '))
->getStateUsing(fn ($record) => $record->specialRegions->pluck('name')->join(', '))
->placeholder('—')
->wrap(),
])
Expand Down Expand Up @@ -223,30 +271,45 @@ public static function table(Table $table): Table
->recordActions([
EditAction::make()
->label(__('eclipse-world::countries.actions.edit.label'))
->modalHeading(__('eclipse-world::countries.actions.edit.heading')),
->modalHeading(__('eclipse-world::countries.actions.edit.heading'))
->authorize(fn () => self::canUpdateAny()),

ActionGroup::make([
DeleteAction::make()
->label(__('eclipse-world::countries.actions.delete.label'))
->modalHeading(__('eclipse-world::countries.actions.delete.heading')),
->modalHeading(__('eclipse-world::countries.actions.delete.heading'))
->visible(fn (Country $record) => ! $record->trashed())
->authorize(fn () => self::canDeleteAny()),

RestoreAction::make()
->label(__('eclipse-world::countries.actions.restore.label'))
->modalHeading(__('eclipse-world::countries.actions.restore.heading')),
->modalHeading(__('eclipse-world::countries.actions.restore.heading'))
->visible(fn (Country $record) => $record->trashed())
->authorize(fn () => self::canRestoreAny()),

ForceDeleteAction::make()
->label(__('eclipse-world::countries.actions.force_delete.label'))
->modalHeading(__('eclipse-world::countries.actions.force_delete.heading'))
->modalDescription(fn (Country $record): string => __('eclipse-world::countries.actions.force_delete.description', [
'name' => $record->name,
])),
]))
->visible(fn (Country $record) => $record->trashed())
->authorize(fn () => self::canForceDeleteAny()),
]),
])
->toolbarActions([
BulkActionGroup::make([
DeleteBulkAction::make()
->label(__('eclipse-world::countries.actions.delete.label')),
->label(__('eclipse-world::countries.actions.delete.label'))
->authorize(fn () => self::canBulkDelete()),

RestoreBulkAction::make()
->label(__('eclipse-world::countries.actions.restore.label')),
->label(__('eclipse-world::countries.actions.restore.label'))
->authorize(fn () => self::canRestoreAny()),

ForceDeleteBulkAction::make()
->label(__('eclipse-world::countries.actions.force_delete.label')),
->label(__('eclipse-world::countries.actions.force_delete.label'))
->authorize(fn () => self::canForceDeleteAny()),
]),
]);
}
Expand All @@ -263,6 +326,16 @@ public static function getEloquentQuery(): Builder
return parent::getEloquentQuery()
->withoutGlobalScopes([
SoftDeletingScope::class,
])
->with([
'region',
'specialRegions' => function ($query) {
$query->wherePivot('start_date', '<=', now())
->where(function ($query) {
$query->whereNull('world_country_in_special_region.end_date')
->orWhere('world_country_in_special_region.end_date', '>=', now());
});
},
]);
}

Expand Down
Loading
Loading