Skip to content

[Maps] fix double fetch when filter pill is added #63024

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

Merged
merged 7 commits into from
Apr 14, 2020
Merged

[Maps] fix double fetch when filter pill is added #63024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6af3233
[Maps] fix double fetch when filter pill is added
nreese Apr 8, 2020
b13a957
Merge branch 'master' of github.com:elastic/kibana into double_fetch
nreese Apr 9, 2020
673d52b
remove isDataSyncActive
nreese Apr 9, 2020
1d19643
Merge branch 'master' into double_fetch
elasticmachine Apr 13, 2020
b3ddc97
Merge branch 'master' into double_fetch
elasticmachine Apr 13, 2020
138f4dd
set dataMetaAtStart to null instead of deleting
nreese Apr 14, 2020
8da90f0
Merge branch 'double_fetch' of github.com:nreese/kibana into double_f…
nreese Apr 14, 2020
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', {});
Copy link
Contributor

@thomasneirynck thomasneirynck Apr 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

apart from the bugfix, +1 on the removal of _.get.

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