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

Showing welcome header when there are no organisations #3133

Merged
merged 5 commits into from
Sep 3, 2018

Conversation

MichaelBuessemeyer
Copy link
Contributor

@MichaelBuessemeyer MichaelBuessemeyer commented Aug 30, 2018

This PR shows the welcome header at / when no user is logged in and there are no existing organizations. It also disables the auto redirect to onboarding when entering there are no organizations.

URL of deployed dev instance (used for testing):

Steps to test:

  • I suggest testing it locally
  • go to application.conf in the conf folder and set insertInitialData = true to false
  • refresh the schema and then start the server
    => the path / should show the welcome header even when allowOrganizationCreation is set to false.
    And there should be no redirect to onboarding.

Issues:


Copy link
Member

@normanrz normanrz left a comment

Choose a reason for hiding this comment

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

lgtm :-)

const datasets = await getDatasets();
this.setState({ datasets });
const [datasets, organizations] = await Promise.all([getDatasets(), getOrganizations()]);
this.setState({ datasets, hasOrganisations: organizations.length > 0 });
Copy link
Member

Choose a reason for hiding this comment

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

I'd suggest to also use the american english spelling for organization here :)

@MichaelBuessemeyer MichaelBuessemeyer merged commit 5d106d3 into master Sep 3, 2018
@philippotto philippotto deleted the show-welcome-header branch January 24, 2019 08:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Show welcome header when no organizations
3 participants