[AIDAPP-374]: Refactor all product administration permissions to a single permission

app-modules/authorization/src/Filament/Resources/PermissionResource.php

@@ -42,7 +42,6 @@
 use Filament\Tables\Actions\ViewAction;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Forms\Components\TextInput;
-use App\Filament\Clusters\UserManagement;
 use App\Filament\Tables\Columns\IdColumn;
 use AidingApp\Authorization\Models\Permission;
 use AidingApp\Authorization\Filament\Resources\PermissionResource\Pages\ViewPermission;
@@ -53,9 +52,7 @@ class PermissionResource extends Resource
 {
     protected static ?string $model = Permission::class;
 
-    protected static ?string $navigationIcon = 'heroicon-o-key';
-
-    protected static ?string $cluster = UserManagement::class;
+    protected static ?string $navigationGroup = 'People Administration';
 
     protected static ?int $navigationSort = 40;
 

app-modules/authorization/src/Filament/Resources/RoleResource.php

@@ -38,7 +38,6 @@
 
 use Filament\Resources\Resource;
 use AidingApp\Authorization\Models\Role;
-use App\Filament\Clusters\UserManagement;
 use Illuminate\Database\Eloquent\Builder;
 use AidingApp\Authorization\Filament\Resources\RoleResource\Pages\EditRole;
 use AidingApp\Authorization\Filament\Resources\RoleResource\Pages\ViewRole;
@@ -50,9 +49,7 @@ class RoleResource extends Resource
 {
     protected static ?string $model = Role::class;
 
-    protected static ?string $navigationIcon = 'heroicon-o-shield-check';
-
-    protected static ?string $cluster = UserManagement::class;
+    protected static ?string $navigationGroup = 'People Administration';
 
     protected static ?int $navigationSort = 30;
 

app-modules/contact/src/Policies/ContactSourcePolicy.php

@@ -55,55 +55,55 @@ public function before(Authenticatable $authenticatable): ?Response
     public function viewAny(Authenticatable $authenticatable): Response
     {
         return $authenticatable->canOrElse(
-            abilities: 'contact_source.view-any',
+            abilities: 'product_admin.view-any',
             denyResponse: 'You do not have permission to view contact sources.'
         );
     }
 
     public function view(Authenticatable $authenticatable, ContactSource $contactSource): Response
     {
         return $authenticatable->canOrElse(
-            abilities: ['contact_source.*.view', "contact_source.{$contactSource->id}.view"],
+            abilities: ["product_admin.{$contactSource->getKey()}.view"],
             denyResponse: 'You do not have permission to view this contact source.'
         );
     }
 
     public function create(Authenticatable $authenticatable): Response
     {
         return $authenticatable->canOrElse(
-            abilities: 'contact_source.create',
+            abilities: 'product_admin.create',
             denyResponse: 'You do not have permission to create contact sources.'
         );
     }
 
     public function update(Authenticatable $authenticatable, ContactSource $contactSource): Response
     {
         return $authenticatable->canOrElse(
-            abilities: ['contact_source.*.update', "contact_source.{$contactSource->id}.update"],
+            abilities: ["product_admin.{$contactSource->getKey()}.update"],
             denyResponse: 'You do not have permission to update this contact source.'
         );
     }
 
     public function delete(Authenticatable $authenticatable, ContactSource $contactSource): Response
     {
         return $authenticatable->canOrElse(
-            abilities: ['contact_source.*.delete', "contact_source.{$contactSource->id}.delete"],
+            abilities: ["product_admin.{$contactSource->getKey()}.delete"],
             denyResponse: 'You do not have permission to delete this contact source.'
         );
     }
 
     public function restore(Authenticatable $authenticatable, ContactSource $contactSource): Response
     {
         return $authenticatable->canOrElse(
-            abilities: ['contact_source.*.restore', "contact_source.{$contactSource->id}.restore"],
+            abilities: ["product_admin.{$contactSource->getKey()}.restore"],
             denyResponse: 'You do not have permission to restore this contact source.'
         );
     }
 
     public function forceDelete(Authenticatable $authenticatable, ContactSource $contactSource): Response
     {
         return $authenticatable->canOrElse(
-            abilities: ['contact_source.*.force-delete', "contact_source.{$contactSource->id}.force-delete"],
+            abilities: ["product_admin.{$contactSource->getKey()}.force-delete"],
             denyResponse: 'You do not have permission to force delete this contact source.'
         );
     }

app-modules/contact/src/Policies/ContactStatusPolicy.php

@@ -55,55 +55,55 @@ public function before(Authenticatable $authenticatable): ?Response
     public function viewAny(Authenticatable $authenticatable): Response
     {
         return $authenticatable->canOrElse(
-            abilities: 'contact_status.view-any',
+            abilities: 'product_admin.view-any',
             denyResponse: 'You do not have permission to view contact statuses.'
         );
     }
 
     public function view(Authenticatable $authenticatable, ContactStatus $contactStatus): Response
     {
         return $authenticatable->canOrElse(
-            abilities: ['contact_status.*.view', "contact_status.{$contactStatus->id}.view"],
+            abilities: ["product_admin.{$contactStatus->getKey()}.view"],
             denyResponse: 'You do not have permission to view contact statuses.'
         );
     }
 
     public function create(Authenticatable $authenticatable): Response
     {
         return $authenticatable->canOrElse(
-            abilities: 'contact_status.create',
+            abilities: 'product_admin.create',
             denyResponse: 'You do not have permission to create contact statuses.'
         );
     }
 
     public function update(Authenticatable $authenticatable, ContactStatus $contactStatus): Response
     {
         return $authenticatable->canOrElse(
-            abilities: ['contact_status.*.update', "contact_status.{$contactStatus->id}.update"],
+            abilities: ["product_admin.{$contactStatus->getKey()}.update"],
             denyResponse: 'You do not have permission to update contact statuses.'
         );
     }
 
     public function delete(Authenticatable $authenticatable, ContactStatus $contactStatus): Response
     {
         return $authenticatable->canOrElse(
-            abilities: ['contact_status.*.delete', "contact_status.{$contactStatus->id}.delete"],
+            abilities: ["product_admin.{$contactStatus->getKey()}.delete"],
             denyResponse: 'You do not have permission to delete contact statuses.'
         );
     }
 
     public function restore(Authenticatable $authenticatable, ContactStatus $contactStatus): Response
     {
         return $authenticatable->canOrElse(
-            abilities: ['contact_status.*.restore', "contact_status.{$contactStatus->id}.restore"],
+            abilities: ["product_admin.{$contactStatus->getKey()}.restore"],
             denyResponse: 'You do not have permission to restore contact statuses.'
         );
     }
 
     public function forceDelete(Authenticatable $authenticatable, ContactStatus $contactStatus): Response
     {
         return $authenticatable->canOrElse(
-            abilities: ['contact_status.*.force-delete', "contact_status.{$contactStatus->id}.force-delete"],
+            abilities: ["product_admin.{$contactStatus->getKey()}.force-delete"],
             denyResponse: 'You do not have permission to force delete contact statuses.'
         );
     }

app-modules/contact/src/Policies/OrganizationIndustryPolicy.php

@@ -55,55 +55,55 @@ public function before(Authenticatable $authenticatable): ?Response
     public function viewAny(Authenticatable $authenticatable): Response
     {
         return $authenticatable->canOrElse(
-            abilities: 'organization_industry.view-any',
+            abilities: 'product_admin.view-any',
             denyResponse: 'You do not have permission to view organization industries.'
         );
     }
 
     public function view(Authenticatable $authenticatable, OrganizationIndustry $organizationIndustry): Response
     {
         return $authenticatable->canOrElse(
-            abilities: ['organization_industry.*.view', "organization_industry.{ {$organizationIndustry->id}}.view"],
-            denyResponse: 'You do not have permission to view this organization industries.'
+            abilities: ["product_admin.{$organizationIndustry->getKey()}.view"],
+            denyResponse: 'You do not have permission to view this organization industry.'
         );
     }
 
     public function create(Authenticatable $authenticatable): Response
     {
         return $authenticatable->canOrElse(
-            abilities: 'organization_industry.create',
+            abilities: 'product_admin.create',
             denyResponse: 'You do not have permission to create organization industries.'
         );
     }
 
     public function update(Authenticatable $authenticatable, OrganizationIndustry $organizationIndustry): Response
     {
         return $authenticatable->canOrElse(
-            abilities: ['organization_industry.*.update', "organization_industry.{ {$organizationIndustry->id}}.update"],
+            abilities: ["product_admin.{$organizationIndustry->getKey()}.update"],
             denyResponse: 'You do not have permission to update this organization industry.'
         );
     }
 
     public function delete(Authenticatable $authenticatable, OrganizationIndustry $organizationIndustry): Response
     {
         return $authenticatable->canOrElse(
-            abilities: ['organization_industry.*.delete', "organization_industry.{ {$organizationIndustry->id}}.delete"],
+            abilities: ["product_admin.{$organizationIndustry->getKey()}.delete"],
             denyResponse: 'You do not have permission to delete this organization industry.'
         );
     }
 
     public function restore(Authenticatable $authenticatable, OrganizationIndustry $organizationIndustry): Response
     {
         return $authenticatable->canOrElse(
-            abilities: ['organization_industry.*.restore', "organization_industry.{ {$organizationIndustry->id}}.restore"],
+            abilities: ["product_admin.{$organizationIndustry->getKey()}.restore"],
             denyResponse: 'You do not have permission to restore this organization industry.'
         );
     }
 
     public function forceDelete(Authenticatable $authenticatable, OrganizationIndustry $organizationIndustry): Response
     {
         return $authenticatable->canOrElse(
-            abilities: ['organization_industry.*.force-delete', "organization_industry.{ {$organizationIndustry->id}}.force-delete"],
+            abilities: ["product_admin.{$organizationIndustry->getKey()}.force-delete"],
             denyResponse: 'You do not have permission to force delete this organization industry.'
         );
     }

app-modules/contact/src/Policies/OrganizationTypePolicy.php

@@ -55,55 +55,55 @@ public function before(Authenticatable $authenticatable): ?Response
     public function viewAny(Authenticatable $authenticatable): Response
     {
         return $authenticatable->canOrElse(
-            abilities: 'organization_type.view-any',
+            abilities: 'product_admin.view-any',
             denyResponse: 'You do not have permission to view organization types.'
         );
     }
 
     public function view(Authenticatable $authenticatable, OrganizationType $organizationType): Response
     {
         return $authenticatable->canOrElse(
-            abilities: ['organization_type.*.view', "organization_type.{$organizationType->id}.view"],
+            abilities: ["product_admin.{$organizationType->getKey()}.view"],
             denyResponse: 'You do not have permission to view this organization types.'
         );
     }
 
     public function create(Authenticatable $authenticatable): Response
     {
         return $authenticatable->canOrElse(
-            abilities: 'organization_type.create',
+            abilities: 'product_admin.create',
             denyResponse: 'You do not have permission to create organization types.'
         );
     }
 
     public function update(Authenticatable $authenticatable, OrganizationType $organizationType): Response
     {
         return $authenticatable->canOrElse(
-            abilities: ['organization_type.*.update', "organization_type.{$organizationType->id}.update"],
+            abilities: ["product_admin.{$organizationType->getKey()}.update"],
             denyResponse: 'You do not have permission to update this organization type.'
         );
     }
 
     public function delete(Authenticatable $authenticatable, OrganizationType $organizationType): Response
     {
         return $authenticatable->canOrElse(
-            abilities: ['organization_type.*.delete', "organization_type.{$organizationType->id}.delete"],
+            abilities: ["product_admin.{$organizationType->getKey()}.delete"],
             denyResponse: 'You do not have permission to delete this organization type.'
         );
     }
 
     public function restore(Authenticatable $authenticatable, OrganizationType $organizationType): Response
     {
         return $authenticatable->canOrElse(
-            abilities: ['organization_type.*.restore', "organization_type.{$organizationType->id}.restore"],
+            abilities: ["product_admin.{$organizationType->getKey()}.restore"],
             denyResponse: 'You do not have permission to restore this organization type.'
         );
     }
 
     public function forceDelete(Authenticatable $authenticatable, OrganizationType $organizationType): Response
     {
         return $authenticatable->canOrElse(
-            abilities: ['organization_type.*.force-delete', "organization_type.{$organizationType->id}.force-delete"],
+            abilities: ["product_admin.{$organizationType->getKey()}.force-delete"],
             denyResponse: 'You do not have permission to force delete this organization type.'
         );
     }

app-modules/contact/tests/ContactSource/CreateContactSourceTest.php

@@ -98,8 +98,8 @@
     livewire(ContactSourceResource\Pages\CreateContactSource::class)
         ->assertForbidden();
 
-    $user->givePermissionTo('contact_source.view-any');
-    $user->givePermissionTo('contact_source.create');
+    $user->givePermissionTo('product_admin.view-any');
+    $user->givePermissionTo('product_admin.create');
 
     actingAs($user)
         ->get(

app-modules/contact/tests/ContactSource/EditContactSourceTest.php

@@ -117,8 +117,8 @@
     ])
         ->assertForbidden();
 
-    $user->givePermissionTo('contact_source.view-any');
-    $user->givePermissionTo('contact_source.*.update');
+    $user->givePermissionTo('product_admin.view-any');
+    $user->givePermissionTo('product_admin.*.update');
 
     actingAs($user)
         ->get(

app-modules/contact/tests/ContactSource/ListContactSourcesTest.php

@@ -90,7 +90,7 @@
             ContactSourceResource::getUrl('index')
         )->assertForbidden();
 
-    $user->givePermissionTo('contact_source.view-any');
+    $user->givePermissionTo('product_admin.view-any');
 
     actingAs($user)
         ->get(

app-modules/contact/tests/ContactSource/ViewContactSourceTest.php

@@ -75,8 +75,8 @@
             ])
         )->assertForbidden();
 
