fixes

src/pages/ProjectTracker/ProjectTracker.js

@@ -26,7 +26,6 @@ import TrackerModal from "../../components/UI/TrackerModal/TrackerModal";
 import project from "../../images/trackerProject.svg";
 import tasks from "../../images/trackerTasks.svg";
 import archive from "../../images/archiveTracker.svg";
-import avatarTest from "../../images/AvatarTest .png";
 import selectArrow from "../../images/select.svg";
 import commentsBoard from "../../images/commentsBoard.svg";
 import filesBoard from "../../images/filesBoard.svg";
@@ -40,6 +39,7 @@ export const ProjectTracker = () => {
 
   const [openColumnSelect, setOpenColumnSelect] = useState({});
   const [selectedTab, setSelectedTab] = useState(0);
+  const [priorityTask, setPriorityTask] = useState(0);
   const [wrapperHover, setWrapperHover] = useState({});
   const [modalAdd, setModalAdd] = useState(false);
   const [modalActiveTicket, setModalActiveTicket] = useState(false);
@@ -126,10 +126,11 @@ export const ProjectTracker = () => {
     }
   }
 
-  function selectedTabTask(columnId) {
+  function selectedTabTask(columnId, length) {
     setSelectedTab(columnId);
     dispatch(modalToggle("createTiketProject"));
     setModalAdd(true);
+    setPriorityTask(length + 1)
   }
 
   function openTicket(e, task) {
@@ -197,6 +198,7 @@ export const ProjectTracker = () => {
             active={modalAdd}
             setActive={setModalAdd}
             selectedTab={selectedTab}
+            priorityTask={priorityTask}
           />
 
           {loader && <Loader style="green" />}
@@ -277,7 +279,7 @@ export const ProjectTracker = () => {
                           <div>
                             <span
                               className="add"
-                              onClick={() => selectedTabTask(column.id)}
+                              onClick={() => selectedTabTask(column.id, column.tasks.length)}
                             >
                               +
                             </span>
@@ -322,11 +324,11 @@ export const ProjectTracker = () => {
                           </div>
                         )}
                         {column.tasks.map((task, index) => {
-                          if (index > 2) {
-                            if (!column.open) {
-                              return;
-                            }
-                          }
+                          // if (index > 2) {
+                          //   if (!column.open) {
+                          //     return;
+                          //   }
+                          // }
                           return (
                             <div
                               key={task.id}
@@ -347,7 +349,7 @@ export const ProjectTracker = () => {
                               <div className="tasks__board__item__info">
                                 <div className="tasks__board__item__info__more">
                                   <img src={commentsBoard} alt="commentsImg" />
-                                  <span>{task.comments} коментариев</span>
+                                  <span>{task.comment_count} коментариев</span>
                                 </div>
                                 <div className="tasks__board__item__info__more">
                                   <img src={filesBoard} alt="filesImg" />
@@ -361,18 +363,18 @@ export const ProjectTracker = () => {
                             </div>
                           );
                         })}
-                        {column.tasks.length > 3 && (
-                          <span
-                            className={
-                              column.open
-                                ? "lessItems openItems"
-                                : "moreItems openItems"
-                            }
-                            // onClick={() => toggleMoreTasks(column.id)}
-                          >
-                            {column.open ? "-" : "+"}
-                          </span>
-                        )}
+                        {/*{column.tasks.length > 3 && (*/}
+                        {/*  <span*/}
+                        {/*    className={*/}
+                        {/*      column.open*/}
+                        {/*        ? "lessItems openItems"*/}
+                        {/*        : "moreItems openItems"*/}
+                        {/*    }*/}
+                        {/*    // onClick={() => toggleMoreTasks(column.id)}*/}
+                        {/*  >*/}
+                        {/*    {column.open ? "-" : "+"}*/}
+                        {/*  </span>*/}
+                        {/*)}*/}
                       </div>
                     );
                   })}