🔧 Update Module

frontend/src/components/SelectAsync/index.jsx

@@ -15,7 +15,6 @@ export default function SelectAsync({
   withRedirect = false,
   urlToRedirect = '/',
 }) {
-  const [isLoading, setIsLoading] = useState(false);
   const [selectOptions, setOptions] = useState([]);
   const [currentValue, setCurrentValue] = useState(undefined);
 
@@ -26,9 +25,8 @@ export default function SelectAsync({
   };
   const { result, isLoading: fetchIsLoading, isSuccess } = useFetch(asyncList);
   useEffect(() => {
-    isSuccess ? setOptions(result) : setOptions([]);
-    setIsLoading(fetchIsLoading);
-  }, [fetchIsLoading]);
+    isSuccess && setOptions(result);
+  }, [isSuccess]);
 
   const labels = (optionField) => {
     return displayLabels.map((x) => optionField[x]).join(' ');
@@ -55,8 +53,8 @@ export default function SelectAsync({
 
   return (
     <Select
-      loading={isLoading}
-      disabled={isLoading}
+      loading={fetchIsLoading}
+      disabled={fetchIsLoading}
       value={currentValue}
       onChange={handleSelectChange}
     >

frontend/src/hooks/useFetch/index.jsx

@@ -26,26 +26,7 @@ function useFetchData(fetchFunction) {
 }
 
 export default function useFetch(fetchFunction) {
-   const [data, setData] = useState(null);
-   const [isLoading, setLoading] = useState(true);
-   const [isSuccess, setSuccess] = useState(false);
-   const [error, setError] = useState(null);
+  const { data, isLoading, isSuccess, error } = useFetchData(fetchFunction);
 
-   useEffect(() => {
-     async function fetchData() {
-       try {
-         const data = await fetchFunction();
-         setData(data.result);
-         setSuccess(true);
-       } catch (error) {
-         setError(error);
-       } finally {
-         setLoading(false);
-       }
-     }
-
-     fetchData();
-   }, [isLoading]);
-
-   return { data, isLoading, isSuccess, error };
+  return { result: data, isLoading, isSuccess, error };
 }

frontend/src/modules/PaymentModule/PaymentDataTableModule/index.jsx

@@ -1,11 +1,10 @@
 import { ErpLayout } from '@/layout';
-import PaymentERP from './components/PaymentERP';
-import DataTableDropMenu from './components/DataTableDropMenu';
+import ErpPanel from '@/modules/ErpPanelModule';
 
 export default function PaymentDataTableModule({ config }) {
   return (
     <ErpLayout>
-      <PaymentERP config={config}></PaymentERP>
+      <ErpPanel config={config}></ErpPanel>
     </ErpLayout>
   );
 }

frontend/src/modules/PaymentModule/ReadPaymentModule/index.jsx

@@ -4,13 +4,13 @@ import ReadItem from './components/ReadItem';
 import PageLoader from '@/components/PageLoader';
 import { erp } from '@/redux/erp/actions';
 import { selectItemById, selectCurrentItem } from '@/redux/erp/selectors';
-import { useEffect, useState } from 'react';
+import { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { useParams, useHistory } from 'react-router-dom';
+import { useParams } from 'react-router-dom';
 
 export default function ReadPaymentModule({ config }) {
   const dispatch = useDispatch();
-  const history = useHistory();
+
   const { id } = useParams();
   let item = useSelector(selectItemById(id));
 
@@ -20,7 +20,6 @@ export default function ReadPaymentModule({ config }) {
     } else {
       dispatch(erp.read({ entity: config.entity, id }));
     }
-    console.log('useEffect item');
   }, [item]);
 
   const { result: currentResult } = useSelector(selectCurrentItem);

frontend/src/modules/PaymentModule/UpdatePaymentModule/components/UpdatePayment.jsx

@@ -12,7 +12,7 @@ import { selectCurrentLang } from '@/redux/lang/selectors';
 import Loading from '@/components/Loading';
 
 import calculate from '@/utils/calculate';
-import PaymentForm from '../../Forms/PaymentForm';
+import PaymentForm from '@/forms/PaymentForm';
 export default function UpdatePayment({ config, currentInvoice }) {
   let { entity } = config;
   const dispatch = useDispatch();