Merge branch 'develop'

metadatacenter-attic · May 3, 2021 · e1c6f6f · e1c6f6f
2 parents 43aaa75 + 15f3016
commit e1c6f6f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/phs-gdc-dashboard/src/components/AppContent.js b/phs-gdc-dashboard/src/components/AppContent.js
@@ -52,7 +52,7 @@ export default function AppContent() {
         <Grid item md={4}>
           <Card className={classes.card}>
             <Step1
-              title={"Select Index Variable"}
+              title={"Select Locations"}
               setPhsVariableName={setPhsVariableName}
               setPhsVariableValues={setPhsVariableValues}
               showPhsVariableValuesError={showPhsVariableValuesError}
@@ -65,7 +65,7 @@ export default function AppContent() {
         </Grid>
         <Grid item md={4}>
           <Card className={classes.card}>
-            <Step2 title={"Select DC Variables"}
+            <Step2 title={"Select Data Variables"}
                    setDcVariableNames={setDcVariableNames}
                    showDcVariableNamesError={showDcVariableNamesError}
                    validateStep2DcVariableNames={validateStep2DcVariableNames}

diff --git a/phs-gdc-dashboard/src/components/content/Step1.js b/phs-gdc-dashboard/src/components/content/Step1.js
@@ -95,34 +95,34 @@ export default function Step1(props) {
                     >&nbsp;&nbsp;&nbsp;</IconButton>
                   }
       />
-      <p className={"stepSubHeader"}>Select the variable that will link your data to Data Commons</p>
+      <p className={"stepSubHeader"}>Select locations we can use to look up data in Data Commons</p>
       <CardContent>
         <FormControl className={classes.formControl} fullWidth
                      variant="outlined" /* if the variant is omitted here, the label of the select field is misaligned */>
-          <InputLabel id="variable-select-label">Variable</InputLabel>
+          <InputLabel id="location-type-select-label">Location Type</InputLabel>
           <Select
-            labelId="variable-select-label"
-            id="variable-select-id"
+            labelId="location-type-select-label"
+            id="location-type-select-id"
             value={variable}
             onChange={handleChangeVariableSelect}
             variant="outlined"
             className={classes.select}
-            label="Variable">
+            label="Location Type">
             {Object.keys(phsIndexVariables).map((varKey) =>
               <MenuItem key={varKey} value={varKey}
                         disabled={!phsIndexVariables[varKey].enabled}>{phsIndexVariables[varKey].uiLabel}</MenuItem>
             )};
           </Select>
-          <FormHelperText>Select a variable from the list</FormHelperText>
+          <FormHelperText>Select a location type from the list</FormHelperText>
         </FormControl>
         <div className={classes.separator}/>
 
         <FormControl className={classes.formControl} fullWidth>
-          <FormLabel component="legend">Variable values</FormLabel>
+          <FormLabel component="legend">Entering location values</FormLabel>
           <RadioGroup value={valueOptionRadio} onChange={handleChangeValuesOptionRadio}>
-            <FormControlLabel value="optionEnter" control={<Radio color={"primary"}/>} label="Enter values by hand"/>
+            <FormControlLabel value="optionEnter" control={<Radio color={"primary"}/>} label="Enter location values by hand"/>
             <FormControlLabel value="optionSelect" control={<Radio color={"primary"}/>}
-                              label="Use all values from selected locations"/>
+                              label="Use all values from selected region (US states)"/>
           </RadioGroup>
         </FormControl>
 
@@ -174,8 +174,8 @@ export default function Step1(props) {
             renderInput={(params) => (
               <TextField {...params}
                          error={props.showLocationsError}
-                         helperText={"Select locations (US states)"}
-                         variant="outlined" label="Location" placeholder=""/>
+                         helperText={"Select region (US states)"}
+                         variant="outlined" label="States" placeholder=""/>
             )}
           />
         </>

diff --git a/phs-gdc-dashboard/src/components/content/Step2.js b/phs-gdc-dashboard/src/components/content/Step2.js
@@ -34,7 +34,7 @@ export default function Step2(props) {
                     >&nbsp;&nbsp;&nbsp;</IconButton>
                   }
       />
-      <p className={"stepSubHeader"}>Select the Data Commons variables you want to retrieve values from</p>
+      <p className={"stepSubHeader"}>Select Data Commons variables to retrieve values from</p>
       <CardContent>
         <div className={classes.topics}>
 

diff --git a/phs-gdc-dashboard/src/components/content/TopicsTreeSelect.js b/phs-gdc-dashboard/src/components/content/TopicsTreeSelect.js
@@ -29,8 +29,8 @@ export default function TopicsTreeSelect(props) {
         data={statVarsTree}
         onChange={handleChange}
       />
-      <FormHelperText className="helper-text">Search for variables by name or browse the hierarchy. <i>(Note that
-        many variables may not have data. Please see <a href={STATVARS_AVAILABILITY_SHEET} target="_blank">variables-location
+      <FormHelperText className="helper-text">Select from the hierarchy or begin typing variable name. <i>(Many variables 
+        may not have data. Please see <a href={STATVARS_AVAILABILITY_SHEET} target="_blank">variables-location
           availability list</a>.)</i></FormHelperText>
     </div>
   );