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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ return [
'default_sort_column' => 'id',
'default_sort_direction' => 'desc',
'navigation_count_badge' => false,
'resource' => \Rmsramos\Activitylog\Resources\ActivitylogResource::class,
'resource' => \Rmsramos\Activitylog\Resources\Activitylogs\ActivitylogResource::class,
],
'date_format' => 'd/m/Y',
'datetime_format' => 'd/m/Y H:i:s',
Expand Down Expand Up @@ -146,7 +146,7 @@ public function panel(Panel $panel): Panel

## Customising the ActivitylogResource

You can swap out the `ActivitylogResource` used by updating the `->resource()` value. Use this to create your own `CustomResource` class and extend the original at `\Rmsramos\Activitylog\Resources\ActivitylogResource::class`. This will allow you to customise everything such as the views, table, form and permissions.
You can swap out the `ActivitylogResource` used by updating the `->resource()` value. Use this to create your own `CustomResource` class and extend the original at `\Rmsramos\Activitylog\Resources\Activitylogs\ActivitylogResource::class`. This will allow you to customise everything such as the views, table, form and permissions.

> [!NOTE]
> If you wish to change the resource on List and View page be sure to replace the `getPages` method on the new resource and create your own version of the `ListPage` and `ViewPage` classes to reference the custom `CustomResource`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
@endif
@endforeach
@elseif (($placeholder = $getPlaceholder()) !== null)
<x-filament-infolists::entries.placeholder>
<div class="fi-in-placeholder">
{{ $placeholder }}
</x-filament-infolists::entries.placeholder>
</div>
@endif
</div>
</x-dynamic-component>
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
>
@if (count($childComponentContainers = $getChildComponentContainers()))
<ol class="relative border-gray-200 border-s dark:border-gray-700">
<x-filament::grid
<x-filament-schemas::grid
:default="$getGridColumns('default')"
:sm="$getGridColumns('sm')"
:md="$getGridColumns('md')"
Expand All @@ -38,12 +38,12 @@ class="gap-2"
{{ $container }}
</li>
@endforeach
</x-filament::grid>
</x-filament-schemas::grid>
</ol>
@elseif (($placeholder = $getPlaceholder()) !== null)
<x-filament-infolists::entries.placeholder>
<div class="fi-in-placeholder">
{{ $placeholder }}
</x-filament-infolists::entries.placeholder>
</div>
@endif
</div>
</x-dynamic-component>
</x-dynamic-component>
2 changes: 1 addition & 1 deletion src/Actions/ActivityLogTimelineTableAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Rmsramos\Activitylog\Actions;

use Filament\Tables\Actions\Action;
use Filament\Actions\Action;
use Rmsramos\Activitylog\Actions\Concerns\ActionContent;

class ActivityLogTimelineTableAction extends Action
Expand Down
7 changes: 4 additions & 3 deletions src/Actions/Concerns/ActionContent.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Carbon\Exceptions\InvalidFormatException;
use Closure;
use Filament\Schemas\Schema;
use Filament\Actions\StaticAction;
use Filament\Infolists\Components\TextEntry;
use Filament\Infolists\Infolist;
Expand Down Expand Up @@ -151,9 +152,9 @@ protected function configureModal(): void
->icon('heroicon-o-bell-alert');
}

protected function getSchema(): array
public function getSchema(Schema $schema): Schema
{
return [
return $schema->schema([
TimeLineRepeatableEntry::make('activities')
->schema([
TimeLineIconEntry::make('activityData.event')
Expand All @@ -175,7 +176,7 @@ protected function getSchema(): array
->since()
->badge(),
]),
];
]);
}

public function withRelations(?array $relations = null): ?StaticAction
Expand Down
10 changes: 5 additions & 5 deletions src/RelationManagers/ActivitylogRelationManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

namespace Rmsramos\Activitylog\RelationManagers;

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

class ActivitylogRelationManager extends RelationManager
{
Expand All @@ -24,9 +24,9 @@ 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<?php

namespace Rmsramos\Activitylog\Resources\ActivitylogResource;
namespace Rmsramos\Activitylog\Resources\Activitylogs;

use ActivitylogForm;
use Exception;
use Filament\Facades\Filament;
use Filament\Forms\Components\DatePicker;
Expand All @@ -28,8 +27,9 @@
use Rmsramos\Activitylog\ActivitylogPlugin;
use Rmsramos\Activitylog\Helpers\ActivityLogHelper;
use Rmsramos\Activitylog\RelationManagers\ActivitylogRelationManager;
use Rmsramos\Activitylog\Resources\ActivitylogResource\Pages\ListActivitylog;
use Rmsramos\Activitylog\Resources\ActivitylogResource\Pages\ViewActivitylog;
use Rmsramos\Activitylog\Resources\Activitylogs\Pages\ListActivitylog;
use Rmsramos\Activitylog\Resources\Activitylogs\Pages\ViewActivitylog;
use Rmsramos\Activitylog\Resources\Activitylogs\Schemas\ActivitylogForm;
use Rmsramos\Activitylog\Traits\HasCustomActivityResource;
use Spatie\Activitylog\Models\Activity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

namespace Rmsramos\Activitylog\Resources\ActivitylogResource\Pages;
namespace Rmsramos\Activitylog\Resources\Activitylogs\Pages;

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

class ListActivitylog extends ListRecords
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

namespace Rmsramos\Activitylog\Resources\ActivitylogResource\Pages;
namespace Rmsramos\Activitylog\Resources\Activitylogs\Pages;

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

class ViewActivitylog extends ViewRecord
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
<?php

namespace Rmsramos\Activitylog\Resources\Activitylogs\Schemas;

use Filament\Forms\Components\Textarea;
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 Illuminate\Support\Str;
use Rmsramos\Activitylog\ActivitylogPlugin;

class ActivitylogForm
Expand Down Expand Up @@ -36,22 +39,22 @@ public static function configure(Schema $schema): Schema

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

TextEntry::make('event')
->content(function (?Model $record): string {
->state(function (?Model $record): string {
/** @var Activity $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 {
->state(function (?Model $record): string {
/** @var Activity $record */
if (! $record?->created_at) {
return '-';
Expand Down