* fix: integer to text comparison in routing insights query Add explicit integer array cast to prevent PostgreSQL type mismatch error when comparing bookingUserId (integer) with user_id array values in getRoutedToPerPeriodData query * add e2e tests * refactor: remove LoadingInsight component and handle loading in ChartCard - Enhanced ChartCard to render default loading UI when isPending is true - Replaced all LoadingInsight usages with ChartCard that accepts isPending/isError props - Removed LoadingInsight component and updated exports - Updated 16 chart components to use the new pattern - ChartCard now shows spinner and skeleton title during loading state Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * fix: make children prop optional in ChartCard when isPending is true Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: remove unused loadingState prop from ChartCard - Remove loadingState prop and ChartLoadingState type export - Simplify computedLoadingState to derive state only from isPending/isError - No functional changes - loadingState was not being used by any components - data-loading-state attribute behavior remains unchanged for E2E tests Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: remove duplicate isPending early returns from chart components - Update all 16 chart components to use single ChartCard return pattern - Gate children rendering with !isPending && isSuccess && data checks - Prevents data processing code from executing during loading state - Improves code consistency and maintainability across all charts Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: remove redundant !isPending check from chart conditionals - Simplify conditional rendering to use just 'isSuccess && data' or 'isSuccess' - In TanStack Query, isSuccess and isPending are mutually exclusive - The !isPending check was redundant since isSuccess already implies !isPending - Applied to all 16 chart components for consistency - Components with safe defaults (data ?? []) use just 'isSuccess' - Components requiring data check use 'isSuccess && data' Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * revert the mistake * apply feedback * apply feedback * fix e2e --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
161 lines
4.7 KiB
TypeScript
161 lines
4.7 KiB
TypeScript
"use client";
|
|
|
|
import { Fragment, useMemo, type ReactNode } from "react";
|
|
|
|
import classNames from "@calcom/ui/classNames";
|
|
import { PanelCard } from "@calcom/ui/components/card";
|
|
import { Spinner } from "@calcom/ui/components/icon";
|
|
import { SkeletonText } from "@calcom/ui/components/skeleton";
|
|
import { Tooltip } from "@calcom/ui/components/tooltip";
|
|
|
|
type PanelCardProps = React.ComponentProps<typeof PanelCard>;
|
|
|
|
type LegendItem = {
|
|
label: string;
|
|
color: string; // hex format
|
|
};
|
|
|
|
export type LegendSize = "sm" | "default";
|
|
|
|
export function ChartCard({
|
|
legend,
|
|
legendSize,
|
|
enabledLegend,
|
|
onSeriesToggle,
|
|
isPending,
|
|
isError,
|
|
...panelCardProps
|
|
}: Omit<PanelCardProps, 'children'> & {
|
|
legend?: Array<LegendItem>;
|
|
legendSize?: LegendSize;
|
|
enabledLegend?: Array<LegendItem>;
|
|
onSeriesToggle?: (label: string) => void;
|
|
isPending?: boolean;
|
|
isError?: boolean;
|
|
children?: ReactNode;
|
|
}) {
|
|
const legendComponent =
|
|
legend && legend.length > 0 ? (
|
|
<Legend items={legend} size={legendSize} enabledItems={enabledLegend} onItemToggle={onSeriesToggle} />
|
|
) : null;
|
|
|
|
// Generate a chart ID from the title for testing purposes
|
|
const chartId = useMemo(() => {
|
|
if (typeof panelCardProps.title === "string") {
|
|
return panelCardProps.title.toLowerCase().replace(/\s+/g, "-");
|
|
}
|
|
return undefined;
|
|
}, [panelCardProps.title]);
|
|
|
|
// Calculate loading state from isPending/isError
|
|
const computedLoadingState = useMemo(() => {
|
|
if (isPending) return "loading";
|
|
if (isError) return "error";
|
|
return "loaded";
|
|
}, [isPending, isError]);
|
|
|
|
const shouldShowDefaultLoading = isPending && !panelCardProps.children;
|
|
|
|
const displayTitle = shouldShowDefaultLoading ? <SkeletonText className="w-32" /> : panelCardProps.title;
|
|
|
|
return (
|
|
<PanelCard
|
|
{...panelCardProps}
|
|
title={displayTitle}
|
|
data-testid="chart-card"
|
|
data-chart-id={chartId}
|
|
data-loading-state={computedLoadingState}
|
|
headerContent={
|
|
panelCardProps.headerContent ? (
|
|
<div className="flex items-center gap-2">
|
|
{panelCardProps.headerContent}
|
|
{legendComponent}
|
|
</div>
|
|
) : (
|
|
legendComponent
|
|
)
|
|
}>
|
|
{shouldShowDefaultLoading ? (
|
|
<div className="m-auto flex h-80 flex-col items-center justify-center">
|
|
<Spinner className="h-6 w-6" />
|
|
</div>
|
|
) : (
|
|
panelCardProps.children
|
|
)}
|
|
</PanelCard>
|
|
);
|
|
}
|
|
|
|
export function ChartCardItem({
|
|
count,
|
|
className,
|
|
children,
|
|
}: {
|
|
count?: number | string;
|
|
className?: string;
|
|
children: ReactNode;
|
|
}) {
|
|
return (
|
|
<div
|
|
className={classNames(
|
|
"text-default border-muted flex items-center justify-between border-b px-3 py-3.5 last:border-b-0",
|
|
className
|
|
)}>
|
|
<div className="grow text-sm font-medium">{children}</div>
|
|
{count !== undefined && <div className="text-sm font-medium">{count}</div>}
|
|
</div>
|
|
);
|
|
}
|
|
|
|
function Legend({
|
|
items,
|
|
size = "default",
|
|
enabledItems,
|
|
onItemToggle,
|
|
}: {
|
|
items: LegendItem[];
|
|
size?: LegendSize;
|
|
enabledItems?: LegendItem[];
|
|
onItemToggle?: (label: string) => void;
|
|
}) {
|
|
const enabledSet = useMemo(() => new Set((enabledItems ?? []).map((i) => i.label)), [enabledItems]);
|
|
const isClickable = Boolean(onItemToggle);
|
|
|
|
return (
|
|
<div className="bg-default flex items-center gap-2 rounded-lg px-1.5 py-1">
|
|
{items.map((item, index) => {
|
|
const isEnabled = enabledItems ? enabledSet.has(item.label) : true;
|
|
|
|
return (
|
|
<Fragment key={item.label}>
|
|
<button
|
|
type="button"
|
|
className={classNames(
|
|
"relative flex items-center gap-2 rounded-md px-1.5 py-0.5 transition-opacity",
|
|
isClickable && "cursor-pointer hover:bg-gray-100",
|
|
!isEnabled && "opacity-25"
|
|
)}
|
|
style={{ backgroundColor: `${item.color}33` }}
|
|
aria-pressed={isClickable ? isEnabled : undefined}
|
|
aria-label={`Toggle ${item.label}`}
|
|
disabled={!isClickable}
|
|
onClick={isClickable ? () => onItemToggle?.(item.label) : undefined}>
|
|
<div className="h-2 w-2 rounded-full" style={{ backgroundColor: item.color }} />
|
|
<Tooltip content={item.label}>
|
|
<span
|
|
className={classNames(
|
|
"text-default truncate py-0.5 text-sm font-medium leading-none",
|
|
size === "sm" ? "w-16" : ""
|
|
)}>
|
|
{item.label}
|
|
</span>
|
|
</Tooltip>
|
|
</button>
|
|
{index < items.length - 1 && <div className="bg-cal-muted h-5 w-px" />}
|
|
</Fragment>
|
|
);
|
|
})}
|
|
</div>
|
|
);
|
|
}
|