Fixed delete bucket event functionality (#109)

Co-authored-by: Benjamin Perez <benjamin@bexsoft.net>

Author: bexsoft

portal-ui/bindata_assetfs.go

@@ -14,8 +14,9 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
 import React from "react";
+import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
+import get from "lodash/get";
 import {
   Button,
   Dialog,
@@ -69,12 +70,17 @@ class DeleteEvent extends React.Component<
     }
 
     this.setState({ deleteLoading: true }, () => {
+      const events = get(bucketEvent, "events", []);
+      const prefix = get(bucketEvent, "prefix", "");
+      const suffix = get(bucketEvent, "suffix", "");
       api
         .invoke(
           "DELETE",
-          `/api/v1/buckets/${selectedBucket}/events/${bucketEvent.id}`,
+          `/api/v1/buckets/${selectedBucket}/events/${bucketEvent.arn}`,
           {
-            name: selectedBucket
+            events,
+            prefix,
+            suffix
           }
         )
         .then((res: BucketList) => {

portal-ui/src/screens/Console/Buckets/ViewBucket/DeleteEvent.tsx

@@ -228,21 +228,26 @@ class ViewBucket extends React.Component<IViewBucketProps, IViewBucketState> {
 
     return (
       <React.Fragment>
-        <AddEvent
-          open={addScreenOpen}
-          selectedBucket={bucketName}
-          closeModalAndRefresh={() => {
-            this.setState({ addScreenOpen: false });
-            this.fetchEvents();
-          }}
-        />
-        <SetAccessPolicy
-          bucketName={bucketName}
-          open={setAccessPolicyScreenOpen}
-          closeModalAndRefresh={() => {
-            this.closeAddModalAndRefresh();
-          }}
-        />
+        {addScreenOpen && (
+          <AddEvent
+            open={addScreenOpen}
+            selectedBucket={bucketName}
+            closeModalAndRefresh={() => {
+              this.setState({ addScreenOpen: false });
+              this.fetchEvents();
+            }}
+          />
+        )}
+        {setAccessPolicyScreenOpen && (
+          <SetAccessPolicy
+            bucketName={bucketName}
+            open={setAccessPolicyScreenOpen}
+            closeModalAndRefresh={() => {
+              this.closeAddModalAndRefresh();
+            }}
+          />
+        )}
+
         <Grid container>
           <Grid item xs={12}>
             <Typography variant="h6">