Merge branch 'task-90-fix/delete_edit_dateTiemTask' into 'development'

Task 90 fix/delete edit date tiem task

See merge request !63

planner-api/src/routers/copyTasks.ts

@@ -41,8 +41,9 @@ router.post("/make-copy", async(req:Request, res:Response):Promise<Response>=>{
 } )
 
 /** change date time of copy of task in calendar view */
-router.put("/change-copy", authAuthorOrExecutorOfTask, async(req:Request, res: Response):Promise<Response>=>{
-    const {executorStatus, dateTimeTaskId, taskId, dateTimeStart, dateTimeDue, description, title, priority} = req.body
+router.put("/change-copy/:dateTimeTaskId", authAuthorOrExecutorOfTask, async(req:Request, res: Response):Promise<Response>=>{
+    const {dateTimeTaskId} = req.params
+    const {executorStatus, taskId, dateTimeStart, dateTimeDue, description, title, priority} = req.body
     const dateTimeTask = await dataSource
     .createQueryBuilder()
     .select('dateTimeTask')
@@ -55,7 +56,7 @@ router.put("/change-copy", authAuthorOrExecutorOfTask, async(req:Request, res: R
     await dateTimeTask.save()
     const task = await taskFinderById(taskId)
     if (!task) return res.status(404).send({Message:'task not found'})
-    task.title = title;
+    task.title = title; 
     task.description = description;
     task.priority = priority;
     await task.save()

planner-api/src/routers/tasks.ts

@@ -157,8 +157,9 @@ router.delete('/:taskId',async (req: Request, res: Response):Promise<Response>=>
 
 
 /**change of task  by task id */
-router.put('/',authAuthorOrExecutorOfTask,async(req:Request, res:Response)=> {
-    const {authorStatus,executorStatus,taskId,title,description,note, archive,project,dateTimeTaskId,dateTimeStart,dateTimeDue,executor,accomplish,dateTimeDeadLine, dateTimeFactDeadLine,priority} = req.body;
+router.put('/:taskId',authAuthorOrExecutorOfTask,async(req:Request, res:Response)=> {
+    const {taskId} = req.params
+    const {authorStatus,executorStatus,title,description,note, archive,project,dateTimeTaskId,dateTimeStart,dateTimeDue,executor,accomplish,dateTimeDeadLine, dateTimeFactDeadLine,priority} = req.body;
     const task = await taskFinderById(taskId)
     if (!task) return res.status(404).send({Message:'task not found'})
     let dateTimeTask = null;

planner-front/src/components/MyTasksCompoments/TableRowTask/TableRowTask.js

@@ -31,7 +31,7 @@ const TableRowTask= ({
   deleteHandle,
   handleEditTask, 
   deleteDateTimeTask,
-  handleEditDateTimeTask,
+  // handleEditDateTimeTask,
   onChange,
   onModalOpen,
   onProjectChange,
@@ -339,8 +339,10 @@ const TableRowTask= ({
                         </TableCell>
 
                         {/* Edit option datetimeTask */}
-                    <TableCell style={{width:'0%'}}>
-                          <Tooltip title="Редактировать Копию">
+                    <TableCell 
+                    // style={{width:'0%'}}
+                    >
+                          {/* <Tooltip title="Редактировать Копию">
                             {task.isEditMode ? (
                               <IconButton
                                 aria-label="done"
@@ -359,9 +361,9 @@ const TableRowTask= ({
                                 <Edit />
                               </IconButton>
                             )}
-                          </Tooltip>
+                          </Tooltip> */}
                         </TableCell >
-
+                        
                         {/* delete option datetimeTask  */}
                         {task.author.id===user.id  ?
                         (<TableCell style={{width:'0%'}}>

planner-front/src/containers/MyTasks/MyTasks.js

@@ -13,7 +13,7 @@ import TaskModal from "../../components/MyTasksCompoments/TaskModal/TaskModal";
 import EnhancedTableHead from "./MyTasksHeader/MyTasksHeader";
 import moment from "moment";
 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 TableRowTask from "../../components/MyTasksCompoments/TableRowTask/TableRowTask";
 
@@ -44,7 +44,7 @@ export default function EnhancedTable() {
     if (tasks && tasks?.length > 0) {
       setRecievedTasks(tasks);
       }
-}, [tasks?.length]);
+}, [dispatch, tasks?.length]);
 
 useEffect(() => {
   dispatch(fetchAllTasks());
@@ -162,9 +162,9 @@ useEffect(() => {
     dispatch(deleteTask(id));
   };
 
-  const deleteDateTimeTask=(dateTImeTaskId)=>{
-    console.log('delete by dateTImeTaskId')
-    // dispatch(deleteDateTimeTask(dateTImeTaskId))
+  const deleteDateTimeTaskHandle=(dateTimeTaskId)=>{
+    console.log('delete by dateTimeTaskId ', dateTimeTaskId)
+    dispatch(deleteDateTimeTask(dateTimeTaskId))
   }
 
   const handleEditDateTimeTask=(dateTimeTask)=>{
@@ -272,7 +272,7 @@ console.log('tasks', tasks)
                       deleteHandle={deleteHandle}
                       handleEditTask ={handleEditTask}
                       handleEditDateTimeTask={handleEditDateTimeTask}
-                      deleteDateTimeTask={deleteDateTimeTask}
+                      deleteDateTimeTask={deleteDateTimeTaskHandle}
                       onChange={onChange}
                       onModalOpen={onModalOpen}
                       onProjectChange={onProjectChange}

planner-front/src/store/actionTypes/tasksTypes.js

@@ -20,4 +20,8 @@ export const DELETE_TASK_REQUEST = "DELETE_TASK_REQUEST";
 export const DELETE_TASK_SUCCESS = "DELETE_TASK_SUCCESS";
 export const DELETE_TASK_FAILURE = "DELETE_TASK_FAILURE";
 
-export const EDIT_CALENDAR_TASK = "EDIT_CALENDAR_TASK";
\ No newline at end of file
+export const EDIT_CALENDAR_TASK = "EDIT_CALENDAR_TASK";
+
+export const DELETE_DATETIMETASK_REQUEST = "DELETE_TASK_REQUEST";
+export const DELETE_DATETIMETASK_SUCCESS = "DELETE_TASK_SUCCESS";
+export const DELETE_DATETIMETASK_FAILURE = "DELETE_TASK_FAILURE";
\ No newline at end of file

planner-front/src/store/actions/tasksActions.js

@@ -14,7 +14,10 @@ import {
   FETCH_ALL_TASKS_SUCCESS,
   FETCH_TASKS_BY_PROJECT_SUCCESS,
   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";
 import axios from '../../axiosPlanner'
 
@@ -209,4 +212,31 @@ export const fetchTasksByProject = (projects) => {
         dispatch(fetchTasksByProjectFailure(error.response.data));
       }
   }
-}
\ No newline at end of file
+}
+
+
+
+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));
+      }
+  }
+}

planner-front/src/store/reducers/tasksReducer.js

@@ -15,7 +15,10 @@ import {
   EDIT_CALENDAR_TASK,
   FETCH_TASKS_BY_PROJECT_REQUEST,
   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";
 
 const initialState = {
@@ -102,6 +105,12 @@ const tasksReduсer = (state = initialState, action) => {
       return {...state, loading: true};
     case DELETE_TASK_FAILURE:
       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: 
         return state;
 }