From 616566d0abf71ecf9ff0dfdee42395978ce5f232 Mon Sep 17 00:00:00 2001
From: shams mosowi <shams.mosowi@gmail.com>
Date: Mon, 11 Nov 2019 15:08:10 +1100
Subject: [PATCH] feat: new rows created with filter data as initial value

---
 www/src/components/Table/Grid.tsx  |  1 -
 www/src/components/Table/index.tsx | 19 ++++++++++++++++---
 www/src/views/TableView.tsx        |  2 +-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/www/src/components/Table/Grid.tsx b/www/src/components/Table/Grid.tsx
index bdb38561..b6d2af93 100644
--- a/www/src/components/Table/Grid.tsx
+++ b/www/src/components/Table/Grid.tsx
@@ -14,7 +14,6 @@ const Grid = (props: any) => {
     columns,
     RowRenderer,
     handleRowGetter,
-
     tableHeight,
     onGridRowsUpdated,
     rows,
diff --git a/www/src/components/Table/index.tsx b/www/src/components/Table/index.tsx
index 1931ef08..589eb970 100644
--- a/www/src/components/Table/index.tsx
+++ b/www/src/components/Table/index.tsx
@@ -221,7 +221,7 @@ function Table(props: Props) {
       return (
         <Button
           onClick={() => {
-            tableActions.row.add();
+            addRow();
           }}
         >
           Add a new row
@@ -241,6 +241,19 @@ function Table(props: Props) {
     }
     return rows[index];
   };
+  const addRow = (data?: any) => {
+    if (filters) {
+      // adds filter data into the new row
+      const filtersData = filters.reduce(
+        (accumulator: any, currentValue: FireTableFilter) => ({
+          ...accumulator,
+          [currentValue.key]: currentValue.value,
+        }),
+        {}
+      );
+      tableActions.row.add({ ...filtersData, ...data });
+    } else tableActions.row.add({ ...data });
+  };
   return (
     <>
       <Suspense fallback={<div>Loading header...</div>}>
@@ -251,7 +264,7 @@ function Table(props: Props) {
           updateConfig={tableActions.table.updateConfig}
           columns={columns}
           filters={filters}
-          addRow={tableActions.row.add}
+          addRow={addRow}
         />
       </Suspense>{" "}
       {!tableState.loadingColumns ? (
@@ -267,7 +280,7 @@ function Table(props: Props) {
           rows={rows}
           resizeColumn={tableActions.column.resize}
           loadingRows={tableState.loadingRows}
-          addRow={tableActions.row.add}
+          addRow={addRow}
           setSelectedCell={setSelectedCell}
         />
       ) : (
diff --git a/www/src/views/TableView.tsx b/www/src/views/TableView.tsx
index 76f7d450..f4f80eb8 100644
--- a/www/src/views/TableView.tsx
+++ b/www/src/views/TableView.tsx
@@ -16,7 +16,7 @@ export default function TableView() {
     // encoded
     //%5B%7B%20key:%20%22cohort%22,%20operator:%20%22==%22,%20value:%20%22SYD1%22%20%7D%5D
     // decoded
-    //[{ key: "cohort", operator: "==", value: "AMS1" }]
+    //[{key:"cohort",operator:"==",value:"AMS1"}]
     console.log(parsed.filters);
     filters = eval(parsed.filters);
   }