Merge pull request #1558 from rocket-admin/backend_dashboards_properties-rework

feat: update SavedDbQueryEntity and migration for widget properties management

Author: Artuomka

backend/src/entities/visualizations/saved-db-query/saved-db-query.entity.ts

@@ -27,7 +27,7 @@ export class SavedDbQueryEntity {
 	@Column({ type: 'text', default: null, nullable: true })
 	description: string | null;
 
-	@Column({ type: 'varchar' })
+	@Column({ type: 'varchar', nullable: true, default: DashboardWidgetTypeEnum.Chart })
 	widget_type: DashboardWidgetTypeEnum;
 
 	@Column({ type: 'varchar', default: null, nullable: true })
@@ -36,7 +36,7 @@ export class SavedDbQueryEntity {
 	@Column('json', { default: null, nullable: true })
 	widget_options: string | null;
 
-	@Column({ type: 'text' })
+	@Column({ type: 'text', nullable: true, default: null })
 	query_text: string;
 
 	@Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })

…DashboardWidgetPropertiesToSavedQuery.ts …DashboardWidgetPropertiesToSavedQuery.tsbackend/src/migrations/1770116525022-MovedDashboardWidgetPropertiesToSavedQuery.ts renamed to backend/src/migrations/1770126075082-MovedDashboardWidgetPropertiesToSavedQuery.ts backend/src/migrations/1770116525022-MovedDashboardWidgetPropertiesToSavedQuery.ts renamed to backend/src/migrations/1770126075082-MovedDashboardWidgetPropertiesToSavedQuery.ts

@@ -1,20 +1,22 @@
 import { MigrationInterface, QueryRunner } from 'typeorm';
 
-export class MovedDashboardWidgetPropertiesToSavedQuery1770116525022 implements MigrationInterface {
-	name = 'MovedDashboardWidgetPropertiesToSavedQuery1770116525022';
+export class MovedDashboardWidgetPropertiesToSavedQuery1770126075082 implements MigrationInterface {
+	name = 'MovedDashboardWidgetPropertiesToSavedQuery1770126075082';
 
 	public async up(queryRunner: QueryRunner): Promise<void> {
 		await queryRunner.query(`ALTER TABLE "dashboard_widget" DROP COLUMN "widget_options"`);
 		await queryRunner.query(`ALTER TABLE "dashboard_widget" DROP COLUMN "widget_type"`);
 		await queryRunner.query(`ALTER TABLE "dashboard_widget" DROP COLUMN "name"`);
 		await queryRunner.query(`ALTER TABLE "dashboard_widget" DROP COLUMN "description"`);
 		await queryRunner.query(`ALTER TABLE "dashboard_widget" DROP COLUMN "chart_type"`);
-		await queryRunner.query(`ALTER TABLE "saved_db_query" ADD "widget_type" character varying NOT NULL`);
+		await queryRunner.query(`ALTER TABLE "saved_db_query" ADD "widget_type" character varying DEFAULT 'chart'`);
 		await queryRunner.query(`ALTER TABLE "saved_db_query" ADD "chart_type" character varying`);
 		await queryRunner.query(`ALTER TABLE "saved_db_query" ADD "widget_options" json`);
+		await queryRunner.query(`ALTER TABLE "saved_db_query" ALTER COLUMN "query_text" DROP NOT NULL`);
 	}
 
 	public async down(queryRunner: QueryRunner): Promise<void> {
+		await queryRunner.query(`ALTER TABLE "saved_db_query" ALTER COLUMN "query_text" SET NOT NULL`);
 		await queryRunner.query(`ALTER TABLE "saved_db_query" DROP COLUMN "widget_options"`);
 		await queryRunner.query(`ALTER TABLE "saved_db_query" DROP COLUMN "chart_type"`);
 		await queryRunner.query(`ALTER TABLE "saved_db_query" DROP COLUMN "widget_type"`);