From 7728c17ab9880aa758beef83dbe1db5e5381dc86 Mon Sep 17 00:00:00 2001
From: shubham4443 <shubham4443@gmail.com>
Date: Sat, 30 Jan 2021 22:53:59 +0530
Subject: [PATCH 1/5] WIP: disabling eventing, truncate event logs and remove
 allow, deny and authenticated rule from eventing filters

---
 src/components/eventing/EventingConfigure.jsx | 129 ++++++++++++++----
 .../configure-rule/ConfigureRule.jsx          |   7 +-
 src/constants.js                              |   2 +-
 src/pages/eventing/EventingSettings.jsx       |  13 ++
 src/services/eventing.js                      |  40 ++++++
 5 files changed, 159 insertions(+), 32 deletions(-)

diff --git a/src/components/eventing/EventingConfigure.jsx b/src/components/eventing/EventingConfigure.jsx
index 3ab4fb96..e2582a50 100644
--- a/src/components/eventing/EventingConfigure.jsx
+++ b/src/components/eventing/EventingConfigure.jsx
@@ -1,42 +1,111 @@
-import React from 'react'
-import { AutoComplete, Button, Form, Checkbox } from 'antd';
+import React, { useState } from 'react'
+import { AutoComplete, Button, Form, Checkbox, Select, Input, DatePicker } from 'antd';
 import ConditionalFormBlock from "../conditional-form-block/ConditionalFormBlock";
 import FormItemLabel from "../form-item-label/FormItemLabel";
+import { useSelector } from 'react-redux';
+import { getTrackedCollections } from '../../operations/database';
 
+const { Option } = AutoComplete;
 
