fix(Editor): fixing bugs and making changes to the editor to make it …

…more usable

Merge pull request #448 from qri-io/editor

lib/actions/editor.js

@@ -10,7 +10,12 @@ import {
   EDITOR_UPDATE_BODY,
   EDITOR_SET_VIZ_SCRIPT,
   EDITOR_SET_TRANSFORM_SCRIPT,
-  EDITOR_REMOVE_SECTION
+  EDITOR_REMOVE_SECTION,
+  EDITOR_SET_SCHEMA,
+  EDITOR_SET_BODY_VIEW,
+  EDITOR_SET_COL_ORDER,
+  EDITOR_SET_ROW_ORDER,
+  EDITOR_SET_BODY_ERROR
 } from '../constants/editor'
 
 import {
@@ -26,7 +31,7 @@ const blankDataset = {}
 
 // initDataset resets the editor to a blank dataset
 // TODO - consider renaming this to like "initEditor" or something to avoid confusion with "newDataset", "saveDataset" actions
-export function initDataset (name = '', dataset = blankDataset, transformScript = '', vizScript = '', body = '') {
+export function initDataset (name = '', dataset = blankDataset, transformScript = '', vizScript = '', body = undefined) {
   return {
     type: EDITOR_INIT_DATASET,
     name,
@@ -132,6 +137,16 @@ export function setStructure (structure = {}) {
   }
 }
 
+// setSchema updates/replaces the schema in
+// the dataset.structure section
+// as well as the the schema string section
+export function setSchema (schema = '') {
+  return {
+    type: EDITOR_SET_SCHEMA,
+    schema
+  }
+}
+
 // setViz replaces/updates the editor viz object
 export function setViz (viz = {}) {
   return {
@@ -188,3 +203,31 @@ export function removeSection (section = '') {
     section
   }
 }
+
+export function setBodyView (view = '') {
+  return {
+    type: EDITOR_SET_BODY_VIEW,
+    view
+  }
+}
+
+export function setColOrder (order) {
+  return {
+    type: EDITOR_SET_COL_ORDER,
+    order
+  }
+}
+
+export function setRowOrder (order) {
+  return {
+    type: EDITOR_SET_ROW_ORDER,
+    order
+  }
+}
+
+export function setBodyError (error) {
+  return {
+    type: EDITOR_SET_BODY_ERROR,
+    error
+  }
+}

lib/components/dataset/Body.js

@@ -7,7 +7,7 @@ import Spinner from '../chrome/Spinner'
 import DatasetRefProps from '../../propTypes/datasetRefProps'
 import Button from '../chrome/Button'
 import HandsonTable from '../HandsonTable'
-import { extractSchema } from '../../selectors/dataset'
+import { extractColumnHeaders } from '../../selectors/dataset'
 import BodyReadOnly from './BodyReadOnly'
 
 export default class Body extends Base {
@@ -20,7 +20,7 @@ export default class Body extends Base {
 
   makeColHeaders () {
     const { datasetRef } = this.props
-    const schema = extractSchema(datasetRef)
+    const schema = extractColumnHeaders(datasetRef)
     return schema && schema.map(i => i.title)
   }
 
@@ -49,7 +49,7 @@ export default class Body extends Base {
 
     // button for switching views
 
-    if (body && datasetRef.dataset && datasetRef.dataset.structure && datasetRef.dataset.structure.format === 'csv') {
+    if (body && datasetRef.dataset && datasetRef.dataset.structure && datasetRef.dataset.structure.depth === 2) {
       return <HandsonTable body={body} readOnly={readOnly} colHeaders={this.makeColHeaders()} layout={layout} />
     }