{
mockMatchMedia({matches: true})
})
describe('components/sidebarSidebar', () => {
+ beforeEach(() => {
+ jest.clearAllMocks()
+ })
+
const mockStore = configureStore([thunk])
const board = TestBlockFactory.createBoard()
@@ -32,6 +42,10 @@ describe('components/sidebarSidebar', () => {
categoryAttribute1.name = 'Category 1'
categoryAttribute1.boardIDs = [board.id]
+ const defaultCategory = TestBlockFactory.createCategoryBoards()
+ defaultCategory.id = 'default_category'
+ defaultCategory.name = 'Boards'
+
test('sidebar hidden', () => {
const store = mockStore({
teams: {
@@ -274,6 +288,125 @@ describe('components/sidebarSidebar', () => {
expect(sidebarCollapsedCategory.length).toBe(1)
})
+ test('should assign default category if current board doesnt have a category', () => {
+ const board2 = TestBlockFactory.createBoard()
+ board2.id = 'board2'
+
+ const store = mockStore({
+ teams: {
+ current: {id: 'team-id'},
+ },
+ boards: {
+ current: board2.id,
+ boards: {
+ [board2.id]: board2,
+ },
+ myBoardMemberships: {
+ [board2.id]: board2,
+ },
+ },
+ cards: {
+ cards: {
+ card_id_1: {title: 'Card'},
+ },
+ current: 'card_id_1',
+ },
+ views: {
+ views: [],
+ },
+ users: {
+ me: {
+ id: 'user_id_1',
+ props: {},
+ },
+ },
+ sidebar: {
+ categoryAttributes: [
+ categoryAttribute1,
+ defaultCategory,
+ ],
+ },
+ })
+
+ const history = createMemoryHistory()
+ const onBoardTemplateSelectorOpen = jest.fn()
+
+ mockedOctoClient.moveBoardToCategory.mockResolvedValueOnce({} as Response)
+
+ const component = wrapIntl(
+
+
+
+
+ ,
+ )
+ const {container} = render(component)
+ expect(container).toMatchSnapshot()
+
+ expect(mockedOctoClient.moveBoardToCategory).toBeCalledWith('team-id', 'board2', 'default_category', '')
+ })
+
+ test('shouldnt do any category assignment is board is in a category', () => {
+ const board2 = TestBlockFactory.createBoard()
+ board2.id = 'board2'
+
+ const categoryAttribute2 = TestBlockFactory.createCategoryBoards()
+ categoryAttribute2.name = 'Category 2'
+ categoryAttribute2.boardIDs = [board2.id]
+
+ const store = mockStore({
+ teams: {
+ current: {id: 'team-id'},
+ },
+ boards: {
+ current: board2.id,
+ boards: {
+ [board2.id]: board2,
+ },
+ myBoardMemberships: {
+ [board2.id]: board2,
+ },
+ },
+ cards: {
+ cards: {
+ card_id_1: {title: 'Card'},
+ },
+ current: 'card_id_1',
+ },
+ views: {
+ views: [],
+ },
+ users: {
+ me: {
+ id: 'user_id_1',
+ props: {},
+ },
+ },
+ sidebar: {
+ categoryAttributes: [
+ categoryAttribute1,
+ categoryAttribute2,
+ defaultCategory,
+ ],
+ },
+ })
+
+ const history = createMemoryHistory()
+ const onBoardTemplateSelectorOpen = jest.fn()
+
+ const component = wrapIntl(
+
+
+
+
+ ,
+ )
+ const {container} = render(component)
+ expect(container).toMatchSnapshot()
+
+ expect(mockedOctoClient.moveBoardToCategory).toBeCalledTimes(0)
+ })
+
// TODO: Fix this later
// test('global templates', () => {
// const store = mockStore({
diff --git a/webapp/src/components/sidebar/sidebar.tsx b/webapp/src/components/sidebar/sidebar.tsx
index 416688c1c..4d051d328 100644
--- a/webapp/src/components/sidebar/sidebar.tsx
+++ b/webapp/src/components/sidebar/sidebar.tsx
@@ -8,7 +8,7 @@ import IconButton from '../../widgets/buttons/iconButton'
import HamburgerIcon from '../../widgets/icons/hamburger'
import HideSidebarIcon from '../../widgets/icons/hideSidebar'
import ShowSidebarIcon from '../../widgets/icons/showSidebar'
-import {getMySortedBoards} from '../../store/boards'
+import {getCurrentBoard, getMySortedBoards} from '../../store/boards'
import {useAppDispatch, useAppSelector} from '../../store/hooks'
import {Utils} from '../../utils'
import {IUser} from '../../user'
@@ -35,6 +35,8 @@ import {Constants} from '../../constants'
import {getMe} from '../../store/users'
import {getCurrentViewId} from '../../store/views'
+import octoClient from '../../octoClient'
+
import SidebarCategory from './sidebarCategory'
import SidebarSettingsMenu from './sidebarSettingsMenu'
import SidebarUserMenu from './sidebarUserMenu'
@@ -62,6 +64,7 @@ const Sidebar = (props: Props) => {
const sidebarCategories = useAppSelector
(getSidebarCategories)
const me = useAppSelector(getMe)
const activeViewID = useAppSelector(getCurrentViewId)
+ const currentBoard = useAppSelector(getCurrentBoard)
useEffect(() => {
wsClient.addOnChange((_: WSClient, categories: Category[]) => {
@@ -98,6 +101,37 @@ const Sidebar = (props: Props) => {
hideSidebar()
}, [windowDimensions])
+ // This handles the case when a user opens a linked board from Channels RHS
+ // and thats the first time that user is opening that board.
+ // Here we check if that board has a associated category for the user. If not,
+ // we assign it to the default "Boards" category.
+ // We do this on the client side rather than the server side live for all other cases
+ // is 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) {
+ return
+ }
+
+ // find the category the current board belongs to
+ const category = sidebarCategories.find((c) => c.boardIDs.indexOf(currentBoard.id) >= 0)
+ if (category) {
+ // Boards does belong to a category.
+ // All good here. Nothing to do
+ return
+ }
+
+ // if the board doesn't belong to a category
+ // we need to move it to the default "Boards" category
+ const boardsCategory = sidebarCategories.find((c) => c.name === 'Boards')
+ if (!boardsCategory) {
+ Utils.logError('Boards category not found for user')
+ return
+ }
+
+ octoClient.moveBoardToCategory(team.id, currentBoard.id, boardsCategory.id, '')
+ }, [sidebarCategories, currentBoard, team])
+
if (!boards) {
return
}