@solidstarters/solid-core 1.2.200 → 1.2.201

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

@@ -2287,6 +2287,7 @@
             "private": false,
             "encrypt": false,
             "relationType": "many-to-many",
+            "relationCoModelFieldName": "roles",
             "relationCoModelSingularName": "user",
             "relationCreateInverse": false,
             "relationCascade": "set null",
@@ -2304,6 +2305,7 @@
             "private": false,
             "encrypt": false,
             "relationType": "many-to-many",
+            "relationCoModelFieldName": "roles",
             "relationCoModelSingularName": "menuItemMetadata",
             "relationCreateInverse": false,
             "relationCascade": "set null",
@@ -5121,6 +5123,136 @@
             "encrypt": false
           }
         ]
+      },
+      {
+        "singularName": "modelSequence",
+        "tableName": "ss_model_sequence",
+        "pluralName": "modelSequences",
+        "displayName": "Model Sequence",
+        "description": "This is used to maintain model field sequence",
+        "dataSource": "default",
+        "dataSourceType": "postgres",
+        "isSystem": true,
+        "userKeyFieldUserKey": "sequenceName",
+        "fields": [
+          {
+            "name": "module",
+            "displayName": "Module",
+            "type": "relation",
+            "ormType": "integer",
+            "required": true,
+            "unique": false,
+            "index": true,
+            "private": false,
+            "encrypt": false,
+            "relationType": "many-to-one",
+            "relationCreateInverse": false,
+            "relationCoModelSingularName": "moduleMetadata",
+            "relationModelModuleName": "solid-core",
+            "relationCascade": "cascade",
+            "isSystem": true
+          },
+          {
+            "name": "model",
+            "displayName": "Model",
+            "type": "relation",
+            "ormType": "integer",
+            "required": true,
+            "unique": false,
+            "index": true,
+            "private": false,
+            "encrypt": false,
+            "relationType": "many-to-one",
+            "relationCreateInverse": false,
+            "relationCoModelSingularName": "modelMetadata",
+            "relationModelModuleName": "solid-core",
+            "relationCascade": "cascade",
+            "isSystem": true
+          },
+          {
+            "name": "field",
+            "displayName": "Field",
+            "type": "relation",
+            "ormType": "integer",
+            "required": true,
+            "unique": false,
+            "index": true,
+            "private": false,
+            "encrypt": false,
+            "relationType": "many-to-one",
+            "relationCreateInverse": false,
+            "relationCoModelSingularName": "fieldMetadata",
+            "relationModelModuleName": "solid-core",
+            "relationCascade": "cascade",
+            "isSystem": true
+          },
+          {
+            "name": "sequenceName",
+            "displayName": "Sequence Name",
+            "type": "shortText",
+            "ormType": "varchar",
+            "length": 512,
+            "required": true,
+            "unique": true,
+            "index": true,
+            "private": false,
+            "encrypt": false,
+            "isSystem": false,
+            "isUserKey": true
+          },
+          {
+            "name": "currentValue",
+            "displayName": "Current Value",
+            "type": "int",
+            "ormType": "integer",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "isSystem": false,
+            "defaultValue": "1"
+          },
+          {
+            "name": "prefix",
+            "displayName": "Prefix",
+            "type": "shortText",
+            "ormType": "varchar",
+            "length": 512,
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "isSystem": false
+          },
+          {
+            "name": "padding",
+            "displayName": "Padding",
+            "type": "int",
+            "ormType": "integer",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "isSystem": false,
+            "defaultValue": "5"
+          },
+          {
+            "name": "separator",
+            "displayName": "Separator",
+            "type": "shortText",
+            "ormType": "varchar",
+            "length": 512,
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "isSystem": false
+          }
+        ]
       }
     ]
   },
@@ -5654,6 +5786,19 @@
       "viewUserKey": "importTransactionErrorLog-list-view",
       "moduleUserKey": "solid-core",
       "modelUserKey": "importTransactionErrorLog"
