Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MM-62104 Fix board disappearing or move to default category when switching teams #44

Merged
merged 2 commits into from
Dec 12, 2024
Merged

MM-62104 Fix board disappearing or move to default category when switching teams #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7fb12c
MM-62104 Fix board disappearing or move to default category when swit…
Rajat-Dabade Dec 9, 2024
31181b3
fix tests
Rajat-Dabade Dec 10, 2024
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
11 changes: 7 additions & 4 deletions webapp/src/components/sidebar/sidebar.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ import {createMemoryHistory} from 'history'
import {Provider as ReduxProvider} from 'react-redux'
import {Router} from 'react-router-dom'

import {render} from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import {render, waitFor} from '@testing-library/react'

import thunk from 'redux-thunk'

import {mocked} from 'jest-mock'

import userEvent from '@testing-library/user-event'

import {mockMatchMedia, wrapIntl} from '../../testUtils'

import {TestBlockFactory} from '../../test/testBlockFactory'
Expand Down Expand Up @@ -306,7 +307,7 @@ describe('components/sidebarSidebar', () => {
expect(sidebarCollapsedCategory.length).toBe(1)
})

test('should assign default category if current board doesnt have a category', () => {
test('should assign default category if current board doesnt have a category', async () => {
const board2 = TestBlockFactory.createBoard()
board2.id = 'board2'

Expand Down Expand Up @@ -362,7 +363,9 @@ describe('components/sidebarSidebar', () => {
const {container} = render(component)
expect(container).toMatchSnapshot()

expect(mockedOctoClient.moveBoardToCategory).toBeCalledWith('team-id', 'board2', 'default_category', '')
await waitFor(() =>
expect(mockedOctoClient.moveBoardToCategory).toBeCalledWith('team-id', 'board2', 'default_category', '')
)
})

test('shouldnt do any category assignment is board is in a category', () => {
Expand Down
12 changes: 8 additions & 4 deletions webapp/src/components/sidebar/sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ const Sidebar = (props: Props) => {
const me = useAppSelector<IUser|null>(getMe)
const activeViewID = useAppSelector(getCurrentViewId)
const currentBoard = useAppSelector(getCurrentBoard)
const [initialized, setInitialized] = useState(false)

useEffect(() => {
const categoryOnChangeHandler = (_: WSClient, categories: Category[]) => {
Expand All @@ -98,11 +99,14 @@ const Sidebar = (props: Props) => {
const team = useAppSelector(getCurrentTeam)

useEffect(() => {
setInitialized(false)
if (team) {
dispatch(fetchSidebarCategories(team!.id))
dispatch(fetchSidebarCategories(team!.id)).then(() => {
setInitialized(true)
})
}
loadTheme()
}, [team?.id])
}, [team?.id, dispatch])

useEffect(() => {
function handleResize() {
Expand All @@ -125,7 +129,7 @@ const Sidebar = (props: Props) => {
// because there is no good, explicit API call to add this logic to when opening
// a board that you have implicit access to.
useEffect(() => {
if (!sidebarCategories || sidebarCategories.length === 0 || !currentBoard || !team || currentBoard.isTemplate) {
if (!initialized || !sidebarCategories || sidebarCategories.length === 0 || !currentBoard || !team || currentBoard.isTemplate) {
return
}

Expand All @@ -147,7 +151,7 @@ const Sidebar = (props: Props) => {
}

octoClient.moveBoardToCategory(team.id, currentBoard.id, boardsCategory.id, '')
}, [sidebarCategories, currentBoard, team])
}, [sidebarCategories, currentBoard, team, initialized])

useWebsockets(teamId, (websocketClient: WSClient) => {
const onCategoryReorderHandler = (_: WSClient, newCategoryOrder: string[]): void => {
Expand Down
Loading