@solidstarters/solid-core 1.2.141 → 1.2.142

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.141",
+  "version": "1.2.142",
   "description": "This module is a NestJS module containing all the required core providers required by a Solid application",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/dtos/create-ai-interaction.dto.ts

@@ -1,60 +1,56 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { IsInt } from 'class-validator';
 import { IsOptional } from 'class-validator';
-import { IsString, IsNotEmpty, IsJSON } from 'class-validator';
-export class CreateAiInteractionDto {
-@IsOptional()
-@IsInt()
-@ApiProperty()
-userId: number;
-
-@IsString()
-@IsOptional()
-@ApiProperty()
-userUserKey: string;
-
-@IsNotEmpty()
-@IsString()
-@ApiProperty()
-threadId: string;
-
-@IsNotEmpty()
-@IsString()
-@ApiProperty()
-role: string;
-
-@IsNotEmpty()
-@IsString()
-@ApiProperty()
-message: string;
-
-@IsOptional()
-@IsString()
-@ApiProperty()
-contentType: string;
+import { IsString, IsNotEmpty, IsJSON, IsBoolean } from 'class-validator';
 
-@IsOptional()
-@IsString()
-@ApiProperty()
-status: string;
-
-@IsOptional()
-@IsString()
-@ApiProperty()
-errorMessage: string;
-
-@IsOptional()
-@IsString()
-@ApiProperty()
-modelUsed: string;
-
-@IsOptional()
-@IsInt()
-@ApiProperty()
-responseTimeMs: number;
-
-@IsOptional()
-@IsJSON()
-@ApiProperty()
-metadata: any;
+export class CreateAiInteractionDto {
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    userId: number;
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    userUserKey: string;
+    @IsNotEmpty()
+    @IsString()
+    @ApiProperty()
+    threadId: string;
+    @IsNotEmpty()
+    @IsString()
+    @ApiProperty()
+    role: string;
+    @IsNotEmpty()
+    @IsString()
+    @ApiProperty()
+    message: string;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    contentType: string;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    status: string;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    errorMessage: string;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    modelUsed: string;
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    responseTimeMs: number;
+    @IsOptional()
+    @IsJSON()
+    @ApiProperty()
+    metadata: any;
+
+@IsOptional()
+@IsBoolean()
+@ApiProperty()
+isApplied: boolean = false;
 }

package/src/dtos/update-ai-interaction.dto.ts

@@ -1,65 +1,60 @@
-import { IsInt,IsOptional, IsString, IsNotEmpty, IsJSON } from 'class-validator';
+import { IsInt,IsOptional, IsString, IsNotEmpty, IsJSON, IsBoolean } from 'class-validator';
 import { ApiProperty } from '@nestjs/swagger';
+
 export class UpdateAiInteractionDto {
     @IsOptional()
     @IsInt()
     id: number;
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    userId: number;
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    userUserKey: string;
+    @IsNotEmpty()
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    threadId: string;
+    @IsNotEmpty()
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    role: string;
+    @IsNotEmpty()
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    message: string;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    contentType: string;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    status: string;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    errorMessage: string;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    modelUsed: string;
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    responseTimeMs: number;
+    @IsOptional()
+    @IsJSON()
+    @ApiProperty()
+    metadata: any;
 
 @IsOptional()
-@IsInt()
-@ApiProperty()
-userId: number;
-
-@IsString()
-@IsOptional()
-@ApiProperty()
-userUserKey: string;
-
-@IsNotEmpty()
-@IsOptional()
-@IsString()
-@ApiProperty()
-threadId: string;
-
-@IsNotEmpty()
-@IsOptional()
-@IsString()
-@ApiProperty()
-role: string;
-
-@IsNotEmpty()
-@IsOptional()
-@IsString()
-@ApiProperty()
-message: string;
-
-@IsOptional()
-@IsString()
-@ApiProperty()
-contentType: string;
-
-@IsOptional()
-@IsString()
-@ApiProperty()
-status: string;
-
-@IsOptional()
-@IsString()
-@ApiProperty()
-errorMessage: string;
-
-@IsOptional()
-@IsString()
-@ApiProperty()
-modelUsed: string;
-
-@IsOptional()
-@IsInt()
-@ApiProperty()
-responseTimeMs: number;
-
-@IsOptional()
-@IsJSON()
+@IsBoolean()
 @ApiProperty()
-metadata: any;
+isApplied: boolean;
 }

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

@@ -1,39 +1,34 @@
 import { CommonEntity } from 'src/entities/common.entity'
 import {Entity, JoinColumn, ManyToOne, Index, Column} from 'typeorm';
 import { User } from 'src/entities/user.entity'
-@Entity("ss_ai_interactions")
-export class AiInteraction extends CommonEntity{
-@Index()
-@ManyToOne(() => User, { onDelete: "CASCADE", nullable: false })
-@JoinColumn()
-user: User;
-
-@Index()
-@Column({ type: "varchar" })
-threadId: string;
-
-@Column({ type: "varchar" })
-role: string;
-
-@Column({ type: "text" })
-message: string;
-
-@Column({ type: "varchar", nullable: true })
-contentType: string;
 
-@Index()
-@Column({ type: "varchar", nullable: true })
-status: string;
-
-@Column({ type: "text", nullable: true })
-errorMessage: string;
-
-@Column({ type: "varchar", nullable: true })
-modelUsed: string;
-
-@Column({ type: "integer", nullable: true })
-responseTimeMs: number;
-
-@Column({ type: "jsonb", nullable: true })
-metadata: any;
+@Entity("ss_ai_interactions")
+export class AiInteraction extends CommonEntity {
+    @Index()
+    @ManyToOne(() => User, { onDelete: "CASCADE", nullable: false })
+    @JoinColumn()
+    user: User;
+    @Index()
+    @Column({ type: "varchar" })
+    threadId: string;
+    @Column({ type: "varchar" })
+    role: string;
+    @Column({ type: "text" })
+    message: string;
+    @Column({ type: "varchar", nullable: true })
+    contentType: string;
+    @Index()
+    @Column({ type: "varchar", nullable: true })
+    status: string;
+    @Column({ type: "text", nullable: true })
+    errorMessage: string;
+    @Column({ type: "varchar", nullable: true })
+    modelUsed: string;
+    @Column({ type: "integer", nullable: true })
+    responseTimeMs: number;
+    @Column({ type: "jsonb", nullable: true })
+    metadata: any;
+
+@Column({ type: "boolean", nullable: true, default: false })
+isApplied: boolean = false;
 }

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

@@ -22,4 +22,7 @@ export class DashboardQuestionSqlDatasetConfig extends CommonEntity {
     question: DashboardQuestion;
     @Column({ type: "text", nullable: true })
     options: any;
+    @Index({ unique: true })
+    @Column({ type: "varchar", nullable: true })
+    externalId: string;
 }

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

@@ -29,4 +29,7 @@ export class DashboardQuestion extends CommonEntity {
     kpiSql: string;
     @Column({ type: "integer", nullable: true })
     sequenceNumber: number;
+    @Index({ unique: true })
+    @Column({ type: "varchar", nullable: true })
+    externalId: string;
 }

package/src/interfaces.ts

@@ -134,8 +134,8 @@ export interface IEntityComputedFieldProvider {
   name(): string;
 }
 
-export interface IEntityPreComputeFieldProvider<TTriggerEntity, TContext, TValue> extends IEntityComputedFieldProvider {
-  preComputeValue(entity: TTriggerEntity, computedFieldMetadata: ComputedFieldMetadata<TContext>): Promise<TValue>;
+export interface IEntityPreComputeFieldProvider<TTriggerEntity, TContext, TValue=void> extends IEntityComputedFieldProvider {
+  preComputeValue(triggerEntity: TTriggerEntity, computedFieldMetadata: ComputedFieldMetadata<TContext>): Promise<TValue>;
 }
 
 export interface IEntityPostComputeFieldProvider<TTriggerEntity, TContext> extends IEntityComputedFieldProvider {

package/src/jobs/database/trigger-mcp-client-subscriber-database.service.ts

@@ -62,7 +62,8 @@ export class TriggerMcpClientSubscriberDatabase extends DatabaseSubscriber<Trigg
                 errorMessage: errorsStr,
                 modelUsed: aiResponse.model,
                 responseTimeMs: aiResponse.duration_ms,
-                metadata: JSON.stringify(aiResponse)
+                metadata: JSON.stringify(aiResponse),
+                isApplied: aiInteraction.isApplied
             });
 
             // update the job entry with failure... raising an error will lead the job to be marked as failed...
@@ -80,7 +81,8 @@ export class TriggerMcpClientSubscriberDatabase extends DatabaseSubscriber<Trigg
                 errorMessage: '',
                 modelUsed: aiResponse.model,
                 responseTimeMs: aiResponse.duration_ms,
-                metadata: JSON.stringify(aiResponse)
+                metadata: JSON.stringify(aiResponse),
+                isApplied: aiInteraction.isApplied
             });
         }
 

