Merge branch 'develop' into dewanshmobile/stuff

Author: lindapaiste

client/modules/IDE/components/PolicyContainer.jsx renamed to client/modules/Legal/components/PolicyContainer.jsx

@@ -205,7 +205,7 @@ class Collection extends React.Component {
     if (
       this.props.user != null &&
       this.props.user.username &&
-      this.props.collection.owner.username === this.props.user.username
+      this.props.collection?.owner?.username === this.props.user.username
     ) {
       isOwner = true;
     }
@@ -214,15 +214,15 @@ class Collection extends React.Component {
   }
 
   hasCollection() {
-    return !this.props.loading && this.props.collection != null;
+    return !!this.props.collection;
   }
 
   hasCollectionItems() {
     return this.hasCollection() && this.props.collection.items.length > 0;
   }
 
   _renderLoader() {
-    if (this.props.loading) return <Loader />;
+    if (this.props.loading && !this.hasCollection()) return <Loader />;
     return null;
   }
 
@@ -336,11 +336,7 @@ class Collection extends React.Component {
   }
 
   _renderEmptyTable() {
-    const isLoading = this.props.loading;
-    const hasCollectionItems =
-      this.props.collection != null && this.props.collection.items.length > 0;
-
-    if (!isLoading && !hasCollectionItems) {
+    if (this.hasCollection() && !this.hasCollectionItems()) {
       return (
         <p className="collection-empty-message">
           {this.props.t('Collection.NoSketches')}
@@ -516,13 +512,7 @@ Collection.propTypes = {
 
 Collection.defaultProps = {
   username: undefined,
-  collection: {
-    id: undefined,
-    items: [],
-    owner: {
-      username: undefined
-    }
-  }
+  collection: null
 };
 
 function mapStateToProps(state, ownProps) {

client/modules/IDE/pages/CodeOfConduct.jsx renamed to client/modules/Legal/pages/CodeOfConduct.jsx

@@ -21,7 +21,7 @@ import createRedirectWithUsername from './components/createRedirectWithUsername'
 import MobileDashboardView from './modules/Mobile/MobileDashboardView';
 // import PrivacyPolicy from './modules/IDE/pages/PrivacyPolicy';
 // import TermsOfUse from './modules/IDE/pages/TermsOfUse';
-import Legal from './modules/IDE/pages/Legal';
+import Legal from './modules/Legal/pages/Legal';
 import { getUser } from './modules/User/actions';
 import {
   userIsAuthenticated,