@cdc/editor 1.4.2 → 1.4.3

package/src/components/DataImport.js

@@ -1,23 +1,24 @@
-import React, { useState, useContext, useEffect } from 'react';
-import {useDropzone} from 'react-dropzone'
-import {csvParse} from 'd3';
-import { useDebounce } from 'use-debounce';
-import { get } from 'axios';
+import React, { useState, useContext, useEffect } from 'react'
+import { useDropzone } from 'react-dropzone'
+import { csvParse } from 'd3'
+import { useDebounce } from 'use-debounce'
+import { get } from 'axios'
 
-import GlobalState from '../context';
-import '../scss/data-import.scss';
-import TabPane from './TabPane';
-import Tabs from './Tabs';
-import PreviewDataTable from './PreviewDataTable';
+import GlobalState from '../context'
+import '../scss/data-import.scss'
+import TabPane from './TabPane'
+import Tabs from './Tabs'
+import PreviewDataTable from './PreviewDataTable'
 
-import LinkIcon from '../assets/icons/link.svg';
-import FileUploadIcon from '../assets/icons/file-upload-solid.svg';
-import CloseIcon from '@cdc/core/assets/icon-close.svg';
+import LinkIcon from '../assets/icons/link.svg'
+import FileUploadIcon from '../assets/icons/file-upload-solid.svg'
+import CloseIcon from '@cdc/core/assets/icon-close.svg'
 
-import validMapData from '../../example/valid-data-map.csv';
-import validChartData from '../../example/valid-data-chart.csv';
+import validMapData from '../../example/valid-data-map.csv'
+import validChartData from '../../example/valid-data-chart.csv'
+import validCountyMapData from '../../example/valid-county-data.csv'
 
