[Maps] Register GeoJson upload with integrations page #126350

maksimkovalev · 2022-02-24T15:13:26Z

Added cards on Integration page to upload GeoJson. Links to Maps app with upload_geojson parameter in url now opens layer sidebar with expanded wizard.

maksimkovalev · 2022-02-25T08:45:19Z

@thomasneirynck would you like to review this PR?

x-pack/plugins/maps/public/classes/layers/wizards/load_layer_wizards.ts

...s/public/classes/layers/wizards/solution_layers/observability/observability_layer_wizard.tsx

...lugins/maps/public/classes/layers/wizards/solution_layers/security/security_layer_wizard.tsx

x-pack/plugins/maps/server/register_integrations.ts

x-pack/plugins/maps/public/routes/map_page/saved_map/get_open_layer_wizard_url_param.ts

x-pack/plugins/maps/public/reducers/ui.ts

x-pack/plugins/maps/public/classes/layers/wizards/layer_wizard_registry.ts

nreese

I think that layerWizardId needs to be renamed to something more specific. As is, layerWizardId is very misleading as it conveys that it's the redux state for any open layer wizard and this is not the case. In AddLayerPanel, selecting a layer wizard only updates component state and does not update redux state. I think renaming layerWizardId to something like autoOpenLayerWizardId will avoid confusion.

x-pack/plugins/maps/common/constants.ts

x-pack/plugins/maps/public/classes/layers/wizards/file_upload_wizard/config.tsx

nreese

Can you add a functional test to ensure the URL works. https://github.com/elastic/kibana/blob/main/x-pack/test/functional/apps/maps/discover.js is a good example of testing linking to maps

x-pack/plugins/maps/common/constants.ts

x-pack/plugins/maps/public/actions/ui_actions.ts

x-pack/plugins/maps/public/classes/layers/wizards/layer_wizard_registry.ts

x-pack/plugins/maps/public/connected_components/add_layer_panel/index.ts

x-pack/plugins/maps/server/register_integrations.ts

x-pack/plugins/maps/public/actions/ui_actions.ts

x-pack/test/functional/apps/maps/geofile_wizard_auto_open.js

x-pack/plugins/maps/public/connected_components/add_layer_panel/index.ts

nreese · 2022-03-09T16:01:53Z

@elasticmachine merge upstream

elasticmachine · 2022-03-09T16:27:15Z

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

x-pack/plugins/maps/public/connected_components/add_layer_panel/view.tsx

nreese · 2022-03-09T16:50:50Z

x-pack/plugins/maps/server/register_integrations.ts

