Merge branch 'main' into feature/frontend-charts

Author: gugu

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;
 }

backend/src/entities/visualizations/dashboard-widget/dashboard-widget.entity.ts

@@ -22,6 +22,9 @@ export class DashboardWidgetEntity {
 	@Column({ type: 'varchar' })
 	widget_type: DashboardWidgetTypeEnum;
 
+	@Column({ type: 'varchar', default: null, nullable: true })
+	chart_type: string | null;
+
 	@Column({ default: null, nullable: true })
 	name: string | null;
 

backend/src/entities/visualizations/dashboard-widget/dashboard-widgets.controller.ts

@@ -69,6 +69,7 @@ export class DashboardWidgetController {
 			masterPassword: masterPwd,
 			userId,
 			widget_type: createDto.widget_type,
+			chart_type: createDto.chart_type,
 			name: createDto.name,
 			description: createDto.description,
 			position_x: createDto.position_x,
@@ -108,6 +109,7 @@ export class DashboardWidgetController {
 			masterPassword: masterPwd,
 			userId,
 			widget_type: updateDto.widget_type,
+			chart_type: updateDto.chart_type,
 			name: updateDto.name,
 			description: updateDto.description,
 			position_x: updateDto.position_x,

backend/src/entities/visualizations/dashboard-widget/data-structures/create-dashboard-widget.ds.ts

@@ -6,6 +6,7 @@ export class CreateDashboardWidgetDs {
 	masterPassword: string;
 	userId: string;
 	widget_type: DashboardWidgetTypeEnum;
+	chart_type?: string;
 	name?: string;
 	description?: string;
 	position_x?: number;

backend/src/entities/visualizations/dashboard-widget/data-structures/update-dashboard-widget.ds.ts

@@ -7,6 +7,7 @@ export class UpdateDashboardWidgetDs {
 	masterPassword: string;
 	userId: string;
 	widget_type?: DashboardWidgetTypeEnum;
+	chart_type?: string;
 	name?: string;
 	description?: string;
 	position_x?: number;

backend/src/entities/visualizations/dashboard-widget/dto/create-dashboard-widget.dto.ts

@@ -8,6 +8,11 @@ export class CreateDashboardWidgetDto {
 	@IsEnum(DashboardWidgetTypeEnum)
 	widget_type: DashboardWidgetTypeEnum;
 
+	@ApiPropertyOptional({ description: 'Chart type for chart widgets' })
+	@IsOptional()
+	@IsString()
+	chart_type?: string;
+
 	@ApiPropertyOptional({ description: 'Widget name' })
 	@IsOptional()
 	@IsString()

backend/src/entities/visualizations/dashboard-widget/dto/found-dashboard-widget.dto.ts

@@ -8,6 +8,9 @@ export class FoundDashboardWidgetDto {
 	@ApiProperty({ description: 'Widget type', enum: DashboardWidgetTypeEnum })
 	widget_type: DashboardWidgetTypeEnum;
 
+	@ApiPropertyOptional({ description: 'Chart type for chart widgets' })
+	chart_type: string | null;
+
 	@ApiPropertyOptional({ description: 'Widget name' })
 	name: string | null;