datastake-daf 0.6.826 → 0.6.828

package/dist/hooks/index.js

@@ -2292,7 +2292,7 @@ const useWidgetFetch = ({
   };
   React.useEffect(() => {
     fetchData();
-  }, [config]);
+  }, [JSON.stringify(rest?.filters)]);
   return {
     data,
     loading,
@@ -2399,6 +2399,16 @@ const useGetQueryParams = ({
       product,
       ...rest
     } = queryParams;
+    const parsedSearchParams = safeJsonParse(rawSearchParams);
+    const otherParams = {
+      ...rest,
+      ...(product ? {
+        "products.typeOfProduct": product
+      } : {}),
+      ...(status ? {
+        published: status === "submitted"
+      } : {})
+    };
     return {
       paginationQuery: {
         skip: page,
@@ -2406,21 +2416,13 @@ const useGetQueryParams = ({
       },
       searchParams: {
         qs: search,
-        fields: safeJsonParse(rawSearchParams)
-      },
-      otherParams: {
-        ...rest,
-        ...(product && {
-          "products.typeOfProduct": product
-        }),
-        ...(status && {
-          published: status === "submitted" ? true : false
-        })
+        fields: parsedSearchParams
       },
+      otherParams,
       sortBy,
       sortDir
     };
-  }, [queryParams]);
+  }, [JSON.stringify(queryParams)]);
   return params;
 };
 

package/dist/pages/index.js

@@ -7491,7 +7491,7 @@ const useWidgetFetch = ({
   };
   React.useEffect(() => {
     fetchData();
-  }, [config]);
+  }, [JSON.stringify(rest?.filters)]);
   return {
     data,
     loading,
@@ -14419,6 +14419,9 @@ function MineSites({
     defaultData: [],
     stop: selectedPartners?.loading
   }), [activeTab, selectedPartners, filters]);
+  console.log({
+    dataFetchConfig
+  });
   const {
     data,
     loading,
@@ -40577,6 +40580,16 @@ const useGetQueryParams = ({
       product,
       ...rest
     } = queryParams;
+    const parsedSearchParams = safeJsonParse(rawSearchParams);
+    const otherParams = {
+      ...rest,
+      ...(product ? {
+        "products.typeOfProduct": product
+      } : {}),
+      ...(status ? {
+        published: status === "submitted"
+      } : {})
+    };
     return {
       paginationQuery: {
         skip: page,
@@ -40584,21 +40597,13 @@ const useGetQueryParams = ({
       },
       searchParams: {
         qs: search,
-        fields: safeJsonParse(rawSearchParams)
-      },
-      otherParams: {
-        ...rest,
-        ...(product && {
-          "products.typeOfProduct": product
-        }),
-        ...(status && {
-          published: status === "submitted" ? true : false
-        })
+        fields: parsedSearchParams
       },
+      otherParams,
       sortBy,
       sortDir
     };
-  }, [queryParams]);
+  }, [JSON.stringify(queryParams)]);
   return params;
 };
 
