This commit is contained in:
Mary Hipp 2024-07-01 15:11:37 -04:00 committed by Mary Hipp Rogers
parent 977a77f4e6
commit 93caa23ef8
4 changed files with 16 additions and 13 deletions

View File

@ -20,7 +20,6 @@
"archiveBoard": "Archive Board", "archiveBoard": "Archive Board",
"archived": "Archived", "archived": "Archived",
"autoAddBoard": "Auto-Add Board", "autoAddBoard": "Auto-Add Board",
"selectedForAutoAdd": "Selected for Auto-Add",
"bottomMessage": "Deleting this board and its images will reset any features currently using them.", "bottomMessage": "Deleting this board and its images will reset any features currently using them.",
"cancel": "Cancel", "cancel": "Cancel",
"changeBoard": "Change Board", "changeBoard": "Change Board",

View File

@ -71,11 +71,13 @@ const BoardContextMenu = ({ board, setBoardToDelete, children }: Props) => {
() => ( () => (
<MenuList visibility="visible"> <MenuList visibility="visible">
<MenuGroup title={boardName}> <MenuGroup title={boardName}>
{!autoAssignBoardOnClick && ( <MenuItem
<MenuItem icon={<PiPlusBold />} isDisabled={isSelectedForAutoAdd} onClick={handleSetAutoAdd}> icon={<PiPlusBold />}
{isSelectedForAutoAdd ? t('boards.selectedForAutoAdd') : t('boards.menuItemAutoAdd')} isDisabled={isSelectedForAutoAdd || autoAssignBoardOnClick}
onClick={handleSetAutoAdd}
>
{t('boards.menuItemAutoAdd')}
</MenuItem> </MenuItem>
)}
{isBulkDownloadEnabled && ( {isBulkDownloadEnabled && (
<MenuItem icon={<PiDownloadBold />} onClickCapture={handleBulkDownload}> <MenuItem icon={<PiDownloadBold />} onClickCapture={handleBulkDownload}>
{t('boards.downloadBoard')} {t('boards.downloadBoard')}

View File

@ -64,10 +64,10 @@ const GalleryBoard = ({ board, isSelected, setBoardToDelete }: GalleryBoardProps
const handleSelectBoard = useCallback(() => { const handleSelectBoard = useCallback(() => {
dispatch(boardIdSelected({ boardId: board_id })); dispatch(boardIdSelected({ boardId: board_id }));
if (autoAssignBoardOnClick) { if (autoAssignBoardOnClick && !board.archived) {
dispatch(autoAddBoardIdChanged(board_id)); dispatch(autoAddBoardIdChanged(board_id));
} }
}, [board_id, autoAssignBoardOnClick, dispatch]); }, [board_id, autoAssignBoardOnClick, dispatch, board.archived]);
const [updateBoard, { isLoading: isUpdateBoardLoading }] = useUpdateBoardMutation(); const [updateBoard, { isLoading: isUpdateBoardLoading }] = useUpdateBoardMutation();

View File

@ -33,11 +33,13 @@ const NoBoardBoardContextMenu = ({ children }: Props) => {
() => ( () => (
<MenuList visibility="visible"> <MenuList visibility="visible">
<MenuGroup title={t('boards.uncategorized')}> <MenuGroup title={t('boards.uncategorized')}>
{!autoAssignBoardOnClick && ( <MenuItem
<MenuItem icon={<PiPlusBold />} isDisabled={isSelectedForAutoAdd} onClick={handleSetAutoAdd}> icon={<PiPlusBold />}
{isSelectedForAutoAdd ? t('boards.selectedForAutoAdd') : t('boards.menuItemAutoAdd')} isDisabled={isSelectedForAutoAdd || autoAssignBoardOnClick}
onClick={handleSetAutoAdd}
>
{t('boards.menuItemAutoAdd')}
</MenuItem> </MenuItem>
)}
{isBulkDownloadEnabled && ( {isBulkDownloadEnabled && (
<MenuItem icon={<PiDownloadBold />} onClickCapture={handleBulkDownload}> <MenuItem icon={<PiDownloadBold />} onClickCapture={handleBulkDownload}>
{t('boards.downloadBoard')} {t('boards.downloadBoard')}