datastake-daf 0.6.763 → 0.6.765

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

@@ -0,0 +1,153 @@
+import { useCallback, useState } from "react";
+import PartnerService from "../../services/PartnerService.js";
+import { message } from "antd";
+
+export const usePartnersActions = ({
+    activeTab,
+    filters,
+    setTotalRequests,
+    t = () => {},
+}) => {
+    const [loading, setLoading] = useState(false);
+    const [data, setData] = useState([]);
+    const [requestDataFetch, setRequestDataFetch] = useState(false);
+    const [initFetchDone, setInitFetchDone] = useState(false);
+
+	const fetchData = useCallback(async () => {
+		setLoading(true);
+		setData([]);
+	
+		try {
+			const { data } = await PartnerService.get(activeTab, {
+				...filters,
+				type: activeTab,
+			});
+			setData(data);
+			setTotalRequests(data?.meta?.total || 0);
+		} catch (err) {
+			console.log(err);
+		}
+	
+		setLoading(false);
+	
+		if (!initFetchDone) {
+			setInitFetchDone(true);
+		}
+	}, [activeTab, filters, initFetchDone, setLoading, setTotalRequests, setData, setInitFetchDone]);
+
+	const accept = useCallback(
+		async (id) => {
+			setLoading(true);
+
+			try {
+				await PartnerService.accept(id);
+				setRequestDataFetch(true);
+			} catch (err) {
+				console.log(err);
+			}
+
+			setLoading(false);
+		},
+		[setLoading],
+	);
+
+	const decline = useCallback(
+		async (id) => {
+			setLoading(true);
+
+			try {
+				await PartnerService.decline(id);
+				setRequestDataFetch(true);
+			} catch (err) {
+				console.log(err);
+			}
+
+			setLoading(false);
+		},
+		[setLoading],
+	);
+
+	const activate = useCallback(
+		async (id) => {
+			setLoading(true);
+
+			try {
+				await PartnerService.activate(id);
+				setRequestDataFetch(true);
+			} catch (err) {
+				console.log(err);
+			}
+
+			setLoading(false);
+		},
+		[setLoading],
+	);
+
+	const suspend = useCallback(
+		async (id) => {
+			setLoading(true);
+
+			try {
+				await PartnerService.suspend(id);
+				message.success(t("Partner suspended successfully"));
+				setRequestDataFetch(true);
+			} catch (err) {
+				console.log(err);
+			}
+
+			setLoading(false);
+		},
+		[setLoading],
+	);
+
+	const resendInvite = useCallback(
+		async (id) => {
+			setLoading(true);
+
+			try {
+				await PartnerService.resendInvite(id);
+				await fetchData();
+			} catch (err) {
+				console.log(err);
+			}
+
+			setLoading(false);
+		},
+		[fetchData, setLoading],
+	);
+
+	const block = useCallback(
+		async (id) => {
+			setLoading(true);
+
+			try {
+				await PartnerService.block(id);
+				await fetchData();
+			} catch (err) {
+				console.log(err);
+			}
+
+			setLoading(false);
+		},
+		[fetchData, setLoading],
+	);
+
+    return {
+        loading,
+        setLoading,
+        data,
+        setData,
+        requestDataFetch,
+        setRequestDataFetch,
+        fetchData,
+        accept,
+        decline,
+        activate,
+        suspend,
+        resendInvite,
+        block,
+        setTotalRequests,
+        initFetchDone,
+        setInitFetchDone,
+    }
+}

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

@@ -1,11 +1,236 @@
-import React from 'react';
+import React, { useState, useMemo, useEffect, useCallback } from 'react'
+import { Modal } from 'antd';
+import { usePartnersActions } from './hook.js';
+import { getColumns } from './columns.js';
+import TablePageWithTabs from '../../core/components/Screens/TableScreen/TablePageWithTabs/index.jsx';
+import { checkboxConfig, selectFiltersConfig, filtersConfig } from './config.js';
+import Create from './create.jsx';
+import { useGetQueryParams } from '../../hooks/useGetQueryParams.js';
+import ModalHeader from '../../core/components/Header/ModalHeader/index.jsx';
+import Edit from './edit.jsx';
 
