From 9d5395d02a3e5bf26c56dfed94fb6ff1c5214be8 Mon Sep 17 00:00:00 2001
From: Paula Quispe <paula.quispe@processmaker.com>
Date: Fri, 22 Nov 2024 09:26:38 -0400
Subject: [PATCH 1/3] FOUR-20443

---
 .../RenameRequestsToCasesPermissionSeeder.php | 25 --------
 ...permission_view_all_cases_all_requests.php | 64 +++++++++++++++++++
 2 files changed, 64 insertions(+), 25 deletions(-)
 delete mode 100644 database/seeders/RenameRequestsToCasesPermissionSeeder.php
 create mode 100644 upgrades/2024_11_19_161132_create_permission_view_all_cases_all_requests.php

diff --git a/database/seeders/RenameRequestsToCasesPermissionSeeder.php b/database/seeders/RenameRequestsToCasesPermissionSeeder.php
deleted file mode 100644
index 2b2429ee2d..0000000000
--- a/database/seeders/RenameRequestsToCasesPermissionSeeder.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Database\Seeders;
-
-use Illuminate\Database\Seeder;
-use Illuminate\Support\Facades\DB;
-use ProcessMaker\Models\Permission;
-
-class RenameRequestsToCasesPermissionSeeder extends Seeder
-{
-    public function run()
-    {
-        // Update the group Request by Cases
-        DB::table('permissions')
-            ->where('group', 'Requests')
-            ->update(['group' => 'Cases']);
-        // Update the title of group
-        $permission = Permission::where('name', 'view-all_requests')->first();
-
-        if ($permission) {
-            $permission->title = 'View All Cases';
-            $permission->save();
-        }
-    }
-}
diff --git a/upgrades/2024_11_19_161132_create_permission_view_all_cases_all_requests.php b/upgrades/2024_11_19_161132_create_permission_view_all_cases_all_requests.php
new file mode 100644
index 0000000000..af6f196bf0
--- /dev/null
+++ b/upgrades/2024_11_19_161132_create_permission_view_all_cases_all_requests.php
@@ -0,0 +1,64 @@
+<?php
+
+use ProcessMaker\Models\Permission;
+use ProcessMaker\Upgrades\UpgradeMigration as Upgrade;
+
+class CreatePermissionViewAllCasesAllRequests extends Upgrade
+{
+    private const NEW_NAME_GROUP = 'Cases and Requests';
+
+    private const PERMISSIONS = [
+        [
+            'name' => 'view-all_cases',
+            'title' => 'View All Cases',
+        ],
+        [
+            'name' => 'view-my_requests',
+            'title' => 'View My Requests',
+        ],
+    ];
+
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // Update the group Requests to Cases and Requests
+        DB::table('permissions')
+            ->where('group', 'Requests')
+            ->update(['group' => self::NEW_NAME_GROUP]);
+        // Update the group Cases to Cases and Requests
+        DB::table('permissions')
+            ->where('group', 'Cases')
+            ->update(['group' => self::NEW_NAME_GROUP]);
+        // Create new permissions view-all_cases view-all_requests
+        $this->createPermissions();
+    }
+
+    /**
+     * Create new permissions
+     *
+     * @return void
+     */
+    private function createPermissions(): void
+    {
+        foreach (self::PERMISSIONS as $permission) {
+            Permission::updateOrCreate([
+                'name' => $permission['name'],
+            ], [
+                'title' => $permission['title'],
+                'name' => $permission['name'],
+                'group' => self::NEW_NAME_GROUP,
+            ]);
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Permission::where('name', 'view-all_cases')->delete();
+        Permission::where('name', 'view-my_requests')->delete();
+    }
+}

From 7339f2b5d43f0858844b2139dd49da64c5a5f28c Mon Sep 17 00:00:00 2001
From: Paula Quispe <paula.quispe@processmaker.com>
Date: Fri, 22 Nov 2024 13:59:24 -0400
Subject: [PATCH 2/3] The card needs to hide if the data is null

---
 resources/jscomposition/cases/casesMain/utils/counters.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/jscomposition/cases/casesMain/utils/counters.js b/resources/jscomposition/cases/casesMain/utils/counters.js
index ac017b1e6c..273edf9428 100644
--- a/resources/jscomposition/cases/casesMain/utils/counters.js
+++ b/resources/jscomposition/cases/casesMain/utils/counters.js
@@ -27,7 +27,7 @@ export const formatCounters = (data) => {
     },
   ];
 
-  if (data.totalAllCases) {
+  if (data.totalAllCases !== null) {
     counters.push({
       header: t("All cases"),
       body: data.totalAllCases.toString(),
@@ -37,7 +37,7 @@ export const formatCounters = (data) => {
     });
   }
 
-  if (data.totalMyRequest) {
+  if (data.totalMyRequest !== null) {
     counters.push({
       header: t("My requests"),
       body: data.totalMyRequest.toString(),

From 998c1aa453168174d797ff10fadba0b6efe5ca3c Mon Sep 17 00:00:00 2001
From: Paula Quispe <paula.quispe@processmaker.com>
Date: Tue, 26 Nov 2024 12:32:46 -0400
Subject: [PATCH 3/3] FOUR-20443: solving observations

---
 ...2_create_permission_view_all_cases_all_requests.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/upgrades/2024_11_19_161132_create_permission_view_all_cases_all_requests.php b/upgrades/2024_11_19_161132_create_permission_view_all_cases_all_requests.php
index af6f196bf0..96531f1531 100644
--- a/upgrades/2024_11_19_161132_create_permission_view_all_cases_all_requests.php
+++ b/upgrades/2024_11_19_161132_create_permission_view_all_cases_all_requests.php
@@ -31,7 +31,15 @@ public function up(): void
         DB::table('permissions')
             ->where('group', 'Cases')
             ->update(['group' => self::NEW_NAME_GROUP]);
-        // Create new permissions view-all_cases view-all_requests
+        // Update with the correct label "View All Request"
+        // Summer 2024: PO requested change to "View All Cases"
+        // Fall 2024: PO requested revert to "View All Request"
+        $permission = Permission::where('name', 'view-all_requests')->first();
+        if ($permission && $permission->title == 'View All Cases') {
+            $permission->title = 'View All Request';
+            $permission->save();
+        }
+        // Create new permissions [view-all_cases, view-all_requests]
         $this->createPermissions();
     }