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.

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

ShareModal: Fixes url sync issue that caused issue with save drawer #81706

Merged
merged 2 commits into from Feb 1, 2024

Conversation

torkelo
Copy link
Member

@torkelo torkelo commented Feb 1, 2024

Fixes the issue where it would close any modal or drawer on unmount

Fixes #81009

@torkelo torkelo requested a review from a team as a code owner February 1, 2024 11:58
@torkelo torkelo requested review from oscarkilhed, ivanortegaalba, juanicabanas and ashharrison90 and removed request for a team, oscarkilhed and ivanortegaalba February 1, 2024 11:58
@grafana-delivery-bot grafana-delivery-bot bot added this to the 10.4.x milestone Feb 1, 2024
@torkelo torkelo modified the milestones: 10.4.x, 10.3.x Feb 1, 2024
@torkelo torkelo added backport v10.3.x Mark PR for automatic backport to v10.3.x type/bug add to changelog and removed area/frontend labels Feb 1, 2024
Copy link
Contributor

This PR must be merged before a backport PR will be created.

@grafana grafana deleted a comment from grafana-delivery-bot bot Feb 1, 2024
@torkelo torkelo requested a review from a team as a code owner February 1, 2024 13:42
@torkelo torkelo requested review from mauigrl05 and removed request for a team February 1, 2024 13:42
Copy link
Contributor

@evictorero evictorero left a comment

Choose a reason for hiding this comment

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

Tested and works as expected!

@torkelo torkelo merged commit 7c2622a into main Feb 1, 2024
14 checks passed
@torkelo torkelo deleted the share-modal-url-sync-fix branch February 1, 2024 14:07
@grafana-delivery-bot grafana-delivery-bot bot modified the milestones: 10.3.x, 10.4.x Feb 1, 2024
Copy link
Contributor

The backport to v10.3.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-81706-to-v10.3.x origin/v10.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 7c2622a4f1e325d50984498d2b55fd6afabfee71

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-81706-to-v10.3.x
# Create the PR body template
PR_BODY=$(gh pr view 81706 --json body --template 'Backport 7c2622a4f1e325d50984498d2b55fd6afabfee71 from #81706{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v10.3.x] ShareModal: Fixes url sync issue that caused issue with save drawer" --body-file - --label "type/bug" --label "area/frontend" --label "add to changelog" --label "backport" --base v10.3.x --milestone 10.3.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-81706-to-v10.3.x

# Create a pull request where the `base` branch is `v10.3.x` and the `compare`/`head` branch is `backport-81706-to-v10.3.x`.

# Remove the local backport branch
git switch main
git branch -D backport-81706-to-v10.3.x

@grafana-delivery-bot grafana-delivery-bot bot added the backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. label Feb 1, 2024
ivanortegaalba pushed a commit that referenced this pull request Feb 1, 2024
…81706)

* ShareModal: Fixes url sync issue that caused issue with save drawer

* Updated fix

(cherry picked from commit 7c2622a)
ivanortegaalba pushed a commit that referenced this pull request Feb 1, 2024
…81706)

* ShareModal: Fixes url sync issue that caused issue with save drawer

* Updated fix

(cherry picked from commit 7c2622a)
ivanortegaalba added a commit that referenced this pull request Feb 1, 2024
…e drawer (#81721)

ShareModal: Fixes url sync issue that caused issue with save drawer (#81706)

(cherry picked from commit 7c2622a)

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
Ukochka pushed a commit that referenced this pull request Feb 14, 2024
…81706)

* ShareModal: Fixes url sync issue that caused issue with save drawer

* Updated fix
@aangelisc aangelisc modified the milestones: 10.4.x, 10.4.0 Mar 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
add to changelog area/frontend backport v10.3.x Mark PR for automatic backport to v10.3.x backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. type/bug
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Dashboards: Unable to see dashboard changes in drawer
3 participants