@galadrim/galadmin 0.1.150 → 0.1.152

package/dist/types/config.d.ts

@@ -15,6 +15,7 @@ export type BaseTypeColumn = {
     required?: boolean;
     includeInExport?: boolean;
     displayCondition?: (record: any) => boolean;
+    roles?: string[];
 };
 export type ColorColumn = {
     dataType: 'color';
@@ -134,7 +135,7 @@ export type CreateType = {
 };
 export type CustomAction = {
     label: string;
-    action: (record: any) => void;
+    action: (record: any) => void | string;
     successMessage?: string;
 };
 export type FormDataFile = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galadrim/galadmin",
-  "version": "0.1.150",
+  "version": "0.1.152",
   "main": "dist/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

package/src/api.ts

@@ -562,7 +562,13 @@ export default (db, config, user) => {
             try {
                 const { rows } = await db.query("SELECT " + (view.selectExpression || "*") + " FROM ?? " + (view.join || "") + " WHERE ?? = ?", [view.tableName, view.tableName + "." + view.primaryId, recordId])
                 const record = rows[0]
-                await action.action(record);
+                const actionResult = await action.action(record);
+                if (actionResult) {
+                    return res.send({
+                        success: true,
+                        message: actionResult
+                    })
+                }
             } catch (err) {
                 console.error(err)
                 return res.send({

package/src/index.ts

@@ -169,6 +169,16 @@ export default (config: Config): any => {
                         return view;
                     }
                 })
+                .map(view => {
+                    if (view.type === "table") {
+                        return {
+                            ...view,
+                            columns: view.columns.filter(column => !column.roles || (req.session.user && column.roles.includes(req.session.user.role)))
+                        }
+                    } else {
+                        return view;
+                    }
+                })
         }, req.session.user)(req, res, next)
     })
 

package/src/types/config.ts

@@ -16,6 +16,7 @@ export type BaseTypeColumn = {
     required?: boolean;
     includeInExport?: boolean;
     displayCondition?: (record: any) => boolean;
+    roles?: string[];
 };
 
 export type ColorColumn = {
@@ -161,7 +162,7 @@ export type CreateType = {
 
 export type CustomAction = {
     label: string;
-    action: (record: any) => void;
+    action: (record: any) => void | string;
     successMessage?: string;
 };