@solidstarters/solid-core 1.2.204 → 1.2.207

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

@@ -2613,7 +2613,8 @@
               "Hourly:Hourly",
               "Daily:Daily",
               "Weekly:Weekly",
-              "Monthly:Monthly"
+              "Monthly:Monthly",
+              "Custom:Custom"
             ],
             "selectionValueType": "string",
             "required": true,
@@ -2787,6 +2788,19 @@
             "selectionDynamicProvider": "ListOfScheduledJobsSelectionProvider",
             "selectionDynamicProviderCtxt": "{}"
           },
+          {
+            "name": "cronExpression",
+            "displayName": "Cron Expression",
+            "type": "shortText",
+            "ormType": "varchar",
+            "length": 512,
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "isSystem": false
+          },
           {
             "name": "module",
             "displayName": "Module",
@@ -2842,6 +2856,19 @@
             "encrypt": false,
             "isSystem": true
           },
+          {
+            "name": "level",
+            "displayName": "Level",
+            "type": "shortText",
+            "ormType": "varchar",
+            "length": 128,
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "isSystem": true
+          },
           {
             "name": "type",
             "displayName": "Type",
@@ -2864,7 +2891,7 @@
             "description": "This is the user id field",
             "type": "relation",
             "ormType": "integer",
-            "isSystem": false,
+            "isSystem": true,
             "relationType": "many-to-one",
             "relationCoModelFieldName": null,
             "relationCreateInverse": false,
@@ -2874,7 +2901,32 @@
             "relationCascade": "cascade",
             "required": false,
             "unique": false,
-            "index": false,
+            "index": true,
+            "private": false,
+            "encrypt": false,
+            "encryptionType": null,
+            "decryptWhen": null,
+            "columnName": null,
+            "relationJoinTableName": null,
+            "isRelationManyToManyOwner": null
+          },
+          {
+            "name": "moduleMetadata",
+            "displayName": "Module",
+            "description": "This setting emanated from which module...",
+            "type": "relation",
+            "ormType": "integer",
+            "isSystem": true,
+            "relationType": "many-to-one",
+            "relationCoModelFieldName": null,
+            "relationCreateInverse": false,
+            "relationCoModelSingularName": "moduleMetadata",
+            "relationCoModelColumnName": null,
+            "relationModelModuleName": "solid-core",
+            "relationCascade": "cascade",
+            "required": false,
+            "unique": false,
+            "index": true,
             "private": false,
             "encrypt": false,
             "encryptionType": null,
@@ -5248,10 +5300,62 @@
       "name": "Admin"
     },
     {
-      "name": "Internal User"
+      "name": "Internal User",
+      "permissions": [
+        "UserController.findMany",
+        "UserController.checkIfPermissionExists",
+        "UserController.findOne",
+        "MenuItemMetadataController.findMany",
+        "MenuItemMetadataController.findUserMenus",
+        "MenuItemMetadataController.findOne",
+        "ViewMetadataController.getLayout",
+        "ViewMetadataController.findMany",
+        "ViewMetadataController.findOne",
+        "ActionMetadataController.findMany",
+        "ActionMetadataController.findOne",
+        "UserViewMetadataController.upsert",
+        "UserViewMetadataController.findMany",
+        "UserViewMetadataController.findOne",
+        "AuthenticationController.changePassword",
+        "AuthenticationController.logout",
+        "AuthenticationController.me",
+        "ModelMetadataController.navigation",
+        "FieldMetadataController.getSelectionDynamicValues",
+        "FieldMetadataController.getSelectionDynamicValue",
+        "FieldMetadataController.findFieldDefaultMetaData",
+        "SavedFiltersController.delete",
+        "SavedFiltersController.deleteMany",
+        "SavedFiltersController.findOne",
+        "SavedFiltersController.findMany",
+        "SavedFiltersController.recover",
+        "SavedFiltersController.recoverMany",
+        "SavedFiltersController.partialUpdate",
+        "SavedFiltersController.update",
+        "SavedFiltersController.insertMany",
+        "SavedFiltersController.create",
+        "ChatterMessageController.create",
+        "ChatterMessageController.getChatterMessages",
+        "ChatterMessageController.postMessage",
+        "ChatterMessageController.findMany",
+        "ImportTransactionController.getImportTemplate",
+        "ImportTransactionController.getImportInstructions",
+        "ImportTransactionController.getImportMappingInfo",
+        "ImportTransactionController.startImportSync",
+        "ImportTransactionController.startImportAsync",
+        "ImportTransactionController.exportFailedImportedImports",
+        "ExportTemplateController.startExportSync",
+        "ExportTemplateController.startExportAsync",
+        "ListOfValuesController.findMany",
+        "ListOfValuesController.findOne",
+        "SettingController.getAllSettings"
+      ]
     },
     {
-      "name": "Public"
+      "name": "Public",
+      "permissions": [
+        "SettingController.wrapSettings",
+        "AuthenticationController.logout"
+      ]
     }
   ],
   "users": [
@@ -10216,6 +10320,12 @@
                                   "name": "frequency"
                                 }
                               },
+                              {
+                                "type": "field",
+                                "attrs": {
+                                  "name": "cronExpression"
+                                }
+                              },
                               {
                                 "type": "field",
                                 "attrs": {
@@ -12538,6 +12648,10 @@
     {
       "name": "default-filesystem",
       "type": "filesystem"
+    },
+    {
+      "name": "default-aws-s3",
+      "type": "aws-s3"
     }
   ],
   "checksums": [],
@@ -12572,4 +12686,4 @@
     }
   ],
   "modelSequences": []
-}
+}

package/src/seeders/sms-template-seeder.service.ts

@@ -1,11 +1,12 @@
 import { Inject, Injectable, Logger } from '@nestjs/common';
 import * as fs from 'fs';
 import * as path from 'path';
+import type { SolidCoreSetting } from "src/services/settings/default-settings-provider.service";
 
 import { ConfigType } from '@nestjs/config';
-import commonConfig from '../config/common.config';
 import { CreateSmsTemplateDto } from '../dtos/create-sms-template.dto';
 import { SmsTemplateService } from '../services/sms-template.service';
+import { SettingService } from 'src/services/setting.service';
 
 @Injectable()
 export class SmsTemplateSeederService {
@@ -13,13 +14,14 @@ export class SmsTemplateSeederService {
 
     constructor(
         private readonly smsTemplateService: SmsTemplateService,
-        @Inject(commonConfig.KEY)
-        private readonly commonConfiguration: ConfigType<typeof commonConfig>,
+        private readonly settingService: SettingService
     ) { }
 
     async seed() {
         // Read the module metadata from a file specified in the .env 
-        const seedDataFiles = this.commonConfiguration.smsTemplateSeederFiles.split(',');
+        const seedDataFileVariable = this.settingService.getConfigValue<SolidCoreSetting>("smsTemplateSeederFiles");
+        const seedDataFiles = seedDataFileVariable.split(',');
+
         for (let i = 0; i < seedDataFiles.length; i++) {
             const seedDataFile = seedDataFiles[i];
             const fullPath = path.join(process.cwd(), seedDataFile);

package/src/seeders/system-fields-seeder.service.ts

@@ -53,5 +53,8 @@ export class SystemFieldsSeederService {
       }));
       await this.fieldMetadataRepository.save(newFields);
     }
+    else {
+      this.logger.debug(`No missing system fields for model: ${model.singularName}`);
+    }
   }
 }

package/src/services/action-metadata.service.ts

@@ -1,13 +1,8 @@
-import { forwardRef, Inject, Injectable } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
-import { DiscoveryService, ModuleRef } from "@nestjs/core";
+import { Injectable } from '@nestjs/common';
+import { ModuleRef } from "@nestjs/core";
 import { InjectEntityManager } from '@nestjs/typeorm';
-import { CrudHelperService } from "src/services/crud-helper.service";
 import { CRUDService } from 'src/services/crud.service';
-import { FileService } from "src/services/file.service";
-import { ModelMetadataService } from 'src/services/model-metadata.service';
-import { ModuleMetadataService } from 'src/services/module-metadata.service';
-import { EntityManager, In } from 'typeorm';
+import { EntityManager } from 'typeorm';
 
 
 import { ActionMetadataRepository } from 'src/repository/action-metadata.repository';
