mirror of
https://github.com/elastic/kibana.git
synced 2025-04-24 09:48:58 -04:00
[TSVB] fix wrong field list on overriding index pattern for series (#96204)
This commit is contained in:
parent
413477b788
commit
b670ef29ae
10 changed files with 30 additions and 26 deletions
|
@ -48,9 +48,9 @@ export function Agg(props: AggProps) {
|
|||
...props.style,
|
||||
};
|
||||
|
||||
const indexPattern =
|
||||
(props.series.override_index_pattern && props.series.series_index_pattern) ||
|
||||
props.panel.index_pattern;
|
||||
const indexPattern = props.series.override_index_pattern
|
||||
? props.series.series_index_pattern
|
||||
: props.panel.index_pattern;
|
||||
|
||||
return (
|
||||
<div className={props.className} style={style}>
|
||||
|
|
|
@ -51,8 +51,9 @@ export const FilterRatioAgg = (props) => {
|
|||
(query) => handleChange({ denominator: query }),
|
||||
[handleChange]
|
||||
);
|
||||
const indexPattern =
|
||||
(series.override_index_pattern && series.series_index_pattern) || panel.index_pattern;
|
||||
const indexPattern = series.override_index_pattern
|
||||
? series.series_index_pattern
|
||||
: panel.index_pattern;
|
||||
|
||||
const defaults = {
|
||||
numerator: getDataStart().query.queryString.getDefaultQuery(),
|
||||
|
|
|
@ -39,8 +39,9 @@ export function PercentileAgg(props) {
|
|||
const handleSelectChange = createSelectHandler(handleChange);
|
||||
const handleNumberChange = createNumberHandler(handleChange);
|
||||
|
||||
const indexPattern =
|
||||
(series.override_index_pattern && series.series_index_pattern) || panel.index_pattern;
|
||||
const indexPattern = series.override_index_pattern
|
||||
? series.series_index_pattern
|
||||
: panel.index_pattern;
|
||||
|
||||
useEffect(() => {
|
||||
if (!checkModel(model)) {
|
||||
|
|
|
@ -65,9 +65,9 @@ export const PositiveRateAgg = (props) => {
|
|||
const handleSelectChange = createSelectHandler(handleChange);
|
||||
|
||||
const htmlId = htmlIdGenerator();
|
||||
const indexPattern =
|
||||
(props.series.override_index_pattern && props.series.series_index_pattern) ||
|
||||
props.panel.index_pattern;
|
||||
const indexPattern = props.series.override_index_pattern
|
||||
? props.series.series_index_pattern
|
||||
: props.panel.index_pattern;
|
||||
|
||||
const selectedUnitOptions = UNIT_OPTIONS.filter((o) => o.value === model.unit);
|
||||
|
||||
|
|
|
@ -31,8 +31,9 @@ export function StandardAgg(props) {
|
|||
const handleSelectChange = createSelectHandler(handleChange);
|
||||
|
||||
const restrictFields = getSupportedFieldsByMetricType(model.type);
|
||||
const indexPattern =
|
||||
(series.override_index_pattern && series.series_index_pattern) || panel.index_pattern;
|
||||
const indexPattern = series.override_index_pattern
|
||||
? series.series_index_pattern
|
||||
: panel.index_pattern;
|
||||
const htmlId = htmlIdGenerator();
|
||||
|
||||
return (
|
||||
|
|
|
@ -72,8 +72,9 @@ const StandardDeviationAggUi = (props) => {
|
|||
const handleSelectChange = createSelectHandler(handleChange);
|
||||
const handleTextChange = createTextHandler(handleChange);
|
||||
|
||||
const indexPattern =
|
||||
(series.override_index_pattern && series.series_index_pattern) || panel.index_pattern;
|
||||
const indexPattern = series.override_index_pattern
|
||||
? series.series_index_pattern
|
||||
: panel.index_pattern;
|
||||
const htmlId = htmlIdGenerator();
|
||||
const selectedModeOption = modeOptions.find((option) => {
|
||||
return model.mode === option.value;
|
||||
|
|
|
@ -100,8 +100,9 @@ const TopHitAggUi = (props) => {
|
|||
order: 'desc',
|
||||
};
|
||||
const model = { ...defaults, ...props.model };
|
||||
const indexPattern =
|
||||
(series.override_index_pattern && series.series_index_pattern) || panel.index_pattern;
|
||||
const indexPattern = series.override_index_pattern
|
||||
? series.series_index_pattern
|
||||
: panel.index_pattern;
|
||||
|
||||
const aggWithOptionsRestrictFields = [
|
||||
PANEL_TYPES.TABLE,
|
||||
|
|
|
@ -33,10 +33,9 @@ export const SeriesConfig = (props) => {
|
|||
const handleSelectChange = createSelectHandler(props.onChange);
|
||||
const handleTextChange = createTextHandler(props.onChange);
|
||||
const htmlId = htmlIdGenerator();
|
||||
const seriesIndexPattern =
|
||||
props.model.override_index_pattern && props.model.series_index_pattern
|
||||
? props.model.series_index_pattern
|
||||
: props.indexPatternForQuery;
|
||||
const seriesIndexPattern = props.model.override_index_pattern
|
||||
? props.model.series_index_pattern
|
||||
: props.indexPatternForQuery;
|
||||
|
||||
return (
|
||||
<div className="tvbAggRow">
|
||||
|
|
|
@ -63,8 +63,9 @@ export class Split extends Component {
|
|||
|
||||
render() {
|
||||
const { model, panel, uiRestrictions, seriesQuantity } = this.props;
|
||||
const indexPattern =
|
||||
(model.override_index_pattern && model.series_index_pattern) || panel.index_pattern;
|
||||
const indexPattern = model.override_index_pattern
|
||||
? model.series_index_pattern
|
||||
: panel.index_pattern;
|
||||
const splitMode = get(this.props, 'model.split_mode', SPLIT_MODES.EVERYTHING);
|
||||
const Component = this.getComponent(splitMode, uiRestrictions);
|
||||
|
||||
|
|
|
@ -327,10 +327,9 @@ export const TimeseriesConfig = injectI18n(function (props) {
|
|||
|
||||
const disableSeparateYaxis = model.separate_axis ? false : true;
|
||||
|
||||
const seriesIndexPattern =
|
||||
props.model.override_index_pattern && props.model.series_index_pattern
|
||||
? props.model.series_index_pattern
|
||||
: props.indexPatternForQuery;
|
||||
const seriesIndexPattern = props.model.override_index_pattern
|
||||
? props.model.series_index_pattern
|
||||
: props.indexPatternForQuery;
|
||||
|
||||
const initialPalette = {
|
||||
...model.palette,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue