datastake-daf 0.6.750 → 0.6.751

package/dist/utils/index.js

@@ -7677,6 +7677,14 @@ function getRedirectPath(user, fallback = '', app, isDatastake) {
 }
 
 const en = {
+  "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-other": "No other identified",
   "No planning required": "No planning required",
   "No evaluation required": "No evaluation required",
   "No improvement required": "No improvement required",
@@ -8880,6 +8888,14 @@ const en = {
 };
 
 const fr = {
+  "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-other": "Aucun autre identifié",
   "No planning required": "Pas de planification requise",
   "No evaluation required": "Pas d'évaluation requise",
   "No improvement required": "Pas d'amélioration requise",
@@ -10716,6 +10732,14 @@ const fr = {
 };
 
 const sp = {
+  "no-board-members": "No hay miembros del consejo identificados",
+  "no-management": "No hay gerencia identificados",
+  "no-beneficiaries": "No hay beneficiarios identificados",
+  "no-stakeholders": "No hay partes interesadas identificadas",
+  "no-operators": "No hay operadores identificados",
+  "no-traders": "No hay comerciantes identificados",
+  "no-government": "No hay gobierno identificado",
+  "no-other": "No hay otros identificados",
   "No planning required": "No se requiere planeación",
   "No evaluation required": "No se requiere evaluación",
   "No improvement required": "No se requiere mejora",

package/package.json

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

package/src/@daf/pages/Dashboards/SupplyChain/components/ChartsContainer/components/GenderDistribution/index.js

@@ -50,7 +50,7 @@ function GenderDistribution({
 					items: [
 						{
 							label:
-								options?.optionPositionSupplyChain.find((o) => {
+								options?.optionPositionSupplyChain?.find((o) => {
 									return o.value === item.key;
 								}).label || item.key,
 							value: data[item.key] || 0,
@@ -68,7 +68,7 @@ function GenderDistribution({
 					});
 				}
 
-				const _config = config.find((c) => c.key === item.key);
+				const _config = config?.find((c) => c.key === item.key);
 
 				if (_config) {
 					return renderTooltipJsx({

package/src/@daf/pages/Dashboards/SupplyChain/components/ChartsContainer/components/Identification/hook.js

@@ -60,7 +60,7 @@ export function useIdentification({ data, theme = {}, options = {} }) {
 						title: "Products",
 						items: values.map((val) => ({
 							label:
-								options.minerals.find(
+								options?.minerals?.find(
 									(mineral) => mineral.value === val.typeOfProduct,
 								)?.label || val.typeOfProduct,
 							color: colors[

package/src/@daf/pages/Dashboards/SupplyChain/components/SupplyChainMap/index.js

@@ -52,7 +52,12 @@ function SupplyChainMap({selectedSources = {}, t = () => {}, goTo = () => {}, op
 				}}
 				link
 				onClickLink={(data) => {
-					goTo(getRedirectLink(`/app/view/stakeholders/${data.datastakeId}`));
+					const locationTypes = ['mineSite', 'village'];
+					if (locationTypes.includes(data.type)) {
+						goTo(getRedirectLink(`/app/view/locations/${data.datastakeId}`));
+					} else {
+						goTo(getRedirectLink(`/app/view/stakeholders/${data.datastakeId}`));
+					}
 				}}
 			/>
         </Widget>

package/src/@daf/pages/Dashboards/UserDashboard/components/MineSites/helper.js

@@ -108,7 +108,7 @@ export 	const onClickLink = (data, getRedirectLink, activeTab, goTo, user) => {
     if (activeTab === "stakeholder") {
         switch (data.stakeholderType) {
             case "operator":
-                return goTo(getLink(`/app/summary/operators/${data?.datastakeId}`));
+                return goTo(getLink(`/app/operator-summary/${data?.datastakeId}`));
             case "worker":
                 return goTo(getLink(`/app/view/workers/${data?.datastakeId}`));
             default:
@@ -119,7 +119,7 @@ export 	const onClickLink = (data, getRedirectLink, activeTab, goTo, user) => {
     if (activeTab === "event") {
         switch (data.category) {
             case "mineSite":
-                return goTo(getLink(`/app/summary/scl/${data?.datastakeId}`));
+                return goTo(getLink(`/app/mine-summary/${data?.datastakeId}`));
             default:
                 return goTo(getLink(`/app/view/locations/${data?.datastakeId}`));
         }
@@ -129,7 +129,7 @@ export 	const onClickLink = (data, getRedirectLink, activeTab, goTo, user) => {
         case "mineSite": {
             const isOwnData = user?.company?.id === data?.authorId;
             return goTo(
-                `/app/summary/scl/${data?.datastakeId}${
+                `/app/mine-summary/${data?.datastakeId}${
                     !isOwnData ? `?sourceId=${data?.authorId}` : ""
                 }`,
             );

package/src/@daf/pages/Locations/MineSite/index.jsx

@@ -99,7 +99,7 @@ const ProductionSitesTable = ({
            goTo={goTo}
            defaultActiveTab={"own"}
            columns={columns}
-           data={data}
+           data={data?.data}
            checkboxConfig={checkboxConfig}
            APP={APP}
            getApiBaseUrl={getApiBaseUrl}

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

@@ -0,0 +1,51 @@
+import React, { useMemo } from 'react'
+import MineSiteDetails from '../MineSiteDetails/index.js'
+import LocationMap from '../LocationMap/index.js'
+import { useWidgetFetch } from '../../../../../hooks/useWidgetFetch.js';
+
+const MineDetailsSection = ({
+    locationData = {},
+    loading = false,
+    t = () => {},
+    options = {},
+    selectedPartners = {},
+    params = {},
+}) => {
+    const defaultFetchConfig = useMemo(
+        () => ({
+            basepath: "analytics",
+            url: '/widgets/mine-site-details',
+            defaultData: [],
+            stop: selectedPartners?.loading,
+            filters: {
+                datastakeId: locationData?.datastakeId,
+                sources: selectedPartners?.partners || [],
+                metrics: ['extractionMethod', 'products', 'totalNumberOfWorkers', 'gps', 'administrativeLevel1', 'administrativeLevel2'],
+                filterBySources: false,
+            },
+        }),
+        [selectedPartners, locationData],
+    );
+
+    const { data, loading: loadingData } = useWidgetFetch({config: defaultFetchConfig});
+
+    return (
+        <section>
+            <MineSiteDetails
+                locationData={data}
+                loading={loading || loadingData}
+                t={t}
+                options={options}
+            />
+            <LocationMap
+                selectedPartners={selectedPartners}
+                t={t}
+                params={params}
+                locationData={data}
+                loading={loading || loadingData}
+            />
+        </section>
+    )
+}
+
+export default MineDetailsSection

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

@@ -1,5 +1,5 @@
 import React from "react";
-import { Tag } from "antd";
+import { Tag, Tooltip } from "antd";
 import { getTagColor } from "../../../../../utils/productTag.js";
 
 export function getKeyIndicatorsConfig({ t, data }) {
@@ -7,26 +7,20 @@ export function getKeyIndicatorsConfig({ t, data }) {
 		{
 			label: t("Extraction Methods"),
 			render: () => {
-				if (!data?.extractionPoints?.length) {
+				const validExtractionPoints = data?.extractionPoints?.filter(Boolean) || [];
+				if (validExtractionPoints?.length === 0 || !validExtractionPoints) {
 					return "-";
 				}
 				return (
-					<div
-						style={{
-							display: "flex",
-							flexWrap: "wrap",
-						}}
-					>
-						{data?.extractionPoints?.map((method) => {
+					<div>
+						{validExtractionPoints?.map((method, index) => {
 							return (
-								<Tag
-									key={method}
-									style={{
-										marginBottom: 8,
-									}}
-								>
-									{method}
-								</Tag>
+								<React.Fragment key={method}>
+									<Tooltip title={method}>
+										<span style={{ fontWeight: "normal"}}>{method}</span>
+									</Tooltip>
+									{index < validExtractionPoints.length - 1 && ", "}
+								</React.Fragment>
 							);
 						})}
 					</div>
@@ -36,28 +30,28 @@ export function getKeyIndicatorsConfig({ t, data }) {
 		{
 			label: t("Products"),
 			render: () => {
-				if (data?.productsOfLocation?.length === 0) {
+				const validProducts = data?.products?.filter(Boolean) || [];
+				if (validProducts?.length === 0 || !validProducts) {
 					return "-";
 				}
-
+		
 				return (
-					<div
-						style={{
-							display: "flex",
-							flexWrap: "wrap",
-						}}
-					>
-						{data?.productsOfLocation?.map((product) => {
+					<div>
+						{validProducts?.map((product, index) => {
 							return (
-								<Tag
-									key={product}
-									style={{
-										marginBottom: 8,
-									}}
-									color={getTagColor(product)}
-								>
-									{product}
-								</Tag>
+								<React.Fragment key={product}>
+									<Tooltip title={product}>
+										<span 
+											style={{ 
+												fontWeight: "normal",
+												color: getTagColor(product)
+											}}
+										>
+											{product}
+										</span>
+									</Tooltip>
+									{index < validProducts.length - 1 && ", "}
+								</React.Fragment>
 							);
 						})}
 					</div>
@@ -68,9 +62,9 @@ export function getKeyIndicatorsConfig({ t, data }) {
 			label: t("Number of Workers on Site"),
 			render: () => {
 				if (!data.workers) {
-					return "-";
+					return 0;
 				}
-				return data.workers;
+				return <Tooltip title={data.workers}>{data.workers}</Tooltip>;
 			},
 		},
 	];

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

@@ -1,6 +1,7 @@
 import React, { useMemo } from 'react'
 import { getKeyIndicatorsConfig } from './config.js'
 import KeyIndicatorsWidget from '../../../../../core/components/Dashboard/Widget/KeyIndicators/index.jsx'
+import { findOptions } from '../../../../../../helpers/StringHelper.js';
 
 const MineSiteDetails = ({
     locationData = {},
@@ -10,23 +11,10 @@ const MineSiteDetails = ({
 }) => {
 
     const data = useMemo(() => {
+		const products = locationData?.products?.map((product) => product.typeOfProduct);
 		return {
-			extractionPoints: (locationData?.extractionMethod || []).map((method) => {
-				const _method = options?.extractionMethodsOptions?.find(
-					(option) => option.value === method,
-				)?.label;
-
-				return _method;
-			}),
-			products: (
-				(locationData?.products || []).map((product) => product.typeOfProduct) || []
-			).map((product) => {
-				const _product = options?.minerals?.find(
-					(option) => option.value === product,
-				)?.label;
-
-				return _product;
-			}),
+			extractionPoints: findOptions(locationData?.extractionMethod, options?.extractionMethodsOptions),
+			products: findOptions(products, options?.mineralOptions),
 			workers: locationData?.totalNumberOfWorkers || 0,
 		};
 	}, [locationData, options]);

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

@@ -1,24 +1,24 @@
 export const IconNodesConfig = {
-	operators: {
-		name: "nashiriki::Operators",
+	operator: {
+		name: "Operators",
 		icon: "Worker",
 		order: 1,
 		emptyName: "no-operators",
 	},
-	traders: {
-		name: "nashiriki::Traders",
+	trader: {
+		name: "Traders",
 		icon: "Handshake",
 		order: 2,
 		emptyName: "no-traders",
 	},
 	government: {
-		name: "nashiriki::Government",
+		name: "Government",
 		icon: "KYC",
 		order: 3,
 		emptyName: "no-government",
 	},
 	other: {
-		name: "nashiriki::Other",
+		name: "Other",
 		icon: "CivilSociety",
 		order: 4,
 		emptyName: "no-other",

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

@@ -1,24 +1,24 @@
 import { IconNodesConfig } from './config.js';
+import { findOptions } from '../../../../../../helpers/StringHelper.js';
 
-export const getStakeholderMappingData = ({data, locationData, id, options, t, goTo, selectedPartners}) => {
+export const getStakeholderMappingData = ({data, locationData, id, options, t, goTo, selectedPartners, mainSubject}) => {
     const _data = data;
+    const mainSubjectData = _data?.[mainSubject];
 
     return {
-        id: id,
-        name: locationData?.name || "",
+        id: mainSubjectData?.datastakeId || "",
+        name: mainSubjectData?.name || "",
         country: {
-            label:
-                options?.countries?.find((country) => country.value === locationData?.country)
-                    ?.label || "",
-            value: (locationData?.country || "").toLowerCase() || "",
+            label: findOptions(mainSubjectData?.country, options?.countries) || "",
+            value: (mainSubjectData?.country || "").toLowerCase() || "",
         },
-        onClick: () => goTo(`/app/view/production-sites/${id}`),
+        onClick: () => goTo(`/app/view/production-sites/${mainSubjectData?.datastakeId}`),
         totalSources: selectedPartners?.partners?.length || 0,
         backgroundColor: "#FFD6E7",
         iconColor: "#C41D7F",
 
         icon: "DashboardLocations",
-        children: Object.keys(_data)?.map((key, index) => {
+        children: Object.keys(_data)?.filter(key => (key !== mainSubject))?.map((key, index) => {
             return {
                 id: key,
                 name: t(IconNodesConfig[key]?.name),
@@ -29,17 +29,14 @@ export const getStakeholderMappingData = ({data, locationData, id, options, t, g
                 hoverColor: "#36cfca",
                 content: _data[key].length,
                 emptyName: IconNodesConfig[key]?.emptyName
-                    ? t(`nashiriki::${IconNodesConfig[key]?.emptyName}`)
+                    ? t(`${IconNodesConfig[key]?.emptyName}`)
                     : undefined,
                 children: (_data[key] || [])?.map((child) => {
                     return {
                         id: child?.datastakeId || "",
                         name: child?.name || "",
                         country: {
-                            label:
-                                options?.countries?.find(
-                                    (country) => country.value === child?.country,
-                                )?.label || "",
+                            label: findOptions(child?.country, options?.countries) || "",
                             value: child?.country ? child?.country?.toLowerCase() : "",
                         },
 
@@ -53,8 +50,8 @@ export const getStakeholderMappingData = ({data, locationData, id, options, t, g
                             goTo(`/app/view/stakeholders/${child.datastakeId}`);
                         },
                         totalSources: child?.sources || 0,
-                        tooltipHeader: t("nashiriki::link-details"),
-                        tooltipLabel: t("nashiriki::sources-reporting"),
+                        tooltipHeader: t("link-details"),
+                        tooltipLabel: t("sources-reporting"),
                         value: child?.sources || 0,
                     };
                 }),

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

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

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

@@ -4,10 +4,9 @@ import DashboardLayout from '../../../core/components/Dashboard/DashboardLayout/
 import Header from '../../../core/components/Header/index.jsx'
 import Multiselect from '../../../core/components/Select/MultiSelect/index.jsx'
 import { Select, Spin } from 'antd'
-import MineSiteDetails from './components/MineSiteDetails/index.js'
-import LocationMap from './components/LocationMap/index.js'
 import InformationAvailability from '../components/InformationAvailability/index.js'
 import StakeholderMapping from './components/StakeholderMapping/index.js'
+import MineDetailsSection from './components/MineDetailsSection/index.js'
 
 const MineSummary = ({
     hasSelect = false,
@@ -66,9 +65,10 @@ const MineSummary = ({
         <DashboardLayout
             header={
                 <Header 
-                    title={t('Mine Summary')}
+                    title={hasSelect ? t("Mine Review") : (singleItemData?.name || "") + " " + t("Summary")}
                     className="with-border-header h-w-btn-header no-px-body"
                     goBackTo={!hasSelect && goBack}
+                    loading={loading}
                     addedHeaderFirst
 					actionButtons={[
                         {
@@ -125,26 +125,20 @@ const MineSummary = ({
 					/>
 				</section>
 			)}
-            <section>
-                <MineSiteDetails
-                    locationData={hasSelect ? singleItemData : data}
-                    loading={loadingData}
-                    t={t}
-                    options={options}
-                />
-                <LocationMap
-                    selectedPartners={selectedPartners}
-                    t={t}
-                    params={params}
-                    locationData={hasSelect ? singleItemData : data}
-                    loading={loadingData}
-                />
-            </section>
+            <MineDetailsSection 
+                locationData={singleItemData}
+                loading={loadingData}
+                t={t}
+                options={options}
+                selectedPartners={selectedPartners}
+                params={params}
+            />
             <section>
                 <InformationAvailability
                     selectedPartners={selectedPartners}
                     t={t}
                     id={params?.id || selectedItem}
+                    partners={partners}
                 />
             </section>
             <section>
@@ -152,7 +146,9 @@ const MineSummary = ({
                     selectedPartners={selectedPartners}
                     t={t}
                     id={params?.id || selectedItem}
-                    locationData={hasSelect ? singleItemData : data}
+                    locationData={singleItemData}
+                    goTo={goTo}
+                    options={options}
                 />  
             </section>
         </DashboardLayout>

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

@@ -1,24 +1,24 @@
 export const IconNodesConfig = {
 	beneficiaries: {
-		name: "nashiriki::beneficiaries",
+		name: "Beneficiaries",
 		icon: "CoinsHand",
 		order: 3,
 		emptyName: "no-beneficiaries",
 	},
 	boardMembers: {
-		name: "nashiriki::board-members",
+		name: "Board Members",
 		icon: "Users",
 		order: 1,
 		emptyName: "no-board-members",
 	},
 	management: {
-		name: "nashiriki::management",
+		name: "Management",
 		icon: "Filters",
 		order: 2,
 		emptyName: "no-management",
 	},
 	shareholders: {
-		name: "nashiriki::stakeholders",
+		name: "Stakeholders",
 		icon: "PercentCircle",
 		order: 4,
 		emptyName: "no-stakeholders",

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

@@ -1,17 +1,17 @@
 import { IconNodesConfig } from './config.js';
+import { findOptions } from '../../../../../../helpers/StringHelper.js';
 
-export const getGovernanceData = ({data, operatorData, id, options, t, goTo, selectedPartners}) => {
+export const getGovernanceData = ({data, operatorData, id, options, t, goTo, selectedPartners, mainSubject}) => {
     const { sources, ...rest } = data;
 
     const _data = rest;
 
+    const mainSubjectData = _data?.[mainSubject];
     return {
-        id: operatorData?.datastakeId || id,
-        name: t(operatorData?.name || ""),
+        id: mainSubjectData?.datastakeId || id,
+        name: mainSubjectData?.name || "",
         country: {
-            label:
-                options?.countries?.find((country) => country.value === operatorData?.country)
-                    ?.label || "",
+            label: findOptions(mainSubjectData?.country, options?.countries) || "",
             value: (operatorData?.country || "").toLowerCase() || "",
         },
         onClick: () => {
@@ -19,7 +19,7 @@ export const getGovernanceData = ({data, operatorData, id, options, t, goTo, sel
         },
         totalSources: selectedPartners?.partners?.length || 0,
 
-        children: Object.keys(_data)?.map((key, index) => {
+        children: Object.keys(_data || {})?.filter(key => (key !== mainSubject))?.map((key, index) => {
             return {
                 id: key,
                 name: t(IconNodesConfig[key]?.name),
@@ -35,10 +35,7 @@ export const getGovernanceData = ({data, operatorData, id, options, t, goTo, sel
                         id: child?.datastakeId || "",
                         name: child?.name || "",
                         country: {
-                            label:
-                                options?.countries?.find(
-                                    (country) => country.value === child?.country,
-                                )?.label || "",
+                            label: findOptions(child?.country, options?.countries) || "",
                             value: (child?.country || "").toLowerCase() || "",
                         },
 

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

@@ -20,17 +20,23 @@ const Governance = ({
 			filters: {
 				datastakeId: id,
 				sources: selectedPartners?.partners || [],
-                coreSubject: "stakeholder"
+                coreSubject: "stakeholder",
+                metrics: {
+                    shareholders: ['shareholders'],
+                    boardMembers: ['boardMembers'],
+                    management: ['management'],
+                    beneficiaries: ['directBeneficiaries']
+                }
 			},
 			defaultData: {},
 			stop: selectedPartners?.loading,
 		};
-	}, [selectedPartners]);
+	}, [selectedPartners, id]);
 
     const { data, loading } = useWidgetFetch({config: defaultFetchConfig});
 
     const graphData = useMemo(() => {
-		return getGovernanceData({data, operatorData, id, options, t, goTo, selectedPartners});
+		return getGovernanceData({data, operatorData, id, options, t, goTo, selectedPartners, mainSubject: "stakeholder"});
 	}, [data, operatorData, options, t]);
 
     return (

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

@@ -66,7 +66,7 @@ const OperatorSummary = ({
         <DashboardLayout
             header={
                 <Header 
-                    title={t('Operator Summary')}
+                    title={hasSelect ? t("Operator Review") : (singleItemData?.name || "") + " " + t("Summary")}
                     className="with-border-header h-w-btn-header no-px-body"
                     goBackTo={!hasSelect && goBack}
                     addedHeaderFirst
@@ -130,7 +130,7 @@ const OperatorSummary = ({
                 selectedPartners={selectedPartners}
                 t={t}
                 id={params?.id || selectedItem}
-                data={hasSelect ? singleItemData : data}
+                data={singleItemData}
                 loading={loading}
             />
             <section>
@@ -138,6 +138,8 @@ const OperatorSummary = ({
                     selectedPartners={selectedPartners}
                     t={t}
                     id={params?.id || selectedItem}
+                    subject="stakeholder"
+                    partners={partners}
                 />
             </section>
             <section>
@@ -148,7 +150,7 @@ const OperatorSummary = ({
                     options={options}
                     goTo={goTo}
                     getRedirectLink={getRedirectLink}
-                    operatorData={hasSelect ? singleItemData : data}
+                    operatorData={singleItemData}
                 />
             </section>
             <section>
@@ -159,7 +161,7 @@ const OperatorSummary = ({
                     options={options}
                     goTo={goTo}
                     getRedirectLink={getRedirectLink}
-                    operatorData={hasSelect ? singleItemData : data}
+                    operatorData={singleItemData}
                 />
             </section>