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

[Maps] Migrate maps client router to react #65079

Merged
merged 125 commits into from
Jun 18, 2020
Merged

[Maps] Migrate maps client router to react #65079

Show file tree
Hide file tree
Changes from 44 commits
Commits
Show all changes
125 commits
Select commit Hold shift + click to select a range
decd241
Add placeholder top nav and partial main route handler
May 19, 2020
0a720a0
Add router logic
May 19, 2020
a7ef58a
Register maps app in plugin setup and connect router
May 19, 2020
fbf485a
Remove maps app legacy init from xpack index
May 19, 2020
3e7985a
Reorg
May 21, 2020
1066d4d
Narrow down to working code loading maps create edit view
May 25, 2020
b19fe29
Completely remove legacy maps
May 26, 2020
29353f7
Create map route working but mapContainer has 0 height
May 26, 2020
ac4ba83
Update layout to reflect original layout so style is applied correctly
May 26, 2020
58c3e45
Saved map loading by id. Layers loading in legend but not on map
May 26, 2020
b0f63a1
Saved layers loading
May 26, 2020
18b341a
Basic top nav in place with settings, inspect and save working
May 27, 2020
a19e264
Add breadcrumbs updates
May 27, 2020
1d71ac7
Merge remote-tracking branch 'upstream/master' into np-migrate-maps-c…
May 27, 2020
a9d9474
Connect search bar and time filter functionality
May 27, 2020
6b2bb5a
Clean up
May 27, 2020
d31704b
Browser router working without redirect
May 27, 2020
cb2702b
Redirect working for hash urls
May 27, 2020
771f498
Clean up
May 27, 2020
a9c3dae
Update remaining hash refs
May 27, 2020
e854fd7
More clean up, reorg
May 28, 2020
3b5166c
Merge remote-tracking branch 'upstream/master' into np-migrate-maps-c…
May 29, 2020
8f0270a
Reorg and set up for state handling
May 29, 2020
f6a61c5
Watch store for changes
May 29, 2020
f7870af
Global state syncing in place
May 29, 2020
ecbe676
Handle global state in create_edit route. Add handling for subscripti…
May 30, 2020
786a216
Replace angular full-screen class assignment
May 31, 2020
671dafe
Global sync accurate for time in URL and timepicker. Query 1 behind
Jun 1, 2020
22d9a15
Index patterns passed to top nav. Filter bar in place
Jun 1, 2020
d4939fd
Add app state handling and supporting logic
Jun 1, 2020
d44f9c8
Update actions on save to work with latest master
Jun 1, 2020
31a485f
Refactor to redux containers where needed. Centralize store handling
Jun 1, 2020
098b639
Add inspector adapters to props
Jun 1, 2020
c9dd5fd
Clean old state refs and connect app state where needed
Jun 1, 2020
421ce7a
Merge remote-tracking branch 'upstream/master' into np-migrate-maps-c…
Jun 1, 2020
0f271fd
Fix issue affecting embeddables
Jun 2, 2020
3771093
Use arrow function syntax to bind 'this' correctly for filters
Jun 2, 2020
0d8257b
Fix linting errors
Jun 2, 2020
d0b7bfd
Reorg and optimization. Biggest difference is improved load time from…
Jun 3, 2020
1d830e3
Merge remote-tracking branch 'upstream/master' into np-migrate-maps-c…
Jun 3, 2020
e68baaf
Fix type errors and update import paths
Jun 3, 2020
8c66a72
Clean up top nav menu todos and flow
Jun 3, 2020
a52df2e
Add back test data sub on save map links
Jun 3, 2020
e44dfdf
More explicitly handle list route
Jun 3, 2020
e8e4233
Check onMap in valid way for new router
Jun 3, 2020
bdc326c
Update test to use browser router nav instead of hash
Jun 3, 2020
e6dff64
i18n updates
Jun 3, 2020
6812066
Make syncWithStore an arrow function to properly bind 'this'
Jun 3, 2020
4629ad4
Update breadcrumbs correctly
Jun 4, 2020
1734763
Fix some details with how the url and breadcrumbs work on refresh and…
Jun 4, 2020
f3c0279
Clean up remaining hash map url refs
Jun 4, 2020
fb8bd00
Merge remote-tracking branch 'upstream/master' into np-migrate-maps-c…
Jun 4, 2020
5f02956
Fix relative fetch path
Jun 4, 2020
3f96e0e
Rename angular -> bootstrap
Jun 4, 2020
2f5f26d
Do saved map ops prior to component rendering
Jun 6, 2020
5443040
Wait until filters set to render map
Jun 6, 2020
2819f6d
Merge remote-tracking branch 'upstream/master' into np-migrate-maps-c…
Jun 6, 2020
9021bf1
Pass updateFiltersAndDispatch to MapsRoot. Fixes shape drawing filters
Jun 7, 2020
6d9be6b
jClean up routing handing
Jun 7, 2020
0f7b50a
Update map app title when route view loaded
Jun 7, 2020
6942143
Register saved objects w/ recently accessed. Some clean up
Jun 8, 2020
a0a2d3d
Hydrate maps from global state where needed on update
Jun 8, 2020
b80e975
Merge remote-tracking branch 'upstream/master' into np-migrate-maps-c…
Jun 8, 2020
9e402e7
TS/import fixes
Jun 8, 2020
4e6330a
Remove relative index pattern settings URL request, use leading slash
Jun 9, 2020
61536c5
Fix bug that caused filters toverwrite each other
Jun 9, 2020
be50603
Add revised handling for global state direct updates
Jun 9, 2020
dcc155d
Prevent app state retention between maps by clearing filter manager
Jun 9, 2020
7e49cf2
Merge remote-tracking branch 'upstream/master' into np-migrate-maps-c…
Jun 9, 2020
8cfd067
Remove only app state filters on leaving map
Jun 9, 2020
39af16f
Convert functions to arrow functions to avoid this binding error on r…
Jun 9, 2020
3e359a1
Sync global state after setting init query, time and refresh
Jun 10, 2020
8b7d6a5
Handle populating app state on refresh
Jun 10, 2020
b656732
Merge remote-tracking branch 'upstream/master' into np-migrate-maps-c…
Jun 10, 2020
3c0f0e7
Roll back change to get initial layers function
Jun 10, 2020
a73e919
Review feedback. Clean up
Jun 10, 2020
2481e4d
Clean up refresh handling
Jun 10, 2020
fbb680a
Check globalState exists to catch edge case. Some TS reminder comments
Jun 10, 2020
9020e9e
Update hash url logic in test
Jun 11, 2020
95199f8
i18n updates
Jun 11, 2020
712fbde
Add support finding buttons by text in functional tests
Jun 11, 2020
eb3ea1e
Construct discover maps URLs with hash before params
Jun 11, 2020
c7d210b
Merge remote-tracking branch 'upstream/master' into np-migrate-maps-c…
Jun 11, 2020
83e1721
Lazy load renderApp
Jun 12, 2020
2746533
Fix type errors
Jun 12, 2020
bf42414
Merge remote-tracking branch 'upstream/master' into np-migrate-maps-c…
Jun 13, 2020
5d0ddf3
Review feedback. Renamed route to 'maps_app', TS updates, map setting…
Jun 15, 2020
ec3badd
Merge remote-tracking branch 'upstream/master' into np-migrate-maps-c…
Jun 15, 2020
7402a28
Import tooltip and embeddable content directly from source outside of…
Jun 15, 2020
31fc4c4
Merge remote-tracking branch 'upstream/master' into np-migrate-maps-c…
Jun 15, 2020
b954bea
Review feedback. Add back 'allByLinkText' find function. Add timeout …
Jun 15, 2020
dae1039
Prevent add to history on global state init
Jun 16, 2020
f3789e7
Redirect back to list if saved object not found. Add toast for feedback
Jun 16, 2020
bebaafc
Update wording for global state flush. Fix typo
Jun 16, 2020
91039c6
Merge remote-tracking branch 'upstream/master' into np-migrate-maps-c…
Jun 16, 2020
b0c5f67
Use error message. Change toast to warning
Jun 16, 2020
98d99f7
Review feedback, clean up
Jun 16, 2020
e951a0d
Review feedback. Lots of clean up, async adjustments, using constants
Jun 16, 2020
c8dc83a
Review feedback. Mostly clean up
Jun 16, 2020
b59d7d8
Merge remote-tracking branch 'upstream/master' into np-migrate-maps-c…
Jun 16, 2020
0322eff
Forgot one componentDidMount async update
Jun 16, 2020
00f1339
Fix auto-import wrong APP_ID
Jun 16, 2020
09868a4
Update map paths changed in merge
Jun 16, 2020
3202683
Update one other conditional statement checking interval
Jun 16, 2020
60ba38b
Remove unneeded lambda function
Jun 16, 2020
ec92862
Pass saved query to top nav
Jun 16, 2020
616c32f
Remove arrow function syntax from saved gis map functions and revise …
Jun 17, 2020
15e0d4d
Merge remote-tracking branch 'upstream/master' into np-migrate-maps-c…
Jun 17, 2020
80dbdda
Review feedback. Clean up, tweaks
Jun 17, 2020
2b733fb
Review feedback. Cleaning
Jun 17, 2020
9f0b484
Review feedback. More clean up
Jun 17, 2020
ba661d0
Review feedback. Clean up store sync
Jun 17, 2020
ca846e0
Review feedback. Clean up. Remove unneeded file. Rename view files
Jun 17, 2020
a0bf57f
Subscribe to query service state as global state monitor
Jun 17, 2020
73917e1
Remove unused 'withRouter'
Jun 17, 2020
729ce10
Review feedback. Clean up state
Jun 17, 2020
0e18579
Merge remote-tracking branch 'upstream/master' into np-migrate-maps-c…
Jun 17, 2020
78880a8
Revert "Review feedback. Clean up state"
Jun 18, 2020
6c0ac0b
Review feedback. Remove refreshConfig froms state
Jun 18, 2020
20096c1
Review feedback. Remove filters from state
Jun 18, 2020
1cf23f7
Remove extra global state update. Add cleaner saved query clean up ha…
Jun 18, 2020
8d4228b
Merge remote-tracking branch 'upstream/master' into np-migrate-maps-c…
Jun 18, 2020
a18ec43
Remove extra updateGlobalState accidentally moved in prior commit
Jun 18, 2020
adbc1ab
Merge remote-tracking branch 'upstream/master' into np-migrate-maps-c…
Jun 18, 2020
e908161
Merge branch 'master' into np-migrate-maps-client-router-to-react
elasticmachine Jun 18, 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 src/plugins/discover/public/application/components/sidebar/lib/visualize_url_utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export function getMapsAppUrl(

return {
app: 'maps',
path: `#/map?${mapAppParams.toString()}`,
path: `/map?${mapAppParams.toString()}`,
};
}

Expand Down
2 changes: 0 additions & 2 deletions x-pack/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { reporting } from './legacy/plugins/reporting';
import { security } from './legacy/plugins/security';
import { dashboardMode } from './legacy/plugins/dashboard_mode';
import { beats } from './legacy/plugins/beats_management';
import { maps } from './legacy/plugins/maps';
import { spaces } from './legacy/plugins/spaces';
import { ingestManager } from './legacy/plugins/ingest_manager';

Expand All @@ -23,7 +22,6 @@ module.exports = function (kibana) {
security(kibana),
dashboardMode(kibana),
beats(kibana),
maps(kibana),
Copy link
Contributor

Choose a reason for hiding this comment

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

:)

ingestManager(kibana),
];
};
41 changes: 0 additions & 41 deletions x-pack/legacy/plugins/maps/index.js
View file
Open in desktop

This file was deleted.

Loading