adminforth 1.1.22 → 1.1.24

package/dist/index.js

@@ -23,7 +23,7 @@ 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, AllowedActionsEnum } from './types/AdminForthConfig.js';
+import { AdminForthFilterOperators, AdminForthDataTypes, AdminForthResourcePages, AllowedActionsEnum, ActionCheckSource } from './types/AdminForthConfig.js';
 import path from 'path';
 //get array from enum AdminForthResourcePages
 class AdminForth {
@@ -633,13 +633,13 @@ class AdminForth {
                 };
             }),
         });
-        function interpretResource(adminUser, resource, meta) {
+        function interpretResource(adminUser, resource, meta, source) {
             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);
+                        resource.options.allowedActions[key] = yield value({ adminUser, resource, meta, source });
                     }
                 })));
             });
@@ -667,7 +667,7 @@ class AdminForth {
                 if (!resource) {
                     return { error: `Resource ${resourceId} not found` };
                 }
-                yield interpretResource(adminUser, resource, {});
+                yield interpretResource(adminUser, resource, {}, ActionCheckSource.DisplayButtons);
                 // exclude "plugins" key
                 return { resource: Object.assign(Object.assign({}, resource), { plugins: undefined }) };
             }),
@@ -691,7 +691,7 @@ class AdminForth {
                 if (!resource) {
                     return { error: `Resource ${resourceId} not found` };
                 }
-                yield interpretResource(adminUser, resource, { requestBody: body });
+                yield interpretResource(adminUser, resource, { requestBody: body }, ActionCheckSource.DisplayButtons);
                 const { allowed, error } = checkAccess(source, resource);
                 console.log('allowed', allowed, error);
                 if (!allowed) {
@@ -891,7 +891,7 @@ class AdminForth {
                 if (!resource) {
                     return { error: `Resource '${body['resourceId']}' not found` };
                 }
-                yield interpretResource(adminUser, resource, { requestBody: body });
+                yield interpretResource(adminUser, resource, { requestBody: body }, ActionCheckSource.CreateRequest);
                 const { allowed, error } = checkAccess(AllowedActionsEnum.create, resource);
                 if (!allowed) {
                     return { error };
@@ -963,11 +963,6 @@ 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);
@@ -976,6 +971,11 @@ class AdminForth {
                     return { error: `Record with ${primaryKeyColumn.name} ${recordId} not found` };
                 }
                 const record = body['record'];
+                yield interpretResource(adminUser, resource, { requestBody: body, record, oldRecord }, ActionCheckSource.EditRequest);
+                const { allowed, error } = checkAccess(AllowedActionsEnum.edit, resource);
+                if (!allowed) {
+                    return { error };
+                }
                 // execute hook if needed
                 for (const hook of listify((_6 = (_5 = resource.hooks) === null || _5 === void 0 ? void 0 : _5.edit) === null || _6 === void 0 ? void 0 : _6.beforeSave)) {
                     const resp = yield hook({ resource, record, adminUser });
@@ -1035,7 +1035,7 @@ class AdminForth {
                 if (resource.options.allowedActions.delete === false) {
                     return { error: `Resource '${resource.resourceId}' does not allow delete action` };
                 }
-                yield interpretResource(adminUser, resource, { requestBody: body });
+                yield interpretResource(adminUser, resource, { requestBody: body }, ActionCheckSource.DeleteRequest);
                 const { allowed, error } = checkAccess(AllowedActionsEnum.delete, resource);
                 if (!allowed) {
                     return { error };

package/dist/plugins/AuditLog/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/spa/spa/src/composables/useFrontendApi.ts

@@ -12,3 +12,15 @@ export function showErrorTost(message: string, timeout?: number) {
   window.adminforth.alert({ message, variant: 'danger', timeout: timeout || 'unlimited'});  
   return message;
 }
+
+
+const useFrontendApi = () => {
+    return {
+        showSuccesTost,
+        showWarningTost,
+        showErrorTost
+    }
+}
+
+
+export default useFrontendApi;

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

@@ -16,7 +16,7 @@
         Edit
       </RouterLink>
 
-      <button v-if="coreStore?.resourceOptions?.allowedActions?.delete"  @click="showDeleteModal"
+      <button v-if="coreStore?.resourceOptions?.allowedActions?.delete"  @click="deleteRecord"
         class="flex items-center py-1 px-3 text-sm font-medium rounded-default text-red-600 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-red-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-red-500 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
       >
         <IconTrashBinSolid class="w-4 h-4" />
@@ -120,6 +120,7 @@ import { IconPenSolid, IconTrashBinSolid } from '@iconify-prerendered/vue-flowbi
 import { onMounted, ref } from 'vue';
 import { useRoute,useRouter } from 'vue-router';
 import {callAdminForthApi} from '@/utils';
+import {showSuccesTost} from '@/composables/useFrontendApi';
 
 
 const item = ref(null);
@@ -154,40 +155,34 @@ onMounted(async () => {
   loading.value = false;
 });
 
-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)
-  })
-  modalStore.togleModal();
-  
-
-}
-
 async function deleteRecord(row) {
-  try{
-    await callAdminForthApi({
+  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: route.params.resourceId,
         primaryKey: route.params.primaryKey,
-        recordId: route.params.primaryKey
+      }});
+      if (!res.error){
+        router.push({ name: 'resource-list', params: { resourceId: route.params.resourceId } });
+        showSuccesTost('Record deleted successfully')
+      } else {
+        console.error(res.error)
       }
-    });
-    router.push({ name: 'resource-list', params: { resourceId: route.params.resourceId } });
-  } catch (error) {
-    console.log(error);
-  }
 
