@solidxai/core 0.1.6-beta.2 → 0.1.6-beta.21

package/sql/default/mysql/proc_CleanupModelMetadata.sql

@@ -0,0 +1,153 @@
+DROP PROCEDURE IF EXISTS cleanup_model_metadata;
+
+DELIMITER $$
+
+CREATE PROCEDURE cleanup_model_metadata(
+    IN p_model_singular_name VARCHAR(255),
+    IN p_also_drop_model     TINYINT(1)   -- 0 = false, 1 = true (DEFAULT 0)
+)
+BEGIN
+    DECLARE v_model_id        INT;
+    DECLARE v_controller_name VARCHAR(512);
+
+    -- Default p_also_drop_model to 0 when NULL is passed
+    IF p_also_drop_model IS NULL THEN
+        SET p_also_drop_model = 0;
+    END IF;
+
+    --------------------------------------------------------------------
+    -- Derive ControllerName from model singular name
+    -- e.g. 'city' -> 'CityController'
+    --      'bankIfscMaster' -> 'BankIfscMasterController'
+    --------------------------------------------------------------------
+    SET v_controller_name = CONCAT(
+        UPPER(LEFT(p_model_singular_name, 1)),
+        SUBSTR(p_model_singular_name, 2),
+        'Controller'
+    );
+
+    SELECT m.id
+      INTO v_model_id
+      FROM ss_model_metadata AS m
+     WHERE m.singular_name = p_model_singular_name
+     LIMIT 1;
+
+    IF v_model_id IS NULL THEN
+        SIGNAL SQLSTATE '45000'
+            SET MESSAGE_TEXT = CONCAT('CleanupModelMetadata: Model with singular_name "', p_model_singular_name, '" not found.');
+    END IF;
+
+    --------------------------------------------------------------------
+    -- Temp tables for IDs (session-scoped, dropped at end of session)
+    --------------------------------------------------------------------
+    DROP TEMPORARY TABLE IF EXISTS tmp_view_ids;
+    DROP TEMPORARY TABLE IF EXISTS tmp_action_ids;
+    DROP TEMPORARY TABLE IF EXISTS tmp_permission_ids;
+
+    CREATE TEMPORARY TABLE tmp_view_ids       (id INT PRIMARY KEY);
+    CREATE TEMPORARY TABLE tmp_action_ids     (id INT PRIMARY KEY);
+    CREATE TEMPORARY TABLE tmp_permission_ids (id INT PRIMARY KEY);
+
+    INSERT INTO tmp_view_ids (id)
+    SELECT v.id
+      FROM ss_view_metadata AS v
+     WHERE v.model_id = v_model_id;
+
+    INSERT INTO tmp_action_ids (id)
+    SELECT a.id
+      FROM ss_action_metadata AS a
+     WHERE a.model_id = v_model_id;
+
+    --------------------------------------------------------------------
+    -- Collect permissions for this controller:
+    -- e.g. CityController.create, CityController.update, etc.
+    --------------------------------------------------------------------
+    INSERT INTO tmp_permission_ids (id)
+    SELECT p.id
+      FROM ss_permission_metadata AS p
+     WHERE p.name LIKE CONCAT(v_controller_name, '.%');
+
+    --------------------------------------------------------------------
+    -- 1) Delete user-view metadata
+    --------------------------------------------------------------------
+    DELETE FROM ss_user_view_metadata
+     WHERE view_metadata_id IN (SELECT id FROM tmp_view_ids);
+
+    --------------------------------------------------------------------
+    -- 2) Delete menu items linked via action_id
+    --------------------------------------------------------------------
+    DELETE FROM ss_menu_item_metadata
+     WHERE action_id IN (SELECT id FROM tmp_action_ids);
+
+    --------------------------------------------------------------------
+    -- 3) Delete actions
+    --------------------------------------------------------------------
+    DELETE FROM ss_action_metadata
+     WHERE id IN (SELECT id FROM tmp_action_ids);
+
+    --------------------------------------------------------------------
+    -- 4) Delete views
+    --------------------------------------------------------------------
+    DELETE FROM ss_view_metadata
+     WHERE id IN (SELECT id FROM tmp_view_ids);
+
+    --------------------------------------------------------------------
+    -- 5) Delete import transaction error logs for this model's imports
+    --------------------------------------------------------------------
+    DELETE FROM ss_import_transaction_error_log
+     WHERE import_transaction_id IN (
+           SELECT it.id
+             FROM ss_import_transaction AS it
+            WHERE it.model_metadata_id = v_model_id
+     );
+
+    --------------------------------------------------------------------
+    -- 6) Delete import transactions linked to the model
+    --------------------------------------------------------------------
+    DELETE FROM ss_import_transaction
+     WHERE model_metadata_id = v_model_id;
+
+    --------------------------------------------------------------------
+    -- 7) Delete permissions for this controller
+    --    a) Delete from role-permission join table
+    --    b) Delete from permission metadata
+    --------------------------------------------------------------------
+    DELETE FROM ss_role_metadata_permissions_ss_permission_metadata
+     WHERE ss_permission_metadata_id IN (SELECT id FROM tmp_permission_ids);
+
+    DELETE FROM ss_permission_metadata
+     WHERE id IN (SELECT id FROM tmp_permission_ids);
+
+    --------------------------------------------------------------------
+    -- 8) Optionally delete the model row itself (+ fields)
+    --------------------------------------------------------------------
+    IF p_also_drop_model = 1 THEN
+
+        -- 8a) Null user_key_field_id pointing to fields of this model
+        UPDATE ss_model_metadata AS mm
+           SET user_key_field_id = NULL
+         WHERE user_key_field_id IN (
+                SELECT f.id
+                  FROM ss_field_metadata AS f
+                 WHERE f.model_id = v_model_id
+         );
+
+        -- 8b) Null parent_model_id pointing to this model
+        UPDATE ss_model_metadata
+           SET parent_model_id = NULL
+         WHERE parent_model_id = v_model_id;
+
+        -- 8c) Delete model (fields deleted via ON DELETE CASCADE)
+        DELETE FROM ss_model_metadata
+         WHERE id = v_model_id;
+
+    END IF;
+
+    -- Cleanup temp tables
+    DROP TEMPORARY TABLE IF EXISTS tmp_view_ids;
+    DROP TEMPORARY TABLE IF EXISTS tmp_action_ids;
+    DROP TEMPORARY TABLE IF EXISTS tmp_permission_ids;
+
+END$$
+
+DELIMITER ;

