Merge pull request #121 from uwblueprint/jacob/populate-task-list

Jacob-Kathleen/populate task list
uwblueprint · Nov 16, 2024 · 610fd05 · 610fd05
2 parents c642cb0 + 8c1aaa2
commit 610fd05
Show file tree

Hide file tree

Showing 10 changed files with 509 additions and 218 deletions.
diff --git a/backend/services/implementations/taskService.ts b/backend/services/implementations/taskService.ts
@@ -172,6 +172,12 @@ class TaskService implements ITaskService {
 
   async deleteTaskById(taskId: number): Promise<TaskDTO> {
     try {
+      await prisma.taskAssigned.deleteMany({
+        where: {
+          taskId,
+        },
+      });
+
       const deletedTask = await prisma.task.delete({
         where: {
           id: taskId,

diff --git a/backend/yarn.lock b/backend/yarn.lock
@@ -3637,6 +3637,11 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
+[email protected]:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
+
 fsevents@^2.3.2, fsevents@~2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"

diff --git a/frontend/src/APIClients/Queries/TaskQueries.ts b/frontend/src/APIClients/Queries/TaskQueries.ts
@@ -17,7 +17,7 @@ export const GET_TASK_BY_ID = gql`
 `;
 
 export const GET_TASKS_BY_TYPE = gql`
-  query getTaskById($type: TaskType!) {
+  query getTasksByType($type: TaskType!) {
     getTasksByType(type: $type) {
       id
       type

diff --git a/frontend/src/components/common/CommonTable.tsx b/frontend/src/components/common/CommonTable.tsx
@@ -20,7 +20,7 @@ import ChevronRightOutlinedIcon from "@mui/icons-material/ChevronRightOutlined";
 import KeyboardArrowUpOutlinedIcon from "@mui/icons-material/KeyboardArrowUpOutlined";
 import KeyboardArrowDownOutlinedIcon from "@mui/icons-material/KeyboardArrowDownOutlined";
 
-type TableTypes = string | number | boolean | Date;
+type TableTypes = string | number | boolean | Date | string[];
 
 export type ColumnInfoTypes = { header: string; key: string };
 

diff --git a/frontend/src/components/common/FormField.tsx b/frontend/src/components/common/FormField.tsx
@@ -28,7 +28,7 @@ const FormField = ({
   leftElement,
 }: {
   label: string;
-  value: string;
+  value: string | number | undefined;
   type?: string;
   onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
   onBlur?: () => void;
@@ -42,9 +42,11 @@ const FormField = ({
 }) => (
   <Flex flexDir="column" flex="1">
     <FormControl isRequired={required}>
-      <FormLabel mb="5px" color="gray.main" fontWeight="700">
-        {label}
-      </FormLabel>
+      {label && (
+        <FormLabel mb="5px" color="gray.main" fontWeight="700">
+          {label}
+        </FormLabel>
+      )}
       <InputGroup>
         {leftElement && (
           <InputLeftElement height="34px" pointerEvents="none" color="black">