Skip to content

Commit 36fe5f0

Browse files
committed
Update list_fields assignment to prioritize personalTableSettings over commonTableSettings
1 parent f208767 commit 36fe5f0

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

shared-code/src/helpers/data-structures-builders/table-settings.ds.builder.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ export function buildDAOsTableSettingsDs(
3838
display_name: commonTableSettings?.display_name,
3939
search_fields: commonTableSettings?.search_fields,
4040
excluded_fields: commonTableSettings?.excluded_fields,
41-
list_fields: personalTableSettings?.list_fields || commonTableSettings?.list_fields || [],
41+
list_fields: (Array.isArray(personalTableSettings?.list_fields) && personalTableSettings.list_fields.length > 0)
42+
? personalTableSettings.list_fields
43+
: commonTableSettings?.list_fields || [],
4244
identification_fields: commonTableSettings?.identification_fields,
4345
list_per_page: personalTableSettings?.list_per_page || commonTableSettings?.list_per_page,
4446
ordering: personalTableSettings?.ordering || commonTableSettings?.ordering,

0 commit comments

Comments
 (0)