Merge pull request #147 from DiSSCo/SmokeTestingFixes

Smoke testing fixes 2
DiSSCo · Dec 19, 2024 · ba5f8d6 · ba5f8d6
2 parents 582afd4 + 92330c5
commit ba5f8d6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/...omponents/elements/annotationSidePanel/components/masMenu/components/MasJobRecordCard.tsx b/...omponents/elements/annotationSidePanel/components/masMenu/components/MasJobRecordCard.tsx
@@ -89,7 +89,7 @@ const MASJobRecordCard = (props: Props) => {
                             </span>
                             {` ${format(masJobRecord.timeStarted, 'MMMM dd - yyyy')}`}
                         </p>
-                        {['COMPLETED', 'FAILED'].includes(masJobRecord.state) &&
+                        {['COMPLETED'].includes(masJobRecord.state) &&
                             <p className="fs-4">
                                 <span className="fw-lightBold">
                                     Completed:

diff --git 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
@@ -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
@@ -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 = () => {
                             <Col lg="auto"
                                 className="d-flex align-items-center pe-0"
                             >
-                                <FontAwesomeIcon icon={faInfoCircle}
-                                    className="fs-4 tc-accent"
-                                />
+                                <Tooltip text="Minimum Information about a Digital Specimen"
+                                    placement="bottom"
+                                >
+                                    <FontAwesomeIcon icon={faInfoCircle}
+                                        className="fs-4 tc-accent"
+                                    />
+                                </Tooltip>
                             </Col>
                             <Col>
                                 <p className="fs-4 tc-accent fw-bold">

diff --git a/src/components/staticPages/StaticPage.tsx b/src/components/staticPages/StaticPage.tsx
@@ -79,7 +79,7 @@ const StaticPage = (props: Props) => {
                                         <Row>
                                             {paragraph.logo &&
                                                 <Col lg="auto">
-                                                    <img src={`src/webroot/logos/${paragraph.logo}`}
+                                                    <img src={`webroot/logos/${paragraph.logo}`}
                                                         alt={paragraph.logo}
                                                         className={styles.logo}
                                                     />