datastake-daf 0.6.838 → 0.6.839

package/dist/pages/index.js

@@ -55693,7 +55693,7 @@ const PlantingLocations = ({
  * Formats a date based on the time filter
  * @param {dayjs.Dayjs} date - The date to format
  * @param {boolean} breakLine - Whether to add a line break (for tooltips)
- * @param {string} timeFilter - The time filter ('daily', 'weekly', 'monthly')
+ * @param {string} timeFilter - The time filter ('daily', 'weekly', 'monthly', 'yearly')
  * @returns {string} Formatted date string
  */
 const getFormatDate = (date, breakLine = false, timeFilter = 'monthly') => {
@@ -55702,20 +55702,30 @@ const getFormatDate = (date, breakLine = false, timeFilter = 'monthly') => {
       return date.format("DD/MM");
     case "weekly":
       return `W${renderNumber$1(date.week())}`;
+    case "yearly":
+      return date.format("YYYY");
     default:
       // Monthly format: "Dec 24", "Jan 25", etc.
-
       return breakLine ? `${capitalize(date.format("MMM"))}\n${date.format("YY")}` : `${capitalize(date.format("MMM"))} ${date.format("YY")}`;
   }
 };
 
 /**
  * Gets the time quantity string for dayjs operations
- * @param {string} timeFilter - The time filter ('daily', 'weekly', 'monthly')
- * @returns {string} Time quantity string ('days', 'weeks', 'months')
+ * @param {string} timeFilter - The time filter ('daily', 'weekly', 'monthly', 'yearly')
+ * @returns {string} Time quantity string ('days', 'weeks', 'months', 'years')
  */
 const getTimeQuantity = (timeFilter = 'monthly') => {
-  return timeFilter === "monthly" ? "months" : timeFilter === "daily" ? "days" : "weeks";
+  switch (timeFilter) {
+    case "daily":
+      return "days";
+    case "weekly":
+      return "weeks";
+    case "yearly":
+      return "years";
+    default:
+      return "months";
+  }
 };
 
 /**
@@ -55741,6 +55751,9 @@ const getPreviousGraphData = (dates, startDate, timeFilter, valueField = 'total'
       case "weekly":
         isBeforeStart = date.isBefore(startDate, 'week');
         break;
+      case "yearly":
+        isBeforeStart = date.isBefore(startDate, 'year');
+        break;
       default:
         isBeforeStart = date.isBefore(startDate, 'month');
         break;
@@ -55763,7 +55776,7 @@ const getPreviousGraphData = (dates, startDate, timeFilter, valueField = 'total'
  * Processes chart data with time filtering support
  * @param {Object} params - Parameters object
  * @param {Array} params.mainData - Array of data objects with date and value fields
- * @param {string} params.timeFilter - Time filter ('daily', 'weekly', 'monthly')
+ * @param {string} params.timeFilter - Time filter ('daily', 'weekly', 'monthly', 'yearly')
  * @param {Object} params.filters - Optional filters object with timeframe
  * @param {boolean} params.isCumulative - Whether to calculate cumulative values (default: false)
  * @param {string} params.valueField - Field name to extract value from (default: 'total', also checks 'count', 'jobs', 'value')
@@ -55790,6 +55803,9 @@ const processChartDateData = ({
   } else if (filter === "weekly") {
     start = start.startOf('week');
     end = end.startOf('week');
+  } else if (filter === "yearly") {
+    start = start.startOf('year');
+    end = end.startOf('year');
   } else {
     start = start.startOf('month');
     end = end.startOf('month');
@@ -55806,9 +55822,24 @@ const processChartDateData = ({
     cumulativeScore = hasPreviousData ? previousCumulativeScore : 0;
   }
 
+  // Get the period unit for comparison
+  const getPeriodUnit = f => {
+    switch (f) {
+      case "daily":
+        return "day";
+      case "weekly":
+        return "week";
+      case "yearly":
+        return "year";
+      default:
+        return "month";
+    }
+  };
+  const periodUnit = getPeriodUnit(filter);
+
   // Loop until we reach the end date
   let currentDate = start.clone();
-  while (currentDate.isBefore(end) || currentDate.isSame(end, filter === "daily" ? "day" : filter === "weekly" ? "week" : "month")) {
+  while (currentDate.isBefore(end) || currentDate.isSame(end, periodUnit)) {
     // Filter data points that fall within this period
     const score = isEmpty ? 0 : dates.filter(d => {
       if (!d.date) return false;
@@ -55817,6 +55848,8 @@ const processChartDateData = ({
           return d.date === currentDate.format("YYYY-MM-DD");
         case "weekly":
           return dayjs__default["default"](d.date, "YYYY-MM-DD").week() === currentDate.week() && dayjs__default["default"](d.date, "YYYY-MM-DD").year() === currentDate.year();
+        case "yearly":
+          return dayjs__default["default"](d.date, "YYYY-MM-DD").year() === currentDate.year();
         default:
           return dayjs__default["default"](d.date, "YYYY-MM-DD").format("YYYY-MM") === currentDate.format("YYYY-MM");
       }
@@ -55853,7 +55886,7 @@ const processChartDateData = ({
 const formatDateAxis = (label, getFormatDateFn) => {
   if (!label) return label;
 
-  // Check if label is already in the correct format (MMM YY, DD/MM, or W#)
+  // Check if label is already in the correct format (MMM YY, DD/MM, W#, or YYYY)
   // If it matches our format patterns, return as-is
   if (typeof label === 'string') {
     // Check for MMM YY format (e.g., "Dec 24", "Jan 25")
@@ -55868,6 +55901,10 @@ const formatDateAxis = (label, getFormatDateFn) => {
     if (/^W\d+$/.test(label)) {
       return label;
     }
+    // Check for YYYY format (e.g., "2024", "2025")
+    if (/^\d{4}$/.test(label)) {
+      return label;
+    }
   }
 
   // Otherwise, try to parse and format it
@@ -55875,7 +55912,7 @@ const formatDateAxis = (label, getFormatDateFn) => {
 
   // If first attempt fails, try parsing as ISO date string
   if (!date.isValid() && typeof label === 'string') {
-    date = dayjs__default["default"](label, ['YYYY-MM-DD', 'YYYY-MM', 'MMM YY', 'MMM YYYY', 'DD/MM'], true);
+    date = dayjs__default["default"](label, ['YYYY-MM-DD', 'YYYY-MM', 'YYYY', 'MMM YY', 'MMM YYYY', 'DD/MM'], true);
   }
 
   // If it's a valid date, format it using getFormatDate
@@ -55892,7 +55929,7 @@ const formatDateAxis = (label, getFormatDateFn) => {
  * Provides state management and formatting functions for time-based charts
  * 
  * @param {Object} options - Configuration options
- * @param {string} options.defaultFilter - Default time filter ('daily', 'weekly', 'monthly')
+ * @param {string} options.defaultFilter - Default time filter ('daily', 'weekly', 'monthly', 'yearly')
  * @returns {Object} Time filter state and utilities
  */
 const useTimeFilter = ({
@@ -55943,6 +55980,9 @@ const selectOptions$2 = [{
 }, {
   label: "Monthly",
   value: "monthly"
+}, {
+  label: "Yearly",
+  value: "yearly"
 }];
 const RestoredArea = ({
   restoredAreaChart,
@@ -56086,6 +56126,9 @@ const selectOptions$1 = [{
 }, {
   label: "Monthly",
   value: "monthly"
+}, {
+  label: "Yearly",
+  value: "yearly"
 }];
 const PlantingActivitiesTimeline = ({
   activitiesTimelineChart,
@@ -56114,6 +56157,11 @@ const PlantingActivitiesTimeline = ({
     while (lastNonZeroIndex >= 0 && (processedData[lastNonZeroIndex].jobs || 0) === 0) {
       lastNonZeroIndex--;
     }
+
+    // If all values are 0, return full processed data to show x-axis with default date range
+    if (lastNonZeroIndex < 0) {
+      return processedData;
+    }
     return processedData.slice(0, lastNonZeroIndex + 1);
   }, [activitiesTimelineChart, processChartDateData]);
   const maxActivitiesYValue = React.useMemo(() => {
@@ -57008,6 +57056,9 @@ const selectOptions = [{
 }, {
   label: "Monthly",
   value: "monthly"
+}, {
+  label: "Yearly",
+  value: "yearly"
 }];
 const JobsTimeline = ({
   dayJobsTimeline,
@@ -57023,22 +57074,6 @@ const JobsTimeline = ({
     defaultFilter: 'monthly'
   });
   const jobsData = Array.isArray(dayJobsTimeline) ? dayJobsTimeline : dayJobsTimeline?.jobsTimeline || dayJobsTimeline?.jobs || dayJobsTimeline?.timeline || [];
-
-  // const jobsTimelineData = useMemo(() => {
-  //     // Always process data, even if empty, to generate default date range for x-axis
-  //     const dataToProcess = (!jobsData || !Array.isArray(jobsData) || jobsData.length === 0) 
-  //         ? [] 
-  //         : jobsData;
-
-  //     // Process data without cumulative calculation (for jobs timeline)
-  //     // Try to find value in total, count, jobs, or value fields
-  //     return processChartDateData({
-  //         mainData: dataToProcess,
-  //         isCumulative: false,
-  //         valueField: 'total', // Will fallback to count/jobs/value if total doesn't exist
-  //     });
-  // }, [jobsData, processChartDateData]);
-
   const jobsTimelineData = React.useMemo(() => {
     // Prepare data first
     const dataToProcess = !jobsData || !Array.isArray(jobsData) || jobsData.length === 0 ? [] : jobsData;
@@ -57056,7 +57091,12 @@ const JobsTimeline = ({
       lastNonZeroIndex--;
     }
 
-    // Slice up to last period with data
+    // If all values are 0, return full processed data to show x-axis with default date range
+    if (lastNonZeroIndex < 0) {
+      return processedData;
+    }
+
+    // Otherwise, slice up to last period with data
     return processedData.slice(0, lastNonZeroIndex + 1);
   }, [jobsData, processChartDateData]);
   const maxYValue = React.useMemo(() => {

package/package.json

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

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

@@ -6,7 +6,7 @@ import { getFormatDate, getTimeQuantity, processChartDateData, formatDateAxis }
  * Provides state management and formatting functions for time-based charts
  * 
  * @param {Object} options - Configuration options
- * @param {string} options.defaultFilter - Default time filter ('daily', 'weekly', 'monthly')
+ * @param {string} options.defaultFilter - Default time filter ('daily', 'weekly', 'monthly', 'yearly')
  * @returns {Object} Time filter state and utilities
  */
 export const useTimeFilter = ({ defaultFilter = 'monthly' } = {}) => {

package/src/@daf/pages/Summary/Activities/PlantingCycle/components/CommunityParticipation/JobsTimeline/index.jsx

@@ -7,6 +7,7 @@ const selectOptions = [
     { label: "Daily", value: "daily" },
     { label: "Weekly", value: "weekly" },
     { label: "Monthly", value: "monthly" },
+    { label: "Yearly", value: "yearly" },
 ];
 
 const JobsTimeline = ({
@@ -20,20 +21,6 @@ const JobsTimeline = ({
         ? dayJobsTimeline 
         : (dayJobsTimeline?.jobsTimeline || dayJobsTimeline?.jobs || dayJobsTimeline?.timeline || []);
 
-    // const jobsTimelineData = useMemo(() => {
-    //     // Always process data, even if empty, to generate default date range for x-axis
-    //     const dataToProcess = (!jobsData || !Array.isArray(jobsData) || jobsData.length === 0) 
-    //         ? [] 
-    //         : jobsData;
-
-    //     // Process data without cumulative calculation (for jobs timeline)
-    //     // Try to find value in total, count, jobs, or value fields
-    //     return processChartDateData({
-    //         mainData: dataToProcess,
-    //         isCumulative: false,
-    //         valueField: 'total', // Will fallback to count/jobs/value if total doesn't exist
-    //     });
-    // }, [jobsData, processChartDateData]);
 
     const jobsTimelineData = useMemo(() => {
         // Prepare data first
@@ -54,7 +41,12 @@ const JobsTimeline = ({
             lastNonZeroIndex--;
         }
     
-        // Slice up to last period with data
+        // If all values are 0, return full processed data to show x-axis with default date range
+        if (lastNonZeroIndex < 0) {
+            return processedData;
+        }
+    
+        // Otherwise, slice up to last period with data
         return processedData.slice(0, lastNonZeroIndex + 1);
     }, [jobsData, processChartDateData]);
     

package/src/@daf/pages/Summary/Activities/PlantingCycle/components/CycleOutcomes/PlantingActivitiesTimeline.jsx

@@ -7,6 +7,7 @@ const selectOptions = [
     { label: "Daily", value: "daily" },
     { label: "Weekly", value: "weekly" },
     { label: "Monthly", value: "monthly" },
+    { label: "Yearly", value: "yearly" },
 ];
 
 const PlantingActivitiesTimeline = ({
@@ -34,6 +35,11 @@ const PlantingActivitiesTimeline = ({
             lastNonZeroIndex--;
         }
     
+        // If all values are 0, return full processed data to show x-axis with default date range
+        if (lastNonZeroIndex < 0) {
+            return processedData;
+        }
+    
         return processedData.slice(0, lastNonZeroIndex + 1);
     }, [activitiesTimelineChart, processChartDateData]);
     

package/src/@daf/pages/Summary/Activities/PlantingCycle/components/CycleOutcomes/RestoredArea.jsx

@@ -7,6 +7,7 @@ const selectOptions = [
     { label: "Daily", value: "daily" },
     { label: "Weekly", value: "weekly" },
     { label: "Monthly", value: "monthly" },
+    { label: "Yearly", value: "yearly" },
 ];
 
 const RestoredArea = ({

package/src/@daf/utils/timeFilterUtils.js

@@ -6,18 +6,19 @@ import { renderNumber } from './numbers.js';
  * Formats a date based on the time filter
  * @param {dayjs.Dayjs} date - The date to format
  * @param {boolean} breakLine - Whether to add a line break (for tooltips)
- * @param {string} timeFilter - The time filter ('daily', 'weekly', 'monthly')
+ * @param {string} timeFilter - The time filter ('daily', 'weekly', 'monthly', 'yearly')
  * @returns {string} Formatted date string
  */
 export const getFormatDate = (date, breakLine = false, timeFilter = 'monthly') => {
     switch (timeFilter) {
         case "daily":
             return date.format("DD/MM");
-        case "weekly" :
+        case "weekly":
             return `W${renderNumber(date.week())}`;
+        case "yearly":
+            return date.format("YYYY");
         default:
             // Monthly format: "Dec 24", "Jan 25", etc.
-
             return breakLine
                 ? `${capitalize(date.format("MMM"))}\n${date.format("YY")}`
                 : `${capitalize(date.format("MMM"))} ${date.format("YY")}`;
@@ -26,15 +27,20 @@ export const getFormatDate = (date, breakLine = false, timeFilter = 'monthly') =
 
 /**
  * Gets the time quantity string for dayjs operations
- * @param {string} timeFilter - The time filter ('daily', 'weekly', 'monthly')
- * @returns {string} Time quantity string ('days', 'weeks', 'months')
+ * @param {string} timeFilter - The time filter ('daily', 'weekly', 'monthly', 'yearly')
+ * @returns {string} Time quantity string ('days', 'weeks', 'months', 'years')
  */
 export const getTimeQuantity = (timeFilter = 'monthly') => {
-    return timeFilter === "monthly"
-        ? "months"
-        : timeFilter === "daily"
-        ? "days"
-        : "weeks";
+    switch (timeFilter) {
+        case "daily":
+            return "days";
+        case "weekly":
+            return "weeks";
+        case "yearly":
+            return "years";
+        default:
+            return "months";
+    }
 };
 
 /**
@@ -62,6 +68,9 @@ export const getPreviousGraphData = (dates, startDate, timeFilter, valueField =
             case "weekly":
                 isBeforeStart = date.isBefore(startDate, 'week');
                 break;
+            case "yearly":
+                isBeforeStart = date.isBefore(startDate, 'year');
+                break;
             default:
                 isBeforeStart = date.isBefore(startDate, 'month');
                 break;
@@ -86,7 +95,7 @@ export const getPreviousGraphData = (dates, startDate, timeFilter, valueField =
  * Processes chart data with time filtering support
  * @param {Object} params - Parameters object
  * @param {Array} params.mainData - Array of data objects with date and value fields
- * @param {string} params.timeFilter - Time filter ('daily', 'weekly', 'monthly')
+ * @param {string} params.timeFilter - Time filter ('daily', 'weekly', 'monthly', 'yearly')
  * @param {Object} params.filters - Optional filters object with timeframe
  * @param {boolean} params.isCumulative - Whether to calculate cumulative values (default: false)
  * @param {string} params.valueField - Field name to extract value from (default: 'total', also checks 'count', 'jobs', 'value')
@@ -114,6 +123,9 @@ export const processChartDateData = ({
     } else if (filter === "weekly") {
         start = start.startOf('week');
         end = end.startOf('week');
+    } else if (filter === "yearly") {
+        start = start.startOf('year');
+        end = end.startOf('year');
     } else {
         start = start.startOf('month');
         end = end.startOf('month');
@@ -133,9 +145,20 @@ export const processChartDateData = ({
         cumulativeScore = hasPreviousData ? previousCumulativeScore : 0;
     }
 
+    // Get the period unit for comparison
+    const getPeriodUnit = (f) => {
+        switch (f) {
+            case "daily": return "day";
+            case "weekly": return "week";
+            case "yearly": return "year";
+            default: return "month";
+        }
+    };
+    const periodUnit = getPeriodUnit(filter);
+
     // Loop until we reach the end date
     let currentDate = start.clone();
-    while (currentDate.isBefore(end) || currentDate.isSame(end, filter === "daily" ? "day" : filter === "weekly" ? "week" : "month")) {
+    while (currentDate.isBefore(end) || currentDate.isSame(end, periodUnit)) {
         // Filter data points that fall within this period
         const score = isEmpty ? 0 : dates
             .filter((d) => {
@@ -146,6 +169,8 @@ export const processChartDateData = ({
                     case "weekly":
                         return dayjs(d.date, "YYYY-MM-DD").week() === currentDate.week() &&
                                dayjs(d.date, "YYYY-MM-DD").year() === currentDate.year();
+                    case "yearly":
+                        return dayjs(d.date, "YYYY-MM-DD").year() === currentDate.year();
                     default:
                         return (
                             dayjs(d.date, "YYYY-MM-DD").format("YYYY-MM") ===
@@ -187,7 +212,7 @@ export const processChartDateData = ({
 export const formatDateAxis = (label, getFormatDateFn) => {
     if (!label) return label;
     
-    // Check if label is already in the correct format (MMM YY, DD/MM, or W#)
+    // Check if label is already in the correct format (MMM YY, DD/MM, W#, or YYYY)
     // If it matches our format patterns, return as-is
     if (typeof label === 'string') {
         // Check for MMM YY format (e.g., "Dec 24", "Jan 25")
@@ -202,6 +227,10 @@ export const formatDateAxis = (label, getFormatDateFn) => {
         if (/^W\d+$/.test(label)) {
             return label;
         }
+        // Check for YYYY format (e.g., "2024", "2025")
+        if (/^\d{4}$/.test(label)) {
+            return label;
+        }
     }
     
     // Otherwise, try to parse and format it
@@ -209,7 +238,7 @@ export const formatDateAxis = (label, getFormatDateFn) => {
     
     // If first attempt fails, try parsing as ISO date string
     if (!date.isValid() && typeof label === 'string') {
-        date = dayjs(label, ['YYYY-MM-DD', 'YYYY-MM', 'MMM YY', 'MMM YYYY', 'DD/MM'], true);
+        date = dayjs(label, ['YYYY-MM-DD', 'YYYY-MM', 'YYYY', 'MMM YY', 'MMM YYYY', 'DD/MM'], true);
     }
     
     // If it's a valid date, format it using getFormatDate