Merge branch 'development' of…

Merge branch 'development' of ssh://git.attractor-school.com:30022/apollo64/crm-team-one into task-61-enhance/refactoring_code

planner-api/src/fixtures.ts

@@ -69,8 +69,6 @@ const loadFixtures = async () => {
         newTask.title = `Buy ${faker.commerce.productName()}`;
         newTask.description = faker.random.words(4);
         newTask.executor = faker.helpers.arrayElement(users);
-        // newTask.dateTimeDue = null;
-        // newTask.dateTimeStart = null;
         newTask.author = faker.helpers.arrayElement(users);
         newTask.accomplish = accomplish[0];
         newTask.priority = faker.helpers.arrayElement(priorities);
@@ -94,9 +92,7 @@ const loadFixtures = async () => {
         newProject.title = `Project ${faker.random.words(1)}`;
         newProject.color = faker.random.words(1);
         newProject.members = faker.helpers.arrayElements(members,randomIntFromInterval(1, 3))
-        // newProject.admin = faker.helpers.arrayElement(users);
         newProject.tasks= faker.helpers.arrayElements(tasks, randomIntFromInterval(1, 3));
-        // newProject.workers = faker.helpers.arrayElements(users, randomIntFromInterval(1, 3));
         await newProject.save();
         projects.push(newProject)
     }

planner-api/src/routers/members.ts

+import express,{Router, Request, Response} from 'express';
+import {myDataSource} from '../app-data-source';
+import { Member } from "../models/Member";
+
+const router:Router = express.Router();
+const dataSource = myDataSource;
+
+

planner-api/src/routers/projects.ts

@@ -5,7 +5,6 @@ import { User } from '../models/User';
 import { Member, MemberRole } from '../models/Member';
 import { userInfo } from 'os';
 import { Task } from '../models/Task';
-import { getRepository } from 'typeorm';
 
 const router:Router = express.Router();
 const dataSource = myDataSource;
@@ -26,7 +25,37 @@ router.get('/my',async (req:Request, res:Response): Promise<Response>=> {
     .getOne();
     if(!user) return res.status(404).send({Message:'user not found'})
 
-    const projects:Project[] = await dataSource.manager.find(Project)
+
+    const rawProjects = await dataSource
+    .createQueryBuilder()
+    .from(Project, "project")
+    .select(["project.id"])
+    .leftJoinAndSelect('project.members', 'member')
+    .loadRelationCountAndMap('project.tasks', 'project.tasks')
+    .leftJoinAndSelect('member.user', 'user' )
+    .where('member.userId = :userId',{userId:user.id})
+    // .where("project.id = :id", { id: req.params.id })
+    // .select(["*","members"])
+    // .select("*") 
+    .getMany()
+    const projectIds = []
+    if (rawProjects.length>0){
+        for(let project of rawProjects){
+            projectIds.push(project.id
+                )
+        }
+    }
+    console.log('projectIds', projectIds)
+    const projects = await dataSource
+    .createQueryBuilder()
+    .from(Project, "project")
+    .select(["project"])
+    .leftJoinAndSelect('project.members', 'member')
+    .loadRelationCountAndMap('project.tasks', 'project.tasks')
+    .leftJoinAndSelect('member.user', 'user')
+    .where('project.id IN(:...projectIds)', {projectIds})
+    .getMany()
+    // const projects:Project[] = await dataSource.manager.find(Project)
     return res.send({projects})
 })
 
@@ -82,6 +111,19 @@ router.get("/:id",async (req:Request, res:Response): Promise<Response> => {
 })
 
 
+router.delete('/:projectId',async (req: Request, res: Response):Promise<Response>=>{
+    const projectId = req.params.projectId;
+    await myDataSource
+    .createQueryBuilder()
+    .delete()
+    .from(Project)
+    .where("id = :id", { id: projectId })
+    .execute()
+    return res.send({message: 'Project deleted successfully'})
+
+})
+
+
 router.get('/user/:userId', async (req : Request, res : Response): Promise<Response>=>{
     const userId:string = req.params.userId
     const userProjects = await dataSource
@@ -93,4 +135,62 @@ router.get('/user/:userId', async (req : Request, res : Response): Promise<Respo
     return res.send({userProjects})
 })
 
+
+/** Add user to specific project  */
+
+router.post('/add-user/', async (req: Request, res: Response):Promise<Response>=>{
+    const {userId, projectId, roleProject} = req.body;
+    const newMember:Member = new Member();
+    try{
+    newMember.user= userId;
+    newMember.project=projectId
+    newMember.roleProject=roleProject
+    await newMember.save()
+    return res.send({newMember})
+    } catch(e){
+        return res.send({message:"add user to project failed" })
+    }
+    
+})
+
+
+/** Remove user from specific project  */
+
+router.post('/remove-user', async (req: Request, res: Response):Promise<Response>=> {
+    console.log('in delete user')
+    const token = req.get('Authorization');
+    console.log('token ', token)
+    const {userId, projectId} = req.body;
+    console.log('req.body', req.body )
+    const adminOfProject =  await dataSource
+    .createQueryBuilder()
+    .select("user")
+    .from(User, "user")
+    .leftJoinAndSelect("user.membership","member")
+    .leftJoinAndSelect('member.project', 'project' )
+    .where("user.token = :token", { token })
+    .andWhere('project.id=:projectId',{projectId})
+    .andWhere('member.roleProject=:roleProject',{roleProject:'admin'})
+    .getOne()
+    if (!adminOfProject){
+        return res.send({message:'User is not authorized'})
+    } 
+    // return res.send({adminOfProject})
+    
+    console.log('adminOfProject', adminOfProject)
+    try{
+        await dataSource
+        .createQueryBuilder()
+        .delete()
+        .from(Member)
+        .where("user = :userId", { userId })
+        .andWhere("project=:projectId",{projectId})
+        .execute()
+    return res.send({message:"User removed from project successfully" })
+    } catch(e){
+        return res.send({message:'Failed to remove user from project'})
+    }
+}) 
+
+
 export default router;

planner-api/src/routers/tasks.ts

@@ -2,6 +2,8 @@ import express,{Router, Request, Response} from 'express';
 import {Task} from '../models/Task';
 import {myDataSource} from '../app-data-source';
 import { User } from '../models/User';
+import { Member } from '../models/Member';
+import { In } from 'typeorm';
 const router:Router = express.Router();
 const dataSource = myDataSource;
 
@@ -97,6 +99,61 @@ router.get('/my', async (req: Request, res: Response):Promise<Response>=>{
     return res.send({tasks})
 })
 
+
+router.get('/related', async (req: Request, res: Response):Promise<Response>=>{
+    const token = req.get('Authorization');
+    const user = await dataSource
+    .createQueryBuilder()
+    .select("user")
+    .from(User, "user")
+    .where("user.token = :token", { token: token })
+    .getOne()
+    if(!user) return res.status(404).send({Message:'user not found'})
+
+    const rawMembership = await dataSource
+    .createQueryBuilder()
+    .select("member")
+    .from(Member, "member")
+    .leftJoinAndSelect('member.user', 'user' )
+    .leftJoinAndSelect('member.project', 'project' )
+    .leftJoinAndSelect('project.tasks', 'task' )
+    .where("member.userId = :id", { id: user.id })
+    .getMany()
+     let projectIds:any[] = []
+    if (rawMembership.length>0){
+        for (let member of rawMembership){
+            const projectId = member?.project?.id
+            projectIds.push(projectId)
+        }
+    }
+    let tasks :Task[]= []
+    const projectsIdArray = [...new Set(projectIds)]; 
+    const searchByProjectsIdArray:object[] = []
+    for (let projectId of projectsIdArray){
+        searchByProjectsIdArray.push({id:projectId})
+    }
+    if (projectIds.length>0){
+    tasks = await dataSource
+   .getRepository(Task)
+.find({
+        relations:{
+        author:true,
+        executor:true,
+        project:true    
+        },
+        where:{
+        project:
+            {id:In(
+                projectsIdArray
+            )}
+        }
+    })
+
+}
+    return res.send({tasks})
+})
+
+
 router.delete('/:taskId',async (req: Request, res: Response):Promise<Response>=>{
     const taskId = req.params.taskId;
     await myDataSource
@@ -144,7 +201,6 @@ router.put('/',async(req:Request, res:Response)=> {
 
 router.post('/project',async (req: Request, res: Response):Promise<Response>=>{
     let projectArray :string[]= req.body;
-        console.log('projectArray ', projectArray)
     if (projectArray.length===0) {
         const rawTasks = await
         dataSource

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

@@ -8,10 +8,12 @@ const CustomTableCell = ({task,
   onChange,
   onModalOpen,
   placeholder,
+  user
  }) => {
   const styles = { width: "auto", height: "10px"};
 
-  if (task) {
+
+   if (task) {
     return (
       <>
         <TableCell
@@ -19,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/components/ProjectTasks/ProjectTasksBody.js

+import * as React from "react";
+import {
+  Box,
+  Table,
+  TableBody,
+  TableCell,
+  TableContainer,
+  TablePagination,
+  TableRow,
+  Paper
+} from "@mui/material";
+import { useState } from "react";
+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 ProjectTasksHeader from "./ProjectTasksHeader";
+
+export default function ProjectTasksBody({ tasks }) {
+
+  const [order, setOrder] = useState("asc");
+  const [orderBy, setOrderBy] = useState("id");
+  const [page, setPage] = useState(0);
+  const [rowsPerPage, setRowsPerPage] = useState(5);
+  const [modal, setModal] = useState({
+    open: false,
+    task: null,
+  });
+
+  console.log(tasks)
+
+  const handleRequestSort = (event, property) => {
+    const isAsc = orderBy === property && order === "asc";
+    setOrder(isAsc ? "desc" : "asc");
+    setOrderBy(property);
+  };
+
+  const handleChangePage = (event, newPage) => {
+    setPage(newPage);
+  };
+
+  const handleChangeRowsPerPage = (event) => {
+    setRowsPerPage(parseInt(event.target.value, 10));
+    setPage(0);
+  };
+
+  const onModalOpen = (event, task) => {
+    event.stopPropagation();
+    setModal({ ...modal, open: true, id: task.id });
+  };
+
+  const handleClose = () => {
+    setModal({ ...modal, open: false, id: null });
+  };
+
+  const rawProjects = tasks?.map(task => task.project)
+
+  if (
+    tasks &&
+    tasks?.length > 0
+  ) {
+    return (
+      <Box sx={{ width: "fullwidth" }}>
+        <Paper sx={{ width: "100%", mb: 2 }}>
+          <TableContainer>
+            <Table sx={{ minWidth: 600 }} aria-labelledby="tableTitle">
+              <ProjectTasksHeader
+                order={order}
+                orderBy={orderBy}
+                onRequestSort={handleRequestSort}
+                rowCount={tasks.length}
+              />
+              <TableBody>
+
+                {stableSort(tasks, getComparator(order, orderBy))
+                  .slice(page * rowsPerPage, page * rowsPerPage + rowsPerPage)
+                  .map((task, index) => {
+                    return (
+
+                      <TableRow hover key={task.id}>
+                        <TableCell
+                          component="th"
+                          scope="row"
+                          padding="none"
+                        ></TableCell>
+                        {task.isEditMode ? (
+                          <TableCell>
+                            <BasicSelect
+                              items={[
+                                { value: "A", title: "A" },
+                                { value: "B", title: "B" },
+                                { value: "C", title: "C" },
+                              ]}
+                              task={task}
+                              value={task.priority}
+                              //   onChange={onChange}
+                              name="priority"
+                            />
+                          </TableCell>
+                        ) : (
+                          <CustomTableCell
+                            {...{
+                              task,
+                              name: "priority",
+                              value: task.priority,
+                            }}
+                          />
+                        )}
+
+                        <CustomTableCell
+                          {...{
+                            task,
+                            name: "createdAt",
+                            value: moment(task.createdAt)
+                              .utc()
+                              .format("DD-MM-YYYY hh:mm A"),
+
+                          }}
+                        />
+
+                        <CustomTableCell
+                          {...{
+                            task,
+                            name: "title",
+                            value: task.title,
+                            onModalOpen,
+                          }}
+                        />
+
+                        {task.isEditMode ? (
+                          <TableCell>
+                            <BasicSelect
+                              items={rawProjects.map((e) => ({
+                                value: e?.id,
+                                title: e?.title,
+                              }))}
+                              task={task}
+                              name="project"
+                              value={task.project?.id}
+                            />
+                          </TableCell>
+                        ) : (
+                          <CustomTableCell
+                            {...{
+                              task,
+                              name: "projectId",
+                              value: task.project?.title,
+                            }}
+                          />
+                        )}
+
+                        <CustomTableCell
+                          {...{
+                            task,
+                            name: "author",
+                            value: task.author.displayName,
+                          }}
+                        />
+
+                        <TableCell>
+                          <MaterialUIPickers
+                            task={task}
+                            name="dateTimeStart"
+                          />
+                        </TableCell>
+
+                        <TableCell>
+                          <MaterialUIPickers
+                            task={task}
+                            name="dateTimeDue"
+                          />
+                        </TableCell>
+
+                        {task.isEditMode ? (
+                          <TableCell>
+                            <BasicSelect
+                              items={[
+                                { value: "opened", title: "opened" },
+                                { value: "done", title: "done" },
+                                { value: "failed", title: "failed" },
+                              ]}
+                              task={task}
+                              name="accomplish"
+                              value={task.accomplish}
+                            />
+                          </TableCell>
+                        ) : (
+                          <CustomTableCell
+                            {...{
+                              task,
+                              name: "accomplish",
+                              value: task.accomplish,
+                            }}
+                          />
+                        )}
+                      </TableRow>
+                    );
+                  })}
+              </TableBody>
+            </Table>
+          </TableContainer>
+          <TablePagination
+            rowsPerPageOptions={[5, 10, 25]}
+            component="div"
+            count={tasks.length}
+            rowsPerPage={rowsPerPage}
+            page={page}
+            onPageChange={handleChangePage}
+            onRowsPerPageChange={handleChangeRowsPerPage}
+          />
+        </Paper>
+        <TaskModal
+          task={tasks.find((task) => task.id === modal.id)}
+          open={modal.open}
+          handleClose={handleClose}
+        />
+      </Box>
+    );
+  }
+}
+
+
+function descendingComparator(a, b, orderBy) {
+  if (b[orderBy] < a[orderBy]) {
+    return -1;
+  }
+  if (b[orderBy] > a[orderBy]) {
+    return 1;
+  }
+  return 0;
+}
+
+function getComparator(order, orderBy) {
+  return order === "desc"
+    ? (a, b) => descendingComparator(a, b, orderBy)
+    : (a, b) => -descendingComparator(a, b, orderBy);
+}
+
+function stableSort(array, comparator) {
+  const stabilizedThis = array?.map((el, index) => [el, index]);
+  stabilizedThis.sort((a, b) => {
+    const order = comparator(a[0], b[0]);
+    if (order !== 0) {
+      return order;
+    }
+    return a[1] - b[1];
+  });
+  return stabilizedThis.map((el) => el[0]);
+}
+

planner-front/src/components/ProjectTasks/ProjectTasksHeader.js

+import * as React from "react";
+import PropTypes from "prop-types";
+import Box from "@mui/material/Box";
+import TableCell from "@mui/material/TableCell";
+import TableHead from "@mui/material/TableHead";
+import TableRow from "@mui/material/TableRow";
+import TableSortLabel from "@mui/material/TableSortLabel";
+import { visuallyHidden } from "@mui/utils";
+
+const headCells = [
+  {
+    id: "id",
+    numeric: true,
+    disablePadding: true,
+    label: "",
+  },
+  {
+    id: "priority",
+    numeric: false,
+    disablePadding: true,
+    label: "Приоритет",
+  },
+  {
+    id: "createdAt",
+    numeric: true,
+    disablePadding: false,
+    label: "Дата создания",
+  },
+  {
+    id: "title",
+    numeric: true,
+    disablePadding: false,
+    label: "Заголовок",
+  },
+  {
+    id: "projectName",
+    numeric: true,
+    disablePadding: false,
+    label: "Проект",
+  },
+  {
+    id: "authorDisplayName",
+    numeric: true,
+    disablePadding: false,
+    label: "Автор",
+  },
+
+  {
+    id: "dateTimeStart",
+    numeric: true,
+    disablePadding: false,
+    label: "Дата начала",
+  },
+  {
+    id: "dateTimeDue",
+    numeric: true,
+    disablePadding: false,
+    label: "Дата завершения",
+  },
+  {
+    id: "accomplish",
+    numeric: true,
+    disablePadding: false,
+    label: "Статус",
+  }
+];
+
+export default function EnhancedTableHead({ order, orderBy, rowCount, onRequestSort }) {
+
+  const createSortHandler = (property) => (event) => {
+    onRequestSort(event, property);
+  };
+
+  return (
+    <TableHead>
+      <TableRow>
+        {headCells.map((headCell) => (
+          <TableCell
+            key={headCell.id}
+            align={"center"}
+            padding={headCell.disablePadding ? "none" : "normal"}
+            sortDirection={orderBy === headCell.id ? order : false}
+          >
+            <TableSortLabel
+              active={orderBy === headCell.id}
+              direction={orderBy === headCell.id ? order : "asc"}
+              onClick={createSortHandler(headCell.id)}
+            >
+              {headCell.label}
+              {orderBy === headCell.id ? (
+                <Box component="span" sx={visuallyHidden}>
+                  {order === "desc" ? "sorted descending" : "sorted ascending"}
+                </Box>
+              ) : null}
+            </TableSortLabel>
+          </TableCell>
+        ))}
+      </TableRow>
+    </TableHead>
+  );
+}
+
+EnhancedTableHead.propTypes = {
+  onRequestSort: PropTypes.func.isRequired,
+  order: PropTypes.oneOf(["asc", "desc"]).isRequired,
+  orderBy: PropTypes.string.isRequired,
+  rowCount: PropTypes.number.isRequired,
+};

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

 import { Card, CardActions, CardContent, Grid } from "@mui/material";
-import { useLocation, useParams } from "react-router-dom";
+import { useParams } from "react-router-dom";
 import { useSelector, useDispatch } from "react-redux";
 import { useEffect } from "react";
 import { fetchProject } from "../../store/actions/projectsActions";
+import ProjectTasksBody from "../../components/ProjectTasks/ProjectTasksBody";
 
 const FullProject = () => {
-    const { projects, project } = useSelector(state => state.projects);
 
+    const { projects, project } = useSelector(state => state.projects);
     const dispatch = useDispatch();
-    console.log(projects);
-    let location = useLocation();
-    let point = location.pathname
-    console.log(point.includes("admin"))
     const params = useParams()
+    const tasks = project.tasks;
+    console.log(projects);
+    console.log(tasks);
 
     useEffect(() => {
         dispatch(fetchProject(params.id))
     }, [params.id, dispatch]);
-    console.log(project)
+    console.log(project);
 
     return <>
         <Grid item xs={12} sm={12} md={6} lg={4}>
@@ -34,19 +34,21 @@ const FullProject = () => {
                     </strong>
                     <strong>
                         <br></br>
-                        Админ проекта: {project?.project?.admin.name}
+                        Админ проекта: {project?.project?.members}
                     </strong>
                     <strong>
                         <br></br>
-                        Задачи: {projects?.projects?.tasks?.map(task => {
-                            return <>
-                                <strong><br></br>Задача проекта: {task.title} </strong>
-                            </>
-                        })}
+                        Задачи:
+                        <br></br>
+                    </strong>
+                    <strong>
+                        <br></br>
+                        <ProjectTasksBody
+                            tasks={tasks}
+                        />
                     </strong>
                 </CardContent>
                 <CardActions>
-
                 </CardActions>
             </Card>
         </Grid>

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>
     );