datastake-daf 0.6.846 → 0.6.848

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",
@@ -9600,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",
@@ -11068,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",

package/package.json

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

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/useWidgetFetch.js

@@ -2,6 +2,7 @@ import { useState, useEffect, useRef } from "react";
 import DashboardService from "../services/DashboardService.js";
 import { isErrorResponse, getErrorMessage } from "../../helpers/errorHandling.js";
 import { message } from "antd";
+
 // config: {
 //     stop: boolean,
 //     defaultData: object,
@@ -9,37 +10,42 @@ import { message } from "antd";
 //     url: string
 //     basePath: string,
 // }
-export const useWidgetFetch = ({config, getData = DashboardService.getWidget, onFetch = () => {}}) => {
-    const { stop, defaultData, ...rest} = config;
-    const [ data, setData ] = useState(defaultData || {});
-    const [ loading, setLoading ] = useState(false);
-	
-    const fetchData = async () => {
-        setLoading(true);
-        try {
-            const { data } = await getData(rest);
-            setData(data);
-            if (isErrorResponse(data)) {
-                const errorMessage = getErrorMessage(data);
-                message.error(errorMessage);
-                return;
-            }
-            onFetch();
-        } catch (err) {
-            console.log(err);
-        }finally {
-            setLoading(false);
-        }
-    };
-    useEffect(() => {
-        if(!stop) {
-            console.log('fetching data');
-			fetchData();
-		}
-    }, [JSON.stringify(config), stop]);
-    return {
-        data,
-        loading,
-        setData,
-    }
-}
+
+export const useWidgetFetch = ({ config, getData = DashboardService.getWidget, onFetch = () => { } }) => {
+   const { stop, defaultData, ...rest } = config;
+   const [data, setData] = useState(defaultData || {});
+   const [loading, setLoading] = useState(false);
+
+   const fetchData = async () => {
+
+       setLoading(true);
+
+       try {
+           const { data } = await getData(rest);
+           setData(data || defaultData);
+           if (isErrorResponse(data)) {
+               const errorMessage = getErrorMessage(data);
+               message.error(errorMessage);
+               return;
+           }
+           onFetch();
+       } catch (err) {
+           console.log(err);
+       }
+
+       setLoading(false);
+   };
+
+
+   useEffect(() => {
+       if (!stop) {
+           fetchData();
+       }
+   }, [JSON.stringify(config), stop]);
+
+   return {
+       data,
+       loading,
+       setData,
+   }
+}

package/src/@daf/pages/Edit/index.jsx

@@ -33,6 +33,7 @@ const Edit = ({
     params,
     clear,
     getRedirectLink,
+	selectedPartners,
     pathname,
     search,
     viewConfig,
@@ -153,6 +154,7 @@ const Edit = ({
 				view: namespaceConfig?.view,
 				...(namespaceConfig?.scope && { scope: namespaceConfig.scope }),
 				datastakeId: id ? id : 'user',
+				sources: selectedPartners?.partners,
 			})
 		}
 	}
@@ -169,6 +171,7 @@ const Edit = ({
 		user,
 		setLoading,
 		APP,
+		selectedPartners,
 	})
 
     const callback = (type, m) => {

package/src/@daf/pages/Partners/columns.js

@@ -17,6 +17,7 @@ export const getColumns = ({
 	activeTab,
 	setOpen,
 	block,
+	options,
 }) => [
 	{
 		title: t("ID"),
@@ -27,7 +28,6 @@ export const getColumns = ({
 			if (all.empty) {
 				return <div className="daf-default-cell" />;
 			}
-			// THE FALLBACK WAS DEPENDS BEFORE
 			return v || "-";
 		},
 	},
@@ -116,7 +116,7 @@ export const getColumns = ({
 			if (all.empty) {
 				return <div className="daf-default-cell" />;
 			}
-			return v ? findOptions(v, selectOptions?.category || []) : "-";
+			return v ? findOptions(v, options?.categoriesOptions || []) : "-";
 		},
 	},
 	{

package/src/@daf/pages/Partners/config.js

@@ -15,6 +15,28 @@ export const selectFiltersConfig = {
 	},
 };
 
+export const getSelectFiltersConfig = ({t}) => {
+	return {
+		category: {
+			type: "select",
+			label: "Category",
+			placeholder: (t) => `${t("Filter by")} ${t("Category").toLowerCase()}`,
+			style: { flex: 1 },
+			labelStyle: { flex: 1 },
+			getLabel: (option) => option.label,
+			getValue: (option) => option.value,
+		},
+	}
+}
+
+export const getFilterOptions = (options, t) => {
+	const { countries, category, categoriesOptions } = options || {};
+	return {
+		country: countries || [],
+		category: categoriesOptions || category || [],
+	}
+}
+
 export const checkboxConfig = {
 	name: "Name",
 	datastakeId: "ID",

package/src/@daf/pages/Partners/hook.js

@@ -3,8 +3,6 @@ import PartnerService from "../../services/PartnerService.js";
 import { message } from "antd";
 
 export const usePartnersActions = ({
-    activeTab,
-    filters,
     setTotalRequests,
     t = () => {},
 }) => {
@@ -13,14 +11,14 @@ export const usePartnersActions = ({
     const [requestDataFetch, setRequestDataFetch] = useState(false);
     const [initFetchDone, setInitFetchDone] = useState(false);
 
-	const fetchData = useCallback(async () => {
+	const fetchData = useCallback(async (params) => {
 		setLoading(true);
 		setData([]);
 	
 		try {
-			const { data } = await PartnerService.get(activeTab, {
-				...filters,
-				type: activeTab,
+			const { data } = await PartnerService.get({
+				...params,
+				type: params?.tab,
 			});
 			setData(data);
 			setTotalRequests(data?.meta?.total || 0);
@@ -33,7 +31,7 @@ export const usePartnersActions = ({
 		if (!initFetchDone) {
 			setInitFetchDone(true);
 		}
-	}, [activeTab, filters, initFetchDone, setLoading, setTotalRequests, setData, setInitFetchDone]);
+	}, [initFetchDone, setLoading, setTotalRequests, setData, setInitFetchDone]);
 
 	const accept = useCallback(
 		async (id) => {
@@ -106,14 +104,13 @@ export const usePartnersActions = ({
 
 			try {
 				await PartnerService.resendInvite(id);
-				await fetchData();
 			} catch (err) {
 				console.log(err);
 			}
 
 			setLoading(false);
 		},
-		[fetchData, setLoading],
+		[setLoading],
 	);
 
 	const block = useCallback(
@@ -122,14 +119,13 @@ export const usePartnersActions = ({
 
 			try {
 				await PartnerService.block(id);
-				await fetchData();
 			} catch (err) {
 				console.log(err);
 			}
 
 			setLoading(false);
 		},
-		[fetchData, setLoading],
+		[setLoading],
 	);
 
     return {