Commit c438735f authored by Ibadullina Inabat's avatar Ibadullina Inabat

реализовано удаление проекта, бэк не отрабатывает

parent 4ab57d10
import { Card, CardActions, CardContent, Grid, IconButton } from "@mui/material"; import { Button, Card, CardActions, CardContent, Grid, IconButton } from "@mui/material";
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import ArrowForwardIcon from "@mui/icons-material/ArrowForward"; import ArrowForwardIcon from "@mui/icons-material/ArrowForward";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import DeleteIcon from "@mui/icons-material/Delete"; import DeleteIcon from "@mui/icons-material/Delete";
import { deleteProject } from "../../../store/actions/projectsActions";
const ProjectItem = ({ title, tasks, id }) => { const ProjectItem = ({ title, tasks, id }) => {
const user = useSelector(state => state.users.user); const user = useSelector(state => state.users.user);
const dispatch = useDispatch(); const dispatch = useDispatch();
console.log(id)
console.log(user) console.log(user)
const deleteHandle = (id) => {
dispatch(deleteProject(id))
};
return <> return <>
<Grid item xs={12} sm={12} md={6} lg={4}> <Grid item xs={12} sm={12} md={6} lg={4}>
<Card> <Card>
...@@ -23,17 +29,15 @@ const ProjectItem = ({ title, tasks, id }) => { ...@@ -23,17 +29,15 @@ const ProjectItem = ({ title, tasks, id }) => {
</strong> </strong>
</CardContent> </CardContent>
<CardActions> <CardActions>
{<Button onClick={(id) => {
deleteHandle(id);
}} variant="outlined" startIcon={<DeleteIcon />}>
Delete
</Button>}
<IconButton component={Link} to={"/projects/" + id}> <IconButton component={Link} to={"/projects/" + id}>
<ArrowForwardIcon /> <ArrowForwardIcon />
</IconButton> </IconButton>
<IconButton
onClick={(id) => {
// deleteHandle(userId);
}}
>
{(title !== "Личные дела") ?
<DeleteIcon /> : null}
</IconButton>
</CardActions> </CardActions>
</Card> </Card>
</Grid> </Grid>
......
...@@ -15,11 +15,7 @@ const ProjectMembersItem = ({ displayName, roleProject, id, roleProjectOfAuthor, ...@@ -15,11 +15,7 @@ const ProjectMembersItem = ({ displayName, roleProject, id, roleProjectOfAuthor,
const { projects, project } = useSelector(state => state.projects); const { projects, project } = useSelector(state => state.projects);
const deleteHandle = (userId, projectId) => { const deleteHandle = (userId, projectId) => {
if (members.length > 1) {
dispatch(deleteMember(userId, params.id)) dispatch(deleteMember(userId, params.id))
} else {
alert("Нельзя удалить автора проекта")
}
}; };
return <> return <>
......
import { Card, CardActions, CardContent, Grid } from "@mui/material"; import { Button, Card, CardActions, CardContent, Grid, IconButton } from "@mui/material";
import { useParams } from "react-router-dom"; import { useParams } from "react-router-dom";
import { useSelector, useDispatch } from "react-redux"; import { useSelector, useDispatch } from "react-redux";
import { useEffect } from "react"; import { useEffect } from "react";
...@@ -8,6 +8,7 @@ import { fetchUsers } from "../../store/actions/usersActions"; ...@@ -8,6 +8,7 @@ import { fetchUsers } from "../../store/actions/usersActions";
import ProjectMembersList from "../../components/ProjectComponents/ProjectMembersList/ProjectMembersList"; import ProjectMembersList from "../../components/ProjectComponents/ProjectMembersList/ProjectMembersList";
import NewMember from "../NewMember/NewMember"; import NewMember from "../NewMember/NewMember";
const FullProject = () => { const FullProject = () => {
const { projects, project } = useSelector(state => state.projects); const { projects, project } = useSelector(state => state.projects);
...@@ -34,7 +35,7 @@ const FullProject = () => { ...@@ -34,7 +35,7 @@ const FullProject = () => {
return <> return <>
<Grid item xs={12} sm={12} md={6} lg={4}> <Grid item xs={12} sm={12} md={6} lg={4}>
<Card> <Card>
<h2>Проект - {project?.project?.title}</h2> <h2>Проект - {project?.project?.title} </h2>
<CardContent> <CardContent>
<strong> <strong>
<br></br> <br></br>
...@@ -54,13 +55,11 @@ const FullProject = () => { ...@@ -54,13 +55,11 @@ const FullProject = () => {
</strong> </strong>
<strong> <strong>
<br></br> <br></br>
<div style={{display: 'flex', direction: 'column'}}> <div style={{ display: 'flex', direction: 'column' }}>
Участники проекта: {(project?.project?.members[0]?.user.displayName === user.displayName) ? <NewMember members={project?.project?.members} /> : null} Участники проекта: {(project?.project?.members[0]?.user.displayName === user.displayName) ? <NewMember members={project?.project?.members} /> : null}
</div> </div>
<ProjectMembersList users={users} project={project} members={project?.project?.members} roleProjectOfAuthor={project?.project?.members[0]?.roleProject} authorOfProject={project?.project?.members[0]?.user.displayName}/> <ProjectMembersList users={users} project={project} members={project?.project?.members} roleProjectOfAuthor={project?.project?.members[0]?.roleProject} authorOfProject={project?.project?.members[0]?.user.displayName} />
</strong> </strong>
<strong> <strong>
<br></br> <br></br>
......
...@@ -12,3 +12,7 @@ export const DELETE_MEMBER_SUCCESS = "DELETE_MEMBER_SUCCESS"; ...@@ -12,3 +12,7 @@ export const DELETE_MEMBER_SUCCESS = "DELETE_MEMBER_SUCCESS";
export const DELETE_MEMBER_FAILURE = "DELETE_MEMBER_FAILURE"; export const DELETE_MEMBER_FAILURE = "DELETE_MEMBER_FAILURE";
export const FETCH_ALL_USER_PROJECTS_SUCCESS = "FETCH_ALL_USER_PROJECTS_SUCCESS"; export const FETCH_ALL_USER_PROJECTS_SUCCESS = "FETCH_ALL_USER_PROJECTS_SUCCESS";
export const DELETE_PROJECT_REQUEST = "DELETE_PROJECT_REQUEST";
export const DELETE_PROJECT_SUCCESS = "DELETE_PROJECT_SUCCESS";
export const DELETE_PROJECT_FAILURE = "DELETE_PROJECT_FAILURE";
\ No newline at end of file
import axios from "../../axiosPlanner"; import axios from "../../axiosPlanner";
import { CREATE_MEMBER_SUCCESS, CREATE_PROJECT_SUCCESS, DELETE_MEMBER_FAILURE, DELETE_MEMBER_REQUEST, DELETE_MEMBER_SUCCESS, FETCH_ALL_USER_PROJECTS_SUCCESS, FETCH_MEMBERS_ERROR, FETCH_MEMBERS_REQUEST, FETCH_MEMBERS_SUCCESS, FETCH_PROJECTS_ERROR, FETCH_PROJECTS_REQUEST, FETCH_PROJECTS_SUCCESS, FETCH_PROJECT_SUCCESS } from "../actionTypes/projectsActionTypes"; import { CREATE_MEMBER_SUCCESS, CREATE_PROJECT_SUCCESS, DELETE_MEMBER_FAILURE, DELETE_MEMBER_REQUEST, DELETE_MEMBER_SUCCESS, DELETE_PROJECT_FAILURE, DELETE_PROJECT_REQUEST, DELETE_PROJECT_SUCCESS, FETCH_ALL_USER_PROJECTS_SUCCESS, FETCH_MEMBERS_ERROR, FETCH_MEMBERS_REQUEST, FETCH_MEMBERS_SUCCESS, FETCH_PROJECTS_ERROR, FETCH_PROJECTS_REQUEST, FETCH_PROJECTS_SUCCESS, FETCH_PROJECT_SUCCESS } from "../actionTypes/projectsActionTypes";
import { showNotification } from "./commonActions"; import { showNotification } from "./commonActions";
const fetchProjectsRequest = () => { const fetchProjectsRequest = () => {
...@@ -36,6 +36,17 @@ const deleteMemberRequest = () => { ...@@ -36,6 +36,17 @@ const deleteMemberRequest = () => {
return {type: DELETE_MEMBER_FAILURE, error} return {type: DELETE_MEMBER_FAILURE, error}
}; };
const deleteProjectRequest = () => {
return {type: DELETE_PROJECT_REQUEST}
};
const deleteProjectSuccess = () => {
return {type: DELETE_PROJECT_SUCCESS}
};
const deleteProjectFailure = (error) => {
return {type: DELETE_PROJECT_FAILURE, error}
};
export const deleteMember = (memberId, projectId) => { export const deleteMember = (memberId, projectId) => {
return async (dispatch) => { return async (dispatch) => {
dispatch(deleteMemberRequest()); dispatch(deleteMemberRequest());
...@@ -50,6 +61,19 @@ const deleteMemberRequest = () => { ...@@ -50,6 +61,19 @@ const deleteMemberRequest = () => {
} }
} }
export const deleteProject = (projectId, projects) => {
return async (dispatch) => {
dispatch(deleteProjectRequest());
try {
const response = await axios.delete(`/projects/${projectId}`);
console.log("deleteMember ", response.data)
dispatch(deleteProjectSuccess())
dispatch(fetchProjects(projects))
} catch (error) {
dispatch(deleteProjectFailure(error.response.data));
}
}
}
export const fetchProjects = () => { export const fetchProjects = () => {
return async dispatch => { return async dispatch => {
dispatch(fetchProjectsRequest()); dispatch(fetchProjectsRequest());
......
import {DELETE_MEMBER_FAILURE, DELETE_MEMBER_REQUEST, DELETE_MEMBER_SUCCESS, FETCH_ALL_USER_PROJECTS_SUCCESS, FETCH_PROJECTS_ERROR, FETCH_PROJECTS_REQUEST, FETCH_PROJECTS_SUCCESS, FETCH_PROJECT_SUCCESS } from "../actionTypes/projectsActionTypes"; import {DELETE_MEMBER_FAILURE, DELETE_MEMBER_REQUEST, DELETE_MEMBER_SUCCESS, DELETE_PROJECT_FAILURE, DELETE_PROJECT_REQUEST, DELETE_PROJECT_SUCCESS, FETCH_ALL_USER_PROJECTS_SUCCESS, FETCH_PROJECTS_ERROR, FETCH_PROJECTS_REQUEST, FETCH_PROJECTS_SUCCESS, FETCH_PROJECT_SUCCESS } from "../actionTypes/projectsActionTypes";
const initialState = { const initialState = {
allUserProjects: [], allUserProjects: [],
...@@ -24,6 +24,12 @@ const initialState = { ...@@ -24,6 +24,12 @@ const initialState = {
return {...state, loading: true}; return {...state, loading: true};
case DELETE_MEMBER_FAILURE: case DELETE_MEMBER_FAILURE:
return {...state, loading: false, error: action.error}; return {...state, loading: false, error: action.error};
case DELETE_PROJECT_SUCCESS:
return {...state, loading: false};
case DELETE_PROJECT_REQUEST:
return {...state, loading: true};
case DELETE_PROJECT_FAILURE:
return {...state, loading: false, error: action.error};
case FETCH_ALL_USER_PROJECTS_SUCCESS: case FETCH_ALL_USER_PROJECTS_SUCCESS:
return {...state, loading: false, allUserProjects: action.projects} return {...state, loading: false, allUserProjects: action.projects}
default: default:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment