@solidstarters/solid-core 1.2.135 → 1.2.137

package/src/repository/dashboard.repository.ts

@@ -3,8 +3,8 @@ import { CreateDashboardDto } from "src/dtos/create-dashboard.dto";
 import { DashboardVariable } from "src/entities/dashboard-variable.entity";
 import { Dashboard } from "src/entities/dashboard.entity";
 import { ModuleMetadata } from "src/entities/module-metadata.entity";
-import { QuestionSqlDatasetConfig } from "src/entities/question-sql-dataset-config.entity";
-import { Question } from "src/entities/question.entity";
+import { DashboardQuestionSqlDatasetConfig } from "src/entities/dashboard-question-sql-dataset-config.entity";
+import { DashboardQuestion } from "src/entities/dashboard-question.entity";
 import { DataSource, Repository } from "typeorm";
 
 @Injectable()
@@ -17,7 +17,7 @@ export class DashboardRepository extends Repository<Dashboard> {
     }
 
 
-    async upsertWithDto(createDto: CreateDashboardDto) {
+    async upsertWithDto(createDto: any) {
         const moduleMetadataRepository = this.dataSource.getRepository(ModuleMetadata);
         const module = await moduleMetadataRepository.findOneBy({ name: createDto.moduleUserKey });
 
@@ -28,6 +28,55 @@ export class DashboardRepository extends Repository<Dashboard> {
             relations: ['dashboardVariables', 'questions', 'questions.questionSqlDatasetConfigs'],
         });
 
+        if (existingDashboard) {
+            // Update basic fields
+            existingDashboard.layoutJson = JSON.stringify(createDto.layoutJson ?? {});
+            existingDashboard.module = module;
+
+            // Upsert dashboard variables
+            existingDashboard.dashboardVariables = createDto.dashboardVariables?.map(variable => {
+                const existingVar = existingDashboard.dashboardVariables.find(v => v.variableName === variable.variableName);
+                if (existingVar) {
+                    return Object.assign(existingVar, {
+                        ...variable,
+                        selectionStaticValues: JSON.stringify(variable.selectionStaticValues ?? []),
+                        defaultValue: JSON.stringify(variable.defaultValue ?? []),
+                    });
+                }
+                return {
+                    ...variable,
+                    selectionStaticValues: JSON.stringify(variable.selectionStaticValues ?? []),
+                    defaultValue: JSON.stringify(variable.defaultValue ?? []),
+                };
+            }) ?? [];
+
+            // Upsert questions and their configs
+            existingDashboard.questions = createDto.questions?.map(question => {
+                const existingQuestion = existingDashboard.questions.find(q => q.name === question.name);
+                const questionData: any = {
+                    ...question,
+                    questionSqlDatasetConfigs: question.questionSqlDatasetConfigs?.map(cfg => {
+                        const existingCfg = existingQuestion?.questionSqlDatasetConfigs.find(c => c.datasetName === cfg.datasetName);
+                        if (existingCfg) {
+                            return Object.assign(existingCfg, {
+                                ...cfg,
+                                options: JSON.stringify(cfg.options ?? {}),
+                            });
+                        }
+                        return {
+                            ...cfg,
+                            options: JSON.stringify(cfg.options ?? {}),
+                        };
+                    }) ?? [],
+                };
+
+                return existingQuestion ? Object.assign(existingQuestion, questionData) : questionData;
+            }) ?? [];
+
+            return this.save(existingDashboard);
+        }
+
+        // Else: new dashboard
         const dashboardData = {
             ...createDto,
             module,
@@ -46,55 +95,7 @@ export class DashboardRepository extends Repository<Dashboard> {
             })),
         };
 
