Cleans up web UI and fixes ACL token "stuckness" issue. #3245
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
This included making the settings page global so it's reachable, and adding some more information about an error on the error page.
slackpad
changed the title
pearkes
reviewed
Jul 9, 2017
| @@ -340,9 +340,6 @@ App.NodesShowRoute = App.BaseRoute.extend({ | |||
| }, | |||
| node: Ember.$.getJSON(formatUrl(consulHost + '/v1/internal/ui/node/' + params.name, dc.dc, token)).then(function(data) { | |||
| return App.Node.create(data); | |||
| }), | |||
| nodes: Ember.$.getJSON(formatUrl(consulHost + '/v1/internal/ui/node/' + params.name, dc.dc, token)).then(function(data) { | |||
There was a problem hiding this comment.
I'm concerned about this one because we're later setting it:
https://github.com/hashicorp/consul/blob/master/ui/javascripts/app/routes.js#L359-L364
That will currently be nil'd out. I assume if you test this and do:
- View the nodes index page
- Click a specific node
This will then be unnecessary, but did you try visiting a node directly? I would worry it wouldn't then populate the left column given this commit.
If even that works, we should likely remove the above linked set of this attribute.
slackpad
added a commit
that referenced
this pull request
Jul 10, 2017
johncowen
pushed a commit
that referenced
this pull request
May 4, 2018
* Removes GitHub reference. * Doesn't display ACL token on the unauthorized page. * Removes useless fetch for nodes and cleans up comments. * Provides a path to reset the ACL token when it's invalid. This included making the settings page global so it's reachable, and adding some more information about an error on the error page. * Updates built-in web assets.
johncowen
pushed a commit
that referenced
this pull request
May 4, 2018
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.
This makes a quick pass through the web UI to clean up some small issues as noted in the commits. This also fixes #2370 which prevents users from changing the ACL token if they've got an invalid one.