@@ -16,13 +11,6 @@ import { ActionMetadata } from '../entities/action-metadata.entity';
 @Injectable()
 export class ActionMetadataService extends CRUDService<ActionMetadata> {
   constructor(
-    @Inject(forwardRef(() => ModelMetadataService))
-    readonly modelMetadataService: ModelMetadataService,
-    readonly moduleMetadataService: ModuleMetadataService,
-    readonly configService: ConfigService,
-    readonly fileService: FileService,
-    readonly discoveryService: DiscoveryService,
-    readonly crudHelperService: CrudHelperService,
     @InjectEntityManager()
     readonly entityManager: EntityManager,
     // @InjectRepository(ActionMetadata, 'default')
@@ -31,7 +19,7 @@ export class ActionMetadataService extends CRUDService<ActionMetadata> {
     readonly moduleRef: ModuleRef
 
   ) {
-    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'actionMetadata', 'solid-core', moduleRef);
+    super(entityManager, repo, 'actionMetadata', 'solid-core', moduleRef);
   }
 
   async findOneByUserKey(name: string, relations = {}) {

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

@@ -1,20 +1,16 @@
-import { BadRequestException, forwardRef, Inject, Injectable, Logger } from '@nestjs/common';
-import { DiscoveryService, ModuleRef } from "@nestjs/core";
+import { BadRequestException, Injectable, Logger } from '@nestjs/common';
+import { ModuleRef } from "@nestjs/core";
 import { InjectEntityManager } from '@nestjs/typeorm';
 import { EntityManager } from 'typeorm';
+import type { SolidCoreSetting } from "src/services/settings/default-settings-provider.service";
 
-import { ConfigService } from '@nestjs/config';
 import { spawn } from 'child_process';
 import * as fs from 'fs/promises';
 import { ERROR_MESSAGES } from 'src/constants/error-messages';
 import { InvokeAiPromptDto } from 'src/dtos/invoke-ai-prompt.dto';
 import { McpResponse, TriggerMcpClientOptions } from 'src/interfaces';
 import { AiInteractionRepository } from 'src/repository/ai-interaction.repository';
-import { CrudHelperService } from 'src/services/crud-helper.service';
 import { CRUDService } from 'src/services/crud.service';
-import { FileService } from 'src/services/file.service';
-import { ModelMetadataService } from 'src/services/model-metadata.service';
-import { ModuleMetadataService } from 'src/services/module-metadata.service';
 import { AiInteraction } from '../entities/ai-interaction.entity';
 import { McpHandlerFactory } from './genai/mcp-handlers/mcp-handler-factory.service';
 import { PublisherFactory } from './queues/publisher-factory.service';
@@ -24,13 +20,6 @@ export class AiInteractionService extends CRUDService<AiInteraction> {
   private readonly logger = new Logger(AiInteractionService.name);
 
   constructor(
-    @Inject(forwardRef(() => ModelMetadataService))
-    readonly modelMetadataService: ModelMetadataService,
-    readonly moduleMetadataService: ModuleMetadataService,
-    readonly configService: ConfigService,
-    readonly fileService: FileService,
-    readonly discoveryService: DiscoveryService,
-    readonly crudHelperService: CrudHelperService,
     @InjectEntityManager()
     readonly entityManager: EntityManager,
     // @InjectRepository(AiInteraction, 'default')
@@ -42,7 +31,7 @@ export class AiInteractionService extends CRUDService<AiInteraction> {
     readonly mcpHandlerFactory: McpHandlerFactory,
 
   ) {
-    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'aiInteraction', 'solid-core', moduleRef);
+    super(entityManager, repo, 'aiInteraction', 'solid-core', moduleRef);
   }
 
   async triggerMcpClientJob(dto: InvokeAiPromptDto, userId: number, isAutoApply: boolean = false, threadId: string = null): Promise<any> {
@@ -83,8 +72,8 @@ export class AiInteractionService extends CRUDService<AiInteraction> {
    * @returns The parsed object inside the 'response' field of the JSON output.
    */
   async runMcpPrompt(prompt: string): Promise<McpResponse> {
-    const pythonExecutable = process.env.MCP_PYTHON_EXECUTABLE;
-    const mcpClient = process.env.MCP_CLIENT;
+    const pythonExecutable = this.settingService.getConfigValue<SolidCoreSetting>('mcpPythonExecutable');
+    const mcpClient = this.settingService.getConfigValue<SolidCoreSetting>('mcpClient');
 
     // TODO: We can return an error if the above env variables are not properly setup...
     if (!pythonExecutable || !mcpClient) {