@cdc/dashboard 4.25.3 → 4.25.5-1

package/src/components/DataDesignerModal.tsx

@@ -29,20 +29,16 @@ export const DataDesignerModal: React.FC<DataDesignerModalProps> = ({ vizKey, ro
   const [errorMessage, setErrorMessage] = useState('')
   const [loadingAPIData, setLoadingAPIData] = useState(false)
 
+  const isUpdatingVisualization = useMemo(() => {
+    return !!vizKey && !useRow
+  }, [vizKey, useRow])
+
   const configureData = useMemo(() => {
-    if (vizKey && !useRow) {
+    if (isUpdatingVisualization) {
       return config.visualizations[vizKey]
     }
     return config.rows[rowIndex]
-  }, [config.visualizations, config.rows, vizKey, rowIndex, useRow])
-
-  const updateConfigureData = (newConfigureData: Partial<ConfigureData>) => {
-    if (vizKey && !useRow) {
-      dispatch({ type: 'UPDATE_VISUALIZATION', payload: { vizKey, configureData: newConfigureData } })
-    } else {
-      dispatch({ type: 'UPDATE_ROW', payload: { rowIndex, rowData: newConfigureData } })
-    }
-  }
+  }, [config.visualizations, config.rows, rowIndex, isUpdatingVisualization])
 
   const fetchData = async datasetKey => {
     const { data, dataUrl } = config.datasets[datasetKey]
@@ -65,10 +61,32 @@ export const DataDesignerModal: React.FC<DataDesignerModalProps> = ({ vizKey, ro
     return newData
   }
 
-  const changeDataset = async ({ target: { value } }) => {
-    const newData = await fetchData(value)
-    const newConfigureData = { dataDescription: {}, formattedData: undefined, dataKey: value, data: newData }
+  const updateConfigureData = (newConfigureData: Partial<ConfigureData>) => {
+    if (isUpdatingVisualization) {
+      dispatch({ type: 'UPDATE_VISUALIZATION', payload: { vizKey, configureData: newConfigureData } })
+    } else {
+      dispatch({ type: 'UPDATE_ROW', payload: { rowIndex, rowData: newConfigureData } })
+    }
+  }
 
+  const removeDatasetsFromVisualizations = () => {
+    const columnVisualizations = config.rows[rowIndex].columns.map(column => column.widget).filter(Boolean)
+    columnVisualizations.forEach(currentVisualizationKey => {
+      dispatch({ type: 'RESET_VISUALIZATION', payload: { vizKey: currentVisualizationKey } })
+    })
+  }
+
+  const changeDataset = async ({ target: { value } }) => {
+    if (!isUpdatingVisualization) removeDatasetsFromVisualizations()
+    const newData = value === '' ? {} : await fetchData(value)
+    const newConfigureData = {
+      dataDescription: {
+        horizontal: false
+      },
+      formattedData: undefined,
+      dataKey: value,
+      data: newData
+    } as ConfigureData
     updateConfigureData(newConfigureData)
   }
 
@@ -112,12 +130,13 @@ export const DataDesignerModal: React.FC<DataDesignerModalProps> = ({ vizKey, ro
               Object.keys(config.datasets).map(datasetKey => <option key={datasetKey}>{datasetKey}</option>)}
           </select>
           {vizKey && (
+            // only shows for visualizations
             <CheckBox
               label='Apply To Row'
               value={useRow}
               updateField={(section, subsection, fieldName, value) => {
                 setUseRow(value)
-                changeDataset({ target: { value: '' } })
+                changeDataset({ target: { value: configureData.dataKey } })
               }}
             />
           )}

package/src/components/MultiConfigTabs/multiconfigtabs.styles.css

@@ -4,6 +4,9 @@
     font-weight: 400;
     display: block;
     padding: 0.5rem 1rem;
+    @media (max-width: 480px) {
+      padding: 0.5rem 0.8rem;
+    }
     color: var(--primary);
     border-color: var(--lightGray);
     :is(button) {

package/src/components/Row.tsx

@@ -1,4 +1,4 @@
-import React, { useContext, useMemo, useState } from 'react'
+import React, { useContext, useMemo } from 'react'
 
 import { DashboardContext, DashboardDispatchContext } from '../DashboardContext'
 
@@ -239,6 +239,7 @@ const Row: React.FC<RowProps> = ({ row, idx: rowIdx, uuid }) => {
     <>
       <div className='builder-row' data-row-id={rowIdx}>
         <RowMenu rowIdx={rowIdx} />
+        <p className='ml-2 mt-n3'>Row - {rowIdx + 1}</p>
         <button
           title='Configure Data'
           className='btn btn-configure-row'

package/src/components/VisualizationRow.tsx

@@ -4,7 +4,7 @@ import Toggle from './Toggle'
 import _ from 'lodash'
 import { ConfigRow } from '../types/ConfigRow'
 import CdcDataBite from '@cdc/data-bite/src/CdcDataBite'
-import CdcMap from '@cdc/map/src/CdcMap'
+import CdcMap from '@cdc/map/src/CdcMapComponent'
 import CdcWaffleChart from '@cdc/waffle-chart/src/CdcWaffleChart'
 import CdcMarkupInclude from '@cdc/markup-include/src/CdcMarkupInclude'
 import CdcFilteredText from '@cdc/filtered-text/src/CdcFilteredText'

package/src/helpers/reloadURLHelpers.ts

@@ -5,6 +5,7 @@ import { AnyVisualization, Visualization } from '@cdc/core/types/Visualization'
 import _ from 'lodash'
 import { DashboardConfig } from '../types/DashboardConfig'
 import { ConfigRow } from '../types/ConfigRow'
+import { getVizRowColumnLocator } from './getVizRowColumnLocator'
 
 export const isUpdateNeeded = (
   filters: SharedFilter[],
@@ -111,9 +112,16 @@ export const filterUsedByDataUrl = (
   if (!filter.usedBy || !filter.usedBy.length) return true
   const vizUsingFilters = filter.usedBy?.map(vizOrRowKey => visualizations[vizOrRowKey] || rows[vizOrRowKey])
   // push any footnotes which are using the filter also
+  const vizRowLookup = getVizRowColumnLocator(rows) // ensure we have the footnotesId in the rows
   filter.usedBy?.forEach(vizOrRowKey => {
-    if (rows[vizOrRowKey] && rows[vizOrRowKey].footnotesId)
-      return vizUsingFilters.push(visualizations[rows[vizOrRowKey].footnotesId])
+    const vizLookup = vizRowLookup[vizOrRowKey] // if found vizOrRowKey is a viz key
+    const row = rows[vizLookup?.row || vizOrRowKey]
+    if (row?.footnotesId) {
+      // if the widget is using the filter and the widget is on this row and the row has a footnoteId
+      // then the footnote's endpoint should be filtered by the filter
+      vizUsingFilters.push(visualizations[row.footnotesId])
+    }
   })
+
   return vizUsingFilters?.some(viz => viz?.dataKey === datasetKey)
 }

package/src/helpers/shouldLoadAllFilters.ts

@@ -1,30 +1,30 @@
-import { getQueryParam } from '@cdc/core/helpers/queryStringUtils'
-import { Visualization } from '@cdc/core/types/Visualization'
-
-export const shouldLoadAllFilters = (config, isEditorPanel): boolean => {
-  const autoLoad = Boolean(getQueryParam('cove-auto-load'))
-  const activeConfig = config.multiDashboards ? config.multiDashboards[config.activeDashboard] : config
-  const hasFilterByFileNameFunctionality = activeConfig.dashboard.sharedFilters?.some(
-    filter => filter.filterBy === 'File Name'
-  )
-  const isAutoLoadTab = Object.values(activeConfig.visualizations).reduce((acc, viz: Visualization) => {
-    if (acc === false) return acc
-    if (viz.visualizationType === 'dashboardFilters') {
-      if (viz.filterBehavior === 'Apply Button') return false
-      if (viz.autoLoad) {
-        return true
-      }
-    }
-    return acc
-  }, undefined)
-  if (autoLoad || isAutoLoadTab || hasFilterByFileNameFunctionality || isEditorPanel) {
-    const rowDataSetKeys = activeConfig.rows.map(row => row.dataKey).filter(Boolean)
-    const dataKeys = Object.values(activeConfig.visualizations)
-      .map((visualization: Visualization) => visualization.dataKey)
-      .filter(Boolean)
-      .concat(rowDataSetKeys)
-    const missingData = dataKeys.find(dataset => !config.datasets[dataset].data?.length)
-    return Boolean(missingData)
-  }
-  return false
-}
+import { getQueryParam } from '@cdc/core/helpers/queryStringUtils'
+import { Visualization } from '@cdc/core/types/Visualization'
+
+export const shouldLoadAllFilters = (config, isEditorPanel): boolean => {
+  const autoLoad = Boolean(getQueryParam('cove-auto-load'))
+  const activeConfig = config.multiDashboards ? config.multiDashboards[config.activeDashboard] : config
+  const hasFilterByFileNameFunctionality = activeConfig.dashboard.sharedFilters?.some(
+    filter => filter.filterBy === 'File Name'
+  )
+  const isAutoLoadTab = Object.values(activeConfig.visualizations).reduce((acc, viz: Visualization) => {
+    if (acc === false) return acc
+    if (viz.visualizationType === 'dashboardFilters') {
+      if (viz.filterBehavior === 'Apply Button') return false
+      if (viz.autoLoad) {
+        return true
+      }
+    }
+    return acc
+  }, undefined)
+  if (autoLoad || isAutoLoadTab || hasFilterByFileNameFunctionality || isEditorPanel) {
+    const rowDataSetKeys = activeConfig.rows.map(row => row.dataKey).filter(Boolean)
+    const dataKeys = Object.values(activeConfig.visualizations)
+      .map((visualization: Visualization) => visualization.dataKey)
+      .filter(Boolean)
+      .concat(rowDataSetKeys)
+    const missingData = dataKeys.find(dataset => !config.datasets[dataset]?.data?.length)
+    return Boolean(missingData)
+  }
+  return false
+}

package/src/index.tsx

@@ -1,10 +1,11 @@
 import React from 'react'
 import ReactDOM from 'react-dom/client'
 
-import MultiDashboardWrapper from './CdcDashboard'
 import '@cdc/core/styles/cove-main.scss'
 import './coreStyles_dashboard.scss'
 
+import MultiDashboardWrapper from './CdcDashboard'
+
 let isEditor = window.location.href.includes('editor=true')
 let isDebug = window.location.href.includes('debug=true')
 

package/src/scss/main.scss

@@ -121,11 +121,6 @@
     }
   }
 
-  .visually-hidden {
-    position: fixed;
-    left: -10000px;
-  }
-
   .loader {
     width: 100%;
     text-align: center;

package/src/store/dashboard.actions.ts

@@ -30,6 +30,7 @@ type ADD_NEW_DASHBOARD = Action<'ADD_NEW_DASHBOARD', undefined>
 type SAVE_CURRENT_CHANGES = Action<'SAVE_CURRENT_CHANGES', undefined>
 type SWITCH_CONFIG = Action<'SWITCH_CONFIG', number>
 type TOGGLE_ROW = Action<'TOGGLE_ROW', { rowIndex: number; colIndex: number }>
+type RESET_VISUALIZATION = Action<'RESET_VISUALIZATION', { vizKey: string }>
 type UPDATE_VISUALIZATION = Action<'UPDATE_VISUALIZATION', { vizKey: string; configureData: Partial<AnyVisualization> }>
 type UPDATE_ROW = Action<'UPDATE_ROW', { rowIndex: number; rowData: Partial<ConfigRow> }>
 type UPDATE_TOGGLE_NAME = Action<'UPDATE_TOGGLE_NAME', { rowIndex: number; columnIndex: number; toggleName: string }>
@@ -56,6 +57,7 @@ type DashboardActions =
   | SWITCH_CONFIG
   | INITIALIZE_MULTIDASHBOARDS
   | TOGGLE_ROW
+  | RESET_VISUALIZATION
   | UPDATE_VISUALIZATION
   | UPDATE_ROW
   | UPDATE_TOGGLE_NAME

package/src/store/dashboard.reducer.ts

@@ -195,6 +195,21 @@ const reducer = (state: DashboardState, action: DashboardActions): DashboardStat
         config: saveMultiChanges({ ...state.config, rows: newRows }, state.config.activeDashboard)
       }
     }
+    case 'RESET_VISUALIZATION': {
+      const { vizKey } = action.payload
+      const updatedViz = { ...state.config.visualizations[vizKey] } as AnyVisualization
+      delete updatedViz.data
+      delete updatedViz.dataKey
+      delete updatedViz.dataDescription
+      delete updatedViz.formattedData
+      return {
+        ...state,
+        config: saveMultiChanges(
+          { ...state.config, visualizations: { ...state.config.visualizations, [vizKey]: updatedViz } },
+          state.config.activeDashboard
+        )
+      }
+    }
     case 'UPDATE_VISUALIZATION': {
       const { vizKey, configureData } = action.payload
       const updatedViz = { ...state.config.visualizations[vizKey], ...configureData } as AnyVisualization

package/src/types/DataSet.ts

@@ -8,4 +8,5 @@ export type DataSet = ConfigureData & {
   dataUrl: string
   runtimeDataUrl: string
   dataFileSourceType: string
+  loadQueryParam?: string // fetched from the browser's query string and appended to the dataUrl on load.
 }

package/src/types/SharedFilter.ts

@@ -22,6 +22,8 @@ export type SharedFilter = FilterBase & {
   datasetKey?: string
   subGrouping: SubGrouping
   tier?: number
+  // value to use when the filter loads
+  defaultValue?: string
   /**
    * How to format the end file name when filter.filterBy is set to "File Name"
    *

package/LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.