-const Partners = () => {
+const PartnersTable = ({
+    t = () => {},
+    goTo = () => {},
+    user = {},
+    options = {},
+    getRedirectLink = () => {},
+    theme = {},
+    isMobile,
+    APP,
+    location,
+    breadcrumbs = [],
+    getApiBaseUrl = () => {},
+    getAppHeader = () => {},
+    query = {},
+    ajaxForms = {},
+    changeAjaxForms = () => {},
+    ajaxOptions = {},
+    changeAjaxOptions = () => {},
+    applications = [],
+    extendingFilters = {},
+    searchLocationParams,
+}) => {
+    const [totalRequests, setTotalRequests] = useState(0);
+    const [selectOptions, setSelectOptions] = useState();
+    const [activeTab, setActiveTab] = useState();
+    const [pendingEditId, setPendingEditId] = useState(null);
+    const [openModal, setOpenModal] = useState(false);
+
+    const tabs = useMemo(() => [
+            { label: t("List"), key: "partners" },
+            { label: (
+                <div className="tab-cont">
+                <div className="flex flex-column justify-content-center">
+                    {t('Requests')}
+                </div>
+                {typeof totalRequests === 'number' ? (
+                    <div className="flex flex-column justify-content-center">
+                    <div className="bubble">
+                        <div className="flex flex-column justify-content-center">
+                        {totalRequests}
+                        </div>
+                    </div>
+                    </div>
+                ) : null}
+                </div>
+            ), 
+            key: "requests" 
+        },
+    ], [t, totalRequests]);
+
+    const { paginationQuery, searchParams, otherParams, sortBy, sortDir, } = useGetQueryParams({location});
+
+    const filters = useMemo(() => {
+        const cleanSearchParams = Object.fromEntries(
+            Object.entries(searchParams).filter(([_, value]) => value != null && value !== '')
+        );
+
+        return {
+            pagination: paginationQuery,
+            ...(Object.keys(otherParams).length > 0 && otherParams ),
+            ...(Object.keys(cleanSearchParams).length > 0 && { search: cleanSearchParams }),
+            tab: activeTab,
+            sortBy: {
+                [sortBy || "updatedAt"]: sortDir ? (sortDir === "ascend" ? 1 : -1) : -1,
+            },
+            ...extendingFilters,
+        }
+    }, [location.search, activeTab, JSON.stringify(extendingFilters)]);
+
+    const { 
+        loading, 
+        data, 
+        requestDataFetch, 
+        fetchData, 
+        accept, 
+        decline, 
+        activate, 
+        suspend, 
+        resendInvite, 
+        block,
+        setRequestDataFetch,
+        initFetchDone,
+        setInitFetchDone,
+    } = usePartnersActions({
+        activeTab,
+        filters,
+        setTotalRequests,
+        t,
+    });
+
+    const columns = useMemo(() => getColumns({
+        t,
+        accept,
+        decline,
+        suspend,
+        resendInvite,
+        activate,
+        activeTab,
+        selectOptions,
+        block,
+        setOpen: setOpenModal,
+    }), [t, accept, decline, suspend, resendInvite, activate, activeTab, selectOptions, block, setOpenModal]);
+
+    const handleActiveTabChange = useCallback((value) => {
+        setActiveTab(value);
+    }, []);
+
+    useEffect(() => {
+		if (requestDataFetch) {
+			fetchData();
+			setRequestDataFetch(false);
+		}
+	}, [requestDataFetch, fetchData, setRequestDataFetch]);
+
+    useEffect(() => {
+		if (searchLocationParams.has("datastakeId") && !pendingEditId) {
+			setPendingEditId(searchLocationParams.get("datastakeId"));
+		}
+	}, [searchLocationParams, pendingEditId]);
+
+	useEffect(() => {
+		if (pendingEditId) {
+			const partner = data.find((partner) => partner.datastakeId === pendingEditId);
+			if (partner) {
+				setOpenModal(partner);
+				setPendingEditId(null);
+			}
+		}
+	}, [data, pendingEditId]);
+
+    useEffect(() => {
+	    fetchData();
+	}, [filters]);
+
+    const headerTooltip = useMemo(() => ({
+        title: t("Partners"),
+        content: (
+            <div className="max-w-250">
+                {t(
+                    "Partners are organisations sharing their information with you, or receiving your information.",
+                )}
+                <br />
+                {t("Only authorised users can create partnerships.")}
+            </div>
+        ),
+    }), [t]);
+    
+    const drawerTooltip = useMemo(() => ({
+        content: (
+            <div className="max-w-250">
+                {t("Source: This partner will share information with you.")},
+                <br />
+                {t("Client: You will share information with this partner.")},
+                <br />
+                {t("Exchange: You will both share information with each other.")}
+            </div>
+        ),
+    }), [t]);
+    
     return (
-        <div>
-            <h1>Partners</h1>
-        </div>
-    );
-};
+        <>
+            <TablePageWithTabs 
+                t={t}
+                tabs={tabs}
+                title={t("Partners")}
+                breadCrumbs={breadcrumbs}
+                location={location}
+                loading={loading}
+                goTo={goTo}
+                defaultActiveTab={"partners"}
+                columns={columns}
+                data={data}
+                checkboxConfig={checkboxConfig}
+                APP={APP}
+                getApiBaseUrl={getApiBaseUrl}
+                selectOptions={selectOptions}
+                selectFiltersConfig={selectFiltersConfig}
+                getRedirectLink={getRedirectLink}
+                filtersConfig={filtersConfig}
+                isMobile={isMobile}
+                view="partners"
+                getActiveTab={handleActiveTabChange}
+                headerTooltip={headerTooltip}
+                drawerTitle={t("Create Partner")}
+                drawerTooltip={drawerTooltip}
+            >
+                {({onDrawerClose}) => (
+                    <Create
+                        query={query}
+                        goTo={goTo}
+                        user={user}
+                        t={t}
+                        ajaxForms={ajaxForms}
+                        changeAjaxForms={changeAjaxForms}
+                        ajaxOptions={ajaxOptions}
+                        changeAjaxOptions={changeAjaxOptions}
+                        onClose={onDrawerClose}
+                        fetchData={() => setRequestDataFetch(true)}
+                        APP={APP}
+                        getAppHeader={getAppHeader}
+                        getApiBaseUrl={getApiBaseUrl}
+                    />
+                )}
+            </TablePageWithTabs>
+            <Modal
+				open={!!openModal}
+				onCancel={() => setOpenModal(false)}
+				footer={null}
+				title={<ModalHeader title={t("Edit Settings")} />}
+			>
+				{openModal ? (
+					<Edit
+						partner={openModal}
+						fetchData={() => setRequestDataFetch(true)}
+						onClose={() => setOpenModal(false)}
+                        t={t}
+					/>
+				) : null}
+			</Modal>
+            <input id="myInput" hidden />
+        </>
+    )
+}
 