+    },
+    {
+      "displayName": "Model Sequence List Action",
+      "name": "modelSequence-list-action",
+      "type": "solid",
+      "domain": "",
+      "context": "",
+      "customComponent": "",
+      "customIsModal": true,
+      "serverEndpoint": "",
+      "viewUserKey": "modelSequence-list-view",
+      "moduleUserKey": "solid-core",
+      "modelUserKey": "modelSequence"
     }
   ],
   "menus": [
@@ -5992,6 +6137,14 @@
       "actionUserKey": "miscSettings-action",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "settings-menu-item"
+    },
+    {
+      "displayName": "Model Sequence",
+      "name": "modelSequence-menu-item",
+      "sequenceNumber": 1,
+      "actionUserKey": "modelSequence-list-action",
+      "moduleUserKey": "solid-core",
+      "parentMenuItemUserKey": "other-menu-item"
     }
   ],
   "views": [
@@ -6014,8 +6167,19 @@
           "enableGlobalSearch": true,
           "create": true,
           "edit": true,
-          "delete": true,
+          "delete": false,
           "rowButtons": [
+            {
+              "attrs": {
+                "className": "p-button-danger p-button-text",
+                "icon": "pi pi-trash",
+                "label": "Delete",
+                "action": "DeleteModuleRowAction",
+                "openInPopup": true,
+                "actionInContextMenu": true,
+                "customComponentIsSystem": true
+              }
+            },
             {
               "attrs": {
                 "className": "p-button-text",
@@ -9162,29 +9326,6 @@
               "name": "name",
               "isSearchable": true
             }
-          },
-          {
-            "type": "field",
-            "attrs": {
-              "name": "permissions",
-              "isSearchable": true,
-              "widget": "checkbox",
-              "inlineCreate": "true"
-            }
-          },
-          {
-            "type": "field",
-            "attrs": {
-              "name": "users",
-              "isSearchable": true
-            }
-          },
-          {
-            "type": "field",
-            "attrs": {
-              "name": "menuItems",
-              "isSearchable": true
-            }
           }
         ]
       }
@@ -9281,13 +9422,14 @@
                         "attrs": {
                           "name": "group-1",
                           "label": "",
-                          "className": "col-12 sm:col-12 md:col-6 lg:col-6"
+                          "className": "col-12 sm:col-12 md:col-12 lg:col-12"
                         },
                         "children": [
                           {
                             "type": "field",
                             "attrs": {
                               "name": "users",
+                              "editWidget": "DefaultRelationManyToManyCheckBoxFormEditWidget",
                               "showLabel": false
                             }
                           }
@@ -9307,13 +9449,14 @@
                         "attrs": {
                           "name": "group-1",
                           "label": "",
-                          "className": "col-12 sm:col-12 md:col-6 lg:col-6"
+                          "className": "col-12 sm:col-12 md:col-12 lg:col-12"
                         },
                         "children": [
                           {
                             "type": "field",
                             "attrs": {
                               "name": "menuItems",
+                              "editWidget": "DefaultRelationManyToManyCheckBoxFormEditWidget",
                               "showLabel": false
                             }
                           }
@@ -12095,6 +12238,178 @@
           }
         ]
       }
+    },
+    {
+      "name": "modelSequence-list-view",
+      "displayName": "Model Sequence",
+      "type": "list",
+      "context": "{}",
+      "moduleUserKey": "solid-core",
+      "modelUserKey": "modelSequence",
+      "layout": {
+        "type": "list",
+        "attrs": {
+          "pagination": true,
+          "pageSizeOptions": [
+            10,
+            25,
+            50
+          ],
+          "enableGlobalSearch": true,
+          "create": true,
+          "edit": true,
+          "delete": true
+        },
+        "children": [
+          {
+            "type": "field",
+            "attrs": {
+              "name": "id"
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "sequenceName"
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "currentValue"
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "prefix"
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "padding"
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "separator"
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "field"
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "model"
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "module"
+            }
+          }
+        ]
+      }
+    },
+    {
+      "name": "modelSequence-form-view",
+      "displayName": "Model Sequence",
+      "type": "form",
+      "context": "{}",
+      "moduleUserKey": "solid-core",
+      "modelUserKey": "modelSequence",
+      "layout": {
+        "type": "form",
+        "attrs": {
+          "name": "form-1",
+          "label": "Model Sequence",
+          "className": "grid"
+        },
+        "onFieldChange": "",
+        "children": [
+          {
+            "type": "sheet",
+            "attrs": {
+              "name": "sheet-1"
+            },
+            "children": [
+              {
+                "type": "row",
+                "attrs": {
+                  "name": "sheet-1"
+                },
+                "children": [
+                  {
+                    "type": "column",
+                    "attrs": {
+                      "name": "group-1",
+                      "label": "",
+                      "className": "col-12 sm:col-12 md:col-6 lg:col-6"
+                    },
+                    "children": [
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "sequenceName"
+                        }
+                      },
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "prefix"
+                        }
+                      },
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "separator"
+                        }
+                      },
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "module"
+                        }
+                      },
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "model"
+                        }
+                      },
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "field"
+                        }
+                      },
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "currentValue"
+                        }
+                      },
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "padding"
+                        }
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      }
     }
   ],
   "emailTemplates": [
@@ -12209,5 +12524,6 @@
         }
       }
     }