-import { DataTransform } from '@cdc/core/components/DataTransform';
+import { DataTransform } from '@cdc/core/components/DataTransform'
 
 export default function DataImport() {
   const {
@@ -29,238 +30,253 @@ export default function DataImport() {
     maxFileSize,
     setGlobalActive,
     tempConfig,
-    setTempConfig
-  } = useContext(GlobalState);
+    setTempConfig,
+    sharepath
+  } = useContext(GlobalState)
 
-  const transform = new DataTransform();
+  const transform = new DataTransform()
 
-  const [externalURL, setExternalURL] = useState('')
+  const [ externalURL, setExternalURL ] = useState(config.dataFileSourceType === 'url' ? config.dataFileName : (config.dataUrl || ''))
 
-  const [ debouncedExternalURL ] = useDebounce(externalURL, 200);
+  const [ debouncedExternalURL ] = useDebounce(externalURL, 200)
 
-  const [keepURL, setKeepURL] = useState(config.dataUrl || false)
+  const [ keepURL, setKeepURL ] = useState(!!config.dataUrl)
 
   const supportedDataTypes = {
     '.csv': 'text/csv',
     '.json': 'application/json'
-  };
+  }
 
   useEffect(() => {
-    if(true === keepURL) {
-      setConfig({...config, dataUrl: debouncedExternalURL})
+    if (false !== keepURL) {
+      setConfig({ ...config, dataUrl: debouncedExternalURL || externalURL })
+    } else {
+      let newConfig = {...config};
+      delete newConfig.dataUrl;
+      setConfig(newConfig);
     }
-  }, [debouncedExternalURL, keepURL])
+  }, [ debouncedExternalURL, keepURL ])
 
   /**
    * Check to see all series for the viz exists in the new dataset
    */
   const dataExists = (newData, oldSeries, oldAxisX) => {
-    
+
     // Loop through old series to make sure each exists in the new data
-    oldSeries.map(function(currentValue, index, newData){
-      if( ! newData.find( element => element.dataKey === currentValue.dataKey ) )
-        return false;
+    oldSeries.map(function (currentValue, index, newData) {
+      if (!newData.find(element => element.dataKey === currentValue.dataKey))
+        return false
     })
 
     // Is the X Axis still in the dataset?
-    if( newData.columns.indexOf(oldAxisX) < 0 )
-      return false;
+    if (newData.columns.indexOf(oldAxisX) < 0)
+      return false
 
-    return true;
+    return true
   }
 
   const loadExternal = async () => {
-    let dataURL = '';
+    let dataURL = ''
     // Is URL valid?
     try {
-      dataURL = new URL(externalURL);
+      dataURL = new URL(externalURL)
     } catch {
       throw errorMessages.urlInvalid
     }
-    let responseBlob = null;
+    let responseBlob = null
 
     const fileExtension = Object.keys(supportedDataTypes).find(extension => dataURL.pathname.endsWith(extension))
 
     try {
-      const response = await get( dataURL,
+      const response = await get(dataURL,
         {
           responseType: 'blob'
         })
         .then((response) => {
-          responseBlob = response.data;
+          responseBlob = response.data
 
           // Sometimes the files are coming in as plain text types... Maybe when saved from Macs
-          if ( fileExtension === ".csv" && responseBlob.type === "text/plain" ) {
-            responseBlob = responseBlob.slice(0, responseBlob.size, "text/csv")
-          } else if ( fileExtension === ".json" && responseBlob.type === "text/plain" ) {
-            responseBlob = responseBlob.slice(0, responseBlob.size, "application/json")
+          if (fileExtension === '.csv' && responseBlob.type === 'text/plain') {
+            responseBlob = responseBlob.slice(0, responseBlob.size, 'text/csv')
+          } else if (fileExtension === '.json' && responseBlob.type === 'text/plain') {
+            responseBlob = responseBlob.slice(0, responseBlob.size, 'application/json')
           }
-        });
+        })
     } catch (err) {
       console.error(err)
 
-      const error = err.toString();
+      const error = err.toString()
 
-      if( Object.values(errorMessages).includes(err) ) {
+      if (Object.values(errorMessages).includes(err)) {
         throw error
       }
 
       throw errorMessages.failedFetch
     }
-    
-    return responseBlob;
+
+    return responseBlob
   }
 
-  const onDrop = ([uploadedFile]) => loadData(uploadedFile)
+  const onDrop = ([ uploadedFile ]) => loadData(uploadedFile)
 
   /**
    * Handle loading data
    */
   const loadData = async (fileBlob = null, fileName) => {
-    let fileData = fileBlob;
-    let fileSource = fileData?.path ?? fileName ?? null;
-    let fileSourceType = 'file';
+    let fileData = fileBlob
+    let fileSource = fileData?.path ?? fileName ?? null
+    let fileSourceType = 'file'
 
     // Get the raw data as text from the file
-    if(null === fileData) {
-      fileSourceType = 'url';
+    if (null === fileData) {
+      fileSourceType = 'url'
       try {
-        fileData = await loadExternal();
-        fileSource = externalURL;        
+        fileData = await loadExternal()
+        fileSource = externalURL
       } catch (error) {
-        setErrors([error]);
-        return;
+        setErrors([ error ])
+        return
       }
     }
 
     // Check if file is too big
-    if(fileData.size > (maxFileSize * 1048576) ) {
-      setErrors([errorMessages.fileTooLarge]);
-      return;
+    if (fileData.size > (maxFileSize * 1048576)) {
+      setErrors([ errorMessages.fileTooLarge ])
+      return
     }
 
     let path = fileBlob?.name || externalURL || fileName
-    let fileExtension = path.match(/(?:\.([^.]+))?$/g);
+    let fileExtension = path.match(/(?:\.([^.]+))?$/g)
 
-    if(fileExtension.length === 0) {
+    if (fileExtension.length === 0) {
       fileExtension = '.csv'
     } else {
       fileExtension = fileExtension[0]
     }
 
-    let mimeType = supportedDataTypes[fileExtension];
+    let mimeType = supportedDataTypes[fileExtension]
 
     // Convert from blob into raw text
     // Have to use FileReader instead of just .text because IE11 and the polyfills for this are bugged
-    let filereader = new FileReader();
+    let filereader = new FileReader()
 
     // Set encoding for CSV files - needed to render special characters properly
-    let encoding = ( mimeType === 'text/csv' ) ? 'ISO-8859-1' : '';
+    let encoding = (mimeType === 'text/csv') ? 'ISO-8859-1' : ''
 
-    filereader.onload = function() {
+    filereader.onload = function () {
       let text = this.result
 
       switch (mimeType) {
-        case 'text/csv': 
-          text = csvParse(text);
-          break;
+        case 'text/csv':
+          text = csvParse(text)
+          break
         case 'text/plain':
         case 'application/json':
           try {
-            text = JSON.parse(text);
-          } catch (errors) { 
-            setErrors([errorMessages.formatting]);
-            return;
+            text = JSON.parse(text)
+          } catch (errors) {
+            setErrors([ errorMessages.formatting ])
+            return
           }
-          break;
+          break
         default:
-          setErrors([errorMessages.fileType]);
-          return;
+          setErrors([ errorMessages.fileType ])
+          return
       }
-  
+
       // Validate parsed data and set if no issues.
       try {
-        text = transform.autoStandardize(text);
+        text = transform.autoStandardize(text)
 
         if (config.data && config.series) {
           if (dataExists(text, config.series, config?.xAxis.dataKey)) {
             setConfig({
-              ...config, 
-              ...tempConfig, 
-              data:text, // new data
-              dataFileName:fileSource, // new file source
-              dataFileSourceType:fileSourceType ,// new file source type
+              ...config,
+              ...tempConfig,
+              data: text, // new data
+              dataFileName: fileSource, // new file source
+              dataFileSourceType: fileSourceType,// new file source type
             })
           } else {
-            resetEditor({data:text, dataFileName:fileSource, dataFileSourceType:fileSourceType }, 'It appears that your data does not contain all of the columns that your last dataset contained. Continuing will reset your configuration. Do you want to continue?');
+            resetEditor({
+              data: text,
+              dataFileName: fileSource,
+              dataFileSourceType: fileSourceType
+            }, 'It appears that your data does not contain all of the columns that your last dataset contained. Continuing will reset your configuration. Do you want to continue?')
           }
         } else {
-            setConfig({...config, data:text, dataFileName:fileSource, dataFileSourceType:fileSourceType });
+          setConfig({ ...config, data: text, dataFileName: fileSource, dataFileSourceType: fileSourceType })
         }
       } catch (err) {
-          setErrors(err);
+        setErrors(err)
       }
 
     }
-      filereader.readAsText(fileData, encoding)
+    filereader.readAsText(fileData, encoding)
   }
 
   useEffect(() => {
-    let newConfig = {...config}
-    if(tempConfig !== null) {
-      newConfig = {...tempConfig}
-      
+    let newConfig = { ...config }
+    if (tempConfig !== null) {
+      newConfig = { ...tempConfig }
     }
 
-    if(undefined === config.formattedData && config.dataDescription) {
+    if (undefined === config.formattedData && config.dataDescription) {
       const formattedData = transform.developerStandardize(config.data, config.dataDescription)
-      
-      if(formattedData) newConfig.formattedData = formattedData
+
+      if (formattedData) newConfig.formattedData = formattedData
     }
 
-    if(tempConfig !== null) setTempConfig(null)
+    if (tempConfig !== null) setTempConfig(null)
 
     setConfig(newConfig)
-  }, []);
+  }, [])
 
   const updateDescriptionProp = (key, value) => {
-    let dataDescription = {...config.dataDescription, [key]: value}
+    let dataDescription = { ...config.dataDescription, [key]: value }
     let formattedData = transform.developerStandardize(config.data, dataDescription)
 
-    setConfig({...config, formattedData, dataDescription})
-  };
+    setConfig({ ...config, formattedData, dataDescription })
+  }
 
-  const {getRootProps, getInputProps, isDragActive} = useDropzone({onDrop});
+  const { getRootProps, getInputProps, isDragActive } = useDropzone({ onDrop })
 
   const loadFileFromUrl = (url) => {
-    const extUrl = (url) ? url : config.dataFileName; // set url to what is saved in config unless the user has entered something
+    // const extUrl = (url) ? url : config.dataFileName // set url to what is saved in config unless the user has entered something
+    
     return (
       <>
         <form className="input-group d-flex" onSubmit={(e) => e.preventDefault()}>
-          <input id="external-data" type="text" className="form-control flex-grow-1 border-right-0" placeholder="e.g., https://data.cdc.gov/resources/file.json" aria-label="Load data from external URL" aria-describedby="load-data" value={extUrl} onChange={(e) => setExternalURL(e.target.value)} />
-          <button className="input-group-text btn btn-primary px-4" type="submit" id="load-data" onClick={() => loadData( null, externalURL )}>Load</button>
+          <input id="external-data" type="text" className="form-control flex-grow-1 border-right-0"
+                 placeholder="e.g., https://data.cdc.gov/resources/file.json" aria-label="Load data from external URL"
+                 aria-describedby="load-data" value={externalURL} onChange={(e) => setExternalURL(e.target.value)}/>
+          <button className="input-group-text btn btn-primary px-4" type="submit" id="load-data"
+                  onClick={() => loadData(null, externalURL)}>Load
+          </button>
         </form>
         <label htmlFor="keep-url" className="mt-1 d-flex keep-url">
-          <input type="checkbox" id="keep-url" defaultChecked={keepURL} onClick={() => setKeepURL(!keepURL)} /> Always load from URL (normally will only pull once)
+          <input type="checkbox" id="keep-url" checked={keepURL} onChange={() => setKeepURL(!keepURL)}/> Always
+          load from URL (normally will only pull once)
         </label>
       </>
     )
   }
 
-  const resetEditor = ( config = {}, message = 'Are you sure you want to do this?' ) => {
-    config.newViz = true;
-    const confirmDataReset = window.confirm(message);
-            
+  const resetEditor = (config = {}, message = 'Are you sure you want to do this?') => {
+    config.newViz = true
+    const confirmDataReset = window.confirm(message)
+
     if (confirmDataReset === true) {
-      setTempConfig(null);
-      setConfig(config);
-    } 
+      setTempConfig(null)
+      setConfig(config)
+    }
   }
 
   const resetButton = () => {
     return ( //todo convert to modal
-       <button className="btn danger" onClick={() => resetEditor( {}, 'Reseting will remove your data and settings. Do you want to continue?') }>Clear 
-        <CloseIcon />
+      <button className="btn danger"
+              onClick={() => resetEditor({}, 'Reseting will remove your data and settings. Do you want to continue?')}>Clear
+        <CloseIcon/>
       </button>
     )
   }
@@ -268,36 +284,55 @@ export default function DataImport() {
   return (
     <>
       <div className="left-col">
-        { (!config.data || !config.dataFileSourceType) && (   // dataFileSourceType needs to be checked here since earlier versions did not track this state
+        {(!config.data || !config.dataFileSourceType) && (   // dataFileSourceType needs to be checked here since earlier versions did not track this state
           <div className="load-data-area">
             <Tabs>
-              <TabPane title="Upload File" icon={<FileUploadIcon className="inline-icon" />}>
-                <div className={isDragActive ? 'drag-active cdcdataviz-file-selector' : 'cdcdataviz-file-selector'} {...getRootProps()}>
+              <TabPane title="Upload File" icon={<FileUploadIcon className="inline-icon"/>}>
+                {sharepath &&
+                  <p className="alert--info">
+                    The share path set for this website is: {sharepath}
+                  </p>
+                }
+                <div
+                  className={isDragActive ? 'drag-active cdcdataviz-file-selector' : 'cdcdataviz-file-selector'} {...getRootProps()}>
                   <input {...getInputProps()} />
                   {
                     isDragActive ?
-                    <p>Drop file here</p> :
-                    <p>Drag file to this area, or <span>select a file</span>.</p>
+                      <p>Drop file here</p> :
+                      <p>Drag file to this area, or <span>select a file</span>.</p>
                   }
                 </div>
               </TabPane>
-              <TabPane title="Load from URL" icon={<LinkIcon className="inline-icon" />}>
+              <TabPane title="Load from URL" icon={<LinkIcon className="inline-icon"/>}>
                 {loadFileFromUrl(externalURL)}
               </TabPane>
             </Tabs>
             {errors && (errors.map ? errors.map((message, index) => (
               <div className="error-box slim mt-2" key={`error-${message}`}>
-                <span>{message}</span> <CloseIcon className='inline-icon dismiss-error' onClick={() => setErrors( errors.filter((val, i) => i !== index) )} />
+                <span>{message}</span> <CloseIcon className="inline-icon dismiss-error"
+                                                  onClick={() => setErrors(errors.filter((val, i) => i !== index))}/>
               </div>
             )) : errors.message)}
-            <p className="footnote">Supported file types: {Object.keys(supportedDataTypes).join(', ')}. Maximum file size {maxFileSize}MB.</p>
+            <p className="footnote">Supported file types: {Object.keys(supportedDataTypes).join(', ')}. Maximum file
+              size {maxFileSize}MB.</p>
             {/* TODO: Add more sample data in, but this will do for now. */}
             <span className="heading-3">Load Sample Data:</span>
             <ul className="sample-data-list">
-              <li onClick={() => loadData(new Blob([validMapData], {type : 'text/csv'}), 'valid-data-map.csv')}>United States Sample Data #1</li>
-              <li onClick={() => loadData(new Blob([validChartData], {type : 'text/csv'}), 'valid-data-chart.csv')}>Chart Sample Data</li>
+              <li
+                onClick={() => loadData(new Blob([ validMapData ], { type: 'text/csv' }), 'valid-data-map.csv')}>United
+                States Sample Data #1
+              </li>
+              <li
+                onClick={() => loadData(new Blob([ validChartData ], { type: 'text/csv' }), 'valid-data-chart.csv')}>Chart
+                Sample Data
+              </li>
+              <li
+                onClick={() => loadData(new Blob([ validCountyMapData ], { type: 'text/csv' }), 'valid-county-data.csv')}>United
+                States Counties Sample Data
+              </li>
             </ul>
-            <a href="https://www.cdc.gov/wcms/4.0/cdc-wp/data-presentation/data-map.html" target="_blank" rel="noopener noreferrer" className="guidance-link">
+            <a href="https://www.cdc.gov/wcms/4.0/cdc-wp/data-presentation/data-map.html" target="_blank"
+               rel="noopener noreferrer" className="guidance-link">
               <div>
                 <h3>Get Help</h3>
                 <p>Documentation and examples on formatting data and configuring visualizations.</p>
@@ -310,82 +345,91 @@ export default function DataImport() {
           <div>
             <div className="heading-3">Data Source</div>
             <div className="file-loaded-area">
-                {config.dataFileSourceType === 'file' && (
-                  <div className="data-source-options">
-                    <div className={isDragActive ? 'drag-active cdcdataviz-file-selector loaded-file' : 'cdcdataviz-file-selector loaded-file'} {...getRootProps()}>
-                      <input {...getInputProps()} />
-                      {
-                        isDragActive ?
+              {config.dataFileSourceType === 'file' && (
+                <div className="data-source-options">
+                  <div
+                    className={isDragActive ? 'drag-active cdcdataviz-file-selector loaded-file' : 'cdcdataviz-file-selector loaded-file'} {...getRootProps()}>
+                    <input {...getInputProps()} />
+                    {
+                      isDragActive ?
                         <p>Drop file here</p> :
-                        <p><FileUploadIcon /> <span>{config.dataFileName ?? 'Replace data file'}</span></p>
-                      }
-                    </div>
-                    <div>
+                        <p><FileUploadIcon/> <span>{config.dataFileName ?? 'Replace data file'}</span></p>
+                    }
+                  </div>
+                  <div>
                     {resetButton()}
-                    </div>
                   </div>
-                )} 
-                
-                {config.dataFileSourceType === 'url' && (
-                  <div className="url-source-options">
-                    <div>
-                      {loadFileFromUrl(externalURL)}
-                    </div>
-                    <div>
-                      {resetButton()}
-                    </div>
+                </div>
+              )}
+
+              {config.dataFileSourceType === 'url' && (
+                <div className="url-source-options">
+                  <div>
+                    {loadFileFromUrl(externalURL)}
                   </div>
-                )}
+                  <div>
+                    {resetButton()}
+                  </div>
+                </div>
+              )}
             </div>
             <div className="question">
               <div className="heading-3">Describe Data</div>
               <div className="heading-4 data-question">Data Orientation</div>
               <div className="table-button-container">
-                <div className={'table-button' + (config.dataDescription && config.dataDescription.horizontal === false ? ' active' : '')} onClick={() => {updateDescriptionProp('horizontal', false)}}>
+                <div
+                  className={'table-button' + (config.dataDescription && config.dataDescription.horizontal === false ? ' active' : '')}
+                  onClick={() => {
+                    updateDescriptionProp('horizontal', false)
+                  }}>
                   <strong>Vertical</strong>
-                  <p>Geography/X-axis values are contained on a single column.</p>
+                  <p>Values for map geography or chart date/category axis are contained in a single <em>column</em>.</p>
                   <table>
                     <tbody>
-                      <tr>
-                          <th>Date</th>
-                          <th>Value</th>
-                          <th>...</th>
-                      </tr>
-                      <tr>
-                          <td>01/01/2020</td>
-                          <td>150</td>
-                          <td>...</td>
-                      </tr>
-                      <tr>
-                          <td>02/01/2020</td>
-                          <td>150</td>
-                          <td>...</td>
-                      </tr>
+                    <tr>
+                      <th>Date</th>
+                      <th>Value</th>
+                      <th>...</th>
+                    </tr>
+                    <tr>
+                      <td>01/01/2020</td>
+                      <td>150</td>
+                      <td>...</td>
+                    </tr>
+                    <tr>
+                      <td>02/01/2020</td>
+                      <td>150</td>
+                      <td>...</td>
+                    </tr>
                     </tbody>
                   </table>
                   <table>
                     <tbody>
-                      <tr>
-                          <th>State</th>
-                          <th>Value</th>
-                          <th>...</th>
-                      </tr>
-                      <tr>
-                          <td>Georgia</td>
-                          <td>150</td>
-                          <td>...</td>
-                      </tr>
-                      <tr>
-                          <td>Florida</td>
-                          <td>150</td>
-                          <td>...</td>
-                      </tr>
+                    <tr>
+                      <th>State</th>
+                      <th>Value</th>
+                      <th>...</th>
+                    </tr>
+                    <tr>
+                      <td>Georgia</td>
+                      <td>150</td>
+                      <td>...</td>
+                    </tr>
+                    <tr>
+                      <td>Florida</td>
+                      <td>150</td>
+                      <td>...</td>
+                    </tr>
                     </tbody>
                   </table>
                 </div>
-                <div className={'table-button' + (config.dataDescription && config.dataDescription.horizontal === true ? ' active' : '')} onClick={() => {updateDescriptionProp('horizontal', true)}}>
+                <div
+                  className={'table-button' + (config.dataDescription && config.dataDescription.horizontal === true ? ' active' : '')}
+                  onClick={() => {
+                    updateDescriptionProp('horizontal', true)
+                  }}>
                   <strong>Horizontal</strong>
-                  <p>Geography/X-axis values are contained on a single row.</p>
+                  <p>Values for map geography or chart date/category axis are contained in a single <em>row</em></p>
                   <table>
                       <tbody>
                         <tr>
@@ -404,153 +448,154 @@ export default function DataImport() {
                   </table>
                   <table>
                     <tbody>
-                      <tr>
-                          <th>State</th>
-                          <td>Georgia</td>
-                          <td>Florida</td>
-                          <td>...</td>
-                      </tr>
-                      <tr>
-                          <th>Value</th>
-                          <td>100</td>
-                          <td>150</td>
-                          <td>...</td>
-                      </tr>
+                    <tr>
+                      <th>State</th>
+                      <td>Georgia</td>
+                      <td>Florida</td>
+                      <td>...</td>
+                    </tr>
+                    <tr>
+                      <th>Value</th>
+                      <td>100</td>
+                      <td>150</td>
+                      <td>...</td>
+                    </tr>
                     </tbody>
                   </table>
                 </div>
               </div>
             </div>
             {config.dataDescription && (
-                <>
+              <>
+                <div className="question">
+                  <div className="heading-4 data-question">Are there multiple series represented in your data?</div>
+                  <div>
+                    <button className={config.dataDescription.series === true ? 'btn btn-primary active' : 'btn btn-primary'} style={{ marginRight: '.5em' }} onClick={() => { updateDescriptionProp('series', true) }}>Yes</button>
+                    <button className={config.dataDescription.series === false ? 'btn btn-primary active' : 'btn btn-primary'} onClick={() => {updateDescriptionProp('series', false)}}>No</button>
+                  </div>
+                </div>
+                {config.dataDescription.horizontal === true && config.dataDescription.series === true && (
+                  <div className="question">
+                    <div className="heading-4 data-question">Which property in the dataset represents which series the row is describing?</div>
+                    <select onChange={(e) => {updateDescriptionProp('seriesKey', e.target.value)}} value={config.dataDescription.seriesKey}>
+                      <option value="">Choose an option</option>
+                      {Object.keys(config.data[0]).map((value, index) => <option value={value} key={index}>{value}</option>)}
+                    </select>
+                  </div>
+                )}
+                {config.dataDescription.horizontal === false && config.dataDescription.series === true && (
+                  <>
                     <div className="question">
-                        <div className="heading-4 data-question">Are there multiple series represented in your data?</div>
-                        <div>
-                            <button className={config.dataDescription.series === true ? 'btn btn-primary active' : 'btn btn-primary'} style={{marginRight: '.5em'}} onClick={() => {updateDescriptionProp('series', true)}}>Yes</button>
-                            <button className={config.dataDescription.series === false ? 'btn btn-primary active' : 'btn btn-primary'} onClick={() => {updateDescriptionProp('series', false)}}>No</button>
+                      <div className="heading-4 data-question">Are the series values in your data represented in a single row, or across multiple rows?</div>
+                      <div className="table-button-container">
+                        <div className={'table-button' + (config.dataDescription.singleRow === true ? ' active' : '')} onClick={() => {updateDescriptionProp('singleRow', true)}}>
+                          <p>Each row contains the data for an individual series in itself.</p>
+                          <table>
+                            <tbody>
+                            <tr>
+                              <th>Date</th>
+                              <th>Virus 1</th>
+                              <th>Virus 2</th>
+                              <th>...</th>
+                            </tr>
+                            <tr>
+                              <td>01/01/2020</td>
+                              <td>100</td>
+                              <td>150</td>
+                              <td>...</td>
+                            </tr>
+                            <tr>
+                              <td>02/01/2020</td>
+                              <td>15</td>
+                              <td>20</td>
+                              <td>...</td>
+                            </tr>
+                            </tbody>
+                          </table>
                         </div>
+                        <div className={'table-button' + (config.dataDescription.singleRow === false ? ' active' : '')} onClick={() => {updateDescriptionProp('singleRow', false)}}>
+                          <p>Each series data is broken out into multiple rows.</p>
+                          <table>
+                            <tbody>
+                            <tr>
+                              <th>Virus</th>
+                              <th>Date</th>
+                              <th>Value</th>
+                            </tr>
+                            <tr>
+                              <td>Virus 1</td>
+                              <td>01/01/2020</td>
+                              <td>100</td>
+                            </tr>
+                            <tr>
+                              <td>Virus 1</td>
+                              <td>02/01/2020</td>
+                              <td>150</td>
+                            </tr>
+                            <tr>
+                              <td>...</td>
+                              <td>...</td>
+                              <td>...</td>
+                            </tr>
+                            <tr>
+                              <td>Virus 2</td>
+                              <td>01/01/2020</td>
+                              <td>15</td>
+                            </tr>
+                            <tr>
+                              <td>Virus 2</td>
+                              <td>02/01/2020</td>
+                              <td>20</td>
+                            </tr>
+                            <tr>
+                              <td>...</td>
+                              <td>...</td>
+                              <td>...</td>
+                            </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                      </div>
                     </div>
-                    {config.dataDescription.horizontal === true && config.dataDescription.series === true && (
-                      <div className="question">
-                        <div className="heading-4 data-question">Which property in the dataset represents which series the row is describing?</div>
-                        <select onChange={(e) => { updateDescriptionProp('seriesKey', e.target.value) }} value={config.dataDescription.seriesKey}>
+                    {config.dataDescription.singleRow === false && (
+                      <>
+                        <div className="question">
+                          <div className="heading-4 data-question">Which property in the dataset represents which series the row is describing?</div>
+                          <select onChange={(e) => {updateDescriptionProp('seriesKey', e.target.value)}}>
                             <option value="">Choose an option</option>
-                            {Object.keys(config.data[0]).map(key => <option value={key}>{key}</option>)}
-                        </select>
-                      </div>
-                    )}
-                    {config.dataDescription.horizontal === false && config.dataDescription.series === true && (
-                        <>
-                            <div className="question">
-                                <div className="heading-4 data-question">Are the series values in your data represented in a single row, or across multiple rows?</div>
-                                <div className="table-button-container">
-                                  <div className={'table-button' + (config.dataDescription.singleRow === true ? ' active' : '')} onClick={() => {updateDescriptionProp('singleRow', true)}}>
-                                      <p>Each row contains the data for an individual series in itself.</p>
-                                      <table>
-                                          <tbody>
-                                            <tr>
-                                                <th>Virus</th>
-                                                <th>01/01/2020</th>
-                                                <th>02/01/2020</th>
-                                                <th>...</th>
-                                            </tr>
-                                            <tr>
-                                                <td>Virus 1</td>
-                                                <td>100</td>
-                                                <td>150</td>
-                                                <td>...</td>
-                                            </tr>
-                                            <tr>
-                                                <td>Virus 2</td>
-                                                <td>15</td>
-                                                <td>20</td>
-                                                <td>...</td>
-                                            </tr>
-                                          </tbody>
-                                      </table>
-                                  </div>
-                                  <div className={'table-button' + (config.dataDescription.singleRow === false ? ' active' : '')} onClick={() => {updateDescriptionProp('singleRow', false)}}>
-                                      <p>Each series data is broken out into multiple rows.</p>
-                                      <table>
-                                          <tbody>
-                                            <tr>
-                                                <th>Virus</th>
-                                                <th>Date</th>
-                                                <th>Value</th>
-                                            </tr>
-                                            <tr>
-                                                <td>Virus 1</td>
-                                                <td>01/01/2020</td>
-                                                <td>100</td>
-                                            </tr>
-                                            <tr>
-                                                <td>Virus 1</td>
-                                                <td>02/01/2020</td>
-                                                <td>150</td>
-                                            </tr>
-                                            <tr>
-                                                <td>...</td>
-                                                <td>...</td>
-                                                <td>...</td>
-                                            </tr>
-                                            <tr>
-                                                <td>Virus 2</td>
-                                                <td>01/01/2020</td>
-                                                <td>15</td>
-                                            </tr>
-                                            <tr>
-                                                <td>Virus 2</td>
-                                                <td>02/01/2020</td>
-                                                <td>20</td>
-                                            </tr>
-                                            <tr>
-                                                <td>...</td>
-                                                <td>...</td>
-                                                <td>...</td>
-                                            </tr>
-                                          </tbody>
-                                      </table>
-                                  </div>
-                                </div>
-                            </div>
-                            {config.dataDescription.singleRow === false && (
-                                <>
-                                    <div className="question">
-                                        <div className="heading-4 data-question">Which property in the dataset represents which series the row is describing?</div>
-                                        <select onChange={(e) => {updateDescriptionProp('seriesKey', e.target.value)}}>
-                                            <option value="">Choose an option</option>
-                                            {Object.keys(config.data[0]).map(key => <option value={key}>{key}</option>)}
-                                        </select>
-                                    </div>
-                                    <div className="question">
-                                        <div className="heading-4 data-question">Which property in the dataset represents the X-axis, or geography value?</div>
-                                        <select onChange={(e) => {updateDescriptionProp('xKey', e.target.value)}}>
-                                            <option value="">Choose an option</option>
-                                            {Object.keys(config.data[0]).map(key => <option value={key}>{key}</option>)}
-                                        </select>
-                                    </div>
-                                    <div className="question">
-                                        <div className="heading-4 data-question">Which property in the dataset represents the numeric value?</div>
-                                        <select onChange={(e) => {updateDescriptionProp('valueKey', e.target.value)}}>
-                                            <option value="">Choose an option</option>
-                                            {Object.keys(config.data[0]).map(key => <option value={key}>{key}</option>)}
-                                        </select>
-                                    </div>
-                                </>
-                            )}
-                        </>
+                            {Object.keys(config.data[0]).map((value, index) => <option value={value} key={index}>{value}</option>)}
+                          </select>
+                        </div>
+                        <div className="question">
+                          <div className="heading-4 data-question">Which property in the dataset represents the values for the category/date axis or map geography?</div>
+                          <select onChange={(e) => {updateDescriptionProp('xKey', e.target.value)}}>
+                            <option value="">Choose an option</option>
+                            {Object.keys(config.data[0]).map((value, index) => <option value={value} key={index}>{value}</option>)}
+                          </select>
+                        </div>
+                        <div className="question">
+                          <div className="heading-4 data-question">Which property in the dataset represents the numeric value?</div>
+                          <select onChange={(e) => {updateDescriptionProp('valueKey', e.target.value)}}>
+                            <option value="">Choose an option</option>
+                            {Object.keys(config.data[0]).map((value, index) => <option value={value} key={index}>{value}</option>)}
+                          </select>
+                        </div>
+                      </>
                     )}
-                </>
+                  </>
+                )}
+              </>
             )}
             {config.formattedData && (
-              <button className="btn btn-primary" style={{float: 'right', marginBottom: '2em'}} onClick={() => setGlobalActive(1)}>Select your visualization type &raquo;</button>
+              <button className="btn btn-primary" style={{ float: 'right', marginBottom: '2em' }}
+                      onClick={() => setGlobalActive(1)}>Select your visualization type &raquo;</button>
             )}
-        </div>
+          </div>
         )}
       </div>
       <div className="right-col">
-        <PreviewDataTable data={config.data} />
+        <PreviewDataTable data={config.data}/>
       </div>
     </>
-  );
+  )
 }