Skip to content

OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.

fix(dashboard): time interval still wrong on funnel and retention

Carl-Gerhard Lindesvärd1cde7a3e3515
diff --git a/apps/start/src/components/report-chart/funnel/index.tsx b/apps/start/src/components/report-chart/funnel/index.tsx
index 9239eb341..24bd60439 100644
--- a/apps/start/src/components/report-chart/funnel/index.tsx
+++ b/apps/start/src/components/report-chart/funnel/index.tsx
@@ -2,9 +2,6 @@ import { useTRPC } from '@/integrations/trpc/react';
import type { RouterOutputs } from '@/trpc/client';
import { useQuery } from '@tanstack/react-query';
-import { useOverviewOptions } from '@/components/overview/useOverviewOptions';
-import type { IReportInput } from '@openpanel/validation';
-
import { AspectContainer } from '../aspect-container';
import { ReportChartEmpty } from '../common/empty';
import { ReportChartError } from '../common/error';
@@ -13,45 +10,18 @@ import { useReportChartContext } from '../context';
import { Chart, Summary, Tables } from './chart';
export function ReportFunnelChart() {
- const {
- report: {
- id,
- series,
- range,
- projectId,
- options,
- startDate,
- endDate,
- previous,
- breakdowns,
- interval,
- },
- isLazyLoading,
- shareId,
- } = useReportChartContext();
- const { range: overviewRange, startDate: overviewStartDate, endDate: overviewEndDate, interval: overviewInterval } = useOverviewOptions();
-
- const funnelOptions = options?.type === 'funnel' ? options : undefined;
-
+ const { isLazyLoading, report, shareId } = useReportChartContext();
const trpc = useTRPC();
- const input: IReportInput = {
- series,
- range: overviewRange ?? range,
- projectId,
- interval: overviewInterval ?? interval ?? 'day',
- chartType: 'funnel',
- breakdowns,
- previous,
- metric: 'sum',
- startDate: overviewStartDate ?? startDate,
- endDate: overviewEndDate ?? endDate,
- limit: 20,
- options: funnelOptions,
- };
const res = useQuery(
- trpc.chart.funnel.queryOptions(input, {
- enabled: !isLazyLoading && input.series.length > 0,
- }),
+ trpc.chart.funnel.queryOptions(
+ {
+ ...report,
+ shareId,
+ },
+ {
+ enabled: !isLazyLoading && report.series.length > 0,
+ },
+ ),
);
if (isLazyLoading || res.isLoading) {
diff --git a/apps/start/src/components/report-chart/retention/index.tsx b/apps/start/src/components/report-chart/retention/index.tsx
index 09817c2a7..aa52fe3d8 100644
--- a/apps/start/src/components/report-chart/retention/index.tsx
+++ b/apps/start/src/components/report-chart/retention/index.tsx
@@ -1,7 +1,6 @@
import { useTRPC } from '@/integrations/trpc/react';
import { keepPreviousData, useQuery } from '@tanstack/react-query';
-import { useOverviewOptions } from '@/components/overview/useOverviewOptions';
import { AspectContainer } from '../aspect-container';
import { ReportChartEmpty } from '../common/empty';
import { ReportChartError } from '../common/error';
@@ -11,33 +10,14 @@ import { Chart } from './chart';
import CohortTable from './table';
export function ReportRetentionChart() {
- const {
- report: {
- id,
- series,
- range,
- projectId,
- options,
- startDate,
- endDate,
- interval,
- },
- isLazyLoading,
- shareId,
- } = useReportChartContext();
- const {
- range: overviewRange,
- startDate: overviewStartDate,
- endDate: overviewEndDate,
- interval: overviewInterval,
- } = useOverviewOptions();
- const eventSeries = series.filter((item) => item.type === 'event');
+ const { isLazyLoading, report, shareId } = useReportChartContext();
+ const eventSeries = report.series.filter((item) => item.type === 'event');
const firstEvent = (eventSeries[0]?.filters?.[0]?.value ?? []).map(String);
const secondEvent = (eventSeries[1]?.filters?.[0]?.value ?? []).map(String);
const isEnabled =
firstEvent.length > 0 && secondEvent.length > 0 && !isLazyLoading;
- const retentionOptions = options?.type === 'retention' ? options : undefined;
+ const retentionOptions = report.options?.type === 'retention' ? report.options : undefined;
const criteria = retentionOptions?.criteria ?? 'on_or_after';
const trpc = useTRPC();
@@ -46,14 +26,14 @@ export function ReportRetentionChart() {
{
firstEvent,
secondEvent,
- projectId,
- range: overviewRange ?? range,
- startDate: overviewStartDate ?? startDate,
- endDate: overviewEndDate ?? endDate,
+ projectId: report.projectId,
+ range: report.range,
+ startDate: report.startDate,
+ endDate: report.endDate,
criteria,
- interval: overviewInterval ?? interval,
+ interval: report.interval,
shareId,
- id,
+ id: 'id' in report ? report.id : undefined,
},
{
placeholderData: keepPreviousData,