Merge pull request #8545 from ProcessMaker/FOUR-26713

FOUR-26713 Make the adjustments required in ScreenBuilder to support the Conditional Destination

Author: caleeli

ProcessMaker/Events/ProcessUpdated.php

@@ -26,6 +26,8 @@ class ProcessUpdated implements ShouldBroadcastNow
 
     public $activeTokens;
 
+    public $elementDestination;
+
     /**
      * Create a new event instance.
      *
@@ -41,6 +43,7 @@ public function __construct(ProcessRequest $processRequest, $event, TokenInterfa
         if ($token) {
             $this->tokenId = $token->getId();
             $this->elementType = $token->element_type;
+            $this->elementDestination = $token->elementDestination;
         }
     }
 

ProcessMaker/Models/ProcessRequestToken.php

@@ -1317,10 +1317,17 @@ private function getElementDestination($elementDestinationType, $elementDestinat
             $result = $this->evaluateConditionalRedirect(app(ConditionalRedirectServiceInterface::class), $conditionalRedirectProp);
             if ($result) {
                 $elementDestinationType = $result['taskDestination']['value'];
+
+                $url = match ($elementDestinationType) {
+                    'customDashboard' => $result['customDashboard']['url'] ?? null,
+                    'externalURL' => $result['externalUrl'] ?? null,
+                    default => null,
+                };
+
                 $elementDestinationProp = [
                     'value' => [
-                        'url' => ($result['customDashboard']['url'] ?? null) ?: ($result['externalUrl'] ?? null),
-                    ]
+                        'url' => $url,
+                    ],
                 ];
             }
         }
@@ -1372,6 +1379,7 @@ private function evaluateConditionalRedirect(ConditionalRedirectServiceInterface
         if (!$conditionalRedirectProp['isEnabled']) {
             return null;
         }
+
         return $conditionalRedirectService->resolveForToken($conditionalRedirectProp['conditions'], $this);
     }