Merge pull request #1521 from rocket-admin/backend_charts

feat: add chart_type to DashboardWidgetEntity and related DTOs for enhanced widget configuration

Author: Artuomka

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;
 

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

@@ -8,6 +8,11 @@ export class UpdateDashboardWidgetDto {
 	@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/use-cases/create-dashboard-widget.use.case.ts

@@ -27,6 +27,7 @@ export class CreateDashboardWidgetUseCase
 			connectionId,
 			masterPassword,
 			widget_type,
+			chart_type,
 			name,
 			description,
 			position_x,
@@ -68,6 +69,7 @@ export class CreateDashboardWidgetUseCase
 
 		const newWidget = new DashboardWidgetEntity();
 		newWidget.widget_type = widget_type;
+		newWidget.chart_type = chart_type || null;
 		newWidget.name = name || null;
 		newWidget.description = description || null;
 		newWidget.position_x = position_x ?? 0;

backend/src/entities/visualizations/dashboard-widget/use-cases/update-dashboard-widget.use.case.ts

@@ -27,6 +27,7 @@ export class UpdateDashboardWidgetUseCase
 			connectionId,
 			masterPassword,
 			widget_type,
+			chart_type,
 			name,
 			description,
 			position_x,
@@ -78,6 +79,9 @@ export class UpdateDashboardWidgetUseCase
 		if (widget_type !== undefined) {
 			foundWidget.widget_type = widget_type;
 		}
+		if (chart_type !== undefined) {
+			foundWidget.chart_type = chart_type;
+		}
 		if (name !== undefined) {
 			foundWidget.name = name;
 		}

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

@@ -5,6 +5,7 @@ export function buildFoundDashboardWidgetDto(widget: DashboardWidgetEntity): Fou
 	return {
 		id: widget.id,
 		widget_type: widget.widget_type,
+		chart_type: widget.chart_type,
 		name: widget.name,
 		description: widget.description,
 		position_x: widget.position_x,