@solidstarters/solid-core 1.2.66 → 1.2.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.66",
+  "version": "1.2.67",
   "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/providers/list-of-values-selection-providers.service.ts

@@ -34,12 +34,21 @@ export class ListOfValuesSelectionProvider implements ISelectionProvider<ListOfV
 
     async values(query: string, ctxt: ListOfValuesProviderContext): Promise<readonly ISelectionProviderValues[]> {
         const basicFilterQuery = new BasicFilterDto(DEFAULT_LIMIT, 0);
-        basicFilterQuery.filters = {
-            type: {
-                $eq: ctxt.type
-            }
+        if (ctxt.type) {
+            basicFilterQuery.filters = {
+                type: {
+                    $eq: ctxt.type
+                }
+            };
+        }
+        if (query) {
+            basicFilterQuery.filters = {
+                ...basicFilterQuery.filters,
+                display: {
+                    $containsi: `%${query}%`
+                }
+            };
         }
-
         const lovs = await this.listOfValuesService.find(basicFilterQuery);
         const selectionValues = lovs.records.map(lov => {
             return {

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

@@ -3807,7 +3807,7 @@
       "name": "media-menu-item",
       "sequenceNumber": 3,
       "actionUserKey": "media-root",
-      "moduleUserKey": "solid-core",                                             
+      "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": ""
     },
     {
@@ -3980,32 +3980,11 @@
             {
               "attrs": {
                 "className": "pi pi-cog",
-                "label": "Generate Code"
-              },
-              "action": {
-                "title": "",
-                "body": "",
-                "confirmBtnLabel": "Generate Code",
-                "cancelBtnLabel": "Cancel",
-                "customComponent": "GenerateModuleCodeRowAction",
-                "customComponentIsSystem": true,
-                "endpoint": ""
-              }
-            }
-          ],
-          "headerButtons": [
-            {
-              "attrs": {
-                "className": "pi pi-cog",
-                "label": "Generate Code"
-              },
-              "action": {
-                "title": "",
-                "body": "",
-                "confirmBtnLabel": "Generate Code",
-                "cancelBtnLabel": "Cancel",
-                "customComponent": "GenerateModuleCode",
-                "endpoint": ""
+                "label": "Generate Code",
+                "action": "GenerateModuleCodeRowAction",
+                "openInPopup": true,
+                "actionInContextMenu": true,
+                "customComponentIsSystem": true
               }
             }
           ]
@@ -4172,32 +4151,11 @@
             {
               "attrs": {
                 "className": "pi pi-cog",
-                "label": "Generate Code"
-              },
-              "action": {
-                "title": "",
-                "body": "",
-                "confirmBtnLabel": "Generate Code",
-                "cancelBtnLabel": "Cancel",
-                "customComponent": "GenerateModelCodeRowAction",
+                "label": "Generate Code",
+                "action": "GenerateModelCodeRowAction",
                 "customComponentIsSystem": true,
-                "endpoint": ""
-              }
-            }
-          ],
-          "headerButtons": [
-            {
-              "attrs": {
-                "className": "pi pi-cog",
-                "label": "Generate Code"
-              },
-              "action": {
-                "title": "",
-                "body": "",
-                "confirmBtnLabel": "Generate Code",
-                "cancelBtnLabel": "Cancel",
-                "customComponent": "GenerateModelCode",
-                "endpoint": ""
+                "actionInContextMenu": true,
+                "openInPopup": true
               }
             }
           ]
@@ -6046,7 +6004,7 @@
             "attrs": {
               "name": "name",
               "isSearchable": true
-                        }
+            }
           },
           {
             "type": "field",
@@ -6210,7 +6168,6 @@
         ]
       }
     },
-    
     {
       "name": "media-list-view",
       "displayName": "Solid Media Model",
@@ -8673,6 +8630,5 @@
     }
   ],
   "checksums": [],
-  "listOfValues": [
-  ]
+  "listOfValues": []
 }

package/src/services/authentication.service.ts

@@ -41,6 +41,7 @@ import {
 } from "../constants";
 import { SettingService } from './setting.service';
 import { CreateUserDto } from 'src/dtos/create-user.dto';
