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

Jump to bottom

[Maps] Fix issue preventing TMS from rendering correctly #71946

Merged
merged 4 commits into from
Jul 16, 2020
Merged

[Maps] Fix issue preventing TMS from rendering correctly #71946

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f4e5e5
Ensure getColors selector modifies and returns the same object
Jul 15, 2020
3efd051
Call onSourceConfigChange on CreateSourceEditor mount
Jul 16, 2020
1e7b98b
Back out selector update
Jul 16, 2020
63e96dc
Merge branch 'master' into fix-tms-load-issue-on-maps
elasticmachine Jul 16, 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
13 changes: 9 additions & 4 deletions x-pack/plugins/maps/public/selectors/map_selectors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,8 +340,9 @@ export const isLoadingPreviewLayers = createSelector(getLayerList, (layerList) =
});
});

export const getMapColors = createSelector(getLayerListRaw, (layerList) =>
layerList
let mapColorsArr = [];
export const getMapColors = createSelector(getLayerListRaw, (layerList) => {
const newColorsArr = layerList
.filter((layerDescriptor) => {
return !layerDescriptor.__isPreviewLayer;
})
Expand All @@ -352,8 +353,12 @@ export const getMapColors = createSelector(getLayerListRaw, (layerList) =>
);
if (color) accu.push(color);
return accu;
}, [])
);
}, []);
if (!_.isEqual(mapColorsArr, newColorsArr)) {
mapColorsArr = newColorsArr;
}
return mapColorsArr;
});

export const getSelectedLayerJoinDescriptors = createSelector(getSelectedLayer, (selectedLayer) => {
if (!selectedLayer || !('getJoins' in selectedLayer)) {
Expand Down