datastake-daf 0.6.827 → 0.6.829

package/src/@daf/core/components/Screens/Admin/AdminTables/EventsTable/helper.js

@@ -16,28 +16,10 @@ export const getTabs = ({ t }) => {
 };
 
 export const selectFiltersConfig = {
-	category: {
+	eventsType: {
 		type: "select",
-		label: "Category",
-		placeholder: (t) => t("Category"),
-		style: { flex: 1 },
-		labelStyle: { flex: 1 },
-		getLabel: (option) => option.label,
-		getValue: (option) => option.value,
-	},
-	country: {
-		type: "select",
-		label: "Country",
-		placeholder: (t) => t("Country"),
-		style: { flex: 1 },
-		labelStyle: { flex: 1 },
-		getLabel: (option) => option.label,
-		getValue: (option) => option.value,
-	},
-	sources: {
-		type: "select",
-		label: "Sources",
-		placeholder: (t) => t("Sources"),
+		label: "type",
+		placeholder: (t) => t("type"),
 		style: { flex: 1 },
 		labelStyle: { flex: 1 },
 		getLabel: (option) => option.label,
@@ -45,6 +27,20 @@ export const selectFiltersConfig = {
 	},
 };
 
+export const getSelectFiltersConfig = ({t}) => {
+	return {
+		eventsType: {
+			type: "select",
+			label: "type",
+			placeholder: t("type"),
+			style: { flex: 1 },
+			labelStyle: { flex: 1 },
+			getLabel: (option) => option.label,
+			getValue: (option) => option.value,
+		},
+	}
+};
+
 export const filtersConfig = {
 	name: "",
 	datastakeId: "",

package/src/@daf/core/components/Screens/Admin/AdminTables/EventsTable/index.jsx

@@ -5,10 +5,10 @@ import DAFTable from "../../../../Table/index.jsx";
 import { theme, Tag, message } from "antd";
 import CustomIcon from "../../../../Icon/CustomIcon.jsx";
 import {
-	selectFiltersConfig,
 	filtersConfig,
 	defaultUrlParams,
 	checkboxConfig,
+	getSelectFiltersConfig,
 } from "./helper.js";
 import { getColumns } from "./column.js";
 import { getTabs } from "../helper.js";
@@ -37,6 +37,10 @@ export default function EventsTable({
 	const [selectedEvents, setSelectedEvents] = useState([]);
 	const { token } = useToken();
 
+	const selectFiltersConfig = useMemo(() => {
+		return getSelectFiltersConfig({t});
+	}, [t]);
+
 	const {
 		filter,
 		activeTab,
@@ -64,8 +68,6 @@ export default function EventsTable({
 		return options;
 	}, [options]);
 
-
-
 	const columns = useMemo(() => {
 		return getColumns({
 			t,

package/src/@daf/core/components/Screens/Admin/AdminTables/hook.js

@@ -67,7 +67,6 @@ export function useAdminTable({
 			const params = filterParams({
 				activeFilters: filter.activeFilters,
 			});
-			console.log(params, "params");
 			const { data } = await getData({ params });
 			setData(data.data || data);
 			filter.setPagination((prev) => ({ ...prev, total: data?.meta?.total || data?.length || 0 }));
@@ -109,8 +108,6 @@ export const useGetParams = ({location}) => {
 
 	const { activeTab, ...rest } = otherParams;
 
-	console.log({hasPagination})
-
 	const params = useMemo(() => {
 		if (!hasPagination) {
 			return {

package/src/@daf/core/components/Screens/Admin/AdminViews/index.jsx

@@ -153,7 +153,8 @@ function AdminView({
 						};
 
 						try {
-							await updateAccount({ id: editData.id, data: newData });
+							const { data} = await updateAccount({ id: editData.id, data: newData });
+							console.log({data})
 
 							console.log('Checking for pending users...', {
 								hasPendingUsers: pendingUsers.length > 0,

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/hooks/useGetQueryParams.js

@@ -1,30 +1,49 @@
 import { useMemo } from "react";
 import { safeJsonParse } from "../../helpers/StringHelper.js";
 
-export const useGetQueryParams = ({location}) => {
-    const queryParams = useMemo(() => {
-        const params = new URLSearchParams(location?.search);
-        return Object.fromEntries(params.entries());
-    }, [location.search]);
+export const useGetQueryParams = ({ location }) => {
+  const queryParams = useMemo(() => {
+    const params = new URLSearchParams(location?.search);
+    return Object.fromEntries(params.entries());
+  }, [location.search]);
 
-    const params = useMemo(() => {
-        const { page, pageSize, search, searchParams: rawSearchParams, sortBy, sortDir, status, product, ...rest } = queryParams;
-          
-        return {
-          paginationQuery: { skip: page, take: pageSize },
-          searchParams: {
-            qs: search,
-            fields: safeJsonParse(rawSearchParams),
-          },
-          otherParams: {
-            ...rest,
-            ...(product && { "products.typeOfProduct": product }),
-            ...(status && { published: status === "submitted" ? true : false }),
-          },
-          sortBy,
-          sortDir,
-        };
-      }, [queryParams]);
+  const params = useMemo(() => {
+    const {
+      page,
+      pageSize,
+      search,
+      searchParams: rawSearchParams,
+      sortBy,
+      sortDir,
+      status,
+      product,
+      ...rest
+    } = queryParams;
 
-    return params;
-}
+    const parsedSearchParams = safeJsonParse(rawSearchParams);
+
+    const otherParams = {
+      ...rest,
+      ...(product ? { "products.typeOfProduct": product } : {}),
+      ...(status ? { published: status === "submitted" } : {}),
+    };
+
+    return {
+      paginationQuery: {
+        skip: page,
+        take: pageSize,
+      },
+      searchParams: {
+        qs: search,
+        fields: parsedSearchParams,
+      },
+      otherParams,
+      sortBy,
+      sortDir,
+    };
+  }, [
+    JSON.stringify(queryParams),
+  ]);
+
+  return params;
+};

package/src/@daf/hooks/useWidgetFetch.js

@@ -35,7 +35,7 @@ export const useWidgetFetch = ({config, getData = DashboardService.getWidget, on
 
     useEffect(() => {
         fetchData();
-    }, [config]);
+    }, [JSON.stringify(rest?.filters)]);
 
     return {
         data,

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

@@ -70,8 +70,9 @@ function MineSites({
 			stop: selectedPartners?.loading,
 		}),
 		[activeTab, selectedPartners, filters],
+
 	);
-  const { data, loading, setData } = useWidgetFetch({config: dataFetchConfig});
+  	const { data, loading, setData } = useWidgetFetch({config: dataFetchConfig});
 
 	const tabs = useMemo(() => getTabs(t), [t]);
 

package/src/@daf/pages/Locations/MineSite/config.js

@@ -149,7 +149,7 @@ export const getFilterOptions = (options, t) => {
 export const formConfig = {
 	namespace: 'PRODUCTION SITES',
 	view: ['scoping', 'new'],
-	scope: 'global',
+	scope: 'create',
 	formType: 'production-sites',
 }
 

package/src/@daf/pages/Stakeholders/Operators/config.js

@@ -147,7 +147,7 @@ export const getFilterOptions = (options, t) => {
 export const formConfig = {
 	namespace: 'OPERATOR',
 	view: ['scoping', 'new'],
-	scope: 'global',
+	scope: 'createOperator',
 	formType: 'operator',
 }
 

package/src/@daf/pages/Stakeholders/Workers/config.js

@@ -137,7 +137,7 @@ export const getFilterOptions = (options, t) => {
 export const formConfig = {
 	namespace: 'WORKERS',
 	view: ['scoping', 'new'],
-	scope: 'global',
+	scope: 'createWorker',
 	formType: 'worker',
 }
 

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,6 +18,9 @@ export const useFetchData = ({
     subject,
 }) => {
     const { paginationQuery, searchParams, otherParams, sortBy, sortDir, } = useGetQueryParams({location});
+    
+    const prevParamsRef = useRef();
+        
     useEffect(() => {
         const cleanSearchParams = Object.fromEntries(
             Object.entries(searchParams).filter(([_, value]) => value != null && value !== '')
@@ -32,7 +35,7 @@ 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 ),
@@ -41,8 +44,17 @@ export const useFetchData = ({
             sortBy: {
                 [sortBy || extendingSortKey || "updatedAt"]: sortDir ? (sortDir === "ascend" ? 1 : -1) : (extendingSortDir || -1),
             },
-        }, subject)
-    }, [location.search, activeTab, 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

@@ -135,7 +135,7 @@ const View = ({
         "management-location": "location",
         "management-stakeholder": "stakeholder",
         "management-event": "event",
-        "management-incident": "incident",
+        "management-document": "document",
     }
 
 

package/src/@daf/services/LinkedSubjects.js

@@ -7,14 +7,18 @@ export const getNamespace = (namespace) => {
 	let _namespace = namespace;
 	switch (namespace) {
 		case "locations":
+		case "location":
 			_namespace = "location";
 			break;
 		case "stakeholders":
+		case "stakeholder":
 			_namespace = "stakeholder";
 			break;
 		case "documents":
+		case "document":
 			_namespace = "document";
 			break;
+		case "event":
 		case "nashirikiEvent":
 		case "events":
 			_namespace = "event";
@@ -50,7 +54,7 @@ class LinkedSubjectsService extends BaseService {
 
     getOne({ id, signal, namespace, sourceId, source, version }) {
 		return this.apiGet({
-			url: `/${namespace === "nashirikiEvent" ? "event" : namespace}/${id}`,
+			url: `/${getNamespace(namespace)}/${id}`,
 			isApp: true,
 			signal,
 			params: { authorId: sourceId, source, version },

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'