Skip to content

Commit 2882d0e

Browse files
nreesekibanamachine
andcommitted
[Maps] fix term join not updating when editing right field (#111030)
* [Maps] fix term join not updating when editing right field * tslint * clean up Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
1 parent 405214b commit 2882d0e

3 files changed

Lines changed: 26 additions & 10 deletions

File tree

x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { SortDirection } from 'src/plugins/data/common/search';
1212
import { RENDER_AS, SCALING_TYPES } from '../constants';
1313
import { MapExtent, MapQuery } from './map_descriptor';
1414
import { Filter, TimeRange } from '../../../../../src/plugins/data/common';
15+
import { ESTermSourceDescriptor } from './source_descriptor_types';
1516

1617
export type Timeslice = {
1718
from: number;
@@ -50,9 +51,7 @@ type ESGeoLineSourceSyncMeta = {
5051
sortField: string;
5152
};
5253

53-
type ESTermSourceSyncMeta = {
54-
size: number;
55-
};
54+
export type ESTermSourceSyncMeta = Pick<ESTermSourceDescriptor, 'indexPatternId' | 'size' | 'term'>;
5655

5756
export type VectorSourceSyncMeta =
5857
| ESSearchSourceSyncMeta

x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.test.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,3 +109,20 @@ describe('extractPropertiesMap', () => {
109109
expect(properties[minPropName]).toBe(0);
110110
});
111111
});
112+
113+
describe('getSyncMeta', () => {
114+
it('should contain meta requiring source re-fetch when changed', () => {
115+
const source = new ESTermSource({
116+
id: '1234',
117+
indexPatternTitle: indexPatternTitle,
118+
term: termFieldName,
119+
indexPatternId: 'foobar',
120+
size: 10,
121+
});
122+
expect(source.getSyncMeta()).toEqual({
123+
indexPatternId: 'foobar',
124+
size: 10,
125+
term: 'myTermField',
126+
});
127+
});
128+
});

x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import {
2525
} from '../../../../common/elasticsearch_util';
2626
import {
2727
ESTermSourceDescriptor,
28+
ESTermSourceSyncMeta,
2829
VectorJoinSourceRequestMeta,
29-
VectorSourceSyncMeta,
3030
} from '../../../../common/descriptor_types';
3131
import { Adapters } from '../../../../../../../src/plugins/inspector/common/adapters';
3232
import { PropertiesMap } from '../../../../common/elasticsearch_util';
@@ -171,12 +171,12 @@ export class ESTermSource extends AbstractESAggSource implements ITermJoinSource
171171
return this.getMetricFields().map((esAggMetricField) => esAggMetricField.getName());
172172
}
173173

174-
getSyncMeta(): VectorSourceSyncMeta | null {
175-
return this._descriptor.size !== undefined
176-
? {
177-
size: this._descriptor.size,
178-
}
179-
: null;
174+
getSyncMeta(): ESTermSourceSyncMeta | null {
175+
return {
176+
indexPatternId: this._descriptor.indexPatternId,
177+
size: this._descriptor.size,
178+
term: this._descriptor.term,
179+
};
180180
}
181181

182182
getRightFields(): IField[] {

0 commit comments

Comments
 (0)