datastake-daf 0.6.787 → 0.6.788

package/src/@daf/services/AdminService.js

@@ -69,10 +69,10 @@ class AdminService extends BaseService {
     }
 
     getSubjects({ subject, params }) {
-      return this.apiGet({
-          url: `/management/subjects/${subject}`,
+        return this.apiGet({
+          url: `${subject}`,
           params,
-      });
+        })
     }
 
     mergeSubjects({ subject, ...data }) {
@@ -81,15 +81,6 @@ class AdminService extends BaseService {
           data,
         })
     }
-    getUserGrowth(activeFilter) {
-      return this.apiGet({
-        url: `/accounts/dashboard/user-growth`,
-        isUserManager: true,
-        params: { activeFilter },
-      });
-    }
-
-    
 }
 
 export default createLazyService(AdminService);

package/src/@daf/services/DashboardService.js

@@ -26,5 +26,4 @@ class DashboardService extends BaseService {
     }
 }
 
-export default createLazyService(DashboardService);
-
+export default createLazyService(DashboardService);

package/src/@daf/utils/filters.js

@@ -1,102 +1,102 @@
 export const defaultFilterKeys = ["search", "sortDir", "sortBy", "timeframe", "activeTab"];
+
 function hasJsonStructure(str) {
-    if (typeof str !== "string") return false;
-    try {
-        const result = JSON.parse(str);
-        const type = Object.prototype.toString.call(result);
-        return type === "[object Object]" || type === "[object Array]";
-    } catch (err) {
-        return false;
-    }
+	if (typeof str !== "string") return false;
+	try {
+		const result = JSON.parse(str);
+		const type = Object.prototype.toString.call(result);
+		return type === "[object Object]" || type === "[object Array]";
+	} catch (err) {
+		return false;
+	}
 }
+
 export const getDefaultActiveFilters = (
-    params,
-    selectFiltersConfig,
-    defaultPageSize,
-    defaultFilters = {},
-    doPagination,
+	params,
+	selectFiltersConfig,
+	defaultPageSize,
+	defaultFilters = {},
+	doPagination,
 ) => {
-    const o = {};
-    defaultFilterKeys.forEach((k) => {
-        if (params.has(k)) {
-            if (hasJsonStructure(params.get(k))) {
-                o[k] = JSON.parse(params.get(k));
-            } else {
-                o[k] = params.get(k);
-            }
-        } else if (defaultFilters[k]) {
-            if (hasJsonStructure(defaultFilters[k])) {
-                o[k] = JSON.parse(defaultFilters[k]);
-            } else {
-                o[k] = defaultFilters[k];
-            }
-        }
-    });
-    if (params.has("searchParams")) {
-        try {
-            o.searchParams = JSON.parse(params.get("searchParams"));
-        } catch (e) {
-            o.searchParams = params.get("searchParams").split(",");
-        }
-    }
-    if (doPagination) {
-        o.page = Number(params.get("page")) || 1;
-        o.pageSize = Number(params.get("pageSize")) || defaultPageSize;
-    }
-    Object.keys(selectFiltersConfig).forEach((k) => {
-        if (params.has(k)) {
-            if (hasJsonStructure(params.get(k))) {
-                o[k] = JSON.parse(params.get(k));
-            } else {
-                o[k] = params.get(k);
-            }
-        }
-    });
-    return o;
+	const o = {};
+
+	defaultFilterKeys.forEach((k) => {
+		if (params.has(k)) {
+			if (hasJsonStructure(params.get(k))) {
+				o[k] = JSON.parse(params.get(k));
+			} else {
+				o[k] = params.get(k);
+			}
+		} else if (defaultFilters[k]) {
+			if (hasJsonStructure(defaultFilters[k])) {
+				o[k] = JSON.parse(defaultFilters[k]);
+			} else {
+				o[k] = defaultFilters[k];
+			}
+		}
+	});
+
+	if (params.has("searchParams")) {
+		try {
+			o.searchParams = JSON.parse(params.get("searchParams"));
+		} catch (e) {
+			o.searchParams = params.get("searchParams").split(",");
+		}
+	}
+
+	if (doPagination) {
+		o.page = Number(params.get("page")) || 1;
+		o.pageSize = Number(params.get("pageSize")) || defaultPageSize;
+	}
+
+	Object.keys(selectFiltersConfig).forEach((k) => {
+		if (params.has(k)) {
+			if (hasJsonStructure(params.get(k))) {
+				o[k] = JSON.parse(params.get(k));
+			} else {
+				o[k] = params.get(k);
+			}
+		}
+	});
+
+	return o;
 };
