wip

HumanBrainProject · Mar 5, 2024 · 1a815cf · 1a815cf
1 parent 5fef844
commit 1a815cf
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 13 deletions.
diff --git a/apps/nar-v3/src/datastore.js b/apps/nar-v3/src/datastore.js
@@ -31,7 +31,8 @@ class DataStore {
       "patch clamp recordings summary": {},
       "patch clamp recordings detail": {}
     };
-    this.cache["datasets detail"][uuidFromUri(examplePatchClampData["@id"])] = examplePatchClampData;
+    //this.cache["datasets detail"][uuidFromUri(examplePatchClampData["@id"])] = examplePatchClampData;
+    this.cache["datasets detail"]["example"] = examplePatchClampData;
   }
 
   buildRequestConfig(method="GET", body={}) {

diff --git a/apps/nar-v3/src/routes/dataset.jsx b/apps/nar-v3/src/routes/dataset.jsx
@@ -19,8 +19,10 @@ const actorQuery = [
   S("givenName"),
   S("familyName"),
   S("fullName"),
-  S("shortName")
-]
+  S("shortName"),
+];
+
+const MULTIPLE = { expectSingle: false };
 
 const query = buildKGQuery("core/DatasetVersion", [
   S("@id"),
@@ -31,23 +33,20 @@ const query = buildKGQuery("core/DatasetVersion", [
   L("ethicsAssessment/name"),
   L("license/shortName"),
   S("releaseDate"),
-  L("custodian", actorQuery, { expectSingle: false }),
-  L("author", actorQuery, { expectSingle: false }),
+  L("custodian", actorQuery, MULTIPLE),
+  L("author", actorQuery, MULTIPLE),
   R("isVersionOf", "hasVersion", [
     S("fullName"),
     S("description"),
     S("shortName"),
-    L("custodian", actorQuery, { expectSingle: false }),
-    L("author", actorQuery, { expectSingle: false }),
+    L("custodian", actorQuery, MULTIPLE),
+    L("author", actorQuery, MULTIPLE),
   ]),
   L(
     "studiedSpecimen",
     [
       S("lookupLabel"),
-      L("species", [
-        S("name"),
-        L("species/name")
-      ]),
+      L("species", [S("name"), L("species/name")]),
       L("biologicalSex/name"),
       L(
         "studiedState",
@@ -62,9 +61,30 @@ const query = buildKGQuery("core/DatasetVersion", [
             L("maxValueUnit/name"),
           ]),
           L("ageCategory/name"),
-          L("pathology", [], { expectSingle: false }),
+          L("pathology", [S("name")], MULTIPLE),
+          L(
+            "input",
+            [
+              // slice preparation
+              S("lookupLabel"),
+              S("@type"),
+              L("device", []),
+              L("studyTarget/name", [], MULTIPLE),
+              L("temperature", [S("name"), L("unit/name")]),
+              L("tissueBathSolution", [S("name"), L("hasPart", [], MULTIPLE)]),
+              L(
+                "output",
+                [
+                  // slices
+                  S("lookupLabel"),
+                ],
+                MULTIPLE
+              ),
+            ],
+            MULTIPLE
+          ),
         ],
-        { expectSingle: false }
+        MULTIPLE
       ),
     ],
     { type: "core/Subject", expectSingle: false }