datastake-daf 0.6.787 → 0.6.789

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

@@ -0,0 +1,51 @@
+import React from "react";
+import { camelCaseToTitle } from "../../../../../utils";
+
+
+
+export const getKeyIndicatorsRowConfig = ({ t, data = {} }) => [
+
+  {
+    label: t('Primary Data Collection'),
+    render: () => {
+      
+      return <div className="flex">{'-'}</div>;
+    }
+  },
+  {
+    label: t('Monitoring Organization'),
+    render: () => <div>{data?.technicalPartner?.name || '-'}</div>
+  },
+  {
+    label: t('Team Members'),
+    render: () => <div> {data?.teamMembers?.length || '0'}</div>
+  },
+  {
+    label: t('Monitored Area'),
+    render: () => <div>{data?.totalAreaParcelMonitored ? `${data?.totalAreaParcelMonitored} ha` : '0 ha'}</div>
+  }, 
+
+];
+
+export const getSiteConditionsConfig = ({ t, data = {} }) => [
+  {
+    label: t('Season'),
+    icon: 'Tree',
+    render: () => <div>{camelCaseToTitle(data?.season)|| '-'}</div>
+  },
+  {
+    label: t('Weather conditions'),
+    icon: 'Globe',
+    render: () => <div>{ camelCaseToTitle(data?.weatherConditions )|| '-'}</div>
+  },
+  {
+    label: t('Tide level'),
+    icon: 'WaterDrop',
+    render: () => <div>{camelCaseToTitle(data?.tideLevel )|| '-'}</div>
+  },
+  {
+    label: t('Disturbances'),
+    icon: 'Lightning',  
+    render: () => <div>{data?.hasDisturbances ? t('Yes') : t('No')}</div>
+  },
+];

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

@@ -0,0 +1,236 @@
+import L from "leaflet";
+
+const normalizeUrl = (url) => url?.endsWith(':') ? url.slice(0, -1) : url;
+
+
+export const extractFromPhotoDoc = (photoDoc, label, docIndex) => {
+    const photos = photoDoc?.pictures?.filter(p => p?.url) || (photoDoc?.url ? [photoDoc] : []);
+    
+    return photos.map((photo, photoIndex) => ({
+        src: normalizeUrl(photo.url),
+        alt: photo.name || photo.alt || `${label} - Image ${docIndex + 1}-${photoIndex + 1}`
+    }));
+};
+
+export const getActivityImages = (activityData) => {
+    const photoArrays = [
+        { data: activityData?.groupPhotos, label: 'Group Photo' },
+        { data: activityData?.photosStartActivity, label: 'Start of Activity' },
+        { data: activityData?.photosDuringActivity, label: 'During Activity' },
+        { data: activityData?.photosEndActivity, label: 'End of Activity' }
+    ];
+
+    return photoArrays
+        .flatMap(({ data, label }) =>
+            Array.isArray(data)
+                ? data.flatMap((photoDoc, index) => extractFromPhotoDoc(photoDoc, label, index))
+                : []
+        );
+};
+
+const GENDER_COLORS = ['#016C6E', '#00AEB1'];
+
+export const getGenderDistributionData = (activityData) => {
+    return {
+        Male: activityData?.genderDistributionMale || 0,
+        Female: activityData?.genderDistributionFemale || 0,
+    };
+};
+
+
+export const isGenderDistributionEmpty = (genderDistributionData) => {
+    return Object.values(genderDistributionData).every(val => !val || val === 0);
+};
+
+export const calculateGenderPieData = (genderDistributionData) => {
+    const total = Object.values(genderDistributionData).reduce((all, val) => all + (val || 0), 0);
+
+    return Object.keys(genderDistributionData).map((key, index) => {
+        const color = GENDER_COLORS[index % GENDER_COLORS.length];
+
+        return {
+            value: genderDistributionData[key] || 0,
+            percent: total > 0 ? (genderDistributionData[key] || 0) / total : 0,
+            color: color,
+            label: key,
+            key: key,
+        };
+    });
+};
+
+export const getGenderTooltipChildren = (item, isEmpty, genderDistributionData, t, renderTooltipJsx) => {
+    if (isEmpty) {
+        if (!Object.keys(genderDistributionData).length) {
+            return null;
+        }
+
+        return renderTooltipJsx({
+            title: t("Gender"),
+            items: Object.keys(genderDistributionData).map((k) => ({
+                label: k,
+                value: 0,
+            })),
+        });
+    }
+
+    return renderTooltipJsx({
+        title: t("Gender"),
+        items: [
+            {
+                color: item.color,
+                label: t(item.label),
+                value: `${item.value || 0}`,
+            },
+        ],
+    });
+};
+
+export const getIndicatorType = (value) => {
+    if (value === "yes" || value === true) return "compliant";
+    if (value === "no" || value === false) return "notCompliant";
+    if (value === null || value === undefined) return "empty";
+    return "empty"; // default fallback
+};
+
+export const getActivityIndicatorsConfig = (activityData, t) => {
+    
+    return [
+        { icon: "Aid", label: t("Aid kit availability"), type: getIndicatorType(activityData?.aidKitAccessible) },
+        { icon: "MineOperators", label: t("H&S training delivery"), type: getIndicatorType(activityData?.hsTrainingConfirmation) },
+        { icon: "Users", label: t("Workers safe pairing"), type: getIndicatorType(activityData?.duosFormed) },
+        { 
+            icon: "Bear", 
+            label: t("No children"), 
+            type: getIndicatorType(activityData?.presenceOfChildren),
+        },
+        { icon: "Security", label: t("Security presence"), type: getIndicatorType(activityData?.focalPointPresent) },
+        { icon: "UserCircle", label: t("Relay presence"), type: getIndicatorType(activityData?.relayPresent) },
+    ];
+};
+
+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;
+
+    // Don't return early - we need to check for markers even if there's no perimeter
+
+    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,
+            // No gps property - this will display only the polygon without markers
+            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`,
+            // Include area if it exists, so marker can show on top of polygon
+            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`,
+            // Include area if it exists, so marker can show on top of polygon
+            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 even if empty - let the map component handle empty arrays
+    return mapData;
+};

