@cdc/dashboard 4.25.3 → 4.25.6-1

package/src/components/DashboardEditors.tsx

@@ -0,0 +1,143 @@
+import CdcChart from '@cdc/chart/src/CdcChartComponent'
+import { APIFilterDropdowns } from './DashboardFilters'
+import CdcMapComponent from '@cdc/map/src/CdcMapComponent'
+import CdcDataBite from '@cdc/data-bite/src/CdcDataBite'
+import CdcWaffleChart from '@cdc/waffle-chart/src/CdcWaffleChart'
+import CdcMarkupInclude from '@cdc/markup-include/src/CdcMarkupInclude'
+import CdcFilteredText from '@cdc/filtered-text/src/CdcFilteredText'
+import DashboardSharedFilters from './DashboardFilters'
+import DataTableStandAlone from '@cdc/core/components/DataTable/DataTableStandAlone'
+import _ from 'lodash'
+import { AnyVisualization } from '@cdc/core/types/Visualization'
+import { DashboardState } from '../store/dashboard.reducer'
+
+type DashboardEditorProps = {
+  visualizationKey: string
+  visualizationConfig: AnyVisualization
+  _updateConfig: (config: any) => void
+  isDebug?: boolean
+  setSharedFilter?: Function
+  apiFilterDropdowns?: APIFilterDropdowns
+  state: DashboardState
+}
+
+const DashboardEditors: React.FC<DashboardEditorProps> = ({
+  visualizationKey,
+  visualizationConfig,
+  _updateConfig,
+  isDebug,
+  setSharedFilter,
+  apiFilterDropdowns,
+  state
+}) => {
+  const setsSharedFilter =
+    state.config.dashboard.sharedFilters &&
+    state.config.dashboard.sharedFilters.filter(sharedFilter => sharedFilter.setBy === visualizationKey).length > 0
+  const setSharedFilterValue = setsSharedFilter
+    ? state.config.dashboard.sharedFilters.filter(sharedFilter => sharedFilter.setBy === visualizationKey)[0].active
+    : undefined
+  switch (visualizationConfig.type) {
+    case 'chart':
+      return (
+        <CdcChart
+          key={visualizationKey}
+          config={visualizationConfig}
+          isEditor={true}
+          isDebug={isDebug}
+          setConfig={_updateConfig}
+          setSharedFilter={setsSharedFilter ? setSharedFilter : undefined}
+          setSharedFilterValue={setSharedFilterValue}
+          dashboardConfig={state.config}
+          datasets={state.config.datasets}
+          isDashboard={true}
+        />
+      )
+    case 'map':
+      return (
+        <CdcMapComponent
+          key={visualizationKey}
+          config={visualizationConfig}
+          isEditor={true}
+          isDebug={isDebug}
+          setConfig={_updateConfig}
+          setSharedFilter={setsSharedFilter ? setSharedFilter : undefined}
+          setSharedFilterValue={setSharedFilterValue}
+          isDashboard={true}
+          showLoader={false}
+          dashboardConfig={state.config}
+          datasets={state.config.datasets}
+        />
+      )
+
+    case 'data-bite':
+      return (
+        <CdcDataBite
+          key={visualizationKey}
+          config={{ ...visualizationConfig, newViz: true }}
+          isEditor={true}
+          setConfig={_updateConfig}
+          isDashboard={true}
+        />
+      )
+
+    case 'waffle-chart':
+      return (
+        <CdcWaffleChart
+          key={visualizationKey}
+          config={visualizationConfig}
+          isEditor={true}
+          setConfig={_updateConfig}
+          isDashboard={true}
+        />
+      )
+
+    case 'markup-include':
+      return (
+        <CdcMarkupInclude
+          key={visualizationKey}
+          config={visualizationConfig}
+          isEditor={true}
+          setConfig={_updateConfig}
+          isDashboard={true}
+          datasets={state.config.datasets}
+        />
+      )
+
+    case 'filtered-text':
+      return (
+        <CdcFilteredText
+          key={visualizationKey}
+          config={visualizationConfig}
+          isEditor={true}
+          setConfig={_updateConfig}
+          isDashboard={true}
+        />
+      )
+
+    case 'dashboardFilters':
+      return (
+        <DashboardSharedFilters
+          isEditor={true}
+          visualizationConfig={visualizationConfig}
+          apiFilterDropdowns={apiFilterDropdowns}
+          setConfig={_updateConfig}
+        />
+      )
+
+    case 'table':
+      return (
+        <DataTableStandAlone
+          visualizationKey={visualizationKey}
+          config={visualizationConfig}
+          isEditor={true}
+          updateConfig={_updateConfig}
+          datasets={state.config.datasets}
+        />
+      )
+
+    default:
+      return null
+  }
+}
+
+export default DashboardEditors