-        if (existingDashboard) {
-            // Optionally clean up stale children
-            await this.cleanupRemovedRelations(existingDashboard, createDto);
-
-            this.merge(existingDashboard, dashboardData);
-            return this.save(existingDashboard);
-        } else {
-            const newDashboard = this.create(dashboardData);
-            return this.save(newDashboard);
-        }
-    }
-
-    private async cleanupRemovedRelations(existing: Dashboard, dto: CreateDashboardDto) {
-        const dashboardVariableRepo = this.dataSource.getRepository(DashboardVariable);
-        const questionRepo = this.dataSource.getRepository(Question);
-        const datasetConfigRepo = this.dataSource.getRepository(QuestionSqlDatasetConfig); // 👈 make sure this is imported
-
-        // === 1. Clean up removed dashboardVariables ===
-        const dtoVariableNames = new Set(dto.dashboardVariables.map(v => v.variableName));
-        const variablesToRemove = existing.dashboardVariables.filter(
-            v => !dtoVariableNames.has(v.variableName)
-        );
-        if (variablesToRemove.length > 0) {
-            await dashboardVariableRepo.remove(variablesToRemove);
-        }
-
-        // === 2. Clean up removed questions and gather removed question IDs ===
-        const dtoQuestionNames = new Set(dto.questions.map(q => q.name));
-        const questionsToRemove = existing.questions.filter(
-            q => !dtoQuestionNames.has(q.name)
-        );
-
-        if (questionsToRemove.length > 0) {
-            await questionRepo.remove(questionsToRemove);
-        }
-
-        // === 3. Clean up removed questionSqlDatasetConfigs from existing (retained) questions ===
-        for (const existingQuestion of existing.questions) {
-            const dtoQuestion = dto.questions.find(q => q.name === existingQuestion.name);
-            if (!dtoQuestion) continue;
-
-            const dtoDatasetNames = new Set(dtoQuestion.questionSqlDatasetConfigs?.map(cfg => cfg.datasetName));
-            const configsToRemove = existingQuestion.questionSqlDatasetConfigs.filter(
-                cfg => !dtoDatasetNames.has(cfg.datasetName)
-            );
-
-            if (configsToRemove.length > 0) {
-                await datasetConfigRepo.remove(configsToRemove);
-            }
-        }
+        const newDashboard = this.create(dashboardData);
+        return this.save(newDashboard);
     }
 }

package/src/seeders/seed-data/solid-core-metadata.json

@@ -4337,7 +4337,7 @@
           },
           {
             "name": "questions",
-            "displayName": "Questions",
+            "displayName": "Dashboard Questions",
             "type": "relation",
             "required": false,
             "unique": false,
@@ -4345,7 +4345,7 @@
             "relationType": "one-to-many",
             "relationCoModelFieldName": "dashboard",
             "relationCreateInverse": true,
-            "relationCoModelSingularName": "question",
+            "relationCoModelSingularName": "dashboardQuestion",
             "relationModelModuleName": "solid-core",
             "isSystem": true
           },
