datastake-daf 0.6.844 → 0.6.846

package/dist/utils/index.js

@@ -9386,6 +9386,9 @@ const fr = {
   "under-development": "Under development",
   "under-development-description": "Our team is actively building this feature. It will be available in an upcoming release.",
   "Confirm new subject": "Confirmer nouveau sujet",
+  "registration": "Enregistrement",
+  "scrutiny": "Contrôle",
+  "Organisation Policies": "Politiques Organisationnelles",
   affirmations: {
     "subject-created-successfully": "Sujet créé avec succès.",
     "information-saved-successfully": "Information sauvegardée avec succès.",
@@ -11157,7 +11160,12 @@ const fr = {
     "date-added": "Date de Création",
     "last-active": "Dernière Activité",
     "key-indicators": "Indicateurs Clés"
-  }
+  },
+  "Armed Groups": "Groupes Armés",
+  "Identified Armed Groups": "Groupes Armés Identifiés",
+  "Reported Incidents": "Incidents Signalés",
+  "Conflict Map": "Carte des Conflits",
+  "Conflict Management": "Gestion des Conflits"
 };
 
 const sp = {

package/package.json

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

package/src/@daf/core/components/EditForm/helper.js

@@ -778,10 +778,15 @@ export const inputTypeComponent = {
 				}
 				return {
 					label: o.label,
-					items: opts.filter((op) => op.group === o.value),
+					items: opts.filter((op) => op?.filters?.[0]?.value.includes(o.value)),
 				};
 			});
-			const notGrouped = opts.filter((op) => !gKeys.includes(op.group));
+			const notGrouped = opts.filter((op) => {
+				const filterValue = op?.filters?.[0]?.value;
+				if (!filterValue) return true;
+				
+				return !gKeys.some(key => filterValue.includes(key));
+			});
 			if (notGrouped.length) {
 				groupOptions.unshift(...notGrouped);
 			}
@@ -975,18 +980,21 @@ export const inputTypeComponent = {
 				}
 				return {
 					label: o.label,
-					items: opts.filter((op) => op.group === o.value),
+					items: opts.filter((op) => op?.filters?.[0]?.value.includes(o.value)),
 				};
 			});
-			const notGrouped = opts.filter((op) => !gKeys.includes(op.group));
+			const notGrouped = opts.filter((op) => {
+				const filterValue = op?.filters?.[0]?.value;
+				if (!filterValue) return true;
+				
+				return !gKeys.some(key => filterValue.includes(key));
+			});
 			if (notGrouped.length) {
 				groupOptions.unshift(...notGrouped);
 			}
 			opts = groupOptions;
 		}
 
