diff --git a/src/KBBoard/BoardAPI.js b/src/KBBoard/BoardAPI.js index 0a18e97..31d62a6 100644 --- a/src/KBBoard/BoardAPI.js +++ b/src/KBBoard/BoardAPI.js @@ -58,9 +58,9 @@ export const addMemberAPI = async (boardId, username) => { }); }; -export const deleteMemberAPI = async (boardId, username) => { +export const deleteMemberAPI = async (boardId, memberId) => { return axios.delete('/api/boards/members/delete', { - data: {username: username, board_id: boardId} + data: {member_id: memberId, board_id: boardId} }); }; diff --git a/src/KBBoard/BoardLogic.js b/src/KBBoard/BoardLogic.js index d40c8dd..f43be06 100644 --- a/src/KBBoard/BoardLogic.js +++ b/src/KBBoard/BoardLogic.js @@ -209,11 +209,11 @@ export const useBoardLogic = (id, setError, setInfo, setCategories, setLoading) } }, [loadBoardData, setLoading, setError, navigate]); - const deleteMember = useCallback(async (boardId, username, modalDelitMember ) => { + const deleteMember = useCallback(async (boardId, memberId, modalDelitMember ) => { setLoading(true); try { setLoading(true); - await deleteMemberAPI( boardId, username ); + await deleteMemberAPI( boardId, memberId ); await loadBoardData(); modalDelitMember(); } catch { diff --git a/src/KBBoard/KBBoard.js b/src/KBBoard/KBBoard.js index c613f2a..19eee8e 100644 --- a/src/KBBoard/KBBoard.js +++ b/src/KBBoard/KBBoard.js @@ -167,7 +167,7 @@ const KBBoard = () => { }; const handleDeleteMember = async (e) => { e.preventDefault(); - await deleteMember(assignedMember, deletedMember, modalDeleteMember); + await deleteMember(id, deletedMember, modalDeleteMember); }; @@ -183,7 +183,7 @@ const KBBoard = () => {

{info.title}

Участники: - {info.members.map((member) => ( + {(info.members || []).map((member) => ( ))}

@@ -577,7 +577,7 @@ const KBBoard = () => { {info.members.map((member) => ( (member.id !== info.owner.id) ? ( - ) : ( <>