@@ -4547,13 +4547,13 @@
         ]
       },
       {
-        "singularName": "question",
-        "pluralName": "questions",
-        "displayName": "Question",
-        "description": "This is used to maintain questions for dashboards",
+        "singularName": "dashboardQuestion",
+        "pluralName": "dashboardQuestions",
+        "displayName": "Dashboard Question",
+        "description": "This is used to maintain dashboard questions for dashboards",
         "dataSource": "default",
         "dataSourceType": "postgres",
-        "tableName": "ss_question",
+        "tableName": "ss_dashboard_question",
         "userKeyFieldUserKey": "name",
         "fields": [
           {
@@ -4604,6 +4604,18 @@
               "prime-datatable:Prime - Datatable"
             ]
           },
+          {
+            "name": "sequenceNumber",
+            "displayName": "Sequence Number",
+            "type": "int",
+            "ormType": "integer",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "isSystem": true
+          },
           {
             "name": "labelSql",
             "displayName": "Label SQL Query",
@@ -4681,7 +4693,7 @@
           },
           {
             "name": "questionSqlDatasetConfigs",
-            "displayName": "Question SQL Dataset Config",
+            "displayName": "Related Dashboard Question SQL Dataset Config",
             "description": "Related Question SQL Dataset Config Model",
             "type": "relation",
             "ormType": "integer",
@@ -4689,7 +4701,7 @@
             "relationType": "one-to-many",
             "relationCoModelFieldName": "question",
             "relationCreateInverse": true,
-            "relationCoModelSingularName": "questionSqlDatasetConfig",
+            "relationCoModelSingularName": "dashboardQuestionSqlDatasetConfig",
             "relationModelModuleName": "solid-core",
             "relationCascade": "cascade",
             "required": false,
@@ -4701,13 +4713,13 @@
         ]
       },
       {
-        "singularName": "questionSqlDatasetConfig",
-        "pluralName": "questionSqlDatasetConfigs",
-        "displayName": "Question SQL Dataset Config",
-        "description": "This is used to maintain SQL dataset configurations for questions",
+        "singularName": "dashboardQuestionSqlDatasetConfig",
+        "pluralName": "dashboardQuestionSqlDatasetConfigs",
+        "displayName": "Dashboard Question SQL Dataset Config",
+        "description": "This is used to maintain Dashboard Question SQL dataset configurations",
         "dataSource": "default",
         "dataSourceType": "postgres",
-        "tableName": "ss_question_sql_dataset_config",
+        "tableName": "ss_dashboard_question_sql_dataset_config",
         "userKeyFieldUserKey": "datasetName",
         "fields": [
           {
@@ -4811,7 +4823,7 @@
             "relationType": "many-to-one",
             "relationCoModelFieldName": "questionSqlDatasetConfigs",
             "relationCreateInverse": true,
-            "relationCoModelSingularName": "question",
+            "relationCoModelSingularName": "dashboardQuestion",
             "relationModelModuleName": "solid-core",
             "relationCascade": "cascade",
             "required": true,
@@ -4899,14 +4911,19 @@
           {
             "name": "status",
             "displayName": "Status",
-            "type": "shortText",
+            "type": "selectionStatic",
             "ormType": "varchar",
             "length": 64,
             "required": false,
             "unique": false,
             "index": true,
             "private": false,
-            "encrypt": false
+            "encrypt": false,
+            "selectionStaticValues": [
+              "pending:Pending",
+              "failed:Failed",
+              "succeeded:Succeeded"
+            ]
           },
           {
             "name": "errorMessage",
@@ -5416,46 +5433,7 @@
       "type": "solid",
       "domain": "",
       "context": "",
-      "customComponent": "/admin/address-master/dashboardVariable/all",
-      "customIsModal": true,
-      "serverEndpoint": "",
-      "viewUserKey": "dashboardVariable-list-view",
-      "moduleUserKey": "solid-core",
-      "modelUserKey": "dashboardVariable"
-    },
-    {
-      "displayName": "Question List Action",
-      "name": "question-list-action",
-      "type": "solid",
-      "domain": "",
-      "context": "",
-      "customComponent": "/admin/address-master/question/all",
-      "customIsModal": true,
-      "serverEndpoint": "",
-      "viewUserKey": "question-list-view",
-      "moduleUserKey": "solid-core",
-      "modelUserKey": "question"
-    },
-    {
-      "displayName": "Dashboard List Action",
-      "name": "dashboard-list-action",
-      "type": "solid",
-      "domain": "",
-      "context": "",
-      "customComponent": "/admin/address-master/dashboard/all",
-      "customIsModal": true,
-      "serverEndpoint": "",
-      "viewUserKey": "dashboard-list-view",
-      "moduleUserKey": "solid-core",
-      "modelUserKey": "dashboard"
-    },
-    {
-      "displayName": "Dashboard Variable List Action",
-      "name": "dashboardVariable-list-action",
-      "type": "solid",
-      "domain": "",
-      "context": "",
-      "customComponent": "/admin/address-master/dashboardVariable/all",
+      "customComponent": "",
       "customIsModal": true,
       "serverEndpoint": "",
       "viewUserKey": "dashboardVariable-list-view",
@@ -5463,69 +5441,30 @@
       "modelUserKey": "dashboardVariable"
     },
     {
-      "displayName": "Question List Action",
-      "name": "question-list-action",
+      "displayName": "Dashboard Question List Action",
+      "name": "dashboardQuestion-list-action",
       "type": "solid",
       "domain": "",
       "context": "",
-      "customComponent": "/admin/address-master/question/all",
-      "customIsModal": true,
-      "serverEndpoint": "",
-      "viewUserKey": "question-list-view",
-      "moduleUserKey": "solid-core",
-      "modelUserKey": "question"
-    },
-    {
-      "displayName": "Question List Action",
-      "name": "question-list-action",
-      "type": "solid",
-      "domain": "",
-      "context": "",
-      "customComponent": "/admin/address-master/question/all",
-      "customIsModal": true,
-      "serverEndpoint": "",
-      "viewUserKey": "question-list-view",
-      "moduleUserKey": "solid-core",
-      "modelUserKey": "question"
-    },
-    {
-      "displayName": "Question List Action",
-      "name": "question-list-action",
-      "type": "solid",
-      "domain": "",
-      "context": "",
-      "customComponent": "/admin/address-master/question/all",
-      "customIsModal": true,
-      "serverEndpoint": "",
-      "viewUserKey": "question-list-view",
-      "moduleUserKey": "solid-core",
-      "modelUserKey": "question"
-    },
-    {
-      "displayName": "Question SQL Dataset Config List Action",
-      "name": "questionSqlDatasetConfig-list-action",
-      "type": "solid",
-      "domain": "",
-      "context": "",
-      "customComponent": "/admin/address-master/questionSqlDatasetConfig/all",
+      "customComponent": "",
       "customIsModal": true,
       "serverEndpoint": "",
-      "viewUserKey": "questionSqlDatasetConfig-list-view",
+      "viewUserKey": "dashboardQuestion-list-view",
       "moduleUserKey": "solid-core",
-      "modelUserKey": "questionSqlDatasetConfig"
+      "modelUserKey": "dashboardQuestion"
     },
     {
-      "displayName": "Question List Action",
-      "name": "question-list-action",
+      "displayName": "Dashboard Question SQL Dataset Config List Action",
+      "name": "dashboardQuestionSqlDatasetConfig-list-action",
       "type": "solid",
       "domain": "",
       "context": "",
-      "customComponent": "/admin/address-master/question/all",
+      "customComponent": "",
       "customIsModal": true,
       "serverEndpoint": "",
-      "viewUserKey": "question-list-view",
+      "viewUserKey": "dsahboardQuestionSqlDatasetConfig-list-view",
       "moduleUserKey": "solid-core",
-      "modelUserKey": "question"
+      "modelUserKey": "dashboardQuestionSqlDatasetConfig"
     },
     {
       "displayName": "AI Interactions",
@@ -5855,10 +5794,10 @@
       "parentMenuItemUserKey": "dashboard-root-menu-item"
     },
     {
-      "displayName": "Question",
-      "name": "question-menu-item",
+      "displayName": "Dashboard Question",
+      "name": "dashboardQuestion-menu-item",
       "sequenceNumber": 2,
-      "actionUserKey": "question-list-action",
+      "actionUserKey": "dashboardQuestion-list-action",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "dashboard-root-menu-item"
     },
@@ -11418,12 +11357,12 @@
       }
     },
     {
-      "name": "question-list-view",
-      "displayName": "Question",
+      "name": "dashboardQuestion-list-view",
+      "displayName": "Dashboard Question",
       "type": "list",
       "context": "{}",
       "moduleUserKey": "solid-core",
-      "modelUserKey": "question",
+      "modelUserKey": "dashboardQuestion",
       "layout": {
         "type": "list",
         "attrs": {
@@ -11462,22 +11401,28 @@
             "attrs": {
               "name": "visualisedAs"
             }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "sequenceNumber"
+            }
           }
         ]
       }
     },
     {
-      "name": "question-form-view",
-      "displayName": "Question",
+      "name": "dashboardQuestion-form-view",
+      "displayName": "Dashboard Question",
       "type": "form",
       "context": "{}",
       "moduleUserKey": "solid-core",
-      "modelUserKey": "question",
+      "modelUserKey": "dashboardQuestion",
       "layout": {
         "type": "form",
         "attrs": {
           "name": "form-1",
-          "label": "Question",
+          "label": "Dashboard Question",
           "className": "grid"
         },
         "children": [
@@ -11531,6 +11476,12 @@
                                 "attrs": {
                                   "name": "visualisedAs"
                                 }
+                              },
+                              {
+                                "type": "field",
+                                "attrs": {
+                                  "name": "sequenceNumber"
+                                }
                               }
                             ]
                           },