package/src/components/DashboardFilters/DashboardFilters.tsx

@@ -1,205 +1,205 @@
-import React from 'react'
-import MultiSelect from '@cdc/core/components/MultiSelect'
-import { SharedFilter } from '../../types/SharedFilter'
-import { APIFilterDropdowns, DropdownOptions } from './DashboardFiltersWrapper'
-import { FILTER_STYLE } from '../../types/FilterStyles'
-import { NestedOptions, ValueTextPair } from '@cdc/core/components/NestedDropdown/nestedDropdownHelpers'
-import NestedDropdown from '@cdc/core/components/NestedDropdown'
-import { MouseEventHandler } from 'react'
-import Loader from '@cdc/core/components/Loader'
-import _ from 'lodash'
-import { DROPDOWN_STYLES } from '@cdc/core/components/Filters/Filters'
-
-type DashboardFilterProps = {
-  show: number[]
-  filters: SharedFilter[]
-  apiFilterDropdowns: APIFilterDropdowns
-  handleOnChange: (index: number, value: string | string[]) => void
-  showSubmit: boolean
-  applyFilters: MouseEventHandler<HTMLButtonElement>
-  applyFiltersButtonText?: string
-}
-
-const DashboardFilters: React.FC<DashboardFilterProps> = ({
-  show,
-  filters: sharedFilters,
-  apiFilterDropdowns,
-  handleOnChange,
-  showSubmit,
-  applyFilters,
-  applyFiltersButtonText
-}) => {
-  const nullVal = (filter: SharedFilter) => {
-    const val = filter.queuedActive || filter.active
-    return val === null || val === undefined || val === ''
-  }
-
-  const updateField = (_section, _subsection, fieldName, value) => {
-    handleOnChange(fieldName, value) // fieldName is the sharedFilterIndex
-  }
-
-  const stripDuplicateLabelIncrement = (label: string): string => {
-    // converts 'Label (1)' to 'Label'
-    return label.replace(/\s\(\d+\)$/, '')
-  }
-
-  const getNestedDropdownOptions = (options?: DropdownOptions): NestedOptions => {
-    if (!options) return []
-    const getValueTextTuple = (value: string, text?: string): ValueTextPair => (text ? [value, text] : [value])
-    return options.map(({ value, text, subOptions }) => [
-      getValueTextTuple(value, text),
-      (subOptions || []).map(({ value, text }) => getValueTextTuple(value, text))
-    ])
-  }
-
-  return (
-    <form className='d-flex flex-wrap'>
-      {sharedFilters.map((filter, filterIndex) => {
-        const urlFilterType = filter.type === 'urlfilter'
-        const label = stripDuplicateLabelIncrement(filter.key || '')
-
-        if (
-          (!urlFilterType && !filter.showDropdown && filter.filterStyle !== FILTER_STYLE.nestedDropdown) ||
-          (show && !show.includes(filterIndex))
-        )
-          return <React.Fragment key={`${filter.key}-filtersection-${filterIndex}-option`} />
-        const values: JSX.Element[] = []
-
-        const _key = filter.apiFilter?.apiEndpoint
-        const loading = apiFilterDropdowns[_key] === null
-
-        const multiValues: { value; label }[] = []
-        const nestedOptions: NestedOptions = Object.entries(filter?.subGrouping?.valuesLookup || {}).map(
-          ([key, data]) => [
-            [key, key], // Main option: [value, text]
-            Array.isArray(data?.values) ? data.values.map(value => [value, value]) : [] // Ensure `values` is an array
-          ]
-        )
-
-        const activeSubGroupValue = _.get(
-          filter?.subGrouping?.valuesLookup,
-          [filter?.active as string, 'values', 0],
-          null // Default to null if the path is invalid
-        )
-        if (_key && apiFilterDropdowns[_key]) {
-          // URL Filter
-          if (filter.filterStyle !== FILTER_STYLE.nestedDropdown) {
-            apiFilterDropdowns[_key].forEach(({ text, value }, index) => {
-              values.push(
-                <option key={`${value}-option-${index}`} value={value}>
-                  {text}
-                </option>
-              )
-              multiValues.push({ value, label: text })
-            })
-          }
-        } else {
-          // Data Filter
-          const orderedFilterValues = filter.orderedValues || filter.values
-          orderedFilterValues?.forEach((filterOption, index) => {
-            const labeledOpt = filter.labels && filter.labels[filterOption]
-            const resetLabelHasMatch = (filterOption || labeledOpt) === filter.resetLabel
-
-            if (!resetLabelHasMatch) {
-              values.push(
-                <option key={`${filter.key}-option-${index}`} value={filterOption}>
-                  {labeledOpt || filterOption}
-                </option>
-              )
-            } else {
-              // add label to the front of list if it matches with reset label
-              values.unshift(
-                <option key={`${filter.key}-option-${index}`} value={filterOption}>
-                  {labeledOpt || filterOption}
-                </option>
-              )
-            }
-
-            multiValues.push({ value: filterOption, label: labeledOpt || filterOption })
-          })
-        }
-
-        const isDisabled = !values.length
-        // push reset label only if it does not includes in filter values  options
-        if (filter.resetLabel && !filter.values.includes(filter.resetLabel)) {
-          values.unshift(
-            <option key={`${filter.resetLabel}-option`} value={filter.resetLabel}>
-              {filter.resetLabel}
-            </option>
-          )
-        }
-
-        const formGroupClass = `form-group me-4 mb-1${loading ? ' loading-filter' : ''}`
-        return (
-          <div className={formGroupClass} key={`${filter.key}-filtersection-${filterIndex}`}>
-            {label && (
-              <label className='font-weight-bold mb-2' htmlFor={`filter-${filterIndex}`}>
-                {label}
-              </label>
-            )}
-            {filter.filterStyle === FILTER_STYLE.multiSelect ? (
-              <MultiSelect
-                label={label}
-                options={multiValues}
-                fieldName={filterIndex}
-                updateField={updateField}
-                selected={filter.active as string[]}
-                limit={filter.selectLimit || 5}
-                loading={loading}
-              />
-            ) : filter.filterStyle === FILTER_STYLE.nestedDropdown ? (
-              <NestedDropdown
-                activeGroup={(filter.queuedActive?.[0] || filter.active) as string}
-                activeSubGroup={_key ? filter.queuedActive?.[1] || filter.subGrouping?.active : activeSubGroupValue}
-                filterIndex={filterIndex}
-                options={_key ? getNestedDropdownOptions(apiFilterDropdowns[_key]) : nestedOptions}
-                listLabel={label}
-                handleSelectedItems={value => updateField(null, null, filterIndex, value)}
-                loading={loading}
-              />
-            ) : (
-              <>
-                <select
-                  id={`filter-${filterIndex}`}
-                  className={`cove-form-select ${DROPDOWN_STYLES}`}
-                  data-index='0'
-                  value={loading ? 'Loading...' : filter.queuedActive || filter.active}
-                  onChange={val => {
-                    handleOnChange(filterIndex, val.target.value)
-                  }}
-                  disabled={loading || isDisabled}
-                >
-                  {loading && <option value='Loading...'>Loading...</option>}
-                  {nullVal(filter) && (
-                    <option key={`select`} value=''>
-                      {filter.resetLabel || '- Select -'}
-                    </option>
-                  )}
-                  {values}
-                </select>
-                {loading && <Loader spinnerType={'text-secondary'} />}
-              </>
-            )}
-          </div>
-        )
-      })}
-      {showSubmit && (
-        <button
-          className='btn btn-primary mb-1'
-          onClick={applyFilters}
-          disabled={show.some(filterIndex => {
-            const emptyFilterValues = [undefined, '', '- Select -']
-            return (
-              emptyFilterValues.includes(sharedFilters[filterIndex].queuedActive) &&
-              emptyFilterValues.includes(sharedFilters[filterIndex].active)
-            )
-          })}
-        >
-          {applyFiltersButtonText || 'GO!'}
-        </button>
-      )}
-    </form>
-  )
-}
-
-export default DashboardFilters
+import React from 'react'
+import MultiSelect from '@cdc/core/components/MultiSelect'
+import { SharedFilter } from '../../types/SharedFilter'
+import { APIFilterDropdowns, DropdownOptions } from './DashboardFiltersWrapper'
+import { FILTER_STYLE } from '../../types/FilterStyles'
+import { NestedOptions, ValueTextPair } from '@cdc/core/components/NestedDropdown/nestedDropdownHelpers'
+import NestedDropdown from '@cdc/core/components/NestedDropdown'
+import { MouseEventHandler } from 'react'
+import Loader from '@cdc/core/components/Loader'
+import _ from 'lodash'
+import { DROPDOWN_STYLES } from '@cdc/core/components/Filters/components/Dropdown'
+
+type DashboardFilterProps = {
+  show: number[]
+  filters: SharedFilter[]
+  apiFilterDropdowns: APIFilterDropdowns
+  handleOnChange: (index: number, value: string | string[]) => void
+  showSubmit: boolean
+  applyFilters: MouseEventHandler<HTMLButtonElement>
+  applyFiltersButtonText?: string
+}
+
+const DashboardFilters: React.FC<DashboardFilterProps> = ({
+  show,
+  filters: sharedFilters,
+  apiFilterDropdowns,
+  handleOnChange,
+  showSubmit,
+  applyFilters,
+  applyFiltersButtonText
+}) => {
+  const nullVal = (filter: SharedFilter) => {
+    const val = filter.queuedActive || filter.active
+    return val === null || val === undefined || val === ''
+  }
+
+  const updateField = (_section, _subsection, fieldName, value) => {
+    handleOnChange(fieldName, value) // fieldName is the sharedFilterIndex
+  }
+
+  const stripDuplicateLabelIncrement = (label: string): string => {
+    // converts 'Label (1)' to 'Label'
+    return label.replace(/\s\(\d+\)$/, '')
+  }
+
+  const getNestedDropdownOptions = (options?: DropdownOptions): NestedOptions => {
+    if (!options) return []
+    const getValueTextTuple = (value: string, text?: string): ValueTextPair => (text ? [value, text] : [value])
+    return options.map(({ value, text, subOptions }) => [
+      getValueTextTuple(value, text),
+      (subOptions || []).map(({ value, text }) => getValueTextTuple(value, text))
+    ])
+  }
+
+  return (
+    <form className='d-flex flex-wrap'>
+      {sharedFilters.map((filter, filterIndex) => {
+        const urlFilterType = filter.type === 'urlfilter'
+        const label = stripDuplicateLabelIncrement(filter.key || '')
+
+        if (
+          (!urlFilterType && !filter.showDropdown && filter.filterStyle !== FILTER_STYLE.nestedDropdown) ||
+          (show && !show.includes(filterIndex))
+        )
+          return <React.Fragment key={`${filter.key}-filtersection-${filterIndex}-option`} />
+        const values: JSX.Element[] = []
+
+        const _key = filter.apiFilter?.apiEndpoint
+        const loading = apiFilterDropdowns[_key] === null
+
+        const multiValues: { value; label }[] = []
+        const nestedOptions: NestedOptions = Object.entries(filter?.subGrouping?.valuesLookup || {}).map(
+          ([key, data]) => [
+            [key, key], // Main option: [value, text]
+            Array.isArray(data?.values) ? data.values.map(value => [value, value]) : [] // Ensure `values` is an array
+          ]
+        )
+
+        const activeSubGroupValue = _.get(
+          filter?.subGrouping?.valuesLookup,
+          [filter?.active as string, 'values', 0],
+          null // Default to null if the path is invalid
+        )
+        if (_key && apiFilterDropdowns[_key]) {
+          // URL Filter
+          if (filter.filterStyle !== FILTER_STYLE.nestedDropdown) {
+            apiFilterDropdowns[_key].forEach(({ text, value }, index) => {
+              values.push(
+                <option key={`${value}-option-${index}`} value={value}>
+                  {text}
+                </option>
+              )
+              multiValues.push({ value, label: text })
+            })
+          }
+        } else {
+          // Data Filter
+          const orderedFilterValues = filter.orderedValues || filter.values
+          orderedFilterValues?.forEach((filterOption, index) => {
+            const labeledOpt = filter.labels && filter.labels[filterOption]
+            const resetLabelHasMatch = (filterOption || labeledOpt) === filter.resetLabel
+
+            if (!resetLabelHasMatch) {
+              values.push(
+                <option key={`${filter.key}-option-${index}`} value={filterOption}>
+                  {labeledOpt || filterOption}
+                </option>
+              )
+            } else {
+              // add label to the front of list if it matches with reset label
+              values.unshift(
+                <option key={`${filter.key}-option-${index}`} value={filterOption}>
+                  {labeledOpt || filterOption}
+                </option>
+              )
+            }
+
+            multiValues.push({ value: filterOption, label: labeledOpt || filterOption })
+          })
+        }
+
+        const isDisabled = !values.length
+        // push reset label only if it does not includes in filter values  options
+        if (filter.resetLabel && !filter.values.includes(filter.resetLabel)) {
+          values.unshift(
+            <option key={`${filter.resetLabel}-option`} value={filter.resetLabel}>
+              {filter.resetLabel}
+            </option>
+          )
+        }
+
+        const formGroupClass = `form-group me-4 mb-1${loading ? ' loading-filter' : ''}`
+        return (
+          <div className={formGroupClass} key={`${filter.key}-filtersection-${filterIndex}`}>
+            {label && (
+              <label className='font-weight-bold mb-2' htmlFor={`filter-${filterIndex}`}>
+                {label}
+              </label>
+            )}
+            {filter.filterStyle === FILTER_STYLE.multiSelect ? (
+              <MultiSelect
+                label={label}
+                options={multiValues}
+                fieldName={filterIndex}
+                updateField={updateField}
+                selected={filter.active as string[]}
+                limit={filter.selectLimit || 5}
+                loading={loading}
+              />
+            ) : filter.filterStyle === FILTER_STYLE.nestedDropdown ? (
+              <NestedDropdown
+                activeGroup={(filter.queuedActive?.[0] || filter.active) as string}
+                activeSubGroup={_key ? filter.queuedActive?.[1] || filter.subGrouping?.active : activeSubGroupValue}
+                filterIndex={filterIndex}
+                options={_key ? getNestedDropdownOptions(apiFilterDropdowns[_key]) : nestedOptions}
+                listLabel={label}
+                handleSelectedItems={value => updateField(null, null, filterIndex, value)}
+                loading={loading}
+              />
+            ) : (
+              <>
+                <select
+                  id={`filter-${filterIndex}`}
+                  className={`cove-form-select ${DROPDOWN_STYLES}`}
+                  data-index='0'
+                  value={loading ? 'Loading...' : filter.queuedActive || filter.active}
+                  onChange={val => {
+                    handleOnChange(filterIndex, val.target.value)
+                  }}
+                  disabled={loading || isDisabled}
+                >
+                  {loading && <option value='Loading...'>Loading...</option>}
+                  {nullVal(filter) && (
+                    <option key={`select`} value=''>
+                      {filter.resetLabel || '- Select -'}
+                    </option>
+                  )}
+                  {values}
+                </select>
+                {loading && <Loader spinnerType={'text-secondary'} />}
+              </>
+            )}
+          </div>
+        )
+      })}
+      {showSubmit && (
+        <button
+          className='btn btn-primary mb-1'
+          onClick={applyFilters}
+          disabled={show.some(filterIndex => {
+            const emptyFilterValues = [undefined, '', '- Select -']
+            return (
+              emptyFilterValues.includes(sharedFilters[filterIndex].queuedActive) &&
+              emptyFilterValues.includes(sharedFilters[filterIndex].active)
+            )
+          })}
+        >
+          {applyFiltersButtonText || 'GO!'}
+        </button>
+      )}
+    </form>
+  )
+}
+
+export default DashboardFilters