@solidxai/core 0.1.6-beta.9 → 0.1.7

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

@@ -4410,7 +4410,7 @@
         "dataSource": "default",
         "dataSourceType": "postgres",
         "tableName": "ss_dashboard_variable",
-        "userKeyFieldUserKey": "variableName",
+        "userKeyFieldUserKey": "externalId",
         "fields": [
           {
             "name": "variableName",
@@ -4419,12 +4419,12 @@
             "ormType": "varchar",
             "length": 256,
             "required": true,
-            "unique": true,
+            "unique": false,
             "index": true,
             "private": false,
             "encrypt": false,
             "isSystem": true,
-            "isUserKey": true
+            "isUserKey": false
           },
           {
             "name": "variableType",
@@ -4576,6 +4576,35 @@
               "$gte:Greater Than or Equal To"
             ],
             "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."
+          },
+          {
+            "name": "externalId",
+            "displayName": "Dashboard Variable User KExternal IDey",
+            "description": "Concatenation of variable name and dashboard name",
+            "type": "computed",
+            "ormType": "varchar",
+            "isSystem": false,
+            "computedFieldValueType": "string",
+            "computedFieldTriggerConfig": [
+              {
+                "modelName": "dashboardVariable",
+                "moduleName": "solid-core",
+                "operations": [
+                  "before-insert"
+                ]
+              }
+            ],
+            "computedFieldValueProvider": "ConcatEntityComputedFieldProvider",
+            "computedFieldValueProviderCtxt": "{\n  \"fields\": [\n    \"variableName\",\n    \"dashboard.name\"\n  ],\n  \"separator\": \"-\",\n  \"slugify\": true\n}",
+            "required": false,
+            "unique": true,
+            "index": true,
+            "private": false,
+            "encrypt": false,
+            "encryptionType": null,
+            "decryptWhen": null,
+            "columnName": null,
+            "isUserKey": true
           }
         ]
       },
@@ -4587,7 +4616,7 @@
         "dataSource": "default",
         "dataSourceType": "postgres",
         "tableName": "ss_dashboard_question",
-        "userKeyFieldUserKey": "name",
+        "userKeyFieldUserKey": "externalId",
         "fields": [
           {
             "name": "name",
@@ -4596,8 +4625,8 @@
             "ormType": "varchar",
             "length": 256,
             "required": true,
-            "unique": true,
-            "index": true,
+            "unique": false,
+            "index": false,
             "private": false,
             "encrypt": false,
             "isSystem": true,
@@ -4746,27 +4775,31 @@
           {
             "name": "externalId",
             "displayName": "External ID",
+            "description": "Concatenation of question name and dashboard name",
             "type": "computed",
             "ormType": "varchar",
-            "length": 128,
-            "required": false,
-            "unique": true,
-            "index": true,
-            "private": false,
-            "encrypt": false,
-            "isSystem": true,
+            "isSystem": false,
             "computedFieldValueType": "string",
-            "computedFieldValueProvider": "AlphaNumExternalIdComputationProvider",
-            "computedFieldValueProviderCtxt": "{\"prefix\": \"DQ\"}",
             "computedFieldTriggerConfig": [
               {
                 "modelName": "dashboardQuestion",
-                "moduleName": "fees-portal",
+                "moduleName": "solid-core",
                 "operations": [
                   "before-insert"
                 ]
               }
-            ]
+            ],
+            "computedFieldValueProvider": "ConcatEntityComputedFieldProvider",
+            "computedFieldValueProviderCtxt": "{\n  \"fields\": [\n    \"name\",\n    \"dashboard.name\"\n  ],\n  \"separator\": \"-\",\n  \"slugify\": true\n}",
+            "required": false,
+            "unique": true,
+            "index": true,
+            "private": false,
+            "encrypt": false,
+            "encryptionType": null,
+            "decryptWhen": null,
+            "columnName": null,
+            "isUserKey": true
           }
         ]
       },
@@ -4778,7 +4811,7 @@
         "dataSource": "default",
         "dataSourceType": "postgres",
         "tableName": "ss_dashboard_question_sql_dataset_config",
