adminforth 1.1.19 → 1.1.21

package/dist/index.js

@@ -23,10 +23,9 @@ import ExpressServer from './servers/express.js';
 import { v1 as uuid } from 'uuid';
 import fs from 'fs';
 import { ADMINFORTH_VERSION, listify } from './modules/utils.js';
-import { AdminForthFilterOperators, AdminForthDataTypes, AdminForthResourcePages } from './types/AdminForthConfig.js';
+import { AdminForthFilterOperators, AdminForthDataTypes, AdminForthResourcePages, AllowedActionsEnum } from './types/AdminForthConfig.js';
 import path from 'path';
 //get array from enum AdminForthResourcePages
-const DEFAULT_ALLOWED_ACTIONS = { create: true, edit: true, show: true, delete: true };
 class AdminForth {
     constructor(config) {
         _AdminForth_defaultConfig.set(this, {
@@ -211,6 +210,30 @@ class AdminForth {
                 if (!res.options) {
                     res.options = { bulkActions: [], allowedActions: {} };
                 }
+                if (!res.options.allowedActions) {
+                    res.options.allowedActions = {
+                        all: true,
+                    };
+                }
+                if (Object.keys(res.options.allowedActions).includes('all')) {
+                    if (Object.keys(res.options.allowedActions).length > 1) {
+                        errors.push(`Resource "${res.resourceId}" allowedActions cannot have "all" and other keys at same time: ${Object.keys(res.options.allowedActions).join(', ')}`);
+                    }
+                    for (const key of Object.keys(AllowedActionsEnum)) {
+                        if (key !== 'all') {
+                            res.options.allowedActions[key] = res.options.allowedActions.all;
+                        }
+                    }
+                    delete res.options.allowedActions.all;
+                }
+                else {
+                    // by default allow all actions
+                    for (const key of Object.keys(AllowedActionsEnum)) {
+                        if (!Object.keys(res.options.allowedActions).includes(key)) {
+                            res.options.allowedActions[key] = true;
+                        }
+                    }
+                }
                 //check if resource has bulkActions
                 if ((_b = res.options) === null || _b === void 0 ? void 0 : _b.bulkActions) {
                     let bulkActions = res.options.bulkActions;
@@ -256,18 +279,6 @@ class AdminForth {
                         });
                     }
                 }
-                //add default allowedActions to resources
-                if (res.options.allowedActions) {
-                    //check if allowedActions is an object
-                    if (typeof res.options.allowedActions !== 'object') {
-                        errors.push(`Resource "${res.resourceId}" allowedActions must be an object`);
-                    }
-                    const userAllowedActions = res.options.allowedActions;
-                    res.options.allowedActions = Object.assign({}, DEFAULT_ALLOWED_ACTIONS, userAllowedActions);
-                }
-                else {
-                    res.options.allowedActions = DEFAULT_ALLOWED_ACTIONS;
-                }
                 // transform all hooks Functions to array of functions
                 if (res.hooks) {
                     for (const value of [res.hooks.show, res.hooks.list]) {
@@ -568,13 +579,45 @@ class AdminForth {
                     [this.config.auth.usernameField]: username,
                     [this.config.auth.userFullNameField]: userFullName
                 };
+                const checkIsMenuItemVisible = (menuItem) => {
+                    if (typeof menuItem.visible === 'function') {
+                        const toReturn = menuItem.visible(adminUser);
+                        if (typeof toReturn !== 'boolean') {
+                            throw new Error(`'visible' function of ${menuItem.label || menuItem.type}  must return boolean value`);
+                        }
+                        return toReturn;
+                    }
+                };
+                let newMenu = [];
+                for (let menuItem of this.config.menu) {
+                    let newMenuItem = Object.assign({}, menuItem);
+                    if (menuItem.visible) {
+                        if (!checkIsMenuItemVisible(menuItem)) {
+                            continue;
+                        }
+                    }
+                    if (menuItem.children) {
+                        let newChildren = [];
+                        for (let child of menuItem.children) {
+                            let newChild = Object.assign({}, child);
+                            if (child.visible) {
+                                if (!checkIsMenuItemVisible(child)) {
+                                    continue;
+                                }
+                            }
+                            newChildren.push(newChild);
+                        }
+                        newMenuItem = Object.assign(Object.assign({}, newMenuItem), { children: newChildren });
+                    }
+                    newMenu.push(newMenuItem);
+                }
                 return {
                     user: userData,
                     resources: this.config.resources.map((res) => ({
                         resourceId: res.resourceId,
                         label: res.label,
                     })),
-                    menu: this.config.menu,
+                    menu: newMenu,
                     config: {
                         brandName: this.config.customization.brandName,
                         brandLogo: this.config.customization.brandLogo,
@@ -590,10 +633,29 @@ class AdminForth {
                 };
             }),
         });
+        function interpretResource(adminUser, resource, meta) {
+            return __awaiter(this, void 0, void 0, function* () {
+                var _b;
+                yield Promise.all(Object.entries(((_b = resource.options) === null || _b === void 0 ? void 0 : _b.allowedActions) || {}).map((_c) => __awaiter(this, [_c], void 0, function* ([key, value]) {
+                    // if callable then call
+                    if (typeof value === 'function') {
+                        resource.options.allowedActions[key] = yield value(adminUser, resource, meta);
+                    }
+                })));
+            });
+        }
+        function checkAccess(action, resource) {
+            var _b;
+            const allowed = (_b = resource.options) === null || _b === void 0 ? void 0 : _b.allowedActions[action];
+            if (allowed !== true) {
+                return { error: typeof allowed === 'string' ? allowed : 'Action is not allowed', allowed: false };
+            }
+            return { allowed: true };
+        }
         server.endpoint({
             method: 'POST',
             path: '/get_resource',
-            handler: (_l) => __awaiter(this, [_l], void 0, function* ({ body }) {
+            handler: (_l) => __awaiter(this, [_l], void 0, function* ({ body, adminUser }) {
                 const { resourceId } = body;
                 if (!this.statuses.dbDiscover) {
                     return { error: 'Database discovery not started' };
@@ -605,6 +667,7 @@ class AdminForth {
                 if (!resource) {
                     return { error: `Resource ${resourceId} not found` };
                 }
+                yield interpretResource(adminUser, resource, {});
                 // exclude "plugins" key
                 return { resource: Object.assign(Object.assign({}, resource), { plugins: undefined }) };
             }),
@@ -628,6 +691,12 @@ class AdminForth {
                 if (!resource) {
                     return { error: `Resource ${resourceId} not found` };
                 }
+                yield interpretResource(adminUser, resource, { requestBody: body });
+                const { allowed, error } = checkAccess(source, resource);
+                console.log('allowed', allowed, error);
+                if (!allowed) {
+                    return { error };
+                }
                 for (const hook of listify((_p = (_o = resource.hooks) === null || _o === void 0 ? void 0 : _o[source]) === null || _p === void 0 ? void 0 : _p.beforeDatasourceRequest)) {
                     const resp = yield hook({ resource, query: body, adminUser });
                     if (!resp || (!resp.ok && !resp.error)) {
@@ -647,7 +716,7 @@ class AdminForth {
                     }
                     if (filter.operator === AdminForthFilterOperators.IN || filter.operator === AdminForthFilterOperators.NIN) {
                         if (!Array.isArray(filter.value)) {
-                            throw new Error(`Value for operator '${filter.operator}'' should be an array`);
+                            throw new Error(`Value for operator '${filter.operator}' should be an array`);
                         }
                     }
                     if (filter.operator === AdminForthFilterOperators.IN && filter.value.length === 0) {
@@ -818,11 +887,15 @@ class AdminForth {
             path: '/create_record',
             handler: (_y) => __awaiter(this, [_y], void 0, function* ({ body, adminUser }) {
                 var _z, _0, _1, _2, _3;
-                console.log('create_record', body, this.config.resources);
                 const resource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
                 if (!resource) {
                     return { error: `Resource '${body['resourceId']}' not found` };
                 }
+                yield interpretResource(adminUser, resource, { requestBody: body });
+                const { allowed, error } = checkAccess(AllowedActionsEnum.create, resource);
+                if (!allowed) {
+                    return { error };
+                }
                 const record = body['record'];
                 // execute hook if needed
                 for (const hook of listify((_0 = (_z = resource.hooks) === null || _z === void 0 ? void 0 : _z.create) === null || _0 === void 0 ? void 0 : _0.beforeSave)) {
@@ -890,6 +963,11 @@ class AdminForth {
                 if (!resource) {
                     return { error: `Resource '${body['resourceId']}' not found` };
                 }
+                yield interpretResource(adminUser, resource, { requestBody: body });
+                const { allowed, error } = checkAccess(AllowedActionsEnum.edit, resource);
+                if (!allowed) {
+                    return { error };
+                }
                 const recordId = body['recordId'];
                 const connector = this.connectors[resource.dataSource];
                 const oldRecord = yield connector.getRecordByPrimaryKey(resource, recordId);
@@ -957,6 +1035,11 @@ class AdminForth {
                 if (resource.options.allowedActions.delete === false) {
                     return { error: `Resource '${resource.resourceId}' does not allow delete action` };
                 }
+                yield interpretResource(adminUser, resource, { requestBody: body });
+                const { allowed, error } = checkAccess(AllowedActionsEnum.delete, resource);
+                if (!allowed) {
+                    return { error };
+                }
                 // execute hook if needed
                 for (const hook of listify((_11 = (_10 = resource.hooks) === null || _10 === void 0 ? void 0 : _10.delete) === null || _11 === void 0 ? void 0 : _11.beforeSave)) {
                     const resp = yield hook({ resource, record, adminUser });

package/dist/modules/codeInjector.js

@@ -140,7 +140,7 @@ class CodeInjector {
                                 routes += `{
                 path: '${item.path}',
                 name: '${item.path}',
-                component: () => import('${item.component}'),}
+                component: () => import('${item.component}'),
                 meta: { title: '${(_d = item === null || item === void 0 ? void 0 : item.meta) === null || _d === void 0 ? void 0 : _d.title}'
               },\n`;
                             }

package/dist/plugins/AccessControl/index.js

@@ -1,15 +1,5 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { AllowedActionsEnum } from "../../types/AdminForthConfig.js";
 import AdminForthPlugin from "../base.js";
-class AccessControlPlugin extends AdminForthPlugin {
+class AuditLogPlugin extends AdminForthPlugin {
     constructor(options) {
         super(options, import.meta.url);
         this.options = options;
@@ -17,50 +7,7 @@ class AccessControlPlugin extends AdminForthPlugin {
     modifyResourceConfig(adminforth, resourceConfig) {
         super.modifyResourceConfig(adminforth, resourceConfig);
         this.adminforth = adminforth;
-        if (!resourceConfig.hooks) {
-            resourceConfig.hooks = {};
-        }
-        const checkAccess = (adminUser, action, meta) => __awaiter(this, void 0, void 0, function* () {
-            const hasAccessOrError = yield this.options.hasAccess(adminUser, action, meta);
-            if (hasAccessOrError === true) {
-                return { ok: true };
-            }
-            else {
-                return { ok: false, error: hasAccessOrError || AccessControlPlugin.defaultError };
-            }
-        });
-        const bindHookCheck = (action, hookName) => {
-            if (!resourceConfig.hooks[action]) {
-                resourceConfig.hooks[action] = {};
-            }
-            if (!resourceConfig.hooks[action][hookName]) {
-                resourceConfig.hooks[action][hookName] = [];
-            }
-            if (hookName === 'beforeDatasourceRequest') {
-                resourceConfig.hooks[action][hookName].unshift((_a) => __awaiter(this, [_a], void 0, function* ({ adminUser, query }) {
-                    return checkAccess(adminUser, action, { query });
-                }));
-            }
-            else {
-                resourceConfig.hooks[action][hookName].unshift((_b) => __awaiter(this, [_b], void 0, function* ({ adminUser, record }) {
-                    return checkAccess(adminUser, action, { record });
-                }));
-            }
-        };
-        // List check
-        bindHookCheck(AllowedActionsEnum.list, 'beforeDatasourceRequest');
-        // Show check
-        bindHookCheck(AllowedActionsEnum.show, 'beforeDatasourceRequest');
-        // Edit check
-        bindHookCheck(AllowedActionsEnum.edit, 'beforeDatasourceRequest');
-        // create check
-        bindHookCheck(AllowedActionsEnum.create, 'beforeSave');
-        // edit check
-        bindHookCheck(AllowedActionsEnum.edit, 'beforeSave');
-        // delete check
-        bindHookCheck(AllowedActionsEnum.delete, 'beforeSave');
-        console.log('resourceConfig', resourceConfig);
     }
 }
-AccessControlPlugin.defaultError = 'Sorry, you do not have access to this resource.';
-export default AccessControlPlugin;
+AuditLogPlugin.defaultError = 'Sorry, you do not have access to this resource.';
+export default AuditLogPlugin;

package/dist/plugins/AuditLog/index.js

@@ -0,0 +1,66 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { AllowedActionsEnum } from "../../types/AdminForthConfig.js";
+import AdminForthPlugin from "../base.js";
+class AccessControlPlugin extends AdminForthPlugin {
+    constructor(options) {
+        super(options, import.meta.url);
+        this.options = options;
+    }
+    modifyResourceConfig(adminforth, resourceConfig) {
+        super.modifyResourceConfig(adminforth, resourceConfig);
+        this.adminforth = adminforth;
+        if (!resourceConfig.hooks) {
+            resourceConfig.hooks = {};
+        }
+        const checkAccess = (adminUser, action, meta) => __awaiter(this, void 0, void 0, function* () {
+            const hasAccessOrError = yield this.options.hasAccess(adminUser, action, meta);
+            if (hasAccessOrError === true) {
+                return { ok: true };
+            }
+            else {
+                return { ok: false, error: hasAccessOrError || AccessControlPlugin.defaultError };
+            }
+        });
+        const bindHookCheck = (action, hookName) => {
+            if (!resourceConfig.hooks[action]) {
+                resourceConfig.hooks[action] = {};
+            }
+            if (!resourceConfig.hooks[action][hookName]) {
+                resourceConfig.hooks[action][hookName] = [];
+            }
+            if (hookName === 'beforeDatasourceRequest') {
+                resourceConfig.hooks[action][hookName].unshift((_a) => __awaiter(this, [_a], void 0, function* ({ adminUser, query }) {
+                    return checkAccess(adminUser, action, { query });
+                }));
+            }
+            else {
+                resourceConfig.hooks[action][hookName].unshift((_b) => __awaiter(this, [_b], void 0, function* ({ adminUser, record }) {
+                    return checkAccess(adminUser, action, { record });
+                }));
+            }
+        };
+        // List check
+        bindHookCheck(AllowedActionsEnum.list, 'beforeDatasourceRequest');
+        // Show check
+        bindHookCheck(AllowedActionsEnum.show, 'beforeDatasourceRequest');
+        // Edit check
+        bindHookCheck(AllowedActionsEnum.edit, 'beforeDatasourceRequest');
+        // create check
+        bindHookCheck(AllowedActionsEnum.create, 'beforeSave');
+        // edit check
+        bindHookCheck(AllowedActionsEnum.edit, 'beforeSave');
+        // delete check
+        bindHookCheck(AllowedActionsEnum.delete, 'beforeSave');
+        console.log('resourceConfig', resourceConfig);
+    }
+}
+AccessControlPlugin.defaultError = 'Sorry, you do not have access to this resource.';
+export default AccessControlPlugin;

package/dist/plugins/AuditLog/types.js

@@ -0,0 +1 @@
+export {};

package/dist/plugins/ForeignInlineListPlugin/custom/InlineList.vue

@@ -104,6 +104,7 @@ import {
   IconFilterOutline,
   IconPlusOutline,
 } from '@iconify-prerendered/vue-flowbite';
+import { showErrorTost, showWarningTost, showSuccesTost} from '@/composables/useFrontendApi';
 
 import { getIcon } from '@/utils';
 
@@ -145,10 +146,7 @@ const endFilters = computed(() => {
   const primaryKeyColumn = selfPrimaryKeyColumn.value;
 
   if (!refColumn) {
-    window.adminforth.alert({
-      message: `Column with foreignResource.resourceId which is equal to '${props.resource.resourceId}' not found in resource which is specified as foreighResourceId '${listResource.value.resourceId}'`,
-      variant: 'danger',
-    });
+    showErrorTost(`Column with foreignResource.resourceId which is equal to '${props.resource.resourceId}' not found in resource which is specified as foreighResourceId '${listResource.value.resourceId}'`,10000);
     return [];
   }
   return [
@@ -209,11 +207,7 @@ async function getList() {
   });
 
   if (data.error) {
-    window.adminforth.alert({
-      message: data.error,
-      variant: 'danger',
-      timeout: 'unlimited',
-    });
+    showErrorTost(data.error);
     rows.value = [];
     totalRows.value = 0;
     return;

package/dist/spa/spa/src/components/ResourceListTable.vue

@@ -190,7 +190,7 @@
           <button v-if="resource.options?.allowedActions.delete"
                   class="font-medium text-red-600 dark:text-red-500 hover:underline ms-3"
                   :data-tooltip-target="`tooltip-delete-${rowI}`"
-                  @click="showDeleteModal(row)"
+                  @click="deleteRecord(row)"
           >
             <IconTrashBinSolid class="w-5 h-5 me-2"/>
           </button>
@@ -272,10 +272,12 @@
 import { initFlowbite } from 'flowbite';
 import { computed, onMounted, ref, watch } from 'vue';
 import { useRoute } from 'vue-router';
+import { callAdminForthApi, getIcon } from '@/utils';
 
 import ValueRenderer from '@/components/ValueRenderer.vue';
 import { getCustomComponent } from '@/utils';
 import { useCoreStore } from '@/stores/core';
+import { showSuccesTost } from '@/composables/useFrontendApi';
 
 import {
 IconInboxOutline,
@@ -305,6 +307,7 @@ const emits = defineEmits([
   'update:page',
   'update:sort',
   'update:checkboxes',
+  'update:records'
 
 ]);
 
@@ -358,9 +361,11 @@ async function selectAll(value) {
 const totalPages = computed(() => Math.ceil(props.totalRows / props.pageSize));
 
 
+
+
 const allFromThisPageChecked = computed(() => {
-  if (!props.rows.value) return false;
-  return props.rows.value.every((r) => checkboxes.value.includes(r.id));
+  if (!props.rows) return false;
+  return props.rows.every((r) => props.checkboxes.includes(r.id));
 });
 const ascArr = computed(() => sort.value.filter((s) => s.direction === 'asc').map((s) => s.field));
 const descArr = computed(() => sort.value.filter((s) => s.direction === 'desc').map((s) => s.field));
@@ -380,4 +385,35 @@ function onSortButtonClick(field) {
   }
 }
 
+async function deleteRecord(row) {
+  const data = await window.adminforth.confirm({
+    message: 'Are you sure you want to delete this item?',
+    yes: 'Delete',
+    no: 'Cancel',
+  });
+  if (data) {
+    try {
+      const res = await callAdminForthApi({
+      path: '/delete_record',
+      method: 'POST',
+      body: {
+        resourceId: props.resource.resourceId,
+        primaryKey: row._primaryKeyValue,
+      }});
+      if (!res.error){
+        emits('update:records', true)
+        showSuccesTost('Record deleted successfully')
+      } else {
+        console.error(res.error)
+      }
+
+    } catch (e) {
+      console.error(e);
+      };
+    }
+
+    
+}
+
+
 </script>

package/dist/spa/spa/src/composables/useFrontendApi.ts

@@ -0,0 +1,14 @@
+export function showSuccesTost(message: string) {
+  window.adminforth.alert({ message, variant: 'success' });  
+  return message;
+}
+
+export function showWarningTost(message: string) {
+  window.adminforth.alert({ message, variant: 'warning' });  
+  return message;
+}
+
+export function showErrorTost(message: string, timeout?: number) {
+  window.adminforth.alert({ message, variant: 'danger', timeout: timeout || 'unlimited'});  
+  return message;
+}

package/dist/spa/spa/src/utils.ts

@@ -97,3 +97,5 @@ export function checkAcessByAllowedActions(allowedActions:any, action:any ) {
     router.back();
   }
 }
+
+

package/dist/spa/spa/src/views/CreateView.vue

@@ -78,6 +78,7 @@ import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
 import { onMounted, ref, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { computed } from 'vue';
+import { showErrorTost } from '@/composables/useFrontendApi';
 
 
 const isValid = ref(false);
@@ -141,11 +142,8 @@ async function saveRecord() {
     },
   });
   if (response.error) {
-    window.adminforth.alert({
-      message: response.error,
-      variant: 'danger',
-      timeout: 'unlimited',
-    })
+    showErrorTost(response.error);
+    
   }
   saving.value = false;
   if (route.query.returnTo) {

package/dist/spa/spa/src/views/EditView.vue

@@ -73,6 +73,7 @@ import { callAdminForthApi, getCustomComponent,checkAcessByAllowedActions } from
 import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
 import { computed, onMounted, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
+import { showErrorTost } from '@/composables/useFrontendApi';
 
 const coreStore = useCoreStore();
 
@@ -155,11 +156,7 @@ async function saveRecord() {
     },
   });
   if (resp.error) {
-    window.adminforth.alert({
-      message: resp.error,
-      variant: 'danger',
-      timeout: 'unlimited',
-    })
+    showErrorTost(resp.error);
   }
   saving.value = false;
   router.push({ name: 'resource-show', params: { resourceId: route.params.resourceId, primaryKey: coreStore.record[coreStore.primaryKey] } });

package/dist/spa/spa/src/views/ListView.vue

@@ -87,6 +87,7 @@
       @update:page="page = $event"
       @update:sort="sort = $event"
       @update:checkboxes="checkboxes = $event"
+      @update:records="getList"
       :pageSize="pageSize"
       :totalRows="totalRows"
       :checkboxes="checkboxes"
@@ -113,6 +114,7 @@ import { callAdminForthApi, getIcon } from '@/utils';
 import { initFlowbite } from 'flowbite';
 import { computed, onMounted, ref, watch } from 'vue';
 import { useRoute } from 'vue-router';
+import { showErrorTost } from '@/composables/useFrontendApi'
 
 import ValueRenderer from '@/components/ValueRenderer.vue';
 import { getCustomComponent } from '@/utils';
@@ -184,11 +186,7 @@ async function getList() {
     }
   });
   if (data.error) {
-    window.adminforth.alert({
-      message: data.error,
-      variant: 'danger',
-      timeout: 'unlimited',
-    });
+    showErrorTost(data.error);
     rows.value = [];
     totalRows.value = 0;
     return;
@@ -201,36 +199,9 @@ async function getList() {
 }
 
 
-function showDeleteModal(row) {
-  if (!coreStore.config?.deleteConfirmation) {
-    return deleteRecord(row);
-  }
-  modalStore.setModalContent({
-    content: 'Are you sure you want to delete this item?',
-    acceptText: 'Delete',
-    cancelText: 'Cancel',
-  });
-  modalStore.setOnAcceptFunction(() => {
-    return deleteRecord(row)
-  })
-  console.log('row', row);
-  modalStore.togleModal();
 
-}
 
-async function deleteRecord(row) {
-  await callAdminForthApi({
-    path: '/delete_record',
-    method: 'POST',
-    body: {
-      resourceId: route.params.resourceId,
-      primaryKey: row._primaryKeyValue,
-      recordId: row.id
-    }
-  });
-  await getList();
-  modalStore.resetmodalState()
-}
+
 
 async function startBulkAction(actionId) {
   const data = await callAdminForthApi({

package/index.ts

@@ -14,14 +14,17 @@ import { AdminForthConfig, AdminForthClass, AdminForthComponentDeclaration, Admi
   BeforeSaveFunction,
   AfterSaveFunction,
   BeforeDataSourceRequestFunction,
-  AfterDataSourceResponseFunction} from './types/AdminForthConfig.js';
+  AfterDataSourceResponseFunction, AllowedActionValue, AdminUser,
+  AdminForthResource,
+  AllowedActionsEnum
+} from './types/AdminForthConfig.js';
 import path from 'path';
 import AdminForthPlugin from './plugins/base.js';
+import { tr } from '@faker-js/faker';
 
 
 //get array from enum AdminForthResourcePages
 
-const DEFAULT_ALLOWED_ACTIONS = {create: true, edit: true, show: true, delete: true};
 
 
 class AdminForth implements AdminForthClass {
@@ -250,6 +253,32 @@ class AdminForth implements AdminForthClass {
           res.options = {bulkActions: [], allowedActions: {}};
         }
 
+        if (!res.options.allowedActions) {
+          res.options.allowedActions = {
+            all: true,
+          };
+        }
+
+
+        if (Object.keys(res.options.allowedActions).includes('all')) {
+          if (Object.keys(res.options.allowedActions).length > 1) {
+            errors.push(`Resource "${res.resourceId}" allowedActions cannot have "all" and other keys at same time: ${Object.keys(res.options.allowedActions).join(', ')}`);
+          }
+          for (const key of Object.keys(AllowedActionsEnum)) {
+            if (key !== 'all') {
+              res.options.allowedActions[key] = res.options.allowedActions.all;
+            }
+          }
+          delete res.options.allowedActions.all;
+        } else {
+          // by default allow all actions
+          for (const key of Object.keys(AllowedActionsEnum)) {
+            if (!Object.keys(res.options.allowedActions).includes(key)) {
+              res.options.allowedActions[key] = true;
+            }
+          }
+        }
+
 
         //check if resource has bulkActions
         if(res.options?.bulkActions){
@@ -301,17 +330,6 @@ class AdminForth implements AdminForthClass {
 
         }
 
-        //add default allowedActions to resources
-        if(res.options.allowedActions){
-          //check if allowedActions is an object
-          if(typeof res.options.allowedActions !== 'object'){
-            errors.push(`Resource "${res.resourceId}" allowedActions must be an object`);
-          }
-          const userAllowedActions = res.options.allowedActions 
-          res.options.allowedActions = Object.assign({}, DEFAULT_ALLOWED_ACTIONS, userAllowedActions);         
-        } else {
-          res.options.allowedActions = DEFAULT_ALLOWED_ACTIONS;
-        }
 
         // transform all hooks Functions to array of functions
         if (res.hooks) {
@@ -648,13 +666,49 @@ class AdminForth implements AdminForthClass {
             [this.config.auth.usernameField]: username,
             [this.config.auth.userFullNameField]: userFullName
         };
+        const checkIsMenuItemVisible = (menuItem) => {
+          if (typeof menuItem.visible === 'function') {
+            const toReturn = menuItem.visible( adminUser );
+            if (typeof toReturn !== 'boolean') {
+              throw new Error(`'visible' function of ${menuItem.label || menuItem.type }  must return boolean value`);
+            }
+            return toReturn;
+          }}
+        let newMenu = []
+        for (let menuItem of this.config.menu) {
+          let newMenuItem = {...menuItem,}
+          if (menuItem.visible){
+            if (!checkIsMenuItemVisible(menuItem)){
+              continue
+            }
+          }
+          if (menuItem.children){
+            let newChildren = []
+            for (let child of menuItem.children){
+              let newChild = {...child,}
+              if (child.visible){
+                if (!checkIsMenuItemVisible(child)){
+                  continue
+                }
+              }
+              newChildren.push(newChild)
+            }
+            newMenuItem = {...newMenuItem, children: newChildren}
+          }
+          newMenu.push(newMenuItem)
+        }
+         
+          
+
+
+
         return {
           user: userData,
           resources: this.config.resources.map((res) => ({
             resourceId: res.resourceId,
             label: res.label,
           })),
-          menu: this.config.menu,
+          menu: newMenu,
           config: { 
             brandName: this.config.customization.brandName,
             brandLogo: this.config.customization.brandLogo,
@@ -671,12 +725,31 @@ class AdminForth implements AdminForthClass {
       },
     });
 
+    async function interpretResource(adminUser: AdminUser, resource: AdminForthResource, meta: any) {
+      await Promise.all(
+        Object.entries(resource.options?.allowedActions || {}).map(
+          async ([key, value]: [string, AllowedActionValue]) => {
+          // if callable then call
+          if (typeof value === 'function') {
+            resource.options.allowedActions[key] = await value( adminUser, resource, meta );
+          }
+        })
+      );
+    }
+
+    function checkAccess(action: AllowedActionsEnum, resource: AdminForthResource): { allowed: boolean, error?: string } {
+      const allowed = (resource.options?.allowedActions[action] as boolean | string | undefined);
+        if (allowed !== true) {
+          return { error: typeof allowed === 'string' ? allowed : 'Action is not allowed', allowed: false };
+        }
+        return { allowed: true };
+    }
    
 
     server.endpoint({
       method: 'POST',
       path: '/get_resource',
-      handler: async ({ body }) => {
+      handler: async ({ body, adminUser }) => {
         const { resourceId } = body;
         if (!this.statuses.dbDiscover) {
           return { error: 'Database discovery not started' };
@@ -688,6 +761,9 @@ class AdminForth implements AdminForthClass {
         if (!resource) {
           return { error: `Resource ${resourceId} not found` };
         }
+
+        await interpretResource(adminUser, resource, {});
+
         // exclude "plugins" key
         return { resource: { ...resource, plugins: undefined } };
       },
@@ -711,6 +787,14 @@ class AdminForth implements AdminForthClass {
           return { error: `Resource ${resourceId} not found` };
         }
 
+        await interpretResource(adminUser, resource, { requestBody: body });
+
+        const { allowed, error } = checkAccess(source as AllowedActionsEnum, resource);
+        console.log('allowed', allowed, error);
+        if (!allowed) {
+          return { error };
+        }
+
         for (const hook of listify(resource.hooks?.[source]?.beforeDatasourceRequest)) {
           const resp = await hook({ resource, query: body, adminUser });
           if (!resp || (!resp.ok && !resp.error)) {
@@ -723,6 +807,8 @@ class AdminForth implements AdminForthClass {
         }
         const { limit, offset, filters, sort } = body;
 
+        
+
         for (const filter of (filters || [])) {
           if (!Object.values(AdminForthFilterOperators).includes(filter.operator)) {
               throw new Error(`Operator '${filter.operator}' is not allowed`);
@@ -734,7 +820,7 @@ class AdminForth implements AdminForthClass {
 
           if (filter.operator === AdminForthFilterOperators.IN || filter.operator === AdminForthFilterOperators.NIN) {
               if (!Array.isArray(filter.value)) {
-                  throw new Error(`Value for operator '${filter.operator}'' should be an array`);
+                  throw new Error(`Value for operator '${filter.operator}' should be an array`);
               }
           }
 
@@ -922,12 +1008,17 @@ class AdminForth implements AdminForthClass {
         method: 'POST',
         path: '/create_record',
         handler: async ({ body, adminUser }) => {
-            console.log('create_record', body, this.config.resources);
             const resource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
             if (!resource) {
                 return { error: `Resource '${body['resourceId']}' not found` };
             }
-            
+            await interpretResource(adminUser, resource, { requestBody: body });
+
+            const { allowed, error } = checkAccess(AllowedActionsEnum.create, resource);
+            if (!allowed) {
+              return { error };
+            }
+
             const record = body['record'];
             // execute hook if needed
             for (const hook of listify(resource.hooks?.create?.beforeSave as BeforeSaveFunction[])) {
@@ -941,6 +1032,8 @@ class AdminForth implements AdminForthClass {
               }
             }
 
+            
+
             for (const column of resource.columns) {
                 if (column.fillOnCreate) {
                     if (body['record'][column.name] === undefined) {
@@ -1000,6 +1093,12 @@ class AdminForth implements AdminForthClass {
             if (!resource) {
                 return { error: `Resource '${body['resourceId']}' not found` };
             }
+            await interpretResource(adminUser, resource, { requestBody: body });
+
+            const { allowed, error } = checkAccess(AllowedActionsEnum.edit, resource);
+            if (!allowed) {
+              return { error };
+            }
 
             const recordId = body['recordId'];
             const connector = this.connectors[resource.dataSource];
@@ -1074,6 +1173,13 @@ class AdminForth implements AdminForthClass {
                 return { error: `Resource '${resource.resourceId}' does not allow delete action` };
             }
 
+            await interpretResource(adminUser, resource, { requestBody: body });
+
+            const { allowed, error } = checkAccess(AllowedActionsEnum.delete, resource);
+            if (!allowed) {
+              return { error };
+            }
+
             // execute hook if needed
             for (const hook of listify(resource.hooks?.delete?.beforeSave as BeforeSaveFunction[])) {
               const resp = await hook({ resource, record, adminUser });

package/modules/codeInjector.ts

@@ -149,7 +149,7 @@ class CodeInjector implements CodeInjectorType {
               routes += `{
                 path: '${item.path}',
                 name: '${item.path}',
-                component: () => import('${item.component}'),}
+                component: () => import('${item.component}'),
                 meta: { title: '${item?.meta?.title}'
               },\n` 
               

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.1.19",
+  "version": "1.1.21",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/plugins/AccessControl/index.ts

@@ -8,7 +8,7 @@ import { PluginOptions } from "./types.js";
 
 
 
-export default class AccessControlPlugin extends AdminForthPlugin {
+export default class AuditLogPlugin extends AdminForthPlugin {
  
   options: PluginOptions;
   adminforth: AdminForthClass;
@@ -25,59 +25,5 @@ export default class AccessControlPlugin extends AdminForthPlugin {
     super.modifyResourceConfig(adminforth, resourceConfig);
     this.adminforth = adminforth;
 
-    if (!resourceConfig.hooks) {
-      resourceConfig.hooks = {};
-    }
-
-    const checkAccess = async (adminUser: any, action: AllowedActionsEnum, meta: any) => {
-      const hasAccessOrError = await this.options.hasAccess(adminUser, action, meta);
-      if (hasAccessOrError === true) {
-        return { ok: true };
-      } else {
-        return { ok: false, error: hasAccessOrError || AccessControlPlugin.defaultError };
-      }
-    }
-
-    const bindHookCheck = (action: AllowedActionsEnum, hookName: string) => {
-      if (!resourceConfig.hooks[action]) {
-        resourceConfig.hooks[action] = {};
-      }
-      if (!resourceConfig.hooks[action][hookName]) {
-        resourceConfig.hooks[action][hookName] = [];
-      }
-      if (hookName === 'beforeDatasourceRequest') {
-        (resourceConfig.hooks[action][hookName] as Array<BeforeDataSourceRequestFunction>).unshift(
-          async ({adminUser, query}: {resource: AdminForthResource, adminUser: any, query: any}) => {
-            return checkAccess(adminUser, action, { query });
-          }
-        );
-      } else {
-        (resourceConfig.hooks[action][hookName] as Array<BeforeSaveFunction>).unshift(
-          async ({adminUser, record}: {resource: AdminForthResource, adminUser: any, record: any}) => {
-            return checkAccess(adminUser, action, { record });
-          }
-        );
-      }
-    }
-
-    // List check
-    bindHookCheck(AllowedActionsEnum.list, 'beforeDatasourceRequest');
-
-    // Show check
-    bindHookCheck(AllowedActionsEnum.show, 'beforeDatasourceRequest');
-
-    // Edit check
-    bindHookCheck(AllowedActionsEnum.edit, 'beforeDatasourceRequest');    
-
-    // create check
-    bindHookCheck(AllowedActionsEnum.create, 'beforeSave');
-
-    // edit check
-    bindHookCheck(AllowedActionsEnum.edit, 'beforeSave');
-
-    // delete check
-    bindHookCheck(AllowedActionsEnum.delete, 'beforeSave');
-
-    console.log('resourceConfig', resourceConfig);
   }
 }

package/plugins/AccessControl/types.ts

@@ -3,13 +3,5 @@ import { AllowedActionsEnum, AdminUser } from '../../types/AdminForthConfig.js';
 
 
 export type PluginOptions = {
-  /**
-   * Called to check if user has access to a page
-   * Should return `true` if user has access. If user has no access, return `false` or a string with an error message
-   * @param user - The user object
-   * @param action - The {@link AllowedActionsEnum} action
-   * @param meta - The meta object containing query for list/show or record for save/edit
-   * @returns {boolean | string} - 
-   */
-  hasAccess: (user: AdminUser, action: AllowedActionsEnum, meta: any) => Promise<boolean | string>;
+ 
 }

package/plugins/ForeignInlineListPlugin/custom/InlineList.vue

@@ -104,6 +104,7 @@ import {
   IconFilterOutline,
   IconPlusOutline,
 } from '@iconify-prerendered/vue-flowbite';
+import { showErrorTost, showWarningTost, showSuccesTost} from '@/composables/useFrontendApi';
 
 import { getIcon } from '@/utils';
 
@@ -145,10 +146,7 @@ const endFilters = computed(() => {
   const primaryKeyColumn = selfPrimaryKeyColumn.value;
 
   if (!refColumn) {
-    window.adminforth.alert({
-      message: `Column with foreignResource.resourceId which is equal to '${props.resource.resourceId}' not found in resource which is specified as foreighResourceId '${listResource.value.resourceId}'`,
-      variant: 'danger',
-    });
+    showErrorTost(`Column with foreignResource.resourceId which is equal to '${props.resource.resourceId}' not found in resource which is specified as foreighResourceId '${listResource.value.resourceId}'`,10000);
     return [];
   }
   return [
@@ -209,11 +207,7 @@ async function getList() {
   });
 
   if (data.error) {
-    window.adminforth.alert({
-      message: data.error,
-      variant: 'danger',
-      timeout: 'unlimited',
-    });
+    showErrorTost(data.error);
     rows.value = [];
     totalRows.value = 0;
     return;

package/spa/src/components/ResourceListTable.vue

@@ -190,7 +190,7 @@
           <button v-if="resource.options?.allowedActions.delete"
                   class="font-medium text-red-600 dark:text-red-500 hover:underline ms-3"
                   :data-tooltip-target="`tooltip-delete-${rowI}`"
-                  @click="showDeleteModal(row)"
+                  @click="deleteRecord(row)"
           >
             <IconTrashBinSolid class="w-5 h-5 me-2"/>
           </button>
@@ -272,10 +272,12 @@
 import { initFlowbite } from 'flowbite';
 import { computed, onMounted, ref, watch } from 'vue';
 import { useRoute } from 'vue-router';
+import { callAdminForthApi, getIcon } from '@/utils';
 
 import ValueRenderer from '@/components/ValueRenderer.vue';
 import { getCustomComponent } from '@/utils';
 import { useCoreStore } from '@/stores/core';
+import { showSuccesTost } from '@/composables/useFrontendApi';
 
 import {
 IconInboxOutline,
@@ -305,6 +307,7 @@ const emits = defineEmits([
   'update:page',
   'update:sort',
   'update:checkboxes',
+  'update:records'
 
 ]);
 
@@ -358,9 +361,11 @@ async function selectAll(value) {
 const totalPages = computed(() => Math.ceil(props.totalRows / props.pageSize));
 
 
+
+
 const allFromThisPageChecked = computed(() => {
-  if (!props.rows.value) return false;
-  return props.rows.value.every((r) => checkboxes.value.includes(r.id));
+  if (!props.rows) return false;
+  return props.rows.every((r) => props.checkboxes.includes(r.id));
 });
 const ascArr = computed(() => sort.value.filter((s) => s.direction === 'asc').map((s) => s.field));
 const descArr = computed(() => sort.value.filter((s) => s.direction === 'desc').map((s) => s.field));
@@ -380,4 +385,35 @@ function onSortButtonClick(field) {
   }
 }
 
+async function deleteRecord(row) {
+  const data = await window.adminforth.confirm({
+    message: 'Are you sure you want to delete this item?',
+    yes: 'Delete',
+    no: 'Cancel',
+  });
+  if (data) {
+    try {
+      const res = await callAdminForthApi({
+      path: '/delete_record',
+      method: 'POST',
+      body: {
+        resourceId: props.resource.resourceId,
+        primaryKey: row._primaryKeyValue,
+      }});
+      if (!res.error){
+        emits('update:records', true)
+        showSuccesTost('Record deleted successfully')
+      } else {
+        console.error(res.error)
+      }
+
+    } catch (e) {
+      console.error(e);
+      };
+    }
+
+    
+}
+
+
 </script>

package/spa/src/composables/useFrontendApi.ts

@@ -0,0 +1,14 @@
+export function showSuccesTost(message: string) {
+  window.adminforth.alert({ message, variant: 'success' });  
+  return message;
+}
+
+export function showWarningTost(message: string) {
+  window.adminforth.alert({ message, variant: 'warning' });  
+  return message;
+}
+
+export function showErrorTost(message: string, timeout?: number) {
+  window.adminforth.alert({ message, variant: 'danger', timeout: timeout || 'unlimited'});  
+  return message;
+}

package/spa/src/utils.ts

@@ -97,3 +97,5 @@ export function checkAcessByAllowedActions(allowedActions:any, action:any ) {
     router.back();
   }
 }
+
+

package/spa/src/views/CreateView.vue

@@ -78,6 +78,7 @@ import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
 import { onMounted, ref, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { computed } from 'vue';
+import { showErrorTost } from '@/composables/useFrontendApi';
 
 
 const isValid = ref(false);
@@ -141,11 +142,8 @@ async function saveRecord() {
     },
   });
   if (response.error) {
-    window.adminforth.alert({
-      message: response.error,
-      variant: 'danger',
-      timeout: 'unlimited',
-    })
+    showErrorTost(response.error);
+    
   }
   saving.value = false;
   if (route.query.returnTo) {

package/spa/src/views/EditView.vue

@@ -73,6 +73,7 @@ import { callAdminForthApi, getCustomComponent,checkAcessByAllowedActions } from
 import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
 import { computed, onMounted, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
+import { showErrorTost } from '@/composables/useFrontendApi';
 
 const coreStore = useCoreStore();
 
@@ -155,11 +156,7 @@ async function saveRecord() {
     },
   });
   if (resp.error) {
-    window.adminforth.alert({
-      message: resp.error,
-      variant: 'danger',
-      timeout: 'unlimited',
-    })
+    showErrorTost(resp.error);
   }
   saving.value = false;
   router.push({ name: 'resource-show', params: { resourceId: route.params.resourceId, primaryKey: coreStore.record[coreStore.primaryKey] } });

package/spa/src/views/ListView.vue

@@ -87,6 +87,7 @@
       @update:page="page = $event"
       @update:sort="sort = $event"
       @update:checkboxes="checkboxes = $event"
+      @update:records="getList"
       :pageSize="pageSize"
       :totalRows="totalRows"
       :checkboxes="checkboxes"
@@ -113,6 +114,7 @@ import { callAdminForthApi, getIcon } from '@/utils';
 import { initFlowbite } from 'flowbite';
 import { computed, onMounted, ref, watch } from 'vue';
 import { useRoute } from 'vue-router';
+import { showErrorTost } from '@/composables/useFrontendApi'
 
 import ValueRenderer from '@/components/ValueRenderer.vue';
 import { getCustomComponent } from '@/utils';
@@ -184,11 +186,7 @@ async function getList() {
     }
   });
   if (data.error) {
-    window.adminforth.alert({
-      message: data.error,
-      variant: 'danger',
-      timeout: 'unlimited',
-    });
+    showErrorTost(data.error);
     rows.value = [];
     totalRows.value = 0;
     return;
@@ -201,36 +199,9 @@ async function getList() {
 }
 
 
-function showDeleteModal(row) {
-  if (!coreStore.config?.deleteConfirmation) {
-    return deleteRecord(row);
-  }
-  modalStore.setModalContent({
-    content: 'Are you sure you want to delete this item?',
-    acceptText: 'Delete',
-    cancelText: 'Cancel',
-  });
-  modalStore.setOnAcceptFunction(() => {
-    return deleteRecord(row)
-  })
-  console.log('row', row);
-  modalStore.togleModal();
 
-}
 
-async function deleteRecord(row) {
-  await callAdminForthApi({
-    path: '/delete_record',
-    method: 'POST',
-    body: {
-      resourceId: route.params.resourceId,
-      primaryKey: row._primaryKeyValue,
-      recordId: row.id
-    }
-  });
-  await getList();
-  modalStore.resetmodalState()
-}
+
 
 async function startBulkAction(actionId) {
   const data = await callAdminForthApi({

package/types/AdminForthConfig.ts

@@ -833,9 +833,20 @@ export enum AllowedActionsEnum {
   filter = 'filter',
 }
 
+/**
+ * Defines whether user has access to an action, can statically be Boolean
+ * or function which returns Boolean or string with error message
+ * 
+ */
+export type AllowedActionValue = boolean | ((adminUser: AdminUser, resource: AdminForthResource, meta: any) => Promise<boolean | string>);
 
+/**
+ * Object which describes allowed actions for user.
+ */
 export type AllowedActions = {
-  [key in AllowedActionsEnum]?: boolean
+  [key in AllowedActionsEnum]?: AllowedActionValue
+} & {
+  all?: AllowedActionValue;
 }
   
 export type ValidationObject = {