rodriquelca · May 28, 2024 · May 24, 2024 · May 24, 2024 · May 24, 2024 · May 27, 2024
diff --git a/ProcessMaker/Models/ProcessRequestToken.php b/ProcessMaker/Models/ProcessRequestToken.php
@@ -4,6 +4,7 @@
 
 use Carbon\Carbon;
 use DB;
+use Exception;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Notification;
@@ -135,6 +136,7 @@ class ProcessRequestToken extends ProcessMakerModel implements TokenInterface
      */
     protected $appends = [
         'advanceStatus',
+        'elementDestination'
     ];
 
     /**
@@ -286,29 +288,46 @@ public function assignableUsers()
         return new TokenAssignableUsers($query, $this);
     }
 
-    /**
-     * Get the BPMN definition of the element where the token is.
-     *
-     * @return array|\ProcessMaker\Nayra\Contracts\Bpmn\EntityInterface
-     */
-    public function getDefinition($asObject = false, $par = null)
+    private function getDefinitionFromOwner($asObject)
     {
-        if ($this->getOwner() && $this->getOwnerElement()) {
-            $element = $this->getOwnerElement();
+        $element = $this->getOwnerElement();
 
-            return $asObject ? $element : $element->getProperties();
-        }
+        return $asObject ? $element : $element->getProperties();
+    }
+
+    private function getDefinitionFromRequest($asObject)
+    {
         $request = $this->processRequest ?: $this->getInstance();
+
+        if (!$request) {
+            return [];
+        }
+
         $process = $request->processVersion ?: $request->process;
         $definitions = $process->getDefinitions();
         $element = $definitions->findElementById($this->element_id);
+
         if (!$element) {
             return [];
         }
 
         return $asObject ? $element->getBpmnElementInstance() : $element->getBpmnElementInstance()->getProperties();
     }
 
+    /**
+     * Get the BPMN definition of the element where the token is.
+     *
+     * @return array|\ProcessMaker\Nayra\Contracts\Bpmn\EntityInterface
+     */
+    public function getDefinition($asObject = false, $par = null)
+    {
+        if ($this->getOwner() && $this->getOwnerElement()) {
+            return $this->getDefinitionFromOwner($asObject);
+        }
+
+        return $this->getDefinitionFromRequest($asObject);
+    }
+
     /**
      * Get the BPMN element node where the token is currently located.
      *
@@ -1152,4 +1171,64 @@ public function reassign($toUserId, User $requestingUser)
         $this->user->notify($notification);
         event(new ActivityAssigned($this));
     }
+
+    /**
+     * Determines the destination URL based on the element destination type specified in the definition.
+     *
+     * @return string|null
+     */
+    public function getElementDestinationAttribute(): ?string
+    {
+        $definition = $this->getDefinition();
+        $elementDestinationProp = $definition['elementDestination'] ?? null;
+        $elementDestination = null;
+        $elementDestinationType = null;
+
+        try {
+            $elementDestinationProp = json_decode($elementDestinationProp, true);
+            if (is_array($elementDestinationProp) && array_key_exists('type', $elementDestinationProp)) {
+                $elementDestinationType = $elementDestinationProp['type'];
+            }
+        } catch (Exception $e) {
+            return null;
+        }
+
+        switch ($elementDestinationType) {
+            case 'customDashboard':
+            case 'externalURL':
+                if (array_key_exists('value', $elementDestinationProp)) {
+                    if (is_string($elementDestinationProp['value'])) {
+                        $elementDestination = $elementDestinationProp['value'];
+                    } else {
+                        $elementDestination = $elementDestinationProp['value']['url'] ?? null;
+                    }
+                }
+                break;
+            case 'taskList':
+                $elementDestination = route('tasks.index');
+                break;
+            case 'homepageDashboard':
+                if (hasPackage('package-dynamic-ui')) {
+                    $user = auth()->user();
+                    $elementDestination = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::getHomePage($user);
+                } else {
+                    $elementDestination = route('home');
+                }
+                break;
+            case 'processLaunchpad':
+                $elementDestination = route('process.browser.index', [
+                    'process' => $this->process_id,
+                    'categorySelected' => -1
+                ]);
+                break;
+            case 'taskSource':
+                $elementDestination = $elementDestinationType;
+                break;
+            default:
+                $elementDestination = null;
+                break;
+        }
+
+        return $elementDestination;
+    }
 }
diff --git a/resources/js/processes-catalogue/components/ProcessTab.vue b/resources/js/processes-catalogue/components/ProcessTab.vue
@@ -29,6 +29,7 @@
 <script>
 import RequestTab from "./RequestTab.vue";
 import TaskTab from "./TaskTab.vue";
+
 export default {
   components: {
     RequestTab,
@@ -42,6 +43,9 @@ export default {
       type: Object,
     },
   },
+  mounted() {
+    sessionStorage.setItem("elementDestinationURL", window.location.href);
+  },
 };
 </script>
 <style>

diff --git a/resources/views/tasks/edit.blade.php b/resources/views/tasks/edit.blade.php
@@ -535,11 +535,17 @@ class="multiselect__tag-icon"></i>
           redirectToTask(task, force = false) {
             this.redirect(`/tasks/${task}/edit`, force);
           },
-          closed(taskId) {
+          closed(taskId, elementDestination = null) {
             // avoid redirection if using a customized renderer
             if (this.task.component && this.task.component === 'AdvancedScreenFrame') {
               return;
             }
+
+            if (elementDestination) {
+              this.redirect(elementDestination);
+              return;
+            }
+
             this.redirect("/tasks");
           },
           claimTask() {
@@ -677,7 +683,7 @@ class="multiselect__tag-icon"></i>
               screenFields.forEach((field) => {
                 _.set(draftData, field, _.get(this.formData, field));
               });
-                
+
               return ProcessMaker.apiClient
               .put("drafts/" + this.task.id, draftData)
               .then((response) => {

diff --git a/resources/views/tasks/index.blade.php b/resources/views/tasks/index.blade.php
@@ -171,6 +171,8 @@ class="ml-md-2"
       window.ProcessMaker.taskDraftsEnabled = @json($taskDraftsEnabled);
       window.ProcessMaker.advanced_filter = @json($userFilter);
       window.Processmaker.defaultColumns = @json($defaultColumns);
+
+      window.sessionStorage.setItem('elementDestinationURL', window.location.href);
     </script>
     <script src="{{mix('js/tasks/index.js')}}"></script>
 @endsection