Enhanced admin panel

app/Filament/Resources/OrganizationResource.php

@@ -11,6 +11,7 @@ use App\Service\Import\Importers\ImporterProvider;
 use App\Service\Import\Importers\ImportException;
 use App\Service\Import\Importers\ReportDto;
 use App\Service\Import\ImportService;
+use Brick\Money\ISOCurrencyProvider;
 use Filament\Forms;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Form;
@@ -18,6 +19,7 @@ use Filament\Notifications\Notification;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Actions\Action;
+use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 use Illuminate\Support\Facades\Storage;
 
@@ -47,6 +49,20 @@ class OrganizationResource extends Resource
                     ->relationship(name: 'owner', titleAttribute: 'email')
                     ->searchable(['name', 'email'])
                     ->required(),
+                Forms\Components\Select::make('currency')
+                    ->label('Currency')
+                    ->options(ISOCurrencyProvider::getInstance()->getAvailableCurrencies())
+                    ->searchable(),
+                Forms\Components\TextInput::make('billable_rate')
+                    ->label('Billable rate (in Cents)')
+                    ->nullable()
+                    ->numeric(),
+                Forms\Components\DateTimePicker::make('created_at')
+                    ->label('Created At')
+                    ->disabled(),
+                Forms\Components\DateTimePicker::make('updated_at')
+                    ->label('Updated At')
+                    ->disabled(),
             ]);
     }
 
@@ -63,7 +79,18 @@ class OrganizationResource extends Resource
                     ->sortable(),
                 Tables\Columns\TextColumn::make('owner.email')
                     ->sortable(),
+                Tables\Columns\TextColumn::make('currency'),
+                TextColumn::make('billable_rate')
+                    ->money(fn (Organization $resource) => $resource->currency ?? 'EUR', divideBy: 100),
+                Tables\Columns\TextColumn::make('created_at')
+                    ->dateTime()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('updated_at')
+                    ->dateTime()
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
             ])
+            ->defaultSort('created_at', 'desc')
             ->filters([
                 //
             ])
@@ -139,6 +166,7 @@ class OrganizationResource extends Resource
             'index' => Pages\ListOrganizations::route('/'),
             'create' => Pages\CreateOrganization::route('/create'),
             'edit' => Pages\EditOrganization::route('/{record}/edit'),
+            'view' => Pages\ViewOrganization::route('/{record}'),
         ];
     }
 }

app/Filament/Resources/OrganizationResource/Pages/ViewOrganization.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Filament\Resources\OrganizationResource\Pages;
+
+use App\Filament\Resources\OrganizationResource;
+use Filament\Actions\DeleteAction;
+use Filament\Actions\EditAction;
+use Filament\Resources\Pages\ViewRecord;
+
+class ViewOrganization extends ViewRecord
+{
+    protected static string $resource = OrganizationResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            EditAction::make('edit')
+                ->icon('heroicon-s-pencil'),
+            DeleteAction::make('delete')
+                ->icon('heroicon-s-trash'),
+        ];
+    }
+}

app/Filament/Resources/OrganizationResource/RelationManagers/UsersRelationManager.php

@@ -4,10 +4,17 @@ declare(strict_types=1);
 
 namespace App\Filament\Resources\OrganizationResource\RelationManagers;
 
-use Filament\Forms;
+use App\Enums\Role;
+use App\Filament\Resources\UserResource;
+use App\Models\User;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
+use Filament\Tables\Actions\Action;
+use Filament\Tables\Actions\AttachAction;
+use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 
 class UsersRelationManager extends RelationManager
@@ -18,9 +25,12 @@ class UsersRelationManager extends RelationManager
     {
         return $form
             ->schema([
-                Forms\Components\TextInput::make('name')
+                Select::make('role')
-                    ->required()
+                    ->options(Role::class),
-                    ->maxLength(255),
+                TextInput::make('billable_rate')
+                    ->label('Billable rate (in Cents)')
+                    ->nullable()
+                    ->numeric(),
             ]);
     }
 
@@ -31,20 +41,29 @@ class UsersRelationManager extends RelationManager
             ->columns([
                 Tables\Columns\TextColumn::make('name'),
                 Tables\Columns\TextColumn::make('role'),
-            ])
+                TextColumn::make('billable_rate')
-            ->filters([
+                    ->money($this->getOwnerRecord()->currency ?? 'EUR', divideBy: 100),
-                //
             ])
             ->headerActions([
-                Tables\Actions\CreateAction::make(),
+                Tables\Actions\AttachAction::make()->form(fn (AttachAction $action): array => [
+                    $action->getRecordSelect(),
+                    Select::make('role')
+                        ->options(Role::class),
+                ]),
             ])
             ->actions([
+                Action::make('view')
+                    ->icon('heroicon-o-eye')
+                    ->color('gray')
+                    ->url(fn (User $record): string => UserResource::getUrl('view', [
+                        'record' => $record->getKey(),
+                    ])),
                 Tables\Actions\EditAction::make(),
-                Tables\Actions\DeleteAction::make(),
+                Tables\Actions\DetachAction::make(),
             ])
             ->bulkActions([
                 Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
+                    Tables\Actions\DetachBulkAction::make(),
                 ]),
             ]);
     }