package/src/@daf/pages/Summary/Activities/Monitoring/index.jsx

@@ -0,0 +1,66 @@
+import { useMemo } from 'react';
+import { DashboardLayout, Header, KeyIndicators } from '../../../../../../src/index.js'
+import { getKeyIndicatorsRowConfig, getSiteConditionsConfig } from './config';
+import { getActivityIndicatorsConfig } from './helper';
+import ActivityLocation from './components/ActivityLocation/index.jsx';
+import ActivityImagery from './components/ActivityImagery/index.jsx';
+import WorkersDistribution from './components/WorkersDistribution/index.jsx';
+import MangroveGrowthAndSurvival from './components/MangroveGrowthAndSurvival/index.jsx';
+
+
+const   MonitoringActivitySummary = ({ activityData, supportText, onDownload, downloadDisabled, actionButtons, breadcrumbs, goBackTo, loading, t = () => { } }) => {
+    const keyIndicatorsConfig = useMemo(() => getKeyIndicatorsRowConfig({ t, data: activityData }), [t, activityData]);
+
+    // Activity Indicators Config - mapped from activityData
+    const activityIndicatorsConfig = useMemo(() =>
+        getActivityIndicatorsConfig(activityData, t),
+        [activityData, t]
+    );
+
+    // Site Conditions Config
+    const siteConditionsConfig = useMemo(() => 
+        getSiteConditionsConfig({ t, data: activityData }),
+        [t, activityData]
+    );
+
+
+    console.log({activityData});
+    return (
+        <DashboardLayout
+            header={
+                <Header
+                    title={'Monitoring Activity Summary'}
+                    supportText={supportText || ''}
+                    onDownload={onDownload}
+                    downloadDisabled={downloadDisabled}
+                    actionButtons={actionButtons}
+                    breadcrumbs={breadcrumbs}
+                    goBackTo={goBackTo}
+                    loading={loading}
+                />
+            }
+        >
+            <section>
+                <KeyIndicators title={t("Key Information")} config={keyIndicatorsConfig} loading={loading} />
+            </section>
+
+            <ActivityLocation activityData={activityData} loading={loading} t={t} />
+
+            <KeyIndicators
+                loading={loading}
+                config={siteConditionsConfig}
+                title={t("straatos::site-conditions")}
+                widgetClassName="h-w-btn-header"
+            />
+
+            <MangroveGrowthAndSurvival 
+                activityData={activityData} 
+                loading={loading} 
+                t={t} 
+            />
+
+        </DashboardLayout>
+    )
+}
+
+export default MonitoringActivitySummary;

package/src/@daf/pages/Summary/Minesite/components/StakeholderMapping/index.js

