From f7277b6f2cfbfeabf42b67a86a89074725424117 Mon Sep 17 00:00:00 2001 From: Nate Kelley Date: Tue, 13 May 2025 12:16:16 -0600 Subject: [PATCH] show trendlines for line --- .../StylingAppStyling/EditTrendline/EditTrendline.tsx | 3 ++- .../MetricStylingApp/StylingAppStyling/StylingAppStyling.tsx | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendline.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendline.tsx index 7fe463498..583bf8ba2 100644 --- a/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendline.tsx +++ b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendline.tsx @@ -89,7 +89,8 @@ export const EditTrendline: React.FC<{ ...DEFAULT_TRENDLINE_CONFIG, id: uuidv4(), type, - columnId: selectedAxis.y[0] || '' + columnId: selectedAxis.y[0] || '', + aggregateAllCategories: ((selectedAxis as ScatterAxis).category || []).length >= 1 }; addNewTrendId(newTrendline.id); diff --git a/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/StylingAppStyling.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/StylingAppStyling.tsx index 182b314f4..643a2e41e 100644 --- a/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/StylingAppStyling.tsx +++ b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/StylingAppStyling.tsx @@ -493,7 +493,7 @@ const EtcSettings: React.FC< return barGroupType !== 'percentage-stack' && hasYAxisValues; } if (isLineChart) { - return lineGroupType === 'percentage-stack' && hasYAxisValues; + return lineGroupType !== 'percentage-stack' && hasYAxisValues; } return !isScatterChart && !isPieChart && hasYAxisValues; }, [isScatterChart, isPieChart, isLineChart, isBarChart, hasYAxisValues]); @@ -503,7 +503,7 @@ const EtcSettings: React.FC< return barGroupType !== 'percentage-stack' && hasYAxisValues; } if (isLineChart) { - return lineGroupType === 'percentage-stack' && hasYAxisValues; + return lineGroupType !== 'percentage-stack' && hasYAxisValues; } return !isPieChart && hasYAxisValues; }, [isScatterChart, isPieChart, isLineChart, isBarChart, hasYAxisValues]);