tracker tasks

src/components/FileTracker/FileTracker.jsx

@@ -1,47 +1,50 @@
-import React, {useState} from "react";
+import React, { useState } from "react";
+
 import { backendImg } from "@utils/helper";
+
+import { apiRequest } from "@api/request";
+
 import close from "assets/icons/closeProjectPersons.svg";
 
-import {apiRequest} from "@api/request";
-
 const FileTracker = ({ file, setDeletedTask, taskId }) => {
-    const [openImg, setOpenImg] = useState(false)
+  const [openImg, setOpenImg] = useState(false);
-    function deleteFile(file) {
+  function deleteFile(file) {
-        apiRequest("/file/detach", {
+    apiRequest("/file/detach", {
-            method: "DELETE",
+      method: "DELETE",
-            data: {
+      data: {
-                file_id: file.id,
+        file_id: file.id,
-                entity_type: 2,
+        entity_type: 2,
-                entity_id: taskId,
+        entity_id: taskId,
-                status: 0,
+        status: 0,
-            },
+      },
-        }).then(() => {
+    }).then(() => {
-            setDeletedTask(file);
+      setDeletedTask(file);
-        });
+    });
-    }
+  }
 
-    return (
+  return (
-        <div className={openImg ? "taskFile ImgOpened" : "taskFile"} key={file.id}
+    <div
-             onClick={() =>
+      className={openImg ? "taskFile ImgOpened" : "taskFile"}
-             {if(openImg) setOpenImg(!openImg)}}
+      key={file.id}
-        >
+      onClick={() => {
-            <img
+        if (openImg) setOpenImg(!openImg);
-                className="imgFile"
+      }}
-                src={backendImg(file.file?.url)}
+    >
-                alt="img"
+      <img
-                onClick={() =>
+        className="imgFile"
-                {if(!openImg) setOpenImg(!openImg)}}
+        src={backendImg(file.file?.url)}
-            />
+        alt="img"
-            {!openImg &&
+        onClick={() => {
-                <div
+          if (!openImg) setOpenImg(!openImg);
-                    className="deleteFile"
+        }}
-                    onClick={() => deleteFile(file)}
+      />
-                >
+      {!openImg && (
-                    <img src={close} alt="delete" />
+        <div className="deleteFile" onClick={() => deleteFile(file)}>
-                </div>
+          <img src={close} alt="delete" />
-            }
         </div>
-    );
+      )}
+    </div>
+  );
 };
 
 export default FileTracker;

src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx

@@ -22,10 +22,10 @@ import { apiRequest } from "@api/request";
 
 import { useNotification } from "@hooks/useNotification";
 
+import FileTracker from "@components/FileTracker/FileTracker";
 import AcceptModal from "@components/Modal/AcceptModal/AcceptModal";
 import TrackerModal from "@components/Modal/Tracker/TrackerModal/TrackerModal";
 import TrackerTaskComment from "@components/TrackerTaskComment/TrackerTaskComment";
-import FileTracker from "@components/FileTracker/FileTracker";
 
 import archive from "assets/icons/archive.svg";
 import arrow from "assets/icons/arrows/arrowStart.png";
@@ -53,7 +53,7 @@ export const ModalTiсket = ({
   projectId,
   projectName,
   projectUsers,
-  projectOwnerId
+  projectOwnerId,
 }) => {
   const dispatch = useDispatch();
   const [addSubtask, setAddSubtask] = useState(false);
@@ -373,9 +373,9 @@ export const ModalTiсket = ({
   }
 
   function deleteFile(file) {
-     setTaskFiles((prevValue) =>
+    setTaskFiles((prevValue) =>
-        prevValue.filter((item) => item.id !== file.id)
+      prevValue.filter((item) => item.id !== file.id)
-      );
+    );
   }
 
   function startTimer() {
@@ -525,12 +525,12 @@ export const ModalTiсket = ({
               <div className="task__files">
                 {taskFiles.map((file) => {
                   return (
-                      <FileTracker
+                    <FileTracker
-                        key={file.id}
+                      key={file.id}
-                        file={file}
+                      file={file}
-                        setDeletedTask={deleteFile}
+                      setDeletedTask={deleteFile}
-                        taskId={task.id}
+                      taskId={task.id}
-                      />
+                    />
                   );
                 })}
               </div>
@@ -823,12 +823,27 @@ export const ModalTiсket = ({
               <img src={link}></img>
               <p onClick={copyTicketLink}>ссылка на задачу</p>
             </div>
-            <div onClick={archiveTask} className={(profileInfo.id_user === projectOwnerId) || (profileInfo.id_user === task.user_id) ? '' : 'disable'}>
+            <div
+              onClick={archiveTask}
+              className={
+                profileInfo.id_user === projectOwnerId ||
+                profileInfo.id_user === task.user_id
+                  ? ""
+                  : "disable"
+              }
+            >
               <img src={archive}></img>
               <p>в архив</p>
             </div>
-            <div onClick={deleteTask} className={
+            <div
-              (profileInfo.id_user === projectOwnerId) || (profileInfo.id_user === task.user_id) ? '' : 'disable'}>
+              onClick={deleteTask}
+              className={
+                profileInfo.id_user === projectOwnerId ||
+                profileInfo.id_user === task.user_id
+                  ? ""
+                  : "disable"
+              }
+            >
               <img src={del}></img>
               <p>удалить</p>
             </div>

src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx

@@ -6,6 +6,7 @@ import DatePicker, { registerLocale } from "react-datepicker";
 import { useDispatch, useSelector } from "react-redux";
 import { Link, useNavigate, useParams } from "react-router-dom";
 
+import { getProfileInfo } from "@redux/outstaffingSlice";
 import {
   deletePersonOnProject,
   getBoarderLoader,
@@ -13,8 +14,6 @@ import {
   setToggleTab,
 } from "@redux/projectsTrackerSlice";
 
-import { getProfileInfo } from "@redux/outstaffingSlice";
-
 import {
   backendImg,
   caseOfNum,
@@ -1000,13 +999,26 @@ export const TicketFullScreen = () => {
                     <img src={link} alt="link"></img>
                     <p onClick={copyTicketLink}>ссылка на задачу</p>
                   </div>
-                  <div onClick={archiveTask}
+                  <div
-                       className={(profileInfo.id_user === projectInfo.owner_id) || (profileInfo.id_user === taskInfo.user_id) ? '' : 'disable'}>
+                    onClick={archiveTask}
+                    className={
+                      profileInfo.id_user === projectInfo.owner_id ||
+                      profileInfo.id_user === taskInfo.user_id
+                        ? ""
+                        : "disable"
+                    }
+                  >
                     <img src={archive} alt="arch"></img>
                     <p>в архив</p>
                   </div>
-                  <div onClick={deleteTask}
+                  <div
-                       className={(profileInfo.id_user === projectInfo.owner_id) || (profileInfo.id_user === taskInfo.user_id) ? '' : 'disable'}
+                    onClick={deleteTask}
+                    className={
+                      profileInfo.id_user === projectInfo.owner_id ||
+                      profileInfo.id_user === taskInfo.user_id
+                        ? ""
+                        : "disable"
+                    }
                   >
                     <img src={del} alt="delete"></img>
                     <p>удалить</p>