Merge branch 'development' into 'task-62-feature/tasks_of_project_front'

# Conflicts:
#   planner-front/src/components/MyTasksCompoments/CustomTableCell.js

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

@@ -8,12 +8,12 @@ const CustomTableCell = ({task,
   onChange,
   onModalOpen,
   placeholder,
+  user
  }) => {
   const styles = { width: "auto", height: "10px"};
 
-  
 
-  if (task) {
+   if (task) {
     return (
       <>
         <TableCell
@@ -21,7 +21,7 @@ const CustomTableCell = ({task,
           align="left"
           style={styles}
         >
-          {task.isEditMode && onChange ? (
+          {task.isEditMode && onChange && name==!"author" && task.author.id==user.id ? (
             <Input
               placeholder={placeholder}
               value={value}

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

@@ -3,22 +3,23 @@ import "./TaskModal.css";
 import { Done } from "@mui/icons-material";
 import Input from "@mui/material/Input";
 
-const TaskModal = (props) => {
+const TaskModal = ({handleClose,open,task,onChange,user }) => {
+
   return (
     <Modal
       aria-labelledby="transition-modal-title"
       aria-describedby="transition-modal-description"
       className={"modal"}
       closeAfterTransition
-      onClose={props.handleClose}
-      open={props.open}
+      onClose={handleClose}
+      open={open}
     >
-      {props?.task?.isEditMode ? (
+      {task?.isEditMode && task.author.id===user.id ? (
         <div className="modalBox">
           <Input
-            value={props.task.title}
+            value={task.title}
             name="title"
-            onChange={(e) => props.onChange(e, props.task)}
+            onChange={(e) => onChange(e, task)}
             style={{
               width: "auto",
               fontSize: "12px",
@@ -27,18 +28,18 @@ const TaskModal = (props) => {
             }}
           />
           <Input
-            value={props.task.description}
+            value={task.description}
             name="description"
-            onChange={(e) => props.onChange(e, props.task)}
+            onChange={(e) => onChange(e, task)}
             style={{ width: "auto", fontSize: "12px", color: "white" }}
           />
-          <IconButton aria-label="done" onClick={props.handleClose}>
+          <IconButton aria-label="done" onClick={handleClose}>
             <Done />
           </IconButton>
         </div>
       ) : (
         <div className="modalBox">
-          {props.task && props.task.title && (
+          {task && task.title && (
             <div
               style={{
                 width: "200px",
@@ -47,18 +48,18 @@ const TaskModal = (props) => {
                 fontWeight: "600",
               }}
             >
-              {props.task.title}
+              {task.title}
             </div>
           )}
-          {props.task && props.task.description && (
+          {task && task.description && (
             <div style={{ width: "200px", height: "200px", color: "white" }}>
-              {props.task.description}
+              {task.description}
             </div>
           )}
           <IconButton
             sx={{ marginLeft: 0, color: "white" }}
             aria-label="close"
-            onClick={props.handleClose}
+            onClick={handleClose}
           >
             X
           </IconButton>

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

@@ -33,7 +33,7 @@ export default function EnhancedTable() {
   const dispatch = useDispatch();
 
   const tasks = useSelector((state) => state.tasks.tasks);
-  
+  const user = useSelector((state) => state.users.user);
   const [recievedTasks, setRecievedTasks] = useState([]);
   const [addTaskForm, setAddTaskForm] = useState(false);
   const [order, setOrder] = useState("asc");
@@ -45,9 +45,7 @@ export default function EnhancedTable() {
     task: null,
   });
   const [projects,setProjects]=useState(['1','2'])
-  console.log(tasks)
-
-
+ 
   useEffect(() => {
     dispatch(fetchAllTasks());
     filterProjectsNamesFromTasks()
@@ -120,7 +118,7 @@ useEffect(() => {
   
   const onProjectChange = (e, task) => {
     const value = e.target.value;
-    const project = rawProjects.find((e) => e.id === value);
+    const project = uniqueProjects.find((e) => e.id === value);
     const { id } = task;
     const newTasks = recievedTasks.map((task) => {
       if (task.id === id) {
@@ -129,7 +127,7 @@ useEffect(() => {
         updated.projectName = project.title;
         return updated;
       }
-      return task;
+        return task;
     });
     setRecievedTasks(newTasks);
   };
@@ -195,6 +193,8 @@ useEffect(() => {
     setFilterProjectTumbler(true)
   }
   const rawProjects= tasks?.map(task=>task.project)
+  
+
   const filterProjectsNamesFromTasks = ()=>{
     if (tasks && tasks?.length > 0) {
     
@@ -211,6 +211,17 @@ useEffect(() => {
     }
   }
 
+  const uniqueProjects = rawProjects?.reduce((results, value, index) => {
+    const exist = results.find((v) => {
+     return v !== null && v.id === value?.id
+   });
+    if (!exist && value !== null) {
+      results.push(value);
+    }
+    return results;
+  }, []);
+
+
   if (
     tasks &&
     tasks?.length > 0 &&
@@ -259,7 +270,7 @@ useEffect(() => {
                           scope="row"
                           padding="none"
                         ></TableCell>
-                        {task.isEditMode ? (
+                        {task.isEditMode && task.author.id===user.id  ? (
                           <TableCell>
                             <BasicSelect
                               items={[
@@ -271,7 +282,9 @@ useEffect(() => {
                               value={task.priority}
                               onChange={onChange}
                               name="priority"
+                              user={user}
                             />
+
                           </TableCell>
                         ) : (
                           <CustomTableCell
@@ -279,6 +292,7 @@ useEffect(() => {
                               task,
                               name: "priority",
                               value: task.priority,
+                              user:user
                             }}
                           />
                         )}
@@ -290,7 +304,7 @@ useEffect(() => {
                             value: moment(task.createdAt)
                               .utc()
                               .format("DD-MM-YYYY hh:mm A"),
-
+                              user:user
                           }}
                         />
 
@@ -301,13 +315,14 @@ useEffect(() => {
                             value: task.title,
                             onChange,
                             onModalOpen,
+                            user:user
                           }}
                         />
                        
-                       {task.isEditMode ? (
+                       {task.isEditMode && task.author.id===user.id  ? (
                           <TableCell>
                             <BasicSelect
-                              items={rawProjects.map((e) => ({
+                              items={uniqueProjects.map((e) => ({
                                 value: e?.id,
                                 title: e?.title,
                               }))}
@@ -315,6 +330,7 @@ useEffect(() => {
                               onChange={onProjectChange}
                               name="project"
                               value={task.project?.id}
+                              user={user}
                             />
                           </TableCell>
                         ) : (
@@ -323,6 +339,7 @@ useEffect(() => {
                               task,
                               name: "projectId",
                               value: task.project?.title,
+                              user:user
                             }}
                           />
                         )}
@@ -333,6 +350,7 @@ useEffect(() => {
                             name: "author",
                             value: task.author.displayName,
                             onChange: onAuthorChange,
+                            user:user
                           }}
                         />
 
@@ -341,7 +359,9 @@ useEffect(() => {
                             task={task}
                             name="dateTimeStart"
                             onChange={onDateChange}
+                            user={user}
                           />
+                          
                         </TableCell>
 
                         <TableCell>
@@ -349,6 +369,7 @@ useEffect(() => {
                             task={task}
                             name="dateTimeDue"
                             onChange={onDateChange}
+                            user={user}
                           />
                         </TableCell>
 
@@ -364,6 +385,7 @@ useEffect(() => {
                               onChange={onChange}
                               name="accomplish"
                               value={task.accomplish}
+                              user={user}
                             />
                           </TableCell>
                         ) : (
@@ -372,6 +394,7 @@ useEffect(() => {
                               task,
                               name: "accomplish",
                               value: task.accomplish,
+                              user:user
                             }}
                           />
                         )}
@@ -430,6 +453,7 @@ useEffect(() => {
           open={modal.open}
           handleClose={handleClose}
           onChange={onChange}
+          user={user}
         />
       </Box>
     );