fix overview issues

This commit is contained in:
Carl-Gerhard Lindesvärd
2024-02-28 12:09:42 +01:00
parent 8d98c330ac
commit 16b67f1b2b
4 changed files with 18 additions and 40 deletions

View File

@@ -12,7 +12,7 @@ export function StickyBelowHeader({
return ( return (
<div <div
className={cn( className={cn(
'md:sticky bg-white border-b border-border z-10 [[id=dashboard]_&]:top-16 [[id=dashboard]_&]:rounded-none rounded-lg top-0', 'md:sticky bg-white border-b border-border z-20 [[id=dashboard]_&]:top-16 [[id=dashboard]_&]:rounded-none rounded-lg top-0',
className className
)} )}
> >

View File

@@ -189,35 +189,7 @@ export default function OverviewTopDevices({
</WidgetButtons> </WidgetButtons>
</WidgetHead> </WidgetHead>
<WidgetBody> <WidgetBody>
<ChartSwitch <ChartSwitch hideID {...widget.chart} previous={false} />
hideID
{...{
projectId,
startDate,
endDate,
events: [
{
segment: 'user',
filters,
id: 'A',
name: 'session_start',
},
],
breakdowns: [
{
id: 'A',
name: 'browser_version',
},
],
chartType: 'bar',
lineType: 'monotone',
interval: interval,
name: 'Top sources',
range: range,
previous: previous,
metric: 'sum',
}}
/>
</WidgetBody> </WidgetBody>
</Widget> </Widget>
</> </>

View File

@@ -62,6 +62,7 @@ export default function OverviewTopEvents({
conversions: { conversions: {
title: 'Conversions', title: 'Conversions',
btn: 'Conversions', btn: 'Conversions',
hide: conversions.length === 0,
chart: { chart: {
projectId, projectId,
startDate, startDate,
@@ -105,15 +106,17 @@ export default function OverviewTopEvents({
<WidgetHead> <WidgetHead>
<div className="title">{widget.title}</div> <div className="title">{widget.title}</div>
<WidgetButtons> <WidgetButtons>
{widgets.map((w) => ( {widgets
<button .filter((item) => item.hide !== true)
key={w.key} .map((w) => (
onClick={() => setWidget(w.key)} <button
className={cn(w.key === widget.key && 'active')} key={w.key}
> onClick={() => setWidget(w.key)}
{w.btn} className={cn(w.key === widget.key && 'active')}
</button> >
))} {w.btn}
</button>
))}
</WidgetButtons> </WidgetButtons>
</WidgetHead> </WidgetHead>
<WidgetBody> <WidgetBody>

View File

@@ -5,7 +5,10 @@ import type { IChartInput } from '@mixan/validation';
export function useOverviewWidget<T extends string>( export function useOverviewWidget<T extends string>(
key: string, key: string,
widgets: Record<T, { title: string; btn: string; chart: IChartInput }> widgets: Record<
T,
{ title: string; btn: string; chart: IChartInput; hide?: boolean }
>
) { ) {
const keys = Object.keys(widgets) as T[]; const keys = Object.keys(widgets) as T[];
const [widget, setWidget] = useQueryState<T>( const [widget, setWidget] = useQueryState<T>(