Skip to content

Add Filament v4 support (v3.0.0) #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arbazajaz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add Filament v4 support (v3.0.0) #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
],
"require": {
"php": "^8.2",
"filament/filament": "^4.0 || ^5.0",
"illuminate/contracts": "^11.0||^12.0",
"spatie/laravel-activitylog": "^4.8",
"spatie/laravel-package-tools": "^1.16"
Expand Down Expand Up @@ -82,4 +83,4 @@
},
"minimum-stability": "dev",
"prefer-stable": true
}
}
12 changes: 7 additions & 5 deletions src/RelationManagers/ActivitylogRelationManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@

namespace Rmsramos\Activitylog\RelationManagers;

use Filament\Actions\ViewAction as ActionsViewAction;
use Filament\Forms\Form;
use Filament\Resources\RelationManagers\RelationManager;
use Filament\Schemas\Schema;
use Filament\Tables\Actions\ViewAction;
use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Model;
use Rmsramos\Activitylog\ActivitylogPlugin;
use Rmsramos\Activitylog\Resources\ActivitylogResource;
use Rmsramos\Activitylog\Resources\ActivitylogResource\ActivitylogResource;

class ActivitylogRelationManager extends RelationManager
{
Expand All @@ -24,18 +26,18 @@ public static function getTitle(Model $ownerRecord, string $pageClass): string
->headline();
}

public function form(Form $form): Form
public function form(Schema $Schema): Schema
{
return ActivitylogResource::form($form);
return ActivitylogResource::form($Schema);
}

