Browse Source

fix try catch syntax

kaori 4 years ago
parent
commit
68962c9ed4

+ 1 - 1
packages/app/src/client/services/AdminHomeContainer.js

@@ -69,7 +69,7 @@ export default class AdminHomeContainer extends Container {
     }
     catch (err) {
       logger.error(err);
-      toastError(new Error('Failed to fetch data'));
+      throw new Error('Failed to retrive AdminHome data');
     }
   }
 

+ 8 - 8
packages/app/src/components/Admin/AdminHome/AdminHome.jsx

@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useCallback } from 'react';
 import PropTypes from 'prop-types';
 import { useTranslation } from 'react-i18next';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
@@ -22,21 +22,21 @@ const AdminHome = (props) => {
   const { t } = useTranslation();
   const { data: migrationStatus } = useSWRxV5MigrationStatus();
 
-  useEffect(() => {
-    const fetchAdminHomeData = async() => {
-      await adminHomeContainer.retrieveAdminHomeData();
-    };
-
+  const fetchAdminHomeData = useCallback(async() => {
     try {
-      fetchAdminHomeData();
+      await adminHomeContainer.retrieveAdminHomeData();
     }
     catch (err) {
-      toastError(err);
       adminHomeContainer.setState({ retrieveError: err });
+      toastError(err);
       logger.error(err);
     }
   }, [adminHomeContainer]);
 
+  useEffect(() => {
+    fetchAdminHomeData();
+  }, [fetchAdminHomeData]);
+
   return (
     <>
       {