Larastan

andreia · andreia · commit 8a0b5357c656 · 2025-12-11T23:11:36.000-03:00
diff --git a/src/Middleware/RedirectToCorrectEditPage.php b/src/Middleware/RedirectToCorrectEditPage.php
@@ -3,6 +3,7 @@
 namespace Tapp\FilamentLibrary\Middleware;
 
 use Closure;
+use Filament\Facades\Filament;
 use Illuminate\Http\Request;
 use Tapp\FilamentLibrary\Models\LibraryItem;
 
@@ -13,20 +14,28 @@ class RedirectToCorrectEditPage
      */
     public function handle(Request $request, Closure $next)
     {
-        // Check if this is an edit route for library items
-        if ($request->routeIs('filament.admin.resources.library.edit')) {
+        $panel = Filament::getCurrentPanel();
+
+        if (! $panel) {
+            return $next($request);
+        }
+
+        $panelId = $panel->getId();
+
+        // Check if this is an edit route for library items in any panel
+        if ($request->routeIs("filament.{$panelId}.resources.library.edit")) {
             $recordId = $request->route('record');
 
             if ($recordId) {
                 $libraryItem = LibraryItem::find($recordId);
 
-                if ($libraryItem) {
+                if ($libraryItem && isset($libraryItem->type)) {
                     // Redirect to the correct edit page based on type
                     $editUrl = match ($libraryItem->type) {
-                        'folder' => route('filament.admin.resources.library.edit-folder', ['record' => $recordId]),
-                        'file' => route('filament.admin.resources.library.edit-file', ['record' => $recordId]),
-                        'link' => route('filament.admin.resources.library.edit-link', ['record' => $recordId]),
-                        default => route('filament.admin.resources.library.edit-folder', ['record' => $recordId]),
+                        'folder' => route("filament.{$panelId}.resources.library.edit-folder", ['record' => $recordId]),
+                        'file' => route("filament.{$panelId}.resources.library.edit-file", ['record' => $recordId]),
+                        'link' => route("filament.{$panelId}.resources.library.edit-link", ['record' => $recordId]),
+                        default => route("filament.{$panelId}.resources.library.edit-folder", ['record' => $recordId]),
                     };
 
                     return redirect($editUrl);
diff --git a/src/Models/LibraryItem.php b/src/Models/LibraryItem.php
@@ -13,6 +13,27 @@
 use Spatie\MediaLibrary\InteractsWithMedia;
 use Spatie\MediaLibrary\MediaCollections\Models\Media;
 
+/**
+ * @property int $id
+ * @property string $name
+ * @property string $slug
+ * @property string $type
+ * @property int|null $parent_id
+ * @property int $created_by
+ * @property int|null $updated_by
+ * @property string|null $external_url
+ * @property string|null $link_description
+ * @property string|null $general_access
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property-read LibraryItem|null $parent
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, LibraryItem> $children
+ * @property-read \App\Models\User $creator
+ * @property-read \App\Models\User|null $updater
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, LibraryItemPermission> $permissions
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, LibraryItemTag> $tags
+ */
 class LibraryItem extends Model implements HasMedia
 {
     use HasFactory;
@@ -58,14 +79,16 @@ protected static function boot(): void
 
         static::created(function (self $item) {
             // Copy parent folder permissions to the new item
-            if ($item->parent_id) {
+            if ($item->parent_id && $item->parent) {
                 $parentPermissions = $item->parent->permissions()->get();
 
                 foreach ($parentPermissions as $permission) {
-                    $item->permissions()->create([
-                        'user_id' => $permission->user_id,
-                        'role' => $permission->role,
-                    ]);
+                    if (isset($permission->user_id) && isset($permission->role)) {
+                        $item->permissions()->create([
+                            'user_id' => $permission->user_id,
+                            'role' => $permission->role,
+                        ]);
+                    }
                 }
             }
         });
@@ -199,7 +222,7 @@ public function getEffectiveRole($user): ?string
             ->where('user_id', $user->id)
             ->first();
 
-        if ($directPermission) {
+        if ($directPermission && isset($directPermission->role)) {
             return $directPermission->role;
         }
 
@@ -220,14 +243,16 @@ public function getEffectiveRole($user): ?string
 
     /**
      * Get the current owner of this item.
+     *
+     * @return \App\Models\User|\Illuminate\Database\Eloquent\Model|null
      */
-    public function getCurrentOwner(): ?\App\Models\User
+    public function getCurrentOwner()
     {
         $ownerPermission = $this->permissions()
             ->where('role', 'owner')
             ->first();
 
-        if ($ownerPermission) {
+        if ($ownerPermission && $ownerPermission->user) {
             return $ownerPermission->user;
         }
 
diff --git a/src/Models/LibraryItemPermission.php b/src/Models/LibraryItemPermission.php
@@ -6,6 +6,16 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
+/**
+ * @property int $id
+ * @property int $library_item_id
+ * @property int $user_id
+ * @property string $role
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read LibraryItem $libraryItem
+ * @property-read \App\Models\User $user
+ */
 class LibraryItemPermission extends Model
 {
     use HasFactory;
diff --git a/src/Resources/Pages/ListLibraryItems.php b/src/Resources/Pages/ListLibraryItems.php
@@ -254,7 +254,7 @@ protected function getTableQuery(): \Illuminate\Database\Eloquent\Builder
 
     public function getTitle(): string
     {
-        if ($this->parentFolder) {
+        if ($this->parentFolder && isset($this->parentFolder->name)) {
             return $this->parentFolder->name;
         }
 
@@ -263,7 +263,7 @@ public function getTitle(): string
 
     public function getSubheading(): ?string
     {
-        if ($this->parentFolder && $this->parentFolder->link_description) {
+        if ($this->parentFolder && isset($this->parentFolder->link_description) && $this->parentFolder->link_description) {
             return $this->parentFolder->link_description;
         }
 
@@ -298,7 +298,9 @@ public function getBreadcrumbs(): array
             // Generate URLs more efficiently
             $baseUrl = static::getResource()::getUrl('index');
             foreach ($path as $folder) {
-                $breadcrumbs[$baseUrl . '?parent=' . $folder->id] = $folder->name;
+                if (isset($folder->id) && isset($folder->name)) {
+                    $breadcrumbs[$baseUrl . '?parent=' . $folder->id] = $folder->name;
+                }
             }
         }
 
diff --git a/src/Resources/RelationManagers/LibraryItemPermissionsRelationManager.php b/src/Resources/RelationManagers/LibraryItemPermissionsRelationManager.php
@@ -15,6 +15,7 @@
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Schema as SchemaFacade;
+use Tapp\FilamentLibrary\Models\LibraryItem;
 use Tapp\FilamentLibrary\Models\LibraryItemPermission;
 
 class LibraryItemPermissionsRelationManager extends RelationManager
@@ -41,7 +42,7 @@ public static function canAccess(): bool
 
         // For non-admins, check if they have share permission on the current record
         $record = static::getOwnerRecord();
-        if ($record && $record->hasPermission($user, 'share')) {
+        if ($record instanceof LibraryItem && $record->hasPermission($user, 'share')) {
             return true;
         }
 
@@ -50,7 +51,7 @@ public static function canAccess(): bool
 
     public static function canViewForRecord(Model $ownerRecord, string $pageClass): bool
     {
-        return $ownerRecord->hasPermission(auth()->user(), 'share');
+        return $ownerRecord instanceof LibraryItem && $ownerRecord->hasPermission(auth()->user(), 'share');
     }
 
     /**
@@ -173,28 +174,28 @@ public function table(Table $table): Table
             ])
             ->headerActions([
                 CreateAction::make()
-                    ->visible(fn () => $this->ownerRecord->hasPermission(auth()->user(), 'share')),
+                    ->visible(fn () => $this->ownerRecord instanceof LibraryItem && $this->ownerRecord->hasPermission(auth()->user(), 'share')),
             ])
             ->heading('User Permissions')
             ->description('Owner: Share and edit. Editor/Viewer: Standard permissions.')
-            ->actions([
+            ->recordActions([
                 EditAction::make()
-                    ->visible(fn () => $this->ownerRecord->hasPermission(auth()->user(), 'share')),
+                    ->visible(fn () => $this->ownerRecord instanceof LibraryItem && $this->ownerRecord->hasPermission(auth()->user(), 'share')),
                 DeleteAction::make()
-                    ->visible(fn () => $this->ownerRecord->hasPermission(auth()->user(), 'share')),
+                    ->visible(fn () => $this->ownerRecord instanceof LibraryItem && $this->ownerRecord->hasPermission(auth()->user(), 'share')),
             ])
-            ->bulkActions([
+            ->toolbarActions([
                 BulkActionGroup::make([
                     DeleteBulkAction::make()
-                        ->visible(fn () => $this->ownerRecord->hasPermission(auth()->user(), 'share')),
+                        ->visible(fn () => $this->ownerRecord instanceof LibraryItem && $this->ownerRecord->hasPermission(auth()->user(), 'share')),
                 ]),
             ])
             ->emptyStateHeading('No permissions assigned')
             ->emptyStateDescription('Add users to grant them specific permissions on this item.')
             ->emptyStateActions([
                 CreateAction::make()
                     ->label('Add Permission')
-                    ->visible(fn () => $this->ownerRecord->hasPermission(auth()->user(), 'share')),
+                    ->visible(fn () => $this->ownerRecord instanceof LibraryItem && $this->ownerRecord->hasPermission(auth()->user(), 'share')),
             ]);
     }
 }
diff --git a/src/Services/PermissionService.php b/src/Services/PermissionService.php
@@ -80,6 +80,8 @@ public function removePermission($user, LibraryItem $item, string $permission):
 
     /**
      * Bulk assign permissions to multiple users for multiple items.
+     *
+     * @param \Illuminate\Database\Eloquent\Collection<int, LibraryItem>|array<LibraryItem> $items
      */
     public function bulkAssignPermissions($items, array $data): void
     {
@@ -88,17 +90,24 @@ public function bulkAssignPermissions($items, array $data): void
         $generalAccess = $data['general_access'] ?? 'private';
 
         foreach ($items as $item) {
+            if (! $item instanceof LibraryItem) {
+                continue;
+            }
+
             // Update the general access level for the item
             $item->update(['general_access' => $generalAccess]);
 
             // Assign permissions to users
             foreach ($userIds as $userId) {
                 $userModel = $this->getUserModel();
-                $this->assignPermission(
-                    $userModel::find($userId),
-                    $item,
-                    $permission
-                );
+                $user = $userModel::find($userId);
+                if ($user) {
+                    $this->assignPermission(
+                        $user,
+                        $item,
+                        $permission
+                    );
+                }
             }
         }
     }
@@ -111,17 +120,24 @@ public function cascadePermissionsToChildren(LibraryItem $folder, array $userIds
         $children = $folder->children;
 
         foreach ($children as $child) {
+            if (! $child instanceof LibraryItem) {
+                continue;
+            }
+
             foreach ($userIds as $userId) {
                 $userModel = $this->getUserModel();
-                $this->assignPermission(
-                    $userModel::find($userId),
-                    $child,
-                    $permission
-                );
+                $user = $userModel::find($userId);
+                if ($user) {
+                    $this->assignPermission(
+                        $user,
+                        $child,
+                        $permission
+                    );
+                }
             }
 
             // Recursively cascade to grandchildren
-            if ($child->type === 'folder') {
+            if (isset($child->type) && $child->type === 'folder') {
                 $this->cascadePermissionsToChildren($child, $userIds, $permission);
             }
         }
diff --git a/src/Tables/Actions/BulkManagePermissionsAction.php b/src/Tables/Actions/BulkManagePermissionsAction.php
@@ -30,7 +30,7 @@ protected function setUp(): void
             ->icon('heroicon-o-shield-check')
             ->color('warning')
             ->visible(fn (): bool => auth()->user() && FilamentLibraryPlugin::isLibraryAdmin(auth()->user()))
-            ->form([
+            ->schema([
                 Select::make('general_access')
                     ->label('General Access')
                     ->options([
@@ -76,9 +76,10 @@ protected function setUp(): void
 
     public function success(): void
     {
-        $this->successNotification(
-            title: 'Permissions Updated',
-            body: 'Permissions have been successfully updated for the selected items.',
-        );
+        \Filament\Notifications\Notification::make()
+            ->title('Permissions Updated')
+            ->body('Permissions have been successfully updated for the selected items.')
+            ->success()
+            ->send();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ protected function getTableQuery(): \Illuminate\Database\Eloquent\Builder`
`254`	`254`
`255`	`255`	`public function getTitle(): string`
`256`	`256`	`{`
`257`		`- if ($this->parentFolder) {`
	`257`	`+ if ($this->parentFolder && isset($this->parentFolder->name)) {`
`258`	`258`	`return $this->parentFolder->name;`
`259`	`259`	`}`
`260`	`260`
`@@ -263,7 +263,7 @@ public function getTitle(): string`
`263`	`263`
`264`	`264`	`public function getSubheading(): ?string`
`265`	`265`	`{`
`266`		`- if ($this->parentFolder && $this->parentFolder->link_description) {`
	`266`	`+ if ($this->parentFolder && isset($this->parentFolder->link_description) && $this->parentFolder->link_description) {`
`267`	`267`	`return $this->parentFolder->link_description;`
`268`	`268`	`}`
`269`	`269`
`@@ -298,7 +298,9 @@ public function getBreadcrumbs(): array`
`298`	`298`	`// Generate URLs more efficiently`
`299`	`299`	`$baseUrl = static::getResource()::getUrl('index');`
`300`	`300`	`foreach ($path as $folder) {`
`301`		`- $breadcrumbs[$baseUrl . '?parent=' . $folder->id] = $folder->name;`
	`301`	`+ if (isset($folder->id) && isset($folder->name)) {`
	`302`	`+ $breadcrumbs[$baseUrl . '?parent=' . $folder->id] = $folder->name;`
	`303`	`+ }`
`302`	`304`	`}`
`303`	`305`	`}`
`304`	`306`