datastake-daf 0.6.845 → 0.6.846

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

@@ -4,6 +4,7 @@ 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 = {}, 
@@ -25,7 +26,7 @@ function Identification({
 		[t],
 	);
 
-    const chartConfig = useIdentification({ data, theme, options });
+    const { chartConfig, colors, allSeenProducts, graphData } = useIdentification({ data, theme, options });
 
     return (
 		<Widget
@@ -45,7 +46,30 @@ function Identification({
 				</>
 			}
 		>
-			<LineChart {...chartConfig} height="400px" t={t} />
+			<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: [] };
+				}} 
+			/>
 		</Widget>
     )
 }

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

@@ -5,7 +5,6 @@ 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,13 +18,14 @@ 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);
+	const mappedData = mapDataForChainOfCustody(Object.keys(data)?.length > 0 ? data : hardcodedData, options, goTo, APP);
 
 	return (
 		<Widget

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

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

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

@@ -9,24 +9,29 @@ 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 rightIcon = <CustomIcon name="WaziDarkIcon" color="white" 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 mapIcon = (category) => {
 	switch (category) {
@@ -45,7 +50,7 @@ const mapIcon = (category) => {
 const leftBackground = theme.colorPrimary3;
 const rightBackground = theme.colorPrimary6;
 
-export const mapDataForChainOfCustody = (data = {}, options = {}, goTo = () => {}) => {
+export const mapDataForChainOfCustody = (data = {}, options = {}, goTo = () => {}, APP) => {
 	const mapChildren = (items, type, parentId, isDirect = true) => {
 		return (items ?? []).map((item) => {
 			return {
@@ -54,7 +59,7 @@ export const mapDataForChainOfCustody = (data = {}, options = {}, goTo = () => {
 			name: item.name,
 			sources: parentId ? [parentId] : [],
 			subTitle: findOptions(item?.category, options?.categoriesOptions || options?.category || []),
-			leftIcon: type === "client" ? rightIcon : leftIcon,
+			leftIcon:  getDirectionIcon(APP, type === "client" ? "right" : "left"),
 			leftBackground: type === "client" ? rightBackground : leftBackground,
 			topIcon: mapIcon(item.category),
 			children: mapChildren(item.sources ?? item.clients ?? [], type, item.id, false),
@@ -71,7 +76,7 @@ export const mapDataForChainOfCustody = (data = {}, options = {}, goTo = () => {
 		number: 0,
 		name: data.name,
 		subTitle: findOptions(data?.category, options?.categoriesOptions || options?.category || []),
-		leftIcon: middleIcon,
+		leftIcon: getDirectionIcon(APP, "middle"),
 		leftBackground: theme.colorPrimary10,
 		topIcon: mapIcon(data.category),
 		left: mapChildren(data.sources, "source", data.id),

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

@@ -162,6 +162,9 @@ const fr = {
 	"under-development": "Under development",
 	"under-development-description": "Our team is actively building this feature. It will be available in an upcoming release.",
 	"Confirm new subject": "Confirmer nouveau sujet",
+	"registration":"Enregistrement",
+	"scrutiny":"Contrôle",
+	"Organisation Policies" : "Politiques Organisationnelles",
 	affirmations: {
 		"subject-created-successfully": "Sujet créé avec succès.",
 		"information-saved-successfully": "Information sauvegardée avec succès.",
@@ -2189,6 +2192,12 @@ const fr = {
 		"last-active": "Dernière Activité",
 		"key-indicators": "Indicateurs Clés",
 	},
+	"Armed Groups": "Groupes Armés",
+	"Identified Armed Groups":"Groupes Armés Identifiés",
+	"Reported Incidents": "Incidents Signalés",
+	"Conflict Map":"Carte des Conflits",
+	"Conflict Management": "Gestion des Conflits"
+
 };
 
 export default fr;

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

@@ -1944,6 +1944,7 @@ const sp = {
     'subjects': "Temas",
     "key-indicators": "Indicadores Clave",
   },
+
 }
 
 export default sp;

package/build/manifest.json

@@ -1,25 +0,0 @@
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "logo512.png",
-      "type": "image/png",
-      "sizes": "512x512"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}

package/build/robots.txt

@@ -1,3 +0,0 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
-Disallow: