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

Do not display login form while loading #2802

Merged
merged 3 commits into from Sep 12, 2016
Merged

Do not display login form while loading #2802

merged 3 commits into from Sep 12, 2016

Conversation

@edmundoa
Copy link
Member

@edmundoa edmundoa commented Sep 9, 2016

When loading Graylog, we currently display the login form while waiting for some resources to load, namely:

  • Validate user session
  • Load the current logged-in user

Those resources sometimes take a bit to load, and seeing the login form is confusing, as seen in #2770. This PR introduces a loading page that will avoid the confusion of seeing the login form on the screen.

I decided to use the same design used in our login page, as this provides a good transition between the loading and log-in page, which may be show directly before and/or after each other.

Fixes #2770.

edmundoa added 2 commits Sep 9, 2016
This displays a loading page while we validate the user session, instead
of showing the login form.

Refs #2770
@edmundoa edmundoa added this to the 2.1.1 milestone Sep 9, 2016
@dennisoelkers dennisoelkers self-assigned this Sep 9, 2016

render() {
return (
<div>

This comment has been minimized.

@dennisoelkers

dennisoelkers Sep 12, 2016
Member

Minor nitpick, do we need this div?

This comment has been minimized.

@edmundoa

edmundoa Sep 12, 2016
Author Member

I don't think so, must be a leftover from some test. Will take a look 👍

@dennisoelkers
Copy link
Member

@dennisoelkers dennisoelkers commented Sep 12, 2016

Tested it in different scenarios, LGTM. I also like the way it improves logging in/full page refreshes a lot. Good work @edmundoa!

@dennisoelkers dennisoelkers merged commit a1c337b into 2.1 Sep 12, 2016
5 checks passed
5 checks passed
@garybot2
ci-server-integration Jenkins build graylog2-server-integration-pr 1356 has succeeded
Details
@garybot2
ci-web-linter Jenkins build graylog-pr-linter-check 839 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
@dennisoelkers dennisoelkers deleted the issue-2770 branch Sep 12, 2016
dennisoelkers added a commit that referenced this pull request Sep 12, 2016
* Display loading page while loading user information

Refs #2770

* Show loading page while validating session

This displays a loading page while we validate the user session, instead
of showing the login form.

Refs #2770

* Remove unnecessary div

(cherry picked from commit a1c337b)
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