@solidxai/core 0.1.11-beta.8 → 0.1.11

package/dist/subscribers/scheduled-job.subscriber.js.map

@@ -1 +1 @@
-{"version":3,"file":"scheduled-job.subscriber.js","sourceRoot":"","sources":["../../src/subscribers/scheduled-job.subscriber.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, Logger } from \"@nestjs/common\";\nimport { InjectDataSource } from \"@nestjs/typeorm\";\nimport * as fs from \"fs/promises\";\nimport { CreateScheduledJobDto } from \"src/dtos/create-scheduled-job.dto\";\nimport { ModuleMetadata } from \"src/entities/module-metadata.entity\";\nimport { ScheduledJob } from \"src/entities/scheduled-job.entity\";\nimport { ModuleMetadataHelperService } from \"src/helpers/module-metadata-helper.service\";\nimport { ScheduledJobRepository } from \"src/repository/scheduled-job.repository\";\nimport {\n  DataSource,\n  EntityManager,\n  EntitySubscriberInterface,\n  InsertEvent,\n  RemoveEvent,\n  UpdateEvent,\n} from \"typeorm\";\n\n@Injectable()\nexport class ScheduledJobSubscriber\n  implements EntitySubscriberInterface<ScheduledJob> {\n  private readonly logger = new Logger(ScheduledJobSubscriber.name);\n\n  /** Fields that, when changed (and only these changed), should NOT trigger metadata update. */\n  private readonly ignoredUpdateFields: Array<keyof ScheduledJob | string> = [\n    \"lastRunAt\",\n    \"nextRunAt\",\n    \"updatedAt\",\n  ];\n\n  constructor(\n    @InjectDataSource() private readonly dataSource: DataSource,\n    private readonly moduleMetadataHelperService: ModuleMetadataHelperService,\n    private readonly scheduledJobRepo: ScheduledJobRepository\n  ) {\n    this.dataSource.subscribers.push(this);\n  }\n\n  listenTo() {\n    return ScheduledJob;\n  }\n\n  async afterInsert(event: InsertEvent<ScheduledJob>) {\n    if (!event.entity) {\n      this.logger.debug('No schedule Job entity found in the  afterInsert method');\n      return;\n    }\n    await this.updateMetadata(event.entity, event.queryRunner.manager);\n  }\n\n  async afterUpdate(event: UpdateEvent<ScheduledJob>) {\n    if (!event.databaseEntity) {\n      this.logger.debug('No schedule Job entity found in the  afterUpdate method');\n      return;\n    }\n\n    // get hold of the changed field names \n    const changedProps = (event.updatedColumns ?? []).map((c) => c.propertyName);\n\n    // Decide whether to skip: only skip when *all* changed fields are in the ignore list\n    const onlyIgnoredChanged = changedProps.every((p) => this.ignoredUpdateFields.includes(p));\n\n    if (onlyIgnoredChanged) {\n      this.logger.debug(`Skipping metadata update for ScheduledJob#${(event.databaseEntity as ScheduledJob).id}; only ignored fields changed: ${changedProps.join(\", \")}`\n      );\n      return;\n    }\n\n    await this.updateMetadata(event.databaseEntity, event.queryRunner.manager);\n  }\n\n  async afterRemove(event: RemoveEvent<ScheduledJob>) {\n    await this.removeMetadata(event);\n  }\n\n  private async removeMetadata(event: RemoveEvent<ScheduledJob>) {\n    const jobEntity = event.entity;\n    const moduleMetadata = jobEntity?.module;\n\n    if (!moduleMetadata) {\n      this.logger.error(\n        `Module metadata not found for scheduled job with ID ${jobEntity?.id}`\n      );\n      return;\n    }\n\n    const moduleMetadataRepo = event.queryRunner.manager.getRepository(ModuleMetadata);\n    const populatedModuleMetadata = await moduleMetadataRepo.findOne({\n      where: { id: moduleMetadata.id },\n    });\n\n    if (!populatedModuleMetadata) {\n      this.logger.error(\n        `Could not find ModuleMetadata with ID ${moduleMetadata.id}`\n      );\n      return;\n    }\n    const filePath =\n      await this.moduleMetadataHelperService.getModuleMetadataFilePath(\n        populatedModuleMetadata.name\n      );\n    try {\n      await fs.access(filePath);\n    } catch {\n      this.logger.error(`Metadata file not found: ${filePath}`);\n      return;\n    }\n    const metaData =\n      await this.moduleMetadataHelperService.getModuleMetadataConfiguration(\n        filePath\n      );\n    // Remove, update or insert logic\n    const jobName = jobEntity.scheduleName;\n    const existingIndex = metaData.scheduledJobs.findIndex(\n      (job) => job.scheduleName === jobName\n    );\n    if (existingIndex !== -1) {\n      metaData.scheduledJobs.splice(existingIndex, 1);\n      this.logger.log(`Removed scheduled job ${jobName} from metadata`);\n    }\n    const updatedContent = JSON.stringify(metaData, null, 2);\n    await fs.writeFile(filePath, updatedContent);\n    this.logger.log(`Updated scheduledJobs in ${filePath}`);\n  }\n\n  private async updateMetadata(jobEntity: ScheduledJob, entityManager: EntityManager) {\n    // populate the job with its relation\n    const populatedScheduleJob = await entityManager.findOne(ScheduledJob, {\n      where: { id: jobEntity.id },\n      relations: ['module'],\n    });\n\n    if (!populatedScheduleJob) {\n      throw new Error(`ScheduleJob not found for id ${jobEntity.id}`);\n    }\n    const filePath =\n      await this.moduleMetadataHelperService.getModuleMetadataFilePath(\n        populatedScheduleJob.module?.name\n      );\n\n    try {\n      await fs.access(filePath);\n    } catch {\n      this.logger.error(`Metadata file not found: ${filePath}`);\n      return;\n    }\n\n    const metaData =\n      await this.moduleMetadataHelperService.getModuleMetadataConfiguration(\n        filePath\n      );\n\n    // Ensure scheduledJobs exists\n    if (!metaData.scheduledJobs) {\n      metaData.scheduledJobs = [];\n    }\n\n    // Remove, update or insert logic\n    const jobName = jobEntity.scheduleName;\n    const existingIndex = metaData.scheduledJobs.findIndex(\n      (job) => job.scheduleName === jobName\n    );\n    // Insert or update job in metadata\n    const jobDto: CreateScheduledJobDto = await this.scheduledJobRepo.toDto(populatedScheduleJob as ScheduledJob);\n    // Strip out bookkeeping/runtime fields before persisting to metadata JSON.\n    const {\n      moduleId,\n      lastRunAt,\n      nextRunAt,\n      ...dtoToWrite\n    } = jobDto;\n    if (existingIndex !== -1) {\n      metaData.scheduledJobs[existingIndex] = dtoToWrite;\n      this.logger.log(`Updated scheduled job ${jobName} in metadata`);\n    } else {\n      metaData.scheduledJobs.push(dtoToWrite);\n      this.logger.log(`Added scheduled job ${jobName} to metadata`);\n    }\n\n    const updatedContent = JSON.stringify(metaData, null, 2);\n    await fs.writeFile(filePath, updatedContent);\n    this.logger.log(`Updated scheduledJobs in ${filePath}`);\n  }\n}\n"]}
+{"version":3,"file":"scheduled-job.subscriber.js","sourceRoot":"","sources":["../../src/subscribers/scheduled-job.subscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,6CAAmD;AACnD,gDAAkC;AAElC,+EAAqE;AACrE,2EAAiE;AACjE,8FAAyF;AACzF,qFAAiF;AACjF,qCAOiB;AAGV,IAAM,sBAAsB,8BAA5B,MAAM,sBAAsB;IAWjC,YACsB,UAAuC,EAC1C,2BAAwD,EACxD,gBAAwC;QAFpB,eAAU,GAAV,UAAU,CAAY;QAC1C,gCAA2B,GAA3B,2BAA2B,CAA6B;QACxD,qBAAgB,GAAhB,gBAAgB,CAAwB;QAZ1C,WAAM,GAAG,IAAI,eAAM,CAAC,wBAAsB,CAAC,IAAI,CAAC,CAAC;QAGjD,wBAAmB,GAAuC;YACzE,WAAW;YACX,WAAW;YACX,WAAW;SACZ,CAAC;QAOA,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAED,QAAQ;QACN,OAAO,mCAAY,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAgC;QAChD,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAClB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAC;YAC7E,OAAO;QACT,CAAC;QACD,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAgC;QAChD,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;YAC1B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAC;YAC7E,OAAO;QACT,CAAC;QAGD,MAAM,YAAY,GAAG,CAAC,KAAK,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;QAG7E,MAAM,kBAAkB,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAE3F,IAAI,kBAAkB,EAAE,CAAC;YACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA8C,KAAK,CAAC,cAA+B,CAAC,EAAE,kCAAkC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAClK,CAAC;YACF,OAAO;QACT,CAAC;QAED,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC7E,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAgC;QAChD,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,KAAgC;QAC3D,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC;QAC/B,MAAM,cAAc,GAAG,SAAS,EAAE,MAAM,CAAC;QAEzC,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,uDAAuD,SAAS,EAAE,EAAE,EAAE,CACvE,CAAC;YACF,OAAO;QACT,CAAC;QAED,MAAM,kBAAkB,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,uCAAc,CAAC,CAAC;QACzE,MAAM,uBAAuB,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC;YAC/D,KAAK,EAAE,EAAE,EAAE,EAAE,cAAc,CAAC,EAAE,EAAE;SACjC,CAAC,CAAC;QAEH,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,yCAAyC,cAAc,CAAC,EAAE,EAAE,CAC7D,CAAC;YACF,OAAO;QACT,CAAC;QACD,MAAM,QAAQ,GACZ,MAAM,IAAI,CAAC,2BAA2B,CAAC,yBAAyB,CAC9D,uBAAuB,CAAC,IAAI,CAC7B,CAAC;QACJ,IAAI,CAAC;YACH,MAAM,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC5B,CAAC;QAAC,MAAM,CAAC;YACP,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,QAAQ,EAAE,CAAC,CAAC;YAC1D,OAAO;QACT,CAAC;QACD,MAAM,QAAQ,GACZ,MAAM,IAAI,CAAC,2BAA2B,CAAC,8BAA8B,CACnE,QAAQ,CACT,CAAC;QAEJ,MAAM,OAAO,GAAG,SAAS,CAAC,YAAY,CAAC;QACvC,MAAM,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC,SAAS,CACpD,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,YAAY,KAAK,OAAO,CACtC,CAAC;QACF,IAAI,aAAa,KAAK,CAAC,CAAC,EAAE,CAAC;YACzB,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;YAChD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,yBAAyB,OAAO,gBAAgB,CAAC,CAAC;QACpE,CAAC;QACD,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACzD,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QAC7C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,4BAA4B,QAAQ,EAAE,CAAC,CAAC;IAC1D,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,SAAuB,EAAE,aAA4B;QAEhF,MAAM,oBAAoB,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,mCAAY,EAAE;YACrE,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE;YAC3B,SAAS,EAAE,CAAC,QAAQ,CAAC;SACtB,CAAC,CAAC;QAEH,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,gCAAgC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;QAClE,CAAC;QACD,MAAM,QAAQ,GACZ,MAAM,IAAI,CAAC,2BAA2B,CAAC,yBAAyB,CAC9D,oBAAoB,CAAC,MAAM,EAAE,IAAI,CAClC,CAAC;QAEJ,IAAI,CAAC;YACH,MAAM,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC5B,CAAC;QAAC,MAAM,CAAC;YACP,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,QAAQ,EAAE,CAAC,CAAC;YAC1D,OAAO;QACT,CAAC;QAED,MAAM,QAAQ,GACZ,MAAM,IAAI,CAAC,2BAA2B,CAAC,8BAA8B,CACnE,QAAQ,CACT,CAAC;QAGJ,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC;YAC5B,QAAQ,CAAC,aAAa,GAAG,EAAE,CAAC;QAC9B,CAAC;QAGD,MAAM,OAAO,GAAG,SAAS,CAAC,YAAY,CAAC;QACvC,MAAM,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC,SAAS,CACpD,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,YAAY,KAAK,OAAO,CACtC,CAAC;QAEF,MAAM,MAAM,GAA0B,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,oBAAoC,CAAC,CAAC;QAE9G,MAAM,EACJ,QAAQ,EACR,SAAS,EACT,SAAS,EACT,GAAG,UAAU,EACd,GAAG,MAAM,CAAC;QACX,IAAI,aAAa,KAAK,CAAC,CAAC,EAAE,CAAC;YACzB,QAAQ,CAAC,aAAa,CAAC,aAAa,CAAC,GAAG,UAAU,CAAC;YACnD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,yBAAyB,OAAO,cAAc,CAAC,CAAC;QAClE,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACxC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,uBAAuB,OAAO,cAAc,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACzD,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QAC7C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,4BAA4B,QAAQ,EAAE,CAAC,CAAC;IAC1D,CAAC;CACF,CAAA;AApKY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;IAaR,WAAA,IAAA,0BAAgB,GAAE,CAAA;qCAA8B,oBAAU;QACb,4DAA2B;QACtC,iDAAsB;GAdhD,sBAAsB,CAoKlC","sourcesContent":["import { Injectable, Logger } from \"@nestjs/common\";\nimport { InjectDataSource } from \"@nestjs/typeorm\";\nimport * as fs from \"fs/promises\";\nimport { CreateScheduledJobDto } from \"src/dtos/create-scheduled-job.dto\";\nimport { ModuleMetadata } from \"src/entities/module-metadata.entity\";\nimport { ScheduledJob } from \"src/entities/scheduled-job.entity\";\nimport { ModuleMetadataHelperService } from \"src/helpers/module-metadata-helper.service\";\nimport { ScheduledJobRepository } from \"src/repository/scheduled-job.repository\";\nimport {\n  DataSource,\n  EntityManager,\n  EntitySubscriberInterface,\n  InsertEvent,\n  RemoveEvent,\n  UpdateEvent,\n} from \"typeorm\";\n\n@Injectable()\nexport class ScheduledJobSubscriber\n  implements EntitySubscriberInterface<ScheduledJob> {\n  private readonly logger = new Logger(ScheduledJobSubscriber.name);\n\n  /** Fields that, when changed (and only these changed), should NOT trigger metadata update. */\n  private readonly ignoredUpdateFields: Array<keyof ScheduledJob | string> = [\n    \"lastRunAt\",\n    \"nextRunAt\",\n    \"updatedAt\",\n  ];\n\n  constructor(\n    @InjectDataSource() private readonly dataSource: DataSource,\n    private readonly moduleMetadataHelperService: ModuleMetadataHelperService,\n    private readonly scheduledJobRepo: ScheduledJobRepository\n  ) {\n    this.dataSource.subscribers.push(this);\n  }\n\n  listenTo() {\n    return ScheduledJob;\n  }\n\n  async afterInsert(event: InsertEvent<ScheduledJob>) {\n    if (!event.entity) {\n      this.logger.debug('No schedule Job entity found in the  afterInsert method');\n      return;\n    }\n    await this.updateMetadata(event.entity, event.queryRunner.manager);\n  }\n\n  async afterUpdate(event: UpdateEvent<ScheduledJob>) {\n    if (!event.databaseEntity) {\n      this.logger.debug('No schedule Job entity found in the  afterUpdate method');\n      return;\n    }\n\n    // get hold of the changed field names \n    const changedProps = (event.updatedColumns ?? []).map((c) => c.propertyName);\n\n    // Decide whether to skip: only skip when *all* changed fields are in the ignore list\n    const onlyIgnoredChanged = changedProps.every((p) => this.ignoredUpdateFields.includes(p));\n\n    if (onlyIgnoredChanged) {\n      this.logger.debug(`Skipping metadata update for ScheduledJob#${(event.databaseEntity as ScheduledJob).id}; only ignored fields changed: ${changedProps.join(\", \")}`\n      );\n      return;\n    }\n\n    await this.updateMetadata(event.databaseEntity, event.queryRunner.manager);\n  }\n\n  async afterRemove(event: RemoveEvent<ScheduledJob>) {\n    await this.removeMetadata(event);\n  }\n\n  private async removeMetadata(event: RemoveEvent<ScheduledJob>) {\n    const jobEntity = event.entity;\n    const moduleMetadata = jobEntity?.module;\n\n    if (!moduleMetadata) {\n      this.logger.error(\n        `Module metadata not found for scheduled job with ID ${jobEntity?.id}`\n      );\n      return;\n    }\n\n    const moduleMetadataRepo = this.dataSource.getRepository(ModuleMetadata);\n    const populatedModuleMetadata = await moduleMetadataRepo.findOne({\n      where: { id: moduleMetadata.id },\n    });\n\n    if (!populatedModuleMetadata) {\n      this.logger.error(\n        `Could not find ModuleMetadata with ID ${moduleMetadata.id}`\n      );\n      return;\n    }\n    const filePath =\n      await this.moduleMetadataHelperService.getModuleMetadataFilePath(\n        populatedModuleMetadata.name\n      );\n    try {\n      await fs.access(filePath);\n    } catch {\n      this.logger.error(`Metadata file not found: ${filePath}`);\n      return;\n    }\n    const metaData =\n      await this.moduleMetadataHelperService.getModuleMetadataConfiguration(\n        filePath\n      );\n    // Remove, update or insert logic\n    const jobName = jobEntity.scheduleName;\n    const existingIndex = metaData.scheduledJobs.findIndex(\n      (job) => job.scheduleName === jobName\n    );\n    if (existingIndex !== -1) {\n      metaData.scheduledJobs.splice(existingIndex, 1);\n      this.logger.log(`Removed scheduled job ${jobName} from metadata`);\n    }\n    const updatedContent = JSON.stringify(metaData, null, 2);\n    await fs.writeFile(filePath, updatedContent);\n    this.logger.log(`Updated scheduledJobs in ${filePath}`);\n  }\n\n  private async updateMetadata(jobEntity: ScheduledJob, entityManager: EntityManager) {\n    // populate the job with its relation\n    const populatedScheduleJob = await entityManager.findOne(ScheduledJob, {\n      where: { id: jobEntity.id },\n      relations: ['module'],\n    });\n\n    if (!populatedScheduleJob) {\n      throw new Error(`ScheduleJob not found for id ${jobEntity.id}`);\n    }\n    const filePath =\n      await this.moduleMetadataHelperService.getModuleMetadataFilePath(\n        populatedScheduleJob.module?.name\n      );\n\n    try {\n      await fs.access(filePath);\n    } catch {\n      this.logger.error(`Metadata file not found: ${filePath}`);\n      return;\n    }\n\n    const metaData =\n      await this.moduleMetadataHelperService.getModuleMetadataConfiguration(\n        filePath\n      );\n\n    // Ensure scheduledJobs exists\n    if (!metaData.scheduledJobs) {\n      metaData.scheduledJobs = [];\n    }\n\n    // Remove, update or insert logic\n    const jobName = jobEntity.scheduleName;\n    const existingIndex = metaData.scheduledJobs.findIndex(\n      (job) => job.scheduleName === jobName\n    );\n    // Insert or update job in metadata\n    const jobDto: CreateScheduledJobDto = await this.scheduledJobRepo.toDto(populatedScheduleJob as ScheduledJob);\n    // Strip out bookkeeping/runtime fields before persisting to metadata JSON.\n    const {\n      moduleId,\n      lastRunAt,\n      nextRunAt,\n      ...dtoToWrite\n    } = jobDto;\n    if (existingIndex !== -1) {\n      metaData.scheduledJobs[existingIndex] = dtoToWrite;\n      this.logger.log(`Updated scheduled job ${jobName} in metadata`);\n    } else {\n      metaData.scheduledJobs.push(dtoToWrite);\n      this.logger.log(`Added scheduled job ${jobName} to metadata`);\n    }\n\n    const updatedContent = JSON.stringify(metaData, null, 2);\n    await fs.writeFile(filePath, updatedContent);\n    this.logger.log(`Updated scheduledJobs in ${filePath}`);\n  }\n}\n"]}

package/dist/subscribers/security-rule.subscriber.js

@@ -80,7 +80,7 @@ let SecurityRuleSubscriber = SecurityRuleSubscriber_1 = class SecurityRuleSubscr
             this.logger.error(`Model metadata not found for security rule with id ${event.entity.id}`);
             return;
         }
