datastake-daf 0.6.787 → 0.6.789

package/dist/services/index.js

@@ -765,7 +765,7 @@ class AdminService extends BaseService {
     params
   }) {
     return this.apiGet({
-      url: `/management/subjects/${subject}`,
+      url: `${subject}`,
       params
     });
   }
@@ -778,15 +778,6 @@ 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,6 +7506,7 @@ const getDefaultActiveFilters = (params, selectFiltersConfig, defaultPageSize, d
   });
   return o;
 };
+const NEW_PAGINATION_APPS = ["nashiriki"];
 const filterParams = (value, module) => {
   const {
     activeFilters,
@@ -7521,12 +7522,10 @@ const filterParams = (value, module) => {
     ...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
-  };
+  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,
@@ -7541,24 +7540,12 @@ const filterParams = (value, module) => {
   }
   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;
-      }
+      params.filters = JSON.stringify(filters);
     } else {
-      const {
-        authorId,
-        activeTab,
-        ...restFilters
-      } = filters;
-      Object.assign(params, restFilters);
-      if (activeTab !== undefined) {
-        params.tab = activeTab;
-      }
+      params.filters = JSON.stringify({
+        ...filters,
+        authorId: undefined
+      });
     }
   }
   return {
@@ -7765,9 +7752,6 @@ 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",
@@ -9467,7 +9451,7 @@ const fr = {
   Documentation: "Documents",
   "Edit project": "Modifier le projet",
   Name: "Nom",
-  Type: "Type",
+  Type: "Tapez",
   type: "Type",
   Province: "Province",
   Territory: "Territoire",
@@ -11278,7 +11262,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.787",
+	"version": "0.6.789",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/core/components/Dashboard/Widget/ActivityIndicators/ActivityIndicators.stories.js

@@ -250,3 +250,27 @@ export const NoMinWidth = {
 		);
 	},
 };
+
+export const SingleColumn = {
+	name: "Single Column Layout",
+	args: {
+		className: "single-column",
+	},
+	render: (args) => {
+		const config = [
+			{ icon: "Package", label: "Aid kit availability", type: "compliant" },
+			{ icon: "SchoolHat", label: "H&S training delivery", type: "compliant" },
+			{ icon: "UsersCheck", label: "Workers safe pairing", type: "notCompliant" },
+			{ icon: "User", label: "Children presence", type: "compliant" },
+			{ icon: "Lock", label: "Security presence", type: "empty" },
+			{ icon: "Refresh05", label: "Relay presence", type: "compliant" },
+		];
+		
+		return (
+			<ActivityIndicators
+				{...args}
+				config={config}
+			/>
+		);
+	},
+};

package/src/@daf/core/components/Dashboard/Widget/ActivityIndicators/index.jsx

@@ -27,6 +27,7 @@ import styled from "styled-components";
  * @param {ReactNode} children - Additional content to render
  * @param {boolean} noTitle - Hide the widget title
  * @param {string} filterMode - Filter indicators by type: "all" | "compliant" | "notCompliant" | "empty"
+ * @param {string} className - Additional CSS classes. Use "single-column" to force single-column layout
  */
 export default function ActivityIndicatorsWidget({
 	t = (s) => s,

package/src/@daf/core/components/Dashboard/Widget/ActivityIndicators/style.js

@@ -99,6 +99,40 @@ const Style = styled.div`
 			}
 		}
 	}
+
+	&.single-column {
+		grid-template-columns: 1fr;
+
+		.indicator-item {
+			/* Remove the 2-column specific separators first */
+			&:nth-child(1),
+			&:nth-child(2),
+			&:nth-child(3),
+			&:nth-child(4) {
+				&::after {
+					display: none !important;
+				}
+			}
+
+			/* On single column, all items except last get separator */
+			&:not(:last-child) {
+				&::after {
+					content: '' !important;
+					position: absolute;
+					bottom: 0;
+					left: var(--size-lg);
+					right: var(--size-lg);
+					height: 1px;
+					background-color: var(--border-color, #E5E7EB);
+					display: block !important;
+				}
+			}
+			
+			&:last-child::after {
+				display: none !important;
+			}
+		}
+	}
 `;
 
 export const NoMinWidth = styled.div`

package/src/@daf/core/components/Dashboard/Widget/KeyIndicators/KeyIndicators.stories.js

@@ -120,3 +120,42 @@ export const NoMinWidth = {
 		],
 	},
 };
+
+export const SiteConditions = {
+	name: "SiteConditions",
+	args: {
+		title: "Site Conditions",
+		className: "small-content",
+		config: [
+			{
+				label: "Season",
+				icon: "Tree",
+				render: () => <div>Rainy</div>
+			},
+			{
+				label: "Weather conditions",
+				icon: "Globe",
+				render: () => <div>Cloudy</div>
+			},
+			{
+				label: "Tide level",
+				icon: "WaterDrop",
+				render: () => <div>Medium</div>
+			},
+			{
+				label: "Disturbances",
+				icon: "Lightning",
+				render: () => <div>None</div>
+			},
+		],
+	},
+	render: (args) => {
+		return (
+			<DashboardLayout>
+				<section>
+					<KeyIndicators {...args} />
+				</section>
+			</DashboardLayout>
+		);
+	},
+};

package/src/@daf/core/components/Dashboard/Widget/KeyIndicators/LabelWithIcon.jsx

@@ -0,0 +1,38 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import CustomIcon from '../../../Icon/CustomIcon.jsx';
+
+const LabelWithIcon = ({ t, name, icon, iconColor = "#028788", iconWidth = 16, iconHeight = 16 }) => {
+  // name is expected to be already translated (string) or a translation key
+  // If it's a string that looks like a translation key (contains '::'), translate it
+  // Otherwise, use it as-is (already translated)
+  const displayText = (typeof name === 'string' && name.includes('::') && t && typeof t === 'function')
+    ? t(name)
+    : name;
+  
+  return (
+    <div className="flex items-center" style={{ gap: 8 }}>
+      {icon && <CustomIcon name={icon} color={iconColor} width={iconWidth} height={iconHeight} />}
+      <span style={{
+        fontSize: '14px',
+        fontWeight: 500,
+        lineHeight: '26px',
+        letterSpacing: '0%',
+        color: 'var(--base-gray-70)',
+        fontFamily: 'SF UI Display, -apple-system, BlinkMacSystemFont, sans-serif'
+      }}>{displayText}</span>
+    </div>
+  );
+};
+
+LabelWithIcon.propTypes = {
+  t: PropTypes.func,
+  name: PropTypes.string.isRequired,
+  icon: PropTypes.string,
+  iconColor: PropTypes.string,
+  iconWidth: PropTypes.number,
+  iconHeight: PropTypes.number,
+};
+
+export default LabelWithIcon;
+

package/src/@daf/core/components/Dashboard/Widget/KeyIndicators/index.jsx

@@ -2,6 +2,7 @@ import Style, { NoMinWidth } from "./style";
 import Widget from "../index.jsx";
 import { formatClassname } from "../../../../../../helpers/ClassesHelper";
 import { Tooltip } from "antd";
+import LabelWithIcon from "./LabelWithIcon.jsx";
 
 export default function KeyIndicatorsWidget({
 	t = (s) => s,
@@ -25,8 +26,8 @@ export default function KeyIndicatorsWidget({
 			{children}
 			<Style className={formatClassname(["flex", className])}>
 				{config.map((c, i) => (
-					<div className="row-item" key={`key-indicators-${i}`}>
-						<Label label={c.label} withTooltip={withTooltip} />
+					<div className={`row-item ${c.icon ? 'row-item-with-icon' : ''}`} key={`key-indicators-${i}`}>
+						<Label label={c.label} icon={c.icon} withTooltip={withTooltip} t={t} />
 						<div className="flex">{c.render()}</div>
 					</div>
 				))}
@@ -40,7 +41,19 @@ export default function KeyIndicatorsWidget({
 	return component;
 }
 
-function Label({ label, withTooltip }) {
+function Label({ label, icon, withTooltip, t }) {
+	if (icon) {
+		const labelContent = <LabelWithIcon t={t} name={label} icon={icon} />;
+		if (withTooltip) {
+			return (
+				<Tooltip title={label} placement="topLeft">
+					<h4>{labelContent}</h4>
+				</Tooltip>
+			);
+		}
+		return <h4>{labelContent}</h4>;
+	}
+	
 	if (withTooltip) {
 		return (
 			<Tooltip title={label} placement="topLeft">

package/src/@daf/core/components/Dashboard/Widget/KeyIndicators/style.js

@@ -59,12 +59,45 @@ const Style = styled.div`
 				margin-top: 14px;
 			}
 		}
+
+		&.row-item-with-icon {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			gap: 8px;
+
+			h4 {
+				margin-bottom: 0;
+				flex: 0 0 auto;
+			}
+
+			.flex {
+				flex: 0 0 auto;
+				display: flex;
+				align-items: center;
+				font-size: 16px;
+				font-weight: 500;
+				line-height: 38px;
+				letter-spacing: 0;
+				color: var(--base-gray-90);
+				font-family: 'SF UI Display', -apple-system, BlinkMacSystemFont, sans-serif;
+			}
+		}
 	}
 
 	&.small-content {
 		span {
 			font-size: 16px;
 		}
+
+		.row-item-with-icon {
+			.flex {
+				font-size: 16px;
+				line-height: 38px;
+				font-weight: 500;
+				color: var(--base-gray-90);
+			}
+		}
 	}
 
 	.ant-tag {

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/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 ? "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

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

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

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

@@ -104,48 +104,48 @@ export const getColumns = ({
 				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" />;
-			}
+		{
+			title: t("Province"),
+			dataIndex: "administrativeLevel1",
+			key: "administrativeLevel1",
+			ellipsis: true,
+			show: entity.includes("locations"),
+			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
-			}
+				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>;
+				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" />;
-			}
+		{
+			title: t("Territory"),
+			dataIndex: "administrativeLevel2",
+			key: "administrativeLevel2",
+			show: entity.includes("locations"),
+			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
-			}
+				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>;
+				return <Tooltip title={label || '-'}>{label || '-'}</Tooltip>;
+			},
 		},
-	},
 		{
 			title: t("Sources"),
 			dataIndex: "sources",