From 54b0e09aab84e5c6ebbbfea06b014a45157f88d9 Mon Sep 17 00:00:00 2001 From: Conrad Date: Thu, 1 Feb 2018 16:25:54 -0500 Subject: [PATCH] Check if all users have loaded before wrapper renders the rest of the page --- src/containers/Wrapper/index.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/containers/Wrapper/index.js b/src/containers/Wrapper/index.js index 318c4548..148aa3c5 100644 --- a/src/containers/Wrapper/index.js +++ b/src/containers/Wrapper/index.js @@ -21,7 +21,10 @@ class Wrapper extends Component { constructor(props) { super(props); - this.state = { userLoaded: false }; + this.state = { + userLoaded: false, + allUsersLoaded: false, + }; } componentDidMount() { @@ -43,6 +46,12 @@ class Wrapper extends Component { if (nextProps.user.user_id && !this.props.user.user_id) { this.setState({ userLoaded: true }); } + if ( + Object.keys(nextProps.user.allUsers).length !== 0 && + Object.keys(this.props.user.allUsers).length === 0 + ) { + this.setState({ allUsersLoaded: true }); + } } componentWillUnmount() { @@ -68,7 +77,7 @@ class Wrapper extends Component { } render() { - if (!this.state.userLoaded) { + if (!this.state.userLoaded || !this.state.allUsersLoaded) { return ; } const content = React.cloneElement(this.props.children, { -- GitLab