datastake-daf 0.6.847 → 0.6.848

package/src/@daf/{core/components/Screens → pages}/Users/columns.js

@@ -1,16 +1,21 @@
 import React from 'react';
 import { Modal, Tag, Typography, message ,Tooltip} from "antd";
 
-import { renderDateFormatted } from '../../../../../helpers/Forms.js';
-import MoreMenu from '../../../../core/components/Table/MoreMenu/index.jsx';
+import { renderDateFormatted } from '../../../helpers/Forms.js';
+import MoreMenu from '../../core/components/Table/MoreMenu/index.jsx';
 
-export const getColumns = ({t, goTo, user, 	removeUser = () => {},
-resendInvite = () => {},
-setUserToEdit = () => {},
-userRoles = [],
-company = {},
-canCreate = false,
-app}) => [
+export const getColumns = ({
+  t, 
+  goTo, 
+  user, 	
+  removeUser = () => {},
+  resendInvite = () => {},
+  setUserToEdit = () => {},
+  userRoles = [],
+  company = {},
+  canCreate = false,
+  APP
+}) => [
     // {
     //     dataIndex: 'datastakeId',
     //     title: t('ID'),
@@ -172,7 +177,7 @@ app}) => [
 								onClick: () => {
 									if (location.pathname.includes(`/${APP}`)) {
 										navigator.clipboard.writeText(
-											`${window.location.host}/${app}/r/${company.inviteToken}/${all.invitationToken}`,
+											`${window.location.host}/${APP}/r/${company.inviteToken}/${all.invitationToken}`,
 										);
 									} else {
 										navigator.clipboard.writeText(

package/src/@daf/{core/components/Screens → pages}/Users/create.jsx

@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react'
 import { getUserForm } from './config.js';
-import DynamicForm from '../../../../core/components/DynamicForm/index.jsx';
+import DynamicForm from '../../core/components/DynamicForm/index.jsx';
 
 const UsersCreate = ({
     onSubmitted = () => {}, 
@@ -54,6 +54,7 @@ const UsersCreate = ({
                             },
                         },
                     });
+                    onCancel()
                 }}
             />
         </div>

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

@@ -0,0 +1,128 @@
+import React, { useMemo, useState, useEffect } from 'react'
+import { Drawer } from 'antd'
+import { getColumns } from './columns.js';
+import { checkboxConfig, getFiltersConfig, filtersConfig, getFilterOptions } from './config.js';
+import UsersCreate from './create.jsx';
+import TablePage from '../TablePage/index.jsx';
+import { CREATE_DRAWER_WIDTH } from '../../../helpers/Forms.js';
+import DrawerHeader from '../../core/components/Header/DrawerHeader/index.jsx';
+
+const UsersTable = ({
+  t = () => {},
+  goTo = () => {},
+  user = {},
+  options = {},
+  getRedirectLink = () => {},
+  theme = {},
+  loading = false,
+  data = {},
+  isMobile,
+  APP,
+  location,
+  getData = () => {},
+  getApiBaseUrl = () => {},
+  getAppHeader = () => {},
+  onInviteUser = () => {},
+  onEditUser = () => {},
+  query = {},
+  ajaxForms = {},
+  changeAjaxForms = () => {},
+  ajaxOptions = {},
+  changeAjaxOptions = () => {},
+  extendingFilters = {},
+  userRoles = [],
+  breadCrumbs = []
+}) => {
+  const [selectOptions, setSelectOptions] = useState();
+  const params = new URLSearchParams(location?.search);
+  const [openCreateModal, setOpenCreateModal] = useState(params.has("create"));
+  const [userToEdit, setUserToEdit] = useState(null);
+
+  const columns = useMemo(() => getColumns({
+    t,
+    goTo,
+    user,
+    options,
+    getRedirectLink,
+    theme,
+    subject: 'user',
+    data,
+    setUserToEdit,
+    APP,
+  }), [t, goTo, user, options, getRedirectLink, theme, data]);
+
+  const selectFiltersConfig = useMemo(() => getFiltersConfig({ t }), [t]);
+
+  useEffect(() => {
+    setSelectOptions((prev) => ({
+      ...prev,
+      ...getFilterOptions(options, t),
+    }));
+  }, [options, t]);
+
+  const customCreate = ({ onDrawerClose }) => {
+    return (
+        <UsersCreate
+          t={t}
+          goTo={goTo}
+          user={user}
+          APP={APP}
+          getApiBaseUrl={getApiBaseUrl}
+          getAppHeader={getAppHeader}
+          onSubmitted={(payload) => {
+            if (userToEdit) {
+              onEditUser(payload);
+            } else {
+              onInviteUser(payload);
+            }
+            onDrawerClose()
+          }}
+          onCancel={() => {
+            onDrawerClose()
+          }}
+          query={query}
+          ajaxForms={ajaxForms}
+          changeAjaxForms={changeAjaxForms}
+          ajaxOptions={ajaxOptions}
+          changeAjaxOptions={changeAjaxOptions}
+          userRoles={userRoles}
+          userToEdit={userToEdit}
+        />
+    )
+  }
+
+  return (
+    <TablePage
+      t={t}
+      goTo={goTo}
+      user={user}
+      options={options}
+      getRedirectLink={getRedirectLink}
+      theme={theme}
+      loading={loading}
+      data={data}
+      isMobile={isMobile}
+      APP={APP}
+      location={location}
+      getData={getData}
+      getApiBaseUrl={getApiBaseUrl}
+      getAppHeader={getAppHeader}
+      extendingFilters={extendingFilters}
+      subject="users"
+      breadcrumbs={breadCrumbs}
+      headerInfo={{
+        title: "users",
+        createTitle: "New User"
+      }}
+      noTabs={true}
+      customCreate={customCreate}
+      customColumns={columns}
+      customCheckboxConfig={checkboxConfig}
+      customFiltersConfig={filtersConfig}
+      customSelectFiltersConfig={selectFiltersConfig}
+      externalOpenDrawer={!!userToEdit}
+    />
+  );
+};
+
+export default UsersTable;

package/src/@daf/pages/View/hooks/useCallToGetData.js

@@ -14,10 +14,14 @@ export const useCallToGetData = ({
     user,
     setLoading,
     APP,
+    selectedPartners,
   }) => {
     const isFirstRender = useRef(true);
   
     const callToGetData = (_doCall = false) => {
+        if (selectedPartners?.loading) {
+            return;
+        }
           const dKey = namespaceConfig?.dataKey;
           const nKey = `${APP}-${getNkey(namespace || "")}`;
           const doCall = _doCall
@@ -38,7 +42,7 @@ export const useCallToGetData = ({
               return;
           }
           callToGetData(true);
-      }, [source, version]);
+    }, [source, version, selectedPartners?.partners]);
   
     useEffect(() => {
           callToGetData(true);

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

@@ -16,6 +16,7 @@ import Records from '../../../@daf/core/components/ViewForm/components/Records/i
 import { Template } from '../Template/index.jsx'
 import {message} from 'antd'
 import { handleError } from '../../services/ErrorService.js'
+
 const View = ({
     push,
     getRedirectLink,
@@ -33,6 +34,7 @@ const View = ({
     APP,
     viewConfig,
     partners,
+    selectedPartners,
     setSelectedPartners,
     user,
     serviceMap,
@@ -196,7 +198,7 @@ const View = ({
 				...(namespaceConfig?.scope && { scope: namespaceConfig.scope }),
 				datastakeId: id ? id : 'user',
 				version,
-				source,
+				sources: source || selectedPartners?.partners,
 			})
 		}
 	}
@@ -212,7 +214,8 @@ const View = ({
 		version,
 		user,
 		setLoading,
-        APP
+        APP,
+        selectedPartners,
 	})
 
     const extraLinking = useMemo(() => {
@@ -249,7 +252,7 @@ const View = ({
         <>
             <div className={"daf-view-form"}>
                 <Header
-                    title={(namespace === 'kyc' ? "KYC" : data?.name) || ""}
+                    title={(namespace === 'kyc' ? `${user?.firstName} ${user?.lastName} - KYC` : data?.name) || ""}
                     breadcrumbs={breadcrumbs}
                     goBackTo={goBack}
                     actionButtons={actionButtons}

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

@@ -1,4 +1,4 @@
-import { useEffect } from "react";
+import { useEffect, useRef } from "react";
 import { useGetQueryParams } from "../hooks/useGetQueryParams";
 
 export const useFetchData = ({
@@ -7,8 +7,12 @@ export const useFetchData = ({
     activeTab,
     extendingFilters,
     subject,
+    refetchTrigger,
 }) => {
     const { paginationQuery, searchParams, otherParams, sortBy, sortDir, } = useGetQueryParams({location});
+    
+    const prevParamsRef = useRef();
+        
     useEffect(() => {
         const cleanSearchParams = Object.fromEntries(
             Object.entries(searchParams).filter(([_, value]) => value != null && value !== '')
@@ -20,15 +24,30 @@ export const useFetchData = ({
             return;
         }
 
-        getData({
+        const extendingSortKey = extendingFilters?.sortBy ? Object.keys(extendingFilters.sortBy)[0] : null;
+        const extendingSortDir = extendingFilters?.sortBy && extendingSortKey ? extendingFilters.sortBy[extendingSortKey] : null;
+
+        const currentParams = {
+            ...extendingFilters,
             pagination: paginationQuery,
             ...(Object.keys(otherParams).length > 0 && otherParams ),
             ...(Object.keys(cleanSearchParams).length > 0 && { search: cleanSearchParams }),
-            tab: activeTab,
+            ...(activeTab && { tab: activeTab }),
             sortBy: {
-                [sortBy || "updatedAt"]: sortDir ? (sortDir === "ascend" ? 1 : -1) : -1,
+                [sortBy || extendingSortKey || "updatedAt"]: sortDir ? (sortDir === "ascend" ? 1 : -1) : (extendingSortDir || -1),
             },
-            ...extendingFilters,
-        }, subject)
-    }, [location.search, activeTab, JSON.stringify(extendingFilters)]);
+        };
+
+        const currentParamsString = JSON.stringify(currentParams);
+        const paramsChanged = prevParamsRef.current !== currentParamsString;
+        const shouldFetch = paramsChanged || refetchTrigger;
+        
+        if (!shouldFetch) {
+            return;
+        }
+        
+        prevParamsRef.current = currentParamsString;
+        
+        getData(currentParams, subject);
+    }, [location.search, JSON.stringify(extendingFilters), activeTab, refetchTrigger]);
 }

package/src/@daf/services/EventsService.js

@@ -37,11 +37,11 @@ class EventsService extends BaseService {
 		});
 	}
 
-	getData(id, sourceId, source, version) {
+	getData(id, sourceId, sources, version) {
 		return this.apiGet({
 			isApp: true,
 			url: `/event/${id}`,
-			params: { authorId: sourceId, source, version },
+			params: { authorId: sourceId, sources, version },
 		});
 	}
 

package/src/@daf/services/MineSiteService.js

@@ -44,11 +44,11 @@ class MineSiteService extends BaseService {
 		});
 	}
 
-	getData(id, sourceId, source, version) {
+	getData(id, sourceId, sources, version) {
 		return this.apiGet({
 			url: `/location/${id}`,
 			isApp: true,
-			params: { authorId: sourceId,  source, version },
+			params: { authorId: sourceId,  sources, version },
 		});
 	}
 

package/src/@daf/services/OperatorService.js

@@ -45,11 +45,11 @@ 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, version },
+			params: { authorId: sourceId, sources, version },
 		});
 	}
 

package/src/@daf/services/PartnerService.js

@@ -2,11 +2,11 @@ import { BaseService } from "./BaseService.js";
 import { createLazyService } from "./helpers/LazyService.js";
 
 class PartnerService extends BaseService {
-	get(tab, filters) {
+	get(params) {
 		return this.apiGet({
 			url: "/partner",
 			isApp: true,
-			params: filters,
+			params,
 		});
 	}
 

package/src/@daf/services/SourceService.js

@@ -5,7 +5,7 @@ class SourceService extends BaseService {
   get(tab, filters) {
 		const { page, pageSize, search, searchParams, ...rest } = filters;
 		const params = {
-			filters: rest,
+			...rest,
 			pagination: {
 				skip: page,
 				take: pageSize,

package/src/@daf/services/WorkersService.js

@@ -18,11 +18,11 @@ class WorkersService extends BaseService {
 			params: { scope, language },
 		});
 	}
-	getData(id, sourceId, version, source) {
+	getData(id, sourceId, sources, version) {
 		return this.apiGet({
 			isApp: true,
 			url: `/stakeholder/${id}`,
-			params: { authorId: sourceId, version, source },
+			params: { authorId: sourceId, version, sources },
 		});
 	}
 

package/src/constants/locales/fr/translation.js

@@ -32,9 +32,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",
@@ -51,14 +53,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",
@@ -117,15 +120,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",
@@ -162,6 +165,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.",
@@ -415,7 +421,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",
@@ -2094,7 +2100,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",
@@ -2189,6 +2195,12 @@ const fr = {
 		"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"
+
 };
 
 export default fr;

package/src/constants/locales/sp/translation.js

@@ -1944,6 +1944,7 @@ const sp = {
     'subjects': "Temas",
     "key-indicators": "Indicadores Clave",
   },
+
 }
 
 export default sp;

package/src/index.js

@@ -214,4 +214,4 @@ export { INPUT_TYPES, ACTIVE_FORM_KEY, PLACEHOLDER, getDefaultActiveForm } from
 
 
 // Reset Password
-// export { default as ResetPassword } from "./@daf/pages/ResetPassword/index.jsx";
+export { default as ResetPassword } from "./@daf/pages/ResetPassword/index.jsx";

package/src/pages.js

@@ -14,7 +14,7 @@ export { default as PlantingCycleSummary } from './@daf/pages/Summary/Activities
 export { default as MonitoringCampaignSummary } from './@daf/pages/Summary/Activities/MonitoringCampaign/index.jsx';
 export { default as MineSummary } from './@daf/pages/Summary/Minesite/index.jsx';
 export { default as MonitoringActivitySummary } from './@daf/pages/Summary/Activities/Monitoring/index.jsx';
-export { default as UsersTable } from './@daf/core/components/Screens/Users/index.jsx';
+export { default as UsersTable } from './@daf/pages/Users/index.jsx';
 
 // View
 export { default as View } from './@daf/pages/View/index.jsx';