Remove reason modal when skipping task (#1766)

issue #1756

website/src/components/Buttons/Buttons.stories.tsx

@@ -1,7 +1,6 @@
 import { ComponentMeta } from "@storybook/react";
 
 import { LikertButtons } from "./LikertButtons";
-import { SkipButton } from "./Skip";
 import { SubmitButton } from "./Submit";
 
 export default {
@@ -20,5 +19,3 @@ export const Likert = () => {
     ></LikertButtons>
   );
 };
-
-export const Skip = () => <SkipButton onSkip={() => console.log("onClick")}>Skip</SkipButton>;

website/src/components/Survey/TaskControls.tsx

@@ -1,7 +1,6 @@
-import { Box, Flex, IconButton, Progress, Tooltip, useColorModeValue } from "@chakra-ui/react";
+import { Box, Button, Flex, IconButton, Progress, Tooltip, useColorModeValue } from "@chakra-ui/react";
 import { Edit2 } from "lucide-react";
 import { useTranslation } from "next-i18next";
-import { SkipButton } from "src/components/Buttons/Skip";
 import { SubmitButton } from "src/components/Buttons/Submit";
 import { TaskInfo } from "src/components/TaskInfo/TaskInfo";
 import { TaskStatus } from "src/components/Tasks/Task";
@@ -14,7 +13,7 @@ export interface TaskControlsProps {
   onEdit: () => void;
   onReview: () => void;
   onSubmit: () => void;
-  onSkip: (reason: string) => void;
+  onSkip: () => void;
 }
 
 export const TaskControls = ({
@@ -37,7 +36,9 @@ export const TaskControls = ({
         <Flex width={["full", "fit-content"]} justify="center" ml="auto" gap={2}>
           {taskStatus.mode === "EDIT" ? (
             <>
-              <SkipButton onSkip={onSkip} />
+              <Button size="lg" variant="outline" onClick={onSkip}>
+                {t("skip")}
+              </Button>
               <SubmitButton
                 colorScheme="blue"
                 data-cy="review"

website/src/hooks/tasks/useGenericTaskAPI.tsx

@@ -51,15 +51,12 @@ export const useGenericTaskAPI = <TaskType extends BaseTask, ResponseContent = A
   }, [requestNewTask]);
 
   const { trigger: sendRejection } = useSWRMutation("/api/reject_task", post, { onSuccess: skipTask });
-  const rejectTask = useCallback(
-    async (reason: string) => {
-      if (response.taskAvailability !== "AVAILABLE") {
-        throw new Error("Cannot reject task that is not yet ready");
-      }
-      await sendRejection({ id: response.id, reason });
-    },
-    [response, sendRejection]
-  );
+  const rejectTask = useCallback(async () => {
+    if (response.taskAvailability !== "AVAILABLE") {
+      throw new Error("Cannot reject task that is not yet ready");
+    }
+    await sendRejection({ id: response.id });
+  }, [response, sendRejection]);
 
   const completeTask = useCallback(
     async (content: ResponseContent) => {

website/src/lib/oasst_api_client.ts

@@ -141,8 +141,8 @@ export class OasstApiClient {
     return this.post(`/api/v1/tasks/${taskId}/ack`, { message_id: messageId });
   }
 
-  async nackTask(taskId: string, reason: string): Promise<null> {
-    return this.post(`/api/v1/tasks/${taskId}/nack`, { reason });
+  async nackTask(taskId: string): Promise<null> {
+    return this.post(`/api/v1/tasks/${taskId}/nack`, {});
   }
 
   // TODO return a strongly typed Task?

website/src/pages/api/reject_task.ts

@@ -5,7 +5,7 @@ import prisma from "src/lib/prismadb";
 
 const handler = withoutRole("banned", async (req, res, token) => {
   // Parse out the local task ID and the interaction contents.
-  const { id: frontendId, reason } = req.body;
+  const { id: frontendId } = req.body;
 
   const [oasstApiClient, registeredTask] = await Promise.all([
     createApiClient(token),
@@ -15,7 +15,7 @@ const handler = withoutRole("banned", async (req, res, token) => {
   const taskId = (registeredTask.task as Prisma.JsonObject).id as string;
 
   // Update the backend with the rejection
-  await oasstApiClient.nackTask(taskId, reason);
+  await oasstApiClient.nackTask(taskId);
 
   // Send the results to the client.
   res.status(200).json({});

website/src/types/Hooks.ts

@@ -6,7 +6,7 @@ export type TaskApiHook<Task extends BaseTask, ResponseContent> = {
   response: TaskResponse<Task>;
   isLoading: boolean;
   completeTask: (interaction: ResponseContent) => Promise<void>;
-  rejectTask: (reason: string) => Promise<void>;
+  rejectTask: () => Promise<void>;
 };
 
 export type TaskApiHooks = Record<TaskType, (args: TaskType) => TaskApiHook<BaseTask, AllTaskReplies>>;