datastake-daf 0.6.847 → 0.6.849

package/dist/services/index.js

@@ -1453,7 +1453,7 @@ class SourceService extends BaseService {
       ...rest
     } = filters;
     const params = {
-      filters: rest,
+      ...rest,
       pagination: {
         skip: page,
         take: pageSize
@@ -1705,13 +1705,13 @@ class OperatorService extends BaseService {
       }
     });
   }
-  getData(id, sourceId, source, version) {
+  getData(id, sourceId, sources, version) {
     return this.apiGet({
       isApp: true,
       url: `/stakeholder/${id}`,
       params: {
         authorId: sourceId,
-        source,
+        sources,
         version
       }
     });
@@ -1765,11 +1765,11 @@ class OperatorService extends BaseService {
 var OperatorService$1 = createLazyService(OperatorService);
 
 class PartnerService extends BaseService {
-  get(tab, filters) {
+  get(params) {
     return this.apiGet({
       url: "/partner",
       isApp: true,
-      params: filters
+      params
     });
   }
   create(data) {
@@ -1878,13 +1878,13 @@ class EventsService extends BaseService {
       signal
     });
   }
-  getData(id, sourceId, source, version) {
+  getData(id, sourceId, sources, version) {
     return this.apiGet({
       isApp: true,
       url: `/event/${id}`,
       params: {
         authorId: sourceId,
-        source,
+        sources,
         version
       }
     });
@@ -1969,14 +1969,14 @@ class WorkersService extends BaseService {
       }
     });
   }
-  getData(id, sourceId, version, source) {
+  getData(id, sourceId, sources, version) {
     return this.apiGet({
       isApp: true,
       url: `/stakeholder/${id}`,
       params: {
         authorId: sourceId,
         version,
-        source
+        sources
       }
     });
   }
@@ -2077,13 +2077,13 @@ class MineSiteService extends BaseService {
       isApp: true
     });
   }
-  getData(id, sourceId, source, version) {
+  getData(id, sourceId, sources, version) {
     return this.apiGet({
       url: `/location/${id}`,
       isApp: true,
       params: {
         authorId: sourceId,
-        source,
+        sources,
         version
       }
     });

package/dist/utils/index.js

@@ -9256,9 +9256,11 @@ const fr = {
   "merge-subjects": "Fusionner les sujets",
   "FB00007": "Assurez-vous que cela a été correctement communiqué, car l’administrateur du compte détient des privilèges critiques de gestion des utilisateurs.",
   "add-new": "Ajouter un nouveau",
-  "All Data": "Toutes les données",
+  "All Data": "Toutes Données",
   "Site": "Site",
-  "Production Sites": "Sites de production",
+  "Self Assessment": "Auto-Evaluation",
+  "Operator Review": "Examen d’Opérateur",
+  "Production Sites": "Sites de Production",
   "Type of account": "Type de compte",
   "accounts": "Comptes",
   "users": "Utilisateurs",
@@ -9275,14 +9277,15 @@ const fr = {
   "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",
+  "Extraction Methods": "Méthodes d'Extraction",
   "Find Data": "Rechercher des données",
-  "Mine Review": "Évaluation de la mine",
+  "Mine Review": " Examen de Mine",
+  "Partner Update": "Update Partenaires",
   "Completion": "Achèvement",
-  "Information Completeness": "Complétude de l'information",
+  "Information Completeness": "Complétude de l'Information",
   "Consolidated": "Consolidé",
   "Datapoints": "Points de données",
-  "Own Data": "Données propres",
+  "Own Data": "Données Propres",
   "Create Worker": "Créer un travailleur",
   "Workers": "Travailleurs",
   "Census Update": "Mise à jour du recensement",
@@ -9341,15 +9344,15 @@ const fr = {
   "Stakeholders Data": "Données des parties prenantes",
   "Events Data": "Données d'événements",
   "Accumulation": "Accumulation",
-  "Create Mine Site": "Créer un site minier",
+  "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",
+  "Key Information": "Informations Clés",
   "Weekly": "Hebdomadaire",
   "Monthly": "Mensuel",
   "Daily": "Quotidien",
-  "Workforce": "Main-d'œuvre",
+  "Workforce": "Main d’Œuvre ",
   "Trade Actors": "Acteurs commerciaux",
   "Mining Sites": "Sites miniers",
   "Primary Data Collection": "Collecte de données primaires",
@@ -9386,6 +9389,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.",
@@ -9597,7 +9603,7 @@ const fr = {
   "New to Datastake": "Nouveau sur Datastake",
   "Sign Up": "S'inscrire",
   "CADD Dashboard": "Tableau de bord CADD",
-  "Dashboard Title": "Tableau de bord",
+  "Dashboard Title": "Tableau de Bord",
   View: "Vue",
   "KYC Status": "Statut KYC",
   Create: "Créer",
@@ -11065,7 +11071,7 @@ const fr = {
   "Embassy of Norway": "Ambassade de Norvège",
   Analytics: "Indicateurs",
   Dismiss: "Ignorer",
-  "Due Dilligence": "Diligence raisonnable",
+  "Due Dilligence": "Diligence Raisonnable",
   "Assess Mine Site": "Évaluer Site Minier",
   "Assess Supply Chain Actor": "Évaluer Acteur de la Chaine d’Approvisionnement",
   "Report an Incident": "Rapporter un Incident",
@@ -11157,7 +11163,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.847",
+	"version": "0.6.849",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

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/core/components/Screens/TableScreen/StandardTablePage/index.jsx

@@ -0,0 +1,108 @@
+import React, { useState, useEffect, useRef } from 'react'
+import { Drawer } from 'antd'
+import Header from '../../../Header/index.jsx'
+import BaseScreen from '../../BaseScreen/index.jsx'
+import { CREATE_DRAWER_WIDTH } from '../../../../../../helpers/Forms.js'
+import DrawerHeader from '../../../Header/DrawerHeader/index.jsx'
+
+const StandardTablePage = ({
+    t= () => {},
+    title,
+    breadCrumbs,
+    location,
+    loading = false,
+    goTo = () => {},
+    checkboxConfig = {},
+    columns = [],
+    data = {},
+    APP,
+    getApiBaseUrl = () => {},
+    selectOptions = {},
+    selectFiltersConfig = {},
+    getRedirectLink = () => {},
+    filtersConfig = {},
+    isMobile,
+    view,
+    onDownload,
+    downloadDisabled = false,
+    drawerTitle = "",
+    onCreateModalClose = () => {},
+    headerTooltip,
+    drawerTooltip,
+    externalOpenDrawer = false,
+    children
+}) => {
+    const params = new URLSearchParams(location?.search);
+    const [openCreateModal, setOpenCreateModal] = useState(params.has("create"));
+
+    useEffect(() => {
+        if (externalOpenDrawer) {
+            setOpenCreateModal(true);
+        }
+    }, [externalOpenDrawer]);
+
+    console.log({openCreateModal, externalOpenDrawer})
+
+    return (
+        <div className="semibold form-input-output daf-create-view">
+        <Header 
+            title={t(title)}
+            breadcrumbs={breadCrumbs}
+            actionButtons={[
+                {
+                    type: "primary",
+                    onClick: () => setOpenCreateModal(true),
+                    tooltip: t("New"),
+                    icon: "Add",
+                },
+            ]}
+            onDownload={(onDownload && typeof onDownload === 'function') ? onDownload : undefined}
+            downloadDisabled={downloadDisabled}
+            tooltip={headerTooltip}
+        />
+        <BaseScreen 
+            t={t}
+            checkboxConfig={checkboxConfig}
+            defaultTableFilters={{}}
+            columns={columns}
+            data={Array.isArray(data?.data) ? data : data?.data}
+            loading={loading}
+            location={location}
+            goTo={goTo}
+            APP={APP}
+            getApiBaseUrl={getApiBaseUrl}
+            selectOptions={selectOptions}
+            selectFilters={selectFiltersConfig}
+            view={view}
+            getRedirectLink={getRedirectLink}
+            defaultUrlParams={{}}
+            module={APP}
+            filtersConfig={filtersConfig}
+            isMobile={isMobile}
+        />
+        {openCreateModal && (
+            <Drawer
+                destroyOnHidden
+                title={
+                    <DrawerHeader 
+                        title={t(drawerTitle)}
+                    />
+                }
+                tooltip={drawerTooltip}
+                open={openCreateModal}
+                onClose={() => setOpenCreateModal(false)}
+                width={CREATE_DRAWER_WIDTH}
+                bodyStyle={{ padding: 0 }}
+            >
+            {typeof children === 'function' 
+                ? children({ onDrawerClose: () => setOpenCreateModal(false), open: openCreateModal })
+                : children
+            }
+            </Drawer>
+        )}
+
+    </div>
+    )
+}
+
+export default StandardTablePage

package/src/@daf/core/components/Screens/TableScreen/TablePageWithTabs/index.jsx

@@ -32,6 +32,7 @@ const TablePageWithTabs = ({
     tabs = [],
     headerTooltip,
     drawerTooltip,
+    externalOpenDrawer = false,
     children
 }) => {
     const params = new URLSearchParams(location?.search);
@@ -47,7 +48,13 @@ const TablePageWithTabs = ({
         getActiveTabRef.current(activeTab);
     }, [activeTab]);
 
-    return (
+    useEffect(() => {
+        if (externalOpenDrawer) {
+            setOpenCreateModal(true);
+        }
+    }, [externalOpenDrawer]);
+
+        return (
         <div className="semibold form-input-output daf-create-view">
             <Header 
                 title={t(title)}
@@ -90,7 +97,7 @@ const TablePageWithTabs = ({
                 checkboxConfig={checkboxConfig}
                 defaultTableFilters={{}}
                 columns={columns}
-                data={data?.data}
+                data={Array.isArray(data?.data) ? data : data?.data}
                 loading={loading}
                 location={location}
                 goTo={goTo}

package/src/@daf/core/components/TableScreen/TablePageWithTabs/index.jsx

@@ -29,10 +29,13 @@ const TablePageWithTabs = ({
     downloadDisabled = false,
     drawerTitle = "",
     onCreateModalClose = () => {},
+    noTabs = false,
     children
 }) => {
     const params = new URLSearchParams(location?.search);
-    const [activeTab, setActiveTab] = useState(params.get("tab") || defaultActiveTab);
+    const [activeTab, setActiveTab] = useState(
+        noTabs ? null : (params.get("tab") || defaultActiveTab)
+    );
     const [openCreateModal, setOpenCreateModal] = useState(params.has("create"));
 
     const getActiveTabRef = useRef(getActiveTab);
@@ -44,6 +47,12 @@ const TablePageWithTabs = ({
         getActiveTabRef.current(activeTab);
     }, [activeTab]);
 
+    useEffect(() => {
+        if (!noTabs) {
+            getActiveTabRef.current(activeTab);
+        }
+    }, [activeTab, noTabs]);
+
     return (
         <div className="semibold form-input-output daf-create-view">
             <Header 
@@ -60,7 +69,8 @@ const TablePageWithTabs = ({
                 onDownload={onDownload}
                 downloadDisabled={downloadDisabled}
             />
-            <Tabs
+            {!noTabs && (
+                <Tabs
                 items={[
                     { label: t("All Data"), key: "all" },
                     { label: t("Own Data"), key: "own" },
@@ -80,7 +90,7 @@ const TablePageWithTabs = ({
                     goTo(`${location.pathname}?${newParams.toString()}`);
                 }}
                 className="view-page-tabs mt-3"
-            />
+            />)}
             <BaseScreen 
                 t={t}
                 checkboxConfig={checkboxConfig}

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/pages/Dashboards/ConflictManagement/components/RisksWidget/components/IncidentsTime/config.js

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