datastake-daf 0.6.765 → 0.6.767

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

@@ -4,6 +4,7 @@ import Widget from '../../../../../core/components/Dashboard/Widget/index.jsx';
 import Map from '../../../../../core/components/Dashboard/Map/index.jsx';
 import { getTagColor } from '../../../../../utils/productTag.js';
 import PropTypes from 'prop-types';
+import { findOptions } from '../../../../../../helpers/StringHelper.js';
 
 
 function SupplyChainMap({selectedSources = {}, t = () => {}, goTo = () => {}, options = {}, getRedirectLink = () => {} }) {
@@ -23,6 +24,8 @@ function SupplyChainMap({selectedSources = {}, t = () => {}, goTo = () => {}, op
 
     const { loading, data } = useWidgetFetch({config: defaultConfig});
 
+	console.log('data', data);
+
     return (
         <Widget
             title={t("Supply Chain Map")}
@@ -34,26 +37,29 @@ function SupplyChainMap({selectedSources = {}, t = () => {}, goTo = () => {}, op
 				data={Array.isArray(data) && data.length > 0 ? data : []}
 				renderTooltip={(data) => {
 					const productsText = data?.products?.[0];
-					const minerals = options?.minerals || [];
+					const minerals = options?.mineralOptions || [];
+					const participants = data?.stakeholders?.map((stakeholder) => stakeholder.name);
 					return [
 						{
 							label: t("Products"),
 							value:
-								minerals.find((mineral) => mineral.value === productsText)?.label ||
+								findOptions(productsText, minerals) ||
 								productsText ||
 								"-",
 							...(productsText && { tag: getTagColor(productsText) }),
 						},
 						{
 							label: t("Participants"),
-							value: data?.participants || "-",
+							value: participants?.length > 0 ? participants.join(', ') : "-",
 						},
 					];
 				}}
 				link
 				onClickLink={(data) => {
-					const locationTypes = ['mineSite', 'village'];
-					if (locationTypes.includes(data.type)) {
+					const locationTypes = ['village', 'town', 'area', 'territory'];
+					if(data?.type === 'mineSite') {
+						goTo(getRedirectLink(`/app/mine-summary/${data.datastakeId}`));
+					} else if (locationTypes.includes(data.type)) {
 						goTo(getRedirectLink(`/app/view/locations/${data.datastakeId}`));
 					} else {
 						goTo(getRedirectLink(`/app/view/stakeholders/${data.datastakeId}`));

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

@@ -1,19 +1,6 @@
 export const mapData = ({ t, data = [], tabSelected }) => {
 	if (!data.length) {
-		return [
-			{ category: "", type: t("Stakeholders"), value: 0.5 },
-			{ category: "", type: t("Locations"), value: 0.5 },
-			{ category: "", type: t("Events"), value: 0.5 },
-			{ category: " ", type: "Stakeholders", value: 0.5 },
-			{ category: " ", type: "Locations", value: 0.5 },
-			{ category: " ", type: t("Events"), value: 0.5 },
-			{ category: "  ", type: t("Stakeholders"), value: 0.5 },
-			{ category: "  ", type: t("Locations"), value: 0.5 },
-			{ category: "  ", type: t("Events"), value: 0.5 },
-			{ category: "   ", type: t("Stakeholders"), value: 0.5 },
-			{ category: "   ", type: t("Locations"), value: 0.5 },
-			{ category: "   ", type: t("Events"), value: 0.5 },
-		];
+		return [];
 	}
 
 	const metricTypes = {

package/src/@daf/pages/Dashboards/UserDashboard/components/ContributionsGraph/hook.js

@@ -11,16 +11,23 @@ export const useContributionsGraph = ({
 		return mapData({ t, data, tabSelected });
 	}, [data, t]);
 
+    const isEmpty = useMemo(() => _data?.length === 0, [_data]);
+
     const chartConfig = useMemo(() => {
         return {
             data: _data,
-            xField: "value",
-            yField: "category",
+            xFieldKey: "value",
+            yFieldKey: "category",
             seriesField: "type",
             isGroup: true,
+            ...(isEmpty && {
+                xAxisConfig: {
+                    min: 0,
+                    max: 10,
+                    tickCount: 5,
+                }
+            }),
             renderTooltipContent: (title, items) => {
-				const isEmpty = !data.length;
-
 				const tooltipItems = items.map((item) => ({
 					label: item.name,
 					color: item.color,
@@ -40,7 +47,7 @@ export const useContributionsGraph = ({
             ],
         }
 
-    }, [_data, t, theme]);
+    }, [_data, t, theme, isEmpty]);
 
     return chartConfig;
 }

package/src/@daf/pages/Dashboards/UserDashboard/components/MineSites/index.jsx

@@ -86,7 +86,7 @@ function MineSites({
 			return [
 				{
 					label: t("Category"),
-					value: findOptions(data?.category, locationCategories ?? []) || "--",
+					value: findOptions(data?.category, options?.categoriesOptions ?? []) || "--",
 				},
 			];
 		}

package/src/@daf/pages/Dashboards/UserDashboard/components/Triangulation/hook.js

@@ -59,7 +59,7 @@ export const useTriangulation = ({ widgetData, t = () => {}, section, theme = {}
 				return renderTooltipJsx({
 					title: t(
 						section === "data-compilation"
-							? "nashiriki::Information Sharing"
+							? "Information Sharing"
 							: "Triangulation",
 					),
 					items: [

package/src/@daf/pages/Data/Channels/columns.js

@@ -0,0 +1,175 @@
+import React from 'react';
+import { Tooltip, Tag } from 'antd';
+import { findOptions } from '../../../../helpers/StringHelper.js';
+import { renderDateFormatted } from '../../../../helpers/Forms.js';
+import CustomIcon from '../../../core/components/Icon/CustomIcon.jsx';
+import AvatarGroup from '../../../core/components/AvatarGroup/index.jsx';
+import sourceAvatarConfig from '../../../../helpers/sourceAvatarConfig.js';
+import MoreMenu from '../../../core/components/Table/MoreMenu/index.jsx';
+
+
+const getLinkValue = (value, linkingObject) => {
+    if(linkingObject && linkingObject?.[value]) {
+      return linkingObject?.[value]?.name;
+    }
+    return null;
+  }
+  
+  export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, applications}) => [
+      {
+          dataIndex: 'datastakeId',
+          title: t('ID'),
+          ellipsis: true,
+          show: true,
+          render: (v, all) => {
+            if (all.empty) {
+              return <div className="daf-default-cell" />
+            }
+      
+            return <Tooltip title={v}>{v}</Tooltip>;
+          },
+      },
+      {
+          dataIndex: 'partner',
+          title: t('Partner'),
+          ellipsis: true,
+          show: true,
+          render: (v, all) => {
+            if (all.empty) {
+              return <div className="daf-default-cell" />
+            }
+      
+            return <Tooltip title={v}>{v}</Tooltip>;
+          },
+      },     
+      {
+          dataIndex: 'dataPoints',
+          title: t('Data Points'),
+          ellipsis: true,
+          show: true,
+          render: (v, all) => {
+            if (all.empty) {
+              return <div className="daf-default-cell" />
+            }
+  
+            const category = findOptions(v, data?.options?.locationCategories);
+      
+            return category ? <Tooltip title={category}>{category}</Tooltip> : '-';
+          },
+      },     
+      {
+          dataIndex: 'country',
+          title: t('Country'),
+          ellipsis: true,
+          show: true,
+          render: (v, all) => {
+            if (all.empty) {
+              return <div className="daf-default-cell" />
+            }
+  
+            const country = findOptions(v, options?.countries);
+  
+            return country ? <Tooltip title={country}>{country}</Tooltip> : '-';
+          },
+      },      
+      {
+          dataIndex: 'province',
+          title: t('Province'),
+          ellipsis: true,
+          show: true,
+          render: (v, all) => {
+            if (all.empty) {
+              return <div className="daf-default-cell" />
+            }
+  
+            const province = getLinkValue(all?.administrativeLevel1, all?.linking?.SCL);
+  
+            return province ? <Tooltip title={province}>{province}</Tooltip> : '-';
+          },
+      },    
+      {
+          dataIndex: 'territory',
+          title: t('Territory'),
+          ellipsis: true,
+          show: true,
+          render: (v, all) => {
+            if (all.empty) {
+              return <div className="daf-default-cell" />
+            }
+  
+            const territory = getLinkValue(all?.administrativeLevel2, all?.linking?.SCL);
+  
+            return territory ? <Tooltip title={territory}>{territory}</Tooltip> : '-';
+          },
+      },     
+      {
+        title: t("Sources"),
+        dataIndex: "sources",
+        key: "sources",
+        show: activeTab !== "own",
+        render: (val, all) => {
+            if (all.empty) {
+                return <div className="daf-default-cell" />;
+            }
+  
+            const sources = sourceAvatarConfig(val, user, applications);
+  
+            return <AvatarGroup items={sources}></AvatarGroup>;
+        },
+    },
+      {
+          title: t("Last Update"),
+          dataIndex: "updatedAt",
+          key: "updatedAt",
+          width: 125,
+          render: (date, all) => {
+              if (all.empty) {
+                  return <div className="daf-default-cell" />;
+              }
+  
+              const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
+              return <Tooltip title={_date}>{_date}</Tooltip>;
+          },
+          ellipsis: true,
+      },
+     
+      {
+        id: 'actions',
+        title: "",
+        width: 60,
+        render: (_, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />;
+          }
+          const onClick = () => {
+            const link = `/app/view/${subject}/${all.datastakeId}`;
+            if (activeTab === "shared") {
+              link += `?sourceId=${all?.authorId?.id}`;
+            }
+            goTo(getRedirectLink(link));
+          };
+          const moreMenuItems = [
+            {
+              label: t("Details"),
+              value: "details",
+              onClick: onClick,
+            },
+            {
+              label: t("Summary"),
+              value: "Summary",
+              onClick: () => {
+                let link = `/app/summary/${subject}/${all.datastakeId}`
+                if (activeTab === "shared") {
+                  link += `?sourceId=${all?.authorId?.id}`;
+                }
+                goTo(getRedirectLink(link));
+              },
+              // disabled: true,
+            },
+          ];
+          return <div >
+               <MoreMenu items={moreMenuItems} />
+          </div>;
+        }
+      }
+  ].filter((column) => column.show !== false);

package/src/@daf/pages/Events/Activities/columns.js

@@ -106,10 +106,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
           }
 
           const eventCategory = findOptions(v, data?.options?.eventCategoryOptions);
-          const categoryValue = getEventCategoryBySubject(eventCategory, subject);
-          console.log({categoryValue})
-          console.log({eventCategory})
-          console.log({subject})
+          const categoryValue = getEventCategoryBySubject(eventCategory, "correctiveActions", true);
           
           return categoryValue ? <Tooltip title={categoryValue}>{categoryValue}</Tooltip> : '-';
         },

package/src/@daf/pages/Events/helper.js

@@ -1,9 +1,9 @@
-export const getEventCategoryBySubject = (eventCategoryObject, subject) => {
+export const getEventCategoryBySubject = (eventCategoryObject, subject, isSingular = false) => {
     if (!eventCategoryObject || typeof eventCategoryObject !== 'object') {
       return null;
     }
     
-    const subjectSingular = subject.endsWith('ies') 
+    const subjectSingular = isSingular ? subject : subject.endsWith('ies') 
       ? subject.slice(0, -3) + 'y'
       : subject.endsWith('s') 
       ? subject.slice(0, -1)       

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

@@ -87,7 +87,7 @@ const EventsTable = ({
     return (
         <TablePageWithTabs 
            t={t}
-           title={t("events")}
+           title={t("Events")}
            breadCrumbs={breadcrumbs}
            location={location}
            loading={loading}

package/src/@daf/pages/Locations/MineSite/columns.js

@@ -7,6 +7,7 @@ import AvatarGroup from '../../../core/components/AvatarGroup/index.jsx';
 import sourceAvatarConfig from '../../../../helpers/sourceAvatarConfig.js';
 import MoreMenu from '../../../core/components/Table/MoreMenu/index.jsx';
 import MoreOptions from '../../../core/components/Table/MoreOptions/index.jsx';
+import { renderStatusTag } from '../../../utils/tags.js';
 
 export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, applications}) => [
     {
@@ -89,8 +90,8 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const operators = all?.operatorOfLocation?.map((operator) => operator?.clientLocation?.name);
-          return (operators && operators.length > 0) ? <MoreOptions data={operators || []} tooltipPlacement="topLeft" /> : '-';
+          const operators = all?.operator?.map((operator) => operator?.locationClient?.name)?.filter(Boolean);
+          return (operators && operators.length > 0) ? <MoreOptions data={operators || []} toolTipPlacement={operators?.length < 2 ? "topLeft" : "top"} /> : '-';
         },
     },   
     {
@@ -117,8 +118,9 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
           if (all.empty) {
             return <div className="daf-default-cell" />
           }
-          const status = findOptions(v, data?.options?.statusOptions);
-          return status ? <Tooltip title={status}>{status}</Tooltip> : '-';
+          const _val = all?.published || all?.status === "submitted" ? "submitted" : v;
+
+          return renderStatusTag({ value: _val, t });
         },
     },
     

package/src/@daf/pages/Stakeholders/Operators/columns.js

@@ -6,6 +6,7 @@ import CustomIcon from '../../../core/components/Icon/CustomIcon.jsx';
 import AvatarGroup from '../../../core/components/AvatarGroup/index.jsx';
 import sourceAvatarConfig from '../../../../helpers/sourceAvatarConfig.js';
 import MoreMenu from '../../../core/components/Table/MoreMenu/index.jsx';
+import { renderStatusTag } from '../../../utils/tags.js';
 
 export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, applications}) => [
     {
@@ -133,8 +134,9 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
           if (all.empty) {
             return <div className="daf-default-cell" />
           }
-          const status = findOptions(v, data?.options?.statusOptions);
-          return status ? <Tooltip title={status}>{status}</Tooltip> : '-';
+          const _val = all?.published || all?.status === "submitted" ? "submitted" : v;
+
+          return renderStatusTag({ value: _val, t });
         },
     },
    

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

@@ -37,6 +37,7 @@ const PlantingCycleSummary = ({ activityData, supportText, onDownload, downloadD
                         data={[]}
                     />
                 </Widget>
+
             </section>
         </DashboardLayout>
     )

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>;
 		},
 	},
 ];