@solidstarters/solid-core 1.2.16 → 1.2.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.16",
+  "version": "1.2.18",
   "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",
@@ -43,6 +43,7 @@
     "class-validator": "^0.14.1",
     "handlebars": "^4.7.8",
     "ioredis": "^5.4.1",
+    "lodash": "^4.17.21",
     "luxon": "^3.4.4",
     "mailgen": "^2.0.28",
     "mongoose": "^8.7.0",

package/src/dtos/create-field-metadata.dto.ts

@@ -256,8 +256,6 @@ export class CreateFieldMetadataDto {
   @ApiProperty({ description: 'for text fields, this is length. for numeric fields, this is the range of values allowed. Only for type=shortText,longText,richText,json,int,decimal,date,dateTime,time', })
   @IsInt()
   @IsOptional()
-  @Transform(({ obj }) => obj.length ?? undefined) // Automatically sets max = length
-  @ValidateIf((obj) => obj.length !== undefined)  // Only validate if length is provided
   max: number;
 
   @ApiProperty({ description: 'for text fields, this is length. for numeric fields, this is the range of values allowed. Only for type=shortText,longText,richText,json,int,decimal,date,dateTime,time', })
@@ -387,4 +385,19 @@ export class CreateFieldMetadataDto {
   @IsOptional()
   @IsBoolean()
   readonly isUserKey: boolean
+
+  @ApiProperty({ description: 'Relation Join Column Name of Field', })
+  @IsString()
+  @IsOptional()
+  relationJoinColumnName: string
+
+  @ApiProperty({ description: 'Join Column Name of Field', })
+  @IsString()
+  @IsOptional()
+  joinColumnName: string
+
+  @ApiProperty({ description: 'Relation Join Table Name of Field', })
+  @IsString()
+  @IsOptional()
+  relationJoinTableName: string
 }

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

@@ -137,4 +137,13 @@ export class FieldMetadata extends CommonEntity {
 
     @Column({ name: "isUserKey", default: false })
     isUserKey: boolean;
+
+    @Column({ name: 'relation_join_column_name', nullable: true })
+    relationJoinColumnName: string;
+
+    @Column({ name: 'join_column_name', nullable: true })
+    joinColumnName: string;
+
+    @Column({ name: 'relation_join_table_name', nullable: true })
+    relationJoinTableName: string;
 }

package/src/helpers/schematic.service.ts

@@ -1,5 +1,6 @@
 import { Injectable, Logger } from '@nestjs/common';
 import { CommandService } from './command.service';
+import { snakeCase } from "lodash";
 
 export const ADD_MODULE_COMMAND = 'add-module';
 export type GenerateModuleOptions = {
@@ -54,7 +55,7 @@ export class SchematicService {
       // console.log('fieldOptions', fieldOptions);
       let modelCommand = `${baseCommand} --module=${fieldOptions.module} --model=${fieldOptions.model}`;
       if (fieldOptions.moduleDisplayName) {
-        modelCommand += ` --module-display-name=${fieldOptions.moduleDisplayName}`;
+        modelCommand += ` --module-display-name=${snakeCase(fieldOptions.moduleDisplayName)}`;
       }
 
       if (fieldOptions.table) {

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

@@ -843,6 +843,45 @@
             "encrypt": false,
             "columnName": "required",
             "isSystem": true
+          },
+          {
+            "name": "relationJoinColumnName",
+            "displayName": "Relation Join Column Name",
+            "type": "shortText",
+            "ormType": "varchar",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "columnName": "relation_join_column_name",
+            "isSystem": true
+          },
+          {
+            "name": "joinColumnName",
+            "displayName": "Join Column Name",
+            "type": "shortText",
+            "ormType": "varchar",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "columnName": "join_column_name",
+            "isSystem": true
+          },
+          {
+            "name": "relationJoinTableName",
+            "displayName": "Relation Join Table Name",
+            "type": "shortText",
+            "ormType": "varchar",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "columnName": "relation_join_table_name",
+            "isSystem": true
           }
         ]
       },
@@ -1311,7 +1350,7 @@
             "name": "action",
             "displayName": "Action",
             "type": "relation",
-            "required": true,
+            "required": false,
             "unique": false,
             "index": true,
             "private": false,
@@ -2770,7 +2809,7 @@
                 "body": "",
                 "confirmBtnLabel": "Generate Code",
                 "cancelBtnLabel": "Cancel",
-                "customComponent": "core/extension/solid-core/moduleMetadata/list/GenerateModuleCodeRowAction",
+                "customComponent": "../extension/solid-core/moduleMetadata/list/GenerateModuleCodeRowAction",
                 "customComponentIsSystem": true,
                 "endpoint": ""
               }
