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

Fix link to API Browser on Node pages #2361

Merged
merged 1 commit into from Jun 17, 2016
Merged

Conversation

@joschi
Copy link
Contributor

@joschi joschi commented Jun 16, 2016

Refs #2360

@joschi joschi added this to the 2.0.3 milestone Jun 16, 2016
@joschi
Copy link
Contributor Author

@joschi joschi commented Jun 16, 2016

This PR should also be ported into the master branch.

@joschi joschi added the bug label Jun 16, 2016
@dennisoelkers dennisoelkers self-assigned this Jun 16, 2016
@@ -30,7 +31,7 @@ const NodeMaintenanceDropdown = React.createClass({
</LinkContainer>
</IfPermitted>

<MenuItem href={`${this.props.node.transport_address}api-browser`} target="_blank">
<MenuItem href={URLUtils.qualifyUrl('api-browser')} target="_blank">

This comment has been minimized.

@dennisoelkers

dennisoelkers Jun 16, 2016
Member

The link to the API browser is node-specific, as it is visually associated with a node element in the nodes list/part of the node details page of a specific node. The way it is changed here, makes it point to the API browser of the API endpoint node of the web interface, which might not be the same and is therefore counterintuitive. We should therefore disconnect the API browser link from the node element in the UI if it is not possible to reliably generate a link to the node's API browser and present a single API browser link which goes to the REST endpoint of the web interface instead..

@@ -50,7 +49,7 @@ const NodesActions = React.createClass({
<Button bsStyle="info">Metrics</Button>
</LinkContainer>

<Button bsStyle="info" href={apiBrowserURI} target="_blank">
<Button bsStyle="info" href={URLUtils.qualifyUrl('api-browser')} target="_blank">

This comment has been minimized.

@dennisoelkers

dennisoelkers Jun 16, 2016
Member

Same as above.

Jochen Schalanda
Refs #2360
@joschi joschi force-pushed the issue-2360-api-browser-link branch from 0326856 to 5a7b2a5 Jun 16, 2016
@dennisoelkers dennisoelkers merged commit 8f9afb8 into 2.0 Jun 17, 2016
4 checks passed
4 checks passed
@garybot2
ci-server-integration Jenkins build graylog2-server-integration-pr 996 has succeeded
Details
@garybot2
ci-web-linter Jenkins build graylog-pr-linter-check 482 has succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@dennisoelkers dennisoelkers deleted the issue-2360-api-browser-link branch Jun 17, 2016
dennisoelkers added a commit that referenced this pull request Jun 17, 2016
Refs #2360
(cherry picked from commit 8f9afb8)
joschi pushed a commit that referenced this pull request Aug 2, 2016
This reverts commit b6fe1a9.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants