datastake-daf 0.6.764 → 0.6.766

package/dist/services/index.js

@@ -760,6 +760,24 @@ class AdminService extends BaseService {
       url: `/accounts/cancelInvitation/${token}`
     });
   }
+  getSubjects({
+    subject,
+    params
+  }) {
+    return this.apiGet({
+      url: `${subject}`,
+      params
+    });
+  }
+  mergeSubjects({
+    subject,
+    ...data
+  }) {
+    return this.apiPost({
+      url: `/merge/${subject}`,
+      data
+    });
+  }
 }
 var AdminService$1 = createLazyService(AdminService);
 

package/dist/utils/index.js

@@ -7724,15 +7724,117 @@ function getRedirectPath(user, fallback = '', app, isDatastake) {
 }
 
 const en = {
+  "Identified Customers": "Identified Customers",
+  "Identified Suppliers": "Identified Suppliers",
+  "Associated Mine Sites": "Associated Mine Sites",
+  "Supply Chain Position": "Supply Chain Position",
+  "Governance": "Governance",
+  "Holding": "Holding",
+  "Operator Review": "Operator Review",
+  "Stakeholder Mapping": "Stakeholder Mapping",
+  "sources-reporting": "Sources Reporting",
+  "link-details": "Link details",
+  "Mine Site Details": "Mine Site Details",
+  "Number of Workers on Site": "Number of Workers on Site",
+  "Extraction Methods": "Extraction Methods",
+  "Find Data": "Find Data",
+  "Mine Review": "Mine Review",
+  "Completion": "Completion",
+  "Information Completeness": "Information Completeness",
+  "Consolidated": "Consolidated",
+  "Datapoints": "Datapoints",
+  "Own Data": "Own Data",
+  "Create Worker": "Create Worker",
+  "Workers": "Workers",
+  "Census Update": "Census Update",
+  "Create Operator": "Create Operator",
+  "Edit Settings": "Edit Settings",
+  "Create Partner": "Create Partner",
+  "Only authorised users can create partnerships.": "Only authorised users can create partnerships.",
+  "Partners are organisations sharing their information with you, or receiving your information.": "Partners are organisations sharing their information with you, or receiving your information.",
+  "List": "List",
+  "Partner suspended successfully": "Partner suspended successfully",
+  "Invitation type": "Invitation type",
+  "Person name": "Person name",
+  "Source: This partner will share information with you.": "Source: This partner will share information with you.",
+  "Client: You will share information with this partner.": "Client: You will share information with this partner.",
+  "Exchange: You will both share information with each other.": "Exchange: You will both share information with each other.",
+  "Type of partnership": "Type of partnership",
+  "Type of partner": "Type of partner",
+  "Re-activate Partnership": "Re-activate Partnership",
+  "Activate Partner": "Activate Partner",
+  "Resend Invitation": "Resend Invitation",
+  "Resend Invite": "Resend Invite",
+  "Copy Invitation Link": "Copy Invitation Link",
+  "Are you sure you want to suspend this partner?": "Are you sure you want to suspend this partner?",
+  "Suspend Partner": "Suspend Partner",
+  "Are you sure you want to block this user?": "Are you sure you want to block this user?",
+  "Block User": "Block User",
+  "Suspended": "Suspended",
+  "Entity Type": "Entity Type",
+  "Source: This partner shares information with your organisation.": "Source: This partner shares information with your organisation.",
+  "Client: This partner receives information from your organisation.": "Client: This partner receives information from your organisation.",
+  "Exchange: You share information with each other.": "Exchange: You share information with each other.",
+  "Create Production Site": "Create Production Site",
+  "production-sites": "Production Sites",
+  "Summary": "Summary",
+  "Create Locations": "Create Locations",
+  "Create Incidents": "Create Incidents",
+  "Create Activity": "Create Activity",
+  "Activities": "Activities",
+  "Create Events": "Create Events",
+  "Create Document": "Create Document",
+  "Documents": "Documents",
+  "Triangluation": "Triangluation",
+  "Monitoring Map": "Monitoring Map",
+  "Major Incidents": "Major Incidents",
+  "Minor Incidents": "Minor Incidents",
+  "Moderate Incidents": "Moderate Incidents",
+  "Mine Site": "Mine Site",
+  "Location Type": "Location Type",
+  "Data Points": "Data Points",
+  "Information Subjects": "Information Subjects",
+  "Data Compilation": "Data Compilation",
+  "Data Chain of Custody": "Data Chain of Custody",
+  "Contributions": "Contributions",
+  "Others": "Others",
+  "Locations Data": "Locations Data",
+  "Stakeholders Data": "Stakeholders Data",
+  "Events Data": "Events Data",
+  "Accumulation": "Accumulation",
+  "Create Mine Site": "Create Mine Site",
+  "Supply Chain Map": "Supply Chain Map",
+  "Participants": "Participants",
+  "Trade Connections": "Trade Connections",
+  "Key Information": "Key Information",
+  "Weekly": "Weekly",
+  "Monthly": "Monthly",
+  "Daily": "Daily",
+  "Workforce": "Workforce",
+  "Trade Actors": "Trade Actors",
+  "Mining Sites": "Mining Sites",
+  "Primary Data Collection": "Primary Data Collection",
+  "Implementation Partner": "Implementation Partner",
+  "Origin": "Origin",
+  "Activity Participants": "Activity Participants",
+  "Legal Form": "Legal Form",
+  "Hectares Planted": "Hectares Planted",
+  "Sub Category": "Sub Category",
+  "Licensing": "Licensing",
+  "Email address": "Email address",
+  "Partner Type": "Partner Type",
+  "Product": "Product",
+  "Filter by": "Filter by",
+  "Key Stakeholder": "Key Stakeholder",
+  "Mineral Supply Chain Transparency": "Mineral Supply Chain Transparency",
   "no-board-members": "No board members identified",
   "no-management": "No management identified",
   "no-beneficiaries": "No beneficiaries identified",
   "no-stakeholders": "No stakeholders identified",
   "no-operators": "No operators identified",
   "no-traders": "No traders identified",
-  "no-government": "No government identified",
+  "no-governance": "No governance identified",
   "no-other": "No other identified",
-  "No planning required": "No planning required",
   "No evaluation required": "No evaluation required",
   "No improvement required": "No improvement required",
   "Currently unavailable": "Currently unavailable",
@@ -8935,13 +9037,116 @@ const en = {
 };
 
 const fr = {
+  "Identified Customers": "Clients identifiés",
+  "Identified Suppliers": "Fournisseurs identifiés",
+  "Associated Mine Sites": "Sites miniers associés",
+  "Supply Chain Position": "Position dans la chaîne d'approvisionnement",
+  "Governance": "Gouvernance",
+  "Holding": "Holding",
+  "Operator Review": "Évaluation de l'opérateur",
+  "Stakeholder Mapping": "Cartographie des parties prenantes",
+  "sources-reporting": "Sources de rapport",
+  "link-details": "Détails du lien",
+  "Mine Site Details": "Détails du site minier",
+  "Number of Workers on Site": "Nombre de travailleurs sur le site",
+  "Extraction Methods": "Méthodes d'extraction",
+  "Find Data": "Rechercher des données",
+  "Mine Review": "Évaluation de la mine",
+  "Completion": "Achèvement",
+  "Information Completeness": "Complétude de l'information",
+  "Consolidated": "Consolidé",
+  "Datapoints": "Points de données",
+  "Own Data": "Données propres",
+  "Create Worker": "Créer un travailleur",
+  "Workers": "Travailleurs",
+  "Census Update": "Mise à jour du recensement",
+  "Create Operator": "Créer un opérateur",
+  "Edit Settings": "Modifier les paramètres",
+  "Create Partner": "Créer un partenaire",
+  "Only authorised users can create partnerships.": "Seuls les utilisateurs autorisés peuvent créer des partenariats.",
+  "Partners are organisations sharing their information with you, or receiving your information.": "Les partenaires sont des organisations qui partagent leurs informations avec vous ou qui reçoivent vos informations.",
+  "List": "Liste",
+  "Partner suspended successfully": "Partenaire suspendu avec succès",
+  "Invitation type": "Type d'invitation",
+  "Person name": "Nom de la personne",
+  "Source: This partner will share information with you.": "Source : Ce partenaire partagera des informations avec vous.",
+  "Client: You will share information with this partner.": "Client : Vous partagerez des informations avec ce partenaire.",
+  "Exchange: You will both share information with each other.": "Échange : Vous partagerez tous deux des informations l'un avec l'autre.",
+  "Type of partnership": "Type de partenariat",
+  "Type of partner": "Type de partenaire",
+  "Re-activate Partnership": "Réactiver le partenariat",
+  "Activate Partner": "Activer le partenaire",
+  "Resend Invitation": "Renvoyer l'invitation",
+  "Resend Invite": "Renvoyer l'invitation",
+  "Copy Invitation Link": "Copier le lien d'invitation",
+  "Are you sure you want to suspend this partner?": "Êtes-vous sûr de vouloir suspendre ce partenaire ?",
+  "Suspend Partner": "Suspendre le partenaire",
+  "Are you sure you want to block this user?": "Êtes-vous sûr de vouloir bloquer cet utilisateur ?",
+  "Block User": "Bloquer l'utilisateur",
+  "Suspended": "Suspendu",
+  "Entity Type": "Type d'entité",
+  "Source: This partner shares information with your organisation.": "Source : Ce partenaire partage des informations avec votre organisation.",
+  "Client: This partner receives information from your organisation.": "Client : Ce partenaire reçoit des informations de votre organisation.",
+  "Exchange: You share information with each other.": "Échange : Vous partagez des informations l'un avec l'autre.",
+  "Create Production Site": "Créer un site de production",
+  "production-sites": "Sites de production",
+  "Summary": "Résumé",
+  "Create Locations": "Créer des emplacements",
+  "Create Incidents": "Créer des incidents",
+  "Create Activity": "Créer une activité",
+  "Activities": "Activités",
+  "Create Events": "Créer des événements",
+  "Create Document": "Créer un document",
+  "Documents": "Documents",
+  "Triangluation": "Triangulation",
+  "Monitoring Map": "Carte de surveillance",
+  "Major Incidents": "Incidents majeurs",
+  "Minor Incidents": "Incidents mineurs",
+  "Moderate Incidents": "Incidents modérés",
+  "Mine Site": "Site minier",
+  "Location Type": "Type d'emplacement",
+  "Data Points": "Points de données",
+  "Information Subjects": "Sujets d'information",
+  "Data Compilation": "Compilation de données",
+  "Data Chain of Custody": "Chaîne de traçabilité des données",
+  "Contributions": "Contributions",
+  "Others": "Autres",
+  "Locations Data": "Données de localisation",
+  "Stakeholders Data": "Données des parties prenantes",
+  "Events Data": "Données d'événements",
+  "Accumulation": "Accumulation",
+  "Create Mine Site": "Créer un site minier",
+  "Supply Chain Map": "Carte de la chaîne d'approvisionnement",
+  "Participants": "Participants",
+  "Trade Connections": "Connexions commerciales",
+  "Key Information": "Informations clés",
+  "Weekly": "Hebdomadaire",
+  "Monthly": "Mensuel",
+  "Daily": "Quotidien",
+  "Workforce": "Main-d'œuvre",
+  "Trade Actors": "Acteurs commerciaux",
+  "Mining Sites": "Sites miniers",
+  "Primary Data Collection": "Collecte de données primaires",
+  "Implementation Partner": "Partenaire de mise en œuvre",
+  "Origin": "Origine",
+  "Activity Participants": "Participants à l'activité",
+  "Legal Form": "Forme juridique",
+  "Hectares Planted": "Hectares plantés",
+  "Sub Category": "Sous-catégorie",
+  "Licensing": "Licences",
+  "Email address": "Adresse e-mail",
+  "Partner Type": "Type de partenaire",
+  "Product": "Produit",
+  "Filter by": "Filtrer par",
+  "Key Stakeholder": "Partie prenante clé",
+  "Mineral Supply Chain Transparency": "Transparence de la chaîne d'approvisionnement minérale",
   "no-board-members": "Aucun membre du conseil d'administration identifié",
   "no-management": "Aucun management identifié",
   "no-beneficiaries": "Aucun bénéficiaire identifié",
   "no-stakeholders": "Aucun stakeholder identifié",
   "no-operators": "Aucun opérateur identifié",
   "no-traders": "Aucun négociant identifié",
-  "no-government": "Aucun gouvernement identifié",
+  "no-governance": "Aucun gouvernance identifié",
   "no-other": "Aucun autre identifié",
   "No planning required": "Pas de planification requise",
   "No evaluation required": "Pas d'évaluation requise",
@@ -10779,13 +10984,116 @@ const fr = {
 };
 
 const sp = {
+  "Identified Customers": "Clientes identificados",
+  "Identified Suppliers": "Proveedores identificados",
+  "Associated Mine Sites": "Sitios mineros asociados",
+  "Supply Chain Position": "Posición en la cadena de suministro",
+  "Governance": "Gobernanza",
+  "Holding": "Holding",
+  "Operator Review": "Revisión del operador",
+  "Stakeholder Mapping": "Mapeo de partes interesadas",
+  "sources-reporting": "Fuentes de informes",
+  "link-details": "Detalles del enlace",
+  "Mine Site Details": "Detalles del sitio minero",
+  "Number of Workers on Site": "Número de trabajadores en el sitio",
+  "Extraction Methods": "Métodos de extracción",
+  "Find Data": "Buscar datos",
+  "Mine Review": "Revisión de la mina",
+  "Completion": "Finalización",
+  "Information Completeness": "Completitud de la información",
+  "Consolidated": "Consolidado",
+  "Datapoints": "Puntos de datos",
+  "Own Data": "Datos propios",
+  "Create Worker": "Crear trabajador",
+  "Workers": "Trabajadores",
+  "Census Update": "Actualización del censo",
+  "Create Operator": "Crear operador",
+  "Edit Settings": "Editar configuración",
+  "Create Partner": "Crear socio",
+  "Only authorised users can create partnerships.": "Solo los usuarios autorizados pueden crear asociaciones.",
+  "Partners are organisations sharing their information with you, or receiving your information.": "Los socios son organizaciones que comparten su información con usted o reciben su información.",
+  "List": "Lista",
+  "Partner suspended successfully": "Socio suspendido exitosamente",
+  "Invitation type": "Tipo de invitación",
+  "Person name": "Nombre de la persona",
+  "Source: This partner will share information with you.": "Fuente: Este socio compartirá información con usted.",
+  "Client: You will share information with this partner.": "Cliente: Compartirá información con este socio.",
+  "Exchange: You will both share information with each other.": "Intercambio: Ambos compartirán información entre sí.",
+  "Type of partnership": "Tipo de asociación",
+  "Type of partner": "Tipo de socio",
+  "Re-activate Partnership": "Reactivar asociación",
+  "Activate Partner": "Activar socio",
+  "Resend Invitation": "Reenviar invitación",
+  "Resend Invite": "Reenviar invitación",
+  "Copy Invitation Link": "Copiar enlace de invitación",
+  "Are you sure you want to suspend this partner?": "¿Está seguro de que desea suspender a este socio?",
+  "Suspend Partner": "Suspender socio",
+  "Are you sure you want to block this user?": "¿Está seguro de que desea bloquear a este usuario?",
+  "Block User": "Bloquear usuario",
+  "Suspended": "Suspendido",
+  "Entity Type": "Tipo de entidad",
+  "Source: This partner shares information with your organisation.": "Fuente: Este socio comparte información con su organización.",
+  "Client: This partner receives information from your organisation.": "Cliente: Este socio recibe información de su organización.",
+  "Exchange: You share information with each other.": "Intercambio: Comparten información entre sí.",
+  "Create Production Site": "Crear sitio de producción",
+  "production-sites": "Sitios de producción",
+  "Summary": "Resumen",
+  "Create Locations": "Crear ubicaciones",
+  "Create Incidents": "Crear incidentes",
+  "Create Activity": "Crear actividad",
+  "Activities": "Actividades",
+  "Create Events": "Crear eventos",
+  "Create Document": "Crear documento",
+  "Documents": "Documentos",
+  "Triangluation": "Triangulación",
+  "Monitoring Map": "Mapa de monitoreo",
+  "Major Incidents": "Incidentes mayores",
+  "Minor Incidents": "Incidentes menores",
+  "Moderate Incidents": "Incidentes moderados",
+  "Mine Site": "Sitio minero",
+  "Location Type": "Tipo de ubicación",
+  "Data Points": "Puntos de datos",
+  "Information Subjects": "Temas de información",
+  "Data Compilation": "Compilación de datos",
+  "Data Chain of Custody": "Cadena de custodia de datos",
+  "Contributions": "Contribuciones",
+  "Others": "Otros",
+  "Locations Data": "Datos de ubicaciones",
+  "Stakeholders Data": "Datos de partes interesadas",
+  "Events Data": "Datos de eventos",
+  "Accumulation": "Acumulación",
+  "Create Mine Site": "Crear sitio minero",
+  "Supply Chain Map": "Mapa de la cadena de suministro",
+  "Participants": "Participantes",
+  "Trade Connections": "Conexiones comerciales",
+  "Key Information": "Información clave",
+  "Weekly": "Semanal",
+  "Monthly": "Mensual",
+  "Daily": "Diario",
+  "Workforce": "Fuerza laboral",
+  "Trade Actors": "Actores comerciales",
+  "Mining Sites": "Sitios mineros",
+  "Primary Data Collection": "Recopilación de datos primarios",
+  "Implementation Partner": "Socio de implementación",
+  "Origin": "Origen",
+  "Activity Participants": "Participantes de la actividad",
+  "Legal Form": "Forma jurídica",
+  "Hectares Planted": "Hectáreas plantadas",
+  "Sub Category": "Subcategoría",
+  "Licensing": "Licencias",
+  "Email address": "Dirección de correo electrónico",
+  "Partner Type": "Tipo de socio",
+  "Product": "Producto",
+  "Filter by": "Filtrar por",
+  "Key Stakeholder": "Parte interesada clave",
+  "Mineral Supply Chain Transparency": "Transparencia de la cadena de suministro mineral",
   "no-board-members": "No hay miembros del consejo identificados",
   "no-management": "No hay gerencia identificados",
   "no-beneficiaries": "No hay beneficiarios identificados",
   "no-stakeholders": "No hay partes interesadas identificadas",
   "no-operators": "No hay operadores identificados",
   "no-traders": "No hay comerciantes identificados",
-  "no-government": "No hay gobierno identificado",
+  "no-governance": "No hay gobernanza identificado",
   "no-other": "No hay otros identificados",
   "No planning required": "No se requiere planeación",
   "No evaluation required": "No se requiere evaluación",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.764",
+	"version": "0.6.766",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",
@@ -15,7 +15,6 @@
 		"buffer": "^6.0.3",
 		"countries-list": "^2.6.1",
 		"country-city-location": "^1.0.13",
-		"datastake-daf": "^0.6.378",
 		"dayjs": "^1.11.12",
 		"deepmerge": "^4.3.1",
 		"docx": "^9.5.1",

package/src/@daf/core/components/Charts/BarChart/index.jsx

@@ -90,6 +90,7 @@ export default function BarChart({
 	isPdf = false,
 	legendConfig = {},
 	width,
+	xAxisConfig = {},
 	...rest
 }) {
 	const containerRef = React.useRef(null);
@@ -122,10 +123,12 @@ export default function BarChart({
 							},
 					  }
 					: {}),
+				...xAxisConfig,
 				label: {
 					formatter: isPercentage
 						? (v) => `${v}`.replace(/\d{1,3}(?=(\d{3})+$)/g, (s) => `${s},`) + " %"
 						: formattedXAxis,
+					...xAxisConfig?.label,
 				},
 			},
 			yAxis: {
@@ -170,6 +173,7 @@ export default function BarChart({
 		formattedXAxis,
 		color,
 		token.colorPrimary7,
+		xAxisConfig,
 	]);
 
 	React.useEffect(() => {

package/src/@daf/core/components/Dashboard/Map/ChainIcon/index.js

@@ -105,13 +105,6 @@ export default function LocationIcon({
 			const div = document.getElementById(markerId);
 			root.current = createRoot(div);
 
-			console.log({
-				locationID: data.datastakeId,
-				stakeholder,
-				index,
-				parentId: data.datastakeId,
-			});
-
 			root.current.render(
 				<StakeholderIcon
 					data={stakeholder}

package/src/@daf/core/components/Graphs/StakeholderMappings/index.jsx

@@ -163,7 +163,6 @@ function StakeholderMappings({
 	t = (s) => s,
 	emptyString = undefined,
 	isPdf = false,
-	zoomOutTransition = false,
 }) {
 	const reactFlowWrapper = useRef(null);
 	const [nodes, setNodes] = useNodesState([]);
@@ -473,7 +472,6 @@ function StakeholderMappings({
 
 	return (
 		<BaseGraph
-			zoomOutTransition={zoomOutTransition}
 			nodes={nodes}
 			mandatoryNodesToFit={mandatoryNodesToFit}
 			edges={edges}

package/src/@daf/core/components/Graphs/components/BaseGraph.jsx

@@ -33,7 +33,6 @@ const BaseGraph = forwardRef(function BaseGraph(
 		withDuration = true,
 		onFilterChange,
 		isPdf,
-		zoomOutTransition = false,
 		...props
 	},
 	ref,
@@ -57,8 +56,8 @@ const BaseGraph = forwardRef(function BaseGraph(
 			fitView({
 				padding: 0.4,
 				nodes: [...nodesToFit],
-				duration: withDuration ? 300 : undefined,
-				maxZoom: 0.8,
+				// duration: withDuration ? 300 : undefined,
+				maxZoom: 0.9,
 			});
 		});
 	}, [JSON.stringify(nodesToFit), withDuration]);
@@ -87,7 +86,7 @@ const BaseGraph = forwardRef(function BaseGraph(
 					fitView={true} // zoom out on default
 					fitViewOptions={{
 						padding: 0.2, //zoom out on default
-						...(zoomOutTransition ? { duration: withDuration ? 300 : undefined } : {}),
+						// ...(zoomOutTransition ? { duration: withDuration ? 300 : undefined } : {}),
 					}}
 					{...props}
 				>

package/src/@daf/core/components/Screens/Admin/AdminDashboard/components/KeyIndicatorsWidget/config.js

@@ -8,7 +8,7 @@ export function getConfig(data, goTo, t) {
 		return {
 			label: (
 				<div className="flex">
-					<div className="flex-1">{t(`admin::${item.title}`)}</div>
+					<div className="flex-1">{t(`${item.title}`)}</div>
 					<div className="cursor-pointer" onClick={() => goTo(item.goToPath)}>
 						<CustomIcon name="LinkNewTab" width={16} height={16} color={iconColor} />
 					</div>
@@ -17,4 +17,4 @@ export function getConfig(data, goTo, t) {
 			render: () => <span>{renderNumber(item.valueToShow)}</span>,
 		};
 	});
-}
+}

package/src/@daf/core/components/Screens/Admin/AdminDashboard/components/KeyIndicatorsWidget/index.jsx

@@ -17,4 +17,4 @@ export default function KeyIndicatorsWidget({ data = [], loading, goTo, t }) {
 			/>
 		</div>
 	);
-}
+}

package/src/@daf/core/components/Screens/Admin/AdminDashboard/components/UserStatistics/UserActivity/helper.js

@@ -53,6 +53,9 @@ export const getColor = (users, items) => {
 
 export function useConfig(data) {
 	const config = useMemo(() => {
+		// Ensure data is an array to prevent "data.find is not a function" error
+		const safeData = Array.isArray(data) ? data : [];
+		
 		const start = moment().add(-1, "years").format("MMM YY");
 		let now = moment(start, "MMM YY");
 		const _config = [];
@@ -65,7 +68,7 @@ export function useConfig(data) {
 			while (true) {
 				DAYS.forEach((d) => {
 					if (d === nowMonth.format("dd") && now.format("MMM YY") === nowMonth.format("MMM YY")) {
-						const users = data.find((d) => d._id === nowMonth.format("YYYY-MM-DD"))?.count || 0;
+						const users = safeData.find((d) => d._id === nowMonth.format("YYYY-MM-DD"))?.count || 0;
 						conf.push({ date: nowMonth.format("DD MMM YY"), active: true, users: users });
 						nowMonth.add(1, "days");
 					} else {

package/src/@daf/core/components/Screens/Admin/AdminDashboard/components/UserStatistics/UserActivity/index.jsx

@@ -10,8 +10,13 @@ const DAYS = ["Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"];
 
 export default function UserActivity({ loading, data = [], t }) {
 	const config = useConfig(data);
+
 	const { isCollapsed } = useResizeContext();
 
+
+
+	// console.log("userActivityyyyy",data);
+
 	return (
 		<Widget
 			title={t(`admin::user-activity`)}

package/src/@daf/core/components/Screens/Admin/AdminDashboard/components/UserStatistics/UserGrowth/index.jsx

@@ -10,6 +10,7 @@ export default function UserGrowth({ loading, data = [], t, translationKeys, fet
 
 	useUserGrowth({ container, data, t, translationKeys });
 
+
 	useEffect(() => {
 		if (typeof fetchUserGrowth === "function") {
 			fetchUserGrowth(selectValue);

package/src/@daf/core/components/Screens/Admin/AdminDashboard/components/UserStatistics/index.jsx

@@ -4,32 +4,40 @@ import TopContributors from "./TopContributors/index.jsx";
 import Widget from "../../../../../Dashboard/Widget/index.jsx";
 
 export default function UserStatistics({
-	fetchUserGrowth,
-	loading,
-	loadingUserGrowth,
-	data,
-	t,
-	translationKeys,
+  fetchUserGrowth,
+  loading,
+  loadingUserGrowth,
+  data,
+  t,
+  translationKeys,
 }) {
-	return (
-		<Widget
-			title={t(`${translationKeys}-admin::usage-statistics`)}
-			className="with-border-header"
-		>
-			<div className="flex flex-column gap-6">
-				<UserActivity loading={loading} data={data.userActivityData} t={t} />
+	// console.log("UserStatistics:loading", loading);
+	// console.log("UserStatistics:loadingUserGrowth", loadingUserGrowth);
+	// console.log("UserStatistics:data", data);
+	// console.log("UserStatistics:userActivityData", data?.userActivityData);
+	// console.log("UserStatistics:topContributorsData", data?.topContributorsData);
+	// console.log("UserStatistics:userGrowthData", data?.userGrowthData);
 
-				<div className="flex flex-row flex-col-mobile gap-6">
-					<TopContributors data={data.topContributorsData} loading={loading} t={t} />
-					<UserGrowth
-						t={t}
-						loading={loadingUserGrowth}
-						data={data.userGrowthData}
-						fetchUserGrowth={fetchUserGrowth}
-						translationKeys={translationKeys}
-					/>
-				</div>
-			</div>
-		</Widget>
-	);
+
+  return (
+    <Widget
+      title={t(`${translationKeys}-admin::usage-statistics`)}
+      className="with-border-header"
+    >
+      <div className="flex flex-column gap-6">
+        <UserActivity loading={loading} data={data.userActivityData || []} t={t} />
+
+        <div className="flex flex-row flex-col-mobile gap-6">
+          <TopContributors data={data.topContributorsData || []} loading={loading} t={t} />
+          <UserGrowth
+            t={t}
+            loading={loadingUserGrowth}
+            data={data.userGrowthData || []}
+            fetchUserGrowth={fetchUserGrowth}
+            translationKeys={translationKeys}
+          />
+        </div>
+      </div>
+    </Widget>
+  );
 }