datastake-daf 0.6.835 → 0.6.838

package/dist/hooks/index.js

@@ -2277,14 +2277,13 @@ class DashboardService extends BaseService {
       isUserManager: true
     });
   }
-
-  // getWidgetConflictManagement({ url, params = {}, filters = {} }) {
-  //   return this.apiGet({
-  //     url: `/dashboard/conflict-management${url}`,
-  //     params: { ...params, ...filters },
-  //     isApp: true,
-  //   });
-  // }
+  getWidgetConflictManagement(url, params, basepath = "dashboard/conflict-management") {
+    return this.apiGet({
+      url: `/${basepath}${url}`,
+      params,
+      isApp: true
+    });
+  }
 }
 var DashboardService$1 = createLazyService(DashboardService);
 
@@ -2308,6 +2307,8 @@ const useWidgetFetch = ({
   } = config;
   const [data, setData] = React.useState(defaultData || {});
   const [loading, setLoading] = React.useState(false);
+  const [initFetchDone, setInitFetchDone] = React.useState(false);
+  const isMounted = React.useRef(true);
   const fetchData = async () => {
     if (stop) {
       return;
@@ -2317,6 +2318,7 @@ const useWidgetFetch = ({
       const {
         data
       } = await getData(rest);
+      if (!isMounted.current) return;
       setData(data || defaultData);
       if (isErrorResponse(data)) {
         const errorMessage = getErrorMessage(data);
@@ -2324,18 +2326,28 @@ const useWidgetFetch = ({
         return;
       }
       onFetch();
+      setInitFetchDone(true);
     } catch (err) {
       console.log(err);
     }
-    setLoading(false);
+    if (isMounted.current) {
+      setLoading(false);
+    }
   };
+  React.useEffect(() => {
+    isMounted.current = true;
+    return () => {
+      isMounted.current = false;
+    };
+  }, []);
   React.useEffect(() => {
     fetchData();
-  }, [JSON.stringify(rest?.filters)]);
+  }, [JSON.stringify(config)]);
   return {
     data,
     loading,
-    setData
+    setData,
+    initFetchDone
   };
 };