Skip to content

Commit 75fc538

Browse files
committed
#1389 applied tag.hidden logic, reduced autohide time for tags toasts to 5 seconds
1 parent 6395110 commit 75fc538

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

js/components/preview/tags/details/tagDetails.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ const TagDetails = memo(() => {
186186
useEffect(() => {
187187
const categoriesToRemove = getCategoriesToBeRemovedFromTagDetails(tagCategories);
188188
const newTagList = preTagList.filter(t => {
189-
if (t.additional_info?.downloadName || categoriesToRemove.some(c => c.id === t.category)) {
189+
if (t.hidden === true || t.additional_info?.downloadName || categoriesToRemove.some(c => c.id === t.category)) {
190190
return false;
191191
} else {
192192
return true;
@@ -201,8 +201,8 @@ const TagDetails = memo(() => {
201201
const moleculesToEditIds = useSelector(state => state.selectionReducers.moleculesToEdit);
202202
const moleculesToEdit =
203203
moleculesToEditIds &&
204-
moleculesToEditIds.length > 0 &&
205-
!(moleculesToEditIds.length === 1 && moleculesToEditIds[0] === null)
204+
moleculesToEditIds.length > 0 &&
205+
!(moleculesToEditIds.length === 1 && moleculesToEditIds[0] === null)
206206
? moleculesToEditIds.map(id => dispatch(getMoleculeForId(id)))
207207
: [];
208208

js/components/preview/tags/modal/editTagsModal.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ export const EditTagsModal = ({ open, anchorEl, setOpenDialog }) => {
184184
dispatch(appendTagList(augMolTagObject));
185185
dispatch(appendMoleculeTag(molTag));
186186
dispatch(setNoTagsReceived(false));
187-
toastInfo('Tag was created');
187+
toastInfo('Tag was created', { autoHideDuration: 5000 });
188188
});
189189
// reset tag/fields after creating new one
190190
resetTagToEditState();
@@ -222,7 +222,7 @@ export const EditTagsModal = ({ open, anchorEl, setOpenDialog }) => {
222222
)
223223
);
224224
}
225-
toastInfo('Tag was updated');
225+
toastInfo('Tag was updated', { autoHideDuration: 5000 });
226226
// reset tag/fields after updating selected one
227227
resetTagToEditState();
228228
}
@@ -245,7 +245,7 @@ export const EditTagsModal = ({ open, anchorEl, setOpenDialog }) => {
245245
});
246246
}
247247
deleteExistingTag(tag, tag.id);
248-
toastInfo('Tag was deleted');
248+
toastInfo('Tag was deleted', { autoHideDuration: 5000 });
249249
// reset tag/fields after removing selected tag
250250
resetTagToEditState();
251251
}

js/components/preview/tags/tagCategory.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const TagCategory = memo(({ tagClickCallback, disabled = false }) => {
2020
let tagList = useSelector(state => state.apiReducers.tagList);
2121
tagList = tagList
2222
.filter(t => {
23-
if (t.additional_info?.downloadName || listOfProhibitedCategories.some(cid => cid === t.category)) {
23+
if (t.hidden || t.additional_info?.downloadName || listOfProhibitedCategories.some(cid => cid === t.category)) {
2424
return false;
2525
} else {
2626
return true;

js/components/preview/tags/utils/tagUtils.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ export const getAllTagsForLHSCmp = (observations, tagList, tagCategoryList) => {
236236
obs?.tags_set.forEach(tagId => {
237237
let tag = tagList.find(t => t.id === tagId);
238238
if (
239-
tag &&
239+
tag && !tag.hidden &&
240240
!restOfTheTags.some(t => t.id === tag.id) &&
241241
!prioTags.some(t => t.id === tag.id) &&
242242
!obsPrioTags.some(t => t.id === tag.id)

0 commit comments

Comments
 (0)