Skip to content

Commit 63521ed

Browse files
committed
feat: add filer and sort in UserTable and EnvironmentTable
Signed-off-by: karan-palan <karanpalan007@gmail.com>
1 parent 2a7bce4 commit 63521ed

2 files changed

Lines changed: 25 additions & 20 deletions

File tree

src/custom/UsersTable/UsersTable.tsx

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -229,17 +229,17 @@ const UsersTable: React.FC<UsersTableProps> = ({
229229
name: 'user_id',
230230
label: 'User ID',
231231
options: {
232-
filter: false,
233-
sort: false,
232+
filter: true,
233+
sort: true,
234234
searchable: false
235235
}
236236
},
237237
{
238238
name: 'avatar_url',
239239
label: 'Team Member',
240240
options: {
241-
filter: false,
242-
sort: false,
241+
filter: true,
242+
sort: true,
243243
searchable: false,
244244
customBodyRender: (value: string, tableMeta: MUIDataTableMeta) => (
245245
<Box sx={{ '& > img': { mr: 2, flexShrink: 0 } }}>
@@ -257,7 +257,7 @@ const UsersTable: React.FC<UsersTableProps> = ({
257257
name: 'email',
258258
label: 'Email',
259259
options: {
260-
filter: false,
260+
filter: true,
261261
sort: true,
262262
searchable: true
263263
}
@@ -266,7 +266,7 @@ const UsersTable: React.FC<UsersTableProps> = ({
266266
name: 'username',
267267
label: 'Username',
268268
options: {
269-
filter: false,
269+
filter: true,
270270
sort: true,
271271
searchable: true,
272272
customBodyRender: (value: string, tableMeta: MUIDataTableMeta) => (
@@ -308,7 +308,7 @@ const UsersTable: React.FC<UsersTableProps> = ({
308308
name: 'first_name',
309309
label: 'First',
310310
options: {
311-
filter: false,
311+
filter: true,
312312
sort: true,
313313
searchable: true
314314
}
@@ -317,7 +317,7 @@ const UsersTable: React.FC<UsersTableProps> = ({
317317
name: 'last_name',
318318
label: 'Last',
319319
options: {
320-
filter: false,
320+
filter: true,
321321
sort: true,
322322
searchable: true
323323
}
@@ -327,7 +327,7 @@ const UsersTable: React.FC<UsersTableProps> = ({
327327
label: 'Roles',
328328
options: {
329329
filter: true,
330-
sort: false,
330+
sort: true,
331331
searchable: false,
332332
// filterType: "multiselect",
333333
filterOptions: {
@@ -349,7 +349,7 @@ const UsersTable: React.FC<UsersTableProps> = ({
349349
name: 'joined_at',
350350
label: 'Joined At',
351351
options: {
352-
filter: false,
352+
filter: true,
353353
sort: true,
354354
searchable: false,
355355
sortDescFirst: true
@@ -359,8 +359,9 @@ const UsersTable: React.FC<UsersTableProps> = ({
359359
name: 'last_login_time',
360360
label: 'Last Active At',
361361
options: {
362-
filter: false,
362+
filter: true,
363363
sort: true,
364+
364365
searchable: false,
365366
sortDescFirst: true
366367
}
@@ -437,7 +438,11 @@ const UsersTable: React.FC<UsersTableProps> = ({
437438
<ResponsiveDataTable
438439
columns={columns}
439440
data={users}
440-
options={options}
441+
options={{
442+
...options,
443+
filter: true,
444+
sort: true
445+
}}
441446
colViews={colViews}
442447
tableCols={tableCols}
443448
updateCols={updateCols}

src/custom/Workspaces/EnvironmentTable.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ const EnvironmentTable: React.FC<EnvironmentTableProps> = ({
100100
name: 'name',
101101
label: 'Name',
102102
options: {
103-
filter: false,
103+
filter: true,
104104
sort: true,
105105
searchable: true,
106106
customBodyRender: (value: string) => <ConditionalTooltip value={value} maxLength={10} />
@@ -110,8 +110,8 @@ const EnvironmentTable: React.FC<EnvironmentTableProps> = ({
110110
name: 'organization_id',
111111
label: 'Organization ID',
112112
options: {
113-
filter: false,
114-
sort: false,
113+
filter: true,
114+
sort: true,
115115
searchable: false
116116
}
117117
},
@@ -120,7 +120,7 @@ const EnvironmentTable: React.FC<EnvironmentTableProps> = ({
120120
name: 'description',
121121
label: 'Description',
122122
options: {
123-
filter: false,
123+
filter: true,
124124
sort: true,
125125
searchable: true,
126126
customBodyRender: (value: string) => <ResizableDescriptionCell value={value} />
@@ -130,7 +130,7 @@ const EnvironmentTable: React.FC<EnvironmentTableProps> = ({
130130
name: 'created_at',
131131
label: 'Created At',
132132
options: {
133-
filter: false,
133+
filter: true,
134134
sort: true,
135135
searchable: true,
136136
setCellHeaderProps: () => {
@@ -142,7 +142,7 @@ const EnvironmentTable: React.FC<EnvironmentTableProps> = ({
142142
name: 'updated_at',
143143
label: 'Updated At',
144144
options: {
145-
filter: false,
145+
filter: true,
146146
sort: true,
147147
searchable: true,
148148
setCellHeaderProps: () => {
@@ -154,8 +154,8 @@ const EnvironmentTable: React.FC<EnvironmentTableProps> = ({
154154
name: 'actions',
155155
label: 'Actions',
156156
options: {
157-
filter: false,
158-
sort: false,
157+
filter: true,
158+
sort: true,
159159
searchable: false,
160160
customBodyRender: (_: string, tableMeta: MUIDataTableMeta) => (
161161
<IconWrapper disabled={!isRemoveAllowed}>

0 commit comments

Comments
 (0)