From b267828d91620e1b1e701e83930c6592ce24a095 Mon Sep 17 00:00:00 2001
From: Noor <nr5dr@virginia.edu>
Date: Mon, 12 Oct 2020 18:22:49 -0400
Subject: [PATCH 1/7] added edit button and basic functionality

---
 frontend/src/components/EditPropertyModal.js | 33 ++++++--------------
 frontend/src/components/SearchTable.js       |  6 +++-
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/frontend/src/components/EditPropertyModal.js b/frontend/src/components/EditPropertyModal.js
index b8076be0..b4b10a07 100644
--- a/frontend/src/components/EditPropertyModal.js
+++ b/frontend/src/components/EditPropertyModal.js
@@ -1,52 +1,37 @@
 import React from "react";
 import { Modal, Button } from "react-bootstrap";
-import EditPropertyForm from "./EditPropertyForm";
-import { editProperty } from "../api/property";
+import PropertyForm from "./PropertyForm";
+import { postProperty } from "../api/property"; //fix with update
 import "../style/App.css";
 
 const updateProperty = (formValues, setFormValues, setShowEditModal) => {
-  let formValues_withoutID = { ...formValues };
-  delete formValues_withoutID.id;
-  editProperty(formValues_withoutID, formValues.id); 
+  postProperty(formValues);
   setFormValues({});
   setShowEditModal(false);
 };
 
 const EditPropertyModal = ({
-  showEditModal,
+  showModal,
   setShowEditModal,
   formValues,
   setFormValues,
 }) => {
-const originalFormValues = { ...formValues }; {/**/}
-  console.log(originalFormValues); {/**/}
-
   return (
     <>
-      <Modal size="lg" show={showEditModal} onHide={() => {
-        setShowEditModal(false)
-      }}>
+      <Modal size="lg" show={showModal} onHide={() => setShowEditModal(false)}>
         <Modal.Header className="bg-info" closeButton>
-          <Modal.Title className="text-light">Edit Property</Modal.Title>
+          <Modal.Title className="text-light">EDITING PROPERTY</Modal.Title>
         </Modal.Header>
         <Modal.Body>
-          <EditPropertyForm formValues={formValues} setFormValues={setFormValues} /> 
+          <PropertyForm formValues={formValues} setFormValues={setFormValues} />
         </Modal.Body>
         <Modal.Footer>
-          <Button variant="primary" onClick={(e) => {
-            setFormValues(originalFormValues); {/**/}
-            setShowEditModal(false); 
-            console.log(originalFormValues); {/**/}
-            console.log(formValues); {/**/}
-          }}>
+          <Button variant="primary" onClick={() => setShowEditModal(false)}>
             Cancel
           </Button>
           <Button
             variant="success"
-            onClick={() => {
-              updateProperty(formValues, setFormValues, setShowEditModal)
-              window.location.reload()
-            }}
+            onClick={() => updateProperty(formValues, setFormValues, setShowEditModal)}
           >
             Save
           </Button>
diff --git a/frontend/src/components/SearchTable.js b/frontend/src/components/SearchTable.js
index 1bcabd6a..7bf04562 100644
--- a/frontend/src/components/SearchTable.js
+++ b/frontend/src/components/SearchTable.js
@@ -24,7 +24,7 @@ export default function SearchTable(props) {
       )}
       {showEditModal ? (
         <EditPropertyModal
-          showEditModal={showEditModal}
+          showModal={showModal}
           setShowEditModal={setShowEditModal}
           formValues={formValues}
           setFormValues={setFormValues}
@@ -49,6 +49,10 @@ export default function SearchTable(props) {
             console.log(rName, rIndex);
             // setShowModal(true);
           }}
+          onEditClick={(r) => {
+            setFormValues(r);
+            setShowEditModal(true);
+          }}
         />
       </div>
 

From 8d07317a58ac2daf970026efe19930357cc90293 Mon Sep 17 00:00:00 2001
From: Noor <nr5dr@virginia.edu>
Date: Wed, 4 Nov 2020 21:34:05 -0500
Subject: [PATCH 2/7] added API call

---
 frontend/src/components/EditPropertyModal.js | 28 ++++++++++++++------
 frontend/src/components/SearchTable.js       |  6 +----
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/EditPropertyModal.js b/frontend/src/components/EditPropertyModal.js
index b4b10a07..628070a3 100644
--- a/frontend/src/components/EditPropertyModal.js
+++ b/frontend/src/components/EditPropertyModal.js
@@ -1,32 +1,44 @@
 import React from "react";
 import { Modal, Button } from "react-bootstrap";
-import PropertyForm from "./PropertyForm";
-import { postProperty } from "../api/property"; //fix with update
+import EditPropertyForm from "./EditPropertyForm";
+import { editProperty } from "../api/property"; //fix with update
 import "../style/App.css";
 
 const updateProperty = (formValues, setFormValues, setShowEditModal) => {
-  postProperty(formValues);
+  let formValues_withoutID = { ...formValues };
+  delete formValues_withoutID.id;
+  editProperty(formValues_withoutID, formValues.id); 
   setFormValues({});
   setShowEditModal(false);
 };
 
 const EditPropertyModal = ({
-  showModal,
+  showEditModal,
   setShowEditModal,
   formValues,
   setFormValues,
 }) => {
+const originalFormValues = { ...formValues }; {/**/}
+  console.log(originalFormValues); {/**/}
+
   return (
     <>
-      <Modal size="lg" show={showModal} onHide={() => setShowEditModal(false)}>
+      <Modal size="lg" show={showEditModal} onHide={() => {
+        setShowEditModal(false)
+      }}>
         <Modal.Header className="bg-info" closeButton>
-          <Modal.Title className="text-light">EDITING PROPERTY</Modal.Title>
+          <Modal.Title className="text-light">Edit Property</Modal.Title>
         </Modal.Header>
         <Modal.Body>
-          <PropertyForm formValues={formValues} setFormValues={setFormValues} />
+          <EditPropertyForm formValues={formValues} setFormValues={setFormValues} /> 
         </Modal.Body>
         <Modal.Footer>
-          <Button variant="primary" onClick={() => setShowEditModal(false)}>
+          <Button variant="primary" onClick={(e) => {
+            setFormValues(originalFormValues); {/**/}
+            setShowEditModal(false); 
+            console.log(originalFormValues); {/**/}
+            console.log(formValues); {/**/}
+          }}>
             Cancel
           </Button>
           <Button
diff --git a/frontend/src/components/SearchTable.js b/frontend/src/components/SearchTable.js
index 7bf04562..1bcabd6a 100644
--- a/frontend/src/components/SearchTable.js
+++ b/frontend/src/components/SearchTable.js
@@ -24,7 +24,7 @@ export default function SearchTable(props) {
       )}
       {showEditModal ? (
         <EditPropertyModal
-          showModal={showModal}
+          showEditModal={showEditModal}
           setShowEditModal={setShowEditModal}
           formValues={formValues}
           setFormValues={setFormValues}
@@ -49,10 +49,6 @@ export default function SearchTable(props) {
             console.log(rName, rIndex);
             // setShowModal(true);
           }}
-          onEditClick={(r) => {
-            setFormValues(r);
-            setShowEditModal(true);
-          }}
         />
       </div>
 

From b2fc34b27a851f78e60453eaee6f834c9937ad98 Mon Sep 17 00:00:00 2001
From: Noor <nr5dr@virginia.edu>
Date: Fri, 13 Nov 2020 13:43:16 -0500
Subject: [PATCH 3/7] added page refresh on edit property

---
 frontend/src/components/EditPropertyModal.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/EditPropertyModal.js b/frontend/src/components/EditPropertyModal.js
index 628070a3..b8076be0 100644
--- a/frontend/src/components/EditPropertyModal.js
+++ b/frontend/src/components/EditPropertyModal.js
@@ -1,7 +1,7 @@
 import React from "react";
 import { Modal, Button } from "react-bootstrap";
 import EditPropertyForm from "./EditPropertyForm";
-import { editProperty } from "../api/property"; //fix with update
+import { editProperty } from "../api/property";
 import "../style/App.css";
 
 const updateProperty = (formValues, setFormValues, setShowEditModal) => {
@@ -43,7 +43,10 @@ const originalFormValues = { ...formValues }; {/**/}
           </Button>
           <Button
             variant="success"
-            onClick={() => updateProperty(formValues, setFormValues, setShowEditModal)}
+            onClick={() => {
+              updateProperty(formValues, setFormValues, setShowEditModal)
+              window.location.reload()
+            }}
           >
             Save
           </Button>

From bb503d62422683106df3c3dbf4d0dfbe58ecdd42 Mon Sep 17 00:00:00 2001
From: Noor <nr5dr@virginia.edu>
Date: Mon, 12 Oct 2020 18:22:49 -0400
Subject: [PATCH 4/7] added edit button and basic functionality

---
 frontend/src/components/EditPropertyModal.js | 33 ++++++--------------
 frontend/src/components/SearchTable.js       |  6 +++-
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/frontend/src/components/EditPropertyModal.js b/frontend/src/components/EditPropertyModal.js
index b8076be0..b4b10a07 100644
--- a/frontend/src/components/EditPropertyModal.js
+++ b/frontend/src/components/EditPropertyModal.js
@@ -1,52 +1,37 @@
 import React from "react";
 import { Modal, Button } from "react-bootstrap";
-import EditPropertyForm from "./EditPropertyForm";
-import { editProperty } from "../api/property";
+import PropertyForm from "./PropertyForm";
+import { postProperty } from "../api/property"; //fix with update
 import "../style/App.css";
 
 const updateProperty = (formValues, setFormValues, setShowEditModal) => {
-  let formValues_withoutID = { ...formValues };
-  delete formValues_withoutID.id;
-  editProperty(formValues_withoutID, formValues.id); 
+  postProperty(formValues);
   setFormValues({});
   setShowEditModal(false);
 };
 
 const EditPropertyModal = ({
-  showEditModal,
+  showModal,
   setShowEditModal,
   formValues,
   setFormValues,
 }) => {
-const originalFormValues = { ...formValues }; {/**/}
-  console.log(originalFormValues); {/**/}
-
   return (
     <>
-      <Modal size="lg" show={showEditModal} onHide={() => {
-        setShowEditModal(false)
-      }}>
+      <Modal size="lg" show={showModal} onHide={() => setShowEditModal(false)}>
         <Modal.Header className="bg-info" closeButton>
-          <Modal.Title className="text-light">Edit Property</Modal.Title>
+          <Modal.Title className="text-light">EDITING PROPERTY</Modal.Title>
         </Modal.Header>
         <Modal.Body>
-          <EditPropertyForm formValues={formValues} setFormValues={setFormValues} /> 
+          <PropertyForm formValues={formValues} setFormValues={setFormValues} />
         </Modal.Body>
         <Modal.Footer>
-          <Button variant="primary" onClick={(e) => {
-            setFormValues(originalFormValues); {/**/}
-            setShowEditModal(false); 
-            console.log(originalFormValues); {/**/}
-            console.log(formValues); {/**/}
-          }}>
+          <Button variant="primary" onClick={() => setShowEditModal(false)}>
             Cancel
           </Button>
           <Button
             variant="success"
-            onClick={() => {
-              updateProperty(formValues, setFormValues, setShowEditModal)
-              window.location.reload()
-            }}
+            onClick={() => updateProperty(formValues, setFormValues, setShowEditModal)}
           >
             Save
           </Button>
diff --git a/frontend/src/components/SearchTable.js b/frontend/src/components/SearchTable.js
index 1bcabd6a..7bf04562 100644
--- a/frontend/src/components/SearchTable.js
+++ b/frontend/src/components/SearchTable.js
@@ -24,7 +24,7 @@ export default function SearchTable(props) {
       )}
       {showEditModal ? (
         <EditPropertyModal
-          showEditModal={showEditModal}
+          showModal={showModal}
           setShowEditModal={setShowEditModal}
           formValues={formValues}
           setFormValues={setFormValues}
@@ -49,6 +49,10 @@ export default function SearchTable(props) {
             console.log(rName, rIndex);
             // setShowModal(true);
           }}
+          onEditClick={(r) => {
+            setFormValues(r);
+            setShowEditModal(true);
+          }}
         />
       </div>
 

From 4437bc9a758c49ccee1e7ce926a36bba44649ea8 Mon Sep 17 00:00:00 2001
From: Noor <nr5dr@virginia.edu>
Date: Wed, 4 Nov 2020 21:34:05 -0500
Subject: [PATCH 5/7] added API call

---
 frontend/src/components/EditPropertyModal.js | 28 ++++++++++++++------
 frontend/src/components/SearchTable.js       |  6 +----
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/EditPropertyModal.js b/frontend/src/components/EditPropertyModal.js
index b4b10a07..628070a3 100644
--- a/frontend/src/components/EditPropertyModal.js
+++ b/frontend/src/components/EditPropertyModal.js
@@ -1,32 +1,44 @@
 import React from "react";
 import { Modal, Button } from "react-bootstrap";
-import PropertyForm from "./PropertyForm";
-import { postProperty } from "../api/property"; //fix with update
+import EditPropertyForm from "./EditPropertyForm";
+import { editProperty } from "../api/property"; //fix with update
 import "../style/App.css";
 
 const updateProperty = (formValues, setFormValues, setShowEditModal) => {
-  postProperty(formValues);
+  let formValues_withoutID = { ...formValues };
+  delete formValues_withoutID.id;
+  editProperty(formValues_withoutID, formValues.id); 
   setFormValues({});
   setShowEditModal(false);
 };
 
 const EditPropertyModal = ({
-  showModal,
+  showEditModal,
   setShowEditModal,
   formValues,
   setFormValues,
 }) => {
+const originalFormValues = { ...formValues }; {/**/}
+  console.log(originalFormValues); {/**/}
+
   return (
     <>
-      <Modal size="lg" show={showModal} onHide={() => setShowEditModal(false)}>
+      <Modal size="lg" show={showEditModal} onHide={() => {
+        setShowEditModal(false)
+      }}>
         <Modal.Header className="bg-info" closeButton>
-          <Modal.Title className="text-light">EDITING PROPERTY</Modal.Title>
+          <Modal.Title className="text-light">Edit Property</Modal.Title>
         </Modal.Header>
         <Modal.Body>
-          <PropertyForm formValues={formValues} setFormValues={setFormValues} />
+          <EditPropertyForm formValues={formValues} setFormValues={setFormValues} /> 
         </Modal.Body>
         <Modal.Footer>
-          <Button variant="primary" onClick={() => setShowEditModal(false)}>
+          <Button variant="primary" onClick={(e) => {
+            setFormValues(originalFormValues); {/**/}
+            setShowEditModal(false); 
+            console.log(originalFormValues); {/**/}
+            console.log(formValues); {/**/}
+          }}>
             Cancel
           </Button>
           <Button
diff --git a/frontend/src/components/SearchTable.js b/frontend/src/components/SearchTable.js
index 7bf04562..1bcabd6a 100644
--- a/frontend/src/components/SearchTable.js
+++ b/frontend/src/components/SearchTable.js
@@ -24,7 +24,7 @@ export default function SearchTable(props) {
       )}
       {showEditModal ? (
         <EditPropertyModal
-          showModal={showModal}
+          showEditModal={showEditModal}
           setShowEditModal={setShowEditModal}
           formValues={formValues}
           setFormValues={setFormValues}
@@ -49,10 +49,6 @@ export default function SearchTable(props) {
             console.log(rName, rIndex);
             // setShowModal(true);
           }}
-          onEditClick={(r) => {
-            setFormValues(r);
-            setShowEditModal(true);
-          }}
         />
       </div>
 

From 66f32cecacd94347315635cf105c61a40d3c9146 Mon Sep 17 00:00:00 2001
From: Noor <nr5dr@virginia.edu>
Date: Fri, 13 Nov 2020 13:43:16 -0500
Subject: [PATCH 6/7] added page refresh on edit property

---
 frontend/src/components/EditPropertyModal.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/EditPropertyModal.js b/frontend/src/components/EditPropertyModal.js
index 628070a3..b8076be0 100644
--- a/frontend/src/components/EditPropertyModal.js
+++ b/frontend/src/components/EditPropertyModal.js
@@ -1,7 +1,7 @@
 import React from "react";
 import { Modal, Button } from "react-bootstrap";
 import EditPropertyForm from "./EditPropertyForm";
-import { editProperty } from "../api/property"; //fix with update
+import { editProperty } from "../api/property";
 import "../style/App.css";
 
 const updateProperty = (formValues, setFormValues, setShowEditModal) => {
@@ -43,7 +43,10 @@ const originalFormValues = { ...formValues }; {/**/}
           </Button>
           <Button
             variant="success"
-            onClick={() => updateProperty(formValues, setFormValues, setShowEditModal)}
+            onClick={() => {
+              updateProperty(formValues, setFormValues, setShowEditModal)
+              window.location.reload()
+            }}
           >
             Save
           </Button>

From 310b5a60ebb05438b5404253fb7bab3f20ed7a0f Mon Sep 17 00:00:00 2001
From: Noor <nr5dr@virginia.edu>
Date: Fri, 18 Dec 2020 13:30:09 -0500
Subject: [PATCH 7/7] edit modal open on row click, ignore delete click

---
 frontend/src/components/SearchTable.js | 22 +++++++++++++++++-----
 frontend/src/components/Table.js       |  4 ++--
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/SearchTable.js b/frontend/src/components/SearchTable.js
index 1bcabd6a..8e99f340 100644
--- a/frontend/src/components/SearchTable.js
+++ b/frontend/src/components/SearchTable.js
@@ -10,6 +10,8 @@ export default function SearchTable(props) {
   const [showModal, setShowModal] = useState(false);
   const [showEditModal, setShowEditModal] = useState(false);
   const [formValues, setFormValues] = useState({});
+  let isDeleteClicked = false;
+
   return (
     <>
       {showModal ? (
@@ -41,14 +43,24 @@ export default function SearchTable(props) {
             console.log("cname is ", cName);
             console.log("cIndex is ", cIndex);
           }}
-          onEditClick={(r) => {
-            setFormValues(r);
-            setShowEditModal(true);
-          }}
+          // onEditClick={(r) => {
+          //   setFormValues(r);
+          //   setShowEditModal(true);
+          // }}
           onRowSelect={(rName, rIndex) => {
             console.log(rName, rIndex);
-            // setShowModal(true);
+            console.log(isDeleteClicked);
+            if (!isDeleteClicked) {
+              setFormValues(rName);
+              setShowEditModal(true);
+            }
+            isDeleteClicked = false;
           }}
+          onDeleteClick={() => {
+            isDeleteClicked = true;
+            console.log(isDeleteClicked);
+          }
+          }
         />
       </div>
 
diff --git a/frontend/src/components/Table.js b/frontend/src/components/Table.js
index 7a523514..c3cb5eb4 100644
--- a/frontend/src/components/Table.js
+++ b/frontend/src/components/Table.js
@@ -18,8 +18,8 @@ const LocalTable = (props) => {
       {props.columns.map((c, columnIndex) =>
         _renderCell(r[c.field], rowIndex, columnIndex)
       )}
-      <Button variant="warning" onClick={() => props.onEditClick && props.onEditClick(r)}>Edit</Button>
-      <Button variant="danger">Delete</Button>
+      {/* <Button variant="warning" onClick={() => props.onEditClick && props.onEditClick(r)}>Edit</Button> */}
+      <Button variant="danger" onClick={() => props.onDeleteClick()}>Delete</Button>
 
     </tr>
   );