datastake-daf 0.6.846 → 0.6.847

package/src/@daf/pages/Dashboards/ConflictManagement/index.js

@@ -2,6 +2,8 @@ import React, { useMemo, useEffect } from "react";
 import KeyIndicators from "./components/KeyIndicators/index.js";
 import MineSites from "./components/MineSite/index.js";
 import RisksWidget from "./components/RisksWidget/index.js";
+import { useSources } from "../../../hooks/useSources.js";
+import { renderBreadCrumbs } from "../../../../helpers/breadCrumbs.js";
 import CustomIcon from "../../../core/components/Icon/CustomIcon.jsx";
 import { Header, Multiselect } from "../../../../index.js";
 import DashboardLayout from '../../../core/components/Dashboard/DashboardLayout/index.jsx';
@@ -14,23 +16,21 @@ export default function ConflictManagement({
     getRedirectLink = (s) => s, 
     theme = {},
     options = {},
-    breadcrumbs = [],
-	partners, 
-	selectedPartners,
-	setSelectedPartners, 
-	informationSources
+	breadcrumbs = [],
+
 }) {
+	const { partners, selectedPartners, setSelectedPartners, informationSources } =
+		useSources({ user, t });
+
 	// const { pushPath } = useHistory();
 
 	// useEffect(() => {
 	// 	pushPath(`/app/conflict-management`);
 	// }, []);
 
-	console.log(partners, "partners");
-
-	// const breadCrumbs = useMemo(() => {
-	// 	return renderBreadCrumbs({ t, view: "conflict-management", mod: APP, goTo });
-	// }, [t, APP, goTo]);
+	const breadCrumbs = useMemo(() => {
+		return renderBreadCrumbs({ t, view: "conflict-management", mod: APP, goTo });
+	}, [t, APP, goTo]);
 
 	const sourceOptions = useMemo(() => {
 		return partners.map((partner) => {
@@ -53,7 +53,7 @@ export default function ConflictManagement({
 		header={
 		<Header
 				title={t("conflict-management")}
-				breadcrumbs={breadcrumbs}
+				breadcrumbs={breadCrumbs}
 				supportText={
 					<>
 						{t("Supported by")}{" "}

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

@@ -39,6 +39,56 @@ function GenderDistribution({
 
     const isEmpty = useMemo(() => Object.keys(data).filter((k) => !!data[k]).length === 0, [data]);
 
+	const getTooltipChildren = useCallback(
+		(item) => {
+			if (isTradeActions) {
+				if (isEmpty) {
+					return;
+				}
+
+				return renderTooltipJsx({
+					title: t("Role"),
+					items: [
+						{
+							label:
+								(options?.optionPositionSupplyChain || options?.positionSupplyChainOptions || [])?.find((o) => {
+									return o.value === item.key;
+								}).label || item.key,
+							value: data[item.key] || 0,
+						},
+					],
+				});
+			} else {
+				if (isEmpty) {
+					return renderTooltipJsx({
+						title: t("Gender"),
+						items: config.map((conf) => ({
+							label: t(conf.label),
+							value: 0,
+						})),
+					});
+				}
+
+				const _config = config?.find((c) => c.key === item.key);
+
+				if (_config) {
+					return renderTooltipJsx({
+						title: t("Gender"),
+						items: [
+							{
+								label: t(_config.label),
+								value: `${Math.round(item.percent * 100)}%`,
+							},
+						],
+					});
+				}
+
+				return null;
+			}
+		},
+		[t, data, isTradeActions],
+	);
+
     return (
         <Widget
             loading={loading}
@@ -60,52 +110,7 @@ function GenderDistribution({
                     isPie
                     t={t}
                     isEmpty={isEmpty}
-                    getTooltipChildren={		(item) => {
-						if (isTradeActions) {
-							if (isEmpty) {
-								return;
-							}
-			
-							return renderTooltipJsx({
-								title: t("Role"),
-								items: [
-									{
-										label:
-											(options?.optionPositionSupplyChain || options?.positionSupplyChainOptions || [])?.find((o) => {
-												return o.value === item.key;
-											}).label || item.key,
-										value: data[item.key] || 0,
-									},
-								],
-							});
-						} else {
-							if (isEmpty) {
-								return renderTooltipJsx({
-									title: t("Gender"),
-									items: config.map((conf) => ({
-										label: t(conf.label),
-										value: 0,
-									})),
-								});
-							}
-			
-							const _config = config?.find((c) => c.key === item.key);
-			
-							if (_config) {
-								return renderTooltipJsx({
-									title: t("Gender"),
-									items: [
-										{
-											label: t(_config.label),
-											value: `${Math.round(item.percent * 100)}%`,
-										},
-									],
-								});
-							}
-			
-							return null;
-						}
-					}}
+                    getTooltipChildren={getTooltipChildren}
                 />
             </div>
         </Widget>

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

@@ -53,27 +53,27 @@ export function useIdentification({ data, theme = {}, options = {} }) {
 			yFieldKey: "value",
 			seriesField: "typeOfProduct",
 			color: allSeenProducts.map((_, index) => colors[index % colors.length]),
-			// renderTooltipContent: (title, items) => {
-			// 	if (Array.isArray(items) && items[0]) {
-			// 		const title = items[0].title;
-			// 		const values = graphData.filter((d) => d.date === title);
-			// 		return {
-			// 			title: "Products",
-			// 			items: values.map((val) => {
-			// 				return{
-			// 					label: findOptions(val.typeOfProduct, options?.mineralOptions) || val.typeOfProduct,
-			// 					color: colors[
-			// 						allSeenProducts.indexOf(val.typeOfProduct) % colors.length
-			// 					],
-			// 					value: val.value.toLocaleString(),
-			// 				}
-			// 			}),
-			// 		};
-			// 	}
-			// 	return { title: "", items: [] };
-			// },
+			renderTooltipContent: (title, items) => {
+				if (Array.isArray(items) && items[0]) {
+					const title = items[0].title;
+					const values = graphData.filter((d) => d.date === title);
+					return {
+						title: "Products",
+						items: values.map((val) => {
+							return{
+								label: findOptions(val.typeOfProduct, options?.mineralOptions) || val.typeOfProduct,
+								color: colors[
+									allSeenProducts.indexOf(val.typeOfProduct) % colors.length
+								],
+								value: val.value.toLocaleString(),
+							}
+						}),
+					};
+				}
+				return { title: "", items: [] };
+			},
 		};
 	}, [graphData, allSeenProducts, options.minerals]);
 
-	return { chartConfig, colors, allSeenProducts, graphData};
+	return chartConfig;
 }

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

@@ -4,7 +4,6 @@ import LineChart from '../../../../../../../core/components/Charts/LineChart/ind
 import { Select } from 'antd';
 import { useIdentification } from './hook';
 import PropTypes from 'prop-types';
-import { findOptions } from '../../../../../../../../helpers/StringHelper.js';
 
 function Identification({
     selectedSources = {}, 
@@ -26,7 +25,7 @@ function Identification({
 		[t],
 	);
 
-    const { chartConfig, colors, allSeenProducts, graphData } = useIdentification({ data, theme, options });
+    const chartConfig = useIdentification({ data, theme, options });
 
     return (
 		<Widget
@@ -46,30 +45,7 @@ function Identification({
 				</>
 			}
 		>
-			<LineChart 
-				{...chartConfig} 
-				height="400px" 
-				t={t} 			
-				renderTooltipContent={(title, items) => {
-					if (Array.isArray(items) && items[0]) {
-						const title = items[0].title;
-						const values = graphData.filter((d) => d.date === title);
-						return {
-							title: "Products",
-							items: values.map((val) => {
-								return{
-									label: findOptions(val.typeOfProduct, options?.mineralOptions) || val.typeOfProduct,
-									color: colors[
-										allSeenProducts.indexOf(val.typeOfProduct) % colors.length
-									],
-									value: val.value.toLocaleString(),
-								}
-							}),
-						};
-					}
-					return { title: "", items: [] };
-				}} 
-			/>
+			<LineChart {...chartConfig} height="400px" t={t} />
 		</Widget>
     )
 }

package/src/@daf/pages/Dashboards/SupplyChain/index.jsx

@@ -5,6 +5,7 @@ import Header from '../../../core/components/Header/index.jsx';
 import Multiselect from '../../../core/components/Select/MultiSelect/index.jsx';
 import KeyIndicators from './components/KeyIndicators';
 import SupplyChainMap from './components/SupplyChainMap';
+import TradeRelationships from './components/TradeRelationships';
 import ChartsContainer from './components/ChartsContainer';
 
 function SupplyChain({

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

@@ -18,14 +18,13 @@ function DataChainOfCustody({
 	goTo = () => {},
 	options = {},
 	hardcodedData = [],
-	APP
 }) {
 	const fetchConfig = useMemo(() => ({
 		...defaultFetchConfig,}),[],
 	);
 	const { data, loading } = useWidgetFetch({config: fetchConfig});
 
-	const mappedData = mapDataForChainOfCustody(Object.keys(data)?.length > 0 ? data : hardcodedData, options, goTo, APP);
+	const mappedData = mapDataForChainOfCustody(Object.keys(data)?.length > 0 ? data : hardcodedData, options, goTo);
 
 	return (
 		<Widget

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

@@ -104,7 +104,6 @@ function UserDashboard({
                     goTo={goTo} 
                     options={options} 
                     hardcodedData={hardcodedData} 
-                    APP={APP}
                 />
             </section>
         </DashboardLayout>

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

@@ -9,29 +9,24 @@ const kycIcon = <CustomIcon name="KYC" color="#6C737F" width={18} height={18} />
 const buildingIcon = <CustomIcon name="Building" color="#6C737F" width={18} height={18} />;
 const individualIcon = <CustomIcon name="UserCircle" color="#6C737F" width={18} height={18} />;
 const csIcon = <CustomIcon name="CivilSociety" color="#6C737F" width={18} height={18} />;
+const leftIcon = (
+	<CustomIcon
+		name="WaziDarkIcon"
+		color={theme.colorPrimary8}
+		width={16}
+		height={16}
+	/>
+);
+const middleIcon = (
+	<CustomIcon
+		name="WaziDarkIcon"
+		color={theme.colorPrimary2}
+		width={16}
+		height={16}
+	/>
+);
 
-const directionIcons = {
-	nashiriki: {
-		left: "NashirikiSmallLogo",
-		right: "NashirikiSmallLogo",
-		middle: "NashirikiSmallLogo",
-	},
-	wazi: {
-		left: "WaziDarkIcon",
-		right: "WaziDarkIcon",
-		middle: "WaziDarkIcon",
-	},
-}
-
-const directionColors = {
-	left: theme.colorPrimary8,
-	right: "white",
-	middle: theme.colorPrimary2,
-}
-
-const getDirectionIcon = (APP, direction) => {
-	return <CustomIcon name={directionIcons[APP][direction]} color={directionColors[direction]} width={16} height={16} />;
-}
+const rightIcon = <CustomIcon name="WaziDarkIcon" color="white" width={16} height={16} />;
 
 const mapIcon = (category) => {
 	switch (category) {
@@ -50,7 +45,7 @@ const mapIcon = (category) => {
 const leftBackground = theme.colorPrimary3;
 const rightBackground = theme.colorPrimary6;
 
-export const mapDataForChainOfCustody = (data = {}, options = {}, goTo = () => {}, APP) => {
+export const mapDataForChainOfCustody = (data = {}, options = {}, goTo = () => {}) => {
 	const mapChildren = (items, type, parentId, isDirect = true) => {
 		return (items ?? []).map((item) => {
 			return {
@@ -59,7 +54,7 @@ export const mapDataForChainOfCustody = (data = {}, options = {}, goTo = () => {
 			name: item.name,
 			sources: parentId ? [parentId] : [],
 			subTitle: findOptions(item?.category, options?.categoriesOptions || options?.category || []),
-			leftIcon:  getDirectionIcon(APP, type === "client" ? "right" : "left"),
+			leftIcon: type === "client" ? rightIcon : leftIcon,
 			leftBackground: type === "client" ? rightBackground : leftBackground,
 			topIcon: mapIcon(item.category),
 			children: mapChildren(item.sources ?? item.clients ?? [], type, item.id, false),
@@ -76,7 +71,7 @@ export const mapDataForChainOfCustody = (data = {}, options = {}, goTo = () => {
 		number: 0,
 		name: data.name,
 		subTitle: findOptions(data?.category, options?.categoriesOptions || options?.category || []),
-		leftIcon: getDirectionIcon(APP, "middle"),
+		leftIcon: middleIcon,
 		leftBackground: theme.colorPrimary10,
 		topIcon: mapIcon(data.category),
 		left: mapChildren(data.sources, "source", data.id),