Revert "Merge pull request #8544 from ProcessMaker/feature/FOUR-26707"

This reverts commit 272750c, reversing
changes made to a804b1a.

Author: nolanpro

ProcessMaker/Contracts/ConditionalRedirectServiceInterface.php

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

ProcessMaker/Events/ProcessUpdated.php

@@ -13,7 +13,6 @@
 use Laravel\Scout\Searchable;
 use Log;
 use ProcessMaker\Casts\MillisecondsToDateCast;
-use ProcessMaker\Contracts\ConditionalRedirectServiceInterface;
 use ProcessMaker\Events\ActivityAssigned;
 use ProcessMaker\Events\ActivityReassignment;
 use ProcessMaker\Facades\WorkflowUserManager;
@@ -1395,28 +1394,10 @@ public function reassign($toUserId, User $requestingUser, $comments = '')
      *
      * @return array|null Returns the destination URL.
      */
-    private function getElementDestination($elementDestinationType, $elementDestinationProp, array $conditionalRedirectProp): ?array
+    private function getElementDestination($elementDestinationType, $elementDestinationProp): ?array
     {
         $elementDestination = null;
 
-        if (!empty($conditionalRedirectProp['isEnabled']) && !empty($conditionalRedirectProp['conditions'])) {
-            $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' => $url,
-                    ],
-                ];
-            }
-        }
         switch ($elementDestinationType) {
             case 'anotherProcess':
             case 'customDashboard':
@@ -1460,15 +1441,6 @@ private function getElementDestination($elementDestinationType, $elementDestinat
         ];
     }
 
-    private function evaluateConditionalRedirect(ConditionalRedirectServiceInterface $conditionalRedirectService, array $conditionalRedirectProp): ?array
-    {
-        if (!$conditionalRedirectProp['isEnabled']) {
-            return null;
-        }
-
-        return $conditionalRedirectService->resolveForToken($conditionalRedirectProp['conditions'], $this);
-    }
-
     /**
      * Determines the destination URL based on the element destination type specified in the definition.
      *
@@ -1479,8 +1451,6 @@ public function getElementDestinationAttribute(): ?array
         $definition = $this->getDefinition();
         $elementDestinationProp = $definition['elementDestination'] ?? null;
         $elementDestinationType = null;
-        $conditionalRedirectProp = $definition['conditionalRedirect'] ?? '[]';
-        $conditionalRedirectProp = json_decode($conditionalRedirectProp, true);
 
         try {
             $elementDestinationProp = json_decode($elementDestinationProp, true);
@@ -1491,7 +1461,7 @@ public function getElementDestinationAttribute(): ?array
             return null;
         }
 
-        return $this->getElementDestination($elementDestinationType, $elementDestinationProp, $conditionalRedirectProp);
+        return $this->getElementDestination($elementDestinationType, $elementDestinationProp);
     }
 
     /**

ProcessMaker/Models/ProcessRequestToken.php

@@ -29,7 +29,6 @@
 use ProcessMaker\Cache\Settings\SettingCacheManager;
 use ProcessMaker\Console\Commands\HorizonListen;
 use ProcessMaker\Console\Migration\ExtendedMigrateCommand;
-use ProcessMaker\Contracts\ConditionalRedirectServiceInterface;
 use ProcessMaker\Events\ActivityAssigned;
 use ProcessMaker\Events\ScreenBuilderStarting;
 use ProcessMaker\Events\TenantResolved;
@@ -50,7 +49,6 @@
 use ProcessMaker\PolicyExtension;
 use ProcessMaker\Providers\PermissionServiceProvider;
 use ProcessMaker\Repositories\SettingsConfigRepository;
-use ProcessMaker\Services\ConditionalRedirectService;
 use RuntimeException;
 use Spatie\Multitenancy\Events\MadeTenantCurrentEvent;
 use Spatie\Multitenancy\Events\TenantNotFoundForRequestEvent;
@@ -243,12 +241,6 @@ public function register(): void
         });
 
         $this->app->instance('tenant-resolved', false);
-
-        /**
-         * Conditional Redirect Service
-         * This service is used to evaluate the conditional redirect property of a process request token.
-         */
-        $this->app->bind(ConditionalRedirectServiceInterface::class, ConditionalRedirectService::class);
     }
 
     /**