Skip to content

Commit

Permalink
Filament v3 support
Browse files Browse the repository at this point in the history
  • Loading branch information
thapaPrabhat committed Aug 12, 2023
1 parent 7a11679 commit 6963f0b
Show file tree
Hide file tree
Showing 18 changed files with 53 additions and 42 deletions.
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,16 @@ php artisan filament-logger:install
```
This will publish the config & migrations from `spatie/laravel-activitylog`

For Filament v3, you need to register a resource in PanelProvider
```php
public function panel(Panel $panel): Panel
{
return $panel
->resources([
config('filament-logger.activity_resource')
]);
}
```
## Authorization
To enforce policies on `ActivityResource`, after generating a policy, you would need to register `Spatie\Activitylog\Models\Activity` to use that policy in the AuthServiceProvider.
```php
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],
"require": {
"php": "^8.0 | ^8.1",
"filament/filament": "^2.11",
"filament/filament": "^3.0",
"illuminate/contracts": "^8.0 | ^9.0 | ^10.0",
"spatie/laravel-activitylog": "^4.5",
"spatie/laravel-package-tools": "^1.13.5"
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/ar/filament-logger.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

'nav.group' => 'إعدادات',
'nav.log.label' => 'سجل النشاطات',
'nav.log.icon' => 'heroicon-o-clipboard-list',
'nav.log.icon' => 'heroicon-o-clipboard-document-list',
'resource.label.log' => 'سجل النشاط',
'resource.label.logs' => 'سجل النشاطات',
'resource.label.user' => 'المستخدم',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/de/filament-logger.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

'nav.group' => 'Settings',
'nav.log.label' => 'Activity Log',
'nav.log.icon' => 'heroicon-o-clipboard-list',
'nav.log.icon' => 'heroicon-o-clipboard-documents-list',
'resource.label.log' => 'Aktivitätslog',
'resource.label.logs' => 'Aktivitätslog',
'resource.label.user' => 'Nutzer',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/en/filament-logger.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

'nav.group' => 'Settings',
'nav.log.label' => 'Activity Log',
'nav.log.icon' => 'heroicon-o-clipboard-list',
'nav.log.icon' => 'heroicon-o-clipboard-document-list',
'resource.label.log' => 'Activity log',
'resource.label.logs' => 'Activity logs',
'resource.label.user' => 'User',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/es/filament-logger.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

'nav.group' => 'Settings',
'nav.log.label' => 'Bitácora de actividad',
'nav.log.icon' => 'heroicon-o-clipboard-list',
'nav.log.icon' => 'heroicon-o-clipboard-documents-list',
'resource.label.log' => 'Registro de actividad',
'resource.label.logs' => 'Registros de actividad',
'resource.label.user' => 'Usuario',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/fa/filament-logger.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

'nav.group' => 'تنظیمات',
'nav.log.label' => 'لاگ فعالیت ها',
'nav.log.icon' => 'heroicon-o-clipboard-list',
'nav.log.icon' => 'heroicon-o-clipboard-documents-list',
'resource.label.log' => 'لاگ فعالیت',
'resource.label.logs' => 'لاگ فعالیت ها',
'resource.label.user' => 'کاربر',
Expand Down
4 changes: 2 additions & 2 deletions resources/lang/fr/filament-logger.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

'nav.group' => 'Paramètres',
'nav.log.label' => 'Journal d\'activités',
'nav.log.icon' => 'heroicon-o-clipboard-list',
'nav.log.icon' => 'heroicon-o-clipboard-documents-list',
'resource.label.log' => 'Journal d\'activité',
'resource.label.logs' => 'Journal d\'activités',
'resource.label.user' => 'Utilisateur',
Expand All @@ -20,6 +20,6 @@
'resource.label.type' => 'Type',
'resource.label.event' => 'Événement',
'resource.label.logged_at' => 'Enregistré à',
'resource.label.properties' => 'Propriétés',
'resource.label.properties' => 'Propriétés',

];
2 changes: 1 addition & 1 deletion resources/lang/id/filament-logger.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

