Glitch in the UI while create migrations #19

tomatophp · Jul 8, 2024 · 2223e75 · 2223e75
1 parent b7b660b
commit 2223e75
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 78 deletions.
diff --git a/lang/en/messages.php b/lang/en/messages.php
diff --git a/resources/lang/ar/messages.php b/resources/lang/ar/messages.php
@@ -24,6 +24,10 @@
             'docs' => 'عن الاضافة',
         ],
         'notifications' => [
+            'exists' => [
+                'title' => 'خطأ',
+                'body' => 'الاضافة موجودة بالفعل'
+            ],
             'autoload' => [
                 'title' => 'خطأ',
                 'body' => 'عفواً لا يمكن تفعيل هذه الاضافة قبل تشغيل الامر composer dump-autoload في الطرفية'

diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php
@@ -24,6 +24,10 @@
            'docs' => 'Docs',
        ],
         'notifications' => [
+            'exists' => [
+                'title' => 'Error',
+                'body' => 'The plugin already exists.'
+            ],
             'autoload' => [
                 'title' => 'Error',
                 'body' => 'The plugin could not be activated because the class could not be found. please run composer dump-autoload on your terminal'
@@ -52,6 +56,7 @@
     ],
     'tables' => [
         'title' => 'Tables',
+        'single' => 'Table',
         'create' => 'Create Table',
         'edit' => 'Edit Table',
         'columns' => 'Table Columns',

diff --git a/resources/lang/nl/messages.php b/resources/lang/nl/messages.php
@@ -24,6 +24,10 @@
             'docs' => 'Docs',
         ],
         'notifications' => [
+            'exists' => [
+                'title' => 'Error',
+                'body' => 'The plugin already exists.'
+            ],
             'autoload' => [
                 'title' => 'Error',
                 'body' => 'The plugin could not be activated because the class could not be found. please run composer dump-autoload on your terminal'

diff --git a/src/Pages/Plugins.php b/src/Pages/Plugins.php
@@ -76,8 +76,8 @@ public function disableAction(): Action
                 $module?->disable();
 
                 Notification::make()
-                    ->title(trans('filament-plugins::messages.plugins.notifications.disabled.title'))
-                    ->body(trans('filament-plugins::messages.plugins.notifications.disabled.body'))
+                    ->title(trans('filament-plugins::messages.plugins.notificationss.disabled.title'))
+                    ->body(trans('filament-plugins::messages.plugins.notificationss.disabled.body'))
                     ->success()
                     ->send();
 
@@ -98,8 +98,8 @@ public function deleteAction(): Action
                 $module?->delete();
 
                 Notification::make()
-                    ->title(trans('filament-plugins::messages.plugins.notifications.deleted.title'))
-                    ->body(trans('filament-plugins::messages.plugins.notifications.deleted.body'))
+                    ->title(trans('filament-plugins::messages.plugins.notificationss.deleted.title'))
+                    ->body(trans('filament-plugins::messages.plugins.notificationss.deleted.body'))
                     ->success()
                     ->send();
 
@@ -119,8 +119,8 @@ public function activeAction(): Action
             ->action(function (array $arguments) {
                 if(!class_exists(json_decode($arguments['item']['providers'])[0])){
                     Notification::make()
-                        ->title(trans('filament-plugins::messages.plugins.notifications.autoload.title'))
-                        ->body(trans('filament-plugins::messages.plugins.notifications.autoload.body'))
+                        ->title(trans('filament-plugins::messages.plugins.notificationss.autoload.title'))
+                        ->body(trans('filament-plugins::messages.plugins.notificationss.autoload.body'))
                         ->danger()
                         ->send();
                     return;
@@ -129,8 +129,8 @@ public function activeAction(): Action
                 $module?->enable();
 
                 Notification::make()
-                    ->title(trans('filament-plugins::messages.plugins.notifications.enabled.title'))
-                    ->body(trans('filament-plugins::messages.plugins.notifications.enabled.body'))
+                    ->title(trans('filament-plugins::messages.plugins.notificationss.enabled.title'))
+                    ->body(trans('filament-plugins::messages.plugins.notificationss.enabled.body'))
                     ->success()
                     ->send();
 
@@ -195,8 +195,8 @@ public function importPlugin(array $data)
             $zip->close();
 
             Notification::make()
-                ->title(trans('filament-plugins::messages.plugins.notifications.import.title'))
-                ->body(trans('filament-plugins::messages.plugins.notifications.import.body'))
+                ->title(trans('filament-plugins::messages.plugins.notificationss.import.title'))
+                ->body(trans('filament-plugins::messages.plugins.notificationss.import.body'))
                 ->success()
                 ->send();
 
@@ -210,10 +210,11 @@ public function createPlugin(array $data)
         $checkIfPluginExists = Module::find(Str::of($data['name'])->camel()->ucfirst()->toString());
         if($checkIfPluginExists){
             Notification::make()
-                ->title(trans('filament-plugins::messages.plugins.notification.exists.title'))
-                ->body(trans('filament-plugins::messages.plugins.notification.exists.body'))
+                ->title(trans('filament-plugins::messages.plugins.notifications.exists.title'))
+                ->body(trans('filament-plugins::messages.plugins.notifications.exists.body'))
                 ->danger()
                 ->send();
+            return;
         }
 
         $generator = new PluginGenerator(
@@ -225,8 +226,8 @@ public function createPlugin(array $data)
         $generator->generate();
 
         Notification::make()
-            ->title(trans('filament-plugins::messages.plugins.notification.created.title'))
-            ->body(trans('filament-plugins::messages.plugins.notification.created.body'))
+            ->title(trans('filament-plugins::messages.plugins.notifications.created.title'))
+            ->body(trans('filament-plugins::messages.plugins.notifications.created.body'))
             ->success()
             ->send();
     }

diff --git a/src/Resources/TableResource.php b/src/Resources/TableResource.php
@@ -28,6 +28,21 @@ class TableResource extends Resource
 
     protected static bool $shouldRegisterNavigation = false;
 
+    public static function getNavigationLabel(): string
+    {
+        return trans('filament-plugins::messages.tables.title'); // TODO: Change the autogenerated stub
+    }
+
+    public function getTitle(): string
+    {
+        return trans('filament-plugins::messages.tables.title');
+    }
+
+    public static function getPluralLabel(): ?string
+    {
+        return trans('filament-plugins::messages.tables.title')  . ' ['.session()->get('current_module').']'; // TODO: Change the autogenerated stub
+    }
+
     public static function form(Form $form): Form
     {
         return $form
@@ -51,12 +66,10 @@ public static function form(Form $form): Form
 
     public static function table(Table $table): Table
     {
-        $query = $table->getQuery();
-        if(request()->has('module')){
-            $query->where('module', request()->get('module'));
-        }
         return $table
-            ->query($query)
+            ->modifyQueryUsing(function ($query) {
+                $query->where('module', session()->get('current_module'));
+            })
             ->columns([
                 Tables\Columns\TextColumn::make('name')
                     ->label(trans('filament-plugins::messages.tables.form.name'))

diff --git a/src/Resources/TableResource/Pages/ListTables.php b/src/Resources/TableResource/Pages/ListTables.php
@@ -2,6 +2,7 @@
 
 namespace TomatoPHP\FilamentPlugins\Resources\TableResource\Pages;
 
+use Filament\Tables\Table;
 use TomatoPHP\FilamentPlugins\Resources\TableResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
@@ -10,18 +11,21 @@ class ListTables extends ListRecords
 {
     protected static string $resource = TableResource::class;
 
-    public function getTitle(): string
-    {
-        return trans('filament-plugins::messages.tables.title');
-    }
 
     public function mount(): void
     {
         if(!request()->has('module')){
             $this->redirect(route('filament.'.filament()->getCurrentPanel()->getId().'.pages.plugins'));
         }
+
+        if(session()->has('current_module')){
+            session()->forget('current_module');
+        }
+
+        session()->put('current_module', request()->get('module'));
     }
 
+
     protected function getHeaderActions(): array
     {
         return [