app/Filament/Resources/TagResource.php

@@ -56,6 +56,7 @@ class TagResource extends Resource
                     ->label('Updated at')
                     ->sortable(),
             ])
+            ->defaultSort('created_at', 'desc')
             ->filters([
                 //
             ])

app/Filament/Resources/UserResource.php

@@ -4,17 +4,21 @@ declare(strict_types=1);
 
 namespace App\Filament\Resources;
 
+use App\Enums\Weekday;
 use App\Filament\Resources\UserResource\Pages;
 use App\Filament\Resources\UserResource\RelationManagers\OrganizationsRelationManager;
 use App\Filament\Resources\UserResource\RelationManagers\OwnedOrganizationsRelationManager;
 use App\Models\User;
+use App\Service\TimezoneService;
 use Exception;
 use Filament\Forms;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
+use Filament\Tables\Filters\TernaryFilter;
 use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Hash;
 use STS\FilamentImpersonate\Tables\Actions\Impersonate;
 
@@ -47,12 +51,32 @@ class UserResource extends Resource
                     ->label('Email')
                     ->required()
                     ->maxLength(255),
+                Forms\Components\Toggle::make('is_placeholder')
+                    ->label('Is Placeholder'),
+                Forms\Components\DateTimePicker::make('email_verified_at')
+                    ->label('Email Verified At')
+                    ->nullable(),
+                Forms\Components\Select::make('timezone')
+                    ->label('Timezone')
+                    ->options(fn (): array => app(TimezoneService::class)->getSelectOptions())
+                    ->searchable()
+                    ->required(),
+                Forms\Components\Select::make('week_start')
+                    ->label('Week Start')
+                    ->options(Weekday::class)
+                    ->required(),
                 TextInput::make('password')
                     ->password()
                     ->dehydrateStateUsing(fn ($state) => Hash::make($state))
                     ->dehydrated(fn ($state) => filled($state))
                     ->required(fn (string $context): bool => $context === 'create')
                     ->maxLength(255),
+                Forms\Components\DateTimePicker::make('created_at')
+                    ->label('Created At')
+                    ->disabled(),
+                Forms\Components\DateTimePicker::make('updated_at')
+                    ->label('Updated At')
+                    ->disabled(),
             ]);
     }
 
@@ -67,9 +91,36 @@ class UserResource extends Resource
                     ->icon('heroicon-m-envelope')
                     ->searchable()
                     ->sortable(),
+                Tables\Columns\IconColumn::make('is_real_user')
+                    ->getStateUsing(fn (User $record): bool => ! $record->is_placeholder)
+                    ->label('Real user?')
+                    ->boolean(),
+                Tables\Columns\IconColumn::make('email_verified')
+                    ->getStateUsing(fn (User $record): bool => $record->email_verified_at !== null)
+                    ->label('Email verified?')
+                    ->boolean(),
+                Tables\Columns\TextColumn::make('created_at')
+                    ->dateTime()
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
+                Tables\Columns\TextColumn::make('updated_at')
+                    ->dateTime()
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
             ])
+            ->defaultSort('created_at', 'desc')
             ->filters([
-                //
+                TernaryFilter::make('real_user')
+                    ->queries(
+                        true: fn (Builder $query) => $query->where('is_placeholder', '=', false),
+                        false: fn (Builder $query) => $query->where('is_placeholder', '=', true),
+                        blank: fn (Builder $query) => $query,
+                    )
+                    ->label('Real User?'),
+                TernaryFilter::make('email_verified')
+                    ->label('Email Verified?')
+                    ->attribute('email_verified_at')
+                    ->nullable(),
             ])
             ->actions([
                 Impersonate::make()->before(function (User $record): void {
@@ -97,8 +148,8 @@ class UserResource extends Resource
     public static function getRelations(): array
     {
         return [
-            OwnedOrganizationsRelationManager::class,
             OrganizationsRelationManager::class,
+            OwnedOrganizationsRelationManager::class,
         ];
     }
 
@@ -108,6 +159,7 @@ class UserResource extends Resource
             'index' => Pages\ListUsers::route('/'),
             'create' => Pages\CreateUser::route('/create'),
             'edit' => Pages\EditUser::route('/{record}/edit'),
+            'view' => Pages\ViewUser::route('/{record}'),
         ];
     }
 }

app/Filament/Resources/UserResource/Pages/ViewUser.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Filament\Resources\UserResource\Pages;
+
+use App\Filament\Resources\UserResource;
+use Filament\Actions\DeleteAction;
+use Filament\Actions\EditAction;
+use Filament\Resources\Pages\ViewRecord;
+
+class ViewUser extends ViewRecord
+{
+    protected static string $resource = UserResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            EditAction::make('edit')
+                ->icon('heroicon-s-pencil'),
+            DeleteAction::make('delete')
+                ->icon('heroicon-s-trash'),
+        ];
+    }
+}

