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 navigation in LDAP components #3651

Merged
merged 4 commits into from Mar 29, 2017
Merged

Fix navigation in LDAP components #3651

merged 4 commits into from Mar 29, 2017

Conversation

@edmundoa
Copy link
Member

@edmundoa edmundoa commented Mar 24, 2017

LDAP components do not have single URLs any more, so we use callbacks to let the parent decide which component to render.

I also fixed in here a small issue when the LDAP group component tries to render an error message object. That does not work and should also be avoided when the server returns 400 (i.e. LDAP is not configured or no groups are configured), as the default message is more helpful in that case.

Fixes #3485

Once the issue is merged I'll backport it to 2.2.3.

@edmundoa edmundoa added this to the 2.3.0 milestone Mar 24, 2017
@joschi
Copy link
Contributor

@joschi joschi commented Mar 28, 2017

@edmundoa Please rebase this PR on current master.

edmundoa added 4 commits Mar 24, 2017
As there is no easy way to access each component through an URL any
longer, use callbacks to let the parent decide which component to
render.
- Do not try to render an object, as that doesn't work
- Display no configuration message when server returns 400, as that only
  happens when LDAP is not correctly configured. That message is a bit
  more clear and less scary
@edmundoa edmundoa force-pushed the issue-3485 branch from 2d4d454 to 0dcd625 Mar 28, 2017
@joschi joschi self-assigned this Mar 29, 2017
@joschi
joschi approved these changes Mar 29, 2017
Copy link
Contributor

@joschi joschi left a comment

LGTM. 👍

@joschi joschi merged commit 1fafbf1 into master Mar 29, 2017
4 checks passed
4 checks passed
ci-web-linter Jenkins build graylog-pr-linter-check 1476 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
licence/cla Contributor License Agreement is signed.
Details
@joschi joschi deleted the issue-3485 branch Mar 29, 2017
edmundoa added a commit that referenced this pull request Mar 29, 2017
* Fix navigation between ldap config and groups

As there is no easy way to access each component through an URL any
longer, use callbacks to let the parent decide which component to
render.

* Remove unused config prop

* Use jsx extension for ldap component

* Fix error handling in ldap groups component

- Do not try to render an object, as that doesn't work
- Display no configuration message when server returns 400, as that only
  happens when LDAP is not correctly configured. That message is a bit
  more clear and less scary

Fixes #3485
(cherry picked from commit 1fafbf1)
joschi added a commit that referenced this pull request Mar 29, 2017
* Fix navigation between ldap config and groups

As there is no easy way to access each component through an URL any
longer, use callbacks to let the parent decide which component to
render.

* Remove unused config prop

* Use jsx extension for ldap component

* Fix error handling in ldap groups component

- Do not try to render an object, as that doesn't work
- Display no configuration message when server returns 400, as that only
  happens when LDAP is not correctly configured. That message is a bit
  more clear and less scary

Fixes #3485
Refs #3651
(cherry picked from commit 1fafbf1)
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.

2 participants
You can’t perform that action at this time.