From 1763ee72dad684c00a4edad9c7c5409f2633dd2e Mon Sep 17 00:00:00 2001
From: TomDijkema
Date: Mon, 16 Dec 2024 17:09:20 +0100
Subject: [PATCH 1/3] More smoke testing
---
.../components/masMenu/components/MasJobRecordCard.tsx | 2 +-
src/components/home/Home.tsx | 2 +-
src/components/staticPages/StaticPage.tsx | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
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/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 &&
-
From 486e409e7b19201bd07cddc560c96b00f65d1bad Mon Sep 17 00:00:00 2001
From: TomDijkema
Date: Mon, 16 Dec 2024 17:13:07 +0100
Subject: [PATCH 2/3] Update UserAnnotationRecordsTable.tsx
---
.../userRecordTables/UserAnnotationRecordsTable.tsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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';
}
From 92330c516538a3c93de99cb94819a1e9210b9218 Mon Sep 17 00:00:00 2001
From: TomDijkema
Date: Tue, 17 Dec 2024 10:36:09 +0100
Subject: [PATCH 3/3] Add Tooltip to search ID card MIDS info icon
Add Tooltip to search ID card MIDS info icon
---
src/components/search/components/idCard/IdCard.tsx | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
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 = () => {
-
+
+
+