Merge pull request #370 from qa-guru/QAGDEV-707

nik1999777 · web-flow · commit a9a47853e8fe · 2025-04-06T13:44:43.000+03:00
QAGDEV-707 - Невозможно перетащить домашнее задание по борде (Новые -……&gt; На проверке)
diff --git a/src/api/graphql/homework/send-hom-work-to-check.graphql b/src/api/graphql/homework/send-hom-work-to-check.graphql
@@ -0,0 +1,44 @@
+mutation sendHomeWorkToCheck($homeWorkId: ID!) {
+  sendHomeWorkToCheck(homeWorkId: $homeWorkId) {
+    id
+    lecture {
+      id
+      subject
+      description
+      contentHomeWork
+    }
+    training {
+      techStack
+    }
+    answer
+    student {
+      id
+      firstName
+      avatar
+      lastName
+      rating {
+        rating
+      }
+    }
+    mentor {
+      id
+      firstName
+      avatar
+      lastName
+      rating {
+        rating
+      }
+    }
+    filesHomeWork {
+      id
+      creationDate
+      fileName
+      contentType
+      size
+    }
+    creationDate
+    updateDate
+    startCheckingDate
+    endCheckingDate
+  }
+}
diff --git a/src/features/kanban-lecture/containers/homeworks/homeworks-container.tsx b/src/features/kanban-lecture/containers/homeworks/homeworks-container.tsx
@@ -37,7 +37,7 @@ const HomeworksContainer: FC = () => {
         field: StudentHomeWorkSortField.CreationDate,
         order: Order.Desc,
       },
-      filter: { ...filterObject, status: StudentHomeWorkStatus.New },
+      filter: { ...filterObject, status: StudentHomeWorkStatus.Review },
     },
   });
 
diff --git a/src/features/kanban-lecture/views/board/board.tsx b/src/features/kanban-lecture/views/board/board.tsx
@@ -35,7 +35,7 @@ const Board: FC<IBoard> = ({
     setColumns([
       createColumnItem(
         STATUS_COLUMN.NEW,
-        StudentHomeWorkStatus.New,
+        StudentHomeWorkStatus.Review,
         newItems as StudentHomeWorkDto[],
         newTotalElements
       ),
diff --git a/src/features/kanban-mentor/containers/homeworks/homeworks-container.tsx b/src/features/kanban-mentor/containers/homeworks/homeworks-container.tsx
@@ -37,7 +37,7 @@ const HomeworksContainer: FC = () => {
         field: StudentHomeWorkSortField.CreationDate,
         order: Order.Desc,
       },
-      filter: { status: StudentHomeWorkStatus.New },
+      filter: { status: StudentHomeWorkStatus.Review },
     },
   });
 
diff --git a/src/features/kanban-mentor/hooks/use-update-homework-status.ts b/src/features/kanban-mentor/hooks/use-update-homework-status.ts
@@ -42,7 +42,7 @@ const useUpdateHomeworkStatus = () => {
           },
           filter: {
             ...filterObject,
-            status: StudentHomeWorkStatus.New,
+            status: StudentHomeWorkStatus.Review,
             mentorId: undefined,
           },
         },
@@ -79,7 +79,7 @@ const useUpdateHomeworkStatus = () => {
           },
           filter: {
             ...filterObject,
-            status: StudentHomeWorkStatus.New,
+            status: StudentHomeWorkStatus.Review,
             mentorId: undefined,
           },
         },
