@solidstarters/solid-core 1.2.79 → 1.2.81

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.79",
+  "version": "1.2.81",
   "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/services/authentication.service.ts

@@ -42,6 +42,8 @@ import {
 import { SettingService } from './setting.service';
 import { CreateUserDto } from 'src/dtos/create-user.dto';
 import { RoleMetadataService } from './role-metadata.service';
+import commonConfig from 'src/config/common.config';
+
 
 enum LoginProvider {
     LOCAL = 'local',
@@ -74,7 +76,9 @@ export class AuthenticationService {
         private readonly smsService: Msg91OTPService,
         private readonly eventEmitter: EventEmitter2,
         private readonly settingService: SettingService,
-        private readonly roleMetadataService: RoleMetadataService
+        private readonly roleMetadataService: RoleMetadataService,
+        @Inject(commonConfig.KEY)
+        private readonly commonConfiguration: ConfigType<typeof commonConfig>,
 
     ) { }
 
@@ -244,7 +248,7 @@ export class AuthenticationService {
                 userName: user.username,
                 password: autoGeneratedPwd,
             },
-            true,
+            this.commonConfiguration.shouldQueueEmails,
             'user',
             user.id
         );
@@ -360,7 +364,7 @@ export class AuthenticationService {
                     firstName: user.username,
                     emailVerificationTokenOnRegistration: user.emailVerificationTokenOnRegistration,
                 },
-                true,
+                this.commonConfiguration.shouldQueueEmails,
                 'user',
                 user.id
             );
@@ -539,7 +543,7 @@ export class AuthenticationService {
                     firstName: user.username,
                     emailVerificationTokenOnLogin: user.emailVerificationTokenOnLogin
                 },
-                true,
+                this.commonConfiguration.shouldQueueEmails,
                 'user',
                 user.id
             );
@@ -738,7 +742,7 @@ export class AuthenticationService {
                     // TODO: Need to prefix this with the page url where the forgot password page will open up.
                     passwordResetLink: `${process.env.IAM_FRONTEND_APP_FORGOT_PASSWORD_PAGE_URL}?token=${user.verificationTokenOnForgotPassword}&username=${user.username}`
                 },
-                true,
+                this.commonConfiguration.shouldQueueEmails,
                 'user',
                 user.id
             );

package/src/services/crud-helper.service.ts

@@ -182,7 +182,7 @@ export class CrudHelperService {
         }
 
         if (filters) {
-            qb.where(new Brackets(whereQb => {
+            qb.andWhere(new Brackets(whereQb => {
                 this.applyFilters(whereQb, filters, entityAlias, qb);
             }));
         }

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

@@ -594,6 +594,10 @@ export class ModelMetadataService {
         column2Fields.push(formViewLayoutFields[i]);
       }
     }
+    const viewName = `${model.singularName}-list-view`;
+    const formViewName = `${model.singularName}-form-view`;
+    const menuName = `${model.singularName}-menu-item`;
+
     const action = {
       displayName: `${model.displayName} List View`,
       name: `${model.singularName}-list-view`,
@@ -679,11 +683,30 @@ 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);
+
+  if (notExists(metaData.menus, menuName)) {
     metaData.menus.push(menu);
+  }
+
+  if (notExists(metaData.actions, viewName)) {
     metaData.actions.push(action);
+  }
+
+  if (notExists(metaData.views, viewName)) {
     metaData.views.push(modelListview);
+  }
+
+  if (notExists(metaData.views, formViewName)) {
     metaData.views.push(modelFormView);
   }
+    // metaData.menus.push(menu);
+    // metaData.actions.push(action);
+    // metaData.views.push(modelListview);
+    // metaData.views.push(modelFormView);
+  }
 
   //Populate the View, Actions and Menus in the database
   private async populateVAMConfigInDb(model: ModelMetadata) {