datastake-daf 0.6.758 → 0.6.760

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

@@ -1,16 +1,8 @@
-// ============================================================================
-// REGION: Photo/Image Extraction
-// ============================================================================
+import L from "leaflet";
 
-/**
- * Normalize URL by removing trailing colon if present
- */
 const normalizeUrl = (url) => url?.endsWith(':') ? url.slice(0, -1) : url;
 
-/**
- * Extract images from a photo document
- * Handles both documents with pictures arrays and direct image objects
- */
+
 export const extractFromPhotoDoc = (photoDoc, label, docIndex) => {
     const photos = photoDoc?.pictures?.filter(p => p?.url) || (photoDoc?.url ? [photoDoc] : []);
     
@@ -20,13 +12,6 @@ export const extractFromPhotoDoc = (photoDoc, label, docIndex) => {
     }));
 };
 
-/**
- * Extract and process images from activity data
- * Processes group photos and activity photos (start, during, end) into a flat array
- * 
- * @param {Object} activityData - Activity data object containing photo arrays
- * @returns {Array} - Flat array of image objects with src and alt properties
- */
 export const getActivityImages = (activityData) => {
     const photoArrays = [
         { data: activityData?.groupPhotos, label: 'Group Photo' },
@@ -43,17 +28,8 @@ export const getActivityImages = (activityData) => {
         );
 };
 
-// ============================================================================
-// REGION: Gender Distribution
-// ============================================================================
-
-// Gender distribution colors for pie chart
-const GENDER_COLORS = ['#016C6E', '#00AEB1']; // Male (dark teal), Female (light teal)
+const GENDER_COLORS = ['#016C6E', '#00AEB1'];
 
-/**
- * Get gender distribution data from activityData
- * Maps genderDistributionMale and genderDistributionFemale to a structured object
- */
 export const getGenderDistributionData = (activityData) => {
     return {
         Male: activityData?.genderDistributionMale || 0,
@@ -61,18 +37,11 @@ export const getGenderDistributionData = (activityData) => {
     };
 };
 
-/**
- * Check if gender distribution is empty
- * Returns true if all values are 0 or falsy
- */
+
 export const isGenderDistributionEmpty = (genderDistributionData) => {
     return Object.values(genderDistributionData).every(val => !val || val === 0);
 };
 
-/**
- * Calculate pie chart data from gender distribution
- * Computes percentages and assigns colors based on gender distribution values
- */
 export const calculateGenderPieData = (genderDistributionData) => {
     const total = Object.values(genderDistributionData).reduce((all, val) => all + (val || 0), 0);
 
@@ -89,10 +58,6 @@ export const calculateGenderPieData = (genderDistributionData) => {
     });
 };
 
-/**
- * Get tooltip children for gender distribution pie chart
- * Generates tooltip content showing gender label and value
- */
 export const getGenderTooltipChildren = (item, isEmpty, genderDistributionData, t, renderTooltipJsx) => {
     if (isEmpty) {
         if (!Object.keys(genderDistributionData).length) {
@@ -120,16 +85,6 @@ export const getGenderTooltipChildren = (item, isEmpty, genderDistributionData,
     });
 };
 
-// ============================================================================
-// REGION: Activity Indicators
-// ============================================================================
-
-/**
- * Maps activityData value to indicator type
- * "yes" or true → "compliant"
- * "no" or false → "notCompliant"
- * null or undefined → "empty"
- */
 export const getIndicatorType = (value) => {
     if (value === "yes" || value === true) return "compliant";
     if (value === "no" || value === false) return "notCompliant";
@@ -137,34 +92,7 @@ export const getIndicatorType = (value) => {
     return "empty"; // default fallback
 };
 
-/**
- * Special case: Children presence indicator configuration
- * Children presence is compliant if answered 'no', not compliant if answered 'yes'
- * Custom icons: "no" (compliant) → X icon with green badge, "yes" (notCompliant) → Check icon with red badge
- * 
- * @param {string|boolean|null} value - The presenceOfChildren value from activityData
- * @returns {Object} - Configuration object with type and optional statusIcon
- */
-export const getChildrenPresenceConfig = (value) => {
-    if (value === "no" || value === false) {
-        return { type: "compliant", statusIcon: "Close" }; // X icon with green badge
-    }
-    if (value === "yes" || value === true) {
-        return { type: "notCompliant", statusIcon: "Check" }; // Check icon with red badge
-    }
-    return { type: "empty" }; // empty state
-};
-
-/**
- * Get activity indicators configuration from activityData
- * Maps activityData fields to indicator config objects with icon, label, type, and optional statusIcon
- * 
- * @param {Object} activityData - Activity data object
- * @param {Function} t - Translation function
- * @returns {Array} - Array of indicator config objects
- */
 export const getActivityIndicatorsConfig = (activityData, t) => {
-    const childrenPresenceConfig = getChildrenPresenceConfig(activityData?.presenceOfChildren);
     
     return [
         { icon: "Aid", label: t("Aid kit availability"), type: getIndicatorType(activityData?.aidKitAccessible) },
@@ -172,11 +100,137 @@ export const getActivityIndicatorsConfig = (activityData, t) => {
         { icon: "Users", label: t("Workers safe pairing"), type: getIndicatorType(activityData?.duosFormed) },
         { 
             icon: "Bear", 
-            label: t("Children presence"), 
-            type: childrenPresenceConfig.type,
-            ...(childrenPresenceConfig.statusIcon && { statusIcon: childrenPresenceConfig.statusIcon })
+            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/Restoration/index.jsx

@@ -1,9 +1,11 @@
 import { useMemo, useCallback } from 'react';
 import { DashboardLayout, Header, ImageCarousel, KeyIndicators, MineSiteMap, Widget, PieChart, ActivityIndicators } from '../../../../../../src/index.js'
 import { getKeyIndicatorsRowConfig } from './config';
-import { getActivityImages, getGenderDistributionData, isGenderDistributionEmpty, calculateGenderPieData, getGenderTooltipChildren, getActivityIndicatorsConfig } from './helper';
+import { getActivityImages, getGenderDistributionData, isGenderDistributionEmpty, calculateGenderPieData, getGenderTooltipChildren, getActivityIndicatorsConfig, getMapDataFromActivity } from './helper';
 import { renderTooltipJsx } from '../../../../../../src/utils';
+import { convertDMS } from '../../../../../../src/helpers/Map';
 import { useResizeContext } from '../../../../../../src/context';
+import CustomIcon from '../../../../../../src/@daf/core/components/Icon/CustomIcon.jsx';
 
 const RestorationActivitySummary = ({ activityData, supportText, onDownload, downloadDisabled, actionButtons, breadcrumbs, goBackTo, loading, t = () => { } }) => {
     const { isCollapsed, isNestedSidebarCollapsed } = useResizeContext();
@@ -24,6 +26,9 @@ const RestorationActivitySummary = ({ activityData, supportText, onDownload, dow
         [activityData, t]
     );
 
+    // Map Data - transformed from activityData
+    const mapData = useMemo(() => getMapDataFromActivity(activityData, t), [activityData, t]);
+
     return (
         <DashboardLayout
             header={
@@ -46,7 +51,7 @@ const RestorationActivitySummary = ({ activityData, supportText, onDownload, dow
             <section>
                 <Widget
                     title={t("Activity Location")}
-                    className="no-px no-pt-body  no-p-body no-pb-body"
+                    className="no-px h-w-btn-header no-pt-body  no-p-body no-pb-body"
                     style={{ height: '100%', display: 'flex', flexDirection: 'column' }}
                 >
                     <div style={{ flex: 1, minHeight: 0 }}>
@@ -55,73 +60,65 @@ const RestorationActivitySummary = ({ activityData, supportText, onDownload, dow
                             t={t}
                             isSatellite={true}
                             app={"straatos"}
+                            type={'location-territory'}
                             showSider={false}
                             user={null}
-                            data={[
-                                {
-                                    _id: {},
-                                    id: "7f2aaed4-4b2e-406c-8e0a-6659c5c8367b",
-                                    color: "#6698E4",
-                                    parent: {
-                                        _id: {},
-                                        createdAt: "2024-06-13T14:51:55.296Z",
-                                        updatedAt: "2024-06-13T14:51:55.296Z",
-                                        id: "a5340bf1-2c7d-413f-a2a5-ccd7dc8f7a7c",
-                                        name: "New Mine",
-                                        authorId: "4e6066e9-00d8-423a-94ec-c7c9d3432fec",
-                                        collectId: "f8a2b6a9cc935ef3e5844427f49aade34e152eca",
-                                        country: "AL",
-                                        category: "mineSite",
-                                        datastakeId: "LOC-00000000141",
-                                        __v: 0,
-                                    },
-                                    administrativeLevel1: "6839cb26-5af4-44a3-b136-a0f0a0bcecc6",
-                                    administrativeLevel2: "f849835d-5640-4bee-ae98-9f1c810c1abe",
-                                    // "name": "New Mine",
-                                    country: "AL",
-                                    category: "mineSite",
-                                    authorId: "4e6066e9-00d8-423a-94ec-c7c9d3432fec",
-                                    gps: {
-                                        latitude: 7,
-                                        longitude: 1,
-                                    },
-                                    area: [
-                                        [6, 5],
-                                        [7, 1],
-                                        [9, 2],
-                                    ],
-                                    associatedSubjects: [
-                                        {
-                                            entity: "Event",
-                                            _id: {},
-                                            nature: "",
-                                        },
-                                    ],
-                                    published: false,
-                                    version: 1,
-                                    createdAt: "2024-06-13T14:51:55.296Z",
-                                    updatedAt: "2024-06-13T14:51:55.296Z",
-                                    name: "Name",
-                                    type: "Loc Type",
-                                    __v: 0,
-                                    datastakeId: "LOC-00000000141",
-                                },
-                            ]}
-                            // tooltipAsText: true,
+                            data={mapData}
+                            maxZoom={18}
                             primaryLink={true}
-                            renderTooltip={() => {
+                            style={{ height: '100%', width: '100%' }}
+                            renderTooltipForLocation={(data) => {
+                                const coordinates = data.gps?.latitude && data.gps?.longitude
+                                    ? convertDMS(data.gps.latitude, data.gps.longitude)
+                                    : null;
+
+                                if (!coordinates) {
+                                    return [];
+                                }
+
+                                const isActivityEnd = data.name === t("Activity End") || data.id?.includes('-departure');
+                                const iconColor = isActivityEnd ? "#FF7A45" : "#016C6E";
+
+                                return [
+                                    {
+                                        label: t("Coordinates"),
+                                      
+                                        value: (
+                                            <div style={{ display: 'flex', alignItems: 'center', gap: '6px', flexWrap: 'nowrap' }}>
+                                                {/* Latitude icon (vertical) */}
+                                                <div style={{ display: 'flex', alignItems: 'center' }}>
+                                                    <CustomIcon 
+                                                        name="SpacingHeight" 
+                                                        width={14} 
+                                                        height={14} 
+                                                        color={iconColor}
+                                                    />
+                                                    <span style={{ fontWeight: 600, marginLeft: '4px' }}>{coordinates[0]}</span>
+                                                </div>
+                                                {/* Longitude icon (horizontal) */}
+                                                <div style={{ display: 'flex', alignItems: 'center' }}>
+                                                    <CustomIcon 
+                                                        name="SpacingWidth" 
+                                                        width={14} 
+                                                        height={14} 
+                                                        color={iconColor}
+                                                    />
+                                                    <span style={{ fontWeight: 600, marginLeft: '4px' }}>{coordinates[1]}</span>
+                                                </div>
+                                            </div>
+                                        ),
+                                    },
+                                ];
+                            }}
+                            renderTooltipForTerritory={(data) => {
                                 return [
                                     {
-                                        label: "Name",
-                                        value: "Name",
+                                        label: t("Plot Name"),
+                                        value: data.plotName || data.name || "--",
                                     },
                                 ];
                             }}
-                            center={[13, -15]}
-                            mapConfig={{ maxZoom: 18 }}
-                            type={'territory'}
                             link={true}
-                            onClickLink={() => { }}
                         />
                     </div>
                 </Widget>

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

@@ -1,7 +1,6 @@
 import React, { useMemo } from 'react'
 import Widget from '../../../../../core/components/Dashboard/Widget/index.jsx'
 import Map from '../../../../../core/components/Dashboard/Map/index.jsx'
-import { getLinkValue } from '../../../../../../helpers/StringHelper.js'
 
 const LocationMap = ({
     selectedPartners = {},

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

@@ -0,0 +1,76 @@
+import { BaseService } from "./BaseService.js";
+import { createLazyService } from "./helpers/LazyService.js";
+
+class PartnerService extends BaseService {
+	get(tab, filters) {
+		const { page, pageSize, search, searchParams, ...rest } = filters;
+		const params = {
+			filters: rest,
+			pagination: {
+				skip: page,
+				take: pageSize,
+			},
+		};
+		if (search && searchParams.length > 0) {
+			params.search = {
+				qs: search,
+				fields: searchParams,
+			};
+		}
+
+		return this.apiGet({
+			url: "/partner",
+			isApp: true,
+			params,
+		});
+	}
+
+	create(data) {
+		return this.apiPost({
+			url: "/partner",
+			isApp: true,
+			data,
+		});
+	}
+
+	accept(id) {
+		return this.apiPut({ url: `/partner/approve/${id}`, isApp: true });
+	}
+
+	activate(id) {
+		return this.apiPut({ url: `/partner/activate/${id}`, isApp: true });
+	}
+
+	decline(id) {
+		return this.apiPut({ url: `/partner/decline/${id}`, isApp: true });
+	}
+
+	suspend(id) {
+		return this.apiPut({ url: `/partner/suspend/${id}`, isApp: true });
+	}
+
+	block(id) {
+		return this.apiPut({ url: `/partner/block/${id}`, isApp: true });
+	}
+
+	resendInvite(id) {
+		return this.apiPut({ url: `/partner/resendInvite/${id}`, isApp: true });
+	}
+
+	getSubjectSources({ id, namespace = "stakeholder" }) {
+		return this.apiGet({
+			url: `/${namespace}/sources-for-subject/${id}`,
+			isApp: true,
+		});
+	}
+
+	update(id, data) {
+		return this.apiPut({
+			url: `/partner/${id}`,
+			isApp: true,
+			data,
+		});
+	}
+}
+
+export default createLazyService(PartnerService);

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

@@ -0,0 +1,26 @@
+import { Tag } from "antd";
+
+export const renderStatusTag = ({ value, t = (s) => s }) => {
+	const width = 87;
+
+	switch (value) {
+		case "edited":
+			return (
+				<Tag color="yellow" style={{ width }} className="text-center">
+					{t("Edited")}
+				</Tag>
+			);
+		case "submitted":
+			return (
+				<Tag color="green" style={{ width }} className="text-center">
+					{t("Submitted")}
+				</Tag>
+			);
+		default:
+			return (
+				<Tag color="blue" style={{ width }} className="text-center">
+					{t("Private")}
+				</Tag>
+			);
+	}
+};

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

@@ -158,20 +158,23 @@ export const renderTooltipJsx = ({
                   <span className="daf-tooltip-name">{item.label}</span>
                 </Tooltip>
 
-                <Tooltip title={item.tooltipValue || item.value}>
+                <Tooltip title={item.tooltipValue || (typeof item.value === 'string' ? item.value : '')}>
                   <div
                     style={{
                       height: "20px",
                       display: "flex",
                       alignItems: "center",
+                      gap: "4px",
                     }}
                   >
                     {item.tag ? (
                       <Tag color={item.tag} className="mr-none">
                         {item.value}
                       </Tag>
-                    ) : (
+                    ) : typeof item.value === 'string' || typeof item.value === 'number' ? (
                       <span className="daf-tooltip-value">{item.value}</span>
+                    ) : (
+                      item.value
                     )}
                   </div>
                 </Tooltip>

package/src/constants/breadCrumbs.js

@@ -17,4 +17,6 @@ export const defaultBreadCrumbsLabels = {
     summary: "Summary",
     edit: "Edit",
     details: "Details",
+    query: "Query",
+    channels: "Channels",
 }

package/src/constants.js

@@ -1 +1,2 @@
-export { defaultBreadCrumbsLabels } from './constants/breadCrumbs.js';
+export { defaultBreadCrumbsLabels } from './constants/breadCrumbs.js';
+export { CREATE_DRAWER_WIDTH, CREATE_DRAWER_WIDTH_LARGE } from './helpers/Forms.js';

package/src/index.js

@@ -11,7 +11,7 @@ export { default as Pagination } from "./@daf/core/components/Table/Pagination/i
 export { default as StickyTable } from "./@daf/core/components/Table/StickyTable/index.jsx";
 export { default as TableFilters } from "./@daf/core/components/Table/TableFilters/index.jsx";
 export { default as MoreOptions } from "./@daf/core/components/Table/MoreOptions/index.jsx";
-
+export { default as NavigationAction } from "./@daf/core/components/Table/NavigationAction/index.jsx";
 // Button
 export { default as Button } from "./@daf/core/components/Button/index.jsx";
 export { default as FilterButton } from "./@daf/core/components/Button/FilterButton/index.jsx";

package/src/services.js

@@ -17,4 +17,5 @@ export { default as UserService } from './@daf/services/UserService.js';
 export { default as SourceService } from './@daf/services/SourceService.js';
 export { default as DashboardService } from './@daf/services/DashboardService.js';
 export { default as LinkedSubjectsService } from './@daf/services/LinkedSubjects.js';
-export { default as OperatorService } from './@daf/services/OperatorService.js';
+export { default as OperatorService } from './@daf/services/OperatorService.js';
+export { default as PartnerService } from './@daf/services/PartnerService.js';

package/src/utils.js

@@ -60,4 +60,6 @@ export {
 	buildBreadcrumbs
 } from './@daf/utils/adminConfigBuilders.js'
 
-export { renderBreadCrumbs, buildBreadCrumbs as buildBreadCrumbsHelper } from './helpers/breadCrumbs.js'
+export { renderBreadCrumbs, buildBreadCrumbs as buildBreadCrumbsHelper } from './helpers/breadCrumbs.js'
+
+export { copyToClipboard } from './helpers/copyToClipboard.js'