Merge pull request #1519 from rocket-admin/backend_table_settings_rework

fix columns_view in table settings

Author: Artuomka

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

@@ -77,4 +77,7 @@ export class CreateTableSettingsDs {
 
   @ApiProperty({ required: false })
   ordering_field?: string;
+
+  @ApiProperty({ isArray: true, type: 'string', required: false })
+  columns_view?: Array<string>;
 }

backend/src/entities/table-settings/common-table-settings/dto/create-table-settings.dto.ts

@@ -2,16 +2,17 @@ import { CustomFieldsEntity } from '../../../custom-field/custom-fields.entity.j
 import { TableWidgetEntity } from '../../../widget/table-widget.entity.js';
 
 export class CreateTableSettingsDto {
-  connection_id: string;
-  table_name: string;
-  display_name: string;
-  search_fields: string[];
-  excluded_fields: string[];
-  identification_fields: string[];
-  identity_column;
-  readonly_fields: string[];
-  sortable_by: string[];
-  autocomplete_columns: string[];
-  custom_fields?: CustomFieldsEntity[];
-  table_widgets?: TableWidgetEntity[];
+	connection_id: string;
+	table_name: string;
+	display_name: string;
+	search_fields: string[];
+	excluded_fields: string[];
+	identification_fields: string[];
+	identity_column;
+	readonly_fields: string[];
+	sortable_by: string[];
+	autocomplete_columns: string[];
+	custom_fields?: CustomFieldsEntity[];
+	table_widgets?: TableWidgetEntity[];
+	columns_view?: string[];
 }

backend/src/entities/table-settings/common-table-settings/table-settings.controller.ts

@@ -118,6 +118,7 @@ export class TableSettingsController {
 		@Body('list_fields') list_fields: string[],
 		@Body('ordering') ordering: string,
 		@Body('ordering_field') ordering_field: string,
+		@Body('columns_view') columns_view: string[],
 		@UserId() userId: string,
 		@MasterPassword() masterPwd: string,
 	): Promise<FoundTableSettingsDs> {
@@ -147,6 +148,7 @@ export class TableSettingsController {
 			list_fields: list_fields,
 			ordering: ordering,
 			ordering_field: ordering_field,
+			columns_view: columns_view,
 		};
 
 		const errors = this.validateParameters(inputData);
@@ -195,6 +197,7 @@ export class TableSettingsController {
 		@Body('list_fields') list_fields: string[],
 		@Body('ordering') ordering: string,
 		@Body('ordering_field') ordering_field: string,
+		@Body('columns_view') columns_view: string[],
 		@UserId() userId: string,
 		@MasterPassword() masterPwd: string,
 	): Promise<FoundTableSettingsDs> {
@@ -223,6 +226,7 @@ export class TableSettingsController {
 			list_per_page,
 			ordering,
 			ordering_field,
+			columns_view,
 		};
 
 		const errors = this.validateParameters(inputData);

backend/src/entities/table-settings/common-table-settings/utils/build-new-table-settings-entity.ts

@@ -32,6 +32,7 @@ export function buildNewTableSettingsEntity(
 		list_fields,
 		ordering,
 		ordering_field,
+		columns_view,
 	} = settings;
 	newSettings.connection_id = connection;
 	newSettings.display_name = display_name;
@@ -57,5 +58,6 @@ export function buildNewTableSettingsEntity(
 	newSettings.list_fields = list_fields;
 	newSettings.ordering = ordering as QueryOrderingEnum;
 	newSettings.ordering_field = ordering_field;
+	newSettings.columns_view = columns_view;
 	return newSettings;
 }