Merge pull request #286 from KPMP/develop

Release v2.6 (Q4 2024)
KPMP · Dec 13, 2024 · a380ca8 · a380ca8
2 parents 3bf5db3 + 6f87f90
commit a380ca8
Show file tree

Hide file tree

Showing 17 changed files with 9,179 additions and 5,863 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## Release 2.6 (unreleased)
+Brief summary of what's in this release:
+- combined the filter trees into one
+- added clinical data filters
+- reorganized the filters (put into filter categories)
+- added primary adjudicated category to participant report
+- added tooltips to the filter pills to help disambiguate new filters
+- removed units from labels in participant report since values will now include the units
+- updated endpoints
+
+### Breaking changes
+Breaking changes include any database updates needed, if we need to edit any files on system (like .env or certs, etc). Things that are outside of the code itself that need changed for the system to work.
+- This will not work with previous versions of pegasus-data since the graphql endpoints have changed name and structure
+
+----
+
+
 ## Release 2.5 (10/3/2024)
 Brief summary of what's in this release:
 - Segmentation data viewer

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hubble-web",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "private": true,
   "homepage": "/spatial-viewer",
   "baseURL": "/spatial-viewer",
@@ -26,7 +26,7 @@
     "@hms-dbmi/viv": "0.16.1",
     "immutability-helper": "3.1.1",
     "isomorphic-unfetch": "3.1.0",
-    "kpmp-common-components": "1.2.14",
+    "kpmp-common-components": "1.2.16",
     "kpmp-common-styles": "1.0.13",
     "mathjs": "13.1.0",
     "react": "17.0.2",

diff --git a/src/App.js b/src/App.js
@@ -53,24 +53,58 @@ store.subscribe(saveState);
 const connector = new AppSearchAPIConnector({
   searchKey: process.env.REACT_APP_SEARCH_KEY,
   engineName: "spatial-viewer",
-  endpointBase: "/spatial-viewer/search",
+  endpointBase: process.env.REACT_APP_SEARCH_ENDPOINT,
   cacheResponses: false
 })
 
 const searchConfig = {
   apiConnector: connector,
   searchQuery: {
-      disjunctiveFacets: ["sex", "age", "redcapid", "tissuetype", "imagetype", "datatype", "configtype", "level", "releaseversion"],
+      disjunctiveFacets: [
+        "sex", 
+        "age", 
+        "redcapid", 
+        "enrollmentcategory", 
+        "imagetype", 
+        "datatype", 
+        "configtype", 
+        "level", 
+        "releaseversion",
+        "race",
+        "proteinuria",
+        "hypertensionhistory",
+        "hypertensionduration",
+        "onraasblockade",
+        "diabetesduration",
+        "diabeteshistory",
+        "kdigostage",
+        "a1c",
+        "albuminuria",
+        "baselineegfr",
+        "primaryadjudicatedcategory",
+        ],
       facets: {
-        sex: { type: "value", size: 100},
-        age: { type: "value", size: 100},
-        redcapid: { type: "value", size: 500 },
-        tissuetype: { type: "value", size: 100},
-        imagetype: { type: "value", size: 100},
-        datatype: { type: "value", size: 100 },
-        configtype: { type: "value", size: 100},
-        level: { type: "value", size: 100},
-        releaseversion: {type: "value", size: 250}
+        sex: { type: "value", sort: {"value": "asc"}, size: 100},
+        age: { type: "value", sort: {"value": "asc"}, size: 100},
+        redcapid: { type: "value", sort: {"value": "asc"}, size: 500 },
+        enrollmentcategory: { type: "value", sort: {"value": "asc"}, size: 100},
+        imagetype: { type: "value", sort: {"value": "asc"}, size: 100},
+        datatype: { type: "value", sort: {"value": "asc"}, size: 100 },
+        configtype: { type: "value", sort: {"value": "asc"}, size: 100},
+        level: { type: "value", sort: {"value": "asc"}, size: 100},
+        releaseversion: {type: "value", sort: {"value": "asc"}, size: 250},
+        race: {type: "value", sort: {"value": "asc"}, size: 250},
+        proteinuria: {type: "value", sort: {"value": "asc"}, size: 250},
+        hypertensionhistory: {type: "value", sort: {"value": "asc"}, size: 250},
+        hypertensionduration: {type: "value", sort: {"value": "asc"}, size: 250},
+        onraasblockade:{type: "value", sort: {"value": "asc"}, size: 250},
+        diabetesduration: {type: "value", sort: {"value": "asc"}, size: 250},
+        diabeteshistory: {type: "value", sort: {"value": "asc"}, size: 250},
+        kdigostage: {type: "value", sort: {"value": "asc"}, size: 250},
+        a1c: {type: "value", sort: {"value": "asc"}, size: 250},
+        albuminuria: {type: "value", sort: {"value": "asc"}, size: 250},
+        baselineegfr: {type: "value", sort: {"value": "asc"}, size: 250},
+        primaryadjudicatedcategory: {type: "value", sort: {"value": "asc"}, size: 250},
       }
   },
   initialState: {

diff --git a/src/actions/Clinical/clinicalDatasetAction.js b/src/actions/Clinical/clinicalDatasetAction.js
@@ -13,9 +13,6 @@ export const fetchAndSetSummaryDatasets = (participant_id) => {
 export const fetchAndSetClinicalDatasets = (participant_id) => {
     return async (dispatch) => {
         let clinicalDatasets = await fetchParticipantClinicalDataset(participant_id);
-        if (clinicalDatasets) {
-            clinicalDatasets = JSON.parse(clinicalDatasets.clinicalData);
-        }
         clinicalDatasets = mapClinicalKeysToPresentationStyle(clinicalDatasets);
         dispatch(setClinicalDatasets(clinicalDatasets));
     }

diff --git a/src/components/ReportCard/ReportCard.js b/src/components/ReportCard/ReportCard.js
@@ -17,7 +17,7 @@ class ReportCard extends Component {
     getDefaultColumnWidths = () => {
         return [
             { columnName: 'key', width: 215 },
-            { columnName: 'value', width: 180 },
+            { columnName: 'value', width: 200 },
         ]
     };
     getDefaultLinkColumnWidths = () => {