Merge branch 'main' into ImplementTaxonomicServiceForm

DiSSCo · Oct 23, 2024 · 2f8f2dc · 2f8f2dc
2 parents 520735c + 9a91bc9
commit 2f8f2dc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/src/app/Types.ts b/src/app/Types.ts
@@ -37,9 +37,11 @@ export type TaxonomicService = {
 
 /* Type for an Agent */
 export type Maintainer = {
-    "schema:identifier"?: string;
+    "@type": string,
+    "schema:identifier"?: string | Dict[];
     "schema:name"?: string;
-    "schema:Organization"?: {
+    "schema:Affiliation"?: {
+        "@type": string,
         "schema:identifier"?: string;
         "schema:legalName"?: string;
     };

diff --git a/src/components/search/components/SearchResult.tsx b/src/components/search/components/SearchResult.tsx
@@ -4,9 +4,6 @@ import classNames from 'classnames';
 import moment from 'moment';
 import { Row, Col } from 'react-bootstrap';
 
-/* Import Utilities */
-import { MakeReadableString } from 'app/Utilities';
-
 /* Import Hooks */
 import { useAppDispatch } from 'app/Hooks';
 
@@ -96,7 +93,7 @@ const SearchResult = (props: Props) => {
                         {/* Service Type and Publishing Date if preview image is not present */}
                         <Row>
                             <Col>
-                                <p className="fs-5 fs-lg-4">{MakeReadableString(taxonomicService.taxonomicService['schema:Service']['schema:serviceType'] ?? 'Taxonomic Service')}</p>
+                                <p className="fs-5 fs-lg-4">{taxonomicService.taxonomicService['schema:Service']['schema:serviceType']}</p>
                             </Col>
                             {(!previewImage || window.innerWidth < 768) &&
                                 <Col xs="auto" lg="auto">

diff --git a/src/components/taxonomicService/TaxonomicService.tsx b/src/components/taxonomicService/TaxonomicService.tsx
@@ -146,7 +146,7 @@ const TaxonomicService = () => {
                                                     properties={{
                                                         contactEmail: taxonomicService.taxonomicService['schema:ContactPoint']?.['schema:email'],
                                                         contactWebpage: taxonomicService.taxonomicService['schema:ContactPoint']?.['schema:url'],
-                                                        webpage: taxonomicService.taxonomicService['schema:ContactPoint']?.['schema:sameAs'],
+                                                        webpage: taxonomicService.taxonomicService['schema:ContactPoint']?.['schema:url'],
                                                         documentationWebpage: taxonomicService.taxonomicService['schema:documentation'],
                                                         maintainers: taxonomicService.taxonomicService['schema:Maintainer']
                                                     }}

diff --git a/src/components/taxonomicService/components/DescriptionBlock.tsx b/src/components/taxonomicService/components/DescriptionBlock.tsx
@@ -4,9 +4,6 @@ import MarkdownIt from 'markdown-it';
 import moment from 'moment';
 import { Row, Col } from 'react-bootstrap';
 
-/* Import Utilities */
-import { MakeReadableString } from 'app/Utilities';
-
 /* Import Types */
 import { TaxonomicService } from 'app/Types';
 
@@ -64,7 +61,7 @@ const DescriptionBlock = (props: Props) => {
                         {/* Type */}
                         <Col xs={{ span: 12 }} lg="auto">
                             <p className="fs-5 fw-bold">Taxonomic service type</p>
-                            <p className="tc-primary fw-bold">{MakeReadableString(taxonomicService.taxonomicService['schema:Service']['schema:serviceType'])}</p>
+                            <p className="tc-primary fw-bold">{taxonomicService.taxonomicService['schema:Service']['schema:serviceType']}</p>
                         </Col>
                         {/* Taxonomic scope */}
                         <Col xs={{ span: 12 }} lg={{ span: 3 }}