datastake-daf 0.6.794 → 0.6.796

package/src/@daf/core/components/Dashboard/Widget/VegetationWidget/VegetationWidget.stories.jsx

@@ -0,0 +1,76 @@
+import VegetationWidget from "./index.jsx";
+import ThemeLayout from "../../../ThemeLayout/index.jsx";
+
+export default {
+	title: "Dashboard/Widgets/VegetationWidget",
+	component: VegetationWidget,
+	tags: ["autodocs"],
+	argsTypes: {
+		activeVegetationConditions: {
+			control: {
+				type: "checkbox",
+			},
+			options: [
+				"healthy",
+				"white",
+				"black",
+				"reddish",
+				"yellowing",
+				"mosaic",
+				"dryOrDead",
+				"noLeaves",
+				"spiderWebs",
+				"damageFromInsects",
+			],
+		},
+	},
+	decorators: [
+		(Story) => (
+			<div style={{ margin: "3em" }}>
+				<ThemeLayout>
+					<Story />
+				</ThemeLayout>
+			</div>
+		),
+	],
+};
+
+export const Primary = {
+	name: "VegetationWidget",
+	args: {
+		title: "Vegetation Health",
+		activeVegetationConditions: [
+			"healthy",
+			"reddish",
+			"dryOrDead",
+		],
+	},
+};
+
+export const Empty = {
+	name: "Empty",
+	args: {
+		title: "Vegetation Health",
+		activeVegetationConditions: [],
+	},
+};
+
+export const AllActive = {
+	name: "All Active",
+	args: {
+		title: "Vegetation Health",
+		activeVegetationConditions: [
+			"healthy",
+			"white",
+			"black",
+			"reddish",
+			"yellowing",
+			"mosaic",
+			"dryOrDead",
+			"noLeaves",
+			"spiderWebs",
+			"damageFromInsects",
+		],
+	},
+};
+

package/src/@daf/core/components/Dashboard/Widget/VegetationWidget/config.js

@@ -0,0 +1,31 @@
+import { VEGETATION_KEYS as KEYS } from "../../../../../../constants/Vegetation";
+
+// Mapping from growthObservations keys to VEGETATION_KEYS
+export const GROWTH_OBSERVATIONS_TO_VEGETATION_KEYS = {
+	"white_spots": KEYS.WHITE_SPOTS,
+	"healthy_leaves": KEYS.HEALTHY,
+	"yellowing_leaves": KEYS.YELLOWING,
+	"leaf_mosaic": KEYS.MOSAIC,
+	"dry_dead_leaves": KEYS.DRY_OR_DEAD,
+	"no_leaves": KEYS.NO_LEAVES,
+	"black_spots": KEYS.BLACK_SPOTS,
+	"reddish_spots": KEYS.REDDISH_SPOTS,
+	"spider_webs": KEYS.SPIDER_WEBS,
+	"insect_damage": KEYS.DAMAGE_FROM_INSECTS,
+};
+
+export const getVegetationConfig = () => {
+	return [
+		{ img: "/Vegetation/healthy.svg", key: KEYS.HEALTHY, disabled: "/Vegetation/healthy-default.svg" },
+		{ img: "/Vegetation/white.svg", key: KEYS.WHITE_SPOTS, disabled: "/Vegetation/white-default.svg" },
+		{ img: "/Vegetation/black.svg", key: KEYS.BLACK_SPOTS, disabled: "/Vegetation/black-default.svg" },
+		{ img: "/Vegetation/reddish.svg", key: KEYS.REDDISH_SPOTS, disabled: "/Vegetation/reddish-default.svg" },
+		{ img: "/Vegetation/yellowing.svg", key: KEYS.YELLOWING, disabled: "/Vegetation/yellowing-default.svg" },
+		{ img: "/Vegetation/mosaic.svg", key: KEYS.MOSAIC, disabled: "/Vegetation/mosaic-default.svg" },
+		{ img: "/Vegetation/dry-or-dead.svg", key: KEYS.DRY_OR_DEAD, disabled: "/Vegetation/dry-or-dead-default.svg" },
+		{ img: "/Vegetation/no-leaves.svg", key: KEYS.NO_LEAVES, disabled: "/Vegetation/no-leaves-default.svg" },
+		{ img: "/Vegetation/spider-webs.svg", key: KEYS.SPIDER_WEBS, disabled: "/Vegetation/spider-webs-default.svg" },
+		{ img: "/Vegetation/damage-from-insects.svg", key: KEYS.DAMAGE_FROM_INSECTS, disabled: "/Vegetation/damage-from-insects-default.svg" },
+	];
+};
+

