@opengis/fastify-table 1.2.5 → 1.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "type": "module",
   "description": "core-plugins",
   "keywords": [

package/server/plugins/crud/funcs/getAccess.js

@@ -37,13 +37,17 @@ export default async function getAccess({ table, user = {} }) {
 
   const { uid, user_type: userType = 'regular' } = user;
 
-  if (userType.includes('admin')) {
+  if (userType === 'superadmin') {
     return { actions: ['view', 'edit', 'add', 'del'], query: '1=1' };
   }
 
   const body = await getTemplate('table', table);
   const tableActions = ['view'].concat(body?.actions || body?.action_default || []);
 
+  if (userType === 'admin') {
+    return { actions: body?.actions || body?.action_default ? tableActions : ['view', 'edit', 'add', 'del'], query: '1=1' };
+  }
+
   if (body?.public || body?.access === 'public') {
     return { actions: tableActions, query: '1=1' };
   }

package/server/plugins/crud/funcs/validateData.js

@@ -1,37 +1,53 @@
 
 const emailReg = /(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/g;
 
-function checkField(key, val, options) {
+function checkField(key, val, options, idx) {
     // validators: [required]
     if (options?.validators?.includes('required') && !val) {
-        return { error: 'empty required', key };
+        return {
+            error: 'empty required', key, idx,
+        };
     }
 
     // validators: [email] / type: Email
     if ((options.type?.toLowerCase() === 'email' || options?.validators?.includes('email')) && val && !val.match(emailReg)) {
-        return { error: 'invalid email', key, val };
+        return {
+            error: 'invalid email', key, val, idx,
+        };
     }
+    return { key, val, idx };
 }
 
-export default function validateData({ body = {}, schema = {} }) {
-    const arr = Object.keys(schema).reduce((acc, key) => {
-        const curr = { ...schema[key], key };
-        if (curr.colModel?.length && curr.type?.toLowerCase() === 'datatable') {
-            return acc.concat(curr.colModel.map(col => {
-                const subkey = col.name || col.key;
-                const check = body[curr.key]?.reduce((acc, curr) => Object.assign(acc, checkField(subkey, curr[subkey], col)), {});
-                return { ...curr, ...col, check, key: `${curr.key}.${subkey}`, colModel: undefined };
-            }));
+function checkBody({ body = {}, arr = [], idx }) {
+    const res = Object.keys(body).reduce((acc1, key) => {
+        const input = arr.find(el => el.key === key) || {};
+
+        if (input.colModel?.length && input.type?.toLowerCase() === 'datatable') {
+            const result = body[key].reduce((acc, item, i) => {
+                const check = checkBody({ body: item, arr: input.colModel, idx: i });
+                acc.push(check);
+                return acc;
+            }, []);
+            acc1 = acc1.concat(result);
+            return acc1;
         }
-        const check = checkField(curr.key, body[curr.key], schema[curr.key]);
-        return acc.concat({ ...curr, check });
+
+        const check = checkField(key, body[key], input, idx) || {};
+        acc1.push({ key, val: body[key], ...check });
+        return acc1;
     }, []);
 
-    const invalidField = arr.find(el => el.check?.error);
+    const invalidField = res.find(el => el.error);
 
     if (invalidField) {
-        return { key: invalidField.key, ...invalidField.check };
+        console.warn('invalid field: ', invalidField.key, invalidField.error);
+        return invalidField;
     }
 
     return { message: 'ok' };
+}
+
+export default function validateData({ body = {}, schema = {} }) {
+    const res = checkBody({ body, arr: Object.keys(schema).map(key => ({ ...schema[key], key })) });
+    return res;    
 }

package/server/plugins/table/funcs/metaFormat/index.js

@@ -28,7 +28,7 @@ export default async function metaFormat({
     if (!clsValues) return null;
 
     rows.forEach(el => {
-      const val = el[attr.name]?.map?.(c => clsValues[c.toString()] || clsValues[c] || c) || clsValues[el[attr.name]?.toString()] || clsValues[el[attr.name]] || el[attr.name];
+      const val = el[attr.name]?.map?.(c => c ? clsValues[c.toString()] || clsValues[c] || c : null) || clsValues[el[attr.name]?.toString()] || clsValues[el[attr.name]] || el[attr.name];
       if (!val) return;
       if (!sufix) {
         Object.assign(el, { [attr.name]: val.text || val });