From c440edc53a446d849de8f9f4fa2e8ee7688ecd7e Mon Sep 17 00:00:00 2001
From: Jim O'Donnell <james.odonnell@dtc.ox.ac.uk>
Date: Thu, 9 May 2024 21:59:26 +0100
Subject: [PATCH] fix: prevent tasks linking to themselves

A second go at fixing this, previously fixed in #5925. Pass the current task key as a prop to `NextTaskSelector`. Filter the list of tasks to exclude that task key, so that a task can't link back to itself.

This has to be edited in the editors for each individual task type, but I think I got them all.
---
 app/classifier/tasks/combo/editor.cjsx          | 3 ++-
 app/classifier/tasks/dropdown/editor.jsx        | 3 ++-
 app/classifier/tasks/generic-editor.cjsx        | 5 +++--
 app/classifier/tasks/next-task-selector.cjsx    | 2 +-
 app/classifier/tasks/slider/editor.jsx          | 3 ++-
 app/classifier/tasks/survey/editor.cjsx         | 3 ++-
 app/classifier/tasks/text/editor.cjsx           | 3 ++-
 app/classifier/tasks/textFromSubject/editor.jsx | 3 ++-
 8 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/app/classifier/tasks/combo/editor.cjsx b/app/classifier/tasks/combo/editor.cjsx
index 323c43982f..5dd9082316 100644
--- a/app/classifier/tasks/combo/editor.cjsx
+++ b/app/classifier/tasks/combo/editor.cjsx
@@ -47,6 +47,7 @@ ComboTaskEditor = createReactClass
     </li>
 
   render: ->
+    [root, taskKey] = @props.taskPrefix.split '.'
     tasks = require('..').default
     <div>
       <p>Add any number of tasks here and they'll be shown in one step.</p>
@@ -77,7 +78,7 @@ ComboTaskEditor = createReactClass
       <p>
         <label>
           Next task:{' '}
-          <NextTaskSelector task={@props.task} workflow={@props.workflow} value={@props.task.next} onChange={@setNextTask} />
+          <NextTaskSelector taskKey={taskKey} workflow={@props.workflow} value={@props.task.next} onChange={@setNextTask} />
         </label>
         <br />
         <span className="form-help">This overrides anything set by a sub-task.</span>
