Skip to content

Commit 4b8d0ce

Browse files
Merge branch 'table-settings-restore-settings' of https://github.com/rocket-admin/rocketadmin into table-settings-restore-settings
2 parents 9ee561a + 5043c2a commit 4b8d0ce

File tree

16 files changed

+1707
-1163
lines changed

16 files changed

+1707
-1163
lines changed

backend/src/entities/table-settings/application/data-structures/create-table-settings.ds.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,16 @@ export class CreateTableSettingsDs {
6565

6666
@ApiProperty()
6767
allow_csv_import: boolean;
68+
69+
@ApiProperty({ required: false})
70+
list_per_page?: number;
71+
72+
@ApiProperty({ isArray: true, type: 'string', required: false })
73+
list_fields?: Array<string>;
74+
75+
@ApiProperty({ required: false })
76+
ordering?: string;
77+
78+
@ApiProperty({ required: false })
79+
ordering_field?: string;
6880
}

backend/src/entities/table-settings/application/data-structures/found-table-settings.ds.ts

Lines changed: 56 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -4,69 +4,81 @@ import { TableActionEntity } from '../../../table-actions/table-actions-module/t
44
import { TableWidgetEntity } from '../../../widget/table-widget.entity.js';
55

66
export class FoundTableSettingsDs {
7-
@ApiProperty()
8-
id: string;
7+
@ApiProperty()
8+
id: string;
99

10-
@ApiProperty()
11-
table_name: string;
10+
@ApiProperty()
11+
table_name: string;
1212

13-
@ApiProperty()
14-
display_name: string;
13+
@ApiProperty()
14+
display_name: string;
1515

16-
@ApiProperty({ isArray: true, type: String })
17-
search_fields: Array<string>;
16+
@ApiProperty({ isArray: true, type: String })
17+
search_fields: Array<string>;
1818

19-
@ApiProperty({ isArray: true, type: String })
20-
excluded_fields: Array<string>;
19+
@ApiProperty({ isArray: true, type: String })
20+
excluded_fields: Array<string>;
2121

22-
@ApiProperty({ isArray: true, type: String })
23-
identification_fields: Array<string>;
22+
@ApiProperty({ isArray: true, type: String })
23+
identification_fields: Array<string>;
2424

25-
@ApiProperty()
26-
identity_column: string;
25+
@ApiProperty()
26+
identity_column: string;
2727

28-
@ApiProperty({ isArray: true, type: String })
29-
readonly_fields: Array<string>;
28+
@ApiProperty({ isArray: true, type: String })
29+
readonly_fields: Array<string>;
3030

31-
@ApiProperty({ isArray: true, type: String })
32-
sensitive_fields: Array<string>;
31+
@ApiProperty({ isArray: true, type: String })
32+
sensitive_fields: Array<string>;
3333

34-
@ApiProperty({ isArray: true, type: String })
35-
sortable_by: Array<string>;
34+
@ApiProperty({ isArray: true, type: String })
35+
sortable_by: Array<string>;
3636

37-
@ApiProperty({ isArray: true, type: String })
38-
autocomplete_columns: Array<string>;
37+
@ApiProperty({ isArray: true, type: String })
38+
autocomplete_columns: Array<string>;
3939

40-
@ApiProperty({ isArray: true, type: String })
41-
columns_view: Array<string>;
40+
@ApiProperty({ isArray: true, type: String })
41+
columns_view: Array<string>;
4242

43-
@ApiProperty()
44-
connection_id: string;
43+
@ApiProperty()
44+
connection_id: string;
4545

46-
@ApiProperty({ isArray: true, type: CustomFieldsEntity })
47-
custom_fields: Array<CustomFieldsEntity>;
46+
@ApiProperty({ isArray: true, type: CustomFieldsEntity })
47+
custom_fields: Array<CustomFieldsEntity>;
4848

49-
@ApiProperty({ isArray: true, type: TableWidgetEntity })
50-
table_widgets: Array<TableWidgetEntity>;
49+
@ApiProperty({ isArray: true, type: TableWidgetEntity })
50+
table_widgets: Array<TableWidgetEntity>;
5151

52-
@ApiProperty({ isArray: true, type: TableActionEntity })
53-
table_actions: Array<TableActionEntity>;
52+
@ApiProperty({ isArray: true, type: TableActionEntity })
53+
table_actions: Array<TableActionEntity>;
5454

55-
@ApiProperty()
56-
can_add: boolean;
55+
@ApiProperty()
56+
can_add: boolean;
5757

58-
@ApiProperty()
59-
can_delete: boolean;
58+
@ApiProperty()
59+
can_delete: boolean;
6060

61-
@ApiProperty()
62-
can_update: boolean;
61+
@ApiProperty()
62+
can_update: boolean;
6363

64-
@ApiProperty()
65-
icon: string;
64+
@ApiProperty()
65+
icon: string;
6666

67-
@ApiProperty()
68-
allow_csv_export: boolean;
67+
@ApiProperty()
68+
allow_csv_export: boolean;
6969

70-
@ApiProperty()
71-
allow_csv_import: boolean;
70+
@ApiProperty()
71+
allow_csv_import: boolean;
72+
73+
@ApiProperty({ isArray: true, type: 'string' })
74+
list_fields: string[];
75+
76+
@ApiProperty()
77+
list_per_page: number;
78+
79+
@ApiProperty()
80+
ordering: string;
81+
82+
@ApiProperty()
83+
ordering_field: string;
7284
}

0 commit comments

Comments
 (0)