datastake-daf 0.6.821 → 0.6.822

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.821",
+	"version": "0.6.822",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/core/components/Screens/Admin/AdminModals/CombineLocation/columns.js

@@ -28,7 +28,8 @@ export const getColumns = ({ t, selectOptions, module, entity }) => {
 			key: "category",
 			show: true,
 			render: (value, all) => {
-				const label = findOptions(value, selectOptions?.category);
+				const categories = [...(selectOptions?.locationCategories || []), ...(selectOptions?.productionSiteCategories || [])];
+				const label = findOptions(value, categories);
 				return <Tooltip title={label}>{label}</Tooltip>;
 			},
 		},
@@ -38,7 +39,7 @@ export const getColumns = ({ t, selectOptions, module, entity }) => {
 			key: "country",
 			show: true,
 			render: (value, all) => {
-				const label = findOptions(value, selectOptions?.country);
+				const label = findOptions(value, selectOptions?.countries);
 				return <Tooltip title={label}>{label}</Tooltip>;
 			},
 		},
@@ -47,7 +48,7 @@ export const getColumns = ({ t, selectOptions, module, entity }) => {
 			dataIndex: "administrativeLevel1",
 			key: "administrativeLevel1",
 			ellipsis: true,
-			show: entity.includes("locations"),
+			show: entity?.includes("location"),
 			render: (value, all) => {
 				let label;
 				if(all?.administrativeLevel1 && value === all?.administrativeLevel1) {
@@ -63,7 +64,7 @@ export const getColumns = ({ t, selectOptions, module, entity }) => {
 			title: t("Territory"),
 			dataIndex: "administrativeLevel2",
 			key: "administrativeLevel2",
-			show: entity.includes("locations"),
+			show: entity?.includes("location"),
 			render: (value, all) => {
 				let label;
 				if(all?.administrativeLevel2 && value === all?.administrativeLevel2) {
@@ -76,4 +77,4 @@ export const getColumns = ({ t, selectOptions, module, entity }) => {
 			},
 		},
 	].filter((c) => c?.show);
-};
+};

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

@@ -3,8 +3,8 @@ import { Form, Input, Select, theme } from "antd";
 import { Container } from "../CombineModalStyle.js";
 import DAFTable from "../../../../Table/index.jsx";
 import { useMemo, useState } from "react";
-import { getAdminLevelName } from "../../../../../../../helpers/adminLevels.js";
-import { getColumns } from "./helper.js";
+import { getAdminLevel } from "../../../../../../../helpers/adminLevels.js";
+import { getColumns } from "./columns.js";
 
 const { useToken } = theme;
 
@@ -22,6 +22,11 @@ export default function CombineLocationModal({
 	const [MainForm] = Form.useForm();
 	const [isDisabled, setIsDisabled] = useState(true);
 
+	// Watch form values for cross-filtering
+	const selectedCountry = Form.useWatch('country', MainForm);
+	const selectedProvince = Form.useWatch('administrativeLevel1', MainForm);
+	const selectedTerritory = Form.useWatch('administrativeLevel2', MainForm);
+
 	const columns = useMemo(() => {
 		return getColumns({
 			t,
@@ -32,6 +37,31 @@ export default function CombineLocationModal({
 		});
 	}, [selectedLocations, t, selectOptions, module, entity]);
 
+	const categories = [...(selectOptions?.locationCategories || []), ...(selectOptions?.productionSiteCategories || [])];
+
+	const getFilteredLocations = () => {
+		return selectedLocations.filter((location) => {
+			if (selectedCountry && location.country !== selectedCountry) {
+				return false;
+			}
+			if (selectedProvince) {
+				const provinceData = getAdminLevel(location?.linking?.SCL, "level_1") || location?.linking?.SCL?.[location?.administrativeLevel1];
+				const provinceCountry = provinceData?.country || location.country;
+				if (provinceData?.id !== selectedProvince || (selectedCountry && provinceCountry !== selectedCountry)) {
+					return false;
+				}
+			}
+			if (selectedTerritory) {
+				const territoryData = getAdminLevel(location?.linking?.SCL, "level_2") || location?.linking?.SCL?.[location?.administrativeLevel2];
+				const territoryCountry = territoryData?.country || location.country;
+				if (territoryData?.id !== selectedTerritory || (selectedCountry && territoryCountry !== selectedCountry)) {
+					return false;
+				}
+			}
+			return true;
+		});
+	};
+
 	const onSubmit = () => {
 		MainForm.validateFields().then((data) => {
 			const ids = selectedLocations.map((location) => location.id);
@@ -105,20 +135,71 @@ export default function CombineLocationModal({
 					{t("admin::merged_output")}
 				</span>
 
-				<Form
-					form={MainForm}
-					clearOnDestroy={true}
-					className="select-container"
-					onValuesChange={() => {
-						setIsDisabled((prev) => {
-							const values = MainForm.getFieldsValue();
-							return Object.keys(values).some((key) => values[key] === undefined);
-						});
-					}}
-					style={{
-						borderColor: token.baseGray50,
-					}}
-				>
+			<Form
+				form={MainForm}
+				clearOnDestroy={true}
+				className="select-container"
+				onValuesChange={(changedValues) => {
+					if (changedValues.country !== undefined) {
+						const currentValues = MainForm.getFieldsValue();
+						const newCountry = changedValues.country;
+						
+						if (currentValues.administrativeLevel1) {
+							const isProvinceValid = selectedLocations.some((location) => {
+								const provinceData = location?.linking?.SCL?.[location?.administrativeLevel1];
+								return location.country === newCountry && provinceData?.id === currentValues.administrativeLevel1;
+							});
+							if (!isProvinceValid) {
+								MainForm.setFieldsValue({
+									administrativeLevel1: undefined,
+									administrativeLevel2: undefined,
+								});
+							}
+						}
+						
+						if (currentValues.administrativeLevel2) {
+							const isTerritoryValid = selectedLocations.some((location) => {
+								const territoryData = getAdminLevel(location?.linking?.SCL, "level_2") || location?.linking?.SCL?.[location?.administrativeLevel2];
+								return location.country === newCountry && territoryData?.id === currentValues.administrativeLevel2;
+							});
+							if (!isTerritoryValid) {
+								MainForm.setFieldsValue({
+									administrativeLevel2: undefined,
+								});
+							}
+						}
+					}
+					
+					if (changedValues.administrativeLevel1 !== undefined) {
+						const currentValues = MainForm.getFieldsValue();
+						const newProvince = changedValues.administrativeLevel1;
+						
+						if (currentValues.administrativeLevel2) {
+							const isTerritoryValid = selectedLocations.some((location) => {
+								const provinceData = location?.linking?.SCL?.[location?.administrativeLevel1];
+								const territoryData = getAdminLevel(location?.linking?.SCL, "level_2") || location?.linking?.SCL?.[location?.administrativeLevel2];
+								return provinceData?.id === newProvince && territoryData?.id === currentValues.administrativeLevel2;
+							});
+							if (!isTerritoryValid) {
+								MainForm.setFieldsValue({
+									administrativeLevel2: undefined,
+								});
+							}
+						}
+					}
+
+					setIsDisabled(() => {
+						const values = MainForm.getFieldsValue();
+						const requiredFields = entity?.includes("location")
+							? ["id", "name", "category", "country", "administrativeLevel1", "administrativeLevel2"]
+							: ["id", "name", "category", "country"];
+						return requiredFields.some((field) => values[field] === undefined);
+					});
+				}}
+				style={{
+					borderColor: token.baseGray50,
+				}}
+			>
 					<Form.Item className="flex-1" name="id">
 						<Select
 							options={selectedLocations.map((location) => {
@@ -128,6 +209,7 @@ export default function CombineLocationModal({
 								};
 							})}
 							placeholder={t("ID")}
+							allowClear
 						></Select>
 					</Form.Item>
 
@@ -141,7 +223,7 @@ export default function CombineLocationModal({
 								.map((location) => {
 									return {
 										label:
-											(selectOptions?.category || []).find(
+											(categories || []).find(
 												(option) => option.value === location?.category,
 											)?.label ||
 											location?.category ||
@@ -154,68 +236,74 @@ export default function CombineLocationModal({
 										index === self.findIndex((o) => o.value === option.value),
 								)}
 							placeholder={t("Category")}
+							allowClear
 						></Select>
 					</Form.Item>
 
-					<Form.Item className="flex-1" name="country">
-						<Select
-							options={selectedLocations
-								.map((location) => {
-									return {
-										label:
-											(selectOptions?.country || []).find(
-												(option) => option.value === location?.country,
-											)?.label ||
-											location?.country ||
-											"-",
-										value: location?.country || "-",
-									};
-								})
-								.filter(
-									(option, index, self) =>
-										index === self.findIndex((o) => o.value === option.value),
-								)}
-							placeholder={t("admin::country")}
-						></Select>
-					</Form.Item>
+				<Form.Item className="flex-1" name="country">
+					<Select
+						options={getFilteredLocations()
+							.map((location) => {
+								return {
+									label:
+										(selectOptions?.countries || []).find(
+											(option) => option.value === location?.country,
+										)?.label ||
+										location?.country ||
+										"-",
+									value: location?.country || "-",
+								};
+							})
+							.filter(
+								(option, index, self) =>
+									index === self.findIndex((o) => o.value === option.value),
+							)}
+						placeholder={t("admin::country")}
+						allowClear
+					></Select>
+				</Form.Item>
 
 					{entity?.includes("location") && (
 						<>
-							<Form.Item className="flex-1" name="administrativeLevel1">
-								<Select
-									placeholder={t("Province")}
-									options={selectedLocations
-										.map((location) => {
-											const _data = getAdminLevelName(location?.linking?.SCL, "level_1");
-											return {
-												label: _data?.name || "-",
-												value: _data?.id || "-",
-											};
-										})
-										.filter(
-											(option, index, self) =>
-												index === self.findIndex((o) => o.value === option.value),
-										)}
-								/>
-							</Form.Item>
-
-							<Form.Item className="flex-1" name="administrativeLevel2">
-								<Select
-									placeholder={t("Territory")}
-									options={selectedLocations
-										.map((location) => {
-											const _data = getAdminLevelName(location?.linking?.SCL, "level_2");
-											return {
-												label: _data?.name || "-",
-												value: _data?.id || "-",
-											};
-										})
-										.filter(
-											(option, index, self) =>
-												index === self.findIndex((o) => o.value === option.value),
-										)}
-								/>
-							</Form.Item>
+						<Form.Item className="flex-1" name="administrativeLevel1">
+							<Select
+								placeholder={t("Province")}
+								options={getFilteredLocations()
+									.map((location) => {
+										const _data = getAdminLevel(location?.linking?.SCL, "level_1") || location?.linking?.SCL?.[location?.administrativeLevel1];
+										return {
+											label: _data?.name || "-",
+											value: _data?.id || "-",
+										};
+									})
+									.filter(
+										(option, index, self) =>
+											index === self.findIndex((o) => o.value === option.value) &&
+											option.value !== "-",
+									)}
+							allowClear
+							/>
+						</Form.Item>
+
+						<Form.Item className="flex-1" name="administrativeLevel2">
+							<Select
+								placeholder={t("Territory")}
+								options={getFilteredLocations()
+									.map((location) => {
+										const _data = getAdminLevel(location?.linking?.SCL, "level_2") || location?.linking?.SCL?.[location?.administrativeLevel2];
+										return {
+											label: _data?.name || "-",
+											value: _data?.id || "-",
+										};
+									})
+									.filter(
+										(option, index, self) =>
+											index === self.findIndex((o) => o.value === option.value) &&
+											option.value !== "-",
+									)}
+							allowClear
+							/>
+						</Form.Item>
 						</>
 					)}
 				</Form>

package/src/@daf/core/components/Screens/Admin/AdminModals/CombineSubjects/columns.js

@@ -28,7 +28,8 @@ export const getColumns = ({ t, selectOptions, module, entity }) => {
 			key: "category",
 			show: true,
 			render: (value, all) => {
-				const label = findOptions(value, selectOptions?.category);
+				console.log({value, selectOptions})
+				const label = findOptions(value, selectOptions?.categoriesOptions || selectOptions?.category || []);
 				return <Tooltip title={label}>{label}</Tooltip>;
 			},
 		},
@@ -38,7 +39,7 @@ export const getColumns = ({ t, selectOptions, module, entity }) => {
 			key: "country",
 			show: true,
 			render: (value, all) => {
-				const label = findOptions(value, selectOptions?.country);
+				const label = findOptions(value, selectOptions?.countries || []);
 				return <Tooltip title={label}>{label}</Tooltip>;
 			},
 		},

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

@@ -4,7 +4,6 @@ import { Container } from "../CombineModalStyle.js";
 import { findOptions } from "../../../../../../../helpers/StringHelper.js";
 import DAFTable from "../../../../Table/index.jsx";
 import { useMemo, useState } from "react";
-import { mapToSelectOptions } from "./helper.js";
 import { getColumns } from "./columns.js";
 import { getAdminLevelName } from "../../../../../../../helpers/adminLevels.js";
 
@@ -34,6 +33,27 @@ export default function CombineSubjectsModal({
 		});
 	}, [selectedSubjects, t, selectOptions, module, entity]);
 
+	const countryOptions = useMemo(() => {
+		return [...new Set(selectedSubjects.map((subject) => subject?.country))].map((country) => {
+			console.log({country})
+			return {
+				label: findOptions(country, selectOptions?.countries || []),
+				value: country || "-",
+			};
+		});
+	}, [selectedSubjects, selectOptions]);	
+	
+	const categoriesOptions = useMemo(() => {
+		return [...new Set(selectedSubjects.map((subject) => subject?.category))].map((country) => {
+			console.log({country})
+			return {
+				label: findOptions(country, selectOptions?.categoriesOptions || selectOptions?.category || []),
+				value: country || "-",
+			};
+		});
+	}, [selectedSubjects, selectOptions]);
+
+	
 	const onSubmit = () => {
 		MainForm.validateFields().then((data) => {
 			const ids = selectedSubjects.map((subject) => subject.id);
@@ -119,6 +139,7 @@ export default function CombineSubjectsModal({
 								value: s?.id || "-",
 							}))}
 							placeholder={t("ID")}
+							allowClear
 						></Select>
 					</Form.Item>
 
@@ -128,47 +149,19 @@ export default function CombineSubjectsModal({
 
 					<Form.Item className="flex-1" name="category">
 						<Select
-							options={mapToSelectOptions(selectedSubjects, "category", selectOptions, "category")}
+							options={categoriesOptions}
 							placeholder={t("Category")}
+							allowClear
 						></Select>
 					</Form.Item>
 
 					<Form.Item className="flex-1" name="country">
 						<Select
-							options={mapToSelectOptions(selectedSubjects, "country", selectOptions, "country")}
+							options={countryOptions}
 							placeholder={t("admin::country")}
+							allowClear
 						></Select>
 					</Form.Item>
-
-					{entity.includes("location") && (
-						<>
-						<Form.Item className="flex-1" name="administrativeLevel1">
-							<Select
-							placeholder={t("Province")}
-							options={mapToSelectOptions(selectedSubjects, null, selectOptions, null, (subject) => {
-								const _data = getAdminLevelName(subject?.linking?.SCL, "level_1");
-								return {
-									label: _data?.name || "-",
-									value: _data?.id || "-",
-								};
-							})}
-							/>
-						</Form.Item>
-
-						<Form.Item className="flex-1" name="administrativeLevel2">
-							<Select
-							placeholder={t("Territory")}
-							options={mapToSelectOptions(selectedSubjects, null, selectOptions, null, (subject) => {
-								const _data = getAdminLevelName(subject?.linking?.SCL, "level_2");
-								return {
-									label: _data?.name || "-",
-									value: _data?.id || "-",
-								};
-							})}
-							/>
-						</Form.Item>
-						</>
-					)}
 				</Form>
 			</Container>
 			<div style={{ height: 57 }} />

package/src/@daf/core/components/Screens/Admin/AdminTables/LocationTable/column.js

@@ -86,7 +86,8 @@ export const getColumns = ({
 					return <div className="daf-default-cell" />;
 				}
 
-				const category = findOptions(value, options?.locationCategories || []) || "--";
+				const categories = [...(options?.locationCategories || []), ...(options?.productionSiteCategories || [])];
+				const category = findOptions(value, categories) || "-";
 
 				return <Tooltip title={category}>{category}</Tooltip>;
 			},
@@ -101,7 +102,7 @@ export const getColumns = ({
 				if (all.empty) {
 					return <div className="daf-default-cell" />;
 				}
-				const country = findOptions(value, selectOptions?.country || []) || "--";
+				const country = findOptions(value, selectOptions?.countries || []) || "-";
 
 				return <Tooltip title={country}>{country}</Tooltip>;
 			},

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

@@ -116,12 +116,8 @@ export default function LocationTable({
 	});
 
 	const selectOptions = useMemo(() => {
-		return {
-			category: config.options?.category,
-			country: config.options?.countries,
-			sources: [],
-		};
-	}, [config.options]);
+		return options
+	}, [options]);
 
 	const columns = useMemo(() => {
 		return getColumns({

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

@@ -85,8 +85,7 @@ export const getColumns = ({
 					return <div className="daf-default-cell" />;
 				}
 
-				console.log({value, options})
-				const category = findOptions(value, options?.categoriesOptions || []) || "-";
+				const category = findOptions(value, options?.categoriesOptions || options?.category || []) || "-";
 
 				return <Tooltip title={category}>{category}</Tooltip>;
 			},

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

@@ -113,12 +113,8 @@ export default function SubjectsTable({
 	});
 
 	const selectOptions = useMemo(() => {
-		return {
-			category: config.options?.category,
-			country: config.options?.countries,
-			sources: [],
-		};
-	}, [config.options]);
+		return options;
+	}, [options]);
 
 	const columns = useMemo(() => {
 		return getColumns({

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

@@ -32,7 +32,6 @@ export function useAdminTable({
 		defaultPageSize: defaultPageSize || 20,
 		getRedirectLink,
 	});
-	console.log(filter, "filter.activeFilters");
 
 	const activeTab = useMemo(() => filter.activeFilters.activeTab, [filter.activeFilters]);
 

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

@@ -17,7 +17,7 @@ export function getAdminRoutes(config) {
     useAdminAccountsViewConfig,
     useAdminSubjectsConfig,
     useAdminLocationConfig,
-   
+  
     useAdminDocumentsConfig,
     useAdminEventsConfig,
     userIsAdmin,
@@ -25,6 +25,8 @@ export function getAdminRoutes(config) {
 
   const APP_PREFIX = `APP_${appName.toUpperCase()}`;
 
+  console.log({useAdminEventsConfig})
+
   function DashboardWrapper() {
     const dashboardConfig = useAdminDashboardConfig();
     return <AdminDashboardScreen config={dashboardConfig} />;

package/src/@daf/core/components/ViewForm/content.jsx

@@ -130,6 +130,8 @@ const Content = ({
 			return all;
 		}, {});
 
+		console.log({groups, singleGroupsKeys, addedContent, _length, groupped})
+
 		return Object.keys(groupped).map((key) => {
 			const groups = groupped[key];
 

package/src/@daf/pages/Events/config.js

@@ -77,16 +77,7 @@ export const getFiltersConfig = ({t}) => {
 		  style: { flex: 1 },
 		  labelStyle: { flex: 1 },
 		},
-		subCategory: {
-		  type: 'select',
-		  label: 'Category',
-		  placeholder: (t) => `${t('Filter by')} ${t('Category').toLowerCase()}`,
-		  style: { flex: 1 },
-		  labelStyle: { flex: 1 },
-		  getLabel: (option) => option.label,
-		  getValue: (option) => option.value,
-		},
-		category:{
+		eventCategory:{
 			type: 'select',
 			label: 'Category',
 			placeholder: (t) => `${t('Filter by')} ${t('Category').toLowerCase()}`,
@@ -125,7 +116,7 @@ export const getFilterOptions = (options, t) => {
 	return {
        timeframe: timeframe,
 	   country: countries || [],
-	   category: catOptions || [],
+	   eventCategory: catOptions || [],
 	   status: [
 		{
 			value: "submitted",

package/src/@daf/pages/Stakeholders/ArmedGroups/config.js

@@ -2,6 +2,15 @@ import { getStatusOptions } from '../../../utils/filters';
 
 export const getFiltersConfig = ({t}) => {
     return {
+		country: {
+			type: 'select',
+			label: 'Country',
+			placeholder: () => `${t('Filter by')} ${t('Country').toLowerCase()}`,
+			style: { flex: 1 },
+			labelStyle: { flex: 1 },
+			getLabel: (option) => option.label,
+			getValue: (option) => option.value,
+		  },
 		status: {
 		  type: "select",
 		  label: "Status",
@@ -11,18 +20,38 @@ export const getFiltersConfig = ({t}) => {
 		  getLabel: (option) => option.label,
 		  getValue: (option) => option.value,
 		},
-        timeframe: {
-			type: "timeframe",
-			label: "Timeframe",
+		subCategory: {
+			type: 'select',
+			label: 'Sub Category',
+			placeholder: () => `${t('Filter by')} ${t('Sub Category').toLowerCase()}`,
 			style: { flex: 1 },
-		},
+			labelStyle: { flex: 1 },
+			getLabel: (option) => option.label,
+			getValue: (option) => option.value,
+			filterOptions: (val) => {
+			  if (val) {
+				const { option, filters } = val
+				if (filters && option) {
+				  const { filters: optionFilters } = option;
+				  if (Array.isArray(optionFilters) && optionFilters.length) {
+					const { value, condition } = optionFilters[0];
+					if (condition === 'includes') {
+					  return value.includes('nonStateArmedGroup');
+					}
+				  }
+				}
+			  }
+			  return true;
+			},
+		  },
 	}
 }
 
 export const getFilterOptions = (options, t) => {
 	const _default  = {
 		status: getStatusOptions(t) || [],
-        timeframe: [],
+		country: options.countries || [],
+		subCategory: options.subCategory || [],
 	}
 
 	return _default;