Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: DEV-9358 Advanced Editor: Multidashboard changes not saving #1591

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Table } from '@cdc/core/types/Table'
import { DashboardContext, DashboardDispatchContext } from '../../DashboardContext'
import { mapDataToConfig } from '../../helpers/mapDataToConfig'
import './visualizations-panel-styles.css'
import { MultiDashboardConfig } from '../../types/MultiDashboard'

const addVisualization = (type, subType) => {
const modalWillOpen = type !== 'markup-include'
Expand All @@ -30,7 +31,14 @@ const addVisualization = (type, subType) => {
newVisualizationConfig.visualizationType = type
break
case 'table':
const tableConfig: Table = { label: 'Data Table', show: true, showDownloadUrl: false, showVertical: true, expanded: true, collapsible: true }
const tableConfig: Table = {
label: 'Data Table',
show: true,
showDownloadUrl: false,
showVertical: true,
expanded: true,
collapsible: true
}
newVisualizationConfig.table = tableConfig
newVisualizationConfig.columns = {}
newVisualizationConfig.dataFormat = {}
Expand Down Expand Up @@ -74,7 +82,18 @@ const VisualizationsPanel = () => {
const [advancedEditing, setAdvancedEditing] = useState(false)
const { config } = useContext(DashboardContext)
const dispatch = useContext(DashboardDispatchContext)
const loadConfig = newConfig => dispatch({ type: 'APPLY_CONFIG', payload: [mapDataToConfig(newConfig)] })
const loadConfig = incomingConfig => {
const newConfig = !incomingConfig.multiDashboards
? incomingConfig
: ({
...config,
...incomingConfig,
...incomingConfig.multiDashboards[config.activeDashboard],
activeDashboard: config.activeDashboard
} as MultiDashboardConfig)

dispatch({ type: 'APPLY_CONFIG', payload: [mapDataToConfig(newConfig)] })
}
return (
<div className={`visualizations-panel${advancedEditing ? ' advanced-editor' : ''}`}>
<p style={{ fontSize: '14px' }}>Click and drag an item onto the grid to add it to your dashboard.</p>
Expand Down
Loading