Merge conflicts

[arvados-workbench2.git] / src / index.tsx

diff --git a/src/index.tsx b/src/index.tsx
index ae16dce3501120a5b12940e6790481f4088ba6d2..9cc33feb8eba3de42328434b80fea6253dd14814 100644 (file)
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -33,10 +33,12 @@ const sampleProjects = [
 
 function buildProjectTree(tree: any[], level = 0): Array<TreeItem<Project>> {
     const projects = tree.map((t, idx) => ({
-        id: `l${level}i${idx}`,
+        id: `l${level}i${idx}${t[0]}`,
         open: false,
+        active: false,
         data: {
             name: t[0],
+            icon: level === 0 ? <i className="fas fa-th"/> : <i className="fas fa-folder"/>,
             createdAt: '2018-05-05',
         },
         items: t.length > 1 ? buildProjectTree(t[1], level + 1) : []
@@ -59,12 +61,12 @@ const App = () =>
     <Provider store={store}>
         <ConnectedRouter history={history}>
             <div>
-                <Route path="/" component={Workbench}/>
+                <Route path="/" component={Workbench} />
             </div>
         </ConnectedRouter>
     </Provider>;
 
 ReactDOM.render(
-    <App/>,
+    <App />,
     document.getElementById('root') as HTMLElement
 );