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

ui: Rename a model attribute to not be overwritten by ember-data #9524

Merged
merged 6 commits into from Jan 12, 2021

Conversation

kaxcode
Copy link
Contributor

@kaxcode kaxcode commented Jan 7, 2021

🐛 Clicking on a instance, then back, then clicking on the instance again would redirect users to a 404 error page.

Solution: There is a relationship between service-instance and proxy-instance models and they both have attr called Node. In the service-instance model Node is an object and in the proxy-instance model it's a string. We expect a string at all times. To avoid overwriting we have renamed Node to be NodeName in the proxy-instance model.

Test: Left a TODO note on the navigation tests. Unable to complete due to mock data.

@kaxcode kaxcode added the theme/ui Anything related to the UI label Jan 7, 2021
@kaxcode kaxcode requested a review from johncowen January 7, 2021 16:17
Copy link
Contributor

@johncowen johncowen left a comment

Choose a reason for hiding this comment

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

The fix looks good.

I did a test in #9524 , lets get that approved and merged here and we can double check everything before merge.

Oh don't forget to add the 1.9.x backport label here

Copy link
Contributor

@johncowen johncowen left a comment

Choose a reason for hiding this comment

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

Did that force push accidentally remove the test additions from #9532, or is GH playing up for me?

@kaxcode
Copy link
Contributor Author

kaxcode commented Jan 12, 2021

Did that force push accidentally remove the test additions from #9532, or is GH playing up for me?

mmm, not sure. I rebased against master and force pushed.

Copy link
Contributor

@johncowen johncowen left a comment

Choose a reason for hiding this comment

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

:shipit:

@kaxcode kaxcode merged commit b86eea4 into master Jan 12, 2021
@kaxcode kaxcode deleted the ui/bug/error-service-instance-redirect branch January 12, 2021 14:53
@hashicorp-ci
Copy link
Contributor

🍒 If backport labels were added before merging, cherry-picking will start automatically.

To retroactively trigger a backport after merging, add backport labels and re-run https://circleci.com/gh/hashicorp/consul/308810.

@hashicorp-ci
Copy link
Contributor

🍒✅ Cherry pick of commit b86eea4 onto release/1.9.x succeeded!

hashicorp-ci pushed a commit that referenced this pull request Jan 12, 2021
* Rename a model attr to not be overwritten by ember-data

* Make sure we can click on the instances

* Make sure we can click back to the preevious page, not root

* Add a forwards/back/forwards navigation test for service instances

* Rename a model attr to not be overwritten by ember-data

Co-authored-by: John Cowen <jcowen@hashicorp.com>
johncowen pushed a commit that referenced this pull request Jan 20, 2021
johncowen added a commit that referenced this pull request Jan 20, 2021
hashicorp-ci pushed a commit that referenced this pull request Jan 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
theme/ui Anything related to the UI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants