handle duplicate slugs and update delete redirects

Author: scott grayson

src/Models/LibraryItem.php

@@ -220,7 +220,9 @@ protected static function generateUniqueSlug(string $name, ?int $parentId = null
         $slug = $baseSlug;
         $counter = 1;
 
-        while (static::where('slug', $slug)
+        // Check for existing slugs (including soft-deleted ones)
+        while (static::withTrashed()
+            ->where('slug', $slug)
             ->where('parent_id', $parentId)
             ->when($excludeId, fn ($q) => $q->where('id', '!=', $excludeId))
             ->exists()) {

src/Resources/LibraryItemResource.php

@@ -7,6 +7,7 @@
 use Filament\Tables;
 use Filament\Tables\Table;
 use Filament\Actions\EditAction;
+use Filament\Actions\DeleteAction;
 use Filament\Actions\BulkActionGroup;
 use Filament\Actions\DeleteBulkAction;
 use Filament\Actions\RestoreAction;
@@ -135,14 +136,35 @@ public static function table(Table $table): Table
             ])
             ->actions([
                 EditAction::make(),
+                DeleteAction::make()
+                    ->successRedirectUrl(function (LibraryItem $record) {
+                        // Redirect to the parent folder after deletion
+                        $parentId = $record->parent_id;
+                        return static::getUrl('index', $parentId ? ['parent' => $parentId] : []);
+                    }),
                 RestoreAction::make(),
-                ForceDeleteAction::make(),
+                ForceDeleteAction::make()
+                    ->successRedirectUrl(function (LibraryItem $record) {
+                        // Redirect to the parent folder after deletion
+                        $parentId = $record->parent_id;
+                        return static::getUrl('index', $parentId ? ['parent' => $parentId] : []);
+                    }),
             ])
             ->bulkActions([
                 BulkActionGroup::make([
-                    DeleteBulkAction::make(),
+                    DeleteBulkAction::make()
+                        ->successRedirectUrl(function () {
+                            // For bulk actions, redirect to current folder (maintain current location)
+                            $currentParent = request()->get('parent');
+                            return static::getUrl('index', $currentParent ? ['parent' => $currentParent] : []);
+                        }),
                     RestoreBulkAction::make(),
-                    ForceDeleteBulkAction::make(),
+                    ForceDeleteBulkAction::make()
+                        ->successRedirectUrl(function () {
+                            // For bulk actions, redirect to current folder (maintain current location)
+                            $currentParent = request()->get('parent');
+                            return static::getUrl('index', $currentParent ? ['parent' => $currentParent] : []);
+                        }),
                 ]),
             ])
             ->recordUrl(function (LibraryItem $record): string {

src/Resources/Pages/EditLibraryItem.php

@@ -35,7 +35,12 @@ protected function getHeaderActions(): array
         }
 
 
-        $actions[] = DeleteAction::make();
+        $actions[] = DeleteAction::make()
+            ->successRedirectUrl(function () {
+                // Redirect to the parent folder after deletion
+                $parentId = $this->getRecord()->parent_id;
+                return static::getResource()::getUrl('index', $parentId ? ['parent' => $parentId] : []);
+            });
 
         return $actions;
     }

src/Resources/Pages/ListLibraryItems.php

@@ -44,6 +44,15 @@ protected function getHeaderActions(): array
                         : static::getResource()::getUrl('index')
                 )
                 ->color('gray');
+
+            // Add "Edit" action for the current folder
+            $actions[] = Action::make('edit_folder')
+                ->label('Edit')
+                ->icon('heroicon-o-pencil')
+                ->color('gray')
+                ->url(fn (): string =>
+                    static::getResource()::getUrl('edit', ['record' => $this->parentFolder])
+                );
         }
 
         // Add "+ New" dropdown action group
@@ -79,12 +88,13 @@ protected function getHeaderActions(): array
                         ->maxSize(10240) // 10MB
                         ->disk('public')
                         ->directory('library-files')
-                        ->visibility('private'),
+                        ->visibility('private')
+                        ->preserveFilenames(), // This should preserve original filenames
                 ])
                 ->action(function (array $data): void {
                     $filePath = $data['file'];
 
-                    // Extract filename from the path
+                    // Extract filename from the stored path - this should preserve the original name
                     $fileName = basename($filePath);
 
                     LibraryItem::create([