-		console.log({maxWidth, staticWidth, fullWidth});
-
 		return (
 			<Select
 				size="medium"

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

@@ -62,7 +62,7 @@ export default function NewUser({
 			const localUserData = {
 				...apiPayload,
 				status: 'pending',
-				id: apiPayload.email, // Add a unique ID for the table key
+				id: apiPayload.email, 
 				// apps: {
 				// 	[module]: {
 				// 		role: val.role,

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

@@ -1,6 +1,5 @@
-import React from "react";
 import moment from "moment";
-import { Tag, Tooltip, Checkbox } from "antd";
+import { Tag, Tooltip } from "antd";
 import { findOptions } from "../../../../../../../helpers/StringHelper.js";
 import CustomIcon from "../../../../Icon/CustomIcon.jsx";
 import MoreMenu from "../../../../Table/MoreMenu/index.jsx";
@@ -32,57 +31,35 @@ export const getColumns = ({
 	onResendInvitation = () => {},
 	onCanelVerification = () => {},
 	setAddAccountVisible = () => {},
-	setSelectedAccounts = () => {},
-	selectedAccounts = [],
+
 }) => {
 	const cols = [
-		{
-			title: "",
-			dataIndex: "select",
-			key: "select",
-			width: 50,
-			active: true,
-			pending: true,
-			suspended: true,
-			show: true,
-			render: (v, all) => {
-				if (all.empty) {
-					return <div className="daf-default-cell" />;
-				}
-				return (
-					<Checkbox
-						onChange={() =>
-							setSelectedAccounts((prev) => {
-								const isSelected = prev.some((p) => p.userId === all.userId);
-								if (isSelected) {
-									return prev.filter((p) => p.userId !== all.userId);
-								}
-								return [...prev, all];
-							})
-						}
-						checked={selectedAccounts.some((p) => p.userId === all.userId)}
-						disabled={selectedAccounts.length >= 3 && !selectedAccounts.some((p) => p.userId === all.userId)}
-					/>
-				);
-			},
-		},
+	
 		{
 			title: t("ID"),
-			dataIndex: "userId",
 			key: "userId",
+			ellipsis: true,
+			width: 160,
 			active: true,
 			pending: true,
 			suspended: true,
-			ellipsis: true,
-			width: 160,
-			render: (v, all) => {
-				if (all.empty) {
-					return <div className="daf-default-cell" />;
-				}
-
-				return <div className="daf-default-cell">{v || "--"}</div>;
+			render: (_, all) => {
+			  if (all.empty) {
+				return <div className="daf-default-cell" />;
+			  }
+		  
+			  const id =
+				all.status === "pending"
+				  ? all.users?.[0]?.userId ??
+					all.invitedUser?.userId ??
+					all.datastakeId ??
+					"--"
+				  : all.userId ?? "--";
+		  
+			  return <div className="daf-default-cell">{id}</div>;
 			},
-		},
+		  },
+		  
 		{
 			title: t("Name"),
 			dataIndex: "name",
@@ -94,25 +71,28 @@ export const getColumns = ({
 			suspended: true,
 		},
 		{
-			title: t("type"),
-			dataIndex: "apps",
-			key: "apps",
-			render: (apps, all) => {
-				if (all.empty) {
-					return <div className="daf-default-cell" />;
-				}
-
-				const sbg = all?.interface ? all : (apps || []).find((a) => a.app === module);
-
-				return renderTypeTag({
-					value: sbg?.interface,
-					label: findOptions(sbg?.interface, selectOptions.type),
-				});
+			title: t("Type"),
+			key: "type",
+			render: (_, all) => {
+			  if (all.empty) {
+				return <div className="daf-default-cell" />;
+			  }
+		  
+			  const typeValue =
+				all.status === "pending"
+				  ? all.type ?? all.otherData?.interface
+				  : all.apps?.[0]?.interface;
+		  
+			  return renderTypeTag({
+				value: typeValue,
+				label: findOptions(typeValue, selectOptions.type),
+			  });
 			},
 			active: true,
 			pending: true,
 			suspended: true,
-		},
+		  },
+		  
 		{
 			title: t("Email"),
 			dataIndex: "admin",
@@ -165,26 +145,28 @@ export const getColumns = ({
 			pending: true,
 			suspended: false,
 		},
-		{
-			title: t("Email Verified"),
-			dataIndex: "emailVerified",
-			key: "emailVerified",
-			render: (verified, all) => {
-				if (all.empty) {
-					return <div className="daf-default-cell" />;
-				}
+	{
+		title: t("Email Verified"),
+		dataIndex: "emailVerified",
+		key: "emailVerified",
+		render: (verified, all) => {
+			if (all.empty) {
+				return <div className="daf-default-cell" />;
+			}
 
-				return verified ? (
-					<Tag color="green">{t("Yes")}</Tag>
-				) : (
-					<Tag color="red">{t("No")}</Tag>
-				);
-			},
-			ellipsis: false,
-			active: false,
-			pending: true,
-			suspended: false,
+			const isVerified = all.users?.[0]?.emailVerified ?? verified ?? all.emailVerfied;
+
+			return isVerified ? (
+				<Tag color="green">{t("Yes")}</Tag>
+			) : (
+				<Tag color="red">{t("No")}</Tag>
+			);
 		},
+		ellipsis: false,
+		active: false,
+		pending: true,
+		suspended: false,
+	},
 		{
 			title: t("Date"),
 			dataIndex: "createdAt",

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

@@ -154,21 +154,14 @@ function AdminView({
 
 						try {
 							const { data} = await updateAccount({ id: editData.id, data: newData });
-							console.log({data})
 
-							console.log('Checking for pending users...', {
-								hasPendingUsers: pendingUsers.length > 0,
-								hasInviteFunction: !!inviteCompanyAccount,
-								pendingUsers: pendingUsers
-							});
+						
 
 							if (pendingUsers.length > 0 && inviteCompanyAccount) {
 								console.log('Inviting pending users:', pendingUsers.length);
 								for (const user of pendingUsers) {
 									try {
 										const { pendingCompanyId, status, ...userDataToInvite } = user;
-										console.log('Sending invitation for:', user.email, userDataToInvite);
-										// Use the standalone invite function, don't mix it with updateAccount
 										// await inviteCompanyAccount({
 										// 	companyId: editData.id,
 										// 	data: {

package/src/@daf/hooks/useSources.js

@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
 import SourceService from "../services/SourceService.js";
 
-export default function useSource({ user = {}, t = () => {}, getData = () => {}, id }) {
+export default function useSource({ user = {}, t = () => {}, getData = () => {}, id, stop }) {
 	const [loading, setLoading] = useState(true);
 	const [partners, setPartners] = useState([]);
 	const [selectedPartners, setSelectedPartners] = useState({ loading: true });
@@ -59,8 +59,10 @@ export default function useSource({ user = {}, t = () => {}, getData = () => {},
 			}
 		}
 
-		fetchPartners();
-	}, [user.language, id]);
+		if(!stop) {
+			fetchPartners();
+		}
+	}, [user.language, id, stop]);
 
 	function handleSelectedPartnersChange(selected) {
 		setSelectedPartners((prev) => ({
@@ -82,7 +84,6 @@ export default function useSource({ user = {}, t = () => {}, getData = () => {},
 
 export const useSources = ({type, id, user, t = () => {}, stop}) => {
 	function getData(params) {
-		if(stop) return Promise.resolve({ data: [] });
 		if(id !== undefined && id !== null) {
 			return SourceService.getSources({type, id});
 		} else {
@@ -95,6 +96,7 @@ export const useSources = ({type, id, user, t = () => {}, stop}) => {
 		t,
 		getData: getData,
 		id,
+		stop,
 	});
 
 	const informationSources = partners?.length > 0 ? partners?.length - 1 : 0;

package/src/@daf/hooks/useWidgetFetch.js

@@ -13,37 +13,27 @@ export const useWidgetFetch = ({config, getData = DashboardService.getWidget, on
     const { stop, defaultData, ...rest} = config;
     const [ data, setData ] = useState(defaultData || {});
     const [ loading, setLoading ] = useState(false);
-    const [ initFetchDone, setInitFetchDone ] = useState(false);
-    const isMounted = useRef(true);
 	
     const fetchData = async () => {
         setLoading(true);
         try {
             const { data } = await getData(rest);
-            if (!isMounted.current) return;
-            setData(data || defaultData);
+            setData(data);
             if (isErrorResponse(data)) {
                 const errorMessage = getErrorMessage(data);
                 message.error(errorMessage);
                 return;
             }
             onFetch();
-            setInitFetchDone(true);
         } catch (err) {
             console.log(err);
-        }
-        if (isMounted.current) {
+        }finally {
             setLoading(false);
         }
     };
-    useEffect(() => {
-        isMounted.current = true;
-        return () => {
-            isMounted.current = false;
-        };
-    }, []);
     useEffect(() => {
         if(!stop) {
+            console.log('fetching data');
 			fetchData();
 		}
     }, [JSON.stringify(config), stop]);
@@ -51,6 +41,5 @@ export const useWidgetFetch = ({config, getData = DashboardService.getWidget, on
         data,
         loading,
         setData,
-        initFetchDone
     }
 }

package/src/@daf/pages/Dashboards/ConflictManagement/components/RisksWidget/components/IncidentsTime/config.js

@@ -204,3 +204,6 @@ export function useTimelineBase({ language, selectedRange }) {
 }
 
 export default useTimelineBase;
+
+
+

package/src/@daf/pages/Dashboards/ConflictManagement/components/RisksWidget/components/IncidentsTime/hook.js

@@ -1,16 +1,75 @@
-import { useMemo, useState } from "react";
+import { useMemo, useState, useCallback } from "react";
 import useTimelineBase from "./config.js";
-
+import DashboardService from "../../../../../../../services/DashboardService.js";
 export default function useIncidentsTimeline({
   t,
   language,
   severityOptions = [],
   selectedRange = "12",
+  selectedPartners = {},
+  user,
 }) {
   const [filters, setFilters] = useState({ severity: "all" });
-
   const { baseMonths, baseWeeks, mergeWithData } = useTimelineBase({ language, selectedRange });
 
+  const getSourceParam = useCallback(
+    (sourceId) => {
+      if (user?.company?.id !== sourceId) return `?sourceId=${sourceId}`;
+      return "";
+    },
+    [user?.company?.id]
+  );
+   const severityColors = useMemo(
+    () => ({
+      major: "#cf1322",
+      minor: "#fadb14",
+      moderate: "#fa8c16",
+      undetermined: "#999999",
+      placeholder: "transparent",
+    }),
+    []
+  );
+  
+  
+     const renderSeverity = (val) => {
+    if (val === "major")
+      return <span style={{ color: severityColors.major }}>{t("Major")}</span>;
+    if (val === "minor")
+      return <span style={{ color: severityColors.minor }}>{t("Minor")}</span>;
+    if (val === "moderate")
+      return (
+        <span style={{ color: severityColors.moderate }}>{t("Moderate")}</span>
+      );
+    return <span>{t("Undetermined")}</span>;
+  };
+  
+     const categories = useMemo(() => {
+    if (selectedRange === "12") return baseMonths.map((m) => m.label);
+    return baseWeeks.map((w) => w.label);
+  }, [selectedRange, baseMonths, baseWeeks]);
+
+  const defaultFetchConfig = useMemo(
+    () => ({
+      url: `/incidents-timeline`,
+      filters: {
+        ...filters,
+        severity: filters.severity ? filters.severity : "all",
+        period: selectedRange,
+        sources: selectedPartners?.partners || [],
+      },
+      defaultData: [],
+      stop: selectedPartners?.loading,
+    }),
+    [filters, selectedRange, selectedPartners]
+  );
+
+  const getIncidentsTimelineData = useCallback(
+    ({ url, filters }) =>
+      DashboardService.getWidgetConflictManagement(url, filters),
+    []
+  );
+
+
   const filtersConfig = useMemo(
     () => ({
       language,
@@ -43,6 +102,12 @@ export default function useIncidentsTimeline({
     setFilters,
     baseMonths,
     baseWeeks,
-    mergeWithData
+    mergeWithData,
+    defaultFetchConfig,
+    getSourceParam,
+    getIncidentsTimelineData,
+    severityColors,
+    renderSeverity,
+    categories,
   };
 }

package/src/@daf/pages/Dashboards/ConflictManagement/components/RisksWidget/components/IncidentsTime/index.js

@@ -1,27 +1,26 @@
-import { useMemo, useCallback } from "react";
+import { useMemo } from "react";
 import Widget from "../../../../../../../core/components/Dashboard/Widget/index.jsx";
 import PropTypes from "prop-types";
 import useIncidentsTimeline from "./hook.js";
 import { useWidgetFetch } from "../../../../../../../hooks/useWidgetFetch.js";
-import DashboardService from "../../../../../../../services/DashboardService.js";
 import { renderDateFormatted } from "../../../../../../../../helpers/Forms.js";
 import StackChart from "../../../../../../../core/components/Charts/StackChart/index.jsx";
-
 export default function IncidentsTimeline({
   selectedRange,
-  selectedPartners = {},
   t,
   language,
   goTo,
-  user,
   options,
 }) {
   const {
-    filters,
     filtersConfig,
+    defaultFetchConfig,
+    getSourceParam,
+    getIncidentsTimelineData,
     mergeWithData,
-    baseMonths,
-    baseWeeks,
+    severityColors,
+    renderSeverity,
+    categories,
   } = useIncidentsTimeline({
     t,
     language,
@@ -29,96 +28,13 @@ export default function IncidentsTimeline({
     selectedRange,
   });
 
-  const getSourceParam = useCallback(
-    (sourceId) => {
-      if (user?.company?.id !== sourceId) return `?sourceId=${sourceId}`;
-      return "";
-    },
-    [user?.company?.id]
-  );
-
-  const severityColors = useMemo(
-    () => ({
-      major: "#cf1322",
-      minor: "#fadb14",
-      moderate: "#fa8c16",
-      undetermined: "#999999",
-      placeholder: "transparent",
-    }),
-    []
-  );
-
-  const defaultFetchConfig = useMemo(
-    () => ({
-      url: `/incidents-timeline`,
-      filters: {
-        ...filters,
-        severity: filters.severity ? filters.severity : "all",
-        period: selectedRange,
-        sources: selectedPartners?.partners || [],
-      },
-      defaultData: [],
-      stop: selectedPartners?.loading,
-    }),
-    [filters, selectedRange, selectedPartners]
-  );
-
-  const getIncidentsTimelineData = useCallback(
-    ({ url, filters }) =>
-      DashboardService.getWidgetConflictManagement(url, filters),
-    []
-  );
-
   const { data, loading } = useWidgetFetch({
     config: defaultFetchConfig,
     getData: getIncidentsTimelineData,
   });
-
-  const renderSeverity = (val) => {
-    if (val === "major")
-      return <span style={{ color: severityColors.major }}>{t("Major")}</span>;
-    if (val === "minor")
-      return <span style={{ color: severityColors.minor }}>{t("Minor")}</span>;
-    if (val === "moderate")
-      return (
-        <span style={{ color: severityColors.moderate }}>{t("Moderate")}</span>
-      );
-    return <span>{t("Undetermined")}</span>;
-  };
-
   const chartData = useMemo(() => mergeWithData(data), [data, mergeWithData]);
 
-  const categories = useMemo(() => {
-    if (selectedRange === "12") return baseMonths.map((m) => m.label);
-    return baseWeeks.map((w) => w.label);
-  }, [selectedRange, baseMonths, baseWeeks]);
-  console.log({filtersConfig})
 
-  const getTooltipContent = useCallback(
-    ({ item }) => {
-      if (!item) return { title: "", items: [] };
-
-      return {
-        title: item.name || item.label || t("Undetermined"),
-        subTitle: renderDateFormatted(item.date, "DD MMM YYYY"),
-        link: true,
-        onClickLink: () => {
-          goTo(
-            `/app/view/incidents/${item.datastakeId}/identification${getSourceParam(
-              item?.sourceId
-            )}`
-          );
-        },
-        items: [
-          { label: t("nashiriki::Source"), value: item?.source || "--" },
-          item.severity
-            ? { label: t("Severity"), value: renderSeverity(item.severity) }
-            : null,
-        ].filter(Boolean),
-      };
-    },
-    [t, goTo, getSourceParam, renderSeverity]
-  );
 
   return (
     <Widget
@@ -135,7 +51,28 @@ export default function IncidentsTimeline({
           seriesField="severity"
           colors={severityColors}
           doConstraints={false}
-          renderTooltip={getTooltipContent}
+          renderTooltip={({ item }) => {
+            if (!item) return { title: "", items: [] };
+
+            return {
+              title: item.name || item.label || t("Undetermined"),
+              subTitle: renderDateFormatted(item.date, "DD MMM YYYY"),
+              link: true,
+              onClickLink: () => {
+                goTo(
+                  `/app/view/incidents/${item.datastakeId}/identification${getSourceParam(
+                    item?.sourceId
+                  )}`
+                );
+              },
+              items: [
+                { label: t("nashiriki::Source"), value: item?.source || "--" },
+                item.severity
+                  ? { label: t("Severity"), value: renderSeverity(item.severity) }
+                  : null,
+              ].filter(Boolean),
+            };
+          }}
         />
       </div>
     </Widget>