From c526ccb61b32397e11cc8d9efe44db9e83b67d8e Mon Sep 17 00:00:00 2001 From: Mitchell Date: Sat, 27 Jan 2018 18:36:56 -0600 Subject: [PATCH] client - don't show no threads message until after load --- client/app/pages/forum/forum.tsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/client/app/pages/forum/forum.tsx b/client/app/pages/forum/forum.tsx index bab5a68..20980b5 100644 --- a/client/app/pages/forum/forum.tsx +++ b/client/app/pages/forum/forum.tsx @@ -20,6 +20,7 @@ interface Props extends RouteComponentProps { interface State { showEditor: boolean; threads: ThreadModel[]; + threadsLoaded: boolean; initialThreads: ThreadModel[]; pageThreads: ThreadModel[]; pageLinks: (number | string)[]; @@ -51,6 +52,7 @@ export class Forum extends React.Component { this.state = { showEditor: false, threads: [], + threadsLoaded: false, initialThreads: [], pageThreads: [], pageLinks: [], @@ -87,7 +89,7 @@ export class Forum extends React.Component { let threads = await ThreadService.getCategoryThreads(categoryId); // remove hidden threads from normal users threads = reject(threads, t => !this.props.userStore.isModOrAdmin() && t.hidden); - this.setState({ initialThreads: threads }); + this.setState({ initialThreads: threads, threadsLoaded: true }); this.processThreads(threads); } @@ -322,9 +324,12 @@ export class Forum extends React.Component { ); + + const { threads, threadsLoaded } = this.state; + return (
- {this.state.threads.length > 0 ? table : noThreadsMessage} + {threadsLoaded && threads.length < 1 ? noThreadsMessage : table }
);