-
Notifications
You must be signed in to change notification settings - Fork 8.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[7.13] [TSVB] Index pattern select field disappear in Annotation tab (#…
…102314) (#102654) * [TSVB] Index pattern select field disappear in Annotation tab (#102314) * [TSVB] Index pattern select field disappear in Annotation tab * Refactor AnnotationsEditor and move renderRow logic into AnnotationRow * Remove duplicated license, add useCallback to functions in AnnotationRow, remove cross refecrence and update types * Refactor AnnotationEditor and AnnotationRow * refactoring * remove extra props * fix nits Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: Alexey Antonov <alexwizp@gmail.com> # Conflicts: # src/plugins/vis_type_timeseries/public/application/components/yes_no.tsx * fix merge conflicts Co-authored-by: Diana Derevyankina <54894989+DziyanaDzeraviankina@users.noreply.github.com>
- Loading branch information
1 parent
e2d0d3c
commit de135cf
Showing
6 changed files
with
405 additions
and
332 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
284 changes: 284 additions & 0 deletions
284
src/plugins/vis_type_timeseries/public/application/components/annotation_row.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,284 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License | ||
* 2.0 and the Server Side Public License, v 1; you may not use this file except | ||
* in compliance with, at your election, the Elastic License 2.0 or the Server | ||
* Side Public License, v 1. | ||
*/ | ||
|
||
import React, { useState, useEffect, useCallback, useMemo, ChangeEvent } from 'react'; | ||
import { i18n } from '@kbn/i18n'; | ||
import { | ||
EuiCode, | ||
EuiComboBoxOptionOption, | ||
EuiFieldText, | ||
EuiFlexGroup, | ||
EuiFlexItem, | ||
EuiFormRow, | ||
EuiSpacer, | ||
htmlIdGenerator, | ||
} from '@elastic/eui'; | ||
import { FormattedMessage } from '@kbn/i18n/react'; | ||
|
||
import { getDataStart } from '../../services'; | ||
import { KBN_FIELD_TYPES, Query } from '../../../../../plugins/data/public'; | ||
|
||
import { AddDeleteButtons } from './add_delete_buttons'; | ||
import { ColorPicker } from './color_picker'; | ||
import { FieldSelect } from './aggs/field_select'; | ||
import { IndexPatternSelect } from './lib/index_pattern_select'; | ||
import { QueryBarWrapper } from './query_bar_wrapper'; | ||
import { YesNo } from './yes_no'; | ||
import { fetchIndexPattern } from '../../../common/index_patterns_utils'; | ||
import { getDefaultQueryLanguage } from './lib/get_default_query_language'; | ||
|
||
// @ts-expect-error not typed yet | ||
import { IconSelect } from './icon_select/icon_select'; | ||
|
||
import type { | ||
AnnotationItemsSchema, | ||
FetchedIndexPattern, | ||
IndexPatternValue, | ||
} from '../../../common/types'; | ||
import type { VisFields } from '../lib/fetch_fields'; | ||
|
||
const RESTRICT_FIELDS = [KBN_FIELD_TYPES.DATE]; | ||
|
||
const INDEX_PATTERN_KEY = 'index_pattern'; | ||
const TIME_FIELD_KEY = 'time_field'; | ||
|
||
export interface AnnotationRowProps { | ||
annotation: AnnotationItemsSchema; | ||
fields: VisFields; | ||
onChange: (partialModel: Partial<AnnotationItemsSchema>) => void; | ||
handleAdd: () => void; | ||
handleDelete: () => void; | ||
} | ||
|
||
const getAnnotationDefaults = () => ({ | ||
fields: '', | ||
template: '', | ||
index_pattern: '', | ||
query_string: { query: '', language: getDefaultQueryLanguage() }, | ||
}); | ||
|
||
export const AnnotationRow = ({ | ||
annotation, | ||
fields, | ||
onChange, | ||
handleAdd, | ||
handleDelete, | ||
}: AnnotationRowProps) => { | ||
const model = useMemo(() => ({ ...getAnnotationDefaults(), ...annotation }), [annotation]); | ||
const htmlId = htmlIdGenerator(model.id); | ||
|
||
const [fetchedIndex, setFetchedIndex] = useState<FetchedIndexPattern | null>(null); | ||
|
||
useEffect(() => { | ||
const updateFetchedIndex = async (index: IndexPatternValue) => { | ||
const { indexPatterns } = getDataStart(); | ||
|
||
setFetchedIndex( | ||
index | ||
? await fetchIndexPattern(index, indexPatterns) | ||
: { | ||
indexPattern: undefined, | ||
indexPatternString: undefined, | ||
} | ||
); | ||
}; | ||
|
||
updateFetchedIndex(model.index_pattern); | ||
}, [model.index_pattern]); | ||
|
||
const togglePanelActivation = useCallback( | ||
() => | ||
onChange({ | ||
hidden: !model.hidden, | ||
}), | ||
[model.hidden, onChange] | ||
); | ||
|
||
const handleChange = useCallback( | ||
(name: string) => ( | ||
event: Array<EuiComboBoxOptionOption<string>> | ChangeEvent<HTMLInputElement> | ||
) => | ||
onChange({ | ||
[name]: Array.isArray(event) ? event?.[0]?.value : event.target.value, | ||
}), | ||
[onChange] | ||
); | ||
|
||
const handleQueryChange = useCallback( | ||
(filter: Query) => | ||
onChange({ | ||
query_string: filter, | ||
}), | ||
[onChange] | ||
); | ||
|
||
return ( | ||
<div className="tvbAnnotationsEditor" key={model.id}> | ||
<EuiFlexGroup responsive={false}> | ||
<EuiFlexItem grow={false}> | ||
<ColorPicker disableTrash={true} onChange={onChange} name="color" value={model.color} /> | ||
</EuiFlexItem> | ||
|
||
<EuiFlexItem className="tvbAggRow__children"> | ||
<EuiFlexGroup responsive={false} wrap={true} gutterSize="m"> | ||
<EuiFlexItem> | ||
<IndexPatternSelect | ||
value={model[INDEX_PATTERN_KEY]} | ||
indexPatternName={INDEX_PATTERN_KEY} | ||
onChange={onChange} | ||
fetchedIndex={fetchedIndex} | ||
/> | ||
</EuiFlexItem> | ||
<EuiFlexItem> | ||
<FieldSelect | ||
type={TIME_FIELD_KEY} | ||
label={ | ||
<FormattedMessage | ||
id="visTypeTimeseries.annotationsEditor.timeFieldLabel" | ||
defaultMessage="Time field (required)" | ||
/> | ||
} | ||
restrict={RESTRICT_FIELDS} | ||
value={model.time_field} | ||
onChange={handleChange(TIME_FIELD_KEY)} | ||
indexPattern={model.index_pattern} | ||
fields={fields} | ||
/> | ||
</EuiFlexItem> | ||
</EuiFlexGroup> | ||
|
||
<EuiSpacer size="m" /> | ||
|
||
<EuiFlexGroup responsive={false} wrap={true} gutterSize="m"> | ||
<EuiFlexItem> | ||
<EuiFormRow | ||
id={htmlId('queryString')} | ||
label={ | ||
<FormattedMessage | ||
id="visTypeTimeseries.annotationsEditor.queryStringLabel" | ||
defaultMessage="Query string" | ||
/> | ||
} | ||
fullWidth | ||
> | ||
<QueryBarWrapper | ||
query={{ | ||
language: model.query_string.language || getDefaultQueryLanguage(), | ||
query: model.query_string.query || '', | ||
}} | ||
onChange={handleQueryChange} | ||
indexPatterns={[model.index_pattern]} | ||
/> | ||
</EuiFormRow> | ||
</EuiFlexItem> | ||
<EuiFlexItem grow={false}> | ||
<EuiFormRow | ||
label={i18n.translate( | ||
'visTypeTimeseries.annotationsEditor.ignoreGlobalFiltersLabel', | ||
{ | ||
defaultMessage: 'Ignore global filters?', | ||
} | ||
)} | ||
> | ||
<YesNo | ||
value={model.ignore_global_filters} | ||
name="ignore_global_filters" | ||
onChange={onChange} | ||
/> | ||
</EuiFormRow> | ||
</EuiFlexItem> | ||
<EuiFlexItem grow={false}> | ||
<EuiFormRow | ||
label={i18n.translate( | ||
'visTypeTimeseries.annotationsEditor.ignorePanelFiltersLabel', | ||
{ | ||
defaultMessage: 'Ignore panel filters?', | ||
} | ||
)} | ||
> | ||
<YesNo | ||
value={model.ignore_panel_filters} | ||
name="ignore_panel_filters" | ||
onChange={onChange} | ||
/> | ||
</EuiFormRow> | ||
</EuiFlexItem> | ||
</EuiFlexGroup> | ||
|
||
<EuiSpacer size="m" /> | ||
|
||
<EuiFlexGroup responsive={false} wrap={true} gutterSize="m"> | ||
<EuiFlexItem> | ||
<EuiFormRow | ||
id={htmlId('icon')} | ||
label={ | ||
<FormattedMessage | ||
id="visTypeTimeseries.annotationsEditor.iconLabel" | ||
defaultMessage="Icon (required)" | ||
/> | ||
} | ||
> | ||
<IconSelect value={model.icon} onChange={handleChange('icon')} /> | ||
</EuiFormRow> | ||
</EuiFlexItem> | ||
<EuiFlexItem> | ||
<EuiFormRow | ||
id={htmlId('fields')} | ||
label={ | ||
<FormattedMessage | ||
id="visTypeTimeseries.annotationsEditor.fieldsLabel" | ||
defaultMessage="Fields (required - comma separated paths)" | ||
/> | ||
} | ||
fullWidth | ||
> | ||
<EuiFieldText onChange={handleChange('fields')} value={model.fields} fullWidth /> | ||
</EuiFormRow> | ||
</EuiFlexItem> | ||
<EuiFlexItem> | ||
<EuiFormRow | ||
id={htmlId('rowTemplate')} | ||
label={ | ||
<FormattedMessage | ||
id="visTypeTimeseries.annotationsEditor.rowTemplateLabel" | ||
defaultMessage="Row template (required)" | ||
/> | ||
} | ||
helpText={ | ||
<span> | ||
<FormattedMessage | ||
id="visTypeTimeseries.annotationsEditor.rowTemplateHelpText" | ||
defaultMessage="eg.{rowTemplateExample}" | ||
values={{ rowTemplateExample: <EuiCode>{'{{field}}'}</EuiCode> }} | ||
/> | ||
</span> | ||
} | ||
fullWidth | ||
> | ||
<EuiFieldText | ||
onChange={handleChange('template')} | ||
value={model.template} | ||
fullWidth | ||
/> | ||
</EuiFormRow> | ||
</EuiFlexItem> | ||
</EuiFlexGroup> | ||
</EuiFlexItem> | ||
|
||
<EuiFlexItem grow={false}> | ||
<AddDeleteButtons | ||
onAdd={handleAdd} | ||
onDelete={handleDelete} | ||
togglePanelActivation={togglePanelActivation} | ||
isPanelActive={!model.hidden} | ||
/> | ||
</EuiFlexItem> | ||
</EuiFlexGroup> | ||
</div> | ||
); | ||
}; |
Oops, something went wrong.