@cdc/core 4.24.4 → 4.24.5

package/components/EditorPanel/ColumnsEditor.tsx

@@ -6,35 +6,245 @@ import { Visualization } from '../../types/Visualization'
 import { UpdateFieldFunc } from '../../types/UpdateFieldFunc'
 import { Column } from '../../types/Column'
 import _ from 'lodash'
+import React, { useState } from 'react'
 
 interface ColumnsEditorProps {
-  config: Visualization
-  updateField: UpdateFieldFunc<string | boolean | string[] | number | Column>
+  config: Partial<Visualization>
+  updateField: UpdateFieldFunc<string | boolean | string[] | number | Column | Record<string, Partial<Column>>>
   deleteColumn: (colName: string) => void
 }
 
-const ColumnsEditor: React.FC<ColumnsEditorProps> = ({ config, updateField, deleteColumn }) => {
-  const additionalColumns = Object.keys(config.columns).filter(value => {
-    const dataKey = config.xAxis?.dataKey
-    const defaultCols = dataKey ? [dataKey] : []
+type OpenControls = [Record<string, boolean>, Function] // useState type
+
+const FieldSet: React.FC<ColumnsEditorProps & { colKey: string; controls: OpenControls }> = ({ config, deleteColumn, updateField, colKey, controls }) => {
+  const [openControls, setOpenControls] = controls
+  const show = openControls[colKey]
+  const setShow = (key, value) => {
+    setOpenControls({ ...openControls, [key]: value })
+  }
+
+  const editColumn = (key, value) => {
+    if (key === 'dataTable' && value === true) {
+      const newColumns = _.cloneDeep(config.columns) // must pass new columns object to trigger re-render of DataTableEditor
+      newColumns[colKey] = { ...newColumns[colKey], dataTable: value }
+      updateField(null, null, 'columns', newColumns)
+    } else {
+      updateField('columns', colKey, key, value)
+    }
+  }
 
-    if (true === defaultCols.includes(value)) {
-      return false
+  const changeName = value => {
+    const newColumns = _.cloneDeep(config.columns)
+    const currentCol = config.columns[colKey]
+    const newColumn = { ...currentCol, name: value, label: value }
+    if (newColumn.dataTable === undefined) {
+      newColumn.dataTable = true
     }
-    return true
-  })
+    if (value !== colKey) {
+      newColumns[value] = newColumn
+      delete newColumns[colKey]
+      const newControls = { ..._.cloneDeep(openControls), [value]: true }
+      delete newControls[colKey]
+      setOpenControls(newControls)
+    }
+    updateField(null, null, 'columns', newColumns)
+  }
 
-  const editColumn = (addCol, columnName, setval) => {
-    updateField('columns', addCol, columnName, setval)
+  const getColumns = () => {
+    const columns: string[] = config.data.flatMap(row => {
+      return Object.keys(row).map(columnName => columnName)
+    })
+    const configuredColumns = Object.values(config.columns).map(col => col.name)
+    const cols = _.uniq(columns).filter(key => {
+      if (config.table.groupBy === key) return false
+      if (configuredColumns.includes(key)) return false
+      return true
+    })
+    if (config.columns[colKey]?.name) cols.push(config.columns[colKey].name)
+    return cols
   }
 
+  const colName = config.columns[colKey]?.name
+
+  if (!show)
+    return (
+      <div className='mb-1'>
+        <button onClick={() => setShow(colKey, true)}>
+          <Icon display='caretDown' />
+        </button>
+        <span> {colName ? `${colName}` : 'New Column'}</span>
+      </div>
+    )
+  return (
+    <fieldset className='edit-block mb-1' key={colKey}>
+      <div className='d-flex justify-content-between'>
+        <button onClick={() => setShow(colKey, false)}>
+          <Icon display='caretUp' />
+        </button>
+        <button
+          className='btn btn-danger btn-sm'
+          onClick={event => {
+            event.preventDefault()
+            deleteColumn(colKey)
+          }}
+        >
+          Remove
+        </button>
+      </div>
+      <label>
+        <span className='edit-label column-heading'>Column</span>
+        <select
+          value={config.columns[colKey] ? config.columns[colKey].name : undefined}
+          onChange={event => {
+            changeName(event.target.value)
+          }}
+        >
+          {['-Select-', ...getColumns()].map(option => (
+            <option key={option}>{option}</option>
+          ))}
+        </select>
+      </label>
+      {config.type !== 'table' && (
+        <label>
+          <span className='edit-label column-heading'>Associate to Series</span>
+          <select
+            value={config.columns[colKey] ? config.columns[colKey].series : ''}
+            onChange={event => {
+              editColumn('series', event.target.value)
+            }}
+          >
+            <option value=''>Select series</option>
+            {(config.series || []).map(series => (
+              <option key={series.dataKey}>{series.dataKey}</option>
+            ))}
+          </select>
+        </label>
+      )}
+
+      <TextField value={config.columns[colKey].label} section='columns' subsection={colKey} fieldName='label' label='Label' updateField={updateField} />
+      <ul className='column-edit'>
+        <li className='three-col'>
+          <TextField value={config.columns[colKey].prefix} section='columns' subsection={colKey} fieldName='prefix' label='Prefix' updateField={updateField} />
+          <TextField value={config.columns[colKey].suffix} section='columns' subsection={colKey} fieldName='suffix' label='Suffix' updateField={updateField} />
+          <TextField type='number' value={config.columns[colKey].roundToPlace} section='columns' subsection={colKey} fieldName='roundToPlace' label='Round' updateField={updateField} />
+        </li>
+        <li>
+          <label className='checkbox'>
+            <input
+              type='checkbox'
+              checked={config.columns[colKey].commas}
+              onChange={event => {
+                editColumn('commas', event.target.checked)
+              }}
+            />
+            <span className='edit-label'>Add Commas to Numbers</span>
+          </label>
+        </li>
+        <li>
+          {config.table.showVertical && (
+            <label className='checkbox'>
+              <input
+                type='checkbox'
+                checked={config.columns[colKey].dataTable ?? true}
+                onChange={event => {
+                  editColumn('dataTable', event.target.checked)
+                }}
+              />
+              <span className='edit-label'>Show in Data Table</span>
+            </label>
+          )}
+        </li>
+        {config.visualizationType === 'Pie' && (
+          <li>
+            <label className='checkbox'>
+              <input
+                type='checkbox'
+                checked={config.columns[colKey].showInViz}
+                onChange={event => {
+                  editColumn('showInViz', event.target.checked)
+                }}
+              />
+              <span className='edit-label'>Show in Visualization</span>
+            </label>
+          </li>
+        )}
+        {config.type !== 'table' && (
+          <li>
+            <label className='checkbox'>
+              <input
+                type='checkbox'
+                checked={config.columns[colKey].tooltips || false}
+                onChange={event => {
+                  updateField('columns', colKey, 'tooltips', event.target.checked)
+                }}
+              />
+              <span className='edit-label'>Show in tooltip</span>
+            </label>
+          </li>
+        )}
+
+        {config.visualizationType === 'Forest Plot' && (
+          <>
+            <li>
+              <label className='checkbox'>
+                <input
+                  type='checkbox'
+                  checked={config.columns[colKey].forestPlot || false}
+                  onChange={event => {
+                    editColumn('forestPlot', event.target.checked)
+                  }}
+                />
+                <span className='edit-label'>Show in Forest Plot</span>
+              </label>
+            </li>
+            <li>
+              <label className='checkbox'>
+                <input
+                  type='checkbox'
+                  checked={config.columns[colKey].forestPlotAlignRight || false}
+                  onChange={event => {
+                    editColumn('forestPlotAlignRight', event.target.checked)
+                  }}
+                />
+                <span className='edit-label'>Align Right</span>
+              </label>
+            </li>
+
+            {!config.columns[colKey].forestPlotAlignRight && (
+              <li>
+                <label className='text'>
+                  <span className='edit-label'>Forest Plot Starting Point</span>
+                  <input
+                    type='number'
+                    value={config.columns[colKey].forestPlotStartingPoint || 0}
+                    onChange={event => {
+                      editColumn('forestPlotStartingPoint', event.target.value)
+                    }}
+                  />
+                </label>
+              </li>
+            )}
+          </>
+        )}
+      </ul>
+      <label>
+        <span className='edit-label column-heading'>Order</span>
+        <input onWheel={e => e.currentTarget.blur()} type='number' min='1' value={config.columns[colKey].order} onChange={e => updateField('columns', colKey, 'order', parseInt(e.target.value))} />
+      </label>
+    </fieldset>
+  )
+}
+
+const ColumnsEditor: React.FC<ColumnsEditorProps> = ({ config, updateField, deleteColumn }) => {
+  const openControls = useState({})
+  const additionalColumns = Object.keys(config.columns)
+
   // just adds a new column but not set to any data yet
-  const addAdditionalColumn = number => {
+  const addColumnConfig = number => {
     const columnKey = `additionalColumn${number}`
-    const showInViz = config.type === 'table'
     const newColumn: Column = {
       label: 'New Column',
-      dataTable: showInViz,
+      dataTable: true,
       tooltips: false,
       prefix: '',
       suffix: '',
@@ -46,266 +256,99 @@ const ColumnsEditor: React.FC<ColumnsEditorProps> = ({ config, updateField, dele
       showInViz: false,
       forestPlotStartingPoint: 0
     }
-
+    const [controls, setControls] = openControls
+    setControls({ ...controls, [columnKey]: true })
     updateField('columns', null, columnKey, newColumn)
   }
 
-  const getColumns = () => {
-    const columns: string[] = config.data.flatMap(row => {
-      return Object.keys(row).map(columnName => columnName)
-    })
-
-    const { lower, upper } = config.confidenceKeys || {}
-    return _.uniq(columns).filter(key => {
-      const keyIsPresentInSeries = config.series?.filter(series => series.dataKey === key).length > 0
-      if (keyIsPresentInSeries || (config.confidenceKeys && Object.keys(config.confidenceKeys).includes(key) && (lower || upper) && key !== lower && key !== upper)) {
-        return false
-      }
-      return true
-    })
-  }
-
   return (
-    <AccordionItem>
-      <AccordionItemHeading>
-        <AccordionItemButton>Columns</AccordionItemButton>
-      </AccordionItemHeading>
-      <AccordionItemPanel>
-        {'navigation' !== config.type && (
-          <fieldset className='primary-fieldset edit-block'>
-            <label>
-              <span className='edit-label'>
-                Configurations
-                <Tooltip style={{ textTransform: 'none' }}>
-                  <Tooltip.Target>
-                    <Icon display='question' style={{ marginLeft: '0.5rem' }} />
-                  </Tooltip.Target>
-                  <Tooltip.Content>
-                    <p>You can specify additional columns to display in tooltips and / or the supporting data table.</p>
-                  </Tooltip.Content>
-                </Tooltip>
-              </span>
-            </label>
-            {additionalColumns.map(val => (
-              <fieldset className='edit-block' key={val}>
+    <>
+      {'navigation' !== config.type && (
+        <fieldset>
+          <label>
+            <span className='edit-label'>
+              Configurations
+              <Tooltip style={{ textTransform: 'none' }}>
+                <Tooltip.Target>
+                  <Icon display='question' style={{ marginLeft: '0.5rem' }} />
+                </Tooltip.Target>
+                <Tooltip.Content>
+                  <p>You can specify additional columns to display in tooltips and / or the supporting data table.</p>
+                </Tooltip.Content>
+              </Tooltip>
+            </span>
+          </label>
+          {additionalColumns.map((val, i) => (
+            <FieldSet key={val + i} controls={openControls} config={config} deleteColumn={deleteColumn} updateField={updateField} colKey={val} />
+          ))}
+          <button
+            className={'btn btn-primary'}
+            onClick={event => {
+              event.preventDefault()
+              addColumnConfig(additionalColumns.length + 1)
+            }}
+          >
+            Add Configuration
+          </button>
+        </fieldset>
+      )}
+      {'category' === config.legend?.type && (
+        <fieldset>
+          <label>
+            <span className='edit-label'>
+              Additional Category
+              <Tooltip style={{ textTransform: 'none' }}>
+                <Tooltip.Target>
+                  <Icon display='question' style={{ marginLeft: '0.5rem' }} />
+                </Tooltip.Target>
+                <Tooltip.Content>
+                  <p>You can provide additional categories to ensure they appear in the legend</p>
+                </Tooltip.Content>
+              </Tooltip>
+            </span>
+          </label>
+          {config.legend.additionalCategories &&
+            config.legend.additionalCategories.map((colKey, i) => (
+              <fieldset className='edit-block' key={colKey}>
                 <button
                   className='remove-column'
                   onClick={event => {
                     event.preventDefault()
-                    deleteColumn(val)
+                    const updatedAdditionaCategories = [...config.legend.additionalCategories]
+                    updatedAdditionaCategories.splice(i, 1)
+                    updateField('legend', null, 'additionalCategories', updatedAdditionaCategories)
                   }}
                 >
                   Remove
                 </button>
-                <label>
-                  <span className='edit-label column-heading'>Column</span>
-                  <select
-                    value={config.columns[val] ? config.columns[val].name : undefined}
-                    onChange={event => {
-                      editColumn(val, 'name', event.target.value)
-                    }}
-                  >
-                    {['-Select-', ...getColumns()].map(option => (
-                      <option>{option}</option>
-                    ))}
-                  </select>
-                </label>
-                {config.type !== 'table' && (
-                  <label>
-                    <span className='edit-label column-heading'>Associate to Series</span>
-                    <select
-                      value={config.columns[val] ? config.columns[val].series : ''}
-                      onChange={event => {
-                        editColumn(val, 'series', event.target.value)
-                      }}
-                    >
-                      <option value=''>Select series</option>
-                      {(config.series || []).map(series => (
-                        <option>{series.dataKey}</option>
-                      ))}
-                    </select>
-                  </label>
-                )}
-
-                <TextField value={config.columns[val].label} section='columns' subsection={val} fieldName='label' label='Label' updateField={updateField} />
-                <ul className='column-edit'>
-                  <li className='three-col'>
-                    <TextField value={config.columns[val].prefix} section='columns' subsection={val} fieldName='prefix' label='Prefix' updateField={updateField} />
-                    <TextField value={config.columns[val].suffix} section='columns' subsection={val} fieldName='suffix' label='Suffix' updateField={updateField} />
-                    <TextField type='number' value={config.columns[val].roundToPlace} section='columns' subsection={val} fieldName='roundToPlace' label='Round' updateField={updateField} />
-                  </li>
-                  <li>
-                    <label className='checkbox'>
-                      <input
-                        type='checkbox'
-                        checked={config.columns[val].commas}
-                        onChange={event => {
-                          editColumn(val, 'commas', event.target.checked)
-                        }}
-                      />
-                      <span className='edit-label'>Add Commas to Numbers</span>
-                    </label>
-                  </li>
-                  {config.type !== 'table' && (
-                    <li>
-                      {config.table.showVertical && (
-                        <label className='checkbox'>
-                          <input
-                            type='checkbox'
-                            checked={config.columns[val].dataTable}
-                            onChange={event => {
-                              editColumn(val, 'dataTable', event.target.checked)
-                            }}
-                          />
-                          <span className='edit-label'>Show in Data Table</span>
-                        </label>
-                      )}
-                    </li>
-                  )}
-                  {config.visualizationType === 'Pie' && (
-                    <li>
-                      <label className='checkbox'>
-                        <input
-                          type='checkbox'
-                          checked={config.columns[val].showInViz}
-                          onChange={event => {
-                            editColumn(val, 'showInViz', event.target.checked)
-                          }}
-                        />
-                        <span className='edit-label'>Show in Visualization</span>
-                      </label>
-                    </li>
-                  )}
-                  {config.type !== 'table' && (
-                    <li>
-                      <label className='checkbox'>
-                        <input
-                          type='checkbox'
-                          checked={config.columns[val].tooltips || false}
-                          onChange={event => {
-                            updateField('columns', val, 'tooltips', event.target.checked)
-                          }}
-                        />
-                        <span className='edit-label'>Show in tooltip</span>
-                      </label>
-                    </li>
-                  )}
-
-                  {config.visualizationType === 'Forest Plot' && (
-                    <>
-                      <li>
-                        <label className='checkbox'>
-                          <input
-                            type='checkbox'
-                            checked={config.columns[val].forestPlot || false}
-                            onChange={event => {
-                              editColumn(val, 'forestPlot', event.target.checked)
-                            }}
-                          />
-                          <span className='edit-label'>Show in Forest Plot</span>
-                        </label>
-                      </li>
-                      <li>
-                        <label className='checkbox'>
-                          <input
-                            type='checkbox'
-                            checked={config.columns[val].forestPlotAlignRight || false}
-                            onChange={event => {
-                              editColumn(val, 'forestPlotAlignRight', event.target.checked)
-                            }}
-                          />
-                          <span className='edit-label'>Align Right</span>
-                        </label>
-                      </li>
-
-                      {!config.columns[val].forestPlotAlignRight && (
-                        <li>
-                          <label className='text'>
-                            <span className='edit-label'>Forest Plot Starting Point</span>
-                            <input
-                              type='number'
-                              value={config.columns[val].forestPlotStartingPoint || 0}
-                              onChange={event => {
-                                editColumn(val, 'forestPlotStartingPoint', event.target.value)
-                              }}
-                            />
-                          </label>
-                        </li>
-                      )}
-                    </>
-                  )}
-                </ul>
+                <TextField
+                  value={colKey}
+                  label='Category'
+                  section='legend'
+                  subsection={null}
+                  fieldName='additionalCategories'
+                  updateField={(section, subsection, fieldName, value) => {
+                    const updatedAdditionaCategories = [...config.legend.additionalCategories]
+                    updatedAdditionaCategories[i] = value
+                    updateField(section, subsection, fieldName, updatedAdditionaCategories)
+                  }}
+                />
               </fieldset>
             ))}
-            <button
-              className={'btn full-width'}
-              onClick={event => {
-                event.preventDefault()
-                addAdditionalColumn(additionalColumns.length + 1)
-              }}
-            >
-              Add Column Configuration
-            </button>
-          </fieldset>
-        )}
-        {'category' === config.legend?.type && (
-          <fieldset className='primary-fieldset edit-block'>
-            <label>
-              <span className='edit-label'>
-                Additional Category
-                <Tooltip style={{ textTransform: 'none' }}>
-                  <Tooltip.Target>
-                    <Icon display='question' style={{ marginLeft: '0.5rem' }} />
-                  </Tooltip.Target>
-                  <Tooltip.Content>
-                    <p>You can provide additional categories to ensure they appear in the legend</p>
-                  </Tooltip.Content>
-                </Tooltip>
-              </span>
-            </label>
-            {config.legend.additionalCategories &&
-              config.legend.additionalCategories.map((val, i) => (
-                <fieldset className='edit-block' key={val}>
-                  <button
-                    className='remove-column'
-                    onClick={event => {
-                      event.preventDefault()
-                      const updatedAdditionaCategories = [...config.legend.additionalCategories]
-                      updatedAdditionaCategories.splice(i, 1)
-                      updateField('legend', null, 'additionalCategories', updatedAdditionaCategories)
-                    }}
-                  >
-                    Remove
-                  </button>
-                  <TextField
-                    value={val}
-                    label='Category'
-                    section='legend'
-                    subsection={null}
-                    fieldName='additionalCategories'
-                    updateField={(section, subsection, fieldName, value) => {
-                      const updatedAdditionaCategories = [...config.legend.additionalCategories]
-                      updatedAdditionaCategories[i] = value
-                      updateField(section, subsection, fieldName, updatedAdditionaCategories)
-                    }}
-                  />
-                </fieldset>
-              ))}
-            <button
-              className={'btn full-width'}
-              onClick={event => {
-                event.preventDefault()
-                const updatedAdditionaCategories = [...(config.legend.additionalCategories || [])]
-                updatedAdditionaCategories.push('')
-                updateField('legend', null, 'additionalCategories', updatedAdditionaCategories)
-              }}
-            >
-              Add Category
-            </button>
-          </fieldset>
-        )}
-      </AccordionItemPanel>
-    </AccordionItem>
+          <button
+            className={'btn btn-primary full-width'}
+            onClick={event => {
+              event.preventDefault()
+              const updatedAdditionaCategories = [...(config.legend.additionalCategories || [])]
+              updatedAdditionaCategories.push('')
+              updateField('legend', null, 'additionalCategories', updatedAdditionaCategories)
+            }}
+          >
+            Add Category
+          </button>
+        </fieldset>
+      )}
+    </>
   )
 }