diff --git a/apps/nar-v3/src/components/DatasetCard.jsx b/apps/nar-v3/src/components/DatasetCard.jsx index 372cb86..eb2b8ba 100644 --- a/apps/nar-v3/src/components/DatasetCard.jsx +++ b/apps/nar-v3/src/components/DatasetCard.jsx @@ -4,7 +4,7 @@ import Button from "@mui/material/Button"; import Paper from "@mui/material/Paper"; import Stack from "@mui/material/Stack"; import Typography from "@mui/material/Typography"; -import Markdown from 'react-markdown' +import Markdown from "react-markdown"; import { uuidFromUri } from "../utility.js"; @@ -132,7 +132,7 @@ function SubjectCard(props) {
{subject.studiedState[0].ageCategory}
Pathologies
- {subject.studiedState[0].pathology + {subject.studiedState[0].pathology.length > 0 ? subject.studiedState[0].pathology[0].name : "none"}
@@ -161,17 +161,20 @@ function SlicePreparationCard(props) {

{activity.label}

Device name
-
{activity.deviceUsage[0].device.name}
+
{activity.device[0].device.name}
Device type
-
{activity.deviceUsage[0].device.deviceType.name}
+
{activity.device[0].device.deviceType}
Manufacturer
-
{activity.deviceUsage[0].device.manufacturer.fullName}
+
+ {activity.device[0].device.manufacturer.fullName || + activity.device[0].device.manufacturer.shortName} +
Slice thickness
-
{formatQuant(activity.deviceUsage[0].sliceThickness)}
+
{formatQuant(activity.device[0].sliceThickness)}
Slicing plane
-
{activity.deviceUsage[0].slicingPlane.name}
+
{activity.device[0].slicingPlane}
Study targets
-
{activity.studyTargets.map((item) => item.name).join(", ")}
+
{activity.studyTarget.join(", ")}
Temperature
{formatQuant(activity.temperature)}
Dissecting solution (full details to come)
@@ -243,26 +246,26 @@ function CellPatchingCard(props) {
Electrode description
-
{activity.deviceUsage[0].device.description}
- {/* activity.deviceUsage[0].device.deviceType.name */} - {/* activity.deviceUsage[0].device.manufacturer.fullName */} +
{activity.device[0].device.description}
+ {/* activity.device[0].device.deviceType.name */} + {/* activity.device[0].device.manufacturer.fullName */}
Pipette solution (more details to come)
-
{activity.deviceUsage[0].pipetteSolution.name}
+
{activity.device[0].pipetteSolution.name}
Seal resistance
- {activity.deviceUsage[0].sealResistance.values + {activity.device[0].sealResistance.value .map((item) => formatQuant(item)) .join(", ")}
Series resistance
- {activity.deviceUsage[0].seriesResistance.values + {activity.device[0].seriesResistance.value .map((item) => formatQuant(item)) .join(", ")}
Holding potential
- {activity.deviceUsage[0].holdingPotential.values + {activity.device[0].holdingPotential.value .map((item) => formatQuant(item)) .join(", ")}
@@ -444,7 +447,7 @@ function DatasetCard(props) { const getSlices = (subjectIndex) => { const slicePrep = getSlicePreparation(subjectIndex); if (slicePrep) { - return slicePrep.slices; + return slicePrep.output; } else { return null; } @@ -463,7 +466,7 @@ function DatasetCard(props) { const getPatchedCell = (subjectIndex, sliceIndex) => { const cellPatching = getCellPatching(subjectIndex, sliceIndex); if (cellPatching) { - return cellPatching.patchedCells[0]; + return cellPatching.output[0]; } else { return null; } @@ -520,7 +523,9 @@ function DatasetCard(props) { View in KG Search - {formatAuthors(dataset)} + + {formatAuthors(dataset)} +
Licence: @@ -539,7 +544,9 @@ function DatasetCard(props) { {dataset.releaseDate}
- {dataset.description || dataset.isVersionOf.description} + + {dataset.description || dataset.isVersionOf.description} + {subjects ? (