From 0979b4300ae04959ca499529e97ed9d6e55f5658 Mon Sep 17 00:00:00 2001
From: James Melvin <melvin@gameface.ai>
Date: Fri, 13 Jan 2023 18:58:42 +0530
Subject: [PATCH 1/4] fix: non-empty text before submitting on create task

---
 website/src/components/Tasks/CreateTask.tsx | 11 ++++++++---
 website/src/components/Tasks/Task.tsx       |  4 ++++
 website/src/types/TaskReplyState.ts         |  6 +++++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/website/src/components/Tasks/CreateTask.tsx b/website/src/components/Tasks/CreateTask.tsx
index b66eebb0..0bc3c7de 100644
--- a/website/src/components/Tasks/CreateTask.tsx
+++ b/website/src/components/Tasks/CreateTask.tsx
@@ -11,11 +11,16 @@ export const CreateTask = ({ task, taskType, onReplyChanged }: TaskSurveyProps<{
   const labelColor = useColorModeValue("gray.600", "gray.400");
 
   const [inputText, setInputText] = useState("");
-
   const textChangeHandler = (event: React.ChangeEvent<HTMLTextAreaElement>) => {
     const text = event.target.value;
-    onReplyChanged({ content: { text }, state: "VALID" });
-    setInputText(text);
+    const isTextBlank = (!text || /^\s*$/.test(text))?true:false;
+    if(!isTextBlank){
+      onReplyChanged({ content: { text }, state: "VALID" });
+      setInputText(text);
+    }else{
+      onReplyChanged({content: { text }, state: "INVALID"});
+      setInputText("");
+    }
   };
 
   return (
diff --git a/website/src/components/Tasks/Task.tsx b/website/src/components/Tasks/Task.tsx
index 1ccef66c..f5bac231 100644
--- a/website/src/components/Tasks/Task.tsx
+++ b/website/src/components/Tasks/Task.tsx
@@ -50,7 +50,10 @@ export const Task = ({ frontendId, task, trigger, mutate }) => {
       if (taskStatus !== "DEFAULT") setTaskStatus("DEFAULT");
     } else if (state.state === "VALID") {
       if (taskStatus !== "SUBMITABLE") setTaskStatus("SUBMITABLE");
+    } else if (state.state == "INVALID") {
+      setTaskStatus("NOT_SUBMITTABLE");
     }
+    console.log(taskStatus);
   }).current;
 
   const submitResponse = () => {
@@ -94,6 +97,7 @@ export const Task = ({ frontendId, task, trigger, mutate }) => {
         onSubmit={submitResponse}
         onSkip={rejectTask}
         onNextTask={mutate}
+        key={taskStatus}
       />
       <UnchangedWarning
         show={showUnchangedWarning}
diff --git a/website/src/types/TaskReplyState.ts b/website/src/types/TaskReplyState.ts
index 602446f9..648dae3c 100644
--- a/website/src/types/TaskReplyState.ts
+++ b/website/src/types/TaskReplyState.ts
@@ -6,5 +6,9 @@ export interface TaskReplyDefault<T> {
   content: T;
   state: "DEFAULT";
 }
+export interface TaskReplyInValid<T> {
+  content: T;
+  state: "INVALID";
+}
 
-export type TaskReplyState<T> = TaskReplyValid<T> | TaskReplyDefault<T>;
+export type TaskReplyState<T> = TaskReplyValid<T> | TaskReplyDefault<T> | TaskReplyInValid<T>;

From 8067e1a879ef5f29353889e6074ac6943ff9ad8a Mon Sep 17 00:00:00 2001
From: James Melvin <melvin@gameface.ai>
Date: Fri, 13 Jan 2023 19:04:51 +0530
Subject: [PATCH 2/4] fix: pre-commit changes

---
 website/src/components/Tasks/CreateTask.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/website/src/components/Tasks/CreateTask.tsx b/website/src/components/Tasks/CreateTask.tsx
index 0bc3c7de..448258e9 100644
--- a/website/src/components/Tasks/CreateTask.tsx
+++ b/website/src/components/Tasks/CreateTask.tsx
@@ -13,12 +13,12 @@ export const CreateTask = ({ task, taskType, onReplyChanged }: TaskSurveyProps<{
   const [inputText, setInputText] = useState("");
   const textChangeHandler = (event: React.ChangeEvent<HTMLTextAreaElement>) => {
     const text = event.target.value;
-    const isTextBlank = (!text || /^\s*$/.test(text))?true:false;
-    if(!isTextBlank){
+    const isTextBlank = !text || /^\s*$/.test(text) ? true : false;
+    if (!isTextBlank) {
       onReplyChanged({ content: { text }, state: "VALID" });
       setInputText(text);
-    }else{
-      onReplyChanged({content: { text }, state: "INVALID"});
+    } else {
+      onReplyChanged({ content: { text }, state: "INVALID" });
       setInputText("");
     }
   };

From b24b47d8bd3c839a13a50bdffdd5cab284254b38 Mon Sep 17 00:00:00 2001
From: James Melvin <melvin@gameface.ai>
Date: Fri, 13 Jan 2023 19:10:50 +0530
Subject: [PATCH 3/4] fix: merge conflict

---
 website/src/components/Tasks/Task.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/website/src/components/Tasks/Task.tsx b/website/src/components/Tasks/Task.tsx
index f5bac231..dc94c2d9 100644
--- a/website/src/components/Tasks/Task.tsx
+++ b/website/src/components/Tasks/Task.tsx
@@ -97,7 +97,6 @@ export const Task = ({ frontendId, task, trigger, mutate }) => {
         onSubmit={submitResponse}
         onSkip={rejectTask}
         onNextTask={mutate}
-        key={taskStatus}
       />
       <UnchangedWarning
         show={showUnchangedWarning}

From 786553e00abc35fcb29dbdb48e8d6e6435f165dc Mon Sep 17 00:00:00 2001
From: James Melvin <melvin@gameface.ai>
Date: Fri, 13 Jan 2023 19:59:13 +0530
Subject: [PATCH 4/4] fix: removed console log

---
 website/src/components/Tasks/Task.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/website/src/components/Tasks/Task.tsx b/website/src/components/Tasks/Task.tsx
index dc94c2d9..e97b3d4d 100644
--- a/website/src/components/Tasks/Task.tsx
+++ b/website/src/components/Tasks/Task.tsx
@@ -53,7 +53,6 @@ export const Task = ({ frontendId, task, trigger, mutate }) => {
     } else if (state.state == "INVALID") {
       setTaskStatus("NOT_SUBMITTABLE");
     }
-    console.log(taskStatus);
   }).current;
 
   const submitResponse = () => {