datastake-daf 0.6.841 → 0.6.842

package/dist/pages/index.js

@@ -13677,7 +13677,7 @@ const getColors$1 = theme => {
 
 function Locations({
   selectedSources = {},
-  data = [],
+  data = {},
   loading = false,
   t = () => {},
   options = {},
@@ -13688,23 +13688,23 @@ function Locations({
   } = options;
   const colors = getColors$1(theme);
   const pieData = React.useMemo(() => {
-    // eslint-disable-next-line no-shadow-restricted-names
-    const {
-      undefined: undefined$1,
-      ...rest
-    } = data;
-    const total = Object.values(rest).reduce((all, val) => all + (val || 0), 0);
+    const rest = data || {};
+    const total = Object.values(rest).reduce((sum, val) => sum + (val || 0), 0);
     return Object.keys(rest).map((key, index) => {
       const color = colors[index % colors.length];
+      const value = rest[key] || 0;
       return {
-        value: rest[key] || 0,
-        percent: (rest[key] || 0) / total,
-        color: color,
-        label: findOptions(key, countries),
-        key: key
+        value,
+        percent: total ? value / total : 0,
+        color,
+        label: findOptions(key, countries) || key,
+        key
       };
     });
-  }, [data, countries]);
+  }, [data, countries, colors]);
+  console.log({
+    data
+  });
   const isEmpty = React.useMemo(() => Object.keys(data).filter(k => !!data[k]).length === 0, [data]);
   const getTooltipChildren = React.useCallback(item => {
     if (isEmpty) {
@@ -13904,7 +13904,7 @@ function ChartsContainer({
       range: selectedRange
     },
     stop: selectedSources?.loading,
-    defaultData: []
+    defaultData: {}
   }), [isTradeActions, selectedSources, selectedRange]);
   const {
     loading,
@@ -13913,6 +13913,7 @@ function ChartsContainer({
     config: defaultConfig,
     onFetch: () => setPreviousRange(selectedRange)
   });
+  console.log('ChartsContainer data:', data);
   return /*#__PURE__*/jsxRuntime.jsx(Widget, {
     title: isTradeActions ? t("Trade Actors") : t("Mining Sites"),
     className: "with-border-header",
@@ -13929,7 +13930,7 @@ function ChartsContainer({
         selectedRange: selectedRange,
         options: options
       }), /*#__PURE__*/jsxRuntime.jsx(Locations, {
-        data: data?.locations,
+        data: data?.location,
         t: t,
         theme: theme,
         selectedSources: selectedSources,
@@ -43309,7 +43310,7 @@ const getColumns$a = ({
         className: "daf-default-cell"
       });
     }
-    const region = getLinkValue(all?.location?.administrativeLevel1, all?.location?.linking?.SCL);
+    const region = all?.location ? getLinkValue(all?.location?.administrativeLevel1, all?.location?.linking?.SCL) : getLinkValue(all?.administrativeLevel1Name, all?.linking?.SCL) || all?.administrativeLevel1Name;
     return region ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: region,
       children: region
@@ -43317,7 +43318,7 @@ const getColumns$a = ({
   }
 }, {
   dataIndex: 'territory',
-  title: findOptions(user?.company?.country, options?.administrativeLevel2)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel2) : t("Territory"),
+  title: findOptions(user?.company?.country, options?.administrativeLevel2)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel2Name) : t("Territory"),
   ellipsis: true,
   show: true,
   render: (v, all) => {
@@ -43326,7 +43327,7 @@ const getColumns$a = ({
         className: "daf-default-cell"
       });
     }
-    const district = getLinkValue(all?.location?.administrativeLevel2, all?.location?.linking?.SCL);
+    const district = all?.location ? getLinkValue(all?.location?.administrativeLevel2, all?.location?.linking?.SCL) : getLinkValue(all?.administrativeLevel2, all?.linking?.SCL) || all?.administrativeLevel2;
     return district ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: district,
       children: district
@@ -43739,7 +43740,7 @@ const getColumns$9 = ({
         className: "daf-default-cell"
       });
     }
-    const region = getLinkValue(all?.location?.administrativeLevel1, all?.location?.linking?.SCL);
+    const region = all?.location ? getLinkValue(all?.location?.administrativeLevel1, all?.location?.linking?.SCL) : getLinkValue(all?.administrativeLevel1Name, all?.linking?.SCL) || all?.administrativeLevel1Name;
     return region ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: region,
       children: region
@@ -43756,7 +43757,7 @@ const getColumns$9 = ({
         className: "daf-default-cell"
       });
     }
-    const district = getLinkValue(all?.location?.administrativeLevel2, all?.location?.linking?.SCL);
+    const district = all?.location ? getLinkValue(all?.location?.administrativeLevel2, all?.location?.linking?.SCL) : getLinkValue(all?.administrativeLevel2, all?.linking?.SCL) || all?.administrativeLevel2;
     return district ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: district,
       children: district

package/package.json

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

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

@@ -6,28 +6,29 @@ import Widget from '../../../../../../../core/components/Dashboard/Widget/index.
 import Chart from '../../../../../../../core/components/Charts/PieChart/chart.jsx';
 import { getColors } from './config';
 
-function Locations({selectedSources = {}, data = [], loading = false, t = () => {}, options = {}, theme = {}}) {
+function Locations({selectedSources = {}, data = {}, loading = false, t = () => {}, options = {}, theme = {}}) {
     const { countries = [] } = options;
     const colors = getColors(theme);
-
     const pieData = useMemo(() => {
-        // eslint-disable-next-line no-shadow-restricted-names
-        const { undefined, ...rest } = data;
-        const total = Object.values(rest).reduce((all, val) => all + (val || 0), 0);
-    
-        return Object.keys(rest).map((key, index) => {
-          const color = colors[index % colors.length];
-        
-          return {
-            value: rest[key] || 0,
-            percent: (rest[key] || 0) / total,
-            color: color,
-            label: findOptions(key, countries),
-            key: key,
-          };
-        });
-    }, [data, countries]);
-
+      const rest = data || {};
+  
+      const total = Object.values(rest).reduce((sum, val) => sum + (val || 0), 0);
+  
+      return Object.keys(rest).map((key, index) => {
+        const color = colors[index % colors.length];
+        const value = rest[key] || 0;
+  
+        return {
+          value,
+          percent: total ? value / total : 0,
+          color,
+          label: findOptions(key, countries) || key,
+          key,
+        };
+      });
+  }, [data, countries, colors]);
+  
+console.log({data});
     const isEmpty = useMemo(
         () => Object.keys(data).filter((k) => !!data[k]).length === 0,
         [data],

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

@@ -24,13 +24,15 @@ function ChartsContainer({selectedSources = {}, isTradeActions = false, t = () =
 				range: selectedRange,
 			},
 			stop: selectedSources?.loading,
-			defaultData: [],
+			defaultData: {},
 		}),
 		[isTradeActions, selectedSources, selectedRange],
 	);
 
     const { loading, data } = useWidgetFetch({config: defaultConfig, onFetch: () => setPreviousRange(selectedRange)});
 
+    console.log('ChartsContainer data:', data);
+
     return (
         <Widget
             title={isTradeActions ? t("Trade Actors") : t("Mining Sites")}
@@ -50,12 +52,13 @@ function ChartsContainer({selectedSources = {}, isTradeActions = false, t = () =
                     options={options}
                 />
                 <Locations 
-                    data={data?.locations} 
+                    data={data?.location} 
                     t={t} 
                     theme={theme} 
                     selectedSources={selectedSources} 
                     loading={loading} 
                     options={options} 
+
                 />
                 <GenderDistribution
                     selectedSources={selectedSources}

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

@@ -79,14 +79,16 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
           return <div className="daf-default-cell" />
         }
 
-        const region = getLinkValue(all?.location?.administrativeLevel1, all?.location?.linking?.SCL);
+        const region = all?.location 
+          ? getLinkValue(all?.location?.administrativeLevel1, all?.location?.linking?.SCL)
+          : (getLinkValue(all?.administrativeLevel1Name, all?.linking?.SCL) || all?.administrativeLevel1Name);
 
         return region ? <Tooltip title={region}>{region}</Tooltip> : '-';
       },
   },    
   {
       dataIndex: 'territory',
-      title: findOptions(user?.company?.country, options?.administrativeLevel2)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel2) : t("Territory"),
+      title: findOptions(user?.company?.country, options?.administrativeLevel2)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel2Name) : t("Territory"),
       ellipsis: true,
       show: true,
       render: (v, all) => {
@@ -94,7 +96,9 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
           return <div className="daf-default-cell" />
         }
 
-        const district = getLinkValue(all?.location?.administrativeLevel2, all?.location?.linking?.SCL);
+        const district = all?.location
+          ? getLinkValue(all?.location?.administrativeLevel2, all?.location?.linking?.SCL)
+          : (getLinkValue(all?.administrativeLevel2, all?.linking?.SCL) || all?.administrativeLevel2);
 
         return district ? <Tooltip title={district}>{district}</Tooltip> : '-';
       },

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

@@ -79,7 +79,9 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
           return <div className="daf-default-cell" />
         }
 
-        const region = getLinkValue(all?.location?.administrativeLevel1, all?.location?.linking?.SCL);
+        const region = all?.location 
+          ? getLinkValue(all?.location?.administrativeLevel1, all?.location?.linking?.SCL)
+          : (getLinkValue(all?.administrativeLevel1Name, all?.linking?.SCL) || all?.administrativeLevel1Name);
 
         return region ? <Tooltip title={region}>{region}</Tooltip> : '-';
       },
@@ -94,11 +96,13 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
           return <div className="daf-default-cell" />
         }
 
-        const district = getLinkValue(all?.location?.administrativeLevel2, all?.location?.linking?.SCL);
+        const district = all?.location
+          ? getLinkValue(all?.location?.administrativeLevel2, all?.location?.linking?.SCL)
+          : (getLinkValue(all?.administrativeLevel2, all?.linking?.SCL) || all?.administrativeLevel2);
 
         return district ? <Tooltip title={district}>{district}</Tooltip> : '-';
       },
-  },  
+  },    
     {
         dataIndex: 'eventCategory',
         title: t('Category'),