@solidstarters/solid-core 1.2.52 → 1.2.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.52",
+  "version": "1.2.54",
   "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/dtos/create-field-metadata.dto.ts

@@ -321,10 +321,15 @@ export class CreateFieldMetadataDto {
   @IsOptional()
   relationCoModelFieldName: string;
 
-  @ApiProperty({description: 'Only for type=relation, many-to-many. This field is used to set the owner of the many-to-many relation'})
+  @ApiProperty({ description: 'Only for type=relation, many-to-many. This field is used to set the owner of the many-to-many relation' })
   @IsOptional()
   isRelationManyToManyOwner: boolean;
 
+
+  @ApiProperty({ description: 'Only for type=relation, many-to-many. This field is used to store fixed filters that needs to applied on related model' })
+  @IsOptional()
+  relationFieldFixedFilter: string;
+
   @ApiProperty({
     description:
       'Dynamic provider for selection. Only for type=selectionDynamic',

package/src/entities/field-metadata.entity.ts

@@ -102,6 +102,12 @@ export class FieldMetadata extends CommonEntity {
     @Column({ name: 'is_relation_many_to_many_owner', nullable: true })
     isRelationManyToManyOwner: boolean;
 
+    // We can store a filter json like this {"fieldName": ${someVarWhichWillComeFromParentModel... or can be hard coded...}}
+    // {"type": "INDUSTRY"} .... Eg. static fixedFilter 
+    // {"country_id", "${country}"} ... Eg. dynamic fixedFilter 
+    @Column({ name: 'relation_Field_Fixed_Filter', nullable: true })
+    relationFieldFixedFilter: string;
+
     @Column({ name: 'selection_dynamic_provider', nullable: true })
     selectionDynamicProvider: string;
 

package/src/helpers/schematic.service.ts

@@ -14,6 +14,7 @@ type FieldOptions = {
   dataSource: string;
   fields: any[]; //FIXME This type can be improved
   modelEnableSoftDelete?: boolean;
+  parentModel?: string;
 };
 export const REMOVE_FIELDS_COMMAND = 'remove-fields';
 export const REFRESH_MODEL_COMMAND = 'refresh-model';
@@ -70,6 +71,10 @@ export class SchematicService {
         modelCommand += ` --model-enable-soft-delete=${fieldOptions.modelEnableSoftDelete}`;
       }
       
+      if (fieldOptions.parentModel) {
+        modelCommand += ` --parent-model=${fieldOptions.parentModel}`;
+      }
+      
       let fieldCommand = fieldOptions.fields
         .filter((field) => {
           return !Object.values(SYSTEM_FIELDS_TO_IGNORE_FOR_CODE_GENERATION).includes(field.name);

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

@@ -726,6 +726,18 @@
             "columnName": "relation_model_field_name",
             "isSystem": true
           },
+          {
+            "name": "relationFieldFixedFilter",
+            "displayName": "App Description",
+            "type": "longText",
+            "ormType": "varchar",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "isSystem": true
+          },
           {
             "name": "selectionDynamicProvider",
             "displayName": "Selection Dynamic Provider",
@@ -3874,7 +3886,7 @@
                 "body": "",
                 "confirmBtnLabel": "Generate Code",
                 "cancelBtnLabel": "Cancel",
-                "customComponent": "../extension/solid-core/moduleMetadata/list/GenerateModuleCodeRowAction",
+                "customComponent": "GenerateModuleCodeRowAction",
                 "customComponentIsSystem": true,
                 "endpoint": ""
               }
@@ -4066,7 +4078,7 @@
                 "body": "",
                 "confirmBtnLabel": "Generate Code",
                 "cancelBtnLabel": "Cancel",
-                "customComponent": "../extension/solid-core/modelMetadata/list/GenerateModelCodeRowAction",
+                "customComponent": "GenerateModelCodeRowAction",
                 "customComponentIsSystem": true,
                 "endpoint": ""
               }
@@ -5684,9 +5696,8 @@
             "type": "field",
             "attrs": {
               "name": "name",
-              "isSearchable": true,
-              "widget": "HarishShortText"
-            }
+              "isSearchable": true
+                        }
           },
           {
             "type": "field",
@@ -6675,7 +6686,8 @@
             "type": "field",
             "attrs": {
               "name": "username",
-              "isSearchable": true
+              "isSearchable": true,
+              "widget": "SolidUserNameAvatarWidget"
             }
           },
           {

package/src/services/authentication.service.ts

@@ -39,6 +39,7 @@ import {
     RegistrationValidationSource,
     TransactionalRegistrationValidationSource
 } from "../constants";
+import { CreateUserDto } from 'src/dtos/create-user.dto';
 
 enum LoginProvider {
     LOCAL = 'local',
@@ -112,55 +113,15 @@ export class AuthenticationService {
         }
 
         try {
-            const user = new User();
-            user.username = signUpDto.username;
-            user.email = signUpDto.email;
-            user.fullName = signUpDto.fullName;
-            if (signUpDto.mobile) {
-                user.mobile = signUpDto.mobile;
-            }
-            // If password has been specified by the user, then we simply create & activate the user based on the configuration parameter "activateUserOnRegistration".
-            let pwd = '';
-            let autoGeneratedPwd = '';
-            if (signUpDto.password) {
-                pwd = await this.hashingService.hash(signUpDto.password);
-            }
-            else {
-                // TODO: If password is not specified then auto-generate a random password, trigger this password over an email to the user.
-                // TODO: Also track if the user has to force reset / change their password, and then activate the user. 
-                autoGeneratedPwd = this.generatePassword();
-                pwd = await this.hashingService.hash(autoGeneratedPwd);
-                user.forcePasswordChange = true;
-            }
-            user.password = pwd;
-            user.active = this.iamConfiguration.activateUserOnRegistration;
+            var { user, pwd, autoGeneratedPwd } = await this.populateForSignup(new User(), signUpDto, this.iamConfiguration.activateUserOnRegistration);
             const savedUser = await this.userRepository.save(user);
 
             // Also assign a default role to the newly created user. 
-            let roles = [];
+            const userRoles = signUpDto.roles ?? [];
             if (this.iamConfiguration.defaultRole) {
-                roles.push(this.iamConfiguration.defaultRole);
-            }
-            // Default Internal user role assigned 
-            roles.push("Internal User");
-            if (signUpDto.roles) {
-                roles = [...roles, ...signUpDto.roles];
-            }
-            roles = Array.from(new Set([...roles]));
-            if (roles.length > 0) {
-                this.userService.addRolesToUser(user.username, roles);
-            }
-            // Tanay: Adding user password to history table
-            const userPasswordHistory = new UserPasswordHistory();
-            userPasswordHistory.passwordHash = pwd;
-            userPasswordHistory.user = savedUser;
-            await this.userPasswordHistoryRepository.save(userPasswordHistory);
-
-            // if forcePasswordChange is true, then we trigger an email to the user to change the password, this needs to be done using a queue. 
-            // Create a new method like notifyUserOnForcePasswordChange, create a new email template we can call it on-force-password-change this template to include the random password
-            if (user.forcePasswordChange && autoGeneratedPwd) {
-                this.notifyUserOnForcePasswordChange(user, autoGeneratedPwd);
+                userRoles.push(this.iamConfiguration.defaultRole);
             }
+            await this.handlePostSignup(savedUser, userRoles, pwd, autoGeneratedPwd);
 
             // TODO: make provision to trigger a welcome email also.
 
@@ -174,6 +135,79 @@ export class AuthenticationService {
         }
     }
 
+    async signupForExtensionUser<T extends User, U extends CreateUserDto>(signUpDto: SignUpDto, extensionUserDto: U, extensionUserRepo: Repository<T>): Promise<T> {
+        try {
+            // Merge the extended signUpDto attributes into the user entity 
+            //@ts-ignore 
+            const extensionUser = extensionUserRepo.merge(extensionUserRepo.create() as T, extensionUserDto);
+            var { user, pwd, autoGeneratedPwd } = await this.populateForSignup<T>(extensionUser, signUpDto);
+            const savedUser = await extensionUserRepo.save(user);
+
+            await this.handlePostSignup(savedUser, signUpDto.roles,  pwd, autoGeneratedPwd);
+
+            return savedUser;
+        }
+        catch (err) {
+            const pgUniqueViolationErrorCode = '23505';
+            if (err.code === pgUniqueViolationErrorCode) {
+                throw new ConflictException();
+            }
+            throw err;
+        }
+    }
+
+  
+    private async populateForSignup<T extends User>(user: T, signUpDto: SignUpDto, isUserActive: boolean = true) {
+        // const user = new User();
+        user.username = signUpDto.username;
+        user.email = signUpDto.email;
+        user.fullName = signUpDto.fullName;
+        if (signUpDto.mobile) {
+            user.mobile = signUpDto.mobile;
+        }
+        // If password has been specified by the user, then we simply create & activate the user based on the configuration parameter "activateUserOnRegistration".
+        let pwd = '';
+        let autoGeneratedPwd = '';
+        if (signUpDto.password) {
+            pwd = await this.hashingService.hash(signUpDto.password);
+        }
+        else {
+            // TODO: If password is not specified then auto-generate a random password, trigger this password over an email to the user.
+            // TODO: Also track if the user has to force reset / change their password, and then activate the user. 
+            autoGeneratedPwd = this.generatePassword();
+            pwd = await this.hashingService.hash(autoGeneratedPwd);
+            user.forcePasswordChange = true;
+        }
+        user.password = pwd;
+        // user.active = this.iamConfiguration.activateUserOnRegistration;
+        user.active = isUserActive;
+        return { user, pwd, autoGeneratedPwd };
+    }
+
+    private async handlePostSignup(user: User, roles: string[]=[], pwd: string, autoGeneratedPwd: string) {
+        let userRoles = [];
+        // Default Internal user role assigned 
+        userRoles.push("Internal User");
+        if (roles) {
+            userRoles = [...userRoles, ...roles];
+        }
+        userRoles = Array.from(new Set([...userRoles]));
+        if (userRoles.length > 0) {
+            this.userService.addRolesToUser(user.username, userRoles);
+        }
+        // Tanay: Adding user password to history table
+        const userPasswordHistory = new UserPasswordHistory();
+        userPasswordHistory.passwordHash = pwd;
+        userPasswordHistory.user = user;
+        await this.userPasswordHistoryRepository.save(userPasswordHistory);
+
+        // if forcePasswordChange is true, then we trigger an email to the user to change the password, this needs to be done using a queue. 
+        // Create a new method like notifyUserOnForcePasswordChange, create a new email template we can call it on-force-password-change this template to include the random password
+        if (user.forcePasswordChange && autoGeneratedPwd) {
+            this.notifyUserOnForcePasswordChange(user, autoGeneratedPwd);
+        }
+    }
+
     generatePassword(length: number = 8): string {
         const upperCase = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
         const lowerCase = "abcdefghijklmnopqrstuvwxyz";

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

@@ -68,9 +68,9 @@ export class FieldMetadataService {
                     private: false,
                     encrypt: false,
                     model: relationModel,
-                    columnName:null,
+                    columnName: null,
                     relationJoinTableName: null,
-                    id : null,
+                    id: null,
                 }
 
                 // Load the inverse field, 
@@ -98,9 +98,9 @@ export class FieldMetadataService {
                     private: false,
                     encrypt: false,
                     model: relationModel,
-                    columnName:null,
+                    columnName: null,
                     relationJoinTableName: null,
-                    id : null,
+                    id: null,
                 }
 
                 // Load the inverse field, 
@@ -129,10 +129,10 @@ export class FieldMetadataService {
                     private: false,
                     encrypt: false,
                     model: relationModel,
-                    columnName:null,
+                    columnName: null,
                     relationJoinTableName: null,
                     isRelationManyToManyOwner: false,
-                    id : null,
+                    id: null,
                 }
                 const savedField = await this.saveInverseField(fieldRepository, relationModel, inverseFieldManyToMany);
                 return savedField;
@@ -141,7 +141,7 @@ export class FieldMetadataService {
                 throw new Error(`Invalid relation type for field ${field.name} with relation type  ${field.relationType}`);
         }
     }
-    
+
     private async getRelationModel(modelRepository: Repository<ModelMetadata>, field: FieldMetadata, moduleName: string) {
         return await modelRepository.findOne({
             where: {
@@ -750,6 +750,7 @@ export class FieldMetadataService {
                     "columnName",
                     "relationJoinTableName",
                     "isRelationManyToManyOwner",
+                    "relationFieldFixedFilter"
                 ];
 
             case SolidFieldType.mediaSingle:
@@ -1080,7 +1081,7 @@ export class FieldMetadataService {
         fieldsRequiredBasedOnType.forEach((requiredField) => {
             fieldObject[requiredField] = field[requiredField];
         });
-        
+
         if (field.type == "mediaSingle" || field.type == "mediaMultiple") {
             if (field.mediaStorageProvider) {
                 delete fieldObject.mediaStorageProviderId

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

@@ -184,6 +184,16 @@ export class ModelMetadataService {
         relations: {},
       });
     createDto['module'] = resolvedModule;
+
+    const resolvedParentModel = await this.dataSource
+      .getRepository(ModelMetadata)
+      .findOne({
+        where: {
+          id: createDto['parentModelId'],
+        },
+        relations: {},
+      });
+    createDto['parentModel'] = resolvedParentModel;
     const { fields: fieldsMetadata, ...modelMetaDataWithoutFields } = createDto;
     const modelMetadata = this.modelMetadataRepo.create(modelMetaDataWithoutFields);
     let model = await manager.save(modelMetadata);
@@ -330,7 +340,7 @@ export class ModelMetadataService {
         where: {
           id: modelId,
         },
-        relations: ["fields", "fields.mediaStorageProvider", "module"], //FIXME: Check with jenender and change to relations to avoid confusion
+        relations: ["fields", "fields.mediaStorageProvider", "module", "parentModel"], //FIXME: Check with jenender and change to relations to avoid confusion
       });
 
       const filePath = this.moduleMetadataHelperService.getModuleMetadataFilePath(model.module.name);
@@ -345,6 +355,8 @@ export class ModelMetadataService {
         dataSourceType: model.dataSourceType,
         tableName: model.tableName,
         userKeyFieldUserKey: model.fields.find(field => field.isUserKey)?.name,
+        isChild: model?.isChild,
+        parentModelUserKey: model?.parentModel?.singularName,
         fields: []
       }
 
@@ -595,7 +607,7 @@ export class ModelMetadataService {
         where: {
           id: modelId,
         },
-        relations: ["fields", "fields.mediaStorageProvider", "module"], //FIXME: Check with jenender and change to relations to avoid confusion
+        relations: ["fields", "fields.mediaStorageProvider", "module", "parentModel"], //FIXME: Check with jenender and change to relations to avoid confusion
       });
 
       const filePath = this.moduleMetadataHelperService.getModuleMetadataFilePath(model.module.name);
@@ -610,6 +622,8 @@ export class ModelMetadataService {
         dataSourceType: model.dataSourceType,
         tableName: model.tableName,
         userKeyFieldUserKey: model.fields.find(field => field.isUserKey)?.name,
+        isChild: model.isChild,
+        parentModelUserKey: model.parentModel.singularName,
         fields: []
       }
 
@@ -895,7 +909,7 @@ export class ModelMetadataService {
     }
 
     const query = {
-      populate: ["module", "fields"]
+      populate: ["module", "fields", "parentModel"]
     };
     const model = options.modelId ? await this.findOne(options.modelId, query) : await this.findOneByUserKey(options.modelUserKey, query.populate);
 
@@ -917,7 +931,8 @@ export class ModelMetadataService {
         dataSource: model.dataSource,
         table: model.tableName,
         fields: fieldsForRefresh,
-        modelEnableSoftDelete: model.enableSoftDelete
+        modelEnableSoftDelete: model.enableSoftDelete,
+        parentModel: model.parentModel?.singularName
       },
       dryRun
     );