From 9e14de25706f3718eef6d8aaf48400b7358b40f0 Mon Sep 17 00:00:00 2001 From: Keith Stevens Date: Tue, 10 Jan 2023 16:30:44 +0900 Subject: [PATCH] Moving the ValidLabel type --- website/src/components/Messages.tsx | 7 +------ website/src/components/Messages/MessageTableEntry.tsx | 2 +- website/src/hooks/tasks/useGenericTaskAPI.tsx | 1 - website/src/types/Task.ts | 7 +++++++ 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/website/src/components/Messages.tsx b/website/src/components/Messages.tsx index c814a6d6..b49662ed 100644 --- a/website/src/components/Messages.tsx +++ b/website/src/components/Messages.tsx @@ -2,15 +2,10 @@ import { Grid } from "@chakra-ui/react"; import { forwardRef, useColorMode } from "@chakra-ui/react"; import { useMemo } from "react"; import { Message } from "src/types/Conversation"; +import { ValidLabel } from "src/types/Task"; import { FlaggableElement } from "./FlaggableElement"; -export interface ValidLabel { - name: string; - display_text: string; - help_text: string; -} - export const Messages = ({ messages, post_id, diff --git a/website/src/components/Messages/MessageTableEntry.tsx b/website/src/components/Messages/MessageTableEntry.tsx index 0f58efad..e9e8775a 100644 --- a/website/src/components/Messages/MessageTableEntry.tsx +++ b/website/src/components/Messages/MessageTableEntry.tsx @@ -2,7 +2,7 @@ import { Avatar, HStack, LinkBox, useColorModeValue } from "@chakra-ui/react"; import { boolean } from "boolean"; import NextLink from "next/link"; import { FlaggableElement } from "src/components/FlaggableElement"; -import type { ValidLabel } from "src/components/Messages"; +import type { ValidLabel } from "src/types/Task"; interface Message { text: string; diff --git a/website/src/hooks/tasks/useGenericTaskAPI.tsx b/website/src/hooks/tasks/useGenericTaskAPI.tsx index 4b9b3bae..a456cbf1 100644 --- a/website/src/hooks/tasks/useGenericTaskAPI.tsx +++ b/website/src/hooks/tasks/useGenericTaskAPI.tsx @@ -1,5 +1,4 @@ import { useState } from "react"; -import type { ValidLabel } from "src/components/Messages"; import fetcher from "src/lib/fetcher"; import poster from "src/lib/poster"; import { BaseTask, TaskResponse } from "src/types/Task"; diff --git a/website/src/types/Task.ts b/website/src/types/Task.ts index 0dca6a5b..6975fa14 100644 --- a/website/src/types/Task.ts +++ b/website/src/types/Task.ts @@ -12,6 +12,12 @@ export const enum TaskType { label_assistant_reply = "label_assistant_reply", } +export interface ValidLabel { + name: string; + display_text: string; + help_text: string; +} + export interface BaseTask { id: string; type: TaskType; @@ -21,4 +27,5 @@ export interface TaskResponse { id: string; userId: string; task: Task; + valid_labels: ValidLabel[]; }