diff --git a/js/components/preview/tags/details/tagDetails.js b/js/components/preview/tags/details/tagDetails.js index 2f814f0b8..b4895c148 100644 --- a/js/components/preview/tags/details/tagDetails.js +++ b/js/components/preview/tags/details/tagDetails.js @@ -186,7 +186,7 @@ const TagDetails = memo(() => { useEffect(() => { const categoriesToRemove = getCategoriesToBeRemovedFromTagDetails(tagCategories); const newTagList = preTagList.filter(t => { - if (t.additional_info?.downloadName || categoriesToRemove.some(c => c.id === t.category)) { + if (t.hidden === true || t.additional_info?.downloadName || categoriesToRemove.some(c => c.id === t.category)) { return false; } else { return true; @@ -201,8 +201,8 @@ const TagDetails = memo(() => { const moleculesToEditIds = useSelector(state => state.selectionReducers.moleculesToEdit); const moleculesToEdit = moleculesToEditIds && - moleculesToEditIds.length > 0 && - !(moleculesToEditIds.length === 1 && moleculesToEditIds[0] === null) + moleculesToEditIds.length > 0 && + !(moleculesToEditIds.length === 1 && moleculesToEditIds[0] === null) ? moleculesToEditIds.map(id => dispatch(getMoleculeForId(id))) : []; diff --git a/js/components/preview/tags/modal/editTagsModal.js b/js/components/preview/tags/modal/editTagsModal.js index 9a9c703e9..7c07c4ded 100644 --- a/js/components/preview/tags/modal/editTagsModal.js +++ b/js/components/preview/tags/modal/editTagsModal.js @@ -184,7 +184,7 @@ export const EditTagsModal = ({ open, anchorEl, setOpenDialog }) => { dispatch(appendTagList(augMolTagObject)); dispatch(appendMoleculeTag(molTag)); dispatch(setNoTagsReceived(false)); - toastInfo('Tag was created'); + toastInfo('Tag was created', { autoHideDuration: 5000 }); }); // reset tag/fields after creating new one resetTagToEditState(); @@ -222,7 +222,7 @@ export const EditTagsModal = ({ open, anchorEl, setOpenDialog }) => { ) ); } - toastInfo('Tag was updated'); + toastInfo('Tag was updated', { autoHideDuration: 5000 }); // reset tag/fields after updating selected one resetTagToEditState(); } @@ -245,7 +245,7 @@ export const EditTagsModal = ({ open, anchorEl, setOpenDialog }) => { }); } deleteExistingTag(tag, tag.id); - toastInfo('Tag was deleted'); + toastInfo('Tag was deleted', { autoHideDuration: 5000 }); // reset tag/fields after removing selected tag resetTagToEditState(); } diff --git a/js/components/preview/tags/tagCategory.js b/js/components/preview/tags/tagCategory.js index 25465e6b2..27f16b0aa 100644 --- a/js/components/preview/tags/tagCategory.js +++ b/js/components/preview/tags/tagCategory.js @@ -20,7 +20,7 @@ const TagCategory = memo(({ tagClickCallback, disabled = false }) => { let tagList = useSelector(state => state.apiReducers.tagList); tagList = tagList .filter(t => { - if (t.additional_info?.downloadName || listOfProhibitedCategories.some(cid => cid === t.category)) { + if (t.hidden || t.additional_info?.downloadName || listOfProhibitedCategories.some(cid => cid === t.category)) { return false; } else { return true; diff --git a/js/components/preview/tags/utils/tagUtils.js b/js/components/preview/tags/utils/tagUtils.js index 8d2876ec9..0862137c3 100644 --- a/js/components/preview/tags/utils/tagUtils.js +++ b/js/components/preview/tags/utils/tagUtils.js @@ -236,7 +236,7 @@ export const getAllTagsForLHSCmp = (observations, tagList, tagCategoryList) => { obs?.tags_set.forEach(tagId => { let tag = tagList.find(t => t.id === tagId); if ( - tag && + tag && !tag.hidden && !restOfTheTags.some(t => t.id === tag.id) && !prioTags.some(t => t.id === tag.id) && !obsPrioTags.some(t => t.id === tag.id)