From 9275df9aa4792683437fe6bcc5b9c4cef05ada87 Mon Sep 17 00:00:00 2001
From: "Marco A. Nina Mena" <marcoantonina@gmail.com>
Date: Fri, 22 Mar 2024 18:21:45 -0400
Subject: [PATCH 1/3] verify that the event is not repeated

---
 src/components/task.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/components/task.vue b/src/components/task.vue
index 5a50ec6f9..1f9aa8d26 100644
--- a/src/components/task.vue
+++ b/src/components/task.vue
@@ -515,6 +515,13 @@ export default {
         this.reload();
       }
     },
+    existsEventMessage(id, data) {
+      if (sessionStorage.getItem(id)) {
+        return true;
+      }
+      sessionStorage.setItem(id, data);
+      return false;
+    },
     listenForParentChanges() {
       if (!this.parentRequest) {
         return;
@@ -525,7 +532,9 @@ export default {
         '.ProcessUpdated',
         (data) => {
           if (['ACTIVITY_ACTIVATED'].includes(data.event)) {
-            this.closeTask(this.parentRequest);
+            if (['ACTIVITY_ACTIVATED'].includes(data.event) && this.existsEventMessage(`ACTIVATED-${this.userId}-${this.taskId}`)) {
+              this.closeTask(this.parentRequest);
+            }
           }
           if (['ACTIVITY_COMPLETED'].includes(data.event)) {
             if (this.task.process_request.status === 'COMPLETED') {

From 98e2a01b3342b2dbe0bdb298874944a31825fbf7 Mon Sep 17 00:00:00 2001
From: "Marco A. Nina Mena" <marcoantonina@gmail.com>
Date: Mon, 25 Mar 2024 14:50:47 -0400
Subject: [PATCH 2/3] Reload task in activity completed

---
 src/components/task.vue | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/components/task.vue b/src/components/task.vue
index 1f9aa8d26..a9b382e93 100644
--- a/src/components/task.vue
+++ b/src/components/task.vue
@@ -480,10 +480,7 @@ export default {
       return allowed ? this.parentRequest : this.requestId
     },
     processUpdated: _.debounce(function(data) {
-      if (
-        data.event === 'ACTIVITY_COMPLETED' ||
-        data.event === 'ACTIVITY_ACTIVATED'
-      ) {
+      if (data.event === 'ACTIVITY_COMPLETED') {
         this.reload();
       }
       if (data.event === 'ACTIVITY_EXCEPTION') {
@@ -532,7 +529,7 @@ export default {
         '.ProcessUpdated',
         (data) => {
           if (['ACTIVITY_ACTIVATED'].includes(data.event)) {
-            if (['ACTIVITY_ACTIVATED'].includes(data.event) && this.existsEventMessage(`ACTIVATED-${this.userId}-${this.taskId}`)) {
+            if (['ACTIVITY_ACTIVATED'].includes(data.event) && this.existsEventMessage(`${data.event}-${this.userId}-${this.taskId}`)) {
               this.closeTask(this.parentRequest);
             }
           }

From 708cafc657e9ad9caec4834b160b8d20994b8df8 Mon Sep 17 00:00:00 2001
From: "Marco A. Nina Mena" <marcoantonina@gmail.com>
Date: Mon, 25 Mar 2024 16:13:15 -0400
Subject: [PATCH 3/3] Add verify event activity_completed

---
 src/components/task.vue | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/components/task.vue b/src/components/task.vue
index a9b382e93..ec2fcb800 100644
--- a/src/components/task.vue
+++ b/src/components/task.vue
@@ -480,7 +480,7 @@ export default {
       return allowed ? this.parentRequest : this.requestId
     },
     processUpdated: _.debounce(function(data) {
-      if (data.event === 'ACTIVITY_COMPLETED') {
+      if (data.event === 'ACTIVITY_ACTIVATED') {
         this.reload();
       }
       if (data.event === 'ACTIVITY_EXCEPTION') {
@@ -528,12 +528,16 @@ export default {
         `ProcessMaker.Models.ProcessRequest.${this.parentRequest}`,
         '.ProcessUpdated',
         (data) => {
-          if (['ACTIVITY_ACTIVATED'].includes(data.event)) {
-            if (['ACTIVITY_ACTIVATED'].includes(data.event) && this.existsEventMessage(`${data.event}-${this.userId}-${this.taskId}`)) {
-              this.closeTask(this.parentRequest);
-            }
+          if (
+            ['ACTIVITY_ACTIVATED'].includes(data.event) &&
+            !this.existsEventMessage(`${data.event}-${this.userId}-${this.taskId}`)
+          ) {
+            this.closeTask(this.parentRequest);
           }
-          if (['ACTIVITY_COMPLETED'].includes(data.event)) {
+          if (
+            ["ACTIVITY_COMPLETED"].includes(data.event) &&
+            !this.existsEventMessage(`${data.event}-${this.userId}-${this.taskId}`)
+          ) {
             if (this.task.process_request.status === 'COMPLETED') {
               this.processCompleted();
             }