FOUR-15685

pmPaulis · May 24, 2024 · May 23, 2024 · May 23, 2024 · May 23, 2024 · May 23, 2024
commit e65c13c4b0ac5d19e64dde50ac165773ac7f566b
diff --git a/ProcessMaker/Http/Middleware/GenerateMenus.php b/ProcessMaker/Http/Middleware/GenerateMenus.php
@@ -38,7 +38,7 @@ public function handle(Request $request, Closure $next)
             });
             $menu->group(['prefix' => 'requests'], function ($request_items) {
                 $request_items->add(
-                    __('Requests'),
+                    __('Cases'),
                     ['route' => 'requests.index', 'id' => 'requests']
                 )->active('requests/*');
             });
@@ -141,7 +141,7 @@ public function handle(Request $request, Closure $next)
         });
         Menu::make('sidebar_request', function ($menu) {
             $submenu = $menu->add(__('Request'));
-            $submenu->add(__('My Requests'), [
+            $submenu->add(__('My Cases'), [
                 'route' => ['requests_by_type', ''],
                 'icon' => 'fa-id-badge',
             ]);
@@ -154,7 +154,7 @@ public function handle(Request $request, Closure $next)
                 'icon' => 'fa-clipboard-check',
             ]);
             if (\Auth::check() && \Auth::user()->can('view-all_requests')) {
-                $submenu->add(__('All Requests'), [
+                $submenu->add(__('All Cases'), [
                     'route' => ['requests_by_type', 'all'],
                     'icon' => 'fa-clipboard',
                 ]);

diff --git a/resources/js/processes-catalogue/components/ProcessTab.vue b/resources/js/processes-catalogue/components/ProcessTab.vue
@@ -6,7 +6,7 @@
       lazy
     >
       <b-tab
-        :title="$t('My Requests')"
+        :title="$t('My Cases')"
         active
       >
         <request-tab

diff --git a/resources/lang/en.json b/resources/lang/en.json
@@ -93,6 +93,7 @@
   "Align Top": "Align Top",
   "All {{assets}} will be included in this export.": "All {{assets}} will be included in this export.",
   "All assignments were saved.": "All assignments were saved.",
+  "All Cases": "All Cases",
   "All Clear": "All Clear",
   "All elements related to this process will be imported.": "All elements related to this process will be imported.",
   "All Notifications": "All Notifications",
@@ -262,6 +263,7 @@
   "CAPTCHA controls cannot be placed within a Loop control.": "CAPTCHA controls cannot be placed within a Loop control.",
   "Case": "Case",
   "Case by Status": "Case by Status",
+  "Cases": "Cases",
   "Cases Started": "Cases Started",
   "Catch Events": "Catch Events",
   "Categories are required to create a process": "Categories are required to create a process",
@@ -993,6 +995,7 @@
   "Multi-Instance (Sequential)": "Multi-Instance (Sequential)",
   "Multicolumn / Table": "Multicolumn / Table",
   "Must be unique": "Must be unique",
+  "My Cases": "My Cases",
   "My Bookmarks": "My Bookmarks",
   "My Projects": "My Projects",
   "My Requests": "My Requests",

diff --git a/resources/lang/es.json b/resources/lang/es.json
@@ -39,6 +39,7 @@
   "After importing, you can reassign users and groups to your Process.": "Después de importar, puede reasignar usuarios y grupos a su Proceso.",
   "After": "Después",
   "All assignments were saved.": "Todas las tareas fueron guardadas.",
+  "All Cases": "Todos los casos",
   "All Notifications": "Todas las notificaciones",
   "All Requests": "Todas las solicitudes",
   "All Rights Reserved": "Todos los derechos reservados",
@@ -492,6 +493,7 @@
   "Must be unique": "Debe ser único",
   "Multi Column": "Múltiples columnas",
   "Multicolumn / Table": "Columnas múltiples/tabla",
+  "My Cases": "Mis Casos",
   "My Requests": "Mis solicitudes",
   "Name must be unique": "El nombre debe ser único",
   "Name of Variable to store the output": "Nombre de variable para almacenar la salida",
@@ -1302,6 +1304,7 @@
   "Browser": "Navegador",
   "Callback": "Devolución de llamada",
   "Case": "Caso",
+  "Cases": "Casos",
   "Catch Events": "Eventos de captura",
   "Change Version Details": "Cambiar detalles de la versión",
   "Check Flow": "Comprobar flujo",

diff --git a/resources/views/requests/index.blade.php b/resources/views/requests/index.blade.php
@@ -10,7 +10,7 @@
 
 @section('breadcrumbs')
 @include('shared.breadcrumbs', ['routes' => [
-    __('Requests') => route('requests.index'),
+    __('Cases') => route('requests.index'),
     function() use ($title) { return [__($title), null]; }
 ]])
 @endsection
@@ -22,31 +22,31 @@ function() use ($title) { return [__($title), null]; }
                 <counter-card
                     color="info"
                     icon="id-badge"
-                    link="{{ route('requests_by_type', ['type' => '']) }}"
-                    title="My Requests"
+                    link="{{ route('cases_by_type', ['type' => '']) }}"
                     url='requests?total=true&pmql=(status = "In Progress") AND (requester = "{{ Auth::user()->username }}")'
+                    :title="__('My Cases')"
                 ></counter-card>
                 <counter-card
                     color="success"
                     icon="clipboard-list"
-                    link="{{ route('requests_by_type', ['type' => 'in_progress']) }}"
-                    title="In Progress"
+                    link="{{ route('cases_by_type', ['type' => 'in_progress']) }}"
                     url='requests?total=true&pmql=(status = "In Progress")'
+                    :title="__('In Progress')"
                 ></counter-card>
                 <counter-card
                     color="primary"
                     icon="clipboard-check"
-                    link="{{ route('requests_by_type', ['type' => 'completed']) }}"
-                    title="Completed"
+                    link="{{ route('cases_by_type', ['type' => 'completed']) }}"
                     url='requests?total=true&pmql=(status = "Completed")'
+                    :title="__('Completed')"
                 ></counter-card>
                 @can('view-all_requests')
                     <counter-card
                         color="secondary"
                         icon="clipboard"
-                        link="{{ route('requests_by_type', ['type' => 'all']) }}"
-                        title="All Requests"
+                        link="{{ route('cases_by_type', ['type' => 'all']) }}"
                         url='requests?total=true'
+                        :title="__('All Cases')"
                     ></counter-card>
                 @endcan
             </counter-card-group>

diff --git a/routes/api.php b/routes/api.php
@@ -210,6 +210,8 @@
     });
     Route::get('/tasks/rule-execution-log', [InboxRulesController::class, 'executionLog'])->name('inboxrules.execution-log');
 
+    // Cases
+    Route::get('cases', [ProcessRequestController::class, 'index'])->name('cases.index');
     // Requests
     Route::get('requests', [ProcessRequestController::class, 'index'])->name('requests.index'); // Already filtered in controller
     Route::get('requests/{process}/count', [ProcessRequestController::class, 'getCount'])->name('requests.count');

diff --git a/routes/web.php b/routes/web.php
@@ -134,7 +134,13 @@
     Route::get('/redirect-to-intended', [HomeController::class, 'redirectToIntended'])->name('redirect_to_intended');
 
     Route::post('/keep-alive', [LoginController::class, 'keepAlive'])->name('keep-alive');
-
+    // Cases
+    Route::get('cases', [RequestController::class, 'index'])->name('cases.index')->middleware('no-cache');
+    Route::get('cases/{request}', [RequestController::class, 'show'])->name('cases.show');
+    Route::get('cases/{type?}', [RequestController::class, 'index'])->name('cases_by_type')
+        ->where('type', 'all|in_progress|completed')
+        ->middleware('no-cache');
+    // Requests
     Route::get('requests/search', [RequestController::class, 'search'])->name('requests.search');
     Route::get('requests/{type?}', [RequestController::class, 'index'])
         ->where('type', 'all|in_progress|completed')
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ @@
           lazy
         >
           <b-tab
-            :title="$t('My Requests')"
+            :title="$t('My Cases')"
             active
           >
             <request-tab
@@ Expand Down @@