+      defaultMessage: 'Upload GeoJson with Elastic Maps.',
+    }),
+    uiInternalPath: core.http.basePath.prepend(
+      getFullPath(`?${OPEN_LAYER_WIZARD}=${WIZARD_ID.GEO_FILE}`)


The signature of getFullPath expects a saved object id. We are kind of hijacking the method here. Plus the URL is not quite right and when followed produces URLs like http://localhost:5601/qni/app/maps/map?openLayerWizard=uploadGeoFile#?_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:now-15m,to:now))&_a=(filters:!(),query:(language:kuery,query:''))

Notice there are 2 ? which is wrong.

You can change to the below. It looks like core.http.basePath.prepend is not needed. Also notice # character added. Query parameters need to be after # character.

uiInternalPath: `${getFullPath()}#?${OPEN_LAYER_WIZARD}=${WIZARD_ID.GEO_FILE}`

Did you mean getFullPath('')? Because this function requires an id or undefined.

x-pack/test/functional/apps/maps/geofile_wizard_auto_open.ts

x-pack/plugins/maps/server/register_integrations.ts

nreese · 2022-03-10T16:14:14Z

@elasticmachine merge upstream

nreese

LGTM. Lets get copy review from @gchaps before merging
code review, tested in chrome

x-pack/plugins/maps/server/register_integrations.ts

kibana-ci · 2022-03-14T08:23:00Z

💚 Build Succeeded

Metrics [docs]

Module Count

Fewer modules leads to a faster build time

id	before	after	diff
`maps`	758	759	+1

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	+1.2KB

Page load bundle

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

id	before	after	diff
`maps`	65.6KB	66.2KB	+661.0B

History

💛 Build #29482 was flaky b38309d
💚 Build #29275 succeeded 1bc009b
💚 Build #28869 succeeded eda89ba
💚 Build #28679 succeeded a4a81ad
💚 Build #28442 succeeded b6f8b08
💚 Build #28299 succeeded 2e5e801

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

* elastic#116653 - added GeoJson upload for Intergrations page * 116653 - refactoring for messages * 116653 - fixed Checks and api tests * 116653 - fixed checks * 116653 - refactoring; Added constants and registrations for shapefile * 116653 - fixed api test * 116653 - added method for getting selected wizard * 116653 - refactoring * 116653 - refactoring; Added constants, variables renamed * 116653 - prettier fixes * 116653 - refactoring; functional test added * 116653 - test file extension changed to TS * 116653 - refactoring * 116653 - refactoring; test updated * 116653 - refactoring Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

maksimkovalev added 2 commits February 24, 2022 17:02

elastic#116653 - added GeoJson upload for Intergrations page

4e87a2e

116653 - refactoring for messages

c5a38c5

maksimkovalev added [Deprecated-Use Team:Presentation]Team:Geo Former Team Label for Geo Team. Now use Team:Presentation release_note:enhancement v8.2.0 labels Feb 24, 2022

maksimkovalev added 2 commits February 24, 2022 21:46

116653 - fixed Checks and api tests

2523480

116653 - fixed checks

de8027f

maksimkovalev requested a review from nreese February 25, 2022 08:45

nreese added the backport:skip This commit does not require backporting label Feb 28, 2022

nreese reviewed Feb 28, 2022

View reviewed changes

maksimkovalev added 2 commits March 1, 2022 13:57

116653 - refactoring; Added constants and registrations for shapefile

b322a26

116653 - fixed api test

fd72ed4

maksimkovalev requested a review from nreese March 2, 2022 12:16

116653 - added method for getting selected wizard

3101f7b

nreese reviewed Mar 3, 2022

View reviewed changes

x-pack/plugins/maps/public/classes/layers/wizards/layer_wizard_registry.ts Outdated Show resolved Hide resolved

maksimkovalev added 2 commits March 3, 2022 19:29

Merge branch 'main' into e-116653

eed38d8

116653 - refactoring

0fe40fb

nreese reviewed Mar 4, 2022

View reviewed changes

x-pack/plugins/maps/common/constants.ts Outdated Show resolved Hide resolved

x-pack/plugins/maps/public/classes/layers/wizards/file_upload_wizard/config.tsx Outdated Show resolved Hide resolved

maksimkovalev added 3 commits March 7, 2022 11:08

116653 - refactoring; Added constants, variables renamed

484d933

116653 - prettier fixes

afe90d2

Merge branch 'main' into e-116653

002088f

nreese reviewed Mar 7, 2022

View reviewed changes

x-pack/plugins/maps/public/actions/ui_actions.ts Outdated Show resolved Hide resolved

maksimkovalev added 2 commits March 7, 2022 20:57

Merge branch 'main' into e-116653

2f33f93

116653 - refactoring; functional test added

2e5e801

nreese reviewed Mar 8, 2022

View reviewed changes

x-pack/test/functional/apps/maps/geofile_wizard_auto_open.js Outdated Show resolved Hide resolved

116653 - test file extension changed to TS

b6f8b08

nreese reviewed Mar 8, 2022

View reviewed changes

x-pack/plugins/maps/public/connected_components/add_layer_panel/index.ts Outdated Show resolved Hide resolved

116653 - refactoring

a4a81ad

Merge branch 'main' into e-116653

eda89ba

nreese requested a review from gchaps March 9, 2022 16:27

nreese marked this pull request as ready for review March 9, 2022 16:27

nreese requested a review from a team as a code owner March 9, 2022 16:27

nreese reviewed Mar 9, 2022

View reviewed changes

116653 - refactoring; test updated

1bc009b

Merge branch 'main' into e-116653

b38309d

nreese approved these changes Mar 10, 2022

View reviewed changes

gchaps reviewed Mar 10, 2022

View reviewed changes

x-pack/plugins/maps/server/register_integrations.ts Outdated Show resolved Hide resolved

x-pack/plugins/maps/server/register_integrations.ts Outdated Show resolved Hide resolved

x-pack/plugins/maps/server/register_integrations.ts Outdated Show resolved Hide resolved

maksimkovalev added 2 commits March 14, 2022 08:55

116653 - refactoring

14001bf

Merge branch 'main' into e-116653

c88c52c

maksimkovalev requested a review from gchaps March 14, 2022 10:50

nreese merged commit 56c38b6 into elastic:main Mar 14, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Maps] Register GeoJson upload with integrations page #126350

[Maps] Register GeoJson upload with integrations page #126350

maksimkovalev commented Feb 24, 2022 •

edited

maksimkovalev commented Feb 25, 2022

nreese left a comment

nreese left a comment

nreese commented Mar 9, 2022

elasticmachine commented Mar 9, 2022

nreese Mar 9, 2022

maksimkovalev Mar 10, 2022

nreese commented Mar 10, 2022

nreese left a comment

kibana-ci commented Mar 14, 2022

[Maps] Register GeoJson upload with integrations page #126350

[Maps] Register GeoJson upload with integrations page #126350

Conversation

maksimkovalev commented Feb 24, 2022 • edited

maksimkovalev commented Feb 25, 2022

nreese left a comment

Choose a reason for hiding this comment

nreese left a comment

Choose a reason for hiding this comment

nreese commented Mar 9, 2022

elasticmachine commented Mar 9, 2022

nreese Mar 9, 2022

Choose a reason for hiding this comment

maksimkovalev Mar 10, 2022

Choose a reason for hiding this comment

nreese commented Mar 10, 2022

nreese left a comment

Choose a reason for hiding this comment

kibana-ci commented Mar 14, 2022

💚 Build Succeeded

Metrics [docs]

Module Count

Async chunks

Page load bundle

History

maksimkovalev commented Feb 24, 2022 •

edited