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.

Sign up for GitHub

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

Jump to bottom

Fix: [dev-9094] multi dashboard filters #1523

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix: [dev-9094] multi dashboard filters #1523

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 19 additions & 3 deletions packages/dashboard/src/store/dashboard.reducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ const reducer = (state: DashboardState, action: DashboardActions): DashboardStat
case 'ADD_FOOTNOTE': {
const { id, rowIndex, config } = action.payload
const newRows = state.config.rows.map((row, i) => (i === rowIndex ? { ...row, footnotesId: id } : row))
return { ...state, config: { ...state.config, rows: newRows, visualizations: { ...state.config.visualizations, [id]: config } } }
return {
...state,
config: { ...state.config, rows: newRows, visualizations: { ...state.config.visualizations, [id]: config } }
}
}
case 'ADD_NEW_DASHBOARD': {
const currentMultiDashboards = state.config.multiDashboards
Expand Down Expand Up @@ -85,6 +88,13 @@ const reducer = (state: DashboardState, action: DashboardActions): DashboardStat
case 'SET_SHARED_FILTERS': {
const newSharedFilters = action.payload
const newDashboardConfig = { ...state.config.dashboard, sharedFilters: newSharedFilters }
if (state.config.multiDashboards) {
const saveSlot = state.config.activeDashboard
const newMultiDashboards = _.cloneDeep(state.config.multiDashboards)
newMultiDashboards[saveSlot].dashboard = newDashboardConfig
const newState = applyMultiDashboards(state, newMultiDashboards)
return { ...newState, config: { ...newState.config, dashboard: newDashboardConfig } }
}
return { ...state, config: { ...state.config, dashboard: newDashboardConfig } }
}
case 'SET_TAB_SELECTED': {
Expand Down Expand Up @@ -150,7 +160,10 @@ const reducer = (state: DashboardState, action: DashboardActions): DashboardStat
case 'UPDATE_VISUALIZATION': {
const { vizKey, configureData } = action.payload
const updatedViz = { ...state.config.visualizations[vizKey], ...configureData } as AnyVisualization
return { ...state, config: { ...state.config, visualizations: { ...state.config.visualizations, [vizKey]: updatedViz } } }
return {
...state,
config: { ...state.config, visualizations: { ...state.config.visualizations, [vizKey]: updatedViz } }
}
}
case 'UPDATE_ROW': {
const { rowIndex, rowData } = action.payload
Expand All @@ -167,6 +180,9 @@ const reducer = (state: DashboardState, action: DashboardActions): DashboardStat
}
}

const applyMultiDashboards = (state, newMultiDashboards) => ({ ...state, config: { ...state.config, multiDashboards: newMultiDashboards } })
const applyMultiDashboards = (state, newMultiDashboards) => ({
...state,
config: { ...state.config, multiDashboards: newMultiDashboards }
})

export default devToolsWrapper<DashboardState, DashboardActions>(reducer)
Loading