datastake-daf 0.6.765 → 0.6.766

package/src/@daf/pages/Summary/Operator/components/KeyInformation/config.js

@@ -2,6 +2,13 @@ import React from "react";
 import { Tag, Tooltip } from "antd";
 import CountryFlag from "../../../../../core/components/UI/CountryFlag/index.jsx";
 import {findOptions, truncateString } from "../../../../../../helpers/StringHelper.js";
+import MoreTags from "../../../../../core/components/Table/MoreTags/index.jsx";
+
+const getAllProducts = (arr) => {
+	return arr.flatMap(item =>
+		(item.products || []).map(product => product.typeOfProduct)
+	);
+}
 
 export const getKeyIndicatorConfig = ({ t, data = {}, options = {} }) => [
 	{
@@ -28,14 +35,14 @@ export const getKeyIndicatorConfig = ({ t, data = {}, options = {} }) => [
 	{
 		label: t("Supply Chain Position"),
 		render: () => {
-            const position = findOptions(data?.positionSupplyChain, options?.positionSupplyChainOptions);
+            const position = findOptions(data?.positionSupplyChain, options?.positionSupplyChainOptions || options?.optionPositionSupplyChain);
 			return <div>{position|| "-"}</div>;
 		},
 	},
 	{
 		label: t("Legal Form"),
 		render: () => {
-            const subCategory = findOptions(data?.subCategory, options?.subCategoriesOptions);
+            const subCategory = findOptions(data?.subCategory, options?.subCategoriesOptions || options?.subCategory);
 			if(subCategory?.length > 22) {
 				const _subCategory = truncateString(subCategory, 22);
 				return <Tooltip title={subCategory}>
@@ -48,43 +55,48 @@ export const getKeyIndicatorConfig = ({ t, data = {}, options = {} }) => [
 	{
 		label: t("Products"),
 		render: () => {
-			if ((data?.products || []).length === 0) {
-				return "-";
-			}
+			
+			const clientProducts = getAllProducts(data?.clients || []);
+			const supplierProducts = getAllProducts(data?.suppliers || []);
+			const locationProducts = getAllProducts(data?.locationSuppliers || []);
+
+			const allProducts = [...clientProducts, ...supplierProducts, ...locationProducts];
+			const uniqueProducts = [...new Set(allProducts)];
+			const products = findOptions(uniqueProducts, options?.mineralOptions || options?.minerals);
+
 
 			return (
-				<div style={{ display: "flex", flexWrap: "wrap" }}>
-					{data?.products?.map((product) => {
-						return (
-							<Tag
-								color="processing"
-								style={{ color: "#1677FF", marginBottom: 8 }}
-								key={product}
-							>
-								{t(product)}
-							</Tag>
-						);
-					})}
-				</div>
+				<>
+					{products.length > 0 ? (
+						<div style={{ display: "flex", flexWrap: "wrap" }}>
+							<MoreTags 
+								values={products} 
+								limit={3} 
+								tagColor="processing" 
+								style={{ fontWeight: "normal", fontSize: 14 }} 
+							/>
+						</div>
+					) : "-"}
+				</>
 			);
 		},
 	},
 	{
 		label: t("Associated Mine Sites"),
 		render: () => {
-			return <div>{data?.associatedMineSites || 0}</div>;
+			return <div>{data?.locationSuppliers?.length || 0}</div>;
 		},
 	},
 	{
 		label: t("Identified Suppliers"),
 		render: () => {
-			return <div>{data?.identifiedSuppliers || 0}</div>;
+			return <div>{data?.suppliers?.length || 0}</div>;
 		},
 	},
 	{
 		label: t("Identified Customers"),
 		render: () => {
-			return <div>{data?.identifiedCustomers || 0}</div>;
+			return <div>{data?.clients?.length || 0}</div>;
 		},
 	},
 ];

package/src/@daf/pages/Summary/Operator/components/TradeRelationships/helper.js

@@ -1,7 +1,7 @@
 import { leftIcons, leftBackgroundColorLocation, leftBackgroundColorStakeholder, topIcons } from './config.js';
 import { findOptions } from '../../../../../../helpers/StringHelper.js';
 
-export const getFilterConfig = ({operatorData = {}, options = {}, filters = {}, t = () => {}}) => {
+export const getFilterConfig = ({operatorData = {}, options = {}, filters = {}, t = () => {}, APP}) => {
     const productSet = new Set();
     const allTradeMineralOptions = [
         ...(operatorData?.suppliers || []),
@@ -15,7 +15,7 @@ export const getFilterConfig = ({operatorData = {}, options = {}, filters = {},
             .map((product) => {
                 productSet.add(product.typeOfProduct);
 
-                const label = options?.minerals?.find(
+                const label = options?.[APP !== 'nashiriki' ? 'mineralOptions' : 'minerals']?.find(
                     (mineral) => mineral.value === product.typeOfProduct,
                 )?.label;
 
@@ -61,15 +61,15 @@ export const getLeft = (data = {}, mapChildren = () => {}, supplierLocations = [
         .filter((d) => !!d);
 }
 
-export const mapItem = (data, options, goTo, getRedirectLink) => {
-    const { positionSupplyChainOptions, locationCategories } = options || {};
+export const mapItem = (data, options, goTo, getRedirectLink, operatorData = {}, APP) => {
+    const { positionSupplyChainOptions, locationCategories, optionPositionSupplyChain } = options || {};
     return {
-        id: data.datastakeId || "-",
-        datastakeId: data.datastakeId || "-",
+        id: data.datastakeId || operatorData?.id || "-",
+        datastakeId: data.datastakeId || operatorData?.datastakeId || "-",
         leftIcon: leftIcons[data.type === "mineSite" ? "location" : "stakeholder"],
-        name: data.name || "-",
-        subTitle: findOptions(data.type, [
-            ...(positionSupplyChainOptions || []),
+        name: data.name || operatorData?.name || "-",
+        subTitle: findOptions(data.type  || operatorData?.positionSupplyChain, [
+            ...(positionSupplyChainOptions || optionPositionSupplyChain || []),
             ...(locationCategories || []),
         ]),
         leftBackground:
@@ -78,19 +78,19 @@ export const mapItem = (data, options, goTo, getRedirectLink) => {
                 : leftBackgroundColorStakeholder,
         topIcon: topIcons[data.type],
         country: {
-            label: findOptions(data.country, options?.countries || []),
-            value: data.country,
+            label: findOptions((data.country || operatorData?.country), options?.countries || []),
+            value: data.country || operatorData?.country,
         },
         totalSources: data.sources ?? 0,
         volume: data?.volume || "",
         onClick: function () {
             if (data.type === "mineSite") {
                 return goTo(
-                    getRedirectLink(`/app/summary/scl/${data.datastakeId}`),
+                    getRedirectLink(`/app/${APP === 'nashiriki' ? 'summary/scl' : 'mine-summary'}/${data.datastakeId}`),
                 );
             }
             return goTo(
-                getRedirectLink(`/app/summary/operators/${data.datastakeId}`),
+                getRedirectLink(`/app/${APP === 'nashiriki' ? 'summary/operators' : 'operator-summary'}/${data.datastakeId}`),
             );
         },
     }

package/src/@daf/pages/Summary/Operator/components/TradeRelationships/hook.js

@@ -12,6 +12,8 @@ export const useTradeRelationship = ({
     goTo,
     getRedirectLink,
     filters,
+    operatorData,
+    APP,
 }) => {
     const { positionSupplyChainOptions, locationCategories } = options || {};
     const [graphData, setGraphData] = useState({});
@@ -20,21 +22,21 @@ export const useTradeRelationship = ({
 
     const config = useMemo(() => ({
         basepath: "analytics",
-        url: "/widgets/trade-connection-map",
+        url: `/widgets/trade-relationship-map`,
         filters: {
+			datastakeId: id,
             product: filters?.products,
             sources: selectedPartners?.partners || [],
         },
-    }), [id, filters?.products, selectedPartners?.partners]);
+		stop: !selectedPartners?.partners?.length || selectedPartners?.loading,
+    }), [id, filters?.products, selectedPartners?.partners, selectedPartners?.loading]);
     
     const { data } = useWidgetFetch({config: config});
 
     const mapItem = (data) => {
-        return _mapItem(data, options, goTo, getRedirectLink);
+        return _mapItem(data, options, goTo, getRedirectLink, operatorData, APP);
     }
 
-
-
     useEffect(() => {
 		if (id && selectedPartners?.partners?.length > 0 && fetchedProducts) {
 			const _fetch = async () => {
@@ -133,8 +135,6 @@ export const useTradeRelationship = ({
 						left: getLeft(data, mapChildren, supplierLocations),
 					};
 
-					console.log({graphData})
-
 					setGraphData(graphData);
 				} catch (err) {
 					setGraphData({});
@@ -146,7 +146,7 @@ export const useTradeRelationship = ({
 
 			_fetch();
 		}
-	}, [filters?.products, id, selectedPartners, fetchedProducts]);
+	}, [filters?.products, id, selectedPartners, fetchedProducts, operatorData, options, goTo, getRedirectLink, data]);
 
     return {
         graphData,

package/src/@daf/pages/Summary/Operator/components/TradeRelationships/index.js

@@ -12,6 +12,7 @@ const TradeRelationships = ({
     id,
     options = {},
     getRedirectLink = () => {},
+	APP,
 }) => {
     const [filters, setFilters] = useState({});
 
@@ -20,8 +21,8 @@ const TradeRelationships = ({
 	};
 
     const filterConfig = useMemo(() => {
-        return getFilterConfig({operatorData, options, filters, t});
-	}, [filters.products, t, options?.minerals, operatorData]);
+        return getFilterConfig({operatorData, options, filters, t, APP});
+	}, [filters.products, t, options?.mineralOptions, operatorData, options?.mineral, APP]);
 
     const { graphData, loading, fetchedProducts, setFetchedProducts } = useTradeRelationship({
         id,
@@ -30,6 +31,8 @@ const TradeRelationships = ({
         goTo,
         getRedirectLink,
         filters,
+		operatorData,
+		APP
     });
 
     useEffect(() => {

package/src/@daf/pages/Summary/Operator/index.jsx

@@ -31,6 +31,7 @@ const OperatorSummary = ({
     goBack = () => {},
     onIdChange = () => {},
     breadcrumbs = [],
+    APP,
 }) => {
     const { 
         selectedItem, 
@@ -143,6 +144,7 @@ const OperatorSummary = ({
                     id={params?.id || selectedItem}
                     subject="stakeholder"
                     partners={partners}
+                    APP={APP}
                 />
             </section>
             <section>
@@ -154,6 +156,7 @@ const OperatorSummary = ({
                     goTo={goTo}
                     getRedirectLink={getRedirectLink}
                     operatorData={singleItemData}
+                    APP={APP}
                 />
             </section>
             <section>

package/src/@daf/pages/Summary/components/InformationAvailability/index.js

@@ -9,7 +9,8 @@ const InformationAvailability = ({
     t = () => {},
     id,
     subject,
-    partners
+    partners,
+    APP
 }) => {
     const defaultFetchConfig = useMemo(
 		() => ({
@@ -19,11 +20,11 @@ const InformationAvailability = ({
 			stop: !id || selectedPartners?.loading,
 			filters: {
 				// datastakeId: id,
-                scope: subject === "stakeholder" ? "operatorInfo" : "locationInfo",
+                scope: subject === "stakeholder" ? (APP === "nashiriki" ? "operator" : "operatorInfo") : (APP === "nashiriki" ? "nashiriki" : "locationInfo"),
 				sources: selectedPartners?.partners || [],
 			},
 		}),
-		[id, selectedPartners],
+		[id, selectedPartners, APP],
 	);
 
     const { data, loading } = useWidgetFetch({config: defaultFetchConfig});

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

@@ -67,6 +67,20 @@ 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,
+        })
+    }
 }
 
 export default createLazyService(AdminService);

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

@@ -1,13 +1,115 @@
 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",

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

@@ -1,11 +1,114 @@
 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",