datastake-daf 0.6.786 → 0.6.787

package/dist/services/index.js

@@ -765,7 +765,7 @@ class AdminService extends BaseService {
     params
   }) {
     return this.apiGet({
-      url: `${subject}`,
+      url: `/management/subjects/${subject}`,
       params
     });
   }
@@ -778,6 +778,15 @@ class AdminService extends BaseService {
       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,7 +7506,6 @@ const getDefaultActiveFilters = (params, selectFiltersConfig, defaultPageSize, d
   });
   return o;
 };
-const NEW_PAGINATION_APPS = ["nashiriki"];
 const filterParams = (value, module) => {
   const {
     activeFilters,
@@ -7522,10 +7521,12 @@ const filterParams = (value, module) => {
     ...filters
   } = activeFilters || {};
   const params = {};
-  params.pagination = JSON.stringify({
-    [NEW_PAGINATION_APPS.includes(module) ? "skip" : "page"]: page,
-    [NEW_PAGINATION_APPS.includes(module) ? "take" : "pageSize"]: pageSize
-  });
+  // Use skip and take inside pagination object
+  // Calculate skip from page number (page 1 = skip 1, page 2 = skip 21, etc.)
+  params.pagination = {
+    skip: page ? (page - 1) * (pageSize || 20) + 1 : 1,
+    take: pageSize || 20
+  };
   if (search && searchParams) {
     params.search = JSON.stringify({
       qs: search,
@@ -7540,12 +7541,24 @@ const filterParams = (value, module) => {
   }
   if (Object.keys(filters).length) {
     if (value.sourceId && value.sourceId === "overview") {
-      params.filters = JSON.stringify(filters);
+      const {
+        activeTab,
+        ...restFilters
+      } = filters;
+      Object.assign(params, restFilters);
+      if (activeTab !== undefined) {
+        params.tab = activeTab;
+      }
     } else {
-      params.filters = JSON.stringify({
-        ...filters,
-        authorId: undefined
-      });
+      const {
+        authorId,
+        activeTab,
+        ...restFilters
+      } = filters;
+      Object.assign(params, restFilters);
+      if (activeTab !== undefined) {
+        params.tab = activeTab;
+      }
     }
   }
   return {
@@ -7752,6 +7765,9 @@ function getRedirectPath(user, fallback = '', app, isDatastake) {
 }
 
 const en = {
+  "sbg-admin::remove-user-title": "Remove User Title",
+  "sbg-admin::remove-user-body": "Remove User Body",
+  "add-account": "Add Account",
   "Site": "Site",
   "Production Sites": "Production Sites",
   "Type of account": "Type of account",
@@ -9451,7 +9467,7 @@ const fr = {
   Documentation: "Documents",
   "Edit project": "Modifier le projet",
   Name: "Nom",
-  Type: "Tapez",
+  Type: "Type",
   type: "Type",
   Province: "Province",
   Territory: "Territoire",
@@ -11262,7 +11278,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.786",
+	"version": "0.6.787",
 	"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/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 ? "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

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

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

@@ -0,0 +1,224 @@
+import { Checkbox, Tooltip, Avatar } from "antd";
+import CustomIcon from "../../../../Icon/CustomIcon.jsx";
+import { findOptions } from "../../../../../../../helpers/StringHelper.js";
+import { getNameByLevel } from "./helper.js";
+
+export const getColumns = ({
+	t,
+	goTo = () => {},
+	show = "show",
+	getRedirectLink = () => {},
+	token,
+	selectedLocations,
+	setSelectedLocations,
+	selectOptions,
+	entity,
+}) => {
+	const cols = [
+		{
+			title: "",
+			dataIndex: "select",
+			key: "select",
+			width: 50,
+			show: true,
+			render: (v, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
+				return (
+					<Checkbox
+						onChange={() =>
+							setSelectedLocations((prev) => {
+								const isSelected = prev.some((p) => p.id === all.id);
+								if (isSelected) {
+									return prev.filter((p) => p.id !== all.id);
+								}
+								return [...prev, all];
+							})
+						}
+						checked={selectedLocations.some((p) => p.id === all.id)}
+						disabled={
+							selectedLocations?.length >= 3 &&
+							!selectedLocations.some((p) => p.id === all.id)
+						}
+					/>
+				);
+			},
+		},
+		{
+			title: t("ID"),
+			dataIndex: "datastakeId",
+			key: "datastakeId",
+			ellipsis: true,
+			show: true,
+			render: (value, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
+
+				return <Tooltip title={value}>{value}</Tooltip>;
+			},
+		},
+		{
+			title: t("Name"),
+			dataIndex: "name",
+			key: "name",
+			ellipsis: true,
+			show: true,
+			render: (value, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
+
+				return <Tooltip title={value}>{value}</Tooltip>;
+			},
+		},
+		{
+			title: t("Category"),
+			dataIndex: "category",
+			key: "category",
+			ellipsis: true,
+			show: true,
+			render: (value, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
+
+				const category = findOptions(value, selectOptions?.category || []) || "--";
+
+				return <Tooltip title={category}>{category}</Tooltip>;
+			},
+		},
+		{
+			title: t("Country"),
+			dataIndex: "country",
+			key: "country",
+			ellipsis: true,
+			show: true,
+			render: (value, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
+				const country = findOptions(value, selectOptions?.country || []) || "--";
+
+				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" />;
+			}
+
+			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("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" />;
+			}
+
+			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>;
+		},
+	},
+		{
+			title: t("Sources"),
+			dataIndex: "sources",
+			key: "sources",
+			show: true,
+			render: (value, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
+
+				const MAX_SOURCES = 3;
+				const count = value?.length === MAX_SOURCES + 1 ? value?.length : MAX_SOURCES;
+				return (
+					Array.isArray(value) && value?.length > 0 ? <Avatar.Group
+					max={{
+						count: count,
+						style: {
+							color: token.baseGray90,
+							backgroundColor: token.baseGray20,
+							border: `1px solid ${token.baseGray40}`,
+						},
+					}}
+					size={"small"}
+				>
+					{value.map((v, i) => (
+						<Avatar
+							key={i}
+							size={"small"}
+							style={{
+								backgroundColor: token.baseGray20,
+								color: token.baseGray90,
+								border: `1px solid ${token.baseGray40}`,
+								display: "flex",
+								alignItems: "center",
+								justifyContent: "center",
+							}}
+						>
+							<CustomIcon
+								name="Organisation02"
+								width={18}
+								height={18}
+								color={token.baseGray90}
+							/>
+						</Avatar>
+					))}
+				</Avatar.Group> : '-'
+				);
+			},
+		},
+		{
+			title: "",
+			dataIndex: "actions",
+			key: "actions",
+			width: 60,
+			show: true,
+			render: (value, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
+
+				return (
+					<div
+						className="cursor-pointer"
+						onClick={() => {
+							goTo(getRedirectLink(`/app/accounts/view/${all.id}/details`));
+						}}
+					>
+						<CustomIcon name="Link" width={18} height={18} />
+					</div>
+				);
+			},
+		},
+	];
+
+	return cols.filter((c) => c[show]);
+};

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

@@ -0,0 +1,65 @@
+export const getTabs = ({ t }) => {
+	return [
+		{
+			key: "active",
+			label: t("Active"),
+		},
+		{
+			key: "pending",
+			label: t("Pending"),
+		},
+		{
+			key: 'suspended',
+			label: t("Suspended"),
+		}
+	];
+};
+
+export const selectFiltersConfig = {
+	category: {
+		type: "select",
+		label: "Category",
+		placeholder: (t) => t("Category"),
+		style: { flex: 1 },
+		labelStyle: { flex: 1 },
+		getLabel: (option) => option.label,
+		getValue: (option) => option.value,
+	},
+	country: {
+		type: "select",
+		label: "Country",
+		placeholder: (t) => t("Country"),
+		style: { flex: 1 },
+		labelStyle: { flex: 1 },
+		getLabel: (option) => option.label,
+		getValue: (option) => option.value,
+	},
+	sources: {
+		type: "select",
+		label: "Sources",
+		placeholder: (t) => t("Sources"),
+		style: { flex: 1 },
+		labelStyle: { flex: 1 },
+		getLabel: (option) => option.label,
+		getValue: (option) => option.value,
+	},
+};
+
+export const filtersConfig = {
+	name: "",
+	datastakeId: "",
+};
+
+export const defaultUrlParams = { activeTab: "active" };
+
+export const checkboxConfig = {
+	name: "Name",
+	datastakeId: "ID",
+};
+
+export const getNameByLevel = (data, level) => {
+	const entry = Object.values(data || {}).find(item => item.level === level);
+	return entry;
+  }
+
+

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 } from "antd";
+import { theme, Tag, message } 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,6 +37,22 @@ 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,
@@ -58,7 +74,7 @@ export default function LocationTable({
 		defaultPageSize,
 		filtersConfig,
 		getRedirectLink,
-		getData,
+		getData: getDataWithStringPagination,
 		refetchTrigger,
 	});
 
@@ -80,7 +96,7 @@ export default function LocationTable({
 			setSelectedLocations,
 			getRedirectLink,
 			selectOptions,
-			entity: headerTitle
+			entity: headerTitle,
 		});
 	}, [t, goTo, module, token, selectedLocations, getRedirectLink, selectOptions, headerTitle]);
 
@@ -89,7 +105,7 @@ export default function LocationTable({
 			<AdminTable
 				filters={filter}
 				t={t}
-				headerTitle={headerTitle}
+				headerTitle={"test"}
 				actionButton={[
 					{
 						icon: "Merge",
@@ -110,6 +126,7 @@ export default function LocationTable({
 				checkboxConfig={checkboxConfig}
 				defaultTableFilters={{}}
 				breadcrumbs={breadcrumbs}
+
 			>
 				{selectedLocations.length > 0 && (
 					<div
@@ -168,6 +185,7 @@ export default function LocationTable({
 					if (typeof mergeSubjectsFunction === 'function') {
 						mergeSubjectsFunction(data);
 						setSelectedLocations([])
+						message.success(t("Locations successfully merged."))
 					}
 				}}
 				selectedLocations={selectedLocations}