app/Filament/Resources/UserResource/RelationManagers/OrganizationsRelationManager.php

@@ -4,10 +4,17 @@ declare(strict_types=1);
 
 namespace App\Filament\Resources\UserResource\RelationManagers;
 
-use Filament\Forms;
+use App\Enums\Role;
+use App\Filament\Resources\OrganizationResource;
+use App\Models\Organization;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
+use Filament\Tables\Actions\Action;
+use Filament\Tables\Actions\AttachAction;
+use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 
 class OrganizationsRelationManager extends RelationManager
@@ -18,9 +25,12 @@ class OrganizationsRelationManager extends RelationManager
     {
         return $form
             ->schema([
-                Forms\Components\TextInput::make('name')
+                Select::make('role')
-                    ->required()
+                    ->options(Role::class),
-                    ->maxLength(255),
+                TextInput::make('billable_rate')
+                    ->label('Billable rate (in Cents)')
+                    ->nullable()
+                    ->numeric(),
             ]);
     }
 
@@ -29,21 +39,31 @@ class OrganizationsRelationManager extends RelationManager
         return $table
             ->recordTitleAttribute('name')
             ->columns([
-                Tables\Columns\TextColumn::make('name'),
+                TextColumn::make('name'),
-            ])
+                TextColumn::make('role'),
-            ->filters([
+                TextColumn::make('billable_rate')
-                //
+                    ->money(fn (Organization $resource) => $resource->currency ?? 'EUR', divideBy: 100),
             ])
             ->headerActions([
-                Tables\Actions\CreateAction::make(),
+                Tables\Actions\AttachAction::make()->form(fn (AttachAction $action): array => [
+                    $action->getRecordSelect(),
+                    Select::make('role')
+                        ->options(Role::class),
+                ]),
             ])
             ->actions([
+                Action::make('view')
+                    ->icon('heroicon-o-eye')
+                    ->color('gray')
+                    ->url(fn (Organization $record): string => OrganizationResource::getUrl('view', [
+                        'record' => $record->getKey(),
+                    ])),
                 Tables\Actions\EditAction::make(),
-                Tables\Actions\DeleteAction::make(),
+                Tables\Actions\DetachAction::make(),
             ])
             ->bulkActions([
                 Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
+                    Tables\Actions\DetachBulkAction::make(),
                 ]),
             ]);
     }

app/Filament/Resources/UserResource/RelationManagers/OwnedOrganizationsRelationManager.php

@@ -4,10 +4,12 @@ declare(strict_types=1);
 
 namespace App\Filament\Resources\UserResource\RelationManagers;
 
-use Filament\Forms;
+use App\Filament\Resources\OrganizationResource;
+use App\Models\Organization;
 use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
+use Filament\Tables\Actions\Action;
 use Filament\Tables\Table;
 
 class OwnedOrganizationsRelationManager extends RelationManager
@@ -20,9 +22,6 @@ class OwnedOrganizationsRelationManager extends RelationManager
     {
         return $form
             ->schema([
-                Forms\Components\TextInput::make('name')
-                    ->required()
-                    ->maxLength(255),
             ]);
     }
 
@@ -39,7 +38,18 @@ class OwnedOrganizationsRelationManager extends RelationManager
             ->headerActions([
             ])
             ->actions([
-                Tables\Actions\EditAction::make(),
+                Action::make('view')
+                    ->icon('heroicon-o-eye')
+                    ->color('gray')
+                    ->url(fn (Organization $record): string => OrganizationResource::getUrl('view', [
+                        'record' => $record->getKey(),
+                    ])),
+                Action::make('edit')
+                    ->icon('heroicon-o-pencil')
+                    ->url(fn (Organization $record): string => OrganizationResource::getUrl('edit', [
+                        'record' => $record->getKey(),
+                    ]))
+                    ->openUrlInNewTab(),
             ])
             ->bulkActions([
             ]);