@cdc/chart 4.22.10 → 4.23.1

package/src/components/EditorPanel.js

@@ -1,46 +1,42 @@
 import React, { useState, useEffect, useCallback, memo, useContext } from 'react'
 import { DragDropContext, Droppable, Draggable } from 'react-beautiful-dnd'
 
-import {
-  Accordion,
-  AccordionItem,
-  AccordionItemHeading,
-  AccordionItemPanel,
-  AccordionItemButton,
-} from 'react-accessible-accordion'
+import { Accordion, AccordionItem, AccordionItemHeading, AccordionItemPanel, AccordionItemButton } from 'react-accessible-accordion'
 
-import { timeParse, timeFormat } from 'd3-time-format'
-import { useDebounce, useDebouncedCallback } from 'use-debounce'
+import { useDebounce } from 'use-debounce'
 
 import Context from '../context'
 import WarningImage from '../images/warning.svg'
-import AdvancedEditor from '@cdc/core/components/AdvancedEditor';
+import AdvancedEditor from '@cdc/core/components/AdvancedEditor'
 
-import ErrorBoundary from '@cdc/core/components/ErrorBoundary';
-import Waiting from '@cdc/core/components/Waiting';
-import QuestionIcon from '@cdc/core/assets/icon-question-circle.svg'; //TODO: Update with Icon component
-import {useColorPalette} from '../hooks/useColorPalette';
+import ErrorBoundary from '@cdc/core/components/ErrorBoundary'
+import { useColorPalette } from '../hooks/useColorPalette'
 
-import InputCheckbox from '@cdc/core/components/inputs/InputCheckbox';
-import InputToggle from '@cdc/core/components/inputs/InputToggle';
+import InputToggle from '@cdc/core/components/inputs/InputToggle'
 import Tooltip from '@cdc/core/components/ui/Tooltip'
 import Icon from '@cdc/core/components/ui/Icon'
-import useReduceData from '../hooks/useReduceData';
+import useReduceData from '../hooks/useReduceData'
+import useRightAxis from '../hooks/useRightAxis'
 