'nav.group' => 'Pengaturan',
'nav.log.label' => 'Catatan Aktivitas',
'nav.log.icon' => 'heroicon-o-clipboard-list',
'nav.log.icon' => 'heroicon-o-clipboard-documents-list',
'resource.label.log' => 'Catatan aktivitas',
'resource.label.logs' => 'Catatan aktivitas',
'resource.label.user' => 'Pengguna',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/it/filament-logger.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

'nav.group' => 'Impostazioni',
'nav.log.label' => 'Registro attività',
'nav.log.icon' => 'heroicon-o-clipboard-list',
'nav.log.icon' => 'heroicon-o-clipboard-documents-list',
'resource.label.log' => 'Log',
'resource.label.logs' => 'Log',
'resource.label.user' => 'User',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/ka/filament-logger.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

'nav.group' => 'პარამეტრები',
'nav.log.label' => 'საქმიანობის ჟურნალი',
'nav.log.icon' => 'heroicon-o-clipboard-list',
'nav.log.icon' => 'heroicon-o-clipboard-documents-list',
'resource.label.log' => 'საქმიანობის ჟურნალი',
'resource.label.logs' => 'საქმიანობის ჟურნალი',
'resource.label.user' => 'მომხმარებელი',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/pt_br/filament-logger.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

'nav.group' => 'Configurações',
'nav.log.label' => 'Registro de atividade',
'nav.log.icon' => 'heroicon-o-clipboard-list',
'nav.log.icon' => 'heroicon-o-clipboard-documents-list',
'resource.label.log' => 'Registro de atividade',
'resource.label.logs' => 'Registros de atividade',
'resource.label.user' => 'Usuário',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/ru/filament-logger.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

'nav.group' => 'Настройки',
'nav.log.label' => 'Лог действий',
'nav.log.icon' => 'heroicon-o-clipboard-list',
'nav.log.icon' => 'heroicon-o-clipboard-documents-list',
'resource.label.log' => 'Лога действий',
'resource.label.logs' => 'Журнал активности',
'resource.label.user' => 'Юзер',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/tr/filament-logger.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

'nav.group' => 'Ayarlar',
'nav.log.label' => 'Aktivite Günlüğü',
'nav.log.icon' => 'heroicon-o-clipboard-list',
'nav.log.icon' => 'heroicon-o-clipboard-documents-list',
'resource.label.log' => 'Aktivite Günlüğü',
'resource.label.logs' => 'Aktivite Günlükleri',
'resource.label.user' => 'Kullanıcı',
Expand Down
4 changes: 2 additions & 2 deletions resources/lang/uk/filament-logger.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

'nav.group' => 'Налаштування',
'nav.log.label' => 'Лог дій',
'nav.log.icon' => 'heroicon-o-clipboard-list',
'nav.log.icon' => 'heroicon-o-clipboard-documents-list',
'resource.label.log' => 'Лога дій',
'resource.label.logs' => 'Журнал активності',
'resource.label.user' => 'Юзер',
Expand All @@ -22,4 +22,4 @@
'resource.label.logged_at' => 'Час',
'resource.label.properties' => 'Властивості',

];
];
4 changes: 2 additions & 2 deletions resources/lang/vi/filament-logger.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

'nav.group' => 'Cài đặt',
'nav.log.label' => 'Nhật ký hoạt động',
'nav.log.icon' => 'heroicon-o-clipboard-list',
'nav.log.icon' => 'heroicon-o-clipboard-documents-list',
'resource.label.log' => 'Nhật ký hoạt động',
'resource.label.logs' => 'Nhật ký hoạt động',
'resource.label.user' => 'Người dùng',
Expand All @@ -20,6 +20,6 @@
'resource.label.type' => 'Kiểu',
'resource.label.event' => 'Sự kiện',
'resource.label.logged_at' => 'Lúc',
'resource.label.properties' => 'Thuộc tính',
'resource.label.properties' => 'Thuộc tính',

];
11 changes: 6 additions & 5 deletions src/FilamentLoggerServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
namespace Z3d0X\FilamentLogger;

