Fixes to recent flow changes

This commit is contained in:
Jori Lallo
2017-05-11 23:05:11 -07:00
parent 48769a09fb
commit 259c643f91
2 changed files with 17 additions and 16 deletions

View File

@@ -150,7 +150,9 @@ class DocumentScene extends React.Component {
const { sidebar } = this.props.ui;
const doc = this.store.document;
if (!doc) return;
// FIXME: feels ghetto
if (!doc) return <div />;
const allowDelete =
doc &&
doc.collection.type === 'atlas' &&

View File

@@ -36,23 +36,22 @@ class DocumentSceneStore {
@computed get collectionTree(): ?Object {
if (
!this.document ||
this.document.collection ||
this.document.collection.type !== 'atlas'
)
return;
const tree = this.document.collection.navigationTree;
this.document &&
this.document.collection &&
this.document.collection.type === 'atlas'
) {
const tree = this.document.collection.navigationTree;
const collapseNodes = node => {
node.collapsed = this.collapsedNodes.includes(node.id);
node.children = node.children.map(childNode => {
return collapseNodes(childNode);
});
const collapseNodes = node => {
node.collapsed = this.collapsedNodes.includes(node.id);
node.children = node.children.map(childNode => {
return collapseNodes(childNode);
});
return node;
};
return node;
};
return collapseNodes(toJS(tree));
return collapseNodes(toJS(tree));
}
}
/* Actions */