package/src/@daf/core/components/Dashboard/Widget/VegetationWidget/index.jsx

@@ -0,0 +1,137 @@
+import Widget from "../index.jsx";
+import styled from "styled-components";
+import { getVegetationConfig, GROWTH_OBSERVATIONS_TO_VEGETATION_KEYS } from "./config.js";
+import { Tooltip } from "antd";
+
+export default function VegetationWidget({
+	title = "Vegetation Health",
+	activeVegetationConditions = [],
+	filterKeys = null,
+	columnsPerRow = null,
+	itemWidth = 140.33,
+	itemHeight = 140,
+	growthObservations = [],
+	t = (key) => key,
+	...props
+}) {
+	let vegetationConfig = getVegetationConfig();
+	
+	// Get all VEGETATION_KEYS values before filtering (needed for mapping check)
+	const allVegetationKeys = vegetationConfig.map(item => item.key);
+	
+	// Filter to show only specific keys if filterKeys is provided
+	if (filterKeys && Array.isArray(filterKeys)) {
+		vegetationConfig = vegetationConfig.filter(item => filterKeys.includes(item.key));
+	}
+
+	// Map growthObservations to VEGETATION_KEYS
+	// Handle both formats: growthObservations keys (e.g., "yellowing_leaves") and VEGETATION_KEYS (e.g., "yellowing")
+	const mappedGrowthObservations = Array.isArray(growthObservations)
+		? growthObservations
+			.map(obs => {
+				// First try to map from growthObservations format
+				const mapped = GROWTH_OBSERVATIONS_TO_VEGETATION_KEYS[obs];
+				if (mapped) {
+					return mapped;
+				}
+				// If not mapped, check if it's already a VEGETATION_KEY value
+				if (allVegetationKeys.includes(obs)) {
+					return obs;
+				}
+				// Debug: log unmapped observations
+				if (obs) {
+					console.warn(`VegetationWidget: Unmapped growthObservation "${obs}"`);
+				}
+				return null;
+			})
+			.filter(Boolean)
+		: [];
+
+	return (
+		<Widget title={title} className={`with-border-header`} {...props}>
+			<VegetationWrapper $columnsPerRow={columnsPerRow}>
+				<VegetationContainer 
+					$columnsPerRow={columnsPerRow}
+					$itemWidth={itemWidth}
+					$itemHeight={itemHeight}
+				>
+					{vegetationConfig.map((item) => {
+						// Use colored SVG if the item's key exists in growthObservations (mapped)
+						// Otherwise use default SVG
+						// Also check activeVegetationConditions for backward compatibility
+						const isInGrowthObservations = mappedGrowthObservations.includes(item.key);
+						const isInActiveConditions = activeVegetationConditions.includes(item.key);
+						
+						// Use colored SVG if it exists in growthObservations OR activeVegetationConditions
+						const shouldUseColored = isInGrowthObservations || isInActiveConditions;
+						
+						// Debug logging for yellowing specifically
+						if (item.key === "yellowing") {
+							console.log("Yellowing debug:", {
+								itemKey: item.key,
+								growthObservations,
+								mappedGrowthObservations,
+								isInGrowthObservations,
+								isInActiveConditions,
+								shouldUseColored,
+								img: item.img,
+								disabled: item.disabled
+							});
+						}
+
+						return (
+							<Tooltip key={item.key} title={t(`straatos::${item.key}`)}>
+								<img
+									src={shouldUseColored ? item.img : item.disabled}
+									key={item.key}
+									className={`vegetation-item`}
+									alt={item.key}
+								></img>
+							</Tooltip>
+						);
+					})}
+				</VegetationContainer>
+			</VegetationWrapper>
+		</Widget>
+	);
+}
+
+const VegetationWrapper = styled.div`
+	${props => props.$columnsPerRow ? `
+		overflow-x: auto;
+		width: 100%;
+	` : ''}
+`;
+
+const VegetationContainer = styled.div`
+	display: grid;
+	grid-template-columns: ${props => 
+		props.$columnsPerRow 
+			? `repeat(${props.$columnsPerRow}, 1fr)` 
+			: `repeat(auto-fit, minmax(${props.$itemWidth}px, 1fr))`
+	};
+	gap: 24px;
+	${props => props.$columnsPerRow ? `
+		width: 100%;
+	` : ''}
+
+	.vegetation-item {
+		width: 100%;
+		aspect-ratio: ${props => props.$itemWidth / props.$itemHeight};
+		border-radius: 7px;
+		flex-shrink: 0;
+	
+		background-size: cover;
+		background-position: center;
+		background-repeat: no-repeat;
+	}
+
+	.vegetation-item-content {
+		display: flex;
+		align-items: center;
+		height: 100%;
+		color: white;
+		text-align: center;
+	}
+`;
+

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

