@solidstarters/solid-core 1.2.28 → 1.2.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.28",
+  "version": "1.2.30",
   "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/controllers/email-template.controller.ts

@@ -50,7 +50,7 @@ export class EmailTemplateController {
 
   @ApiBearerAuth("jwt")
   @Delete(':id')
-  remove(@Param('id') id: string) {
+  async delete(@Param('id') id: number) {
     return this.emailTemplateService.remove(+id);
   }
 

package/src/controllers/field-metadata.controller.ts

@@ -63,7 +63,7 @@ export class FieldMetadataController {
 
     @ApiBearerAuth("jwt")
     @Delete(':id')
-    remove(@Param('id') id: number) {
+    async delete(@Param('id') id: number) {
         return this.fieldMetadataService.remove(id);
     }
 

package/src/controllers/media.controller.ts

@@ -68,7 +68,7 @@ export class MediaController {
 
     @ApiBearerAuth("jwt")
     @Delete(':id')
-    remove(@Param('id') id: number) {
+    async delete(@Param('id') id: number) {
         return this.mediaService.remove(id);
     }
 

package/src/controllers/model-metadata.controller.ts

@@ -87,7 +87,7 @@ export class ModelMetadataController {
 
     @ApiBearerAuth("jwt")
     @Delete(':id')
-    remove(@Param('id') id: number) {
+    async delete(@Param('id') id: number) {
         return this.modelMetadataService.remove(id);
     }
 

package/src/controllers/sms-template.controller.ts

@@ -43,7 +43,7 @@ export class SmsTemplateController {
 
   @ApiBearerAuth("jwt")
   @Delete(':id')
-  remove(@Param('id') id: string) {
+  async delete(@Param('id') id: number) {
     return this.smsTemplateService.remove(+id);
   }
 }

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

@@ -658,7 +658,7 @@ export class FieldMetadataService {
                     "ormType",
                     "isSystem",
                     "defaultValue",
-                    // "required",
+                    "required",
                     // "unique",
                     "index",
                     "private",

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

@@ -343,6 +343,8 @@ export class ModelMetadataService {
         description: model.description,
         dataSource: model.dataSource,
         dataSourceType: model.dataSourceType,
+        tableName: model.tableName,
+        userKeyFieldUserKey: model.fields.find(field => field.isUserKey)?.name,
         fields: []
       }
 
@@ -606,6 +608,8 @@ export class ModelMetadataService {
         description: model.description,
         dataSource: model.dataSource,
         dataSourceType: model.dataSourceType,
+        tableName: model.tableName,
+        userKeyFieldUserKey: model.fields.find(field => field.isUserKey)?.name,
         fields: []
       }
 
@@ -715,7 +719,9 @@ export class ModelMetadataService {
     const refreshModelCodeOutput = await this.generateModelCode(options);
     const removeFieldCodeOuput = await this.generateRemoveFieldsCode(options);
 
-    const listViewLayout = model.fields.map(field => ({
+    const jsonFieldsList = model.fields.filter((field: FieldMetadata) => field.isSystem !== true);
+
+    const listViewLayout = jsonFieldsList.map(field => ({
       type: "field",
       attrs: {
         name: `${field.name}`,
@@ -724,7 +730,7 @@ export class ModelMetadataService {
       }
     }));
 
-    const formViewLayout = model.fields.map(field => ({
+    const formViewLayout = jsonFieldsList.map(field => ({
       type: "field",
       attrs: {
         name: `${field.name}`
@@ -932,12 +938,12 @@ export class ModelMetadataService {
     const { modelName, fieldName } = data;
 
     const model = await this.modelMetadataRepo.findOne({
-        where: { singularName: modelName },
-        relations: ['fields', 'userKeyField'],
+      where: { singularName: modelName },
+      relations: ['fields', 'userKeyField'],
     });
 
     if (!model) {
-        throw new Error(`Model with name ${modelName} not found`);
+      throw new Error(`Model with name ${modelName} not found`);
     }
 
     if (model.userKeyField) {
@@ -946,7 +952,7 @@ export class ModelMetadataService {
 
     const fieldToUpdate = model.fields.find(field => field.name === fieldName);
     if (!fieldToUpdate) {
-        throw new Error(`Field with name ${fieldName} not found in model ${modelName}`);
+      throw new Error(`Field with name ${fieldName} not found in model ${modelName}`);
     }
 
     fieldToUpdate.isUserKey = true;