diff --git a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx index cab390d0..c1d86bfe 100644 --- a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx +++ b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx @@ -334,8 +334,10 @@ export const ModalTiсket = ({ ); }, [members]); - function copyProjectLink () { - navigator.clipboard.writeText(`https://itguild.info/tracker/project/${projectId}`) + function copyProjectLink() { + navigator.clipboard.writeText( + `https://itguild.info/tracker/project/${projectId}` + ); } return ( diff --git a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx index 6db4239c..676a0ed0 100644 --- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx +++ b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx @@ -210,8 +210,10 @@ export const TicketFullScreen = () => { dispatch(setToggleTab(index)); }; - function copyTicketLink () { - navigator.clipboard.writeText(`https://itguild.info/tracker/task/${taskInfo.id}`) + function copyTicketLink() { + navigator.clipboard.writeText( + `https://itguild.info/tracker/task/${taskInfo.id}` + ); } return ( diff --git a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx index 4d03f1ea..30b537e6 100644 --- a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx +++ b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx @@ -51,8 +51,11 @@ export const TrackerModal = ({ const [workers, setWorkers] = useState([]); const [selectWorkersOpen, setSelectWorkersOpen] = useState(false); const [selectedWorker, setSelectedWorker] = useState(null); - const [selectColumnPriority, setSelectColumnPriority] = useState('Выберите приоритет колонки') - const [selectColumnPriorityOpen, setSelectColumnPriorityOpen] = useState(false) + const [selectColumnPriority, setSelectColumnPriority] = useState( + "Выберите приоритет колонки" + ); + const [selectColumnPriorityOpen, setSelectColumnPriorityOpen] = + useState(false); function createTab() { if (!valueColumn) { @@ -386,19 +389,31 @@ export const TrackerModal = ({ />

Приоритет колонки

-
setSelectColumnPriorityOpen(!selectColumnPriorityOpen)}> - {selectColumnPriority} - arrow - {selectColumnPriorityOpen && -
- {projectBoard.columns.map((column, index) => { - return { - setSelectColumnPriority(index + 1) - dispatch(setColumnPriority(index + 1)) - }}>{index + 1} - })} -
+
+ setSelectColumnPriorityOpen(!selectColumnPriorityOpen) } + > + {selectColumnPriority} + arrow + {selectColumnPriorityOpen && ( +
+ {projectBoard.columns.map((column, index) => { + return ( + { + setSelectColumnPriority(index + 1); + dispatch(setColumnPriority(index + 1)); + }} + > + {index + 1} + + ); + })} +
+ )}
{/*
*/} {/* { }); } - function copyProjectLink () { - navigator.clipboard.writeText(`https://itguild.info/tracker/project/${project.id}`) + function copyProjectLink() { + navigator.clipboard.writeText( + `https://itguild.info/tracker/project/${project.id}` + ); } return ( diff --git a/src/pages/ProjectTracker/ProjectTracker.js b/src/pages/ProjectTracker/ProjectTracker.js index 393dc043..4ff1b352 100644 --- a/src/pages/ProjectTracker/ProjectTracker.js +++ b/src/pages/ProjectTracker/ProjectTracker.js @@ -324,12 +324,26 @@ export const ProjectTracker = () => { {projectBoard.projectUsers?.length} -
+
{projectBoard.projectUsers?.length && - projectBoard.projectUsers.slice(0, projectBoard.length > 3 ? 3 : projectBoard.length).map((person) => { - return avatar - }) - } + projectBoard.projectUsers + .slice( + 0, + projectBoard.length > 3 ? 3 : projectBoard.length + ) + .map((person) => { + return ( + avatar + ); + })}
{ className="tasks__board__item__description" >

- {task.executor?.fio ? task.executor?.fio : 'Исполнитель не назначен'} - {task.executor?.avatar && - avatar - } + + {task.executor?.fio + ? task.executor?.fio + : "Исполнитель не назначен"} + + {task.executor?.avatar && ( + avatar + )}