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..8de9e68 100644 --- a/src/components/SpatialViewer/Facets/AllFacets.js +++ b/src/components/SpatialViewer/Facets/AllFacets.js @@ -71,18 +71,18 @@ class AllFacets extends Component { </AccordionItem> <AccordionItem> <AccordionHeader targetId="5"> - Ethnicity + Race </AccordionHeader> <AccordionBody accordionId="5"> <Row className='mb-2'> <Col> - <Facet field='ethnicity' label='' filterType='any' view={MultiCheckboxFacet}/> + <Facet field='race' label='' filterType='any' view={MultiCheckboxFacet}/> </Col> </Row> </AccordionBody></AccordionItem> <AccordionItem> <AccordionHeader targetId="6"> - A1c % + A1c </AccordionHeader> <AccordionBody accordionId="6"> <Row className='mb-2'> diff --git a/src/helpers/dataHelper.js b/src/helpers/dataHelper.js index 1ab8312..3857f53 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)'] = ""; @@ -68,9 +68,9 @@ 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['Ethnicity'] = ""; + result['Race'] = ""; result['Age (Years)'] = ""; result['Sample Type'] = ""; result['Sex'] = ""; @@ -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 : ""; @@ -105,13 +105,13 @@ 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 : ""; } 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..c336393 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", @@ -106,9 +106,9 @@ 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', - 'Ethnicity': 'test-Ethnicity', + 'Race': 'test-race', 'Age (Years)': 'test-Age', 'Sample Type': 'test-sample_type', 'Sex': 'test-sex', @@ -133,9 +133,9 @@ describe('dataHelper', () => { 'Hypertension Duration (years)': '', 'Hypertension History': '', 'KDIGO Stage': '', - 'On RAAS Blockade': '', + 'RAAS Blockade': '', 'Proteinuria (mg)': '', - 'Ethnicity': '', + 'Race': '', 'Age (Years)': '', 'Sample Type': '', 'Sex': '', @@ -157,9 +157,9 @@ describe('dataHelper', () => { 'Hypertension Duration (years)': '', 'Hypertension History': '', 'KDIGO Stage': '', - 'On RAAS Blockade': '', + 'RAAS Blockade': '', 'Proteinuria (mg)': '', - 'Ethnicity': '', + 'Race': '', 'Age (Years)': '', 'Sample Type': '', 'Sex': '', @@ -181,9 +181,9 @@ describe('dataHelper', () => { 'Hypertension Duration (years)': '', 'Hypertension History': '', 'KDIGO Stage': '', - 'On RAAS Blockade': '', + 'RAAS Blockade': '', 'Proteinuria (mg)': '', - 'Ethnicity': '', + 'Race': '', 'Age (Years)': '', 'Sample Type': '', 'Sex': '',