datastake-daf 0.6.825 → 0.6.827

package/dist/utils/index.js

@@ -11601,7 +11601,7 @@ const sp = {
   "unlinkData": "¿Está seguro de que desea eliminar este enlace?",
   "Link": "Enlace",
   "riskMitigationMeasures": "Medidas de mitigación del riesgo",
-  "other": "Otros",
+  "other": "Otro",
   "Reset": "Restablecer",
   "Lir Details": "Detalles LIR",
   "Locations": "Ubicaciones",

package/package.json

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

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

@@ -37,12 +37,6 @@ export default function DocumentsTable({
 	const [selectedDocuments, setSelectedDocuments] = useState([]);
 	const { token } = useToken();
 
-	const transformedParams = useGetParams({location});
-
-	const getDataWithStringPagination = async () => {						
-		return getData({ params: transformedParams });
-	};
-
 	const {
 		filter,
 		activeTab,
@@ -62,17 +56,13 @@ export default function DocumentsTable({
 		defaultPageSize,
 		filtersConfig,
 		getRedirectLink,
-		getData: getDataWithStringPagination,
+		getData: getData,
 		refetchTrigger,
 	});
 
 	const selectOptions = useMemo(() => {
-		return {
-			category: config.options?.category,
-			country: config.options?.countries,
-			sources: [],
-		};
-	}, [config.options]);
+		return options;
+	}, [options]);
 
 	const columns = useMemo(() => {
 		return getColumns({

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

@@ -57,7 +57,7 @@ export const getColumns = ({
 					label: typeof item.label === 'object' ? Object.values(item.label)[1] : item.label,
 				}))
 
-				const type = findOptions(value, options?.eventsType || []) || "-";
+				const type = (value === 'other' ? t(value) : findOptions(value, options?.eventsType || [])) || "-";
 
 				return <Tooltip title={type}>{type}</Tooltip>;
 			},

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

@@ -37,12 +37,6 @@ export default function EventsTable({
 	const [selectedEvents, setSelectedEvents] = useState([]);
 	const { token } = useToken();
 
-	const transformedParams = useGetParams({location});
-
-	const getDataWithStringPagination = async () => {						
-		return getData({ params: transformedParams });
-	};
-
 	const {
 		filter,
 		activeTab,
@@ -62,7 +56,7 @@ export default function EventsTable({
 		defaultPageSize,
 		filtersConfig,
 		getRedirectLink,
-		getData: getDataWithStringPagination,
+		getData: getData,
 		refetchTrigger,
 	});
 

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

@@ -42,12 +42,6 @@ export default function LocationTable({
     const { token } = useToken();
 	const [isCombineModalOpen, setIsModalOpen] = useState(false);
 
-	const transformedParams = useGetParams({location});
-
-	const getDataWithStringPagination = async () => {
-		return getData({ params: transformedParams });
-	};
-
 	const {
 		filter,
 		activeTab,
@@ -67,7 +61,7 @@ export default function LocationTable({
 		defaultPageSize,
 		filtersConfig,
 		getRedirectLink,
-		getData: getDataWithStringPagination,
+		getData: getData,
 		refetchTrigger,
 	});
 

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

@@ -39,12 +39,6 @@ export default function SubjectsTable({
 	const [selectedSubjects, setSelectedSubjects] = useState([]);
 	const { token } = useToken();
 	const [isCombineModalOpen, setIsModalOpen] = useState(false);
-	const transformedParams = useGetParams({location});
-
-	const getDataWithStringPagination = async () => {
-		return getData({ params: transformedParams });
-	};
-
 
 	const {
 		filter,
@@ -65,7 +59,7 @@ export default function SubjectsTable({
 		defaultPageSize,
 		filtersConfig,
 		getRedirectLink,
-		getData: getDataWithStringPagination,
+		getData: getData,
 		refetchTrigger,
 	});
 

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

@@ -105,13 +105,21 @@ export const useGetParams = ({location}) => {
 		Object.entries(searchParams).filter(([_, value]) => value != null && value !== '')
 	);
 
-	const hasPagination = paginationQuery.skip != null || paginationQuery.take != null;
+	const hasPagination = paginationQuery?.skip != null || paginationQuery?.take != null;
 
 	const { activeTab, ...rest } = otherParams;
 
+	console.log({hasPagination})
+
 	const params = useMemo(() => {
 		if (!hasPagination) {
-			return undefined;
+			return {
+				pagination: {
+					skip: 1,
+					take: 20,
+				},
+				tab: 'active'
+			};
 		}
 		
 		return {
@@ -120,7 +128,7 @@ export const useGetParams = ({location}) => {
 			...(Object.keys(cleanSearchParams)?.length > 0 && { search: cleanSearchParams }),
 			tab: activeTab,
 		}
-	}, [location.search, hasPagination, paginationQuery, rest, cleanSearchParams, activeTab]);
+	}, [location.search]);
 
 	return params;
 }
@@ -141,7 +149,8 @@ export function useSubjectsAdminTable({
 	const [initFetchDone, setInitFetchDone] = useState(false);
 	const [loading, setLoading] = useState(false);
 	const [data, setData] = useState([]);
-
+	const params = useGetParams({location});
+	
 	const filter = useFilters({
 		goTo,
 		location,
@@ -163,7 +172,7 @@ export function useSubjectsAdminTable({
 	const fetchData = useCallback(async () => {
 		try {
 			setLoading(true);
-			const { data } = await getData();
+			const { data } = await getData({ params });
 			setData(data.data || data || []);
 			filter.setPagination((prev) => ({ ...prev, total: data?.meta?.total || data?.length || 0 }));
 			if (!initFetchDone) {
@@ -173,11 +182,11 @@ export function useSubjectsAdminTable({
 		} catch (err) {
 			console.log(err);
 		}
-	}, [filter.activeFilters, refetchTrigger]);
+	}, [params]);
 
 	useEffect(() => {
 		fetchData();
-	}, [fetchData, refetchTrigger]);
+	}, [params, refetchTrigger]);
 
 	return {
 		filter,

package/src/@daf/pages/Events/Testimonials/config.js

@@ -165,7 +165,7 @@ export const getFilterOptions = (options, t) => {
 export const formConfig = {
 	namespace: 'testimonials',
 	view: 'testimonials',
-	scope: 'create',
+	scope: 'createTestimonial',
 	formType: 'testimonial',
 }
 

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

@@ -31,7 +31,7 @@ export const getFilterOptions = (options, t) => {
 export const formConfig = {
 	namespace: 'conflict-areas',
 	view: ['scoping', 'new'],
-	scope: 'conflictAreaCreate',
+	scope: 'createConflictArea',
 	formType: 'conflict-area',
 }
 

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

@@ -60,7 +60,7 @@ export const getFilterOptions = (options, t) => {
 export const formConfig = {
 	namespace: 'armed-groups',
 	view: ['scoping', 'new'],
-	scope: 'global',
+	scope: 'createArmedGroup',
 	formType: 'armed-group',
 }
 

package/src/@daf/pages/Summary/Activities/PlantingCycle/components/CommunityParticipation/JobsTimeline/index.jsx

@@ -20,21 +20,44 @@ const JobsTimeline = ({
         ? 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 = useMemo(() => {
-        // Always process data, even if empty, to generate default date range for x-axis
-        const dataToProcess = (!jobsData || !Array.isArray(jobsData) || jobsData.length === 0) 
-            ? [] 
+        // 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 = useMemo(() => {
         if (!jobsTimelineData || jobsTimelineData.length === 0) {
             return 100;

package/src/@daf/pages/Summary/Activities/PlantingCycle/components/CycleIndicators/HealthAndSafety/helper.js

@@ -1,3 +1,28 @@
+
+// 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',
@@ -11,11 +36,6 @@ const getIndicatorType = (value) => {
     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
- */
 export const getHealthAndSafetyDistributionData = (activityData) => {
     // Define health and safety indicator fields
     const indicators = [
@@ -42,23 +62,12 @@ export 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
- */
 export 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
- */
-export const calculateHealthAndSafetyPieData = (healthAndSafetyDistributionData, t) => {
-    const total = Object.values(healthAndSafetyDistributionData).reduce((all, val) => all + (val || 0), 0);
+export const calculateHealthAndSafetyPieData = (data, t, selectedField) => {
+    const total = Object.values(data).reduce((a, v) => a + (v || 0), 0);
 
     const labels = {
         compliant: t("Available"),
@@ -66,31 +75,27 @@ export const calculateHealthAndSafetyPieData = (healthAndSafetyDistributionData,
         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
- */
-export const getHealthAndSafetyTooltipChildren = (item, isEmpty, healthAndSafetyDistributionData, t, renderTooltipJsx, tooltipTitle = "Health and Safety") => {
+
+export 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;
@@ -104,10 +109,10 @@ export const getHealthAndSafetyTooltipChildren = (item, isEmpty, healthAndSafety
         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

package/src/@daf/pages/Summary/Activities/PlantingCycle/components/CycleIndicators/HealthAndSafety/index.jsx

@@ -54,7 +54,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 = useMemo(() => {
         if (!pieChartData) return { compliant: 0, notCompliant: 0, empty: 0 };
@@ -90,7 +89,10 @@ const HealthAndSafety = ({
     }, [pieChartData, selectedField]);
 
     const isEmpty = useMemo(() => isHealthAndSafetyDistributionEmpty(healthAndSafetyDistributionData), [healthAndSafetyDistributionData]);
-    const pieData = useMemo(() => calculateHealthAndSafetyPieData(healthAndSafetyDistributionData, t), [healthAndSafetyDistributionData, t]);
+    const pieData = useMemo(() => 
+        calculateHealthAndSafetyPieData(healthAndSafetyDistributionData, t, selectedField),
+    [healthAndSafetyDistributionData, t, selectedField]);
+    
 
     // Get the label for the selected field to use as tooltip title
     const selectedFieldLabel = useMemo(() => {
@@ -99,7 +101,16 @@ const HealthAndSafety = ({
     }, [selectedField]);
 
     const getTooltipChildren = useCallback(
-        (item) => getHealthAndSafetyTooltipChildren(item, isEmpty, healthAndSafetyDistributionData, t, renderTooltipJsx, selectedFieldLabel),
+        (item) =>
+            getHealthAndSafetyTooltipChildren(
+                item,
+                isEmpty,
+                healthAndSafetyDistributionData,
+                t,
+                renderTooltipJsx,
+                selectedFieldLabel,
+                selectedField
+            ),
         [t, isEmpty, healthAndSafetyDistributionData, selectedFieldLabel],
     );
 
@@ -110,8 +121,9 @@ const HealthAndSafety = ({
     return (
         <Widget
             loading={loading || pieChartLoading}
-            title={<div>{t("Health and Safety")}</div>}
-            className="with-border-header h-w-btn-header "
+            title={<div>{t("Operational Health & Safety")}</div>}
+            className="with-border-header h-w-btn-header"
+            description={t("Across all activities in this cycle.")}
             addedHeader={
                 <>
                     <div className="flex-1" />

package/src/@daf/pages/Summary/Activities/PlantingCycle/components/CycleOutcomes/PlantingActivitiesTimeline.jsx

@@ -15,21 +15,28 @@ const PlantingActivitiesTimeline = ({
 }) => {
     const { timeFilter, setTimeFilter, formatDateAxis, processChartDateData } = useTimeFilter({ defaultFilter: 'monthly' });
 
-
+   
     const activitiesTimelineData = useMemo(() => {
         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',
         });
+    
+        // 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]);
-
-    // Calculate max value for Y-axis (default to 100 if all values are 0 or very small)
+    
     const maxActivitiesYValue = useMemo(() => {
         if (!activitiesTimelineData || activitiesTimelineData.length === 0) {
             return 100;

package/src/@daf/pages/Template/components/LinkingTemplate/config.js

@@ -85,4 +85,9 @@ export const namespaceMap = {
 	operators: "stakeholder",
 	workers: "stakeholder",
 	activities: "event",
+	"conflict-areas": "location",
+	"armed-groups": "stakeholder",
+	scl: "location",
+	testimonials: 'event',
+	'corrective-actions': 'event',
 }

package/src/@daf/pages/View/hooks/useViewPermissions.js

@@ -1,5 +1,26 @@
 import { useMemo, useEffect } from "react";
 
+const evaluateRule = (rule, data) => {
+    if (typeof rule === "boolean") return rule;
+    if (typeof rule === "function") return rule();
+  
+    if (typeof rule === "string") {
+      const parts = rule.split(" ");
+  
+      // Expecting: "<field> <is|not> <value>"
+      if (parts.length === 3) {
+        const [field, condition, value] = parts;
+  
+        if (condition === "is") return data?.[field] === value;
+        if (condition === "not") return data?.[field] !== value;
+      }
+    }
+  
+    console.warn("Invalid rule:", rule);
+    return false;
+  };
+  
+
 export const useViewPermissions = ({
     data,
     id,
@@ -17,7 +38,6 @@ export const useViewPermissions = ({
     viewConfig,
 }) => {
     const baseNamespaceKeys = Object.keys(namespaceConfig || {});
-    console.log({namespaceConfig})
 
     const baseSupportedNamespaces = baseNamespaceKeys?.reduce((acc, key) => {
       acc[key] = () => true;
@@ -54,7 +74,8 @@ export const useViewPermissions = ({
         ...namespaceOverrides.canEdit,
         };
         
-        return canEditAction[namespace] ? canEditAction[namespace]() : false;
+        const rule = canEditAction[namespace] ? canEditAction[namespace]() : false;
+        return evaluateRule(rule, data);
     }, [namespace, data, user]);
 
     const canDelete = useMemo(() => {
@@ -67,7 +88,8 @@ export const useViewPermissions = ({
             ...namespaceOverrides.canDelete,
             };
             
-        return canDeleteAction[namespace] ? canDeleteAction[namespace]() : false;
+        const rule = canDeleteAction[namespace] ? canDeleteAction[namespace]() : false;
+        return evaluateRule(rule, data);
     }, [namespace, data, user, namespaceOverrides])
 
     useEffect(() => {

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

@@ -51,14 +51,10 @@ const View = ({
     options,
     getSubjectsDetails,
     namespaceOverrides,
-    // ADD CALLBACK TO GET THE CURRENT NAMESPACE CONFIG
 }) => {
     const getNamespaceConfig = (namespace) => namespaceConfiguration?.[namespace] || {};
     const [openRecordsModal, setOpenRecordsModal] = useState(false);
-
-    console.log({partners})
     
-    // HANDLES THE URL PARAMS FOR THE VIEW PAGE
     const {
 		namespace, 
 		id, 
@@ -85,7 +81,6 @@ const View = ({
 
     const namespaceConfig = useMemo(() => getNamespaceConfig(namespace), [namespace]);
 
-    // PREPARES THE FORM FOR THE VIEW PAGE
     const { 
 		form, 
 		data, 
@@ -139,6 +134,8 @@ const View = ({
     const subjects = {
         "management-location": "location",
         "management-stakeholder": "stakeholder",
+        "management-event": "event",
+        "management-incident": "incident",
     }
 
 
@@ -149,7 +146,7 @@ const View = ({
             id: id,
           });
           message.success(t("Subject deleted successfully"));
-          push(getRedirectLink(`/app/management/subject/${subjects[namespace]}`));
+        //   push(getRedirectLink(`/app/management/subject/${subjects[namespace]}`));
         } catch (error) {
           handleError(error);
           message.error(t("Failed to delete subject"));

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

@@ -234,9 +234,8 @@ class AdminService extends BaseService {
     }
 
     deleteSubject({ subject, id }) {
-      const type = subject === 'location' ? 'location' : 'stakeholder';
       return this.apiDelete({
-        url: `/management/subject/${type}/${id}`,
+        url: `/management/subject/${subject}/${id}`,
       });
     }
 

package/src/constants/locales/sp/translation.js

@@ -467,7 +467,7 @@ const sp = {
   "unlinkData": "¿Está seguro de que desea eliminar este enlace?",
   "Link": "Enlace",
   "riskMitigationMeasures": "Medidas de mitigación del riesgo",
-  "other": "Otros",
+  "other": "Otro",
   "Reset": "Restablecer",
   "Lir Details": "Detalles LIR",
   "Locations": "Ubicaciones",