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

Cleans up web UI and fixes ACL token "stuckness" issue. #3245

Merged
merged 5 commits into from
Jul 9, 2017
Merged

Conversation

slackpad
Copy link
Contributor

@slackpad slackpad commented Jul 9, 2017

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.

@slackpad slackpad changed the title Cleans up web UI and fixes ACL token stuckness issue". Cleans up web UI and fixes ACL token "stuckness" issue. Jul 9, 2017
@slackpad slackpad merged commit 86b1e64 into master Jul 9, 2017
@slackpad slackpad deleted the ui-cleanup branch July 9, 2017 00:16
@@ -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) {
Copy link
Contributor

Choose a reason for hiding this comment

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

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:

  1. View the nodes index page
  2. 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
* Removes unnecessary set for model component which will be null.

* Returns a 404 for a missing node, not a 200 with an empty response.

* Updates built-in web assets.
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
* Removes unnecessary set for model component which will be null.

* Returns a 404 for a missing node, not a 200 with an empty response.

* Updates built-in web assets.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unable to rereach settings page in UI after entering invalid ACL token
2 participants