Change source to sourceLink on type queryConfig and propagate those changes
parent
95e1c6abf5
commit
b58772e0cc
|
@ -86,23 +86,26 @@ interface State {
|
||||||
isStaticLegend: boolean
|
isStaticLegend: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
const createWorkingDraft = (source: string, query: CellQuery): QueryConfig => {
|
const createWorkingDraft = (
|
||||||
|
sourceLink: string,
|
||||||
|
query: CellQuery
|
||||||
|
): QueryConfig => {
|
||||||
const {queryConfig} = query
|
const {queryConfig} = query
|
||||||
const draft: QueryConfig = {
|
const draft: QueryConfig = {
|
||||||
...queryConfig,
|
...queryConfig,
|
||||||
id: uuid.v4(),
|
id: uuid.v4(),
|
||||||
source,
|
sourceLink,
|
||||||
}
|
}
|
||||||
|
|
||||||
return draft
|
return draft
|
||||||
}
|
}
|
||||||
|
|
||||||
const createWorkingDrafts = (
|
const createWorkingDrafts = (
|
||||||
source: string,
|
sourceLink: string,
|
||||||
queries: CellQuery[]
|
queries: CellQuery[]
|
||||||
): QueryConfig[] =>
|
): QueryConfig[] =>
|
||||||
_.cloneDeep(
|
_.cloneDeep(
|
||||||
queries.map((query: CellQuery) => createWorkingDraft(source, query))
|
queries.map((query: CellQuery) => createWorkingDraft(sourceLink, query))
|
||||||
)
|
)
|
||||||
|
|
||||||
@ErrorHandling
|
@ErrorHandling
|
||||||
|
@ -272,7 +275,7 @@ class CellEditorOverlay extends Component<Props, State> {
|
||||||
this.setState({
|
this.setState({
|
||||||
queriesWorkingDraft: [
|
queriesWorkingDraft: [
|
||||||
...queriesWorkingDraft,
|
...queriesWorkingDraft,
|
||||||
{...defaultQueryConfig({id: uuid.v4()}), source: null},
|
{...defaultQueryConfig({id: uuid.v4()}), sourceLink: null},
|
||||||
],
|
],
|
||||||
})
|
})
|
||||||
this.handleSetActiveQueryIndex(newIndex)
|
this.handleSetActiveQueryIndex(newIndex)
|
||||||
|
@ -295,7 +298,7 @@ class CellEditorOverlay extends Component<Props, State> {
|
||||||
return {
|
return {
|
||||||
queryConfig: q,
|
queryConfig: q,
|
||||||
query: q.rawText || buildQuery(TYPE_QUERY_CONFIG, timeRange, q),
|
query: q.rawText || buildQuery(TYPE_QUERY_CONFIG, timeRange, q),
|
||||||
source: q.source,
|
sourceLink: q.sourceLink,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -330,7 +333,7 @@ class CellEditorOverlay extends Component<Props, State> {
|
||||||
const queriesWorkingDraft: QueryConfig[] = this.state.queriesWorkingDraft.map(
|
const queriesWorkingDraft: QueryConfig[] = this.state.queriesWorkingDraft.map(
|
||||||
q => ({
|
q => ({
|
||||||
..._.cloneDeep(q),
|
..._.cloneDeep(q),
|
||||||
source: source.links.self,
|
sourceLink: source.links.self,
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -415,7 +418,7 @@ class CellEditorOverlay extends Component<Props, State> {
|
||||||
|
|
||||||
return {
|
return {
|
||||||
...config.queryConfig,
|
...config.queryConfig,
|
||||||
source: q.source,
|
sourceLink: q.sourceLink,
|
||||||
isQuerySupportedByExplorer,
|
isQuerySupportedByExplorer,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -430,10 +433,10 @@ class CellEditorOverlay extends Component<Props, State> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private findSelectedSource = () => {
|
private findSelectedSource = (): string => {
|
||||||
const {source} = this.props
|
const {source} = this.props
|
||||||
const sources = this.formattedSources
|
const sources = this.formattedSources
|
||||||
const currentSource = _.get(this.state.queriesWorkingDraft, '0.source')
|
const currentSource = _.get(this.state.queriesWorkingDraft, '0.sourceLink')
|
||||||
|
|
||||||
if (!currentSource) {
|
if (!currentSource) {
|
||||||
const defaultSource = sources.find(s => s.id === source.id)
|
const defaultSource = sources.find(s => s.id === source.id)
|
||||||
|
@ -520,13 +523,13 @@ class CellEditorOverlay extends Component<Props, State> {
|
||||||
|
|
||||||
private get source(): Source {
|
private get source(): Source {
|
||||||
const {source, sources} = this.props
|
const {source, sources} = this.props
|
||||||
const query = _.get(this.state.queriesWorkingDraft, 0, {source: null})
|
const query = _.get(this.state.queriesWorkingDraft, 0, {sourceLink: null})
|
||||||
|
|
||||||
if (!query.source) {
|
if (!query.sourceLink) {
|
||||||
return source
|
return source
|
||||||
}
|
}
|
||||||
|
|
||||||
return sources.find(s => s.links.self === query.source) || source
|
return sources.find(s => s.links.self === query.sourceLink) || source
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4,9 +4,9 @@ export const nextSource = (
|
||||||
prevQuery: QueryConfig,
|
prevQuery: QueryConfig,
|
||||||
nextQuery: QueryConfig
|
nextQuery: QueryConfig
|
||||||
): string => {
|
): string => {
|
||||||
if (nextQuery.source) {
|
if (nextQuery.sourceLink) {
|
||||||
return nextQuery.source
|
return nextQuery.sourceLink
|
||||||
}
|
}
|
||||||
|
|
||||||
return prevQuery.source
|
return prevQuery.sourceLink
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,7 @@ export interface QueryConfig {
|
||||||
areTagsAccepted: boolean
|
areTagsAccepted: boolean
|
||||||
rawText: string
|
rawText: string
|
||||||
range?: DurationRange | null
|
range?: DurationRange | null
|
||||||
source?: string
|
sourceLink?: string
|
||||||
fill?: string
|
fill?: string
|
||||||
status?: Status
|
status?: Status
|
||||||
shifts: TimeShift[]
|
shifts: TimeShift[]
|
||||||
|
|
Loading…
Reference in New Issue