refactor(*): Small fixes

Merge pull request #434 from qri-io/small_fixes

lib/components/Network.js

@@ -27,14 +27,15 @@ export default class Network extends Base {
   componentWillMount () {
     if (!this.props.skipLoad && this.props.sessionProfile) {
       this.props.loadProfiles()
-    } else if (!this.props.datasets && !this.props.datasetsFetchedAll && !this.props.datasetsFetchedError) {
+    }
+    if (!this.props.datasets && !this.props.datasetsFetchedAll && !this.props.datasetsFetchedError) {
       this.props.loadRegistryDatasets().then(action => this.handleLoadDatasetsError(action))
     }
   }
 
   componentWillReceiveProps (nextProps) {
-    if (!nextProps.datasetsFetchedAll && !nextProps.datasetsLoading && !nextProps.datasetsFetchedError) {
-      this.props.loadRegistryDatasets().then(action => this.handleLoadDatasetsError(action))
+    if (this.props.skipLoad !== nextProps.skipLoad && !nextProps.skipload && nextProps.sessionProfile) {
+      this.props.loadProfiles()
     }
   }
 

lib/components/dataset/Dataset.js

@@ -21,7 +21,11 @@ const RENAME_DATASET_MODAL = 'RENAME_DATASET_MODAL'
 
 export default class Dataset extends Base {
   constructor (props) {
-    super(props);
+    super(props)
+
+    this.state = {
+      publishing: false
+    };
 
     [
       'handleDownloadDataset',
@@ -30,7 +34,8 @@ export default class Dataset extends Base {
       'handleGoBack',
       'handleAddDataset',
       'handleReload',
-      'handleRenameDataset'
+      'handleRenameDataset',
+      'handleTogglePublish'
     ].forEach((m) => { this[m] = this[m].bind(this) })
   }
 
@@ -150,6 +155,18 @@ export default class Dataset extends Base {
     })
   }
 
+  handleTogglePublish () {
+    const { peername, name, datasetRef } = this.props
+    this.setState(
+      { publishing: true },
+      () => {
+        this.props.togglePublishDataset(peername, name, datasetRef.path, datasetRef.published).then(() => {
+          this.setState({ publishing: false })
+        })
+      }
+    )
+  }
+
   template (css) {
     const {
       datasetRef,
@@ -172,6 +189,8 @@ export default class Dataset extends Base {
       isInNamespace,
       registryVersion } = this.props
 
+    const { publishing } = this.state
+
     if (!datasetRef) {
       return <Spinner large />
     }
@@ -235,7 +254,8 @@ export default class Dataset extends Base {
           onRemove={this.handleDeleteDataset}
           onAdd={this.handleAddDataset}
           onEdit={this.handleEditDataset}
-          onTogglePublish={() => { this.props.togglePublishDataset(peername, name, datasetRef.path, datasetRef.published) }}
+          onTogglePublish={this.handleTogglePublish}
+          publishing={publishing}
           exportPath={this.handleDownloadDataset()}
         />
       </div>

lib/components/dataset/DatasetButtonGroup.js

@@ -10,6 +10,7 @@ export default class DatasetButtonGroup extends Base {
       onAdd,
       transfering,
       onPublish,
+      publishing,
       published,
       onEdit,
       exportPath,
@@ -29,7 +30,7 @@ export default class DatasetButtonGroup extends Base {
 
     const publishedText = published ? 'Unpublish' : 'Publish'
     if (isLocal && isInNamespace && isLatestDataset && onPublish) {
-      buttons.push({ onClick: onPublish, text: publishedText })
+      buttons.push({ onClick: onPublish, text: publishedText, loading: publishing })
     }
 
     if (isLatestDataset && !fromRegistry && onEdit) {

lib/components/dataset/DatasetRouter.js

@@ -29,6 +29,7 @@ class DatasetRouter extends Base {
       datasetRef,
       onAdd,
       onTogglePublish,
+      publishing,
       onEdit,
       exportPath,
       onRemove,
@@ -47,6 +48,7 @@ class DatasetRouter extends Base {
         onAdd={onAdd}
         onPublish={onTogglePublish}
         published={datasetRef.published}
+        publishing={publishing}
         onEdit={onEdit}
         exportPath={exportPath}
         onRemove={onRemove}

lib/reducers/paginate.js

@@ -37,7 +37,7 @@ const paginate = ({ types, mapActionToKey, name }) => {
           isFetching: false,
           ids: union(state.ids, action.response.result.data),
           // nextPageUrl: action.response.nextPageUrl,
-          fetchedAll: (action.response.result.data.length < action.pageSize),
+          fetchedAll: (action.response.result.data && action.response.result.data.length < action.pageSize),
           pageCount: action.page,
           error: ''
         })

lib/selectors/transfers.js

@@ -3,7 +3,12 @@ export function selectTransferStatus (state, id) {
 }
 
 export function selectIsTransfering (state, id) {
-  return state && state.transfers && !!Object.keys(state.transfers).find(elm => elm === id)
+  const path = state && state.transfers && Object.keys(state.transfers).find(elm => elm === id)
+  if (!path) {
+    return false
+  }
+  const status = state.transfers[path]
+  return status <= 0
 }
 
 export function selectTransfers (state) {

version.js

@@ -1 +1 @@
-export default '0.6.1'
+export default '0.6.2-dev'