Merge pull request #111 from canyongbs/cleanup/aidapp-87-permission-g…

…roups-feature [AIDAPP-87]: [Cleanup] permission-groups feature
canyongbs · Jun 5, 2024 · fea1baf · fea1baf
2 parents f383c99 + 5d7bf10
commit fea1baf
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 21 deletions.
diff --git a/app-modules/authorization/src/Filament/Resources/PermissionResource.php b/app-modules/authorization/src/Filament/Resources/PermissionResource.php
@@ -38,7 +38,6 @@
 
 use Filament\Forms\Form;
 use Filament\Tables\Table;
-use Laravel\Pennant\Feature;
 use Filament\Resources\Resource;
 use Filament\Tables\Actions\ViewAction;
 use Filament\Tables\Columns\TextColumn;
@@ -79,8 +78,7 @@ public static function table(Table $table): Table
             ->columns([
                 IdColumn::make(),
                 TextColumn::make('group.name')
-                    ->sortable()
-                    ->visible(Feature::active('permission-groups')),
+                    ->sortable(),
                 TextColumn::make('name')
                     ->searchable(),
                 TextColumn::make('guard_name')

diff --git a/...ation/src/Filament/Resources/RoleResource/RelationManagers/PermissionsRelationManager.php b/...ation/src/Filament/Resources/RoleResource/RelationManagers/PermissionsRelationManager.php
@@ -37,7 +37,6 @@
 namespace AidingApp\Authorization\Filament\Resources\RoleResource\RelationManagers;
 
 use Filament\Tables\Table;
-use Laravel\Pennant\Feature;
 use Filament\Facades\Filament;
 use Filament\Tables\Columns\TextColumn;
 use AidingApp\Authorization\Models\Role;
@@ -78,8 +77,7 @@ public function table(Table $table): Table
             ->columns([
                 IdColumn::make(),
                 TextColumn::make('group.name')
-                    ->sortable()
-                    ->visible(Feature::active('permission-groups')),
+                    ->sortable(),
                 TextColumn::make('name'),
             ])
             ->filters(
@@ -88,7 +86,6 @@ public function table(Table $table): Table
                         ->relationship('group', 'name')
                         ->searchable()
                         ->preload()
-                        ->visible(Feature::active('permission-groups'))
                         ->multiple(),
                 ]
             )

diff --git a/app-modules/task/src/Observers/TaskObserver.php b/app-modules/task/src/Observers/TaskObserver.php
@@ -38,7 +38,6 @@
 
 use Exception;
 use App\Models\User;
-use Laravel\Pennant\Feature;
 use AidingApp\Task\Models\Task;
 use Illuminate\Support\Facades\DB;
 use AidingApp\Authorization\Models\Permission;
@@ -69,11 +68,9 @@ public function creating(Task $task): void
     {
         Permission::create([
             'name' => "task.{$task->id}.update",
-            ...(Feature::active('permission-groups') ? [
-                'group_id' => PermissionGroup::query()
-                    ->where('name', 'Task')
-                    ->value('id'),
-            ] : []),
+            'group_id' => PermissionGroup::query()
+                ->where('name', 'Task')
+                ->value('id'),
             'guard_name' => 'web',
         ]);
     }

diff --git a/app/Filament/Resources/SystemUserResource/RelationManagers/PermissionsRelationManager.php b/app/Filament/Resources/SystemUserResource/RelationManagers/PermissionsRelationManager.php
@@ -39,7 +39,6 @@
 use Filament\Forms\Form;
 use App\Models\SystemUser;
 use Filament\Tables\Table;
-use Laravel\Pennant\Feature;
 use Filament\Forms\Components\Select;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Forms\Components\TextInput;
@@ -76,8 +75,7 @@ public function table(Table $table): Table
             ->columns([
                 IdColumn::make(),
                 TextColumn::make('group.name')
-                    ->sortable()
-                    ->visible(Feature::active('permission-groups')),
+                    ->sortable(),
                 TextColumn::make('name'),
             ])
             ->filters(
@@ -86,7 +84,6 @@ public function table(Table $table): Table
                         ->relationship('group', 'name')
                         ->searchable()
                         ->preload()
-                        ->visible(Feature::active('permission-groups'))
                         ->multiple(),
                 ]
             )

diff --git a/app/Filament/Resources/UserResource/RelationManagers/PermissionsRelationManager.php b/app/Filament/Resources/UserResource/RelationManagers/PermissionsRelationManager.php
@@ -38,7 +38,6 @@
 
 use Filament\Forms\Form;
 use Filament\Tables\Table;
-use Laravel\Pennant\Feature;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Forms\Components\TextInput;
 use App\Filament\Tables\Columns\IdColumn;
@@ -70,8 +69,7 @@ public function table(Table $table): Table
             ->columns([
                 IdColumn::make(),
                 TextColumn::make('group.name')
-                    ->sortable()
-                    ->visible(Feature::active('permission-groups')),
+                    ->sortable(),
                 TextColumn::make('name'),
                 TextColumn::make('guard_name'),
             ])
@@ -81,7 +79,6 @@ public function table(Table $table): Table
                         ->relationship('group', 'name')
                         ->searchable()
                         ->preload()
-                        ->visible(Feature::active('permission-groups'))
                         ->multiple(),
                 ]
             )

diff --git a/database/migrations/2024_06_05_151320_data_purge_permission_groups_feature_flag.php b/database/migrations/2024_06_05_151320_data_purge_permission_groups_feature_flag.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+<COPYRIGHT>
+
+    Copyright © 2016-2024, Canyon GBS LLC. All rights reserved.
+
+    Aiding App™ is licensed under the Elastic License 2.0. For more details,
+    see <https://github.com/canyongbs/aidingapp/blob/main/LICENSE.>
+
+    Notice:
+
+    - You may not provide the software to third parties as a hosted or managed
+      service, where the service provides users with access to any substantial set of
+      the features or functionality of the software.
+    - You may not move, change, disable, or circumvent the license key functionality
+      in the software, and you may not remove or obscure any functionality in the
+      software that is protected by the license key.
+    - You may not alter, remove, or obscure any licensing, copyright, or other notices
+      of the licensor in the software. Any use of the licensor’s trademarks is subject
+      to applicable law.
+    - Canyon GBS LLC respects the intellectual property rights of others and expects the
+      same in return. Canyon GBS™ and Aiding App™ are registered trademarks of
+      Canyon GBS LLC, and we are committed to enforcing and protecting our trademarks
+      vigorously.
+    - The software solution, including services, infrastructure, and code, is offered as a
+      Software as a Service (SaaS) by Canyon GBS LLC.
+    - Use of this software implies agreement to the license terms and conditions as stated
+      in the Elastic License 2.0.
+
+    For more information or inquiries please visit our website at
+    <https://www.canyongbs.com> or contact us via email at legal@canyongbs.com.
+
+</COPYRIGHT>
+*/
+
+use Laravel\Pennant\Feature;
+use Illuminate\Database\Migrations\Migration;
+
+return new class () extends Migration {
+    public function up(): void
+    {
+        Feature::purge('permission-groups');
+    }
+
+    public function down(): void
+    {
+        Feature::activate('permission-groups');
+    }
+};