Minor fixes from SDD feedback

* Renamed "Program data" to "Demographics". * Made names when adding a criteria clickable. * Fixed spacing between annotations. * Navigating back from a category when adding a criteria returns to the category list rather than back to the cohort. * Add boolean operator names to dividers between criteria in groups. * Show cohort size when creating a review.
DataBiosphere · Jul 31, 2023 · 4e9d4a6 · 4e9d4a6
1 parent be2e94f
commit 4e9d4a6
Show file tree

Hide file tree

Showing 16 changed files with 135 additions and 68 deletions.
diff --git a/service/src/main/resources/config/verily/sdd/expanded/sdd.json b/service/src/main/resources/config/verily/sdd/expanded/sdd.json
diff --git a/service/src/main/resources/config/verily/sdd/original/ui/top_level.json b/service/src/main/resources/config/verily/sdd/original/ui/top_level.json
@@ -242,7 +242,7 @@
       "type": "classification",
       "id": "tanagra-genotyping",
       "title": "Genotyping platform",
-      "category": "Program data",
+      "category": "Demographics",
       "columns": [
         { "key": "name", "width": "100%", "title": "Genotyping platform" }
       ],
@@ -290,28 +290,28 @@
       "type": "attribute",
       "id": "tanagra-ethnicity",
       "title": "Ethnicity",
