From 880126763fcc4b6e2a093a1183cbe3966b7abaa3 Mon Sep 17 00:00:00 2001
From: Gustavo Bascope <gustavo.bascope@processmaker.com>
Date: Fri, 9 Jun 2023 16:38:52 -0400
Subject: [PATCH 01/14] Implement loading state for tooltip

---
 .../modeler/components/ProcessMap.vue         | 17 +++++++
 .../modeler/components/ProcessMapTooltip.vue  | 45 ++++++++++++++++---
 2 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/resources/js/processes/modeler/components/ProcessMap.vue b/resources/js/processes/modeler/components/ProcessMap.vue
index 8d8fe2431d..5d214d8dc9 100644
--- a/resources/js/processes/modeler/components/ProcessMap.vue
+++ b/resources/js/processes/modeler/components/ProcessMap.vue
@@ -13,6 +13,7 @@
             left: `${tooltip.newX}px`,
             top: `${tooltip.newY}px`
           }"
+          @is-loading="getIsLoading"
         />
         <ModelerReadonly
           ref="modeler"
@@ -49,6 +50,7 @@ export default {
       },
       tooltip: {
         isActive: false,
+        isLoading: false,
         nodeId: null,
         allowedNodes: [
           "bpmn:Task",
@@ -65,6 +67,18 @@ export default {
       requestInProgressNodes: window.ProcessMaker.modeler.requestInProgressNodes,
     };
   },
+  watch: {
+    "tooltip.isLoading": {
+      handler(value) {
+        if (!value) {
+          this.$nextTick().then(() => {
+            this.calculateTooltipPosition();
+          });
+        }
+      },
+      deep: true,
+    },
+  },
   mounted() {
     ProcessMaker.$modeler = this.$refs.modeler;
   },
@@ -106,6 +120,9 @@ export default {
         this.tooltip.newX = window.innerWidth - this.rectTooltip.width;
       }
     },
+    getIsLoading(value) {
+      this.tooltip.isLoading = value;
+    },
   },
 };
 </script>
diff --git a/resources/js/processes/modeler/components/ProcessMapTooltip.vue b/resources/js/processes/modeler/components/ProcessMapTooltip.vue
index a9120a8816..83671b5399 100644
--- a/resources/js/processes/modeler/components/ProcessMapTooltip.vue
+++ b/resources/js/processes/modeler/components/ProcessMapTooltip.vue
@@ -4,6 +4,16 @@
     class="card shadow-sm"
   >
     <div
+      v-if="isLoading"
+      class="d-flex justify-content-center"
+    >
+      <div
+        class="spinner-border text-primary"
+        role="status"
+      />
+    </div>
+    <div
+      v-if="!isLoading"
       class="card-body"
       style="padding-top: 10px; padding-bottom: 5px"
     >
@@ -11,16 +21,16 @@
         <span class="text-info">{{ nodeId }}</span>
       </p>
       <p class="tooltip-data">
-        <span class="tooltip-data-title">Status:</span><span class="text-secondary">Complete</span>
+        <span class="tooltip-data-title">{{ $t('Status') }}:</span><span class="text-secondary">Complete</span>
       </p>
       <p class="tooltip-data">
-        <span class="tooltip-data-title">Completed By:</span><span class="text-secondary">UserName</span>
+        <span class="tooltip-data-title">{{ $t('Completed By') }}:</span><span class="text-secondary">UserName</span>
       </p>
       <p class="tooltip-data">
-        <span class="tooltip-data-title">Time Started:</span><span class="text-secondary">11/21/23 16:51</span>
+        <span class="tooltip-data-title">{{ $t('Time Started') }}:</span><span class="text-secondary">11/21/23 16:51</span>
       </p>
       <p class="tooltip-data">
-        <span class="tooltip-data-title">Time Completed:</span><span class="text-secondary">11/21/23 16:53</span>
+        <span class="tooltip-data-title">{{ $t('Time Completed') }}:</span><span class="text-secondary">11/21/23 16:53</span>
       </p>
     </div>
   </div>
@@ -35,10 +45,33 @@ export default {
         return "";
       },
     },
-
   },
-
+  data() {
+    return {
+      isLoading: false,
+    };
+  },
+  watch: {
+    nodeId() {
+      this.getInformation();
+    },
+    isLoading(value) {
+      this.$emit("is-loading", value);
+    },
+  },
+  mounted() {
+    //
+  },
+  methods: {
+    getInformation() {
+      this.isLoading = true;
+      setTimeout(() => {
+        this.isLoading = false;
+      }, 2000);
+    },
+  },
 };
+
 </script>
 <style>
 #tooltip {

From 9b420f8eadfa466bc22792a788e7a34f5cfe997e Mon Sep 17 00:00:00 2001
From: Gustavo Bascope <gustavo.bascope@processmaker.com>
Date: Mon, 12 Jun 2023 14:10:59 -0400
Subject: [PATCH 02/14] add tooltip information endpoint

---
 .../Http/Controllers/Api/ProcessRequestController.php | 11 +++++++++++
 .../modeler/components/ProcessMapTooltip.vue          |  8 +++++++-
 routes/api.php                                        |  1 +
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php b/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
index 92abf0c58c..c7ef45d8ed 100644
--- a/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
+++ b/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
@@ -20,6 +20,7 @@
 use ProcessMaker\Facades\WorkflowManager;
 use ProcessMaker\Http\Controllers\Controller;
 use ProcessMaker\Http\Resources\ApiCollection;
+use ProcessMaker\Http\Resources\ApiResource;
 use ProcessMaker\Http\Resources\ProcessRequests as ProcessRequestResource;
 use ProcessMaker\Jobs\CancelRequest;
 use ProcessMaker\Jobs\TerminateRequest;
@@ -608,4 +609,14 @@ private function getTaskName($fields, $request)
 
         return $token->element_name;
     }
+
+    public function getRequestToken(Request $httpRequest, ProcessRequest $request)
+    {
+        $maxIdToken = $request->tokens()
+                 ->where(['element_id' => 'node_220'])->max('id');
+
+        $token =  ProcessRequestToken::where(['id' => $maxIdToken])->get();                
+
+        return new ApiResource($token);
+    }
 }
diff --git a/resources/js/processes/modeler/components/ProcessMapTooltip.vue b/resources/js/processes/modeler/components/ProcessMapTooltip.vue
index 83671b5399..9357c38c59 100644
--- a/resources/js/processes/modeler/components/ProcessMapTooltip.vue
+++ b/resources/js/processes/modeler/components/ProcessMapTooltip.vue
@@ -60,7 +60,7 @@ export default {
     },
   },
   mounted() {
-    //
+    this.getTaskTokens();
   },
   methods: {
     getInformation() {
@@ -69,6 +69,12 @@ export default {
         this.isLoading = false;
       }, 2000);
     },
+    getTaskTokens() {
+      ProcessMaker.apiClient.get(`requests/2/tokens`)
+        .then((response) => {
+          console.log(response);
+        });
+    },
   },
 };
 
diff --git a/routes/api.php b/routes/api.php
index c43b0b88e6..b93e26387e 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -160,6 +160,7 @@
     Route::put('requests/{request}', [ProcessRequestController::class, 'update'])->name('requests.update')->middleware('can:update,request');
     Route::put('requests/{request}/retry', [ProcessRequestController::class, 'retry'])->name('requests.retry')->middleware('can:update,request');
     Route::delete('requests/{request}', [ProcessRequestController::class, 'destroy'])->name('requests.destroy')->middleware('can:destroy,request');
+    Route::get('requests/{request}/tokens', [ProcessRequestController::class, 'getRequestToken'])->name('requests.getRequestToken')->middleware('can:view,request');
     Route::post('requests/{request}/events/{event}', [ProcessRequestController::class, 'activateIntermediateEvent'])->name('requests.update,request');
 
     // Request Files

From 227fd790b173006605f56224d286114b51d28b10 Mon Sep 17 00:00:00 2001
From: Eleazar Resendez <eleazar.resendez@processmaker.com>
Date: Tue, 13 Jun 2023 13:00:21 -0600
Subject: [PATCH 03/14] Update Map Legend colors

---
 .../processes/modeler/partials/map-legend.blade.php      | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/resources/views/processes/modeler/partials/map-legend.blade.php b/resources/views/processes/modeler/partials/map-legend.blade.php
index e54af33575..4bda73ab30 100644
--- a/resources/views/processes/modeler/partials/map-legend.blade.php
+++ b/resources/views/processes/modeler/partials/map-legend.blade.php
@@ -13,6 +13,11 @@
 
 @section('css')
   <style>
+    :root {
+      --color-line-in-progress: #1572C2;
+      --color-line-completed: #00875A;
+    }
+
     #map-legend.map-legend-card {
       position: absolute;
       top: 70px;
