[backport-2.9]: Fix a problem with deleting role templates from their detail pages #12419
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
codyrancher
force-pushed
the
role-template-bp
branch
2 times, most recently
from
9dd54a7 to
f0c9047
Compare
… detail pages We were attempting to navigate back to a non-existent page when deleting role templates from their corresponding detail pages. This caused the Prompt Remove dialog to show an error button and not close. rancher#12217
codyrancher
force-pushed
the
role-template-bp
branch
from
f0c9047 to
7965f2b
Compare
The fix would "change" routes to the same route which vue3 doesn't complain about. However in vue2 you can't change to the same route without emitting an exception. This change ensures the route is different before pushing.
codyrancher
force-pushed
the
role-template-bp
branch
from
d45ddab to
bcebd28
Compare
codyrancher
commented
Oct 31, 2024
Comment on lines
+303
to
+308
| // Only push if the route will change otherwise we'll get a `NavigationDuplicated` exception | ||
| const resolvedRoute = this.currentRouter.resolve(this.cachedDoneLocation); | ||
|
|
||
| if (resolvedRoute.resolved.fullPath !== this.$route.fullPath) { | ||
| this.currentRouter.push(this.cachedDoneLocation); | ||
| } |
There was a problem hiding this comment.
This was not a part of the original PR. This was needed as a part of the backport because vue2 treats pushing to the same location as an error where as vue3 doesn't. Without this change one of our e2e tests would fail.
codyrancher
commented
Oct 31, 2024
| @@ -131,6 +132,8 @@ describe('Roles Templates', { tags: ['@usersAndAuths', '@adminUser'] }, () => { | |||
| createClusterRole.saveAndWaitForRequests('POST', '/v3/roletemplates').then((res) => { | |||
| const clusterRoleId = res.response?.body.id; | |||
|
|
|||
| roleTemplatesToDelete.push(clusterRoleId); | |||
There was a problem hiding this comment.
This was also not a part of the PR but was supporting code that was added by a separate pr in 2.10.
rak-phillip
approved these changes
Oct 31, 2024
| @@ -516,6 +516,7 @@ export default { | |||
| <button | |||
| v-if="isView" | |||
| ref="actions" | |||
| data-testid="mathead-action-menu" | |||
There was a problem hiding this comment.
hmm.. I'm just noticing a typo in the id for this backport
Suggested change
| data-testid="mathead-action-menu" | |
| data-testid="masthead-action-menu" |
This is also present in the master branch, so we can keep it as-is if that's more straightforward for the backport.
|
@codyrancher Good to merge |
7 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
backport of #12270
fixes: #12218
Checklist