Skip to content

Commit

Permalink
refactor: small refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
vwh committed Oct 16, 2024
1 parent 7428173 commit a04378b
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 17 deletions.
1 change: 0 additions & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ const areEqual = (
return prevProps.isDatabaseLoaded === nextProps.isDatabaseLoaded;
};

// Memoize DBTable with custom comparison function
const MemoizedDBTable = memo<DBTableProps>(DBTable, areEqual);
const MemoizedUploadFile = memo(UploadFile);
const MemoizedUrlFetch = memo(UrlFetch);
Expand Down
1 change: 1 addition & 0 deletions src/components/database/page-select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export default function PageSelect({
() => Math.ceil(totalRows / rowsPerPage),
[totalRows, rowsPerPage]
);

const currentPage = useMemo(
() => Math.ceil(page / rowsPerPage) + 1,
[page, rowsPerPage]
Expand Down
1 change: 0 additions & 1 deletion src/components/database/query-textarea.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ export default function QueryTextarea({ columnNames }: QueryTextareaProps) {
return (
<CodeMirror
value={sqlQuery}
defaultValue={sqlQuery}
height="126px"
extensions={extensions}
onChange={handleChange}
Expand Down
18 changes: 4 additions & 14 deletions src/components/database/upper-section.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import { useQueryData } from "@/hooks/useQueryData";
import { usePagination } from "@/hooks/usePagination";

import { Button } from "@/components/ui/button";
import StatusMessage from "@/components/stats-message";
import ExportButtons from "@/components/settings/export-buttons";
import PageSelect from "./page-select";
import TableSelect from "./table-select";
import DBTableComponent from "./table-data";
import StatusMessage from "@/components/stats-message";
import ExportButtons from "@/components/settings/export-buttons";
import QueryTextarea from "./query-textarea";

import {
Expand All @@ -32,7 +32,6 @@ export default function DBTable() {
rowPerPageOrAuto,
isCustomQuery,
setIsCustomQuery,
customQuery,
setCustomQuery,
expandPage,
setExpandPage,
Expand Down Expand Up @@ -60,7 +59,7 @@ export default function DBTable() {
if (columns.length > 0) {
setSavedColumns(columns);
}
}, [selectedTableName, columns]);
}, [columns]);

const handleQueryRemove = useCallback(() => {
setQueryError(null);
Expand Down Expand Up @@ -116,14 +115,7 @@ export default function DBTable() {
</div>
</div>
),
[
customQuery,
handleCustomQuery,
handleQueryRemove,
handleResetPage,
page,
savedColumns
]
[handleCustomQuery, handleQueryRemove, handleResetPage, page, savedColumns]
);

const MemoizedTableContent = useMemo(() => {
Expand All @@ -150,7 +142,6 @@ export default function DBTable() {
columns,
selectedTableName,
tableSchemas,
filters,
savedColumns
]);

Expand All @@ -164,7 +155,6 @@ export default function DBTable() {
<div className="flex flex-col gap-3 pb-8">
<section className="rounded-lg bg-gray-100 p-4 shadow-sm dark:bg-gray-700">
<div className="mb-[5px] flex items-center justify-between gap-1">
{/* Use MemoizedTableSelect instead of TableSelect */}
<MemoizedTableSelect />
<div className="flex items-center justify-center gap-1">
{MemoizedExportButtonsComponent}
Expand Down
2 changes: 1 addition & 1 deletion src/components/settings/theme-mode-toggle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export default function ThemeModeToggle() {
)}
</Button>
),
[theme]
[theme, toggleTheme]
);

return MemoizedThemeButton;
Expand Down

0 comments on commit a04378b

Please sign in to comment.