+import { RoleMetadataService } from './role-metadata.service';
 
 enum LoginProvider {
     LOCAL = 'local',
@@ -73,6 +74,8 @@ export class AuthenticationService {
         private readonly smsService: Msg91OTPService,
         private readonly eventEmitter: EventEmitter2,
         private readonly settingService: SettingService,
+        private readonly roleMetadataService: RoleMetadataService
+
     ) { }
 
     async resolveUser(username: string, email: string) {
@@ -145,7 +148,7 @@ export class AuthenticationService {
             var { user, pwd, autoGeneratedPwd } = await this.populateForSignup<T>(extensionUser, signUpDto);
             const savedUser = await extensionUserRepo.save(user);
 
-            await this.handlePostSignup(savedUser, signUpDto.roles,  pwd, autoGeneratedPwd);
+            await this.handlePostSignup(savedUser, signUpDto.roles, pwd, autoGeneratedPwd);
 
             return savedUser;
         }
@@ -158,15 +161,23 @@ export class AuthenticationService {
         }
     }
 
-  
+
     private async populateForSignup<T extends User>(user: T, signUpDto: SignUpDto, isUserActive: boolean = true) {
         // const user = new User();
+
+        if (signUpDto.roles && signUpDto.roles.length > 0) {
+            for (let i = 0; i < signUpDto.roles.length; i++) {
+                const roleName = signUpDto.roles[i];
+                await this.roleMetadataService.findRoleByName(roleName);
+            }
+        }
         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 = '';
@@ -186,8 +197,9 @@ export class AuthenticationService {
         return { user, pwd, autoGeneratedPwd };
     }
 
-    private async handlePostSignup(user: User, roles: string[]=[], pwd: string, autoGeneratedPwd: string) {
-        this.userService.initializeRolesForNewUser(roles, user);
+
+    private async handlePostSignup(user: User, roles: string[] = [], pwd: string, autoGeneratedPwd: string) {
+        await this.userService.initializeRolesForNewUser(roles, user);
         // Tanay: Adding user password to history table
         const userPasswordHistory = new UserPasswordHistory();
         userPasswordHistory.passwordHash = pwd;

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

@@ -184,16 +184,19 @@ export class ModelMetadataService {
         relations: {},
       });
     createDto['module'] = resolvedModule;
+    
+    if (createDto['parentModelId']) {
+      const resolvedParentModel = await this.dataSource
+        .getRepository(ModelMetadata)
+        .findOne({
+          where: {
+            id: createDto['parentModelId'],
+          },
+          relations: {},
+        });
+      createDto['parentModel'] = resolvedParentModel;
+    }
 
-    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);
@@ -515,8 +518,8 @@ export class ModelMetadataService {
 
     // Generate the code for models which are linked to fields having an inverse relation
     const coModelSingularNames = model.fields.
-                          filter(field => field.type === SolidFieldType.relation && field.relationCreateInverse === true)
-                          .map(field => field.relationCoModelSingularName);
+      filter(field => field.type === SolidFieldType.relation && field.relationCreateInverse === true)
+      .map(field => field.relationCoModelSingularName);
 
     for (const singularName of coModelSingularNames) {
       const coModel = await this.findOneBySingularName(singularName);
@@ -525,7 +528,7 @@ export class ModelMetadataService {
         dryRun: options.dryRun
       };
       await this.generateCode(inverseOptions);
-    }                      
+    }
 
     await this.generateVAMConfig(model.id);
 

package/src/services/user.service.ts

@@ -34,7 +34,7 @@ export class UserService extends CRUDService<User> {
     readonly moduleRef: ModuleRef,
     @Inject(iamConfig.KEY)
     private readonly iamConfiguration: ConfigType<typeof iamConfig>,
-    
+
   ) {
     super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'user', 'solid-core', moduleRef);
   }
@@ -237,20 +237,20 @@ export class UserService extends CRUDService<User> {
     return matchingPermssions
   }
 
-  initializeRolesForNewUser(roles: string[], user: User) {
+  async initializeRolesForNewUser(roles: string[], user: User) {
     if (!user.id) {
-        throw new BadRequestException('User must exist before initializing roles');
+      throw new BadRequestException('User must exist before initializing roles');
     }
     let userRoles = [];
     // Default Internal user role assigned 
     userRoles.push("Internal User");
     if (roles) {
-        userRoles = [...userRoles, ...roles];
+      userRoles = [...userRoles, ...roles];
     }
     userRoles = Array.from(new Set([...userRoles]));
     if (userRoles.length > 0) {
-        this.addRolesToUser(user.username, userRoles);
+      await this.addRolesToUser(user.username, userRoles);
     }
- }
+  }
 
 }