diff --git a/client/modules/IDE/components/AddToCollectionList.jsx b/client/modules/IDE/components/AddToCollectionList.jsx index f1ede67d..e9417d3b 100644 --- a/client/modules/IDE/components/AddToCollectionList.jsx +++ b/client/modules/IDE/components/AddToCollectionList.jsx @@ -13,7 +13,8 @@ import getSortedCollections from '../selectors/collections'; import Loader from '../../App/components/loader'; import QuickAddList from './QuickAddList'; -const projectInCollection = (project, collection) => collection.items.find(item => item.project.id === project.id) != null; +const projectInCollection = (project, collection) => + collection.items.find(item => item.project.id === project.id) != null; class CollectionList extends React.Component { constructor(props) { @@ -55,7 +56,6 @@ class CollectionList extends React.Component { } render() { - const username = this.props.username !== undefined ? this.props.username : this.props.user.username; const { collections, project } = this.props; const hasCollections = collections.length > 0; const collectionWithSketchStatus = collections.map(collection => ({ @@ -69,7 +69,13 @@ class CollectionList extends React.Component { if (this.props.loading && !this.state.hasLoadedData) { content = ; } else if (hasCollections) { - content = ; + content = ( + + ); } else { content = 'No collections'; } diff --git a/client/modules/IDE/components/AddToCollectionSketchList.jsx b/client/modules/IDE/components/AddToCollectionSketchList.jsx index d99cc3cd..d4173b4b 100644 --- a/client/modules/IDE/components/AddToCollectionSketchList.jsx +++ b/client/modules/IDE/components/AddToCollectionSketchList.jsx @@ -60,7 +60,13 @@ class SketchList extends React.Component { if (this.props.loading && this.state.isInitialDataLoad) { content = ; } else if (hasSketches) { - content = ; + content = ( + + ); } else { content = 'No collections'; } diff --git a/client/modules/IDE/components/CollectionList/CollectionList.jsx b/client/modules/IDE/components/CollectionList/CollectionList.jsx index ae86fcc6..0709c356 100644 --- a/client/modules/IDE/components/CollectionList/CollectionList.jsx +++ b/client/modules/IDE/components/CollectionList/CollectionList.jsx @@ -141,9 +141,17 @@ class CollectionList extends React.Component { } { this.state.addingSketchesToCollectionId && ( - } closeOverlay={this.hideAddSketches} isFixedHeight> + } + closeOverlay={this.hideAddSketches} + isFixedHeight + >
- +
) diff --git a/client/modules/User/components/Collection.jsx b/client/modules/User/components/Collection.jsx index d88d5427..4e9d5348 100644 --- a/client/modules/User/components/Collection.jsx +++ b/client/modules/User/components/Collection.jsx @@ -256,7 +256,8 @@ class Collection extends React.Component { _renderEmptyTable() { const isLoading = this.props.loading; - const hasCollectionItems = this.props.collection != null && this.props.collection.items.length > 0; + const hasCollectionItems = this.props.collection != null && + this.props.collection.items.length > 0; if (!isLoading && !hasCollectionItems) { return (

No sketches in collection

); @@ -321,7 +322,12 @@ class Collection extends React.Component { } { this.state.isAddingSketches && ( - } closeOverlay={this.hideAddSketches} isFixedHeight> + } + closeOverlay={this.hideAddSketches} + isFixedHeight + >