-      "category": "Program data",
+      "category": "Demographics",
       "attribute": "ethnicity"
     },
     {
       "type": "attribute",
       "id": "tanagra-gender",
       "title": "Gender identity",
-      "category": "Program data",
+      "category": "Demographics",
       "attribute": "gender"
     },
     {
       "type": "attribute",
       "id": "tanagra-race",
       "title": "Race",
-      "category": "Program data",
+      "category": "Demographics",
       "attribute": "race"
     },
     {
       "type": "attribute",
       "id": "tanagra-age",
       "title": "Age",
-      "category": "Program data",
+      "category": "Demographics",
       "attribute": "age"
     },
     {
@@ -333,7 +333,7 @@
       "type": "classification",
       "id": "tanagra-snp",
       "title": "SNP variant",
-      "category": "Program data",
+      "category": "Demographics",
       "columns": [{ "key": "id", "width": "100%", "title": "SNP variant" }],
       "occurrence": "",
       "classification": "snp"

diff --git a/service/src/main/resources/config/verily/sdd_refresh0323/expanded/sdd_refresh0323.json b/service/src/main/resources/config/verily/sdd_refresh0323/expanded/sdd_refresh0323.json
diff --git a/service/src/main/resources/config/verily/sdd_refresh0323/original/ui/top_level.json b/service/src/main/resources/config/verily/sdd_refresh0323/original/ui/top_level.json
@@ -242,7 +242,7 @@
       "type": "classification",
       "id": "tanagra-genotyping",
       "title": "Genotyping platform",
-      "category": "Program data",
+      "category": "Demographics",
       "columns": [
         { "key": "name", "width": "100%", "title": "Genotyping platform" }
       ],
@@ -290,28 +290,28 @@
       "type": "attribute",
       "id": "tanagra-ethnicity",
       "title": "Ethnicity",
-      "category": "Program data",
+      "category": "Demographics",
       "attribute": "ethnicity"
     },
     {
       "type": "attribute",
       "id": "tanagra-gender",
       "title": "Gender identity",
-      "category": "Program data",
+      "category": "Demographics",
       "attribute": "gender"
     },
     {
       "type": "attribute",
       "id": "tanagra-race",
       "title": "Race",
-      "category": "Program data",
+      "category": "Demographics",
       "attribute": "race"
     },
     {
       "type": "attribute",
       "id": "tanagra-age",
       "title": "Age",
-      "category": "Program data",
+      "category": "Demographics",
       "attribute": "age"
     },
     {
@@ -333,7 +333,7 @@
       "type": "classification",
       "id": "tanagra-snp",
       "title": "SNP variant",
-      "category": "Program data",
+      "category": "Demographics",
       "columns": [{ "key": "name", "width": "100%", "title": "SNP variant" }],
       "occurrence": "",
       "classification": "snp"

diff --git a/service/src/main/resources/config/vumc/sdd/expanded/sdd.json b/service/src/main/resources/config/vumc/sdd/expanded/sdd.json
diff --git a/service/src/main/resources/config/vumc/sdd/original/ui/top_level.json b/service/src/main/resources/config/vumc/sdd/original/ui/top_level.json
@@ -242,7 +242,7 @@
       "type": "classification",
       "id": "tanagra-genotyping",
       "title": "Genotyping platform",
-      "category": "Program data",
+      "category": "Demographics",
       "columns": [
         { "key": "name", "width": "100%", "title": "Genotyping platform" }
       ],
@@ -290,28 +290,28 @@
       "type": "attribute",
       "id": "tanagra-ethnicity",
       "title": "Ethnicity",
-      "category": "Program data",
+      "category": "Demographics",
       "attribute": "ethnicity"
     },
     {
       "type": "attribute",
       "id": "tanagra-gender",
       "title": "Gender identity",
-      "category": "Program data",
+      "category": "Demographics",
       "attribute": "gender"
     },
     {
       "type": "attribute",
       "id": "tanagra-race",
       "title": "Race",
-      "category": "Program data",
+      "category": "Demographics",
       "attribute": "race"
     },
     {
       "type": "attribute",
       "id": "tanagra-age",
       "title": "Age",
-      "category": "Program data",
+      "category": "Demographics",
       "attribute": "age"
     },
     {
@@ -333,7 +333,7 @@
       "type": "classification",
       "id": "tanagra-snp",
       "title": "SNP variant",
-      "category": "Program data",
+      "category": "Demographics",
       "columns": [{ "key": "id", "width": "100%", "title": "SNP variant" }],
       "occurrence": "",
       "classification": "snp"

diff --git a/service/src/main/resources/config/vumc/sdd_refresh0323/expanded/sdd_refresh0323.json b/service/src/main/resources/config/vumc/sdd_refresh0323/expanded/sdd_refresh0323.json
diff --git a/service/src/main/resources/config/vumc/sdd_refresh0323/original/ui/top_level.json b/service/src/main/resources/config/vumc/sdd_refresh0323/original/ui/top_level.json
@@ -242,7 +242,7 @@
       "type": "classification",
       "id": "tanagra-genotyping",
       "title": "Genotyping platform",
-      "category": "Program data",
+      "category": "Demographics",
       "columns": [
         { "key": "name", "width": "100%", "title": "Genotyping platform" }
       ],
@@ -290,28 +290,28 @@
       "type": "attribute",
       "id": "tanagra-ethnicity",
       "title": "Ethnicity",
-      "category": "Program data",
+      "category": "Demographics",
       "attribute": "ethnicity"
     },
     {
       "type": "attribute",
       "id": "tanagra-gender",
       "title": "Gender identity",
-      "category": "Program data",
+      "category": "Demographics",
       "attribute": "gender"
     },
     {
       "type": "attribute",
       "id": "tanagra-race",
       "title": "Race",
-      "category": "Program data",
+      "category": "Demographics",
       "attribute": "race"
     },
     {
       "type": "attribute",
       "id": "tanagra-age",
       "title": "Age",
-      "category": "Program data",
+      "category": "Demographics",
       "attribute": "age"
     },
     {
@@ -333,7 +333,7 @@
       "type": "classification",
       "id": "tanagra-snp",
       "title": "SNP variant",
-      "category": "Program data",
+      "category": "Demographics",
       "columns": [{ "key": "name", "width": "100%", "title": "SNP variant" }],
       "occurrence": "",
       "classification": "snp"

diff --git a/ui/src/addCriteria.tsx b/ui/src/addCriteria.tsx
@@ -1,5 +1,6 @@
 import Button from "@mui/material/Button";
 import Chip from "@mui/material/Chip";
+import Link from "@mui/material/Link";
 import Stack from "@mui/material/Stack";
 import { useTheme } from "@mui/material/styles";
 import Typography from "@mui/material/Typography";
@@ -282,9 +283,16 @@ function AddCriteria(props: AddCriteriaProps) {
                               paddingLeft: theme.spacing(2),
                             }}
                           >
-                            <Typography key="" variant="body2">
+                            <Link
+                              key=""
+                              component="button"
+                              variant="body2"
+                              color="inherit"
+                              underline="hover"
+                              onClick={() => onClick(config)}
+                            >
                               {config.title}
-                            </Typography>
+                            </Link>
                           </td>
                           <td
                             style={{

diff --git a/ui/src/cohortReview/cohortReview.tsx b/ui/src/cohortReview/cohortReview.tsx
@@ -285,7 +285,7 @@ export function CohortReview() {
                   ) : null}
                 </GridLayout>
                 <Loading status={annotationsState}>
-                  <GridLayout rows>
+                  <GridLayout rows spacing={2}>
                     {annotationsState.data?.map(
                       (a) =>
                         !!instance && (

diff --git a/ui/src/cohortReview/cohortReviewList.tsx b/ui/src/cohortReview/cohortReviewList.tsx
@@ -185,6 +185,7 @@ export function CohortReviewList() {
   };
 
   const [newReviewDialog, showNewReviewDialog] = useNewReviewDialog({
+    cohort,
     onCreate: onCreateNewReview,
   });