Skip to content

[Maps] Do not patch maps calls with local project_routing #257706

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

Merged
mbondyra merged 5 commits into from
Mar 16, 2026
Merged

[Maps] Do not patch maps calls with local project_routing #257706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2f15a68
[Maps] Do not patch maps calls with local project_routing
mbondyra Mar 13, 2026
7367d32
do not display manage cps settings
mbondyra Mar 13, 2026
df927f0
Merge branch 'main' into maps_cps
mbondyra Mar 15, 2026
f4fd16f
Apply suggestions from code review
mbondyra Mar 16, 2026
140ee10
Merge branch 'main' into maps_cps
mbondyra Mar 16, 2026
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
19 changes: 10 additions & 9 deletions src/platform/packages/shared/kbn-cps-utils/components/project_picker_settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,16 @@ export const ProjectPickerSettings = ({ onResetToDefaults }: ProjectPickerSettin
closePopover();
},
},
{
Copy link
Copy Markdown
Contributor

@nreese nreese Mar 13, 2026

Choose a reason for hiding this comment

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

Should commented out code just be removed?

Copy link
Copy Markdown
Contributor Author

@mbondyra mbondyra Mar 13, 2026

Choose a reason for hiding this comment

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

I'd rather keep it - they have be suported for GA so it's gonna be just one - two month of this code to live as a comment and less work in the future. It's not like the feature that we'll forget about, it is planned to add this (just not ready from cloud side).

isSeparator: true as const,
},
{
name: strings.getManageCrossProjectSearchLabel(),
icon: 'gear',
'data-test-subj': 'projectPickerManageSettingsMenuItem',
onClick: closePopover, // TODO: redirect to CPS management - UI not ready yet
},
// TODO: Enable this when cloud CPS management link is ready: https://github.com/elastic/kibana/issues/257859
// {
// isSeparator: true as const,
// },
// {
// name: strings.getManageCrossProjectSearchLabel(),
// icon: 'gear',
// 'data-test-subj': 'projectPickerManageSettingsMenuItem',
// onClick: closePopover, // TODO: redirect to CPS management - UI not ready yet
// },
],
},
];
Expand Down
1 change: 0 additions & 1 deletion x-pack/platform/plugins/shared/maps/server/mvt/mvt_routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@ async function getTile({
method: 'POST',
path,
body,
querystring: { project_routing: '_alias:_origin' },
Copy link
Copy Markdown
Contributor

@nreese nreese Mar 13, 2026

Choose a reason for hiding this comment

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

Can you explain this change?

Copy link
Copy Markdown
Contributor Author

@mbondyra mbondyra Mar 13, 2026

Choose a reason for hiding this comment

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

What Rudolf did in his PR (linked in the description) is patching all the routes that should have project_routing always set on _alias:_origin. But patching this one was a mistake - we actually don't want this route to be set to local, because maps support cps so the setting should be instead taken from cps picker and then propagated down to body of this request. This has already been working, but the change from the linked PR broke it (I didn't notice when approving).

},
{
signal: abortController.signal,
Expand Down
Loading