+
 const NEW_PAGINATION_APPS = ["nashiriki"];
 export const filterParams = (value, module) => {
-    const { activeFilters, ...rest } = value;
-    const { page, pageSize, sortDir, sortBy, search, searchParams, ...filters } =
-        activeFilters || {};
-    const params = {};
-    // 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,
-            fields: searchParams,
-        });
-    }
-    if (sortDir && sortBy) {
-        params.sort = JSON.stringify({
-            dir: sortDir,
-            by: sortBy,
-        });
-    }
-    if (Object.keys(filters).length) {
-        if (value.sourceId && value.sourceId === "overview") {
-            const { activeTab, ...restFilters } = filters;
-            Object.assign(params, restFilters);
-            if (activeTab !== undefined) {
-                params.tab = activeTab;
-            }
-        } else {
-            const { authorId, activeTab, ...restFilters } = filters;
-            Object.assign(params, restFilters);
-            if (activeTab !== undefined) {
-                params.tab = activeTab;
-            }
-        }
-    }
-    return { ...rest, ...params };
-};
+	const { activeFilters, ...rest } = value;
 
+	const { page, pageSize, sortDir, sortBy, search, searchParams, ...filters } =
+		activeFilters || {};
 
+	const params = {};
+	
+	params.pagination = JSON.stringify({
+		[NEW_PAGINATION_APPS.includes(module) ? "skip" : "page"]: page,
+		[NEW_PAGINATION_APPS.includes(module) ? "take" : "pageSize"]: pageSize,
+	});
 
+	if (search && searchParams) {
+		params.search = JSON.stringify({
+			qs: search,
+			fields: searchParams,
+		});
+	}
 
+	if (sortDir && sortBy) {
+		params.sort = JSON.stringify({
+			dir: sortDir,
+			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 };
+};

package/src/constants/locales/en/translation.js

@@ -1,7 +1,4 @@
 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",

package/src/constants/locales/fr/translation.js

@@ -420,7 +420,7 @@ const fr = {
 	Documentation: "Documents",
 	"Edit project": "Modifier le projet",
 	Name: "Nom",
-	Type: "Type",
+	Type: "Tapez",
 	type: "Type",
 	Province: "Province",
 	Territory: "Territoire",

package/src/constants/locales/sp/translation.js

@@ -233,7 +233,7 @@ const sp = {
   "Documentation": "Documentos",
   "Edit project": "Modificar proyecto",
   "Name": "Nombre",
-  "Type": "Tipo",
+  "Type": "Escribe",
   "type": "Tipo",
   "Province": "Provincia",
   "Territory": "Territorio",

package/src/pages.js

@@ -21,6 +21,7 @@ export { default as RestorationActivitySummary } from './@daf/pages/Summary/Acti
 export { default as PlantingCycleSummary } from './@daf/pages/Summary/Activities/PlantingCycle/index.jsx';
 export { default as MonitoringCampaignSummary } from './@daf/pages/Summary/Activities/MonitoringCampaign/index.jsx';
 export { default as MineSummary } from './@daf/pages/Summary/Minesite/index.jsx';
+export { default as MonitoringActivitySummary } from './@daf/pages/Summary/Activities/Monitoring/index.jsx';
 
 // View
 export { default as View } from './@daf/pages/View/index.jsx';

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

@@ -1,224 +0,0 @@
-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

@@ -1,65 +0,0 @@
-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;
-  }
-
-