Skip to content

Commit 1ed7141

Browse files
committed
The graph now renders in a <Card>
1 parent e4fb4d0 commit 1ed7141

2 files changed

Lines changed: 20 additions & 15 deletions

File tree

apps/webapp/app/components/code/ChartConfigPanel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ export function ChartConfigPanel({ columns, config, onChange, className }: Chart
239239
}
240240

241241
return (
242-
<div className={cn("flex flex-col gap-2 px-3 py-2", className)}>
242+
<div className={cn("flex flex-col gap-2 p-2", className)}>
243243
{/* Chart Type */}
244244
<div className="flex flex-col gap-3">
245245
<ConfigField label="Type">

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/route.tsx

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { ArrowDownTrayIcon, ClipboardIcon, PlayIcon } from "@heroicons/react/20/solid";
1+
import { ArrowDownTrayIcon, ClipboardIcon } from "@heroicons/react/20/solid";
22
import type { OutputColumnMetadata } from "@internal/clickhouse";
33
import { Form, useNavigation } from "@remix-run/react";
44
import {
5+
redirect,
56
type ActionFunctionArgs,
67
type LoaderFunctionArgs,
7-
redirect,
88
} from "@remix-run/server-runtime";
99
import { forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState } from "react";
1010
import { typedjson, useTypedActionData, useTypedLoaderData } from "remix-typedjson";
@@ -19,16 +19,17 @@ import {
1919
import { QueryResultsChart } from "~/components/code/QueryResultsChart";
2020
import { autoFormatSQL, TSQLEditor } from "~/components/code/TSQLEditor";
2121
import { TSQLResultsTable } from "~/components/code/TSQLResultsTable";
22+
import { EnvironmentLabel } from "~/components/environments/EnvironmentLabel";
23+
import { PageBody, PageContainer } from "~/components/layout/AppLayout";
24+
import { Button } from "~/components/primitives/Buttons";
25+
import { Callout } from "~/components/primitives/Callout";
26+
import { Card } from "~/components/primitives/charts/Card";
2227
import {
2328
ClientTabs,
2429
ClientTabsContent,
2530
ClientTabsList,
2631
ClientTabsTrigger,
2732
} from "~/components/primitives/ClientTabs";
28-
import { EnvironmentLabel } from "~/components/environments/EnvironmentLabel";
29-
import { PageBody, PageContainer } from "~/components/layout/AppLayout";
30-
import { Button } from "~/components/primitives/Buttons";
31-
import { Callout } from "~/components/primitives/Callout";
3233
import { Header3 } from "~/components/primitives/Headers";
3334
import { NavBar, PageTitle } from "~/components/primitives/PageHeader";
3435
import { Paragraph } from "~/components/primitives/Paragraph";
@@ -46,10 +47,10 @@ import {
4647
import { Select, SelectItem } from "~/components/primitives/Select";
4748
import { Spinner } from "~/components/primitives/Spinner";
4849
import { Switch } from "~/components/primitives/Switch";
50+
import { prisma } from "~/db.server";
4951
import { useEnvironment } from "~/hooks/useEnvironment";
5052
import { useOrganization } from "~/hooks/useOrganizations";
5153
import { useProject } from "~/hooks/useProject";
52-
import { prisma } from "~/db.server";
5354
import { findProjectBySlug } from "~/models/project.server";
5455
import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
5556
import { QueryPresenter, type QueryHistoryItem } from "~/presenters/v3/QueryPresenter.server";
@@ -574,17 +575,21 @@ export default function Page() {
574575
</ClientTabsContent>
575576
<ClientTabsContent
576577
value="graph"
577-
className="grid min-h-0 grid-rows-[1fr] overflow-hidden"
578+
className="m-0 grid min-h-0 grid-rows-[1fr] overflow-hidden"
578579
>
579580
{results?.rows && results?.columns && results.rows.length > 0 ? (
580581
<ResizablePanelGroup className="h-full overflow-hidden">
581582
<ResizablePanel id="chart-results">
582-
<div className="h-full bg-background-dimmed p-3">
583-
<QueryResultsChart
584-
rows={results.rows}
585-
columns={results.columns}
586-
config={chartConfig}
587-
/>
583+
<div className="h-full bg-charcoal-900 p-2">
584+
<Card>
585+
<Card.Content>
586+
<QueryResultsChart
587+
rows={results.rows}
588+
columns={results.columns}
589+
config={chartConfig}
590+
/>
591+
</Card.Content>
592+
</Card>
588593
</div>
589594
</ResizablePanel>
590595
<ResizableHandle id="chart-split" />

0 commit comments

Comments
 (0)