From eb329ce9e3594fa4c2a2a5c6a4f9cf3c8d5c2b96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A1tia=20Antunes?= Date: Wed, 3 May 2023 15:57:50 +0100 Subject: [PATCH 1/2] fix: round maxUsers to 2 decimal places --- .../src/modules/boards/services/create.board.service.ts | 8 ++++---- .../SubTeamsTab/QuickEditSubTeams/QuickEditSubTeams.tsx | 7 ++++--- frontend/src/hooks/useCreateBoard.tsx | 4 ++-- frontend/src/pages/boards/newSplitBoard.tsx | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/backend/src/modules/boards/services/create.board.service.ts b/backend/src/modules/boards/services/create.board.service.ts index b9950701b..f20965641 100644 --- a/backend/src/modules/boards/services/create.board.service.ts +++ b/backend/src/modules/boards/services/create.board.service.ts @@ -87,7 +87,7 @@ export default class CreateBoardService implements CreateBoardServiceInterface { recurrent && teamId && maxUsers && - teamName === 'xgeeks' && + teamName === 'Teste BotTeam' && !fromSchedule ) { this.addCronJobToBoard(String(createdBoard._id), userId, teamId, maxUsers); @@ -95,7 +95,7 @@ export default class CreateBoardService implements CreateBoardServiceInterface { this.logger.verbose(`Communication Slack Enable is set to "${boardData.slackEnable}".`); - if (slackEnable && teamId && teamName === 'xgeeks') { + if (slackEnable && teamId && teamName === 'Teste BotTeam') { await this.callSlackCommunication(createdBoard._id); } @@ -272,7 +272,7 @@ export default class CreateBoardService implements CreateBoardServiceInterface { const teamLength = teamUsersWotStakeholders.length; const rawMaxTeams = teamLength / Number(configs.maxUsersPerTeam); - const maxTeams = Math.ceil(rawMaxTeams); + const maxTeams = Math.round(rawMaxTeams); if (maxTeams < 2 || configs.maxUsersPerTeam < 2) { return null; @@ -295,7 +295,7 @@ export default class CreateBoardService implements CreateBoardServiceInterface { hideCards: true, postAnonymously: configs.postAnonymously, hideVotes: configs.hideVotes ?? false, - maxUsers: Math.ceil(configs.maxUsersPerTeam), + maxUsers: configs.maxUsersPerTeam, slackEnable: configs.slackEnable, responsibles }; diff --git a/frontend/src/components/CreateBoard/SplitBoard/SubTeamsTab/QuickEditSubTeams/QuickEditSubTeams.tsx b/frontend/src/components/CreateBoard/SplitBoard/SubTeamsTab/QuickEditSubTeams/QuickEditSubTeams.tsx index f055e7a2a..23c857b3b 100644 --- a/frontend/src/components/CreateBoard/SplitBoard/SubTeamsTab/QuickEditSubTeams/QuickEditSubTeams.tsx +++ b/frontend/src/components/CreateBoard/SplitBoard/SubTeamsTab/QuickEditSubTeams/QuickEditSubTeams.tsx @@ -53,7 +53,7 @@ const QuickEditSubTeams = ({ team }: QuickEditSubTeamsProps) => { const error = hasError(value, minTeams, maxTeams); setIsSubmitDisabled(error); - if (!error) setValue('maxUsers', Math.ceil(teamLength / +value)); + if (!error) setValue('maxUsers', Math.round(teamLength / +value)); setErrors((prev) => ({ ...prev, @@ -87,7 +87,7 @@ const QuickEditSubTeams = ({ team }: QuickEditSubTeamsProps) => { count: { ...prev.count, teamsCount: Math.floor(getValues('maxTeams')), - maxUsersCount: Math.floor(getValues('maxUsers')), + maxUsersCount: Number((teamLength / Math.floor(getValues('maxTeams'))).toFixed(2)), }, board: { ...prev.board, @@ -98,7 +98,8 @@ const QuickEditSubTeams = ({ team }: QuickEditSubTeamsProps) => { useEffect(() => { setValue('maxTeams', teamsCount); - setValue('maxUsers', maxUsersCount); + setValue('maxUsers', Math.round(maxUsersCount)); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [teamsCount, maxUsersCount]); useEffect(() => { diff --git a/frontend/src/hooks/useCreateBoard.tsx b/frontend/src/hooks/useCreateBoard.tsx index e3d7ed15c..6760b1d60 100644 --- a/frontend/src/hooks/useCreateBoard.tsx +++ b/frontend/src/hooks/useCreateBoard.tsx @@ -211,7 +211,7 @@ const useCreateBoard = (team?: Team) => { const handleAddTeam = () => { if (!canAdd) return; - const countUsers = (teamMembersLength / (dividedBoardsCount + 1)).toFixed(0); + const countUsers = (teamMembersLength / (dividedBoardsCount + 1)).toFixed(2); setCreateBoardData((prev) => ({ ...prev, @@ -229,7 +229,7 @@ const useCreateBoard = (team?: Team) => { const handleRemoveTeam = () => { if (!canReduce) return; - const countUsers = (teamMembersLength / (dividedBoardsCount - 1)).toFixed(0); + const countUsers = (teamMembersLength / (dividedBoardsCount - 1)).toFixed(2); setCreateBoardData((prev) => ({ ...prev, diff --git a/frontend/src/pages/boards/newSplitBoard.tsx b/frontend/src/pages/boards/newSplitBoard.tsx index 424153020..4ca3a1b7a 100644 --- a/frontend/src/pages/boards/newSplitBoard.tsx +++ b/frontend/src/pages/boards/newSplitBoard.tsx @@ -176,7 +176,7 @@ const NewSplitBoard: NextPage = () => { title, dividedBoards: newDividedBoards, maxVotes, - maxUsers, + maxUsers: boardState.count.maxUsersCount, team, responsibles, slackEnable, From 1e70b3ba160e331a0d56558c8bc30fc40116bc54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A1tia=20Antunes?= Date: Wed, 3 May 2023 16:16:43 +0100 Subject: [PATCH 2/2] fix: fix team name --- backend/src/modules/boards/services/create.board.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/modules/boards/services/create.board.service.ts b/backend/src/modules/boards/services/create.board.service.ts index f20965641..68a167fb9 100644 --- a/backend/src/modules/boards/services/create.board.service.ts +++ b/backend/src/modules/boards/services/create.board.service.ts @@ -87,7 +87,7 @@ export default class CreateBoardService implements CreateBoardServiceInterface { recurrent && teamId && maxUsers && - teamName === 'Teste BotTeam' && + teamName === 'xgeeks' && !fromSchedule ) { this.addCronJobToBoard(String(createdBoard._id), userId, teamId, maxUsers); @@ -95,7 +95,7 @@ export default class CreateBoardService implements CreateBoardServiceInterface { this.logger.verbose(`Communication Slack Enable is set to "${boardData.slackEnable}".`); - if (slackEnable && teamId && teamName === 'Teste BotTeam') { + if (slackEnable && teamId && teamName === 'xgeeks') { await this.callSlackCommunication(createdBoard._id); }