diff --git a/app/classifier/tasks/dropdown/editor.jsx b/app/classifier/tasks/dropdown/editor.jsx
index d77bd47d8c..fcebbd77c3 100644
--- a/app/classifier/tasks/dropdown/editor.jsx
+++ b/app/classifier/tasks/dropdown/editor.jsx
@@ -120,6 +120,7 @@ export default class DropdownEditor extends React.Component {
   }
 
   render() {
+    const [root, taskKey] = this.props.taskPrefix.split('.');
     const handleChange = handleInputChange.bind(this.props.workflow);
 
     const selects = this.props.task.selects;
@@ -218,7 +219,7 @@ export default class DropdownEditor extends React.Component {
           <span className="form-label">Next task</span>
           <br />
           <NextTaskSelector
-            task={this.props.task}
+            taskKey={taskKey}
             workflow={this.props.workflow}
             name={`${this.props.taskPrefix}.next`}
             value={this.props.task.next || ''}
diff --git a/app/classifier/tasks/generic-editor.cjsx b/app/classifier/tasks/generic-editor.cjsx
index 009e19e95d..69baa9ae05 100644
--- a/app/classifier/tasks/generic-editor.cjsx
+++ b/app/classifier/tasks/generic-editor.cjsx
@@ -37,6 +37,7 @@ module.exports = createReactClass
     taskPrefix: ''
 
   render: ->
+    [root, taskKey] = @props.taskPrefix.split '.'
     handleChange = handleInputChange.bind @props.workflow
 
     [mainTextKey, choicesKey] = switch @props.task.type
@@ -130,7 +131,7 @@ module.exports = createReactClass
                       <div className="workflow-choice-setting">
                         <AutoSave resource={@props.workflow}>
                           Next task{' '}
-                          <NextTaskSelector task={@props.task} workflow={@props.workflow} name="#{@props.taskPrefix}.#{choicesKey}.#{index}.next" value={choice.next ? ''} onChange={handleChange} />
+                          <NextTaskSelector taskKey={taskKey} workflow={@props.workflow} name="#{@props.taskPrefix}.#{choicesKey}.#{index}.next" value={choice.next ? ''} onChange={handleChange} />
                         </AutoSave>
                       </div>
 
@@ -304,7 +305,7 @@ module.exports = createReactClass
         <div>
           <AutoSave resource={@props.workflow}>
             Next task{' '}
-            <NextTaskSelector task={@props.task} workflow={@props.workflow} name="#{@props.taskPrefix}.next" value={@props.task.next ? ''} onChange={handleChange} />
+            <NextTaskSelector taskKey={taskKey} workflow={@props.workflow} name="#{@props.taskPrefix}.next" value={@props.task.next ? ''} onChange={handleChange} />
           </AutoSave>
         </div>}
     </div>
diff --git a/app/classifier/tasks/next-task-selector.cjsx b/app/classifier/tasks/next-task-selector.cjsx
index 796da49f88..76f54ce1d0 100644
--- a/app/classifier/tasks/next-task-selector.cjsx
+++ b/app/classifier/tasks/next-task-selector.cjsx
@@ -21,7 +21,7 @@ module.exports = createReactClass
     <select name={@props.name} value={@props.value} onChange={@props.onChange}>
       <option value="">(Submit classification and load next subject)</option>
       {for key, definition of @props.workflow.tasks
-        unless definition.type is 'shortcut' or definition is @props.task
+        unless definition.type is 'shortcut' or key is @props.taskKey
           text = tasks[definition.type]?.getTaskText definition
           if text and text.length > MAX_TEXT_LENGTH_IN_MENU
             text = text[0...MAX_TEXT_LENGTH_IN_MENU] + '...'
diff --git a/app/classifier/tasks/slider/editor.jsx b/app/classifier/tasks/slider/editor.jsx
index d51b9cd286..52aebe675d 100644
--- a/app/classifier/tasks/slider/editor.jsx
+++ b/app/classifier/tasks/slider/editor.jsx
@@ -7,6 +7,7 @@ import handleInputChange from '../../../lib/handle-input-change';
 import NextTaskSelector from '../next-task-selector';
 
 const SliderTaskEditor = (props) => {
+  const [root, taskKey] = props.taskPrefix.split('.');
   const handleChange = handleInputChange.bind(props.workflow);
   let nextTask;
   let helpBox;
@@ -16,7 +17,7 @@ const SliderTaskEditor = (props) => {
         <span className="form-label">Next task</span>
         <br />
         <NextTaskSelector
-          task={props.task}
+          taskKey={taskKey}
           workflow={props.workflow}
           name={`${props.taskPrefix}.next`}
           value={props.task.next ? props.task.next : ''}
diff --git a/app/classifier/tasks/survey/editor.cjsx b/app/classifier/tasks/survey/editor.cjsx
index 9f5968e1db..b9db2ff6d6 100644
--- a/app/classifier/tasks/survey/editor.cjsx
+++ b/app/classifier/tasks/survey/editor.cjsx
@@ -41,6 +41,7 @@ module.exports = createReactClass
         task: JSON.parse JSON.stringify nextProps.task
 
   render: ->
+    [root, taskKey] = @props.taskPrefix.split '.'
     contentWarnings = @checkContentWarnings()
 
     <div className="workflow-task-editor">
@@ -223,7 +224,7 @@ module.exports = createReactClass
         <AutoSave resource={@props.workflow}>
           <span className="form-label">Next task</span>
           <br />
-          <NextTaskSelector task={@props.task} workflow={@props.workflow} name="#{@props.taskPrefix}.next" value={@props.task.next ? ''} onChange={handleInputChange.bind @props.workflow} />
+          <NextTaskSelector taskKey={taskKey} workflow={@props.workflow} name="#{@props.taskPrefix}.next" value={@props.task.next ? ''} onChange={handleInputChange.bind @props.workflow} />
         </AutoSave>
       </p>
 
diff --git a/app/classifier/tasks/text/editor.cjsx b/app/classifier/tasks/text/editor.cjsx
index 5ec63c6a30..1c565db2df 100644
--- a/app/classifier/tasks/text/editor.cjsx
+++ b/app/classifier/tasks/text/editor.cjsx
@@ -31,6 +31,7 @@ module.exports = createReactClass
 
 
   render: ->
+    [root, taskKey] = @props.taskPrefix.split '.'
     handleChange = handleInputChange.bind @props.workflow
     requiredHelp = 'Check this box if this question has to be answered before proceeding. If a marking task is Required, the volunteer will not be able to move on until they have made at least 1 mark.'
 
@@ -86,6 +87,6 @@ module.exports = createReactClass
         <AutoSave resource={@props.workflow}>
           <span className="form-label">Next task</span>
           <br />
-          <NextTaskSelector task={@props.task} workflow={@props.workflow} name="#{@props.taskPrefix}.next" value={@props.task.next ? ''} onChange={handleInputChange.bind @props.workflow} />
+          <NextTaskSelector taskKey={taskKey} workflow={@props.workflow} name="#{@props.taskPrefix}.next" value={@props.task.next ? ''} onChange={handleInputChange.bind @props.workflow} />
         </AutoSave>}
     </div>
diff --git a/app/classifier/tasks/textFromSubject/editor.jsx b/app/classifier/tasks/textFromSubject/editor.jsx
index 2f29778589..94b0f83d45 100644
--- a/app/classifier/tasks/textFromSubject/editor.jsx
+++ b/app/classifier/tasks/textFromSubject/editor.jsx
@@ -11,6 +11,7 @@ export default function TextFromSubjectEditor({
   taskPrefix,
   workflow
 }) {
+  const [root, taskKey] = taskPrefix.split('.');
   const handleChange = handleInputChange.bind(workflow);
 
   return (
@@ -64,7 +65,7 @@ export default function TextFromSubjectEditor({
         </span>
         <br />
         <NextTaskSelector
-          task={task}
+          taskKey={taskKey}
           workflow={workflow}
           name={`${taskPrefix}.next`}
           value={task.next}