-  modalStore.resetmodalState()
+    } catch (e) {
+      console.error(e);
+      };
+    }
+
+    
 }
 
 </script>

package/dist/types/AdminForthConfig.js

@@ -61,6 +61,15 @@ export var AllowedActionsEnum;
     AllowedActionsEnum["delete"] = "delete";
     AllowedActionsEnum["filter"] = "filter";
 })(AllowedActionsEnum || (AllowedActionsEnum = {}));
+export var ActionCheckSource;
+(function (ActionCheckSource) {
+    ActionCheckSource["DisplayButtons"] = "displayButtons";
+    ActionCheckSource["ListRequest"] = "listRequest";
+    ActionCheckSource["ShowRequest"] = "showRequest";
+    ActionCheckSource["EditRequest"] = "editRequest";
+    ActionCheckSource["CreateRequest"] = "createRequest";
+    ActionCheckSource["DeleteRequest"] = "deleteRequest";
+})(ActionCheckSource || (ActionCheckSource = {}));
 export var AdminForthDataTypes;
 (function (AdminForthDataTypes) {
     AdminForthDataTypes["STRING"] = "string";

package/index.ts

@@ -16,11 +16,11 @@ import { AdminForthConfig, AdminForthClass, AdminForthComponentDeclaration, Admi
   BeforeDataSourceRequestFunction,
   AfterDataSourceResponseFunction, AllowedActionValue, AdminUser,
   AdminForthResource,
-  AllowedActionsEnum
+  AllowedActionsEnum,
+  ActionCheckSource
 } 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
@@ -697,10 +697,6 @@ class AdminForth implements AdminForthClass {
           }
           newMenu.push(newMenuItem)
         }
-         
-          
-
-
 
         return {
           user: userData,
@@ -725,13 +721,13 @@ class AdminForth implements AdminForthClass {
       },
     });
 
-    async function interpretResource(adminUser: AdminUser, resource: AdminForthResource, meta: any) {
+    async function interpretResource(adminUser: AdminUser, resource: AdminForthResource, meta: any, source: ActionCheckSource) {
       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 );
+            resource.options.allowedActions[key] = await value({ adminUser, resource, meta, source });
           }
         })
       );
@@ -762,7 +758,7 @@ class AdminForth implements AdminForthClass {
           return { error: `Resource ${resourceId} not found` };
         }
 
-        await interpretResource(adminUser, resource, {});
+        await interpretResource(adminUser, resource, {}, ActionCheckSource.DisplayButtons);
 
         // exclude "plugins" key
         return { resource: { ...resource, plugins: undefined } };
@@ -787,7 +783,7 @@ class AdminForth implements AdminForthClass {
           return { error: `Resource ${resourceId} not found` };
         }
 
-        await interpretResource(adminUser, resource, { requestBody: body });
+        await interpretResource(adminUser, resource, { requestBody: body }, ActionCheckSource.DisplayButtons);
 
         const { allowed, error } = checkAccess(source as AllowedActionsEnum, resource);
         console.log('allowed', allowed, error);
