Merge pull request #774 from JoshKisb/main

update gedcom import
liberu-genealogy · Jun 10, 2024 · b7713d0 · b7713d0
2 parents 471b982 + 1bb05d8
commit b7713d0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/app/Filament/Resources/GedcomResource.php b/app/Filament/Resources/GedcomResource.php
@@ -11,6 +11,7 @@
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
 
 class GedcomResource extends Resource
@@ -49,8 +50,7 @@ public static function form(Form $form): Form
                             return;
                         }
                         $path = $state->store('gedcom-form-imports', 'private');
-                        $conn = Auth::user()->company()->database_name; // Get the tenant's database connection name
-                        ImportGedcom::dispatch(Auth::user(), Storage::disk('private')->path($path), $conn);
+                        ImportGedcom::dispatch(Auth::user(), Storage::disk('private')->path($path));
                     }),
             ]);
     }

diff --git a/app/Jobs/ImportGedcom.php b/app/Jobs/ImportGedcom.php
@@ -24,11 +24,8 @@ class ImportGedcom implements ShouldQueue
     public int $timeout = 0;
     public int $tries = 1;
 
-    protected string $conn;
-
-    public function __construct(protected User $user, protected string $filePath, protected string $conn, protected ?string $slug = null)
+    public function __construct(protected User $user, protected string $filePath, protected ?string $slug = null)
     {
-        $this->conn = $conn;
     }
 
     public function handle(): int
@@ -52,7 +49,7 @@ public function handle(): int
         ]);
         $parser = new GedcomParser();
 
-        $parser->parse($this->conn, $this->filePath, $slug, false);
+        $parser->parse($job->getConnectionName(), $this->filePath, $slug, false);
         // with(new GedcomParser())->parse($tenant->connectionName(), $this->filePath, $slug, true);
 
         File::delete($this->filePath);

diff --git a/public/build/assets/app-CkNwwAZT.css b/public/build/assets/app-CkNwwAZT.css
diff --git a/public/build/assets/dashboard-B7tka_NQ.css b/public/build/assets/dashboard-B7tka_NQ.css
diff --git a/public/build/manifest.json b/public/build/manifest.json
@@ -1,11 +1,11 @@
 {
   "resources/css/app.css": {
-    "file": "assets/app-DMCeC1nD.css",
+    "file": "assets/app-CkNwwAZT.css",
     "src": "resources/css/app.css",
     "isEntry": true
   },
   "resources/css/dashboard.css": {
-    "file": "assets/dashboard-WAznCSOB.css",
+    "file": "assets/dashboard-B7tka_NQ.css",
     "src": "resources/css/dashboard.css",
     "isEntry": true
   },