-        "userKeyFieldUserKey": "datasetName",
+        "userKeyFieldUserKey": "externalId",
         "fields": [
           {
             "name": "datasetName",
@@ -4787,7 +4820,7 @@
             "ormType": "varchar",
             "length": 256,
             "required": true,
-            "unique": true,
+            "unique": false,
             "index": false,
             "private": false,
             "encrypt": false,
@@ -4893,27 +4926,100 @@
           {
             "name": "externalId",
             "displayName": "External ID",
+            "description": "Concatenation of dataset name, question name and dashboard name",
             "type": "computed",
             "ormType": "varchar",
-            "length": 128,
-            "required": false,
-            "unique": true,
-            "index": true,
-            "private": false,
-            "encrypt": false,
-            "isSystem": true,
+            "isSystem": false,
             "computedFieldValueType": "string",
-            "computedFieldValueProvider": "AlphaNumExternalIdComputationProvider",
-            "computedFieldValueProviderCtxt": "{\"prefix\": \"DQSDC\"}",
             "computedFieldTriggerConfig": [
               {
                 "modelName": "dashboardQuestionSqlDatasetConfig",
-                "moduleName": "fees-portal",
+                "moduleName": "solid-core",
                 "operations": [
                   "before-insert"
                 ]
               }
-            ]
+            ],
+            "computedFieldValueProvider": "ConcatEntityComputedFieldProvider",
+            "computedFieldValueProviderCtxt": "{\n  \"fields\": [\n    \"datasetName\",\n \"question.name\",\n  \"question.dashboard.name\"\n  ],\n  \"separator\": \"-\",\n  \"slugify\": true\n}",
+            "required": false,
+            "unique": true,
+            "index": true,
+            "private": false,
+            "encrypt": false,
+            "encryptionType": null,
+            "decryptWhen": null,
+            "columnName": null,
+            "isUserKey": true
+          }
+        ]
+      },
+      {
+        "singularName": "dashboardLayout",
+        "pluralName": "dashboardLayouts",
+        "displayName": "Dashboard Layout",
+        "description": "This is used to maintain dashboard layouts",
+        "dataSource": "default",
+        "dataSourceType": "postgres",
+        "tableName": "ss_dashboard_layout",
+        "userKeyFieldUserKey": "externalId",
+        "fields": [
+          {
+            "name": "layout",
+            "displayName": "Layout",
+            "type": "longText",
+            "ormType": "text",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "isSystem": true,
+            "description": "This stores the dashboard layout"
+          },
+          {
+            "name": "dashboard",
+            "displayName": "Dashboard",
+            "description": "Related Dashboard Model",
+            "type": "relation",
+            "ormType": "integer",
+            "isSystem": true,
+            "relationType": "many-to-one",
+            "relationCoModelFieldName": "dashboardLayouts",
+            "relationCreateInverse": true,
+            "relationCoModelSingularName": "dashboard",
+            "relationModelModuleName": "solid-core",
+            "relationCascade": "cascade",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false
+          },
+          {
+            "name": "user",
+            "displayName": "User",
+            "description": null,
+            "type": "relation",
+            "ormType": "integer",
+            "isSystem": false,
+            "relationType": "many-to-one",
+            "relationCoModelFieldName": null,
+            "relationCreateInverse": false,
+            "relationCoModelSingularName": "user",
+            "relationCoModelColumnName": "",
+            "relationModelModuleName": "solid-core",
+            "relationCascade": "cascade",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "encryptionType": null,
+            "decryptWhen": null,
+            "columnName": null,
+            "relationJoinTableName": "",
+            "isRelationManyToManyOwner": null
           }
         ]
       },
@@ -5629,6 +5735,19 @@
       "moduleUserKey": "solid-core",
       "modelUserKey": "mqMessage"
     },
+    {
+      "displayName": "Message Tree Action",
+      "name": "mqMessage-tree-action",
+      "type": "solid",
+      "domain": "",
+      "context": "",
+      "customComponent": "",
+      "customIsModal": true,
+      "serverEndpoint": "",
+      "viewUserKey": "mqMessage-tree-view",
+      "moduleUserKey": "solid-core",
+      "modelUserKey": "mqMessage"
+    },
     {
       "displayName": "Queues List Action",
       "name": "mqMessageQueue-list-action",
@@ -5850,6 +5969,19 @@
       "moduleUserKey": "solid-core",
       "modelUserKey": "dashboardQuestion"
     },
+    {
+      "displayName": "Dashboard Layout List Action",
+      "name": "dashboardLayout-list-action",
+      "type": "solid",
+      "domain": "",
+      "context": "",
+      "customComponent": "",
+      "customIsModal": true,
+      "serverEndpoint": "",
+      "viewUserKey": "dashboardLayout-list-view",
+      "moduleUserKey": "solid-core",
+      "modelUserKey": "dashboardLayout"
+    },
     {
       "displayName": "Dashboard Question SQL Dataset Config List Action",
       "name": "dashboardQuestionSqlDatasetConfig-list-action",
@@ -6208,6 +6340,14 @@
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "dashboardManagement-menu-item"
     },
+    {
+      "displayName": "Dashboard Layout",
+      "name": "dashboardLayout-menu-item",
+      "sequenceNumber": 3,
+      "actionUserKey": "dashboardLayout-list-action",
+      "moduleUserKey": "solid-core",
+      "parentMenuItemUserKey": "dashboardManagement-menu-item"
+    },
     {
       "displayName": "Settings",
       "name": "settings-menu-item",
@@ -9678,6 +9818,95 @@
         ]
       }
     },
