add ModalTicketToReport and add OpenRequest, fix
LandingTracker, fix url ModalTicket
This commit is contained in:
@ -1,7 +1,7 @@
|
||||
import moment from "moment";
|
||||
import React, { useEffect, useRef, useState } from "react";
|
||||
import { useDispatch, useSelector } from "react-redux";
|
||||
import { Link, useParams } from "react-router-dom";
|
||||
import { Link, useLocation, useNavigate, useParams } from "react-router-dom";
|
||||
|
||||
import {
|
||||
activeLoader,
|
||||
@ -51,6 +51,8 @@ import avatarMok from "assets/images/avatarMok.webp";
|
||||
export const ProjectTracker = () => {
|
||||
const dispatch = useDispatch();
|
||||
const projectId = useParams();
|
||||
const location = useLocation();
|
||||
const navigate = useNavigate();
|
||||
|
||||
const [openColumnSelect, setOpenColumnSelect] = useState({});
|
||||
const [selectedTab, setSelectedTab] = useState(0);
|
||||
@ -97,6 +99,24 @@ export const ProjectTracker = () => {
|
||||
} else {
|
||||
setFilteredNoTasks(false);
|
||||
}
|
||||
|
||||
const path = location.pathname;
|
||||
const match = path.match(/\/task\/(\d+)/);
|
||||
console.log(match);
|
||||
if (match) {
|
||||
const extractedTaskId = match[1];
|
||||
|
||||
console.log(extractedTaskId);
|
||||
// Убираем /task/id из URL
|
||||
const newUrl = path.replace(/\/task\/\d+/, "");
|
||||
navigate(newUrl, { replace: true });
|
||||
|
||||
// Открываем тикет
|
||||
console.log("asd", projectBoard);
|
||||
const Dtask = tasks.find((task) => task.id === extractedTaskId);
|
||||
console.log("asd", Dtask);
|
||||
// openTicket(extractedTaskId);
|
||||
}
|
||||
}, [projectBoard]);
|
||||
|
||||
function dragOverHandler(e) {
|
||||
@ -148,9 +168,16 @@ export const ProjectTracker = () => {
|
||||
function openTicket(e, task) {
|
||||
setSelectedTicket(task);
|
||||
setModalActiveTicket(true);
|
||||
const currentUrl = window.location.pathname;
|
||||
const newUrl = `${currentUrl}/task/${task.id}`;
|
||||
window.history.pushState({}, "", newUrl);
|
||||
document.body.style.overflow = "hidden";
|
||||
}
|
||||
|
||||
// useEffect(() => {
|
||||
|
||||
// }, [location]);
|
||||
|
||||
function deleteColumn(column) {
|
||||
const priorityColumns = [];
|
||||
apiRequest("/project-column/update-column", {
|
||||
|
Reference in New Issue
Block a user