package/src/mappers/dashboard-mapper.ts

@@ -28,7 +28,7 @@ export class DashboardMapper {
                 chartOptions: question.chartOptions ?? null,
                 labelSql: question.labelSql ?? null,
                 kpiSql: question.kpiSql ?? null,
-
+                externalId: question.externalId,
                 questionSqlDatasetConfigs: (question.questionSqlDatasetConfigs || []).map(config => ({
                     sql: config.sql,
                     datasetName: config.datasetName,
@@ -37,6 +37,7 @@ export class DashboardMapper {
                     labelColumnName: config.labelColumnName,
                     valueColumnName: config.valueColumnName,
                     options: this.safeParseJSON(config.options, {}),
+                    externalId: config.externalId
                 }))
             }))
         };

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

@@ -4736,6 +4736,31 @@
             "index": false,
             "private": false,
             "encrypt": false
+          },
+          {
+            "name": "externalId",
+            "displayName": "External ID",
+            "type": "computed",
+            "ormType": "varchar",
+            "length": 128,
+            "required": false,
+            "unique": true,
+            "index": true,
+            "private": false,
+            "encrypt": false,
+            "isSystem": true,
+            "computedFieldValueType": "string",
+            "computedFieldValueProvider": "AlphaNumExternalIdComputationProvider",
+            "computedFieldValueProviderCtxt": "{\"prefix\": \"DQ\"}",
+            "computedFieldTriggerConfig": [
+              {
+                "modelName": "dashboardQuestion",
+                "moduleName": "fees-portal",
+                "operations": [
+                  "before-insert"
+                ]
+              }
+            ]
           }
         ]
       },