-const TextField = memo(({label, tooltip, section = null, subsection = null, fieldName, updateField, value: stateValue, type = "input", i = null, min = null, ...attributes}) => {
-  const [ value, setValue ] = useState(stateValue); 
+// TODO: Remove unused imports
+// TDOO: Move inline styles to a scss file
 
-  const [ debouncedValue ] = useDebounce(value, 500);
+/* eslint-disable react-hooks/rules-of-hooks */
+
+const TextField = memo(({ label, tooltip, section = null, subsection = null, fieldName, updateField, value: stateValue, type = 'input', i = null, min = null, ...attributes }) => {
+  const [value, setValue] = useState(stateValue)
+
+  const [debouncedValue] = useDebounce(value, 500)
 
   useEffect(() => {
     if ('string' === typeof debouncedValue && stateValue !== debouncedValue) {
       updateField(section, subsection, fieldName, debouncedValue, i)
     }
-  }, [ debouncedValue ])
+  }, [debouncedValue]) // eslint-disable-line
 
   let name = subsection ? `${section}-${subsection}-${fieldName}` : `${section}-${subsection}-${fieldName}`
 
-  const onChange = (e) => {
+  const onChange = e => {
     if ('number' !== type || min === null) {
       setValue(e.target.value)
     } else {
@@ -52,52 +48,79 @@ const TextField = memo(({label, tooltip, section = null, subsection = null, fiel
     }
   }
 
-  let formElement = <input type="text" name={name} onChange={onChange} {...attributes} value={value}/>
+  let formElement = <input type='text' name={name} onChange={onChange} {...attributes} value={value} />
 
   if ('textarea' === type) {
-    formElement = (
-      <textarea name={name} onChange={onChange} {...attributes} value={value}></textarea>
-    )
+    formElement = <textarea name={name} onChange={onChange} {...attributes} value={value}></textarea>
   }
 
   if ('number' === type) {
-    formElement = <input type="number" name={name} onChange={onChange} {...attributes} value={value}/>
+    formElement = <input type='number' name={name} onChange={onChange} {...attributes} value={value} />
   }
 
   if ('date' === type) {
-    formElement = <input type="date" name={name} onChange={onChange} {...attributes} value={value}/>
+    formElement = <input type='date' name={name} onChange={onChange} {...attributes} value={value} />
   }
 
   return (
     <label>
-      <span className="edit-label column-heading">{label}{tooltip}</span>
+      <span className='edit-label column-heading'>
+        {label}
+        {tooltip}
+      </span>
       {formElement}
     </label>
   )
 })
 
 const CheckBox = memo(({ label, value, fieldName, section = null, subsection = null, tooltip, updateField, ...attributes }) => (
-  <label className="checkbox">
-    <input type="checkbox" name={fieldName} checked={value} onChange={() => {
-      updateField(section, subsection, fieldName, !value)
-    }} {...attributes}/>
-    <span className="edit-label">{label}{tooltip}</span>
+  <label className='checkbox'>
+    <input
+      type='checkbox'
+      name={fieldName}
+      checked={value}
+      onChange={() => {
+        updateField(section, subsection, fieldName, !value)
+      }}
+      {...attributes}
+    />
+    <span className='edit-label'>
+      {label}
+      {tooltip}
+    </span>
   </label>
 ))
 
 const Select = memo(({ label, value, options, fieldName, section = null, subsection = null, required = false, tooltip, updateField, initial: initialValue, ...attributes }) => {
-  let optionsJsx = options.map((optionName, index) => <option value={optionName} key={index}>{optionName}</option>)
+  let optionsJsx = options.map((optionName, index) => (
+    <option value={optionName} key={index}>
+      {optionName}
+    </option>
+  ))
 
   if (initialValue) {
-    optionsJsx.unshift(<option value="" key="initial">{initialValue}</option>)
+    optionsJsx.unshift(
+      <option value='' key='initial'>
+        {initialValue}
+      </option>
+    )
   }
 
   return (
     <label>
-      <span className="edit-label">{label}{tooltip}</span>
-      <select className={required && !value ? 'warning' : ''} name={fieldName} value={value} onChange={(event) => {
-        updateField(section, subsection, fieldName, event.target.value)
-      }} {...attributes}>
+      <span className='edit-label'>
+        {label}
+        {tooltip}
+      </span>
+      <select
+        className={required && !value ? 'warning' : ''}
+        name={fieldName}
+        value={value}
+        onChange={event => {
+          updateField(section, subsection, fieldName, event.target.value)
+        }}
+        {...attributes}
+      >
         {optionsJsx}
       </select>
     </label>
@@ -109,7 +132,7 @@ const Regions = memo(({ config, updateConfig }) => {
     let regions = []
 
     if (config.regions) {
-      regions = [ ...config.regions ]
+      regions = [...config.regions]
     }
 
     regions[i][fieldName] = value
@@ -118,11 +141,11 @@ const Regions = memo(({ config, updateConfig }) => {
 
   let updateField = (section, subsection, fieldName, value, i) => regionUpdate(fieldName, value, i)
 
-  let removeColumn = (i) => {
+  let removeColumn = i => {
     let regions = []
 
     if (config.regions) {
-      regions = [ ...config.regions ]
+      regions = [...config.regions]
     }
 
     regions.splice(i, 1)
@@ -131,11 +154,10 @@ const Regions = memo(({ config, updateConfig }) => {
   }
 
   let addColumn = () => {
-
     let regions = []
 
     if (config.regions) {
-      regions = [ ...config.regions ]
+      regions = [...config.regions]
     }
 
     regions.push({})
@@ -145,63 +167,83 @@ const Regions = memo(({ config, updateConfig }) => {
 
   return (
     <>
-      {config.regions && config.regions.map(({ label, color, from, to, background }, i) => (
-        <div className="edit-block" key={`region-${i}`}>
-          <button type="button" className="remove-column" onClick={(event) => {
-            event.preventDefault()
-            removeColumn(i)
-          }}>Remove
-          </button>
-          <TextField value={label} label="Region Label" fieldName="label" i={i} updateField={updateField}/>
-          <div className="two-col-inputs">
-            <TextField value={color} label="Text Color" fieldName="color" updateField={(section, subsection, fieldName, value) => regionUpdate(fieldName, value, i)}/>
-            <TextField value={background} label="Background" fieldName="background" updateField={(section, subsection, fieldName, value) => regionUpdate(fieldName, value, i)}/>
-          </div>
-          <div className="two-col-inputs">
-            <TextField value={from} label="From Value" fieldName="from" updateField={(section, subsection, fieldName, value) => regionUpdate(fieldName, value, i)}/>
-            <TextField value={to} label="To Value" fieldName="to" updateField={(section, subsection, fieldName, value) => regionUpdate(fieldName, value, i)}/>
+      {config.regions &&
+        config.regions.map(({ label, color, from, to, background }, i) => (
+          <div className='edit-block' key={`region-${i}`}>
+            <button
+              type='button'
+              className='remove-column'
+              onClick={event => {
+                event.preventDefault()
+                removeColumn(i)
+              }}
+            >
+              Remove
+            </button>
+            <TextField value={label} label='Region Label' fieldName='label' i={i} updateField={updateField} />
+            <div className='two-col-inputs'>
+              <TextField value={color} label='Text Color' fieldName='color' updateField={(section, subsection, fieldName, value) => regionUpdate(fieldName, value, i)} />
+              <TextField value={background} label='Background' fieldName='background' updateField={(section, subsection, fieldName, value) => regionUpdate(fieldName, value, i)} />
+            </div>
+            <div className='two-col-inputs'>
+              <TextField value={from} label='From Value' fieldName='from' updateField={(section, subsection, fieldName, value) => regionUpdate(fieldName, value, i)} />
+              <TextField value={to} label='To Value' fieldName='to' updateField={(section, subsection, fieldName, value) => regionUpdate(fieldName, value, i)} />
+            </div>
           </div>
-        </div>
-      ))}
+        ))}
       {!config.regions && <p style={{ textAlign: 'center' }}>There are currently no regions.</p>}
-      <button type="button" className="btn full-width" onClick={(e) => {
-        e.preventDefault()
-        addColumn()
-      }}>Add Region
+      <button
+        type='button'
+        className='btn full-width'
+        onClick={e => {
+          e.preventDefault()
+          addColumn()
+        }}
+      >
+        Add Region
       </button>
     </>
   )
 })
 
-const headerColors = [ 'theme-blue', 'theme-purple', 'theme-brown', 'theme-teal', 'theme-pink', 'theme-orange', 'theme-slate', 'theme-indigo', 'theme-cyan', 'theme-green', 'theme-amber' ]
+const headerColors = ['theme-blue', 'theme-purple', 'theme-brown', 'theme-teal', 'theme-pink', 'theme-orange', 'theme-slate', 'theme-indigo', 'theme-cyan', 'theme-green', 'theme-amber']
 
 const EditorPanel = () => {
-  const {
-    config,
-    updateConfig,
-    transformedData: data,
-    loading,
-    colorPalettes,
-    unfilteredData,
-    excludedData,
-    transformedData,
-    isDashboard,
-    setParentConfig,
-    missingRequiredSections,
-    setFilteredData
-  } = useContext(Context)
-
-  const {minValue,maxValue,existPositiveValue} = useReduceData(config,unfilteredData);
-  const {paletteName,isPaletteReversed,filteredPallets,filteredQualitative,dispatch} = useColorPalette(colorPalettes,config);
-	useEffect(()=>{
-		if(paletteName) updateConfig({...config, palette:paletteName})
-  }, [paletteName])
-
-
-  
-  useEffect(()=>{
-    dispatch({type:"GET_PALETTE",payload:colorPalettes,paletteName:config.palette})
-  }, [dispatch, config.palette]);
+  const { config, updateConfig, transformedData: data, loading, colorPalettes, unfilteredData, excludedData, isDashboard, setParentConfig, missingRequiredSections } = useContext(Context)
+
+  const { minValue, maxValue, existPositiveValue, isAllLine } = useReduceData(config, unfilteredData)
+  const { paletteName, isPaletteReversed, filteredPallets, filteredQualitative, dispatch } = useColorPalette(colorPalettes, config)
+  useEffect(() => {
+    if (paletteName) updateConfig({ ...config, palette: paletteName })
+  }, [paletteName]) // eslint-disable-line
+
+  useEffect(() => {
+    dispatch({ type: 'GET_PALETTE', payload: colorPalettes, paletteName: config.palette })
+  }, [dispatch, config.palette]) // eslint-disable-line
+
+  // when the visualization type changes we
+  // have to update the individual series type & axis details
+  // dataKey is unchanged here.
+  // ie. { dataKey: 'series_name', type: 'Bar', axis: 'Left'}
+  useEffect(() => {
+    let newSeries = []
+    if (config.series) {
+      newSeries = config.series.map(series => {
+        return {
+          ...series,
+          type: config.visualizationType === 'Combo' ? 'Bar' : config.visualizationType ? config.visualizationType : 'Bar',
+          axis: 'Left'
+        }
+      })
+    }
+
+    updateConfig({
+      ...config,
+      series: newSeries
+    })
+  }, [config.visualizationType]) // eslint-disable-line
+
+  const { hasRightAxis } = useRightAxis({ config: config, yMax: config.yAxis.size, data: config.data, updateConfig })
 
   const filterOptions = [
     {
@@ -219,7 +261,7 @@ const EditorPanel = () => {
   ]
 
   const getItemStyle = (isDragging, draggableStyle) => ({
-    ...draggableStyle,
+    ...draggableStyle
   })
 
   const sortableItemStyles = {
@@ -235,10 +277,10 @@ const EditorPanel = () => {
     marginRight: '.3em',
     marginBottom: '.3em',
     cursor: 'move',
-    zIndex: '999',
+    zIndex: '999'
   }
 
-  const enforceRestrictions = (updatedConfig) => {
+  const enforceRestrictions = updatedConfig => {
     if (updatedConfig.orientation === 'horizontal') {
       updatedConfig.labels = false
     }
@@ -260,11 +302,11 @@ const EditorPanel = () => {
 
     const isArray = Array.isArray(config[section])
 
-    let sectionValue = isArray ? [ ...config[section], newValue ] : { ...config[section], [fieldName]: newValue }
+    let sectionValue = isArray ? [...config[section], newValue] : { ...config[section], [fieldName]: newValue }
 
     if (null !== subsection) {
       if (isArray) {
-        sectionValue = [ ...config[section] ]
+        sectionValue = [...config[section]]
         sectionValue[subsection] = { ...sectionValue[subsection], [fieldName]: newValue }
       } else if (typeof newValue === 'string') {
         sectionValue[subsection] = newValue
@@ -280,22 +322,21 @@ const EditorPanel = () => {
     updateConfig(updatedConfig)
   }
 
-  const [ displayPanel, setDisplayPanel ] = useState(true)
-  const [ lollipopColorStyle, setLollipopColorStyle ] = useState('two-tone')
+  const [displayPanel, setDisplayPanel] = useState(true)
 
   if (loading) {
     return null
   }
 
-  const setLollipopShape = (shape) => {
+  const setLollipopShape = shape => {
     updateConfig({
       ...config,
       lollipopShape: shape
     })
   }
 
-  const removeFilter = (index) => {
-    let filters = [ ...config.filters ]
+  const removeFilter = index => {
+    let filters = [...config.filters]
 
     filters.splice(index, 1)
 
@@ -303,7 +344,7 @@ const EditorPanel = () => {
   }
 
   const updateFilterProp = (name, index, value) => {
-    let filters = [ ...config.filters ]
+    let filters = [...config.filters]
 
     filters[index][name] = value
 
@@ -311,29 +352,28 @@ const EditorPanel = () => {
   }
 
   const addNewFilter = () => {
-    let filters = config.filters ? [ ...config.filters ] : []
+    let filters = config.filters ? [...config.filters] : []
 
-    filters.push({ values: [] });
+    filters.push({ values: [] })
 
-    updateConfig({ ...config, filters });
+    updateConfig({ ...config, filters })
   }
 
-  const addNewSeries = (seriesKey) => {
-    let newSeries = config.series ? [ ...config.series ] : []
-    newSeries.push({ dataKey: seriesKey, type: 'Bar' });
-    updateConfig({ ...config, series: newSeries });
+  const addNewSeries = seriesKey => {
+    let newSeries = config.series ? [...config.series] : []
+    newSeries.push({ dataKey: seriesKey, type: 'Bar' })
+    updateConfig({ ...config, series: newSeries }) // left axis series keys
   }
 
-  const sortSeries = (e) => {
+  const sortSeries = e => {
     const series = config.series[0].dataKey
-    const sorted = data.sort((a, b) => a[series] - b[series]);
-    const newData = e === "asc" ? sorted : sorted.reverse();
-    updateConfig({ ...config }, newData);
+    const sorted = data.sort((a, b) => a[series] - b[series])
+    const newData = e === 'asc' ? sorted : sorted.reverse()
+    updateConfig({ ...config }, newData)
   }
 
-  const removeSeries = (seriesKey) => {
-
-    let series = [ ...config.series ]
+  const removeSeries = seriesKey => {
+    let series = [...config.series]
     let seriesIndex = -1
 
     for (let i = 0; i < series.length; i++) {
@@ -363,17 +403,17 @@ const EditorPanel = () => {
     }
   }
 
-  const addNewExclusion = (exclusionKey) => {
-    let newExclusion = [ ...config.exclusions.keys ]
+  const addNewExclusion = exclusionKey => {
+    let newExclusion = [...config.exclusions.keys]
     newExclusion.push(exclusionKey)
 
     let payload = { ...config.exclusions, keys: newExclusion }
     updateConfig({ ...config, exclusions: payload })
   }
 
-  const removeExclusion = (excludeValue) => {
+  const removeExclusion = excludeValue => {
     let exclusionsIndex = -1
-    let exclusions = [ ...config.exclusions.keys ]
+    let exclusions = [...config.exclusions.keys]
 
     for (let i = 0; i < exclusions.length; i++) {
       if (exclusions[i] === excludeValue) {
@@ -399,14 +439,11 @@ const EditorPanel = () => {
   const getColumns = (filter = true) => {
     let columns = {}
 
-    unfilteredData.map(row => {
-      Object.keys(row).forEach(columnName => columns[columnName] = true)
+    unfilteredData.forEach(row => {
+      Object.keys(row).forEach(columnName => (columns[columnName] = true))
     })
 
     if (filter) {
-      let confidenceUpper = config.confidenceKeys?.upper && config.confidenceKeys?.upper !== ''
-      let confidenceLower = config.confidenceKeys?.lower && config.confidenceKeys?.lower !== ''
-
       Object.keys(columns).forEach(key => {
         if (
           (config.series && config.series.filter(series => series.dataKey === key).length > 0) ||
@@ -424,32 +461,30 @@ const EditorPanel = () => {
     return Object.keys(columns)
   }
 
-
-    const getDataValueOptions = (data)=>{
-      if(!data) return [];
-      const set = new Set();
-      for (let i=0; i<data.length; i++){
-        for (const [key, value] of Object.entries(data[i])) {
-          set.add(key)
-        }
-        
+  const getDataValueOptions = data => {
+    if (!data) return []
+    const set = new Set()
+    for (let i = 0; i < data.length; i++) {
+      for (const [key] of Object.entries(data[i])) {
+        set.add(key)
       }
-      return Array.from(set)
-    };
-    
+    }
+    return Array.from(set)
+  }
+
   const getDataValues = (dataKey, unique = false) => {
     let values = []
-    excludedData.map(e => {
+    excludedData.forEach(e => {
       values.push(e[dataKey])
     })
-    return unique ? [ ...new Set(values) ] : values
+    return unique ? [...new Set(values)] : values
   }
 
-  const showBarStyleOptions = ()=>{
-    if (config.visualizationType === 'Bar' && config.visualizationSubType !== 'stacked' && (config.orientation==='horizontal' || config.orientation==='vertical') ) {
-      return ['flat','rounded','lollipop']
+  const showBarStyleOptions = () => {
+    if (config.visualizationType === 'Bar' && config.visualizationSubType !== 'stacked' && (config.orientation === 'horizontal' || config.orientation === 'vertical')) {
+      return ['flat', 'rounded', 'lollipop']
     } else {
-      return ['flat','rounded']
+      return ['flat', 'rounded']
     }
   }
 
@@ -459,18 +494,17 @@ const EditorPanel = () => {
 
   const Error = () => {
     return (
-      <section className="waiting">
-        <section className="waiting-container">
+      <section className='waiting'>
+        <section className='waiting-container'>
           <h3>Error With Configuration</h3>
           <p>{config.runtime.editorErrorMessage}</p>
         </section>
       </section>
     )
-
   }
 
   const Confirm = () => {
-    const confirmDone = (e) => {
+    const confirmDone = e => {
       e.preventDefault()
 
       let newConfig = { ...config }
@@ -480,11 +514,13 @@ const EditorPanel = () => {
     }
 
     return (
-      <section className="waiting">
-        <section className="waiting-container">
+      <section className='waiting'>
+        <section className='waiting-container'>
           <h3>Finish Configuring</h3>
           <p>Set all required options to the left and confirm below to display a preview of the chart.</p>
-          <button className="btn" style={{ margin: '1em auto' }} disabled={missingRequiredSections()} onClick={confirmDone}>I'm Done</button>
+          <button className='btn' style={{ margin: '1em auto' }} disabled={missingRequiredSections()} onClick={confirmDone}>
+            I'm Done
+          </button>
         </section>
       </section>
     )
@@ -508,17 +544,17 @@ const EditorPanel = () => {
     }
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [ config ])
-  
+  }, [config])
+
   // Set paired bars to be horizontal, even though that option doesn't display
   useEffect(() => {
-    if(config.visualizationType === 'Paired Bar') {
-        updateConfig({
-          ...config,
-          orientation: 'horizontal'
+    if (config.visualizationType === 'Paired Bar') {
+      updateConfig({
+        ...config,
+        orientation: 'horizontal'
       })
     }
-  }, []);
+  }, []) // eslint-disable-line
 
   useEffect(() => {
     if (config.orientation === 'horizontal') {
@@ -527,50 +563,50 @@ const EditorPanel = () => {
         lollipopShape: config.lollipopShape
       })
     }
-  }, [ config.isLollipopChart, config.lollipopShape ])
+  }, [config.isLollipopChart, config.lollipopShape]) // eslint-disable-line
 
   const ExclusionsList = useCallback(() => {
-    const exclusions = [ ...config.exclusions.keys ]
+    const exclusions = [...config.exclusions.keys]
     return (
-      <ul className="series-list">
+      <ul className='series-list'>
         {exclusions.map((exclusion, index) => {
           return (
             <li key={exclusion}>
-              <div className="series-list__name" data-title={exclusion}>
-                <div className="series-list__name--text">
-                  {exclusion}
-                </div>
+              <div className='series-list__name' data-title={exclusion}>
+                <div className='series-list__name--text'>{exclusion}</div>
               </div>
-              <button className="series-list__remove" onClick={() => removeExclusion(exclusion)}>&#215;</button>
+              <button className='series-list__remove' onClick={() => removeExclusion(exclusion)}>
+                &#215;
+              </button>
             </li>
           )
         })}
       </ul>
     )
-  }, [ config ])
+  }, [config]) // eslint-disable-line
 
-  const ErrorWithLolliopChart = ({ message }) => {
-    return (
-      <section className="waiting">
-        <section className="waiting-container">
-          <h3>Error With Configuration</h3>
-          <p>{message}</p>
-        </section>
-      </section>
-    )
+  const checkIsLine = type => {
+    return type === ('Line' || 'dashed-sm')
   }
 
   const handleFilterChange = (idx1, idx2, filterIndex, filter) => {
     let filterOrder = filter.values
-    let [ movedItem ] = filterOrder.splice(idx1, 1)
+    let [movedItem] = filterOrder.splice(idx1, 1)
     filterOrder.splice(idx2, 0, movedItem)
-    let filters = [ ...config.filters ]
+    let filters = [...config.filters]
     let filterItem = { ...config.filters[filterIndex] }
     filterItem.active = filter.values[0]
-    filterItem.values = filterOrder
+    filterItem.orderedValues = filterOrder
     filterItem.order = 'cust'
     filters[filterIndex] = filterItem
-    setFilteredData(filters)
+    updateConfig({ ...config, filters })
+  }
+
+  const handleSeriesChange = (idx1, idx2) => {
+    let seriesOrder = config.series
+    let [movedItem] = seriesOrder.splice(idx1, 1)
+    seriesOrder.splice(idx2, 0, movedItem)
+    updateConfig({ ...config, series: seriesOrder })
   }
 
   if (config.isLollipopChart && config?.series?.length > 1) {
@@ -581,500 +617,787 @@ const EditorPanel = () => {
     config.runtime.editorErrorMessage = 'Add a data series'
   }
 
-  const section = config.orientation==='horizontal'  ? 'xAxis' : 'yAxis';
-  const [warningMsg,setWarningMsg] = useState({maxMsg:'',minMsg:''});
+  const section = config.orientation === 'horizontal' ? 'xAxis' : 'yAxis'
+  const [warningMsg, setWarningMsg] = useState({ maxMsg: '', minMsg: '' })
 
   const validateMaxValue = () => {
-    const enteredValue = config[section].max;
-    let message = '';
-
-   switch(true){
-     case (enteredValue  && parseFloat(enteredValue) < parseFloat(maxValue) && existPositiveValue):
-       message = 'Max value must be more than '+ maxValue;
-       break;
-     case (enteredValue  && parseFloat(enteredValue) < 0 && !existPositiveValue):
-       message = 'Value must be more than or equal to 0';
-       break;
-     default : message = '' ;
-   }
-    setWarningMsg(function(prevMsg){return{...prevMsg,maxMsg:message}});
-  };
-
-
-  const validateMinValue = ()=>{
-   const enteredValue = config[section].min;
-   let minVal = Number(minValue); 
-   let message = '';
-
-  switch(true){
-    case ((config.visualizationType === 'Line' || config.visualizationType === 'Spark Line')  && (enteredValue && parseFloat(enteredValue) > minVal)):
-      message = 'Value must be less than ' + minValue;
-      break; 
-    case ((config.visualizationType === 'Bar' || config.visualizationType === 'Combo' ) && enteredValue && minVal > 0 &&  parseFloat(enteredValue) > 0):
-      message = 'Value must be less than or equal to 0';
-      break; 
-    case ( enteredValue &&  minVal < 0 && parseFloat(enteredValue) > minVal) :
-      message = 'Value must be less than ' + minValue; 
-      break;
-    default : message = ''
-  };
-    setWarningMsg(function (prevMsg) { return {...prevMsg, minMsg: message}});
- };
-
-useEffect(()=>{
-  validateMinValue();
-  validateMaxValue();
-},[minValue,maxValue,config]);
+    const enteredValue = config[section].max
+    let message = ''
+
+    switch (true) {
+      case enteredValue && parseFloat(enteredValue) < parseFloat(maxValue) && existPositiveValue:
+        message = 'Max value must be more than ' + maxValue
+        break
+      case enteredValue && parseFloat(enteredValue) < 0 && !existPositiveValue:
+        message = 'Value must be more than or equal to 0'
+        break
+      default:
+        message = ''
+    }
+    setWarningMsg(function (prevMsg) {
+      return { ...prevMsg, maxMsg: message }
+    })
+  }
+
+  const validateMinValue = () => {
+    const enteredValue = config[section].min
+    let minVal = Number(minValue)
+    let message = ''
+
+    switch (true) {
+      case (config.visualizationType === 'Line' || config.visualizationType === 'Spark Line') && enteredValue && parseFloat(enteredValue) > minVal:
+        message = 'Value must be less than ' + minValue
+        break
+      case config.visualizationType === 'Combo' && isAllLine && enteredValue && parseFloat(enteredValue) > minVal:
+        message = 'Value must be less than ' + minValue
+        break
+      case (config.visualizationType === 'Bar' || (config.visualizationType === 'Combo' && !isAllLine)) && enteredValue && minVal > 0 && parseFloat(enteredValue) > 0:
+        message = 'Value must be less than or equal to 0'
+        break
+      case enteredValue && minVal < 0 && parseFloat(enteredValue) > minVal:
+        message = 'Value must be less than ' + minValue
+        break
+      default:
+        message = ''
+    }
+    setWarningMsg(function (prevMsg) {
+      return { ...prevMsg, minMsg: message }
+    })
+  }
+  useEffect(() => {
+    validateMinValue()
+    validateMaxValue()
+  }, [minValue, maxValue, config]) // eslint-disable-line
 
   return (
-    <ErrorBoundary component="EditorPanel">
-      {config.newViz && <Confirm/>}
-      {undefined === config.newViz && config.runtime && config.runtime.editorErrorMessage && <Error/>}
+    <ErrorBoundary component='EditorPanel'>
+      {config.newViz && <Confirm />}
+      {undefined === config.newViz && config.runtime && config.runtime.editorErrorMessage && <Error />}
       <button className={displayPanel ? `editor-toggle` : `editor-toggle collapsed`} title={displayPanel ? `Collapse Editor` : `Expand Editor`} onClick={onBackClick}></button>
       <section className={`${displayPanel ? 'editor-panel cove' : 'hidden editor-panel cove'}${isDashboard ? ' dashboard' : ''}`}>
-        <div aria-level="2" role="heading" className="heading-2">Configure Chart</div>
-        <section className="form-container">
+        <div aria-level='2' role='heading' className='heading-2'>
+          Configure Chart
+        </div>
+        <section className='form-container'>
           <form>
             <Accordion allowZeroExpanded={true}>
-              <AccordionItem> {/* General */}
+              <AccordionItem>
+                {' '}
+                {/* General */}
                 <AccordionItemHeading>
-                  <AccordionItemButton>
-                    General
-                  </AccordionItemButton>
+                  <AccordionItemButton>General</AccordionItemButton>
                 </AccordionItemHeading>
                 <AccordionItemPanel>
-                  <Select value={config.visualizationType} fieldName="visualizationType" label="Chart Type" updateField={updateField} options={[ 'Pie', 'Line', 'Bar', 'Combo', 'Paired Bar', 'Spark Line' ]}/>
-                  {(config.visualizationType === 'Bar'|| config.visualizationType === 'Combo') && <Select value={config.visualizationSubType || 'Regular'} fieldName="visualizationSubType" label="Chart Subtype" updateField={updateField} options={[ 'regular', 'stacked' ]}/>}
-                  {config.visualizationType === 'Bar' && <Select value={config.orientation || 'vertical'} fieldName="orientation" label="Orientation" updateField={updateField} options={[ 'vertical', 'horizontal' ]}/>}
-                  {config.visualizationType === 'Bar' &&  <Select value={ config.isLollipopChart? 'lollipop': config.barStyle || 'flat'} fieldName="barStyle" label="bar style" updateField={updateField}  options={showBarStyleOptions()}/>}
-                  {(config.visualizationType === 'Bar' && config.barStyle==='rounded' ) &&   <Select value={config.tipRounding||'top'} fieldName="tipRounding" label="tip rounding" updateField={updateField} options={['top','full']}/>}
-                  {(config.visualizationType === 'Bar' && config.barStyle==='rounded' ) &&   <Select value={config.roundingStyle||'standard'} fieldName="roundingStyle" label="rounding style" updateField={updateField} options={['standard','shallow','finger']}/>}
-                  {(config.visualizationType === 'Bar' && config.orientation === 'horizontal') &&
-                    <Select value={config.yAxis.labelPlacement || 'Below Bar'} section="yAxis" fieldName="labelPlacement" label="Label Placement" updateField={updateField} options={[ 'Below Bar', 'On Date/Category Axis' ]}/>
-                  }
-                  {config.orientation === 'horizontal' && (config.yAxis.labelPlacement === 'Below Bar' || config.yAxis.labelPlacement === 'On Date/Category Axis' || config.visualizationType === 'Paired Bar' ) ? (
-                    <CheckBox value={config.yAxis.displayNumbersOnBar} section="yAxis" fieldName="displayNumbersOnBar" label={config.isLollipopChart ? 'Display Numbers after Bar' : 'Display Numbers on Bar'} updateField={updateField}/>
-                  ): config.visualizationType !== 'Pie' &&  (
-                    <CheckBox value={config.labels} fieldName="labels" label="Display label on data" updateField={updateField}/>
+                  <Select value={config.visualizationType} fieldName='visualizationType' label='Chart Type' updateField={updateField} options={['Pie', 'Line', 'Bar', 'Combo', 'Paired Bar', 'Spark Line']} />
+                  {(config.visualizationType === 'Bar' || config.visualizationType === 'Combo') && <Select value={config.visualizationSubType || 'Regular'} fieldName='visualizationSubType' label='Chart Subtype' updateField={updateField} options={['regular', 'stacked']} />}
+                  {config.visualizationType === 'Bar' && <Select value={config.orientation || 'vertical'} fieldName='orientation' label='Orientation' updateField={updateField} options={['vertical', 'horizontal']} />}
+                  {config.visualizationType === 'Bar' && <Select value={config.isLollipopChart ? 'lollipop' : config.barStyle || 'flat'} fieldName='barStyle' label='bar style' updateField={updateField} options={showBarStyleOptions()} />}
+                  {config.visualizationType === 'Bar' && config.barStyle === 'rounded' && <Select value={config.tipRounding || 'top'} fieldName='tipRounding' label='tip rounding' updateField={updateField} options={['top', 'full']} />}
+                  {config.visualizationType === 'Bar' && config.barStyle === 'rounded' && <Select value={config.roundingStyle || 'standard'} fieldName='roundingStyle' label='rounding style' updateField={updateField} options={['standard', 'shallow', 'finger']} />}
+                  {config.visualizationType === 'Bar' && config.orientation === 'horizontal' && <Select value={config.yAxis.labelPlacement || 'Below Bar'} section='yAxis' fieldName='labelPlacement' label='Label Placement' updateField={updateField} options={['Below Bar', 'On Date/Category Axis']} />}
+                  {config.orientation === 'horizontal' && (config.yAxis.labelPlacement === 'Below Bar' || config.yAxis.labelPlacement === 'On Date/Category Axis' || config.visualizationType === 'Paired Bar') ? (
+                    <CheckBox value={config.yAxis.displayNumbersOnBar} section='yAxis' fieldName='displayNumbersOnBar' label={config.isLollipopChart ? 'Display Numbers after Bar' : 'Display Numbers on Bar'} updateField={updateField} />
+                  ) : (
+                    config.visualizationType !== 'Pie' && <CheckBox value={config.labels} fieldName='labels' label='Display label on data' updateField={updateField} />
                   )}
-                  {config.visualizationType === 'Pie' && <Select fieldName="pieType" label="Pie Chart Type" updateField={updateField} options={[ 'Regular', 'Donut' ]}/>}
-                  <TextField value={config.title} fieldName="title" label="Title" updateField={updateField} />
-                  
+                  {config.visualizationType === 'Pie' && <Select fieldName='pieType' label='Pie Chart Type' updateField={updateField} options={['Regular', 'Donut']} />}
+
+                  <TextField value={config.title} fieldName='title' label='Title' updateField={updateField} />
                   <TextField
-										value={config.superTitle}
-										updateField={updateField}
-										fieldName='superTitle'
-										label='Super Title'
-										placeholder='Super Title'
-										tooltip={
-                      <Tooltip style={{textTransform: 'none'}}>
-                        <Tooltip.Target><Icon display="question" style={{marginLeft: '0.5rem'}}/></Tooltip.Target>
+                    value={config.superTitle}
+                    updateField={updateField}
+                    fieldName='superTitle'
+                    label='Super Title'
+                    placeholder='Super Title'
+                    tooltip={
+                      <Tooltip style={{ textTransform: 'none' }}>
+                        <Tooltip.Target>
+                          <Icon display='question' style={{ marginLeft: '0.5rem' }} />
+                        </Tooltip.Target>
                         <Tooltip.Content>
-                        <p>Super Title</p>
+                          <p>Super Title</p>
                         </Tooltip.Content>
                       </Tooltip>
-										}
+                    }
                   />
-                  
+
                   <TextField
-										type='textarea'
-										value={config.introText}
-										updateField={updateField}
-										fieldName='introText'
-										label='Intro Text'
-										tooltip={
-                      <Tooltip style={{textTransform: 'none'}}>
-                        <Tooltip.Target><Icon display="question" style={{marginLeft: '0.5rem'}}/></Tooltip.Target>
+                    type='textarea'
+                    value={config.introText}
+                    updateField={updateField}
+                    fieldName='introText'
+                    label='Intro Text'
+                    tooltip={
+                      <Tooltip style={{ textTransform: 'none' }}>
+                        <Tooltip.Target>
+                          <Icon display='question' style={{ marginLeft: '0.5rem' }} />
+                        </Tooltip.Target>
                         <Tooltip.Content>
-                        <p>Intro Text</p>
+                          <p>Intro Text</p>
                         </Tooltip.Content>
                       </Tooltip>
-										}
-									/>
-
-                  <TextField type="textarea" value={config.description} fieldName="description" label="Subtext" updateField={updateField} tooltip={
-                    <Tooltip style={{ textTransform: 'none' }}>
-                      <Tooltip.Target><Icon display="question" style={{ marginLeft: '0.5rem' }}/></Tooltip.Target>
-                      <Tooltip.Content>
-                        <p>Enter supporting text to display below the data visualization, if applicable. The following HTML tags are supported: strong, em, sup, and sub.</p>
-                      </Tooltip.Content>
-                    </Tooltip>
-                  } />
-                  
+                    }
+                  />
+
+                  <TextField
+                    type='textarea'
+                    value={config.description}
+                    fieldName='description'
+                    label='Subtext'
+                    updateField={updateField}
+                    tooltip={
+                      <Tooltip style={{ textTransform: 'none' }}>
+                        <Tooltip.Target>
+                          <Icon display='question' style={{ marginLeft: '0.5rem' }} />
+                        </Tooltip.Target>
+                        <Tooltip.Content>
+                          <p>Enter supporting text to display below the data visualization, if applicable. The following HTML tags are supported: strong, em, sup, and sub.</p>
+                        </Tooltip.Content>
+                      </Tooltip>
+                    }
+                  />
+
                   <TextField
-										type='textarea'
-										value={config.footnotes}
-										updateField={updateField}
-										fieldName='footnotes'
-										label='Footnotes'
-										tooltip={
-                      <Tooltip style={{textTransform: 'none'}}>
-                        <Tooltip.Target><Icon display="question" style={{marginLeft: '0.5rem'}}/></Tooltip.Target>
+                    type='textarea'
+                    value={config.footnotes}
+                    updateField={updateField}
+                    fieldName='footnotes'
+                    label='Footnotes'
+                    tooltip={
+                      <Tooltip style={{ textTransform: 'none' }}>
+                        <Tooltip.Target>
+                          <Icon display='question' style={{ marginLeft: '0.5rem' }} />
+                        </Tooltip.Target>
                         <Tooltip.Content>
-                        <p>Footnotes</p>
+                          <p>Footnotes</p>
                         </Tooltip.Content>
                       </Tooltip>
-										}
-									/>
+                    }
+                  />
 
-                  {config.visualizationSubType !== 'horizontal' &&
-                    <TextField type="number" value={config.height} fieldName="height" label="Chart Height" updateField={updateField}/>
-                  }
+                  {config.orientation === 'vertical' && <TextField type='number' value={config.heights.vertical} section='heights' fieldName='vertical' label='Chart Height' updateField={updateField} />}
                 </AccordionItemPanel>
               </AccordionItem>
 
-
-              {config.visualizationType !== 'Pie' &&
+              {config.visualizationType !== 'Pie' && (
                 <AccordionItem>
                   <AccordionItemHeading>
-                    <AccordionItemButton>
-                      Data Series {((!config.series || config.series.length === 0) || (config.visualizationType === 'Paired Bar' && config.series.length < 2)) && <WarningImage width="25" className="warning-icon"/>}
-                    </AccordionItemButton>
+                    <AccordionItemButton>Data Series {(!config.series || config.series.length === 0 || (config.visualizationType === 'Paired Bar' && config.series.length < 2)) && <WarningImage width='25' className='warning-icon' />}</AccordionItemButton>
                   </AccordionItemHeading>
                   <AccordionItemPanel>
-                    {((!config.series || config.series.length === 0) && (config.visualizationType !== 'Paired Bar')) && <p className="warning">At least one series is required</p>}
-                    {((!config.series || config.series.length === 0 || config.series.length < 2) && (config.visualizationType === 'Paired Bar')) && <p className="warning">Select two data series for paired bar chart (e.g., Male and Female).</p>}
+                    {(!config.series || config.series.length === 0) && config.visualizationType !== 'Paired Bar' && <p className='warning'>At least one series is required</p>}
+                    {(!config.series || config.series.length === 0 || config.series.length < 2) && config.visualizationType === 'Paired Bar' && <p className='warning'>Select two data series for paired bar chart (e.g., Male and Female).</p>}
                     {config.series && config.series.length !== 0 && (
                       <>
                         <fieldset>
-                          <legend className="edit-label float-left">
-                            Displaying
-                          </legend>
+                          <legend className='edit-label float-left'>Displaying</legend>
                           <Tooltip style={{ textTransform: 'none' }}>
-                            <Tooltip.Target><Icon display="question" style={{ marginLeft: '0.5rem' }}/></Tooltip.Target>
+                            <Tooltip.Target>
+                              <Icon display='question' style={{ marginLeft: '0.5rem' }} />
+                            </Tooltip.Target>
                             <Tooltip.Content>
                               <p>A data series is a set of related data points plotted in a chart and typically represented in the chart legend.</p>
                             </Tooltip.Content>
                           </Tooltip>
                         </fieldset>
-                        <ul className="series-list">
-                          {config.series.map((series, i) => {
 
-                            if (config.visualizationType === 'Combo') {
-                              let changeType = (i, value) => {
-                                let series = [ ...config.series ]
-                                series[i].type = value
+                        <DragDropContext onDragEnd={({ source, destination }) => handleSeriesChange(source.index, destination.index)}>
+                          <Droppable droppableId='filter_order'>
+                            {provided => (
+                              <ul {...provided.droppableProps} className='series-list' ref={provided.innerRef} style={{ marginTop: '1em' }}>
+                                {config.series.map((series, i) => {
+                                  if (config.visualizationType === 'Combo') {
+                                    let changeType = (i, value) => {
+                                      let series = [...config.series]
+                                      series[i].type = value
+
+                                      series[i].axis = 'Left'
+
+                                      updateConfig({ ...config, series })
+                                    }
+
+                                    let typeDropdown = (
+                                      <select
+                                        value={series.type}
+                                        onChange={event => {
+                                          changeType(i, event.target.value)
+                                        }}
+                                        style={{ width: '100px', marginRight: '10px' }}
+                                      >
+                                        <option value='' default>
+                                          Select
+                                        </option>
+                                        <option value='Bar'>Bar</option>
+                                        <option value='Line'>Solid Line</option>
+                                        <option value='dashed-sm'>Small Dashed</option>
+                                        <option value='dashed-md'>Medium Dashed</option>
+                                        <option value='dashed-lg'>Large Dashed</option>
+                                      </select>
+                                    )
+
+                                    return (
+                                      <Draggable key={series.dataKey} draggableId={`draggableFilter-${series.dataKey}`} index={i}>
+                                        {(provided, snapshot) => (
+                                          <li>
+                                            <div className={snapshot.isDragging ? 'currently-dragging' : ''} style={getItemStyle(snapshot.isDragging, provided.draggableProps.style, sortableItemStyles)} ref={provided.innerRef} {...provided.draggableProps} {...provided.dragHandleProps}>
+                                              <div className={`series-list__name${series.dataKey.length > 15 ? ' series-list__name--truncate' : ''}`} data-title={series.dataKey}>
+                                                <div className='series-list__name-text'>{series.dataKey}</div>
+                                              </div>
+                                              <span>
+                                                <span className='series-list__dropdown'>{typeDropdown}</span>
+                                                {config.series && config.series.length > 1 && (
+                                                  <button className='series-list__remove' onClick={() => removeSeries(series.dataKey)}>
+                                                    &#215;
+                                                  </button>
+                                                )}
+                                              </span>
+                                            </div>
+                                          </li>
+                                        )}
+                                      </Draggable>
+                                    )
+                                  }
+
+                                  return (
+                                    <Draggable key={series.dataKey} draggableId={`draggableFilter-${series.dataKey}`} index={i}>
+                                      {(provided, snapshot) => (
+                                        <li
+                                          key={series.dataKey}
+                                          className={snapshot.isDragging ? 'currently-dragging' : ''}
+                                          style={getItemStyle(snapshot.isDragging, provided.draggableProps.style, sortableItemStyles)}
+                                          ref={provided.innerRef}
+                                          {...provided.draggableProps}
+                                          {...provided.dragHandleProps}
+                                        >
+                                          {/*<div  className={snapshot.isDragging ? 'currently-dragging' : ''} style={getItemStyle(snapshot.isDragging, provided.draggableProps.style, sortableItemStyles)} ref={provided.innerRef} {...provided.draggableProps} {...provided.dragHandleProps}>*/}
+                                          <div className='series-list__name' data-title={series.dataKey}>
+                                            <div className='series-list__name--text'>{series.dataKey}</div>
+                                          </div>
+                                          {config.series && config.series.length > 1 && (
+                                            <button className='series-list__remove' onClick={() => removeSeries(series.dataKey)}>
+                                              &#215;
+                                            </button>
+                                          )}
+                                          {/*</div>*/}
+                                        </li>
+                                      )}
+                                    </Draggable>
+                                  )
+                                })}
+                                {provided.placeholder}
+                              </ul>
+                            )}
+                          </Droppable>
+                        </DragDropContext>
+                      </>
+                    )}
+
+                    <Select
+                      fieldName='visualizationType'
+                      label='Add Data Series'
+                      initial='Select'
+                      onChange={e => {
+                        if (e.target.value !== '' && e.target.value !== 'Select') {
+                          addNewSeries(e.target.value)
+                        }
+                        e.target.value = ''
+                      }}
+                      options={getColumns()}
+                    />
+                    {config.series && config.series.length <= 1 && config.visualizationType === 'Bar' && (
+                      <>
+                        <span className='divider-heading'>Confidence Keys</span>
+                        <Select value={config.confidenceKeys.upper || ''} section='confidenceKeys' fieldName='upper' label='Upper' updateField={updateField} initial='Select' options={getColumns()} />
+                        <Select value={config.confidenceKeys.lower || ''} section='confidenceKeys' fieldName='lower' label='Lower' updateField={updateField} initial='Select' options={getColumns()} />
+                      </>
+                    )}
+
+                    {config.series && config.series.length === 1 && <Select fieldName='visualizationType' label='Rank by Value' initial='Select' onChange={e => sortSeries(e.target.value)} options={['asc', 'desc']} />}
+                  </AccordionItemPanel>
+                </AccordionItem>
+              )}
+
+              {hasRightAxis && config.series && config.visualizationType === 'Combo' && (
+                <AccordionItem>
+                  <AccordionItemHeading>
+                    <AccordionItemButton>Assign Data Series Axis</AccordionItemButton>
+                  </AccordionItemHeading>
+                  <AccordionItemPanel>
+                    <p>Only line series data can be assigned to the right axis. Check the data series section above.</p>
+                    {config.series && config.series.filter(series => checkIsLine(series.type)) && (
+                      <>
+                        <fieldset>
+                          <legend className='edit-label float-left'>Displaying</legend>
+                          <Tooltip style={{ textTransform: 'none' }}>
+                            <Tooltip.Target>
+                              <Icon display='question' style={{ marginLeft: '0.5rem' }} />
+                            </Tooltip.Target>
+                            <Tooltip.Content>
+                              <p>Assign an axis for the series</p>
+                            </Tooltip.Content>
+                          </Tooltip>
+                        </fieldset>
+                        <ul className='series-list'>
+                          {config.series &&
+                            config.series.map((series, i) => {
+                              if (series.type === 'Bar') return false // can't set individual bars atm.
+
+                              let changeAxis = (i, value) => {
+                                let series = [...config.series]
+                                series[i].axis = value
                                 updateConfig({ ...config, series })
                               }
 
-                              let typeDropdown = (
-                                <select value={series.type} onChange={(event) => {
-                                  changeType(i, event.target.value)
-                                }} style={{ width: '100px', marginRight: '10px' }}>
-                                  <option value="" default>Select</option>
-                                  <option value="Bar">Bar</option>
-                                  <option value="Line">Solid Line</option>
-                                  <option value="dashed-sm">Small Dashed</option>
-                                  <option value="dashed-md">Medium Dashed</option>
-                                  <option value="dashed-lg">Large Dashed</option>
+                              let axisDropdown = (
+                                <select
+                                  value={series.axis}
+                                  onChange={event => {
+                                    changeAxis(i, event.target.value)
+                                  }}
+                                  style={{ width: '100px', marginRight: '10px' }}
+                                >
+                                  <option value='Left' default>
+                                    left
+                                  </option>
+                                  <option value='Right'>right</option>
                                 </select>
                               )
 
                               return (
                                 <li key={series.dataKey}>
                                   <div className={`series-list__name${series.dataKey.length > 15 ? ' series-list__name--truncate' : ''}`} data-title={series.dataKey}>
-                                    <div className="series-list__name-text">{series.dataKey}</div>
+                                    <div className='series-list__name-text'>{series.dataKey}</div>
                                   </div>
                                   <span>
-                                    <span className="series-list__dropdown">{typeDropdown}</span>
-                                    {config.series && config.series.length > 1 &&
-                                      <button className="series-list__remove" onClick={() => removeSeries(series.dataKey)}>&#215;</button>
-                                    }
+                                    <span className='series-list__dropdown'>{axisDropdown}</span>
                                   </span>
                                 </li>
                               )
-                            }
-
-                            return (
-                              <li key={series.dataKey}>
-                                <div className="series-list__name" data-title={series.dataKey}>
-                                  <div className="series-list__name--text">
-                                    {series.dataKey}
-                                  </div>
-                                </div>
-                                {config.series && config.series.length > 1 &&
-                                  <button className="series-list__remove" onClick={() => removeSeries(series.dataKey)}>&#215;</button>
-                                }
-                              </li>
-                            )
-                          })}
+                            })}
                         </ul>
-                      </>)}
-
-                    <Select fieldName="visualizationType" label="Add Data Series" initial="Select" onChange={(e) => {
-                      if (e.target.value !== '' && e.target.value !== 'Select') {
-                        addNewSeries(e.target.value)
-                      }
-                      e.target.value = ''
-                    }} options={getColumns()}/>
-                    {config.series && config.series.length <= 1 && config.visualizationType === 'Bar' && (
-                      <>
-                        <span className="divider-heading">Confidence Keys</span>
-                        <Select value={config.confidenceKeys.upper || ''} section="confidenceKeys" fieldName="upper" label="Upper" updateField={updateField} initial="Select" options={getColumns()}/>
-                        <Select value={config.confidenceKeys.lower || ''} section="confidenceKeys" fieldName="lower" label="Lower" updateField={updateField} initial="Select" options={getColumns()}/>
                       </>
                     )}
-
-                    {config.series && config.series.length === 1 && <Select
-                      fieldName="visualizationType"
-                      label="Rank by Value"
-                      initial="Select"
-                      onChange={(e) => sortSeries(e.target.value)}
-                      options={['asc', 'desc']} />}
-                    
                   </AccordionItemPanel>
                 </AccordionItem>
-              }
+              )}
 
               <AccordionItem>
                 <AccordionItemHeading>
                   <AccordionItemButton>
-                    {config.visualizationType !== 'Pie'
-                      ? config.visualizationType === 'Bar' ? 'Value Axis' : 'Value Axis'
-                      : 'Data Format'
-                    }
-                    {config.visualizationType === 'Pie' && !config.yAxis.dataKey && <WarningImage width="25" className="warning-icon"/>}
+                    {config.visualizationType !== 'Pie' ? (config.orientation !== 'horizontal' ? 'Left Value Axis' : 'Value Axis') : 'Data Format'}
+                    {config.visualizationType === 'Pie' && !config.yAxis.dataKey && <WarningImage width='25' className='warning-icon' />}
                   </AccordionItemButton>
                 </AccordionItemHeading>
                 <AccordionItemPanel>
-                  {config.visualizationType === 'Pie' &&
-                    <Select value={config.yAxis.dataKey || ''} section="yAxis" fieldName="dataKey" label="Data Column" initial="Select" required={true} updateField={updateField} options={getColumns(false)} tooltip={
-                      <Tooltip style={{ textTransform: 'none' }}>
-                        <Tooltip.Target><Icon display="question" style={{ marginLeft: '0.5rem' }}/></Tooltip.Target>
-                        <Tooltip.Content>
-                          <p>Select the source data to be visually represented.</p>
-                        </Tooltip.Content>
-                      </Tooltip>
-                    }/>
-                  }
+                  {config.visualizationType === 'Pie' && (
+                    <Select
+                      value={config.yAxis.dataKey || ''}
+                      section='yAxis'
+                      fieldName='dataKey'
+                      label='Data Column'
+                      initial='Select'
+                      required={true}
+                      updateField={updateField}
+                      options={getColumns(false)}
+                      tooltip={
+                        <Tooltip style={{ textTransform: 'none' }}>
+                          <Tooltip.Target>
+                            <Icon display='question' style={{ marginLeft: '0.5rem' }} />
+                          </Tooltip.Target>
+                          <Tooltip.Content>
+                            <p>Select the source data to be visually represented.</p>
+                          </Tooltip.Content>
+                        </Tooltip>
+                      }
+                    />
+                  )}
                   {config.visualizationType !== 'Pie' && (
                     <>
-                      <TextField value={config.yAxis.label} section="yAxis" fieldName="label" label="Label" updateField={updateField}/>
-                      <TextField value={config.yAxis.numTicks} placeholder="Auto" type="number" section="yAxis" fieldName="numTicks" label="Number of ticks" className="number-narrow" updateField={updateField}/>
-                      <TextField value={config.yAxis.size} type="number" section="yAxis" fieldName="size" label={config.orientation === 'horizontal' ? 'Size (Height)' : 'Size (Width)'} className="number-narrow" updateField={updateField} tooltip={
-                        <Tooltip style={{ textTransform: 'none' }}>
-                        <Tooltip.Target><Icon display="question"/></Tooltip.Target>
-                        <Tooltip.Content>
-                         <p>{`Increase the size if elements in the ${config.orientation} axis are being crowded or hidden behind other elements.  Decrease if less space is required for the value axis.`}</p>  
-                        </Tooltip.Content>
-                      </Tooltip>
-                      }/>
-                      {config.orientation !== 'horizontal' && <CheckBox value={config.yAxis.gridLines} section="yAxis" fieldName="gridLines" label="Display Gridlines" updateField={updateField}/>}
+                      <TextField value={config.yAxis.label} section='yAxis' fieldName='label' label='Label' updateField={updateField} />
+                      {config.runtime.seriesKeys && config.runtime.seriesKeys.length === 1 && <CheckBox value={config.isLegendValue} fieldName='isLegendValue' label='Use Legend Value in Hover' updateField={updateField} />}
+                      <TextField value={config.yAxis.numTicks} placeholder='Auto' type='number' section='yAxis' fieldName='numTicks' label='Number of ticks' className='number-narrow' updateField={updateField} />
+                      <TextField
+                        value={config.yAxis.size}
+                        type='number'
+                        section='yAxis'
+                        fieldName='size'
+                        label={config.orientation === 'horizontal' ? 'Size (Height)' : 'Size (Width)'}
+                        className='number-narrow'
+                        updateField={updateField}
+                        tooltip={
+                          <Tooltip style={{ textTransform: 'none' }}>
+                            <Tooltip.Target>
+                              <Icon display='question' />
+                            </Tooltip.Target>
+                            <Tooltip.Content>
+                              <p>{`Increase the size if elements in the ${config.orientation} axis are being crowded or hidden behind other elements.  Decrease if less space is required for the value axis.`}</p>
+                            </Tooltip.Content>
+                          </Tooltip>
+                        }
+                      />
+                      {config.orientation === 'horizontal' && <TextField value={config.xAxis.labelOffset} section='xAxis' fieldName='labelOffset' label='Label offset' type='number' className='number-narrow' updateField={updateField} />}
+                      {config.orientation !== 'horizontal' && <CheckBox value={config.yAxis.gridLines} section='yAxis' fieldName='gridLines' label='Display Gridlines' updateField={updateField} />}
                     </>
                   )}
-                  <span className="divider-heading">Number Formatting</span>
-                  <CheckBox value={config.dataFormat.commas} section="dataFormat" fieldName="commas" label="Add commas" updateField={updateField}/>
-                  <TextField value={config.dataFormat.roundTo} type="number" section="dataFormat" fieldName="roundTo" label="Round to decimal point" className="number-narrow" updateField={updateField} min={0}/>
-                  <div className="two-col-inputs">
-                    <TextField value={config.dataFormat.prefix} section="dataFormat" fieldName="prefix" label="Prefix" updateField={updateField} tooltip={
-                      <Tooltip style={{ textTransform: 'none' }}>
-                        <Tooltip.Target><Icon display="question" style={{ marginLeft: '0.5rem' }}/></Tooltip.Target>
-                        <Tooltip.Content>
-                          {config.visualizationType === 'Pie' && <p>Enter a data prefix to display in the data table and chart tooltips, if applicable.</p>}
-                          {config.visualizationType !== 'Pie' && <p>Enter a data prefix (such as "$"), if applicable.</p>}
-                        </Tooltip.Content>
-                      </Tooltip>
-                    }/>
-                    <TextField value={config.dataFormat.suffix} section="dataFormat" fieldName="suffix" label="Suffix" updateField={updateField} tooltip={
+                  <span className='divider-heading'>Number Formatting</span>
+                  <CheckBox value={config.dataFormat.commas} section='dataFormat' fieldName='commas' label='Add commas' updateField={updateField} />
+                  <CheckBox
+                    value={config.dataFormat.abbreviated}
+                    section='dataFormat'
+                    fieldName='abbreviated'
+                    label='Abbreviate Axis Values'
+                    updateField={updateField}
+                    tooltip={
                       <Tooltip style={{ textTransform: 'none' }}>
-                        <Tooltip.Target><Icon display="question" style={{ marginLeft: '0.5rem' }}/></Tooltip.Target>
+                        <Tooltip.Target>
+                          <Icon display='question' />
+                        </Tooltip.Target>
                         <Tooltip.Content>
-                          {config.visualizationType === 'Pie' && <p>Enter a data suffix to display in the data table and tooltips, if applicable.</p>}
-                          {config.visualizationType !== 'Pie' && <p>Enter a data suffix (such as "%"), if applicable.</p>}
+                          <p>{`This option abbreviates very large or very small numbers on the value axis`}</p>
                         </Tooltip.Content>
                       </Tooltip>
-                    }/>
+                    }
+                  />
+                  <TextField value={config.dataFormat.roundTo} type='number' section='dataFormat' fieldName='roundTo' label='Round to decimal point' className='number-narrow' updateField={updateField} min={0} />
+                  <div className='two-col-inputs'>
+                    <TextField
+                      value={config.dataFormat.prefix}
+                      section='dataFormat'
+                      fieldName='prefix'
+                      label='Prefix'
+                      updateField={updateField}
+                      tooltip={
+                        <Tooltip style={{ textTransform: 'none' }}>
+                          <Tooltip.Target>
+                            <Icon display='question' style={{ marginLeft: '0.5rem' }} />
+                          </Tooltip.Target>
+                          <Tooltip.Content>
+                            {config.visualizationType === 'Pie' && <p>Enter a data prefix to display in the data table and chart tooltips, if applicable.</p>}
+                            {config.visualizationType !== 'Pie' && <p>Enter a data prefix (such as "$"), if applicable.</p>}
+                          </Tooltip.Content>
+                        </Tooltip>
+                      }
+                    />
+                    <TextField
+                      value={config.dataFormat.suffix}
+                      section='dataFormat'
+                      fieldName='suffix'
+                      label='Suffix'
+                      updateField={updateField}
+                      tooltip={
+                        <Tooltip style={{ textTransform: 'none' }}>
+                          <Tooltip.Target>
+                            <Icon display='question' style={{ marginLeft: '0.5rem' }} />
+                          </Tooltip.Target>
+                          <Tooltip.Content>
+                            {config.visualizationType === 'Pie' && <p>Enter a data suffix to display in the data table and tooltips, if applicable.</p>}
+                            {config.visualizationType !== 'Pie' && <p>Enter a data suffix (such as "%"), if applicable.</p>}
+                          </Tooltip.Content>
+                        </Tooltip>
+                      }
+                    />
                   </div>
-                 
-                  {(config.orientation === 'horizontal') ?  // horizontal - x is vertical y is horizontal
-                    <>
-                      <CheckBox value={config.xAxis.hideAxis} section="xAxis" fieldName="hideAxis" label="Hide Axis" updateField={updateField} />
-                      <CheckBox value={config.xAxis.hideLabel} section="xAxis" fieldName="hideLabel" label="Hide Label" updateField={updateField} />
-                      <CheckBox value={config.xAxis.hideTicks} section="xAxis" fieldName="hideTicks" label="Hide Ticks" updateField={updateField} />
-                      <TextField value={config.xAxis.max}  section='xAxis' fieldName='max' label='update max value' type='number' placeholder='Auto'  updateField={updateField} />
-                      <span style={{color:'red',display:'block'}} >{warningMsg.maxMsg}</span>
-                    </>
-                    : (config.visualizationType !=='Pie') &&
+
+                  {config.orientation === 'horizontal' ? ( // horizontal - x is vertical y is horizontal
                     <>
-                      <CheckBox value={config.yAxis.hideAxis} section="yAxis" fieldName="hideAxis" label="Hide Axis" updateField={updateField} />
-                      <CheckBox value={config.yAxis.hideLabel} section="yAxis" fieldName="hideLabel" label="Hide Label" updateField={updateField} />
-                      <CheckBox value={config.yAxis.hideTicks} section="yAxis" fieldName="hideTicks" label="Hide Ticks" updateField={updateField} />
-                      <TextField value={config.yAxis.max} section='yAxis' fieldName='max' type='number' label='update max value' placeholder='Auto' updateField={updateField}  />
-                      <span style={{color:'red',display:'block'}} >{warningMsg.maxMsg}</span>
-                      <TextField value={config.yAxis.min} section='yAxis' fieldName='min' type='number' label='update min value' placeholder='Auto' updateField={updateField}  />
-                      <span style={{color:'red',display:'block'}} >{warningMsg.minMsg}</span>
+                      <CheckBox value={config.xAxis.hideAxis} section='xAxis' fieldName='hideAxis' label='Hide Axis' updateField={updateField} />
+                      <CheckBox value={config.xAxis.hideLabel} section='xAxis' fieldName='hideLabel' label='Hide Label' updateField={updateField} />
+                      <CheckBox value={config.xAxis.hideTicks} section='xAxis' fieldName='hideTicks' label='Hide Ticks' updateField={updateField} />
+                      <TextField value={config.xAxis.max} section='xAxis' fieldName='max' label='update max value' type='number' placeholder='Auto' updateField={updateField} />
+                      <span style={{ color: 'red', display: 'block' }}>{warningMsg.maxMsg}</span>
                     </>
-                  }
+                  ) : (
+                    config.visualizationType !== 'Pie' && (
+                      <>
+                        <CheckBox value={config.yAxis.hideAxis} section='yAxis' fieldName='hideAxis' label='Hide Axis' updateField={updateField} />
+                        <CheckBox value={config.yAxis.hideLabel} section='yAxis' fieldName='hideLabel' label='Hide Label' updateField={updateField} />
+                        <CheckBox value={config.yAxis.hideTicks} section='yAxis' fieldName='hideTicks' label='Hide Ticks' updateField={updateField} />
+                        <TextField value={config.yAxis.max} section='yAxis' fieldName='max' type='number' label='update max value' placeholder='Auto' updateField={updateField} />
+                        <span style={{ color: 'red', display: 'block' }}>{warningMsg.maxMsg}</span>
+                        <TextField value={config.yAxis.min} section='yAxis' fieldName='min' type='number' label='update min value' placeholder='Auto' updateField={updateField} />
+                        <span style={{ color: 'red', display: 'block' }}>{warningMsg.minMsg}</span>
+                      </>
+                    )
+                  )}
                 </AccordionItemPanel>
               </AccordionItem>
 
+              {/* Right Value Axis Settings */}
+              {hasRightAxis && (
+                <AccordionItem>
+                  <AccordionItemHeading>
+                    <AccordionItemButton>Right Value Axis</AccordionItemButton>
+                  </AccordionItemHeading>
+                  <AccordionItemPanel>
+                    <TextField value={config.yAxis.rightLabel} section='yAxis' fieldName='rightLabel' label='Label' updateField={updateField} />
+                    <TextField value={config.yAxis.rightNumTicks} placeholder='Auto' type='number' section='yAxis' fieldName='rightNumTicks' label='Number of ticks' className='number-narrow' updateField={updateField} />
+                    <TextField value={config.yAxis.rightAxisSize} type='number' section='yAxis' fieldName='rightAxisSize' label='Size (Width)' className='number-narrow' updateField={updateField} />
+                    <TextField value={config.yAxis.rightLabelOffsetSize} type='number' section='yAxis' fieldName='rightLabelOffsetSize' label='Label Offset' className='number-narrow' updateField={updateField} />
+
+                    <span className='divider-heading'>Number Formatting</span>
+                    <CheckBox value={config.dataFormat.rightCommas} section='dataFormat' fieldName='rightCommas' label='Add commas' updateField={updateField} />
+                    <TextField value={config.dataFormat.rightRoundTo} type='number' section='dataFormat' fieldName='rightRoundTo' label='Round to decimal point' className='number-narrow' updateField={updateField} min={0} />
+                    <div className='two-col-inputs'>
+                      <TextField
+                        value={config.dataFormat.rightPrefix}
+                        section='dataFormat'
+                        fieldName='rightPrefix'
+                        label='Prefix'
+                        updateField={updateField}
+                        tooltip={
+                          <Tooltip style={{ textTransform: 'none' }}>
+                            <Tooltip.Target>
+                              <Icon display='question' style={{ marginLeft: '0.5rem' }} />
+                            </Tooltip.Target>
+                            <Tooltip.Content>
+                              {config.visualizationType === 'Pie' && <p>Enter a data prefix to display in the data table and chart tooltips, if applicable.</p>}
+                              {config.visualizationType !== 'Pie' && <p>Enter a data prefix (such as "$"), if applicable.</p>}
+                            </Tooltip.Content>
+                          </Tooltip>
+                        }
+                      />
+                      <TextField
+                        value={config.dataFormat.rightSuffix}
+                        section='dataFormat'
+                        fieldName='rightSuffix'
+                        label='Suffix'
+                        updateField={updateField}
+                        tooltip={
+                          <Tooltip style={{ textTransform: 'none' }}>
+                            <Tooltip.Target>
+                              <Icon display='question' style={{ marginLeft: '0.5rem' }} />
+                            </Tooltip.Target>
+                            <Tooltip.Content>
+                              {config.visualizationType === 'Pie' && <p>Enter a data suffix to display in the data table and tooltips, if applicable.</p>}
+                              {config.visualizationType !== 'Pie' && <p>Enter a data suffix (such as "%"), if applicable.</p>}
+                            </Tooltip.Content>
+                          </Tooltip>
+                        }
+                      />
+                    </div>
+
+                    <CheckBox value={config.yAxis.rightHideAxis} section='yAxis' fieldName='rightHideAxis' label='Hide Axis' updateField={updateField} />
+                    <CheckBox value={config.yAxis.rightHideLabel} section='yAxis' fieldName='rightHideLabel' label='Hide Label' updateField={updateField} />
+                    <CheckBox value={config.yAxis.rightHideTicks} section='yAxis' fieldName='rightHideTicks' label='Hide Ticks' updateField={updateField} />
+                  </AccordionItemPanel>
+                </AccordionItem>
+              )}
+
               <AccordionItem>
                 <AccordionItemHeading>
                   <AccordionItemButton>
-                    {config.visualizationType !== 'Pie'
-                      ? config.visualizationType === 'Bar' ? 'Date/Category Axis' : 'Date/Category Axis'
-                      : 'Segments'
-                    }
-                    {!config.xAxis.dataKey && <WarningImage width="25" className="warning-icon"/>}
+                    {config.visualizationType !== 'Pie' ? (config.visualizationType === 'Bar' ? 'Date/Category Axis' : 'Date/Category Axis') : 'Segments'}
+                    {!config.xAxis.dataKey && <WarningImage width='25' className='warning-icon' />}
                   </AccordionItemButton>
                 </AccordionItemHeading>
                 <AccordionItemPanel>
-                  {config.visualizationType !== 'Pie' && <>
-                    <Select value={config.xAxis.type} section="xAxis" fieldName="type" label="Data Type" updateField={updateField} options={[ 'categorical', 'date' ]}/>
-                    <Select value={config.xAxis.dataKey || ''} section="xAxis" fieldName="dataKey" label="Data Key" initial="Select" required={true} updateField={updateField} options={getColumns(false)} tooltip={
-                      <Tooltip style={{ textTransform: 'none' }}>
-                        <Tooltip.Target><Icon display="question" style={{ marginLeft: '0.5rem' }}/></Tooltip.Target>
-                        <Tooltip.Content>
-                          <p>Select the column or row containing the categories or dates for this axis. </p>
-                        </Tooltip.Content>
-                      </Tooltip>
-                    }/>
-                  </>}
+                  {config.visualizationType !== 'Pie' && (
+                    <>
+                      <Select value={config.xAxis.type} section='xAxis' fieldName='type' label='Data Type' updateField={updateField} options={['categorical', 'date']} />
+                      <Select
+                        value={config.xAxis.dataKey || ''}
+                        section='xAxis'
+                        fieldName='dataKey'
+                        label='Data Key'
+                        initial='Select'
+                        required={true}
+                        updateField={updateField}
+                        options={getColumns(false)}
+                        tooltip={
+                          <Tooltip style={{ textTransform: 'none' }}>
+                            <Tooltip.Target>
+                              <Icon display='question' style={{ marginLeft: '0.5rem' }} />
+                            </Tooltip.Target>
+                            <Tooltip.Content>
+                              <p>Select the column or row containing the categories or dates for this axis. </p>
+                            </Tooltip.Content>
+                          </Tooltip>
+                        }
+                      />
+                    </>
+                  )}
 
-                  {config.visualizationType === 'Pie' &&
-                    <Select value={config.xAxis.dataKey || ''} section="xAxis" fieldName="dataKey" label="Segment Labels" initial="Select" required={true} updateField={updateField} options={getColumns(false)} tooltip={
-                      <Tooltip style={{ textTransform: 'none' }}>
-                        <Tooltip.Target><Icon display="question" style={{ marginLeft: '0.5rem' }}/></Tooltip.Target>
-                        <Tooltip.Content>
-                          <p>Select the source row or column that contains the segment labels. Depending on the data structure, it may be listed as "Key."</p>
-                        </Tooltip.Content>
-                      </Tooltip>
-                    }/>
-                  }
+                  {config.visualizationType === 'Pie' && (
+                    <Select
+                      value={config.xAxis.dataKey || ''}
+                      section='xAxis'
+                      fieldName='dataKey'
+                      label='Segment Labels'
+                      initial='Select'
+                      required={true}
+                      updateField={updateField}
+                      options={getColumns(false)}
+                      tooltip={
+                        <Tooltip style={{ textTransform: 'none' }}>
+                          <Tooltip.Target>
+                            <Icon display='question' style={{ marginLeft: '0.5rem' }} />
+                          </Tooltip.Target>
+                          <Tooltip.Content>
+                            <p>Select the source row or column that contains the segment labels. Depending on the data structure, it may be listed as "Key."</p>
+                          </Tooltip.Content>
+                        </Tooltip>
+                      }
+                    />
+                  )}
 
                   {config.visualizationType !== 'Pie' && (
                     <>
-                      <TextField value={config.xAxis.label} section="xAxis" fieldName="label" label="Label" updateField={updateField}/>
+                      <TextField value={config.xAxis.label} section='xAxis' fieldName='label' label='Label' updateField={updateField} />
 
                       {config.xAxis.type === 'date' && (
                         <>
-                          <p style={{ padding: '1.5em 0 0.5em', fontSize: '.9rem', lineHeight: '1rem' }}>Format how charts should parse and display your dates using <a href="https://github.com/d3/d3-time-format#locale_format" target="_blank" rel="noreferrer">these guidelines</a>.</p>
-                          <TextField value={config.xAxis.dateParseFormat} section="xAxis" fieldName="dateParseFormat" placeholder="Ex. %Y-%m-%d" label="Date Parse Format" updateField={updateField}/>
-                          <TextField value={config.xAxis.dateDisplayFormat} section="xAxis" fieldName="dateDisplayFormat" placeholder="Ex. %Y-%m-%d" label="Date Display Format" updateField={updateField}/>
+                          <p style={{ padding: '1.5em 0 0.5em', fontSize: '.9rem', lineHeight: '1rem' }}>
+                            Format how charts should parse and display your dates using{' '}
+                            <a href='https://github.com/d3/d3-time-format#locale_format' target='_blank' rel='noreferrer'>
+                              these guidelines
+                            </a>
+                            .
+                          </p>
+                          <TextField value={config.xAxis.dateParseFormat} section='xAxis' fieldName='dateParseFormat' placeholder='Ex. %Y-%m-%d' label='Date Parse Format' updateField={updateField} />
+                          <TextField value={config.xAxis.dateDisplayFormat} section='xAxis' fieldName='dateDisplayFormat' placeholder='Ex. %Y-%m-%d' label='Date Display Format' updateField={updateField} />
                         </>
                       )}
 
-                      <CheckBox value={config.exclusions.active} section="exclusions" fieldName="active" label={config.xAxis.type === 'date' ? 'Limit by start and/or end dates' : 'Exclude one or more values'} tooltip={
-                        <Tooltip style={{ textTransform: 'none' }}>
-                          <Tooltip.Target><Icon display="question" style={{ marginLeft: '0.5rem' }}/></Tooltip.Target>
-                          <Tooltip.Content>
-                            <p>When this option is checked, you can select source-file values for exclusion from the date/category axis. </p>
-                          </Tooltip.Content>
-                        </Tooltip>
-                      } updateField={updateField}/>
+                      <CheckBox
+                        value={config.exclusions.active}
+                        section='exclusions'
+                        fieldName='active'
+                        label={config.xAxis.type === 'date' ? 'Limit by start and/or end dates' : 'Exclude one or more values'}
+                        tooltip={
+                          <Tooltip style={{ textTransform: 'none' }}>
+                            <Tooltip.Target>
+                              <Icon display='question' style={{ marginLeft: '0.5rem' }} />
+                            </Tooltip.Target>
+                            <Tooltip.Content>
+                              <p>When this option is checked, you can select source-file values for exclusion from the date/category axis. </p>
+                            </Tooltip.Content>
+                          </Tooltip>
+                        }
+                        updateField={updateField}
+                      />
 
-                      {config.exclusions.active &&
+                      {config.exclusions.active && (
                         <>
-                          {config.xAxis.type === 'categorical' &&
+                          {config.xAxis.type === 'categorical' && (
                             <>
-                              {config.exclusions.keys.length > 0 &&
+                              {config.exclusions.keys.length > 0 && (
                                 <>
                                   <fieldset>
-                                    <legend className="edit-label">Excluded Keys</legend>
+                                    <legend className='edit-label'>Excluded Keys</legend>
                                   </fieldset>
-                                  <ExclusionsList/>
+                                  <ExclusionsList />
                                 </>
-                              }
-
-                              <Select fieldName="visualizationType" label="Add Exclusion" initial="Select" onChange={(e) => {
-                                if (e.target.value !== '' && e.target.value !== 'Select') {
-                                  addNewExclusion(e.target.value)
-                                }
-                                e.target.value = ''
-                              }} options={getDataValues(config.xAxis.dataKey, true)}/>
+                              )}
+
+                              <Select
+                                fieldName='visualizationType'
+                                label='Add Exclusion'
+                                initial='Select'
+                                onChange={e => {
+                                  if (e.target.value !== '' && e.target.value !== 'Select') {
+                                    addNewExclusion(e.target.value)
+                                  }
+                                  e.target.value = ''
+                                }}
+                                options={getDataValues(config.xAxis.dataKey, true)}
+                              />
                             </>
-                          }
+                          )}
 
-                          {config.xAxis.type === 'date' &&
+                          {config.xAxis.type === 'date' && (
                             <>
-                              <TextField type="date" section="exclusions" fieldName="dateStart" label="Start Date" updateField={updateField} value={config.exclusions.dateStart || ''}/>
-                              <TextField type="date" section="exclusions" fieldName="dateEnd" label="End Date" updateField={updateField} value={config.exclusions.dateEnd || ''}/>
+                              <TextField type='date' section='exclusions' fieldName='dateStart' label='Start Date' updateField={updateField} value={config.exclusions.dateStart || ''} />
+                              <TextField type='date' section='exclusions' fieldName='dateEnd' label='End Date' updateField={updateField} value={config.exclusions.dateEnd || ''} />
                             </>
-                          }
-                        </>
-                      }
-
-                      {config.xAxis.type === 'date' &&
-                        <>
-                          <TextField value={config.xAxis.numTicks} placeholder="Auto" type="number" min="1" section="xAxis" fieldName="numTicks" label="Number of ticks" className="number-narrow" updateField={updateField}/>
+                          )}
                         </>
-                      }
+                      )}
+                      <TextField value={config.xAxis.numTicks} placeholder='Auto' type='number' min='1' section='xAxis' fieldName='numTicks' label='Number of ticks' className='number-narrow' updateField={updateField} />
 
-                      <TextField value={config.xAxis.size} type="number" min="0" section="xAxis" fieldName="size" label={config.orientation === 'horizontal' ? 'Size (Width)' : 'Size (Height)'} className="number-narrow" updateField={updateField}/>
+                      <TextField value={config.xAxis.size} type='number' min='0' section='xAxis' fieldName='size' label={config.orientation === 'horizontal' ? 'Size (Width)' : 'Size (Height)'} className='number-narrow' updateField={updateField} />
 
-                      {config.yAxis.labelPlacement !== 'Below Bar' &&
-                        <TextField value={config.xAxis.tickRotation} type="number" min="0" section="xAxis" fieldName="tickRotation" label="Tick rotation (Degrees)" className="number-narrow" updateField={updateField}/>
-                      }
-                      {(config.orientation === 'horizontal') ?
+                      {config.yAxis.labelPlacement !== 'Below Bar' && <TextField value={config.xAxis.tickRotation} type='number' min='0' section='xAxis' fieldName='tickRotation' label='Tick rotation (Degrees)' className='number-narrow' updateField={updateField} />}
+                      {config.orientation === 'horizontal' ? (
                         <>
-                          <CheckBox value={config.yAxis.hideAxis} section="yAxis" fieldName="hideAxis" label="Hide Axis" updateField={updateField}/>
-                          <CheckBox value={config.yAxis.hideLabel} section="yAxis" fieldName="hideLabel" label="Hide Label" updateField={updateField}/>
+                          <CheckBox value={config.yAxis.hideAxis} section='yAxis' fieldName='hideAxis' label='Hide Axis' updateField={updateField} />
+                          <CheckBox value={config.yAxis.hideLabel} section='yAxis' fieldName='hideLabel' label='Hide Label' updateField={updateField} />
                         </>
-                        :
+                      ) : (
                         <>
-                          <CheckBox value={config.xAxis.hideAxis} section="xAxis" fieldName="hideAxis" label="Hide Axis" updateField={updateField}/>
-                          <CheckBox value={config.xAxis.hideLabel} section="xAxis" fieldName="hideLabel" label="Hide Label" updateField={updateField}/>
-                          <CheckBox value={config.xAxis.hideTicks} section="xAxis" fieldName="hideTicks" label="Hide Ticks" updateField={updateField}/>
+                          <CheckBox value={config.xAxis.hideAxis} section='xAxis' fieldName='hideAxis' label='Hide Axis' updateField={updateField} />
+                          <CheckBox value={config.xAxis.hideLabel} section='xAxis' fieldName='hideLabel' label='Hide Label' updateField={updateField} />
+                          <CheckBox value={config.xAxis.hideTicks} section='xAxis' fieldName='hideTicks' label='Hide Ticks' updateField={updateField} />
                         </>
-                      }
+                      )}
                     </>
                   )}
 
-                  {config.visualizationType === 'Pie' &&
+                  {config.visualizationType === 'Pie' && (
                     <>
-                      <CheckBox value={config.exclusions.active} section="exclusions" fieldName="active" label={'Exclude one or more values'} updateField={updateField} tooltip={
-                        <Tooltip style={{ textTransform: 'none' }}>
-                          <Tooltip.Target><Icon display="question" style={{ marginLeft: '0.5rem' }}/></Tooltip.Target>
-                          <Tooltip.Content>
-                            <p>When this option is checked, you can select values for exclusion from the pie segments.</p>
-                          </Tooltip.Content>
-                        </Tooltip>
-                      }/>
-                      {config.exclusions.active &&
+                      <CheckBox
+                        value={config.exclusions.active}
+                        section='exclusions'
+                        fieldName='active'
+                        label={'Exclude one or more values'}
+                        updateField={updateField}
+                        tooltip={
+                          <Tooltip style={{ textTransform: 'none' }}>
+                            <Tooltip.Target>
+                              <Icon display='question' style={{ marginLeft: '0.5rem' }} />
+                            </Tooltip.Target>
+                            <Tooltip.Content>
+                              <p>When this option is checked, you can select values for exclusion from the pie segments.</p>
+                            </Tooltip.Content>
+                          </Tooltip>
+                        }
+                      />
+                      {config.exclusions.active && (
                         <>
-                          {config.exclusions.keys.length > 0 &&
+                          {config.exclusions.keys.length > 0 && (
                             <>
                               <fieldset>
-                                <legend className="edit-label">Excluded Keys</legend>
+                                <legend className='edit-label'>Excluded Keys</legend>
                               </fieldset>
-                              <ExclusionsList/>
+                              <ExclusionsList />
                             </>
-                          }
-
-                          <Select fieldName="visualizationType" label="Add Exclusion" initial="Select" onChange={(e) => {
-                            if (e.target.value !== '' && e.target.value !== 'Select') {
-                              addNewExclusion(e.target.value)
-                            }
-                            e.target.value = ''
-                          }} options={getDataValues(config.xAxis.dataKey, true)}/>
+                          )}
+
+                          <Select
+                            fieldName='visualizationType'
+                            label='Add Exclusion'
+                            initial='Select'
+                            onChange={e => {
+                              if (e.target.value !== '' && e.target.value !== 'Select') {
+                                addNewExclusion(e.target.value)
+                              }
+                              e.target.value = ''
+                            }}
+                            options={getDataValues(config.xAxis.dataKey, true)}
+                          />
                         </>
-                      }
+                      )}
                     </>
-                  }
+                  )}
                 </AccordionItemPanel>
               </AccordionItem>
 
-              {(config.visualizationType !== 'Pie' && config.visualizationType !== 'Paired Bar') &&
+              {config.visualizationType !== 'Pie' && config.visualizationType !== 'Paired Bar' && (
                 <AccordionItem>
                   <AccordionItemHeading>
-                    <AccordionItemButton>
-                      Regions
-                    </AccordionItemButton>
+                    <AccordionItemButton>Regions</AccordionItemButton>
                   </AccordionItemHeading>
                   <AccordionItemPanel>
-                    <Regions config={config} updateConfig={updateConfig}/>
+                    <Regions config={config} updateConfig={updateConfig} />
                   </AccordionItemPanel>
                 </AccordionItem>
-              }
+              )}
 
               <AccordionItem>
                 <AccordionItemHeading>
-                  <AccordionItemButton>
-                    Legend
-                  </AccordionItemButton>
+                  <AccordionItemButton>Legend</AccordionItemButton>
                 </AccordionItemHeading>
                 <AccordionItemPanel>
-                <CheckBox value={config.legend.reverseLabelOrder} section="legend" fieldName="reverseLabelOrder" label="Reverse Labels" updateField={updateField}/>
+                  <CheckBox value={config.legend.reverseLabelOrder} section='legend' fieldName='reverseLabelOrder' label='Reverse Labels' updateField={updateField} />
                   {/* <fieldset className="checkbox-group">
                     <CheckBox value={config.legend.dynamicLegend} section="legend" fieldName="dynamicLegend" label="Dynamic Legend" updateField={updateField}/>
                     {config.legend.dynamicLegend && (
@@ -1086,88 +1409,104 @@ useEffect(()=>{
                       </>
                     )}
                   </fieldset> */}
-                  <CheckBox value={config.legend.hide} section="legend" fieldName="hide" label="Hide Legend" updateField={updateField} tooltip={
-                    <Tooltip style={{ textTransform: 'none' }}>
-                      <Tooltip.Target><Icon display="question" style={{ marginLeft: '0.5rem' }}/></Tooltip.Target>
-                      <Tooltip.Content>
-                        <p>With a single-series chart, consider hiding the legend to reduce visual clutter.</p>
-                      </Tooltip.Content>
-                    </Tooltip>
-                  }/>
-
-                  {(config.visualizationType==='Bar' && config.visualizationSubType ==="regular" && config.runtime.seriesKeys.length===1 )&& (
-                   <Select value={config.legend.colorCode} section="legend" fieldName="colorCode" label="Color code by category" initial="Select" updateField={updateField} options={getDataValueOptions(data)}/>
+                  <CheckBox
+                    value={config.legend.hide}
+                    section='legend'
+                    fieldName='hide'
+                    label='Hide Legend'
+                    updateField={updateField}
+                    tooltip={
+                      <Tooltip style={{ textTransform: 'none' }}>
+                        <Tooltip.Target>
+                          <Icon display='question' style={{ marginLeft: '0.5rem' }} />
+                        </Tooltip.Target>
+                        <Tooltip.Content>
+                          <p>With a single-series chart, consider hiding the legend to reduce visual clutter.</p>
+                        </Tooltip.Content>
+                      </Tooltip>
+                    }
+                  />
+                  <CheckBox value={config.legend.showLegendValuesTooltip} section='legend' fieldName='showLegendValuesTooltip' label='Show Legend Values in Tooltip' updateField={updateField} />
+
+                  {config.visualizationType === 'Bar' && config.visualizationSubType === 'regular' && config.runtime.seriesKeys.length === 1 && (
+                    <Select value={config.legend.colorCode} section='legend' fieldName='colorCode' label='Color code by category' initial='Select' updateField={updateField} options={getDataValueOptions(data)} />
                   )}
-                  <Select value={config.legend.behavior} section="legend" fieldName="behavior" label="Legend Behavior (When clicked)" updateField={updateField} options={[ 'highlight', 'isolate' ]}/>
-                  <TextField value={config.legend.label} section="legend" fieldName="label" label="Title" updateField={updateField}/>
-                  <Select value={config.legend.position} section="legend" fieldName="position" label="Position" updateField={updateField} options={[ 'right', 'left' ]}/>
-                  <TextField type='textarea' value={config.legend.description} 	updateField={updateField} 	section='legend' 	fieldName='description' 	label='Legend Description' />
+                  <Select value={config.legend.behavior} section='legend' fieldName='behavior' label='Legend Behavior (When clicked)' updateField={updateField} options={['highlight', 'isolate']} />
+                  <TextField value={config.legend.label} section='legend' fieldName='label' label='Title' updateField={updateField} />
+                  <Select value={config.legend.position} section='legend' fieldName='position' label='Position' updateField={updateField} options={['right', 'left', 'bottom']} />
+                  {config.legend.position === 'bottom' && <CheckBox value={config.legend.singleRow} section='legend' fieldName='singleRow' label='Single Row Legend' updateField={updateField} />}
+                  <TextField type='textarea' value={config.legend.description} updateField={updateField} section='legend' fieldName='description' label='Legend Description' />
                 </AccordionItemPanel>
               </AccordionItem>
 
               <AccordionItem>
                 <AccordionItemHeading>
-                  <AccordionItemButton>
-                    Filters
-                  </AccordionItemButton>
+                  <AccordionItemButton>Filters</AccordionItemButton>
                 </AccordionItemHeading>
                 <AccordionItemPanel>
-                  {config.filters && <ul className="filters-list">
-                    {config.filters.map((filter, index) => (
-                        <fieldset className="edit-block" key={index}>
-                          <button type="button" className="remove-column" onClick={() => {
-                            removeFilter(index)
-                          }}>Remove
+                  {config.filters && (
+                    <ul className='filters-list'>
+                      {config.filters.map((filter, index) => (
+                        <fieldset className='edit-block' key={index}>
+                          <button
+                            type='button'
+                            className='remove-column'
+                            onClick={() => {
+                              removeFilter(index)
+                            }}
+                          >
+                            Remove
                           </button>
                           <label>
-                            <span className="edit-label column-heading">Filter</span>
-                            <select value={filter.columnName} onChange={(e) => {
-                              updateFilterProp('columnName', index, e.target.value)
-                            }}>
-                              <option value="">- Select Option -</option>
+                            <span className='edit-label column-heading'>Filter</span>
+                            <select
+                              value={filter.columnName}
+                              onChange={e => {
+                                updateFilterProp('columnName', index, e.target.value)
+                              }}
+                            >
+                              <option value=''>- Select Option -</option>
                               {getColumns().map((dataKey, index) => (
-                                <option value={dataKey} key={index}>{dataKey}</option>
+                                <option value={dataKey} key={index}>
+                                  {dataKey}
+                                </option>
                               ))}
                             </select>
                           </label>
                           <label>
-                            <span className="edit-label column-heading">Label</span>
-                            <input type="text" value={filter.label} onChange={(e) => {
-                              updateFilterProp('label', index, e.target.value)
-                            }}/>
+                            <span className='edit-label column-heading'>Label</span>
+                            <input
+                              type='text'
+                              value={filter.label}
+                              onChange={e => {
+                                updateFilterProp('label', index, e.target.value)
+                              }}
+                            />
                           </label>
 
                           <label>
-                            <span className="edit-filterOrder column-heading">Filter Order</span>
-                            <select value={filter.order ? filter.order : 'asc'} onChange={(e) => updateFilterProp('order', index, e.target.value)}>
+                            <span className='edit-filterOrder column-heading'>Filter Order</span>
+                            <select value={filter.order ? filter.order : 'asc'} onChange={e => updateFilterProp('order', index, e.target.value)}>
                               {filterOptions.map((option, index) => {
-                                return <option value={option.value} key={`filter-${index}`}>{option.label}</option>
+                                return (
+                                  <option value={option.value} key={`filter-${index}`}>
+                                    {option.label}
+                                  </option>
+                                )
                               })}
                             </select>
 
-                            {filter.order === 'cust' &&
-                              <DragDropContext
-                                onDragEnd={({ source, destination }) =>
-                                  handleFilterChange(source.index, destination.index, index, config.filters[index])
-                                }>
-                                <Droppable droppableId="filter_order">
-                                  {(provided) => (
-                                    <ul
-                                      {...provided.droppableProps}
-                                      className="sort-list"
-                                      ref={provided.innerRef}
-                                      style={{ marginTop: '1em' }}
-                                    >
+                            {filter.order === 'cust' && (
+                              <DragDropContext onDragEnd={({ source, destination }) => handleFilterChange(source.index, destination.index, index, config.filters[index])}>
+                                <Droppable droppableId='filter_order'>
+                                  {provided => (
+                                    <ul {...provided.droppableProps} className='sort-list' ref={provided.innerRef} style={{ marginTop: '1em' }}>
                                       {config.filters[index]?.values.map((value, index) => {
                                         return (
                                           <Draggable key={value} draggableId={`draggableFilter-${value}`} index={index}>
                                             {(provided, snapshot) => (
                                               <li>
-                                                <div className={snapshot.isDragging ? 'currently-dragging' : ''}
-                                                     style={getItemStyle(snapshot.isDragging, provided.draggableProps.style, sortableItemStyles)}
-                                                     ref={provided.innerRef}
-                                                     {...provided.draggableProps}
-                                                     {...provided.dragHandleProps}>
+                                                <div className={snapshot.isDragging ? 'currently-dragging' : ''} style={getItemStyle(snapshot.isDragging, provided.draggableProps.style, sortableItemStyles)} ref={provided.innerRef} {...provided.draggableProps} {...provided.dragHandleProps}>
                                                   {value}
                                                 </div>
                                               </li>
@@ -1180,98 +1519,86 @@ useEffect(()=>{
                                   )}
                                 </Droppable>
                               </DragDropContext>
-                            }
+                            )}
                           </label>
-
                         </fieldset>
-                      )
-                    )}
-                  </ul>}
+                      ))}
+                    </ul>
+                  )}
                   {!config.filters && <p style={{ textAlign: 'center' }}>There are currently no filters.</p>}
-                  <button type="button" onClick={addNewFilter} className="btn full-width">Add Filter</button>
+                  <button type='button' onClick={addNewFilter} className='btn full-width'>
+                    Add Filter
+                  </button>
                 </AccordionItemPanel>
               </AccordionItem>
 
               <AccordionItem>
                 <AccordionItemHeading>
-                  <AccordionItemButton>
-                    Visual
-                  </AccordionItemButton>
+                  <AccordionItemButton>Visual</AccordionItemButton>
                 </AccordionItemHeading>
                 <AccordionItemPanel>
-
-                  {config.isLollipopChart &&
+                  {config.isLollipopChart && (
                     <>
-                      <fieldset className="header">
-                        <legend className="edit-label">Lollipop Shape</legend>
-                        <div onChange={(e) => {
-                          setLollipopShape(e.target.value)
-                        }}>
-                          <label className="radio-label">
-                            <input
-                              type="radio"
-                              name="lollipopShape"
-                              value="circle"
-                              checked={config.lollipopShape === 'circle'}
-                            />
+                      <fieldset className='header'>
+                        <legend className='edit-label'>Lollipop Shape</legend>
+                        <div
+                          onChange={e => {
+                            setLollipopShape(e.target.value)
+                          }}
+                        >
+                          <label className='radio-label'>
+                            <input type='radio' name='lollipopShape' value='circle' checked={config.lollipopShape === 'circle'} />
                             Circle
                           </label>
-                          <label className="radio-label">
-                            <input
-                              type="radio"
-                              name="lollipopShape"
-                              value="square"
-                              checked={config.lollipopShape === 'square'}
-                            />
+                          <label className='radio-label'>
+                            <input type='radio' name='lollipopShape' value='square' checked={config.lollipopShape === 'square'} />
                             Square
                           </label>
                         </div>
-
                       </fieldset>
-                      <Select value={config.lollipopColorStyle ? config.lollipopColorStyle : 'two-tone'} fieldName="lollipopColorStyle" label="Lollipop Color Style" updateField={updateField} options={[ 'regular', 'two-tone' ]}/>
-                      <Select value={config.lollipopSize ? config.lollipopSize : 'small'} fieldName="lollipopSize" label="Lollipop Size" updateField={updateField} options={[ 'small', 'medium', 'large' ]}/>
+                      <Select value={config.lollipopColorStyle ? config.lollipopColorStyle : 'two-tone'} fieldName='lollipopColorStyle' label='Lollipop Color Style' updateField={updateField} options={['regular', 'two-tone']} />
+                      <Select value={config.lollipopSize ? config.lollipopSize : 'small'} fieldName='lollipopSize' label='Lollipop Size' updateField={updateField} options={['small', 'medium', 'large']} />
                     </>
-                  }
+                  )}
 
-                  <Select value={config.fontSize} fieldName="fontSize" label="Font Size" updateField={updateField} options={[ 'small', 'medium', 'large' ]}/>
+                  <Select value={config.fontSize} fieldName='fontSize' label='Font Size' updateField={updateField} options={['small', 'medium', 'large']} />
 
-                  {config.series?.some(series => series.type === 'Bar' || series.type === 'Paired Bar') &&
-                    <Select value={config.barHasBorder} fieldName="barHasBorder" label="Bar Borders" updateField={updateField} options={[ 'true', 'false' ]}/>
-                  }
+                  {config.series?.some(series => series.type === 'Bar' || series.type === 'Paired Bar') && <Select value={config.barHasBorder} fieldName='barHasBorder' label='Bar Borders' updateField={updateField} options={['true', 'false']} />}
 
-                  {/* <CheckBox value={config.animate} fieldName="animate" label="Animate Visualization" updateField={updateField} /> */}
+                  <CheckBox value={config.animate} fieldName='animate' label='Animate Visualization' updateField={updateField} />
 
                   {/*<CheckBox value={config.animateReplay} fieldName="animateReplay" label="Replay Animation When Filters Are Changed" updateField={updateField} />*/}
 
-                  {((config.series?.some(series => series.type === 'Line') && config.visualizationType === 'Combo') || config.visualizationType === 'Line' || config.visualizationType === "Spark Line") &&
-                    <Select value={config.lineDatapointStyle} fieldName="lineDatapointStyle" label="Line Datapoint Style" updateField={updateField} options={[ 'hidden', 'hover', 'always show' ]}/>
-                  }
+                  {((config.series?.some(series => series.type === 'Line') && config.visualizationType === 'Combo') || config.visualizationType === 'Line' || config.visualizationType === 'Spark Line') && (
+                    <Select value={config.lineDatapointStyle} fieldName='lineDatapointStyle' label='Line Datapoint Style' updateField={updateField} options={['hidden', 'hover', 'always show']} />
+                  )}
 
-                  <label className="header">
-                    <span className="edit-label">Header Theme</span>
-                    <ul className="color-palette">
-                      {headerColors.map((palette) => (
-                        <button 
+                  {/* eslint-disable */}
+                  <label className='header'>
+                    <span className='edit-label'>Header Theme</span>
+                    <ul className='color-palette'>
+                      {headerColors.map(palette => (
+                        <button
                           title={palette}
-                          key={palette} 
-                          onClick={(e) => {
-                            e.preventDefault();
+                          key={palette}
+                          onClick={e => {
+                            e.preventDefault()
                             updateConfig({ ...config, theme: palette })
-                          }} 
-                          className={config.theme === palette ? 'selected ' + palette : palette}>
-                        </button>
+                          }}
+                          className={config.theme === palette ? 'selected ' + palette : palette}
+                        ></button>
                       ))}
                     </ul>
                   </label>
                   <label>
-                    <span className="edit-label">Chart Color Palette</span>
+                    <span className='edit-label'>Chart Color Palette</span>
                   </label>
+                  {/* eslint-enable */}
                   {/* <InputCheckbox fieldName='isPaletteReversed'  size='small' label='Use selected palette in reverse order'   updateField={updateField}  value={isPaletteReversed} /> */}
-                  <InputToggle fieldName="isPaletteReversed" size="small" label="Use selected palette in reverse order" updateField={updateField} value={isPaletteReversed}/>
+                  <InputToggle fieldName='isPaletteReversed' size='small' label='Use selected palette in reverse order' updateField={updateField} value={isPaletteReversed} />
                   <span>Sequential</span>
-                  <ul className="color-palette">
-                    {filteredPallets.map((palette) => {
-
+                  <ul className='color-palette'>
+                    {filteredPallets.map(palette => {
                       const colorOne = {
                         backgroundColor: colorPalettes[palette][2]
                       }
@@ -1285,11 +1612,11 @@ useEffect(()=>{
                       }
 
                       return (
-                        <button 
-                          title={palette} 
-                          key={palette} 
-                          onClick={(e) => {
-                            e.preventDefault();
+                        <button
+                          title={palette}
+                          key={palette}
+                          onClick={e => {
+                            e.preventDefault()
                             updateConfig({ ...config, palette })
                           }}
                           className={config.palette === palette ? 'selected' : ''}
@@ -1302,9 +1629,8 @@ useEffect(()=>{
                     })}
                   </ul>
                   <span>Non-Sequential</span>
-                  <ul className="color-palette">
-                    {filteredQualitative.map((palette) => {
-
+                  <ul className='color-palette'>
+                    {filteredQualitative.map(palette => {
                       const colorOne = {
                         backgroundColor: colorPalettes[palette][2]
                       }
@@ -1317,13 +1643,12 @@ useEffect(()=>{
                         backgroundColor: colorPalettes[palette][6]
                       }
 
-
                       return (
-                        <button 
-                          title={palette} 
-                          key={palette} 
-                          onClick={(e) => {
-                            e.preventDefault();
+                        <button
+                          title={palette}
+                          key={palette}
+                          onClick={e => {
+                            e.preventDefault()
                             updateConfig({ ...config, palette })
                           }}
                           className={config.palette === palette ? 'selected' : ''}
@@ -1338,82 +1663,103 @@ useEffect(()=>{
 
                   {config.visualizationType !== 'Pie' && (
                     <>
-                      <TextField value={config.dataCutoff} type="number" fieldName="dataCutoff" className="number-narrow" label="Data Cutoff" updateField={updateField} tooltip={
-                        <Tooltip style={{ textTransform: 'none' }}>
-                          <Tooltip.Target><Icon display="question" style={{ marginLeft: '0.5rem' }}/></Tooltip.Target>
-                          <Tooltip.Content>
-                            <p>Any value below the cut-off value is included in a special "less than" category. This option supports special conditions like suppressed data.</p>
-                          </Tooltip.Content>
-                        </Tooltip>
-                      }/>
+                      <TextField
+                        value={config.dataCutoff}
+                        type='number'
+                        fieldName='dataCutoff'
+                        className='number-narrow'
+                        label='Data Cutoff'
+                        updateField={updateField}
+                        tooltip={
+                          <Tooltip style={{ textTransform: 'none' }}>
+                            <Tooltip.Target>
+                              <Icon display='question' style={{ marginLeft: '0.5rem' }} />
+                            </Tooltip.Target>
+                            <Tooltip.Content>
+                              <p>Any value below the cut-off value is included in a special "less than" category. This option supports special conditions like suppressed data.</p>
+                            </Tooltip.Content>
+                          </Tooltip>
+                        }
+                      />
                     </>
                   )}
-                  {(config.orientation === 'horizontal' && config.yAxis.labelPlacement !== 'On Bar') &&
-                    <TextField type="number" value={config.barHeight || '25'} fieldName="barHeight" label="Bar Thickness" updateField={updateField} min="15"/>
-                  }
-                  {((config.visualizationType === 'Bar' && config.orientation !== 'horizontal') || config.visualizationType === 'Combo') &&
-                    <TextField value={config.barThickness} type="number" fieldName="barThickness" label="Bar Thickness" updateField={updateField}/>
-                  }
-
-                  {config.visualizationType === "Spark Line" &&
-                    <div className="cove-accordion__panel-section checkbox-group">
-                      <CheckBox value={config.visual?.border} section="visual" fieldName="border" label="Display Border" updateField={updateField} />
-                      <CheckBox value={config.visual?.borderColorTheme} section="visual" fieldName="borderColorTheme" label="Use Border Color Theme" updateField={updateField} />
-                      <CheckBox value={config.visual?.accent} section="visual" fieldName="accent" label="Use Accent Style" updateField={updateField} />
-                      <CheckBox value={config.visual?.background} section="visual" fieldName="background" label="Use Theme Background Color" updateField={updateField} />
-                      <CheckBox value={config.visual?.hideBackgroundColor} section="visual" fieldName="hideBackgroundColor" label="Hide Background Color" updateField={updateField} />
+                  {config.orientation === 'horizontal' && !config.isLollipopChart && config.yAxis.labelPlacement !== 'On Bar' && <TextField type='number' value={config.barHeight || '25'} fieldName='barHeight' label=' Bar Thickness' updateField={updateField} min='15' />}
+                  {((config.visualizationType === 'Bar' && config.orientation !== 'horizontal') || config.visualizationType === 'Combo') && <TextField value={config.barThickness} type='number' fieldName='barThickness' label='Bar Thickness' updateField={updateField} />}
+                  {config.orientation === 'horizontal' && <TextField type='number' value={config.barSpace || '20'} fieldName='barSpace' label='Bar Space' updateField={updateField} min='0' />}
+                  {(config.visualizationType === 'Bar' || config.visualizationType === 'Line' || config.visualizationType === 'Combo') && <CheckBox value={config.topAxis.hasLine} section='topAxis' fieldName='hasLine' label='Add Top Axis Line' updateField={updateField} />}
+
+                  {config.visualizationType === 'Spark Line' && (
+                    <div className='cove-accordion__panel-section checkbox-group'>
+                      <CheckBox value={config.visual?.border} section='visual' fieldName='border' label='Display Border' updateField={updateField} />
+                      <CheckBox value={config.visual?.borderColorTheme} section='visual' fieldName='borderColorTheme' label='Use Border Color Theme' updateField={updateField} />
+                      <CheckBox value={config.visual?.accent} section='visual' fieldName='accent' label='Use Accent Style' updateField={updateField} />
+                      <CheckBox value={config.visual?.background} section='visual' fieldName='background' label='Use Theme Background Color' updateField={updateField} />
+                      <CheckBox value={config.visual?.hideBackgroundColor} section='visual' fieldName='hideBackgroundColor' label='Hide Background Color' updateField={updateField} />
                     </div>
-                  }
+                  )}
+
+                  {(config.visualizationType === 'Line' || config.visualizationType === 'Combo') && <CheckBox value={config.showLineSeriesLabels} fieldName='showLineSeriesLabels' label='Append Series Name to End of Line Charts' updateField={updateField} />}
+                  {(config.visualizationType === 'Line' || config.visualizationType === 'Combo') && config.showLineSeriesLabels && (
+                    <CheckBox value={config.colorMatchLineSeriesLabels} fieldName='colorMatchLineSeriesLabels' label='Match Series Color to Name at End of Line Charts' updateField={updateField} />
+                  )}
                 </AccordionItemPanel>
               </AccordionItem>
 
               <AccordionItem>
                 <AccordionItemHeading>
-                  <AccordionItemButton>
-                    Data Table
-                  </AccordionItemButton>
+                  <AccordionItemButton>Data Table</AccordionItemButton>
                 </AccordionItemHeading>
                 <AccordionItemPanel>
-                  <CheckBox value={config.table.show} section="table" fieldName="show" label="Show Table" updateField={updateField} tooltip={
-                    <Tooltip style={{ textTransform: 'none' }}>
-                      <Tooltip.Target><Icon display="question" style={{ marginLeft: '0.5rem' }}/></Tooltip.Target>
-                      <Tooltip.Content>
-                        <p>Hiding the data table may affect accessibility. An alternate form of accessing visualization data is a 508 requirement.</p>
-                      </Tooltip.Content>
-                    </Tooltip>
-                  }/>
-                  	<TextField
-											value={config.table.caption}
-											updateField={updateField}
-											section='table'
-                      type='textarea'
-											fieldName='caption'
-											label='Data Table Caption'
-											placeholder=' Data table'
-                      tooltip={
-                        <Tooltip style={{textTransform: 'none'}}>
-                          <Tooltip.Target><Icon display="question" style={{marginLeft: '0.5rem'}}/></Tooltip.Target>
-                          <Tooltip.Content>
-                            <p>Enter a description of  the data table to be read by screen readers.</p>
-                          </Tooltip.Content>
-                        </Tooltip>
-                      }
-                      />
-                   <CheckBox value={config.table.limitHeight} section="table" fieldName="limitHeight" label="Limit Table Height" updateField={updateField}/>
-                   {config.table.limitHeight && (
-                   <TextField value={config.table.height} section="table" fieldName='height'  label='Data Table Height' type="number" min="0" max="500" 	placeholder='Height(px)' updateField={updateField}/>
-                   )}
-                  <CheckBox value={config.table.expanded} section="table" fieldName="expanded" label="Expanded by Default" updateField={updateField}/>
-                  <CheckBox value={config.table.download} section="table" fieldName="download" label="Display Download Button" updateField={updateField}/>
-                  <TextField value={config.table.label} section="table" fieldName="label" label="Label" updateField={updateField}/>
-                 {config.visualizationType !== 'Pie' && <TextField value={config.table.indexLabel} section="table" fieldName="indexLabel" label="Index Column Header" updateField={updateField}/>}
+                  <CheckBox
+                    value={config.table.show}
+                    section='table'
+                    fieldName='show'
+                    label='Show Table'
+                    updateField={updateField}
+                    tooltip={
+                      <Tooltip style={{ textTransform: 'none' }}>
+                        <Tooltip.Target>
+                          <Icon display='question' style={{ marginLeft: '0.5rem' }} />
+                        </Tooltip.Target>
+                        <Tooltip.Content>
+                          <p>Hiding the data table may affect accessibility. An alternate form of accessing visualization data is a 508 requirement.</p>
+                        </Tooltip.Content>
+                      </Tooltip>
+                    }
+                  />
+                  <TextField
+                    value={config.table.caption}
+                    updateField={updateField}
+                    section='table'
+                    type='textarea'
+                    fieldName='caption'
+                    label='Data Table Caption'
+                    placeholder=' Data table'
+                    tooltip={
+                      <Tooltip style={{ textTransform: 'none' }}>
+                        <Tooltip.Target>
+                          <Icon display='question' style={{ marginLeft: '0.5rem' }} />
+                        </Tooltip.Target>
+                        <Tooltip.Content>
+                          <p>Enter a description of the data table to be read by screen readers.</p>
+                        </Tooltip.Content>
+                      </Tooltip>
+                    }
+                  />
+                  <CheckBox value={config.table.limitHeight} section='table' fieldName='limitHeight' label='Limit Table Height' updateField={updateField} />
+                  {config.table.limitHeight && <TextField value={config.table.height} section='table' fieldName='height' label='Data Table Height' type='number' min='0' max='500' placeholder='Height(px)' updateField={updateField} />}
+                  <CheckBox value={config.table.expanded} section='table' fieldName='expanded' label='Expanded by Default' updateField={updateField} />
+                  <CheckBox value={config.table.download} section='table' fieldName='download' label='Display Download Button' updateField={updateField} />
+                  <CheckBox value={config.table.showDownloadUrl} section='table' fieldName='showDownloadUrl' label='Display Link to Dataset' updateField={updateField} />
+                  {/* <CheckBox value={config.table.showDownloadImgButton} section='table' fieldName='showDownloadImgButton' label='Display Image Button' updateField={updateField} /> */}
+                  {/* <CheckBox value={config.table.showDownloadPdfButton} section='table' fieldName='showDownloadPdfButton' label='Display PDF Button' updateField={updateField} /> */}
+                  <TextField value={config.table.label} section='table' fieldName='label' label='Label' updateField={updateField} />
+                  {config.visualizationType !== 'Pie' && <TextField value={config.table.indexLabel} section='table' fieldName='indexLabel' label='Index Column Header' updateField={updateField} />}
                 </AccordionItemPanel>
               </AccordionItem>
             </Accordion>
           </form>
-          {config.type !== 'Spark Line' &&
-            <AdvancedEditor loadConfig={updateConfig} state={config} convertStateToConfig={convertStateToConfig} />
-          }
+          {config.type !== 'Spark Line' && <AdvancedEditor loadConfig={updateConfig} state={config} convertStateToConfig={convertStateToConfig} />}
         </section>
       </section>
     </ErrorBoundary>