-const EventingConfigure = ({ initialValues, handleSubmit, dbList, loading }) => {
+const EventingConfigure = ({ initialValues, handleSubmit, dbList, loading, onDeleteEventingLogs }) => {
+  const [form] = Form.useForm()
 
-	const [form] = Form.useForm()
-	const handleSubmitClick = e => {
-		form.validateFields().then(values => {
-			handleSubmit(values)
-		})
-	}
+  const [value, setValue] = useState("");
+  const [selectedDbs, setSelectedDbs] = useState([]);
+  const trackedCollections = useSelector(state => {
+    const allTrackedCollections = selectedDbs.reduce((prev, curr) => [...prev, ...getTrackedCollections(state, curr)], [])
+    return [...new Set(allTrackedCollections)]
+  })
 
-	if (!loading) {
-		form.setFieldsValue(initialValues)
-	}
+  const handleSearch = value => setValue(value);
+  const handleSelectDatabases = values => setSelectedDbs(values)
 
-	return (
-		<Form form={form} >
-			<Form.Item name="enabled" valuePropName="checked">
-				<Checkbox>
-					Enable eventing module
+  const handleTruncateEventLogs = () => {
+    form.validateFields(["truncateSince"]).then(values => {
+      values.truncateSince = values.truncateSince.unix()
+      
+      onDeleteEventingLogs(values.truncateSince)
+    })
+  }
+  const handleSubmitClick = e => {
+    form.validateFields(["dbAlias", "db", "col"]).then(values => {
+      values = Object.assign({}, initialValues, values)
+
+      if (values.enabled) {
+        values.dbTablesInclusionMap = {}
+        if (!values.db) {
+          values.dbTablesInclusionMap["*"] = "*";
+        }
+        else {
+          values.db.forEach(item => {
+            if (item == values.dbAlias) {
+              values.dbTablesInclusionMap[item] = values.col ? values.col : "*";
+              return;
+            }
+            values.dbTablesInclusionMap[item] = values.col ? [] : "*";
+          })
+        }
+      }
+
+      delete values["db"]
+      delete values["col"]
+      // handleSubmit(values)
+      console.log(values)
+    })
+  }
+
+  if (!loading) {
+    form.setFieldsValue(initialValues)
+  }
+
+  return (
+    <Form form={form} >
+      <Form.Item name="enabled" valuePropName="checked">
+        <Checkbox>
+          Enable eventing module
         </Checkbox>
-			</Form.Item>
-			<ConditionalFormBlock dependency="enabled" condition={() => form.getFieldValue("enabled")}>
-				<FormItemLabel name="Eventing DB" description="The database to store event invocation logs" />
-				<Form.Item name="dbAlias" rules={[{ required: true, message: 'Database is required!' }]}>
-					<AutoComplete placeholder="Choose an eventing database" style={{ width: 320 }} options={dbList.map(db => ({ value: db }))} />
-				</Form.Item>
-			</ConditionalFormBlock>
-			<Form.Item>
-				<Button onClick={handleSubmitClick} >
-					Save
+      </Form.Item>
+      <ConditionalFormBlock dependency="enabled" condition={() => form.getFieldValue("enabled")}>
+        <FormItemLabel name="Eventing DB" description="The database to store event invocation logs" />
+        <Form.Item name="dbAlias" rules={[{ required: true, message: 'Database is required!' }]}>
+          <AutoComplete placeholder="Choose an eventing database" style={{ width: 320 }} options={dbList.map(db => ({ value: db }))} />
+        </Form.Item>
+        <FormItemLabel name="Disabling eventing" description="Select the database & table on which the eventing has to be disabled" />
+        <Input.Group compact>
+          <Form.Item name="db" style={{ flexGrow: 1, width: 200, marginRight: 10 }}>
+            <Select mode="tags" placeholder="Select databases" onSearch={handleSearch} onChange={handleSelectDatabases}  >
+              {
+                dbList.map(db => (<Option key={db} value={db}>{db}</Option>))
+              }
+            </Select>
+          </Form.Item>
+          <Form.Item name="col" style={{ flexGrow: 1, width: 200 }} >
+            <Select mode="tags" placeholder="Collections / Tables" onSearch={handleSearch} >
+              {
+                trackedCollections.filter(data => (data.toLowerCase().indexOf(value.toLowerCase()) !== -1)).map(data => (
+                  <Option key={data} value={data}>
+                    {data}
+                  </Option>
+                ))
+              }
+            </Select>
+          </Form.Item>
+        </Input.Group>
+      </ConditionalFormBlock>
+      <Form.Item>
+        <Button onClick={handleSubmitClick} >
+          Save
 				</Button>
-			</Form.Item>
-		</Form>
-	)
+      </Form.Item>
+      <ConditionalFormBlock dependency="enabled" condition={() => form.getFieldValue("enabled")}>
+        <FormItemLabel name="Truncate event logs" description="Delete the event logs from a specific timestamp to clear/save database storage" />
+        <Form.Item name="truncateSince" rules={[{ required: true, message: "No date selected!" }]}>
+          <DatePicker showTime format="YYYY-MM-DD HH:mm:ss" />
+        </Form.Item>
+        <Button type="primary" danger onClick={handleTruncateEventLogs}>Delete</Button>
+      </ConditionalFormBlock>
+    </Form>
+  )
 }
 
 export default EventingConfigure;
\ No newline at end of file
diff --git a/src/components/security-rules/configure-rule/ConfigureRule.jsx b/src/components/security-rules/configure-rule/ConfigureRule.jsx
index a2974b73..a6f8c77c 100644
--- a/src/components/security-rules/configure-rule/ConfigureRule.jsx
+++ b/src/components/security-rules/configure-rule/ConfigureRule.jsx
@@ -339,7 +339,12 @@ const ConfigureRule = (props) => {
           <Select placeholder="Rule">
             {rules
               .filter((val) => {
-                if (props.blockDepth === 1) return true
+                if (props.ruleMetaData.ruleType === securityRuleGroups.EVENTING_FILTERS) 
+                  return !["allow", "deny", "authenticated"].includes(val)
+
+                if (props.blockDepth === 1) 
+                  return true
+                  
                 return !["allow", "deny", "authenticated"].includes(val)
               })
               .map((val) => (
diff --git a/src/constants.js b/src/constants.js
index 203450f1..f80fb461 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -196,7 +196,7 @@ export const defaultEventRule = {
 }
 
 export const defaultEventFilterRule = {
-  rule: "allow"
+  rule: "match"
 }
 
 export const defaultEndpointRule = {
diff --git a/src/pages/eventing/EventingSettings.jsx b/src/pages/eventing/EventingSettings.jsx
index 236552ee..7828adb7 100644
--- a/src/pages/eventing/EventingSettings.jsx
+++ b/src/pages/eventing/EventingSettings.jsx
@@ -10,6 +10,8 @@ import './event.css';
 import { saveEventingConfig, getEventingConfig } from '../../operations/eventing';
 import { getDbConfigs } from '../../operations/database';
 import { projectModules, actionQueuedMessage } from '../../constants';
+import client from "../../client";
+import { getAPIToken } from '../../operations/projects';
 
 const EventingSettings = () => {
   const { projectID } = useParams();
@@ -18,6 +20,7 @@ const EventingSettings = () => {
   const loading = useSelector(state => state.pendingRequests > 0)
   const eventingConfig = useSelector(state => getEventingConfig(state))
   const dbConfigs = useSelector(state => getDbConfigs(state));
+  const internalToken = useSelector(state => getAPIToken(state))
 
   // Derived state
   const dbList = Object.keys(dbConfigs)
@@ -30,6 +33,15 @@ const EventingSettings = () => {
       .finally(() => decrementPendingRequests());
   };
 
+  const handleDeleteEventingLogs = (timestamp) => {
+    const dbAlias = dbConfigs.dbAlias
+    incrementPendingRequests()
+    client.eventing.deleteEventLogs(projectID, dbAlias, timestamp, () => internalToken)
+      .then(() => notify("success", "Logs truncated successfully"))
+      .catch(ex => notify("error", "Error truncating event logs", ex))
+      .finally(() => decrementPendingRequests())
+  }
+
   return (
     <div>
       <Topbar showProjectSelector />
@@ -44,6 +56,7 @@ const EventingSettings = () => {
             dbList={dbList}
             loading={loading}
             handleSubmit={handleEventingConfig}
+            onDeleteEventingLogs={handleDeleteEventingLogs}
           />
         </div>
       </div>
diff --git a/src/services/eventing.js b/src/services/eventing.js
index b7c9d6c5..72af7787 100644
--- a/src/services/eventing.js
+++ b/src/services/eventing.js
@@ -227,6 +227,46 @@ class Eventing {
         .catch(ex => reject({title: "Failed to delete eventing-schema", msg: ex.message}))
     })
   }
+
+  deleteEventLogs(projectId, dbAlias, timestamp, getToken) {
+    let uri = `/v1/api/${projectId}/graphql`
+    if (spaceCloudClusterOrigin) {
+      uri = spaceCloudClusterOrigin + uri;
+    }
+    const graphqlClient = createGraphQLClient(uri, getToken)
+    return new Promise((resolve, reject) => {
+      graphqlClient.mutate({
+        mutation: gql`
+        mutation {
+          delete_invocation_logs(
+            where: {
+              invocation_time: {
+                _lte: $timestamp
+              }
+            }
+          ) @${dbAlias}
+        
+          delete_event_logs(
+            where: {
+              event_ts: {
+                _lte: $timestamp
+              }
+            }
+          ) @${dbAlias}
+        }
+        `,
+        variables: { timestamp }
+      }).then(res => {
+        const { data, errors } = res
+        if (errors && errors.length > 0) {
+          reject(errors[0].message)
+          return
+        }
+
+        resolve()
+      }).catch(ex => reject(ex.toString()))
+    })
+  }
 }
 
 export default Eventing
\ No newline at end of file

From 2fd8e906ba540ddc816285b2b2a4746c50378336 Mon Sep 17 00:00:00 2001
From: shubham4443 <shubham4443@gmail.com>
Date: Wed, 3 Feb 2021 23:49:27 +0530
Subject: [PATCH 2/5] dynamic input of dbs added

---
 src/components/eventing/EventingConfigure.jsx | 94 +++++++++++--------
 1 file changed, 57 insertions(+), 37 deletions(-)

diff --git a/src/components/eventing/EventingConfigure.jsx b/src/components/eventing/EventingConfigure.jsx
index e2582a50..46ebf1dc 100644
--- a/src/components/eventing/EventingConfigure.jsx
+++ b/src/components/eventing/EventingConfigure.jsx
@@ -4,6 +4,7 @@ import ConditionalFormBlock from "../conditional-form-block/ConditionalFormBlock
 import FormItemLabel from "../form-item-label/FormItemLabel";
 import { useSelector } from 'react-redux';
 import { getTrackedCollections } from '../../operations/database';
+import { MinusCircleFilled, PlusOutlined } from '@ant-design/icons';
 
 const { Option } = AutoComplete;
 
@@ -12,45 +13,41 @@ const EventingConfigure = ({ initialValues, handleSubmit, dbList, loading, onDel
 
   const [value, setValue] = useState("");
   const [selectedDbs, setSelectedDbs] = useState([]);
-  const trackedCollections = useSelector(state => {
-    const allTrackedCollections = selectedDbs.reduce((prev, curr) => [...prev, ...getTrackedCollections(state, curr)], [])
-    return [...new Set(allTrackedCollections)]
-  })
+  const state = useSelector(state => state)
 
   const handleSearch = value => setValue(value);
-  const handleSelectDatabases = values => setSelectedDbs(values)
+  const handleSelectDatabases = values => setSelectedDbs([values])
 
   const handleTruncateEventLogs = () => {
     form.validateFields(["truncateSince"]).then(values => {
       values.truncateSince = values.truncateSince.unix()
-      
+
       onDeleteEventingLogs(values.truncateSince)
     })
   }
+
+  const getCollections = (db) => getTrackedCollections(state, db)
+
   const handleSubmitClick = e => {
-    form.validateFields(["dbAlias", "db", "col"]).then(values => {
+    form.validateFields(["enabled", "dbAlias", "dbTables"]).then(values => {
       values = Object.assign({}, initialValues, values)
 
       if (values.enabled) {
         values.dbTablesInclusionMap = {}
-        if (!values.db) {
+        if (values.dbTables.length === 0) {
           values.dbTablesInclusionMap["*"] = "*";
         }
         else {
-          values.db.forEach(item => {
-            if (item == values.dbAlias) {
-              values.dbTablesInclusionMap[item] = values.col ? values.col : "*";
-              return;
+          values.dbTables.forEach(item => {
+            if (item) {
+              values.dbTablesInclusionMap[item.db] = item.col.length > 0 ? item.col : "*"
             }
-            values.dbTablesInclusionMap[item] = values.col ? [] : "*";
           })
         }
       }
 
-      delete values["db"]
-      delete values["col"]
-      // handleSubmit(values)
-      console.log(values)
+      delete values["dbTables"]
+      handleSubmit(values)
     })
   }
 
@@ -71,26 +68,49 @@ const EventingConfigure = ({ initialValues, handleSubmit, dbList, loading, onDel
           <AutoComplete placeholder="Choose an eventing database" style={{ width: 320 }} options={dbList.map(db => ({ value: db }))} />
         </Form.Item>
         <FormItemLabel name="Disabling eventing" description="Select the database & table on which the eventing has to be disabled" />
-        <Input.Group compact>
-          <Form.Item name="db" style={{ flexGrow: 1, width: 200, marginRight: 10 }}>
-            <Select mode="tags" placeholder="Select databases" onSearch={handleSearch} onChange={handleSelectDatabases}  >
-              {
-                dbList.map(db => (<Option key={db} value={db}>{db}</Option>))
-              }
-            </Select>
-          </Form.Item>
-          <Form.Item name="col" style={{ flexGrow: 1, width: 200 }} >
-            <Select mode="tags" placeholder="Collections / Tables" onSearch={handleSearch} >
-              {
-                trackedCollections.filter(data => (data.toLowerCase().indexOf(value.toLowerCase()) !== -1)).map(data => (
-                  <Option key={data} value={data}>
-                    {data}
-                  </Option>
-                ))
-              }
-            </Select>
-          </Form.Item>
-        </Input.Group>
+        <Form.List name="dbTables">
+          {(fields, { add, remove }) => {
+            return (
+              <div>
+                {fields.map((field) => (
+                  <Input.Group compact>
+                    <Form.Item
+                      name={[field.name, 'db']}
+                      key={[field.name, 'db']}
+                      style={{ flexGrow: 1, width: 200, marginRight: 10 }}
+                    >
+                      <Select showSearch placeholder="Select databases" onSearch={handleSearch} onChange={handleSelectDatabases}  >
+                        {
+                          dbList.map(db => (<Option key={db} value={db}>{db}</Option>))
+                        }
+                      </Select>
+                    </Form.Item>
+                    <Form.Item
+                      name={[field.name, 'col']}
+                      key={[field.name, 'col']}
+                      style={{ flexGrow: 1, width: 200, marginRight: 10 }}
+                      shouldUpdate
+                    >
+                      <Select mode="tags" placeholder="Collections / Tables" onSearch={handleSearch} >
+                        {
+                          getCollections(form.getFieldValue(["dbTables", field.name, 'db'])).filter(data => (data.toLowerCase().indexOf(value.toLowerCase()) !== -1)).map(data => (
+                            <Option key={data} value={data}>
+                              {data}
+                            </Option>
+                          ))
+                        }
+                      </Select>
+                    </Form.Item>
+                    <Form.Item>
+                      <MinusCircleFilled onClick={() => remove(field.name)} style={{ fontSize: 20, cursor: "pointer" }} />
+                    </Form.Item>
+                  </Input.Group>
+                ))}
+                <Button style={{ marginBottom: "1em" }} onClick={() => add()}><PlusOutlined /> Add database</Button>
+              </div>
+            )
+          }}
+        </Form.List>
       </ConditionalFormBlock>
       <Form.Item>
         <Button onClick={handleSubmitClick} >

From cf98765b5b77bc0c2e88710d2691da9692a6d41e Mon Sep 17 00:00:00 2001
From: shubham4443 <shubham4443@gmail.com>
Date: Fri, 26 Feb 2021 20:09:29 +0530
Subject: [PATCH 3/5] allowed adding custom database

---
 src/components/eventing/EventingConfigure.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/eventing/EventingConfigure.jsx b/src/components/eventing/EventingConfigure.jsx
index 46ebf1dc..a0892844 100644
--- a/src/components/eventing/EventingConfigure.jsx
+++ b/src/components/eventing/EventingConfigure.jsx
@@ -79,11 +79,11 @@ const EventingConfigure = ({ initialValues, handleSubmit, dbList, loading, onDel
                       key={[field.name, 'db']}
                       style={{ flexGrow: 1, width: 200, marginRight: 10 }}
                     >
-                      <Select showSearch placeholder="Select databases" onSearch={handleSearch} onChange={handleSelectDatabases}  >
+                      <AutoComplete placeholder="Select databases" onSelect={handleSelectDatabases}  >
                         {
-                          dbList.map(db => (<Option key={db} value={db}>{db}</Option>))
+                          dbList.map(db => (<AutoComplete.Option key={db} value={db}>{db}</AutoComplete.Option>))
                         }
-                      </Select>
+                      </AutoComplete>
                     </Form.Item>
                     <Form.Item
                       name={[field.name, 'col']}

From 0910c66250e9d0fa003e2b868ed82551da260791 Mon Sep 17 00:00:00 2001
From: shubham4443 <shubham4443@gmail.com>
Date: Wed, 3 Mar 2021 01:15:33 +0530
Subject: [PATCH 4/5] fixed the issue of missing initial values

---
 src/components/eventing/EventingConfigure.jsx | 59 +++++++++++--------
 1 file changed, 33 insertions(+), 26 deletions(-)

diff --git a/src/components/eventing/EventingConfigure.jsx b/src/components/eventing/EventingConfigure.jsx
index a0892844..275eb307 100644
--- a/src/components/eventing/EventingConfigure.jsx
+++ b/src/components/eventing/EventingConfigure.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import React from 'react'
 import { AutoComplete, Button, Form, Checkbox, Select, Input, DatePicker } from 'antd';
 import ConditionalFormBlock from "../conditional-form-block/ConditionalFormBlock";
 import FormItemLabel from "../form-item-label/FormItemLabel";
@@ -10,14 +10,8 @@ const { Option } = AutoComplete;
 
 const EventingConfigure = ({ initialValues, handleSubmit, dbList, loading, onDeleteEventingLogs }) => {
   const [form] = Form.useForm()
-
-  const [value, setValue] = useState("");
-  const [selectedDbs, setSelectedDbs] = useState([]);
   const state = useSelector(state => state)
 
-  const handleSearch = value => setValue(value);
-  const handleSelectDatabases = values => setSelectedDbs([values])
-
   const handleTruncateEventLogs = () => {
     form.validateFields(["truncateSince"]).then(values => {
       values.truncateSince = values.truncateSince.unix()
@@ -52,11 +46,17 @@ const EventingConfigure = ({ initialValues, handleSubmit, dbList, loading, onDel
   }
 
   if (!loading) {
-    form.setFieldsValue(initialValues)
+    const dbTables = [];
+    if (initialValues.dbTablesInclusionMap) {
+      Object.keys(initialValues.dbTablesInclusionMap).forEach(db => {
+        dbTables.push({ db, col: initialValues.dbTablesInclusionMap[db] })
+      })
+    }
+    form.setFieldsValue({ ...initialValues, dbTables })
   }
 
   return (
-    <Form form={form} >
+    <Form form={form}>
       <Form.Item name="enabled" valuePropName="checked">
         <Checkbox>
           Enable eventing module
@@ -73,33 +73,40 @@ const EventingConfigure = ({ initialValues, handleSubmit, dbList, loading, onDel
             return (
               <div>
                 {fields.map((field) => (
-                  <Input.Group compact>
+                  <Input.Group compact key={field.key}>
                     <Form.Item
                       name={[field.name, 'db']}
                       key={[field.name, 'db']}
                       style={{ flexGrow: 1, width: 200, marginRight: 10 }}
                     >
-                      <AutoComplete placeholder="Select databases" onSelect={handleSelectDatabases}  >
+                      <AutoComplete placeholder="Select databases">
                         {
                           dbList.map(db => (<AutoComplete.Option key={db} value={db}>{db}</AutoComplete.Option>))
                         }
                       </AutoComplete>
                     </Form.Item>
-                    <Form.Item
-                      name={[field.name, 'col']}
-                      key={[field.name, 'col']}
-                      style={{ flexGrow: 1, width: 200, marginRight: 10 }}
-                      shouldUpdate
-                    >
-                      <Select mode="tags" placeholder="Collections / Tables" onSearch={handleSearch} >
-                        {
-                          getCollections(form.getFieldValue(["dbTables", field.name, 'db'])).filter(data => (data.toLowerCase().indexOf(value.toLowerCase()) !== -1)).map(data => (
-                            <Option key={data} value={data}>
-                              {data}
-                            </Option>
-                          ))
-                        }
-                      </Select>
+                    <Form.Item noStyle shouldUpdate>
+                      {() => (
+                        <Form.Item
+                          name={[field.name, 'col']}
+                          key={[field.name, 'col']}
+                          style={{ flexGrow: 1, width: 200, marginRight: 10 }}
+                        >
+                          <Select
+                            mode="tags"
+                            placeholder="Collections / Tables"
+                            filterOption={(input, option) => option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0}
+                          >
+                            {
+                              getCollections(form.getFieldValue(["dbTables", field.name, 'db'])).map(data => (
+                                <Option key={data} value={data}>
+                                  {data}
+                                </Option>
+                              ))
+                            }
+                          </Select>
+                        </Form.Item>
+                      )}
                     </Form.Item>
                     <Form.Item>
                       <MinusCircleFilled onClick={() => remove(field.name)} style={{ fontSize: 20, cursor: "pointer" }} />

From 3b1e63d14e3eec951349008eb20e601f88815679 Mon Sep 17 00:00:00 2001
From: shubham4443 <shubham4443@gmail.com>
Date: Sat, 6 Mar 2021 17:26:15 +0530
Subject: [PATCH 5/5] changed label and added validation for add databases

---
 src/components/eventing/EventingConfigure.jsx | 36 ++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/components/eventing/EventingConfigure.jsx b/src/components/eventing/EventingConfigure.jsx
index 275eb307..75244312 100644
--- a/src/components/eventing/EventingConfigure.jsx
+++ b/src/components/eventing/EventingConfigure.jsx
@@ -34,7 +34,7 @@ const EventingConfigure = ({ initialValues, handleSubmit, dbList, loading, onDel
         else {
           values.dbTables.forEach(item => {
             if (item) {
-              values.dbTablesInclusionMap[item.db] = item.col.length > 0 ? item.col : "*"
+              values.dbTablesInclusionMap[item.db] = item.col && item.col.length > 0 ? item.col : "*"
             }
           })
         }
@@ -47,7 +47,10 @@ const EventingConfigure = ({ initialValues, handleSubmit, dbList, loading, onDel
 
   if (!loading) {
     const dbTables = [];
-    if (initialValues.dbTablesInclusionMap) {
+    if (initialValues.enabled && (!initialValues.dbTablesInclusionMap || Object.keys(initialValues.dbTablesInclusionMap).length === 0)) {
+      dbTables.push({ db: "*", col: ["*"] })
+    }
+    if (initialValues.enabled && initialValues.dbTablesInclusionMap) {
       Object.keys(initialValues.dbTablesInclusionMap).forEach(db => {
         dbTables.push({ db, col: initialValues.dbTablesInclusionMap[db] })
       })
@@ -55,6 +58,13 @@ const EventingConfigure = ({ initialValues, handleSubmit, dbList, loading, onDel
     form.setFieldsValue({ ...initialValues, dbTables })
   }
 
+  const isAddDatabaseDisabled = (fields) => {
+    if (Object.keys(fields).length === 0) {
+      return false;
+    }
+    return fields.dbTables.find(x => x.db === "*");
+  }
+
   return (
     <Form form={form}>
       <Form.Item name="enabled" valuePropName="checked">
@@ -67,7 +77,7 @@ const EventingConfigure = ({ initialValues, handleSubmit, dbList, loading, onDel
         <Form.Item name="dbAlias" rules={[{ required: true, message: 'Database is required!' }]}>
           <AutoComplete placeholder="Choose an eventing database" style={{ width: 320 }} options={dbList.map(db => ({ value: db }))} />
         </Form.Item>
-        <FormItemLabel name="Disabling eventing" description="Select the database & table on which the eventing has to be disabled" />
+        <FormItemLabel name="Enable eventing" description="Select the database & table on which the eventing has to be enabled" />
         <Form.List name="dbTables">
           {(fields, { add, remove }) => {
             return (
@@ -78,6 +88,7 @@ const EventingConfigure = ({ initialValues, handleSubmit, dbList, loading, onDel
                       name={[field.name, 'db']}
                       key={[field.name, 'db']}
                       style={{ flexGrow: 1, width: 200, marginRight: 10 }}
+                      rules={[{ required: true, message: "Please enter a database!" }]}
                     >
                       <AutoComplete placeholder="Select databases">
                         {
@@ -91,6 +102,7 @@ const EventingConfigure = ({ initialValues, handleSubmit, dbList, loading, onDel
                           name={[field.name, 'col']}
                           key={[field.name, 'col']}
                           style={{ flexGrow: 1, width: 200, marginRight: 10 }}
+                          rules={[{ required: true, message: "Please enter atleast 1 collection!" }]}
                         >
                           <Select
                             mode="tags"
@@ -113,7 +125,23 @@ const EventingConfigure = ({ initialValues, handleSubmit, dbList, loading, onDel
                     </Form.Item>
                   </Input.Group>
                 ))}
-                <Button style={{ marginBottom: "1em" }} onClick={() => add()}><PlusOutlined /> Add database</Button>
+                <Form.Item shouldUpdate noStyle>
+                  {() => (
+                    <Button
+                      style={{ marginBottom: "1em" }}
+                      onClick={() => {
+                        form.validateFields([
+                          ...fields.map(obj => ["dbTables", obj.name, "db"]),
+                          ...fields.map(obj => ["dbTables", obj.name, "col"])])
+                          .then(() => add())
+                          .catch(ex => console.log("Exception", ex))
+                      }}
+                      disabled={isAddDatabaseDisabled(form.getFieldsValue([...fields.map(obj => ["dbTables", obj.name, "db"])]))}
+                    >
+                      <PlusOutlined /> Add database
+                    </Button>
+                  )}
+                </Form.Item>
               </div>
             )
           }}