Merge branch 'develop' into task/FOUR-28803

Author: nolanpro

ProcessMaker/Helpers/DataTypeHelper.php

@@ -10,6 +10,9 @@ private static function isDate($value)
     {
         if (is_string($value)) {
             if (strlen($value) > 5) {
+                if (!preg_match('/\d{4}-\d{2}-\d{2}/', $value)) {
+                    return false;
+                }
                 try {
                     $parsed = Carbon::parse($value);
                     if ($parsed->isMidnight()) {

ProcessMaker/Http/Controllers/Api/UserController.php

@@ -255,10 +255,13 @@ public function getUsersTaskCount(Request $request)
             $processRequestToken = ProcessRequestToken::findOrFail($request->input('assignable_for_task_id'));
             if (config('app.reassign_restrict_to_assignable_users')) {
                 $include_ids = $processRequestToken->process->getAssignableUsersByAssignmentType($processRequestToken);
-            }
-            $assignmentRule = $processRequestToken->getAssignmentRule();
-            if ($assignmentRule === 'rule_expression' && $request->has('form_data')) {
-                $include_ids = $processRequestToken->getAssigneesFromExpression($request->input('form_data'));
+                $assignmentRule = $processRequestToken->getAssignmentRule();
+                if ($assignmentRule === 'rule_expression' && $request->has('form_data')) {
+                    $include_ids = $processRequestToken->getAssigneesFromExpression($request->input('form_data'));
+                }
+                if ($assignmentRule === 'process_variable' && $request->has('form_data')) {
+                    $include_ids = $processRequestToken->getUsersFromProcessVariable($request->input('form_data'));
+                }
             }
         }
 

ProcessMaker/Http/Controllers/TaskController.php

@@ -140,7 +140,7 @@ public function edit(ProcessRequestToken $task, string $preview = '')
         $element = $task->getDefinition(true);
         $screenFields = $screenVersion ? $screenVersion->screenFilteredFields() : [];
         $taskDraftsEnabled = TaskDraft::draftsEnabled();
-
+        $isSmartExtractTask = $task->element_name === 'Manual Document Review';
         // Remove screen parent to reduce the size of the response
         $screen = $task->screen;
         $screen['parent'] = null;
@@ -190,6 +190,25 @@ public function edit(ProcessRequestToken $task, string $preview = '')
                 'datetime_format',
             ]);
             $userConfiguration = (new UserConfigurationController())->index();
+            $hitlEnabled = config('smart-extract.hitl_enabled', false) && $isSmartExtractTask;
+
+            // Build the iframe source
+            $iframeSrc = null;
+            if ($hitlEnabled) {
+                $dashboardUrl = config('smart-extract.dashboard_url');
+                $requestData = $task->processRequest->data ?? [];
+
+                $documentToken = $requestData['documentToken'] ?? null;
+                $fileId = $requestData['fileId'] ?? null;
+
+                if ($documentToken && $fileId && !empty($dashboardUrl)) {
+                    $queryParams = http_build_query([
+                        'documentToken' => $documentToken,
+                        'fileId' => $fileId,
+                    ]);
+                    $iframeSrc = $dashboardUrl . '?' . $queryParams;
+                }
+            }
 
             return view('tasks.edit', [
                 'task' => $task,
@@ -204,6 +223,8 @@ public function edit(ProcessRequestToken $task, string $preview = '')
                 'screenFields' => $screenFields,
                 'taskDraftsEnabled' => $taskDraftsEnabled,
                 'userConfiguration' => $userConfiguration,
+                'hitlEnabled' => $hitlEnabled,
+                'iframeSrc' => $iframeSrc,
             ]);
         }
     }

ProcessMaker/Http/Middleware/HideServerHeaders.php

@@ -55,7 +55,7 @@ class HideServerHeaders
     /**
      * Handle an incoming request.
      *
-     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     * @param  Closure(Request): (Response)  $next
      */
     public function handle(Request $request, Closure $next): Response
     {

ProcessMaker/Http/Middleware/IsManager.php

@@ -13,7 +13,7 @@ class IsManager
     /**
      * Handle an incoming request.
      *
-     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     * @param  Closure(Request): (Response)  $next
      */
     public function handle(Request $request, Closure $next): Response
     {

ProcessMaker/Http/Resources/Task.php

@@ -74,6 +74,8 @@ public function toArray($request)
 
         $this->addAssignableUsers($array, $include);
 
+        $this->mergeHitlCaseNumber($array);
+
         return $array;
     }
 
@@ -114,6 +116,28 @@ private function addAssignableUsers(&$array, $include)
         }
     }
 
