diff --git a/src/components/elements/annotationSidePanel/components/masMenu/components/MasJobRecordCard.tsx b/src/components/elements/annotationSidePanel/components/masMenu/components/MasJobRecordCard.tsx index 48fe22a1..e1ab4939 100644 --- a/src/components/elements/annotationSidePanel/components/masMenu/components/MasJobRecordCard.tsx +++ b/src/components/elements/annotationSidePanel/components/masMenu/components/MasJobRecordCard.tsx @@ -89,7 +89,7 @@ const MASJobRecordCard = (props: Props) => { {` ${format(masJobRecord.timeStarted, 'MMMM dd - yyyy')}`}

- {['COMPLETED', 'FAILED'].includes(masJobRecord.state) && + {['COMPLETED'].includes(masJobRecord.state) &&

Completed: diff --git a/src/components/home/Home.tsx b/src/components/home/Home.tsx index 06b7c35b..3d310a26 100644 --- a/src/components/home/Home.tsx +++ b/src/components/home/Home.tsx @@ -90,7 +90,7 @@ const Home = () => { } /* If any topic disciplines are selected, add them as search params */ - values.topicDisciplines.forEach((topicDiscipline, index) => { + ([...values.topicDisciplines, ...(values.unclassified ? ['unclassified'] : [])]).forEach((topicDiscipline, index) => { let linkExtension: string = `${(index > 0 || searchLink.includes('?')) ? '&' : '?'}topicDiscipline=`; /* Check if topic discipline belongs to other */ diff --git a/src/components/profile/components/userRecordTables/UserAnnotationRecordsTable.tsx b/src/components/profile/components/userRecordTables/UserAnnotationRecordsTable.tsx index 0ddf1d0f..08f506c3 100644 --- a/src/components/profile/components/userRecordTables/UserAnnotationRecordsTable.tsx +++ b/src/components/profile/components/userRecordTables/UserAnnotationRecordsTable.tsx @@ -42,8 +42,8 @@ const UserAnnotationRecordsTable = () => { if (userAnnotation["oa:hasTarget"]["oa:hasSelector"]?.["@type"] === 'ods:ClassSelector') { jsonPath = userAnnotation["oa:hasTarget"]["oa:hasSelector"]["ods:class"]; - } else if (userAnnotation["oa:hasTarget"]["oa:hasSelector"]?.["@type"] === 'ods:FieldSelector') { - jsonPath = userAnnotation["oa:hasTarget"]["oa:hasSelector"]["ods:field"]; + } else if (userAnnotation["oa:hasTarget"]["oa:hasSelector"]?.["@type"] === 'ods:TermSelector') { + jsonPath = userAnnotation["oa:hasTarget"]["oa:hasSelector"]["ods:term"]; } else { jsonPath = 'Region of interest'; } diff --git a/src/components/search/components/idCard/IdCard.tsx b/src/components/search/components/idCard/IdCard.tsx index 923c094f..dda083af 100644 --- a/src/components/search/components/idCard/IdCard.tsx +++ b/src/components/search/components/idCard/IdCard.tsx @@ -28,7 +28,7 @@ import GetDigitalSpecimen from 'api/digitalSpecimen/GetDigitalSpecimen'; import GetDigitalSpecimenDigitalMedia from 'api/digitalSpecimen/GetDigitalSpecimenDigitalMedia'; /* Import Components */ -import { Button, LoadingScreen, OpenStreetMap } from 'components/elements/customUI/CustomUI'; +import { Button, LoadingScreen, OpenStreetMap, Tooltip } from 'components/elements/customUI/CustomUI'; import { DigitalMediaItem } from 'components/elements/Elements'; @@ -117,9 +117,13 @@ const IdCard = () => { - + + +

diff --git a/src/components/staticPages/StaticPage.tsx b/src/components/staticPages/StaticPage.tsx index c4be97f8..2ff89ec5 100644 --- a/src/components/staticPages/StaticPage.tsx +++ b/src/components/staticPages/StaticPage.tsx @@ -79,7 +79,7 @@ const StaticPage = (props: Props) => { {paragraph.logo && - {paragraph.logo}