@@ -28,7 +28,7 @@ const StakeholderMapping = ({
 				metrics: {
 					operator: ['operator.locationClient'],
 					government: ['custom.stakeholderId', 'governance'],
-					trader: ['trade'],
+					trader: ['trade.locationClient'],
 					other: ['civilSociety', 'international'],
 				}
 			},

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

@@ -69,10 +69,10 @@ class AdminService extends BaseService {
     }
 
     getSubjects({ subject, params }) {
-      return this.apiGet({
-          url: `/management/subjects/${subject}`,
+        return this.apiGet({
+          url: `${subject}`,
           params,
-      });
+        })
     }
 
     mergeSubjects({ subject, ...data }) {
@@ -81,15 +81,6 @@ class AdminService extends BaseService {
           data,
         })
     }
-    getUserGrowth(activeFilter) {
-      return this.apiGet({
-        url: `/accounts/dashboard/user-growth`,
-        isUserManager: true,
-        params: { activeFilter },
-      });
-    }
-
-    
 }
 
 export default createLazyService(AdminService);

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

@@ -26,5 +26,4 @@ class DashboardService extends BaseService {
     }
 }
 
-export default createLazyService(DashboardService);
-
+export default createLazyService(DashboardService);

package/src/@daf/utils/filters.js

@@ -1,102 +1,102 @@
 export const defaultFilterKeys = ["search", "sortDir", "sortBy", "timeframe", "activeTab"];
+
 function hasJsonStructure(str) {
-    if (typeof str !== "string") return false;
-    try {
-        const result = JSON.parse(str);
-        const type = Object.prototype.toString.call(result);
-        return type === "[object Object]" || type === "[object Array]";
-    } catch (err) {
-        return false;
-    }
+	if (typeof str !== "string") return false;
+	try {
+		const result = JSON.parse(str);
+		const type = Object.prototype.toString.call(result);
+		return type === "[object Object]" || type === "[object Array]";
+	} catch (err) {
+		return false;
+	}
 }
+
 export const getDefaultActiveFilters = (
-    params,
-    selectFiltersConfig,
-    defaultPageSize,
-    defaultFilters = {},
-    doPagination,
+	params,
+	selectFiltersConfig,
+	defaultPageSize,
+	defaultFilters = {},
+	doPagination,
 ) => {
-    const o = {};
-    defaultFilterKeys.forEach((k) => {
-        if (params.has(k)) {
-            if (hasJsonStructure(params.get(k))) {
-                o[k] = JSON.parse(params.get(k));
-            } else {
-                o[k] = params.get(k);
-            }
-        } else if (defaultFilters[k]) {
-            if (hasJsonStructure(defaultFilters[k])) {
-                o[k] = JSON.parse(defaultFilters[k]);
-            } else {
-                o[k] = defaultFilters[k];
-            }
-        }
-    });
-    if (params.has("searchParams")) {
-        try {
-            o.searchParams = JSON.parse(params.get("searchParams"));
-        } catch (e) {
-            o.searchParams = params.get("searchParams").split(",");
-        }
-    }
-    if (doPagination) {
-        o.page = Number(params.get("page")) || 1;
-        o.pageSize = Number(params.get("pageSize")) || defaultPageSize;
-    }
-    Object.keys(selectFiltersConfig).forEach((k) => {
-        if (params.has(k)) {
-            if (hasJsonStructure(params.get(k))) {
-                o[k] = JSON.parse(params.get(k));
-            } else {
-                o[k] = params.get(k);
-            }
-        }
-    });
-    return o;
+	const o = {};
+
+	defaultFilterKeys.forEach((k) => {
+		if (params.has(k)) {
+			if (hasJsonStructure(params.get(k))) {
+				o[k] = JSON.parse(params.get(k));
+			} else {
+				o[k] = params.get(k);
+			}
+		} else if (defaultFilters[k]) {
+			if (hasJsonStructure(defaultFilters[k])) {
+				o[k] = JSON.parse(defaultFilters[k]);
+			} else {
+				o[k] = defaultFilters[k];
+			}
+		}
+	});
+
+	if (params.has("searchParams")) {
+		try {
+			o.searchParams = JSON.parse(params.get("searchParams"));
+		} catch (e) {
+			o.searchParams = params.get("searchParams").split(",");
+		}
+	}
+
+	if (doPagination) {
+		o.page = Number(params.get("page")) || 1;
+		o.pageSize = Number(params.get("pageSize")) || defaultPageSize;
+	}
+
+	Object.keys(selectFiltersConfig).forEach((k) => {
+		if (params.has(k)) {
+			if (hasJsonStructure(params.get(k))) {
+				o[k] = JSON.parse(params.get(k));
+			} else {
+				o[k] = params.get(k);
+			}
+		}
+	});
+
+	return o;
 };
