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

Jump to bottom

Alerting: Fix export with modifications URL when mounted on subpath #77622

Merged
merged 1 commit into from
Nov 3, 2023
Merged

Alerting: Fix export with modifications URL when mounted on subpath #77622

merged 1 commit into from
Nov 3, 2023

Conversation

gillesdemey
Copy link
Member

@gillesdemey gillesdemey commented Nov 3, 2023 •
edited

What is this feature?

This PR fixes incorrect redirect when exporting a rule with changes. The bug initially surfaced because history.push was being combined with createUrl – history.push from the location service already prepends the subUrl.

This PR uses the url property for a menu item with the result of createUrl().

Which issue(s) does this PR fix?:

Fixes #77149

Special notes for your reviewer:

@gillesdemey gillesdemey added this to the 10.3.x milestone Nov 3, 2023
@gillesdemey gillesdemey requested a review from a team as a code owner November 3, 2023 13:48
@gillesdemey gillesdemey self-assigned this Nov 3, 2023
@gillesdemey gillesdemey requested review from VikaCep, konrad147 and soniaAguilarPeiron and removed request for a team November 3, 2023 13:48
konrad147
konrad147 approved these changes Nov 3, 2023
View reviewed changes
Copy link
Contributor

@konrad147 konrad147 left a comment

Choose a reason for hiding this comment

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

LGTM!

soniaAguilarPeiron
soniaAguilarPeiron approved these changes Nov 3, 2023
View reviewed changes
Copy link
Member

@soniaAguilarPeiron soniaAguilarPeiron left a comment

Choose a reason for hiding this comment

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

LGTM!

@gillesdemey gillesdemey merged commit 3dac373 into main Nov 3, 2023
29 checks passed
@gillesdemey gillesdemey deleted the alerting/fix-modify-export-subpath branch November 3, 2023 15:36
@gillesdemey gillesdemey mentioned this pull request Nov 6, 2023
Merged
zserge pushed a commit that referenced this pull request Nov 9, 2023
@gillesdemey @zserge
Alerting: Fix export with modifications URL when mounted on subpath (#…
356c882 
…77622)
@gillesdemey gillesdemey added backport A backport PR backport v10.2.x and removed no-backport Skip backport of PR backport A backport PR labels Nov 15, 2023
@grafana-delivery-bot grafana-delivery-bot bot mentioned this pull request Nov 15, 2023
Merged
grafana-delivery-bot bot pushed a commit that referenced this pull request Nov 15, 2023
@gillesdemey @grafana-delivery-bot
Alerting: Fix export with modifications URL when mounted on subpath (#…
cdc49c4 
…77622)

(cherry picked from commit 3dac373)
@grafana-delivery-bot grafana-delivery-bot bot mentioned this pull request Nov 15, 2023
Merged
gillesdemey pushed a commit that referenced this pull request Nov 15, 2023
@grafana-delivery-bot
[v10.2.x] Alerting: Fix export with modifications URL when mounted on…
1a41311 
… subpath (#78217)

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
Fix export with modifications URL when mounted on subpath (#77622)
@aangelisc aangelisc modified the milestones: 10.3.x, 10.2.3 Dec 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@konrad147 konrad147 konrad147 approved these changes

@soniaAguilarPeiron soniaAguilarPeiron soniaAguilarPeiron approved these changes

@VikaCep VikaCep Awaiting requested review from VikaCep VikaCep is a code owner automatically assigned from grafana/alerting-frontend

Assignees

@gillesdemey gillesdemey

Labels
add to changelog area/alerting Grafana Alerting area/frontend backport v10.2.x type/bug
Projects
Alerting
Archived in project
Milestone
10.2.3
Development

Successfully merging this pull request may close these issues.

Alerting: Modify export 404's with custom root url
4 participants
@gillesdemey @konrad147 @soniaAguilarPeiron @aangelisc