bad merge and rebase

frontend/scenes/Collection/CollectionStore.js

@@ -18,7 +18,7 @@ class CollectionStore {
       invariant(res && res.data, 'Data should be available');
       const { data } = res;
 
-      if (data.type === 'atlas') this.redirectUrl = data.recentDocuments[0].url;
+      if (data.type === 'atlas') this.redirectUrl = data.documents[0].url;
       else throw new Error('TODO code up non-atlas collections');
     } catch (e) {
       console.log(e);

frontend/scenes/Document/Document.js

@@ -137,14 +137,6 @@ type Props = {
               </CenteredContent>
             : this.store.document &&
                 <DocumentContainer>
-                  {!isEditing &&
-                    <PublishingInfo
-                      collaborators={this.store.document.collaborators}
-                      createdAt={this.store.document.createdAt}
-                      createdBy={this.store.document.createdBy}
-                      updatedAt={this.store.document.updatedAt}
-                      updatedBy={this.store.document.updatedBy}
-                    />}
                   <Editor
                     key={this.store.document.id}
                     text={this.store.document.text}

server/presenters/collection.js

@@ -16,7 +16,7 @@ async function present(ctx, collection, includeRecentDocuments = false) {
   };
 
   if (collection.type === 'atlas')
-    data.navigationTree = collection.navigationTree;
+    data.documents = await collection.getDocumentsStructure();
 
   if (includeRecentDocuments) {
     const documents = await Document.findAll({