@solidstarters/solid-core 1.2.204 → 1.2.206

package/src/seeders/module-metadata-seeder.service.ts

@@ -1,3 +1,4 @@
+
 import { forwardRef, Inject, Injectable, Logger } from '@nestjs/common';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -7,7 +8,6 @@ import { CreateDashboardDto } from 'src/dtos/create-dashboard.dto';
 import { CreateEmailTemplateDto } from 'src/dtos/create-email-template.dto';
 import { CreateListOfValuesDto } from 'src/dtos/create-list-of-values.dto';
 import { CreateSecurityRuleDto } from 'src/dtos/create-security-rule.dto';
-import { CreateSettingDto } from 'src/dtos/create-setting.dto';
 import { CreateSmsTemplateDto } from 'src/dtos/create-sms-template.dto';
 import { DashboardRepository } from 'src/repository/dashboard.repository';
 import { SecurityRuleRepository } from 'src/repository/security-rule.repository';
@@ -17,15 +17,13 @@ import { ListOfValuesService } from 'src/services/list-of-values.service';
 import { SettingService } from 'src/services/setting.service';
 import { SmsTemplateService } from 'src/services/sms-template.service';
 import { UserService } from 'src/services/user.service';
-import { DataSource, In, Repository } from 'typeorm';
-import appBuilderConfig from '../config/app-builder.config';
+import { DataSource, In } from 'typeorm';
 import { CreateModelMetadataDto } from '../dtos/create-model-metadata.dto';
 import { CreateModuleMetadataDto } from '../dtos/create-module-metadata.dto';
-import { getDynamicModuleNames, getDynamicModuleNamesBasedOnMetadata } from '../helpers/module.helper';
+import { getDynamicModuleNamesBasedOnMetadata } from '../helpers/module.helper';
 import { SolidRegistry } from '../helpers/solid-registry';
 import { ActionMetadataService } from '../services/action-metadata.service';
 import { FieldMetadataService } from '../services/field-metadata.service';
-import { MediaStorageProviderMetadataSeederService } from '../services/media-storage-provider-metadata-seeder.service';
 import { MediaStorageProviderMetadataService } from '../services/media-storage-provider-metadata.service';
 import { ModelMetadataService } from '../services/model-metadata.service';
 import { ModuleMetadataService } from '../services/module-metadata.service';
@@ -35,7 +33,7 @@ import solidCoreMetadata from './seed-data/solid-core-metadata.json';
 import { SystemFieldsSeederService } from './system-fields-seeder.service';
 // import { CreateScheduledJobDto } from 'src/dtos/create-scheduled-job.dto';
 import { ActionMetadata, MENU_ROLE_JOIN_TABLE_NAME, MENU_ROLE_JOIN_TABLE_NAME_MENU_COL, MENU_ROLE_JOIN_TABLE_NAME_ROLE_COL, MenuItemMetadata, ModuleMetadata, RoleMetadata, SignUpDto } from 'src';
-import { ADMIN_ROLE_NAME, INTERNAL_ROLE_NAME, INTERNAL_ROLE_PERMISSIONS, PUBLIC_ROLE_NAME } from 'src/dtos/create-role-metadata.dto';
+import { ADMIN_ROLE_NAME } from 'src/dtos/create-role-metadata.dto';
 import { CreateSavedFiltersDto } from 'src/dtos/create-saved-filters.dto';
 import { CreateScheduledJobDto } from 'src/dtos/create-scheduled-job.dto';
 import { PermissionMetadataRepository } from 'src/repository/permission-metadata.repository';
