datastake-daf 0.6.828 → 0.6.830

package/dist/pages/index.js

@@ -14419,9 +14419,6 @@ function MineSites({
     defaultData: [],
     stop: selectedPartners?.loading
   }), [activeTab, selectedPartners, filters]);
-  console.log({
-    dataFetchConfig
-  });
   const {
     data,
     loading,
@@ -45496,9 +45493,7 @@ const useFetchData = ({
   } = useGetQueryParams({
     location
   });
-  const tab = React.useMemo(() => {
-    return activeTab;
-  }, [activeTab]);
+  const prevParamsRef = React.useRef();
   React.useEffect(() => {
     const cleanSearchParams = Object.fromEntries(Object.entries(searchParams).filter(([_, value]) => value != null && value !== ''));
     const hasPagination = paginationQuery.skip != null || paginationQuery.take != null;
@@ -45507,19 +45502,25 @@ const useFetchData = ({
     }
     const extendingSortKey = extendingFilters?.sortBy ? Object.keys(extendingFilters.sortBy)[0] : null;
     const extendingSortDir = extendingFilters?.sortBy && extendingSortKey ? extendingFilters.sortBy[extendingSortKey] : null;
-    getData({
+    const currentParams = {
       ...extendingFilters,
       pagination: paginationQuery,
       ...(Object.keys(otherParams).length > 0 && otherParams),
       ...(Object.keys(cleanSearchParams).length > 0 && {
         search: cleanSearchParams
       }),
-      tab: tab,
+      tab: activeTab,
       sortBy: {
         [sortBy || extendingSortKey || "updatedAt"]: sortDir ? sortDir === "ascend" ? 1 : -1 : extendingSortDir || -1
       }
-    }, subject);
-  }, [location.search, JSON.stringify(extendingFilters)]);
+    };
+    const currentParamsString = JSON.stringify(currentParams);
+    if (prevParamsRef.current === currentParamsString) {
+      return;
+    }
+    prevParamsRef.current = currentParamsString;
+    getData(currentParams, subject);
+  }, [location.search, JSON.stringify(extendingFilters), activeTab]);
 };
 const useTablePage = ({
   subject,
@@ -50665,13 +50666,6 @@ const Content = ({
       }
       return all;
     }, {});
-    console.log({
-      groups,
-      singleGroupsKeys,
-      addedContent,
-      _length,
-      groupped
-    });
     return Object.keys(groupped).map(key => {
       const groups = groupped[key];
       return /*#__PURE__*/jsxRuntime.jsx(React__default["default"].Fragment, {
@@ -62152,7 +62146,7 @@ const View = ({
         id: id
       });
       antd.message.success(t("Subject deleted successfully"));
-      //   push(getRedirectLink(`/app/management/subject/${subjects[namespace]}`));
+      push(getRedirectLink(`/app/management/subjects/${subjects[namespace]}`));
     } catch (error) {
       handleError(error);
       antd.message.error(t("Failed to delete subject"));

package/dist/utils/index.js

@@ -15074,6 +15074,30 @@ const getAdminLevelName = (data, level) => {
   return entry?.name || "-";
 };
 
+const formatDataForTable = (data, options) => {
+  // If data is an array, take the first element
+  const dataObj = Array.isArray(data) ? data[0] : data;
+  return {
+    data: {
+      data: (dataObj.data || []).map(({
+        children,
+        ...rest
+      }) => {
+        if (Array.isArray(children) && children.length === 0) {
+          return rest;
+        }
+        return {
+          ...rest,
+          children
+        };
+      }),
+      meta: dataObj.data
+    },
+    ...(Object.keys(options)?.length > 0 && options),
+    totalItems: Array.isArray(dataObj?.meta) ? dataObj?.meta?.[0]?.total : dataObj?.meta?.total || 0
+  };
+};
+
 exports.ErrorFormat = ErrorFormat;
 exports.MessageTypes = MessageTypes;
 exports.StorageManager = StorageManager;
@@ -15112,6 +15136,7 @@ exports.filterParams = filterParams;
 exports.filterSelectOptions = filterSelectOptions;
 exports.filterString = filterString;
 exports.findOptions = findOptions;
+exports.formatDataForTable = formatDataForTable;
 exports.formatErrors = formatErrors;
 exports.formatToKebabCase = formatToKebabCase$1;
 exports.getAdminLevelName = getAdminLevelName;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.828",
+	"version": "0.6.830",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/core/components/Screens/Admin/adminRoutes.js

@@ -25,8 +25,6 @@ export function getAdminRoutes(config) {
 
   const APP_PREFIX = `APP_${appName.toUpperCase()}`;
 
-  console.log({useAdminEventsConfig})
-
   function DashboardWrapper() {
     const dashboardConfig = useAdminDashboardConfig();
     return <AdminDashboardScreen config={dashboardConfig} />;

package/src/@daf/core/components/ViewForm/content.jsx

@@ -130,7 +130,6 @@ const Content = ({
 			return all;
 		}, {});
 
-		console.log({groups, singleGroupsKeys, addedContent, _length, groupped})
 
 		return Object.keys(groupped).map((key) => {
 			const groups = groupped[key];

package/src/@daf/pages/Dashboards/UserDashboard/components/MineSites/index.jsx

@@ -72,7 +72,6 @@ function MineSites({
 		[activeTab, selectedPartners, filters],
 
 	);
-	console.log({dataFetchConfig})
   	const { data, loading, setData } = useWidgetFetch({config: dataFetchConfig});
 
 	const tabs = useMemo(() => getTabs(t), [t]);

package/src/@daf/pages/TablePage/hook.js

@@ -1,4 +1,4 @@
-import { useState, useEffect, useCallback, useMemo } from 'react';
+import { useState, useEffect, useCallback, useMemo, useRef } from 'react';
 import { useGetQueryParams } from "../../hooks/useGetQueryParams.js";
 import { 
     getFiltersConfig,
@@ -18,10 +18,8 @@ export const useFetchData = ({
     subject,
 }) => {
     const { paginationQuery, searchParams, otherParams, sortBy, sortDir, } = useGetQueryParams({location});
-
-    const tab = useMemo(() => {
-        return activeTab;
-    }, [activeTab])
+    
+    const prevParamsRef = useRef();
         
     useEffect(() => {
         const cleanSearchParams = Object.fromEntries(
@@ -37,17 +35,26 @@ export const useFetchData = ({
         const extendingSortKey = extendingFilters?.sortBy ? Object.keys(extendingFilters.sortBy)[0] : null;
         const extendingSortDir = extendingFilters?.sortBy && extendingSortKey ? extendingFilters.sortBy[extendingSortKey] : null;
 
-        getData({
+        const currentParams = {
             ...extendingFilters,
             pagination: paginationQuery,
             ...(Object.keys(otherParams).length > 0 && otherParams ),
             ...(Object.keys(cleanSearchParams).length > 0 && { search: cleanSearchParams }),
-            tab: tab,
+            tab: activeTab,
             sortBy: {
                 [sortBy || extendingSortKey || "updatedAt"]: sortDir ? (sortDir === "ascend" ? 1 : -1) : (extendingSortDir || -1),
             },
-        }, subject)
-    }, [location.search, JSON.stringify(extendingFilters)]);
+        };
+
+        const currentParamsString = JSON.stringify(currentParams);
+        if (prevParamsRef.current === currentParamsString) {
+            return;
+        }
+        
+        prevParamsRef.current = currentParamsString;
+
+        getData(currentParams, subject);
+    }, [location.search, JSON.stringify(extendingFilters), activeTab]);
 }
 
 export const useTablePage = ({

package/src/@daf/pages/View/index.jsx

@@ -146,7 +146,7 @@ const View = ({
             id: id,
           });
           message.success(t("Subject deleted successfully"));
-        //   push(getRedirectLink(`/app/management/subject/${subjects[namespace]}`));
+          push(getRedirectLink(`/app/management/subjects/${subjects[namespace]}`));
         } catch (error) {
           handleError(error);
           message.error(t("Failed to delete subject"));

package/src/helpers/dataFetch.js

@@ -0,0 +1,19 @@
+export const formatDataForTable = (data, options) => {
+    // If data is an array, take the first element
+    const dataObj = Array.isArray(data) ? data[0] : data;
+    
+    return {
+        data: {
+            data: (dataObj.data || []).map(({ children, ...rest }) => {
+                if (Array.isArray(children) && children.length === 0) {
+                  return rest;
+                }
+              
+                return { ...rest, children }; 
+            }),
+            meta: dataObj.data,
+        },
+        ...(Object.keys(options)?.length > 0 && options),
+        totalItems: Array.isArray(dataObj?.meta) ? dataObj?.meta?.[0]?.total : dataObj?.meta?.total || 0,
+    }
+}

package/src/utils.js

@@ -66,4 +66,6 @@ export { copyToClipboard } from './helpers/copyToClipboard.js'
 
 export { isArrayOfObjects } from './@daf/utils/arrays.js'
 
-export { getAdminLevelName } from './helpers/adminLevels.js'
+export { getAdminLevelName } from './helpers/adminLevels.js'
+
+export { formatDataForTable } from './helpers/dataFetch.js'