cleanup

packages/grafana-ui/src/components/Table/TableInputCSV.story.tsx

@@ -1,9 +1,22 @@
+import React from 'react';
+
 import { storiesOf } from '@storybook/react';
-import TableInputCSV from './TableInputCSV';
+import TableInputCSV, { ParseResults } from './TableInputCSV';
-import { withFullSizeStory } from '../../utils/storybook/withFullSizeStory';
+//import { withFullSizeStory } from '../../utils/storybook/withFullSizeStory';
 
 const TableInputStories = storiesOf('UI/Table/Input', module);
 
 TableInputStories.add('default', () => {
-  return withFullSizeStory(TableInputCSV, {});
+  //return withFullSizeStory(TableInputCSV, {});
+  return (
+    <div>
+      <TableInputCSV
+        width={'90%'}
+        height={'90vh'}
+        onTableParsed={(results: ParseResults) => {
+          console.log('GOT', results);
+        }}
+      />
+    </div>
+  );
 });

packages/grafana-ui/src/components/Table/TableInputCSV.test.tsx

@@ -1,11 +1,21 @@
 import React from 'react';
 
 import renderer from 'react-test-renderer';
-import TableInputCSV from './TableInputCSV';
+import TableInputCSV, { ParseResults } from './TableInputCSV';
 
 describe('TableInputCSV', () => {
   it('renders correctly', () => {
-    const tree = renderer.create(<TableInputCSV width={100} height={100} />).toJSON();
+    const tree = renderer
+      .create(
+        <TableInputCSV
+          width={100}
+          height={100}
+          onTableParsed={(results: ParseResults) => {
+            console.log('GOT', results);
+          }}
+        />
+      )
+      .toJSON();
     //expect(tree).toMatchSnapshot();
     expect(tree).toBeDefined();
   });

packages/grafana-ui/src/components/Table/TableInputCSV.tsx

@@ -3,7 +3,7 @@ import debounce from 'lodash/debounce';
 import Papa, { ParseError, ParseMeta } from 'papaparse';
 import { TableData, Column } from '../../types/data';
 
-// Subset of all parse configs
+// Subset of all parse options
 export interface ParseConfig {
   delimiter?: string; // default: ","
   newline?: string; // default: "\r\n"
@@ -12,7 +12,7 @@ export interface ParseConfig {
   comments?: boolean | string; // default: false
 }
 
-interface ParseResults {
+export interface ParseResults {
   table: TableData;
   meta: ParseMeta;
   errors: ParseError[];
@@ -106,8 +106,9 @@ export function parseCSV(text: string, config?: ParseConfig): ParseResults {
 
 interface Props {
   config?: ParseConfig;
-  width: number;
+  width: number | string;
-  height: number;
+  height: number | string;
+  onTableParsed: (results: ParseResults) => void;
 }
 
 interface State {
@@ -127,37 +128,39 @@ class TableInputCSV extends React.PureComponent<Props, State> {
   readCSV = debounce(() => {
     const results = parseCSV(this.state.text, this.props.config);
     this.setState({ results });
-    console.log('GOT:', results);
   }, 150);
 
   componentDidUpdate(prevProps: Props, prevState: State) {
     if (this.state.text !== prevState.text || this.props.config !== prevProps.config) {
       this.readCSV();
     }
+    if (this.state.results !== prevState.results) {
+      this.props.onTableParsed(this.state.results);
+    }
   }
 
   handleChange = (event: any) => {
     this.setState({ text: event.target.value });
   };
-  handleBlur = (event: React.SyntheticEvent<HTMLTextAreaElement>) => {
-    //  console.log('BLUR', event);
-  };
 
   render() {
     const { width, height } = this.props;
     const { table, errors } = this.state.results;
 
+    let clazz = 'fa fa-check-circle';
+    errors.forEach(error => {
+      if (error.type === 'warning') {
+        clazz = 'fa fa-exclamation-triangle';
+      } else {
+        clazz = 'fa fa-times-circle';
+      }
+    });
+
     return (
-      <div
+      <div className="gf-table-input-csv" style={{ width, height }}>
-        className={'gf-table-input-wrap'}
+        <textarea placeholder="Enter CSV here..." value={this.state.text} onChange={this.handleChange} />
-        style={{
-          width: `${width}px`,
-          height: `${height}px`,
-        }}
-      >
-        <textarea value={this.state.text} onChange={this.handleChange} onBlur={this.handleBlur} />
         <footer>
-          BAR: / ROWS:{table.rows.length} / COLS:{table.columns.length} / {JSON.stringify(errors)}
+          Rows:{table.rows.length}, Columns:{table.columns.length} <i className={clazz} />
         </footer>
       </div>
     );

packages/grafana-ui/src/components/Table/_TableInputCSV.scss

@@ -1,17 +1,18 @@
-.gf-table-input-wrap {
+.gf-table-input-csv {
-  width: 100%;
+  position: relative;
 }
 
-.gf-table-input-wrap textarea {
+.gf-table-input-csv textarea {
   height: 100%;
   width: 100%;
   resize: none;
 }
 
-.gf-table-input-wrap footer {
+.gf-table-input-csv footer {
   position: absolute;
   bottom: 20px;
   right: 20px;
-  border: 2px solid #222;
+  border: 1px solid #222;
   background: #ccc;
+  padding: 4px 10px;
 }