@@ -62,7 +60,6 @@ export class ModuleMetadataSeederService {
         private readonly authenticationService: AuthenticationService,
         private readonly solidActionService: ActionMetadataService,
         private readonly solidViewService: ViewMetadataService,
-        private readonly mediaStorageProviderSeederService: MediaStorageProviderMetadataSeederService,
         private readonly emailTemplateService: EmailTemplateService,
         private readonly smsTemplateService: SmsTemplateService,
         private readonly listOfValuesService: ListOfValuesService,
@@ -102,8 +99,10 @@ export class ModuleMetadataSeederService {
 
         if (conf && Array.isArray(conf.modulesToSeed)) {
             modulesToSeed = conf.modulesToSeed;
+            console.log(`▶ Selective seeding enabled. Modules to seed: ${modulesToSeed.join(', ')}`);
             this.logger.log(`Selective seeding enabled. Modules to seed: ${modulesToSeed.join(', ')}`);
         } else {
+            console.log(`▶ No modulesToSeed provided. Seeding ALL modules.`);
             this.logger.log(`No modulesToSeed provided. Seeding ALL modules.`);
         }
 
@@ -124,69 +123,81 @@ export class ModuleMetadataSeederService {
         for (let i = 0; i < filteredSeedDataFiles.length; i++) {
             const overallMetadata = filteredSeedDataFiles[i];
             const moduleMetadata: CreateModuleMetadataDto = overallMetadata.moduleMetadata;
+            console.log(`▶ Seeding Metadata for Module: ${moduleMetadata.name}`);
             this.logger.log(`Seeding Metadata for Module: ${moduleMetadata.name}`);
 
             // Process module metadata first. 
+            console.log(`▶ [${moduleMetadata.name}] Seeding Module / Model / Fields`);
             this.logger.log(`Seeding Module / Model / Fields`);
             await this.seedModuleModelFields(moduleMetadata);
 
             // Media Storage provider templates
+            console.log(`▶ [${moduleMetadata.name}] Seeding Media Storage Providers`);
             this.logger.log(`Seeding Media Storage Providers`);
             await this.seedMediaStorageProviders(overallMetadata.mediaStorageProviders);
 
             // Custom role handling
+            console.log(`▶ [${moduleMetadata.name}] Seeding Roles`);
             this.logger.log(`Seeding Roles`);
             await this.seedRoles(overallMetadata);
 
             // Custom user handling
+            console.log(`▶ [${moduleMetadata.name}] Seeding Users`);
             this.logger.log(`Seeding Users`);
             await this.seedUsers(overallMetadata);
 
             // Application Module View handling 
+            console.log(`▶ [${moduleMetadata.name}] Seeding Views`);
             this.logger.log(`Seeding Views`);
             await this.seedViews(overallMetadata);
 
             // Application Module Action handling
+            console.log(`▶ [${moduleMetadata.name}] Seeding Actions`);
             this.logger.log(`Seeding Actions`);
             await this.seedActions(overallMetadata);
 
             // Application Module Menu handling 
+            console.log(`▶ [${moduleMetadata.name}] Seeding Menus`);
             this.logger.log(`Seeding Menus`);
             await this.seedMenus(overallMetadata);
 
             // Email templates 
+            console.log(`▶ [${moduleMetadata.name}] Seeding Email Templates`);
             this.logger.log(`Seeding Email Templates`);
             await this.seedEmailTemplates(overallMetadata, moduleMetadata.name);
 
             // Sms templates
+            console.log(`▶ [${moduleMetadata.name}] Seeding Sms Templates`);
             this.logger.log(`Seeding Sms Templates`);
             await this.seedSmsTemplates(overallMetadata, moduleMetadata.name);
 
-            // Settings
-            this.logger.log(`Seeding Default Settings`);
-            await this.seedDefaultSettings();
-
             // Security rules
+            console.log(`▶ [${moduleMetadata.name}] Seeding Security Rules`);
             this.logger.log(`Seeding Security Rules`);
             await this.seedSecurityRules(overallMetadata);
 
             // List Of Values
+            console.log(`▶ [${moduleMetadata.name}] Seeding List Of Values`);
             this.logger.log(`Seeding List Of Values`);
             await this.seedListOfValues(moduleMetadata, overallMetadata);
 
             // Dashboards
+            console.log(`▶ [${moduleMetadata.name}] Seeding Dashboards`);
             this.logger.log(`Seeding Dashboards`);
             await this.seedDashboards(moduleMetadata, overallMetadata);
 
             // Scheduled Jobs
+            console.log(`▶ [${moduleMetadata.name}] Seeding Scheduled Jobs`);
             this.logger.log(`Seeding Scheduled Jobs`);
             await this.seedScheduledJobs(moduleMetadata, overallMetadata);
 
             // Saved Filters
+            console.log(`▶ [${moduleMetadata.name}] Seeding Saved Filters`);
             this.logger.log(`Seeding Saved Filters`);
             await this.seedSavedFilters(moduleMetadata, overallMetadata);
 
             // Model Sequences
+            console.log(`▶ [${moduleMetadata.name}] Seeding Model Sequences`);
             this.logger.log(`Seeding Model Sequences`);
             await this.seedModelSequences(overallMetadata);
 
@@ -197,7 +208,7 @@ export class ModuleMetadataSeederService {
         await this.setupDefaultRolesWithPermissions();
 
         // Add a console log indicating seeding is finished. This needs to be console.log so that it looks proper when this code is run via CLI.
-        console.log(`Seeding completed.`);
+        console.log(`✔ Seeding completed.`);
         //this.logger.log(`All Seeders finished`);
 
         //FIXME: Handle displaying the created users credentials in a better way.
@@ -239,11 +250,13 @@ export class ModuleMetadataSeederService {
     private async setupDefaultRolesWithPermissions() {
         this.logger.debug(`About to add all permissions to the Admin role`);
         await this.roleService.addAllPermissionsToRole(ADMIN_ROLE_NAME);
+
         // 2. Give  permissions to the Internal / Public role.
-        this.logger.debug(`About to add all permissions to the Internal role`);
-        await this.roleService.addPermissionToRole(INTERNAL_ROLE_NAME, INTERNAL_ROLE_PERMISSIONS);
-        this.logger.debug(`About to add all permissions to the Public role`);
-        await this.roleService.addPermissionToRole(PUBLIC_ROLE_NAME, ['SettingController.wrapSettings', 'AuthenticationController.logout']);
+        // this.logger.debug(`About to add all permissions to the Internal role`);
+        // await this.roleService.addPermissionToRole(INTERNAL_ROLE_NAME, INTERNAL_ROLE_PERMISSIONS);
+
+        // this.logger.debug(`About to add all permissions to the Public role`);
+        // await this.roleService.addPermissionToRole(PUBLIC_ROLE_NAME, ['SettingController.wrapSettings', 'AuthenticationController.logout']);
     }
 
     private async seedSecurityRules(overallMetadata: any) {
@@ -256,7 +269,7 @@ export class ModuleMetadataSeederService {
     // Ok
     private async seedDefaultSettings() {
         this.logger.debug(`[Start] Processing settings`);
-        await this.settingService.seedDefaultSettings();
+        await this.settingService.seedSystemAdminEditableAndAboveSettings();
         this.logger.debug(`[End] Processing settings`);
     }
 
@@ -347,12 +360,17 @@ export class ModuleMetadataSeederService {
         this.logger.log(`Seeding Permissions`);
         await this.seedPermissions();
 
-        this.logger.log(`Seeding Default Media Storage Providers`);
-        await this.seedDefaultMediaStorageProviders();
+        // this.logger.log(`Seeding Default Media Storage Providers`);
+        // await this.seedDefaultMediaStorageProviders();
 
         this.logger.log(`Seeding System Fields Metadata`);
         await this.seedDefaultSystemFields();
 
+        // Settings
+        this.logger.log(`Seeding Default Settings`);
+        await this.seedDefaultSettings();
+
+
         this.logger.debug(`Global metadata seeding completed`);
     }
 
@@ -409,9 +427,9 @@ export class ModuleMetadataSeederService {
     }
 
     // OK
-    private async seedDefaultMediaStorageProviders() {
-        await this.mediaStorageProviderSeederService.seed();
-    }
+    // private async seedDefaultMediaStorageProviders() {
+    //     await this.mediaStorageProviderSeederService.seed();
+    // }
 
     // OK
     private async seedMediaStorageProviders(mediaStorageProviders: any[]) {
@@ -815,12 +833,6 @@ export class ModuleMetadataSeederService {
         this.logger.debug(`[End] Processing module metadata`);
     }
 
-    private async seedSettings(createDto: CreateSettingDto) {
-        const settingsArray: any[] = await this.settingsRepo.find();
-        if (!settingsArray || settingsArray.length === 0) {
-            this.settingService.create(createDto);
-        }
-    }
 
     private async handleSeedSecurityRules(rulesDto: CreateSecurityRuleDto[]) {
         if (!rulesDto || rulesDto.length === 0) {

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

@@ -2842,6 +2842,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 +2877,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 +2887,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 +5286,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": [
@@ -12538,6 +12628,10 @@
     {
       "name": "default-filesystem",
       "type": "filesystem"
+    },
+    {
+      "name": "default-aws-s3",
+      "type": "aws-s3"
     }
   ],
   "checksums": [],
@@ -12572,4 +12666,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/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) {