+    {
+      "name": "mqMessage-tree-view",
+      "displayName": "Messages Tree View",
+      "type": "tree",
+      "context": "{}",
+      "moduleUserKey": "solid-core",
+      "modelUserKey": "mqMessage",
+      "layout": {
+        "type": "tree",
+        "attrs": {
+          "pagination": true,
+          "pageSizeOptions": [
+            10,
+            25,
+            50
+          ],
+          "enableGlobalSearch": true,
+          "create": false,
+          "edit": false,
+          "delete": false
+        },
+        "children": [
+          {
+            "type": "field",
+            "attrs": {
+              "name": "messageId",
+              "isSearchable": true
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "messageBroker",
+              "isSearchable": true
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "stage",
+              "isSearchable": true
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "startedAt",
+              "isSearchable": true
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "finishedAt",
+              "isSearchable": true
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "elapsedMillis",
+              "isSearchable": true
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "parentEntityId",
+              "isSearchable": true
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "parentEntity",
+              "isSearchable": true
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "mqMessageQueue",
+              "label": "Queue",
+              "isSearchable": true
+            }
+          }
+        ]
+      }
+    },
     {
       "name": "mqMessage-form-view",
       "displayName": "Mq Message",
@@ -11722,6 +11951,8 @@
           "label": "Dashboard Question",
           "className": "grid"
         },
+        "onFieldChange": "dashboardQuestionFieldChangeHandler",
+        "onFormLoad": "dashboardQuestionOnFormLoadHandler",
         "children": [
           {
             "type": "sheet",
@@ -11799,13 +12030,17 @@
                               {
                                 "type": "field",
                                 "attrs": {
-                                  "name": "labelSql"
+                                  "name": "labelSql",
+                                  "editWidget": "codeEditor",
+                                  "editorLanguage": "sql"
                                 }
                               },
                               {
                                 "type": "field",
                                 "attrs": {
-                                  "name": "kpiSql"
+                                  "name": "kpiSql",
+                                  "editWidget": "codeEditor",
+                                  "editorLanguage": "sql"
                                 }
                               },
                               {
@@ -12057,6 +12292,111 @@
         ]
       }
     },
+    {
+      "name": "dashboardLayout-list-view",
+      "displayName": "Dashboard Layout",
+      "type": "list",
+      "context": "{}",
+      "moduleUserKey": "solid-core",
+      "modelUserKey": "dashboardLayout",
+      "layout": {
+        "type": "list",
+        "attrs": {
+          "pagination": true,
+          "pageSizeOptions": [
+            10,
+            25,
+            50
+          ],
+          "enableGlobalSearch": true,
+          "create": true,
+          "edit": true,
+          "delete": true
+        },
+        "children": [
+          {
+            "type": "field",
+            "attrs": {
+              "name": "id"
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "dashboard"
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "user"
+            }
+          }
+        ]
+      }
+    },
+    {
+      "name": "dashboardLayout-form-view",
+      "displayName": "Dashboard Layout",
+      "type": "form",
+      "context": "{}",
+      "moduleUserKey": "solid-core",
+      "modelUserKey": "dashboardLayout",
+      "layout": {
+        "type": "form",
+        "attrs": {
+          "name": "form-1",
+          "label": "Dashboard Layout",
+          "className": "grid"
+        },
+        "children": [
+          {
+            "type": "sheet",
+            "attrs": {
+              "name": "sheet-1"
+            },
+            "children": [
+              {
+                "type": "row",
+                "attrs": {
+                  "name": "sheet-1"
+                },
+                "children": [
+                  {
+                    "type": "column",
+                    "attrs": {
+                      "name": "group-1",
+                      "label": "",
+                      "className": "col-12"
+                    },
+                    "children": [
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "layout"
+                        }
+                      },
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "dashboard"
+                        }
+                      },
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "user"
+                        }
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      }
+    },
     {
       "name": "aiInteraction-list-view",
       "displayName": "AI Interaction",
@@ -12779,4 +13119,4 @@
     }
   ],
   "modelSequences": []
-}
+}

package/src/services/1.js

@@ -0,0 +1,6 @@
+1. Do i need to create a storeStreams method for aws service too?
+    - Handle later
+2. queues handling -> if queues is enabled by default, i.e triggerExport(exportTransactionEntity.id).
+    - startExport should either return the data or return the transaction id
+3. How to handle scenarios wherein, nested related exist.(do i need to only get the userkey)
+    - show the userKey

package/src/services/chatter-message.service.ts

@@ -90,13 +90,13 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         return savedMessage;
     }
 