-        const modelMetadataRepo = event.manager.getRepository(model_metadata_entity_1.ModelMetadata);
+        const modelMetadataRepo = this.dataSource.getRepository(model_metadata_entity_1.ModelMetadata);
         const populatedModelMetadata = await modelMetadataRepo.findOne({
             where: {
                 id: modelMetadata.id

package/dist/subscribers/security-rule.subscriber.js.map

@@ -1 +1 @@
-{"version":3,"file":"security-rule.subscriber.js","sourceRoot":"","sources":["../../src/subscribers/security-rule.subscriber.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, Logger } from '@nestjs/common';\nimport { InjectDataSource } from \"@nestjs/typeorm\";\nimport * as fs from 'fs/promises'; // Use the Promise-based version of fs for async/await\nimport { SOLID_CORE_MODULE_NAME } from 'src/constants';\nimport { ModelMetadata } from 'src/entities/model-metadata.entity';\nimport { SecurityRule } from 'src/entities/security-rule.entity';\nimport { ModuleMetadataHelperService } from \"src/helpers/module-metadata-helper.service\";\nimport { SecurityRuleRepository } from 'src/repository/security-rule.repository';\nimport { DataSource, EntitySubscriberInterface, InsertEvent, UpdateEvent } from \"typeorm\";\n\n@Injectable()\nexport class SecurityRuleSubscriber implements EntitySubscriberInterface<SecurityRule> {\n    private readonly logger = new Logger(SecurityRuleSubscriber.name);\n    constructor(\n        @InjectDataSource()\n        private readonly dataSource: DataSource,\n        readonly moduleMetadataHelperService: ModuleMetadataHelperService,\n        readonly securityRuleRepo: SecurityRuleRepository,\n    ) {\n        this.dataSource.subscribers.push(this);\n    }\n\n    listenTo() {\n        return SecurityRule;\n    }\n\n    async afterInsert(event: InsertEvent<SecurityRule>) {\n        await this.saveSecurityRules(event);\n    }\n\n    async afterUpdate(event: UpdateEvent<SecurityRule>) {\n        await this.saveSecurityRules(event);\n    }\n\n    async saveSecurityRules(event: UpdateEvent<SecurityRule> | InsertEvent<SecurityRule>) {\n        const securityRule = event.entity as SecurityRule;\n        const modelMetadata = event.entity.modelMetadata;\n        if (!modelMetadata) {\n            this.logger.error(`Model metadata not found for security rule with id ${event.entity.id}`);\n            return;\n        }\n\n        const modelMetadataRepo = event.manager.getRepository(ModelMetadata);\n        const populatedModelMetadata = await modelMetadataRepo.findOne({\n            where: {\n                id: modelMetadata.id\n            },\n            relations: {\n                module: true,\n            }\n        });\n\n        // Ignore further processing if the module is solid core module, since solid core security rules cannot be seeded from the UI\n        if (populatedModelMetadata.module.name === SOLID_CORE_MODULE_NAME) {\n            return;\n        }\n\n        const filePath = await this.moduleMetadataHelperService.getModuleMetadataFilePath(populatedModelMetadata.module.name);\n        try {\n            await fs.access(filePath);\n        } catch (error: any) {\n            // FIXME - Should we actually delete the security rule here, if the file is not found?\n            this.logger.error(`File not found at path: ${filePath}`);\n            return;\n        }\n        const metaData = await this.moduleMetadataHelperService.getModuleMetadataConfiguration(filePath);\n\n        if (metaData.securityRules) {\n            const securityRuleIndex = metaData.securityRules?.findIndex((ruleFromFile: { name: string }) => ruleFromFile.name === securityRule.name);\n            const { id, roleId, modelMetadataId, ...requiredDto } = await this.securityRuleRepo.toDto(securityRule)\n            metaData.securityRules[securityRuleIndex] = { ...requiredDto, securityRuleConfig: JSON.parse(securityRule.securityRuleConfig) }\n        }\n        else {\n            const securityRules = []\n            const { id, roleId, modelMetadataId, ...requiredDto } = await this.securityRuleRepo.toDto(securityRule)\n            securityRules.push({ ...requiredDto, securityRuleConfig: JSON.parse(securityRule.securityRuleConfig) })\n            metaData.securityRules = securityRules\n        }\n        // Write the updated object back to the file\n        const updatedContent = JSON.stringify(metaData, null, 2);\n        await fs.writeFile(filePath, updatedContent);\n    }\n\n}"]}
+{"version":3,"file":"security-rule.subscriber.js","sourceRoot":"","sources":["../../src/subscribers/security-rule.subscriber.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, Logger } from '@nestjs/common';\nimport { InjectDataSource } from \"@nestjs/typeorm\";\nimport * as fs from 'fs/promises'; // Use the Promise-based version of fs for async/await\nimport { SOLID_CORE_MODULE_NAME } from 'src/constants';\nimport { ModelMetadata } from 'src/entities/model-metadata.entity';\nimport { SecurityRule } from 'src/entities/security-rule.entity';\nimport { ModuleMetadataHelperService } from \"src/helpers/module-metadata-helper.service\";\nimport { SecurityRuleRepository } from 'src/repository/security-rule.repository';\nimport { DataSource, EntitySubscriberInterface, InsertEvent, UpdateEvent } from \"typeorm\";\n\n@Injectable()\nexport class SecurityRuleSubscriber implements EntitySubscriberInterface<SecurityRule> {\n    private readonly logger = new Logger(SecurityRuleSubscriber.name);\n    constructor(\n        @InjectDataSource()\n        private readonly dataSource: DataSource,\n        readonly moduleMetadataHelperService: ModuleMetadataHelperService,\n        readonly securityRuleRepo: SecurityRuleRepository,\n    ) {\n        this.dataSource.subscribers.push(this);\n    }\n\n    listenTo() {\n        return SecurityRule;\n    }\n\n    async afterInsert(event: InsertEvent<SecurityRule>) {\n        await this.saveSecurityRules(event);\n    }\n\n    async afterUpdate(event: UpdateEvent<SecurityRule>) {\n        await this.saveSecurityRules(event);\n    }\n\n    async saveSecurityRules(event: UpdateEvent<SecurityRule> | InsertEvent<SecurityRule>) {\n        const securityRule = event.entity as SecurityRule;\n        const modelMetadata = event.entity.modelMetadata;\n        if (!modelMetadata) {\n            this.logger.error(`Model metadata not found for security rule with id ${event.entity.id}`);\n            return;\n        }\n\n        const modelMetadataRepo = this.dataSource.getRepository(ModelMetadata);\n        const populatedModelMetadata = await modelMetadataRepo.findOne({\n            where: {\n                id: modelMetadata.id\n            },\n            relations: {\n                module: true,\n            }\n        });\n\n        // Ignore further processing if the module is solid core module, since solid core security rules cannot be seeded from the UI\n        if (populatedModelMetadata.module.name === SOLID_CORE_MODULE_NAME) {\n            return;\n        }\n\n        const filePath = await this.moduleMetadataHelperService.getModuleMetadataFilePath(populatedModelMetadata.module.name);\n        try {\n            await fs.access(filePath);\n        } catch (error: any) {\n            // FIXME - Should we actually delete the security rule here, if the file is not found?\n            this.logger.error(`File not found at path: ${filePath}`);\n            return;\n        }\n        const metaData = await this.moduleMetadataHelperService.getModuleMetadataConfiguration(filePath);\n\n        if (metaData.securityRules) {\n            const securityRuleIndex = metaData.securityRules?.findIndex((ruleFromFile: { name: string }) => ruleFromFile.name === securityRule.name);\n            const { id, roleId, modelMetadataId, ...requiredDto } = await this.securityRuleRepo.toDto(securityRule)\n            metaData.securityRules[securityRuleIndex] = { ...requiredDto, securityRuleConfig: JSON.parse(securityRule.securityRuleConfig) }\n        }\n        else {\n            const securityRules = []\n            const { id, roleId, modelMetadataId, ...requiredDto } = await this.securityRuleRepo.toDto(securityRule)\n            securityRules.push({ ...requiredDto, securityRuleConfig: JSON.parse(securityRule.securityRuleConfig) })\n            metaData.securityRules = securityRules\n        }\n        // Write the updated object back to the file\n        const updatedContent = JSON.stringify(metaData, null, 2);\n        await fs.writeFile(filePath, updatedContent);\n    }\n\n}"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidxai/core",
-  "version": "0.1.11-beta.8",
+  "version": "0.1.11",
   "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/controllers/media.controller.ts

@@ -47,7 +47,7 @@ export class MediaController {
     return this.service.update(id, updateDto, files, true);
   }
 
-  @Public()
+  // @Public()
   // @SkipThrottle({ short: false, login: true, burst: true, sustained: true }) //Enable the short throttle only
   @ApiBearerAuth("jwt")
   @Post('/upload')

package/src/helpers/module-metadata-helper.service.ts

@@ -34,7 +34,7 @@ export class ModuleMetadataHelperService {
         if (!moduleName) {
             return '';
         }
-        return path.resolve(process.cwd(), 'src', moduleName);
+        return path.resolve(process.cwd(), 'src', kebabCase(moduleName));
     }
 
     async getSolidUiModulePath(moduleName: string): Promise<string> {

package/src/helpers/solid-registry.ts

@@ -8,7 +8,7 @@ import { Locale } from 'src/entities/locale.entity';
 import { SecurityRule } from 'src/entities/security-rule.entity';
 import { IScheduledJob } from 'src/services/scheduled-jobs/scheduled-job.interface';
 import { IDashboardWidgetDataProvider, IErrorCodeProvider, ISecurityRuleConfigProvider, ISelectionProvider, ISelectionProviderContext, ISolidDatabaseModule } from "../interfaces";
-import { EntityManager, ObjectLiteral } from 'typeorm';
+import { ObjectLiteral } from 'typeorm';
 
 type ControllerMetadata = {
   name: string;
@@ -49,12 +49,6 @@ export interface TypeOrmEventContext {
   metadataName?: string;
   updatedColumns?: string[];
   updatedRelations?: string[];
-  // Transaction-bound EntityManager from the originating TypeORM event. Providers that
-  // need to query the DB during a pre-compute hook must use this (not an injected
-  // DataSource/EntityManager) so the query runs on the active transaction's connection.
-  // On single-threaded embedded engines (PGlite), a second connection mid-transaction
-  // can deadlock.
-  manager?: EntityManager;
 }
 
 export interface ComputedFieldMetadata<TContext = any> {

package/src/helpers/typeorm-db-helper.ts

@@ -45,6 +45,21 @@ const solidCoreDbType: DatasourceType =
         ? (process.env.SOLID_CORE_DB_TYPE as DatasourceType)
         : DatasourceType.postgres;
 
+// Must use ANSI CAST() syntax — not Postgres-specific `::text` — because TypeORM's
+// replacePropertyNamesForTheWholeQuery regex treats ':' as part of the property name,
+// so `alias.col::text` is parsed as property `col::text` (no match → no column substitution).
+export function buildCastToText(driver: string, colExpr: string): string {
+    switch (driver) {
+        case DatasourceType.mssql:
+            return `CAST(${colExpr} AS NVARCHAR(MAX))`;
+        case DatasourceType.mysql:
+        case DatasourceType.mariadb:
+            return `CAST(${colExpr} AS CHAR)`;
+        default:
+            return `CAST(${colExpr} AS TEXT)`;
+    }
+}
+
 export function getColumnType(solidType: string): ColumnOptions {
     switch (solidType) {
         case "longText":

package/src/index.ts

@@ -171,7 +171,6 @@ export * from './guards/permissions.guard'
 export * from './guards/roles.guard'
 
 export * from './helpers/command.service'
-export * from './helpers/nodemon-heartbeat'
 export * from './helpers/module.helper'
 export * from './helpers/schematic.service'
 export * from './helpers/solid-registry'

package/src/interfaces.ts

@@ -89,6 +89,7 @@ export interface SettingDefinition<T = any> {
   encrypted?: boolean;
   label?: string;
   description?: string;
+  helpText?: string;
   placeholder?: string;
   group?: string;
   sortOrder?: number;

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

@@ -6116,7 +6116,8 @@
       "sequenceNumber": 1,
       "actionUserKey": "moduleMetadata-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "appBuilder-menu-item"
+      "parentMenuItemUserKey": "appBuilder-menu-item",
+      "iconName": "view_module"
     },
     {
       "displayName": "Model",
@@ -6124,7 +6125,8 @@
       "sequenceNumber": 2,
       "actionUserKey": "modelMetadata-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "appBuilder-menu-item"
+      "parentMenuItemUserKey": "appBuilder-menu-item",
+      "iconName": "table_rows"
     },
     {
       "displayName": "Field",
@@ -6132,7 +6134,8 @@
       "sequenceNumber": 3,
       "actionUserKey": "fieldMetadata-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "appBuilder-menu-item"
+      "parentMenuItemUserKey": "appBuilder-menu-item",
+      "iconName": "label"
     },
     {
       "displayName": "Datasources",
@@ -6140,7 +6143,8 @@
       "sequenceNumber": 4,
       "actionUserKey": "datasource-management-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "appBuilder-menu-item"
+      "parentMenuItemUserKey": "appBuilder-menu-item",
+      "iconName": "storage"
     },
     {
       "displayName": "Menu Item",
@@ -6148,7 +6152,8 @@
       "sequenceNumber": 1,
       "actionUserKey": "menuItemMetadata-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "layoutBuilder-menu-item"
+      "parentMenuItemUserKey": "layoutBuilder-menu-item",
+      "iconName": "menu"
     },
     {
       "displayName": "View",
@@ -6156,7 +6161,8 @@
       "sequenceNumber": 2,
       "actionUserKey": "viewMetadata-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "layoutBuilder-menu-item"
+      "parentMenuItemUserKey": "layoutBuilder-menu-item",
+      "iconName": "pageview"
     },
     {
       "displayName": "Action",
@@ -6164,7 +6170,8 @@
       "sequenceNumber": 3,
       "actionUserKey": "actionMetadata-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "layoutBuilder-menu-item"
+      "parentMenuItemUserKey": "layoutBuilder-menu-item",
+      "iconName": "bolt"
     },
     {
       "displayName": "User View",
@@ -6172,7 +6179,8 @@
       "sequenceNumber": 5,
       "actionUserKey": "userViewMetadata-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "layoutBuilder-menu-item"
+      "parentMenuItemUserKey": "layoutBuilder-menu-item",
+      "iconName": "person"
     },
     {
       "displayName": "Media Management",
@@ -6189,7 +6197,8 @@
       "sequenceNumber": 1,
       "actionUserKey": "media-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "mediaManagement-menu-item"
+      "parentMenuItemUserKey": "mediaManagement-menu-item",
+      "iconName": "perm_media"
     },
     {
       "displayName": "Media Storage Provider",
@@ -6197,7 +6206,8 @@
       "sequenceNumber": 2,
       "actionUserKey": "mediaStorageProviderMetadata-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "mediaManagement-menu-item"
+      "parentMenuItemUserKey": "mediaManagement-menu-item",
+      "iconName": "cloud"
     },
     {
       "displayName": "IAM",
@@ -6206,7 +6216,7 @@
       "actionUserKey": "",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "",
-      "iconName": "person_shield"
+      "iconName": "manage_accounts"
     },
     {
       "displayName": "User",
@@ -6214,7 +6224,8 @@
       "sequenceNumber": 1,
       "actionUserKey": "user-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "iam-menu-item"
+      "parentMenuItemUserKey": "iam-menu-item",
+      "iconName": "person"
     },
     {
       "displayName": "Role",
@@ -6222,7 +6233,8 @@
       "sequenceNumber": 2,
       "actionUserKey": "roleMetadata-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "iam-menu-item"
+      "parentMenuItemUserKey": "iam-menu-item",
+      "iconName": "admin_panel_settings"
     },
     {
       "displayName": "Permission",
@@ -6230,7 +6242,8 @@
       "sequenceNumber": 3,
       "actionUserKey": "permissionMetadata-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "iam-menu-item"
+      "parentMenuItemUserKey": "iam-menu-item",
+      "iconName": "key"
     },
     {
       "displayName": "Security rules",
@@ -6238,7 +6251,8 @@
       "sequenceNumber": 4,
       "actionUserKey": "securityRule-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "iam-menu-item"
+      "parentMenuItemUserKey": "iam-menu-item",
+      "iconName": "gavel"
     },
     {
       "displayName": "User Activity History",
@@ -6246,7 +6260,8 @@
       "sequenceNumber": 5,
       "actionUserKey": "userActivityHistory-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "iam-menu-item"
+      "parentMenuItemUserKey": "iam-menu-item",
+      "iconName": "history"
     },
     {
       "displayName": "Queues",
@@ -6263,7 +6278,8 @@
       "sequenceNumber": 1,
       "actionUserKey": "solid-core-queue-health-dashboard-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "queues-menu-item"
+      "parentMenuItemUserKey": "queues-menu-item",
+      "iconName": "analytics"
     },
     {
       "displayName": "Queues",
@@ -6271,7 +6287,8 @@
       "sequenceNumber": 2,
       "actionUserKey": "mqMessageQueue-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "queues-menu-item"
+      "parentMenuItemUserKey": "queues-menu-item",
+      "iconName": "dns"
     },
     {
       "displayName": "Messages",
@@ -6279,7 +6296,8 @@
       "sequenceNumber": 3,
       "actionUserKey": "mqMessage-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "queues-menu-item"
+      "parentMenuItemUserKey": "queues-menu-item",
+      "iconName": "message"
     },
     {
       "displayName": "Notification",
@@ -6288,7 +6306,7 @@
       "actionUserKey": "",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "",
-      "iconName": "notification_settings"
+      "iconName": "notification_add"
     },
     {
       "displayName": "Email",
@@ -6296,7 +6314,8 @@
       "sequenceNumber": 1,
       "actionUserKey": "emailTemplate-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "notification-menu-item"
+      "parentMenuItemUserKey": "notification-menu-item",
+      "iconName": "email"
     },
     {
       "displayName": "SMS",
@@ -6304,7 +6323,8 @@
       "sequenceNumber": 2,
       "actionUserKey": "smsTemplate-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "notification-menu-item"
+      "parentMenuItemUserKey": "notification-menu-item",
+      "iconName": "sms"
     },
     {
       "displayName": "Other",
@@ -6313,7 +6333,7 @@
       "actionUserKey": "",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "",
-      "iconName": "other_admission"
+      "iconName": "more_horiz"
     },
     {
       "displayName": "List of Values",
@@ -6321,7 +6341,8 @@
       "sequenceNumber": 1,
       "actionUserKey": "listOfValues-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "other-menu-item"
+      "parentMenuItemUserKey": "other-menu-item",
+      "iconName": "list"
     },
     {
       "displayName": "Scheduled Jobs",
@@ -6329,7 +6350,8 @@
       "sequenceNumber": 2,
       "actionUserKey": "scheduledJob-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "other-menu-item"
+      "parentMenuItemUserKey": "other-menu-item",
+      "iconName": "event_repeat"
     },
     {
       "displayName": "Saved Filters",
@@ -6337,7 +6359,8 @@
       "sequenceNumber": 4,
       "actionUserKey": "savedFilters-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "other-menu-item"
+      "parentMenuItemUserKey": "other-menu-item",
+      "iconName": "filter_list_alt"
     },
     {
       "displayName": "Chatter Message",
@@ -6345,7 +6368,8 @@
       "sequenceNumber": 5,
       "actionUserKey": "chatterMessage-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "other-menu-item"
+      "parentMenuItemUserKey": "other-menu-item",
+      "iconName": "forum"
     },
     {
       "displayName": "Locale",
@@ -6353,7 +6377,8 @@
       "sequenceNumber": 7,
       "actionUserKey": "locale-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "other-menu-item"
+      "parentMenuItemUserKey": "other-menu-item",
+      "iconName": "language"
     },
     {
       "displayName": "Import Transactions",
@@ -6361,7 +6386,8 @@
       "sequenceNumber": 8,
       "actionUserKey": "importTransaction-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "other-menu-item"
+      "parentMenuItemUserKey": "other-menu-item",
+      "iconName": "upload_file"
     },
     {
       "displayName": "Settings",
@@ -6378,7 +6404,8 @@
       "sequenceNumber": 1,
       "actionUserKey": "modelSequence-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "other-menu-item"
+      "parentMenuItemUserKey": "other-menu-item",
+      "iconName": "format_list_numbered"
     },
     {
       "displayName": "Dashboard User Layout",
@@ -6387,7 +6414,7 @@
       "actionUserKey": "dashboardUserLayout-list-action",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "",
-      "iconName": ""
+      "iconName": "dashboard_customize"
     },
     {
       "displayName": "Agent",
@@ -6404,7 +6431,8 @@
       "sequenceNumber": 1,
       "actionUserKey": "agentSession-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "agent-menu-item"
+      "parentMenuItemUserKey": "agent-menu-item",
+      "iconName": "chat"
     },
     {
       "displayName": "MCP Audit Log",
@@ -6412,7 +6440,8 @@
       "sequenceNumber": 3,
       "actionUserKey": "mcpAuditLog-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "agent-menu-item"
+      "parentMenuItemUserKey": "agent-menu-item",
+      "iconName": "fact_check"
     }
   ],
   "views": [

package/src/services/authentication.service.ts

@@ -1042,13 +1042,15 @@ export class AuthenticationService {
     }
 
     const type = this.resolveLoginType(signInDto);
-    const user = await this.findUserForLogin(type, signInDto.identifier);
-    const dummyOtp = this.getDummyOtpForUser(user);
-    if (!dummyOtp) {
-      await this.assignLoginOtp(user, type);
-      await this.notifyUserOnOtpInititateLogin(user, type);
+    const user = await this.findUserForLoginOrNull(type, signInDto.identifier);
+    if (user) {
+      const dummyOtp = this.getDummyOtpForUser(user);
+      if (!dummyOtp) {
+        await this.assignLoginOtp(user, type);
+        await this.notifyUserOnOtpInititateLogin(user, type);
+      }
     }
-    return this.buildLoginOtpResponse(user, type);
+    return this.buildLoginOtpResponse(type, signInDto.identifier, user);
   }
 
   private resolveLoginType(
@@ -1100,6 +1102,25 @@ export class AuthenticationService {
     return user;
   }
 
+  private async findUserForLoginOrNull(
+    type: PasswordlessLoginValidateWhatSources,
+    identifier: string,
+    options: { withRoles?: boolean } = {},
+  ): Promise<User | null> {
+    try {
+      return await this.findUserForLogin(type, identifier, options);
+    } catch (error) {
+      if (
+        error instanceof UnauthorizedException &&
+        (error.message === ERROR_MESSAGES.USER_NOT_FOUND ||
+          error.message === ERROR_MESSAGES.USER_INACTIVE)
+      ) {
+        return null;
+      }
+      throw error;
+    }
+  }
+
   private async assignLoginOtp(
     user: User,
     type: PasswordlessLoginValidateWhatSources,
@@ -1123,19 +1144,29 @@ export class AuthenticationService {
   }
 
   private buildLoginOtpResponse(
-    user: User,
     type: PasswordlessLoginValidateWhatSources,
+    identifier: string,
+    user?: User | null,
   ) {
-    const maskedIdentifier =
-      type === PasswordlessLoginValidateWhatSources.EMAIL
-        ? { email: this.maskEmail(user.email) }
-        : { mobile: this.maskMobile(user.mobile) };
+    const maskedIdentifier = this.buildMaskedLoginIdentifier(
+      type,
+      user?.email ?? user?.mobile ?? identifier,
+    );
     return {
       message: SUCCESS_MESSAGES.OTP_SENT_SUCCESS_LOGIN,
       user: maskedIdentifier,
     };
   }
 
+  private buildMaskedLoginIdentifier(
+    type: PasswordlessLoginValidateWhatSources,
+    identifier: string,
+  ) {
+    return type === PasswordlessLoginValidateWhatSources.EMAIL
+      ? { email: this.maskEmail(identifier) }
+      : { mobile: this.maskMobile(identifier) };
+  }
+
   private async notifyUserOnOtpInititateLogin(
     user: User,
     loginType: PasswordlessLoginValidateWhatSources,
@@ -1273,9 +1304,12 @@ export class AuthenticationService {
       throw new BadRequestException(ERROR_MESSAGES.INVALID_VERIFICATION_TYPE);
     }
 
-    const user = await this.findUserForLogin(type, identifier, {
+    const user = await this.findUserForLoginOrNull(type, identifier, {
       withRoles: true,
     });
+    if (!user) {
+      throw new UnauthorizedException(ERROR_MESSAGES.INVALID_OTP);
+    }
     this.checkAccountBlocked(user);
     const dummyOtp = this.getDummyOtpForUser(user);
 

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

@@ -45,12 +45,7 @@ export class AlphaNumExternalIdComputationProvider<T extends CommonEntity> imple
       }
     }
 
-    // Use the originating transaction's EntityManager so the uniqueness check runs on the
-    // active connection. Falls back to the injected manager only when no event context is
-    // available (e.g. direct invocation outside a TypeORM lifecycle event).
-    const manager = eventContext?.manager ?? this.entityManager;
-
-    const uniqueCode = await this.generateUniqueExternalId(manager, resolvedPrefix, codeLength, computedFieldMetadata.fieldName, entityName);
+    const uniqueCode = await this.generateUniqueExternalId(resolvedPrefix, codeLength, computedFieldMetadata.fieldName, entityName);
     const finalExternalId = resolvedPrefix ? `${resolvedPrefix}-${uniqueCode}` : uniqueCode;
 
     triggerEntity[computedFieldMetadata.fieldName] = finalExternalId;
@@ -65,8 +60,8 @@ export class AlphaNumExternalIdComputationProvider<T extends CommonEntity> imple
     return result;
   }
 
-  private async isExternalIdUnique(manager: EntityManager, externalId: string, fieldName: string, entityName: string): Promise<boolean> {
-    const count = await manager.count(entityName as any,
+  private async isExternalIdUnique(externalId: string, fieldName: string, entityName: string): Promise<boolean> {
+    const count = await this.entityManager.count(entityName as any,
       {
         where: { [fieldName]: externalId },
       }
@@ -74,7 +69,7 @@ export class AlphaNumExternalIdComputationProvider<T extends CommonEntity> imple
     return count === 0;
   }
 
-  private async generateUniqueExternalId(manager: EntityManager, resolvedPrefix: string, codeLength: number, fieldName: string, entityName: string): Promise<string> {
+  private async generateUniqueExternalId(resolvedPrefix: string, codeLength: number, fieldName: string, entityName: string): Promise<string> {
     const maxAttempts = 10;
 
     for (let attempt = 0; attempt < maxAttempts; attempt++) {
@@ -83,7 +78,7 @@ export class AlphaNumExternalIdComputationProvider<T extends CommonEntity> imple
 
       const fullId = resolvedPrefix ? `${resolvedPrefix}-${newId}` : newId;
 
-      const isUnique = await this.isExternalIdUnique(manager, fullId, fieldName, entityName);
+      const isUnique = await this.isExternalIdUnique(fullId, fieldName, entityName);
 
       if (isUnique) {
         return newId;