datastake-daf 0.6.787 → 0.6.788

package/src/@daf/core/components/Screens/Admin/AdminDashboard/components/UserStatistics/TopContributors/index.jsx

@@ -8,7 +8,7 @@ export default function TopContributors({ data, loading, t }) {
 	const container = useRef(null);
 
 	useTopContributors({ container, data, t });
-console.log("topcontributorshhhh", data);
+
 	return (
 		<Widget
 			title={t(`admin::top-contributors`)}

package/src/@daf/core/components/Screens/Admin/AdminDashboard/components/UserStatistics/UserGrowth/hook.js

@@ -12,7 +12,7 @@ export default function useUserGrowth({ container, data: mainData = {}, t, trans
 	const [mainGraph, setMainGraph] = useState(null);
 	const [data, setData] = useState([]);
 	const { token } = useToken();
-console.log("mainData", mainData);
+
 	const fetchData = () => {
 		const { dates = [] } = mainData;
 		const _data = [];

package/src/@daf/core/components/Screens/Admin/AdminDashboard/components/UserStatistics/UserGrowth/index.jsx

@@ -9,7 +9,7 @@ export default function UserGrowth({ loading, data = [], t, translationKeys, fet
 	const [selectValue, setSelectValue] = useState(selectOptions[0]?.value);
 
 	useUserGrowth({ container, data, t, translationKeys });
-console.log("usergrowthhhhh", data);
+
 
 	useEffect(() => {
 		if (typeof fetchUserGrowth === "function") {

package/src/@daf/core/components/Screens/Admin/AdminModals/AddUser/index.jsx

@@ -24,6 +24,7 @@ export default function AddUserModal({ isOpen, defaultData = {}, userRoles = [],
 			.catch(() => {});
 	};
 
+	console.log("hellooooooooooooooooooooooooo");
 
 	return (
 		<Modal

package/src/@daf/core/components/Screens/Admin/AdminModals/CombineLocation/index.jsx

@@ -1,7 +1,7 @@
 import Modal from "../../../../Modal/index.jsx";
 import { Form, Input, Select, theme } from "antd";
 import { Container } from "../CombineModalStyle.js";
-// import { findOptions } from "../../../../../../../helpers/StringHelper.js";
+import { findOptions } from "../../../../../../../helpers/StringHelper.js";
 import DAFTable from "../../../../Table/index.jsx";
 import { useMemo, useState } from "react";
 import { getColumns } from "./helper.js";

package/src/@daf/core/components/Screens/Admin/AdminModals/NewAccount/index.jsx

@@ -47,7 +47,7 @@ export default function NewAccount({
 	return (
 		<Modal
 			t={t}
-			title={t(isEdit ? "edit-account" : "add-account")}
+			title={t(isEdit ? "admin::edit-account" : "admin::add-account")}
 			open={isOpen}
 			onClose={onClose}
 			onSuccess={onSubmit}

package/src/@daf/core/components/Screens/Admin/AdminScreens/Dashboard.jsx

@@ -20,7 +20,7 @@ export default function AdminDashboardScreen({ config }) {
     userGrowthDataLoading,
   } = useWidgetFetch();
 
-  // console.log({userGrowthData});
+  console.log({userGrowthData});
 
   const actionsWidgetsConfig = useMemo(
     () => getActionWidgetsConfig({ getRedirectLink }),
@@ -39,7 +39,7 @@ export default function AdminDashboardScreen({ config }) {
   const safeUserActivity = Array.isArray(data?.data?.userActivity) ? data.data.userActivity : [];
   const safeTopContributors = Array.isArray(data?.topContributors) ? data.topContributors : [];
   const safeUserGrowth = Array.isArray(data?.userGrowthData) ? data.userGrowthData : [];
-console.log("safeUserGrowth", safeUserGrowth);
+
 
   return (
     <AdminDashboard

package/src/@daf/core/components/Screens/Admin/AdminScreens/Location.jsx

@@ -47,11 +47,11 @@ export default function AdminLocationScreen({ config }) {
 	const handleMergeLocations = useCallback(
 		async (mergeData) => {
 			try {
-				if (AdminService.mergeSubjects) {
-					await AdminService.mergeSubjects({ subject: 'location', ...mergeData });
+				if (AdminService.mergeLocations) {
+					await AdminService.mergeLocations(mergeData);
 					message.success(t("Locations merged successfully"));
 				} else {
-					console.warn("AdminService.mergeSubjects is not implemented");
+					console.warn("AdminService.mergeLocations is not implemented");
 					message.success(t("Locations merged successfully"));
 				}
 			} catch (err) {
@@ -61,12 +61,12 @@ export default function AdminLocationScreen({ config }) {
 		[AdminService, t, handleError]
 	);
 
-	// Use custom getData if provided, otherwise use default AdminService.getSubjects
+	// Use custom getData if provided, otherwise use default AdminService.getLocations
 	const getLocations = useCallback((params) => {
 		if (getData) {
 			return getData(params);
 		}
-		return AdminService.getSubjects({ subject: 'location', params });
+		return AdminService.getLocations(params);
 	}, [getData, AdminService]);
 
 	return (

package/src/@daf/core/components/Screens/Admin/AdminScreens/Subjects.jsx

@@ -48,7 +48,7 @@ export default function AdminSubjectsScreen({ config }) {
 		async (mergeData) => {
 			try {
 				if (AdminService.mergeSubjects) {
-					await AdminService.mergeSubjects({ subject: 'stakeholder', ...mergeData });
+					await AdminService.mergeSubjects(mergeData);
 					message.success(t("Subjects merged successfully"));
 				} else {
 					console.warn("AdminService.mergeSubjects is not implemented");
@@ -66,7 +66,7 @@ export default function AdminSubjectsScreen({ config }) {
 		if (getData) {
 			return getData(params);
 		}
-		return AdminService.getSubjects({ subject: 'stakeholder', params });
+		return AdminService.getSubjects(params);
 	}, [getData, AdminService]);
 
 	return (

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

@@ -2,7 +2,7 @@ import { useState, useMemo } from "react";
 import { useAdminTable } from "../hook";
 import AdminTable from "../components/index.jsx";
 import DAFTable from "../../../../Table/index.jsx";
-import { theme, Tag, message } from "antd";
+import { theme, Tag } from "antd";
 import CustomIcon from "../../../../Icon/CustomIcon.jsx";
 import {
 	getTabs,
@@ -11,8 +11,8 @@ import {
 	defaultUrlParams,
 	checkboxConfig,
 } from "../SubjectsTable/helper.js";
+import { getColumns } from "../SubjectsTable/columns.js";
 import CombineLocationModal from "../../AdminModals/CombineLocation/index.jsx";
-import { getColumns } from "./column.js";
 const { useToken } = theme;
 
 export default function LocationTable({
@@ -37,22 +37,6 @@ export default function LocationTable({
 	const { token } = useToken();
 	const [combineLocationVisible, setCombineLocationVisible] = useState(false);
 
-	// Wrapper to transform pagination params to strings and ensure tab is at root level
-	const getDataWithStringPagination = async ({ params }) => {
-		// Extract tab from the params (it should already be there from filterParams)
-		const { pagination, tab, ...otherParams } = params;
-		
-		const transformedParams = {
-			...otherParams,
-			pagination: {
-				skip: String(pagination?.skip || 1),
-				take: String(pagination?.take || 20),
-			},
-			tab: tab || "active", // Ensure tab is at root level with default value
-		};
-		return getData({ params: transformedParams });
-	};
-
 	const {
 		filter,
 		activeTab,
@@ -74,7 +58,7 @@ export default function LocationTable({
 		defaultPageSize,
 		filtersConfig,
 		getRedirectLink,
-		getData: getDataWithStringPagination,
+		getData,
 		refetchTrigger,
 	});
 
@@ -96,7 +80,7 @@ export default function LocationTable({
 			setSelectedLocations,
 			getRedirectLink,
 			selectOptions,
-			entity: headerTitle,
+			entity: headerTitle
 		});
 	}, [t, goTo, module, token, selectedLocations, getRedirectLink, selectOptions, headerTitle]);
 
@@ -105,7 +89,7 @@ export default function LocationTable({
 			<AdminTable
 				filters={filter}
 				t={t}
-				headerTitle={"test"}
+				headerTitle={headerTitle}
 				actionButton={[
 					{
 						icon: "Merge",
@@ -126,7 +110,6 @@ export default function LocationTable({
 				checkboxConfig={checkboxConfig}
 				defaultTableFilters={{}}
 				breadcrumbs={breadcrumbs}
-
 			>
 				{selectedLocations.length > 0 && (
 					<div
@@ -185,7 +168,6 @@ export default function LocationTable({
 					if (typeof mergeSubjectsFunction === 'function') {
 						mergeSubjectsFunction(data);
 						setSelectedLocations([])
-						message.success(t("Locations successfully merged."))
 					}
 				}}
 				selectedLocations={selectedLocations}

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

@@ -104,48 +104,48 @@ export const getColumns = ({
 				return <Tooltip title={country}>{country}</Tooltip>;
 			},
 		},
-	{
-		title: t("Admin Level 1"),
-		dataIndex: "administrativeLevel1",
-		key: "administrativeLevel1",
-		ellipsis: true,
-		show: entity.includes("location"),
-		render: (value, all) => {
-			if (all.empty) {
-				return <div className="daf-default-cell" />;
-			}
+		{
+			title: t("Province"),
+			dataIndex: "administrativeLevel1",
+			key: "administrativeLevel1",
+			ellipsis: true,
+			show: entity.includes("locations"),
+			render: (value, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
 
-			let label;
-			if(all?.administrativeLevel1 && value === all?.administrativeLevel1) {
-				label = all?.linking?.SCL?.[value]?.name
-			} else {
-				label = getNameByLevel(all?.linking?.SCL, "level_1")?.name
-			}
+				let label;
+				if(all?.administrativeLevel1 && value === all?.administrativeLevel1) {
+					label = all?.linking?.SCL?.[value]?.name
+				} else {
+					label = getNameByLevel(all?.linking?.SCL, "level_1")?.name
+				}
 
-			return <Tooltip title={label || '-'}>{label || '-'}</Tooltip>;
+				return <Tooltip title={label || '-'}>{label || '-'}</Tooltip>;
+			},
 		},
-	},
-	{
-		title: t("Admin Level 2"),
-		dataIndex: "administrativeLevel2",
-		key: "administrativeLevel2",
-		show: entity.includes("location"),
-		ellipsis: true,
-		render: (value, all) => {
-			if (all.empty) {
-				return <div className="daf-default-cell" />;
-			}
+		{
+			title: t("Territory"),
+			dataIndex: "administrativeLevel2",
+			key: "administrativeLevel2",
+			show: entity.includes("locations"),
+			ellipsis: true,
+			render: (value, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
 
-			let label;
-			if(all?.administrativeLevel2 && value === all?.administrativeLevel2) {
-				label = all?.linking?.SCL?.[value]?.name
-			} else {
-				label = getNameByLevel(all?.linking?.SCL, "level_2")?.name
-			}
+				let label;
+				if(all?.administrativeLevel2 && value === all?.administrativeLevel2) {
+					label = all?.linking?.SCL?.[value]?.name
+				} else {
+					label = getNameByLevel(all?.linking?.SCL, "level_2")?.name
+				}
 
-			return <Tooltip title={label || '-'}>{label || '-'}</Tooltip>;
+				return <Tooltip title={label || '-'}>{label || '-'}</Tooltip>;
+			},
 		},
-	},
 		{
 			title: t("Sources"),
 			dataIndex: "sources",

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

@@ -2,7 +2,7 @@ import { useState, useMemo } from "react";
 import { useAdminTable } from "../hook";
 import AdminTable from "../components/index.jsx";
 import DAFTable from "../../../../Table/index.jsx";
-import { theme, Tag, message } from "antd";
+import { theme, Tag } from "antd";
 import CustomIcon from "../../../../Icon/CustomIcon.jsx";
 import {
 	getTabs,
@@ -67,7 +67,7 @@ export default function SubjectsTable({
 		return {
 			category: config.options?.category,
 			country: config.options?.countries,
-			sources: [],
+			sources: [], //TODO: add sources logic and make sure you only show unique sources only once
 		};
 	}, [config.options]);
 
@@ -113,15 +113,25 @@ export default function SubjectsTable({
 				breadcrumbs={breadcrumbs}
 			>
 				{selectedSubjects.length > 0 && (
-					<div className="flex flex-row  ml-6 mt-5" style={{ flexWrap: "wrap", gap: "8px" }}>
+					<div
+						className="flex flex-row  ml-6 mt-5"
+						style={{
+							flexWrap: "wrap",
+							gap: "8px",
+						}}
+					>
 						{selectedSubjects.map((account) => (
 							<Tag
 								key={account.userId}
 								className="flex flex-row gap-2 items-center"
 								onClick={() =>
-									setSelectedSubjects((prev) => prev.filter((a) => a.datastakeId !== account.datastakeId))
+									setSelectedSubjects((prev) =>
+										prev.filter((a) => a.datastakeId !== account.datastakeId),
+									)
 								}
-								style={{ cursor: "pointer" }}
+								style={{
+									cursor: "pointer",
+								}}
 							>
 								<span>{account.datastakeId}</span>
 								<CustomIcon name="Close" size={10} />
@@ -150,20 +160,19 @@ export default function SubjectsTable({
 			<CombineSubjectsModal
 				isOpen={isCombineModalOpen}
 				t={t}
-				onClose={() => setIsModalOpen(false)}
+				onClose={() => {
+					setIsModalOpen(false);
+				}}
 				onSuccess={(data) => {
 					setIsModalOpen(false);
 					setLoading(true);
-					message.success(t("Subjects successfully merged."))
 					if (typeof mergeSubjectsFunction === 'function') {
-						mergeSubjectsFunction(data).finally(() => {
-							setSelectedSubjects([]);
-							fetchData();
-						});
+						mergeSubjectsFunction(data);
+						setSelectedSubjects([])
 					}
 				}}
 				selectedSubjects={selectedSubjects}
-				selectOptions={selectOptions}
+				selectOptions={selectOptions || {}}
 				module={module}
 				entity={headerTitle}
 			/>

package/src/@daf/core/components/Screens/Admin/AdminViews/components/Users/helper.js

@@ -167,7 +167,10 @@ export const getColumns = ({
 	return cols.filter((v) => v.show);
 };
 
-export const checkboxConfig = {};
+export const checkboxConfig = {
+	name: "Name",
+	datastakeId: "ID",
+};
 
 export const selectFiltersConfig = {
 	userRole: {
@@ -191,17 +194,9 @@ export const selectFiltersConfig = {
 };
 
 export const filtersConfig = {
-	search: "",
-};
-
-export const defaultUrlParams = {
-	search: "",
-	userRole: null,
-	status: null,
+	name: "",
+	datastakeId: "",
 };
 
-export const defaultTableFilters = {
-	search: "",
-	userRole: null,
-	status: null,
-};
+export const defaultUrlParams = {};
+export const defaultTableFilters = {};

package/src/@daf/core/components/Screens/Admin/AdminViews/components/Users/index.jsx

@@ -60,10 +60,10 @@ export default function Users({
 			userRole: userRoles.filter((u) => !u.isForAppAdmin),
 			status: accountStatuses,
 		};
-	}, [userRoles, accountStatuses]);
+	}, [userRoles]);
 
 	const canClearSearch = useMemo(() => {
-		return !!activeFilters.search || !!activeFilters.userRole || !!activeFilters.status;
+		return !!activeFilters.search;
 	}, [activeFilters]);
 
 	const onDeleteUserClick = useCallback(

package/src/@daf/core/components/Screens/Admin/adminRoutes.js

@@ -104,7 +104,7 @@ export function getAdminRoutes(config) {
     ...(typeof useAdminLocationConfig === "function"
       ? [
           {
-            path: "management/subjects/location",
+            path: "subjects/location",
             key: `${APP_PREFIX}_ADMIN_SUBJECTS_LOCATIONS`,
             exact: true,
             visible: (user) => userIsAdmin(user),
@@ -115,7 +115,7 @@ export function getAdminRoutes(config) {
     ...(typeof useAdminSubjectsConfig === "function"
       ? [
           {
-            path: "management/subjects/stakeholder",
+            path: "subjects/stakeholder",
             key: `${APP_PREFIX}_ADMIN_SUBJECTS_STAKEHOLDERS`,
             exact: true,
             visible: (user) => userIsAdmin(user),

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

@@ -0,0 +1,29 @@
+import React, { useMemo } from 'react';
+import { ImageCarousel } from '../../../../../../../../src/index.js';
+import { getActivityImages } from '../../helper';
+import { useResizeContext } from '../../../../../../../../src/context';
+
+const ActivityImagery = ({ 
+    activityData, 
+    loading = false, 
+    t = (s) => s 
+}) => {
+    const { isCollapsed, isNestedSidebarCollapsed } = useResizeContext();
+    const images = useMemo(() => getActivityImages(activityData), [activityData]);
+
+    return (
+        <div style={{ maxWidth: "70%", width: "calc(100% - 405px)" }}>
+            <ImageCarousel
+                loading={loading}
+                images={images}
+                title={t("straatos::activity-imagery")}
+                key={`${isCollapsed}-${isNestedSidebarCollapsed}`}
+                customArrows={true}
+                activeDotColor="#003435"
+            />
+        </div>
+    );
+};
+
+export default ActivityImagery;
+

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

@@ -0,0 +1,94 @@
+import React, { useMemo } from 'react';
+import { Widget, MineSiteMap } from '../../../../../../../../src/index.js';
+import { getMapDataFromActivity } from '../../helper';
+import { convertDMS } from '../../../../../../../../src/helpers/Map';
+import CustomIcon from '../../../../../../../../src/@daf/core/components/Icon/CustomIcon.jsx';
+
+const ActivityLocation = ({ 
+    activityData, 
+    loading = false, 
+    t = (s) => s 
+}) => {
+    const mapData = useMemo(() => getMapDataFromActivity(activityData, t), [activityData, t]);
+
+    return (
+        <section>
+        <Widget
+            title={t("Activity Location")}
+            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 }}>
+                <MineSiteMap
+                    loading={loading}
+                    t={t}
+                    isSatellite={true}
+                    app={"straatos"}
+                    type={'location-territory'}
+                    showSider={false}
+                    user={null}
+                    data={mapData}
+                    maxZoom={18}
+                    primaryLink={true}
+                    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: t("Plot Name"),
+                                value: data.plotName || data.name || "--",
+                            },
+                        ];
+                    }}
+                    link={true}
+                />
+            </div>
+        </Widget>
+        </section>
+    );
+};
+
+export default ActivityLocation;
+

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

@@ -0,0 +1,56 @@
+import React, { useMemo } from 'react';
+import { ActivityIndicators } from '../../../../../../../../../../src/index.js';
+
+const PlantedSpecies = ({ 
+    activityData, 
+    loading = false, 
+    t = (s) => s 
+}) => {
+    const speciesConfig = useMemo(() => {
+        // Extract planted species from activityData
+        // Assuming the data structure might have plantedSpecies array or similar
+        const species = activityData?.plantedSpecies || activityData?.mangroveSpecies || [];
+        
+        // If species is an array, map it to config format
+        if (Array.isArray(species)) {
+            return species.map((speciesItem, index) => {
+                const speciesName = typeof speciesItem === 'string' 
+                    ? speciesItem 
+                    : speciesItem?.name || speciesItem?.species || `Species ${index + 1}`;
+                
+                // Determine if species is selected/planted (you may need to adjust this logic)
+                const isSelected = typeof speciesItem === 'object' 
+                    ? speciesItem?.selected !== false 
+                    : true;
+                
+                return {
+                    icon: 'Tree',
+                    label: speciesName,
+                    type: isSelected ? 'compliant' : 'notCompliant',
+                    statusIcon: isSelected ? 'Check' : 'Close'
+                };
+            });
+        }
+        
+        // Fallback: if no species data, show default species from image
+        return [
+            { icon: 'Tree', label: 'Rhyzophora sp', type: 'compliant', statusIcon: 'Check' },
+            { icon: 'Tree', label: 'Rhyzophora', type: 'notCompliant', statusIcon: 'Close' },
+            { icon: 'Tree', label: 'Rhyzophora mangle', type: 'notCompliant', statusIcon: 'Close' }
+        ];
+    }, [activityData]);
+
+    return (
+        <ActivityIndicators
+            title={t("Planted Species")}
+            config={speciesConfig}
+            loading={loading}
+            widgetClassName="h-w-btn-header"
+            t={t}
+            className="single-column"
+        />
+    );
+};
+
+export default PlantedSpecies;
+