Made DynamicTable functional

jsx/src/components/DynamicTable/DynamicTable.jsx

@@ -1,141 +1,95 @@
-import React, { useState } from "react";
+import React, { useState, useEffect } from "react";
 import "./table-select.css";
+import PropTypes from "prop-types";
 
-export default class DynamicTable extends React.Component {
-  constructor(props) {
-    super(props);
-    this.current_propobject = props.current_propobject;
-    this.setProp = props.setProp;
-    this.setPropKeys = props.setPropKeys;
-    this.setPropValues = props.setPropValues;
 
-    let current_keys = [];
+const DynamicTable = (props) => {
-    let current_values = [];
   
-    for (var property in this.current_propobject) {
+  var [message, setMessage] = useState(""),
-      current_keys.push(property);
+    [message2, setMessage2] = useState("");
-      current_values.push(this.current_propobject[property]);
+  var {current_propobject} = props;
+  
+  var propobject = current_propobject;
+
+  var [propkeys, setOwnKeys] = useState(Object.keys(current_propobject));
+  var [propvalues, setOwnValues] = useState(Object.values(current_propobject));
+  var updateMessageKey = (event) => {
+    setMessage(event.target.value);
   }
-    //current_keys = this.current_propobject.propkeys
+  var updateMessageValue = (event) => {
-    //current_values = this.current_propobject.propvalues
+    setMessage2(event.target.value);
-
-    this.state = {
-      message: "",
-      message2: "",
-      propkeys: current_keys,
-      propvalues: current_values,
-      propobject: "",
-    };
   }
+  const handleRefresh = () => {
     
-  updateMessageKey(event) {
-    this.setState({
-      message: event.target.value,
-    });
-  }
-
-  updateMessageValue(event) {
-    this.setState({
-      message2: event.target.value,
-    });
-  }
-  handleRefresh(i) {
-    var propkeys = this.state.propkeys;
-    var propvalues = this.state.propvalues;
     var propobject = {};
     propkeys.forEach((key, i) => (propobject[key] = propvalues[i]));
+    props.setProp(propobject);
+    props.setPropKeys(propkeys);
+    props.setPropValues(propvalues);
+    setMessage("");
+    setMessage2("");
 
-    console.log(propobject);
-    this.setProp(propobject);
-    this.setPropKeys(propkeys);
-    this.setPropValues(propvalues);
-
-    this.setState({
-      propkeys: propkeys,
-      propvalues: propvalues,
-      message: "",
-      message2: "",
-      propobject: propobject,
-    });
   }
-  handleClick() {
+  
-    var propkeys = this.state.propkeys;
+  const handleClick = () => {
-    var propvalues = this.state.propvalues;
+    if (message != "") {
-    if (this.state.message != "") {
+      if (message2 != "") {
-      if (this.state.message2 != "") {
+        propkeys.push(message);
-        propkeys.push(this.state.message);
+        propvalues.push(message2);
-        propvalues.push(this.state.message2);
       } else {
         console.log("Value not valid");
       }
     } else {
       console.log("Value not valid");
     }
-
     var propobject = {};
     propkeys.forEach((key, i) => (propobject[key] = propvalues[i]));
+    props.setProp(propobject);
+    props.setPropKeys(propkeys);
+    setOwnKeys(propkeys);
+    props.setPropValues(propvalues);
+    setOwnValues(propvalues);
+    setMessage("");
+    setMessage2("");
+    console.log(propkeys);
+    console.log(propvalues);
     console.log(propobject);
-    this.setProp(propobject);
-    this.setPropKeys(propkeys);
-    this.setPropValues(propvalues);
-    this.setState({
-      propkeys: propkeys,
-      propvalues: propvalues,
-      message: "",
-      message2: "",
-      propobject: propobject,
-    });
   }
   
-  handleValueChanged(i, event) {
-    var propvalues = this.state.propvalues;
-    var propkeys = this.state.propkeys;
-    propvalues[i] = event.target.value;
-
-    this.handleRefresh();
-    this.setPropKeys(propkeys);
-    this.setPropValues(propvalues);
-    this.setState({
-      propvalues: propvalues,
-    });
-  }
-  handleKeyChanged(i, event) {
-    var propkeys = this.state.propkeys;
-
-    if (event.target.value != "") {
-      propkeys[i] = event.target.value;
-    }
-    console.log(event.target.value);
-
-    if (event.target.value == "") {
-      this.handleItemDeleted(i);
-    }
-    this.handleRefresh(i);
-    this.setPropKeys(propkeys);
-    this.setState({
-      propkeys: propkeys,
-    });
-  }
-
-  handleItemDeleted(i) {
-    var propvalues = this.state.propvalues;
-    var propkeys = this.state.propkeys;
 
+  const renderKeyRows = () => {
+    return propkeys.map(function (o, i) {
+      return (
+        <tr key={"item-" + i}>
+          <td>
+            <input
+              className="form-control"
+              type="text"
+              value={propkeys[i]}
+              id={o}
+              onChange= {(e) => {
+                if (e.target.value != "") {
+                  propkeys[i] = e.target.value ;
+                } else{
                   propvalues.splice(i, 1);
                   propkeys.splice(i, 1);
-    this.setPropKeys(propkeys);
+                }
-    this.setPropValues(propvalues);
+                setOwnKeys(propkeys);
-    this.handleRefresh(i);
+                props.setPropKeys(propkeys);
-    this.setState({
+                props.setProp(propobject)
-      propvalues: propvalues,
+                handleRefresh();
-      propkeys: propkeys,
+                }}
+            />
+          </td>
+        </tr>
+      );
     });
   }
+  const renderValueRows = () => {
 
-  renderKeyRows() {
+    return propvalues.map(function (o, i) {
-    var context = this;
+      //console.log("ValRows" +i)
-
+      //console.log("ValRows" +o)
-    return this.state.propkeys.map(function (o, i) {
       return (
         <tr key={"item-" + i}>
           <td>
@@ -143,42 +97,38 @@ export default class DynamicTable extends React.Component {
               className="form-control"
               type="text"
               value={o}
-              id={o + i}
+              onChange={(e) => {
-              onChange={context.handleKeyChanged.bind(context, i)}
+                propvalues[i] = e.target.value;
+                props.setPropValues(propvalues);
+                setOwnValues(propvalues);
+                handleRefresh();
+              }}
             />
           </td>
         </tr>
       );
     });
   }
-  renderValueRows() {
+  const renderDelete = () => {
-    var context = this;
 
-    return this.state.propvalues.map(function (o, i) {
+    return propvalues.map(function (o, i) {
-      return (
-        <tr key={"item-" + i}>
-          <td>
-            <input
-              className="form-control"
-              type="text"
-              value={o}
-              onChange={context.handleValueChanged.bind(context, i)}
-            />
-          </td>
-        </tr>
-      );
-    });
-  }
-  renderDelete() {
-    var context = this;
-
-    return this.state.propvalues.map(function (o, i) {
       return (
         <tr key={"item-" + i}>
           <td>
             <button
               className="btn btn-default"
-              onClick={context.handleItemDeleted.bind(context, i)}
+              onClick={() => {
+                propvalues.splice(i, 1);
+                propkeys.splice(i, 1);
+                var propobject = {};
+                propkeys.forEach((key, i) => (propobject[key] = propvalues[i]));
+                props.setProp(propobject);
+                props.setPropKeys(propkeys);
+                props.setPropValues(propvalues);
+                setOwnValues(propvalues);
+                setOwnKeys(propkeys);
+                handleRefresh();
+              }}
             >
               Delete
             </button>
@@ -188,7 +138,8 @@ export default class DynamicTable extends React.Component {
     });
   }
 
-  render() {
+
+
   return (
     <div>
       <table className="">
@@ -200,9 +151,9 @@ export default class DynamicTable extends React.Component {
         </thead>
         <tbody>
           <tr>
-              <td>{this.renderKeyRows()}</td>
+            <td>{renderKeyRows()}</td>
-              <td>{this.renderValueRows()}</td>
+            <td>{renderValueRows()}</td>
-              <td>{this.renderDelete()}</td>
+            <td>{renderDelete()}</td>
           </tr>
         </tbody>
       </table>
@@ -212,16 +163,16 @@ export default class DynamicTable extends React.Component {
             <input
               className="form-control"
               type="text"
-                value={this.state.message}
+              value={message}
-                onChange={this.updateMessageKey.bind(this)}
+              onChange={(e) => updateMessageKey(e)}
             />
           </td>
           <td>
               <input
                 className="form-control"
                 type="text"
-                value={this.state.message2}
+                value={message2}
-                onChange={this.updateMessageValue.bind(this)}
+                onChange={(e) => updateMessageValue(e)}
               />
             </td>
           <td>
@@ -230,7 +181,7 @@ export default class DynamicTable extends React.Component {
               data-testid="add-item"
               className="btn btn-default"
               type="button"
-                onClick={this.handleClick.bind(this)}
+              onClick={() => handleClick()}
             >
               Add Item
             </button>
@@ -241,4 +192,11 @@ export default class DynamicTable extends React.Component {
     </div>
   );
 }
-}
+DynamicTable.propTypes = {
+  current_keys: PropTypes.array,
+  current_values: PropTypes.array,
+  setPropKeys: PropTypes.array,
+  setPropValues: PropTypes.array,
+  setProp: PropTypes.func,
+};
+export default DynamicTable;