datastake-daf 0.6.783 → 0.6.784

package/dist/utils/index.js

@@ -7752,6 +7752,9 @@ function getRedirectPath(user, fallback = '', app, isDatastake) {
 }
 
 const en = {
+  "Site": "Site",
+  "Production Sites": "Production Sites",
+  "Type of account": "Type of account",
   "accounts": "Accounts",
   "users": "Users",
   "subjects": "Subjects",
@@ -9070,6 +9073,9 @@ const en = {
 };
 
 const fr = {
+  "Site": "Site",
+  "Production Sites": "Sites de production",
+  "Type of account": "Type de compte",
   "accounts": "Comptes",
   "users": "Utilisateurs",
   "subjects": "Sujets",
@@ -11022,6 +11028,9 @@ const fr = {
 };
 
 const sp = {
+  "Site": "Sitio",
+  "Production Sites": "Centros de producción",
+  "Type of account": "Tipo de cuenta",
   "Identified Customers": "Clientes identificados",
   "Identified Suppliers": "Proveedores identificados",
   "Associated Mine Sites": "Sitios mineros asociados",

package/package.json

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

package/src/@daf/core/components/Charts/BarChart/index.jsx

@@ -123,7 +123,7 @@ export default function BarChart({
 							},
 					  }
 					: {}),
-				...xAxisConfig,
+				...(Object.keys(xAxisConfig).length > 0 ? xAxisConfig : {}),
 				label: {
 					formatter: isPercentage
 						? (v) => `${v}`.replace(/\d{1,3}(?=(\d{3})+$)/g, (s) => `${s},`) + " %"

package/src/@daf/core/components/Dashboard/Map/ChainIcon/utils.js

@@ -117,13 +117,13 @@ export function getStakeholderPosition({ zoom, totalMarkers, markerIndex }) {
 	return { x, y, center, radius, angleDeg };
 }
 
-function applyAnimationDirect(el, isShortLink) {
+function applyAnimationDirect(el, isShortLink, lineFlow = "downstream") {
 	if (!(el instanceof SVGElement) || isShortLink) return;
   
 	el.style.strokeDasharray = "10, 10";
 	el.style.strokeDashoffset = "0";
   
-	el.style.animation = "dash-flow 1.2s linear infinite";
+	el.style.animation = `dash-flow 1.2s linear infinite ${lineFlow === "upstream" && "reverse"}`;
   
 	el.classList.add('animated-polyline');
 }

package/src/@daf/core/components/Screens/BaseScreen/index.jsx

@@ -150,6 +150,7 @@ const BaseScreen = ({
 						showFilters={showFilters}
 						defaultFilters={defaultFilters}
 						onChange={onTableChange}
+						t={t}
 						{...rest}
 					/>
 					<Pagination

package/src/@daf/core/components/Select/MultiSelect/index.jsx

@@ -4,6 +4,7 @@ import PropTypes from "prop-types";
 import { Avatar, Checkbox } from "antd";
 import { theme } from "antd";
 import React from "react";
+import MultiSelectStyled from "./style";
 const { useToken } = theme;
 
 /**
@@ -163,7 +164,7 @@ export default function Multiselect({
 	};
 
 	return (
-		<Select
+		<MultiSelectStyled
 			mode={isSingle ? undefined : "multiple"}
 			value={selectValue}
 			onChange={onSelectChange}
@@ -231,6 +232,7 @@ export default function Multiselect({
 											display: "flex",
 											alignItems: "center",
 											justifyContent: "center",
+											padding: 0,
 										}}
 									>
 										{option?.avatar || getFirstChar(option?.label)}
@@ -289,7 +291,7 @@ export default function Multiselect({
 				}
 			}}
 			{...restProps}
-		></Select>
+		></MultiSelectStyled>
 	);
 }
 

package/src/@daf/core/components/Select/MultiSelect/style.js

@@ -0,0 +1,15 @@
+import styled from 'styled-components';
+import { Select } from 'antd';
+
+const MultiSelectStyled = styled(Select)`
+  &.ant-select-single {
+    .ant-select-selector {
+        padding-inline-end: 24px !important;
+        padding: 0 !important;
+        max-width: 56px !important;
+        width: 56px !important;
+    }
+  }
+`;
+
+export default MultiSelectStyled;

package/src/@daf/hooks/useGetQueryParams.js

@@ -18,7 +18,9 @@ export const useGetQueryParams = ({location}) => {
           },
           otherParams: {
             ...rest,
-          }
+          },
+          sortBy,
+          sortDir,
         };
       }, [queryParams]);
 

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

@@ -12,6 +12,7 @@ export const useContributionsGraph = ({
 	}, [data, t]);
 
     const isEmpty = useMemo(() => _data?.length === 0, [_data]);
+    console.log({_data, isEmpty})
 
     const chartConfig = useMemo(() => {
         return {
@@ -20,13 +21,11 @@ export const useContributionsGraph = ({
             yFieldKey: "category",
             seriesField: "type",
             isGroup: true,
-            ...(isEmpty && {
-                xAxisConfig: {
-                    min: 0,
-                    max: 10,
-                    tickCount: 5,
-                }
-            }),
+            xAxisConfig: isEmpty ? {
+                min: 0,
+                max: 10,
+                tickCount: 5,
+            } : {},
             renderTooltipContent: (title, items) => {
 				const tooltipItems = items.map((item) => ({
 					label: item.name,

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

@@ -41,7 +41,7 @@ function ContributionsGraph({
             title={t("Contributions")}
             className="with-border-header h-w-btn-header no-px-body"
         >
-            <BarChart {...chartConfig} height="400px" t={t} />
+            <BarChart {...chartConfig} height="400px" t={t} key={data?.length} />
         </Widget>
     )
 }

package/src/@daf/pages/Documents/config.js

@@ -1,10 +1,10 @@
 export const getFiltersConfig = ({t}) => {
     return {
-   timeframe: {
-		type: "timeframe",
-		label: "Timeframe",
-		style: { flex: 1 },
-	},
+		timeframe: {
+			type: "timeframe",
+			label: "Timeframe",
+			style: { flex: 1 },
+		},
     }
 }
 

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

@@ -14,6 +14,8 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         title: t('ID'),
         ellipsis: true,
         show: true,
+        key: "datastakeId",
+        sorter: () => 0 + 0,
         render: (v, all) => {
           if (all.empty) {
             return <div className="daf-default-cell" />
@@ -27,6 +29,8 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         title: t('Title'),
         ellipsis: true,
         show: true,
+        key: "name",
+        sorter: () => 0 + 0,
         render: (v, all) => {
           if (all.empty) {
             return <div className="daf-default-cell" />
@@ -39,6 +43,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
       title: t("Date"),
       dataIndex: "date",
       key: "date",
+      sorter: () => 0 + 0,
       render: (date, all) => {
           if (all.empty) {
               return <div className="daf-default-cell" />;

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

@@ -1,16 +1,15 @@
 export const getFiltersConfig = ({t}) => {
     return {
-
-		
-timeframe: {
-	type: "timeframe",
-	label: "Timeframe",
-	style: { flex: 1 },
+		timeframe: {
+			type: "timeframe",
+			label: "Timeframe",
+			style: { flex: 1 },
+			t: t,
 		},
 		country: {
 			type: 'select',
 			label: 'Country',
-			placeholder: (t) => `${t('Filter by')} ${t('Country').toLowerCase()}`,
+			placeholder: () => `${t('Filter by')} ${t('Country').toLowerCase()}`,
 			style: { flex: 1 },
 			labelStyle: { flex: 1 },
 			getLabel: (option) => option.label,
@@ -34,7 +33,7 @@ timeframe: {
 	  
 			return t('Province');
 		  },
-		  placeholder: (t) => `${t('Filter by')} ${t('Province').toLowerCase()}`,
+		  placeholder: () => `${t('Filter by')} ${t('Province').toLowerCase()}`,
 		  filters: (data) => ({
 			country: data.country,
 			level: 'level_1',
@@ -66,7 +65,7 @@ timeframe: {
 			return t('Province');
 		  },
 		  show: (data) => !(data.country && data.administrativeLevel1),
-		  placeholder: (t) => `${t('Filter by')} ${t('Territory').toLowerCase()}`,
+		  placeholder: () => `${t('Filter by')} ${t('Territory').toLowerCase()}`,
 		  filters: (data) => ({
 			country: data.country,
 			level: 'level_2',
@@ -82,7 +81,7 @@ timeframe: {
 		category: {
 		  type: 'select',
 		  label: 'Category',
-		  placeholder: (t) => `${t('Filter by')} ${t('Category').toLowerCase()}`,
+		  placeholder: () => `${t('Filter by')} ${t('Category').toLowerCase()}`,
 		  style: { flex: 1 },
 		  labelStyle: { flex: 1 },
 		  getLabel: (option) => option.label,
@@ -106,7 +105,7 @@ timeframe: {
 		positionInTheMineralSupplyChain: {
 		  type: 'select',
 		  label: 'Position',
-		  placeholder: (t) => `${t('Filter by')} ${t('Position').toLowerCase()}`,
+		  placeholder: () => `${t('Filter by')} ${t('Position').toLowerCase()}`,
 		  style: { flex: 1 },
 		  labelStyle: { flex: 1 },
 		  getLabel: (option) => option.label,
@@ -115,7 +114,7 @@ timeframe: {
 		status: {
 		  type: "select",
 		  label: "Status",
-		  placeholder: (t) => `${t("Filter by")} ${t("Status").toLowerCase()}`,
+		  placeholder: () => `${t("Filter by")} ${t("Status").toLowerCase()}`,
 		  style: { flex: 1 },
 		  labelStyle: { fley: 1 },
 		  getLabel: (option) => option.label,
@@ -127,7 +126,6 @@ timeframe: {
 export const getFilterOptions = (options, t) => {
 	const {
 		timeframe = [],
-
 		statusOptions = [],
 		categoryOptions = [],
 		countries = [],
@@ -139,21 +137,27 @@ export const getFilterOptions = (options, t) => {
 		administrativeLevel2,
 		positionInMineralSupplyChainOptions,
 		subCategoriesOptions,
-	  } = options || {};
+		eventCategoryOptions = [],
+	} = options || {};
+
+	const _categoryOptions = eventCategoryOptions?.map((item) => ({
+		value: item.value,
+		label: typeof item.label === 'object' ? Object.values(item.label)[1] : item.label,
+	}))
 
 	const _default  = {
 		timeframe: timeframe,
 		status: [
 			{
 				value: "submitted",
-				label: "Submitted",
+				label: t("Submitted"),
 			},
 			{
 				value: "private",
-				label: "Private",
+				label: t("Private"),
 			},
 		],
-		category: stakeholderCategoryOptions || categoryOptions,
+		category: _categoryOptions,
 		country: countries,
 		subCategory: subCategoriesOptions,
 		// category: category,

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

@@ -14,6 +14,8 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         title: t('ID'),
         ellipsis: true,
         show: true,
+        key: "datastakeId",
+        sorter: () => 0 + 0,
         render: (v, all) => {
           if (all.empty) {
             return <div className="daf-default-cell" />
@@ -27,6 +29,8 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         title: t('Title'),
         ellipsis: true,
         show: true,
+        key: "name",
+        sorter: () => 0 + 0,
         render: (v, all) => {
           if (all.empty) {
             return <div className="daf-default-cell" />
@@ -39,6 +43,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
       title: t("Date"),
       dataIndex: "date",
       key: "date",
+      sorter: () => 0 + 0,
       render: (date, all) => {
           if (all.empty) {
               return <div className="daf-default-cell" />;

package/src/@daf/pages/Events/Incidents/config.js

@@ -1,11 +1,9 @@
 export const getFiltersConfig = ({t}) => {
     return {
-
-		
-timeframe: {
-	type: "timeframe",
-	label: "Timeframe",
-	style: { flex: 1 },
+		timeframe: {
+			type: "timeframe",
+			label: "Timeframe",
+			style: { flex: 1 },
 		},
 		country: {
 			type: 'select',
@@ -127,7 +125,6 @@ timeframe: {
 export const getFilterOptions = (options, t) => {
 	const {
 		timeframe = [],
-
 		statusOptions = [],
 		categoryOptions = [],
 		countries = [],
@@ -139,21 +136,27 @@ export const getFilterOptions = (options, t) => {
 		administrativeLevel2,
 		positionInMineralSupplyChainOptions,
 		subCategoriesOptions,
-	  } = options || {};
+		eventCategoryOptions = [],
+	} = options || {};
+
+	const _categoryOptions = eventCategoryOptions?.map((item) => ({
+		value: item.value,
+		label: typeof item.label === 'object' ? Object.values(item.label)[0] : item.label,
+	}))
 
 	const _default  = {
 		timeframe: timeframe,
 		status: [
 			{
 				value: "submitted",
-				label: "Submitted",
+				label: t("Submitted"),
 			},
 			{
 				value: "private",
-				label: "Private",
+				label: t("Private"),
 			},
 		],
-		category: stakeholderCategoryOptions || categoryOptions,
+		category: _categoryOptions,
 		country: countries,
 		subCategory: subCategoriesOptions,
 		// category: category,

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

@@ -14,6 +14,8 @@ export const getColumns = ({ t, goTo, user, options, activeTab, getRedirectLink,
     title: t('ID'),
     ellipsis: true,
     show: true,
+    key: "datastakeId",
+    sorter: () => 0 + 0,
     render: (v, all) => {
       if (all.empty) {
         return <div className="daf-default-cell" />
@@ -27,6 +29,8 @@ export const getColumns = ({ t, goTo, user, options, activeTab, getRedirectLink,
     title: t('Title'),
     ellipsis: true,
     show: true,
+    key: "name",
+    sorter: () => 0 + 0,
     render: (v, all) => {
       if (all.empty) {
         return <div className="daf-default-cell" />
@@ -40,6 +44,8 @@ export const getColumns = ({ t, goTo, user, options, activeTab, getRedirectLink,
     title: t('Type'),
     ellipsis: true,
     show: true,
+    key: "typeOfEvent",
+    sorter: () => 0 + 0,
     render: (v, all) => {
       if (all.empty) {
         return <div className="daf-default-cell" />

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

@@ -1,6 +1,5 @@
 export const getFiltersConfig = ({t}) => {
     return {
-
         timeframe: {
             type: "timeframe",
             label: "Timeframe",
@@ -86,21 +85,6 @@ export const getFiltersConfig = ({t}) => {
 		  labelStyle: { flex: 1 },
 		  getLabel: (option) => option.label,
 		  getValue: (option) => option.value,
-		  filterOptions: (val) => {
-			if (val) {
-			  const { option, filters } = val
-			  if (filters && option) {
-				const { filters: optionFilters } = option;
-				if (Array.isArray(optionFilters) && optionFilters.length) {
-				  const { value, condition } = optionFilters[0];
-				  if (condition === 'includes') {
-					return value.includes('corporation');
-				  }
-				}
-			  }
-			}
-			return true;
-		  },
 		},
 		category:{
 			type: 'select',

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

@@ -15,6 +15,8 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         title: t('ID'),
         ellipsis: true,
         show: true,
+        key: "datastakeId",
+        sorter: () => 0 + 0,
         render: (v, all) => {
           if (all.empty) {
             return <div className="daf-default-cell" />
@@ -28,6 +30,8 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         title: t('Name'),
         ellipsis: true,
         show: true,
+        key: "name",
+        sorter: () => 0 + 0,
         render: (v, all) => {
           if (all.empty) {
             return <div className="daf-default-cell" />
@@ -68,7 +72,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
     },     
     {
         dataIndex: 'category',
-        title: t('Type'),
+        title: t('type'),
         ellipsis: true,
         show: true,
         render: (v, all) => {

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

@@ -3,7 +3,7 @@ export const getFiltersConfig = ({t}) => {
 		country: {
 		  type: 'select',
 		  label: 'Country',
-		  placeholder: (t) => `${t('Filter by')} ${t('Country').toLowerCase()}`,
+		  placeholder: () => `${t('Filter by')} ${t('Country').toLowerCase()}`,
 		  style: { flex: 1 },
 		  labelStyle: { flex: 1 },
 		  getLabel: (option) => option.label,
@@ -27,7 +27,7 @@ export const getFiltersConfig = ({t}) => {
 	  
 			return t('Province');
 		  },
-		  placeholder: (t) => `${t('Filter by')} ${t('Province').toLowerCase()}`,
+		  placeholder: () => `${t('Filter by')} ${t('Province').toLowerCase()}`,
 		  filters: (data) => ({
 			country: data.country,
 			level: 'level_1',
@@ -59,7 +59,7 @@ export const getFiltersConfig = ({t}) => {
 			return t('Province');
 		  },
 		  show: (data) => !(data.country && data.administrativeLevel1),
-		  placeholder: (t) => `${t('Filter by')} ${t('Territory').toLowerCase()}`,
+		  placeholder: () => `${t('Filter by')} ${t('Territory').toLowerCase()}`,
 		  filters: (data) => ({
 			country: data.country,
 			level: 'level_2',
@@ -75,31 +75,25 @@ export const getFiltersConfig = ({t}) => {
 		product: {
 		  type: 'select',
 		  label: 'Product',
-		  placeholder: (t) => `${t('Filter by')} ${t('Product').toLowerCase()}`,
+		  placeholder: () => `${t('Filter by')} ${t('Product').toLowerCase()}`,
+		  style: { flex: 1 },
+		  labelStyle: { flex: 1 },
+		  getLabel: (option) => option.label,
+		  getValue: (option) => option.value,
+		},		
+		type: {
+		  type: 'select',
+		  label: 'Type',
+		  placeholder: () => `${t('Filter by')} ${t('Type').toLowerCase()}`,
 		  style: { flex: 1 },
 		  labelStyle: { flex: 1 },
 		  getLabel: (option) => option.label,
 		  getValue: (option) => option.value,
-		  filterOptions: (val) => {
-			if (val) {
-			  const { option, filters } = val
-			  if (filters && option) {
-				const { filters: optionFilters } = option;
-				if (Array.isArray(optionFilters) && optionFilters.length) {
-				  const { value, condition } = optionFilters[0];
-				  if (condition === 'includes') {
-					return value.includes('corporation');
-				  }
-				}
-			  }
-			}
-			return true;
-		  },
 		},
 		positionInTheMineralSupplyChain: {
 		  type: 'select',
 		  label: 'Position',
-		  placeholder: (t) => `${t('Filter by')} ${t('Position').toLowerCase()}`,
+		  placeholder: () => `${t('Filter by')} ${t('Position').toLowerCase()}`,
 		  style: { flex: 1 },
 		  labelStyle: { flex: 1 },
 		  getLabel: (option) => option.label,
@@ -108,7 +102,7 @@ export const getFiltersConfig = ({t}) => {
 		status: {
 		  type: "select",
 		  label: "Status",
-		  placeholder: (t) => `${t("Filter by")} ${t("Status").toLowerCase()}`,
+		  placeholder: () => `${t("Filter by")} ${t("Status").toLowerCase()}`,
 		  style: { flex: 1 },
 		  labelStyle: { fley: 1 },
 		  getLabel: (option) => option.label,
@@ -129,23 +123,26 @@ export const getFilterOptions = (options, t) => {
 		stakeholderSubCategoriesOptions,
 		administrativeLevel1,
 		administrativeLevel2,
+		mineralOptions,
+		locationCategories = [],
 	  } = options || {};
 
 	const _default  = {
 		category: stakeholderCategoryOptions || categoryOptions,
 		country: countries,
-		product: product,
+		product: mineralOptions,
+		type: locationCategories,
 		administrativeLevel1,
 		administrativeLevel2,
 		subCategory: subCategoriesOptions,
 		status: [
 			{
 				value: "submitted",
-				label: "Submitted",
+				label: t("Submitted"),
 			},
 			{
 				value: "private",
-				label: "Private",
+				label: t("Private"),
 			},
 		],
 	}

package/src/@daf/pages/Partners/columns.js

@@ -4,7 +4,7 @@ import MoreMenu from '../../core/components/Table/MoreMenu/index.jsx';
 import TooltipIcon from '../../core/components/Icon/TooltipIcon.jsx';
 import { findOptions, camelCaseToTitle } from '../../../helpers/StringHelper.js';
 import { copyToClipboard } from '../../../helpers/copyToClipboard.js';
-import { partnershipTypes, partnerTypes } from './config.js';
+import { getPartnershipTypes, getPartnerTypes } from './config.js';
 
 export const getColumns = ({
 	t,
@@ -63,6 +63,7 @@ export const getColumns = ({
 				return <div className="daf-default-cell" />;
 			}
 
+			const partnershipTypes = getPartnershipTypes(t);
 			return partnershipTypes.find((v) => v.value === val)?.label || val || "-";
 		},
 	},
@@ -76,6 +77,7 @@ export const getColumns = ({
 				return <div className="daf-default-cell" />;
 			}
 
+			const partnerTypes = getPartnerTypes(t);
 			return partnerTypes.find((v) => v.value === val)?.label || val || "-";
 		},
 	},

package/src/@daf/pages/Partners/config.js

@@ -20,13 +20,17 @@ export const checkboxConfig = {
 	datastakeId: "ID",
 };
 
-export const partnerTypes = [
-	{ label: "Individual", value: "individual" },
-	{ label: "Organisation", value: "organisation" },
-];
+export const getPartnerTypes = (t) => {
+	return [	
+		{ label: t("Individual"), value: "individual" },
+		{ label: t("Organisation"), value: "organisation" },
+	]
+}
 
-export const partnershipTypes = [
-	{ label: "Source", value: "source" },
-	{ label: "Client", value: "client" },
-	{ label: "Exchange", value: "exchange" },
-];
+export const getPartnershipTypes = (t) => {
+	return [
+		{ label: t("Source"), value: "source" },
+		{ label: t("Client"), value: "client" },
+		{ label: t("Exchange"), value: "exchange" },
+	]
+}