clean: only assign unassigned linked tasks

coopcycle · Jun 4, 2024 · 3f9d2e1 · 3f9d2e1
1 parent 817930c
commit 3f9d2e1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/redux/Dispatch/actions.js b/src/redux/Dispatch/actions.js
@@ -21,7 +21,7 @@ import {
   startTaskSuccess,
 } from '../Courier';
 
-import { withLinkedTasks } from '../../shared/src/logistics/redux/taskUtils';
+import { withUnassignedLinkedTasks } from '../../shared/src/logistics/redux/taskUtils';
 import { isSameDate } from './utils';
 
 /*
@@ -299,7 +299,7 @@ export function assignTask(task, username) {
   return function (dispatch, getState) {
     const httpClient = getState().app.httpClient;
 
-    const linkedTasks = withLinkedTasks(task, selectAllTasks(getState()));
+    const linkedTasks = withUnassignedLinkedTasks(task, selectAllTasks(getState()));
 
     if (linkedTasks.length > 1) {
       dispatch(bulkAssignmentTasksRequest());
@@ -341,7 +341,7 @@ export function bulkAssignmentTasks(tasks, username) {
     let tasksToAssign = [];
 
     tasks.forEach((task) => {
-      tasksToAssign.push(...withLinkedTasks(task, selectAllTasks(getState())))
+      tasksToAssign.push(...withUnassignedLinkedTasks(task, selectAllTasks(getState())))
     });
 
     const payload = _.uniq(tasksToAssign.map(t => t['@id']));

diff --git a/src/shared/src/logistics/redux/taskUtils.js b/src/shared/src/logistics/redux/taskUtils.js
@@ -57,12 +57,10 @@ export function groupLinkedTasks(tasks) {
   });
 }
 
-export function withLinkedTasks(task, allTasks) {
+function withLinkedTasks(task, allTasks) {
   const groups = groupLinkedTasks(allTasks);
   const newTasks = [];
 
-  console.debug(groups)
-
   if (Object.prototype.hasOwnProperty.call(groups, task['@id'])) {
     groups[task['@id']].forEach(taskId => {
       const t = _.find(allTasks, t => t['@id'] === taskId);
@@ -72,12 +70,13 @@ export function withLinkedTasks(task, allTasks) {
     // task with no linked tasks
     newTasks.push(task);
   }
-
-  console.debug(newTasks)
-
   return newTasks;
 }
 
+export function withUnassignedLinkedTasks(task, allTasks) {
+  return withLinkedTasks(task, allTasks).filter(t => !t.assignedTo)
+}
+
 export function mapToColor(tasks) {
   return mapValues(groupLinkedTasks(tasks), taskIds =>
     colorHash.hex(taskIds.join(' ')),