datastake-daf 0.6.816 → 0.6.817

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

@@ -105,11 +105,15 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
               return <div className="daf-default-cell" />;
           }
 
-          const sources = sourceAvatarConfig(val, user, applications);
+        if (!val || val?.length === 0) {
+          return "-";
+        }
+
+        const sources = sourceAvatarConfig(val, user, applications);
 
-          return <AvatarGroup items={sources}></AvatarGroup>;
+        return <AvatarGroup items={sources} />;
       },
-  },
+    },
     {
         title: t("Last Update"),
         dataIndex: "updatedAt",

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

@@ -0,0 +1,110 @@
+import React from 'react';
+import { Tooltip } from 'antd';
+import { findOptions, getLinkValue } 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';
+import NavigationAction from '../../../core/components/Table/NavigationAction/index.jsx';
+import { renderStatusTag } from '../../../utils/tags.js';
+
+export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, applications}) => [
+    {
+        dataIndex: 'datastakeId',
+        title: t('ID'),
+        ellipsis: true,
+        show: true,
+        key: "datastakeId",
+        sorter: () => 0 + 0,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+    
+          return <Tooltip title={v}>{v}</Tooltip>;
+        },
+    },
+    {
+        dataIndex: 'name',
+        title: t('Name'),
+        ellipsis: true,
+        show: true,
+        key: "name",
+        sorter: () => 0 + 0,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+    
+          return <Tooltip title={v}>{v}</Tooltip>;
+        },
+    },      
+    {
+      title: t("Last Update"),
+      dataIndex: "updatedAt",
+      key: "updatedAt",
+      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,
+  }, 
+  {
+    title: t("Sources"),
+    dataIndex: "sources",
+    key: "sources",
+    show: activeTab !== "own",
+    render: (val, all) => {
+        if (all.empty) {
+            return <div className="daf-default-cell" />;
+        }
+
+      if (!val || val?.length === 0) {
+        return "-";
+      }
+
+      const sources = sourceAvatarConfig(val, user, applications);
+
+      return <AvatarGroup items={sources} />;
+    },
+  },
+    {
+        title: t("Status"),
+        dataIndex: 'status',
+        ellipsis: true,
+        show: activeTab == "own",
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+          const _val = all?.published || all?.status === "submitted" ? "submitted" : v;
+
+          return renderStatusTag({ value: _val, t });
+        },
+    },
+    {
+        id: 'actions',
+        title: "",
+        width: 60,
+        render: (_, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />;
+          }
+  
+          const onClick = () => {
+            let link = `/app/view/${subject}/${all.datastakeId}`;
+            if (activeTab === "shared") {
+              link += `?sourceId=${all?.authorId?.id}`;
+            }
+            goTo(getRedirectLink(link));
+          };
+  
+          return <NavigationAction onClick={onClick} theme={theme} />;
+        }
+      }
+].filter((column) => column.show !== false);

package/src/@daf/pages/Stakeholders/ArmedGroups/config.js

@@ -0,0 +1,41 @@
+import { getStatusOptions } from '../../../utils/filters';
+
+export const getFiltersConfig = ({t}) => {
+    return {
+		status: {
+		  type: "select",
+		  label: "Status",
+		  placeholder: () => `${t("Filter by")} ${t("Status").toLowerCase()}`,
+		  style: { flex: 1 },
+		  labelStyle: { fley: 1 },
+		  getLabel: (option) => option.label,
+		  getValue: (option) => option.value,
+		},
+        timeframe: {
+			type: "timeframe",
+			label: "Timeframe",
+			style: { flex: 1 },
+		},
+	}
+}
+
+export const getFilterOptions = (options, t) => {
+	const _default  = {
+		status: getStatusOptions(t) || [],
+        timeframe: [],
+	}
+
+	return _default;
+}
+
+export const formConfig = {
+	namespace: 'armed-groups',
+	view: ['scoping', 'new'],
+	scope: 'global',
+	formType: 'armed-group',
+}
+
+export const viewConfig = {
+	title: "Armed Groups",
+	createTitle: "New Armed Group",
+}

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

