feat(ui.explorer): remove queryStatus from state

pull/5747/head
Pavel Zavora 2021-05-05 06:34:26 +02:00
parent 5cf3ca7c05
commit 6ff9854770
3 changed files with 9 additions and 13 deletions

View File

@ -13,7 +13,7 @@ export const initialState: DashboardUIState = {
timeRange: {lower, upper},
zoomedTimeRange: {lower: null, upper: null},
isEditMode: false,
cellQueryStatus: {queryID: null, status: null},
cellQueryStatuses: {},
hoverTime: NULL_HOVER_TIME,
activeCellID: '',
}
@ -29,14 +29,14 @@ export default (
dashboards,
}
return {...state, ...newState}
return {...state, ...newState, cellQueryStatuses: {}}
}
case ActionType.LoadDashboard: {
const {dashboard} = action.payload
const newDashboards = _.unionBy([dashboard], state.dashboards, 'id')
return {...state, dashboards: newDashboards}
return {...state, dashboards: newDashboards, cellQueryStatuses: {}}
}
case ActionType.SetDashboardTimeRange: {
@ -140,8 +140,12 @@ export default (
case ActionType.EditCellQueryStatus: {
const {queryID, status} = action.payload
const {cellQueryStatuses} = state
return {...state, cellQueryStatus: {queryID, status}}
return {
...state,
cellQueryStatuses: {...cellQueryStatuses, [queryID]: status},
}
}
case ActionType.TemplateVariableLocalSelected: {

View File

@ -6,7 +6,6 @@ import {DEState} from 'src/types/dataExplorer'
export const initialState: DEState = {
sourceLink: '',
queryStatus: {queryID: null, status: null},
queryStatuses: {},
}
@ -23,7 +22,6 @@ export default (state = initialState, action: Action): DEState => {
const {queryStatuses} = state
return {
...state,
queryStatus: {queryID, status},
queryStatuses: {...queryStatuses, [queryID]: status},
}
}
@ -31,7 +29,6 @@ export default (state = initialState, action: Action): DEState => {
return {
...state,
queryStatuses: {},
queryStatus: {queryID: null, status: null},
}
}
}

View File

@ -1,5 +1,5 @@
import {ColorNumber, ColorString} from 'src/types/colors'
import {CellType, Axes, Status} from 'src/types'
import {CellType, Axes, QueryStatuses} from 'src/types'
import {
DecimalPlaces,
FieldOption,
@ -7,7 +7,6 @@ import {
TableOptions,
NoteVisibility,
} from 'src/types/dashboards'
import {QueryStatuses} from './queries'
// Write Data Modes
export enum WriteDataMode {
@ -17,10 +16,6 @@ export enum WriteDataMode {
export interface DEState {
sourceLink: string
queryStatus: {
queryID: string | null
status: Status
}
queryStatuses: QueryStatuses
}