[DO NOT MERGE] HITL Demo Server

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;
@@ -204,6 +204,7 @@ public function edit(ProcessRequestToken $task, string $preview = '')
                 'screenFields' => $screenFields,
                 'taskDraftsEnabled' => $taskDraftsEnabled,
                 'userConfiguration' => $userConfiguration,
+                'hitlEnabled' => config('smart-extract.hitl_enabled', false) && $isSmartExtractTask,
             ]);
         }
     }

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/ScriptRunners/ScriptMicroserviceRunner.php

@@ -136,6 +136,8 @@ private function getEnvironmentVariables(User $user)
             $variablesParameter['API_HOST'] = config('app.docker_host_url') . '/api/1.0';
             $variablesParameter['APP_URL'] = config('app.docker_host_url');
             $variablesParameter['API_SSL_VERIFY'] = (config('app.api_ssl_verify') ? '1' : '0');
+            $variablesParameter['SMART_EXTRACT_API_HOST'] = config('app.smart_extract_api_host');
+            $variablesParameter['SMART_EXTRACT_PM_API_TOKEN'] = config('app.smart_extract_api_token');
         }
 
         return $variablesParameter;

ProcessMaker/Traits/TaskControllerIndexMethods.php

@@ -154,6 +154,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');
@@ -163,8 +164,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

@@ -173,6 +173,7 @@
                 "package-rpa": "1.1.1",
                 "package-savedsearch": "1.43.4",
                 "package-slideshow": "1.4.3",
+                "package-smart-extract": "dev-develop",
                 "package-signature": "1.15.2",
                 "package-testing": "1.8.1",
                 "package-translations": "2.14.4",

config/app.php

@@ -298,4 +298,7 @@
     'multitenancy' => env('MULTITENANCY', false),
 
     'resources_core_path' => base_path('resources-core'),
+
+    'smart_extract_api_host' => env('SMART_EXTRACT_API_HOST', 'extract-api.processmaker.net'),
+    'smart_extract_api_token' => env('SMART_EXTRACT_PM_API_TOKEN', ''),
 ];

resources/js/tasks/components/TasksList.vue

@@ -496,7 +496,7 @@ export default {
       return `
       <a href="${this.openTask(record, 1)}"
          class="text-nowrap">
-         # ${processRequest.case_number || record.case_number}
+         # ${processRequest.case_number || record.case_number || ""}
       </a>`;
     },
     formatCaseTitle(processRequest, record) {

resources/views/layouts/layoutnext.blade.php

@@ -133,6 +133,7 @@ class="main flex-grow-1 h-100
 @endif
 
 @yield('js')
+@stack('scripts')
 
 @isset($addons)
   @foreach ($addons as $addon)

resources/views/tasks/edit.blade.php

@@ -87,25 +87,29 @@ class="nav-link">
             <div id="tabContent" class="tab-content tw-flex tw-flex-col tw-grow tw-overflow-y-scroll">
               <div id="tab-form" role="tabpanel" aria-labelledby="tab-form" class="tab-pane active show">
                 @can('update', $task)
-                <task
-                  ref="task"
-                  class="card border-0"
-                  v-model="formData"
-                  :initial-task-id="{{ $task->id }}"
-                  :initial-request-id="{{ $task->process_request_id }}"
-                  :screen-version="{{ $task->screen['id'] ?? null }}"
-                  :user-id="{{ Auth::user()->id }}"
-                  csrf-token="{{ csrf_token() }}"
-                  initial-loop-context="{{ $task->getLoopContext() }}"
-                  :wait-loading-listeners="true"
-                  @task-updated="taskUpdated"
-                  @updated-page-core="updatePage"
-                  @submit="submit"
-                  @completed="completed"
-                  @@error="error"
-                  @closed="closed"
-                  @redirect="redirectToTask"
-                  @form-data-changed="handleFormDataChange" />
+                  @unless($hitlEnabled)
+                    <task
+                      ref="task"
+                      class="card border-0"
+                      v-model="formData"
+                      :initial-task-id="{{ $task->id }}"
+                      :initial-request-id="{{ $task->process_request_id }}"
+                      :screen-version="{{ $task->screen['id'] ?? null }}"
+                      :user-id="{{ Auth::user()->id }}"
+                      csrf-token="{{ csrf_token() }}"
+                      initial-loop-context="{{ $task->getLoopContext() }}"
+                      :wait-loading-listeners="true"
+                      @task-updated="taskUpdated"
+                      @updated-page-core="updatePage"
+                      @submit="submit"
+                      @completed="completed"
+                      @@error="error"
+                      @closed="closed"
+                      @redirect="redirectToTask"
+                      @form-data-changed="handleFormDataChange" />
+                  @else
+                    @include('tasks.partials.hitl-iframe')
+                  @endunless
                 @endcan
                 <div v-if="taskHasComments">
                   <timeline :commentable_id="task.id"

resources/views/tasks/partials/hitl-iframe.blade.php

@@ -0,0 +1,22 @@
+{{-- Smart Extract Manual Edit content when HITL is enabled --}}
+@php
+  // Note: This URL will be obtained from request data in future implementation.
+  $iframeSrc = null
+@endphp
+
+@if (!empty($iframeSrc))
+  <div
+    id="manual-edit-iframe-container"
+    style="position: relative; width: 100%; height: calc(100vh - 200px); border: none; margin: 0; padding: 0;"
+  >
+    <x-package-smart-extract::iframe-loader
+      :src="$iframeSrc"
+      :title="__('Smart Extract')"
+      loading-message="{{ __('Loading dashboard') }}"
+    />
+  </div>
+@else
+  <div class="alert alert-warning">
+    {{ __('No iframe source provided for Manual Edit.') }}
+  </div>
+@endif