-    $user->givePermissionTo('contact_source.view-any');
-    $user->givePermissionTo('contact_source.*.view');
+    $user->givePermissionTo('product_admin.view-any');
+    $user->givePermissionTo('product_admin.*.view');
 
     actingAs($user)
         ->get(

app-modules/contact/tests/ContactStatus/CreateContactStatusTest.php

@@ -101,8 +101,8 @@
     livewire(ContactStatusResource\Pages\CreateContactStatus::class)
         ->assertForbidden();
 
-    $user->givePermissionTo('contact_status.view-any');
-    $user->givePermissionTo('contact_status.create');
+    $user->givePermissionTo('product_admin.view-any');
+    $user->givePermissionTo('product_admin.create');
 
     actingAs($user)
         ->get(

app-modules/contact/tests/ContactStatus/EditContactStatusTest.php

@@ -126,8 +126,8 @@
     ])
         ->assertForbidden();
 
-    $user->givePermissionTo('contact_status.view-any');
-    $user->givePermissionTo('contact_status.*.update');
+    $user->givePermissionTo('product_admin.view-any');
+    $user->givePermissionTo('product_admin.*.update');
 
     actingAs($user)
         ->get(

app-modules/contact/tests/ContactStatus/ListContactStatusesTest.php

@@ -100,7 +100,7 @@
             ContactStatusResource::getUrl('index')
         )->assertForbidden();
 