+
 const NEW_PAGINATION_APPS = ["nashiriki"];
 export const filterParams = (value, module) => {
-    const { activeFilters, ...rest } = value;
-    const { page, pageSize, sortDir, sortBy, search, searchParams, ...filters } =
-        activeFilters || {};
-    const params = {};
-    // Use skip and take inside pagination object
-    // Calculate skip from page number (page 1 = skip 1, page 2 = skip 21, etc.)
-    params.pagination = {
-        skip: page ? ((page - 1) * (pageSize || 20) + 1) : 1,
-        take: pageSize || 20,
-    };
-    if (search && searchParams) {
-        params.search = JSON.stringify({
-            qs: search,
-            fields: searchParams,
-        });
-    }
-    if (sortDir && sortBy) {
-        params.sort = JSON.stringify({
-            dir: sortDir,
-            by: sortBy,
-        });
-    }
-    if (Object.keys(filters).length) {
-        if (value.sourceId && value.sourceId === "overview") {
-            const { activeTab, ...restFilters } = filters;
-            Object.assign(params, restFilters);
-            if (activeTab !== undefined) {
-                params.tab = activeTab;
-            }
-        } else {
-            const { authorId, activeTab, ...restFilters } = filters;
-            Object.assign(params, restFilters);
-            if (activeTab !== undefined) {
-                params.tab = activeTab;
-            }
-        }
-    }
-    return { ...rest, ...params };
-};
+	const { activeFilters, ...rest } = value;
 
+	const { page, pageSize, sortDir, sortBy, search, searchParams, ...filters } =
+		activeFilters || {};
 
+	const params = {};
+	
+	params.pagination = JSON.stringify({
+		[NEW_PAGINATION_APPS.includes(module) ? "skip" : "page"]: page,
+		[NEW_PAGINATION_APPS.includes(module) ? "take" : "pageSize"]: pageSize,
+	});
 
+	if (search && searchParams) {
+		params.search = JSON.stringify({
+			qs: search,
+			fields: searchParams,
+		});
+	}
 
+	if (sortDir && sortBy) {
+		params.sort = JSON.stringify({
+			dir: sortDir,
+			by: sortBy,
+		});
+	}
 
+	if (Object.keys(filters).length) {
+		if (value.sourceId && value.sourceId === "overview") {
+			params.filters = JSON.stringify(filters);
+		} else {
+			params.filters = JSON.stringify({ ...filters, authorId: undefined });
+		}
+	}
+
+	return { ...rest, ...params };
+};

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

@@ -1,7 +1,4 @@
 const en = {
-  "sbg-admin::remove-user-title":"Remove User Title",
-  "sbg-admin::remove-user-body":"Remove User Body",
-"add-account":"Add Account",
   "Site": "Site",
   "Production Sites": "Production Sites",
   "Type of account": "Type of account",

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

@@ -420,7 +420,7 @@ const fr = {
 	Documentation: "Documents",
 	"Edit project": "Modifier le projet",
 	Name: "Nom",
-	Type: "Type",
+	Type: "Tapez",
 	type: "Type",
 	Province: "Province",
 	Territory: "Territoire",

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

@@ -233,7 +233,7 @@ const sp = {
   "Documentation": "Documentos",
   "Edit project": "Modificar proyecto",
   "Name": "Nombre",
-  "Type": "Tipo",
+  "Type": "Escribe",
   "type": "Tipo",
   "Province": "Provincia",
   "Territory": "Territorio",

package/src/pages.js

@@ -21,6 +21,7 @@ export { default as RestorationActivitySummary } from './@daf/pages/Summary/Acti
 export { default as PlantingCycleSummary } from './@daf/pages/Summary/Activities/PlantingCycle/index.jsx';
 export { default as MonitoringCampaignSummary } from './@daf/pages/Summary/Activities/MonitoringCampaign/index.jsx';
 export { default as MineSummary } from './@daf/pages/Summary/Minesite/index.jsx';
+export { default as MonitoringActivitySummary } from './@daf/pages/Summary/Activities/Monitoring/index.jsx';
 
 // View
 export { default as View } from './@daf/pages/View/index.jsx';