@@ -41564,7 +41569,7 @@ const getFilterOptions$c = (options, t) => {
 const formConfig$a = {
   namespace: 'OPERATOR',
   view: ['scoping', 'new'],
-  scope: 'global',
+  scope: 'createOperator',
   formType: 'operator'
 };
 const viewConfig$a = {
@@ -41991,7 +41996,7 @@ const getFilterOptions$b = (options, t) => {
 const formConfig$9 = {
   namespace: 'WORKERS',
   view: ['scoping', 'new'],
-  scope: 'global',
+  scope: 'createWorker',
   formType: 'worker'
 };
 const viewConfig$9 = {
@@ -44636,7 +44641,7 @@ const getFilterOptions$4 = (options, t) => {
 const formConfig$2 = {
   namespace: 'PRODUCTION SITES',
   view: ['scoping', 'new'],
-  scope: 'global',
+  scope: 'create',
   formType: 'production-sites'
 };
 const viewConfig$2 = {
@@ -45491,6 +45496,9 @@ const useFetchData = ({
   } = useGetQueryParams({
     location
   });
+  const tab = React.useMemo(() => {
+    return activeTab;
+  }, [activeTab]);
   React.useEffect(() => {
     const cleanSearchParams = Object.fromEntries(Object.entries(searchParams).filter(([_, value]) => value != null && value !== ''));
     const hasPagination = paginationQuery.skip != null || paginationQuery.take != null;
@@ -45506,12 +45514,12 @@ const useFetchData = ({
       ...(Object.keys(cleanSearchParams).length > 0 && {
         search: cleanSearchParams
       }),
-      tab: activeTab,
+      tab: tab,
       sortBy: {
         [sortBy || extendingSortKey || "updatedAt"]: sortDir ? sortDir === "ascend" ? 1 : -1 : extendingSortDir || -1
       }
     }, subject);
-  }, [location.search, activeTab, JSON.stringify(extendingFilters)]);
+  }, [location.search, JSON.stringify(extendingFilters)]);
 };
 const useTablePage = ({
   subject,
@@ -55413,14 +55421,19 @@ const PlantingActivitiesTimeline = ({
     const dataToProcess = !activitiesTimelineChart || !Array.isArray(activitiesTimelineChart) || activitiesTimelineChart.length === 0 ? [] : activitiesTimelineChart;
 
     // Process data without cumulative calculation (for activities timeline)
-    return processChartDateData({
+    const processedData = processChartDateData({
       mainData: dataToProcess,
       isCumulative: false,
       valueField: 'count'
     });
-  }, [activitiesTimelineChart, processChartDateData]);
 
-  // Calculate max value for Y-axis (default to 100 if all values are 0 or very small)
+    // Remove trailing periods with 0 jobs (optional: remove all zero if you prefer)
+    let lastNonZeroIndex = processedData.length - 1;
+    while (lastNonZeroIndex >= 0 && (processedData[lastNonZeroIndex].jobs || 0) === 0) {
+      lastNonZeroIndex--;
+    }
+    return processedData.slice(0, lastNonZeroIndex + 1);
+  }, [activitiesTimelineChart, processChartDateData]);
   const maxActivitiesYValue = React.useMemo(() => {
     if (!activitiesTimelineData || activitiesTimelineData.length === 0) {
       return 100;
@@ -55765,6 +55778,29 @@ const CyclePartners = ({
   });
 };
 
+// Custom tooltip labels per field/value
+const FIELD_TOOLTIP_LABELS = {
+  aidKitAccessible: {
+    compliant: "Available",
+    notCompliant: "Not available",
+    empty: "No data"
+  },
+  hsTrainingConfirmation: {
+    compliant: "Training delivered",
+    notCompliant: "No training",
+    empty: "No data"
+  },
+  duosFormed: {
+    compliant: "Duos formed",
+    notCompliant: "Not implemented",
+    empty: "No data"
+  },
+  presenceOfChildren: {
+    compliant: "None reported",
+    notCompliant: "Children present",
+    empty: "No data"
+  }
+};
 const HEALTH_SAFETY_COLORS = {
   compliant: '#016C6E',
   notCompliant: '#F97066',
@@ -55776,12 +55812,6 @@ const getIndicatorType$1 = value => {
   if (value === null || value === undefined) return "empty";
   return "empty";
 };
-
-/**
- * Gets health and safety distribution data from activity data
- * @param {Object} activityData - Activity data object
- * @returns {Object} Distribution object with compliant, notCompliant, and empty counts
- */
 const getHealthAndSafetyDistributionData = activityData => {
   // Define health and safety indicator fields
   const indicators = [{
@@ -55817,53 +55847,26 @@ const getHealthAndSafetyDistributionData = activityData => {
   });
   return distribution;
 };
-
-/**
- * Checks if the health and safety distribution data is empty
- * @param {Object} healthAndSafetyDistributionData - Distribution object
- * @returns {boolean} True if all values are 0 or empty
- */
 const isHealthAndSafetyDistributionEmpty = healthAndSafetyDistributionData => {
   return Object.values(healthAndSafetyDistributionData).every(val => !val || val === 0);
 };
-
-/**
- * Calculates pie chart data from health and safety distribution
- * @param {Object} healthAndSafetyDistributionData - Distribution object
- * @param {Function} t - Translation function
- * @returns {Array} Array of pie chart data points with value, percent, color, label, and key
- */
-const calculateHealthAndSafetyPieData = (healthAndSafetyDistributionData, t) => {
-  const total = Object.values(healthAndSafetyDistributionData).reduce((all, val) => all + (val || 0), 0);
+const calculateHealthAndSafetyPieData = (data, t, selectedField) => {
+  const total = Object.values(data).reduce((a, v) => a + (v || 0), 0);
   const labels = {
     compliant: t("Available"),
     notCompliant: t("Not available"),
     empty: t("Not answered")
   };
-  return Object.keys(healthAndSafetyDistributionData).map(key => {
-    const color = HEALTH_SAFETY_COLORS[key] || '#D9D9D9';
-    return {
-      value: healthAndSafetyDistributionData[key] || 0,
-      percent: total > 0 ? (healthAndSafetyDistributionData[key] || 0) / total : 0,
-      color: color,
-      label: labels[key] || key,
-      key: key
-    };
-  });
+  return Object.keys(data).map(key => ({
+    value: data[key] || 0,
+    percent: total > 0 ? (data[key] || 0) / total : 0,
+    color: HEALTH_SAFETY_COLORS[key] || '#D9D9D9',
+    label: labels[key] || key,
+    key,
+    keyOfField: selectedField //  <-- ADD THIS
+  }));
 };
-
-/**
- * Generates tooltip content for health and safety pie chart
- * Shows all statuses with their percentages
- * @param {Object} item - The pie chart item being hovered (not used, but kept for compatibility)
- * @param {boolean} isEmpty - Whether the distribution is empty
- * @param {Object} healthAndSafetyDistributionData - Distribution object
- * @param {Function} t - Translation function
- * @param {Function} renderTooltipJsx - Function to render tooltip JSX
- * @param {string} tooltipTitle - Title to display in the tooltip (defaults to "Health and Safety")
- * @returns {JSX.Element|null} Tooltip content or null
- */
-const getHealthAndSafetyTooltipChildren = (item, isEmpty, healthAndSafetyDistributionData, t, renderTooltipJsx, tooltipTitle = "Health and Safety") => {
+const getHealthAndSafetyTooltipChildren = (item, isEmpty, healthAndSafetyDistributionData, t, renderTooltipJsx, tooltipTitle = "Health and Safety", selectedField) => {
   // If empty or no data, return null to display nothing
   if (isEmpty || !Object.keys(healthAndSafetyDistributionData).length) {
     return null;
@@ -55876,10 +55879,10 @@ const getHealthAndSafetyTooltipChildren = (item, isEmpty, healthAndSafetyDistrib
   if (total === 0) {
     return null;
   }
-  const labels = {
+  const labels = FIELD_TOOLTIP_LABELS[item?.keyOfField] || {
     compliant: t("Available"),
     notCompliant: t("Not available"),
-    empty: t("Not answered")
+    empty: t("No data")
   };
 
   // Filter items with values > 0
@@ -55962,7 +55965,6 @@ const HealthAndSafety = ({
     getData: customGetData
   });
 
-  // Process the fetched pie chart data
   // The API returns data in format: [{count: 1, [field]: "null"}, {count: 1, [field]: "no"}, {count: 1, [field]: "yes"}]
   const healthAndSafetyDistributionData = React.useMemo(() => {
     if (!pieChartData) return {
@@ -56003,7 +56005,7 @@ const HealthAndSafety = ({
     return getHealthAndSafetyDistributionData(pieChartData);
   }, [pieChartData, selectedField]);
   const isEmpty = React.useMemo(() => isHealthAndSafetyDistributionEmpty(healthAndSafetyDistributionData), [healthAndSafetyDistributionData]);
-  const pieData = React.useMemo(() => calculateHealthAndSafetyPieData(healthAndSafetyDistributionData, t), [healthAndSafetyDistributionData, t]);
+  const pieData = React.useMemo(() => calculateHealthAndSafetyPieData(healthAndSafetyDistributionData, t, selectedField), [healthAndSafetyDistributionData, t, selectedField]);
 
   // Get the label for the selected field to use as tooltip title
   const selectedFieldLabel = React.useMemo(() => {
@@ -56017,9 +56019,10 @@ const HealthAndSafety = ({
   return /*#__PURE__*/jsxRuntime.jsx(Widget, {
     loading: loading || pieChartLoading,
     title: /*#__PURE__*/jsxRuntime.jsx("div", {
-      children: t("Health and Safety")
+      children: t("Operational Health & Safety")
     }),
-    className: "with-border-header h-w-btn-header ",
+    className: "with-border-header h-w-btn-header",
+    description: t("Across all activities in this cycle."),
     addedHeader: /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
       children: [/*#__PURE__*/jsxRuntime.jsx("div", {
         className: "flex-1"
@@ -56338,17 +56341,41 @@ const JobsTimeline = ({
     defaultFilter: 'monthly'
   });
   const jobsData = Array.isArray(dayJobsTimeline) ? dayJobsTimeline : dayJobsTimeline?.jobsTimeline || dayJobsTimeline?.jobs || dayJobsTimeline?.timeline || [];
+
+  // const jobsTimelineData = useMemo(() => {
+  //     // Always process data, even if empty, to generate default date range for x-axis
+  //     const dataToProcess = (!jobsData || !Array.isArray(jobsData) || jobsData.length === 0) 
+  //         ? [] 
+  //         : jobsData;
+
+  //     // Process data without cumulative calculation (for jobs timeline)
+  //     // Try to find value in total, count, jobs, or value fields
+  //     return processChartDateData({
+  //         mainData: dataToProcess,
+  //         isCumulative: false,
+  //         valueField: 'total', // Will fallback to count/jobs/value if total doesn't exist
+  //     });
+  // }, [jobsData, processChartDateData]);
+
   const jobsTimelineData = React.useMemo(() => {
-    // Always process data, even if empty, to generate default date range for x-axis
+    // Prepare data first
     const dataToProcess = !jobsData || !Array.isArray(jobsData) || jobsData.length === 0 ? [] : jobsData;
 
-    // Process data without cumulative calculation (for jobs timeline)
-    // Try to find value in total, count, jobs, or value fields
-    return processChartDateData({
+    // Process data without cumulative calculation
+    const processedData = processChartDateData({
       mainData: dataToProcess,
       isCumulative: false,
-      valueField: 'total' // Will fallback to count/jobs/value if total doesn't exist
+      valueField: 'total' // fallback handled inside processChartDateData
     });
+
+    // Find last index with jobs > 0
+    let lastNonZeroIndex = processedData.length - 1;
+    while (lastNonZeroIndex >= 0 && (processedData[lastNonZeroIndex].jobs || 0) === 0) {
+      lastNonZeroIndex--;
+    }
+
+    // Slice up to last period with data
+    return processedData.slice(0, lastNonZeroIndex + 1);
   }, [jobsData, processChartDateData]);
   const maxYValue = React.useMemo(() => {
     if (!jobsTimelineData || jobsTimelineData.length === 0) {
@@ -61746,14 +61773,18 @@ 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";
@@ -61796,7 +61827,7 @@ class LinkedSubjectsService extends BaseService {
     version
   }) {
     return this.apiGet({
-      url: `/${namespace === "nashirikiEvent" ? "event" : namespace}/${id}`,
+      url: `/${getNamespace(namespace)}/${id}`,
       isApp: true,
       signal,
       params: {
@@ -62112,7 +62143,7 @@ const View = ({
     "management-location": "location",
     "management-stakeholder": "stakeholder",
     "management-event": "event",
-    "management-incident": "incident"
+    "management-document": "document"
   };
   const handleDeleteSubject = React.useCallback(async () => {
     try {

package/dist/services/index.js

@@ -1535,14 +1535,18 @@ 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";
@@ -1585,7 +1589,7 @@ class LinkedSubjectsService extends BaseService {
     version
   }) {
     return this.apiGet({
-      url: `/${namespace === "nashirikiEvent" ? "event" : namespace}/${id}`,
+      url: `/${getNamespace(namespace)}/${id}`,
       isApp: true,
       signal,
       params: {

package/package.json

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

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/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,10 @@ function MineSites({
 			stop: selectedPartners?.loading,
 		}),
 		[activeTab, selectedPartners, filters],
+
 	);
-  const { data, loading, setData } = useWidgetFetch({config: dataFetchConfig});
+	console.log({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',
 }