@@ -2962,7 +3001,7 @@
                 "body": "",
                 "confirmBtnLabel": "Generate Code",
                 "cancelBtnLabel": "Cancel",
-                "customComponent": "core/extension/solid-core/modelMetadata/list/GenerateModelCodeRowAction",
+                "customComponent": "../extension/solid-core/modelMetadata/list/GenerateModelCodeRowAction",
                 "customComponentIsSystem": true,
                 "endpoint": ""
               }

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

@@ -583,7 +583,10 @@ export class FieldMetadataService {
                     "encrypt",
                     "encryptionType",
                     "decryptWhen",
-                    "columnName"
+                    "columnName",
+                    "relationJoinColumnName",
+                    "joinColumnName",
+                    "relationJoinTableName"
                 ];
 
             case SolidFieldType.mediaSingle:

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

@@ -23,6 +23,7 @@ import { ViewMetadata } from '../entities/view-metadata.entity';
 import { ActionMetadata } from '../entities/action-metadata.entity';
 import { MenuItemMetadata } from '../entities/menu-item-metadata.entity';
 import { RoleMetadataService } from './role-metadata.service';
+import { PermissionMetadataSeederService } from 'src/seeders/permission-metadata-seeder.service';
 
 @Injectable()
 export class ModelMetadataService {
@@ -183,8 +184,8 @@ export class ModelMetadataService {
       if (fieldMetadata.isUserKey) {
         userKeyField = affectedField;
       }
-      listViewLayout.push({ type: "field", attrs: { name: `${affectedField.name}`, label: `${affectedField.displayName}`, sortable: true, filterable: true } })
-      formViewLayout.push({ type: "field", attrs: { name: `${affectedField.name}`, label: `${affectedField.displayName}` } })
+      listViewLayout.push({ type: "field", attrs: { name: `${affectedField.name}`, sortable: true, filterable: true } })
+      formViewLayout.push({ type: "field", attrs: { name: `${affectedField.name}` } })
 
     }
 
@@ -195,104 +196,104 @@ 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);
+    // 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;
   }
@@ -323,7 +324,7 @@ export class ModelMetadataService {
         fields: []
       }
 
-      const listViewLayoutFields = [{ type: "field", attrs: { name: `id`, label: `Id`, sortable: true, filterable: true } }];
+      const listViewLayoutFields = [{ type: "field", attrs: { name: `id`, sortable: true, filterable: true } }];
       const formViewLayoutFields = [];
 
       for (let i = 0; i < model.fields.length; i++) {
@@ -338,8 +339,8 @@ export class ModelMetadataService {
             fieldObject[requiredField] = field[requiredField];
           });
           modelMetaData.fields.push(fieldObject);
-          listViewLayoutFields.push({ type: "field", attrs: { name: `${field.name}`, label: `${field.displayName}`, sortable: true, filterable: true } })
-          formViewLayoutFields.push({ type: "field", attrs: { name: `${field.name}`, label: `${field.displayName}` } })
+          listViewLayoutFields.push({ type: "field", attrs: { name: `${field.name}`, sortable: true, filterable: true } })
+          formViewLayoutFields.push({ type: "field", attrs: { name: `${field.name}` } })
 
         }
       }
