OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.
fix(dashboard): remove loading state when we already have some data
Carl-Gerhard Lindesvärd0959ede05584
diff --git a/apps/dashboard/src/components/report-chart/area/index.tsx b/apps/dashboard/src/components/report-chart/area/index.tsxindex 01b647a56..5f3f7e256 100644--- a/apps/dashboard/src/components/report-chart/area/index.tsx+++ b/apps/dashboard/src/components/report-chart/area/index.tsx@@ -15,7 +15,11 @@ export function ReportAreaChart() {staleTime: 1000 * 60 * 1,});- if (isLazyLoading || res.isLoading || res.isFetching) {+ if (+ isLazyLoading ||+ res.isLoading ||+ (res.isFetching && !res.data?.series.length)+ ) {return <Loading />;}diff --git a/apps/dashboard/src/components/report-chart/bar/index.tsx b/apps/dashboard/src/components/report-chart/bar/index.tsxindex 5ffc7b2ff..330f67471 100644--- a/apps/dashboard/src/components/report-chart/bar/index.tsx+++ b/apps/dashboard/src/components/report-chart/bar/index.tsx@@ -14,7 +14,11 @@ export function ReportBarChart() {staleTime: 1000 * 60 * 1,});- if (isLazyLoading || res.isLoading || res.isFetching) {+ if (+ isLazyLoading ||+ res.isLoading ||+ (res.isFetching && !res.data?.series.length)+ ) {return <Loading />;}diff --git a/apps/dashboard/src/components/report-chart/funnel/chart.tsx b/apps/dashboard/src/components/report-chart/funnel/chart.tsxindex c77ed13b4..abc21bc0b 100644--- a/apps/dashboard/src/components/report-chart/funnel/chart.tsx+++ b/apps/dashboard/src/components/report-chart/funnel/chart.tsx@@ -98,7 +98,7 @@ export function Chart({><divclassName={cn(- 'bg-def-400 w-full',+ 'bg-foreground w-full',step.event.id === mostDropoffs.event.id && 'bg-rose-500',)}style={{ height: `${step.percent}%` }}@@ -236,7 +236,13 @@ export function Chart({</div><Progresssize="lg"- className="w-full @2xl:w-1/2 text-white bg-def-200 mt-0.5 dark:text-black"+ className={cn(+ 'w-full @2xl:w-1/2 text-white bg-def-200 mt-0.5 dark:text-black',+ )}+ innerClassName={cn(+ 'bg-primary',+ step.event.id === mostDropoffs.event.id && 'bg-rose-500',+ )}value={percent}/></div>diff --git a/apps/dashboard/src/components/report-chart/funnel/index.tsx b/apps/dashboard/src/components/report-chart/funnel/index.tsxindex 857738608..6fdb62ae4 100644--- a/apps/dashboard/src/components/report-chart/funnel/index.tsx+++ b/apps/dashboard/src/components/report-chart/funnel/index.tsx@@ -31,7 +31,7 @@ export function ReportFunnelChart() {keepPreviousData: true,});- if (isLazyLoading || res.isLoading || res.isFetching) {+ if (isLazyLoading || res.isLoading) {return <Loading />;}diff --git a/apps/dashboard/src/components/report-chart/histogram/index.tsx b/apps/dashboard/src/components/report-chart/histogram/index.tsxindex b06d86a21..197c45e1a 100644--- a/apps/dashboard/src/components/report-chart/histogram/index.tsx+++ b/apps/dashboard/src/components/report-chart/histogram/index.tsx@@ -15,7 +15,11 @@ export function ReportHistogramChart() {staleTime: 1000 * 60 * 1,});- if (isLazyLoading || res.isLoading || res.isFetching) {+ if (+ isLazyLoading ||+ res.isLoading ||+ (res.isFetching && !res.data?.series.length)+ ) {return <Loading />;}diff --git a/apps/dashboard/src/components/report-chart/line/index.tsx b/apps/dashboard/src/components/report-chart/line/index.tsxindex 02cb77f9c..e6c856628 100644--- a/apps/dashboard/src/components/report-chart/line/index.tsx+++ b/apps/dashboard/src/components/report-chart/line/index.tsx@@ -15,7 +15,11 @@ export function ReportLineChart() {staleTime: 1000 * 60 * 1,});- if (isLazyLoading || res.isLoading || res.isFetching) {+ if (+ isLazyLoading ||+ res.isLoading ||+ (res.isFetching && !res.data?.series.length)+ ) {return <Loading />;}diff --git a/apps/dashboard/src/components/report-chart/map/index.tsx b/apps/dashboard/src/components/report-chart/map/index.tsxindex 4cd0684a2..4ee5376c2 100644--- a/apps/dashboard/src/components/report-chart/map/index.tsx+++ b/apps/dashboard/src/components/report-chart/map/index.tsx@@ -15,7 +15,11 @@ export function ReportMapChart() {staleTime: 1000 * 60 * 1,});- if (isLazyLoading || res.isLoading || res.isFetching) {+ if (+ isLazyLoading ||+ res.isLoading ||+ (res.isFetching && !res.data?.series.length)+ ) {return <Loading />;}diff --git a/apps/dashboard/src/components/report-chart/metric/index.tsx b/apps/dashboard/src/components/report-chart/metric/index.tsxindex 7c82b8a31..5df27988a 100644--- a/apps/dashboard/src/components/report-chart/metric/index.tsx+++ b/apps/dashboard/src/components/report-chart/metric/index.tsx@@ -11,7 +11,11 @@ export function ReportMetricChart() {staleTime: 1000 * 60 * 1,});- if (isLazyLoading || res.isLoading || res.isFetching) {+ if (+ isLazyLoading ||+ res.isLoading ||+ (res.isFetching && !res.data?.series.length)+ ) {return <Loading />;}diff --git a/apps/dashboard/src/components/report-chart/pie/index.tsx b/apps/dashboard/src/components/report-chart/pie/index.tsxindex 8461dc00f..60514ca02 100644--- a/apps/dashboard/src/components/report-chart/pie/index.tsx+++ b/apps/dashboard/src/components/report-chart/pie/index.tsx@@ -15,7 +15,11 @@ export function ReportPieChart() {staleTime: 1000 * 60 * 1,});- if (isLazyLoading || res.isLoading || res.isFetching) {+ if (+ isLazyLoading ||+ res.isLoading ||+ (res.isFetching && !res.data?.series.length)+ ) {return <Loading />;}diff --git a/apps/dashboard/src/components/ui/progress.tsx b/apps/dashboard/src/components/ui/progress.tsxindex 40dbba183..7aa20a5ea 100644--- a/apps/dashboard/src/components/ui/progress.tsx+++ b/apps/dashboard/src/components/ui/progress.tsx@@ -7,8 +7,9 @@ const Progress = React.forwardRef<React.ElementRef<typeof ProgressPrimitive.Root>,React.ComponentPropsWithoutRef<typeof ProgressPrimitive.Root> & {size?: 'sm' | 'default' | 'lg';+ innerClassName?: string;}->(({ className, value, size = 'default', ...props }, ref) => (+>(({ className, innerClassName, value, size = 'default', ...props }, ref) => (<ProgressPrimitive.Rootref={ref}className={cn(@@ -20,7 +21,10 @@ const Progress = React.forwardRef<{...props}><ProgressPrimitive.Indicator- className={'h-full w-full flex-1 rounded bg-primary transition-all'}+ className={cn(+ 'h-full w-full flex-1 rounded bg-primary transition-all',+ innerClassName,+ )}style={{transform: `translateX(-${100 - (value || 0)}%)`,}}