@@ -1012,7 +1008,7 @@ class AdminForth implements AdminForthClass {
             if (!resource) {
                 return { error: `Resource '${body['resourceId']}' not found` };
             }
-            await interpretResource(adminUser, resource, { requestBody: body });
+            await interpretResource(adminUser, resource, { requestBody: body}, ActionCheckSource.CreateRequest);
 
             const { allowed, error } = checkAccess(AllowedActionsEnum.create, resource);
             if (!allowed) {
@@ -1093,13 +1089,7 @@ 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];
             const oldRecord = await connector.getRecordByPrimaryKey(resource, recordId)
@@ -1109,6 +1099,13 @@ class AdminForth implements AdminForthClass {
             }
             const record = body['record'];
 
+            await interpretResource(adminUser, resource, { requestBody: body, record, oldRecord}, ActionCheckSource.EditRequest);
+
+            const { allowed, error } = checkAccess(AllowedActionsEnum.edit, resource);
+            if (!allowed) {
+              return { error };
+            }
+
             // execute hook if needed
             for (const hook of listify(resource.hooks?.edit?.beforeSave as BeforeSaveFunction[])) {
               const resp = await hook({ resource, record, adminUser });
@@ -1173,7 +1170,7 @@ class AdminForth implements AdminForthClass {
                 return { error: `Resource '${resource.resourceId}' does not allow delete action` };
             }
 
-            await interpretResource(adminUser, resource, { requestBody: body });
+            await interpretResource(adminUser, resource, { requestBody: body }, ActionCheckSource.DeleteRequest);
 
             const { allowed, error } = checkAccess(AllowedActionsEnum.delete, resource);
             if (!allowed) {

package/package.json

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

package/plugins/AuditLog/types.ts

@@ -0,0 +1,4 @@
+
+
+export type PluginOptions = {
+}

package/spa/src/composables/useFrontendApi.ts

@@ -12,3 +12,15 @@ export function showErrorTost(message: string, timeout?: number) {
   window.adminforth.alert({ message, variant: 'danger', timeout: timeout || 'unlimited'});  
   return message;
 }
+
+
+const useFrontendApi = () => {
+    return {
+        showSuccesTost,
+        showWarningTost,
+        showErrorTost
+    }
+}
+
+
+export default useFrontendApi;

package/spa/src/views/ShowView.vue

@@ -16,7 +16,7 @@
         Edit
       </RouterLink>
 
-      <button v-if="coreStore?.resourceOptions?.allowedActions?.delete"  @click="showDeleteModal"
+      <button v-if="coreStore?.resourceOptions?.allowedActions?.delete"  @click="deleteRecord"
         class="flex items-center py-1 px-3 text-sm font-medium rounded-default text-red-600 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-red-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-red-500 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
       >
         <IconTrashBinSolid class="w-4 h-4" />
@@ -120,6 +120,7 @@ import { IconPenSolid, IconTrashBinSolid } from '@iconify-prerendered/vue-flowbi
 import { onMounted, ref } from 'vue';
 import { useRoute,useRouter } from 'vue-router';
 import {callAdminForthApi} from '@/utils';
+import {showSuccesTost} from '@/composables/useFrontendApi';
 
 
 const item = ref(null);
@@ -154,40 +155,34 @@ onMounted(async () => {
   loading.value = false;
 });
 
-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)
-  })
-  modalStore.togleModal();
-  
-
-}
-
 async function deleteRecord(row) {
-  try{
-    await callAdminForthApi({
+  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: route.params.resourceId,
         primaryKey: route.params.primaryKey,
-        recordId: route.params.primaryKey
+      }});
+      if (!res.error){
+        router.push({ name: 'resource-list', params: { resourceId: route.params.resourceId } });
+        showSuccesTost('Record deleted successfully')
+      } else {
+        console.error(res.error)
       }
-    });
-    router.push({ name: 'resource-list', params: { resourceId: route.params.resourceId } });
-  } catch (error) {
-    console.log(error);
-  }
 
-  modalStore.resetmodalState()
+    } catch (e) {
+      console.error(e);
+      };
+    }
+
+    
 }
 
 </script>

package/types/AdminForthConfig.ts

@@ -838,7 +838,29 @@ export enum AllowedActionsEnum {
  * or function which returns Boolean or string with error message
  * 
  */
-export type AllowedActionValue = boolean | ((adminUser: AdminUser, resource: AdminForthResource, meta: any) => Promise<boolean | string>);
+export type AllowedActionValue = boolean | (({adminUser, resource, meta, source}: {
+  adminUser: AdminUser,
+  resource: AdminForthResource,
+
+  /**
+   * Meta object which will pass request information just in case
+   */
+  meta: any,
+
+  /**
+   * Source of the check
+   */
+  source: ActionCheckSource,
+}) => Promise<boolean | string>);
+
+export enum ActionCheckSource {
+  DisplayButtons = 'displayButtons',
+  ListRequest = 'listRequest',
+  ShowRequest = 'showRequest',
+  EditRequest = 'editRequest',
+  CreateRequest = 'createRequest',
+  DeleteRequest = 'deleteRequest',
+}
 
 /**
  * Object which describes allowed actions for user.

package/plugins/AccessControl/types.ts

@@ -1,7 +0,0 @@
-
-import { AllowedActionsEnum, AdminUser } from '../../types/AdminForthConfig.js';
-
-
-export type PluginOptions = {
- 
-}