From 88e81be9c927713a2efbcd991d211f5a70b33983 Mon Sep 17 00:00:00 2001
From: Henry Jonas <jonathan.quispe@processmaker.com>
Date: Thu, 27 Mar 2025 16:28:06 -0400
Subject: [PATCH 01/16] FOUR-23419: S1: FE - Implement new UI for new comments
 (Task Section)

---
 resources/js/tasks/api/index.js               |  58 ++++
 .../js/tasks/components/TasksPreview.vue      | 267 +++++++++---------
 .../taskPreview/TaskPreviewAssignment.vue     | 105 +++++++
 resources/js/tasks/edit.js                    |   4 +-
 resources/js/tasks/variables/index.js         |   8 +
 5 files changed, 311 insertions(+), 131 deletions(-)
 create mode 100644 resources/js/tasks/api/index.js
 create mode 100644 resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
 create mode 100644 resources/js/tasks/variables/index.js

diff --git a/resources/js/tasks/api/index.js b/resources/js/tasks/api/index.js
new file mode 100644
index 0000000000..c8bd09f0df
--- /dev/null
+++ b/resources/js/tasks/api/index.js
@@ -0,0 +1,58 @@
+import { getApi } from "../variables/index";
+
+// getReassignUsers(filter = null) {
+//   const params = { };
+//   if (filter) {
+//     params.filter = filter;
+//   }
+//   if (this.task?.id) {
+//     params.assignable_for_task_id = this.task.id;
+//   }
+
+//   ProcessMaker.apiClient.get('users_task_count', { params }).then(response => {
+//     this.reassignUsers = [];
+//     response.data.data.forEach((user) => {
+//       if (this.currentTaskUserId === user.id) {
+//         return;
+//       }
+//       this.reassignUsers.push({
+//         text: user.fullname,
+//         value: user.id,
+//         active_tasks_count: user.active_tasks_count
+//       });
+//     });
+//   });
+// }
+
+export const getReassignUsers = async (filter = null, taskId = null) => {
+  const api = getApi();
+  console.log("getReassignUsers", filter, taskId);
+  const response = await api.get("users_task_count", { params: { filter, assignable_for_task_id: taskId } });
+  return response.data;
+};
+
+export const updateReassignUser = async (taskId, userId) => {
+  const api = getApi();
+  const response = await api.put(`tasks/${taskId}`, { user_id: userId });
+  return response.data;
+};
+
+// const reassignUser = async (redirect = false) => {
+//   if (selectedUser.value) {
+//     ProcessMaker.apiClient
+//       .put(`tasks/${this.task.id}`, {
+//         user_id: this.selectedUser,
+//       })
+//       .then((response) => {
+//         this.$emit("on-reassign-user", this.selectedUser);
+//         this.showReassignment = false;
+//         this.selectedUser = null;
+//         if (redirect) {
+//           this.redirect("/tasks");
+//         }
+//         if (this.showPreview) {
+//           this.showPreview = false;
+//         }
+//       });
+//   }
+// };
diff --git a/resources/js/tasks/components/TasksPreview.vue b/resources/js/tasks/components/TasksPreview.vue
index fd45f5817a..47d0ef83d6 100644
--- a/resources/js/tasks/components/TasksPreview.vue
+++ b/resources/js/tasks/components/TasksPreview.vue
@@ -1,75 +1,81 @@
 <template>
   <div>
     <div v-if="tooltipButton === 'inboxRules' && showPreview">
-      <splitpane-container  :size="50" :class-inbox="true">
+      <splitpane-container
+        :size="50"
+        :class-inbox="true">
         <div
-        ref="tasks-preview"
-        class="tasks-preview h-100 p-3"
-        >
+          ref="tasks-preview"
+          class="tasks-preview h-100 p-3">
           <div class="d-flex w-100 mb-3">
-             <slot name="header" v-bind:close="onClose" v-bind:screenFilteredTaskData="formData" v-bind:taskReady="taskReady"></slot>
+            <slot
+              name="header"
+              :close="onClose"
+              :screen-filtered-task-data="formData"
+              :task-ready="taskReady" />
           </div>
-          <div :class="{
-            'frame-container': tooltipButton === 'previewTask' || tooltipButton === '',
-            'frame-container-full': tooltipButton === 'fullTask',
-            'frame-container-inbox': tooltipButton === 'inboxRules'
+          <div
+            :class="{
+              'frame-container': tooltipButton === 'previewTask' || tooltipButton === '',
+              'frame-container-full': tooltipButton === 'fullTask',
+              'frame-container-inbox': tooltipButton === 'inboxRules'
             }"
             class="iframe-container">
             <iframe
               v-if="showFrame1"
-              :title="$t('Preview')"
               ref="tasksFrame1"
+              :title="$t('Preview')"
               width="100%"
               :class="showFrame2 ? 'loadingFrame' : ''"
               class="iframe"
               :src="linkTasks1"
-              @load="frameLoaded('tasksFrame1')"
               :event-parent-id="_uid"
-            />
+              @load="frameLoaded('tasksFrame1')" />
             <iframe
               v-if="showFrame2"
-              :title="$t('Preview')"
               ref="tasksFrame2"
+              :title="$t('Preview')"
               width="100%"
               :class="showFrame1 ? 'loadingFrame' : ''"
               class="iframe"
               :src="linkTasks2"
-              @load="frameLoaded('tasksFrame2')"
               :event-parent-id="_uid"
-            />
+              @load="frameLoaded('tasksFrame2')" />
 
             <task-loading
               v-show="stopFrame"
-              class="load-frame"
-            />
+              class="load-frame" />
           </div>
-      </div>
-          </splitpane-container>
+        </div>
+      </splitpane-container>
     </div>
 
     <div v-else>
-    <splitpane-container v-if="showPreview" :size="splitpaneSize">
-      <div
-        ref="tasks-preview"
-        class="tasks-preview h-100 p-3 position-relative"
-      >
+      <splitpane-container
+        v-if="showPreview"
+        :size="splitpaneSize">
+        <div
+          ref="tasks-preview"
+          class="tasks-preview h-100 p-3 position-relative">
           <div class="d-flex w-100 mb-3">
-            <slot name="header" v-bind:close="onClose" v-bind:screenFilteredTaskData="formData" v-bind:taskReady="taskReady">
+            <slot
+              name="header"
+              :close="onClose"
+              :screen-filtered-task-data="formData"
+              :task-ready="taskReady">
               <b-button-group>
                 <b-button
                   class="arrow-button"
                   variant="outline-secondary"
                   :disabled="!existPrev || disableNavigation"
-                  @click="goPrevNext('Prev')"
-                >
+                  @click="goPrevNext('Prev')">
                   <i class="fas fa-chevron-left" />
                 </b-button>
                 <b-button
                   class="arrow-button"
                   variant="outline-secondary"
                   :disabled="!existNext || disableNavigation"
-                  @click="goPrevNext('Next')"
-                >
+                  @click="goPrevNext('Next')">
                   <i class="fas fa-chevron-right" />
                 </b-button>
               </b-button-group>
@@ -79,8 +85,7 @@
                 :date="lastAutosave"
                 :error="errorAutosave"
                 :form-data="formData"
-                :size="headerResponsive()"
-              />
+                :size="headerResponsive()" />
               <div class="ml-auto mr-0 text-right">
                 <ellipsis-menu
                   v-if="ellipsisButton"
@@ -88,96 +93,87 @@
                   :data="task"
                   :divider="false"
                   style="float:none; color: #566877;"
-                  @navigate="onProcessNavigate"
-                />
+                  @navigate="onProcessNavigate" />
                 <b-button-group
                   v-if="!ellipsisButton"
-                  class="preview-group-button"
-                >
+                  class="preview-group-button">
                   <b-button
+                    v-if="taskDraftsEnabled"
+                    v-b-tooltip.hover
                     class="icon-button"
                     :aria-label="$t('Clear Draft')"
                     variant="light"
-                    v-b-tooltip.hover 
                     :title="$t('Clear Draft')"
-                    @click="eraseDraft()"
-                    v-if="taskDraftsEnabled"
-                  >
-                    <img src="/img/smartinbox-images/eraser.svg" :alt="$t('No Image')">
+                    @click="eraseDraft()">
+                    <img
+                      src="/img/smartinbox-images/eraser.svg"
+                      :alt="$t('No Image')">
                   </b-button>
                   <b-button
                     v-if="showQuickFillPreview === false"
+                    v-b-tooltip.hover
                     class="icon-button"
                     :aria-label="$t('Quick fill')"
-                    v-b-tooltip.hover 
                     :title="$t('Quick fill')"
                     variant="light"
-                    @click="showQuickFillPreview = true"
-                  >
+                    @click="showQuickFillPreview = true">
                     <img
                       src="/img/smartinbox-images/fill.svg"
-                      :alt="$t('No Image')"
-                    >
+                      :alt="$t('No Image')">
                   </b-button>
                 </b-button-group>
                 <b-button-group
                   v-if="!ellipsisButton"
-                  class="preview-group-button"
-                >
+                  class="preview-group-button">
                   <b-button
+                    v-b-tooltip.hover
                     class="icon-button"
                     variant="light"
                     :aria-label="$t('Priority')"
-                    v-b-tooltip.hover 
                     :title="$t('Priority')"
                     :class="{ 'button-priority': isPriority }"
-                    @click="addPriority()"
-                  >
+                    @click="addPriority()">
                     <img
                       :src="
                         isPriority
                           ? '/img/priority.svg'
                           : '/img/priority-header.svg'
                       "
-                      :alt="$t('No Image')"
-                    >
+                      :alt="$t('No Image')">
                   </b-button>
                   <b-button
                     v-if="allowReassignment"
+                    v-b-tooltip.hover
                     class="btn text-secondary icon-button"
                     variant="light"
                     :aria-label="$t('Reassign')"
-                    v-b-tooltip.hover 
                     :title="$t('Reassign')"
-                    @click="openReassignment()"
-                  >
+                    @click="openReassignment()">
                     <i class="fas fa-user-friends" />
                   </b-button>
                   <b-button
+                    v-b-tooltip.hover
                     class="btn text-secondary icon-button"
                     variant="light"
                     :aria-label="$t('Open Task')"
-                    v-b-tooltip.hover 
                     :title="$t('Open Task')"
-                    @click="openTask()"
-                  >
+                    @click="openTask()">
                     <i class="fas fa-external-link-alt" />
                   </b-button>
                 </b-button-group>
 
                 <b-button
+                  v-b-tooltip.hover
                   class="btn-light text-secondary"
                   :aria-label="$t('Close')"
-                    v-b-tooltip.hover 
-                    :title="$t('Close')"
-                  @click="onClose();showReassignment=false;"
-                >
+                  :title="$t('Close')"
+                  @click="onClose();showReassignment=false;">
                   <i class="fas fa-times" />
                 </b-button>
               </div>
             </slot>
           </div>
-          <div
+          <!-- <div
             id="reassign-container"
             class="d-flex align-items-center overlay-div position-absolute top-0 start-0 w-100 bg-white shadow-lg p-2 pr-4"
             v-if="showReassignment"
@@ -201,54 +197,58 @@
             <button type="button" class="btn btn-outline-secondary btn-sm ml-2" @click="cancelReassign">
               {{ $t('Cancel') }}
             </button>
-          </div>
-          <div :class="{
-            'frame-container': tooltipButton === 'previewTask' || tooltipButton === '',
-            'frame-container-full': tooltipButton === 'fullTask',
-            'frame-container-inbox': tooltipButton === 'inboxRules'
-          }"
-          class="iframe-container">
+          </div> -->
+
+          <TaskPreviewAssignment
+            v-if="showReassignment"
+            :task="task"
+            @on-reassign-user="e=> reassignUser(e,false)" />
+          <div
+            :class="{
+              'frame-container': tooltipButton === 'previewTask' || tooltipButton === '',
+              'frame-container-full': tooltipButton === 'fullTask',
+              'frame-container-inbox': tooltipButton === 'inboxRules'
+            }"
+            class="iframe-container">
             <iframe
               v-if="showFrame1"
-              :title="$t('Preview')"
               ref="tasksFrame1"
+              :title="$t('Preview')"
               width="100%"
               :class="showFrame2 ? 'loadingFrame' : ''"
               class="iframe"
               :src="linkTasks1"
               :event-parent-id="_uid"
-              @load="frameLoaded('tasksFrame1')"
-            />
+              @load="frameLoaded('tasksFrame1')" />
             <iframe
               v-if="showFrame2"
-              :title="$t('Preview')"
               ref="tasksFrame2"
+              :title="$t('Preview')"
               width="100%"
               :class="showFrame1 ? 'loadingFrame' : ''"
               class="iframe"
               :src="linkTasks2"
               :event-parent-id="_uid"
-              @load="frameLoaded('tasksFrame2')"
-            />
+              @load="frameLoaded('tasksFrame2')" />
 
             <task-loading
               v-show="stopFrame"
-              class="load-frame"
-            />
+              class="load-frame" />
+          </div>
+          <splitpane-container
+            v-if="showQuickFillPreview"
+            :size="93">
+            <quick-fill-preview
+              class="quick-fill-preview"
+              :task="task"
+              :prop-from-button="'previewTask'"
+              :prop-columns="propColumns"
+              :prop-filters="propFilters"
+              @quick-fill-data="fillWithQuickFillData"
+              @close="showQuickFillPreview = false" />
+          </splitpane-container>
         </div>
-        <splitpane-container v-if="showQuickFillPreview" :size="93">
-          <quick-fill-preview
-            class="quick-fill-preview"
-            :task="task"
-            :prop-from-button ="'previewTask'"
-            :prop-columns="propColumns"
-            :prop-filters="propFilters"
-            @quick-fill-data="fillWithQuickFillData"
-            @close="showQuickFillPreview = false"
-          ></quick-fill-preview>
-        </splitpane-container>
-      </div>
-    </splitpane-container>
+      </splitpane-container>
     </div>
   </div>
 </template>
@@ -260,15 +260,24 @@ import TaskSaveNotification from "./TaskSaveNotification.vue";
 import EllipsisMenu from "../../components/shared/EllipsisMenu.vue";
 import QuickFillPreview from "./QuickFillPreview.vue";
 import PreviewMixin from "./PreviewMixin";
-import autosaveMixins from "../../modules/autosave/autosaveMixin.js"
-import PMDropdownSuggest from "../../components/PMDropdownSuggest.vue";
+import autosaveMixins from "../../modules/autosave/autosaveMixin.js";
+// import PMDropdownSuggest from "../../components/PMDropdownSuggest.vue";
 import reassignMixin from "../../common/reassignMixin";
+import TaskPreviewAssignment from "./taskPreview/TaskPreviewAssignment.vue";
 
 export default {
-  components: { SplitpaneContainer, TaskLoading, QuickFillPreview, TaskSaveNotification, EllipsisMenu, PMDropdownSuggest },
+  components: {
+    SplitpaneContainer,
+    TaskLoading,
+    QuickFillPreview,
+    TaskSaveNotification,
+    EllipsisMenu,
+    // PMDropdownSuggest,
+    TaskPreviewAssignment,
+  },
   mixins: [PreviewMixin, autosaveMixins, reassignMixin],
   props: ["tooltipButton", "propPreview"],
-  data(){
+  data() {
     return {
     };
   },
@@ -282,9 +291,9 @@ export default {
           this.lastAutosave = "-";
         }
         this.isPriority = task.is_priority;
-        const priorityAction = this.actions.find(action => action.value === 'mark-priority');
+        const priorityAction = this.actions.find((action) => action.value === "mark-priority");
         if (priorityAction) {
-          priorityAction.content = this.isPriority ? 'Unmark Priority' : 'Mark as Priority';
+          priorityAction.content = this.isPriority ? "Unmark Priority" : "Mark as Priority";
         }
         if (this.task.id) {
           this.getTaskDefinitionForReassignmentPermission();
@@ -293,19 +302,19 @@ export default {
         if (task?.id !== previousTask?.id) {
           this.userHasInteracted = false;
           this.setAllowReassignment();
-        } 
+        }
       },
     },
     showPreview(value) {
       this.$emit("onWatchShowPreview", value);
-    }
+    },
   },
   mounted() {
-    if(this.propPreview){
+    if (this.propPreview) {
       this.showPreview = true;
     }
-    
-    this.receiveEvent('taskReady', (taskId) => {
+
+    this.receiveEvent("taskReady", (taskId) => {
       this.taskReady = true;
     });
 
@@ -317,42 +326,36 @@ export default {
       }
     });
 
-    this.receiveEvent('userHasInteracted', () => {
+    this.receiveEvent("userHasInteracted", () => {
       this.userHasInteracted = true;
     });
 
-    this.$root.$on('pane-size', (value) => {
+    this.$root.$on("pane-size", (value) => {
       this.size = value;
     });
     this.screenWidthPx = window.innerWidth;
-    window.addEventListener('resize', this.updateScreenWidthPx);
+    window.addEventListener("resize", this.updateScreenWidthPx);
     this.getUser();
     this.setAllowReassignment();
   },
-  computed: {
-    disabled() {
-      return this.selectedUser ? false : true;
-    },
-  },
   methods: {
     fillWithQuickFillData(data) {
-      const message = this.$t('Task Filled succesfully');
+      const message = this.$t("Task Filled succesfully");
       this.sendEvent("fillData", data);
       this.showUseThisTask = false;
-      ProcessMaker.alert(message, 'success');
+      ProcessMaker.alert(message, "success");
       this.handleAutosave();
       this.disableNavigation = false;
     },
-    sendEvent(name, data)
-    {
+    sendEvent(name, data) {
       const event = new CustomEvent(name, {
-        detail: data
+        detail: data,
       });
-      if(this.showFrame1) {
-        this.$refs["tasksFrame1"].contentWindow.dispatchEvent(event);
+      if (this.showFrame1) {
+        this.$refs.tasksFrame1.contentWindow.dispatchEvent(event);
       }
-      if(this.showFrame2) {
-        this.$refs["tasksFrame2"].contentWindow.dispatchEvent(event);
+      if (this.showFrame2) {
+        this.$refs.tasksFrame2.contentWindow.dispatchEvent(event);
       }
     },
     receiveEvent(name, callback) {
@@ -370,12 +373,12 @@ export default {
       this.options.is_loading = true;
       const draftData = _.omitBy(this.formData, (value, key) => key.startsWith("_"));
       return ProcessMaker.apiClient
-        .put("drafts/" + this.task.id, draftData)
+        .put(`drafts/${this.task.id}`, draftData)
         .then((response) => {
           this.task.draft = _.merge(
             {},
             this.task.draft,
-            response.data
+            response.data,
           );
         })
         .catch(() => {
@@ -389,8 +392,8 @@ export default {
     },
     eraseDraft() {
       ProcessMaker.apiClient
-        .delete("drafts/" + this.task.id)
-        .then(response => {
+        .delete(`drafts/${this.task.id}`)
+        .then((response) => {
           // No need to run resetRequestFiles here
           // because the iframe gets reloaded after
           // the draft is cleared
@@ -403,10 +406,6 @@ export default {
           this.userHasInteracted = false;
         });
     },
-    cancelReassign() {
-      this.showReassignment = false;
-      this.selectedUser = null;
-    },
     openReassignment() {
       this.showReassignment = !this.showReassignment;
       this.getReassignUsers();
@@ -425,7 +424,18 @@ export default {
           this.user = response.data;
         });
     },
-  }
+    reassignUser(selectedUser, redirect = false) {
+      console.log("REASSIGN USER task preview", selectedUser);
+      this.$emit("on-reassign-user", selectedUser);
+      this.showReassignment = false;
+      if (redirect) {
+        this.redirect("/tasks");
+      }
+      if (this.showPreview) {
+        this.showPreview = false;
+      }
+    },
+  },
 };
 </script>
 
@@ -515,7 +525,6 @@ export default {
   color: #C56363;
 }
 
-
 .iframe-container {
   display: flex;
   flex-direction: column;
diff --git a/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue b/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
new file mode 100644
index 0000000000..fb6d3b55f1
--- /dev/null
+++ b/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
@@ -0,0 +1,105 @@
+<template>
+  <div
+    id="reassign-container"
+    class="d-flex align-items-center overlay-div position-absolute top-0 start-0 w-100 bg-white shadow-lg p-2 pr-4">
+    <div class="mr-3">
+      <label for="user">Assign to:</label>
+    </div>
+    <div class="flex-grow-1">
+      <PMDropdownSuggest
+        v-model="selectedUser"
+        :options="reassignUsers"
+        :placeholder="$t('Type here to search')"
+        @onInput="onReassignInput">
+        <template #pre-text="{ option }">
+          <b-badge
+            variant="secondary"
+            class="mr-2 custom-badges pl-2 pr-2 rounded-lg">
+            {{ option.active_tasks_count }}
+          </b-badge>
+        </template>
+      </PMDropdownSuggest>
+    </div>
+    <button
+      type="button"
+      class="btn btn-primary btn-sm ml-2"
+      :disabled="disabled"
+      @click="reassignUser">
+      {{ $t('Assign') }}
+    </button>
+    <button
+      type="button"
+      class="btn btn-outline-secondary btn-sm ml-2"
+      @click="cancelReassign">
+      {{ $t('Cancel') }}
+    </button>
+  </div>
+</template>
+
+<script setup>
+import {
+  ref, onMounted, nextTick, computed,
+} from "vue";
+import PMDropdownSuggest from "../../../components/PMDropdownSuggest.vue";
+import { getReassignUsers, updateReassignUser } from "../../api";
+
+const { _ } = window;
+
+const props = defineProps({
+  task: {
+    type: Object,
+    required: true,
+  },
+});
+
+const emit = defineEmits(["on-reassign-user"]);
+
+const selectedUser = ref(null);
+const reassignUsers = ref([]);
+
+const disabled = computed(() => !selectedUser.value);
+
+const currentTaskUserId = computed(() => props.task.user_id);
+
+// Load the reassign users
+const loadReassignUsers = async () => {
+  const response = await getReassignUsers();
+
+  reassignUsers.value = [];
+  response.data.forEach((user) => {
+    if (currentTaskUserId.value === user.id) {
+      return;
+    }
+    reassignUsers.value.push({
+      text: user.fullname,
+      value: user.id,
+      active_tasks_count: user.active_tasks_count,
+    });
+  });
+};
+
+const onReassignInput = _.debounce(async (filter) => {
+  await loadReassignUsers(filter);
+}, 300);
+
+const reassignUser = async () => {
+  if (selectedUser.value) {
+    const response = await updateReassignUser(props.task.id, selectedUser.value);
+    console.log("REASSIGN USER RESPONSE", response);
+    if (response) {
+      emit("on-reassign-user", selectedUser.value);
+    }
+
+    nextTick(() => {
+      selectedUser.value = null;
+    });
+  }
+};
+const cancelReassign = () => {
+  selectedUser.value = null;
+};
+
+onMounted(async () => {
+  await loadReassignUsers();
+});
+</script>
diff --git a/resources/js/tasks/edit.js b/resources/js/tasks/edit.js
index eb2133702c..9b61442a98 100644
--- a/resources/js/tasks/edit.js
+++ b/resources/js/tasks/edit.js
@@ -15,12 +15,12 @@ window.__ = translator;
 
 const main = new Vue({
   el: "#task",
-  mixins: addons,
   components: {
     TaskSaveNotification,
     TaskSavePanel,
     TasksList,
   },
+  mixins: addons,
   data: {
     // Edit data
     fieldsToUpdate: [],
@@ -260,7 +260,7 @@ const main = new Vue({
     show() {
       this.selectedUser = null;
       this.showReassignment = true;
-      this.getReassignUsers();
+      this.getReassignUsers(); // TODO: improve this code
     },
     showQuickFill() {
       this.redirect(`/tasks/${this.task.id}/edit/quickfill`);
diff --git a/resources/js/tasks/variables/index.js b/resources/js/tasks/variables/index.js
new file mode 100644
index 0000000000..58dccd95eb
--- /dev/null
+++ b/resources/js/tasks/variables/index.js
@@ -0,0 +1,8 @@
+export default {};
+console.log("window.ProcessMaker", window.ProcessMaker);
+
+export const getApi = () => window.ProcessMaker?.apiClient;
+
+// export const getI18n = () => window.ProcessMaker?.i18n;
+
+// export const getAlert = () => window.ProcessMaker?.alert;

From 956a2c818fc7cd8ee91da6678ffe4ec998a5cec0 Mon Sep 17 00:00:00 2001
From: Henry Jonas <jonathan.quispe@processmaker.com>
Date: Thu, 27 Mar 2025 18:44:21 -0400
Subject: [PATCH 02/16] FOUR-23419: S1: FE - Implement new UI for new comments
 (Task Section)

---
 resources/js/tasks/api/index.js               | 49 +--------------
 .../js/tasks/components/TasksPreview.vue      | 34 +---------
 .../taskPreview/TaskPreviewAssignment.vue     | 62 ++++++++++++-------
 resources/js/tasks/variables/index.js         |  5 --
 4 files changed, 46 insertions(+), 104 deletions(-)

diff --git a/resources/js/tasks/api/index.js b/resources/js/tasks/api/index.js
index c8bd09f0df..0b6d8354aa 100644
--- a/resources/js/tasks/api/index.js
+++ b/resources/js/tasks/api/index.js
@@ -1,58 +1,13 @@
 import { getApi } from "../variables/index";
 
-// getReassignUsers(filter = null) {
-//   const params = { };
-//   if (filter) {
-//     params.filter = filter;
-//   }
-//   if (this.task?.id) {
-//     params.assignable_for_task_id = this.task.id;
-//   }
-
-//   ProcessMaker.apiClient.get('users_task_count', { params }).then(response => {
-//     this.reassignUsers = [];
-//     response.data.data.forEach((user) => {
-//       if (this.currentTaskUserId === user.id) {
-//         return;
-//       }
-//       this.reassignUsers.push({
-//         text: user.fullname,
-//         value: user.id,
-//         active_tasks_count: user.active_tasks_count
-//       });
-//     });
-//   });
-// }
-
 export const getReassignUsers = async (filter = null, taskId = null) => {
   const api = getApi();
-  console.log("getReassignUsers", filter, taskId);
   const response = await api.get("users_task_count", { params: { filter, assignable_for_task_id: taskId } });
   return response.data;
 };
 
-export const updateReassignUser = async (taskId, userId) => {
+export const updateReassignUser = async (taskId, userId, comments = null) => {
   const api = getApi();
-  const response = await api.put(`tasks/${taskId}`, { user_id: userId });
+  const response = await api.put(`tasks/${taskId}`, { user_id: userId, comments });
   return response.data;
 };
-
-// const reassignUser = async (redirect = false) => {
-//   if (selectedUser.value) {
-//     ProcessMaker.apiClient
-//       .put(`tasks/${this.task.id}`, {
-//         user_id: this.selectedUser,
-//       })
-//       .then((response) => {
-//         this.$emit("on-reassign-user", this.selectedUser);
-//         this.showReassignment = false;
-//         this.selectedUser = null;
-//         if (redirect) {
-//           this.redirect("/tasks");
-//         }
-//         if (this.showPreview) {
-//           this.showPreview = false;
-//         }
-//       });
-//   }
-// };
diff --git a/resources/js/tasks/components/TasksPreview.vue b/resources/js/tasks/components/TasksPreview.vue
index 47d0ef83d6..56188401cd 100644
--- a/resources/js/tasks/components/TasksPreview.vue
+++ b/resources/js/tasks/components/TasksPreview.vue
@@ -56,8 +56,8 @@
         :size="splitpaneSize">
         <div
           ref="tasks-preview"
-          class="tasks-preview h-100 p-3 position-relative">
-          <div class="d-flex w-100 mb-3">
+          class="tasks-preview h-100 position-relative">
+          <div class="d-flex w-100 p-3">
             <slot
               name="header"
               :close="onClose"
@@ -173,35 +173,10 @@
               </div>
             </slot>
           </div>
-          <!-- <div
-            id="reassign-container"
-            class="d-flex align-items-center overlay-div position-absolute top-0 start-0 w-100 bg-white shadow-lg p-2 pr-4"
-            v-if="showReassignment"
-          >
-            <div class="mr-3">
-              <label for="user">Assign to:</label>
-            </div>
-            <div class="flex-grow-1">
-              <PMDropdownSuggest v-model="selectedUser"
-                                 :options="reassignUsers"
-                                 @onInput="onReassignInput"
-                                 :placeholder="$t('Type here to search')">
-                <template v-slot:pre-text="{ option }">
-                  <b-badge variant="secondary" class="mr-2 custom-badges pl-2 pr-2 rounded-lg">{{ option.active_tasks_count }}</b-badge>
-                </template>
-              </PMDropdownSuggest>
-            </div>
-            <button type="button" class="btn btn-primary btn-sm ml-2" @click="reassignUser(false)" :disabled="disabled">
-              {{ $t('Assign') }}
-            </button>
-            <button type="button" class="btn btn-outline-secondary btn-sm ml-2" @click="cancelReassign">
-              {{ $t('Cancel') }}
-            </button>
-          </div> -->
-
           <TaskPreviewAssignment
             v-if="showReassignment"
             :task="task"
+            @on-cancel-reassign="showReassignment = false"
             @on-reassign-user="e=> reassignUser(e,false)" />
           <div
             :class="{
@@ -261,7 +236,6 @@ import EllipsisMenu from "../../components/shared/EllipsisMenu.vue";
 import QuickFillPreview from "./QuickFillPreview.vue";
 import PreviewMixin from "./PreviewMixin";
 import autosaveMixins from "../../modules/autosave/autosaveMixin.js";
-// import PMDropdownSuggest from "../../components/PMDropdownSuggest.vue";
 import reassignMixin from "../../common/reassignMixin";
 import TaskPreviewAssignment from "./taskPreview/TaskPreviewAssignment.vue";
 
@@ -272,7 +246,6 @@ export default {
     QuickFillPreview,
     TaskSaveNotification,
     EllipsisMenu,
-    // PMDropdownSuggest,
     TaskPreviewAssignment,
   },
   mixins: [PreviewMixin, autosaveMixins, reassignMixin],
@@ -425,7 +398,6 @@ export default {
         });
     },
     reassignUser(selectedUser, redirect = false) {
-      console.log("REASSIGN USER task preview", selectedUser);
       this.$emit("on-reassign-user", selectedUser);
       this.showReassignment = false;
       if (redirect) {
diff --git a/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue b/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
index fb6d3b55f1..fded93b485 100644
--- a/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
+++ b/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
@@ -1,11 +1,9 @@
 <template>
   <div
     id="reassign-container"
-    class="d-flex align-items-center overlay-div position-absolute top-0 start-0 w-100 bg-white shadow-lg p-2 pr-4">
-    <div class="mr-3">
-      <label for="user">Assign to:</label>
-    </div>
-    <div class="flex-grow-1">
+    class="tw-flex tw-flex-col tw-space-y-3 tw-items-center overlay-div tw-absolute top-0 start-0 tw-w-full bg-white shadow-lg tw-p-2">
+    <div class="tw-flex tw-flex-col tw-space-x-2 tw-p-2 tw-w-full">
+      <label>{{ $t('Assign to') }}:</label>
       <PMDropdownSuggest
         v-model="selectedUser"
         :options="reassignUsers"
@@ -20,19 +18,29 @@
         </template>
       </PMDropdownSuggest>
     </div>
-    <button
-      type="button"
-      class="btn btn-primary btn-sm ml-2"
-      :disabled="disabled"
-      @click="reassignUser">
-      {{ $t('Assign') }}
-    </button>
-    <button
-      type="button"
-      class="btn btn-outline-secondary btn-sm ml-2"
-      @click="cancelReassign">
-      {{ $t('Cancel') }}
-    </button>
+
+    <div class="tw-flex tw-flex-col tw-space-x-2 tw-p-2 tw-w-full">
+      <label>{{ $t('Comments') }}</label>
+      <textarea
+        v-model="comments"
+        class="tw-w-full tw-border tw-border-gray-300 tw-rounded-md " />
+    </div>
+
+    <div class="tw-flex tw-flex-row tw-space-x-2 tw-w-full tw-justify-end">
+      <button
+        type="button"
+        class="btn btn-primary btn-sm ml-2"
+        :disabled="disabled"
+        @click="reassignUser">
+        {{ $t('Assign') }}
+      </button>
+      <button
+        type="button"
+        class="btn btn-outline-secondary btn-sm ml-2"
+        @click="cancelReassign">
+        {{ $t('Cancel') }}
+      </button>
+    </div>
   </div>
 </template>
 
@@ -54,11 +62,13 @@ const props = defineProps({
 
 const emit = defineEmits(["on-reassign-user"]);
 
+// Refs
 const selectedUser = ref(null);
+const comments = ref(null);
 const reassignUsers = ref([]);
 
+// Computed properties
 const disabled = computed(() => !selectedUser.value);
-
 const currentTaskUserId = computed(() => props.task.user_id);
 
 // Load the reassign users
@@ -78,14 +88,19 @@ const loadReassignUsers = async () => {
   });
 };
 
+/**
+ * Load the reassign users
+ */
 const onReassignInput = _.debounce(async (filter) => {
   await loadReassignUsers(filter);
 }, 300);
 
+/**
+ * Reassign the user
+ */
 const reassignUser = async () => {
   if (selectedUser.value) {
-    const response = await updateReassignUser(props.task.id, selectedUser.value);
-    console.log("REASSIGN USER RESPONSE", response);
+    const response = await updateReassignUser(props.task.id, selectedUser.value, comments.value);
     if (response) {
       emit("on-reassign-user", selectedUser.value);
     }
@@ -95,8 +110,13 @@ const reassignUser = async () => {
     });
   }
 };
+
+/**
+ * Cancel the reassign
+ */
 const cancelReassign = () => {
   selectedUser.value = null;
+  emit("on-cancel-reassign");
 };
 
 onMounted(async () => {
diff --git a/resources/js/tasks/variables/index.js b/resources/js/tasks/variables/index.js
index 58dccd95eb..678bc49e51 100644
--- a/resources/js/tasks/variables/index.js
+++ b/resources/js/tasks/variables/index.js
@@ -1,8 +1,3 @@
 export default {};
-console.log("window.ProcessMaker", window.ProcessMaker);
 
 export const getApi = () => window.ProcessMaker?.apiClient;
-
-// export const getI18n = () => window.ProcessMaker?.i18n;
-
-// export const getAlert = () => window.ProcessMaker?.alert;

From 0b05cd500d2f2b1ece2c2621f0e63fd833778006 Mon Sep 17 00:00:00 2001
From: Henry Jonas <jonathan.quispe@processmaker.com>
Date: Mon, 31 Mar 2025 11:41:34 -0400
Subject: [PATCH 03/16] FOUR-23419: S1: FE - Implement new UI for new comments
 (Task Section)

---
 resources/js/tasks/api/index.js               | 20 ++++++++++++++++
 .../taskPreview/TaskPreviewAssignment.vue     | 24 +++++++++++++++++--
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/resources/js/tasks/api/index.js b/resources/js/tasks/api/index.js
index 0b6d8354aa..55418c8d4f 100644
--- a/resources/js/tasks/api/index.js
+++ b/resources/js/tasks/api/index.js
@@ -11,3 +11,23 @@ export const updateReassignUser = async (taskId, userId, comments = null) => {
   const response = await api.put(`tasks/${taskId}`, { user_id: userId, comments });
   return response.data;
 };
+
+export const updateComment = async ({
+  body,
+  subject,
+  commentableId,
+  commentableType,
+  parentId = 0,
+  type = "COMMENT",
+}) => {
+  const api = getApi();
+  const response = await api.post("comments/comments", {
+    body,
+    subject,
+    commentable_id: commentableId,
+    commentable_type: commentableType,
+    type,
+    parent_id: parentId,
+  });
+  return response.data;
+};
diff --git a/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue b/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
index fded93b485..d39e9af7e8 100644
--- a/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
+++ b/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
@@ -49,7 +49,7 @@ import {
   ref, onMounted, nextTick, computed,
 } from "vue";
 import PMDropdownSuggest from "../../../components/PMDropdownSuggest.vue";
-import { getReassignUsers, updateReassignUser } from "../../api";
+import { getReassignUsers, updateReassignUser, updateComment } from "../../api";
 
 const { _ } = window;
 
@@ -95,13 +95,33 @@ const onReassignInput = _.debounce(async (filter) => {
   await loadReassignUsers(filter);
 }, 300);
 
+/**
+ * Prepare the comment (data and parameters) to be updated
+ */
+const prepareToUpdateComment = async () => {
+  const comment = {
+    body: comments.value,
+    commentableId: props.task.id,
+    commentableType: "ProcessMaker\\Models\\ProcessRequestToken",
+    type: "COMMENT",
+    parent_id: 0,
+    subject: "Commented on Reassigned Task",
+  };
+
+  const response = await updateComment(comment);
+
+  return response;
+};
+
 /**
  * Reassign the user
  */
 const reassignUser = async () => {
   if (selectedUser.value) {
     const response = await updateReassignUser(props.task.id, selectedUser.value, comments.value);
-    if (response) {
+    const commentResponse = await prepareToUpdateComment();
+
+    if (response && commentResponse) {
       emit("on-reassign-user", selectedUser.value);
     }
 

From 44e4a1d89a2d10e4db9ee8925cd3a2a37622606b Mon Sep 17 00:00:00 2001
From: Roly Gutierrez <roly.gutierrez@processmaker.com>
Date: Wed, 9 Apr 2025 00:20:55 -0400
Subject: [PATCH 04/16] -23421 S1: BE - The comments needs to use in comment to
 Endpoint

 ## Description:
- The following API to assign (reasign) a user needs to receive a comment
- or in order to register a TASK COMMENT

 ## Related Tickets & Packages
https://processmaker.atlassian.net/browse/FOUR-23421
---
 .../Http/Controllers/Api/TaskController.php   | 13 +++++++--
 ProcessMaker/Models/ProcessRequestToken.php   |  5 +++-
 ...eld_to_the_process_request_token_table.php | 28 +++++++++++++++++++
 tests/Feature/Api/TaskControllerTest.php      | 14 ++++++++++
 4 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 database/migrations/2025_04_08_115507_add_the_comments_field_to_the_process_request_token_table.php

diff --git a/ProcessMaker/Http/Controllers/Api/TaskController.php b/ProcessMaker/Http/Controllers/Api/TaskController.php
index 2d691af0ee..7ab85b0e89 100644
--- a/ProcessMaker/Http/Controllers/Api/TaskController.php
+++ b/ProcessMaker/Http/Controllers/Api/TaskController.php
@@ -273,7 +273,13 @@ public function getTasksByCase(Request $request, User $user = null)
      */
     public function show(ProcessRequestToken $task)
     {
-        return new Resource($task);
+        // Obtener el modelo con los datos
+        $taskData = $task->toArray();
+        
+        // Asegúrate de que el campo comments esté presente
+        $taskData['comments'] = $task->comments ?? ''; // Aquí puedes ajustar la lógica para obtener los comentarios
+        
+        return new Resource($taskData);
     }
 
     /**
@@ -335,7 +341,8 @@ public function update(Request $request, ProcessRequestToken $task)
             return new Resource($task->refresh());
         } elseif (!empty($request->input('user_id'))) {
             $userToAssign = $request->input('user_id');
-            $task->reassign($userToAssign, $request->user());
+            $comments = $request->input('comments');
+            $task->reassign($userToAssign, $request->user(), $comments);
 
             $taskRefreshed = $task->refresh();
 
@@ -420,7 +427,7 @@ public function setPriority(Request $request, ProcessRequestToken $task)
     }
 
     /**
-     * Only send data for a screen’s fields
+     * Only send data for a screen's fields
      *
      * @param ProcessRequestToken $task
      *
diff --git a/ProcessMaker/Models/ProcessRequestToken.php b/ProcessMaker/Models/ProcessRequestToken.php
index dbfb962449..8f7f85a1b9 100644
--- a/ProcessMaker/Models/ProcessRequestToken.php
+++ b/ProcessMaker/Models/ProcessRequestToken.php
@@ -1208,7 +1208,7 @@ public function sendActivityActivatedNotifications()
      * @param User $requestingUser
      * @return void
      */
-    public function reassign($toUserId, User $requestingUser)
+    public function reassign($toUserId, User $requestingUser, $comments = '')
     {
         $sendActivityActivatedNotifications = false;
         $reassingAction = false;
@@ -1233,6 +1233,9 @@ public function reassign($toUserId, User $requestingUser)
             $this->persistUserData($toUserId);
             $reassingAction = true;
         }
+        if ($comments != null && $comments !== '') {
+            $this->comments = $comments;
+        }
         $this->save();
 
         if ($sendActivityActivatedNotifications) {
diff --git a/database/migrations/2025_04_08_115507_add_the_comments_field_to_the_process_request_token_table.php b/database/migrations/2025_04_08_115507_add_the_comments_field_to_the_process_request_token_table.php
new file mode 100644
index 0000000000..69811599b1
--- /dev/null
+++ b/database/migrations/2025_04_08_115507_add_the_comments_field_to_the_process_request_token_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('process_request_tokens', function (Blueprint $table) {
+            $table->longText('comments')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('process_request_tokens', function (Blueprint $table) {
+            $table->dropColumn('comments');
+        });
+    }
+};
diff --git a/tests/Feature/Api/TaskControllerTest.php b/tests/Feature/Api/TaskControllerTest.php
index cacba824d3..a545789a58 100644
--- a/tests/Feature/Api/TaskControllerTest.php
+++ b/tests/Feature/Api/TaskControllerTest.php
@@ -248,4 +248,18 @@ public function testTasksByCaseReturnsCorrectData()
         $this->assertEquals($data2['form_input_1'], $responseData[1]['taskData']['form_input_1']);
         $this->assertEquals($data2['form_text_area_1'], $responseData[1]['taskData']['form_text_area_1']);
     }
+
+    public function testShowTaskIncludesNewProperty()
+    {
+        $user = User::factory()->create();
+        $this->actingAs($user);
+
+        $comments = "This is a comment";
+
+        $task = ProcessRequestToken::factory()->create([
+            "comments" => $comments
+        ]);
+
+        $this->assertEquals($comments, $task->comments);
+    }
 }

From 066a037eda4217a2acb8b1ea7e73f4eb53238efd Mon Sep 17 00:00:00 2001
From: Roly Gutierrez <roly.gutierrez@processmaker.com>
Date: Wed, 9 Apr 2025 00:32:24 -0400
Subject: [PATCH 05/16] FOUR-23421 Remove unnecessary changes.

---
 ProcessMaker/Http/Controllers/Api/TaskController.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/ProcessMaker/Http/Controllers/Api/TaskController.php b/ProcessMaker/Http/Controllers/Api/TaskController.php
index 7ab85b0e89..abad08c25c 100644
--- a/ProcessMaker/Http/Controllers/Api/TaskController.php
+++ b/ProcessMaker/Http/Controllers/Api/TaskController.php
@@ -273,13 +273,7 @@ public function getTasksByCase(Request $request, User $user = null)
      */
     public function show(ProcessRequestToken $task)
     {
-        // Obtener el modelo con los datos
-        $taskData = $task->toArray();
-        
-        // Asegúrate de que el campo comments esté presente
-        $taskData['comments'] = $task->comments ?? ''; // Aquí puedes ajustar la lógica para obtener los comentarios
-        
-        return new Resource($taskData);
+        return new Resource($task);
     }
 
     /**

From 5cdee2045834fb480cf2886c958c251acdf68c9c Mon Sep 17 00:00:00 2001
From: Roly Gutierrez <roly.gutierrez@processmaker.com>
Date: Wed, 16 Apr 2025 08:22:36 -0400
Subject: [PATCH 06/16] FOUR-23423 S2: BE - A list of users from the groups or
 users able to resolve the task

---
 .../Http/Controllers/Api/UserController.php   | 25 ++++++--------
 ProcessMaker/Models/Process.php               | 34 +++++++++++++++++++
 .../taskPreview/TaskPreviewAssignment.vue     |  7 ++--
 3 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/ProcessMaker/Http/Controllers/Api/UserController.php b/ProcessMaker/Http/Controllers/Api/UserController.php
index 0ecbf49fe0..aaa23b11f9 100644
--- a/ProcessMaker/Http/Controllers/Api/UserController.php
+++ b/ProcessMaker/Http/Controllers/Api/UserController.php
@@ -186,8 +186,7 @@ public function index(Request $request)
      */
     public function getUsersTaskCount(Request $request)
     {
-        $query = User::nonSystem();
-        $query->select('id', 'username', 'firstname', 'lastname');
+        $query = User::select('id', 'username', 'firstname', 'lastname');
 
         $filter = $request->input('filter', '');
         if (!empty($filter)) {
@@ -199,30 +198,26 @@ public function getUsersTaskCount(Request $request)
             });
         }
 
-        $query->where('status', 'ACTIVE');
-
-        $query->withCount('activeTasks');
-
         $include_ids = [];
         $include_ids_string = $request->input('include_ids', '');
         if (!empty($include_ids_string)) {
             $include_ids = explode(',', $include_ids_string);
         } elseif ($request->has('assignable_for_task_id')) {
-            $task = ProcessRequestToken::findOrFail($request->input('assignable_for_task_id'));
-            if ($task->getAssignmentRule() === 'user_group') {
-                // Limit the list of users to those that can be assigned to the task
-                $include_ids = $task->process->getAssignableUsers($task->element_id);
-            }
+            $processRequestToken = ProcessRequestToken::findOrFail($request->input('assignable_for_task_id'));
+            $include_ids = $processRequestToken->process->getAssignableUsersByAssignmentType($processRequestToken);
         }
 
         if (!empty($include_ids)) {
             $query->whereIn('id', $include_ids);
         }
 
-        $response = $query->orderBy(
-            $request->input('order_by', 'username'),
-            $request->input('order_direction', 'ASC')
-        )
+        $response = $query
+            ->where('is_system', false)
+            ->where('status', 'ACTIVE')
+            ->withCount('activeTasks')
+            ->orderBy(
+                $request->input('order_by', 'username'),
+                $request->input('order_direction', 'ASC'))
             ->paginate(50);
 
         return new ApiCollection($response);
diff --git a/ProcessMaker/Models/Process.php b/ProcessMaker/Models/Process.php
index b1cae9afc3..1d9f0bc749 100644
--- a/ProcessMaker/Models/Process.php
+++ b/ProcessMaker/Models/Process.php
@@ -1037,6 +1037,40 @@ public function getAssignableUsers($processTaskUuid)
         return array_values($users);
     }
 
+    /**
+     * This method is used to get the assignable users for a task based on the assignment rule.
+     * The assignment rule can be:
+     * - user_group: would assign it to those in the group or the Process Manager.
+     * - process_variable: would assign it to those in the group or the Process Manager.
+     * - rule_expression: would assign it to those in the group or the Process Manager.
+     * - previous_task_assignee: would assign it to the Process Manager.
+     * - requester: would assign it to the Process Manager.
+     * - process_manager: would assign it to the same Process Manager.
+     * 
+     * @param ProcessRequestToken $processRequestToken
+     * @return array
+     */
+    public function getAssignableUsersByAssignmentType(ProcessRequestToken $processRequestToken): array
+    {
+        $users = [];
+        switch ($processRequestToken->getAssignmentRule()) {
+            case 'user_group':
+            case 'process_variable':
+            case 'rule_expression':
+                $users = $this->getAssignableUsers($processRequestToken->element_id);
+                $users[] = $processRequestToken->process->properties["manager_id"];
+                break;
+            case 'previous_task_assignee':
+            case 'requester':
+                $users[] = $processRequestToken->process->properties["manager_id"];
+                break;
+            case 'process_manager':
+                $users[] = $processRequestToken->process->properties["manager_id"];
+                break;
+        }
+        return $users;
+    }
+
     /**
      * Get a consolidated list of users within groups.
      *
diff --git a/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue b/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
index d39e9af7e8..9b92c41bc4 100644
--- a/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
+++ b/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
@@ -72,14 +72,11 @@ const disabled = computed(() => !selectedUser.value);
 const currentTaskUserId = computed(() => props.task.user_id);
 
 // Load the reassign users
-const loadReassignUsers = async () => {
-  const response = await getReassignUsers();
+const loadReassignUsers = async (filter) => {
+  const response = await getReassignUsers(filter, props.task.id);
 
   reassignUsers.value = [];
   response.data.forEach((user) => {
-    if (currentTaskUserId.value === user.id) {
-      return;
-    }
     reassignUsers.value.push({
       text: user.fullname,
       value: user.id,

From bbbba0118b9d177bafca6a482e47b97b3a3097a8 Mon Sep 17 00:00:00 2001
From: Roly Gutierrez <roly.gutierrez@processmaker.com>
Date: Mon, 21 Apr 2025 14:24:08 -0400
Subject: [PATCH 07/16] FOUR-23423

Fix unit tests
---
 tests/Feature/Api/UsersTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/Feature/Api/UsersTest.php b/tests/Feature/Api/UsersTest.php
index 1afd472bae..42fe239741 100644
--- a/tests/Feature/Api/UsersTest.php
+++ b/tests/Feature/Api/UsersTest.php
@@ -883,6 +883,7 @@ public function testGetUsersTaskCount()
 
         $process = Process::factory()->create([
             'user_id' => $admin->id,
+            'manager_id' => $admin->id,
         ]);
 
         $bpmn = file_get_contents(__DIR__ . '/../../Fixtures/task_with_user_group_assignment.bpmn');

From ea9df545585b5a5790a20fb7b47106d0288fdf0b Mon Sep 17 00:00:00 2001
From: Paula Quispe <paula.quispe@processmaker.com>
Date: Mon, 19 May 2025 19:24:33 -0400
Subject: [PATCH 08/16] FOUR-24106

---
 .../components/taskPreview/TaskPreviewAssignment.vue      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue b/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
index 9b92c41bc4..ca5f6ba6d8 100644
--- a/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
+++ b/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
@@ -23,7 +23,8 @@
       <label>{{ $t('Comments') }}</label>
       <textarea
         v-model="comments"
-        class="tw-w-full tw-border tw-border-gray-300 tw-rounded-md " />
+        class="tw-w-full tw-border tw-border-gray-300 tw-rounded-md"
+        :placeholder="$t('Add a comment to the assignment')" />
     </div>
 
     <div class="tw-flex tw-flex-row tw-space-x-2 tw-w-full tw-justify-end">
@@ -68,7 +69,10 @@ const comments = ref(null);
 const reassignUsers = ref([]);
 
 // Computed properties
-const disabled = computed(() => !selectedUser.value);
+const disabled = computed(() => {
+  const hasOnlyWhitespace = comments.value && comments.value.trim().length === 0;
+  return !selectedUser.value || hasOnlyWhitespace;
+});
 const currentTaskUserId = computed(() => props.task.user_id);
 
 // Load the reassign users

From 706797ba895d81b816ba28cd1cc19c01671b3e6c Mon Sep 17 00:00:00 2001
From: Henry Jonas <jonathan.quispe@processmaker.com>
Date: Wed, 21 May 2025 14:01:47 -0400
Subject: [PATCH 09/16] FOUR-23891: UI: The Assign button needs to block for
 avoid send the comments a more than one time

---
 .../taskPreview/TaskPreviewAssignment.vue     | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue b/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
index ca5f6ba6d8..f45892d781 100644
--- a/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
+++ b/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
@@ -31,7 +31,7 @@
       <button
         type="button"
         class="btn btn-primary btn-sm ml-2"
-        :disabled="disabled"
+        :disabled="disabled || disabledAssign"
         @click="reassignUser">
         {{ $t('Assign') }}
       </button>
@@ -67,13 +67,13 @@ const emit = defineEmits(["on-reassign-user"]);
 const selectedUser = ref(null);
 const comments = ref(null);
 const reassignUsers = ref([]);
+const disabledAssign = ref(false);
 
 // Computed properties
 const disabled = computed(() => {
   const hasOnlyWhitespace = comments.value && comments.value.trim().length === 0;
   return !selectedUser.value || hasOnlyWhitespace;
 });
-const currentTaskUserId = computed(() => props.task.user_id);
 
 // Load the reassign users
 const loadReassignUsers = async (filter) => {
@@ -118,17 +118,24 @@ const prepareToUpdateComment = async () => {
  * Reassign the user
  */
 const reassignUser = async () => {
+  disabledAssign.value = true;
   if (selectedUser.value) {
-    const response = await updateReassignUser(props.task.id, selectedUser.value, comments.value);
-    const commentResponse = await prepareToUpdateComment();
-
-    if (response && commentResponse) {
-      emit("on-reassign-user", selectedUser.value);
+    try {
+      const response = await updateReassignUser(props.task.id, selectedUser.value, comments.value);
+      const commentResponse = await prepareToUpdateComment();
+
+      if (response && commentResponse) {
+        emit("on-reassign-user", selectedUser.value);
+      }
+
+      nextTick(() => {
+        selectedUser.value = null;
+      });
+    } catch (error) {
+      console.error(error);
+    } finally {
+      disabledAssign.value = false;
     }
-
-    nextTick(() => {
-      selectedUser.value = null;
-    });
   }
 };
 

From 522cbbef6d586907f4b724a36023e94efc34dd2a Mon Sep 17 00:00:00 2001
From: Henry Jonas <jonathan.quispe@processmaker.com>
Date: Wed, 21 May 2025 14:51:07 -0400
Subject: [PATCH 10/16] FOUR-23891: UI: The Assign button needs to block for
 avoid send the comments a more than one time

---
 .../js/tasks/components/taskPreview/TaskPreviewAssignment.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue b/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
index f45892d781..007ad99b0a 100644
--- a/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
+++ b/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
@@ -22,8 +22,8 @@
     <div class="tw-flex tw-flex-col tw-space-x-2 tw-p-2 tw-w-full">
       <label>{{ $t('Comments') }}</label>
       <textarea
-        v-model="comments"
-        class="tw-w-full tw-border tw-border-gray-300 tw-rounded-md"
+        rows="5"
+        class="tw-w-full tw-border tw-border-gray-300 tw-rounded-md tw-resize-none"
         :placeholder="$t('Add a comment to the assignment')" />
     </div>
 

From bfdf6f5c93b6176709928750ff46f9bc80ae0c1a Mon Sep 17 00:00:00 2001
From: Henry Jonas <jonathan.quispe@processmaker.com>
Date: Wed, 21 May 2025 15:53:25 -0400
Subject: [PATCH 11/16] FOUR-23891: UI: The Assign button needs to block for
 avoid send the comments a more than one time

---
 .../components/taskPreview/TaskPreviewAssignment.vue      | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue b/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
index 007ad99b0a..5e06c2840e 100644
--- a/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
+++ b/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
@@ -22,6 +22,7 @@
     <div class="tw-flex tw-flex-col tw-space-x-2 tw-p-2 tw-w-full">
       <label>{{ $t('Comments') }}</label>
       <textarea
+        v-model="comments"
         rows="5"
         class="tw-w-full tw-border tw-border-gray-300 tw-rounded-md tw-resize-none"
         :placeholder="$t('Add a comment to the assignment')" />
@@ -65,15 +66,12 @@ const emit = defineEmits(["on-reassign-user"]);
 
 // Refs
 const selectedUser = ref(null);
-const comments = ref(null);
+const comments = ref("");
 const reassignUsers = ref([]);
 const disabledAssign = ref(false);
 
 // Computed properties
-const disabled = computed(() => {
-  const hasOnlyWhitespace = comments.value && comments.value.trim().length === 0;
-  return !selectedUser.value || hasOnlyWhitespace;
-});
+const disabled = computed(() => !selectedUser.value || !comments.value?.trim());
 
 // Load the reassign users
 const loadReassignUsers = async (filter) => {

From 09330e43d128dd13e5e84b960d302cb3192afeab Mon Sep 17 00:00:00 2001
From: Fabio <frguachallab@gmail.com>
Date: Thu, 29 May 2025 16:34:26 -0400
Subject: [PATCH 12/16] FOUR-24105:Cancel and Assignment buttons are not in the
 correct position in the Reassignment form

---
 .../js/tasks/components/TasksPreview.vue      | 96 ++++++++++++-------
 .../taskPreview/TaskPreviewAssignment.vue     | 28 +++---
 2 files changed, 81 insertions(+), 43 deletions(-)

diff --git a/resources/js/tasks/components/TasksPreview.vue b/resources/js/tasks/components/TasksPreview.vue
index 56188401cd..e9b27459df 100644
--- a/resources/js/tasks/components/TasksPreview.vue
+++ b/resources/js/tasks/components/TasksPreview.vue
@@ -3,16 +3,19 @@
     <div v-if="tooltipButton === 'inboxRules' && showPreview">
       <splitpane-container
         :size="50"
-        :class-inbox="true">
+        :class-inbox="true"
+      >
         <div
           ref="tasks-preview"
-          class="tasks-preview h-100 p-3">
+          class="tasks-preview h-100 p-3"
+        >
           <div class="d-flex w-100 mb-3">
             <slot
               name="header"
               :close="onClose"
               :screen-filtered-task-data="formData"
-              :task-ready="taskReady" />
+              :task-ready="taskReady"
+            />
           </div>
           <div
             :class="{
@@ -20,7 +23,8 @@
               'frame-container-full': tooltipButton === 'fullTask',
               'frame-container-inbox': tooltipButton === 'inboxRules'
             }"
-            class="iframe-container">
+            class="iframe-container"
+          >
             <iframe
               v-if="showFrame1"
               ref="tasksFrame1"
@@ -30,7 +34,8 @@
               class="iframe"
               :src="linkTasks1"
               :event-parent-id="_uid"
-              @load="frameLoaded('tasksFrame1')" />
+              @load="frameLoaded('tasksFrame1')"
+            />
             <iframe
               v-if="showFrame2"
               ref="tasksFrame2"
@@ -40,11 +45,13 @@
               class="iframe"
               :src="linkTasks2"
               :event-parent-id="_uid"
-              @load="frameLoaded('tasksFrame2')" />
+              @load="frameLoaded('tasksFrame2')"
+            />
 
             <task-loading
               v-show="stopFrame"
-              class="load-frame" />
+              class="load-frame"
+            />
           </div>
         </div>
       </splitpane-container>
@@ -53,29 +60,34 @@
     <div v-else>
       <splitpane-container
         v-if="showPreview"
-        :size="splitpaneSize">
+        :size="splitpaneSize"
+      >
         <div
           ref="tasks-preview"
-          class="tasks-preview h-100 position-relative">
+          class="tasks-preview h-100 position-relative"
+        >
           <div class="d-flex w-100 p-3">
             <slot
               name="header"
               :close="onClose"
               :screen-filtered-task-data="formData"
-              :task-ready="taskReady">
+              :task-ready="taskReady"
+            >
               <b-button-group>
                 <b-button
                   class="arrow-button"
                   variant="outline-secondary"
                   :disabled="!existPrev || disableNavigation"
-                  @click="goPrevNext('Prev')">
+                  @click="goPrevNext('Prev')"
+                >
                   <i class="fas fa-chevron-left" />
                 </b-button>
                 <b-button
                   class="arrow-button"
                   variant="outline-secondary"
                   :disabled="!existNext || disableNavigation"
-                  @click="goPrevNext('Next')">
+                  @click="goPrevNext('Next')"
+                >
                   <i class="fas fa-chevron-right" />
                 </b-button>
               </b-button-group>
@@ -85,7 +97,8 @@
                 :date="lastAutosave"
                 :error="errorAutosave"
                 :form-data="formData"
-                :size="headerResponsive()" />
+                :size="headerResponsive()"
+              />
               <div class="ml-auto mr-0 text-right">
                 <ellipsis-menu
                   v-if="ellipsisButton"
@@ -93,10 +106,12 @@
                   :data="task"
                   :divider="false"
                   style="float:none; color: #566877;"
-                  @navigate="onProcessNavigate" />
+                  @navigate="onProcessNavigate"
+                />
                 <b-button-group
                   v-if="!ellipsisButton"
-                  class="preview-group-button">
+                  class="preview-group-button"
+                >
                   <b-button
                     v-if="taskDraftsEnabled"
                     v-b-tooltip.hover
@@ -104,10 +119,12 @@
                     :aria-label="$t('Clear Draft')"
                     variant="light"
                     :title="$t('Clear Draft')"
-                    @click="eraseDraft()">
+                    @click="eraseDraft()"
+                  >
                     <img
                       src="/img/smartinbox-images/eraser.svg"
-                      :alt="$t('No Image')">
+                      :alt="$t('No Image')"
+                    >
                   </b-button>
                   <b-button
                     v-if="showQuickFillPreview === false"
@@ -116,15 +133,18 @@
                     :aria-label="$t('Quick fill')"
                     :title="$t('Quick fill')"
                     variant="light"
-                    @click="showQuickFillPreview = true">
+                    @click="showQuickFillPreview = true"
+                  >
                     <img
                       src="/img/smartinbox-images/fill.svg"
-                      :alt="$t('No Image')">
+                      :alt="$t('No Image')"
+                    >
                   </b-button>
                 </b-button-group>
                 <b-button-group
                   v-if="!ellipsisButton"
-                  class="preview-group-button">
+                  class="preview-group-button"
+                >
                   <b-button
                     v-b-tooltip.hover
                     class="icon-button"
@@ -132,14 +152,16 @@
                     :aria-label="$t('Priority')"
                     :title="$t('Priority')"
                     :class="{ 'button-priority': isPriority }"
-                    @click="addPriority()">
+                    @click="addPriority()"
+                  >
                     <img
                       :src="
                         isPriority
                           ? '/img/priority.svg'
                           : '/img/priority-header.svg'
                       "
-                      :alt="$t('No Image')">
+                      :alt="$t('No Image')"
+                    >
                   </b-button>
                   <b-button
                     v-if="allowReassignment"
@@ -148,7 +170,8 @@
                     variant="light"
                     :aria-label="$t('Reassign')"
                     :title="$t('Reassign')"
-                    @click="openReassignment()">
+                    @click="openReassignment()"
+                  >
                     <i class="fas fa-user-friends" />
                   </b-button>
                   <b-button
@@ -157,7 +180,8 @@
                     variant="light"
                     :aria-label="$t('Open Task')"
                     :title="$t('Open Task')"
-                    @click="openTask()">
+                    @click="openTask()"
+                  >
                     <i class="fas fa-external-link-alt" />
                   </b-button>
                 </b-button-group>
@@ -167,7 +191,8 @@
                   class="btn-light text-secondary"
                   :aria-label="$t('Close')"
                   :title="$t('Close')"
-                  @click="onClose();showReassignment=false;">
+                  @click="onClose();showReassignment=false;"
+                >
                   <i class="fas fa-times" />
                 </b-button>
               </div>
@@ -177,14 +202,16 @@
             v-if="showReassignment"
             :task="task"
             @on-cancel-reassign="showReassignment = false"
-            @on-reassign-user="e=> reassignUser(e,false)" />
+            @on-reassign-user="e=> reassignUser(e,false)"
+          />
           <div
             :class="{
               'frame-container': tooltipButton === 'previewTask' || tooltipButton === '',
               'frame-container-full': tooltipButton === 'fullTask',
               'frame-container-inbox': tooltipButton === 'inboxRules'
             }"
-            class="iframe-container">
+            class="iframe-container"
+          >
             <iframe
               v-if="showFrame1"
               ref="tasksFrame1"
@@ -194,7 +221,8 @@
               class="iframe"
               :src="linkTasks1"
               :event-parent-id="_uid"
-              @load="frameLoaded('tasksFrame1')" />
+              @load="frameLoaded('tasksFrame1')"
+            />
             <iframe
               v-if="showFrame2"
               ref="tasksFrame2"
@@ -204,15 +232,18 @@
               class="iframe"
               :src="linkTasks2"
               :event-parent-id="_uid"
-              @load="frameLoaded('tasksFrame2')" />
+              @load="frameLoaded('tasksFrame2')"
+            />
 
             <task-loading
               v-show="stopFrame"
-              class="load-frame" />
+              class="load-frame"
+            />
           </div>
           <splitpane-container
             v-if="showQuickFillPreview"
-            :size="93">
+            :size="93"
+          >
             <quick-fill-preview
               class="quick-fill-preview"
               :task="task"
@@ -220,7 +251,8 @@
               :prop-columns="propColumns"
               :prop-filters="propFilters"
               @quick-fill-data="fillWithQuickFillData"
-              @close="showQuickFillPreview = false" />
+              @close="showQuickFillPreview = false"
+            />
           </splitpane-container>
         </div>
       </splitpane-container>
diff --git a/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue b/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
index 5e06c2840e..6c49d3567c 100644
--- a/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
+++ b/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
@@ -1,18 +1,21 @@
 <template>
   <div
     id="reassign-container"
-    class="tw-flex tw-flex-col tw-space-y-3 tw-items-center overlay-div tw-absolute top-0 start-0 tw-w-full bg-white shadow-lg tw-p-2">
+    class="tw-flex tw-flex-col tw-space-y-3 tw-items-center overlay-div tw-absolute top-0 start-0 tw-w-full bg-white shadow-lg tw-p-2"
+  >
     <div class="tw-flex tw-flex-col tw-space-x-2 tw-p-2 tw-w-full">
       <label>{{ $t('Assign to') }}:</label>
       <PMDropdownSuggest
         v-model="selectedUser"
         :options="reassignUsers"
         :placeholder="$t('Type here to search')"
-        @onInput="onReassignInput">
+        @onInput="onReassignInput"
+      >
         <template #pre-text="{ option }">
           <b-badge
             variant="secondary"
-            class="mr-2 custom-badges pl-2 pr-2 rounded-lg">
+            class="mr-2 custom-badges pl-2 pr-2 rounded-lg"
+          >
             {{ option.active_tasks_count }}
           </b-badge>
         </template>
@@ -25,22 +28,25 @@
         v-model="comments"
         rows="5"
         class="tw-w-full tw-border tw-border-gray-300 tw-rounded-md tw-resize-none"
-        :placeholder="$t('Add a comment to the assignment')" />
+        :placeholder="$t('Add a comment to the assignment')"
+      />
     </div>
 
     <div class="tw-flex tw-flex-row tw-space-x-2 tw-w-full tw-justify-end">
       <button
         type="button"
-        class="btn btn-primary btn-sm ml-2"
-        :disabled="disabled || disabledAssign"
-        @click="reassignUser">
-        {{ $t('Assign') }}
+        class="btn btn-outline-secondary btn-sm ml-2"
+        @click="cancelReassign"
+      >
+        {{ $t('Cancel') }}
       </button>
       <button
         type="button"
-        class="btn btn-outline-secondary btn-sm ml-2"
-        @click="cancelReassign">
-        {{ $t('Cancel') }}
+        class="btn btn-primary btn-sm ml-2"
+        :disabled="disabled || disabledAssign"
+        @click="reassignUser"
+      >
+        {{ $t('Assign') }}
       </button>
     </div>
   </div>

From a93810b65e5659dc778ba18b895b66ab89b7a913 Mon Sep 17 00:00:00 2001
From: Henry Jonas <jonathan.quispe@processmaker.com>
Date: Mon, 4 Aug 2025 11:53:30 -0400
Subject: [PATCH 13/16] FOUR-24106: There is not placeholder in comment filed
 in Reassignment form

---
 .../js/tasks/components/taskPreview/TaskPreviewAssignment.vue  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue b/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
index 6c49d3567c..c9c44652c9 100644
--- a/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
+++ b/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
@@ -27,7 +27,8 @@
       <textarea
         v-model="comments"
         rows="5"
-        class="tw-w-full tw-border tw-border-gray-300 tw-rounded-md tw-resize-none"
+        class="tw-w-full tw-border tw-border-gray-300 tw-rounded-md
+          tw-resize-none placeholder:tw-text-gray-400/80 placeholder:tw-text-sm tw-p-2"
         :placeholder="$t('Add a comment to the assignment')"
       />
     </div>

From 920d2a2d2f8f041c96ccc80f606c6f94e4698f52 Mon Sep 17 00:00:00 2001
From: Paula Quispe <paula.quispe@processmaker.com>
Date: Tue, 5 Aug 2025 22:14:50 -0400
Subject: [PATCH 14/16] FOUR-25586

---
 ProcessMaker/Http/Controllers/Api/UserController.php | 12 +++++++++++-
 config/app.php                                       |  2 ++
 .../components/taskPreview/TaskPreviewAssignment.vue | 10 ++++++----
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/ProcessMaker/Http/Controllers/Api/UserController.php b/ProcessMaker/Http/Controllers/Api/UserController.php
index a3adf62f2e..3580d40a99 100644
--- a/ProcessMaker/Http/Controllers/Api/UserController.php
+++ b/ProcessMaker/Http/Controllers/Api/UserController.php
@@ -204,7 +204,17 @@ public function getUsersTaskCount(Request $request)
             $include_ids = explode(',', $include_ids_string);
         } elseif ($request->has('assignable_for_task_id')) {
             $processRequestToken = ProcessRequestToken::findOrFail($request->input('assignable_for_task_id'));
-            $include_ids = $processRequestToken->process->getAssignableUsersByAssignmentType($processRequestToken);
+            if (config('app.reassign_restrict_to_assignable_users', true)) {
+                $include_ids = $processRequestToken->process->getAssignableUsersByAssignmentType($processRequestToken);
+            }
+
+            // Exclude the current assigned user from the list
+            $currentUserId = $processRequestToken->user_id;
+            if ($currentUserId) {
+                $include_ids = array_filter($include_ids, function ($id) use ($currentUserId) {
+                    return $id != $currentUserId;
+                });
+            }
         }
 
         if (!empty($include_ids)) {
diff --git a/config/app.php b/config/app.php
index dba8da36cd..6a8db1f079 100644
--- a/config/app.php
+++ b/config/app.php
@@ -292,4 +292,6 @@
     'json_optimization_decode' => env('JSON_OPTIMIZATION_DECODE', false),
 
     'multitenancy' => env('MULTITENANCY', false),
+
+    'reassign_restrict_to_assignable_users' => env('REASSIGN_RESTRICT_TO_ASSIGNABLE_USERS', true),
 ];
diff --git a/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue b/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
index c9c44652c9..64f3418355 100644
--- a/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
+++ b/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
@@ -126,12 +126,14 @@ const reassignUser = async () => {
   disabledAssign.value = true;
   if (selectedUser.value) {
     try {
+      // First create the comment only if comments.value is not empty
+      comments.value && comments.value.trim() && await prepareToUpdateComment();
+
+      // Then reassign the task
       const response = await updateReassignUser(props.task.id, selectedUser.value, comments.value);
-      const commentResponse = await prepareToUpdateComment();
 
-      if (response && commentResponse) {
-        emit("on-reassign-user", selectedUser.value);
-      }
+      // Emit success even if comment creation fails (comments package might not be active)
+      response && emit("on-reassign-user", selectedUser.value);
 
       nextTick(() => {
         selectedUser.value = null;

From c8e3696931e14cd64c27a5236ee4a02da89ce344 Mon Sep 17 00:00:00 2001
From: Paula Quispe <paula.quispe@processmaker.com>
Date: Fri, 8 Aug 2025 19:53:23 -0400
Subject: [PATCH 15/16] FOUR-25586

---
 ProcessMaker/Http/Controllers/Api/UserController.php   | 10 +---------
 resources/js/tasks/api/index.js                        | 10 +++++++---
 .../components/taskPreview/TaskPreviewAssignment.vue   |  2 +-
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/ProcessMaker/Http/Controllers/Api/UserController.php b/ProcessMaker/Http/Controllers/Api/UserController.php
index 3580d40a99..c00503dc38 100644
--- a/ProcessMaker/Http/Controllers/Api/UserController.php
+++ b/ProcessMaker/Http/Controllers/Api/UserController.php
@@ -204,17 +204,9 @@ public function getUsersTaskCount(Request $request)
             $include_ids = explode(',', $include_ids_string);
         } elseif ($request->has('assignable_for_task_id')) {
             $processRequestToken = ProcessRequestToken::findOrFail($request->input('assignable_for_task_id'));
-            if (config('app.reassign_restrict_to_assignable_users', true)) {
+            if (config('app.reassign_restrict_to_assignable_users')) {
                 $include_ids = $processRequestToken->process->getAssignableUsersByAssignmentType($processRequestToken);
             }
-
-            // Exclude the current assigned user from the list
-            $currentUserId = $processRequestToken->user_id;
-            if ($currentUserId) {
-                $include_ids = array_filter($include_ids, function ($id) use ($currentUserId) {
-                    return $id != $currentUserId;
-                });
-            }
         }
 
         if (!empty($include_ids)) {
diff --git a/resources/js/tasks/api/index.js b/resources/js/tasks/api/index.js
index 1dfcfe83c8..0b55e7e35f 100644
--- a/resources/js/tasks/api/index.js
+++ b/resources/js/tasks/api/index.js
@@ -1,9 +1,13 @@
 import { getApi } from "../variables/index";
 
-export const getReassignUsers = async (filter = null, taskId = null) => {
+export const getReassignUsers = async (filter = null, taskId = null, currentTaskUserId = null) => {
   const api = getApi();
-  const response = await api.get("users_task_count", { params: { filter, assignable_for_task_id: taskId } });
-  return response.data;
+  const response = await api.get("users_task_count", { params: { filter, assignable_for_task_id: taskId, include_current_user: true } });
+  const data = response.data;
+  if (currentTaskUserId && Array.isArray(data?.data)) {
+    data.data = data.data.filter((user) => user.id !== currentTaskUserId);
+  }
+  return data;
 };
 
 export const updateReassignUser = async (taskId, userId, comments = null) => {
diff --git a/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue b/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
index 64f3418355..52f066c087 100644
--- a/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
+++ b/resources/js/tasks/components/taskPreview/TaskPreviewAssignment.vue
@@ -82,7 +82,7 @@ const disabled = computed(() => !selectedUser.value || !comments.value?.trim());
 
 // Load the reassign users
 const loadReassignUsers = async (filter) => {
-  const response = await getReassignUsers(filter, props.task.id);
+  const response = await getReassignUsers(filter, props.task.id, props.task.user_id);
 
   reassignUsers.value = [];
   response.data.forEach((user) => {

From c368786dbbfc10632b9f709926473bb102f6f743 Mon Sep 17 00:00:00 2001
From: Fabio <frguachallab@gmail.com>
Date: Mon, 1 Sep 2025 15:58:47 -0400
Subject: [PATCH 16/16] FOUR-24108:Reassignment form is not hidden in tasks
 where the "Allow Reassignment" option is not enabled.

---
 resources/js/tasks/components/PreviewMixin.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/js/tasks/components/PreviewMixin.js b/resources/js/tasks/components/PreviewMixin.js
index c7a5886161..d004bc69d2 100644
--- a/resources/js/tasks/components/PreviewMixin.js
+++ b/resources/js/tasks/components/PreviewMixin.js
@@ -172,6 +172,7 @@ const PreviewMixin = {
       }
       this.prevTask = prevTask;
       this.nextTask = nextTask;
+      this.showReassignment = false;
     },
     /**
      * Expand Open task