@@ -11548,6 +11499,18 @@
                                   "name": "sourceType"
                                 }
                               },
+                              {
+                                "type": "field",
+                                "attrs": {
+                                  "name": "labelSql"
+                                }
+                              },
+                              {
+                                "type": "field",
+                                "attrs": {
+                                  "name": "kpiSql"
+                                }
+                              },
                               {
                                 "type": "field",
                                 "attrs": {
@@ -11627,7 +11590,7 @@
                               {
                                 "type": "field",
                                 "attrs": {
-                                  "name": "barChartLabelOptions"
+                                  "name": "chartOptions"
                                 }
                               }
                             ]
@@ -11661,12 +11624,12 @@
       }
     },
     {
-      "name": "questionSqlDatasetConfig-list-view",
-      "displayName": "Question SQL Dataset Config",
+      "name": "dashboardQuestionSqlDatasetConfig-list-view",
+      "displayName": "Dashboard Question SQL Dataset Config",
       "type": "list",
       "context": "{}",
       "moduleUserKey": "solid-core",
-      "modelUserKey": "questionSqlDatasetConfig",
+      "modelUserKey": "dashboardQuestionSqlDatasetConfig",
       "layout": {
         "type": "list",
         "attrs": {
@@ -11703,24 +11666,24 @@
           {
             "type": "field",
             "attrs": {
-              "name": "backgroundColor"
+              "name": "options"
             }
           }
         ]
       }
     },
     {
-      "name": "questionSqlDatasetConfig-form-view",
-      "displayName": "Question SQL Dataset Config",
+      "name": "dashboardQuestionSqlDatasetConfig-form-view",
+      "displayName": "Dashboard Question SQL Dataset Config",
       "type": "form",
       "context": "{}",
       "moduleUserKey": "solid-core",
-      "modelUserKey": "questionSqlDatasetConfig",
+      "modelUserKey": "dashboardQuestionSqlDatasetConfig",
       "layout": {
         "type": "form",
         "attrs": {
           "name": "form-1",
-          "label": "Question SQL Dataset Config",
+          "label": "Dashboard Question SQL Dataset Config",
           "className": "grid"
         },
         "children": [
@@ -11782,12 +11745,6 @@
                           "name": "valueColumnName"
                         }
                       },
-                      {
-                        "type": "field",
-                        "attrs": {
-                          "name": "backgroundColor"
-                        }
-                      },
                       {
                         "type": "field",
                         "attrs": {