Skip to content

fix(sql): scroll long scripts inside the SQL editor (#1480) #1481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shaishab316 wants to merge 1 commit into
base: main
Choose a base branch
from
+81 −53
Open

fix(sql): scroll long scripts inside the SQL editor (#1480) #1481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions ui/studio/views/sql/SqlView.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1259,6 +1259,23 @@ describe("SqlView", () => {
harness.cleanup();
});

it("keeps the SQL editor in a bounded scroll region for long scripts", () => {
const { adapter } = createAdapterMock();
const studio = createStudioMock(adapter);
useStudioMock.mockReturnValue(studio);

const harness = renderSqlView();

const scrollRegion = harness.container.querySelector(
'[data-testid="sql-editor-scroll-container"]',
);
expect(scrollRegion).toBeTruthy();
expect(scrollRegion?.className).toContain("min-h-0");
expect(scrollRegion?.className).toContain("overflow-hidden");

harness.cleanup();
});

it("supports cancelling a running query", async () => {
const raw: Adapter["raw"] = async (_details, options) => {
return await new Promise((resolve) => {
Expand Down
117 changes: 64 additions & 53 deletions ui/studio/views/sql/SqlView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import { createSqlEditorSchemaFromIntrospection } from "../../../../data/sql-edi
import { getTopLevelSqlStatementAtCursor } from "../../../../data/sql-statements";
import { Button } from "../../../components/ui/button";
import { Input } from "../../../components/ui/input";
import { cn } from "../../../lib/utils";
import { TableHead, TableRow } from "../../../components/ui/table";
import { useColumnPinning } from "../../../hooks/use-column-pinning";
import { useIntrospection } from "../../../hooks/use-introspection";
Expand Down Expand Up @@ -875,41 +876,47 @@ export function SqlView(_props: ViewProps) {
) : null}
</StudioHeader>

<div className="flex flex-col gap-3 p-3 border-b border-border bg-background">
<div className="rounded-md border border-border overflow-hidden bg-background">
<CodeMirror
aria-label="SQL editor"
basicSetup={{
foldGutter: false,
}}
className={[
"[&_.cm-editor]:!border-0 [&_.cm-editor]:font-mono",
"[&_.cm-gutters]:border-r [&_.cm-gutters]:border-border [&_.cm-gutters]:bg-muted/30",
"[&_.cm-line]:text-[15px] [&_.cm-scroller]:font-mono",
].join(" ")}
extensions={sqlEditorExtensions}
minHeight="128px"
onCreateEditor={(view) => {
editorViewRef.current = view;
const cursorIndex = view.state.doc.length;
view.dispatch({
selection: {
anchor: cursorIndex,
head: cursorIndex,
},
});
view.focus();
}}
onChange={(value) => {
hasUserEditedEditorValueRef.current = true;
latestEditorValueRef.current = value;
setEditorValue(value);
}}
placeholder="Write SQL..."
theme={isDarkMode ? "dark" : "light"}
value={editorValue}
/>
</div>
<div className="flex min-h-0 flex-1 flex-col overflow-hidden">
<div className="flex min-h-0 flex-1 flex-col gap-3 overflow-hidden border-b border-border bg-background p-3">
<div
className="flex min-h-0 flex-1 flex-col overflow-hidden rounded-md border border-border bg-background"
data-testid="sql-editor-scroll-container"
>
<CodeMirror
aria-label="SQL editor"
basicSetup={{
foldGutter: false,
}}
className={[
"min-h-0 flex-1",
"[&_.cm-editor]:!border-0 [&_.cm-editor]:font-mono",
"[&_.cm-gutters]:border-r [&_.cm-gutters]:border-border [&_.cm-gutters]:bg-muted/30",
"[&_.cm-line]:text-[15px] [&_.cm-scroller]:font-mono",
].join(" ")}
extensions={sqlEditorExtensions}
height="100%"
minHeight="128px"
onCreateEditor={(view) => {
editorViewRef.current = view;
const cursorIndex = view.state.doc.length;
view.dispatch({
selection: {
anchor: cursorIndex,
head: cursorIndex,
},
});
view.focus();
}}
onChange={(value) => {
hasUserEditedEditorValueRef.current = true;
latestEditorValueRef.current = value;
setEditorValue(value);
}}
placeholder="Write SQL..."
theme={isDarkMode ? "dark" : "light"}
value={editorValue}
/>
</div>
{aiGenerationErrorMessage ? (
<div className="text-sm text-destructive">
<strong>AI SQL generation error:</strong> {aiGenerationErrorMessage}
Expand Down Expand Up @@ -969,25 +976,29 @@ export function SqlView(_props: ViewProps) {
) : null}
</div>
) : null}
</div>
</div>

<div
data-testid="sql-result-grid-container"
className="grow min-h-0 flex flex-col"
>
{result == null ? null : (
<SqlResultGrid
isRunning={isRunning}
paginationState={paginationState}
pinnedColumnIds={pinnedColumnIds}
result={result}
rowSelectionState={rowSelectionState}
setPaginationState={setPaginationState}
setPinnedColumnIds={setPinnedColumnIds}
setRowSelectionState={setRowSelectionState}
visualizationState={visualization.state}
/>
)}
<div
data-testid="sql-result-grid-container"
className={cn(
"flex min-h-0 flex-col",
result != null ? "flex-1" : "flex-none",
)}
>
{result == null ? null : (
<SqlResultGrid
isRunning={isRunning}
paginationState={paginationState}
pinnedColumnIds={pinnedColumnIds}
result={result}
rowSelectionState={rowSelectionState}
setPaginationState={setPaginationState}
setPinnedColumnIds={setPinnedColumnIds}
setRowSelectionState={setRowSelectionState}
visualizationState={visualization.state}
/>
)}
</div>
</div>
</div>
);
Expand Down