@@ -44,12 +49,12 @@
 
     .in-progress-line {
       border-right-style: dashed;
-      border-right-color: #00875A;
+      border-right-color: var(--color-line-in-progress);
     }
 
     .completed-line {
       border-right-style: solid;
-      border-right-color: #5faaee;
+      border-right-color: var(--color-line-completed);
     }
   </style>
 @endsection

From 6218f76429996ab84a804981c5991872ea5ab93d Mon Sep 17 00:00:00 2001
From: Gustavo Bascope <gustavo.bascope@processmaker.com>
Date: Tue, 13 Jun 2023 15:23:42 -0400
Subject: [PATCH 04/14] ProcessRequestToken endpoint and tooltip information

---
 .../Api/ProcessRequestController.php          | 13 ++-
 .../Controllers/Process/ModelerController.php |  1 +
 .../modeler/components/ProcessMap.vue         |  5 +
 .../modeler/components/ProcessMapTooltip.vue  | 95 ++++++++++++++-----
 .../processes/modeler/inflight.blade.php      |  1 +
 5 files changed, 87 insertions(+), 28 deletions(-)

diff --git a/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php b/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
index c7ef45d8ed..723d7d7eb1 100644
--- a/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
+++ b/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
@@ -613,9 +613,16 @@ private function getTaskName($fields, $request)
     public function getRequestToken(Request $httpRequest, ProcessRequest $request)
     {
         $maxIdToken = $request->tokens()
-                 ->where(['element_id' => 'node_220'])->max('id');
-
-        $token =  ProcessRequestToken::where(['id' => $maxIdToken])->get();                
+                 ->where(['element_id' => $httpRequest->element_id])->max('id');                
+
+        $token =  ProcessRequestToken::where(['process_request_tokens.id' => $maxIdToken])
+                ->join('users', 'users.id', 'process_request_tokens.user_id')
+                ->selectRaw('element_id, element_name, process_request_tokens.created_at, completed_at, username, 
+                            CASE 
+                            WHEN process_request_tokens.status = "CLOSED" THEN "Completed" 
+                            WHEN process_request_tokens.status = "ACTIVE" THEN "In Progress" 
+                            END as status')
+                ->get();                
 
         return new ApiResource($token);
     }
diff --git a/ProcessMaker/Http/Controllers/Process/ModelerController.php b/ProcessMaker/Http/Controllers/Process/ModelerController.php
index 688f02c0de..2a0b4e0575 100644
--- a/ProcessMaker/Http/Controllers/Process/ModelerController.php
+++ b/ProcessMaker/Http/Controllers/Process/ModelerController.php
@@ -74,6 +74,7 @@ public function inflight(ModelerManager $manager, Process $process, Request $req
             'bpmn' => $bpmn,
             'requestCompletedNodes' => $filteredCompletedNodes,
             'requestInProgressNodes' => $requestInProgressNodes,
+            'requestId' => $request->request_id,
         ]);
     }
 }
diff --git a/resources/js/processes/modeler/components/ProcessMap.vue b/resources/js/processes/modeler/components/ProcessMap.vue
index 5d214d8dc9..1c726196f2 100644
--- a/resources/js/processes/modeler/components/ProcessMap.vue
+++ b/resources/js/processes/modeler/components/ProcessMap.vue
@@ -9,6 +9,8 @@
           v-show="tooltip.isActive"
           ref="tooltip"
           :node-id="tooltip.nodeId"
+          :node-name="tooltip.nodeName"
+          :request-id="requestId"
           :style="{
             left: `${tooltip.newX}px`,
             top: `${tooltip.newY}px`
