Skip to content

fix: fix columns width on long rowset #1384

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

Merged
merged 9 commits into from
Oct 2, 2024
Merged

fix: fix columns width on long rowset #1384

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
77b21c1
fix: fix columns width on long rowset
astandrik Oct 1, 2024
81874d6
fix: dynamic column width
astandrik Oct 2, 2024
5add284
fix: review fix
astandrik Oct 2, 2024
fa986f0
Merge branch 'main' into astandrik.fix-columns-width-on-long-rowset-1340
astandrik Oct 2, 2024
d4dfddb
fix: better paddings
astandrik Oct 2, 2024
65e23b2
fix: remove sorting
astandrik Oct 2, 2024
6fcb982
fix: remove settings mix
astandrik Oct 2, 2024
6162468
fix: rm unused
astandrik Oct 2, 2024
55498af
fix: review fixes
astandrik Oct 2, 2024
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
18 changes: 16 additions & 2 deletions src/components/QueryResultTable/QueryResultTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,30 @@ const TABLE_SETTINGS: Settings = {

export const b = cn('ydb-query-result-table');

const prepareTypedColumns = (columns: ColumnType[]) => {
const WIDTH_PREDICTION_ROWS_COUNT = 100;
const MAX_COLUMN_WIDTH = 600;

const prepareTypedColumns = (columns: ColumnType[], data?: KeyValueRow[]) => {
if (!columns.length) {
return [];
}

const dataSlice = data?.slice(0, WIDTH_PREDICTION_ROWS_COUNT);

return columns.map(({name, type}) => {
const columnType = getColumnType(type);

const maxColumnContentLength =
dataSlice?.reduce(
(max, row) => Math.max(max, row[name] ? String(row[name]).length : max),
name.length,
) || name.length;

const headerPadding = columnType === 'number' ? 40 : 20;

const column: Column<KeyValueRow> = {
name,
width: Math.min(maxColumnContentLength * 10 + headerPadding, MAX_COLUMN_WIDTH),
align: columnType === 'number' ? DataTable.RIGHT : DataTable.LEFT,
sortAccessor: (row) => {
const value = row[name];
Expand Down Expand Up @@ -82,7 +96,7 @@ export const QueryResultTable = (props: QueryResultTableProps) => {

const data = React.useMemo(() => prepareQueryResponse(rawData), [rawData]);
const columns = React.useMemo(() => {
return rawColumns ? prepareTypedColumns(rawColumns) : prepareGenericColumns(data);
return rawColumns ? prepareTypedColumns(rawColumns, data) : prepareGenericColumns(data);
}, [data, rawColumns]);
const settings = React.useMemo(
() => ({
Expand Down
Loading