use Filament\Facades\Filament;
use Filament\PluginServiceProvider;
use Spatie\LaravelPackageTools\PackageServiceProvider;
use Spatie\LaravelPackageTools\Commands\InstallCommand;
use Spatie\LaravelPackageTools\Package;

class FilamentLoggerServiceProvider extends PluginServiceProvider
class FilamentLoggerServiceProvider extends PackageServiceProvider
{

public static string $name = 'filament-logger';

protected function getResources(): array
Expand All @@ -19,9 +18,11 @@ protected function getResources(): array
];
}

public function packageConfigured(Package $package): void
public function configurePackage(Package $package): void
{
$package
$package->name(static::$name)
->hasTranslations()
->hasConfigFile()
->hasInstallCommand(function (InstallCommand $installCommand) {
$installCommand
->publishConfigFile()
Expand Down
38 changes: 19 additions & 19 deletions src/Resources/ActivityResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,26 @@

namespace Z3d0X\FilamentLogger\Resources;

use Filament\Forms\Form;
use Filament\Tables\Table;
use Illuminate\Support\Str;
use Filament\Facades\Filament;
use Filament\Forms\Components\Card;
use Filament\Forms\Components\DatePicker;
use Filament\Resources\Resource;
use Filament\Tables\Filters\Filter;
use Filament\Forms\Components\Group;
use Filament\Forms\Components\Section;
use Filament\Forms\Components\KeyValue;
use Filament\Forms\Components\Placeholder;
use Filament\Forms\Components\Textarea;
use Filament\Forms\Components\TextInput;
use Filament\Resources\Form;
use Filament\Resources\Resource;
use Filament\Resources\Table;
use Filament\Tables\Columns\BadgeColumn;
use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Filters\Filter;
use Illuminate\Database\Eloquent\Model;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Components\DatePicker;
use Filament\Tables\Filters\SelectFilter;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Str;
use Filament\Forms\Components\Placeholder;
use Spatie\Activitylog\Contracts\Activity;
use Spatie\Activitylog\Models\Activity as ActivityModel;
use Spatie\Activitylog\ActivitylogServiceProvider;
use Spatie\Activitylog\Models\Activity as ActivityModel;
use Z3d0X\FilamentLogger\Resources\ActivityResource\Pages;

class ActivityResource extends Resource
Expand All @@ -37,7 +36,7 @@ public static function form(Form $form): Form
return $form
->schema([
Group::make([
Card::make([
Section::make([
TextInput::make('causer_id')
->afterStateHydrated(function ($component, ?Model $record) {
/** @phpstan-ignore-next-line */
Expand All @@ -62,7 +61,7 @@ public static function form(Form $form): Form
->columnSpan(['sm' => 3]),

Group::make([
Card::make([
Section::make([
Placeholder::make('log_name')
->content(function (?Model $record): string {
/** @var Activity&ActivityModel $record */
Expand All @@ -85,7 +84,7 @@ public static function form(Form $form): Form
}),
])
]),
Card::make()
Section::make()
->columns()
->visible(fn ($record) => $record->properties?->count() > 0)
->schema(function (?Model $record) {
Expand Down Expand Up @@ -122,7 +121,8 @@ public static function table(Table $table): Table
{
return $table
->columns([
BadgeColumn::make('log_name')
TextColumn::make('log_name')
->badge()
->colors(static::getLogNameColors())
->label(__('filament-logger::filament-logger.resource.label.type'))
->formatStateUsing(fn ($state) => ucwords($state))
Expand Down Expand Up @@ -317,17 +317,17 @@ public static function getPluralLabel(): string
return __('filament-logger::filament-logger.resource.label.logs');
}

protected static function getNavigationGroup(): ?string
public static function getNavigationGroup(): ?string
{
return __('filament-logger::filament-logger.nav.group');
}

protected static function getNavigationLabel(): string
public static function getNavigationLabel(): string
{
return __('filament-logger::filament-logger.nav.log.label');
}

protected static function getNavigationIcon(): string
public static function getNavigationIcon(): string
{
return __('filament-logger::filament-logger.nav.log.icon');
}
Expand Down

0 comments on commit 6963f0b

Please sign in to comment.