@@ -82,14 +82,17 @@ export function useDataGridProps(
82
82
) ;
83
83
} , [ ] ) ;
84
84
85
- const fields = getFields ( searchParams , zaaktypeChoicesState ) . map ( ( field ) => {
86
- const isActiveFromStorage = fieldSelectionState ?. [ field . name ] ;
87
- const isActive =
88
- typeof isActiveFromStorage === "undefined"
89
- ? field . active !== false
90
- : isActiveFromStorage ;
91
- return { ...field , active : isActive } as TypedField ;
92
- } ) ;
85
+ const hasAction = paginatedResults . results . some ( ( zaak ) => zaak . action ) ;
86
+ const fields = getFields ( searchParams , zaaktypeChoicesState , hasAction ) . map (
87
+ ( field ) => {
88
+ const isActiveFromStorage = fieldSelectionState ?. [ field . name ] ;
89
+ const isActive =
90
+ typeof isActiveFromStorage === "undefined"
91
+ ? field . active !== false
92
+ : isActiveFromStorage ;
93
+ return { ...field , active : isActive } as TypedField ;
94
+ } ,
95
+ ) ;
93
96
94
97
//
95
98
// Get object list.
@@ -227,6 +230,7 @@ export function useDataGridProps(
227
230
export function getFields (
228
231
searchParams : URLSearchParams ,
229
232
zaaktypeChoices : ZaaktypeChoice [ ] ,
233
+ hasAction : boolean ,
230
234
) : TypedField [ ] {
231
235
return [
232
236
{
@@ -345,10 +349,15 @@ export function getFields(
345
349
{ value : "false" , label : "Nee" } ,
346
350
] ,
347
351
} ,
348
- {
349
- name : "action" ,
350
- type : "action" ,
351
- filterable : false ,
352
- } ,
352
+ // Only show action column if there are actions to show
353
+ ...( hasAction
354
+ ? [
355
+ {
356
+ name : "action" ,
357
+ type : "action" ,
358
+ filterable : false ,
359
+ } ,
360
+ ]
361
+ : [ ] ) ,
353
362
] ;
354
363
}
0 commit comments