fix: access key loading

bittorrent · Jun 17, 2024 · 6ba9a36 · 6ba9a36
1 parent 62e23de
commit 6ba9a36
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/components/Tables/S3ApiTable.js b/src/components/Tables/S3ApiTable.js
@@ -29,13 +29,15 @@ export default function S3ApiTable({ color }) {
     const [globalS3Obj, setGlobalS3Obj] = useState(null);
     const history = useHistory();
     const [bucketList, setBucketList] = useState(null);
+    const [loading, setLoading] = useState(false);
     const [accessKeyList, setAccessKeyList] = useState([]);
     const [curAccessData, setAccessData] = useState(null);
     const handleNewBucket = () => {
         Emitter.emit('openS3NewBucketModal', { globalS3, callbackFn: reFetchBucketList })
     }
 
     const fetchBucketList = async (params) => {
+        if(!params)return;
         try {
             globalS3 = null;
             globalS3 = new S3Client({
@@ -57,6 +59,8 @@ export default function S3ApiTable({ color }) {
 
         } catch (e) {
             console.log("error", e)
+             setLoading(false)
+
         }
 
     }
@@ -73,6 +77,7 @@ export default function S3ApiTable({ color }) {
     }, [curAccessData]);
 
     const reFetchBucketList = async () => {
+        setLoading(true)
         try {
             const input = {};
             const command = new ListBucketsCommand(input);
@@ -97,8 +102,10 @@ export default function S3ApiTable({ color }) {
                 const list = sortListByDate(bucketList, 'CreationDate')
                 setBucketList(() => [...list])
             }
+            setLoading(false)
         } catch (e) {
             console.log("error", e)
+            setLoading(false)
         }
 
     }
@@ -226,7 +233,7 @@ export default function S3ApiTable({ color }) {
                             })}
                     </tbody>
                 </table>
-                {!bucketList && (
+                {loading && (
                     <div className="w-full flex justify-center pt-4">
                         <img
                             alt="loading"

diff --git a/src/components/Tables/S3BucketsTable.js b/src/components/Tables/S3BucketsTable.js
@@ -66,7 +66,6 @@ export default function S3BucketsTable({ color, bucketName, accessKeyId, secretA
             })
 
             Contents.map((item, index) => {
-
                 item.Name = item.Key.slice(prefixLen);
                 item.Type = 2;
                 item.CID = CIDList[index];

diff --git a/src/utils/BTFSUtil.js b/src/utils/BTFSUtil.js
@@ -159,11 +159,11 @@ export function ceilLatency(str) {
             let unit = str.replace(/[^a-zA-Z]/g, '');
             return numInt + ' ' + unit;
         } else {
-            return 'n/a'
+            return '--'
         }
     } catch (e) {
         console.log(e);
-        return 'n/a'
+        return '--'
     }
 }