-  ]
+  ],
+  "modelSequences": []
 }

package/src/seeders/system-fields-seeder.service.ts

@@ -1,7 +1,7 @@
 // This class will add the system fields in the field-metadata table if they are missing.
 // Fetch all the models and their fields metadata and check if the system fields are present.
 
-import { Injectable } from "@nestjs/common";
+import { forwardRef, Inject, Injectable, Logger } from "@nestjs/common";
 import { ModelMetadata } from "src/entities/model-metadata.entity";
 import { ModelMetadataHelperService } from "src/helpers/model-metadata-helper.service";
 import { FieldMetadataRepository } from "src/repository/field-metadata.repository";
@@ -9,6 +9,7 @@ import { ModelMetadataRepository } from "src/repository/model-metadata.repositor
 
 @Injectable()
 export class SystemFieldsSeederService {
+  private readonly logger = new Logger(SystemFieldsSeederService.name);
   // This service is responsible for seeding the system fields metadata for all models.
   // It will check if the system fields are already present in the field-metadata table.
   // If not, it will add them.
@@ -16,6 +17,7 @@ export class SystemFieldsSeederService {
     private readonly modelHelperService: ModelMetadataHelperService,
     //   @InjectRepository(ModelMetadata)
     //   private readonly modelRepository: Repository<ModelMetadata>, // Replace with actual model repository type
+    @Inject(forwardRef(() => ModelMetadataRepository))
     private readonly modelRepository: ModelMetadataRepository, // Replace with actual model repository type
     private readonly fieldMetadataRepository: FieldMetadataRepository, // Replace with actual field repository type
   ) { }
@@ -33,9 +35,10 @@ export class SystemFieldsSeederService {
   }
 
   private async seedMissingSystemFields(model: ModelMetadata) {
+    this.logger.debug(`Checking system fields for model: ${model.singularName}`);
     const existingSystemFields = model.fields.filter(field => field.isSystem);
     const systemFieldsMetadata = this.modelHelperService.getSystemFieldsMetadata(model.isLegacyTable, model.isLegacyTableWithId);
-
+    this.logger.debug(`Model: ${model.singularName} has ${existingSystemFields.length} existing system fields.`);
     // Find out which system fields are missing
     const missingFields = systemFieldsMetadata.filter(
       sysField => !existingSystemFields.some(field => field.name === sysField.name)
@@ -43,6 +46,7 @@ export class SystemFieldsSeederService {
 
     // If there are missing fields, add them
     if (missingFields.length > 0) {
+      this.logger.debug(`Seeding ${missingFields.length} missing system fields for model: ${model.singularName}`);
       const newFields = missingFields.map(field => ({
         ...field,
         model: model, // Associate the field with the current model

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

@@ -1,4 +1,4 @@
-import { Injectable } from '@nestjs/common';
+import { forwardRef, Inject, Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { DiscoveryService, ModuleRef } from "@nestjs/core";
 import { InjectEntityManager } from '@nestjs/typeorm';
@@ -7,7 +7,7 @@ import { CRUDService } from 'src/services/crud.service';
 import { FileService } from "src/services/file.service";
 import { ModelMetadataService } from 'src/services/model-metadata.service';
 import { ModuleMetadataService } from 'src/services/module-metadata.service';
-import { EntityManager } from 'typeorm';
+import { EntityManager, In } from 'typeorm';
 
 
 import { ActionMetadataRepository } from 'src/repository/action-metadata.repository';
@@ -16,6 +16,7 @@ import { ActionMetadata } from '../entities/action-metadata.entity';
 @Injectable()
 export class ActionMetadataService extends CRUDService<ActionMetadata> {
   constructor(
+    @Inject(forwardRef(() => ModelMetadataService))
     readonly modelMetadataService: ModelMetadataService,
     readonly moduleMetadataService: ModuleMetadataService,
     readonly configService: ConfigService,

package/src/services/ai-interaction.service.ts

@@ -1,4 +1,4 @@
-import { BadRequestException, Injectable, Logger } from '@nestjs/common';
+import { BadRequestException, forwardRef, Inject, Injectable, Logger } from '@nestjs/common';
 import { DiscoveryService, ModuleRef } from "@nestjs/core";
 import { InjectEntityManager } from '@nestjs/typeorm';
 import { EntityManager } from 'typeorm';
@@ -24,6 +24,7 @@ export class AiInteractionService extends CRUDService<AiInteraction> {
   private readonly logger = new Logger(AiInteractionService.name);
 
   constructor(
+    @Inject(forwardRef(() => ModelMetadataService))
     readonly modelMetadataService: ModelMetadataService,
     readonly moduleMetadataService: ModuleMetadataService,
     readonly configService: ConfigService,

package/src/services/authentication.service.ts

@@ -571,11 +571,18 @@ export class AuthenticationService {
 
         // Validate & generate otp token for the user based on the identifier type.
         if (signInDto.type === RegistrationValidationSource.EMAIL) {
+            // const user = await this.userRepository.findOne({
+            //     where: {
+            //         email: signInDto.identifier,
+            //     }
+            // });
             const user = await this.userRepository.findOne({
-                where: {
-                    email: signInDto.identifier,
-                }
+                where: [
+                    { username: signInDto.identifier },
+                    { email: signInDto.identifier },
+                ]
             });
+
             if (!user) {
                 throw new UnauthorizedException(ERROR_MESSAGES.USER_NOT_FOUND);
             }
@@ -588,11 +595,18 @@ export class AuthenticationService {
             await this.userRepository.save(user);
             this.notifyUserOnOtpInititateLogin(user, RegistrationValidationSource.EMAIL);
         } else if (signInDto.type === RegistrationValidationSource.MOBILE) {
+            // const user = await this.userRepository.findOne({
+            //     where: {
+            //         mobile: signInDto.identifier,
+            //     }
+            // });
             const user = await this.userRepository.findOne({
-                where: {
-                    mobile: signInDto.identifier,
-                }
+                where: [
+                    { username: signInDto.identifier },
+                    { mobile: signInDto.identifier },
+                ]
             });
+
             if (!user) {
                 throw new UnauthorizedException(ERROR_MESSAGES.USER_NOT_FOUND);
             }
@@ -655,11 +669,20 @@ export class AuthenticationService {
             throw new BadRequestException(ERROR_MESSAGES.PASSWORDLESS_REGISTRATION_DISABLED);
         }
         if (confirmSignInDto.type === RegistrationValidationSource.EMAIL) {
+            // const user = await this.userRepository.findOne({
+            //     where: {
+            //         email: confirmSignInDto.identifier,
+            //     },
+            //     relations: ['roles']
+            // });
             const user = await this.userRepository.findOne({
-                where: {
-                    email: confirmSignInDto.identifier,
-                },
-                relations: ['roles']
+                where: [
+                    { username: confirmSignInDto.identifier },
+                    { email: confirmSignInDto.identifier },
+                ],
+                relations: {
+                    roles: true
+                }
             });
             if (!user) {
                 throw new UnauthorizedException(ERROR_MESSAGES.USER_NOT_FOUND);
@@ -682,11 +705,20 @@ export class AuthenticationService {
             const roles = user.roles.map((role) => role.name);
             return { accessToken, refreshToken, user: { id, username, email, mobile, lastLoginProvider, roles } };
         } else if (confirmSignInDto.type === RegistrationValidationSource.MOBILE) {
+            // const user = await this.userRepository.findOne({
+            //     where: {
+            //         mobile: confirmSignInDto.identifier,
+            //     },
+            //     relations: ['roles']
+            // });
             const user = await this.userRepository.findOne({
-                where: {
-                    mobile: confirmSignInDto.identifier,
-                },
-                relations: ['roles']
+                where: [
+                    { username: confirmSignInDto.identifier },
+                    { mobile: confirmSignInDto.identifier },
+                ],
+                relations: {
+                    roles: true
+                }
             });
             if (!user) {
                 throw new UnauthorizedException(ERROR_MESSAGES.USER_NOT_ACTIVE);

package/src/services/chatter-message-details.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@nestjs/common';
+import { forwardRef, Inject, Injectable } from '@nestjs/common';
 import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
 import { DiscoveryService, ModuleRef  } from "@nestjs/core";
 import { EntityManager, Repository, In } from 'typeorm';
@@ -16,6 +16,7 @@ import { ChatterMessageDetailsRepository } from 'src/repository/chatter-message-
 @Injectable()
 export class ChatterMessageDetailsService extends CRUDService<ChatterMessageDetails>{
   constructor(
+    @Inject(forwardRef(() => ModelMetadataService))
     readonly modelMetadataService: ModelMetadataService,
     readonly moduleMetadataService: ModuleMetadataService,
     readonly configService: ConfigService,