Merge pull request #118 from devforth/groupName

Group name

Author: ivictbor

adminforth/index.ts

@@ -1,4 +1,3 @@
-
 import AdminForthAuth from './auth.js';
 import MongoConnector from './dataConnectors/mongo.js';
 import PostgresConnector from './dataConnectors/postgres.js';
@@ -414,6 +413,15 @@ class AdminForth implements IAdminForth {
       return { error: err };
     }
 
+    for (const column of resource.columns) {
+      const fieldName = column.name;
+      if (fieldName in record) {
+        if (!column.showIn?.create || column.backendOnly) {
+          return { error: `Field "${fieldName}" cannot be modified as it is restricted from creation` };
+        }
+      }
+    }
+
     // execute hook if needed
     for (const hook of listify(resource.hooks?.create?.beforeSave)) {
       console.log('🪲 Hook beforeSave', hook);
@@ -490,6 +498,15 @@ class AdminForth implements IAdminForth {
         delete record[column.name];
     }
 
+    for (const column of resource.columns) {
+      const fieldName = column.name;
+      if (fieldName in record) {
+        if (!column.showIn?.edit || column.editReadonly || column.backendOnly) {
+          return { error: `Field "${fieldName}" cannot be modified as it is restricted from editing` };
+        }
+      }
+    }
+
     // execute hook if needed
     for (const hook of listify(resource.hooks?.edit?.beforeSave)) {
       const resp = await hook({

adminforth/modules/restApi.ts

@@ -458,6 +458,14 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
           }
         });
 
+        if (resource.options.fieldGroups) {
+          resource.options.fieldGroups.forEach((group, i) => {
+            if (group.groupName) {
+              translateRoutines[`fieldGroup${i}`] = tr(group.groupName, `resource.${resource.resourceId}.fieldGroup`);
+            }
+          });
+        }
+
         const translated: Record<string, string> = {};
         await Promise.all(
           Object.entries(translateRoutines).map(async ([key, value]) => {
@@ -531,6 +539,10 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
             ),
             options: {
               ...resource.options,
+              fieldGroups: resource.options.fieldGroups?.map((group, i) => ({
+                ...group,
+                groupName: translated[`fieldGroup${i}`] || group.groupName,
+              })),
               bulkActions: allowedBulkActions.map(
                 (action, i) => ({
                   ...action,

dev-demo/resources/apartments.ts

@@ -63,7 +63,7 @@ export default {
     {
       name: "id",
       label: "Identifier", // if you wish you can redefine label
-      showIn: ["filter", "show", "list"], // show in filter and in show page
+      showIn: {filter: true, show: true, list: true, create: false, edit: false}, // show in filter and in show page
       primaryKey: true,
       // @ts-ignore
       fillOnCreate: ({ initialRecord, adminUser }) =>
@@ -77,7 +77,7 @@ export default {
       name: "title",
       // type: AdminForthDataTypes.JSON,
       required: true,
-      showIn: ["list", "create", "edit", "filter", "show"], // the default is full set
+      showIn: {list: true, create: true, edit: true, filter: true, show: true}, // the default is full set
       maxLength: 255, // you can set max length for string fields
       minLength: 3, // you can set min length for string fields
       components: {
@@ -187,7 +187,7 @@ export default {
     },
     {
       name: "price",
-      showIn: ["create", "edit", "filter", "show"],
+      showIn: {create: true, edit: true, filter: true, show: true},
       allowMinMaxQuery: true, // use better experience for filtering e.g. date range, set it only if you have index on this column or if there will be low number of rows
       editingNote: "Price is in USD", // you can appear note on editing or creating page
     },
@@ -216,7 +216,7 @@ export default {
         { value: 4, label: "4 rooms" },
         { value: 5, label: "5 rooms" },
       ],
-      showIn: ["filter", "show", "create", "edit"],
+      showIn: {filter: true, show: true, create: true, edit: true},
     },
     {
       name: "room_sizes",
@@ -230,15 +230,15 @@ export default {
       name: "description",
       sortable: false,
       type: AdminForthDataTypes.RICHTEXT,
-      showIn: ["filter", "show", "edit", "create"],
+      showIn: {filter: true, show: true, edit: true, create: true},
     },
     {
       name: "listed",
       required: true, // will be required on create/edit
     },
     {
       name: "user_id",
-      showIn: ["filter", "show", "edit", "list", "create"],
+      showIn: {filter: true, show: true, edit: true, list: true, create: true},
       foreignResource: {
         resourceId: "users",
         hooks: {