-export default Partners
+export default PartnersTable

package/src/@daf/pages/Stakeholders/Operators/index.jsx

@@ -5,6 +5,7 @@ import { checkboxConfig, getFiltersConfig, filtersConfig, getFilterOptions } fro
 import { useGetQueryParams } from '../../../hooks/useGetQueryParams.js';
 import StakeholdersCreate from './create.jsx';
 import { displayMessage } from '../../../../helpers/messages.js';
+import { useFetchData } from '../../hook.js';
 
 const OperatorsTable = ({
     t = () => {},
@@ -53,28 +54,13 @@ const OperatorsTable = ({
         applications,
     }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications]);
 
-
-    const { paginationQuery, searchParams, otherParams, sortBy, sortDir } = useGetQueryParams({location});
-
-    const filters = useMemo(() => {
-        return {
-            ...otherParams,
-            ...extendingFilters
-        }
-    }, [otherParams, extendingFilters])
-
-    useEffect(() => {
-        getData({
-            pagination: paginationQuery,
-            ...(Object.keys(searchParams).length > 0 && { search: searchParams }),
-            ...otherParams,
-            tab: activeTab,
-            sortBy: {
-                [sortBy || "updatedAt"]: sortDir ? (sortDir === "ascend" ? 1 : -1) : -1,
-            },
-            ...extendingFilters
-        }, 'operators')
-    }, [location.search, activeTab, JSON.stringify(extendingFilters)]);
+    useFetchData({
+        location,
+        getData,
+        activeTab,
+        extendingFilters,
+        subject: 'operators',
+    })
 
     const selectFiltersConfig = useMemo(() => {
         return getFiltersConfig({t});

package/src/@daf/pages/Stakeholders/Workers/index.jsx

@@ -5,6 +5,7 @@ import { checkboxConfig, getFiltersConfig, filtersConfig, getFilterOptions } fro
 import { useGetQueryParams } from '../../../hooks/useGetQueryParams.js';
 import StakeholdersCreate from './create.jsx';
 import { displayMessage } from '../../../../helpers/messages.js';
+import { useFetchData } from '../../hook.js';
 
 const WorkersTable = ({
     t = () => {},
@@ -53,27 +54,13 @@ const WorkersTable = ({
         applications,
     }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications]);
 
-    const { paginationQuery, searchParams, otherParams, sortBy, sortDir } = useGetQueryParams({location});
-
-    const filters = useMemo(() => {
-        return {
-            ...otherParams,
-            ...extendingFilters
-        }
-    }, [otherParams, extendingFilters])
-
-    useEffect(() => {
-        getData({
-            pagination: paginationQuery,
-            ...(Object.keys(searchParams).length > 0 && { search: searchParams }),
-            ...otherParams,
-            tab: activeTab,
-            sortBy: {
-                [sortBy || "updatedAt"]: sortDir ? (sortDir === "ascend" ? 1 : -1) : -1,
-            },
-            ...extendingFilters
-        }, 'workers')
-    }, [location.search, activeTab, JSON.stringify(extendingFilters)]);
+    useFetchData({
+        location,
+        getData,
+        activeTab,
+        extendingFilters,
+        subject: 'workers',
+    })
 
     const selectFiltersConfig = useMemo(() => {
         return getFiltersConfig({t});

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

@@ -6,6 +6,7 @@ import { useGetQueryParams } from '../../hooks/useGetQueryParams.js';
 import StakeholdersCreate from './create.jsx';
 import { displayMessage } from '../../../helpers/messages.js';
 import DAFHeader from '../../core/components/Header/index.jsx';
+import { useFetchData } from '../hook.js';
 
 const StakeholdersTable = ({
     t = () => {},
@@ -36,6 +37,7 @@ const StakeholdersTable = ({
     applications = [],
     subjectClear = () => {},
     breadcrumbs = [],
+    extendingFilters = {},
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState("own");
@@ -51,16 +53,13 @@ const StakeholdersTable = ({
         applications,
     }), [t, goTo, user, options, activeTab, getRedirectLink, theme, applications]);
 
-    const { paginationQuery, searchParams, otherParams } = useGetQueryParams({location});
-
-    useEffect(() => {
-        getData({
-            pagination: paginationQuery,
-            ...(Object.keys(otherParams).length > 0 && { filters: otherParams }),
-            ...(Object.keys(searchParams).length > 0 && { search: searchParams }),
-            tab: activeTab,
-        }, 'stakeholders')
-    }, [paginationQuery, otherParams, searchParams, activeTab]);
+    useFetchData({
+        location,
+        getData,
+        activeTab,
+        extendingFilters,
+        subject: 'stakeholders',
+    })
 
     const selectFiltersConfig = useMemo(() => {
         return getFiltersConfig({t});

package/src/@daf/pages/Summary/Activities/PlantingCycle/config.js

@@ -0,0 +1,40 @@
+import React from "react";
+
+export const getKeyIndicatorsRowConfig = ({ t, data = {} }) => [
+  {
+    label: t('Region'),
+    render: () => {
+    //   const region = data?.region;
+      return <div>{ '-'}</div>;
+    }
+  },
+  {
+    label: t('Associated Plots'),
+    render: () => {
+    //   const plotsCount =  data?.associatedPlotsCount || '0';
+      return <div>{'0'}</div>
+    }
+  },
+  {
+    label: t('Implementation Partners'),
+    render: () => {
+    //   const partnersCount = data?.partnersCount || '0';
+      return <div>{'0'}</div>
+    }
+  },
+  {
+    label: t('Total Activities'),
+    render: () => {
+    //   const activitiesCount = data?.activitiesCount || '0';
+      return <div>{'0'}</div>
+    }
+  },
+  {
+    label: t('Information Sources'),
+    render: () => {
+    //   const sourcesCount = data?.informationSourcesCount || '0';
+      return <div>{'0'}</div>
+    }
+  },
+];
+

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

@@ -0,0 +1,122 @@
+import L from "leaflet";
+
+export const getMapDataFromActivity = (activityData, t) => {
+    const location = activityData?.location;
+    const perimeter = location?.perimeter;
+
+    const area = Array.isArray(perimeter) && perimeter.length > 0
+        ? perimeter
+            .filter((coord) => Array.isArray(coord) && coord.length >= 2)
+            .map((coord) => {
+                const first = typeof coord[0] === 'number' ? coord[0] : parseFloat(coord[0]);
+                const second = typeof coord[1] === 'number' ? coord[1] : parseFloat(coord[1]);
+                
+                if (isNaN(first) || isNaN(second) || !isFinite(first) || !isFinite(second)) {
+                    return null;
+                }
+                
+                // Try both formats and use Leaflet to validate
+                // First try as [lat, lng]
+                try {
+                    const latLng1 = L.latLng(first, second);
+                    if (latLng1.lat >= -90 && latLng1.lat <= 90 && 
+                        latLng1.lng >= -180 && latLng1.lng <= 180) {
+                        return [latLng1.lat, latLng1.lng];
+                    }
+                } catch (e) {
+                    // Not valid as [lat, lng], try swapping
+                }
+                
+                // Try as [lng, lat] (GeoJSON format) - swap them
+                try {
+                    const latLng2 = L.latLng(second, first);
+                    if (latLng2.lat >= -90 && latLng2.lat <= 90 && 
+                        latLng2.lng >= -180 && latLng2.lng <= 180) {
+                        return [latLng2.lat, latLng2.lng];
+                    }
+                } catch (e) {
+                    // Invalid coordinates
+                }
+                
+                return null;
+            })
+            .filter((coord) => coord !== null)
+        : null;
+
+    const mapData = [];
+    const baseColor = '#15FFFFB2';
+    const locationName = location?.name || activityData?.name || t("Activity Location");
+    const datastakeId = location?.datastakeId || activityData?.datastakeId;
+
+    // Helper to validate coordinates
+    const isValidCoordinate = (coord) => {
+        const num = typeof coord === 'number' ? coord : parseFloat(coord);
+        return !isNaN(num) && isFinite(num);
+    };
+
+    // Entry 1: Perimeter polygon (independent - show if it exists)
+    if (area && area.length >= 3) {
+        mapData.push({
+            _id: {},
+            id: `${activityData?.id || activityData?.datastakeId || 'perimeter'}-perimeter`,
+            area: area,
+            color: baseColor,
+            name: locationName,
+            plotName: locationName,
+            territoryTitle: t("Associated Plot"),
+            subTitle: t("Activity Location"),
+            type: t("Activity Location"),
+            datastakeId: datastakeId,
+            sources: null,
+            link: null,
+        });
+    }
+
+    // Entry 2: Arrival marker (independent - show if it exists)
+    const arrivalLat = activityData?.locationCheckArrival?.latitude;
+    const arrivalLng = activityData?.locationCheckArrival?.longitude;
+    if (isValidCoordinate(arrivalLat) && isValidCoordinate(arrivalLng)) {
+        mapData.push({
+            _id: {},
+            id: `${activityData?.id || activityData?.datastakeId || 'arrival'}-arrival`,
+            area: area && area.length >= 3 ? area : null,
+            color: baseColor,
+            gps: {
+                latitude: typeof arrivalLat === 'number' ? arrivalLat : parseFloat(arrivalLat),
+                longitude: typeof arrivalLng === 'number' ? arrivalLng : parseFloat(arrivalLng),
+            },
+            name: t("Activity Start"),
+            plotName: locationName,
+            territoryTitle: t("Associated Plot"), 
+            datastakeId: `${datastakeId}-arrival`,
+            sources: null,
+            link: null,
+        });
+    }
+
+    // Entry 3: Departure marker (independent - show if it exists)
+    const departureLat = activityData?.locationCheckDeparture?.latitude;
+    const departureLng = activityData?.locationCheckDeparture?.longitude;
+    if (isValidCoordinate(departureLat) && isValidCoordinate(departureLng)) {
+        mapData.push({
+            _id: {},
+            id: `${activityData?.id || activityData?.datastakeId || 'departure'}-departure`,
+            area: area && area.length >= 3 ? area : null,
+            color: baseColor,
+            gps: {
+                latitude: typeof departureLat === 'number' ? departureLat : parseFloat(departureLat),
+                longitude: typeof departureLng === 'number' ? departureLng : parseFloat(departureLng),
+            },
+            name: t("Activity End"),
+            plotName: locationName, 
+            territoryTitle: t("Associated Plot"), 
+            datastakeId: `${datastakeId}-departure`,
+            markerColor: "#FF7A45", 
+            sources: null,
+            link: null,
+        });
+    }
+
+    return mapData;
+};
+