FOUR-17581 Fix Processes that are started with another thread do not display the screen

ProcessMaker/Events/RedirectToEvent.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace ProcessMaker\Events;
+
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+use ProcessMaker\Models\ProcessRequest;
+
+class RedirectToEvent implements ShouldBroadcastNow
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    public $payloadUrl;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(
+        private ProcessRequest $processRequest,
+        public string $method,
+        public array $params
+    ) {
+        //
+    }
+
+    /**
+     * Set the event name
+     *
+     * @return string
+     */
+    public function broadcastAs()
+    {
+        return 'RedirectTo';
+    }
+
+    /**
+     * Get the channels the event should broadcast on.
+     *
+     * @return array<int, \Illuminate\Broadcasting\Channel>
+     */
+    public function broadcastOn(): array
+    {
+        return [
+            new PrivateChannel('ProcessMaker.Models.ProcessRequest.' . $this->processRequest->getKey()),
+        ];
+    }
+}

ProcessMaker/Http/Controllers/Api/TaskController.php

@@ -19,6 +19,7 @@
 use ProcessMaker\Http\Resources\ApiResource;
 use ProcessMaker\Http\Resources\Task as Resource;
 use ProcessMaker\Http\Resources\TaskCollection;
+use ProcessMaker\Listeners\HandleRedirectListener;
 use ProcessMaker\Models\Process;
 use ProcessMaker\Models\ProcessRequest;
 use ProcessMaker\Models\ProcessRequestToken;
@@ -245,6 +246,7 @@ public function update(Request $request, ProcessRequestToken $task)
             $instance = $task->processRequest;
             TaskDraft::moveDraftFiles($task);
             WorkflowManager::completeTask($process, $instance, $task, $data);