@@ -4858,6 +4883,31 @@
             "index": false,
             "private": false,
             "encrypt": false
+          },
+          {
+            "name": "externalId",
+            "displayName": "External ID",
+            "type": "computed",
+            "ormType": "varchar",
+            "length": 128,
+            "required": false,
+            "unique": true,
+            "index": true,
+            "private": false,
+            "encrypt": false,
+            "isSystem": true,
+            "computedFieldValueType": "string",
+            "computedFieldValueProvider": "AlphaNumExternalIdComputationProvider",
+            "computedFieldValueProviderCtxt": "{\"prefix\": \"DQSDC\"}",
+            "computedFieldTriggerConfig": [
+              {
+                "modelName": "dashboardQuestionSqlDatasetConfig",
+                "moduleName": "fees-portal",
+                "operations": [
+                  "before-insert"
+                ]
+              }
+            ]
           }
         ]
       },
@@ -4996,6 +5046,17 @@
             "index": false,
             "private": false,
             "encrypt": false
+          },
+          {
+            "name": "isApplied",
+            "displayName": "Is Applied",
+            "type": "boolean",
+            "ormType": "boolean",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false
           }
         ]
       }

package/src/services/ai-interaction.service.ts

@@ -205,6 +205,9 @@ export class AiInteractionService extends CRUDService<AiInteraction> {
 
     // TODO: This provider to implement an interface - IMcpToolResponseHandler ... apply(aiInteraction: AiInteraction)
     // throw new Error('Method not implemented.');
+    
+    // Mark the interaction as applied
+    await this.update(aiInteraction.id, { isApplied: true }, [], true);
 
     return handlerApplicationResponse;
   }

package/src/services/computed-fields/entity/alpha-num-external-id-computed-field-provider.ts

@@ -1,25 +1,40 @@
 import { Injectable } from '@nestjs/common';
 import { InjectEntityManager } from '@nestjs/typeorm';
 import { ComputedFieldProvider } from 'src/decorators/computed-field-provider.decorator';
