Docker/planka
Docker/planka
1
0
Fork 0
mirror of https://github.com/plankanban/planka.git synced 2025-07-24 15:49:46 +02:00
Code Issues Releases Activity

fix: Socket bug fixes and improvements

Browse source
This commit is contained in:
Maksim Eltyshev 2022-10-03 12:11:19 +02:00
parent 4e876922f8
commit 9f16881965
6 changed files with 53 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

43
server/api/helpers/board-memberships/delete-one.js
View file

@ -1,3 +1,5 @@
const { v4: uuid } = require('uuid');
module.exports = {
inputs: {
record: {
@ -29,18 +31,9 @@ module.exports = {
const boardMembership = await BoardMembership.destroyOne(inputs.record.id);
if (boardMembership) {
sails.sockets.broadcast(
`user:${boardMembership.userId}`,
'boardMembershipDelete',
{
item: boardMembership,
},
inputs.request,
);
const notifyBoard = () => {
const notify = (room) => {
sails.sockets.broadcast(
`board:${boardMembership.boardId}`,
room,
'boardMembershipDelete',
{
item: boardMembership,
@ -54,16 +47,32 @@ module.exports = {
inputs.project.id,
);
if (isProjectManager) {
notifyBoard();
} else {
// TODO: also remove if unsubscribed to user
if (!isProjectManager) {
sails.sockets.removeRoomMembersFromRooms(
`user:${boardMembership.userId}`,
`@user:${boardMembership.userId}`,
`board:${boardMembership.boardId}`,
notifyBoard,
() => {
notify(`board:${boardMembership.boardId}`);
},
);
}
notify(`user:${boardMembership.userId}`);
if (isProjectManager) {
const tempRoom = uuid();
sails.sockets.addRoomMembersToRooms(`board:${boardMembership.boardId}`, tempRoom, () => {
sails.sockets.removeRoomMembersFromRooms(
`user:${boardMembership.userId}`,
tempRoom,
() => {
notify(tempRoom);
sails.sockets.removeRoomMembersFromRooms(tempRoom, tempRoom);
},
);
});
}
}
return boardMembership;

25
server/api/helpers/boards/delete-one.js
View file

@ -17,16 +17,23 @@ module.exports = {
const board = await Board.archiveOne(inputs.record.id);
if (board) {
sails.sockets.leaveAll(`board:${board.id}`);
sails.sockets.removeRoomMembersFromRooms(`board:${board.id}`, `board:${board.id}`);
sails.sockets.broadcast(
`project:${board.projectId}`,
'boardDelete',
{
item: board,
},
inputs.request,
);
const managerUserIds = await sails.helpers.projects.getManagerUserIds(board.projectId);
const memberUserIds = await sails.helpers.boards.getMemberUserIds(board.id);
const userIds = _.union(managerUserIds, memberUserIds);
userIds.forEach((userId) => {
sails.sockets.broadcast(
`user:${userId}`,
'boardDelete',
{
item: board,
},
inputs.request,
);
});
}
return board;

7
server/api/helpers/boards/update-one.js
View file

@ -25,9 +25,10 @@ module.exports = {
},
async fn(inputs) {
const userIds = await sails.helpers.projects.getManagerAndBoardMemberUserIds(
inputs.record.projectId,
);
const managerUserIds = await sails.helpers.projects.getManagerUserIds(inputs.record.projectId);
const memberUserIds = await sails.helpers.boards.getMemberUserIds(inputs.record.id);
const userIds = _.union(managerUserIds, memberUserIds);
if (!_.isUndefined(inputs.values.position)) {
const boards = await sails.helpers.projects.getBoards(

2
server/api/helpers/projects/delete-one.js
View file

@ -26,7 +26,7 @@ module.exports = {
const userIds = _.union(managerUserIds, memberUserIds);
userIds.forEach((userId) => {
sails.sockets.removeRoomMembersFromRooms(`user:${userId}`, boardRooms);
sails.sockets.removeRoomMembersFromRooms(`@user:${userId}`, boardRooms);
sails.sockets.broadcast(
`user:${userId}`,

4
server/api/helpers/users/update-one.js
View file

@ -123,13 +123,13 @@ module.exports = {
if (user.id === inputs.user.id && inputs.request && inputs.request.isSocket) {
const tempRoom = uuid();
sails.sockets.addRoomMembersToRooms(`user:${user.id}`, tempRoom, () => {
sails.sockets.addRoomMembersToRooms(`@user:${user.id}`, tempRoom, () => {
sails.sockets.leave(inputs.request, tempRoom, () => {
sails.sockets.leaveAll(tempRoom);
});
});
} else {
sails.sockets.leaveAll(`user:${user.id}`);
sails.sockets.leaveAll(`@user:${user.id}`);
}
}

4
server/api/hooks/current-user/index.js
View file

@ -59,6 +59,10 @@ module.exports = function defineCurrentUserHook(sails) {
accessToken,
currentUser,
});
if (req.isSocket) {
sails.sockets.join(req, `@user:${currentUser.id}`);
}
}
}