Skip to content

Commit cba4afc

Browse files
Karan-PalanKaran-Palan
committed
feat: ensure sort and filter is globally enabled in all tables
Signed-off-by: karan-palan <karanpalan007@gmail.com>
1 parent 63521ed commit cba4afc

7 files changed

Lines changed: 41 additions & 41 deletions

File tree

‎src/custom/CatalogDesignTable/DesignTableColumnConfig.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export const createDesignsColumnsConfig = ({
7474
options: {
7575
filter: true,
7676
sort: true,
77-
searchable: true,
77+
searchable: false,
7878
customBodyRender: (value: string) => <ConditionalTooltip value={value} maxLength={10} />
7979
}
8080
},
@@ -173,9 +173,9 @@ export const createDesignsColumnsConfig = ({
173173
name: 'actions',
174174
label: 'Actions',
175175
options: {
176-
filter: false,
177-
sort: false,
178-
searchable: false,
176+
filter: true,
177+
sort: true,
178+
searchable: true,
179179
setCellHeaderProps: () => ({ align: 'center' as const }),
180180
setCellProps: () => ({ align: 'center' as const }),
181181
customBodyRender: function CustomBody(_, tableMeta: MUIDataTableMeta) {

‎src/custom/CatalogDesignTable/columnConfig.tsx‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@ export const createDesignColumns = ({
8686
name: 'id',
8787
label: 'ID',
8888
options: {
89-
filter: false,
89+
filter: true,
9090
customBodyRender: (value: string) => <ConditionalTooltip value={value} maxLength={10} />
9191
}
9292
},
9393
{
9494
name: 'name',
9595
label: 'Name',
9696
options: {
97-
filter: false,
97+
filter: true,
9898
sort: true,
9999
searchable: true,
100100
customBodyRender: (value: string, tableMeta: MUIDataTableMeta) => {
@@ -122,7 +122,7 @@ export const createDesignColumns = ({
122122
name: 'first_name',
123123
label: 'Author',
124124
options: {
125-
filter: false,
125+
filter: true,
126126
sort: true,
127127
searchable: true,
128128
customBodyRender: (_: string, tableMeta: MUIDataTableMeta) => {
@@ -154,7 +154,7 @@ export const createDesignColumns = ({
154154
name: 'created_at',
155155
label: 'Created At',
156156
options: {
157-
filter: false,
157+
filter: true,
158158
sort: true,
159159
searchable: true
160160
}
@@ -163,7 +163,7 @@ export const createDesignColumns = ({
163163
name: 'updated_at',
164164
label: 'Updated At',
165165
options: {
166-
filter: false,
166+
filter: true,
167167
sort: true,
168168
searchable: true
169169
}
@@ -173,7 +173,7 @@ export const createDesignColumns = ({
173173
label: 'Type',
174174
options: {
175175
filter: true,
176-
sort: false,
176+
sort: true,
177177
searchable: true
178178
}
179179
},
@@ -182,56 +182,56 @@ export const createDesignColumns = ({
182182
label: 'Class',
183183
options: {
184184
filter: true,
185-
sort: false,
185+
sort: true,
186186
searchable: true
187187
}
188188
},
189189
{
190190
name: 'view_count',
191191
label: 'Opens',
192192
options: {
193-
filter: false,
193+
filter: true,
194194
sort: true
195195
}
196196
},
197197
{
198198
name: 'download_count',
199199
label: 'Downloads',
200200
options: {
201-
filter: false,
201+
filter: true,
202202
sort: true
203203
}
204204
},
205205
{
206206
name: 'clone_count',
207207
label: 'Clones',
208208
options: {
209-
filter: false,
209+
filter: true,
210210
sort: true
211211
}
212212
},
213213
{
214214
name: 'deployment_count',
215215
label: 'Deploys',
216216
options: {
217-
filter: false,
217+
filter: true,
218218
sort: true
219219
}
220220
},
221221
{
222222
name: 'share_count',
223223
label: 'Shares',
224224
options: {
225-
filter: false,
225+
filter: true,
226226
sort: true
227227
}
228228
},
229229
{
230230
name: 'actions',
231231
label: 'Actions',
232232
options: {
233-
filter: false,
234-
sort: false,
233+
filter: true,
234+
sort: true,
235235
searchable: false,
236236
setCellHeaderProps: () => ({ align: 'center' }),
237237
setCellProps: () => ({ align: 'center' }),

‎src/custom/ResponsiveDataTable.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ const ResponsiveDataTable = ({
311311
print: false,
312312
download: false,
313313
search: false,
314-
filter: false,
314+
filter: true,
315315
viewColumns: false,
316316
rowsPerPageOptions: rowsPerPageOptions,
317317
onViewColumnsChange: (column: string, action: string) => {

‎src/custom/TeamTable/TeamTableConfiguration.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ export default function TeamTableConfiguration({
143143
options: {
144144
filter: true,
145145
sort: true,
146-
searchable: false,
146+
searchable: true,
147147
customBodyRender: (value: string) => <ConditionalTooltip value={value} maxLength={30} />
148148
}
149149
},
@@ -200,8 +200,8 @@ export default function TeamTableConfiguration({
200200
name: 'actions',
201201
label: 'Actions',
202202
options: {
203-
filter: false,
204-
sort: false,
203+
filter: true,
204+
sort: true,
205205
searchable: false,
206206
customBodyRender: (_: string, tableMeta: MUIDataTableMeta) => {
207207
if (bulkSelect || tableMeta.rowData[4].Valid) {
@@ -282,7 +282,7 @@ export default function TeamTableConfiguration({
282282
const ExpandedRowIdx = teams?.findIndex((team) => team.id === teamId);
283283

284284
const options = {
285-
filter: false,
285+
filter: true,
286286
selectableRows: 'none' as const,
287287
filterType: 'dropdown' as const,
288288
expandableRows: true,

‎src/custom/UsersTable/UsersTable.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,8 +393,8 @@ const UsersTable: React.FC<UsersTableProps> = ({
393393
name: 'actions',
394394
label: 'Actions',
395395
options: {
396-
filter: false,
397-
sort: false,
396+
filter: true,
397+
sort: true,
398398
searchable: false,
399399
customBodyRender: (_: string, tableMeta: MUIDataTableMeta) =>
400400
getValidColumnValue(tableMeta.rowData, 'deleted_at', columns).Valid !== false ? (

‎src/custom/Workspaces/EnvironmentTable.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ const EnvironmentTable: React.FC<EnvironmentTableProps> = ({
9292
name: 'id',
9393
label: 'ID',
9494
options: {
95-
filter: false,
95+
filter: true,
9696
customBodyRender: (value: string) => <ConditionalTooltip value={value} maxLength={10} />
9797
}
9898
},
@@ -196,7 +196,7 @@ const EnvironmentTable: React.FC<EnvironmentTableProps> = ({
196196
});
197197

198198
const options = {
199-
filter: false,
199+
filter: true,
200200
responsive: 'standard',
201201
selectableRows: 'none',
202202
count: environmentsOfWorkspace?.total_count,

‎src/custom/Workspaces/WorkspaceViewsTable.tsx‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,15 @@ const WorkspaceViewsTable: React.FC<ViewsTableProps> = ({
101101
name: 'id',
102102
label: 'ID',
103103
options: {
104-
filter: false,
104+
filter: true,
105105
customBodyRender: (value) => <ConditionalTooltip value={value} maxLength={10} />
106106
}
107107
},
108108
{
109109
name: 'name',
110110
label: 'Name',
111111
options: {
112-
filter: false,
112+
filter: true,
113113
sort: true,
114114
searchable: true,
115115
customBodyRender: (value, tableMeta) => {
@@ -127,8 +127,8 @@ const WorkspaceViewsTable: React.FC<ViewsTableProps> = ({
127127
name: 'avatar_url',
128128
label: 'Owner',
129129
options: {
130-
filter: false,
131-
sort: false,
130+
filter: true,
131+
sort: true,
132132
searchable: false,
133133
customBodyRender: (value: string, tableMeta: MUIDataTableMeta) => {
134134
const getValidColumnValue = (
@@ -156,7 +156,7 @@ const WorkspaceViewsTable: React.FC<ViewsTableProps> = ({
156156
name: 'email',
157157
label: 'Email',
158158
options: {
159-
filter: false,
159+
filter: true,
160160
sort: true,
161161
searchable: true
162162
}
@@ -165,7 +165,7 @@ const WorkspaceViewsTable: React.FC<ViewsTableProps> = ({
165165
name: 'first_name',
166166
label: 'First Name',
167167
options: {
168-
filter: false,
168+
filter: true,
169169
sort: true,
170170
searchable: true
171171
}
@@ -174,7 +174,7 @@ const WorkspaceViewsTable: React.FC<ViewsTableProps> = ({
174174
name: 'last_name',
175175
label: 'Last Name',
176176
options: {
177-
filter: false,
177+
filter: true,
178178
sort: true,
179179
searchable: true
180180
}
@@ -183,7 +183,7 @@ const WorkspaceViewsTable: React.FC<ViewsTableProps> = ({
183183
name: 'created_at',
184184
label: 'Created At',
185185
options: {
186-
filter: false,
186+
filter: true,
187187
sort: true,
188188
searchable: true,
189189
setCellHeaderProps: () => {
@@ -195,7 +195,7 @@ const WorkspaceViewsTable: React.FC<ViewsTableProps> = ({
195195
name: 'updated_at',
196196
label: 'Updated At',
197197
options: {
198-
filter: false,
198+
filter: true,
199199
sort: true,
200200
searchable: true,
201201
setCellHeaderProps: () => {
@@ -207,8 +207,8 @@ const WorkspaceViewsTable: React.FC<ViewsTableProps> = ({
207207
name: 'visibility',
208208
label: 'Visibility',
209209
options: {
210-
filter: false,
211-
sort: false,
210+
filter: true,
211+
sort: true,
212212
searchable: true,
213213
setCellHeaderProps: () => {
214214
return { align: 'center' };
@@ -219,8 +219,8 @@ const WorkspaceViewsTable: React.FC<ViewsTableProps> = ({
219219
name: 'actions',
220220
label: 'Actions',
221221
options: {
222-
filter: false,
223-
sort: false,
222+
filter: true,
223+
sort: true,
224224
searchable: false,
225225
customBodyRender: (_: string, tableMeta: MUIDataTableMeta) => (
226226
<IconWrapper disabled={!isRemoveAllowed}>
@@ -261,7 +261,7 @@ const WorkspaceViewsTable: React.FC<ViewsTableProps> = ({
261261
});
262262

263263
const options = {
264-
filter: false,
264+
filter: true,
265265
responsive: 'standard',
266266
selectableRows: 'none',
267267
count: viewsOfWorkspace?.total_count,

0 commit comments

Comments
 (0)