fix: chart selector aggregation (#741)

lunary-ai · Feb 6, 2025 · 2e22761 · 2e22761
1 parent 767c1a6
commit 2e22761
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/packages/frontend/components/analytics/Charts/AreaChartComponent.tsx b/packages/frontend/components/analytics/Charts/AreaChartComponent.tsx
@@ -161,7 +161,7 @@ export default function AreaChartComponent({
         xAxisProps={{
           fontSize: "45px",
           tickFormatter: (value, index) => {
-            if (index === 0 || index === formattedData.length - 1) {
+            if (value === data[0].date || value === data.at(-1).date) {
               return formatDate(value, "daily") || "";
             }
             return "";

diff --git a/packages/frontend/components/analytics/DashboardModal.tsx b/packages/frontend/components/analytics/DashboardModal.tsx
@@ -226,11 +226,20 @@ function ChartSelectionPanel({
                         <ChartComponent
                           id={chart.id}
                           dataKey={chart.dataKey}
-                          startDate={startDate}
-                          endDate={endDate}
-                          granularity={granularity}
-                          checks={checks}
-                          isCustom={false}
+                          startDate={new Date(chart.startDate || startDate)}
+                          endDate={new Date(chart.endDate || endDate)}
+                          granularity={chart.granularity || granularity}
+                          checks={[
+                            ...(Array.isArray(chart.checks)
+                              ? chart.checks
+                              : []),
+                            ...checks,
+                          ]}
+                          color={chart.color}
+                          aggregationMethod={chart.aggregationMethod}
+                          isCustom={chart.isCustom}
+                          primaryDimension={chart.primaryDimension}
+                          secondaryDimension={chart.secondaryDimension}
                           chart={chart}
                         />
                       </AnalyticsCard>
@@ -321,11 +330,17 @@ function ChartSelectionPanel({
                                 }
                                 endDate={new Date(chart.endDate || endDate)}
                                 granularity={chart.granularity || granularity}
-                                checks={chart.checks || checks}
+                                checks={[
+                                  ...(Array.isArray(chart.checks)
+                                    ? chart.checks
+                                    : []),
+                                  ...checks,
+                                ]}
+                                color={chart.color}
+                                aggregationMethod={chart.aggregationMethod}
+                                isCustom={chart.isCustom}
                                 primaryDimension={chart.primaryDimension}
                                 secondaryDimension={chart.secondaryDimension}
-                                aggregationMethod={chart.aggregationMethod}
-                                isCustom={true}
                                 chart={chart}
                               />
                             </AnalyticsCard>