@@ -49,7 +49,13 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const country = findOptions(v, data?.options?.positionSupplyChainOptions || data?.options?.optionPositionSupplyChain);
+          const positionSupplyChainOptions = [
+            ...(data?.options?.positionSupplyChainOptions || []), 
+            ...(options?.positionSupplyChainOptions || []),
+            ...(options?.optionPositionSupplyChain || [])
+          ]
+
+          const country = findOptions(v, positionSupplyChainOptions);
 
           return country ? <Tooltip title={country}>{country}</Tooltip> : '-';
         },
@@ -66,7 +72,13 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const subCategory = findOptions(v, data?.options?.subCategoriesOptions || data?.options?.subCategory);
+          const subCategoriesOptions = [
+            ...(data?.options?.subCategoriesOptions || []), 
+            ...(options?.subCategoriesOptions || []),
+            ...(options?.subCategory || [])
+          ]
+
+          const subCategory = findOptions(v, subCategoriesOptions);
     
           return subCategory ? <Tooltip title={subCategory}>{subCategory}</Tooltip> : '-';
         },
@@ -116,21 +128,25 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
       },
       ellipsis: true,
   }, 
-    {
-        title: t("Sources"),
-        dataIndex: "sources",
-        key: "sources",
-        show: activeTab !== "own",
-        render: (val, all) => {
-            if (all.empty) {
-                return <div className="daf-default-cell" />;
-            }
+  {
+    title: t("Sources"),
+    dataIndex: "sources",
+    key: "sources",
+    show: activeTab !== "own",
+    render: (val, all) => {
+        if (all.empty) {
+            return <div className="daf-default-cell" />;
+        }
+
+      if (!val || val?.length === 0) {
+        return "-";
+      }
 
-            const sources = sourceAvatarConfig(val, user, applications);
+      const sources = sourceAvatarConfig(val, user, applications);
 
-            return <AvatarGroup items={sources}></AvatarGroup>;
-        },
+      return <AvatarGroup items={sources} />;
     },
+  },
     {
         title: t("Status"),
         dataIndex: 'status',

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

@@ -66,7 +66,13 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const activity = findOptions(v, data?.options?.activityAtSiteOptions || data?.options?.activityAtSite);
+          const activityAtSiteOptions = [
+            ...(data?.options?.activityAtSiteOptions || []), 
+            ...(options?.activityAtSiteOptions || []),
+            ...(options?.activityAtSite || [])
+          ]
+
+          const activity = findOptions(v, activityAtSiteOptions);
     
           return activity ? <Tooltip title={activity}>{activity}</Tooltip> : '-';
         },
@@ -101,20 +107,24 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         ellipsis: true,
     },   
     {
-        title: t("Sources"),
-        dataIndex: "sources",
-        key: "sources",
-        show: activeTab !== "own",
-        render: (val, all) => {
-            if (all.empty) {
-                return <div className="daf-default-cell" />;
-            }
+      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);
+        if (!val || val?.length === 0) {
+          return "-";
+        }
 
-          return <AvatarGroup items={sources}></AvatarGroup>;
-        },
-    },    
+        const sources = sourceAvatarConfig(val, user, applications);
+
+        return <AvatarGroup items={sources} />;
+      },
+    },   
     {
         title: t("Status"),
         dataIndex: "status",

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

@@ -43,7 +43,9 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const category = findOptions(v, options?.categoriesOptions);
+          const categoriesOptions = [...(options?.categoriesOptions || []), ...(options?.category || [])]
+
+          const category = findOptions(v, categoriesOptions);
     
           return category ? <Tooltip title={category}>{category}</Tooltip> : '-';
         },
@@ -58,7 +60,9 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const subCategory = findOptions(v, options?.subCategoriesOptions);
+          const subCategoriesOptions = [...(options?.subCategoriesOptions || []), ...(options?.subCategory || [])];
+
+          const subCategory = findOptions(v, subCategoriesOptions);
     
           return subCategory ? <Tooltip title={subCategory}>{subCategory}</Tooltip> : '-';
         },
@@ -89,12 +93,12 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
                 return <div className="daf-default-cell" />;
             }
             if (!val || val?.length === 0) {
-                return "--";
+                return "-";
             }
 
             const sources = sourceAvatarConfig(val, user, applications);
 