+            HandleRedirectListener::sendRedirectToEvent();
 
             return new Resource($task->refresh());
         } elseif (!empty($request->input('user_id'))) {

ProcessMaker/Jobs/BpmnAction.php

@@ -13,6 +13,7 @@
 use Illuminate\Support\Facades\Log;
 use ProcessMaker\BpmnEngine;
 use ProcessMaker\Exception\HttpABTestingException;
+use ProcessMaker\Listeners\HandleRedirectListener;
 use ProcessMaker\Models\Process as Definitions;
 use ProcessMaker\Models\ProcessRequest;
 use ProcessMaker\Models\ProcessRequestLock;
@@ -66,6 +67,8 @@ public function handle()
 
             // Run engine to the next state
             $this->engine->runToNextState();
+            // call to redirect when user task is assigned
+            HandleRedirectListener::sendRedirectToEvent();
         } catch (HttpABTestingException $exception) {
             Log::error($exception->getMessage());
             throw $exception;

ProcessMaker/Listeners/HandleActivityAssignedInterstitialRedirect.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace ProcessMaker\Listeners;
+
+use ProcessMaker\Events\ActivityAssigned;
+
+class HandleActivityAssignedInterstitialRedirect extends HandleRedirectListener
+{
+
+    /**
+     * Handle the event.
+     */
+    public function handle(ActivityAssigned $event): void
+    {
+        $request = $event->getProcessRequestToken()->getInstance();
+        if (empty($request)) {
+            return;
+        }
+
+        $allowInterstitial = $event->getProcessRequestToken()->getInterstitial()['allow_interstitial'];
+        if ($allowInterstitial) {
+            $payloadUrl = route('tasks.edit', ['task' => $event->getProcessRequestToken()->id]);
+        } else {
+            $payloadUrl = route('requests.show', [
+                'request' => $event->getProcessRequestToken()
+                    ->getAttribute('process_request_id')
+            ]);
+        }
+        $this->setRedirectTo($request,
+            'redirectToTask',
+            [
+                'payloadUrl' => $payloadUrl,
+                'tokenId' => $event->getProcessRequestToken()->id,
+                'allowInterstitial' => $event->getProcessRequestToken()->getInterstitial()['allow_interstitial'],
+            ]
+        );
+    }
+}

ProcessMaker/Listeners/HandleActivityCompletedRedirect.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace ProcessMaker\Listeners;
+
+use ProcessMaker\Events\ActivityCompleted;
+
+class HandleActivityCompletedRedirect extends HandleRedirectListener
+{
+
+    /**
+     * Handle the event.
+     */
+    public function handle(ActivityCompleted $event): void
+    {
+        $request = $event->getProcessRequestToken()->getInstance();
+        if (empty($request)) {
+            return;
+        }
+
+        $this->setRedirectTo($request, 'processUpdated', $event);
+    }
+}

ProcessMaker/Listeners/HandleEndEventRedirect.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace ProcessMaker\Listeners;
+
+use Illuminate\Support\Facades\Auth;
+use ProcessMaker\Events\ProcessCompleted;
+
+class HandleEndEventRedirect extends HandleRedirectListener
+{
+
+    /**
+     * Handle the event.
+     */
+    public function handle(ProcessCompleted $event): void
+    {
+        $request = $event->getProcessRequest();
+        if (empty($request)) {
+            return;
+        }
+
+        $userId = Auth::id();
+        $requestId = $event->getProcessRequest()->id;
+        $this->setRedirectTo($request, 'processCompletedRedirect', $event, $userId, $requestId);
+    }
+}

ProcessMaker/Listeners/HandleRedirectListener.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace ProcessMaker\Listeners;
+
+use ProcessMaker\Events\RedirectToEvent;
+use ProcessMaker\Models\ProcessRequest;
+
+class HandleRedirectListener
+{
+    private static $processRequest = null;
+
+    private static $redirectionMethod = '';
+
+    private static $redirectionParams = [];
+
+    protected function setRedirectTo(ProcessRequest $processRequest, string $method, ...$params): void
+    {
+        self::$processRequest = $processRequest;
+        self::$redirectionMethod = $method;
+        self::$redirectionParams = $params;
+    }
+
+    public static function sendRedirectToEvent()
+    {
+        $method = self::$redirectionMethod;
+        $params = self::$redirectionParams;
+        $processRequest = self::$processRequest;
+
+        if ($processRequest !== null) {
+            $event = new RedirectToEvent($processRequest, $method, $params);
+            event($event);
+            // clean params to prevent send the same redirect multiple times
+            self::$redirectionParams = [];
+            self::$redirectionMethod = '';
+            self::$processRequest = null;
+        }
+    }
+}

ProcessMaker/Providers/EventServiceProvider.php

@@ -3,6 +3,8 @@
 namespace ProcessMaker\Providers;
 
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
+use ProcessMaker\Events\ActivityAssigned;
+use ProcessMaker\Events\ActivityCompleted;
 use ProcessMaker\Events\ActivityReassignment;
 use ProcessMaker\Events\AuthClientCreated;
 use ProcessMaker\Events\AuthClientDeleted;
@@ -25,6 +27,7 @@
 use ProcessMaker\Events\GroupUsersUpdated;
 use ProcessMaker\Events\PermissionUpdated;
 use ProcessMaker\Events\ProcessArchived;
+use ProcessMaker\Events\ProcessCompleted;
 use ProcessMaker\Events\ProcessCreated;
 use ProcessMaker\Events\ProcessPublished;
 use ProcessMaker\Events\ProcessRestored;
@@ -58,6 +61,9 @@
 use ProcessMaker\Events\UserGroupMembershipUpdated;
 use ProcessMaker\Events\UserRestored;
 use ProcessMaker\Events\UserUpdated;
+use ProcessMaker\Listeners\HandleActivityAssignedInterstitialRedirect;
+use ProcessMaker\Listeners\HandleActivityCompletedRedirect;
+use ProcessMaker\Listeners\HandleEndEventRedirect;
 use ProcessMaker\Listeners\SecurityLogger;
 use ProcessMaker\Listeners\SessionControlSettingsUpdated;
 
@@ -91,6 +97,15 @@ class EventServiceProvider extends ServiceProvider
         SettingsUpdated::class => [
             SessionControlSettingsUpdated::class,
         ],
+        ProcessCompleted::class => [
+            HandleEndEventRedirect::class,
+        ],
+        ActivityCompleted::class => [
+            HandleActivityCompletedRedirect::class,
+        ],
+        ActivityAssigned::class => [
+            HandleActivityAssignedInterstitialRedirect::class,
+        ],
     ];
 
     /**

resources/views/tasks/edit.blade.php

@@ -543,13 +543,6 @@ class="multiselect__tag-icon"></i>
             if (this.task.component && this.task.component === 'AdvancedScreenFrame') {
               return;
             }
-
-            if (endEventDestination) {
-              this.redirect(endEventDestination);
-              return;
-            }
-
-            this.redirect(`/requests/${processRequestId}`);
           },
           error(processRequestId) {
             this.$refs.task.showSimpleErrorMessage();
@@ -562,12 +555,6 @@ class="multiselect__tag-icon"></i>
             if (this.task.component && this.task.component === 'AdvancedScreenFrame') {
               return;
             }
-
-            if (elementDestination) {
-              this.redirect(elementDestination);
-              return;
-            }
-
             this.redirect("/tasks");
           },
           claimTask() {