public function table(Table $table): Table
{
return ActivitylogResource::table(
$table
->heading(ActivitylogPlugin::get()->getPluralLabel())
->actions([
ViewAction::make(),
->headerActions([
ActionsViewAction::make(),
])
);
}
Expand Down
36 changes: 18 additions & 18 deletions src/Resources/ActivitylogResource/ActivitylogResource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,36 @@

namespace Rmsramos\Activitylog\Resources\ActivitylogResource;

use ActivitylogForm;

use Exception;
use Filament\Tables\Table;
use Illuminate\Support\Str;
use Filament\Schemas\Schema;
use Filament\Facades\Filament;
use Filament\Forms\Components\DatePicker;
use Filament\Forms\Components\Placeholder;
use Filament\Notifications\Notification;
use Filament\Resources\Resource;
use Filament\Schemas\Schema;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\HtmlString;
use Filament\Tables\Columns\Column;
use Filament\Tables\Filters\Filter;
use Livewire\Component as Livewire;
use Illuminate\Support\Facades\Gate;
use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Columns\ViewColumn;
use Filament\Tables\Filters\Filter;
use Illuminate\Database\Eloquent\Model;
use Spatie\Activitylog\Models\Activity;
use Filament\Notifications\Notification;
use Filament\Forms\Components\DatePicker;
use Filament\Tables\Filters\SelectFilter;
use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Gate;
use Illuminate\Support\HtmlString;
use Illuminate\Support\Str;
use Livewire\Component as Livewire;
use Rmsramos\Activitylog\Actions\Concerns\ActionContent;
use Rmsramos\Activitylog\ActivitylogPlugin;
use Rmsramos\Activitylog\Helpers\ActivityLogHelper;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Rmsramos\Activitylog\Actions\Concerns\ActionContent;
use Rmsramos\Activitylog\Traits\HasCustomActivityResource;
use Rmsramos\Activitylog\RelationManagers\ActivitylogRelationManager;
use Rmsramos\Activitylog\Resources\ActivitylogResource\Pages\ListActivitylog;
use Rmsramos\Activitylog\Resources\ActivitylogResource\Pages\ViewActivitylog;
use Rmsramos\Activitylog\Traits\HasCustomActivityResource;
use Spatie\Activitylog\Models\Activity;
use Rmsramos\Activitylog\Resources\ActivitylogResource\Schemas\ActivitylogForm;

class ActivitylogResource extends Resource
{
Expand Down Expand Up @@ -299,7 +299,7 @@ public static function getDateFilterComponent(): Filter

return $indicators;
})
->form([
->schema([
self::getDatePickerCompoment('created_from'),
self::getDatePickerCompoment('created_until'),
])
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/ActivitylogResource/Pages/ListActivitylog.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace Rmsramos\Activitylog\Resources\ActivitylogResource\Pages;

use Filament\Resources\Pages\ListRecords;
use Rmsramos\Activitylog\Resources\ActivitylogResource;
use Rmsramos\Activitylog\Resources\ActivitylogResource\ActivitylogResource;

class ListActivitylog extends ListRecords
{
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/ActivitylogResource/Pages/ViewActivitylog.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace Rmsramos\Activitylog\Resources\ActivitylogResource\Pages;

use Filament\Resources\Pages\ViewRecord;
use Rmsramos\Activitylog\Resources\ActivitylogResource;
use Rmsramos\Activitylog\Resources\ActivitylogResource\ActivitylogResource;

class ViewActivitylog extends ViewRecord
{
Expand Down
41 changes: 26 additions & 15 deletions src/Resources/ActivitylogResource/Schemas/ActivitylogForm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
<?php

namespace Rmsramos\Activitylog\Resources\ActivitylogResource\Schemas;

use Illuminate\Support\Str;
use Filament\Schemas\Schema;
use Filament\Forms\Components\Textarea;
use Illuminate\Database\Eloquent\Model;
use Filament\Forms\Components\TextInput;
use Filament\Infolists\Components\TextEntry;
use Filament\Schemas\Components\Section;
use Filament\Schemas\Schema;
use Illuminate\Database\Eloquent\Model;
use Rmsramos\Activitylog\ActivitylogPlugin;
use Filament\Infolists\Components\TextEntry;

class ActivitylogForm
{
Expand All @@ -24,7 +27,7 @@ public static function configure(Schema $schema): Schema
TextInput::make('subject_type')
->afterStateHydrated(function ($component, ?Model $record, $state) {
/** @var Activity $record */
return $state ? $component->state(Str::of($state)->afterLast('\\')->headline().' # '.$record->subject_id) : $component->state('-');
return $state ? $component->state(Str::of($state)->afterLast('\\')->headline() . ' # ' . $record->subject_id) : $component->state('-');
})
->label(__('activitylog::forms.fields.subject_type.label')),

Expand All @@ -36,32 +39,40 @@ public static function configure(Schema $schema): Schema

Section::make([
TextEntry::make('log_name')
->content(function (?Model $record): string {
/** @var Activity $record */
return $record?->log_name ? ucwords($record->log_name) : '-';
->state(function (?Model $record): string {
/** @var Activity|null $record */
return $record?->log_name
? ucwords($record->log_name)
: '-';
})
->label(__('activitylog::forms.fields.log_name.label')),


TextEntry::make('event')
->content(function (?Model $record): string {
/** @var Activity $record */
return $record?->event ? ucwords(__('activitylog::action.event.'.$record->event)) : '-';
->state(function (?Model $record): string {
/** @var Activity|null $record */
return $record?->event
? ucwords(__('activitylog::action.event.' . $record->event))
: '-';
})
->label(__('activitylog::forms.fields.event.label')),


TextEntry::make('created_at')
->label(__('activitylog::forms.fields.created_at.label'))
->content(function (?Model $record): string {
/** @var Activity $record */
if (! $record?->created_at) {
return '-';
->state(function (?Model $record): ?string {
/** @var Activity|null $record */
if (!$record?->created_at) {
return null;
}

$parser = ActivitylogPlugin::get()->getDateParser();

return $parser($record->created_at)
->format(ActivitylogPlugin::get()->getDatetimeFormat());
}),
})
->placeholder('-'),

]),
]);
}
Expand Down