Merge branch 'task-53-fix/put_task_repair' into 'development'

Task 53 fix/put task repair

See merge request !30

planner-api/src/routers/tasks.ts

@@ -80,6 +80,7 @@ router.delete('/:taskId',async (req: Request, res: Response):Promise<Response>=>
 
 router.put('/',async(req:Request, res:Response)=> {
     const token = req.get('Authorization');
+
     const user = await dataSource
     .createQueryBuilder()
     .select("user")
@@ -94,6 +95,7 @@ router.put('/',async(req:Request, res:Response)=> {
     .from(Task, "task")
     .where("task.id = :id", { id })
     .getOne()
+
     if (!task) return res.status(404).send({Message:'task not found'})
     task.title= title
     task.description= description

planner-api/src/routers/users.ts

@@ -35,9 +35,7 @@ return res.send({users})
 
 
 router.post('/', upload.single("avatar"), async (req : Request, res : Response):Promise<object> => {
-    console.log(req.body)
     const {name,surname,password,email, role} = req.body;
-    console.log(req.body)
     const displayName = surname+' '+name[0]+'.'
     const user = new User();
     user.name = name;
@@ -47,13 +45,10 @@ router.post('/', upload.single("avatar"), async (req : Request, res : Response):
     user.email = email;
     user.role = role;
     user.generateToken()
-    console.log("user " + user)
     await user.save();
-    console.log("saved")
     const userToFront:User|null = await dataSource.manager.findOneBy(User, {
         email: user.email
     })
-    console.log("userToFront " + userToFront)
     return res.send({userToFront})
 })
 

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

+import * as React from "react";
+import {
+  Box,
+  Table,
+  TableBody,
+  TableCell,
+  TableContainer,
+  TableRow,
+  Paper,
+  IconButton,
+  Tooltip,
+  Input,
+} from "@mui/material";
+import { useState, useEffect } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import { Done, Edit, NavigateNextOutlined } from "@mui/icons-material";
+import DeleteIcon from "@mui/icons-material/Delete";
+import TaskModal from "../../components/MyTasksCompoments/TaskModal/TaskModal";
+import moment from "moment";
+import CustomTableCell from "../../components/MyTasksCompoments/CustomTableCell";
+import MaterialUIPickers from "../../components/MyTasksCompoments/DateTimePicker/DateTimePicker";
+import BasicSelect from "../../components/UI/Select/Select";
+import { fetchAllTasks, deleteTask,editTask,addTask } from "../../store/actions/tasksActions";
+
+
+export default function NewTaskForm (props) {
+
+   
+    //   const onToggleEditModeDone = (id) => {
+    //     const newTasks = recievedTasks.map((task) => {
+    //       if (task.id === id) {
+    //         return {
+    //           ...task,
+    //           isEditMode: false,
+    //           readOnly: true,
+    //         };
+    //       }
+    //       return task;
+    //     });
+    //     setRecievedTasks(newTasks);
+    //   };
+   
+    
+    const task={
+      id:0,
+      title: "",
+      description: "",
+      createdAt: "",
+      dateTimeStart: null,
+      dateTimeDue: null,
+      accomplish: "",
+      priority: "",
+      author: {
+         name: "",
+         },
+      executors: [
+        { name: "" }
+      ],
+      isEditMode:false,
+      readOnly: true
+    };
+
+    const onToggleEditMode = (id) => {
+        console.log(task)
+            return {
+              ...task,
+              isEditMode: true,
+              readOnly: false,
+              
+            };
+        
+          
+      };
+      console.log(task)
+
+    return (
+        <TableRow hover key={task.id}>
+        <TableCell
+          component="th"
+          scope="row"
+          padding="none"
+        ></TableCell>
+        <CustomTableCell
+          {...{
+            task,
+            name: "priority",
+            value: task.priority,
+            onChange:props.onChange,
+          }}
+        />
+        <CustomTableCell
+          {...{
+            task,
+            name: "createdAt",
+            value: task.createdAt,
+          }}
+        />
+
+        <CustomTableCell
+          {...{
+            task,
+            name: "title",
+            value: task.title,
+            onChange:props.onChange,
+            onModalOpen:props.onModalOpen,
+          }}
+        />
+       
+         {task.isEditMode ? (
+          <BasicSelect
+            items={["project1", "project2", "project3"]}
+            task={task}
+            onChange={props.onChange}
+          />
+        ) : (
+          <CustomTableCell
+          {...{
+            task,
+            name: "project",
+            value: task.project?.title,
+            onChange: props.onChange,
+          }}
+        />
+        )}
+        <CustomTableCell
+          {...{
+            task,
+            name: "author",
+            value: task.author.displayName,
+            onChange: props.onAuthorChange,
+          }}
+        />
+
+        <TableCell>
+          <MaterialUIPickers
+            task={task}
+            name="dateTimeStart"
+            onChange={props.onDateChange}
+          />
+        </TableCell>
+
+        <TableCell>
+          <MaterialUIPickers
+            task={task}
+            name="dateTimeDue"
+            onChange={props.onDateChange}
+          />
+        </TableCell>
+
+        {task.isEditMode ? (
+          <BasicSelect
+            items={["opened", "done", "failed"]}
+            task={task}
+            onChange={props.onChange}
+          />
+        ) : (
+          <CustomTableCell
+            {...{
+              task,
+              name: "accomplish",
+              value: task.accomplish,
+            }}
+          />
+        )}
+
+        <TableCell>
+          {task.isEditMode ? (
+            <IconButton
+              aria-label="done"
+              onClick={() => {props.onToggleEditModeDone(task.id); props.HandleEditTask(task) }}
+            >
+              <Done />
+            </IconButton>
+          ) : (
+            <IconButton
+              aria-label="edit"
+              onClick={() => onToggleEditMode(task.id)}
+            >
+              <Edit />
+            </IconButton>
+          )}
+        </TableCell>
+        <TableCell>
+          <Tooltip title="Delete">
+            <IconButton
+              onClick={(id) => {
+                props.deleteHandle(task.id);
+              }}
+            >
+              <DeleteIcon />
+            </IconButton>
+          </Tooltip>
+        </TableCell>
+      </TableRow>
+    );
+  
+}

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

@@ -24,6 +24,7 @@ import CustomTableCell from "../../components/MyTasksCompoments/CustomTableCell"
 import MaterialUIPickers from "../../components/MyTasksCompoments/DateTimePicker/DateTimePicker";
 import BasicSelect from "../../components/UI/Select/Select";
 import { fetchAllTasks, deleteTask,editTask,addTask } from "../../store/actions/tasksActions";
+import NewTaskForm from "../../components/MyTasksCompoments/NewTaskForm";
 
 
 function descendingComparator(a, b, orderBy) {
@@ -59,7 +60,7 @@ export default function EnhancedTable() {
 
   useEffect(() => {
     dispatch(fetchAllTasks());
-  }, []);
+  }, [dispatch]);
 
   const tasks = useSelector((state) => state.tasks.tasks);
 console.log(tasks)
@@ -149,6 +150,7 @@ console.log(tasks)
   };
 
   const onToggleEditMode = (id) => {
+    console.log(id)
     const newTasks = recievedTasks.map((task) => {
       if (task.id === id) {
         return {
@@ -162,7 +164,21 @@ console.log(tasks)
     setRecievedTasks(newTasks);
   };
 
-  const HandleEditTask=(task)=>{
+  const onToggleEditModeDone = (id) => {
+    const newTasks = recievedTasks.map((task) => {
+      if (task.id === id) {
+        return {
+          ...task,
+          isEditMode: false,
+          readOnly: true,
+        };
+      }
+      return task;
+    });
+    setRecievedTasks(newTasks);
+  };
+
+  const HandleEditTask= (task)=>{
      dispatch(editTask(task))
   }
 
@@ -264,10 +280,22 @@ console.log(tasks)
                   </TableCell>
                 </TableRow> */}
 
+                 {/* <NewTaskForm
+                 onChange={onChange}
+                 onModalOpen={onModalOpen}
+                 onAuthorChange={onAuthorChange}
+                 onDateChange={onDateChange}
+                 onToggleEditMode={onToggleEditMode}
+                 onToggleEditModeDone={onToggleEditModeDone}
+                 HandleEditTask={HandleEditTask}
+                 deleteHandle={deleteHandle}
+                 /> */}
+
                 {stableSort(recievedTasks, getComparator(order, orderBy))
                   .slice(page * rowsPerPage, page * rowsPerPage + rowsPerPage)
                   .map((task, index) => {
                     return (
+
                       <TableRow hover key={task.id}>
                         <TableCell
                           component="th"
@@ -311,7 +339,7 @@ console.log(tasks)
                           {...{
                             task,
                             name: "project",
-                            value: task.project,
+                            value: task.project?.title,
                             onChange: onChange,
                           }}
                         />
@@ -361,7 +389,7 @@ console.log(tasks)
                           {task.isEditMode ? (
                             <IconButton
                               aria-label="done"
-                              onClick={() => {onToggleEditMode(task.id); HandleEditTask(task) }}
+                              onClick={() => {onToggleEditModeDone(task.id); HandleEditTask(task) }}
                             >
                               <Done />
                             </IconButton>

planner-front/src/index.js

@@ -6,7 +6,7 @@ import { configureStore } from '@reduxjs/toolkit';
 import { Provider } from 'react-redux';
 import usersReducer from './store/reducers/usersReducer';
 import tasksReducer from './store/reducers/tasksReducer';
-import axios from 'axios';
+import axios from './axiosPlanner';
 
 const localStorageMiddleware = ({getState}) => (next) => (action) => {
   const result = next(action);
@@ -21,13 +21,6 @@ const loadFromLocalStorage = () => {
   return undefined;
 };
 
-axios.interceptors.request.use(config=>{
-  try{
-      config.headers['Authorization']=store.getState().users.user.token;
-  } catch(e){
-  }
-  return config;
-})
 
 const store = configureStore({
   reducer: {
@@ -38,6 +31,14 @@ const store = configureStore({
   middleware: (getDefaultMiddleware) => getDefaultMiddleware().concat(localStorageMiddleware)
 })
 
+axios.interceptors.request.use(config=>{
+  try{
+      config.headers['Authorization']=store.getState().users.user.token;
+  } catch(e){
+  }
+  return config;
+})
+
 const root = ReactDOM.createRoot(document.getElementById('root'));
 root.render(
   <Provider store={store}>

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

@@ -70,11 +70,7 @@ export const addTask = (task) => {
       dispatch(addTaskRequest());
       const token = getState().users?.user?.token;
       try {
-        await axios.post("/tasks", task, {
-          headers: {
-            'Authorization': 'IwGVRaksGTWtnKlOZd7zJ'
-          }
-        });
+        await axios.post("/tasks", task);
         dispatch(addTaskSuccess())
         dispatch(fetchCalendarTasks())
       } catch (error) {
@@ -98,14 +94,10 @@ const editTaskFailure = (error) => {
 export const editTask = (task) => {
   return async (dispatch, getState) => {
       dispatch(editTaskRequest());
-      const token = getState().users?.user?.token;
+      // const token = getState().users?.user?.token;
       try {
-        console.log(task)
-        const r=await axios.put("/tasks", task, {
-          headers: {
-            'Authorization': 'IwGVRaksGTWtnKlOZd7zJ'
-          }
-        });
+        console.log('task' , task)
+        const r=await axios.put("/tasks/", task);
         console.log(r)
         dispatch(editTaskSuccess())
         dispatch(fetchAllTasks())
@@ -131,13 +123,9 @@ const deleteTaskFailure = (error) => {
 export const deleteTask = (taskId) => {
   return async (dispatch, getState) => {
       dispatch(deleteTaskRequest());
-      const token = getState().users?.user?.token;
+      // const token = getState().users?.user?.token;
       try {
-        await axios.delete(`/tasks/${taskId}`, {
-          headers: {
-            'Authorization': 'IwGVRaksGTWtnKlOZd7zJ'
-          }
-        });
+        await axios.delete(`/tasks/${taskId}`);
         dispatch(deleteTaskSuccess())
         dispatch(fetchCalendarTasks())
         dispatch(fetchAllTasks())