Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions frontend/src/components/board/AssignMembers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
}

const AssignMembers: React.FC<AssignMembersProps> = (props) => {
const {boardId} = useParams();
const { boardId } = useParams();
const [assignedMembers, setAssignedMembers] = useState<Member[]>(props?.assignedMembers || []);
const [members, setMembers] = useState<Member[]>([])
const [isOpen, setIsOpen] = useState(false);
Expand All @@ -31,28 +31,28 @@
}

const toggleAssign = async (member: Member) => {
try {
const isAssigned = assignedMembers.some(am => am.id === member.id);

if (isAssigned) {
// remove
await taskService.removeMember(Number(boardId), props.taskId, member.id);
setAssignedMembers(prev => prev.filter(am => am.id !== member.id));
notify.success(`${member.name} removed`);
} else {
// assign
await taskService.assignMember(Number(boardId), props.taskId, member.id);
setAssignedMembers(prev => [...prev, member]);
notify.success(`${member.name} assigned`);
try {
const isAssigned = assignedMembers.some(am => am.id === member.id);

if (isAssigned) {
// remove
await taskService.removeMember(Number(boardId), props.taskId, member.id);
setAssignedMembers(prev => prev.filter(am => am.id !== member.id));
notify.success(`${member.name} removed`);
} else {
// assign
await taskService.assignMember(Number(boardId), props.taskId, member.id);
setAssignedMembers(prev => [...prev, member]);
notify.success(`${member.name} assigned`);
}
} catch (error: any) {
notify.error(error.response?.data?.message || "Something went wrong");
}
} catch (error: any) {
notify.error(error.response?.data?.message || "Something went wrong");
}
};
};

useEffect(() => {
fetchMemebers();
}, [boardId]);

Check warning on line 55 in frontend/src/components/board/AssignMembers.tsx

View workflow job for this annotation

GitHub Actions / build-and-deploy

React Hook useEffect has a missing dependency: 'fetchMemebers'. Either include it or remove the dependency array

const filtered = members.filter((m) =>
m.name.toLowerCase().includes(search.toLowerCase())
Expand Down Expand Up @@ -164,7 +164,7 @@
<li
key={m.id}
onClick={() => toggleAssign(m)}
className="flex items-center justify-between px-2 py-1 rounded bg-gray-800"
className="flex items-center justify-between px-2 py-1 rounded bg-gray-800 cursor-pointer hover:bg-gray-700"
>
<span className="text-white">{m.name}</span>
<span className="text-green-400 text-xs">✓</span>
Expand Down
14 changes: 13 additions & 1 deletion frontend/src/store/slices/tasksSlice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,20 @@ const tasksSlice = createSlice({
assignedMemberToTask: (state, action: PayloadAction<{ taskId: number; memberId: number }>) => {
const { taskId, memberId } = action.payload;
const task = state.byId[taskId];
if (task) {
if (task && !task.memberIds.includes(memberId)) {
task.memberIds.push(memberId);
}
},

removeMemberFromTask: (state, action: PayloadAction<{ taskId: number; userId: number }>) => {
const { taskId, userId } = action.payload;
const task = state.byId[taskId];
if (task && task.memberIds.includes(userId)) {
const index = task.memberIds.indexOf(userId);
if (index !== -1) {
task.memberIds.splice(index, 1);
}
}
}
}
});
Expand All @@ -78,5 +89,6 @@ export const {
taskRemoved,
taskRestored,
assignedMemberToTask,
removeMemberFromTask
} = tasksSlice.actions;
export default tasksSlice.reducer;
14 changes: 9 additions & 5 deletions frontend/src/websocket/boardHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { RootState, AppDispatch } from "@/store";
import { columnArchived, archivedColumnRestored, columnDeleted } from "@/store/slices/archiveColumnsSlice";
import { taskArchived, taskDeleted, archivedTaskRestored } from "@/store/slices/archiveTasksSlice";
import { addTaskToColumn, columnCreated, columnRemoved, columnReplaced, columnRestored, columnUpdated, removeTaskFromColumn } from "@/store/slices/columnsSlice";
import { assignedMemberToTask, taskCreated, taskRemoved, taskReplaced, taskRestored, taskUpdated } from "@/store/slices/tasksSlice";
import { assignedMemberToTask, removeMemberFromTask, taskCreated, taskRemoved, taskReplaced, taskRestored, taskUpdated } from "@/store/slices/tasksSlice";

export const handleBoardWSMessage = (
message: any,
Expand Down Expand Up @@ -115,10 +115,14 @@ export const handleBoardWSMessage = (
case "MEMBER_ASSIGNED_TO_TASK": {
console.log("Member assigned to task", message);
const { taskId, assignData }: { taskId: number, assignData: { userId: number, username: string } } = message.payload;
const task = getState().tasks.byId[taskId];
if (task && !task.memberIds.includes(assignData.userId)) {
dispatch(assignedMemberToTask({ taskId, memberId: assignData.userId }));
}
dispatch(assignedMemberToTask({ taskId, memberId: assignData.userId }));
break;
}

case "MEMBER_UNASSIGNED_TO_TASK": {
console.log("Member unassigned to task", message);
const { taskId, userId } = message.payload;
dispatch(removeMemberFromTask({ taskId, userId }));
break;
}

Expand Down
Loading