-    async postAuditMessageOnInsert(entity: any, metadata: EntityMetadata, messageQueue: boolean = false) {
+    async postAuditMessageOnInsert(entity: any, modelName: string, messageQueue: boolean = false) {
         if (!entity) {
             return;
         }
         const model = await this.modelMetadataRepo.findOne({
             where: {
-                singularName: lowerFirst(metadata.name)
+                singularName: lowerFirst(modelName)
             },
             relations: {
                 fields: true,
@@ -152,13 +152,13 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         }
     }
 
-    async postAuditMessageOnUpdate(entity: any, metadata: EntityMetadata, databaseEntity: any, updatedColumns: any[] = [], messageQueue: boolean = false) {
+    async postAuditMessageOnUpdate(entity: any, modelName: string, databaseEntity: any, updatedColumns: any[] = [], messageQueue: boolean = false) {
         if (!databaseEntity || !entity) {
             return;
         }
         const model = await this.modelMetadataRepo.findOne({
             where: {
-                singularName: lowerFirst(metadata.name)
+                singularName: lowerFirst(modelName)
             },
             relations: {
                 fields: true,
@@ -204,6 +204,7 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
 
         const changedRelationFields = [];
         if (potentialRelationFields.length > 0) {
+            const metadata = this.entityManager.connection.entityMetadatas.find(m => m.name === modelName);
             const populatedOldEntity = await this.populateRelationFields(databaseEntity, potentialRelationFields, metadata);
 
             for (const field of potentialRelationFields) {
@@ -268,13 +269,12 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         }
     }
 
-    async postAuditMessageOnDelete(entity: any, metadata: EntityMetadata, databaseEntity: any, messageQueue: boolean = false) {
+    async postAuditMessageOnDelete(modelName: string, databaseEntity: any, messageQueue: boolean = false) {
         const model = await this.modelMetadataRepo.findOne({
             where: {
-                singularName: lowerFirst(metadata.name)
+                singularName: lowerFirst(modelName)
             },
             relations: {
-                fields: true,
                 module: true,
                 userKeyField: true
             }
@@ -284,13 +284,29 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
             return;
         }
 
+        const modelFields = await this.modelMetadataHelperService.loadFieldHierarchy(model.singularName);
+
+        const auditFields = modelFields.filter(field =>
+            field.enableAuditTracking &&
+            !['mediaSingle', 'mediaMultiple', 'richText', 'json'].includes(field.type) &&
+            !(field.type === 'relation' && field.relationType === 'one-to-many')
+        );
+
+        // Populate relation fields so display values (e.g. names) are resolvable.
+        // The related entities themselves still exist in the DB after a delete.
+        const relationFields = auditFields.filter(field => field.type === 'relation');
+        const entityMetadata = this.entityManager.connection.entityMetadatas.find(m => m.name === modelName);
+        const populatedEntity = relationFields.length > 0 && entityMetadata
+            ? await this.populateRelationFields(databaseEntity, relationFields, entityMetadata)
+            : { ...databaseEntity };
+
         const chatterMessage = new ChatterMessage();
         chatterMessage.messageType = CHATTER_MESSAGE_TYPE.AUDIT;
         chatterMessage.messageSubType = CHATTER_MESSAGE_SUBTYPE.AUDIT_DELETE;
         chatterMessage.coModelEntityId = databaseEntity?.id;
         chatterMessage.coModelName = model?.singularName;
         chatterMessage.modelDisplayName = model?.displayName;
-        chatterMessage.modelUserKey = entity[model?.userKeyField?.name];
+        chatterMessage.modelUserKey = databaseEntity[model?.userKeyField?.name];
         chatterMessage.messageBody = `${model?.displayName} deleted`;
 
         const activeUser = this.requestContextService.getActiveUser();
@@ -302,7 +318,23 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
             chatterMessage.user = null;
         }
 
-        await this.repo.save(chatterMessage);
+        const savedMessage = await this.repo.save(chatterMessage);
+
+        for (const field of auditFields) {
+            const fieldValue = populatedEntity[field.name];
+            if (fieldValue !== undefined && fieldValue !== null && fieldValue !== '') {
+                const messageDetail = new ChatterMessageDetails();
+                messageDetail.chatterMessage = savedMessage;
+                messageDetail.fieldName = field.name;
+                messageDetail.fieldDisplayName = field.displayName;
+                messageDetail.fieldType = field.type;
+                messageDetail.oldValue = this.formatFieldValue(field, fieldValue);
+                messageDetail.oldValueDisplay = await this.formatFieldValueDisplay(field, fieldValue);
+                messageDetail.newValue = null;
+                messageDetail.newValueDisplay = null;
+                await this.chatterMessageDetailsRepo.save(messageDetail);
+            }
+        }
     }
 
     private formatFieldValue(field: any, value: any): string {