package/sql/default/mysql/proc_CleanupModuleMetadata.sql

@@ -0,0 +1,56 @@
+DROP PROCEDURE IF EXISTS cleanup_module_metadata;
+
+DELIMITER $$
+
+CREATE PROCEDURE cleanup_module_metadata(
+    IN p_module_name      VARCHAR(255),
+    IN p_also_drop_module TINYINT(1)   -- 0 = false, 1 = true (DEFAULT 0)
+)
+BEGIN
+    DECLARE v_module_id INT;
+
+    -- Default p_also_drop_module to 0 when NULL is passed
+    IF p_also_drop_module IS NULL THEN
+        SET p_also_drop_module = 0;
+    END IF;
+
+    SELECT m.id
+      INTO v_module_id
+      FROM ss_module_metadata AS m
+     WHERE m.name = p_module_name
+     LIMIT 1;
+
+    IF v_module_id IS NULL THEN
+        SIGNAL SQLSTATE '45000'
+            SET MESSAGE_TEXT = CONCAT('CleanupModuleMetadata: Module "', p_module_name, '" not found.');
+    END IF;
+
+    ----------------------------------------------------------------
+    -- 1) Delete menus for this module (children first, then roots)
+    ----------------------------------------------------------------
+    DELETE FROM ss_menu_item_metadata
+     WHERE module_id = v_module_id
+       AND parent_menu_item_id IS NOT NULL;
+
+    DELETE FROM ss_menu_item_metadata
+     WHERE module_id = v_module_id
+       AND parent_menu_item_id IS NULL;
+
+    ----------------------------------------------------------------
+    -- 2) Delete actions for this module
+    ----------------------------------------------------------------
+    DELETE FROM ss_action_metadata
+     WHERE module_id = v_module_id;
+
+    ----------------------------------------------------------------
+    -- 3) Optionally delete the module row itself
+    --    (assumes ss_model_metadata.module_id has ON DELETE SET NULL)
+    ----------------------------------------------------------------
+    IF p_also_drop_module = 1 THEN
+        DELETE FROM ss_module_metadata
+         WHERE id = v_module_id;
+    END IF;
+
+END$$
+
+DELIMITER ;