+import { CommonEntity } from 'src/entities/common.entity';
 import { ComputedFieldMetadata } from 'src/helpers/solid-registry';
 import { IEntityPreComputeFieldProvider } from 'src/interfaces';
-// import {
-//   ComputedFieldMetadata,
-//   ComputedFieldProvider,
-//   IEntityPreComputeFieldProvider,
-// } from '@solidstarters/solid-core';
 import { EntityManager } from 'typeorm';
-// import { Agreement } from '../entities/agreement.entity';
+
+export interface AlphaNumExternalIdContext {
+  prefix: string; // The prefix to use for the external ID
+  length?: number; // Optional: length of the unique code to generate, default is 5
+}
 
 @ComputedFieldProvider()
 @Injectable()
-export class AgreementIdComputationProvider implements IEntityPreComputeFieldProvider<any, any, string> {
+export class AlphaNumExternalIdComputationProvider<T extends CommonEntity> implements IEntityPreComputeFieldProvider<T, AlphaNumExternalIdContext> {
   constructor(
     @InjectEntityManager()
     private readonly entityManager: EntityManager
   ) { }
 
-  generateRandomCode(length = 5): string {
+  name(): string {
+    return this.constructor.name;
+  }
+
+  help(): string {
+    return 'Provider used to compute external ID for a CommonEntity.';
+  }
+
+  async preComputeValue(triggerEntity: T, computedFieldMetadata: ComputedFieldMetadata<AlphaNumExternalIdContext>) {
+    const prefix = computedFieldMetadata.computedFieldValueProviderCtxt.prefix;
+    const codeLength = computedFieldMetadata.computedFieldValueProviderCtxt.length || 5;
+    const uniqueCode = await this.generateUniqueExternalId(codeLength, triggerEntity, computedFieldMetadata.fieldName);
+    triggerEntity[computedFieldMetadata.fieldName] = `${prefix}-${uniqueCode}`;
+  }
+
+  private generateRandomCode(length = 5): string {
     const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
     let result = '';
     for (let i = 0; i < length; i++) {
@@ -28,43 +43,26 @@ export class AgreementIdComputationProvider implements IEntityPreComputeFieldPro
     return result;
   }
 
-  async isAgreementIdUnique(agreementId: string): Promise<boolean> {
-    // const count = await this.entityManager.count(Agreement, {
-    //   where: { agreementId },
-    // });
-    // return count === 0;
-    return false;
+  private async isExternalIdUnique(externalId: string, triggerEntity: T, fieldName: string): Promise<boolean> {
+    const count = await this.entityManager.count(triggerEntity.constructor.name, {
+      where: { [fieldName]: externalId },
+    });
+    return count === 0;
   }
 
-  async generateUniqueAgreementId(codeLength: number): Promise<string> {
+  private async generateUniqueExternalId(codeLength: number, triggerEntity: T, fieldName: string): Promise<string> {
     const maxAttempts = 10;
 
     for (let attempt = 0; attempt < maxAttempts; attempt++) {
       const newId = this.generateRandomCode(codeLength);
 
-      const isUnique = await this.isAgreementIdUnique(newId);
+      const isUnique = await this.isExternalIdUnique(newId, triggerEntity, fieldName);
 
       if (isUnique) {
         return newId;
       }
     }
 
-    throw new Error('Failed to generate a unique agreement ID after multiple attempts');
+    throw new Error('Failed to generate a unique external ID after multiple attempts');
   }
-
-  async preComputeValue(triggerEntity: any, computedFieldMetadata: ComputedFieldMetadata<any>): Promise<string> {
-    const prefix = computedFieldMetadata.computedFieldValueProviderCtxt['prefix'];
-    const codeLength = computedFieldMetadata.computedFieldValueProviderCtxt['length'] || 5;
-    const uniqueCode = await this.generateUniqueAgreementId(codeLength);
-    return `${prefix}-${uniqueCode}`;
-  }
-
-  name(): string {
-    return 'AgreementIdComputationProvider';
-  }
-
-  help(): string {
-    return 'Provider used to compute values for the agreement id field on save.';
-  }
-
 }

package/src/services/computed-fields/entity/concat-entity-computed-field-provider.service.ts

@@ -14,7 +14,7 @@ export interface ConcatComputedFieldContext {
 
 @ComputedFieldProvider()
 @Injectable()
-export class ConcatEntityComputedFieldProvider<T extends CommonEntity> implements IEntityPreComputeFieldProvider<T, ConcatComputedFieldContext, string> {
+export class ConcatEntityComputedFieldProvider<T extends CommonEntity> implements IEntityPreComputeFieldProvider<T, ConcatComputedFieldContext> {
 
     name(): string {
         return "ConcatEntityComputedFieldProvider";
@@ -24,7 +24,7 @@ export class ConcatEntityComputedFieldProvider<T extends CommonEntity> implement
         return "Computed field provider used to create fields whose value is a concatenation of other fields in the same model.";
     }
 
-    async preComputeValue(entity: T, computedFieldMetadata: ComputedFieldMetadata<ConcatComputedFieldContext>): Promise<string> {
+    async preComputeValue(triggerEntity: T, computedFieldMetadata: ComputedFieldMetadata<ConcatComputedFieldContext>){
         const { computedFieldValueProviderCtxt } = computedFieldMetadata;
         const separator = computedFieldValueProviderCtxt.separator || ' '; // Default to space if no separator is provided
         const fields = computedFieldValueProviderCtxt.fields || [];
@@ -35,7 +35,7 @@ export class ConcatEntityComputedFieldProvider<T extends CommonEntity> implement
             const field = fields[i];
 
             // if slugify then each field val to be converted to a slug before concatenation
-            let fieldVal = entity[field];
+            let fieldVal = triggerEntity[field];
             if (slugify && typeof fieldVal === 'string') {
                 fieldVal = kebabCase(fieldVal);
             }
@@ -45,8 +45,7 @@ export class ConcatEntityComputedFieldProvider<T extends CommonEntity> implement
             }
             concatenatedString += fieldVal;
         }
-
-        return concatenatedString;
+        triggerEntity[computedFieldMetadata.fieldName] = concatenatedString; //This set the computed value on the entity, since for pre-compute, entity and triggerEntity are the same
     }
 
 }

package/src/services/computed-fields/entity/noops-entity-computed-field-provider.service.ts

@@ -0,0 +1,22 @@
+import { ComputedFieldMetadata } from "src/helpers/solid-registry";
+import { IEntityPostComputeFieldProvider, IEntityPreComputeFieldProvider } from "src/interfaces";
+
+export class NoopsEntityComputedFieldProviderService implements IEntityPreComputeFieldProvider<any, any>, IEntityPostComputeFieldProvider<any, any> {
+    constructor() { }
+
+    name(): string {
+        return "NoopsEntityComputedFieldProviderService";
+    }
+
+    help(): string {
+        return "This is a no-op computed field provider that does nothing.";
+    }
+
+    async preComputeValue(entity: any, computedFieldMetadata: ComputedFieldMetadata<any>): Promise<void> {
+        // No operation performed
+    }
+
+    async postComputeAndSaveValue(entity: any, computedFieldMetadata: ComputedFieldMetadata<any>): Promise<void> {
+        // No operation performed
+    }
+}

package/src/services/setting.service.ts

@@ -66,7 +66,13 @@ export class SettingService extends CRUDService<Setting> {
       enableDarkMode: true,
       copyright: null,
       enableUsername: true,
-      enabledNotification: true
+      enabledNotification: true,
+      contactSupportEmail : null,
+      contactSupportDisplayName: null,
+      contactSupportIcon: null,
+      authScreenRightBackgroundImage: null,
+      authScreenLeftBackgroundImage: null,
+      authScreenCenterBackgroundImage: null,
     };
 
     const existingSettings = await this.repo.find();
@@ -153,7 +159,13 @@ export class SettingService extends CRUDService<Setting> {
       copyright: null,
       forceChangePasswordOnFirstLogin: true,
       enableUsername: true,
-      enabledNotification: true
+      enabledNotification: true,
+      contactSupportEmail : null,
+      contactSupportDisplayName: null,
+      contactSupportIcon: null,
+      authScreenRightBackgroundImage: null,
+      authScreenLeftBackgroundImage: null,
+      authScreenCenterBackgroundImage: null,
     };
   }