From 5adb4d999407530901cee3f6cd9534e3edbce766 Mon Sep 17 00:00:00 2001 From: dert1129 Date: Fri, 15 Nov 2024 09:37:42 -0500 Subject: [PATCH 1/4] change ethnicity to race --- src/App.js | 4 ++-- src/components/SpatialViewer/Facets/AllFacets.js | 4 ++-- src/helpers/dataHelper.js | 4 ++-- src/helpers/dataHelper.test.js | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/App.js b/src/App.js index d62bb6c..f267441 100755 --- a/src/App.js +++ b/src/App.js @@ -70,7 +70,7 @@ const searchConfig = { "configtype", "level", "releaseversion", - "ethnicity", + "race", "proteinuria", "hypertensionhistory", "hypertensionduration", @@ -93,7 +93,7 @@ const searchConfig = { configtype: { type: "value", size: 100}, level: { type: "value", size: 100}, releaseversion: {type: "value", size: 250}, - ethnicity: {type: "value", size: 250}, + race: {type: "value", size: 250}, proteinuria: {type: "value", size: 250}, hypertensionhistory: {type: "value", size: 250}, hypertensionduration: {type: "value", size: 250}, diff --git a/src/components/SpatialViewer/Facets/AllFacets.js b/src/components/SpatialViewer/Facets/AllFacets.js index 24c7a82..72a3530 100644 --- a/src/components/SpatialViewer/Facets/AllFacets.js +++ b/src/components/SpatialViewer/Facets/AllFacets.js @@ -71,12 +71,12 @@ class AllFacets extends Component { - Ethnicity + Race - + diff --git a/src/helpers/dataHelper.js b/src/helpers/dataHelper.js index 1ab8312..919802d 100644 --- a/src/helpers/dataHelper.js +++ b/src/helpers/dataHelper.js @@ -70,7 +70,7 @@ export const mapClinicalKeysToPresentationStyle = (data) => { result['KDIGO Stage'] = ""; result['On RAAS Blockade'] = ""; result['Proteinuria (mg)'] = ""; - result['Ethnicity'] = ""; + result['Race'] = ""; result['Age (Years)'] = ""; result['Sample Type'] = ""; result['Sex'] = ""; @@ -111,7 +111,7 @@ export const mapClinicalKeysToPresentationStyle = (data) => { result['Proteinuria (mg)'] = data.proteinuria ? data.proteinuria : ""; } if (data.race) { - result['Ethnicity'] = data.race ? data.race : ""; + result['race'] = data.race ? data.race : ""; } if (data.ageBinned) { result['Age (Years)'] = data.ageBinned ? data.ageBinned.replace(' Years', '') : ""; diff --git a/src/helpers/dataHelper.test.js b/src/helpers/dataHelper.test.js index 6cc6162..38fdc52 100644 --- a/src/helpers/dataHelper.test.js +++ b/src/helpers/dataHelper.test.js @@ -88,7 +88,7 @@ describe('dataHelper', () => { "kdigoStage": "testdkigo_stage", "onRaasBlockade": "test-on_raas_blockade", "proteinuria": "proteinuria", - "race": "test-Ethnicity", + "race": "test-race", "age": "test-Age", "sex": "test-sex", "protocol": "test-protocol", @@ -108,7 +108,7 @@ describe('dataHelper', () => { 'KDIGO Stage': 'testdkigo_stage', 'On RAAS Blockade': 'test-on_raas_blockade', 'Proteinuria (mg)': 'proteinuria', - 'Ethnicity': 'test-Ethnicity', + 'Race': 'test-race', 'Age (Years)': 'test-Age', 'Sample Type': 'test-sample_type', 'Sex': 'test-sex', @@ -135,7 +135,7 @@ describe('dataHelper', () => { 'KDIGO Stage': '', 'On RAAS Blockade': '', 'Proteinuria (mg)': '', - 'Ethnicity': '', + 'Race': '', 'Age (Years)': '', 'Sample Type': '', 'Sex': '', @@ -159,7 +159,7 @@ describe('dataHelper', () => { 'KDIGO Stage': '', 'On RAAS Blockade': '', 'Proteinuria (mg)': '', - 'Ethnicity': '', + 'Race': '', 'Age (Years)': '', 'Sample Type': '', 'Sex': '', @@ -183,7 +183,7 @@ describe('dataHelper', () => { 'KDIGO Stage': '', 'On RAAS Blockade': '', 'Proteinuria (mg)': '', - 'Ethnicity': '', + 'Race': '', 'Age (Years)': '', 'Sample Type': '', 'Sex': '', From 209089ab8e5d9640214724e91b9439fc11e38007 Mon Sep 17 00:00:00 2001 From: dert1129 Date: Fri, 15 Nov 2024 09:39:45 -0500 Subject: [PATCH 2/4] rename A1c % to A1c --- src/components/SpatialViewer/Facets/AllFacets.js | 2 +- src/helpers/dataHelper.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/SpatialViewer/Facets/AllFacets.js b/src/components/SpatialViewer/Facets/AllFacets.js index 72a3530..8de9e68 100644 --- a/src/components/SpatialViewer/Facets/AllFacets.js +++ b/src/components/SpatialViewer/Facets/AllFacets.js @@ -82,7 +82,7 @@ class AllFacets extends Component { - A1c % + A1c diff --git a/src/helpers/dataHelper.js b/src/helpers/dataHelper.js index 919802d..b9467bb 100644 --- a/src/helpers/dataHelper.js +++ b/src/helpers/dataHelper.js @@ -60,7 +60,7 @@ export const mapSummaryKeysToPresentationStyle = (data) => { export const mapClinicalKeysToPresentationStyle = (data) => { const result = {}; - result['A1C (%)']= ""; + result['A1C']= ""; result['Albuminuria (mg)'] = ""; result['Baseline eGFR (ml/min/1.73m2)'] = ""; result['Diabetes Duration (Years)'] = ""; @@ -81,7 +81,7 @@ export const mapClinicalKeysToPresentationStyle = (data) => { return result; } if (data.a1c) { - result['A1C (%)'] = data.a1c ? data.a1c : ""; + result['A1C'] = data.a1c ? data.a1c : ""; } if (data.albuminuria) { result['Albuminuria (mg)'] = data.albuminuria ? data.albuminuria : ""; From 0a94fa99c6d35eb9bb4933a93ad776bac516a3b1 Mon Sep 17 00:00:00 2001 From: dert1129 Date: Fri, 15 Nov 2024 09:46:16 -0500 Subject: [PATCH 3/4] fix dataHelper for report page --- src/helpers/dataHelper.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/helpers/dataHelper.js b/src/helpers/dataHelper.js index b9467bb..34cdf29 100644 --- a/src/helpers/dataHelper.js +++ b/src/helpers/dataHelper.js @@ -60,7 +60,7 @@ export const mapSummaryKeysToPresentationStyle = (data) => { export const mapClinicalKeysToPresentationStyle = (data) => { const result = {}; - result['A1C']= ""; + result['A1c %']= ""; result['Albuminuria (mg)'] = ""; result['Baseline eGFR (ml/min/1.73m2)'] = ""; result['Diabetes Duration (Years)'] = ""; @@ -81,7 +81,7 @@ export const mapClinicalKeysToPresentationStyle = (data) => { return result; } if (data.a1c) { - result['A1C'] = data.a1c ? data.a1c : ""; + result['A1c %'] = data.a1c ? data.a1c : ""; } if (data.albuminuria) { result['Albuminuria (mg)'] = data.albuminuria ? data.albuminuria : ""; From 2ea5382726baecfaa8c23b13a01005d45a89d80d Mon Sep 17 00:00:00 2001 From: dert1129 Date: Fri, 15 Nov 2024 09:51:19 -0500 Subject: [PATCH 4/4] rename On Raas Blockade to On Raas Blockade --- src/helpers/dataHelper.js | 4 ++-- src/helpers/dataHelper.test.js | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/helpers/dataHelper.js b/src/helpers/dataHelper.js index 34cdf29..3857f53 100644 --- a/src/helpers/dataHelper.js +++ b/src/helpers/dataHelper.js @@ -68,7 +68,7 @@ export const mapClinicalKeysToPresentationStyle = (data) => { result['Hypertension Duration (years)'] = ""; result['Hypertension History'] = ""; result['KDIGO Stage'] = ""; - result['On RAAS Blockade'] = ""; + result['RAAS Blockade'] = ""; result['Proteinuria (mg)'] = ""; result['Race'] = ""; result['Age (Years)'] = ""; @@ -105,7 +105,7 @@ export const mapClinicalKeysToPresentationStyle = (data) => { result['KDIGO Stage'] = data.kdigoStage ? data.kdigoStage : ""; } if (data.onRaasBlockade) { - result['On RAAS Blockade'] = data.onRaasBlockade ? data.onRaasBlockade : ""; + result['RAAS Blockade'] = data.onRaasBlockade ? data.onRaasBlockade : ""; } if (data.proteinuria) { result['Proteinuria (mg)'] = data.proteinuria ? data.proteinuria : ""; diff --git a/src/helpers/dataHelper.test.js b/src/helpers/dataHelper.test.js index 38fdc52..c336393 100644 --- a/src/helpers/dataHelper.test.js +++ b/src/helpers/dataHelper.test.js @@ -106,7 +106,7 @@ describe('dataHelper', () => { 'Hypertension Duration (years)': 'test-hypertension_duration', 'Hypertension History': 'test-hypertension_history', 'KDIGO Stage': 'testdkigo_stage', - 'On RAAS Blockade': 'test-on_raas_blockade', + 'RAAS Blockade': 'test-on_raas_blockade', 'Proteinuria (mg)': 'proteinuria', 'Race': 'test-race', 'Age (Years)': 'test-Age', @@ -133,7 +133,7 @@ describe('dataHelper', () => { 'Hypertension Duration (years)': '', 'Hypertension History': '', 'KDIGO Stage': '', - 'On RAAS Blockade': '', + 'RAAS Blockade': '', 'Proteinuria (mg)': '', 'Race': '', 'Age (Years)': '', @@ -157,7 +157,7 @@ describe('dataHelper', () => { 'Hypertension Duration (years)': '', 'Hypertension History': '', 'KDIGO Stage': '', - 'On RAAS Blockade': '', + 'RAAS Blockade': '', 'Proteinuria (mg)': '', 'Race': '', 'Age (Years)': '', @@ -181,7 +181,7 @@ describe('dataHelper', () => { 'Hypertension Duration (years)': '', 'Hypertension History': '', 'KDIGO Stage': '', - 'On RAAS Blockade': '', + 'RAAS Blockade': '', 'Proteinuria (mg)': '', 'Race': '', 'Age (Years)': '',