From a275081a70ee46e04bd18eb48c8f852b4786eac3 Mon Sep 17 00:00:00 2001 From: "Marco A. Nina Mena" Date: Wed, 6 May 2026 15:19:06 -0400 Subject: [PATCH 1/7] Add migration to create permissions for task tabs --- ..._05_04_191751_add_permissions_tab_task.php | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 database/migrations/2026_05_04_191751_add_permissions_tab_task.php diff --git a/database/migrations/2026_05_04_191751_add_permissions_tab_task.php b/database/migrations/2026_05_04_191751_add_permissions_tab_task.php new file mode 100644 index 0000000000..c30dc8262d --- /dev/null +++ b/database/migrations/2026_05_04_191751_add_permissions_tab_task.php @@ -0,0 +1,36 @@ + 'Task tabs', + 'title' => $permission[0], + 'name' => $permission[1], + ]); + } + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Permission::where('group', 'Task tabs')->delete(); + } +}; From 491003264cbce0c9a9a3fb72f47779d394988697 Mon Sep 17 00:00:00 2001 From: "Marco A. Nina Mena" Date: Wed, 6 May 2026 16:16:42 -0400 Subject: [PATCH 2/7] Implement conditional rendering for task tabs based on user permissions --- resources/views/requests/show.blade.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/resources/views/requests/show.blade.php b/resources/views/requests/show.blade.php index 8b9510af97..abf15173b2 100644 --- a/resources/views/requests/show.blade.php +++ b/resources/views/requests/show.blade.php @@ -42,12 +42,15 @@ @click="switchTab('pending')" href="#pending" role="tab" aria-controls="pending" aria-selected="true">{{ __('Tasks') }} + @can('overview-tab-task')
  • {{ __('Overview') }}
    • + @endcan + @can('summary-tab-task')
    • + @endcan @if ($request->status === 'COMPLETED' && !$request->errors) @can('editData', $request)
  • @@ -65,11 +69,13 @@
    • @endcan @endif + @can('completed-tab-task')
  • {{ __('Completed') }}
    • + @endcan @if (count($files) > 0 && !hasPackage('package-files'))
  • + @can('form-tab-task')
  • {{ __('Forms') }}
    • + @endcan @isset($addons) @foreach ($addons as $addon) @if (!empty($addon['title']))
  • @@ -487,8 +495,10 @@ class="btn btn-outline-info btn-block" @endforeach @if (hasPackage('package-files')) - - + @can('file-tab-task') + + + @endif @endif diff --git a/resources/views/cases/edit.blade.php b/resources/views/cases/edit.blade.php index 767a6cddc5..d340a35dd8 100644 --- a/resources/views/cases/edit.blade.php +++ b/resources/views/cases/edit.blade.php @@ -19,14 +19,26 @@ @endsection +@php + $permissions = [ + 'overviewTabTask' => Auth::user()->can('overview-tab-task'), + 'summaryTabTask' => Auth::user()->can('summary-tab-task'), + 'completedTabTask' => Auth::user()->can('completed-tab-task'), + 'formTabTask' => Auth::user()->can('form-tab-task'), + 'filesTabTask' => Auth::user()->can('files-tab-task'), + ]; +@endphp + @section('content')
    - + Date: Thu, 7 May 2026 10:08:45 -0400 Subject: [PATCH 4/7] Add additional permissions to UserObserver for task tabs Updated UserObserver to include new permissions: overview-tab-task, summary-tab-task, completed-tab-task, form-tab-task, and files-tab-task. --- ProcessMaker/Observers/UserObserver.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ProcessMaker/Observers/UserObserver.php b/ProcessMaker/Observers/UserObserver.php index d8e45ef942..39fcfe1f4f 100644 --- a/ProcessMaker/Observers/UserObserver.php +++ b/ProcessMaker/Observers/UserObserver.php @@ -38,6 +38,11 @@ public function created(User $user): void $perList = [ 'view-process-catalog', 'view-my_requests', + 'overview-tab-task', + 'summary-tab-task', + 'completed-tab-task', + 'form-tab-task', + 'files-tab-task', ]; $permissionIds = Permission::whereIn('name', $perList)->pluck('id')->toArray(); $user->permissions()->attach($permissionIds); From 1997f43c91c8c8d24ca2876095c717294cbfefbb Mon Sep 17 00:00:00 2001 From: "Marco A. Nina Mena" Date: Thu, 7 May 2026 15:08:58 -0400 Subject: [PATCH 5/7] Add migration to assign tab task permissions to non-administrator users and corresponding tests This commit introduces a new migration that assigns specific tab task permissions to non-administrator users and includes a rollback method to remove these permissions. Additionally, it adds a test suite to verify the correct assignment and removal of permissions during migration operations. --- ...2346_add_permissions_tab_task_to_users.php | 82 ++++++++++++++++++ .../AddPermissionsTabTaskToUsersTest.php | 86 +++++++++++++++++++ 2 files changed, 168 insertions(+) create mode 100644 database/migrations/2026_05_07_142346_add_permissions_tab_task_to_users.php create mode 100644 tests/Feature/Migrations/AddPermissionsTabTaskToUsersTest.php diff --git a/database/migrations/2026_05_07_142346_add_permissions_tab_task_to_users.php b/database/migrations/2026_05_07_142346_add_permissions_tab_task_to_users.php new file mode 100644 index 0000000000..1174327d8b --- /dev/null +++ b/database/migrations/2026_05_07_142346_add_permissions_tab_task_to_users.php @@ -0,0 +1,82 @@ +whereIn('name', self::TAB_TASK_PERMISSIONS) + ->pluck('id', 'name') + ->values(); + + foreach ($permissionIds as $permissionId) { + $this->assignPermissionToUsers((int) $permissionId); + } + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + $permissionIds = DB::table('permissions') + ->whereIn('name', self::TAB_TASK_PERMISSIONS) + ->pluck('id', 'name') + ->values(); + + DB::table('assignables') + ->whereIn('permission_id', $permissionIds) + ->where('assignable_type', User::class) + ->delete(); + } + + private function assignPermissionToUsers(int $permissionId): void + { + $lastUserId = 0; + + do { + $users = DB::table('users AS u') + ->leftJoin('assignables AS a', function ($join) use ($permissionId) { + $join->on('u.id', '=', 'a.assignable_id') + ->where('a.assignable_type', User::class) + ->where('a.permission_id', $permissionId); + }) + ->whereNull('a.permission_id') + ->where('u.id', '>', $lastUserId) + ->where('u.is_administrator', false) + ->select('u.id') + ->orderBy('u.id') + ->limit(self::CHUNK_SIZE) + ->get(); + + if ($users->isEmpty()) { + return; + } + + $records = $users->map(fn ($user) => [ + 'permission_id' => $permissionId, + 'assignable_id' => $user->id, + 'assignable_type' => User::class, + ])->all(); + + DB::table('assignables')->insert($records); + $lastUserId = $users->last()->id; + } while ($users->count() === self::CHUNK_SIZE); + } +}; diff --git a/tests/Feature/Migrations/AddPermissionsTabTaskToUsersTest.php b/tests/Feature/Migrations/AddPermissionsTabTaskToUsersTest.php new file mode 100644 index 0000000000..7e70f1505e --- /dev/null +++ b/tests/Feature/Migrations/AddPermissionsTabTaskToUsersTest.php @@ -0,0 +1,86 @@ +run(); + + [$existingUser, $newUser, $adminUser] = User::withoutEvents(fn () => [ + User::factory()->create(['is_administrator' => false]), + User::factory()->create(['is_administrator' => false]), + User::factory()->admin()->create(), + ]); + + $existingPermission = Permission::byName('overview-tab-task'); + $existingUser->permissions()->attach($existingPermission->id); + + $this->migration()->up(); + + $this->assertSame($this->tabTaskPermissionIds()->count(), $this->tabTaskPermissionCount($existingUser)); + $this->assertSame($this->tabTaskPermissionIds()->count(), $this->tabTaskPermissionCount($newUser)); + $this->assertSame(0, $this->tabTaskPermissionCount($adminUser)); + $this->assertSame(1, $this->userPermissionCount($existingUser, $existingPermission)); + } + + public function testItRemovesTabTaskPermissionAssignmentsOnRollback(): void + { + (new PermissionSeeder)->run(); + + $user = User::withoutEvents(fn () => User::factory()->create(['is_administrator' => false])); + + $migration = $this->migration(); + $migration->up(); + $migration->down(); + + $this->assertSame(0, $this->tabTaskPermissionCount($user)); + } + + private function migration() + { + return include base_path(self::MIGRATION_PATH); + } + + private function tabTaskPermissionCount(User $user): int + { + return DB::table('assignables') + ->where('assignable_id', $user->id) + ->where('assignable_type', User::class) + ->whereIn('permission_id', $this->tabTaskPermissionIds()) + ->count(); + } + + private function userPermissionCount(User $user, Permission $permission): int + { + return DB::table('assignables') + ->where('assignable_id', $user->id) + ->where('assignable_type', User::class) + ->where('permission_id', $permission->id) + ->count(); + } + + private function tabTaskPermissionIds() + { + return Permission::whereIn('name', self::TAB_TASK_PERMISSIONS) + ->pluck('id', 'name') + ->values(); + } +} From 898ea58c916a0ab48655db408c91e62fb8d59454 Mon Sep 17 00:00:00 2001 From: "Marco A. Nina Mena" Date: Fri, 8 May 2026 09:01:58 -0400 Subject: [PATCH 6/7] Fix test permissions --- .../ProcessMaker/Repositories/PermissionRepositoryTest.php | 2 ++ .../ProcessMaker/Services/PermissionServiceManagerTest.php | 3 +++ 2 files changed, 5 insertions(+) diff --git a/tests/unit/ProcessMaker/Repositories/PermissionRepositoryTest.php b/tests/unit/ProcessMaker/Repositories/PermissionRepositoryTest.php index a5fd5b97ca..7bb19884bc 100644 --- a/tests/unit/ProcessMaker/Repositories/PermissionRepositoryTest.php +++ b/tests/unit/ProcessMaker/Repositories/PermissionRepositoryTest.php @@ -48,6 +48,8 @@ protected function setUp(): void // Create test user $this->user = User::factory()->create(['username' => 'testuser']); + // remove all permissions from user + $this->user->permissions()->detach(); } /** diff --git a/tests/unit/ProcessMaker/Services/PermissionServiceManagerTest.php b/tests/unit/ProcessMaker/Services/PermissionServiceManagerTest.php index 6672078ef0..d0dff0ece8 100644 --- a/tests/unit/ProcessMaker/Services/PermissionServiceManagerTest.php +++ b/tests/unit/ProcessMaker/Services/PermissionServiceManagerTest.php @@ -34,6 +34,9 @@ protected function setUp(): void $this->group = Group::factory()->create(['name' => 'Test Group']); $this->user = User::factory()->create(['username' => 'testuser']); + // remove all permissions from user + $this->user->permissions()->detach(); + // Clear cache Cache::flush(); } From 2dd8c430f16ba796ea781d24167ff500d4fb8d82 Mon Sep 17 00:00:00 2001 From: "Marco A. Nina Mena" Date: Tue, 19 May 2026 09:17:10 -0400 Subject: [PATCH 7/7] fix permission nambe --- resources/views/requests/show.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/requests/show.blade.php b/resources/views/requests/show.blade.php index abf15173b2..3612a4127d 100644 --- a/resources/views/requests/show.blade.php +++ b/resources/views/requests/show.blade.php @@ -495,7 +495,7 @@ class="btn btn-outline-info btn-block" @endforeach @if (hasPackage('package-files')) - @can('file-tab-task') + @can('files-tab-task') @endif