Merge pull request #362 from qa-guru/QAGDEV-689

QAGDEV-689 - Дать возможность администратору менять статус ДЗ у студента

Author: nik1999777

src/features/kanban/views/homework-details-full/homework-details-full.tsx

@@ -8,6 +8,8 @@ import Homework from "shared/features/homework/view";
 import StatusText from "shared/components/status-text";
 import HomeworkBaseInfo from "shared/components/homework-base-info";
 import { formatId } from "shared/helpers";
+import { useRoleAccess } from "shared/hooks";
+import { UserRole } from "api/graphql/generated/graphql";
 
 import StatusSelect from "../../views/status-select";
 import { IHomeworkDescriptionFull } from "./homework-details-full.types";
@@ -27,10 +29,14 @@ const HomeworkDetailsFull: FC<IHomeworkDescriptionFull> = ({ data }) => {
     id,
   } = data?.homeWork!;
 
+  const hasAdminRoleAcces = useRoleAccess({
+    allowedRoles: [UserRole.Admin],
+  });
+
   const currentUserId = useReactiveVar(userIdVar);
   const isCurrentMentor = currentUserId === mentor?.id;
   const hasNoMentor = mentor?.id === undefined;
-  const showSelect = isCurrentMentor || hasNoMentor;
+  const showSelect = hasAdminRoleAcces || isCurrentMentor || hasNoMentor;
 
   return (
     <Container>

src/shared/helpers/get-updated-allowed-columns.ts

@@ -16,6 +16,10 @@ export const getUpdatedAllowedColumns = (
     allowedRoles: [UserRole.Mentor, UserRole.Lector, UserRole.Admin],
   });
 
+  const hasAdminRoleAcces = useRoleAccess({
+    allowedRoles: [UserRole.Admin],
+  });
+
   if (!hasDraggAccess) {
     return [];
   }
@@ -27,17 +31,17 @@ export const getUpdatedAllowedColumns = (
       allowedColumns = [STATUS_COLUMN.IN_REVIEW];
       break;
     case STATUS_COLUMN.IN_REVIEW:
-      if (currentUserId === mentorId) {
+      if (hasAdminRoleAcces || currentUserId === mentorId) {
         allowedColumns = [STATUS_COLUMN.APPROVED, STATUS_COLUMN.NOT_APPROVED];
       }
       break;
     case STATUS_COLUMN.APPROVED:
-      if (currentUserId === mentorId) {
+      if (hasAdminRoleAcces || currentUserId === mentorId) {
         allowedColumns = [];
       }
       break;
     case STATUS_COLUMN.NOT_APPROVED:
-      if (currentUserId === mentorId) {
+      if (hasAdminRoleAcces || currentUserId === mentorId) {
         allowedColumns = [STATUS_COLUMN.APPROVED];
       }
       break;

src/shared/hooks/use-drag-effect.ts

@@ -32,6 +32,10 @@ export const useDragEffect = ({
     allowedRoles: [UserRole.Mentor, UserRole.Lector, UserRole.Admin],
   });
 
+  const hasAdminRoleAcces = useRoleAccess({
+    allowedRoles: [UserRole.Admin],
+  });
+
   const currentUserId = useReactiveVar(userIdVar);
   const mentorId = card.mentor?.id;
 
@@ -54,7 +58,11 @@ export const useDragEffect = ({
       return;
     }
 
-    if (currentUserId !== mentorId && (isFromInReview || isFromNotApproved)) {
+    if (
+      !hasAdminRoleAcces &&
+      currentUserId !== mentorId &&
+      (isFromInReview || isFromNotApproved)
+    ) {
       enqueueSnackbar("Вы не можете поменять статус чужой домашней работы");
       return;
     }
@@ -76,5 +84,6 @@ export const useDragEffect = ({
     mentorId,
     enqueueSnackbar,
     setDraggingState,
+    hasAdminRoleAcces,
   ]);
 };