diff --git a/src/components/UI/TrackerModal/TrackerModal.jsx b/src/components/UI/TrackerModal/TrackerModal.jsx index 75a96866..9951b10b 100644 --- a/src/components/UI/TrackerModal/TrackerModal.jsx +++ b/src/components/UI/TrackerModal/TrackerModal.jsx @@ -20,17 +20,16 @@ export const TrackerModal = ({ defautlInput, titleProject, projectId, + titleColumn }) => { const dispatch = useDispatch(); const projectBoard = useSelector(getProjectBoard); const modalType = useSelector(getValueModalType); - const titleColumn = useSelector(getColumnTitle); - const [emailWorker, setEmailWorker] = useState(""); const [projectName, setProjectName] = useState(defautlInput); - const [editTitleColumn, setEditTitleColumn] = useState(""); + const [editTitleColumn, setEditTitleColumn] = useState(titleColumn); const [valueColumn, setValueColumn] = useState(""); const [nameProject, setNameProject] = useState(""); @@ -242,19 +241,8 @@ export const TrackerModal = ({

Введите новое название

- {/* {Boolean(projectBoard?.columns) && - Boolean(projectBoard.columns.length) && - projectBoard.columns.map((column) => { - // console.log(column.title); - // console.log("Lol" + titleColumn.title); - if (column.title === titleColumn) { - console.log(column.title); - - } - })} */} setEditTitleColumn(e.target.value)} /> diff --git a/src/pages/ProjectTracker/ProjectTracker.js b/src/pages/ProjectTracker/ProjectTracker.js index 6c78f0c9..842f85a0 100644 --- a/src/pages/ProjectTracker/ProjectTracker.js +++ b/src/pages/ProjectTracker/ProjectTracker.js @@ -270,6 +270,12 @@ export const ProjectTracker = () => { wrapperHover[column.id] ? "tasks__board__hover" : "" }`} > +
{/**/} {column.title} @@ -303,7 +309,6 @@ export const ProjectTracker = () => { [column.id]: false, })); dispatch(modalToggle("editColumn")); - dispatch(setColumnTitle(column.title)); setModalAdd(true); }} > diff --git a/src/redux/projectsTrackerSlice.js b/src/redux/projectsTrackerSlice.js index 0ee4459e..9efb3268 100644 --- a/src/redux/projectsTrackerSlice.js +++ b/src/redux/projectsTrackerSlice.js @@ -6,7 +6,6 @@ const initialState = { projectBoard: {}, toggleTab: 1, modalType: "", - titleColumn: "", boardLoader: false, }; @@ -66,9 +65,6 @@ export const projectsTrackerSlice = createSlice({ modalToggle: (state, action) => { state.modalType = action.payload; }, - setColumnTitle: (state, action) => { - state.titleColumn = action.payload; - }, }, extraReducers: { [setProjectBoardFetch.fulfilled]: (state, action) => { @@ -94,7 +90,6 @@ export const getProjects = (state) => state.tracker.projects; export const getProjectBoard = (state) => state.tracker.projectBoard; export const getToggleTab = (state) => state.tracker.toggleTab; export const getValueModalType = (state) => state.tracker.modalType; -export const getColumnTitle = (state) => state.tracker.titleColumn; export const getBoarderLoader = (state) => state.tracker.boardLoader; export default projectsTrackerSlice.reducer;