Reviewed and enhanched multi-tenancy support from pull request #55 by @…

…nilede-bharat. Minor fixes and code review. Updated README and screenshots.

README.md

@@ -47,8 +47,6 @@ Register the plugin through your panel service provider:
 ## Configuration
 
 ```php
-<?php
-
 use RickDBCN\FilamentEmail\Filament\Resources\EmailResource;
 use RickDBCN\FilamentEmail\Models\Email;
 
@@ -79,8 +77,10 @@ return [
     'can_access' => [
         'role' => [],
     ],
-];
 
+    //Use this option for customize tenant model class
+    //'tenant_model' => \App\Models\Team::class,
+];
 ```
 
 ## Testing

config/filament-email.php

@@ -30,5 +30,7 @@
     'can_access' => [
         'role' => [],
     ],
-    //    'tenant_model' => \App\Models\Team::class, 'pass model of relation to emails like team has many emails'
+
+    //Use this option for customize tenant model class
+    //'tenant_model' => \App\Models\Team::class,
 ];

database/migrations/add_team_id_field_to_filament_email_log_table.php.stub

@@ -0,0 +1,24 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up()
+    {
+        Schema::table('filament_email_log', function (Blueprint $table) {
+            $table->after('id', function (Blueprint $table) {
+                $table->foreignId('team_id')->nullable();
+            });
+        });
+    }
+
+    public function down()
+    {
+        Schema::table('filament_email_log', function (Blueprint $table) {
+            $table->dropColumn('team_id');
+        });
+    }
+};

database/migrations/create_filament_email_table.php.stub

@@ -10,7 +10,6 @@ return new class extends Migration
     {
         Schema::create('filament_email_log', function (Blueprint $table) {
             $table->id();
-            $table->foreignId('tenant_id')->nullable();
             $table->string('from')->nullable();
             $table->string('to')->nullable();
             $table->string('cc')->nullable();

src/Filament/Resources/EmailResource.php

@@ -210,6 +210,7 @@ public static function table(Table $table): Table
                             ->onColor('success')
                             ->offColor('danger')
                             ->inline(false)
+                            ->disabled(fn ($record): bool => empty($record->attachments))
                             ->default(fn ($record): bool => ! empty($record->attachments))
                             ->required(),
                     ])

src/FilamentEmailServiceProvider.php

@@ -27,6 +27,7 @@ public function configurePackage(Package $package): void
             ->hasMigrations([
                 'create_filament_email_table',
                 'add_attachments_field_to_filament_email_log_table',
+                'add_team_id_field_to_filament_email_log_table',
             ]);
 
         $this->app->register(EmailMessageServiceProvider::class);

src/Listeners/FilamentEmailLogger.php

@@ -49,6 +49,7 @@ public function handle(object $event): void
             ->put($savePathRaw, $rawMessage->getMessage()->toString());
 
         $model::create([
+            'team_id' => Filament::getTenant()?->id ?? null,
             'from' => $this->recipientsToString($email->getFrom()),
             'to' => $this->recipientsToString($email->getTo()),
             'cc' => $this->recipientsToString($email->getCc()),
@@ -59,7 +60,6 @@ public function handle(object $event): void
             'raw_body' => $savePathRaw,
             'sent_debug_info' => $rawMessage->getDebug(),
             'attachments' => ! empty($attachments) ? $attachments : null,
-            'tenant_id' => Filament::getTenant()?->id ?? auth()->id(),
         ]);
 
     }

src/Models/Email.php

@@ -2,11 +2,15 @@
 
 namespace RickDBCN\FilamentEmail\Models;
 
+use Filament\Facades\Filament;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Prunable;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Carbon;
+use Mpdf\Tag\B;
 
 /**
  * Email
@@ -41,9 +45,20 @@ class Email extends Model
         'attachments' => 'json',
     ];
 
-    public function team()
+    public function team(): BelongsTo
     {
-        return $this->hasOne(config('filament-email')['tenant_model'], 'id', 'tenant_id');
+        return $this->belongsTo(config('filament-email.tenant_model'), 'team_id', 'id');
+    }
+
+    protected static function booted(): void
+    {
+        static::addGlobalScope('teams', function (Builder $query) {
+            if (auth()->check() && Filament::getTenant()) {
+                $query->whereBelongsTo(auth()->user()?->teams);
+            } else {
+                $query->whereTeamId(null);
+            }
+        });
     }
 
     public static function boot()