adds the ability to use the config for teams foreign key feature when…

… enabled
bezhanSalleh · Nov 10, 2024 · 8de271b · 8de271b
1 parent 38be833
commit 8de271b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/src/Commands/SuperAdminCommand.php b/src/Commands/SuperAdminCommand.php
@@ -92,7 +92,7 @@ public function handle(): int
                 return self::FAILURE;
             }
             setPermissionsTeamId($tenantId);
-            $this->superAdminRole = FilamentShield::createRole(team_id: $tenantId);
+            $this->superAdminRole = FilamentShield::createRole(tenantId: $tenantId);
             $this->superAdminRole->syncPermissions(Utils::getPermissionModel()::pluck('id'));
 
         } else {

diff --git a/src/FilamentShield.php b/src/FilamentShield.php
@@ -106,13 +106,13 @@ protected static function giveSuperAdminPermission(string | array | Collection $
         }
     }
 
-    public static function createRole(?string $name = null, ?int $team_id = null): Role
+    public static function createRole(?string $name = null, ?int $tenantId = null): Role
     {
         if (Utils::isTeamFeatureEnabled()) {
             return Utils::getRoleModel()::firstOrCreate(
                 [
                     'name' => $name ?? Utils::getSuperAdminName(),
-                    config('permission.column_names.team_foreign_key') => $team_id,
+                    Utils::getTenantModelForeignKey() => $tenantId,
                 ],
                 ['guard_name' => Utils::getFilamentAuthGuard()]
             );

diff --git a/src/Resources/RoleResource/Pages/CreateRole.php b/src/Resources/RoleResource/Pages/CreateRole.php
@@ -18,14 +18,14 @@ protected function mutateFormDataBeforeCreate(array $data): array
     {
         $this->permissions = collect($data)
             ->filter(function ($permission, $key) {
-                return ! in_array($key, ['name', 'guard_name', 'select_all', 'team_id']);
+                return ! in_array($key, ['name', 'guard_name', 'select_all', Utils::getTenantModelForeignKey()]);
             })
             ->values()
             ->flatten()
             ->unique();
 
-        if (Arr::has($data, 'team_id')) {
-            return Arr::only($data, ['name', 'guard_name', 'team_id']);
+        if (Arr::has($data, Utils::getTenantModelForeignKey())) {
+            return Arr::only($data, ['name', 'guard_name', Utils::getTenantModelForeignKey()]);
         }
 
         return Arr::only($data, ['name', 'guard_name']);

diff --git a/src/Resources/RoleResource/Pages/EditRole.php b/src/Resources/RoleResource/Pages/EditRole.php
@@ -26,14 +26,14 @@ protected function mutateFormDataBeforeSave(array $data): array
     {
         $this->permissions = collect($data)
             ->filter(function ($permission, $key) {
-                return ! in_array($key, ['name', 'guard_name', 'select_all', 'team_id']);
+                return ! in_array($key, ['name', 'guard_name', 'select_all', Utils::getTenantModelForeignKey()]);
             })
             ->values()
             ->flatten()
             ->unique();
 
-        if (Arr::has($data, 'team_id')) {
-            return Arr::only($data, ['name', 'guard_name', 'team_id']);
+        if (Arr::has($data, Utils::getTenantModelForeignKey())) {
+            return Arr::only($data, ['name', 'guard_name', Utils::getTenantModelForeignKey()]);
         }
 
         return Arr::only($data, ['name', 'guard_name']);

diff --git a/src/Support/Utils.php b/src/Support/Utils.php
@@ -271,4 +271,9 @@ public static function getTenantModel(): ?string
     {
         return config()->get('filament-shield.tenant_model', null);
     }
+
+    public static function getTenantModelForeignKey(): string
+    {
+        return config()->get('permission.column_names.team_foreign_key', 'team_id');
+    }
 }