diff --git a/src/features/kanban-mentor/views/board/board.tsx b/src/features/kanban-mentor/views/board/board.tsx
@@ -46,7 +46,7 @@ const Board: FC<IBoard> = ({
     setColumns([
       createColumnItem(
         STATUS_COLUMN.NEW,
-        StudentHomeWorkStatus.New,
+        StudentHomeWorkStatus.Review,
         newItems as StudentHomeWorkDto[],
         newTotalElements
       ),
diff --git a/src/features/kanban-mentor/views/status-select/status-select.tsx b/src/features/kanban-mentor/views/status-select/status-select.tsx
@@ -24,7 +24,7 @@ const StatusSelect: FC<IStatusSelect> = ({ currentStatus, homeworkId }) => {
     currentStatus?: Maybe<StudentHomeWorkStatus>
   ) => {
     switch (currentStatus) {
-      case StudentHomeWorkStatus.New:
+      case StudentHomeWorkStatus.Review:
         return [StudentHomeWorkStatus.InReview];
       case StudentHomeWorkStatus.InReview:
         return [
diff --git a/src/features/kanban-mentor/views/status-select/status-select.types.ts b/src/features/kanban-mentor/views/status-select/status-select.types.ts
@@ -11,7 +11,7 @@ export interface IStatusSelect {
 
 export const states = [
   {
-    value: "NEW",
+    value: "REVIEW",
     Icon: Clock,
     text: "Новые",
   },
diff --git a/src/features/kanban-student/containers/homeworks/homeworks-container.tsx b/src/features/kanban-student/containers/homeworks/homeworks-container.tsx
@@ -37,7 +37,7 @@ const HomeworksContainer: FC = () => {
         field: StudentHomeWorkSortField.CreationDate,
         order: Order.Desc,
       },
-      filter: { ...filterObject, status: StudentHomeWorkStatus.New },
+      filter: { ...filterObject, status: StudentHomeWorkStatus.Review },
     },
   });
 
diff --git a/src/features/kanban-student/views/board/board.tsx b/src/features/kanban-student/views/board/board.tsx
@@ -36,7 +36,7 @@ const Board: FC<IBoard> = ({
     setColumns([
       createColumnItem(
         STATUS_COLUMN.NEW,
-        StudentHomeWorkStatus.New,
+        StudentHomeWorkStatus.Review,
         newItems as StudentHomeWorkDto[],
         newTotalElements
       ),
diff --git a/src/features/kanban-student/views/mobile-board/mobile-board.types.ts b/src/features/kanban-student/views/mobile-board/mobile-board.types.ts
@@ -14,7 +14,7 @@ export interface IMobileBoard {
 
 export const states = [
   {
-    value: "NEW",
+    value: "REVIEW",
     Icon: Clock,
     text: "Новые",
   },
diff --git a/src/features/kanban/containers/homeworks/homeworks-container.tsx b/src/features/kanban/containers/homeworks/homeworks-container.tsx
@@ -43,8 +43,7 @@ const HomeworksContainer: FC = () => {
       },
       filter: {
         ...filterObject,
-        status: StudentHomeWorkStatus.New,
-        mentorId: undefined,
+        status: StudentHomeWorkStatus.Review,
       },
     },
   });
diff --git a/src/features/kanban/hooks/use-update-homework-status.ts b/src/features/kanban/hooks/use-update-homework-status.ts
@@ -46,8 +46,7 @@ const useUpdateHomeworkStatus = () => {
           },
           filter: {
             ...filterObject,
-            status: StudentHomeWorkStatus.New,
-            mentorId: undefined,
+            status: StudentHomeWorkStatus.Review,
           },
         },
       });
@@ -83,7 +82,7 @@ const useUpdateHomeworkStatus = () => {
           },
           filter: {
             ...filterObject,
-            status: StudentHomeWorkStatus.New,
+            status: StudentHomeWorkStatus.Review,
             mentorId: undefined,
           },
         },
diff --git a/src/features/kanban/views/board/board.tsx b/src/features/kanban/views/board/board.tsx
@@ -46,7 +46,7 @@ const Board: FC<IBoard> = ({
     setColumns([
       createColumnItem(
         STATUS_COLUMN.NEW,
-        StudentHomeWorkStatus.New,
+        StudentHomeWorkStatus.Review,
         newItems as StudentHomeWorkDto[],
         newTotalElements
       ),
diff --git a/src/features/kanban/views/status-select/status-select.tsx b/src/features/kanban/views/status-select/status-select.tsx
@@ -24,7 +24,7 @@ const StatusSelect: FC<IStatusSelect> = ({ currentStatus, homeworkId }) => {
     currentStatus?: Maybe<StudentHomeWorkStatus>
   ) => {
     switch (currentStatus) {
-      case StudentHomeWorkStatus.New:
+      case StudentHomeWorkStatus.Review:
         return [StudentHomeWorkStatus.InReview];
       case StudentHomeWorkStatus.InReview:
         return [
diff --git a/src/shared/components/status-text/status-text.tsx b/src/shared/components/status-text/status-text.tsx
@@ -20,7 +20,7 @@ const StatusText: FC<IStatusText> = ({ status }) => {
   let statusText;
 
   switch (status) {
-    case StudentHomeWorkStatus.New:
+    case StudentHomeWorkStatus.Review:
       icon = <Clock />;
       statusText = "Новые";
       break;
diff --git a/src/shared/constants/constants.ts b/src/shared/constants/constants.ts
@@ -47,7 +47,7 @@ export const HOMEWORKS_QUERY_DEFAULTS = {
 
 export const STATES = [
   {
-    value: "NEW",
+    value: "REVIEW",
     Icon: Clock,
     text: "Новые",
   },
diff --git a/src/shared/features/kanban-profile-mentor/containers/homeworks/homeworks-container.tsx b/src/shared/features/kanban-profile-mentor/containers/homeworks/homeworks-container.tsx
@@ -41,7 +41,7 @@ const HomeworksContainer: FC = () => {
         field: StudentHomeWorkSortField.CreationDate,
         order: Order.Desc,
       },
-      filter: { status: StudentHomeWorkStatus.New },
+      filter: { status: StudentHomeWorkStatus.Review },
     },
   });
 
diff --git a/src/shared/features/kanban-profile-mentor/views/board/board.tsx b/src/shared/features/kanban-profile-mentor/views/board/board.tsx
@@ -35,7 +35,7 @@ const Board: FC<IBoard> = ({
     setColumns([
       createColumnItem(
         STATUS_COLUMN.NEW,
-        StudentHomeWorkStatus.New,
+        StudentHomeWorkStatus.Review,
         newItems as StudentHomeWorkDto[],
         newTotalElements
       ),
diff --git a/src/shared/features/kanban-profile-student/containers/homeworks/homeworks-container.tsx b/src/shared/features/kanban-profile-student/containers/homeworks/homeworks-container.tsx
@@ -41,7 +41,7 @@ const HomeworksContainer: FC = () => {
         field: StudentHomeWorkSortField.CreationDate,
         order: Order.Desc,
       },
-      filter: { ...filterObject, status: StudentHomeWorkStatus.New },
+      filter: { ...filterObject, status: StudentHomeWorkStatus.Review },
     },
   });
 
diff --git a/src/shared/features/kanban-profile-student/views/board/board.tsx b/src/shared/features/kanban-profile-student/views/board/board.tsx
@@ -35,7 +35,7 @@ const Board: FC<IBoard> = ({
     setColumns([
       createColumnItem(
         STATUS_COLUMN.NEW,
-        StudentHomeWorkStatus.New,
+        StudentHomeWorkStatus.Review,
         newItems as StudentHomeWorkDto[],
         newTotalElements
       ),
diff --git a/src/shared/features/send-homework/container/send-homework-container.tsx b/src/shared/features/send-homework/container/send-homework-container.tsx
@@ -6,6 +6,7 @@ import {
   HomeWorkByLectureAndTrainingQuery,
   Maybe,
   useCreateHomeWorkToCheckMutation,
+  useSendHomeWorkToCheckMutation,
   useUpdateHomeworkMutation,
 } from "api/graphql/generated/graphql";
 
@@ -66,11 +67,16 @@ const SendHomeworkContainer: FC = () => {
       },
     });
 
+  const [sendHomeWorkToCheck, { loading: loadingSendHomeWorkToCheck }] =
+    useSendHomeWorkToCheckMutation();
+
   return (
     <SendHomework
       loadingCreateHomeWorkToCheck={loadingCreateHomeWorkToCheck}
       loadingUpdateHomework={loadingUpdateHomework}
+      loadingSendHomeWorkToCheck={loadingSendHomeWorkToCheck}
       createHomeWorkToCheck={createHomeWorkToCheck}
+      sendHomeWorkToCheck={sendHomeWorkToCheck}
       updateHomework={updateHomework}
     />
   );
diff --git a/src/shared/features/send-homework/view/send-homework.tsx b/src/shared/features/send-homework/view/send-homework.tsx
@@ -15,7 +15,9 @@ import { StyledBox, StyledFormHelperText } from "./send-homework.styled";
 const SendHomework: FC<ISendHomeWork> = (props) => {
   const {
     createHomeWorkToCheck,
+    sendHomeWorkToCheck,
     loadingCreateHomeWorkToCheck,
+    loadingSendHomeWorkToCheck,
     loadingUpdateHomework,
     updateHomework,
   } = props;
@@ -75,6 +77,12 @@ const SendHomework: FC<ISendHomeWork> = (props) => {
             },
           });
 
+          await sendHomeWorkToCheck({
+            variables: {
+              homeWorkId,
+            },
+          });
+
           setPendingFiles([]);
           setError("");
           rteRef.current?.editor?.commands.clearContent();
@@ -97,7 +105,11 @@ const SendHomework: FC<ISendHomeWork> = (props) => {
 
         <SendButtons
           onReply={handleSendHomeWork}
-          loading={loadingCreateHomeWorkToCheck || loadingUpdateHomework}
+          loading={
+            loadingCreateHomeWorkToCheck ||
+            loadingUpdateHomework ||
+            loadingSendHomeWorkToCheck
+          }
         />
       </StyledBox>
     </form>
diff --git a/src/shared/features/send-homework/view/send-homework.types.ts b/src/shared/features/send-homework/view/send-homework.types.ts
@@ -1,13 +1,16 @@
 import {
   CreateHomeWorkToCheckMutationFn,
   Maybe,
+  SendHomeWorkToCheckMutationFn,
   UpdateCommentMutationFn,
 } from "api/graphql/generated/graphql";
 
 export interface ISendHomeWork {
   createHomeWorkToCheck: CreateHomeWorkToCheckMutationFn;
   updateHomework: UpdateCommentMutationFn;
+  sendHomeWorkToCheck: SendHomeWorkToCheckMutationFn;
   loadingCreateHomeWorkToCheck: boolean;
   loadingUpdateHomework: boolean;
+  loadingSendHomeWorkToCheck: boolean;
   homeWorkId?: Maybe<string>;
 }
diff --git a/src/shared/helpers/format-status.ts b/src/shared/helpers/format-status.ts
@@ -4,7 +4,7 @@ export const formatStatus = (status: string) => {
       return "Принято";
     case "IN_REVIEW":
       return "На проверке";
-    case "NEW":
+    case "REVIEW":
       return "Новые";
     case "NOT_APPROVED":
       return "Не принято";
diff --git a/src/shared/helpers/get-allowed-columns.ts b/src/shared/helpers/get-allowed-columns.ts
@@ -6,7 +6,7 @@ export const getAllowedColumns = (title: StudentHomeWorkStatus) => {
   let allowedColumns: string[] = [];
 
   switch (title) {
-    case StudentHomeWorkStatus.New:
+    case StudentHomeWorkStatus.Review:
       allowedColumns = [STATUS_COLUMN.IN_REVIEW];
       break;
     case StudentHomeWorkStatus.InReview:

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ export interface IStatusSelect {`
`11`	`11`
`12`	`12`	`export const states = [`
`13`	`13`	`{`
`14`		`- value: "NEW",`
	`14`	`+ value: "REVIEW",`
`15`	`15`	`Icon: Clock,`
`16`	`16`	`text: "Новые",`
`17`	`17`	`},`