@solidstarters/solid-core 1.2.61 → 1.2.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.61",
+  "version": "1.2.63",
   "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

@@ -4,6 +4,8 @@ import { PaginationQueryDto } from "src/dtos/pagination-query.dto";
 import { SelectionProvider } from "src/decorators/selection-provider.decorator";
 import { Injectable } from "@nestjs/common";
 import { ISelectionProvider, ISelectionProviderContext, ISelectionProviderValues } from "../interfaces";
+import { filter } from "rxjs";
+import { BasicFilterDto } from "src/dtos/basic-filters.dto";
 
 interface ListOfValuesProviderContext extends ISelectionProviderContext {
     type: string;
@@ -31,8 +33,14 @@ export class ListOfValuesSelectionProvider implements ISelectionProvider<ListOfV
     }
 
     async values(query: string, ctxt: ListOfValuesProviderContext): Promise<readonly ISelectionProviderValues[]> {
-        const paginatedQuery = new PaginationQueryDto(DEFAULT_LIMIT, 0);
-        const lovs = await this.listOfValuesService.find(paginatedQuery);
+        const basicFilterQuery = new BasicFilterDto(DEFAULT_LIMIT, 0);
+        basicFilterQuery.filters = {
+            type: {
+                $eq: ctxt.type
+            }
+        }
+
+        const lovs = await this.listOfValuesService.find(basicFilterQuery);
         const selectionValues = lovs.records.map(lov => {
             return {
                 label: lov.display,

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

@@ -8674,13 +8674,5 @@
   ],
   "checksums": [],
   "listOfValues": [
-    {
-      "type": "industry",
-      "value": "IT",
-      "display": "IT",
-      "description": "Insdustry It list of value",
-      "default": true,
-      "sequence": 1
-    }
   ]
 }

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

@@ -232,105 +232,6 @@ export class ModelMetadataService {
       model = await manager.save(updatedModelMetadataDto);
     }
 
-    // const modelViews = [{
-    //   name: `${model.singularName}-list-view`,
-    //   displayName: `${model.displayName}`,
-    //   type: 'list',
-    //   context: "{}",
-    //   module: resolvedModule,
-    //   model: model,
-    //   layout: JSON.stringify({
-    //     type: "list",
-    //     attrs: {
-    //       pagination: true,
-    //       pageSizeOptions: [
-    //         10,
-    //         25,
-    //         50
-    //       ],
-    //       enableGlobalSearch: true,
-    //       create: true,
-    //       edit: true,
-    //       delete: true
-    //     },
-    //     children: listViewLayout
-    //   }, null, 2)
-    // },
-    // {
-    //   name: `${model.singularName}-form-view`,
-    //   displayName: `${model.displayName}`,
-    //   type: 'form',
-    //   context: "{}",
-    //   module: model.module,
-    //   model: model,
-    //   layout: JSON.stringify(
-    //     {
-    //       type: "form",
-    //       attrs: { name: "form-1", label: `${model.displayName}`, className: "grid" },
-    //       children: [
-    //         {
-    //           type: "sheet",
-    //           attrs: { name: "sheet-1" },
-    //           children: [
-    //             {
-    //               type: "row",
-    //               attrs: { name: "group-1", label: "", className: "" },
-    //               children: [
-    //                 {
-    //                   type: "column",
-    //                   attrs: { name: "group-1", label: "", className: "col-6" },
-    //                   children: formViewLayout
-    //                 }
-    //               ]
-    //             }
-    //           ]
-    //         }
-    //       ]
-    //     }, null, 2)
-    // }
-    // ];
-    // const viewRepo = manager.getRepository(ViewMetadata);
-    // for (let j = 0; j < modelViews.length; j++) {
-    //   const view = modelViews[j];
-    //   const createdView = await viewRepo.create(view);
-    //   await viewRepo.save(createdView);
-    // }
-
-    // const view = await viewRepo.findOneBy({ name: `${model.singularName}-list-view` });
-
-    // const action = {
-    //   displayName: `${model.displayName} List View`,
-    //   name: `${model.singularName}-list-view`,
-    //   type: "solid",
-    //   domain: "",
-    //   context: "",
-    //   customComponent: `/admin/address-master/${model.singularName}/all`,
-    //   customIsModal: true,
-    //   serverEndpoint: "",
-    //   view: view,
-    //   module: resolvedModule,
-    //   model: model
-    // };
-    // const actionRepo = manager.getRepository(ActionMetadata);
-    // const createdAction = await actionRepo.create(action);
-    // const newAction = await actionRepo.save(createdAction);
-
-    // const adminRole = await this.roleService.findRoleByName('Admin');
-
-    // const menu = {
-    //   displayName: `${model.displayName}`,
-    //   name: `${model.singularName}`,
-    //   sequenceNumber: 1,
-    //   action: newAction,
-    //   module: resolvedModule,
-    //   roles: [adminRole],
-    //   parentMenuItemUserKey: ""
-    // };
-
-    // const menuRepo = manager.getRepository(MenuItemMetadata);
-    // const createdMenu = await menuRepo.create(menu);
-    // await menuRepo.save(createdMenu);
-
     return model;
   }
 
@@ -360,122 +261,14 @@ export class ModelMetadataService {
         fields: []
       }
 
-      const listViewLayoutFields = [{ type: "field", attrs: { name: `id`, sortable: true, filterable: true } }];
-      const formViewLayoutFields = [];
-
       for (let i = 0; i < model.fields.length; i++) {
         const field = model.fields[i];
-        if (!field.isSystem) {
-
-          const fieldObject: Record<string, any> = await this.fieldMetadataService.createFieldConfig(field);
-          modelMetaData.fields.push(fieldObject);
-          listViewLayoutFields.push({ type: "field", attrs: { name: `${field.name}`, sortable: true, filterable: true } })
-          formViewLayoutFields.push({ type: "field", attrs: { name: `${field.name}` } })
-
-        }
-      }
-      const column1Fields = [];
-      const column2Fields = [];
-
-      // Distribute fields between two columns
-      for (let i = 0; i < formViewLayoutFields.length; i++) {
-        if (i % 2 === 0) {
-          column1Fields.push(formViewLayoutFields[i]);
-        } else {
-          column2Fields.push(formViewLayoutFields[i]);
-        }
+        if (field.isSystem) continue;
+        const fieldObject: Record<string, any> = await this.fieldMetadataService.createFieldConfig(field);
+        modelMetaData.fields.push(fieldObject);
       }
-      const action = {
-        displayName: `${model.displayName} List View`,
-        name: `${model.singularName}-list-view`,
-        type: "solid",
-        domain: "",
-        context: "",
-        customComponent: `/admin/address-master/${model.singularName}/all`,
-        customIsModal: true,
-        serverEndpoint: "",
-        viewUserKey: `${model.singularName}-list-view`,
-        moduleUserKey: `${model.module.name}`,
-        modelUserKey: `${model.singularName}`
-      };
-
-      const menu = {
-        displayName: `${model.displayName}`,
-        name: `${model.singularName}-menu-item`,
-        sequenceNumber: 1,
-        actionUserKey: `${model.singularName}-list-view`,
-        moduleUserKey: `${model.module.name}`,
-        parentMenuItemUserKey: ""
-      };
-
-      const modelListview = {
-        name: `${model.singularName}-list-view`,
-        displayName: `${model.displayName}`,
-        type: "list",
-        context: "{}",
-        moduleUserKey: `${model.module.name}`,
-        modelUserKey: `${model.singularName}`,
-        layout: {
-          type: "list",
-          attrs: {
-            pagination: true,
-            pageSizeOptions: [
-              10,
-              25,
-              50
-            ],
-            enableGlobalSearch: true,
-            create: true,
-            edit: true,
-            delete: true
-          },
-          children: listViewLayoutFields
-        }
-      };
-
-
-      const modelFormView = {
-        name: `${model.singularName}-form-view`,
-        displayName: `${model.displayName}`,
-        type: "form",
-        context: "{}",
-        moduleUserKey: `${model.module.name}`,
-        modelUserKey: `${model.singularName}`,
-        layout: {
-          type: "form",
-          attrs: { name: "form-1", label: `${model.displayName}`, className: "grid" },
-          children: [
-            {
-              type: "sheet",
-              attrs: { name: "sheet-1" },
-              children: [
-                {
-                  type: "row",
-                  attrs: { name: "sheet-1" },
-                  children: [
-                    {
-                      type: "column",
-                      attrs: { name: "group-1", label: "", className: "col-6" },
-                      children: column1Fields
-                    },
-                    {
-                      type: "column",
-                      attrs: { name: "group-2", label: "", className: "col-6" },
-                      children: column2Fields
-                    }]
-                },
-              ]
-            }
-          ]
-        }
-      };
       // Update the `models` array
       metaData.moduleMetadata.models.push(modelMetaData);
-      metaData.menus.push(menu);
-      metaData.actions.push(action);
-      metaData.views.push(modelListview);
-      metaData.views.push(modelFormView);
-
 
       // Write the updated object back to the file
       const updatedContent = JSON.stringify(metaData, null, 2);
@@ -734,14 +527,170 @@ export class ModelMetadataService {
       await this.generateCode(inverseOptions);
     }                      
 
+    await this.generateVAMConfig(model.id);
+
+    return `${removeFieldCodeOuput} \n ${refreshModelCodeOutput}`;
+  }
+
+  // Generate the View, Action and Menu configuration for the model
+  private async generateVAMConfig(modelId: number) {
+    try {
+      return await this.dataSource.transaction(async (manager: EntityManager) => {
+        const modelRepository = manager.getRepository(ModelMetadata);
+        const model = await modelRepository.findOne({
+          where: {
+            id: modelId
+          },
+          relations: ["fields", "module"]
+        });
+        await this.populateVAMConfigInDb(model);
+        await this.populateVAMConfigInFile(model);
+      });
+    } catch (error) {
+      this.logger.error('generateVAMConfig Transaction failed:', error);
+      throw error;
+    }
+  }
+
+  private async populateVAMConfigInFile(model: ModelMetadata) {
+    try {
+      const filePath = this.moduleMetadataHelperService.getModuleMetadataFilePath(model.module.name);
+      const metaData = await this.moduleMetadataHelperService.getModuleMetadataConfiguration(filePath);
+
+      const listViewLayoutFields = [{ type: "field", attrs: { name: `id`, sortable: true, filterable: true } }];
+      const formViewLayoutFields = [];
+
+      for (let i = 0; i < model.fields.length; i++) {
+        const field = model.fields[i];
+        if (field.isSystem) continue;
+        listViewLayoutFields.push({ type: "field", attrs: { name: `${field.name}`, sortable: true, filterable: true } })
+        formViewLayoutFields.push({ type: "field", attrs: { name: `${field.name}` } })
+      }
+      this.populateVAMConfigInFileInternal(formViewLayoutFields, model, listViewLayoutFields, metaData);
+      // Write the updated object back to the file
+      const updatedContent = JSON.stringify(metaData, null, 2);
+      await fs.writeFile(filePath, updatedContent);
+
+    } catch (error) {
+      // console.error('File creation failed:', error);
+      this.logger.error('File updation failed for View, action, menus config:', error);
+      throw new Error('File updation failed for View, action, menus config'); // Trigger rollback
+    }
+  }
+
+  // Populate the View, Actions and Menus in the config file
+  private populateVAMConfigInFileInternal(formViewLayoutFields: any[], model: ModelMetadata, listViewLayoutFields: { type: string; attrs: { name: string; sortable: boolean; filterable: boolean; }; }[], metaData: any) {
+    const column1Fields = [];
+    const column2Fields = [];
+
+    // Distribute fields between two columns
+    for (let i = 0; i < formViewLayoutFields.length; i++) {
+      if (i % 2 === 0) {
+        column1Fields.push(formViewLayoutFields[i]);
+      } else {
+        column2Fields.push(formViewLayoutFields[i]);
+      }
+    }
+    const action = {
+      displayName: `${model.displayName} List View`,
+      name: `${model.singularName}-list-view`,
+      type: "solid",
+      domain: "",
+      context: "",
+      customComponent: `/admin/address-master/${model.singularName}/all`,
+      customIsModal: true,
+      serverEndpoint: "",
+      viewUserKey: `${model.singularName}-list-view`,
+      moduleUserKey: `${model.module.name}`,
+      modelUserKey: `${model.singularName}`
+    };
+
+    const menu = {
+      displayName: `${model.displayName}`,
+      name: `${model.singularName}-menu-item`,
+      sequenceNumber: 1,
+      actionUserKey: `${model.singularName}-list-view`,
+      moduleUserKey: `${model.module.name}`,
+      parentMenuItemUserKey: ""
+    };
+
+    const modelListview = {
+      name: `${model.singularName}-list-view`,
+      displayName: `${model.displayName}`,
+      type: "list",
+      context: "{}",
+      moduleUserKey: `${model.module.name}`,
+      modelUserKey: `${model.singularName}`,
+      layout: {
+        type: "list",
+        attrs: {
+          pagination: true,
+          pageSizeOptions: [
+            10,
+            25,
+            50
+          ],
+          enableGlobalSearch: true,
+          create: true,
+          edit: true,
+          delete: true
+        },
+        children: listViewLayoutFields
+      }
+    };
+
+
+    const modelFormView = {
+      name: `${model.singularName}-form-view`,
+      displayName: `${model.displayName}`,
+      type: "form",
+      context: "{}",
+      moduleUserKey: `${model.module.name}`,
+      modelUserKey: `${model.singularName}`,
+      layout: {
+        type: "form",
+        attrs: { name: "form-1", label: `${model.displayName}`, className: "grid" },
+        children: [
+          {
+            type: "sheet",
+            attrs: { name: "sheet-1" },
+            children: [
+              {
+                type: "row",
+                attrs: { name: "sheet-1" },
+                children: [
+                  {
+                    type: "column",
+                    attrs: { name: "group-1", label: "", className: "col-6" },
+                    children: column1Fields
+                  },
+                  {
+                    type: "column",
+                    attrs: { name: "group-2", label: "", className: "col-6" },
+                    children: column2Fields
+                  }
+                ]
+              },
+            ]
+          }
+        ]
+      }
+    };
+    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) {
     const jsonFieldsList = model.fields.filter((field: FieldMetadata) => field.isSystem !== true);
 
     const listViewLayout = jsonFieldsList.map(field => ({
       type: "field",
       attrs: {
         name: `${field.name}`,
-        sortable: true,
-        filterable: true
+        isSearchable: true,
       }
     }));
 
@@ -873,8 +822,6 @@ export class ModelMetadataService {
       const createdMenu = menuRepo.create(menuData);
       await menuRepo.save(createdMenu);
     }
-
-    return `${removeFieldCodeOuput} \n ${refreshModelCodeOutput}`;
   }
 
   private async generateCode(options: CodeGenerationOptions) {

package/m21-12m.definition

@@ -1,43 +0,0 @@
-                // many-to-one field
-                // {
-                //     "name": "module",
-                //     "displayName": "Module",
-                //     "type": "relation",
-                //     "required": true,
-                //     "unique": false,
-                //     "index": true,
-                //     "private": false,
-                //     "encrypt": false,
-                //     "relationType": "many-to-one",
-                //     "relationModelSingularName": "moduleMetadata",
-                //     "relationCreateInverse": true,
-                //     "relationCascade": "set null",
-                //     "relationModelModuleName": "solid-core",
-                //     "isSystem": true
-                //   },
-
-                // one-to-many field
-                // {
-                //    "name": field.relationModelField,
-                // Logic to create a oneToMany field definition
-                // return [
-                //     "name",
-                //     "displayName",
-                //     "description",
-                //     "type",
-                //     "ormType",
-                //     "isSystem",
-                //     "relationType",
-                //     "relationModelFieldName",
-                //     "relationCreateInverse",
-                //     "relationModelSingularName",
-                //     "relationModelModuleName",
-                //     "required",
-                //     "unique",
-                //     "index",
-                //     "private",
-                //     "encrypt",
-                //     "encryptionType",
-                //     "decryptWhen",
-                //     "columnName"
-                // ];

package/src/entities/mysql-issues

@@ -1,14 +0,0 @@
-# Issues
-1. @Column("text", { array: true, name: 'media_types', nullable: true }) // array type not supported. No impact on code generation. not being used
-2. 
-default values not allowed for text,blog // Code generation impact. If we want to support default values for long text/rich text, then changes to be made.
-date value is not supported propertly in mysql
-i.e new Date("2025-02-11T00:00:00.000Z")
-3. Below type of code cannot exist. // No impact on code generation. Not being used.
-@Index({ unique: true })
-@Column({ unique: true })
-4.  // Impact on code generation. unique index to be generated by using @Index and not @Column.
-@Index({ unique: true })
-@Column({ })
-5. i.e new Date("2025-02-11T00:00:00.000Z")
--> Remove the column default value