From 66f2a53591ff637ef4bc30649f62a364d0f4ccdd Mon Sep 17 00:00:00 2001
From: Boy132 <mail@boy132.de>
Date: Tue, 11 Nov 2025 11:44:52 +0100
Subject: [PATCH] update import buttons

---
 .../Resources/Plugins/PluginResource.php      | 93 ++++++++++++-------
 lang/en/admin/plugin.php                      |  6 +-
 2 files changed, 61 insertions(+), 38 deletions(-)

diff --git a/app/Filament/Admin/Resources/Plugins/PluginResource.php b/app/Filament/Admin/Resources/Plugins/PluginResource.php
index 3a46c6ab4..562f30d20 100644
--- a/app/Filament/Admin/Resources/Plugins/PluginResource.php
+++ b/app/Filament/Admin/Resources/Plugins/PluginResource.php
@@ -14,8 +14,6 @@ use Filament\Forms\Components\TextInput;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Notifications\Notification;
 use Filament\Resources\Resource;
-use Filament\Schemas\Components\Tabs;
-use Filament\Schemas\Components\Tabs\Tab;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 use Illuminate\Http\UploadedFile;
@@ -63,7 +61,8 @@ class PluginResource extends Resource
                     ->icon(fn (Plugin $plugin) => $plugin->isUpdateAvailable() ? 'tabler-versions-off' : 'tabler-versions')
                     ->iconColor(fn (Plugin $plugin) => $plugin->isUpdateAvailable() ? 'danger' : 'success')
                     ->tooltip(fn (Plugin $plugin) => $plugin->isUpdateAvailable() ? trans('admin/plugin.update_available') : null)
-                    ->sortable(),
+                    ->sortable()
+                    ->searchable(),
                 TextColumn::make('author')
                     ->label(trans('admin/plugin.author'))
                     ->sortable(),
@@ -216,50 +215,74 @@ class PluginResource extends Resource
                 ]),
             ])
             ->headerActions([
-                Action::make('import')
-                    ->label(trans('admin/plugin.import'))
+                Action::make('import_from_file')
+                    ->label(trans('admin/plugin.import_from_file'))
                     ->authorize(fn () => user()?->can('create', Plugin::class))
-                    ->icon('tabler-download')
+                    ->icon('tabler-file-download')
                     ->schema([
-                        Tabs::make('Tabs')
-                            ->contained(false)
-                            ->tabs([
-                                Tab::make('from_file')
-                                    ->label(trans('admin/plugin.from_file'))
-                                    ->icon('tabler-file-upload')
-                                    ->schema([
-                                        FileUpload::make('file')
-                                            ->acceptedFileTypes(['application/zip', 'application/zip-compressed', 'application/x-zip-compressed'])
-                                            ->preserveFilenames()
-                                            ->previewable(false)
-                                            ->storeFiles(false),
-                                    ]),
-                                Tab::make('from_url')
-                                    ->label(trans('admin/plugin.from_url'))
-                                    ->icon('tabler-world-upload')
-                                    ->schema([
-                                        TextInput::make('url')
-                                            ->url()
-                                            ->endsWith('.zip'),
-                                    ]),
-                            ]),
+                        // TODO: switch to new file upload
+                        FileUpload::make('file')
+                            ->required()
+                            ->acceptedFileTypes(['application/zip', 'application/zip-compressed', 'application/x-zip-compressed'])
+                            ->preserveFilenames()
+                            ->previewable(false)
+                            ->storeFiles(false),
                     ])
                     ->action(function ($data, $livewire) {
                         try {
-                            if ($data['file'] instanceof UploadedFile) {
-                                Plugins::downloadPluginFromFile($data['file']);
+                            /** @var UploadedFile $file */
+                            $file = $data['file'];
+
+                            $pluginName = str($file->getClientOriginalName())->before('.zip')->toString();
+
+                            if (Plugin::where('id', $pluginName)->exists()) {
+                                throw new Exception(trans('admin/plugin.notifications.import_exists'));
                             }
 
-                            if (is_string($data['url'])) {
-                                Plugins::downloadPluginFromUrl($data['url']);
-                            }
-
-                            redirect(ListPlugins::getUrl(['tab' => $livewire->activeTab]));
+                            Plugins::downloadPluginFromFile($file);
 
                             Notification::make()
                                 ->success()
                                 ->title(trans('admin/plugin.notifications.imported'))
                                 ->send();
+
+                            redirect(ListPlugins::getUrl(['tab' => $livewire->activeTab]));
+                        } catch (Exception $exception) {
+                            report($exception);
+
+                            Notification::make()
+                                ->danger()
+                                ->title(trans('admin/plugin.notifications.import_failed'))
+                                ->body($exception->getMessage())
+                                ->send();
+                        }
+                    }),
+                Action::make('import_from_url')
+                    ->label(trans('admin/plugin.import_from_url'))
+                    ->authorize(fn () => user()?->can('create', Plugin::class))
+                    ->icon('tabler-world-download')
+                    ->schema([
+                        TextInput::make('url')
+                            ->required()
+                            ->url()
+                            ->endsWith('.zip'),
+                    ])
+                    ->action(function ($data, $livewire) {
+                        try {
+                            $pluginName = str($data['url'])->before('.zip')->split('/')->last();
+
+                            if (Plugin::where('id', $pluginName)->exists()) {
+                                throw new Exception(trans('admin/plugin.notifications.import_exists'));
+                            }
+
+                            Plugins::downloadPluginFromUrl($data['url']);
+
+                            Notification::make()
+                                ->success()
+                                ->title(trans('admin/plugin.notifications.imported'))
+                                ->send();
+
+                            redirect(ListPlugins::getUrl(['tab' => $livewire->activeTab]));
                         } catch (Exception $exception) {
                             report($exception);
 
diff --git a/lang/en/admin/plugin.php b/lang/en/admin/plugin.php
index ae5a4b0f8..0342da5b9 100644
--- a/lang/en/admin/plugin.php
+++ b/lang/en/admin/plugin.php
@@ -18,10 +18,9 @@ return [
     'update' => 'Update',
     'enable' => 'Enable',
     'disable' => 'Disable',
-    'import' => 'Import',
+    'import_from_file' => 'Import from File',
+    'import_from_url' => 'Import from URL',
     'no_plugins' => 'No Plugins',
-    'from_file' => 'From File',
-    'from_url' => 'From URL',
     'all' => 'All',
     'change_load_order' => 'Change load order',
     'apply_load_order' => 'Apply load order',
@@ -53,6 +52,7 @@ return [
         'enabled' => 'Plugin enabled',
         'disabled' => 'Plugin disabled',
         'imported' => 'Plugin imported',
+        'import_exists' => 'A plugin with that id already exists',
         'import_failed' => 'Could not import plugin',
     ],
 ];