@@ -680,13 +681,149 @@ export class ModelMetadataService {
 
   async generateCode(options: CodeGenerationOptions): Promise<string> {
     const query = {
-      populate: ["module", "fields"]
+        populate: ["module", "fields"]
     };
-    const model = options.modelId ? await this.findOne(options.modelId, query) : await this.findOneByUserKey(options.modelUserKey, query.populate);
-    options.fieldIdsForRemoval = model.fields.filter((field) => field.isMarkedForRemoval).map((field) => field.id);
+
+    const model = options.modelId 
+        ? await this.findOne(options.modelId, query) 
+        : await this.findOneByUserKey(options.modelUserKey, query.populate);
+
+    options.fieldIdsForRemoval = model.fields
+        .filter(field => field.isMarkedForRemoval)
+        .map(field => field.id);
 
     const refreshModelCodeOutput = await this.generateModelCode(options);
     const removeFieldCodeOuput = await this.generateRemoveFieldsCode(options);
+
+    const listViewLayout = model.fields.map(field => ({
+        type: "field",
+        attrs: { 
+            name: `${field.name}`, 
+            sortable: true, 
+            filterable: true 
+        }
+    }));
+
+    const formViewLayout = model.fields.map(field => ({
+        type: "field",
+        attrs: { 
+            name: `${field.name}`
+        }
+    }));
+
+    const resolvedModule = await this.dataSource.getRepository(ModuleMetadata).findOne({
+        where: { id: model.module.id }
+    });
+
+    const viewRepo = this.dataSource.getRepository(ViewMetadata);
+    const actionRepo = this.dataSource.getRepository(ActionMetadata);
+    const menuRepo = this.dataSource.getRepository(MenuItemMetadata);
+
+    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, 3)
+        },
+        {
+            name: `${model.singularName}-form-view`,
+            displayName: `${model.displayName}`,
+            type: 'form',
+            context: "{}",
+            module: resolvedModule,
+            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, 3)
+        }
+    ];
+
+    for (const view of modelViews) {
+        const existingView = await viewRepo.findOne({ where: { name: view.name } });
+
+        if (!existingView) {
+          const createdView = viewRepo.create(view);
+          await viewRepo.save(createdView);
+        }
+    }
+
+    let view = await viewRepo.findOne({ where: { name: `${model.singularName}-list-view` } });
+
+    const actionData = {
+        displayName: `${model.displayName} List View`,
+        name: `${model.singularName}-list-view`,
+        type: "solid",
+        domain: "" as any,
+        context: "" as any,
+        customComponent: `/admin/address-master/${model.singularName}/all`,
+        customIsModal: true,
+        serverEndpoint: "",
+        view: view,
+        module: resolvedModule,
+        model: model
+    };
+
+    let existingAction = await actionRepo.findOne({ where: { name: actionData.name } });
+
+    if (!existingAction) {
+      const createdAction = actionRepo.create(actionData);
+      existingAction = await actionRepo.save(createdAction);
+    }
+
+    const adminRole = await this.roleService.findRoleByName('Admin');
+
+    const menuData = {
+        displayName: `${model.displayName}`,
+        name: `${model.singularName}-menu-item`,
+        sequenceNumber: 1,
+        action: existingAction,
+        module: resolvedModule,
+        roles: [adminRole],
+        parentMenuItemUserKey: ""
+    };
+
+    let existingMenu = await menuRepo.findOne({ where: { name: menuData.name } });
+
+    if (!existingMenu) {
+      const createdMenu = menuRepo.create(menuData);
+      await menuRepo.save(createdMenu);
+    }
+
     return `${removeFieldCodeOuput} \n ${refreshModelCodeOutput}`;
   }
 

package/src/services/1.js

@@ -1,6 +0,0 @@
-1. Do i need to create a storeStreams method for aws service too?
-    - Handle later
-2. queues handling -> if queues is enabled by default, i.e triggerExport(exportTransactionEntity.id).
-    - startExport should either return the data or return the transaction id
-3. How to handle scenarios wherein, nested related exist.(do i need to only get the userkey)
-    - show the userKey