+    private function mergeHitlCaseNumber(array &$array): void
+    {
+        if (!config('smart-extract.hitl_enabled')) {
+            return;
+        }
+
+        if (!empty(data_get($array, 'process_request.case_number'))) {
+            return;
+        }
+
+        $this->processRequest->loadMissing('parentRequest');
+        $parentCaseNumber = $this->processRequest->parentRequest?->case_number;
+        if (!$parentCaseNumber) {
+            return;
+        }
+
+        data_set($array, 'process_request.case_number', $parentCaseNumber);
+        if (empty($array['case_number'])) {
+            $array['case_number'] = $parentCaseNumber;
+        }
+    }
+
     /**
      * Add the active users to the list of assigned users
      *
@@ -131,7 +155,7 @@ private function addActiveAssignedUsers(array $users, array $assignedUsers)
                 ->whereNotIn('status', Process::NOT_ASSIGNABLE_USER_STATUS)
                 ->whereIn('id', $chunk)
                 ->pluck('id')->toArray();
-            $assignedUsers = array_merge($assignedUsers,$activeUsers);
+            $assignedUsers = array_merge($assignedUsers, $activeUsers);
         }
 
         return $assignedUsers;

ProcessMaker/Jobs/ErrorHandling.php

@@ -211,10 +211,59 @@ public function setDefaultsFromDataSourceConfig(array $config)
     public static function convertResponseToException($result)
     {
         if ($result['status'] === 'error') {
-            if (str_starts_with($result['message'], 'Command exceeded timeout of')) {
-                throw new ScriptTimeoutException($result['message']);
+            $rawMessage = $result['message'] ?? '';
+            if (str_starts_with((string) $rawMessage, 'Command exceeded timeout of')) {
+                throw new ScriptTimeoutException((string) $rawMessage);
+            }
+
+            $message = self::extractScriptErrorMessage($result);
+
+            if (empty($message)) {
+                $message = $rawMessage ?: 'Script execution failed with unknown error';
+            }
+
+            throw new ScriptException($message);
+        }
+    }
+
+    /**
+     * Extract a concise error message from the microservice response.
+     */
+    private static function extractScriptErrorMessage(array $result): string
+    {
+        $candidates = [
+            $result['output']['error'] ?? null,
+            $result['output']['exception'] ?? null,
+            $result['output']['stderr'] ?? null,
+            $result['output']['stdout'] ?? null,
+            $result['message'] ?? null,
+        ];
+
+        foreach ($candidates as $candidate) {
+            if (is_string($candidate) || is_numeric($candidate)) {
+                $short = self::shortenMessage((string) $candidate);
+                if (!empty($short)) {
+                    return $short;
+                }
             }
-            throw new ScriptException(json_encode($result, JSON_PRETTY_PRINT));
         }
+
+        return '';
+    }
+
+    /**
+     * Keep only the first line of the error and limit its length to avoid noisy traces.
+     */
+    private static function shortenMessage(string $message): string
+    {
+        $firstLine = strtok($message, "\n");
+        $firstLine = $firstLine === false ? $message : $firstLine;
+        $trimmed = trim($firstLine);
+
+        if (strlen($trimmed) > 400) {
+            return substr($trimmed, 0, 400) . '…';
+        }
+
+        return $trimmed;
     }
 }

ProcessMaker/Models/ProcessRequestToken.php

@@ -991,6 +991,60 @@ public function getAssignmentRule()
         return $assignment;
     }
 
