diff --git a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
index d00d5883..f2d14230 100644
--- a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
+++ b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
@@ -25,9 +25,9 @@ import file from "assets/icons/fileModal.svg";
import link from "assets/icons/link.svg";
import send from "assets/icons/send.svg";
import watch from "assets/icons/watch.svg";
+import avatarMok from "assets/images/avatarMok.png";
import "./modalTicket.scss";
-import avatarMok from "assets/images/avatarMok.png";
export const ModalTiсket = ({
active,
@@ -471,12 +471,11 @@ export const ModalTiсket = ({
Исполнитель: {executor.fio}
+ src={
+ executor?.avatar ? urlForLocal(executor.avatar) : avatarMok
+ }
+ alt="avatar"
+ />
);
@@ -537,7 +536,7 @@ export const ModalTiсket = ({
? urlForLocal(member.avatar)
: avatarMok
}
- alt='avatar'
+ alt="avatar"
/>
);
diff --git a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
index 0c93c5e7..a5e264f4 100644
--- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
+++ b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
@@ -7,8 +7,9 @@ import { Link, useNavigate, useParams } from "react-router-dom";
import {
deletePersonOnProject,
getBoarderLoader,
- modalToggle, setProjectBoardFetch,
- setToggleTab
+ modalToggle,
+ setProjectBoardFetch,
+ setToggleTab,
} from "@redux/projectsTrackerSlice";
import { getCorrectRequestDate, urlForLocal } from "@utils/helper";
@@ -47,7 +48,7 @@ export const TicketFullScreen = () => {
const dispatch = useDispatch();
const navigate = useNavigate();
const boardLoader = useSelector(getBoarderLoader);
- const [projectInfo, setProjectInfo] = useState({})
+ const [projectInfo, setProjectInfo] = useState({});
const [taskInfo, setTaskInfo] = useState({});
const [editOpen, setEditOpen] = useState(false);
const [inputsValue, setInputsValue] = useState({});
@@ -112,10 +113,12 @@ export const TicketFullScreen = () => {
}
});
});
- apiRequest(`/project/get-project?project_id=${taskInfo.project_id}&expand=columns`).then((res) => {
- setProjectInfo(res)
- setCorrectProjectUsers(res.projectUsers)
- })
+ apiRequest(
+ `/project/get-project?project_id=${taskInfo.project_id}&expand=columns`
+ ).then((res) => {
+ setProjectInfo(res);
+ setCorrectProjectUsers(res.projectUsers);
+ });
setLoader(boardLoader);
});
}, []);
@@ -307,8 +310,8 @@ export const TicketFullScreen = () => {
setTaskInfo((prevState) => ({
...prevState,
executor_id: null,
- executor: null
- }))
+ executor: null,
+ }));
});
}
@@ -324,8 +327,8 @@ export const TicketFullScreen = () => {
setTaskInfo((prevState) => ({
...prevState,
executor_id: res.executor_id,
- executor: res.executor
- }))
+ executor: res.executor,
+ }));
});
}
@@ -339,8 +342,10 @@ export const TicketFullScreen = () => {
}).then(() => {
setTaskInfo((prevState) => ({
...prevState,
- taskUsers: taskInfo.taskUsers.filter((item) => item.user_id !== person.user_id)
- }))
+ taskUsers: taskInfo.taskUsers.filter(
+ (item) => item.user_id !== person.user_id
+ ),
+ }));
});
}
@@ -355,7 +360,7 @@ export const TicketFullScreen = () => {
setDropListMembersOpen(false);
setTaskInfo((prevValue) => ({
...prevValue,
- taskUsers: [...prevValue.taskUsers, res]
+ taskUsers: [...prevValue.taskUsers, res],
}));
});
}
@@ -422,24 +427,19 @@ export const TicketFullScreen = () => {
)}
{projectInfo.projectUsers?.length &&
- projectInfo.projectUsers
- .slice(
- 0,
- 3
- )
- .map((person) => {
- return (
-
- );
- })}
+ projectInfo.projectUsers.slice(0, 3).map((person) => {
+ return (
+
+ );
+ })}
{
? urlForLocal(taskInfo.executor.avatar)
: avatarMok
}
- alt="avatar" />
+ alt="avatar"
+ />
{
? urlForLocal(person.user.avatar)
: avatarMok
}
- alt='avatar'
+ alt="avatar"
/>
);
@@ -694,7 +695,7 @@ export const TicketFullScreen = () => {
? urlForLocal(member.avatar)
: avatarMok
}
- alt='avatar'
+ alt="avatar"
/>
{
? urlForLocal(person.user.avatar)
: avatarMok
}
- alt='avatar'
+ alt="avatar"
/>
);
diff --git a/src/pages/ProjectTracker/ProjectTracker.js b/src/pages/ProjectTracker/ProjectTracker.js
index a912c7a0..134ff358 100644
--- a/src/pages/ProjectTracker/ProjectTracker.js
+++ b/src/pages/ProjectTracker/ProjectTracker.js
@@ -327,24 +327,19 @@ export const ProjectTracker = () => {
)}
{projectBoard.projectUsers?.length &&
- projectBoard.projectUsers
- .slice(
- 0,
- 3
- )
- .map((person) => {
- return (
-
- );
- })}
+ projectBoard.projectUsers.slice(0, 3).map((person) => {
+ return (
+
+ );
+ })}