From 506f2cd3bf5539087a8ce0b3957bf23fcee57688 Mon Sep 17 00:00:00 2001
From: Chen-I Lim <chenilim@gmail.com>
Date: Tue, 10 Nov 2020 10:09:08 -0800
Subject: [PATCH] Fix empty sidebar on fitst load

---
 webapp/src/components/cardDetail.tsx |  2 +-
 webapp/src/components/viewHeader.tsx |  2 +-
 webapp/src/pages/boardPage.tsx       | 15 +++------------
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/webapp/src/components/cardDetail.tsx b/webapp/src/components/cardDetail.tsx
index 298868d16..93fe44433 100644
--- a/webapp/src/components/cardDetail.tsx
+++ b/webapp/src/components/cardDetail.tsx
@@ -85,7 +85,7 @@ class CardDetail extends React.Component<Props, State> {
                 const newCardTree = this.state.cardTree.mutableCopy()
                 await newCardTree.sync()
                 this.setState({cardTree: newCardTree, title: newCardTree.card.title})
-            }
+            },
         )
     }
 
diff --git a/webapp/src/components/viewHeader.tsx b/webapp/src/components/viewHeader.tsx
index f4f78f1f6..8ae50ef02 100644
--- a/webapp/src/components/viewHeader.tsx
+++ b/webapp/src/components/viewHeader.tsx
@@ -347,7 +347,7 @@ class ViewHeader extends React.Component<Props, State> {
                             onClick={() => Archiver.exportBoardTree(boardTree)}
                         />
 
-                        <Menu.Separator />
+                        <Menu.Separator/>
 
                         <Menu.Text
                             id='testAdd100Cards'
diff --git a/webapp/src/pages/boardPage.tsx b/webapp/src/pages/boardPage.tsx
index 7a6cb6e14..ba8be87b4 100644
--- a/webapp/src/pages/boardPage.tsx
+++ b/webapp/src/pages/boardPage.tsx
@@ -150,6 +150,7 @@ export default class BoardPage extends React.Component<Props, State> {
         const workspaceTree = new MutableWorkspaceTree()
         await workspaceTree.sync()
         const boardIds = workspaceTree.boards.map((o) => o.id)
+        this.setState({workspaceTree})
 
         // Listen to boards plus all blocks at root (Empty string for parentId)
         this.workspaceListener.open(
@@ -161,7 +162,8 @@ export default class BoardPage extends React.Component<Props, State> {
             () => {
                 Utils.log('workspaceListener.onReconnect')
                 this.sync()
-            })
+            },
+        )
 
         if (boardId) {
             const boardTree = new MutableBoardTree(boardId)
@@ -176,14 +178,11 @@ export default class BoardPage extends React.Component<Props, State> {
 
             // TODO: Handle error (viewId not found)
             this.setState({
-                workspaceTree,
                 boardTree,
                 boardId,
                 viewId: boardTree.activeView.id,
             })
             Utils.log(`sync complete: ${boardTree.board.id} (${boardTree.board.title})`)
-        } else {
-            this.forceUpdate()
         }
     }
 
@@ -221,10 +220,6 @@ export default class BoardPage extends React.Component<Props, State> {
     }
 
     showView(viewId: string, boardId: string = this.state.boardId): void {
-        if (!this.state.boardTree) {
-            return
-        }
-
         if (this.state.boardId === boardId) {
             const newBoardTree = this.state.boardTree.mutableCopy()
             newBoardTree.setActiveView(viewId)
@@ -238,10 +233,6 @@ export default class BoardPage extends React.Component<Props, State> {
     }
 
     setSearchText(text?: string): void {
-        if (!this.state.boardTree) {
-            return
-        }
-
         const newBoardTree = this.state.boardTree.mutableCopy()
         newBoardTree.setSearchText(text)
         this.setState({boardTree: newBoardTree})