fix filter drawing and feature drawing broken in 8.2

[nreese]

Fixes #129632

#113144 added the below redux selector

export const getCustomIcons = ({ map }: MapStoreState): CustomIcon[] => {
  return (
    map.settings.customIcons.map((icon) => {
      return { ...icon, svg: Buffer.from(icon.svg, 'base64').toString('utf-8') };
    }) ?? []
  );
};

This causes problems with react component re-render checking. map.settings.customIcons.map always returns a new array instance so react re-render instance checking will always trigger as updated props.

This exposed an existing bug in draw_control.tsx. Logic in componentDidUpdate set draw control mode to SIMPLE_SELECT when it should not have been. The redux selector bug caused componentDidUpdate to fire on all redux state changes (redux state is updated on mouse move to set the current mouse coordinates).

The fix:

• draw_control.tsx is updated to better guard the setting of draw control mode to SIMPLE_SELECT
• getCustomIcons selector returns map.settings.customIcons instead of map.settings.customIcons.map.
• Base64 encoding/decoding logic is moved to saved_map. Custom icon svg state in redux is always unencoded svg strings. Custom icon svg state in savedObject.attributes is always base64 encoded svg string

[elasticmachine]

Pinging @elastic/kibana-gis (Team:Geo)

[nickpeihl]

lgtm! thanks for the fix!

tested in chrome and code review.

[kibana-ci]

💚 Build Succeeded

• Buildkite Build
• Commit: 21cf29a
• Storybooks Preview
• Webpack Bundle Analyzer

Metrics [docs]

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id	before	after	diff
maps	2.5MB	2.5MB	+3.7KB

Unknown metric groups

ESLint disabled line counts

id	before	after	diff
maps	42	41	-1

Total ESLint disabled count

id	before	after	diff
maps	70	69	-1

History

• 💔 Build #36621 failed 82580be
• 💔 Build #36605 failed afdee94

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

[kibanamachine]

💚 All backports created successfully

Status	Branch	Result
✅	8.2

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation