Skip to content

Commit 76d4e14

Browse files
committed
table settings: add columns_view to PersonalTableSettingsInput and update buildDAOsTableSettingsDs logic
1 parent e16fca3 commit 76d4e14

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ type PersonalTableSettingsInput = {
2727
ordering_field: string;
2828
list_per_page: number;
2929
list_fields: string[];
30+
columns_view: string[];
3031
};
3132

3233
export function buildDAOsTableSettingsDs(
@@ -38,9 +39,10 @@ export function buildDAOsTableSettingsDs(
3839
display_name: commonTableSettings?.display_name,
3940
search_fields: commonTableSettings?.search_fields,
4041
excluded_fields: commonTableSettings?.excluded_fields,
41-
list_fields: (Array.isArray(personalTableSettings?.list_fields) && personalTableSettings.list_fields.length > 0)
42-
? personalTableSettings.list_fields
43-
: commonTableSettings?.list_fields || [],
42+
list_fields:
43+
Array.isArray(personalTableSettings?.list_fields) && personalTableSettings.list_fields.length > 0
44+
? personalTableSettings.list_fields
45+
: commonTableSettings?.list_fields || [],
4446
identification_fields: commonTableSettings?.identification_fields,
4547
list_per_page: personalTableSettings?.list_per_page || commonTableSettings?.list_per_page,
4648
ordering: personalTableSettings?.ordering || commonTableSettings?.ordering,
@@ -49,7 +51,10 @@ export function buildDAOsTableSettingsDs(
4951
readonly_fields: commonTableSettings?.readonly_fields,
5052
sortable_by: commonTableSettings?.sortable_by,
5153
autocomplete_columns: commonTableSettings?.autocomplete_columns,
52-
columns_view: commonTableSettings?.columns_view,
54+
columns_view:
55+
Array.isArray(personalTableSettings?.columns_view) && personalTableSettings.columns_view.length > 0
56+
? personalTableSettings.columns_view
57+
: commonTableSettings?.columns_view || [],
5358
can_delete: commonTableSettings?.can_delete,
5459
can_update: commonTableSettings?.can_update,
5560
can_add: commonTableSettings?.can_add,

0 commit comments

Comments
 (0)