+    /**
+     * Get user IDs from process variables for task assignment.
+     *
+     * Extracts user IDs and group IDs from form data based on the activity's
+     * assignedUsers and assignedGroups properties. Retrieves all users from
+     * specified groups (including subgroups recursively) and combines them
+     * with directly assigned users.
+     *
+     * Used when assignment rule is 'process_variable'.
+     *
+     * @param array $form_data Form data containing process variable values.
+     *                         Keys must match activity's assignedUsers and
+     *                         assignedGroups properties. Values must be arrays.
+     *
+     * @return array Unique numeric user IDs (direct users + users from groups).
+     */
+    public function getUsersFromProcessVariable(array $form_data)
+    {
+        $activity = $this->getBpmnDefinition()->getBpmnElementInstance();
+        $assignedUsers = $activity->getProperty('assignedUsers', null);
+        $assignedGroups = $activity->getProperty('assignedGroups', null);
+
+        $usersIds = [];
+        $groupsIds = [];
+
+        // Validate and get user IDs from form_data
+        if ($assignedUsers && isset($form_data[$assignedUsers]) && is_array($form_data[$assignedUsers])) {
+            $usersIds = $form_data[$assignedUsers];
+        }
+
+        // Validate and get group IDs from form_data
+        if ($assignedGroups && isset($form_data[$assignedGroups]) && is_array($form_data[$assignedGroups])) {
+            $groupsIds = $form_data[$assignedGroups];
+        }
+
+        // Get users from groups using the Process model method
+        $usersFromGroups = [];
+        if (!empty($groupsIds) && $this->process) {
+            // Use the getConsolidatedUsers method from the Process model
+            // This method gets users from groups including subgroups recursively
+            $this->process->getConsolidatedUsers($groupsIds, $usersFromGroups);
+        }
+
+        // Combine direct users with users from groups
+        $allUserIds = array_unique(array_merge($usersIds, $usersFromGroups));
+
+        // Convert to numeric array and filter valid values
+        $allUserIds = array_values(array_filter($allUserIds, function ($id) {
+            return !empty($id) && is_numeric($id) && $id > 0;
+        }));
+
+        return $allUserIds;
+    }
+
     /**
      * Get the assignees for the token.
      *

ProcessMaker/Traits/TaskControllerIndexMethods.php

@@ -155,6 +155,7 @@ private function excludeNonVisibleTasks($query, $request)
     {
         $nonSystem = filter_var($request->input('non_system'), FILTER_VALIDATE_BOOLEAN);
         $allTasks = filter_var($request->input('all_tasks'), FILTER_VALIDATE_BOOLEAN);
+        $hitlEnabled = filter_var(config('smart-extract.hitl_enabled'), FILTER_VALIDATE_BOOLEAN);
         $query->when(!$allTasks, function ($query) {
             $query->where(function ($query) {
                 $query->where('element_type', '=', 'task');
@@ -164,8 +165,20 @@ private function excludeNonVisibleTasks($query, $request)
                 });
             });
         })
-            ->when($nonSystem, function ($query) {
-                $query->nonSystem();
+            ->when($nonSystem, function ($query) use ($hitlEnabled) {
+                if (!$hitlEnabled) {
+                    $query->nonSystem();
+
+                    return;
+                }
+
+                $query->where(function ($query) {
+                    $query->nonSystem();
+                    $query->orWhere(function ($query) {
+                        $query->where('element_type', '=', 'task');
+                        $query->where('element_name', '=', 'Manual Document Review');
+                    });
+                });
             });
     }
 

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "processmaker/processmaker",
-    "version": "2026.1.2",
+    "version": "2026.2.1",
     "description": "BPM PHP Software",
     "keywords": [
         "php bpm processmaker"
@@ -152,33 +152,34 @@
                 "package-ab-testing": "1.4.0",
                 "package-actions-by-email": "1.22.9",
                 "package-advanced-user-manager": "1.13.2",
-                "package-ai": "1.16.11",
+                "package-ai": "1.16.12",
                 "package-analytics-reporting": "1.11.2",
                 "package-auth": "1.24.11",
                 "package-collections": "2.27.2",
                 "package-comments": "1.16.2",
                 "package-conversational-forms": "1.15.0",
-                "package-data-sources": "1.34.3",
+                "package-data-sources": "1.34.4",
                 "package-decision-engine": "1.16.1",
                 "package-dynamic-ui": "1.28.3",
-                "package-email-start-event": "1.0.8",
+                "package-email-start-event": "1.0.9",
                 "package-files": "1.23.4",
                 "package-googleplaces": "1.12.0",
                 "package-photo-video": "1.6.1",
                 "package-pm-blocks": "1.12.7",
                 "package-process-documenter": "1.12.0",
                 "package-process-optimization": "1.10.0",
                 "package-product-analytics": "1.5.11",
-                "package-projects": "1.12.6",
+                "package-projects": "1.12.7",
                 "package-rpa": "1.1.1",
                 "package-savedsearch": "1.43.7",
                 "package-slideshow": "1.4.3",
-                "package-signature": "1.15.3",
+                "package-smart-extract": "0.0.3",
+                "package-signature": "1.15.2",
                 "package-testing": "1.8.1",
                 "package-translations": "2.14.5",
                 "package-versions": "1.13.0",
                 "package-vocabularies": "2.17.1",
-                "package-webentry": "2.29.12",
+                "package-webentry": "2.29.13",
                 "package-api-testing": "1.3.1",
                 "package-variable-finder": "1.0.5",
                 "packages": "^0"