@solidstarters/solid-core 1.2.97 → 1.2.99

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);
@@ -926,7 +928,7 @@ export class ModelMetadataService {
         modelEnableSoftDelete: model.enableSoftDelete,
         parentModel: model.parentModel?.singularName,
         parentModule: model.parentModel?.module?.name,
-
+        draftPublishWorkflowEnabled: model.draftPublishWorkflow,
       },
       dryRun
     );

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/services/setting.service.ts

@@ -48,6 +48,7 @@ export class SettingService extends CRUDService<Setting> {
       authPagesLayout: "center",
       authPagesTheme: "light",
       appLogo: "",
+      companylogo: "",
       appLogoPosition: "in_form_view",
       showAuthContent: false,
       appTitle: process.env.SOLID_APP_NAME || "Solid App",
@@ -130,6 +131,7 @@ export class SettingService extends CRUDService<Setting> {
       authPagesLayout: "center",
       authPagesTheme: "light",
       appLogo: "",
+      companylogo: "",
       appLogoPosition: "in_form_view", //in_form_view | in_image_view
       showAuthContent: false,
       appTitle: process.env.SOLID_APP_NAME || "Solid App",
@@ -176,14 +178,41 @@ export class SettingService extends CRUDService<Setting> {
     }
   }
 
-  async updateSettings(settings: Record<string, any>): Promise<Setting[]> {
+  async updateSettings(settings: Record<string, any> = {}, files: Array<Express.Multer.File> = []): Promise<Setting[]> {
     const existingSettings = await this.repo.find();
     const existingKeys = new Set(existingSettings.map(s => s.key));
 
     const settingsToUpdate: Setting[] = [];
     const settingsToCreate: Setting[] = [];
 
+    if (files && files.length > 0) {
+      for (const file of files) {
+        const key = file.fieldname;
+        const fileStoragePath = `${this.configService.get('app-builder.fileStorageDir')}/${file.filename}-${file.originalname}`;
+        
+        await this.fileService.copyFile(file.path, fileStoragePath);
+        await this.fileService.deleteFile(file.path);
+
+        if (existingKeys.has(key)) {
+          const existingSetting = existingSettings.find(s => s.key === key);
+          if (existingSetting) {
+            existingSetting.value = fileStoragePath;
+            settingsToUpdate.push(existingSetting);
+          }
+        } else {
+          const newSetting = new Setting();
+          newSetting.key = key;
+          newSetting.value = fileStoragePath;
+          settingsToCreate.push(newSetting);
+        }
+      }
+    }
+
     for (const [key, value] of Object.entries(settings)) {
+      if (files && files.some(f => f.fieldname === key)) {
+        continue;
+      }
+
       const stringValue = typeof value === 'boolean' ? value.toString() :
         Array.isArray(value) ? value.join(',') :
           value === null || value === undefined ? '' : String(value);

package/src/solid-core.module.ts

@@ -119,7 +119,7 @@ import { Msg91OTPService } from './services/sms/Msg91OTPService';
 import { Msg91SMSService } from './services/sms/Msg91SMSService';
 // import { UserService } from './services/user.service';
 import { Msg91WhatsappService } from './services/whatsapp/Msg91WhatsappService';
-import { SoftDeleteAwareEventSubscriber } from './subscribers/softDeleteAwareEventSubscriber.subscriber';
+import { SoftDeleteAwareEventSubscriber } from './subscribers/soft-delete-aware-event.subscriber';
 
 import { PermissionMetadataController } from './controllers/permission-metadata.controller';
 import { PermissionMetadata } from './entities/permission-metadata.entity';
@@ -181,6 +181,9 @@ import { ImportTransactionErrorLog } from './entities/import-transaction-error-l
 import { ImportTransactionErrorLogService } from './services/import-transaction-error-log.service';
 import { ImportTransactionErrorLogController } from './controllers/import-transaction-error-log.controller';
 import { LocaleListSelectionProvider } from './services/selection-providers/locale-list-selection-provider.service';
+import { CreatedByUpdatedBySubscriber } from './subscribers/created-by-updated-by.subscriber';
+import { SystemFieldsSeederService } from './seeders/system-fields-seeder.service';
+import { ModelMetadataHelperService } from './helpers/model-metadata-helper.service';
 
 
 @Global()
@@ -299,6 +302,7 @@ import { LocaleListSelectionProvider } from './services/selection-providers/loca
     ModuleMetadataService,
     ModuleMetadataHelperService,
     ModelMetadataService,
+    ModelMetadataHelperService,
     FieldMetadataService,
     RemoveFieldsCommand,
     RefreshModelCommand,
@@ -391,6 +395,9 @@ import { LocaleListSelectionProvider } from './services/selection-providers/loca
     FieldRepository,
     ImportTransactionService,
     ImportTransactionErrorLogService,
+    CreatedByUpdatedBySubscriber,
+    SystemFieldsSeederService,
+    
   ],
   exports: [
     ModuleMetadataService,

package/src/subscribers/audit.subscriber.ts

@@ -1,21 +1,20 @@
-import { Connection, EntitySubscriberInterface, EventSubscriber, InsertEvent, RemoveEvent, UpdateEvent } from 'typeorm';
-import { ChatterMessageService } from '../services/chatter-message.service';
-import { EntityMetadata } from 'typeorm';
-import { InjectRepository } from '@nestjs/typeorm';
-import { ModelMetadata } from '../entities/model-metadata.entity';
-import { Repository } from 'typeorm';
 import { Injectable } from '@nestjs/common';
+import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';
+import { DataSource, EntityMetadata, EntitySubscriberInterface, EventSubscriber, InsertEvent, RemoveEvent, Repository, UpdateEvent } from 'typeorm';
+import { ModelMetadata } from '../entities/model-metadata.entity';
+import { ChatterMessageService } from '../services/chatter-message.service';
 @Injectable()
 @EventSubscriber()
 export class AuditSubscriber implements EntitySubscriberInterface {
-    
+
     constructor(
-        private readonly connection: Connection,    
+        @InjectDataSource()
+        private readonly dataSource: DataSource,
         private readonly chatterMessageService: ChatterMessageService,
         @InjectRepository(ModelMetadata)
         private readonly modelMetadataRepo: Repository<ModelMetadata>,
     ) {
-        connection.subscribers.push(this);
+        this.dataSource.subscribers.push(this);
     }
 
     private async shouldTrackAudit(entity: any, metadata: EntityMetadata): Promise<boolean> {
@@ -33,8 +32,8 @@ export class AuditSubscriber implements EntitySubscriberInterface {
             return false;
         }
 
-        const auditFields = model.fields.filter(field => 
-            field.enableAuditTracking && 
+        const auditFields = model.fields.filter(field =>
+            field.enableAuditTracking &&
             !['mediaSingle', 'mediaMultiple', 'computed', 'richText', 'json'].includes(field.type) &&
             !(field.type === 'relation' && field.relationType === 'one-to-many')
         );

package/src/subscribers/created-by-updated-by.subscriber.ts

@@ -0,0 +1,54 @@
+import { Injectable } from "@nestjs/common";
+import { InjectDataSource } from "@nestjs/typeorm";
+import { User } from "src/entities/user.entity";
+import { ActiveUserData } from "src/interfaces/active-user-data.interface";
+import { RequestContextService } from "src/services/request-context.service";
+import { DataSource, EntitySubscriberInterface, EventSubscriber, InsertEvent, UpdateEvent } from "typeorm";
+
+@Injectable()
+@EventSubscriber()
+export class CreatedByUpdatedBySubscriber implements EntitySubscriberInterface {
+    constructor(
+        @InjectDataSource()
+        private readonly dataSource: DataSource,
+        private readonly requestContextService: RequestContextService,
+    ) {
+        this.dataSource.subscribers.push(this);
+    }
+
+    async beforeInsert(event: InsertEvent<any>) {
+        await this.stampUserField(event, true);
+    }
+
+    async beforeUpdate(event: UpdateEvent<any>) {
+        await this.stampUserField(event, false);
+    }
+
+    private async stampUserField(event: InsertEvent<any> | UpdateEvent<any>, isInsert: boolean){
+        if (!event.entity) {
+            return;
+        }
+        // Get the current active user details from the request context
+        const activeUserOrUndefined = this.requestContextService.getActiveUser;
+        if (!activeUserOrUndefined) {
+            return;
+        }
+
+        const loadedUser = await this.loadUser(activeUserOrUndefined as unknown as ActiveUserData);
+        if (isInsert) {
+            event.entity.createdBy = loadedUser;
+            event.entity.updatedBy = loadedUser; // For insert, we set both createdBy and updatedBy to the same user
+        }
+        else {
+            event.entity.updatedBy = loadedUser;
+        }
+    }
+
+    private async loadUser(activeUser: ActiveUserData): Promise<User> {
+        const userRepo = this.dataSource.getRepository(User); // Assuming 'User' is the entity name for users in your application
+        const loadedUser = await userRepo.findOne({
+            where: { id: activeUser.sub }, // Assuming 'sub' is the user ID in the JWT token
+        });
+        return loadedUser;;
+    }
+}

package/src/subscribers/model.subscriber.ts

@@ -1,9 +1,9 @@
-import { DataSource, EntitySubscriberInterface, EventSubscriber, InsertEvent, UpdateEvent } from 'typeorm';
-import { ModelMetadata } from '../entities/model-metadata.entity';
-import { FieldMetadata } from '../entities/field-metadata.entity';
 import { Injectable, Logger, NotFoundException } from '@nestjs/common';
 import { InjectDataSource } from '@nestjs/typeorm';
-import { RemoveFieldsCommand } from '../commands/remove-fields.command';
+import { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.service';
+import { DataSource, EntitySubscriberInterface, EventSubscriber, InsertEvent } from 'typeorm';
+import { FieldMetadata } from '../entities/field-metadata.entity';
+import { ModelMetadata } from '../entities/model-metadata.entity';
 
 @EventSubscriber()
 @Injectable()
@@ -13,7 +13,7 @@ export class ModelSubscriber implements EntitySubscriberInterface<ModelMetadata>
   constructor(
     @InjectDataSource()
     private readonly dataSource: DataSource,
-
+    private readonly modelHelperService: ModelMetadataHelperService,
   ) {
     this.dataSource.subscribers.push(this);
   }
@@ -25,76 +25,22 @@ export class ModelSubscriber implements EntitySubscriberInterface<ModelMetadata>
   async afterInsert(event: InsertEvent<ModelMetadata>): Promise<void> {
     this.logger.debug(`[ModelSubscriber] getting invoked for insert on model: ${event.entity.singularName}`);
 
-    // const fieldMetadataRepo = event.manager.getRepository(FieldMetadata);
-    // const fieldMetadataRepo = this.dataSource.getRepository(FieldMetadata);
     const transactionManager = event.queryRunner?.manager;
     if (!transactionManager) {
       throw new NotFoundException(`Trnasaction Manager not found`);
-
     }
 
-    const systemFieldsMetadata = [
-      {
-        name: "id",
-        displayName: "Id",
-        type: "int",
-        ormType: "bigint",
-        isSystem: true,
-        model: event.entity,
-      },
-      {
-        name: "createdAt",
-        displayName: "Created At",
-        type: "datetime",
-        ormType: "timestamp",
-        isSystem: true,
-        model: event.entity,
-      },
-      {
-        name: "updatedAt",
-        displayName: "Updated At",
-        type: "datetime",
-        ormType: "timestamp",
-        isSystem: true,
-        model: event.entity,
-      },
-      {
-        name: "deletedAt",
-        displayName: "Deleted At",
-        type: "datetime",
-        ormType: "timestamp",
-        isSystem: true,
-        model: event.entity,
-      },
-      {
-        name: "publishedAt",
-        displayName: "Published At",
-        type: "datetime",
-        ormType: "timestamp",
-        isSystem: true,
-        model: event.entity,
-      },
-      {
-        name: "localeName",
-        displayName: "Locale",
-        type: "shortText",
-        ormType: "varchar",
-        isSystem: true,
-        model: event.entity,
-      },
-      {
-        name: "defaultEntityLocaleId",
-        displayName: "Default Entity Locale Id",
-        type: "int",
-        ormType: "integer",
-        isSystem: true,
-        model: event.entity,
-      }
-    ];
-    await transactionManager.save(FieldMetadata, systemFieldsMetadata);
-    // Save to the database.
-    // fieldMetadataRepo.save(systemFieldsMetadata);
-
+    await transactionManager.save(FieldMetadata, this.systemFieldMetadataToBeAdded(event));
   }
 
+
+  private systemFieldMetadataToBeAdded(event: InsertEvent<ModelMetadata>) {
+    const systemFieldsDefaultMetadata = this.modelHelperService.getSystemFieldsMetadata();
+    // map and add the model as event.entity for the above metadata
+    const systemFieldsMetadata = systemFieldsDefaultMetadata.map(field => ({
+      ...field,
+      model: event.entity,
+    }));
+    return systemFieldsMetadata;
+  }
 }

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);
     }
 }

package/dist/subscribers/softDeleteAwareEventSubscriber.subscriber.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"softDeleteAwareEventSubscriber.subscriber.d.ts","sourceRoot":"","sources":["../../src/subscribers/softDeleteAwareEventSubscriber.subscriber.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,yBAAyB,EAAmB,YAAY,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAGhH,qBAEa,8BAA+B,YAAW,yBAAyB;IAIxE,OAAO,CAAC,QAAQ,CAAC,UAAU;IAH/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmD;gBAGrD,UAAU,EAAE,UAAU;IAK3C,gBAAgB,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI;IAclE,aAAa,CAAC,KAAK,EAAE,YAAY,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI;CAM/D"}

package/dist/subscribers/softDeleteAwareEventSubscriber.subscriber.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"softDeleteAwareEventSubscriber.subscriber.js","sourceRoot":"","sources":["../../src/subscribers/softDeleteAwareEventSubscriber.subscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAuE;AACvE,6CAAmD;AACnD,qCAAgH;AAKzG,IAAM,8BAA8B,sCAApC,MAAM,8BAA8B;IAEvC,YAEI,UAAuC;QAAtB,eAAU,GAAV,UAAU,CAAY;QAH1B,WAAM,GAAG,IAAI,eAAM,CAAC,gCAA8B,CAAC,IAAI,CAAC,CAAC;QAKtE,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED,gBAAgB,CAAC,KAA2B;QACxC,IAAI,CAAC,KAAK,CAAC,MAAM;YAAE,OAAO;QAC1B,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAE5B,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,CAAC,cAAc,GAAG,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC;QAC5C,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,cAAc,GAAG,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QAClD,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;IAEpE,CAAC;IAED,aAAa,CAAC,KAAwB;QAClC,IAAI,CAAC,KAAK,CAAC,MAAM;YAAE,OAAO;QAC1B,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC5B,MAAM,CAAC,cAAc,GAAG,aAAa,CAAC;IAC1C,CAAC;CAEJ,CAAA;AA7BY,wEAA8B;yCAA9B,8BAA8B;IAF1C,IAAA,yBAAe,GAAE;IACjB,IAAA,mBAAU,GAAE;IAIJ,WAAA,IAAA,0BAAgB,GAAE,CAAA;qCACU,oBAAU;GAJlC,8BAA8B,CA6B1C"}

package/src/services/pending_import_issues

@@ -1,3 +0,0 @@
-1. fileLocation -> file
-2. Change the import response to return proper shape.
-3. Change the urls to reflect proper semantics.