@solidstarters/solid-core 1.2.15 → 1.2.17

package/package.json

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

@@ -2770,7 +2770,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 +2962,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/authentication.service.ts

@@ -925,7 +925,7 @@ export class AuthenticationService {
         await this.validateUserUsingGoogle(user);
 
         // finally we simply generate the tokens. 
-        const tokens = this.generateTokens(user);
+        const tokens = await this.generateTokens(user);
         return {
             user: {
                 email: user.email,

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 {
@@ -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;
   }
@@ -687,9 +688,138 @@ export class ModelMetadataService {
 
     const refreshModelCodeOutput = await this.generateModelCode(options);
     const removeFieldCodeOuput = await this.generateRemoveFieldsCode(options);
+
+    // Extract listViewLayout and formViewLayout from model fields
+    const listViewLayout = model.fields.map(field => ({
+        type: "field",
+        attrs: { 
+            name: `${field.name}`, 
+            label: `${field.displayName}`, 
+            sortable: true, 
+            filterable: true 
+        }
+    }));
+
+    const formViewLayout = model.fields.map(field => ({
+        type: "field",
+        attrs: { 
+            name: `${field.name}`, 
+            label: `${field.displayName}` 
+        }
+    }));
+
+    // Fetch module data
+    const resolvedModule = await this.dataSource.getRepository(ModuleMetadata).findOne({
+        where: { id: model.module.id }
+    });
+
+    // Generate model views
+    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: 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, 2)
+        }
+    ];
+
+    // Save views
+    const viewRepo = this.dataSource.getRepository(ViewMetadata);
+    for (const view of modelViews) {
+        const createdView = viewRepo.create(view);
+        await viewRepo.save(createdView);
+    }
+
+    // Fetch the list view
+    const view = await viewRepo.findOneBy({ name: `${model.singularName}-list-view` });
+
+    // Generate action
+    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
+    };
+
+    // Save action
+    const actionRepo = this.dataSource.getRepository(ActionMetadata);
+    const createdAction = actionRepo.create(action);
+    const newAction = await actionRepo.save(createdAction);
+
+    // Fetch Admin Role
+    const adminRole = await this.roleService.findRoleByName('Admin');
+
+    // Generate menu
+    const menu = {
+        displayName: `${model.displayName}`,
+        name: `${model.singularName}`,
+        sequenceNumber: 1,
+        action: newAction,
+        module: resolvedModule,
+        roles: [adminRole],
+        parentMenuItemUserKey: ""
+    };
+
+    // Save menu
+    const menuRepo = this.dataSource.getRepository(MenuItemMetadata);
+    const createdMenu = menuRepo.create(menu);
+    await menuRepo.save(createdMenu);
     return `${removeFieldCodeOuput} \n ${refreshModelCodeOutput}`;
   }
 
+
   async generateRemoveFieldsCode(options: CodeGenerationOptions): Promise<string> {
     if (!options.modelId && !options.modelUserKey) {
       throw new BadRequestException('Model ID or Model Name is required for generating code');