Skip to content

Commit 3d81613

Browse files
author
Keivan Vosoughi
committed
DSE-45483: Fix for Datasets Table REndering
1 parent 1534f9d commit 3d81613

File tree

3 files changed

+20
-9
lines changed

3 files changed

+20
-9
lines changed

app/client/src/pages/Home/DatasetsTab.tsx

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ const { Search } = Input;
2121
const Container = styled.div`
2222
background-color: #ffffff;
2323
padding: 1rem;
24+
overflow-x: auto;
2425
`;
2526

2627
const StyledTable = styled(Table)`
@@ -109,53 +110,56 @@ const DatasetsTab: React.FC = () => {
109110
key: 'display_name',
110111
title: 'Display Name',
111112
dataIndex: 'display_name',
112-
sorter: sortItemsByKey('display_name'),
113+
width: 140,
114+
sorter: sortItemsByKey('display_name')
113115
}, {
114116
key: 'generate_file_name',
115117
title: 'Dataset Name',
116118
dataIndex: 'generate_file_name',
117-
sorter: sortItemsByKey('generate_file_name'),
118119
width: 250,
120+
sorter: sortItemsByKey('generate_file_name'),
119121
render: (generate_file_name) => <Tooltip title={generate_file_name}><StyledParagraph style={{ width: 200, marginBottom: 0 }} ellipsis={{ rows: 1 }}>{generate_file_name}</StyledParagraph></Tooltip>
120122
}, {
121123
key: 'model_id',
122124
title: 'Model',
123125
dataIndex: 'model_id',
124-
sorter: sortItemsByKey('model_id'),
125126
width: 250,
127+
sorter: sortItemsByKey('model_id'),
126128
render: (modelId) => <Tooltip title={modelId}><StyledParagraph style={{ width: 200, marginBottom: 0 }} ellipsis={{ rows: 1 }}>{modelId}</StyledParagraph></Tooltip>
127129
}, {
128130
key: 'num_questions',
129131
title: 'Questions Per Topic',
130132
dataIndex: 'num_questions',
133+
width: 120,
131134
align: 'center',
132-
sorter: sortItemsByKey('num_questions'),
133-
width: 120
135+
sorter: sortItemsByKey('num_questions')
134136
},
135137
{
136138
key: 'total_count',
137139
title: 'Total Count',
138140
dataIndex: 'total_count',
141+
width: 80,
139142
align: 'center',
140-
sorter: sortItemsByKey('total_count'),
141-
width: 80
143+
sorter: sortItemsByKey('total_count')
142144
}, {
143145
key: 'use_case',
144146
title: 'Use Case',
145147
dataIndex: 'use_case',
148+
width: 120,
146149
sorter: sortItemsByKey('use_case'),
147150
render: (useCase) => TRANSLATIONS[useCase]
148151
}, {
149152
key: 'timestamp',
150153
title: 'Creation Time',
151154
dataIndex: 'timestamp',
152155
defaultSortOrder: 'descend',
156+
width: 120,
153157
sorter: sortItemsByKey('timestamp'),
154158
render: (timestamp) => <>{timestamp == null ? 'N/A' : <DateTime dateTime={timestamp}/>}</>
155159
}, {
156160
key: '7',
157161
title: 'Actions',
158-
width: 150,
162+
width: 100,
159163
render: (row: Dataset) => (
160164
<DatasetActions dataset={row} refetch={refetch} setToggleDatasetExportModal={setToggleDatasetExportModal}/>
161165
)

app/client/src/pages/Home/EvaluationsTab.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ const { Search } = Input;
2121
const Container = styled.div`
2222
background-color: #ffffff;
2323
padding: 1rem;
24+
overflow-x: auto;
2425
`;
2526

2627
const StyledTable = styled(Table)`
@@ -89,34 +90,40 @@ const EvaluationsTab: React.FC = () => {
8990
key: 'display_name',
9091
title: 'Display Name',
9192
dataIndex: 'display_name',
93+
width: 150,
9294
sorter: sortItemsByKey('display_name'),
9395
}, {
9496
key: 'model_id',
9597
title: 'Model ID',
9698
dataIndex: 'model_id',
99+
width: 150,
97100
sorter: sortItemsByKey('model_id'),
98101
}, {
99102
key: 'average_score',
100103
title: 'Average Score',
101104
dataIndex: 'average_score',
105+
width: 80,
102106
render: (average_score) => <Badge count={average_score} color={getColorCode(average_score)} showZero />,
103107
sorter: sortItemsByKey('average_score'),
104108
},{
105109
key: 'use_case',
106110
title: 'Use Case',
107111
dataIndex: 'use_case',
112+
width: 180,
108113
sorter: sortItemsByKey('use_case'),
109114
render: (useCase) => <StyledParagraph style={{ width: 200, marginBottom: 0 }} ellipsis={{ rows: 1 }}>{TRANSLATIONS[useCase]}</StyledParagraph>
110115
}, {
111116
key: 'timestamp',
112117
title: 'Create Time',
113118
dataIndex: 'timestamp',
119+
width: 140,
114120
sorter: sortItemsByKey('timestamp'),
115121
render: (timestamp) => <DateTime dateTime={timestamp}></DateTime>
116122

117123
}, {
118124
key: 'action',
119125
title: 'Actions',
126+
width: 100,
120127
render: (row: Evaluation) =>
121128
<EvaluateActions evaluation={row} refetch={refetch} />
122129

app/client/src/pages/Home/hooks.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,4 +242,4 @@ export const useUpgradeSynthesisStudio = () => {
242242
isError: mutation.isError,
243243
data: mutation.data
244244
};
245-
}
245+
}

0 commit comments

Comments
 (0)