M31 rebase

client/app/pages/data-sources/EditDataSource.jsx

@@ -7,7 +7,7 @@ import routeWithUserSession from "@/components/ApplicationArea/routeWithUserSess
 import navigateTo from "@/components/ApplicationArea/navigateTo";
 import LoadingState from "@/components/items-list/components/LoadingState";
 import DynamicForm from "@/components/dynamic-form/DynamicForm";
-import SchemaTable from "@/pages/data-sources/schema-table-components/SchemaTable";
+import { SchemaTable } from "@/pages/data-sources/schema-table-components/SchemaTable";
 import helper from "@/components/dynamic-form/dynamicFormHelper";
 import HelpTrigger, { TYPES as HELP_TRIGGER_TYPES } from "@/components/HelpTrigger";
 import wrapSettingsTab from "@/components/SettingsWrapper";

client/app/pages/data-sources/schema-table-components/EditableTable.jsx

@@ -37,20 +37,33 @@ export class EditableCell extends React.Component {
     super(props);
     this.state = {
       visible: this.props.record ? this.props.record.visible : false,
+      description: this.props.record ? this.props.record.description : "test"
     };
+
   }
 
   onChange = () => {
     this.setState(prevState => ({ visible: !prevState.visible }));
   };
 
+  onChangeDesc = (e) => {
+    let newThing = e.target ? e.target.value : "";
+    this.setState(prevState => ({ description: newThing }));
+  };
+
   getInput = () => {
     if (this.props.input_type === "visible") {
       return <TableVisibilityCheckbox visible={this.state.visible} onChange={this.onChange} />;
     } else if (this.props.input_type === "sample_queries") {
       return <SampleQueryList />;
     }
-    return <TextArea className="table-textarea" placeholder="Enter description..." style={{ resize: "vertical" }} />;
+    return <TextArea
+      className="table-textarea"
+      style={{ resize: "vertical" }}
+      rows={3}
+      value={this.state.description}
+      onChange={this.onChangeDesc}
+    />;
   };
 
   render() {
@@ -62,9 +75,11 @@ export class EditableCell extends React.Component {
           return (
             <td {...restProps}>
               {editing ? (
-                <Form.Item style={{ margin: 0 }} name={dataIndex} initialValue={record[dataIndex]}>
-                {this.getInput()}
-                </Form.Item>
+                <Form>
+                  <Form.Item style={{ margin: 0 }} name={dataIndex} initialValue={record[dataIndex]}>
+                  {this.getInput()}
+                  </Form.Item>
+                </Form>
               ) : (
                 restProps.children
               )}