fix: general ui fixes

This commit is contained in:
Carl-Gerhard Lindesvärd
2025-12-02 21:54:57 +01:00
parent 50ef4c0d94
commit e4b919c4da
10 changed files with 256 additions and 248 deletions

View File

@@ -3,7 +3,6 @@ import { ProjectLink } from '@/components/links';
import { SerieIcon } from '@/components/report-chart/common/serie-icon'; import { SerieIcon } from '@/components/report-chart/common/serie-icon';
import { useNumber } from '@/hooks/use-numer-formatter'; import { useNumber } from '@/hooks/use-numer-formatter';
import { pushModal } from '@/modals'; import { pushModal } from '@/modals';
import { formatDateTime, formatTimeAgoOrDateTime, timeAgo } from '@/utils/date';
import { getProfileName } from '@/utils/getters'; import { getProfileName } from '@/utils/getters';
import type { ColumnDef } from '@tanstack/react-table'; import type { ColumnDef } from '@tanstack/react-table';
@@ -28,7 +27,7 @@ export function useColumns() {
accessorKey: 'name', accessorKey: 'name',
header: 'Name', header: 'Name',
cell({ row }) { cell({ row }) {
const { name, path, duration } = row.original; const { name, path, duration, properties } = row.original;
const renderName = () => { const renderName = () => {
if (name === 'screen_view') { if (name === 'screen_view') {
if (path.includes('/')) { if (path.includes('/')) {
@@ -209,7 +208,7 @@ export function useColumns() {
), ),
); );
const items = Object.entries(filteredProperties); const items = Object.entries(filteredProperties);
const limit = 1; const limit = 2;
const data = items.slice(0, limit).map(([key, value]) => ({ const data = items.slice(0, limit).map(([key, value]) => ({
name: key, name: key,
value: value, value: value,

View File

@@ -57,7 +57,7 @@ export function OverviewLiveHistogram({
<Wrapper <Wrapper
count={totalSessions} count={totalSessions}
icons={ icons={
<div className="row gap-2"> <div className="row gap-2 shrink-0">
{liveData.referrers.slice(0, 3).map((ref, index) => ( {liveData.referrers.slice(0, 3).map((ref, index) => (
<div <div
key={`${ref.referrer}-${ref.count}-${index}`} key={`${ref.referrer}-${ref.count}-${index}`}
@@ -107,11 +107,11 @@ interface WrapperProps {
function Wrapper({ children, count, icons }: WrapperProps) { function Wrapper({ children, count, icons }: WrapperProps) {
return ( return (
<div className="flex h-full flex-col"> <div className="flex h-full flex-col">
<div className="row gap-2 justify-between"> <div className="row gap-2 justify-between items-center">
<div className="relative mb-1 text-xs font-medium text-muted-foreground"> <div className="relative text-xs font-medium text-muted-foreground">
{count} sessions last 30 min {count} sessions last 30 min
</div> </div>
<div>{icons}</div> {icons}
</div> </div>
<div className="relative flex h-full w-full flex-1 items-end justify-center gap-2"> <div className="relative flex h-full w-full flex-1 items-end justify-center gap-2">
{children} {children}

View File

@@ -53,7 +53,7 @@ export function RealtimeActiveSessions({
const sessions = state.length > 0 ? state : (activeSessionsQuery.data ?? []); const sessions = state.length > 0 ? state : (activeSessionsQuery.data ?? []);
return ( return (
<div className="col h-full"> <div className="col h-full max-md:hidden">
<div className="hide-scrollbar h-full overflow-y-auto pb-10"> <div className="hide-scrollbar h-full overflow-y-auto pb-10">
<AnimatePresence mode="popLayout" initial={false}> <AnimatePresence mode="popLayout" initial={false}>
<div className="col gap-4"> <div className="col gap-4">

View File

@@ -51,6 +51,7 @@ export function RealtimeGeo({ projectId }: RealtimeGeoProps) {
{ {
name: 'Country / City', name: 'Country / City',
width: 'w-full', width: 'w-full',
responsive: { priority: 1 },
render(item) { render(item) {
return ( return (
<Tooltiper <Tooltiper
@@ -69,6 +70,7 @@ export function RealtimeGeo({ projectId }: RealtimeGeoProps) {
{ {
name: 'Duration', name: 'Duration',
width: '75px', width: '75px',
responsive: { priority: 7 },
render(item) { render(item) {
return number.shortWithUnit(item.avg_duration, 'min'); return number.shortWithUnit(item.avg_duration, 'min');
}, },
@@ -76,6 +78,7 @@ export function RealtimeGeo({ projectId }: RealtimeGeoProps) {
{ {
name: 'Events', name: 'Events',
width: '60px', width: '60px',
responsive: { priority: 4 },
render(item) { render(item) {
return ( return (
<div className="row gap-2 justify-end"> <div className="row gap-2 justify-end">
@@ -89,6 +92,7 @@ export function RealtimeGeo({ projectId }: RealtimeGeoProps) {
{ {
name: 'Sessions', name: 'Sessions',
width: '82px', width: '82px',
responsive: { priority: 2 },
render(item) { render(item) {
return ( return (
<div className="row gap-2 justify-end"> <div className="row gap-2 justify-end">

View File

@@ -58,7 +58,7 @@ export function RealtimeLiveHistogram({
count={totalVisitors} count={totalVisitors}
icons={ icons={
liveData.referrers && liveData.referrers.length > 0 ? ( liveData.referrers && liveData.referrers.length > 0 ? (
<div className="row gap-2"> <div className="row gap-2 shrink-0">
{liveData.referrers.slice(0, 3).map((ref, index) => ( {liveData.referrers.slice(0, 3).map((ref, index) => (
<div <div
key={`${ref.referrer}-${ref.count}-${index}`} key={`${ref.referrer}-${ref.count}-${index}`}

View File

@@ -48,6 +48,7 @@ export function RealtimePaths({ projectId }: RealtimePathsProps) {
{ {
name: 'Path', name: 'Path',
width: 'w-full', width: 'w-full',
responsive: { priority: 1 },
render(item) { render(item) {
return ( return (
<Tooltiper <Tooltiper
@@ -76,6 +77,7 @@ export function RealtimePaths({ projectId }: RealtimePathsProps) {
{ {
name: 'Duration', name: 'Duration',
width: '75px', width: '75px',
responsive: { priority: 7 },
render(item) { render(item) {
return number.shortWithUnit(item.avg_duration, 'min'); return number.shortWithUnit(item.avg_duration, 'min');
}, },
@@ -83,6 +85,7 @@ export function RealtimePaths({ projectId }: RealtimePathsProps) {
{ {
name: 'Events', name: 'Events',
width: '60px', width: '60px',
responsive: { priority: 4 },
render(item) { render(item) {
return ( return (
<div className="row gap-2 justify-end"> <div className="row gap-2 justify-end">
@@ -96,6 +99,7 @@ export function RealtimePaths({ projectId }: RealtimePathsProps) {
{ {
name: 'Sessions', name: 'Sessions',
width: '82px', width: '82px',
responsive: { priority: 2 },
render(item) { render(item) {
return ( return (
<div className="row gap-2 justify-end"> <div className="row gap-2 justify-end">

View File

@@ -45,6 +45,7 @@ export function RealtimeReferrals({ projectId }: RealtimeReferralsProps) {
{ {
name: 'Referrer', name: 'Referrer',
width: 'w-full', width: 'w-full',
responsive: { priority: 1 },
render(item) { render(item) {
return ( return (
<Tooltiper asChild content={item.referrer_name} side="left"> <Tooltiper asChild content={item.referrer_name} side="left">
@@ -59,6 +60,7 @@ export function RealtimeReferrals({ projectId }: RealtimeReferralsProps) {
{ {
name: 'Duration', name: 'Duration',
width: '75px', width: '75px',
responsive: { priority: 7 },
render(item) { render(item) {
return number.shortWithUnit(item.avg_duration, 'min'); return number.shortWithUnit(item.avg_duration, 'min');
}, },
@@ -66,6 +68,7 @@ export function RealtimeReferrals({ projectId }: RealtimeReferralsProps) {
{ {
name: 'Events', name: 'Events',
width: '60px', width: '60px',
responsive: { priority: 4 },
render(item) { render(item) {
return ( return (
<div className="row gap-2 justify-end"> <div className="row gap-2 justify-end">
@@ -79,6 +82,7 @@ export function RealtimeReferrals({ projectId }: RealtimeReferralsProps) {
{ {
name: 'Sessions', name: 'Sessions',
width: '82px', width: '82px',
responsive: { priority: 2 },
render(item) { render(item) {
return ( return (
<div className="row gap-2 justify-end"> <div className="row gap-2 justify-end">

View File

@@ -15,13 +15,12 @@ export function Chart({ data }: Props) {
const { const {
report: { metric, unit }, report: { metric, unit },
} = useReportChartContext(); } = useReportChartContext();
const { series } = useVisibleSeries(data, 100); const { series } = useVisibleSeries(data, 99999);
const [filters, setFilter] = useEventQueryFilters(); const [_, setFilter] = useEventQueryFilters();
const mapData = useMemo( const mapData = useMemo(
() => () =>
series.map((s) => ({ series.map((s) => ({
country: s.names[0]?.toLowerCase() ?? '', country: s.names[1]?.toLowerCase() ?? '',
value: s.metrics[metric] ?? 0, value: s.metrics[metric] ?? 0,
})), })),
[series, metric], [series, metric],

View File

@@ -18,10 +18,10 @@ import { useTRPC } from '@/integrations/trpc/react';
import { cn } from '@/utils/cn'; import { cn } from '@/utils/cn';
import { getProfileName } from '@/utils/getters'; import { getProfileName } from '@/utils/getters';
import type { IClickhouseEvent, IServiceEvent } from '@openpanel/db'; import type { IClickhouseEvent, IServiceEvent } from '@openpanel/db';
import { useQuery } from '@tanstack/react-query'; import { useSuspenseQuery } from '@tanstack/react-query';
import { FilterIcon, XIcon } from 'lucide-react'; import { FilterIcon, XIcon } from 'lucide-react';
import { omit } from 'ramda'; import { omit } from 'ramda';
import { useState } from 'react'; import { Suspense, useState } from 'react';
import { popModal } from '.'; import { popModal } from '.';
import { ModalContent } from './Modal/Container'; import { ModalContent } from './Modal/Container';
@@ -52,7 +52,19 @@ const filterable: Partial<Record<keyof IServiceEvent, keyof IClickhouseEvent>> =
origin: 'origin', origin: 'origin',
}; };
export default function EventDetails({ id, createdAt, projectId }: Props) { export default function EventDetails(props: Props) {
return (
<ModalContent className="!p-0">
<Widget className="bg-transparent border-0 min-w-0">
<Suspense fallback={<EventDetailsSkeleton />}>
<EventDetailsContent {...props} />
</Suspense>
</Widget>
</ModalContent>
);
}
function EventDetailsContent({ id, createdAt, projectId }: Props) {
const [, setEvents] = useEventQueryNamesFilter(); const [, setEvents] = useEventQueryNamesFilter();
const [, setFilter] = useEventQueryFilters(); const [, setFilter] = useEventQueryFilters();
const TABS = { const TABS = {
@@ -67,7 +79,7 @@ export default function EventDetails({ id, createdAt, projectId }: Props) {
}; };
const [widget, setWidget] = useState(TABS.essentials); const [widget, setWidget] = useState(TABS.essentials);
const trpc = useTRPC(); const trpc = useTRPC();
const query = useQuery( const query = useSuspenseQuery(
trpc.event.details.queryOptions({ trpc.event.details.queryOptions({
id, id,
projectId, projectId,
@@ -75,10 +87,6 @@ export default function EventDetails({ id, createdAt, projectId }: Props) {
}), }),
); );
if (!query.data) {
return <EventDetailsSkeleton />;
}
const { event, session } = query.data; const { event, session } = query.data;
const profile = event.profile; const profile = event.profile;
@@ -172,8 +180,7 @@ export default function EventDetails({ id, createdAt, projectId }: Props) {
})); }));
return ( return (
<ModalContent className="!p-0"> <>
<Widget className="bg-transparent border-0 min-w-0">
<WidgetHead> <WidgetHead>
<div className="row items-center justify-between"> <div className="row items-center justify-between">
<div className="title">{event.name}</div> <div className="title">{event.name}</div>
@@ -290,8 +297,7 @@ export default function EventDetails({ id, createdAt, projectId }: Props) {
columns={1} columns={1}
data={data} data={data}
renderValue={(item) => { renderValue={(item) => {
const isFilterable = const isFilterable = item.value && (filterable as any)[item.name];
item.value && (filterable as any)[item.name];
if (isFilterable) { if (isFilterable) {
return ( return (
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
@@ -306,16 +312,11 @@ export default function EventDetails({ id, createdAt, projectId }: Props) {
} }
return ( return (
<FieldValue <FieldValue name={item.name} value={item.value} event={event} />
name={item.name}
value={item.value}
event={event}
/>
); );
}} }}
onItemClick={(item) => { onItemClick={(item) => {
const isFilterable = const isFilterable = item.value && (filterable as any)[item.name];
item.value && (filterable as any)[item.name];
if (isFilterable) { if (isFilterable) {
popModal(); popModal();
setFilter(item.name as keyof IServiceEvent, item.value); setFilter(item.name as keyof IServiceEvent, item.value);
@@ -355,15 +356,13 @@ export default function EventDetails({ id, createdAt, projectId }: Props) {
</div> </div>
</section> </section>
</WidgetBody> </WidgetBody>
</Widget> </>
</ModalContent>
); );
} }
function EventDetailsSkeleton() { function EventDetailsSkeleton() {
return ( return (
<ModalContent className="!p-0"> <>
<Widget className="bg-transparent border-0 min-w-0">
<WidgetHead> <WidgetHead>
<div className="row items-center justify-between"> <div className="row items-center justify-between">
<div className="h-6 w-32 bg-muted animate-pulse rounded" /> <div className="h-6 w-32 bg-muted animate-pulse rounded" />
@@ -446,7 +445,6 @@ function EventDetailsSkeleton() {
</div> </div>
</section> </section>
</WidgetBody> </WidgetBody>
</Widget> </>
</ModalContent>
); );
} }

View File

@@ -67,7 +67,7 @@ function Component() {
</div> </div>
</div> </div>
<div className="grid grid-cols-3 gap-4 p-8 pt-0"> <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-4 p-4 pt-4 md:p-8 md:pt-0">
<div> <div>
<RealtimeGeo projectId={projectId} /> <RealtimeGeo projectId={projectId} />
</div> </div>