Merge branch 'feat/dsv-table-data-import' into feat/html-table-data-import

package.json

@@ -73,7 +73,6 @@
     "cookie-parser": "^1.4.3",
     "cross-env": "^5.0.5",
     "csrf": "~3.0.3",
-    "csv-to-markdown-table": "^0.4.0",
     "diff": "^3.5.0",
     "elasticsearch": "^15.0.0",
     "entities": "^1.1.1",
@@ -148,6 +147,7 @@
     "commander": "^2.11.0",
     "connect-browser-sync": "^2.1.0",
     "css-loader": "^1.0.0",
+    "csv-to-markdown-table": "^0.4.0",
     "date-fns": "^1.29.0",
     "diff2html": "^2.3.3",
     "eazy-logger": "^3.0.2",

src/client/js/components/PageEditor/HandsontableModal.jsx

@@ -8,7 +8,7 @@ import Handsontable from 'handsontable';
 import { HotTable } from '@handsontable/react';
 import { debounce } from 'throttle-debounce';
 
-import DataImportForm from './DataImportForm';
+import TableDataImportForm from './TableDataImportForm';
 import MarkdownTable from '../../models/MarkdownTable';
 
 const DEFAULT_HOT_HEIGHT = 300;
@@ -318,7 +318,7 @@ export default class HandsontableModal extends React.PureComponent {
             </ButtonGroup>
             <Collapse in={this.state.isDataImportAreaExpanded}>
               <div> {/* This div is necessary for smoothing animations. (https://react-bootstrap.github.io/utilities/transitions/#transitions-collapse) */}
-                <DataImportForm onCancel={this.toggleDataImportArea} onImport={this.importData}/>
+                <TableDataImportForm onCancel={this.toggleDataImportArea} onImport={this.importData}/>
               </div>
             </Collapse>
           </div>

src/client/js/components/PageEditor/DataImportForm.js → src/client/js/components/PageEditor/TableDataImportForm.jsx

@@ -5,7 +5,7 @@ import ControlLabel from 'react-bootstrap/es/ControlLabel';
 import FormControl from 'react-bootstrap/es/FormControl';
 import Button from 'react-bootstrap/es/Button';
 
-export default class DataImportForm extends React.PureComponent {
+export default class TableDataImportForm extends React.Component {
 
   constructor(props) {
     super(props);
@@ -48,7 +48,7 @@ export default class DataImportForm extends React.PureComponent {
   }
 }
 
-DataImportForm.propTypes = {
+TableDataImportForm.propTypes = {
   onCancel: PropTypes.func,
   onImport: PropTypes.func
 };