@@ -52,6 +54,7 @@ export default {
         isActive: false,
         isLoading: false,
         nodeId: null,
+        nodeName: null,
         allowedNodes: [
           "bpmn:Task",
           "bpmn:ManualTask",
@@ -65,6 +68,7 @@ export default {
       },
       requestCompletedNodes: window.ProcessMaker.modeler.requestCompletedNodes,
       requestInProgressNodes: window.ProcessMaker.modeler.requestInProgressNodes,
+      requestId: window.ProcessMaker.modeler.requestId,
     };
   },
   watch: {
@@ -98,6 +102,7 @@ export default {
       if ((isNodeTooltipAllowed && this.tooltip.isActive === false)
         || (isNodeTooltipAllowed && this.tooltip.nodeId !== node.id)) {
         this.tooltip.nodeId = node.id;
+        this.tooltip.nodeName = node.name;
         this.tooltip.isActive = true;
         this.$nextTick(() => {
           this.tooltip.coordinates = { x: event.clientX, y: event.clientY };
diff --git a/resources/js/processes/modeler/components/ProcessMapTooltip.vue b/resources/js/processes/modeler/components/ProcessMapTooltip.vue
index 9357c38c59..10ececc3c8 100644
--- a/resources/js/processes/modeler/components/ProcessMapTooltip.vue
+++ b/resources/js/processes/modeler/components/ProcessMapTooltip.vue
@@ -17,25 +17,41 @@
       class="card-body"
       style="padding-top: 10px; padding-bottom: 5px"
     >
-      <p class="tooltip-title">
-        <span class="text-info">{{ nodeId }}</span>
-      </p>
-      <p class="tooltip-data">
-        <span class="tooltip-data-title">{{ $t('Status') }}:</span><span class="text-secondary">Complete</span>
-      </p>
-      <p class="tooltip-data">
-        <span class="tooltip-data-title">{{ $t('Completed By') }}:</span><span class="text-secondary">UserName</span>
-      </p>
-      <p class="tooltip-data">
-        <span class="tooltip-data-title">{{ $t('Time Started') }}:</span><span class="text-secondary">11/21/23 16:51</span>
-      </p>
-      <p class="tooltip-data">
-        <span class="tooltip-data-title">{{ $t('Time Completed') }}:</span><span class="text-secondary">11/21/23 16:53</span>
-      </p>
+      <div v-if="!tokenResult.hasOwnProperty('message')">
+        <p class="tooltip-title">
+          <span class="text-info">{{ tokenResult.element_name }}</span>
+        </p>
+        <p class="tooltip-data">
+          <span class="tooltip-data-title">{{ $t('Status') }}:</span>
+          <span class="text-secondary">{{ tokenResult.status }}</span>
+        </p>
+        <p class="tooltip-data">
+          <span class="tooltip-data-title">{{ $t('Completed By') }}:</span>
+          <span class="text-secondary">{{ tokenResult.username }}</span>
+        </p>
+        <p class="tooltip-data">
+          <span class="tooltip-data-title">{{ $t('Time Started') }}:</span>
+          <span class="text-secondary">{{ tokenResult.created_at }}</span>
+        </p>
+        <p class="tooltip-data">
+          <span class="tooltip-data-title">{{ $t('Time Completed') }}:</span>
+          <span class="text-secondary">{{ tokenResult.completed_at }}</span>
+        </p>
+      </div>
+      <div v-if="tokenResult.hasOwnProperty('message')">
+        <p class="tooltip-title">
+          <span class="text-info">{{ nodeName }}</span>
+        </p>
+        <p class="tooltip-data">
+          <span class="tooltip-data-title">{{ tokenResult.message }}</span>
+        </p>
+      </div>
     </div>
   </div>
 </template>
 <script>
+import moment from "moment";
+
 export default {
   name: "ProcessMapTooltip",
   props: {
@@ -45,36 +61,65 @@ export default {
         return "";
       },
     },
+    nodeName: {
+      type: String,
+      default() {
+        return "";
+      },
+    },
+    requestId: {
+      type: String,
+      default() {
+        return null;
+      },
+    },
   },
   data() {
     return {
       isLoading: false,
+      tokenResult: {},
     };
   },
   watch: {
     nodeId() {
-      this.getInformation();
+      this.getRequestTokens();
     },
     isLoading(value) {
       this.$emit("is-loading", value);
     },
   },
   mounted() {
-    this.getTaskTokens();
+    this.getRequestTokens();
   },
   methods: {
-    getInformation() {
+    getRequestTokens() {
       this.isLoading = true;
-      setTimeout(() => {
-        this.isLoading = false;
-      }, 2000);
-    },
-    getTaskTokens() {
-      ProcessMaker.apiClient.get(`requests/2/tokens`)
+      ProcessMaker.apiClient.get(`requests/${this.requestId}/tokens`, {
+        params: {
+          element_id: this.nodeId,
+        },
+      })
         .then((response) => {
-          console.log(response);
+          if (response.data.length > 0) {
+            this.isLoading = false;
+            [this.tokenResult] = response.data;
+            this.tokenResult.created_at = this.formatDate(this.tokenResult.created_at);
+            if (this.tokenResult.completed_at === null) {
+              this.tokenResult.completed_at = "-";
+            } else {
+              this.tokenResult.completed_at = this.formatDate(this.tokenResult.completed_at);
+            }
+          } else {
+            this.tokenResult = {
+              message: "No Information found.",
+            };
+            this.isLoading = false;
+          }
         });
     },
+    formatDate(date) {
+      return moment(date).format("MM/DD/YY HH:mm");
+    },
   },
 };
 
diff --git a/resources/views/processes/modeler/inflight.blade.php b/resources/views/processes/modeler/inflight.blade.php
index 5e4ba1ad4a..84c6d4bd7b 100644
--- a/resources/views/processes/modeler/inflight.blade.php
+++ b/resources/views/processes/modeler/inflight.blade.php
@@ -34,6 +34,7 @@
       configurables: [],
       requestCompletedNodes: @json($requestCompletedNodes),
       requestInProgressNodes: @json($requestInProgressNodes),
+      requestId: @json($requestId),
     }
 
     window.ProcessMaker.EventBus.$on('modeler-start', ({

From 17bf03e3ec785c0ca0f289975c5db9d91f910e83 Mon Sep 17 00:00:00 2001
From: Eleazar Resendez <eleazar.resendez@processmaker.com>
Date: Tue, 13 Jun 2023 15:46:32 -0600
Subject: [PATCH 05/14] Highlight unused nodes

---
 .../Controllers/Process/ModelerController.php | 36 ++++++++++++++++++-
 .../modeler/components/ProcessMap.vue         |  2 ++
 .../processes/modeler/inflight.blade.php      |  1 +
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/ProcessMaker/Http/Controllers/Process/ModelerController.php b/ProcessMaker/Http/Controllers/Process/ModelerController.php
index 688f02c0de..e50643b89a 100644
--- a/ProcessMaker/Http/Controllers/Process/ModelerController.php
+++ b/ProcessMaker/Http/Controllers/Process/ModelerController.php
@@ -3,6 +3,7 @@
 namespace ProcessMaker\Http\Controllers\Process;
 
 use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
 use ProcessMaker\Events\ModelerStarting;
 use ProcessMaker\Http\Controllers\Controller;
 use ProcessMaker\Managers\ModelerManager;
@@ -11,6 +12,7 @@
 use ProcessMaker\Models\ProcessRequest;
 use ProcessMaker\PackageHelper;
 use ProcessMaker\Traits\HasControllerAddons;
+use SimpleXMLElement;
 
 class ModelerController extends Controller
 {
@@ -53,6 +55,7 @@ public function inflight(ModelerManager $manager, Process $process, Request $req
         $bpmn = $process->bpmn;
         $requestCompletedNodes = [];
         $requestInProgressNodes = [];
+        $requestIdleNodes = [];
 
         // Use the process version that was active when the request was started.
         $processRequest = ProcessRequest::find($request->request_id);
@@ -62,10 +65,14 @@ public function inflight(ModelerManager $manager, Process $process, Request $req
                 ->firstOrFail()
                 ->bpmn;
 
-            $requestCompletedNodes = $processRequest->tokens()->where('status', 'CLOSED')->pluck('element_id');
+            $requestCompletedNodes = $processRequest->tokens()->whereIn('status', ['CLOSED', 'TRIGGERED'])->pluck('element_id');
             $requestInProgressNodes = $processRequest->tokens()->where('status', 'ACTIVE')->pluck('element_id');
             // Remove any node that is 'ACTIVE' from the 'CLOSED' list.
             $filteredCompletedNodes = $requestCompletedNodes->diff($requestInProgressNodes)->values();
+
+            $xml = $this->loadAndPrepareXML($bpmn);
+            $nodeIds = $this->filterXML($xml);
+            $requestIdleNodes = $nodeIds->diff($filteredCompletedNodes)->diff($requestInProgressNodes)->values();
         }
 
         return view('processes.modeler.inflight', [
@@ -74,6 +81,33 @@ public function inflight(ModelerManager $manager, Process $process, Request $req
             'bpmn' => $bpmn,
             'requestCompletedNodes' => $filteredCompletedNodes,
             'requestInProgressNodes' => $requestInProgressNodes,
+            'requestIdleNodes' => $requestIdleNodes,
         ]);
     }
+
+    /**
+     * Load XML from a string and register its namespaces.
+     * This function will help to prepare the XML for further processing.
+     */
+    private function loadAndPrepareXML(string $bpmn): SimpleXMLElement
+    {
+        $xml = simplexml_load_string($bpmn);
+        $namespaces = $xml->getNamespaces(true);
+
+        foreach ($namespaces as $prefix => $ns) {
+            $xml->registerXPathNamespace($prefix, $ns);
+        }
+
+        return $xml;
+    }
+
+    /**
+     * Filter the XML to get IDs of all nodes excluding "lanes" and "pools" nodes.
+     */
+    private function filterXML(SimpleXMLElement $xml): Collection
+    {
+        $elements = $xml->xpath('//*[name() != "bpmn:lane" and name() != "bpmn:participant"]/@id');
+
+        return collect(array_map('strval', $elements));
+    }
 }
diff --git a/resources/js/processes/modeler/components/ProcessMap.vue b/resources/js/processes/modeler/components/ProcessMap.vue
index 8d8fe2431d..378bf72fc3 100644
--- a/resources/js/processes/modeler/components/ProcessMap.vue
+++ b/resources/js/processes/modeler/components/ProcessMap.vue
@@ -20,6 +20,7 @@
           :decorations="decorations"
           :request-completed-nodes="requestCompletedNodes"
           :request-in-progress-nodes="requestInProgressNodes"
+          :request-idle-nodes="requestIdleNodes"
           @set-xml-manager="xmlManager = $event"
           @click="handleClick"
         />
@@ -63,6 +64,7 @@ export default {
       },
       requestCompletedNodes: window.ProcessMaker.modeler.requestCompletedNodes,
       requestInProgressNodes: window.ProcessMaker.modeler.requestInProgressNodes,
+      requestIdleNodes: window.ProcessMaker.modeler.requestIdleNodes,
     };
   },
   mounted() {
diff --git a/resources/views/processes/modeler/inflight.blade.php b/resources/views/processes/modeler/inflight.blade.php
index 5e4ba1ad4a..98e82107de 100644
--- a/resources/views/processes/modeler/inflight.blade.php
+++ b/resources/views/processes/modeler/inflight.blade.php
@@ -34,6 +34,7 @@
       configurables: [],
       requestCompletedNodes: @json($requestCompletedNodes),
       requestInProgressNodes: @json($requestInProgressNodes),
+      requestIdleNodes: @json($requestIdleNodes),
     }
 
     window.ProcessMaker.EventBus.$on('modeler-start', ({

From 2c7cbb85dea8908feb4af5bf6ee111cec68679d0 Mon Sep 17 00:00:00 2001
From: Gustavo Bascope <gustavo.bascope@processmaker.com>
Date: Wed, 14 Jun 2023 11:25:44 -0400
Subject: [PATCH 06/14] fix endpoint query

---
 .../Http/Controllers/Api/ProcessRequestController.php         | 2 +-
 .../js/processes/modeler/components/ProcessMapTooltip.vue     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php b/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
index 723d7d7eb1..81ba20bf69 100644
--- a/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
+++ b/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
@@ -622,7 +622,7 @@ public function getRequestToken(Request $httpRequest, ProcessRequest $request)
                             WHEN process_request_tokens.status = "CLOSED" THEN "Completed" 
                             WHEN process_request_tokens.status = "ACTIVE" THEN "In Progress" 
                             END as status')
-                ->get();                
+                ->first();                
 
         return new ApiResource($token);
     }
diff --git a/resources/js/processes/modeler/components/ProcessMapTooltip.vue b/resources/js/processes/modeler/components/ProcessMapTooltip.vue
index 10ececc3c8..89d877248a 100644
--- a/resources/js/processes/modeler/components/ProcessMapTooltip.vue
+++ b/resources/js/processes/modeler/components/ProcessMapTooltip.vue
@@ -100,9 +100,9 @@ export default {
         },
       })
         .then((response) => {
-          if (response.data.length > 0) {
+          if (response.data.length !== 0) {
             this.isLoading = false;
-            [this.tokenResult] = response.data;
+            this.tokenResult = response.data;
             this.tokenResult.created_at = this.formatDate(this.tokenResult.created_at);
             if (this.tokenResult.completed_at === null) {
               this.tokenResult.completed_at = "-";

From d5c8b0c789819b301a70f5c1f486e7d7790ab051 Mon Sep 17 00:00:00 2001
From: Eleazar Resendez <eleazar.resendez@processmaker.com>
Date: Wed, 14 Jun 2023 12:39:23 -0600
Subject: [PATCH 07/14] Color sequence flow elements

---
 .../Controllers/Process/ModelerController.php | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/ProcessMaker/Http/Controllers/Process/ModelerController.php b/ProcessMaker/Http/Controllers/Process/ModelerController.php
index e50643b89a..21a39ed44e 100644
--- a/ProcessMaker/Http/Controllers/Process/ModelerController.php
+++ b/ProcessMaker/Http/Controllers/Process/ModelerController.php
@@ -70,9 +70,14 @@ public function inflight(ModelerManager $manager, Process $process, Request $req
             // Remove any node that is 'ACTIVE' from the 'CLOSED' list.
             $filteredCompletedNodes = $requestCompletedNodes->diff($requestInProgressNodes)->values();
 
+            // Get idle nodes.
             $xml = $this->loadAndPrepareXML($bpmn);
-            $nodeIds = $this->filterXML($xml);
+            $nodeIds = $this->getNodeIds($xml);
             $requestIdleNodes = $nodeIds->diff($filteredCompletedNodes)->diff($requestInProgressNodes)->values();
+
+            // Add completed sequence flow to the list of completed nodes.
+            $sequenceFlowNodes = $this->getCompletedSequenceFlow($xml, $filteredCompletedNodes->implode(' '), $requestInProgressNodes->implode(' '));
+            $filteredCompletedNodes = $filteredCompletedNodes->merge($sequenceFlowNodes);
         }
 
         return view('processes.modeler.inflight', [
@@ -104,10 +109,23 @@ private function loadAndPrepareXML(string $bpmn): SimpleXMLElement
     /**
      * Filter the XML to get IDs of all nodes excluding "lanes" and "pools" nodes.
      */
-    private function filterXML(SimpleXMLElement $xml): Collection
+    private function getNodeIds(SimpleXMLElement $xml): Collection
     {
         $elements = $xml->xpath('//*[name() != "bpmn:lane" and name() != "bpmn:participant"]/@id');
 
         return collect(array_map('strval', $elements));
     }
+
+    /**
+     * Performs an XPath query to get sequenceFlow elements
+     * whose 'sourceRef' attribute is in the string of completed nodes
+     * and 'targetRef' attribute is in the string of in-progress and completed nodes.
+     */
+    private function getCompletedSequenceFlow(SimpleXMLElement $xml, string $completedNodesStr, string $inProgressNodesStr): Collection
+    {
+        $inProgressAndCompletedNodes = $completedNodesStr . ' ' . $inProgressNodesStr;
+        $elements = $xml->xpath('//bpmn:sequenceFlow[contains("' . $completedNodesStr . '", @sourceRef) and contains("' . $inProgressAndCompletedNodes . '", @targetRef)]/@id');
+
+        return collect(array_map('strval', $elements));
+    }
 }

From aa4e9a8f06acb5d702084361519c4375bd33dc66 Mon Sep 17 00:00:00 2001
From: Gustavo Bascope <gustavo.bascope@processmaker.com>
Date: Thu, 15 Jun 2023 12:54:22 -0400
Subject: [PATCH 08/14] repeat paths count added

---
 .../Api/ProcessRequestController.php          | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php b/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
index 81ba20bf69..5e957db7b5 100644
--- a/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
+++ b/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
@@ -610,6 +610,24 @@ private function getTaskName($fields, $request)
         return $token->element_name;
     }
 
+    /**
+     *      Get Information of the last token for the element query
+     *      
+     *      @Parameter
+     *          Request $httpRequest
+     *          ProcessRequest $request
+     *     @return
+     *          object data {
+     *              element_id,
+     *              element_name,
+     *              created_at,
+     *              completed_at,
+     *              username,
+     *              count
+     *          }
+     *         
+     */
+
     public function getRequestToken(Request $httpRequest, ProcessRequest $request)
     {
         $maxIdToken = $request->tokens()
@@ -622,7 +640,12 @@ public function getRequestToken(Request $httpRequest, ProcessRequest $request)
                             WHEN process_request_tokens.status = "CLOSED" THEN "Completed" 
                             WHEN process_request_tokens.status = "ACTIVE" THEN "In Progress" 
                             END as status')
-                ->first();                
+                ->first();           
+
+        if (!empty($token)) {
+            $tokenCount = ProcessRequestToken::where(['element_id' => $httpRequest->element_id, 'process_request_id'=> $request->id])->count();
+            $token->count = $tokenCount;
+        }
 
         return new ApiResource($token);
     }

From c08ede654615f96219475875c5dc41086e2ab473 Mon Sep 17 00:00:00 2001
From: Eleazar Resendez <eleazar.resendez@processmaker.com>
Date: Thu, 15 Jun 2023 13:26:21 -0600
Subject: [PATCH 09/14] Small code cleanup

---
 .../Api/ProcessRequestController.php          | 52 +++++++++++--------
 .../Controllers/Process/ModelerController.php |  3 +-
 .../modeler/components/ProcessMap.vue         |  1 -
 .../modeler/components/ProcessMapTooltip.vue  | 47 ++++++++---------
 .../processes/modeler/inflight.blade.php      |  2 -
 5 files changed, 52 insertions(+), 53 deletions(-)

diff --git a/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php b/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
index 5e957db7b5..f6d4b48eed 100644
--- a/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
+++ b/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
@@ -8,10 +8,8 @@
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\ValidationException;
 use Notification;
@@ -27,7 +25,6 @@
 use ProcessMaker\Models\Comment;
 use ProcessMaker\Models\ProcessRequest;
 use ProcessMaker\Models\ProcessRequestToken;
-use ProcessMaker\Models\Setting;
 use ProcessMaker\Models\User;
 use ProcessMaker\Nayra\Contracts\Bpmn\CatchEventInterface;
 use ProcessMaker\Notifications\ProcessCanceledNotification;
@@ -174,7 +171,7 @@ public function index(Request $request, $getTotal = false, User $user = null)
         }
 
         if (isset($response)) {
-            //Map each item through its resource
+            // Map each item through its resource
             $response = $response->map(function ($processRequest) use ($request) {
                 return new ProcessRequestResource($processRequest);
             });
@@ -612,7 +609,7 @@ private function getTaskName($fields, $request)
 
     /**
      *      Get Information of the last token for the element query
-     *      
+     *
      *      @Parameter
      *          Request $httpRequest
      *          ProcessRequest $request
@@ -625,27 +622,36 @@ private function getTaskName($fields, $request)
      *              username,
      *              count
      *          }
-     *         
      */
-
     public function getRequestToken(Request $httpRequest, ProcessRequest $request)
     {
-        $maxIdToken = $request->tokens()
-                 ->where(['element_id' => $httpRequest->element_id])->max('id');                
-
-        $token =  ProcessRequestToken::where(['process_request_tokens.id' => $maxIdToken])
-                ->join('users', 'users.id', 'process_request_tokens.user_id')
-                ->selectRaw('element_id, element_name, process_request_tokens.created_at, completed_at, username, 
-                            CASE 
-                            WHEN process_request_tokens.status = "CLOSED" THEN "Completed" 
-                            WHEN process_request_tokens.status = "ACTIVE" THEN "In Progress" 
-                            END as status')
-                ->first();           
-
-        if (!empty($token)) {
-            $tokenCount = ProcessRequestToken::where(['element_id' => $httpRequest->element_id, 'process_request_id'=> $request->id])->count();
-            $token->count = $tokenCount;
-        }
+        $httpRequest->validate([
+            'element_id' => 'required|string',
+        ]);
+
+        $maxIdToken = $request->tokens()->where('element_id', $httpRequest->element_id)->max('id');
+        $token = $request->tokens()
+            ->where('id', $maxIdToken)
+            ->select('user_id', 'element_id', 'element_name', 'created_at', 'completed_at', 'status')
+            ->with([
+                'user' => fn ($query) => $query->select('id', 'username'),
+            ])
+            ->firstOrFail();
+
+        $status = match ($token->status) {
+            'CLOSED' => __('Completed'),
+            'ACTIVE' => __('In Progress'),
+            default => $token->status,
+        };
+        $token->status = $status;
+
+        // Get the number of times the flow has run when clicking on a flow line.
+        $tokensCount = $request->tokens()
+            ->where([
+                'element_id' => $httpRequest->element_id,
+                'process_request_id'=> $request->id,
+            ])->count();
+        $token->count = $tokensCount;
 
         return new ApiResource($token);
     }
diff --git a/ProcessMaker/Http/Controllers/Process/ModelerController.php b/ProcessMaker/Http/Controllers/Process/ModelerController.php
index 24e8b0bcdf..306b3a1f34 100644
--- a/ProcessMaker/Http/Controllers/Process/ModelerController.php
+++ b/ProcessMaker/Http/Controllers/Process/ModelerController.php
@@ -67,7 +67,7 @@ public function inflight(ModelerManager $manager, Process $process, Request $req
 
             $requestCompletedNodes = $processRequest->tokens()->whereIn('status', ['CLOSED', 'TRIGGERED'])->pluck('element_id');
             $requestInProgressNodes = $processRequest->tokens()->where('status', 'ACTIVE')->pluck('element_id');
-            // Remove any node that is 'ACTIVE' from the 'CLOSED' list.
+            // Remove any node that is 'ACTIVE' from the completed list.
             $filteredCompletedNodes = $requestCompletedNodes->diff($requestInProgressNodes)->values();
 
             // Get idle nodes.
@@ -82,7 +82,6 @@ public function inflight(ModelerManager $manager, Process $process, Request $req
 
         return view('processes.modeler.inflight', [
             'manager' => $manager,
-            'process' => $process,
             'bpmn' => $bpmn,
             'requestCompletedNodes' => $filteredCompletedNodes,
             'requestInProgressNodes' => $requestInProgressNodes,
diff --git a/resources/js/processes/modeler/components/ProcessMap.vue b/resources/js/processes/modeler/components/ProcessMap.vue
index 90f7873f73..044d715a28 100644
--- a/resources/js/processes/modeler/components/ProcessMap.vue
+++ b/resources/js/processes/modeler/components/ProcessMap.vue
@@ -46,7 +46,6 @@ export default {
     return {
       self: this,
       validationBar: [],
-      process: window.ProcessMaker.modeler.process,
       xmlManager: null,
       decorations: {
         borderOutline: {},
diff --git a/resources/js/processes/modeler/components/ProcessMapTooltip.vue b/resources/js/processes/modeler/components/ProcessMapTooltip.vue
index 89d877248a..24c5ddbc18 100644
--- a/resources/js/processes/modeler/components/ProcessMapTooltip.vue
+++ b/resources/js/processes/modeler/components/ProcessMapTooltip.vue
@@ -27,7 +27,7 @@
         </p>
         <p class="tooltip-data">
           <span class="tooltip-data-title">{{ $t('Completed By') }}:</span>
-          <span class="text-secondary">{{ tokenResult.username }}</span>
+          <span class="text-secondary">{{ tokenResult.user.username }}</span>
         </p>
         <p class="tooltip-data">
           <span class="tooltip-data-title">{{ $t('Time Started') }}:</span>
@@ -77,7 +77,9 @@ export default {
   data() {
     return {
       isLoading: false,
-      tokenResult: {},
+      tokenResult: {
+        user: {},
+      },
     };
   },
   watch: {
@@ -88,9 +90,7 @@ export default {
       this.$emit("is-loading", value);
     },
   },
-  mounted() {
-    this.getRequestTokens();
-  },
+  mounted() {},
   methods: {
     getRequestTokens() {
       this.isLoading = true;
@@ -100,29 +100,22 @@ export default {
         },
       })
         .then((response) => {
-          if (response.data.length !== 0) {
-            this.isLoading = false;
-            this.tokenResult = response.data;
-            this.tokenResult.created_at = this.formatDate(this.tokenResult.created_at);
-            if (this.tokenResult.completed_at === null) {
-              this.tokenResult.completed_at = "-";
-            } else {
-              this.tokenResult.completed_at = this.formatDate(this.tokenResult.completed_at);
-            }
-          } else {
-            this.tokenResult = {
-              message: "No Information found.",
-            };
-            this.isLoading = false;
-          }
+          this.tokenResult = response.data;
+          this.tokenResult.created_at = this.formatDate(this.tokenResult.created_at);
+          this.tokenResult.completed_at = this.formatDate(this.tokenResult.completed_at);
+        })
+        .catch(() => {
+          this.tokenResult.message = this.$t("No information found.");
+        })
+        .finally(() => {
+          this.isLoading = false;
         });
     },
     formatDate(date) {
-      return moment(date).format("MM/DD/YY HH:mm");
+      return date === null ? "-" : moment(date).format("MM/DD/YY HH:mm");
     },
   },
 };
-
 </script>
 <style>
 #tooltip {
@@ -130,18 +123,22 @@ export default {
   z-index: 3;
 }
 .tooltip-title {
-  font-weight: bold;
-  font-size: 90%;
   margin-bottom: 5px;
+  font-weight: bold;
+  font-size: 16px;
+  line-height: 24px;
+  letter-spacing: -0.02em;
 }
 .tooltip-data-title {
   font-weight: bold;
   padding-right: 5px;
 }
 .tooltip-data {
+  font-size: 14px;
+  line-height: 21px;
+  letter-spacing: -0.02em;
   padding-top: 0px;
   padding-bottom: 0px;
   margin-bottom: 5px;
-  font-size: 80%;
 }
 </style>
diff --git a/resources/views/processes/modeler/inflight.blade.php b/resources/views/processes/modeler/inflight.blade.php
index 47e388b796..2c6ba08c8f 100644
--- a/resources/views/processes/modeler/inflight.blade.php
+++ b/resources/views/processes/modeler/inflight.blade.php
@@ -28,8 +28,6 @@
   <script>
     const breadcrumbData = [];
     window.ProcessMaker.modeler = {
-      process: @json($process),
-      processName: @json($process->name),
       xml: @json($bpmn),
       configurables: [],
       requestCompletedNodes: @json($requestCompletedNodes),

From b454f2fb02cbead443dcf4eba2d593dafb68633d Mon Sep 17 00:00:00 2001
From: Eleazar Resendez <eleazar.resendez@processmaker.com>
Date: Thu, 15 Jun 2023 13:48:10 -0600
Subject: [PATCH 10/14] Display "Completed by" when the task is completed

---
 .../Http/Controllers/Api/ProcessRequestController.php        | 5 +++--
 .../js/processes/modeler/components/ProcessMapTooltip.vue    | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php b/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
index f6d4b48eed..a75fd573f2 100644
--- a/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
+++ b/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
@@ -638,12 +638,13 @@ public function getRequestToken(Request $httpRequest, ProcessRequest $request)
             ])
             ->firstOrFail();
 
-        $status = match ($token->status) {
+        $translatedStatus = match ($token->status) {
             'CLOSED' => __('Completed'),
             'ACTIVE' => __('In Progress'),
             default => $token->status,
         };
-        $token->status = $status;
+        $token->status_translation = $translatedStatus;
+        $token->completed_by = $token->completed_at ? $token->user['username'] : '-';
 
         // Get the number of times the flow has run when clicking on a flow line.
         $tokensCount = $request->tokens()
diff --git a/resources/js/processes/modeler/components/ProcessMapTooltip.vue b/resources/js/processes/modeler/components/ProcessMapTooltip.vue
index 24c5ddbc18..b929ced015 100644
--- a/resources/js/processes/modeler/components/ProcessMapTooltip.vue
+++ b/resources/js/processes/modeler/components/ProcessMapTooltip.vue
@@ -23,11 +23,11 @@
         </p>
         <p class="tooltip-data">
           <span class="tooltip-data-title">{{ $t('Status') }}:</span>
-          <span class="text-secondary">{{ tokenResult.status }}</span>
+          <span class="text-secondary">{{ tokenResult.status_translation }}</span>
         </p>
         <p class="tooltip-data">
           <span class="tooltip-data-title">{{ $t('Completed By') }}:</span>
-          <span class="text-secondary">{{ tokenResult.user.username }}</span>
+          <span class="text-secondary">{{ tokenResult.completed_by }}</span>
         </p>
         <p class="tooltip-data">
           <span class="tooltip-data-title">{{ $t('Time Started') }}:</span>

From 9fcffac01c40182d2a546b3f983b5bcdccc2c662 Mon Sep 17 00:00:00 2001
From: Gustavo Bascope <gustavo.bascope@processmaker.com>
Date: Fri, 16 Jun 2023 11:22:23 -0400
Subject: [PATCH 11/14] repeated paths tooltip added

---
 .../Api/ProcessRequestController.php          | 53 ++++++++++++++++++-
 .../modeler/components/ProcessMapTooltip.vue  | 12 ++++-
 2 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php b/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
index a75fd573f2..8c4352087d 100644
--- a/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
+++ b/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
@@ -23,6 +23,7 @@
 use ProcessMaker\Jobs\CancelRequest;
 use ProcessMaker\Jobs\TerminateRequest;
 use ProcessMaker\Models\Comment;
+use ProcessMaker\Models\Process;
 use ProcessMaker\Models\ProcessRequest;
 use ProcessMaker\Models\ProcessRequestToken;
 use ProcessMaker\Models\User;
@@ -32,6 +33,7 @@
 use ProcessMaker\RetryProcessRequest;
 use Symfony\Component\HttpFoundation\IpUtils;
 use Throwable;
+use SimpleXMLElement;
 
 class ProcessRequestController extends Controller
 {
@@ -620,6 +622,7 @@ private function getTaskName($fields, $request)
      *              created_at,
      *              completed_at,
      *              username,
+     *              sequenceFlow,
      *              count
      *          }
      */
@@ -630,6 +633,23 @@ public function getRequestToken(Request $httpRequest, ProcessRequest $request)
         ]);
 
         $maxIdToken = $request->tokens()->where('element_id', $httpRequest->element_id)->max('id');
+        if ($maxIdToken === null)
+        {
+            $process = Process::find($request->process_id);
+            $bpmn = $process->versions()
+                ->where('id', $request->process_version_id)
+                ->firstOrFail()
+                ->bpmn;
+            
+            // Get the ref node for the sequence flow
+            $xml = $this->loadAndPrepareXML($bpmn);
+            $nodeId = $this->getTargetRefNode($xml,$httpRequest->element_id);
+            // Get the Max targetRef Node Id
+            $httpRequest->element_id = $nodeId;
+            $maxIdToken = $request->tokens()->where('element_id', $httpRequest->element_id)->max('id');
+            
+            
+        }
         $token = $request->tokens()
             ->where('id', $maxIdToken)
             ->select('user_id', 'element_id', 'element_name', 'created_at', 'completed_at', 'status')
@@ -638,13 +658,16 @@ public function getRequestToken(Request $httpRequest, ProcessRequest $request)
             ])
             ->firstOrFail();
 
+        // Flags if the object clicked is a Sequence Flow
+        $token->sequenceFlow = !empty($nodeId) ? true : false;
+
         $translatedStatus = match ($token->status) {
             'CLOSED' => __('Completed'),
             'ACTIVE' => __('In Progress'),
             default => $token->status,
         };
         $token->status_translation = $translatedStatus;
-        $token->completed_by = $token->completed_at ? $token->user['username'] : '-';
+        $token->completed_by = $token->completed_at ? ($token->user['username'] ?? '-') : '-';
 
         // Get the number of times the flow has run when clicking on a flow line.
         $tokensCount = $request->tokens()
@@ -656,4 +679,32 @@ public function getRequestToken(Request $httpRequest, ProcessRequest $request)
 
         return new ApiResource($token);
     }
+
+    /**
+     * Load XML from a string and register its namespaces.
+     * This function will help to prepare the XML for further processing.
+     */
+    private function loadAndPrepareXML(string $bpmn): SimpleXMLElement
+    {
+        $xml = simplexml_load_string($bpmn);
+        $namespaces = $xml->getNamespaces(true);
+
+        foreach ($namespaces as $prefix => $ns) {
+            $xml->registerXPathNamespace($prefix, $ns);
+        }
+
+        return $xml;
+    }
+
+    /**
+     * Performs an XPath query to get the targetRef Node Id
+     */
+    private function getTargetRefNode(SimpleXMLElement $xml, string $sequenceFlowId)
+    {
+        $sequenceFlowNode = $xml->xpath("//bpmn:sequenceFlow[@id='{$sequenceFlowId}']");
+
+        $targetRef = (string) $sequenceFlowNode[0]['targetRef'];
+
+        return $targetRef;
+    }
 }
diff --git a/resources/js/processes/modeler/components/ProcessMapTooltip.vue b/resources/js/processes/modeler/components/ProcessMapTooltip.vue
index b929ced015..1404463c6f 100644
--- a/resources/js/processes/modeler/components/ProcessMapTooltip.vue
+++ b/resources/js/processes/modeler/components/ProcessMapTooltip.vue
@@ -17,7 +17,7 @@
       class="card-body"
       style="padding-top: 10px; padding-bottom: 5px"
     >
-      <div v-if="!tokenResult.hasOwnProperty('message')">
+      <div v-if="!tokenResult.hasOwnProperty('message') && !tokenResult.sequenceFlow">
         <p class="tooltip-title">
           <span class="text-info">{{ tokenResult.element_name }}</span>
         </p>
@@ -38,6 +38,13 @@
           <span class="text-secondary">{{ tokenResult.completed_at }}</span>
         </p>
       </div>
+      <div v-if="!tokenResult.hasOwnProperty('message') && tokenResult.sequenceFlow">
+        <p class="tooltip-data">
+          <span class="tooltip-data-title">
+            {{ repeatMessage }}
+          </span>
+        </p>
+      </div>
       <div v-if="tokenResult.hasOwnProperty('message')">
         <p class="tooltip-title">
           <span class="text-info">{{ nodeName }}</span>
@@ -80,6 +87,7 @@ export default {
       tokenResult: {
         user: {},
       },
+      repeatMessage: "",
     };
   },
   watch: {
@@ -101,6 +109,8 @@ export default {
       })
         .then((response) => {
           this.tokenResult = response.data;
+          this.repeatMessage = (this.tokenResult.count > 1) ? this.$t(`The path was reapeted ${this.tokenResult.count} times`)
+            : this.$t(`The path was repeated ${this.tokenResult.count} time`);
           this.tokenResult.created_at = this.formatDate(this.tokenResult.created_at);
           this.tokenResult.completed_at = this.formatDate(this.tokenResult.completed_at);
         })

From bd3d3a88c1558ea76485a77934c9e36a4f0c69db Mon Sep 17 00:00:00 2001
From: Eleazar Resendez <eleazar.resendez@processmaker.com>
Date: Fri, 16 Jun 2023 11:27:19 -0600
Subject: [PATCH 12/14] Apply syntactic sugar refactor

---
 .../Api/ProcessRequestController.php          | 31 ++++++++-----------
 .../modeler/components/ProcessMapTooltip.vue  |  7 ++---
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php b/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
index 8c4352087d..d6f9bb4c1f 100644
--- a/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
+++ b/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
@@ -23,7 +23,6 @@
 use ProcessMaker\Jobs\CancelRequest;
 use ProcessMaker\Jobs\TerminateRequest;
 use ProcessMaker\Models\Comment;
-use ProcessMaker\Models\Process;
 use ProcessMaker\Models\ProcessRequest;
 use ProcessMaker\Models\ProcessRequestToken;
 use ProcessMaker\Models\User;
@@ -31,9 +30,9 @@
 use ProcessMaker\Notifications\ProcessCanceledNotification;
 use ProcessMaker\Query\SyntaxError;
 use ProcessMaker\RetryProcessRequest;
+use SimpleXMLElement;
 use Symfony\Component\HttpFoundation\IpUtils;
 use Throwable;
-use SimpleXMLElement;
 
 class ProcessRequestController extends Controller
 {
@@ -632,24 +631,22 @@ public function getRequestToken(Request $httpRequest, ProcessRequest $request)
             'element_id' => 'required|string',
         ]);
 
+        $targetNodeId = null;
         $maxIdToken = $request->tokens()->where('element_id', $httpRequest->element_id)->max('id');
-        if ($maxIdToken === null)
-        {
-            $process = Process::find($request->process_id);
-            $bpmn = $process->versions()
+        if ($maxIdToken === null) {
+            $bpmn = $request->process->versions()
                 ->where('id', $request->process_version_id)
                 ->firstOrFail()
                 ->bpmn;
-            
-            // Get the ref node for the sequence flow
+
+            // Get the ref. node for the sequence flow.
             $xml = $this->loadAndPrepareXML($bpmn);
-            $nodeId = $this->getTargetRefNode($xml,$httpRequest->element_id);
+            $targetNodeId = $this->getTargetRefNode($xml, $httpRequest->element_id);
             // Get the Max targetRef Node Id
-            $httpRequest->element_id = $nodeId;
+            $httpRequest->merge(['element_id' => $targetNodeId]);
             $maxIdToken = $request->tokens()->where('element_id', $httpRequest->element_id)->max('id');
-            
-            
         }
+
         $token = $request->tokens()
             ->where('id', $maxIdToken)
             ->select('user_id', 'element_id', 'element_name', 'created_at', 'completed_at', 'status')
@@ -658,8 +655,8 @@ public function getRequestToken(Request $httpRequest, ProcessRequest $request)
             ])
             ->firstOrFail();
 
-        // Flags if the object clicked is a Sequence Flow
-        $token->sequenceFlow = !empty($nodeId) ? true : false;
+        // Flags if the object clicked is a Sequence Flow.
+        $token->is_sequence_flow = $targetNodeId ? true : false;
 
         $translatedStatus = match ($token->status) {
             'CLOSED' => __('Completed'),
@@ -699,12 +696,10 @@ private function loadAndPrepareXML(string $bpmn): SimpleXMLElement
     /**
      * Performs an XPath query to get the targetRef Node Id
      */
-    private function getTargetRefNode(SimpleXMLElement $xml, string $sequenceFlowId)
+    private function getTargetRefNode(SimpleXMLElement $xml, string $sequenceFlowId): string
     {
         $sequenceFlowNode = $xml->xpath("//bpmn:sequenceFlow[@id='{$sequenceFlowId}']");
 
-        $targetRef = (string) $sequenceFlowNode[0]['targetRef'];
-
-        return $targetRef;
+        return (string) $sequenceFlowNode[0]['targetRef'];
     }
 }
diff --git a/resources/js/processes/modeler/components/ProcessMapTooltip.vue b/resources/js/processes/modeler/components/ProcessMapTooltip.vue
index 1404463c6f..70c4705170 100644
--- a/resources/js/processes/modeler/components/ProcessMapTooltip.vue
+++ b/resources/js/processes/modeler/components/ProcessMapTooltip.vue
@@ -17,7 +17,7 @@
       class="card-body"
       style="padding-top: 10px; padding-bottom: 5px"
     >
-      <div v-if="!tokenResult.hasOwnProperty('message') && !tokenResult.sequenceFlow">
+      <div v-if="!tokenResult.hasOwnProperty('message') && !tokenResult.is_sequence_flow">
         <p class="tooltip-title">
           <span class="text-info">{{ tokenResult.element_name }}</span>
         </p>
@@ -38,7 +38,7 @@
           <span class="text-secondary">{{ tokenResult.completed_at }}</span>
         </p>
       </div>
-      <div v-if="!tokenResult.hasOwnProperty('message') && tokenResult.sequenceFlow">
+      <div v-if="!tokenResult.hasOwnProperty('message') && tokenResult.is_sequence_flow">
         <p class="tooltip-data">
           <span class="tooltip-data-title">
             {{ repeatMessage }}
@@ -109,8 +109,7 @@ export default {
       })
         .then((response) => {
           this.tokenResult = response.data;
-          this.repeatMessage = (this.tokenResult.count > 1) ? this.$t(`The path was reapeted ${this.tokenResult.count} times`)
-            : this.$t(`The path was repeated ${this.tokenResult.count} time`);
+          this.repeatMessage = this.$t(`The path was repeated ${this.tokenResult.count} ${this.tokenResult.count > 1 ? "times" : "time"}`);
           this.tokenResult.created_at = this.formatDate(this.tokenResult.created_at);
           this.tokenResult.completed_at = this.formatDate(this.tokenResult.completed_at);
         })

From b2c108467a82cf3999813675aa74a6d21c35bb6a Mon Sep 17 00:00:00 2001
From: Gustavo Bascope <gustavo.bascope@processmaker.com>
Date: Mon, 19 Jun 2023 16:02:08 -0400
Subject: [PATCH 13/14] fix repeated paths for multiple sources

---
 .../Api/ProcessRequestController.php          | 50 +++++++++++++++----
 1 file changed, 41 insertions(+), 9 deletions(-)

diff --git a/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php b/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
index d6f9bb4c1f..e16faad96b 100644
--- a/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
+++ b/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
@@ -631,7 +631,7 @@ public function getRequestToken(Request $httpRequest, ProcessRequest $request)
             'element_id' => 'required|string',
         ]);
 
-        $targetNodeId = null;
+        $elementId = null;
         $maxIdToken = $request->tokens()->where('element_id', $httpRequest->element_id)->max('id');
         if ($maxIdToken === null) {
             $bpmn = $request->process->versions()
@@ -639,11 +639,33 @@ public function getRequestToken(Request $httpRequest, ProcessRequest $request)
                 ->firstOrFail()
                 ->bpmn;
 
-            // Get the ref. node for the sequence flow.
+            // Get the source and target node for the sequence flow.
             $xml = $this->loadAndPrepareXML($bpmn);
-            $targetNodeId = $this->getTargetRefNode($xml, $httpRequest->element_id);
-            // Get the Max targetRef Node Id
-            $httpRequest->merge(['element_id' => $targetNodeId]);
+            $targetAndSourceRef = $this->getRefNodes($xml, $httpRequest->element_id);
+
+            if (!empty($targetAndSourceRef)) {
+                $targetRef = $targetAndSourceRef['targetRef'];
+                $sourceRef = $targetAndSourceRef['sourceRef'];
+
+                $targetTokensCount = $request->tokens()
+                ->where([
+                    'element_id' => $targetRef,
+                    'process_request_id'=> $request->id,
+                ])->count();
+
+                $sourceTokensCount = $request->tokens()
+                ->where([
+                    'element_id' => $sourceRef,
+                    'process_request_id'=> $request->id,
+                ])->count();
+
+                //get the min repeated node Id
+
+                $elementId = ($sourceTokensCount < $targetTokensCount) ? $sourceRef : $targetRef;
+            }
+
+            // Get the Max Node Id
+            $httpRequest->merge(['element_id' => $elementId]);
             $maxIdToken = $request->tokens()->where('element_id', $httpRequest->element_id)->max('id');
         }
 
@@ -656,7 +678,7 @@ public function getRequestToken(Request $httpRequest, ProcessRequest $request)
             ->firstOrFail();
 
         // Flags if the object clicked is a Sequence Flow.
-        $token->is_sequence_flow = $targetNodeId ? true : false;
+        $token->is_sequence_flow = $elementId ? true : false;
 
         $translatedStatus = match ($token->status) {
             'CLOSED' => __('Completed'),
@@ -694,12 +716,22 @@ private function loadAndPrepareXML(string $bpmn): SimpleXMLElement
     }
 
     /**
-     * Performs an XPath query to get the targetRef Node Id
+     * Performs an XPath query to get the targetRef and SourceRef Node Id
      */
-    private function getTargetRefNode(SimpleXMLElement $xml, string $sequenceFlowId): string
+    private function getRefNodes(SimpleXMLElement $xml, string $sequenceFlowId): array
     {
         $sequenceFlowNode = $xml->xpath("//bpmn:sequenceFlow[@id='{$sequenceFlowId}']");
 
-        return (string) $sequenceFlowNode[0]['targetRef'];
+        if (empty($sequenceFlowNode)) {
+            return [];
+        }
+
+        $targetRef = (string) $sequenceFlowNode[0]['targetRef'];
+        $sourceRef = (string) $sequenceFlowNode[0]['sourceRef'];
+
+        return [
+            'targetRef' => $targetRef,
+            'sourceRef' => $sourceRef,
+        ];
     }
 }

From e4cf3624802c8d661c59720d51c1c88d125149ad Mon Sep 17 00:00:00 2001
From: Eleazar Resendez <eleazar.resendez@processmaker.com>
Date: Tue, 20 Jun 2023 10:24:54 -0600
Subject: [PATCH 14/14] Moved functions related to ProcessMap into a Trait

---
 .../Api/ProcessRequestController.php          | 71 +++----------
 .../Controllers/Process/ModelerController.php | 41 +-------
 ProcessMaker/Traits/ProcessMapTrait.php       | 99 +++++++++++++++++++
 3 files changed, 115 insertions(+), 96 deletions(-)
 create mode 100644 ProcessMaker/Traits/ProcessMapTrait.php

diff --git a/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php b/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
index e16faad96b..8e4a863629 100644
--- a/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
+++ b/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
@@ -30,12 +30,14 @@
 use ProcessMaker\Notifications\ProcessCanceledNotification;
 use ProcessMaker\Query\SyntaxError;
 use ProcessMaker\RetryProcessRequest;
-use SimpleXMLElement;
+use ProcessMaker\Traits\ProcessMapTrait;
 use Symfony\Component\HttpFoundation\IpUtils;
 use Throwable;
 
 class ProcessRequestController extends Controller
 {
+    use ProcessMapTrait;
+
     const DOMAIN_CACHE_TIME = 86400;
 
     /**
@@ -632,8 +634,8 @@ public function getRequestToken(Request $httpRequest, ProcessRequest $request)
         ]);
 
         $elementId = null;
-        $maxIdToken = $request->tokens()->where('element_id', $httpRequest->element_id)->max('id');
-        if ($maxIdToken === null) {
+        $maxTokenId = $this->getMaxTokenId($request, $httpRequest->element_id);
+        if ($maxTokenId === null) {
             $bpmn = $request->process->versions()
                 ->where('id', $request->process_version_id)
                 ->firstOrFail()
@@ -643,34 +645,25 @@ public function getRequestToken(Request $httpRequest, ProcessRequest $request)
             $xml = $this->loadAndPrepareXML($bpmn);
             $targetAndSourceRef = $this->getRefNodes($xml, $httpRequest->element_id);
 
-            if (!empty($targetAndSourceRef)) {
+            if ($targetAndSourceRef->isNotEmpty()) {
                 $targetRef = $targetAndSourceRef['targetRef'];
                 $sourceRef = $targetAndSourceRef['sourceRef'];
 
-                $targetTokensCount = $request->tokens()
-                ->where([
-                    'element_id' => $targetRef,
-                    'process_request_id'=> $request->id,
-                ])->count();
-
-                $sourceTokensCount = $request->tokens()
-                ->where([
-                    'element_id' => $sourceRef,
-                    'process_request_id'=> $request->id,
-                ])->count();
-
-                //get the min repeated node Id
+                // Get the token counts for the target and source nodes.
+                $targetTokensCount = $this->getTokenCount($request, $targetRef);
+                $sourceTokensCount = $this->getTokenCount($request, $sourceRef);
 
+                // Get the minimum repeated node ID.
                 $elementId = ($sourceTokensCount < $targetTokensCount) ? $sourceRef : $targetRef;
             }
 
-            // Get the Max Node Id
+            // Get the maximum node ID.
             $httpRequest->merge(['element_id' => $elementId]);
-            $maxIdToken = $request->tokens()->where('element_id', $httpRequest->element_id)->max('id');
+            $maxTokenId = $this->getMaxTokenId($request, $httpRequest->element_id);
         }
 
         $token = $request->tokens()
-            ->where('id', $maxIdToken)
+            ->where('id', $maxTokenId)
             ->select('user_id', 'element_id', 'element_name', 'created_at', 'completed_at', 'status')
             ->with([
                 'user' => fn ($query) => $query->select('id', 'username'),
@@ -688,7 +681,7 @@ public function getRequestToken(Request $httpRequest, ProcessRequest $request)
         $token->status_translation = $translatedStatus;
         $token->completed_by = $token->completed_at ? ($token->user['username'] ?? '-') : '-';
 
-        // Get the number of times the flow has run when clicking on a flow line.
+        // Get the number of times the flow has run.
         $tokensCount = $request->tokens()
             ->where([
                 'element_id' => $httpRequest->element_id,
@@ -698,40 +691,4 @@ public function getRequestToken(Request $httpRequest, ProcessRequest $request)
 
         return new ApiResource($token);
     }
-
-    /**
-     * Load XML from a string and register its namespaces.
-     * This function will help to prepare the XML for further processing.
-     */
-    private function loadAndPrepareXML(string $bpmn): SimpleXMLElement
-    {
-        $xml = simplexml_load_string($bpmn);
-        $namespaces = $xml->getNamespaces(true);
-
-        foreach ($namespaces as $prefix => $ns) {
-            $xml->registerXPathNamespace($prefix, $ns);
-        }
-
-        return $xml;
-    }
-
-    /**
-     * Performs an XPath query to get the targetRef and SourceRef Node Id
-     */
-    private function getRefNodes(SimpleXMLElement $xml, string $sequenceFlowId): array
-    {
-        $sequenceFlowNode = $xml->xpath("//bpmn:sequenceFlow[@id='{$sequenceFlowId}']");
-
-        if (empty($sequenceFlowNode)) {
-            return [];
-        }
-
-        $targetRef = (string) $sequenceFlowNode[0]['targetRef'];
-        $sourceRef = (string) $sequenceFlowNode[0]['sourceRef'];
-
-        return [
-            'targetRef' => $targetRef,
-            'sourceRef' => $sourceRef,
-        ];
-    }
 }
diff --git a/ProcessMaker/Http/Controllers/Process/ModelerController.php b/ProcessMaker/Http/Controllers/Process/ModelerController.php
index 306b3a1f34..27162ed2da 100644
--- a/ProcessMaker/Http/Controllers/Process/ModelerController.php
+++ b/ProcessMaker/Http/Controllers/Process/ModelerController.php
@@ -12,11 +12,13 @@
 use ProcessMaker\Models\ProcessRequest;
 use ProcessMaker\PackageHelper;
 use ProcessMaker\Traits\HasControllerAddons;
+use ProcessMaker\Traits\ProcessMapTrait;
 use SimpleXMLElement;
 
 class ModelerController extends Controller
 {
     use HasControllerAddons;
+    use ProcessMapTrait;
 
     /**
      * Invokes the Process Modeler for rendering.
@@ -89,43 +91,4 @@ public function inflight(ModelerManager $manager, Process $process, Request $req
             'requestId' => $request->request_id,
         ]);
     }
-
-    /**
-     * Load XML from a string and register its namespaces.
-     * This function will help to prepare the XML for further processing.
-     */
-    private function loadAndPrepareXML(string $bpmn): SimpleXMLElement
-    {
-        $xml = simplexml_load_string($bpmn);
-        $namespaces = $xml->getNamespaces(true);
-
-        foreach ($namespaces as $prefix => $ns) {
-            $xml->registerXPathNamespace($prefix, $ns);
-        }
-
-        return $xml;
-    }
-
-    /**
-     * Filter the XML to get IDs of all nodes excluding "lanes" and "pools" nodes.
-     */
-    private function getNodeIds(SimpleXMLElement $xml): Collection
-    {
-        $elements = $xml->xpath('//*[name() != "bpmn:lane" and name() != "bpmn:participant"]/@id');
-
-        return collect(array_map('strval', $elements));
-    }
-
-    /**
-     * Performs an XPath query to get sequenceFlow elements
-     * whose 'sourceRef' attribute is in the string of completed nodes
-     * and 'targetRef' attribute is in the string of in-progress and completed nodes.
-     */
-    private function getCompletedSequenceFlow(SimpleXMLElement $xml, string $completedNodesStr, string $inProgressNodesStr): Collection
-    {
-        $inProgressAndCompletedNodes = $completedNodesStr . ' ' . $inProgressNodesStr;
-        $elements = $xml->xpath('//bpmn:sequenceFlow[contains("' . $completedNodesStr . '", @sourceRef) and contains("' . $inProgressAndCompletedNodes . '", @targetRef)]/@id');
-
-        return collect(array_map('strval', $elements));
-    }
 }
diff --git a/ProcessMaker/Traits/ProcessMapTrait.php b/ProcessMaker/Traits/ProcessMapTrait.php
new file mode 100644
index 0000000000..cf9b5f55b8
--- /dev/null
+++ b/ProcessMaker/Traits/ProcessMapTrait.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace ProcessMaker\Traits;
+
+use Illuminate\Support\Collection;
+use ProcessMaker\Models\ProcessRequest;
+use SimpleXMLElement;
+
+trait ProcessMapTrait
+{
+    /**
+     * Load XML from a string and register its namespaces.
+     * This function will help to prepare the XML for further processing.
+     */
+    private function loadAndPrepareXML(string $bpmn): SimpleXMLElement
+    {
+        $xml = simplexml_load_string($bpmn);
+        $namespaces = $xml->getNamespaces(true);
+
+        foreach ($namespaces as $prefix => $ns) {
+            $xml->registerXPathNamespace($prefix, $ns);
+        }
+
+        return $xml;
+    }
+
+    /**
+     * Get the maximum token ID for a given element ID.
+     */
+    private function getMaxTokenId(ProcessRequest $request, ?string $elementId): ?int
+    {
+        return $request->tokens()
+            ->where('element_id', $elementId)
+            ->max('id');
+    }
+
+    /**
+     * Get the token count for a given element ID.
+     */
+    private function getTokenCount(ProcessRequest $request, string $elementId): int
+    {
+        return $request->tokens()
+            ->where([
+                'element_id' => $elementId,
+                'process_request_id' => $request->id,
+            ])
+            ->count();
+    }
+
+    /**
+     * Filter the XML using the provided XPath query and return a Collection of string values.
+     */
+    private function filterXML(SimpleXMLElement $xml, string $xpathQuery): Collection
+    {
+        $elements = $xml->xpath($xpathQuery);
+
+        return collect(array_map('strval', $elements));
+    }
+
+    /**
+     * Filter the XML to get IDs of all nodes excluding "lanes" and "pools" nodes.
+     */
+    private function getNodeIds(SimpleXMLElement $xml): Collection
+    {
+        $query = '//*[name() != "bpmn:lane" and name() != "bpmn:participant"]/@id';
+
+        return $this->filterXML($xml, $query);
+    }
+
+    /**
+     * Performs an XPath query to get sequenceFlow elements
+     * whose 'sourceRef' attribute is in the string of completed nodes
+     * and 'targetRef' attribute is in the string of in-progress and completed nodes.
+     */
+    private function getCompletedSequenceFlow(SimpleXMLElement $xml, string $completedNodesStr, string $inProgressNodesStr): Collection
+    {
+        $inProgressAndCompletedNodes = $completedNodesStr . ' ' . $inProgressNodesStr;
+        $query = '//bpmn:sequenceFlow[contains("' . $completedNodesStr . '", @sourceRef) and contains("' . $inProgressAndCompletedNodes . '", @targetRef)]/@id';
+
+        return $this->filterXML($xml, $query);
+    }
+
+    /**
+     * Performs an XPath query to get the targetRef and SourceRef Node Id
+     */
+    private function getRefNodes(SimpleXMLElement $xml, string $sequenceFlowId): Collection
+    {
+        $sequenceFlowNode = $xml->xpath("//bpmn:sequenceFlow[@id='{$sequenceFlowId}']");
+
+        if (empty($sequenceFlowNode)) {
+            return collect();
+        }
+
+        return collect([
+            'targetRef' => (string) $sequenceFlowNode[0]['targetRef'],
+            'sourceRef' => (string) $sequenceFlowNode[0]['sourceRef'],
+        ]);
+    }
+}