-            return <AvatarGroup items={sources}></AvatarGroup>;
+            return <AvatarGroup items={sources} />;
         },
     },
     {

package/src/@daf/pages/Summary/Activities/MonitoringCampaign/components/BiodiversityHabitat/ObservedFauna.jsx

@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 import { Widget, BarChart } from '../../../../../../../../src/index.js';
-import { calculateNaturalAxisConfig, mergeDefaultCategories } from '../chartHelpers.js';
+import { calculateNiceAxisConfig, mergeDefaultCategories } from '../chartHelpers.js';
 
 const ObservedFauna = ({
     observedFaunaChart,
@@ -32,11 +32,16 @@ const ObservedFauna = ({
     }, [observedFaunaChart, options]);
 
     const xAxisConfig = useMemo(() => {
-        const maxValue = chartData && chartData.length > 0
-            ? Math.max(...chartData.map(item => Number(item?.value) || 0))
-            : 0;
-
-        return calculateNaturalAxisConfig(maxValue);
+        return calculateNiceAxisConfig(
+            chartData,
+            'value',
+            1.2, // multiplier: 20% padding
+            {
+                min: 0,
+                max: 10,
+                tickMethod: () => [0, 2, 4, 6, 8, 10]
+            }
+        );
     }, [chartData]);
 
     return (

package/src/@daf/pages/Summary/Activities/MonitoringCampaign/components/MangroveGrowth/PlantedSpecies.jsx

@@ -2,14 +2,7 @@ import React, { useMemo, useCallback } from 'react';
 import { Widget, PieChart } from '../../../../../../../../src/index.js';
 import { renderTooltipJsx } from '../../../../../../utils/tooltip.js';
 
-// Color mapping for planted species
-const PLANTED_SPECIES_COLORS = {
-    rhyzophora_mangle: '#016C6E',
-    rhyzophora: '#00AEB1',
-    rhyzophora_sp: '#A0EBEC',
-};
-
-const DEFAULT_COLOR = '#9E9E9E';
+const COLORS = ['#6AD99E', '#F5C2AC', '#F0A888', '#DF571E', '#C04B19', '#9B3D14', '#7A2F0F'];
 
 const PlantedSpecies = ({
     plantedSpeciesChart,
@@ -34,7 +27,7 @@ const PlantedSpecies = ({
         return data.map((item, index) => ({
             value: Number(item?.count) || 0,
             percent: total > 0 ? (Number(item?.count) || 0) / total : 0,
-            color: PLANTED_SPECIES_COLORS[item?.name] || DEFAULT_COLOR,
+            color: COLORS[index % COLORS.length],
             label: optionsMap[item?.name] || item?.name || '',
             key: item?.name || `item-${index}`,
         }));
@@ -51,26 +44,18 @@ const PlantedSpecies = ({
                 return null;
             }
 
-            // Calculate total from all items
-            const total = pieData.reduce((sum, dataItem) => sum + (dataItem.value || 0), 0);
-
-            // Show all items in the tooltip, sorted by value (descending)
-            const allItems = pieData
-                .filter(dataItem => dataItem.value > 0)
-                .sort((a, b) => b.value - a.value)
-                .map(dataItem => ({
-                    color: dataItem.color,
-                    label: dataItem.label || '',
-                    value: dataItem.value || 0,
-                }));
-
             return renderTooltipJsx({
                 title: t("Planted Species"),
-                subTitle: total.toLocaleString(),
-                items: allItems,
+                items: [
+                    {
+                        color: item.color,
+                        label: item.label || '',
+                        value: item.value || 0,
+                    },
+                ],
             });
         },
-        [t, isEmpty, pieData]
+        [t, isEmpty]
     );
 
     return (

package/src/@daf/pages/Summary/Activities/MonitoringCampaign/components/MangroveGrowth/SeedlingsHeight.jsx

@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 import { Widget, ColumnChart } from '../../../../../../../../src/index.js';
-import { calculateNaturalAxisConfig, mergeDefaultCategories } from '../chartHelpers.js';
+import { calculateNiceAxisConfig, mergeDefaultCategories } from '../chartHelpers.js';
 
 // Default height ranges to always display
 const DEFAULT_HEIGHT_RANGES = [
@@ -26,13 +26,16 @@ const SeedlingsHeight = ({
     }, [seedlingsHeightChart]);
 
     const yAxisConfig = useMemo(() => {
-        // Calculate max value from data
-        const maxValue = chartData && chartData.length > 0
-            ? Math.max(...chartData.map(item => Number(item?.value) || 0))
-            : 0;
-
-        // Use the helper function to calculate natural number axis configuration
-        return calculateNaturalAxisConfig(maxValue);
+        return calculateNiceAxisConfig(
+            chartData,
+            'value',
+            2, // multiplier: double the max value
+            {
+                min: 0,
+                max: 20,
+                tickMethod: () => [0, 5, 10, 15, 20]
+            }
+        );
     }, [chartData]);
 
     return (
@@ -55,10 +58,10 @@ const SeedlingsHeight = ({
                             const item = data[0]?.data || data[0];
                             return {
                                 title: t("Seedlings Height"),
+                                subTitle: title,
                                 items: [
                                     {
-                                        color: "#016C6E",
-                                        label: title,
+                                        label: t("Count"),
                                         value: item?.value || 0,
                                     },
                                 ],

package/src/@daf/pages/Summary/Activities/MonitoringCampaign/components/MangroveGrowth/VegetationHealth.jsx

@@ -2,22 +2,7 @@ import React, { useMemo, useCallback } from 'react';
 import { Widget, PieChart } from '../../../../../../../../src/index.js';
 import { renderTooltipJsx } from '../../../../../../utils/tooltip.js';
 
-// Color mapping for vegetation health conditions
-const VEGETATION_HEALTH_COLORS = {
-    healthy_leaves: '#6AD99E',
-    white_spots: '#E8F0F0',
-    yellowing_leaves: '#CDC14F',
-    black_spots: '#2E3131',
-    reddish_spots: '#CB2525',
-    leaf_mosaic: '#B59E76',
-    spider_webs: '#F8F6EF',
-    damage_from_insects: '#DE8954',
-    dry_dead_leaves: '#767870',
-    no_leaves: '#F97066',
-    other: '#BDBDBD',
-};
-
-const DEFAULT_COLOR = '#9E9E9E';
+const COLORS = ['#016C6E', '#F5C2AC', '#F0A888', '#DF571E', '#C04B19', '#9B3D14', '#7A2F0F'];
 
 const VegetationHealth = ({
     vegetationHealthChart,
@@ -41,15 +26,15 @@ const VegetationHealth = ({
         return data.map((item, index) => ({
             value: Number(item?.count) || 0,
             percent: total > 0 ? (Number(item?.count) || 0) / total : 0,
-            color: VEGETATION_HEALTH_COLORS[item?.name] || DEFAULT_COLOR,
+            color: COLORS[index % COLORS.length],
             label: optionsMap[item?.name] || item?.name || '',
             key: item?.name || `item-${index}`,
         }));
     }, [vegetationHealthChart, optionsMap]);
 
     const isEmpty = useMemo(() => {
-        return !vegetationHealthChart || vegetationHealthChart.length === 0 ||
-            vegetationHealthChart.every(item => !item?.count || Number(item.count) === 0);
+        return !vegetationHealthChart || vegetationHealthChart.length === 0 || 
+               vegetationHealthChart.every(item => !item?.count || Number(item.count) === 0);
     }, [vegetationHealthChart]);
 
     const getTooltipChildren = useCallback(

package/src/@daf/pages/Summary/Activities/MonitoringCampaign/components/SoilWaterProfile/SoilType.jsx

@@ -3,15 +3,7 @@ import { Widget, PieChart } from '../../../../../../../../src/index.js';
 import { renderTooltipJsx } from '../../../../../../utils/tooltip.js';
 import { renderPercentage } from '../../../../../../utils/numbers.js';
 
-// Color mapping for soil types
-const SOIL_TYPE_COLORS = {
-    sandy: '#00AEB1',
-    mixed: '#016C6E',
-    clay: '#A0EBEC',
-    muddy: '#4FB3A1',
-};
-
-const DEFAULT_COLOR = '#9E9E9E';
+const COLORS = ['#016C6E', '#4FB3A1', '#A8E6CF', '#FFD93D', '#F0A888', '#DF571E', '#C04B19'];
 
 const SoilType = ({
     soilTypeChart,
@@ -36,7 +28,7 @@ const SoilType = ({
         return data.map((item, index) => ({
             value: Number(item?.count) || 0,
             percent: total > 0 ? (Number(item?.count) || 0) / total : 0,
-            color: SOIL_TYPE_COLORS[item?.soilType] || DEFAULT_COLOR,
+            color: COLORS[index % COLORS.length],
             label: optionsMap[item?.soilType] || item?.soilType || '',
             key: item?.soilType || `item-${index}`,
         }));
@@ -53,21 +45,17 @@ const SoilType = ({
                 return null;
             }
 
-            // Show all items in the tooltip, sorted by percentage (descending)
-            const allItems = pieData
-                .filter(dataItem => dataItem.value > 0)
-                .sort((a, b) => b.percent - a.percent)
-                .map(dataItem => ({
-                    color: dataItem.color,
-                    label: dataItem.label || '',
-                    value: renderPercentage(Math.round(dataItem.percent * 100)),
-                }));
-
             return renderTooltipJsx({
                 title: t("Soil Type"),
-                items: allItems,
+                items: [
+                    {
+                        color: item.color,
+                        label: optionsMap[item.label] || item.label || '',
+                        value: `${ renderPercentage(item.percent.toFixed(2) * 100)}`,
+                    },
+                ],
             });
-        }, [t, isEmpty, pieData]);
+        }, [t, isEmpty, optionsMap]);
 
     return (
         <Widget

package/src/@daf/pages/Summary/Activities/MonitoringCampaign/components/SoilWaterProfile/WaterQuality.jsx

@@ -1,20 +1,8 @@
 import React, { useMemo, useCallback } from 'react';
 import { Widget, PieChart } from '../../../../../../../../src/index.js';
 import { renderTooltipJsx } from '../../../../../../utils/tooltip.js';
-import { renderPercentage } from '../../../../../../utils/numbers.js';
 
-// Color mapping for water quality types
-const WATER_QUALITY_COLORS = {
-    fairly_clear: '#32D583',      
-    turbid: '#FFA940',            
-    polluted: '#F97066',         
-    oil_traces: '#2B3644',       
-    no_water: '#DAD6CE',         
-    clear: '#6AD99E',            
-    other: '#9E9E9E',            
-};
-
-const DEFAULT_COLOR = '#9E9E9E';
+const COLORS = ['#6AD99E', '#FFD93D', '#F0A888', '#DF571E', '#B0B0B0', '#016C6E', '#4FB3A1'];
 
 const WaterQuality = ({
     waterQualityChart,
@@ -38,7 +26,7 @@ const WaterQuality = ({
         return data.map((item, index) => ({
             value: Number(item?.count) || 0,
             percent: total > 0 ? (Number(item?.count) || 0) / total : 0,
-            color: WATER_QUALITY_COLORS[item?.waterQuality] || DEFAULT_COLOR,
+            color: COLORS[index % COLORS.length],
             label: optionsMap[item?.waterQuality] || item?.waterQuality || '',
             key: item?.waterQuality || `item-${index}`,
         }));
@@ -55,22 +43,18 @@ const WaterQuality = ({
                 return null;
             }
 
-            // Show all items in the tooltip, sorted by percentage (descending)
-            const allItems = pieData
-                .filter(dataItem => dataItem.value > 0)
-                .sort((a, b) => b.percent - a.percent)
-                .map(dataItem => ({
-                    color: dataItem.color,
-                    label: dataItem.label || '',
-                    value: renderPercentage(Math.round(dataItem.percent * 100)),
-                }));
-
             return renderTooltipJsx({
                 title: t("Water Quality"),
-                items: allItems,
+                items: [
+                    {
+                        color: item.color,
+                        label: item.label || '',
+                        value: `${Math.round(item.percent * 100)}%`,
+                    },
+                ],
             });
         },
-        [t, isEmpty, pieData]
+        [t, isEmpty]
     );
 
     return (