FOUR-15859: On Process End - Start a request for another selected process

rodriquelca · rodriquelca · commit c89b08d5212f · 2024-06-06T15:22:30.000-04:00
diff --git a/ProcessMaker/Models/ProcessRequest.php b/ProcessMaker/Models/ProcessRequest.php
@@ -1057,9 +1057,9 @@ public function getProcessVersionAlternativeAttribute(): string | null
     /**
      * Retrieves the destination of the first closed end event.
      *
-     * @return ?string Returns a string value representing the element destination of the first closed end event.
+     * @return ?array Returns a string value representing the element destination of the first closed end event.
      */
-    public function getElementDestination(): ?string
+    public function getElementDestination(): ?array
     {
         $endEvents = $this->tokens()
             ->where('element_type', 'end_event')
diff --git a/ProcessMaker/Models/ProcessRequestToken.php b/ProcessMaker/Models/ProcessRequestToken.php
@@ -136,7 +136,7 @@ class ProcessRequestToken extends ProcessMakerModel implements TokenInterface
      */
     protected $appends = [
         'advanceStatus',
-        'elementDestination'
+        'elementDestination',
     ];
 
     /**
@@ -1196,13 +1196,14 @@ public function reassign($toUserId, User $requestingUser)
      * @param elementDestinationType Used to determine the type of destination for an element.
      * @param elementDestinationProp Used to determine the properties of the destination for an element.
      *
-     * @return string|null Returns the destination URL.
+     * @return array|null Returns the destination URL.
      */
-    private function getElementDestination($elementDestinationType, $elementDestinationProp): ?string
+    private function getElementDestination($elementDestinationType, $elementDestinationProp): ?array
     {
         $elementDestination = null;
 
         switch ($elementDestinationType) {
+            case 'anotherProcess':
             case 'customDashboard':
             case 'externalURL':
                 if (array_key_exists('value', $elementDestinationProp)) {
@@ -1227,7 +1228,7 @@ private function getElementDestination($elementDestinationType, $elementDestinat
             case 'processLaunchpad':
                 $elementDestination = route('process.browser.index', [
                     'process' => $this->process_id,
-                    'categorySelected' => -1
+                    'categorySelected' => -1,
                 ]);
                 break;
             case 'taskSource':
@@ -1236,18 +1237,20 @@ private function getElementDestination($elementDestinationType, $elementDestinat
             default:
                 $elementDestination = null;
                 break;
-
         }
 
-        return $elementDestination;
+        return [
+            'type' => $elementDestinationType,
+            'value' => $elementDestination,
+        ];
     }
 
     /**
      * Determines the destination URL based on the element destination type specified in the definition.
      *
-     * @return string|null
+     * @return array|null
      */
-    public function getElementDestinationAttribute(): ?string
+    public function getElementDestinationAttribute(): ?array
     {
         $definition = $this->getDefinition();
         $elementDestinationProp = $definition['elementDestination'] ?? null;

Original file line number	Diff line number	Diff line change
`@@ -1057,9 +1057,9 @@ public function getProcessVersionAlternativeAttribute(): string \| null`
`1057`	`1057`	`/**`
`1058`	`1058`	`* Retrieves the destination of the first closed end event.`
`1059`	`1059`	`*`
`1060`		`- * @return ?string Returns a string value representing the element destination of the first closed end event.`
	`1060`	`+ * @return ?array Returns a string value representing the element destination of the first closed end event.`
`1061`	`1061`	`*/`
`1062`		`- public function getElementDestination(): ?string`
	`1062`	`+ public function getElementDestination(): ?array`
`1063`	`1063`	`{`
`1064`	`1064`	`$endEvents = $this->tokens()`
`1065`	`1065`	`->where('element_type', 'end_event')`