-    $user->givePermissionTo('contact_status.view-any');
+    $user->givePermissionTo('product_admin.view-any');
 
     actingAs($user)
         ->get(

app-modules/contact/tests/ContactStatus/ViewContactStatusTest.php

@@ -79,8 +79,8 @@
             ])
         )->assertForbidden();
 
-    $user->givePermissionTo('contact_status.view-any');
-    $user->givePermissionTo('contact_status.*.view');
+    $user->givePermissionTo('product_admin.view-any');
+    $user->givePermissionTo('product_admin.*.view');
 
     actingAs($user)
         ->get(

app-modules/contact/tests/OrganizationIndustry/CreateOrganizationIndustryTest.php

@@ -60,8 +60,8 @@
     livewire(CreateOrganizationIndustry::class)
         ->assertForbidden();
 
-    $user->givePermissionTo('organization_industry.view-any');
-    $user->givePermissionTo('organization_industry.create');
+    $user->givePermissionTo('product_admin.view-any');
+    $user->givePermissionTo('product_admin.create');
 
     actingAs($user)
         ->get(
@@ -71,8 +71,8 @@
 test('Create New Organization Industry', function () {
     $user = User::factory()->licensed(Contact::getLicenseType())->create();
 
-    $user->givePermissionTo('organization_industry.view-any');
-    $user->givePermissionTo('organization_industry.create');
+    $user->givePermissionTo('product_admin.view-any');
+    $user->givePermissionTo('product_admin.create');
 
     actingAs($user);