Update from main branch

This commit is contained in:
MaxOvs19
2023-05-16 10:24:07 +03:00
3 changed files with 34 additions and 23 deletions

View File

@ -7,7 +7,8 @@ import {
getValueModalType,
setProject,
setProjectBoardFetch,
editProjectName
editProjectName,
getColumnTitle,
} from "../../../redux/projectsTrackerSlice";
import "./trackerModal.scss";
@ -18,7 +19,8 @@ export const TrackerModal = ({
selectedTab,
defautlInput,
titleProject,
projectId
projectId,
titleColumn
}) => {
const dispatch = useDispatch();
const projectBoard = useSelector(getProjectBoard);
@ -27,6 +29,8 @@ export const TrackerModal = ({
const [emailWorker, setEmailWorker] = useState("");
const [projectName, setProjectName] = useState(defautlInput);
const [editTitleColumn, setEditTitleColumn] = useState(titleColumn);
const [valueColumn, setValueColumn] = useState("");
const [nameProject, setNameProject] = useState("");
@ -80,11 +84,11 @@ export const TrackerModal = ({
method: "PUT",
data: {
project_id: projectId,
name: projectName
name: projectName,
},
}).then((res) => {
setActive(false)
dispatch(editProjectName({id: projectId, name: projectName}))
setActive(false);
dispatch(editProjectName({ id: projectId, name: projectName }));
});
}
@ -232,7 +236,6 @@ export const TrackerModal = ({
</button>
</div>
)}
{/* TODO: fix state */}
{modalType === "editColumn" && (
<div>
<div className="title-project">
@ -240,8 +243,8 @@ export const TrackerModal = ({
<div className="input-container">
<input
className="name-project"
value={defautlInput}
onChange={(e) => setValueTiket(e.target.value)}
value={editTitleColumn}
onChange={(e) => setEditTitleColumn(e.target.value)}
/>
</div>
</div>