package/src/controllers/dashboard-layout.controller.ts

@@ -0,0 +1,106 @@
+import { Controller, Post, Body, Param, UploadedFiles, UseInterceptors, Put, Get, Query, Delete, Patch } from '@nestjs/common';
+import { AnyFilesInterceptor } from "@nestjs/platform-express";
+import { ApiBearerAuth, ApiQuery, ApiTags } from '@nestjs/swagger';
+import { CreateDashboardLayoutDto } from 'src/dtos/create-dashboard-layout.dto';
+import { UpdateDashboardLayoutDto } from 'src/dtos/update-dashboard-layout.dto';
+import { DashboardLayoutService } from 'src/services/dashboard-layout.service';
+
+enum ShowSoftDeleted {
+  INCLUSIVE = "inclusive",
+  EXCLUSIVE = "exclusive",
+}
+
+@ApiTags('Solid Core')
+@Controller('dashboard-layout')
+export class DashboardLayoutController {
+  constructor(private readonly service: DashboardLayoutService) { }
+
+  @ApiBearerAuth("jwt")
+  @Post()
+  @UseInterceptors(AnyFilesInterceptor())
+  create(@Body() createDto: CreateDashboardLayoutDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+    return this.service.create(createDto, files);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Post('/bulk')
+  @UseInterceptors(AnyFilesInterceptor())
+  insertMany(@Body() createDtos: CreateDashboardLayoutDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = []) {
+    return this.service.insertMany(createDtos, filesArray);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Post('/upsert-user-dashboard-layout')
+  @UseInterceptors(AnyFilesInterceptor())
+  upsertUserDashboardLayout(@Body() createDtos: CreateDashboardLayoutDto) {
+    return this.service.upsertUserDashboardLayout(createDtos);
+  }
+
+
+  @ApiBearerAuth("jwt")
+  @Put(':id')
+  @UseInterceptors(AnyFilesInterceptor())
+  update(@Param('id') id: number, @Body() updateDto: UpdateDashboardLayoutDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+    return this.service.update(id, updateDto, files);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Patch(':id')
+  @UseInterceptors(AnyFilesInterceptor())
+  partialUpdate(@Param('id') id: number, @Body() updateDto: UpdateDashboardLayoutDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+    return this.service.update(id, updateDto, files, true);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Post('/bulk-recover')
+  async recoverMany(@Body() ids: number[]) {
+    return this.service.recoverMany(ids);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Get('/user-dashboard-layout/:dashboardId')
+  async getUserDashboardLayoutByDashboardId(@Param('dashboardId') dashboardId: number) {
+    return this.service.getUserDashboardLayoutByDashboardId(dashboardId);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Get('/recover/:id')
+  async recover(@Param('id') id: number) {
+    return this.service.recover(id);
+  }
+
+  @ApiBearerAuth("jwt")
+  @ApiQuery({ name: 'showSoftDeleted', required: false, enum: ShowSoftDeleted })
+  @ApiQuery({ name: 'limit', required: false, type: Number })
+  @ApiQuery({ name: 'offset', required: false, type: Number })
+  @ApiQuery({ name: 'fields', required: false, type: Array })
+  @ApiQuery({ name: 'sort', required: false, type: Array })
+  @ApiQuery({ name: 'groupBy', required: false, type: Array })
+  @ApiQuery({ name: 'populate', required: false, type: Array })
+  @ApiQuery({ name: 'populateMedia', required: false, type: Array })
+  @ApiQuery({ name: 'filters', required: false, type: Array })
+  @Get()
+  async findMany(@Query() query: any) {
+    return this.service.find(query);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Get(':id')
+  async findOne(@Param('id') id: string, @Query() query: any) {
+    return this.service.findOne(+id, query);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Delete('/bulk')
+  async deleteMany(@Body() ids: number[]) {
+    return this.service.deleteMany(ids);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Delete(':id')
+  async delete(@Param('id') id: number) {
+    return this.service.delete(id);
+  }
+
+
+}

package/src/controllers/scheduled-job.controller.ts

@@ -89,5 +89,11 @@ export class ScheduledJobController {
     return this.service.delete(id);
   }
 
+  @ApiBearerAuth("jwt")
+  @Post(':id/trigger')
+  async triggerRun(@Param('id') id: string) {
+    return this.service.triggerRun(+id);
+  }
+
 
 }

package/src/dtos/create-dashboard-layout.dto.ts

@@ -0,0 +1,31 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsString } from 'class-validator';
+import { IsNotEmpty, IsOptional, IsInt } from 'class-validator';
+
+
+export class CreateDashboardLayoutDto {
+    @IsNotEmpty()
+    @IsString()
+    @ApiProperty()
+    layout: string;
+
+    @IsOptional()
+    @IsInt()
+    @ApiProperty({ description: "Related Dashboard Model" })
+    dashboardId: number;
+
+    @IsString()
+    @IsOptional()
+    @ApiProperty({ description: "Related Dashboard Model" })
+    dashboardUserKey: string;
+
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    userId: number;
+
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    userUserKey: string;
+}

package/src/dtos/create-dashboard-variable.dto.ts

@@ -53,4 +53,8 @@ export class CreateDashboardVariableDto {
     @IsString()
     @ApiProperty({ description: "This is the default operator for this variable when it is rendered at runtime. It can be a static value for this variable when it is rendered at runtime." })
     defaultOperator: string;
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    externalId: string;
 }

package/src/dtos/update-dashboard-layout.dto.ts

@@ -0,0 +1,30 @@
+import { IsInt, IsOptional, IsString, IsNotEmpty } from 'class-validator';
+import { ApiProperty } from '@nestjs/swagger';
+
+export class UpdateDashboardLayoutDto {
+    @IsNotEmpty()
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    layout: string;
+
+    @IsOptional()
+    @IsInt()
+    @ApiProperty({ description: "Related Dashboard Model" })
+    dashboardId: number;
+
+    @IsString()
+    @IsOptional()
+    @ApiProperty({ description: "Related Dashboard Model" })
+    dashboardUserKey: string;
+
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    userId: number;
+
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    userUserKey: string;
+}

package/src/dtos/update-dashboard-variable.dto.ts

@@ -1,4 +1,4 @@
-import { IsInt,IsOptional, IsString, IsNotEmpty, IsJSON, IsBoolean } from 'class-validator';
+import { IsInt, IsOptional, IsString, IsNotEmpty, IsJSON, IsBoolean } from 'class-validator';
 import { ApiProperty } from '@nestjs/swagger';
 
 export class UpdateDashboardVariableDto {
@@ -51,4 +51,8 @@ export class UpdateDashboardVariableDto {
     @IsString()
     @ApiProperty({ description: "This is the default operator for this variable when it is rendered at runtime. It can be a static value for this variable when it is rendered at runtime." })
     defaultOperator: string;
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    externalId: string;
 }

package/src/entities/action-metadata.entity.ts

@@ -3,6 +3,7 @@ import { Entity, Column, Index, ManyToOne, JoinColumn } from "typeorm";
 import { ModuleMetadata } from 'src/entities/module-metadata.entity';
 import { ModelMetadata } from 'src/entities/model-metadata.entity';
 import { ViewMetadata } from 'src/entities/view-metadata.entity'
+import { getColumnType } from 'src/helpers/typeorm-db-helper';
 @Entity("ss_action_metadata")
 export class ActionMetadata extends CommonEntity {
     @Column({ name: "name", type: "varchar", unique: true })
@@ -15,10 +16,10 @@ export class ActionMetadata extends CommonEntity {
     @Column({ name: "type", type: "varchar" })
     type: string;
 
-    @Column({ name: "domain", type: "text", nullable: true })
+    @Column({ name: "domain", type: "text", nullable: true})
     domain: any;
 
-    @Column({ name: "context", type: "text", nullable: true })
+    @Column({ name: "context", type: "text", nullable: true})
     context: any;
 
     @Column({ name: "custom_component", type: "varchar", nullable: true })

package/src/entities/ai-interaction.entity.ts

@@ -1,6 +1,7 @@
 import { CommonEntity } from 'src/entities/common.entity'
 import { Entity, JoinColumn, ManyToOne, Index, Column } from 'typeorm';
 import { User } from 'src/entities/user.entity'
+import { getColumnType } from 'src/helpers/typeorm-db-helper';
 
 @Entity("ss_ai_interactions")
 export class AiInteraction extends CommonEntity {
@@ -16,7 +17,7 @@ export class AiInteraction extends CommonEntity {
     @Column({ type: "varchar" })
     role: string;
 
-    @Column({ type: "text" })
+    @Column({ ...getColumnType('longText'), nullable: true })
     message: string;
 
     @Column({ type: "varchar", nullable: true })
@@ -26,7 +27,7 @@ export class AiInteraction extends CommonEntity {
     @Column({ type: "varchar", nullable: true })
     status: string;
 
-    @Column({ type: "text", nullable: true })
+    @Column({ nullable: true, ...getColumnType('longText') })
     errorMessage: string;
 
     @Column({ type: "varchar", nullable: true })
@@ -35,7 +36,7 @@ export class AiInteraction extends CommonEntity {
     @Column({ type: "integer", nullable: true })
     responseTimeMs: number;
 
-    @Column({ type: "simple-json", nullable: true })
+    @Column({ type: "simple-json", nullable: true, ...getColumnType('simpleJsonLargeText') })
     metadata: any;
 
     @Column({ nullable: true, default: false })
@@ -62,7 +63,7 @@ export class AiInteraction extends CommonEntity {
     @Column({ type: "integer", nullable: true })
     totalTokens: number;
 
-    @Column({ type: "text", nullable: true })
+    @Column({ nullable: true, ...getColumnType('longText') })
     originalMessage: string;
 
     @Column({ nullable: true, default: false })

package/src/entities/chatter-message-details.entity.ts

@@ -1,6 +1,7 @@
 import { CommonEntity } from 'src/entities/common.entity'
 import { Entity, JoinColumn, ManyToOne, Column, Index } from 'typeorm';
 import { ChatterMessage } from 'src/entities/chatter-message.entity'
+import { getColumnType } from 'src/helpers/typeorm-db-helper';
 @Entity("ss_chatter_message_details")
 export class ChatterMessageDetails extends CommonEntity {
     @Index()
@@ -8,10 +9,10 @@ export class ChatterMessageDetails extends CommonEntity {
     @JoinColumn()
     chatterMessage: ChatterMessage;
 
-    @Column({ type: "text", nullable: true })
+    @Column({ nullable: true, ...getColumnType('longText') })
     oldValue: string;
 
-    @Column({ type: "text", nullable: true })
+    @Column({ nullable: true, ...getColumnType('longText') })
     newValue: string;
 
     @Column({ type: "varchar", nullable: true })
@@ -24,6 +25,9 @@ export class ChatterMessageDetails extends CommonEntity {
     @Column({ type: "varchar" })
     fieldName: string;
 
-    @Column({ type: "text", nullable: true })
+    @Column({ nullable: true })
     fieldDisplayName: string;
+
+    @Column({ type: "varchar", nullable: true })
+    fieldType: string;
 }

package/src/entities/chatter-message.entity.ts

@@ -2,6 +2,7 @@ import { CommonEntity } from 'src/entities/common.entity'
 import { Entity, Column, Index, JoinColumn, ManyToOne, OneToMany } from 'typeorm';
 import { User } from 'src/entities/user.entity'
 import { ChatterMessageDetails } from './chatter-message-details.entity';
+import { getColumnType } from 'src/helpers/typeorm-db-helper';
 
 @Index(["coModelName", "coModelEntityId"])
 @Entity("ss_chatter_message")
@@ -13,7 +14,7 @@ export class ChatterMessage extends CommonEntity {
     @Column({ type: "varchar" })
     messageSubType: string; // audit_update | audit_insert | audit_delete | custom
 
-    @Column({ type: "text", nullable: true })
+    @Column({ nullable: true, ...getColumnType('longText') })
     messageBody: string;
 
     @Index()
@@ -32,9 +33,9 @@ export class ChatterMessage extends CommonEntity {
     @OneToMany(() => ChatterMessageDetails, (chatterMessageDetails) => chatterMessageDetails.chatterMessage, { cascade: true })
     chatterMessageDetails: ChatterMessageDetails[];
 
-    @Column({ type: "text", nullable: true })
+    @Column({ nullable: true })
     modelDisplayName: string;
 
-    @Column({ type: "text", nullable: true })
+    @Column({ nullable: true })
     modelUserKey: string;
 }

package/src/entities/common.entity.ts

@@ -1,6 +1,6 @@
-import { Column, CreateDateColumn, DeleteDateColumn, Index, PrimaryGeneratedColumn, UpdateDateColumn } from "typeorm";
 import { Exclude, Expose } from "class-transformer";
-import { LocalDateTimeTransformer, UtcDateTimeTransformer } from "src/transformers/typeorm/local-date-time-transformer";
+import { LocalDateTimeTransformer } from "src/transformers/typeorm/local-date-time-transformer";
+import { Column, CreateDateColumn, DeleteDateColumn, Index, PrimaryGeneratedColumn, UpdateDateColumn } from "typeorm";
 
 @Exclude()
 export abstract class CommonEntity {

package/src/entities/dashboard-layout.entity.ts

@@ -0,0 +1,18 @@
+import { CommonEntity } from 'src/entities/common.entity'
+import { Entity, Column, JoinColumn, ManyToOne } from 'typeorm';
+import { Dashboard } from 'src/entities/dashboard.entity'
+import { User } from './user.entity';
+
+@Entity("ss_dashboard_layout")
+export class DashboardLayout extends CommonEntity {
+    @Column({ type: "text", nullable: true })
+    layout: string;
+
+    @ManyToOne(() => Dashboard, { nullable: true })
+    @JoinColumn()
+    dashboard: Dashboard;
+
+    @ManyToOne(() => User, { nullable: true })
+    @JoinColumn()
+    user: User;
+}

package/src/entities/dashboard-question-sql-dataset-config.entity.ts

@@ -1,20 +1,21 @@
 import { CommonEntity } from 'src/entities/common.entity'
 import { Entity, Column, Index, JoinColumn, ManyToOne } from 'typeorm';
 import { DashboardQuestion } from 'src/entities/dashboard-question.entity'
+import { getColumnType } from 'src/helpers/typeorm-db-helper';
 
 @Entity("ss_dashboard_question_sql_dataset_config")
 export class DashboardQuestionSqlDatasetConfig extends CommonEntity {
-    @Index({ unique: true })
+    @Index()
     @Column({ type: "varchar" })
     datasetName: string;
 
     @Column({ type: "varchar" })
     datasetDisplayName: string;
 
-    @Column({ type: "text", nullable: true })
+    @Column({ nullable: true })
     description: string;
 
-    @Column({ type: "text" })
+    @Column({ ...getColumnType('longText'), nullable: true })
     sql: string;
 
     @Column({ type: "varchar" })
@@ -27,7 +28,7 @@ export class DashboardQuestionSqlDatasetConfig extends CommonEntity {
     @JoinColumn()
     question: DashboardQuestion;
 
-    @Column({ type: "text", nullable: true })
+    @Column({ nullable: true, ...getColumnType('longText') })
     options: any;
 
     @Index({ unique: true })

package/src/entities/dashboard-question.entity.ts

@@ -1,11 +1,12 @@
 import { CommonEntity } from 'src/entities/common.entity'
 import { Entity, Column, Index, JoinColumn, ManyToOne, OneToMany } from 'typeorm';
+import { getColumnType } from 'src/helpers/typeorm-db-helper';
 import { Dashboard } from 'src/entities/dashboard.entity';
 import { DashboardQuestionSqlDatasetConfig } from 'src/entities/dashboard-question-sql-dataset-config.entity'
 
 @Entity("ss_dashboard_question")
 export class DashboardQuestion extends CommonEntity {
-    @Index({ unique: true })
+    @Index()
     @Column({ type: "varchar" })
     name: string;
 
@@ -27,13 +28,13 @@ export class DashboardQuestion extends CommonEntity {
     @OneToMany(() => DashboardQuestionSqlDatasetConfig, dashboardQuestionSqlDatasetConfig => dashboardQuestionSqlDatasetConfig.question, { cascade: true })
     questionSqlDatasetConfigs: DashboardQuestionSqlDatasetConfig[];
 
-    @Column({ type: "simple-json", nullable: true })
+    @Column({ type: "simple-json", nullable: true, ...getColumnType('simpleJsonLargeText') })
     chartOptions: any;
 
-    @Column({ type: "text", nullable: true })
+    @Column({ nullable: true, ...getColumnType('longText') })
     labelSql: string;
 
-    @Column({ type: "text", nullable: true })
+    @Column({ nullable: true, ...getColumnType('longText') })
     kpiSql: string;
 
     @Column({ type: "integer", nullable: true })

package/src/entities/dashboard-variable.entity.ts

@@ -1,10 +1,11 @@
 import { CommonEntity } from 'src/entities/common.entity'
-import {Entity, Column, Index, JoinColumn, ManyToOne} from 'typeorm';
+import { Entity, Column, Index, JoinColumn, ManyToOne } from 'typeorm';
 import { Dashboard } from 'src/entities/dashboard.entity'
+import { getColumnType } from 'src/helpers/typeorm-db-helper';
 
 @Entity("ss_dashboard_variable")
 export class DashboardVariable extends CommonEntity {
-    @Index({ unique: true })
+    @Index()
     @Column({ type: "varchar" })
     variableName: string;
 
@@ -18,7 +19,7 @@ export class DashboardVariable extends CommonEntity {
     @Column({ nullable: true })
     selectionDynamicSourceType: string;
 
-    @Column({ type: "text", nullable: true })
+    @Column({ nullable: true, ...getColumnType('longText') })
     selectionDynamicSQL: string;
 
     @Column({ type: "varchar", nullable: true })
@@ -31,9 +32,13 @@ export class DashboardVariable extends CommonEntity {
     @JoinColumn()
     dashboard: Dashboard;
 
-    @Column({ type: "text", nullable: true })
+    @Column({ nullable: true})
     defaultValue: string;
 
     @Column({ type: "varchar", nullable: true })
     defaultOperator: string;
+
+    @Index({ unique: true })
+    @Column({ type: "varchar" })
+    externalId: string;
 }