datastake-daf 0.6.794 → 0.6.795

package/dist/services/index.js

@@ -765,85 +765,19 @@ class AdminService extends BaseService {
     params
   }) {
     return this.apiGet({
-      url: `/management/subjects/${subject}`,
+      url: `${subject}`,
       params
     });
   }
-  mergeLocations({
-    ids,
-    data
-  }) {
-    const [id1, id2, ...remainingIds] = ids || [];
-    if (!id1 || !id2) {
-      throw new Error('At least two IDs are required for merging');
-    }
-    const url = `/management/merge/location/${id1}/${id2}`;
-    const payload = {
-      ...data
-    };
-    if (remainingIds.length > 0) {
-      payload.additionalIds = remainingIds;
-    }
-    return this.apiPost({
-      url,
-      data: payload
-    });
-  }
   mergeSubjects({
     subject,
-    ids,
-    data
+    ...data
   }) {
-    const [id1, id2, ...remainingIds] = ids || [];
-    if (!id1 || !id2) {
-      throw new Error('At least two IDs are required for merging');
-    }
-    const url = `/management/merge/${subject}/${id1}/${id2}`;
-    const payload = {
-      ...data
-    };
-    if (remainingIds.length > 0) {
-      payload.additionalIds = remainingIds;
-    }
     return this.apiPost({
-      url,
-      data: payload
-    });
-  }
-  viewLocation({
-    id
-  }) {
-    return this.apiGet({
-      url: `/management/subject/location/${id}`
-    });
-  }
-  viewStakeholder({
-    id
-  }) {
-    return this.apiGet({
-      url: `/management/subject/stakeholder/${id}`
-    });
-  }
-  updateSubject({
-    subject,
-    id,
-    data
-  }) {
-    const type = subject === 'location' ? 'location' : 'stakeholder';
-    return this.apiPut({
-      url: `/management/subject/${type}/${id}`,
+      url: `/merge/${subject}`,
       data
     });
   }
-  getUserGrowth(activeFilter) {
-    return this.apiGet({
-      url: `/accounts/dashboard/user-growth`,
-      isUserManager: true,
-      params: {
-        activeFilter
-      }
-    });
-  }
 }
 var AdminService$1 = createLazyService(AdminService);
 

package/dist/utils/index.js

@@ -7506,14 +7506,15 @@ const getDefaultActiveFilters = (params, selectFiltersConfig, defaultPageSize, d
   });
   return o;
 };
+const NEW_PAGINATION_APPS = ["nashiriki"];
 const filterParams = (value, module) => {
   const {
     activeFilters,
     ...rest
   } = value;
   const {
-    page = 1,
-    pageSize = 20,
+    page,
+    pageSize,
     sortDir,
     sortBy,
     search,
@@ -7522,10 +7523,9 @@ const filterParams = (value, module) => {
   } = activeFilters || {};
   const params = {};
   params.pagination = JSON.stringify({
-    page,
-    pageSize
+    [NEW_PAGINATION_APPS.includes(module) ? "skip" : "page"]: page,
+    [NEW_PAGINATION_APPS.includes(module) ? "take" : "pageSize"]: pageSize
   });
-  params.filters = JSON.stringify(filters);
   if (search && searchParams) {
     params.search = JSON.stringify({
       qs: search,
@@ -7538,6 +7538,16 @@ const filterParams = (value, module) => {
       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
@@ -7742,13 +7752,7 @@ function getRedirectPath(user, fallback = '', app, isDatastake) {
 }
 
 const en = {
-  "sbg-admin::remove-user-title": "Remove User Title",
-  "sbg-admin::remove-user-body": "Remove User Body",
-  "Administrative-level-1": "Administrative Level 1",
-  "Administrative-level-2": "Administrative Level 2",
-  "merge-output": "Merge Output",
-  "admin::current_subjects": "Current Subjects",
-  "add-account": "Add Account",
+  "All Data": "All Data",
   "Site": "Site",
   "Production Sites": "Production Sites",
   "Type of account": "Type of account",
@@ -9070,6 +9074,7 @@ const en = {
 };
 
 const fr = {
+  "All Data": "Toutes les données",
   "Site": "Site",
   "Production Sites": "Sites de production",
   "Type of account": "Type de compte",
@@ -9448,7 +9453,7 @@ const fr = {
   Documentation: "Documents",
   "Edit project": "Modifier le projet",
   Name: "Nom",
-  Type: "Type",
+  Type: "Tapez",
   type: "Type",
   Province: "Province",
   Territory: "Territoire",
@@ -11025,6 +11030,7 @@ const fr = {
 };
 
 const sp = {
+  "All Data": "Todos los datos",
   "Site": "Sitio",
   "Production Sites": "Centros de producción",
   "Type of account": "Tipo de cuenta",
@@ -11259,7 +11265,7 @@ const sp = {
   "Documentation": "Documentos",
   "Edit project": "Modificar proyecto",
   "Name": "Nombre",
-  "Type": "Tipo",
+  "Type": "Escribe",
   "type": "Tipo",
   "Province": "Provincia",
   "Territory": "Territorio",

package/package.json

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

package/src/@daf/core/components/Dashboard/Map/hook.js

@@ -11,6 +11,21 @@ import {
 import { useMapHelper } from "./helper";
 import { isLocation, isStakeholder } from "./ChainIcon/utils";
 
+const calculatePolygonArea = (coordinates) => {
+	if (!coordinates || !Array.isArray(coordinates) || coordinates.length < 3) return 0;
+	let area = 0;
+	for (let i = 0; i < coordinates.length; i++) {
+		const j = (i + 1) % coordinates.length;
+		const lat1 = coordinates[i][0];
+		const lng1 = coordinates[i][1];
+		const lat2 = coordinates[j][0];
+		const lng2 = coordinates[j][1];
+		area += lat1 * lng2;
+		area -= lng1 * lat2;
+	}
+	return Math.abs(area / 2);
+};
+
 export const useMap = ({
 	type,
 	data: allData = null,
@@ -240,7 +255,16 @@ export const useMap = ({
 			const maxTotal = Math.max(...(data || []).map((d) => d.total));
 			
 			const dataToRender = type === "chain" ? filteredData : data;
-			dataToRender.forEach((d, i) => {
+			
+			const sortedData = type === "territory"
+				? [...dataToRender].sort((a, b) => {
+					const areaA = calculatePolygonArea(a.area);
+					const areaB = calculatePolygonArea(b.area);
+					return areaB - areaA;
+				  })
+				: dataToRender;
+			
+			sortedData.forEach((d, i) => {
 				addIconToMapInitialy(
 					[d?.marker?.lat, d?.marker?.lng],
 					"location",

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(() => {