#90 set up task reducer & types & actions

parent 51db4527
...@@ -339,8 +339,10 @@ const TableRowTask= ({ ...@@ -339,8 +339,10 @@ const TableRowTask= ({
</TableCell> </TableCell>
{/* Edit option datetimeTask */} {/* Edit option datetimeTask */}
{/* <TableCell style={{width:'0%'}}> <TableCell
<Tooltip title="Редактировать Копию"> // style={{width:'0%'}}
>
{/* <Tooltip title="Редактировать Копию">
{task.isEditMode ? ( {task.isEditMode ? (
<IconButton <IconButton
aria-label="done" aria-label="done"
...@@ -359,8 +361,8 @@ const TableRowTask= ({ ...@@ -359,8 +361,8 @@ const TableRowTask= ({
<Edit /> <Edit />
</IconButton> </IconButton>
)} )}
</Tooltip> </Tooltip> */}
</TableCell > */} </TableCell >
{/* delete option datetimeTask */} {/* delete option datetimeTask */}
{task.author.id===user.id ? {task.author.id===user.id ?
......
...@@ -13,7 +13,7 @@ import TaskModal from "../../components/MyTasksCompoments/TaskModal/TaskModal"; ...@@ -13,7 +13,7 @@ import TaskModal from "../../components/MyTasksCompoments/TaskModal/TaskModal";
import EnhancedTableHead from "./MyTasksHeader/MyTasksHeader"; import EnhancedTableHead from "./MyTasksHeader/MyTasksHeader";
import moment from "moment"; import moment from "moment";
import MyTaskToolBar from "../../components/MyTasksCompoments/MyTaskToolBar"; import MyTaskToolBar from "../../components/MyTasksCompoments/MyTaskToolBar";
import { fetchAllTasks, deleteTask,editTask} from "../../store/actions/tasksActions"; import { fetchAllTasks, deleteTask,editTask, deleteDateTimeTask} from "../../store/actions/tasksActions";
import NewTaskForm from "../../components/MyTasksCompoments/NewTaskForm"; import NewTaskForm from "../../components/MyTasksCompoments/NewTaskForm";
import TableRowTask from "../../components/MyTasksCompoments/TableRowTask/TableRowTask"; import TableRowTask from "../../components/MyTasksCompoments/TableRowTask/TableRowTask";
...@@ -44,7 +44,7 @@ export default function EnhancedTable() { ...@@ -44,7 +44,7 @@ export default function EnhancedTable() {
if (tasks && tasks?.length > 0) { if (tasks && tasks?.length > 0) {
setRecievedTasks(tasks); setRecievedTasks(tasks);
} }
}, [tasks?.length]); }, [dispatch, tasks?.length]);
useEffect(() => { useEffect(() => {
dispatch(fetchAllTasks()); dispatch(fetchAllTasks());
...@@ -162,9 +162,9 @@ useEffect(() => { ...@@ -162,9 +162,9 @@ useEffect(() => {
dispatch(deleteTask(id)); dispatch(deleteTask(id));
}; };
const deleteDateTimeTask=(dateTImeTaskId)=>{ const deleteDateTimeTaskHandle=(dateTimeTaskId)=>{
console.log('delete by dateTImeTaskId') console.log('delete by dateTimeTaskId ', dateTimeTaskId)
// dispatch(deleteDateTimeTask(dateTImeTaskId)) dispatch(deleteDateTimeTask(dateTimeTaskId))
} }
const handleEditDateTimeTask=(dateTimeTask)=>{ const handleEditDateTimeTask=(dateTimeTask)=>{
...@@ -272,7 +272,7 @@ console.log('tasks', tasks) ...@@ -272,7 +272,7 @@ console.log('tasks', tasks)
deleteHandle={deleteHandle} deleteHandle={deleteHandle}
handleEditTask ={handleEditTask} handleEditTask ={handleEditTask}
handleEditDateTimeTask={handleEditDateTimeTask} handleEditDateTimeTask={handleEditDateTimeTask}
deleteDateTimeTask={deleteDateTimeTask} deleteDateTimeTask={deleteDateTimeTaskHandle}
onChange={onChange} onChange={onChange}
onModalOpen={onModalOpen} onModalOpen={onModalOpen}
onProjectChange={onProjectChange} onProjectChange={onProjectChange}
......
...@@ -22,6 +22,6 @@ export const DELETE_TASK_FAILURE = "DELETE_TASK_FAILURE"; ...@@ -22,6 +22,6 @@ export const DELETE_TASK_FAILURE = "DELETE_TASK_FAILURE";
export const EDIT_CALENDAR_TASK = "EDIT_CALENDAR_TASK"; export const EDIT_CALENDAR_TASK = "EDIT_CALENDAR_TASK";
export const DELETE_COPYTASK_REQUEST = "DELETE_TASK_REQUEST"; export const DELETE_DATETIMETASK_REQUEST = "DELETE_TASK_REQUEST";
export const DELETE_COPYTASK_SUCCESS = "DELETE_TASK_SUCCESS"; export const DELETE_DATETIMETASK_SUCCESS = "DELETE_TASK_SUCCESS";
export const DELETE_COPYTASK_FAILURE = "DELETE_TASK_FAILURE"; export const DELETE_DATETIMETASK_FAILURE = "DELETE_TASK_FAILURE";
\ No newline at end of file \ No newline at end of file
...@@ -14,7 +14,10 @@ import { ...@@ -14,7 +14,10 @@ import {
FETCH_ALL_TASKS_SUCCESS, FETCH_ALL_TASKS_SUCCESS,
FETCH_TASKS_BY_PROJECT_SUCCESS, FETCH_TASKS_BY_PROJECT_SUCCESS,
FETCH_TASKS_BY_PROJECT_FAILURE, FETCH_TASKS_BY_PROJECT_FAILURE,
FETCH_TASKS_BY_PROJECT_REQUEST FETCH_TASKS_BY_PROJECT_REQUEST,
DELETE_DATETIMETASK_FAILURE,
DELETE_DATETIMETASK_SUCCESS,
DELETE_DATETIMETASK_REQUEST,
} from "../actionTypes/tasksTypes"; } from "../actionTypes/tasksTypes";
import axios from '../../axiosPlanner' import axios from '../../axiosPlanner'
...@@ -210,3 +213,30 @@ export const fetchTasksByProject = (projects) => { ...@@ -210,3 +213,30 @@ export const fetchTasksByProject = (projects) => {
} }
} }
} }
const deleteDateTimeTaskRequest = () => {
return {type: DELETE_DATETIMETASK_REQUEST}
};
const deleteDateTimeTaskSuccess = () => {
return {type: DELETE_DATETIMETASK_SUCCESS}
};
const deleteDateTimeTaskFailure = (error) => {
return {type: DELETE_DATETIMETASK_FAILURE, error}
};
export const deleteDateTimeTask = (dateTimeTaskId) => {
return async (dispatch) => {
dispatch(deleteDateTimeTaskRequest());
try {
await axios.delete(`/copy-tasks/${dateTimeTaskId}`);
dispatch(deleteDateTimeTaskSuccess())
dispatch(fetchAllTasks())
} catch (error) {
dispatch(deleteDateTimeTaskFailure(error.response.data));
}
}
}
...@@ -15,7 +15,10 @@ import { ...@@ -15,7 +15,10 @@ import {
EDIT_CALENDAR_TASK, EDIT_CALENDAR_TASK,
FETCH_TASKS_BY_PROJECT_REQUEST, FETCH_TASKS_BY_PROJECT_REQUEST,
FETCH_TASKS_BY_PROJECT_SUCCESS, FETCH_TASKS_BY_PROJECT_SUCCESS,
FETCH_TASKS_BY_PROJECT_FAILURE FETCH_TASKS_BY_PROJECT_FAILURE,
DELETE_DATETIMETASK_FAILURE,
DELETE_DATETIMETASK_SUCCESS,
DELETE_DATETIMETASK_REQUEST
} from "../actionTypes/tasksTypes"; } from "../actionTypes/tasksTypes";
const initialState = { const initialState = {
...@@ -102,6 +105,12 @@ const tasksReduсer = (state = initialState, action) => { ...@@ -102,6 +105,12 @@ const tasksReduсer = (state = initialState, action) => {
return {...state, loading: true}; return {...state, loading: true};
case DELETE_TASK_FAILURE: case DELETE_TASK_FAILURE:
return {...state, loading: false, error: action.error}; return {...state, loading: false, error: action.error};
case DELETE_DATETIMETASK_SUCCESS:
return {...state, loading: false};
case DELETE_DATETIMETASK_REQUEST:
return {...state, loading: true};
case DELETE_DATETIMETASK_FAILURE:
return {...state, loading: false, error: action.error};
default: default:
return state; return state;
} }
......
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