Task/FOUR-27119: Modify Task Edit to render iframe with smart extract URL after Operator clicks on HITL Manual Task #8581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

CarliPinell wants to merge 81 commits into epic/FOUR-26611 from task/FOUR-27119

ProcessMaker/AssignmentRules/ProcessManagerAssigned.php

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,8 @@ @@
     use ProcessMaker\Exception\ThereIsNoProcessManagerAssignedException;
     use ProcessMaker\Models\Process;
     use ProcessMaker\Models\ProcessRequest;
+    use ProcessMaker\Models\ProcessRequestToken;
+    use ProcessMaker\Models\User;
     use ProcessMaker\Nayra\Contracts\Bpmn\ActivityInterface;
     use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;
@@ Expand All @@
          * @param TokenInterface $token
          * @param Process $process
          * @param ProcessRequest $request
-         * @return int
+         * @return int|null
          * @throws ThereIsNoProcessManagerAssignedException
          */
         public function getNextUser(ActivityInterface $task, TokenInterface $token, Process $process, ProcessRequest $request)
         {
-            $user_id = $request->processVersion->manager_id;
+            // review for multiple managers
+            $managers = $request->processVersion->manager_id;
+            $user_id = $this->getNextManagerAssigned($managers, $task, $request);
             if (!$user_id) {
                 throw new ThereIsNoProcessManagerAssignedException($task);
             }
             return $user_id;
         }
+        /**
+         * Get the round robin manager using a true round robin algorithm
+         *
+         * @param array $managers
+         * @param ActivityInterface $task
+         * @param ProcessRequest $request
+         * @return int|null
+         */
+        private function getNextManagerAssigned($managers, $task, $request)
+        {
+            // Validate input
+            if (empty($managers) || !is_array($managers)) {
+                return null;
+            }
+            // If only one manager, return it
+            if (count($managers) === 1) {
+                return $managers[0];
+            }
+            // get the last manager assigned to the task across all requests
+            $last = ProcessRequestToken::where('process_id', $request->process_id)
+                ->where('element_id', $task->getId())
+                ->whereIn('user_id', $managers)
+                ->orderBy('created_at', 'desc')
+                ->first();
+            $user_id = $last ? $last->user_id : null;
+            sort($managers);
+            $key = array_search($user_id, $managers);
+            if ($key === false) {
+                // If no previous manager found, start with the first manager
+                $key = 0;
+            } else {
+                // Move to the next manager in the round-robin
+                $key = ($key + 1) % count($managers);
+            }
+            $user_id = $managers[$key];
+            return $user_id;
+        }
     }

ProcessMaker/Console/Kernel.php

-Original file line number
+Diff line change
@@ Expand Up / @@ -88,6 +88,9 @@ protected function schedule(Schedule $schedule) @@
                     $schedule->command('metrics:clear')->cron("*/{$clearInterval} * * * *");
                     break;
             }
+            // 5 minutes is recommended in https://laravel.com/docs/12.x/horizon#metrics
+            $schedule->command('horizon:snapshot')->everyFiveMinutes();
         }
         /**
@@ Expand Down @@

ProcessMaker/Exception/MultitenancyAccessedLandlord.php

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,11 +5,21 @@ @@
     use Exception;
     use Illuminate\Http\Request;
     use Illuminate\Http\Response;
+    use ProcessMaker\Facades\Metrics;
     class MultitenancyAccessedLandlord extends Exception
     {
         public function render(Request $request): Response
         {
+            // If we're trying to access the /metrics route, collect landlord metrics and render them
+            if ($request->path() === 'metrics') {
+                Metrics::collectQueueMetrics();
+                return response(Metrics::renderMetrics(), 200, [
+                    'Content-Type' => 'text/plain; version=0.0.4',
+                ]);
+            }
             return response()->view('multitenancy.landlord-landing-page');
         }
@@ Expand Down @@

ProcessMaker/Http/Controllers/Admin/TenantQueueController.php

-Original file line number
+Diff line change
@@ Expand Up / @@ -14,36 +14,12 @@ @@
     class TenantQueueController extends Controller
     {
-        /**
-         * Constructor to check if tenant tracking is enabled.
-         */
-        public function __construct()
-        {
-            // Check if tenant job tracking is enabled
-            $enabled = TenantQueueServiceProvider::enabled();
-            if (!$enabled) {
-                if (!app()->runningInConsole()) {
-                    abort(404, 'Tenant queue tracking is disabled');
-                }
-            }
-            // If the route binding has a tenant id, check if the user is allowed to access the tenant queue
-            if ($id = (int) request()->route('tenantId')) {
-                if (!TenantQueueServiceProvider::allowAllTenats() && $id !== app('currentTenant')?->id) {
-                    throw new AuthorizationException();
-                }
-            }
-        }
         /**
          * Show the tenant jobs dashboard.
          */
         public function index()
         {
-            if (!Auth::user()->is_administrator) {
-                throw new AuthorizationException();
-            }
+            $this->checkPermissions();
             return view('admin.tenant-queues.index');
         }
@@ Expand All / @@ -53,9 +29,7 @@ public function index() @@
          */
         public function getTenants(): JsonResponse
         {
-            if (!Auth::user()->is_administrator) {
-                throw new AuthorizationException();
-            }
+            $this->checkPermissions();
             $tenantsWithJobs = TenantQueueServiceProvider::getTenantsWithJobs();
@@ Expand Down Expand Up / @@ -87,9 +61,7 @@ public function getTenants(): JsonResponse @@
          */
         public function getTenantJobs(Request $request, string $tenantId): JsonResponse
         {
-            if (!Auth::user()->is_administrator) {
-                throw new AuthorizationException();
-            }
+            $this->checkPermissions();
             $status = $request->get('status');
             $limit = min((int) $request->get('limit', 50), 100); // Max 100 jobs
@@ Expand Down Expand Up @@
          */
         public function getOverallStats(): JsonResponse
         {
-            if (!Auth::user()->is_administrator) {
-                throw new AuthorizationException();
-            }
+            $this->checkPermissions();
             $tenantsWithJobs = TenantQueueServiceProvider::getTenantsWithJobs();
@@ Expand Down Expand Up / @@ -163,9 +133,7 @@ public function getOverallStats(): JsonResponse @@
          */
         public function getJobDetails(string $tenantId, string $jobId): JsonResponse
         {
-            if (!Auth::user()->is_administrator) {
-                throw new AuthorizationException();
-            }
+            $this->checkPermissions();
             $tenantKey = "tenant_jobs:{$tenantId}:{$jobId}";
             $jobData = Redis::hgetall($tenantKey);
@@ Expand Down Expand Up @@
          */
         public function clearTenantJobs(string $tenantId): JsonResponse
         {
-            if (!Auth::user()->is_administrator) {
-                throw new AuthorizationException();
-            }
+            $this->checkPermissions();
             try {
                 $pattern = "tenant_jobs:{$tenantId}:*";
@@ Expand All @@
                 return response()->json(['error' => 'Failed to clear tenant job data'], 500);
             }
         }
+        private function checkPermissions(): void
+        {
+            // Check if tenant job tracking is enabled
+            $enabled = TenantQueueServiceProvider::enabled();
+            if (!$enabled) {
+                throw new AuthorizationException('Tenant queue tracking is disabled');
+            }
+            if (!Auth::user()->is_administrator) {
+                throw new AuthorizationException();
+            }
+            // If the route binding has a tenant id, check if the user is allowed to access the tenant queue
+            if ($id = (int) request()->route('tenantId')) {
+                if (!TenantQueueServiceProvider::allowAllTenats() && $id !== app('currentTenant')?->id) {
+                    throw new AuthorizationException();
+                }
+            }
+        }
     }

ProcessMaker/Http/Controllers/Api/ProcessController.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -429,7 +429,7 @@ public function store(Request $request)
  
            //set manager id

            if ($request->has('manager_id')) {

                $process->manager_id = $request->input('manager_id', null);

                $process->manager_id = $this->validateMaxManagers($request);

            }

            if (isset($data['bpmn'])) {

    @@ -542,7 +542,7 @@ public function update(Request $request, Process $process)
  
            $process->fill($request->except('notifications', 'task_notifications', 'notification_settings', 'cancel_request', 'cancel_request_id', 'start_request_id', 'edit_data', 'edit_data_id', 'projects'));

            if ($request->has('manager_id')) {

                $process->manager_id = $request->input('manager_id', null);

                $process->manager_id = $this->validateMaxManagers($request);

            }

            if ($request->has('user_id')) {

    @@ -621,6 +621,55 @@ public function update(Request $request, Process $process)
  
            return new Resource($process->refresh());

        }

        private function validateMaxManagers(Request $request)

        {

            $managerIds = $request->input('manager_id', []);

            // Handle different input types

            if (is_string($managerIds)) {

                // If it's a string, try to decode it as JSON

                if (empty($managerIds)) {

                    $managerIds = [];

                } else {

                    $decoded = json_decode($managerIds, true);

                    // Handle JSON decode failure

                    if (json_last_error() !== JSON_ERROR_NONE) {

                        throw new \Illuminate\Validation\ValidationException(

                            validator([], []),

                            ['manager_id' => [__('Invalid JSON format for manager_id')]]

                        );

                    }

                    $managerIds = $decoded;

                }

            }

            // Ensure we have an array

            if (!is_array($managerIds)) {

                // If it's a single value (not array), convert to array

                $managerIds = [$managerIds];

            }

            // Filter out null, empty values and validate each manager ID

            $managerIds = array_filter($managerIds, function ($id) {

                return $id !== null && $id !== '' && is_numeric($id) && $id > 0;

            });

            // Re-index the array to remove gaps from filtered values

            $managerIds = array_values($managerIds);

            // Validate maximum number of managers

            if (count($managerIds) > 10) {

                throw new \Illuminate\Validation\ValidationException(

                    validator([], []),

                    ['manager_id' => [__('Maximum number of managers is :max', ['max' => 10])]]

                );

            }

            return $managerIds;

        }

        /**

         * Validate the structure of stages.

         *

    @@ -1714,7 +1763,7 @@ protected function checkUserCanStartProcess($event, $currentUser, $process, $req
  
                        }

                        break;

                    case 'process_manager':

                        $response = $currentUser === $process->manager_id;

                        $response = in_array($currentUser, $process->manager_id ?? []);

                        break;

                }

            }

ProcessMaker/Http/Controllers/Api/ScriptExecutorController.php

-Original file line number
+Diff line change
@@ Expand Up / @@ -59,7 +59,15 @@ public function index(Request $request) @@
         {
             $this->checkAuth($request);
-            return new ApiCollection(ScriptExecutor::nonSystem()->get());
+            $query = ScriptExecutor::nonSystem();
+            if ($request->has('order_by')) {
+                $order_by = $request->input('order_by');
+                $order_direction = $request->input('order_direction', 'ASC');
+                $query->orderBy($order_by, $order_direction);
+            }
+            return new ApiCollection($query->get());
         }
         /**
@@ Expand Down @@

ProcessMaker/Http/Controllers/Api/TaskController.php

-Original file line number
+Diff line change
@@ Expand Up @@
             $this->applyAdvancedFilter($query, $request);
-            $this->applyForCurrentUser($query, $user);
-            // Apply filter overdue
-            $query->overdue($request->input('overdue'));
             if ($request->input('processesIManage') === 'true') {
                 $this->applyProcessManager($query, $user);
+            } else {
+                $this->applyForCurrentUser($query, $user);
             }
+            // Apply filter overdue
+            $query->overdue($request->input('overdue'));
             // If only the total is being requested (by a Saved Search), send it now
             if ($getTotal === true) {
                 return $query->count();
@@ Expand All @@
             $response = $this->applyUserFilter($response, $request, $user);
+            if ($response->total() > 0 && $request->input('processesIManage') === 'true') {
+                // enable user manager in cache
+                $this->enableUserManager($user);
+            }
             $inOverdueQuery = ProcessRequestToken::query()
                 ->whereIn('id', $response->pluck('id'))
                 ->where('due_at', '<', Carbon::now());
@@ Expand Down @@

ProcessMaker/Http/Controllers/Api/UserController.php

-Original file line number
+Diff line change
@@ Expand Up / @@ -209,10 +209,14 @@ public function getUsersTaskCount(Request $request) @@
                 $include_ids = explode(',', $include_ids_string);
             } elseif ($request->has('assignable_for_task_id')) {
                 $task = ProcessRequestToken::findOrFail($request->input('assignable_for_task_id'));
-                if ($task->getAssignmentRule() === 'user_group') {
+                $assignmentRule = $task->getAssignmentRule();
+                if ($assignmentRule === 'user_group') {
                     // Limit the list of users to those that can be assigned to the task
                     $include_ids = $task->process->getAssignableUsers($task->element_id);
                 }
+                if ($assignmentRule === 'rule_expression' && $request->has('form_data')) {
+                    $include_ids = $task->getAssigneesFromExpression($request->input('form_data'));
+                }
             }
             if (!empty($include_ids)) {
@@ Expand Down @@

ProcessMaker/Http/Controllers/CasesController.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -95,7 +95,7 @@ public function show($case_number)
  
            // The user can see the comments

            $canViewComments = (Auth::user()->hasPermissionsFor('comments')->count() > 0) || class_exists(PackageServiceProvider::class);

            // The user is Manager from the main request

            $isProcessManager = $request->process?->manager_id === Auth::user()->id;

            $isProcessManager = in_array(Auth::user()->id, $request->process?->manager_id ?? []);

            // Check if the user has permission print for request

            $canPrintScreens = $canOpenCase = $this->canUserCanOpenCase($allRequests);

            if (!$canOpenCase && !$isProcessManager) {

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Task/FOUR-27119: Modify Task Edit to render iframe with smart extract URL after Operator clicks on HITL Manual Task #8581

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!