Skip to content

[Maps] Add layer edit controls#99812

Merged
kindsun merged 123 commits intoelastic:masterfrom
kindsun:draw-controls-ui
Jun 17, 2021
Merged

[Maps] Add layer edit controls#99812
kindsun merged 123 commits intoelastic:masterfrom
kindsun:draw-controls-ui

Conversation

@kindsun
Copy link
Copy Markdown
Contributor

@kindsun kindsun commented May 11, 2021 •
edited
Loading

Adds layer edit control toolbar for any index-based layer in the Maps app as part of #96836.

image

To test, add xpack.maps.enableDrawingFeature: true to your kibana.yml

Functionality this PR adds:

  • The ability to add points (for point layers) or shapes (for shape layers) to any non-clustered, non-global-time-filtered, es doc layer
  • Shapes included: lines, points, bounding boxes, circles, polygons

What this PR doesn't add, but is planned for the future:

  • Integration with the new vector layer wizard
  • Ability to edit/remove existing shapes
  • Attribute editing capability

How to edit features:

  • Add sample data
  • Create a map, add any sample data layer
  • Disable global time filter in layer settings, save and close layer settings
  • Left click on layer in TOC and open Edit features in pop-up menu
  • This will open the Edit features toolbar on the left with just points enabled
  • To test shapes editing capability, extract and upload the attached file below via GeoJSON Uploader and repeat the above steps (except the global time filter toggle, that shouldn't apply here)

australia_states_v1.geo.zip

Aaron Caldwell added 30 commits March 26, 2021 15:50
Placeholder feature edit control in place
5f8aa18
Merge remote-tracking branch 'upstream/master' into shape-drawing-ui
2cbd6b0
Placeholder menu added
a80038a
Redux integrated
26ec7bf
Single shape drawing
8ca809a
Merge remote-tracking branch 'upstream/master' into shape-drawing-ui
f9eeb95
Keep draw mode active
b8eea96
Trigger editing through add layer wizard
b4f3af0
Add index checking utils
001c87f
Connect error checking
95f8f14
Conditionally show edit toolbar
2de30ec
Connect missing shapes. Some clean up
92e17aa
Track features and index name in store
143b24a
Connect add layer button enablement
e129539
Connect persistence utils
9c5ca16
Dispatch clearing action
423e3aa
Full roundtrip w/ settings showing. Moved async calls to component
f238ccb
Adjust addLayer call for async
d450fd1
Merge remote-tracking branch 'upstream/master' into shape-drawing-ui
3d7ad76
Add edit controls
b12ad85
Fix deleting functionality to update store
576b3d3
Add toggle color to buttons. Fall back to edit between drawings
cd211f9
Deselect features still selected when entering trash mode
4f79738
Add geometry check to filter out invalid geometries
ceae6d2
Clear out old drawing data on cancel. Update action names
bee0fd5
Add circle drawing button
3725859
Add tools show on map with cancel. Not completely connected to add la…
5200165 
…yer code
Merge remote-tracking branch 'upstream/master' into shape-drawing-ui
2087b70
Merge remote-tracking branch 'upstream/master' into shape-drawing-ui
33080d1
Pull out unneeded pieces. Add in common utils
87cdb31
@kindsun kindsun requested a review from nreese June 16, 2021 17:43
@elizabetdev
Copy link
Copy Markdown
Contributor

elizabetdev commented Jun 16, 2021

@aaronjcaldwell @nreese,

I pushed a few design changes with 95e97c1.

I changed the icons. The layer settings or "Edit layer" is now using the old icon. The edit features is now using the "vector" icon.

Screenshot 2021-06-16 at 18 38 15

Another change is the active state in the toolbar now is more prominent. The hover keeps the same.

toolbar@2x

When we are feature editing the background in the layer panel highlights. I don't think we need the dashed red border.

Screenshot 2021-06-16 at 19 11 42

After this, we need to open a new PR with some design changes. We can discuss it tomorrow in our meeting. You can find the prototype here. But the main idea is that the exit button would move to the highlighted layer and also we would add a badge saying that we are in "drawing mode".

Draw mode

@kindsun
Copy link
Copy Markdown
Contributor Author

kindsun commented Jun 16, 2021

@miukimiu Thanks for the clean-up 🙇 ! Changes look good to me for this PR. Looking forward to your next pass on edit tools in a separate PR, the preview shot of what that will look like looks great!

Let me know if there are any more changes you'd like to get in for this PR or if you need any updates from me.

@kindsun kindsun requested a review from nreese June 16, 2021 20:17
nreese
nreese reviewed Jun 16, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@nreese nreese left a comment

Choose a reason for hiding this comment

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

Looking really good. Just some minor comments

@kindsun kindsun requested a review from nreese June 16, 2021 22:14
@kibanamachine
Copy link
Copy Markdown
Contributor

kibanamachine commented Jun 17, 2021

💚 Build Succeeded

Metrics [docs]

Module Count

Fewer modules leads to a faster build time

id before after diff
maps 733 742 +9

Public APIs missing comments

Total count of every public API that lacks a comment. Target amount is 0. Run node scripts/build_api_docs --plugin [yourplugin] --stats comments for more detailed information.

id before after diff
maps 195 202 +7

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.6MB 3.1MB ⚠️ +486.1KB

Page load bundle

Size of the bundles that are downloaded on every page load. Target size is below 100kb

id before after diff
maps 63.6KB 64.4KB +778.0B
Unknown metric groups

API count

id before after diff
maps 196 203 +7

History

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

elizabetdev
elizabetdev approved these changes Jun 17, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@elizabetdev elizabetdev left a comment

Choose a reason for hiding this comment

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

From a design perspective, it looks good. We're using the right icons, colors and the toolbar now has better states. 🎉

As I commented on #99812 (comment) we decided to improve the user flow in a different PR.

nreese
nreese approved these changes Jun 17, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@nreese nreese left a comment

Choose a reason for hiding this comment

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

LGTM thanks for sticking with all the review comments. This PR turned out really nice and its great to be able to draw features and index them.

@kindsun kindsun merged commit 246e7be into elastic:master Jun 17, 2021
@kindsun kindsun deleted the draw-controls-ui branch June 17, 2021 13:21
@kindsun kindsun mentioned this pull request Jun 17, 2021
Merged
kindsun pushed a commit to kindsun/kibana that referenced this pull request Jun 17, 2021
@elizabetdev
[Maps] Add layer edit controls (elastic#99812)
e724f14 
Co-authored-by: miukimiu <elizabet.oliveira@elastic.co>
kindsun pushed a commit that referenced this pull request Jun 17, 2021
@elizabetdev
[Maps] Add layer edit controls (#99812) (#102501)
dbd8532 
Co-authored-by: miukimiu <elizabet.oliveira@elastic.co>

Co-authored-by: miukimiu <elizabet.oliveira@elastic.co>
@kindsun kindsun mentioned this pull request Jun 17, 2021
Closed
@kindsun kindsun mentioned this pull request Jun 23, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nreese nreese nreese approved these changes

+2 more reviewers

@thomasneirynck thomasneirynck thomasneirynck left review comments

@elizabetdev elizabetdev elizabetdev approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

release_note:enhancement release_note:feature Makes this part of the condensed release notes Team:Geo Former Team Label for Geo Team. Now use Team:Presentation v7.14.0 v8.0.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@kindsun @elasticmachine @ryankeairns @nreese @elizabetdev @kibanamachine @thomasneirynck