@@ -10,6 +10,7 @@ const { useToken } = theme;
 export default function useTopContributors({ container, data = [], t }) {
 	const [mainGraph, setMainGraph] = useState(null);
 	const { token } = useToken();
+
 	useEffect(() => {
 		if (container.current) {
 			if (mainGraph) {

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/helper.js

@@ -47,7 +47,7 @@ export const getColumns = ({ t, selectOptions, module, entity }) => {
 			dataIndex: "administrativeLevel1",
 			key: "administrativeLevel1",
 			ellipsis: true,
-			show: entity?.includes("location"),
+			show: entity.includes("locations"),
 			render: (value, all) => {
 				let label;
 				if(all?.administrativeLevel1 && value === all?.administrativeLevel1) {
@@ -63,7 +63,7 @@ export const getColumns = ({ t, selectOptions, module, entity }) => {
 			title: t("Territory"),
 			dataIndex: "administrativeLevel2",
 			key: "administrativeLevel2",
-			show: entity?.includes("location"),
+			show: entity.includes("locations"),
 			render: (value, all) => {
 				let label;
 				if(all?.administrativeLevel2 && value === all?.administrativeLevel2) {

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

@@ -1,10 +1,11 @@
 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 DAFTable from "../../../../Table/index.jsx";
 import { useMemo, useState } from "react";
-import { getNameByLevel } from "../../AdminTables/SubjectsTable/helper.js";
 import { getColumns } from "./helper.js";
+import { getNameByLevel } from "../../AdminTables/SubjectsTable/helper.js";
 
 const { useToken } = theme;
 
@@ -34,22 +35,10 @@ export default function CombineLocationModal({
 
 	const onSubmit = () => {
 		MainForm.validateFields().then((data) => {
-			const ids = selectedLocations.map((location) => location.id);	  
-			const allowedKeys = [
-				"id", 
-				"name", 
-				"country", 
-				"category", 
-				"administrativeLevel1", 
-				"administrativeLevel2"
-			];		  
-			const filteredData = Object.fromEntries(
-				Object.entries(data).filter(([key]) => allowedKeys.includes(key))
-			);
-	
+			const ids = selectedLocations.map((location) => location._id);
 			onSuccess({
 				ids,
-				data: filteredData,
+				data,
 			});
 		});
 	};
@@ -68,7 +57,8 @@ export default function CombineLocationModal({
 				setIsDisabled(() => {
 				  const values = MainForm.getFieldsValue();
 			  
-				  const requiredFields = entity?.includes("location")
+				  const requiredFields =
+					entity === "location"
 					  ? ["id", "name", "category", "country", "administrativeLevel1", "administrativeLevel2"]
 					  : ["id", "name", "category", "country"];
 			  
@@ -124,7 +114,7 @@ export default function CombineLocationModal({
 							options={selectedLocations.map((location) => {
 								return {
 									label: location?.datastakeId || "-",
-                value: location?.id || "-",
+									value: location?.datastakeId || "-",
 								};
 							})}
 							placeholder={t("ID")}
@@ -179,7 +169,7 @@ export default function CombineLocationModal({
 						></Select>
 					</Form.Item>
 
-					{entity?.includes("location") && (
+					{entity.includes("locations") && (
 						<>
 						<Form.Item className="flex-1" name="administrativeLevel1">
 							<Select

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

@@ -36,7 +36,7 @@ export default function CombineSubjectsModal({
 
 	const onSubmit = () => {
 		MainForm.validateFields().then((data) => {
-			const ids = selectedSubjects.map((subject) => subject.id);
+			const ids = selectedSubjects.map((subject) => subject._id);
 			onSuccess({
 				ids,
 				data,
@@ -47,7 +47,7 @@ export default function CombineSubjectsModal({
 	return (
 		<Modal
 			open={isOpen}
-			title={t("merge")}
+			title={t("admin::merge")}
 			onClose={onClose}
 			onSuccess={onSubmit}
 			withModalFormWrapper={false}
@@ -59,7 +59,7 @@ export default function CombineSubjectsModal({
 				  const values = MainForm.getFieldsValue();
 			  
 				  const requiredFields =
-					entity.includes("location")
+					entity === "location"
 					  ? ["id", "name", "category", "country", "administrativeLevel1", "administrativeLevel2"]
 					  : ["id", "name", "category", "country"];
 			  
@@ -75,7 +75,7 @@ export default function CombineSubjectsModal({
 							color: token.baseGray90,
 						}}
 					>
-						{t("current_subjects")}
+						{t("admin::current_subjects")}
 					</span>
 					<DAFTable
 						columns={columns}
@@ -93,7 +93,7 @@ export default function CombineSubjectsModal({
 						marginTop: 14,
 					}}
 				>
-					{t("merged_output")}
+					{t("admin::merged_output")}
 				</span>
 
 				<Form
@@ -135,7 +135,7 @@ export default function CombineSubjectsModal({
 						></Select>
 					</Form.Item>
 
-					{entity.includes("location") && (
+					{entity.includes("locations") && (
 						<>
 						<Form.Item className="flex-1" name="administrativeLevel1">
 							<Select

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

@@ -48,11 +48,11 @@ export default function AdminLocationScreen({ config }) {
 		async (mergeData) => {
 			try {
 				if (AdminService.mergeLocations) {
-					await AdminService.mergeLocations({ subject: 'location', ...mergeData });
+					await AdminService.mergeLocations(mergeData);
 					message.success(t("Locations merged successfully"));
 				} else {
 					console.warn("AdminService.mergeLocations is not implemented");
-					message.error(t("Locations not merged"));
+					message.success(t("Locations merged successfully"));
 				}
 			} catch (err) {
 				handleError?.(err);
@@ -61,11 +61,12 @@ export default function AdminLocationScreen({ config }) {
 		[AdminService, t, handleError]
 	);
 
-	const getSubjects = useCallback((params) => {
+	// 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 (
@@ -76,12 +77,12 @@ export default function AdminLocationScreen({ config }) {
 			location={location}
 			module={module}
 			headerTitle={headerTitle}
-			getData={getSubjects}
+			getData={getLocations}
 			isMobile={isMobile}
 			defaultPageSize={defaultPageSize}
 			view={view}
 			breadcrumbs={breadcrumbs}
-			mergeLocationsFunction={handleMergeLocations}
+			mergeSubjectsFunction={handleMergeLocations}
 			refetchTrigger={refetchTrigger}
 			config={{
 				options: {

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/AdminScreens/index.js

@@ -10,4 +10,3 @@ export { default as AdminAccountsScreen } from "./Accounts.jsx";
 export { default as AdminAccountsViewScreen } from "./AccountsView.jsx";
 export { default as AdminSubjectsScreen } from "./Subjects.jsx";
 export { default as AdminLocationScreen } from "./Location.jsx";
-export { default as AdminSubjectsViewScreen } from "./SubjectsView.jsx";

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

@@ -60,7 +60,6 @@ export default function AccountTable({
 		filtersConfig,
 		getRedirectLink,
 		getData,
-		fetchPendingOnMount: true, 
 	});
 
 	const selectOptions = useMemo(() => {