@solidstarters/solid-core 1.2.97 → 1.2.98

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.97",
+  "version": "1.2.98",
   "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/action-metadata.controller.ts

@@ -7,7 +7,7 @@ import { UpdateActionMetadataDto } from '../dtos/update-action-metadata.dto';
 import { SolidRequestContextDto } from 'src/dtos/solid-request-context.dto';
 import { SolidRequestContextDecorator } from 'src/decorators/solid-request-context.decorator';
 
-@ApiTags('App')
+@ApiTags('App Builder')
 @Controller('action-metadata') //FIXME: Change this to the model plural name 
 export class ActionMetadataController {
   constructor(private readonly service: ActionMetadataService) { }

package/src/controllers/export-template.controller.ts

@@ -7,7 +7,7 @@ import { UpdateExportTemplateDto } from '../dtos/update-export-template.dto';
 import { Response } from 'express';
 import { StartExportSyncDto } from 'src/dtos/export.dto';
 
-@ApiTags('Solid') 
+@ApiTags('Solid Core') 
 @Controller('export-template') //FIXME: Change this to the model plural name 
 export class ExportTemplateController { 
   constructor(private readonly service: ExportTemplateService) {}

package/src/controllers/export-transaction.controller.ts

@@ -5,7 +5,7 @@ import { ExportTransactionService } from '../services/export-transaction.service
 import { CreateExportTransactionDto } from '../dtos/create-export-transaction.dto';
 import { UpdateExportTransactionDto } from '../dtos/update-export-transaction.dto';
 
-@ApiTags('Solid') 
+@ApiTags('Solid Core') 
 @Controller('export-transaction') //FIXME: Change this to the model plural name 
 export class ExportTransactionController {
   constructor(private readonly service: ExportTransactionService) {}

package/src/controllers/menu-item-metadata.controller.ts

@@ -9,7 +9,7 @@ import { ActiveUserData } from 'src/interfaces/active-user-data.interface';
 import { SolidRequestContextDto } from 'src/dtos/solid-request-context.dto';
 import { SolidRequestContextDecorator } from 'src/decorators/solid-request-context.decorator';
 
-@ApiTags('App')
+@ApiTags('App Builder')
 @Controller('menu-item-metadata') //FIXME: Change this to the model plural name 
 export class MenuItemMetadataController {
   constructor(private readonly service: MenuItemMetadataService) { }

package/src/controllers/permission-metadata.controller.ts

@@ -7,7 +7,7 @@ import { UpdatePermissionMetadataDto } from '../dtos/update-permission-metadata.
 import { SolidRequestContextDto } from 'src/dtos/solid-request-context.dto';
 import { SolidRequestContextDecorator } from 'src/decorators/solid-request-context.decorator';
 
-@ApiTags('Solid')
+@ApiTags('Solid Core')
 @Controller('permission-metadata') //FIXME: Change this to the model plural name 
 export class PermissionMetadataController {
   constructor(private readonly service: PermissionMetadataService) { }

package/src/controllers/role-metadata.controller.ts

@@ -7,7 +7,7 @@ import { UpdateRoleMetadataDto } from '../dtos/update-role-metadata.dto';
 import { SolidRequestContextDto } from 'src/dtos/solid-request-context.dto';
 import { SolidRequestContextDecorator } from 'src/decorators/solid-request-context.decorator';
 
-@ApiTags('Solid') 
+@ApiTags('Solid Core') 
 @Controller('role-metadata') //FIXME: Change this to the model plural name 
 export class RoleMetadataController {
   constructor(private readonly service: RoleMetadataService) {}

package/src/controllers/service.controller.ts

@@ -1,4 +1,4 @@
-import { Controller, Get } from '@nestjs/common';
+import { Body, Controller, Get, Logger, Post } from '@nestjs/common';
 import { DiscoveryService, MetadataScanner, Reflector } from '@nestjs/core';
 import { Public } from 'src/decorators/public.decorator';
 import { SolidRegistry } from '../helpers/solid-registry';
@@ -8,6 +8,8 @@ import { ApiTags } from '@nestjs/swagger';
 @Controller('')
 @ApiTags("Common")
 export class ServiceController {
+    private readonly logger = new Logger(ServiceController.name);
+
     constructor(
         private readonly solidRegistry: SolidRegistry,
     ) { }
@@ -18,6 +20,23 @@ export class ServiceController {
         return { pong: 'v1.0.2' };
     }
 
+    @Public()
+    @Post('seed')
+    async seedData(@Body() seedData: any) {
+        const seeder = this.solidRegistry
+            .getSeeders()
+            .filter((seeder) => seeder.name === seedData.seeder)
+            .map((seeder) => seeder.instance)
+            .pop();
+        if (!seeder) {
+            this.logger.error(`Seeder service ${seedData.seeder} not found. Does your service have a seed() method?`);
+            return;
+        }
+        this.logger.log(`Running the seed() method for seeder :${seeder.constructor.name}`);
+        await seeder.seed();
+        return { message: `seed data for ${seedData.seeder}` };
+    }
+
     // @Public()
     // @Get('play')
     // play() {

package/src/controllers/setting.controller.ts

@@ -8,7 +8,7 @@ import { SolidRequestContextDecorator } from 'src/decorators/solid-request-conte
 import { SolidRequestContextDto } from 'src/dtos/solid-request-context.dto';
 import { UpdateSettingsDto } from 'src/dtos/update-settings.dto';
 
-@ApiTags('Solid') 
+@ApiTags('Solid Core') 
 @Controller('setting') //FIXME: Change this to the model plural name 
 export class SettingController {
   constructor(private readonly service: SettingService) {}

package/src/controllers/test.controller.ts

@@ -34,21 +34,21 @@ export class TestController {
     return { filename: file.originalname };
   }
 
-  @Public()
-  @Post('seed')
-  async seedData(@Body() seedData: any) {
-    const seeder = this.solidRegistry
-      .getSeeders()
-      .filter((seeder) => seeder.name === seedData.seeder)
-      .map((seeder) => seeder.instance)
-      .pop();
-    if (!seeder) {
-      this.logger.error(`Seeder service ${seedData.seeder} not found. Does your service have a seed() method?`);
-      return;
-    }
-    this.logger.log(`Running the seed() method for seeder :${seeder.constructor.name}`);
-    await seeder.seed();
-    return { message: `seed data for ${seedData.seeder}` };
-  }
+  // @Public()
+  // @Post('seed')
+  // async seedData(@Body() seedData: any) {
+  //   const seeder = this.solidRegistry
+  //     .getSeeders()
+  //     .filter((seeder) => seeder.name === seedData.seeder)
+  //     .map((seeder) => seeder.instance)
+  //     .pop();
+  //   if (!seeder) {
+  //     this.logger.error(`Seeder service ${seedData.seeder} not found. Does your service have a seed() method?`);
+  //     return;
+  //   }
+  //   this.logger.log(`Running the seed() method for seeder :${seeder.constructor.name}`);
+  //   await seeder.seed();
+  //   return { message: `seed data for ${seedData.seeder}` };
+  // }
 
 }

package/src/controllers/user.controller.ts

@@ -11,7 +11,7 @@ import { ActiveUserData } from '../interfaces/active-user-data.interface';
 import { SolidRequestContextDecorator } from 'src/decorators/solid-request-context.decorator';
 import { SolidRequestContextDto } from 'src/dtos/solid-request-context.dto';
 
-@ApiTags('Solid')
+@ApiTags('Solid Core')
 @Controller('user') //FIXME: Change this to the model plural name 
 export class UserController {
   constructor(private readonly service: UserService) { }

package/src/controllers/view-metadata.controller.ts

@@ -9,7 +9,7 @@ import { SolidRequestContextDto } from 'src/dtos/solid-request-context.dto';
 import { ActiveUser } from 'src/decorators/active-user.decorator';
 import { ActiveUserData } from 'src/interfaces/active-user-data.interface';
 
-@ApiTags('App')
+@ApiTags('App Builder')
 @Controller('view-metadata') //FIXME: Change this to the model plural name 
 export class ViewMetadataController {
   constructor(private readonly service: ViewMetadataService) { }

package/src/interfaces.ts

@@ -43,9 +43,9 @@ export interface ModuleMetadataConfiguration {
     moduleMetadata?: CreateModuleMetadataDto,
     roles?: CreateRoleMetadataDto[],
     users?: SignUpDto[],
-    actions?: CreateActionMetadataDto[],
-    menus?: CreateMenuItemMetadataDto[],
-    views?: CreateViewMetadataDto[],
+    actions?: any[],
+    menus?: any[],
+    views?: any[],
     emailTemplates?: CreateEmailTemplateDto[],
     smsTemplates?: CreateSmsTemplateDto[],
     mediaStorageProviders?: CreateMediaStorageProviderMetadataDto[]

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

@@ -409,8 +409,10 @@ export class ModuleMetadataSeederService {
             viewData['model'] = await this.modelMetadataService.findOneByUserKey(viewData.modelUserKey);
             // await this.solidViewService.upsert(viewData);
             // First check if module already exists using name
-            await this.solidViewService.createIfNotPresent(viewData);
 
+            // Changed the below to upsert as now we are saving modifications to the view json to file system also.
+            // await this.solidViewService.createIfNotPresent(viewData);
+            await this.solidViewService.upsert(viewData);
         }
     }
 

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

@@ -184,7 +184,7 @@ export class ModelMetadataService {
         relations: {},
       });
     createDto['module'] = resolvedModule;
-    
+
     if (createDto['parentModelId']) {
       const resolvedParentModel = await this.dataSource
         .getRepository(ModelMetadata)
@@ -261,6 +261,7 @@ export class ModelMetadataService {
         userKeyFieldUserKey: model.fields.find(field => field.isUserKey)?.name,
         isChild: model?.isChild,
         parentModelUserKey: model?.parentModel?.singularName,
+        enableAuditTracking: model?.enableAuditTracking,
         fields: []
       }
 
@@ -420,6 +421,7 @@ export class ModelMetadataService {
         userKeyFieldUserKey: model.fields.find(field => field.isUserKey)?.name,
         isChild: model?.isChild,
         parentModelUserKey: model?.parentModel?.singularName,
+        enableAuditTracking: model?.enableAuditTracking,
         fields: []
       }
 
@@ -685,23 +687,23 @@ export class ModelMetadataService {
     };
 
     // Utility function to check if an item with the same name already exists
-  const notExists = (arr: any[], name: string) => !arr.some(item => item.name === name);
+    const notExists = (arr: any[], name: string) => !arr.some(item => item.name === name);
 
-  if (notExists(metaData.menus, menuName)) {
-    metaData.menus.push(menu);
-  }
+    if (notExists(metaData.menus, menuName)) {
+      metaData.menus.push(menu);
+    }
 
-  if (notExists(metaData.actions, viewName)) {
-    metaData.actions.push(action);
-  }
+    if (notExists(metaData.actions, viewName)) {
+      metaData.actions.push(action);
+    }
 
-  if (notExists(metaData.views, viewName)) {
-    metaData.views.push(modelListview);
-  }
+    if (notExists(metaData.views, viewName)) {
+      metaData.views.push(modelListview);
+    }
 
-  if (notExists(metaData.views, formViewName)) {
-    metaData.views.push(modelFormView);
-  }
+    if (notExists(metaData.views, formViewName)) {
+      metaData.views.push(modelFormView);
+    }
     // metaData.menus.push(menu);
     // metaData.actions.push(action);
     // metaData.views.push(modelListview);

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

@@ -131,6 +131,7 @@ export class ModuleMetadataService {
   async createInFile(module: ModuleMetadata) {
     try {
       // Prepare the metadata JSON structure
+
       const moduleMetaDataJson: ModuleMetadataConfiguration = {
         moduleMetadata: {
           name: module?.name,
@@ -144,8 +145,31 @@ export class ModuleMetadataService {
         },
         roles: [],
         users: [],
-        actions: [],
-        menus: [],
+        actions: [
+          {
+            displayName: `${module?.name} Home`,
+            name: `${module?.name}-home-action`,
+            type: "custom",
+            domain: "",
+            context: "",
+            customComponent: `/admin/core/${module?.name}/home`,
+            customIsModal: true,
+            serverEndpoint: "",
+            viewUserKey: "",
+            moduleUserKey: module?.name,
+            modelUserKey: ""
+          }
+        ],
+        menus: [
+          {
+            displayName: "Home",
+            name: `${module?.name}-home-menu`,
+            sequenceNumber: 1,
+            actionUserKey: `${module?.name}-home-action`,
+            moduleUserKey: module?.name,
+            parentMenuItemUserKey: ""
+          }
+        ],
         views: [],
         emailTemplates: [],
         smsTemplates: [],
@@ -325,7 +349,7 @@ export class ModuleMetadataService {
     return true
   }
 
-  async generateCode(options: CodeGenerationOptions): Promise<string> {    
+  async generateCode(options: CodeGenerationOptions): Promise<string> {
     if (!options.moduleId && !options.moduleUserKey) {
       throw new BadRequestException('Module ID or Module Name is required for generating code');
     }
@@ -338,7 +362,7 @@ export class ModuleMetadataService {
 
     // Check if the module name already exists and is loaded
     const moduleInstance = this.solidRegistry.getModule(`${classify(module.name)}Module`);
-    
+
     if (!moduleInstance) {
       const addModuleOutput = await this.generateAddModuleCode(options);
       const refreshModuleOutput = await this.generateRefreshModuleCode(options);

package/src/subscribers/view-metadata.subscriber.ts

@@ -37,22 +37,26 @@ export class ViewMetadataSubsciber implements EntitySubscriberInterface<ViewMeta
         if (!viewMetadata) {
             throw new Error(`View metadata not found for id ${event.entity.id}`);
         }
-        const filePath = await this.moduleMetadataHelperService.getModuleMetadataFilePath(viewMetadata.model.module.name);
-        try {
-            await fs.access(filePath);
-        } catch (error) {
-            this.logger.error(`File not found at path: ${filePath}`);
-            return;
-        }
-        const metaData = await this.moduleMetadataHelperService.getModuleMetadataConfiguration(filePath);
 
-        // Update the view metadata in the module metadata
-        const viewMetadataIndex = metaData.views.findIndex((view: { name: string }) => view.name === event.entity.name);
-        if (viewMetadataIndex !== -1) {
-            metaData.views[viewMetadataIndex].layout = JSON.parse(event.entity.layout);
+        // solid-core module metadata file is stored in the npm package when installed, so we do not propogate those changes to the solid-core-metadata.json file
+        if (viewMetadata.model.module.name != "solid-core") {
+            const filePath = await this.moduleMetadataHelperService.getModuleMetadataFilePath(viewMetadata.model.module.name);
+            try {
+                await fs.access(filePath);
+            } catch (error) {
+                this.logger.error(`File not found at path: ${filePath}`);
+                return;
+            }
+            const metaData = await this.moduleMetadataHelperService.getModuleMetadataConfiguration(filePath);
+
+            // Update the view metadata in the module metadata
+            const viewMetadataIndex = metaData.views.findIndex((view: { name: string }) => view.name === event.entity.name);
+            if (viewMetadataIndex !== -1) {
+                metaData.views[viewMetadataIndex].layout = JSON.parse(event.entity.layout);
+            }
+            // Write the updated object back to the file
+            const updatedContent = JSON.stringify(metaData, null, 2);
+            await fs.writeFile(filePath, updatedContent);
         }
-        // Write the updated object back to the file
-        const updatedContent = JSON.stringify(metaData, null, 2);
-        await fs.writeFile(filePath, updatedContent);
     }
 }