datastake-daf 0.6.793 → 0.6.794

package/dist/services/index.js

@@ -765,19 +765,85 @@ class AdminService extends BaseService {
     params
   }) {
     return this.apiGet({
-      url: `${subject}`,
+      url: `/management/subjects/${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,
-    ...data
+    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/${subject}/${id1}/${id2}`;
+    const payload = {
+      ...data
+    };
+    if (remainingIds.length > 0) {
+      payload.additionalIds = remainingIds;
+    }
     return this.apiPost({
-      url: `/merge/${subject}`,
+      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}`,
       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,15 +7506,14 @@ const getDefaultActiveFilters = (params, selectFiltersConfig, defaultPageSize, d
   });
   return o;
 };
-const NEW_PAGINATION_APPS = ["nashiriki"];
 const filterParams = (value, module) => {
   const {
     activeFilters,
     ...rest
   } = value;
   const {
-    page,
-    pageSize,
+    page = 1,
+    pageSize = 20,
     sortDir,
     sortBy,
     search,
@@ -7523,9 +7522,10 @@ const filterParams = (value, module) => {
   } = activeFilters || {};
   const params = {};
   params.pagination = JSON.stringify({
-    [NEW_PAGINATION_APPS.includes(module) ? "skip" : "page"]: page,
-    [NEW_PAGINATION_APPS.includes(module) ? "take" : "pageSize"]: pageSize
+    page,
+    pageSize
   });
+  params.filters = JSON.stringify(filters);
   if (search && searchParams) {
     params.search = JSON.stringify({
       qs: search,
@@ -7538,16 +7538,6 @@ 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
@@ -7752,6 +7742,13 @@ 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",
   "Site": "Site",
   "Production Sites": "Production Sites",
   "Type of account": "Type of account",
@@ -9451,7 +9448,7 @@ const fr = {
   Documentation: "Documents",
   "Edit project": "Modifier le projet",
   Name: "Nom",
-  Type: "Tapez",
+  Type: "Type",
   type: "Type",
   Province: "Province",
   Territory: "Territoire",
@@ -11262,7 +11259,7 @@ const sp = {
   "Documentation": "Documentos",
   "Edit project": "Modificar proyecto",
   "Name": "Nombre",
-  "Type": "Escribe",
+  "Type": "Tipo",
   "type": "Tipo",
   "Province": "Provincia",
   "Territory": "Territorio",

package/package.json

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

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

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

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

@@ -0,0 +1,79 @@
+import { findOptions } from "../../../../../../../helpers/StringHelper.js";
+import { Tooltip } from "antd";
+import { getNameByLevel } from "../../AdminTables/SubjectsTable/helper.js";
+
+export const getColumns = ({ t, selectOptions, module, entity }) => {
+	return [
+		{
+			title: t("admin::organisation_id"),
+			dataIndex: "datastakeId",
+			key: "datastakeId",
+			show: true,
+			render: (value, all) => {
+				return <Tooltip title={value}>{value}</Tooltip>;
+			},
+		},
+		{
+			title: t("Name"),
+			dataIndex: "name",
+			key: "name",
+			show: true,
+			render: (value, all) => {
+				return <Tooltip title={value}>{value}</Tooltip>;
+			},
+		},
+		{
+			title: t("Category"),
+			dataIndex: "category",
+			key: "category",
+			show: true,
+			render: (value, all) => {
+				const label = findOptions(value, selectOptions?.category);
+				return <Tooltip title={label}>{label}</Tooltip>;
+			},
+		},
+		{
+			title: t("Country"),
+			dataIndex: "country",
+			key: "country",
+			show: true,
+			render: (value, all) => {
+				const label = findOptions(value, selectOptions?.country);
+				return <Tooltip title={label}>{label}</Tooltip>;
+			},
+		},
+		{
+			title: t("Province"),
+			dataIndex: "administrativeLevel1",
+			key: "administrativeLevel1",
+			ellipsis: true,
+			show: entity.includes("locations"),
+			render: (value, all) => {
+				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>;
+			},
+		},
+		{
+			title: t("Territory"),
+			dataIndex: "administrativeLevel2",
+			key: "administrativeLevel2",
+			show: entity.includes("locations"),
+			render: (value, all) => {
+				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>;
+			},
+		},
+	].filter((c) => c?.show);
+};

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("locations"),
+			show: entity?.includes("location"),
 			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("locations"),
+			show: entity?.includes("location"),
 			render: (value, all) => {
 				let label;
 				if(all?.administrativeLevel2 && value === all?.administrativeLevel2) {

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

@@ -1,11 +1,10 @@
 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 { getColumns } from "./helper.js";
 import { getNameByLevel } from "../../AdminTables/SubjectsTable/helper.js";
+import { getColumns } from "./helper.js";
 
 const { useToken } = theme;
 
@@ -35,10 +34,22 @@ export default function CombineLocationModal({
 
 	const onSubmit = () => {
 		MainForm.validateFields().then((data) => {
-			const ids = selectedLocations.map((location) => location._id);
+			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))
+			);
+	
 			onSuccess({
 				ids,
-				data,
+				data: filteredData,
 			});
 		});
 	};
@@ -57,8 +68,7 @@ export default function CombineLocationModal({
 				setIsDisabled(() => {
 				  const values = MainForm.getFieldsValue();
 			  
-				  const requiredFields =
-					entity === "location"
+				  const requiredFields = entity?.includes("location")
 					  ? ["id", "name", "category", "country", "administrativeLevel1", "administrativeLevel2"]
 					  : ["id", "name", "category", "country"];
 			  
@@ -114,7 +124,7 @@ export default function CombineLocationModal({
 							options={selectedLocations.map((location) => {
 								return {
 									label: location?.datastakeId || "-",
-									value: location?.datastakeId || "-",
+                value: location?.id || "-",
 								};
 							})}
 							placeholder={t("ID")}
@@ -169,7 +179,7 @@ export default function CombineLocationModal({
 						></Select>
 					</Form.Item>
 
-					{entity.includes("locations") && (
+					{entity?.includes("location") && (
 						<>
 						<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("admin::merge")}
+			title={t("merge")}
 			onClose={onClose}
 			onSuccess={onSubmit}
 			withModalFormWrapper={false}
@@ -59,7 +59,7 @@ export default function CombineSubjectsModal({
 				  const values = MainForm.getFieldsValue();
 			  
 				  const requiredFields =
-					entity === "location"
+					entity.includes("location")
 					  ? ["id", "name", "category", "country", "administrativeLevel1", "administrativeLevel2"]
 					  : ["id", "name", "category", "country"];
 			  
@@ -75,7 +75,7 @@ export default function CombineSubjectsModal({
 							color: token.baseGray90,
 						}}
 					>
-						{t("admin::current_subjects")}
+						{t("current_subjects")}
 					</span>
 					<DAFTable
 						columns={columns}
@@ -93,7 +93,7 @@ export default function CombineSubjectsModal({
 						marginTop: 14,
 					}}
 				>
-					{t("admin::merged_output")}
+					{t("merged_output")}
 				</span>
 
 				<Form
@@ -135,7 +135,7 @@ export default function CombineSubjectsModal({
 						></Select>
 					</Form.Item>
 
-					{entity.includes("locations") && (
+					{entity.includes("location") && (
 						<>
 						<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 ? "admin::edit-account" : "admin::add-account")}
+			title={t(isEdit ? "edit-account" : "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(mergeData);
+					await AdminService.mergeLocations({ subject: 'location', ...mergeData });
 					message.success(t("Locations merged successfully"));
 				} else {
 					console.warn("AdminService.mergeLocations is not implemented");
-					message.success(t("Locations merged successfully"));
+					message.error(t("Locations not merged"));
 				}
 			} catch (err) {
 				handleError?.(err);
@@ -61,12 +61,11 @@ export default function AdminLocationScreen({ config }) {
 		[AdminService, t, handleError]
 	);
 
-	// Use custom getData if provided, otherwise use default AdminService.getLocations
-	const getLocations = useCallback((params) => {
+	const getSubjects = useCallback((params) => {
 		if (getData) {
 			return getData(params);
 		}
-		return AdminService.getLocations(params);
+		return AdminService.getSubjects({ subject: 'location', params });
 	}, [getData, AdminService]);
 
 	return (
@@ -77,12 +76,12 @@ export default function AdminLocationScreen({ config }) {
 			location={location}
 			module={module}
 			headerTitle={headerTitle}
-			getData={getLocations}
+			getData={getSubjects}
 			isMobile={isMobile}
 			defaultPageSize={defaultPageSize}
 			view={view}
 			breadcrumbs={breadcrumbs}
-			mergeSubjectsFunction={handleMergeLocations}
+			mergeLocationsFunction={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(mergeData);
+					await AdminService.mergeSubjects({ subject: 'stakeholder', ...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(params);
+		return AdminService.getSubjects({ subject: 'stakeholder', params });
 	}, [getData, AdminService]);
 
 	return (