datastake-daf 0.6.764 → 0.6.766

package/src/@daf/pages/Summary/Activities/PlantingCycle/index.jsx

@@ -0,0 +1,47 @@
+import { useMemo } from 'react';
+import { DashboardLayout, Header, KeyIndicators, MineSiteMap, Widget } from '../../../../../../src/index.js'
+import { getKeyIndicatorsRowConfig } from './config';
+
+const PlantingCycleSummary = ({ activityData, supportText, onDownload, downloadDisabled, actionButtons, breadcrumbs, goBackTo, loading, t = () => { } }) => {
+    const keyIndicatorsConfig = useMemo(() => getKeyIndicatorsRowConfig({ t, data: {} }), [t]);
+
+    return (
+        <DashboardLayout
+            header={
+                <Header
+                    title={'Planting Cycle Summary'}
+                    supportText={supportText || ''}
+                    onDownload={onDownload}
+                    downloadDisabled={downloadDisabled}
+                    actionButtons={actionButtons}
+                    breadcrumbs={breadcrumbs}
+                    goBackTo={goBackTo}
+                    loading={loading}
+                />
+            }
+        >
+            <section>
+                <KeyIndicators title={t("Key Information")} config={keyIndicatorsConfig} loading={loading} />
+            </section>
+
+            <section>
+                <Widget
+                    title={t("Planting Locations")}
+                    className="no-px h-w-btn-header no-pt-body  no-p-body no-pb-body"
+                    style={{ height: '100%', display: 'flex', flexDirection: 'column' }}
+                >
+                    <MineSiteMap
+                        loading={loading}
+                        t={t}
+                        isSatellite
+                        data={[]}
+                    />
+                </Widget>
+
+            </section>
+        </DashboardLayout>
+    )
+}
+
+export default PlantingCycleSummary;
+

package/src/@daf/pages/Summary/Activities/Restoration/config.js

@@ -26,7 +26,7 @@ export const getKeyIndicatorsRowConfig = ({ t, data = {} }) => [
   },
   {
     label: t('Activity Participants'),
-    render: () => <div>{'0'}</div>
+    render: () => <div> {data?.totalNumberOfParticipantsArrival || '0'}</div>
   },
   {
     label: t('Hectares Planted'),

package/src/@daf/pages/Summary/Minesite/components/StakeholderMapping/config.js

@@ -12,10 +12,10 @@ export const IconNodesConfig = {
 		emptyName: "no-traders",
 	},
 	government: {
-		name: "Government",
+		name: "Governance",
 		icon: "KYC",
 		order: 3,
-		emptyName: "no-government",
+		emptyName: "no-governance",
 	},
 	other: {
 		name: "Other",

package/src/@daf/pages/Summary/Minesite/components/StakeholderMapping/helper.js

@@ -1,18 +1,18 @@
 import { IconNodesConfig } from './config.js';
 import { findOptions } from '../../../../../../helpers/StringHelper.js';
 
-export const getStakeholderMappingData = ({data, locationData, id, options, t, goTo, selectedPartners, mainSubject}) => {
+export const getStakeholderMappingData = ({data, locationData, id, options, t, goTo, selectedPartners, mainSubject, APP}) => {
     const _data = data;
     const mainSubjectData = _data?.[mainSubject];
 
     return {
-        id: mainSubjectData?.datastakeId || "",
-        name: mainSubjectData?.name || "",
+        id: mainSubjectData?.datastakeId || locationData?.datastakeId || "",
+        name: mainSubjectData?.name || locationData?.name || "",
         country: {
-            label: findOptions(mainSubjectData?.country, options?.countries) || "",
-            value: (mainSubjectData?.country || "").toLowerCase() || "",
+            label: findOptions((mainSubjectData?.country || locationData?.country), options?.countries) || "",
+            value: ((mainSubjectData?.country || locationData?.country) || "").toLowerCase() || "",
         },
-        onClick: () => goTo(`/app/view/production-sites/${mainSubjectData?.datastakeId}`),
+        onClick: () => goTo(`/app/view/${APP === 'nashiriki' ? 'scl' : 'production-sites'}/${mainSubjectData?.datastakeId || locationData?.datastakeId}`),
         totalSources: selectedPartners?.partners?.length || 0,
         backgroundColor: "#FFD6E7",
         iconColor: "#C41D7F",
@@ -43,7 +43,7 @@ export const getStakeholderMappingData = ({data, locationData, id, options, t, g
                         icon: "DashboardStakeholder",
                         onClick: () => {
                             if (child?.type === "operator") {
-                                goTo(`/app/summary/operators/${child.datastakeId}`);
+                                goTo(`/app/${APP === 'nashiriki' ? 'summary/operators' : 'operator-summary'}/${child.datastakeId}`);
                                 return;
                             }
 

package/src/@daf/pages/Summary/Minesite/components/StakeholderMapping/index.js

@@ -11,6 +11,7 @@ const StakeholderMapping = ({
     goTo = () => {},
     selectedPartners = {},
     locationData = {},
+    APP,
 }) => {
 
     const defaultFilter = useMemo(() => {
@@ -25,7 +26,7 @@ const StakeholderMapping = ({
 				coreSubject: "location",
 				filterBySources: false,
 				metrics: {
-					operator: ['operator', 'operator.clientLocation'],
+					operator: ['operator.locationClient'],
 					government: ['custom.stakeholderId', 'governance'],
 					trader: ['trade'],
 					other: ['civilSociety', 'international'],
@@ -37,7 +38,7 @@ const StakeholderMapping = ({
     const { data, loading } = useWidgetFetch({config: defaultFilter});
 
     const graphData = useMemo(() => {
-        return getStakeholderMappingData({data, locationData, id, options, t, goTo, selectedPartners, mainSubject: "mine"});
+        return getStakeholderMappingData({data, locationData, id, options, t, goTo, selectedPartners, mainSubject: "mine", APP});
     }, [data, locationData, id, options, t, goTo, selectedPartners]);
 
     return (

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

@@ -30,6 +30,7 @@ const MineSummary = ({
     goBack = () => {},
     onIdChange = () => {},
     breadcrumbs = [],
+    APP,
 }) => {
     const { 
         selectedItem, 
@@ -78,7 +79,7 @@ const MineSummary = ({
 							tooltip: t("Details"),
 							icon: "FileEdit",
 							onClick: () => {
-								goTo(getRedirectLink(`/app/view/production-sites/${params?.id ? params?.id : selectedItem}`));
+								goTo(getRedirectLink(`/app/view/${APP === 'nashiriki' ? 'scl' : 'production-sites'}/${params?.id ? params?.id : selectedItem}`));
 							},
 						},
 						{
@@ -142,6 +143,7 @@ const MineSummary = ({
                     t={t}
                     id={params?.id || selectedItem}
                     partners={partners}
+                    APP={APP}
                 />
             </section>
             <section>

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

@@ -11,7 +11,6 @@ const Governance = ({
     id,
     options = {},
     goTo = () => {},
-
 }) => {
     const defaultFetchConfig = useMemo(() => {
 		return {

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",