From 9c0a407db65e045f20a5cdf4ff9dcdab3afadbfd Mon Sep 17 00:00:00 2001
From: Alex <33497058+bexsoft@users.noreply.github.com>
Date: Wed, 4 Nov 2020 17:25:36 -0600
Subject: [PATCH] Fixed page refresh on buckets creation (#372)

Co-authored-by: Benjamin Perez <benjamin@bexsoft.net>
---
 .../screens/Console/Buckets/ListBuckets/AddBucket.tsx |  6 +++---
 .../Console/Buckets/ListBuckets/ListBuckets.tsx       | 11 ++++++-----
 .../screens/Console/ObjectBrowser/BrowseBuckets.tsx   |  7 +++++--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/AddBucket.tsx b/portal-ui/src/screens/Console/Buckets/ListBuckets/AddBucket.tsx
index 2444e301d..397a063a7 100644
--- a/portal-ui/src/screens/Console/Buckets/ListBuckets/AddBucket.tsx
+++ b/portal-ui/src/screens/Console/Buckets/ListBuckets/AddBucket.tsx
@@ -67,7 +67,7 @@ const styles = (theme: Theme) =>
 interface IAddBucketProps {
   classes: any;
   open: boolean;
-  closeModalAndRefresh: () => void;
+  closeModalAndRefresh: (refresh: boolean) => void;
   addBucketName: typeof addBucketName;
   addBucketVersioned: typeof addBucketVersioned;
   addBucketQuota: typeof addBucketQuota;
@@ -130,7 +130,7 @@ const AddBucket = ({
       .then((res) => {
         setAddLoading(false);
         setAddError("");
-        closeModalAndRefresh();
+        closeModalAndRefresh(true);
       })
       .catch((err) => {
         setAddLoading(false);
@@ -175,7 +175,7 @@ const AddBucket = ({
       modalOpen={open}
       onClose={() => {
         setAddError("");
-        closeModalAndRefresh();
+        closeModalAndRefresh(false);
       }}
       aria-labelledby="alert-dialog-title"
       aria-describedby="alert-dialog-description"
diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx b/portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx
index 1c4299880..c77bd1437 100644
--- a/portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx
+++ b/portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx
@@ -134,10 +134,13 @@ const ListBuckets = ({
     }
   }, [loading, page, rowsPerPage]);
 
-  const closeAddModalAndRefresh = () => {
+  const closeAddModalAndRefresh = (refresh: boolean) => {
     addBucketOpen(false);
     addBucketReset();
-    setLoading(true);
+
+    if (refresh) {
+      setLoading(true);
+    }
   };
 
   const closeDeleteModalAndRefresh = (refresh: boolean) => {
@@ -201,9 +204,7 @@ const ListBuckets = ({
       {addBucketModalOpen && (
         <AddBucket
           open={addBucketModalOpen}
-          closeModalAndRefresh={() => {
-            closeAddModalAndRefresh();
-          }}
+          closeModalAndRefresh={closeAddModalAndRefresh}
         />
       )}
       {deleteOpen && (
diff --git a/portal-ui/src/screens/Console/ObjectBrowser/BrowseBuckets.tsx b/portal-ui/src/screens/Console/ObjectBrowser/BrowseBuckets.tsx
index ccad93448..3ac1dc09f 100644
--- a/portal-ui/src/screens/Console/ObjectBrowser/BrowseBuckets.tsx
+++ b/portal-ui/src/screens/Console/ObjectBrowser/BrowseBuckets.tsx
@@ -155,9 +155,12 @@ const BrowseBuckets = ({
     }
   }, [loading, offset, rowsPerPage, page]);
 
-  const closeAddModalAndRefresh = () => {
+  const closeAddModalAndRefresh = (refresh: boolean) => {
     setAddScreenOpen(false);
-    setLoading(false);
+
+    if (refresh) {
+      setLoading(true);
+    }
   };
 
   const filteredRecords = records