Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.x] [Maps] fix double fetch when filter pill is added (#63024) #63529

Merged
merged 1 commit into from
Apr 14, 2020
+13 −4
Merged

[7.x] [Maps] fix double fetch when filter pill is added (#63024) #63529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export type DataMeta = Partial<VectorSourceRequestMeta> &

export type DataRequestDescriptor = {
dataId: string;
dataMetaAtStart?: DataMeta;
dataMetaAtStart?: DataMeta | null;
dataRequestToken?: symbol;
data?: object;
dataMeta?: DataMeta;
Expand Down
10 changes: 7 additions & 3 deletions x-pack/plugins/maps/public/layers/util/data_request.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,13 @@ export class DataRequest {
}

getMeta(): DataMeta {
return this.hasData()
? _.get(this._descriptor, 'dataMeta', {})
: _.get(this._descriptor, 'dataMetaAtStart', {});
if (this._descriptor.dataMetaAtStart) {
return this._descriptor.dataMetaAtStart;
} else if (this._descriptor.dataMeta) {
return this._descriptor.dataMeta;
} else {
return {};
}
}

hasData(): boolean {
Expand Down
5 changes: 5 additions & 0 deletions x-pack/plugins/maps/public/reducers/map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,13 @@ const updateLayerInList = (state, layerId, attribute, newValue) => {
if (!layerId) {
return state;
}

const { layerList } = state;
const layerIdx = getLayerIndex(layerList, layerId);
if (layerIdx === -1) {
return state;
}

const updatedLayer = {
...layerList[layerIdx],
// Update layer w/ new value. If no value provided, toggle boolean value
Expand Down