Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"clsx": "^2.1.1",
"dagre": "^0.8.5",
"emoji-picker-react": "^4.19.1",
"fuse.js": "^7.4.2",
"i18next": "^25.10.10",
"i18next-browser-languagedetector": "^8.2.1",
"json-edit-react": "^1.29.1",
Expand Down
9 changes: 9 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 3 additions & 6 deletions src/components/layout/ExplorerSidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ import { ConfirmModal } from "../modals/ConfirmModal";
import { Accordion } from "./sidebar/Accordion";
import { SidebarTableItem } from "./sidebar/SidebarTableItem";
import { buildTableItemSelector } from "../../utils/sidebarTableItem";
import { fuzzyFilter } from "../../utils/fuzzy";
import { SidebarViewItem } from "./sidebar/SidebarViewItem";
import { SidebarRoutineItem } from "./sidebar/SidebarRoutineItem";
import { SidebarSchemaItem } from "./sidebar/SidebarSchemaItem";
Expand Down Expand Up @@ -1471,9 +1472,7 @@ export const ExplorerSidebar = ({ sidebarWidth, startResize, onCollapse, sidebar
</div>
)}
{(() => {
const filtered = tableFilter
? tables.filter((tbl) => tbl.name.toLowerCase().includes(tableFilter.toLowerCase()))
: tables;
const filtered = fuzzyFilter(tables, tableFilter, (tbl) => tbl.name);
return filtered.length === 0 ? (
<div className="text-center p-2 text-xs text-muted italic">
{tableFilter ? t("sidebar.noTablesMatch") : t("sidebar.noTables")}
Expand Down Expand Up @@ -1658,9 +1657,7 @@ export const ExplorerSidebar = ({ sidebarWidth, startResize, onCollapse, sidebar
</div>
)}
{(() => {
const filtered = triggerFilterFlat
? triggers.filter((tr) => tr.name.toLowerCase().includes(triggerFilterFlat.toLowerCase()))
: triggers;
const filtered = fuzzyFilter(triggers, triggerFilterFlat, (tr) => tr.name);
return filtered.length === 0 ? (
<div className="text-center p-2 text-xs text-muted italic">
{triggerFilterFlat ? t("sidebar.noTriggersMatch") : t("sidebar.noTriggers")}
Expand Down
9 changes: 3 additions & 6 deletions src/components/layout/sidebar/SidebarDatabaseItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import type { ContextMenuData } from "../../../types/sidebar";
import type { DriverCapabilities } from "../../../types/plugins";
import { groupRoutinesByType } from "../../../utils/routines";
import { formatObjectCount } from "../../../utils/schema";
import { fuzzyFilter } from "../../../utils/fuzzy";

interface SidebarDatabaseItemProps {
databaseName: string;
Expand Down Expand Up @@ -109,15 +110,11 @@ export const SidebarDatabaseItem = ({
const [triggerFilter, setTriggerFilter] = useState("");

const tables = databaseData?.tables ?? [];
const filteredTables = tableFilter
? tables.filter((t) => t.name.toLowerCase().includes(tableFilter.toLowerCase()))
: tables;
const filteredTables = fuzzyFilter(tables, tableFilter, (t) => t.name);
const views = databaseData?.views ?? [];
const routines = databaseData?.routines ?? [];
const triggers = databaseData?.triggers ?? [];
const filteredTriggers = triggerFilter
? triggers.filter((tr) => tr.name.toLowerCase().includes(triggerFilter.toLowerCase()))
: triggers;
const filteredTriggers = fuzzyFilter(triggers, triggerFilter, (tr) => tr.name);
const isLoading = databaseData?.isLoading ?? false;
const isLoaded = databaseData?.isLoaded ?? false;

Expand Down
9 changes: 3 additions & 6 deletions src/components/layout/sidebar/SidebarSchemaItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import type { TableColumn } from "../../../types/schema";
import type { ContextMenuData } from "../../../types/sidebar";
import { groupRoutinesByType } from "../../../utils/routines";
import { formatObjectCount } from "../../../utils/schema";
import { fuzzyFilter } from "../../../utils/fuzzy";

interface SidebarSchemaItemProps {
schemaName: string;
Expand Down Expand Up @@ -115,16 +116,12 @@ export const SidebarSchemaItem = ({
}

const tables = schemaData?.tables ?? [];
const filteredTables = tableFilter
? tables.filter((t) => t.name.toLowerCase().includes(tableFilter.toLowerCase()))
: tables;
const filteredTables = fuzzyFilter(tables, tableFilter, (t) => t.name);
const views = schemaData?.views ?? [];
const materializedViews = schemaData?.materializedViews ?? [];
const routines = schemaData?.routines ?? [];
const triggers = schemaData?.triggers ?? [];
const filteredTriggers = triggerFilter
? triggers.filter((tr) => tr.name.toLowerCase().includes(triggerFilter.toLowerCase()))
: triggers;
const filteredTriggers = fuzzyFilter(triggers, triggerFilter, (tr) => tr.name);
const isLoading = schemaData?.isLoading ?? false;
const isLoaded = schemaData?.isLoaded ?? false;

Expand Down
18 changes: 18 additions & 0 deletions src/utils/fuzzy.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import Fuse from "fuse.js";

export function fuzzyFilter<T>(
items: T[],
query: string,
getText: (item: T) => string,
): T[] {
const trimmed = query.trim();
if (trimmed === "") return items;

const texts = items.map(getText);
const fuse = new Fuse(texts, {
threshold: 0.4,
ignoreLocation: true,
});

return fuse.search(trimmed).map((result) => items[result.refIndex]);
}
40 changes: 40 additions & 0 deletions tests/utils/fuzzy.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import { describe, it, expect } from "vitest";
import { fuzzyFilter } from "../../src/utils/fuzzy";

const tables = [
{ name: "users" },
{ name: "user_roles" },
{ name: "orders" },
{ name: "order_items" },
{ name: "audit_log" },
];
const byName = (t: { name: string }) => t.name;

describe("fuzzyFilter", () => {
it("returns items unchanged for an empty query", () => {
expect(fuzzyFilter(tables, "", byName)).toEqual(tables);
expect(fuzzyFilter(tables, " ", byName)).toEqual(tables);
});

it("matches case-insensitively", () => {
expect(fuzzyFilter(tables, "USERS", byName).map(byName)).toContain("users");
});

it("keeps relevant matches and ranks the closest first", () => {
const result = fuzzyFilter(tables, "order", byName).map(byName);
expect(result).toContain("orders");
expect(result).toContain("order_items");
expect(result[0]).toBe("orders");
});

it("tolerates single-character typos", () => {
expect(fuzzyFilter(tables, "ordrs", byName).map(byName)).toContain("orders");
expect(fuzzyFilter(tables, "userz", byName).map(byName)).toContain("users");
});

it("excludes clearly unrelated names", () => {
expect(fuzzyFilter(tables, "audit", byName).map(byName)).not.toContain(
"orders",
);
});
});