reading reportData instead of customized data. self massaging data for needed format

src/components/Dashboard/Dashboard.models.ts

@@ -19,6 +19,7 @@ export interface DashboardSection {
   title?: string;
   summary?: string;
   component: React.ComponentType<any>;
+  dataKey: string;
   settings?: Record<string, any>;
   isList?: boolean;
   style?: {

src/components/HistoryChart/HistoryChart.tsx

@@ -8,12 +8,11 @@ type DecoratedPeriod = ReportPeriod & {
   label: string;
 };
 
-const TAB_TO_KEY: Record<string, "weekly" | "monthly" | "yearly" | "fyly" | "full"> = {
+const TAB_TO_KEY: Record<string, "weekly" | "monthly" | "yearly" | "fyly"> = {
   Weekly: "weekly",
   Monthly: "monthly",
   Yearly: "yearly",
-  'Financial Year': "fyly",
+  FYLY: "fyly"
-  'All Time': "full"
 };
 
 function getAmount(p: ReportPeriod, mode: "expense" | "income") {
@@ -40,7 +39,7 @@ function mergeMetric(a: any, b: any) {
 
 function mergeBuckets(
   buckets: any[],
-  key: "weekly" | "monthly" | "yearly" | "fyly" | "full"
+  key: "weekly" | "monthly" | "yearly" | "fyly"
 ): DecoratedPeriod[] {
   const map = new Map<string, DecoratedPeriod>();
 
@@ -71,38 +70,9 @@ function mergeBuckets(
   );
 }
 
-function attachComparison(
-  points: ChartDataPoint[],
-  key: "weekly" | "monthly" | "yearly" | "fyly" | "full"
-): ChartDataPoint[] {
-  const getCompareIndex = (i: number) => {
-    if (key === "weekly") return i - 4;
-    if (key === "monthly") return i - 12;
-    if (key === "yearly") return i - 1;
-    if (key === "fyly") return i - 1;
-    return -1;
-  };
-
-  return points.map((p, i) => {
-    const ci = getCompareIndex(i);
-
-    return {
-      ...p,
-      compare:
-        ci >= 0 && points[ci]
-          ? {
-              id: points[ci].id,
-              label: points[ci].label,
-              amount: points[ci].amount
-            }
-          : undefined
-    };
-  });
-}
-
 function buildChartData(
   reportData: HistoryChartProps["reportData"],
-  key: "weekly" | "monthly" | "yearly" | "fyly" | "full",
+  key: "weekly" | "monthly" | "yearly" | "fyly",
   mode: "expense" | "income",
   comparison: boolean
 ): ChartDataPoint[] {
@@ -116,7 +86,17 @@ function buildChartData(
   }));
 
   if (comparison) {
-    points = attachComparison(points, key);
+    points = points.map((p, i) => ({
+      ...p,
+      compare:
+        i > 0
+          ? {
+              id: points[i - 1].id,
+              label: points[i - 1].label,
+              amount: points[i - 1].amount
+            }
+          : undefined
+    }));
   }
 
   return points;
@@ -158,8 +138,7 @@ export default function HistoryChart(props: HistoryChartProps) {
     weekly: 6,
     monthly: 4,
     yearly: 4,
-    fyly: 4,
+    fyly: 4
-    full: 4,
   };
 
   const visibleCount = visibleCountMap[activeDataKey] ?? 4;

src/components/HistoryChart/HistoryChart.view.tsx

@@ -58,28 +58,19 @@ export default function HistoryChartView(props: ViewProps) {
   const theme = useTheme();
   const isDark = theme.palette.mode === "dark";
 
-  const total = currentData.length;
-  const maxStartIndex = Math.max(total - visibleCount, 0);
-  const clampedStartIndex = Math.min(startIndex, maxStartIndex);
-
   const handleTabChange = (_: React.MouseEvent<HTMLElement>, newTab: string | null) => {
     if (newTab !== null) setActiveTab(newTab);
   };
 
-  const canGoLeft = clampedStartIndex > 0;
+  const canGoLeft = startIndex > 0;
-  const canGoRight = clampedStartIndex < maxStartIndex;
+  const canGoRight = startIndex + visibleCount < currentData.length;
 
   const handlePrev = () => {
-    if (!canGoLeft) return;
+    if (canGoLeft) setStartIndex((prev) => prev - visibleCount);
-    setStartIndex((prev) => Math.max(prev - visibleCount, 0));
   };
 
   const handleNext = () => {
-    if (!canGoRight) return;
+    if (canGoRight) setStartIndex((prev) => prev + visibleCount);
-    setStartIndex((prev) => {
-      const next = prev + visibleCount;
-      return Math.min(next, maxStartIndex);
-    });
   };
 
   return (
@@ -157,8 +148,7 @@ export default function HistoryChartView(props: ViewProps) {
                     display: "flex",
                     flexDirection: "column",
                     alignItems: "center",
-                    cursor: "pointer",
+                    cursor: "pointer"
-                    height: "100%"
                   }}
                 >
                   <Box sx={{ display: "flex", alignItems: "flex-end", gap: 1, height: "100%" }}>

src/components/ProgressCard/TopTags.tsx

@@ -1,109 +0,0 @@
-import * as React from "react";
-import { Box } from "@mui/material";
-import { ReportData, ReportPeriod } from "../../features/report";
-import ProgressCard from "./ProgressCard";
-
-type Props = {
-  reportData: ReportData;
-  mode: "expense" | "income";
-  selectedPeriodId?: string | null;
-  compact?: boolean;
-};
-
-type DecoratedPeriod = ReportPeriod & {
-  id: string;
-  label: string;
-};
-
-function getAmount(p: ReportPeriod, mode: "expense" | "income") {
-  return mode === "expense" ? p.expenses.sum : p.incomes.sum;
-}
-
-function findPeriod(
-  periods: DecoratedPeriod[],
-  selectedPeriodId?: string | null
-) {
-  if (!periods.length) return null;
-
-  if (selectedPeriodId) {
-    const match = periods.find((p) => p.id === selectedPeriodId);
-    if (match) return match;
-  }
-
-  // fallback → latest
-  return periods.reduce((latest, p) =>
-    new Date(p.start).getTime() > new Date(latest.start).getTime()
-      ? p
-      : latest
-  );
-}
-
-export default function TopTags({
-  reportData,
-  mode,
-  selectedPeriodId,
-  compact = true
-}: Props) {
-  const { items, total } = React.useMemo(() => {
-    const tagMap = new Map<string, number>();
-
-    for (const bucket of reportData.buckets) {
-      const tags = bucket.group_key.tags;
-      if (!tags || tags.length === 0) continue;
-
-      // Prefer FULL if available
-      const fullPeriods = (bucket.periods.full || []) as DecoratedPeriod[];
-
-      const periodsToUse =
-        selectedPeriodId
-          ? Object.values(bucket.periods).flat() as DecoratedPeriod[]
-          : fullPeriods;
-
-      const period = findPeriod(periodsToUse, selectedPeriodId);
-      if (!period) continue;
-
-      const amount = getAmount(period, mode);
-
-      for (const tag of tags) {
-        tagMap.set(tag, (tagMap.get(tag) || 0) + amount);
-      }
-    }
-
-    const arr = Array.from(tagMap.entries()).map(([tag, amount]) => ({
-      tag,
-      amount
-    }));
-
-    arr.sort((a, b) => b.amount - a.amount);
-
-    const top = arr.slice(0, 4);
-    const total = top.reduce((sum, t) => sum + t.amount, 0);
-
-    return { items: top, total };
-  }, [reportData, mode, selectedPeriodId]);
-
-  return (
-    <Box
-      sx={{
-        display: "grid",
-        gridTemplateColumns: {
-          xs: "1fr",
-          sm: "repeat(2, 1fr)",
-          md: "repeat(4, 1fr)"
-        },
-        gap: 2
-      }}
-    >
-      {items.map((item) => (
-        <ProgressCard
-          key={item.tag}
-          header={item.tag}
-          progressAmount={item.amount}
-          totalAmount={total}
-          compact={compact}
-          colorTheme={mode === "expense" ? "error" : "success"}
-        />
-      ))}
-    </Box>
-  );
-}

src/dashboard-config.ts

@@ -1,7 +1,7 @@
 import HistoryChart from "./components/HistoryChart";
+import ProgressCard from "./components/ProgressCard";
 import LatestItems from "./components/LatestItems";
 import { DashboardConfig } from "./components/Dashboard";
-import TopTags from "./components/ProgressCard/TopTags";
 
 export const configuration: DashboardConfig = {
   sections: [
@@ -10,6 +10,7 @@ export const configuration: DashboardConfig = {
       title: "Breakdown",
       summary: "Interactive chronological tracking",
       component: HistoryChart,
+      dataKey: "chartData",
       settings: {
         tabs: ["Weekly", "Monthly"],
         // tabs: ["Weekly", "Monthly", "Yearly", "Financial Year", "All Time"],
@@ -21,7 +22,9 @@ export const configuration: DashboardConfig = {
     {
       id: "top-payees",
       title: 'Top Payees',
-      component: TopTags,
+      component: ProgressCard,
+      dataKey: "topPayees",
+      isList: true,
       settings: {
         compact: true,
       },

src/features/report/report.models.ts

@@ -67,7 +67,6 @@ export interface ReportBucket {
     monthly?: ReportPeriod[];
     yearly?: ReportPeriod[];
     fyly?: ReportPeriod[];
-    full?: ReportPeriod[];
   };
 }
 
@@ -76,7 +75,7 @@ export interface ReportBucket {
 // -----------------------------
 
 export interface ReportData {
-  periods: ("weekly" | "monthly" | "yearly" | "fyly" | "full")[];
+  periods: ("weekly" | "monthly" | "yearly" | "fyly")[];
 
   rolling: boolean;
   report_date?: string;

src/features/report/report.utils.ts

@@ -83,7 +83,10 @@ function buildLabel(
       return `${dayFmt.format(start)} - ${dayFmt.format(end)}`;
 
     case "monthly":
-      return `${monthFmt.format(start)} ${yearFmt.format(start)}`;
+      if (sameMonth(start, end)) {
+        return `${monthFmt.format(start)} ${yearFmt.format(start)}`;
+      }
+      return `${monthDayFmt.format(start)} - ${monthDayFmt.format(end)}`;
 
     case "yearly":
       return yearFmt.format(start);
@@ -107,8 +110,8 @@ function decoratePeriods(
 ): (ReportPeriod & { id: string; label: string })[] {
   return periods.map((p) => ({
     ...p,
-    id: buildPeriodId(type, new Date(p.start + "Z"), new Date(p.end + "Z")),
+    id: buildPeriodId(type, new Date(p.start), new Date(p.end)),
-    label: buildLabel(type, new Date(p.start + "Z"), new Date(p.end + "Z")),
+    label: buildLabel(type, new Date(p.start), new Date(p.end)),
   }));
 }