adminforth 1.1.23 → 1.1.25

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

@@ -23,12 +23,11 @@
 
     <ResourceForm 
       v-else
-      :record="editableRecord"
+      :record="coreStore.record"
       :resourceColumns="coreStore.resourceColumns"
       @update:record="onUpdateRecord"
       @update:isValid="isValid = $event"
       :validating="validating"
-      :customComponentsPerColumn="editComponentsPerColumn"
     >
     </ResourceForm>
   </div>
@@ -37,14 +36,14 @@
 
 <script setup>
 
-import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
-import ResourceForm from '@/components/ResourceForm.vue';
-import SingleSkeletLoader from '@/components/SingleSkeletLoader.vue';
+import { ref, computed, onMounted } from 'vue';  
+import { useRoute, useRouter } from 'vue-router';
 import { useCoreStore } from '@/stores/core';
-import { callAdminForthApi, getCustomComponent } from '@/utils';
+import ResourceForm from '@/components/ResourceForm.vue';
+import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
 import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
-import { computed, onMounted, ref } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import SingleSkeletLoader from '@/components/SingleSkeletLoader.vue';
+import { callAdminForthApi } from '@/utils';
 
 const coreStore = useCoreStore();
 
@@ -59,24 +58,11 @@ const loading = ref(false);
 const saving = ref(false);
 
 const record = ref({});
-let editComponentsPerColumn = {};
 
 async function onUpdateRecord(newRecord) {
   record.value = newRecord;
 }
 
-const editableRecord = computed(() => {
-  const newRecord = { ...coreStore.record };
-  if (!coreStore.resourceColumns) {
-    return {};
-  }
-  coreStore.resourceColumns.forEach(column => {
-    if (column.foreignResource) {
-      newRecord[column.name] = newRecord[column.name]?.pk
-    }
-  });
-  return newRecord;
-})
 
 onMounted(async () => {
   loading.value = true;
@@ -89,12 +75,6 @@ onMounted(async () => {
     primaryKey: route.params.primaryKey,
   });
 
-  editComponentsPerColumn = coreStore.resourceColumns.reduce((acc, column) => {
-      if (column.component?.edit) {
-          acc[column.name] = getCustomComponent(column.component.edit);
-      }
-      return acc;
-    }, {});
   loading.value = false;
 });
 
@@ -107,21 +87,13 @@ async function saveRecord() {
   }
 
   saving.value = true;
-
-  const updates = {};
-  for (const key in record.value) {
-    if (record.value[key] !== coreStore.record[key]) {
-      updates[key] = record.value[key];
-    }
-  }
-
   await callAdminForthApi({
     method: 'POST',
     path: `/update_record`,
     body: {
       resourceId: route.params.resourceId,
       recordId: route.params.primaryKey,
-      record: updates,
+      record: record.value,
     },
   });
   saving.value = false;

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

@@ -0,0 +1,8 @@
+<script setup lang="ts">
+</script>
+
+<template>
+  <main>
+    123
+  </main>
+</template>

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

@@ -65,7 +65,7 @@
     </BreadcrumbsWithButtons>
 
     <!-- table -->
-    <div class="relative overflow-x-auto shadow-list-table-shadow dark:shadow-black	  dark:s">
+    <div class="relative overflow-x-auto shadow-md sm:rounded-lg dark:shadow-2xl">
 
 
       <!-- skelet loader -->
@@ -90,7 +90,7 @@
       </div>
 
       <table v-else class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400">
-        <thead class="text-xs text-view-table-heading-text bg-list-view-table-heading dark:bg-gray-700 dark:text-gray-400">
+        <thead class="text-xs text-gray-700 bg-gray-50 dark:bg-gray-700 dark:text-gray-400">
         <tr>
           <th scope="col" class="p-4">
             <div v-if="rows && rows.length" class="flex items-center">
@@ -127,7 +127,7 @@
         </tr>
         </thead>
         <tbody>
-        <tr v-if="!rows" class="bg-list-view-table-bg border-b dark:bg-gray-800 dark:border-gray-700">
+        <tr v-if="!rows" class="bg-white border-b dark:bg-gray-800 dark:border-gray-700">
           <td :colspan="coreStore.resourceColumns.length + 2">
 
             <div role="status"
@@ -171,7 +171,7 @@
             </div>
           </td>
         </tr>
-        <tr v-else-if="rows.length === 0" class="bg-list-view-table-bg border-b dark:bg-gray-800 dark:border-gray-700">
+        <tr v-else-if="rows.length === 0" class="bg-white border-b dark:bg-gray-800 dark:border-gray-700">
           <td :colspan="coreStore.resourceColumns.length + 2">
 
             <div id="toast-simple"
@@ -185,7 +185,7 @@
         </tr>
 
         <tr v-else v-for="(row, rowI) in rows" :key="row.id"
-            class="bg-list-view-table-bg border-b dark:bg-gray-800 border-list-view-border-color dark:border-gray-700 hover:bg-list-view-table-row-hover dark:hover:bg-gray-600">
+            class="bg-white border-b dark:bg-gray-800 dark:border-gray-700 hover:bg-gray-50 dark:hover:bg-gray-600">
           <td class="w-4 p-4">
             <div class="flex items center">
               <input
@@ -198,12 +198,7 @@
             </div>
           </td>
           <td v-for="c in columnsListed" class="px-6 py-4">
-            <!-- if c.name in listComponentsPerColumn, render it. If not, render ValueRenderer -->
-            <component
-              :is="listComponentsPerColumn[c.name] || ValueRenderer"
-              :column="c"
-              :row="row"
-            />
+            <ValueRenderer :column="c" :row="row"/>
           </td>
           <td class="flex items-center px-6 py-4">
 
@@ -315,28 +310,29 @@
 </template>
 
 <script setup>
+import {ref, onMounted, watch, computed} from 'vue';
+import {callAdminForthApi, getIcon} from '@/utils';
+import {useRoute} from 'vue-router';
+import {useCoreStore} from '@/stores/core';
+import {useModalStore} from '@/stores/modal';
 import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
-import { useCoreStore } from '@/stores/core';
-import { useModalStore } from '@/stores/modal';
-import { callAdminForthApi, getIcon } from '@/utils';
-import { initFlowbite } from 'flowbite';
-import { computed, onMounted, ref, watch } from 'vue';
-import { useRoute } from 'vue-router';
+import {initFlowbite} from 'flowbite'
 
 import ValueRenderer from '@/components/ValueRenderer.vue';
-import { getCustomComponent } from '@/utils';
 
 import {
-IconInboxOutline,
-IconPlusOutline
+  IconChevronDoubleLeftOutline,
+  IconChevronDoubleRightOutline,
+  IconInboxFullSolid,
+  IconInboxOutline,
+  IconPlusOutline
 } from '@iconify-prerendered/vue-flowbite';
 
 import {
-IconBanOutline,
-IconEyeSolid,
-IconFilterOutline,
-IconPenSolid,
-IconTrashBinSolid
+  IconEyeSolid,
+  IconTrashBinSolid,
+  IconPenSolid,
+  IconFilterOutline, IconBanOutline
 } from '@iconify-prerendered/vue-flowbite';
 
 import Filters from '@/components/Filters.vue';
@@ -361,6 +357,7 @@ const totalRows = ref(0);
 const allCheckedActions = ref([]);
 const allowedActions = ref({});
 
+
 const DEFAULT_PAGE_SIZE = 10;
 
 const columnsListed = computed(() => coreStore.resourceColumns?.filter(c => c.showIn.includes('list')));
@@ -379,7 +376,6 @@ async function selectAll(value) {
 
 const pageSize = computed(() => coreStore.resourceById[route.params.resourceId]?.pageSize || DEFAULT_PAGE_SIZE);
 const totalPages = computed(() => Math.ceil(totalRows.value / pageSize.value));
-let listComponentsPerColumn = {};
 const allFromThisPageChecked = computed(() => {
   if (!rows.value) return false;
   return rows.value.every((r) => checkboxes.value.includes(r.id));
@@ -423,7 +419,6 @@ async function getList() {
     path: '/get_resource_data',
     method: 'POST',
     body: {
-      source: 'list',
       resourceId: route.params.resourceId,
       limit: pageSize.value,
       offset: (page.value - 1) * pageSize.value,
@@ -431,14 +426,7 @@ async function getList() {
       sort: sort.value,
     }
   });
-  listComponentsPerColumn = coreStore.resourceColumns.reduce((acc, column) => {
-      if (column.component?.list) {
-          acc[column.name] = getCustomComponent(column.component.list);
-      }
-      return acc;
-    }, {});
-
-fetchStatus.value.pending = false;
+  fetchStatus.value.pending = false;
   rows.value = data.data?.map(row => {
     row._primaryKeyValue = row[coreStore.resourceColumns.find(c => c.primaryKey).name];
     return row;

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

@@ -11,7 +11,7 @@
     <div id="authentication-modal" tabindex="-1" class=" overflow-y-auto overflow-x-hidden z-50 min-w-[400px] justify-center items-center md:inset-0 h-[calc(100%-1rem)] max-h-full">
         <div class="relative p-4 w-full max-w-md max-h-full">
             <!-- Modal content -->
-            <div class="relative bg-white rounded-lg shadow dark:bg-gray-700 dark:shadow-black" >
+            <div class="relative bg-white rounded-lg shadow dark:bg-gray-700">
                 <!-- Modal header -->
                 <div class="flex items-center justify-between p-4 md:p-5 border-b rounded-t dark:border-gray-600">
                     <h3 class="text-xl font-semibold text-gray-900 dark:text-white">

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

@@ -1,5 +1,5 @@
 <template>
-  <div :key="`${$route?.params.resourceId}---${$route?.params.primaryKey}`">
+  <div>
     <RouterView/>
   </div>
 </template>

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

@@ -27,10 +27,10 @@
     </div>
     <div 
       v-else
-      class="relative overflow-x-auto shadow-resourse-form-shadow "
+      class="relative overflow-x-auto shadow-md sm:rounded-lg"
     >
      <table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400">
-        <thead class="text-xs text-gray-700 uppercase bg-form-view-heading dark:bg-gray-700 dark:text-gray-400">
+        <thead class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400">
             <tr>
                 <th scope="col" class="px-6 py-3">
                     Field
@@ -42,17 +42,13 @@
         </thead>
         <tbody>
             <tr v-for="column in coreStore.resourceColumns?.filter(c => c.showIn.includes('show'))" :key="column.name"
-                class="bg-form-view-bg odd:dark:bg-gray-900  even:dark:bg-gray-800 border-b  dark:border-gray-700"
+                class="odd:bg-white odd:dark:bg-gray-900 even:bg-gray-50 even:dark:bg-gray-800 border-b dark:border-gray-700"
             >
                 <td class="px-6 py-4 whitespace-nowrap">
                     {{ column.label }}
                 </td>
                 <td class="px-6 py-4 whitespace-nowrap whitespace-pre-wrap">
-                    <component
-                        :is="showComponentsPerColumn[column.name] || ValueRenderer"
-                        :column="column"
-                        :row="coreStore.record"
-                    />
+                    <ValueRenderer :column="column" :row="coreStore.record" />
                 </td>
             </tr>
             
@@ -67,19 +63,18 @@
 
 <script setup>
 
+import { ref, computed, onMounted } from 'vue';  
+import { useRoute } from 'vue-router';
+import { callAdminForthApi } from '@/utils';
 import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
-import ValueRenderer from '@/components/ValueRenderer.vue';
-import { useCoreStore } from '@/stores/core';
-import { getCustomComponent } from '@/utils';
 import { IconPenSolid, IconTrashBinSolid } from '@iconify-prerendered/vue-flowbite';
-import { onMounted, ref } from 'vue';
-import { useRoute } from 'vue-router';
+import { useCoreStore } from '@/stores/core';
+import ValueRenderer from '@/components/ValueRenderer.vue';
 
 
 const item = ref(null);
 const route = useRoute();
 const loading = ref(false);
-let showComponentsPerColumn = {};
 
 const coreStore = useCoreStore();
 
@@ -92,12 +87,6 @@ onMounted(async () => {
     resourceId: route.params.resourceId, 
     primaryKey: route.params.primaryKey,
   });
-  showComponentsPerColumn = coreStore.resourceColumns.reduce((acc, column) => {
-      if (column.component?.show) {
-          acc[column.name] = getCustomComponent(column.component.show);
-      }
-      return acc;
-    }, {});
   loading.value = false;
 });
 

package/dist/spa/tailwind.config.js

@@ -1,12 +1,9 @@
 /** @type {import('tailwindcss').Config} */
 export default {
-  content:  ["./src/**/*.{vue, js}","./src/*.{vue, js}", "./index.html", "./node_modules/flowbite/**/*.js"],
+  content:  ["./src/**/*.{vue, js}", "./node_modules/flowbite/**/*.js"],
   theme: {
-    extend: {
-      /* IMPORTANT:ADMINFORTH TAILWIND STYLES */
-  }
+    extend: {},
   },
-
   darkMode: 'class',
   plugins: [
     require('flowbite/plugin'),

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,7 +16,8 @@ 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';
@@ -696,10 +697,6 @@ class AdminForth implements AdminForthClass {
           }
           newMenu.push(newMenuItem)
         }
-         
-          
-
-
 
         return {
           user: userData,
@@ -724,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 });
           }
         })
       );
@@ -761,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 } };
@@ -786,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);
@@ -1011,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) {
@@ -1092,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)
@@ -1108,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 });
@@ -1172,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.23",
+  "version": "1.1.25",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/plugins/AuditLog/index.ts

@@ -0,0 +1,29 @@
+import { 
+  AdminForthResource, AdminForthClass, BeforeDataSourceRequestFunction,
+  AllowedActionsEnum,
+  BeforeSaveFunction
+} from "../../types/AdminForthConfig.js";
+import AdminForthPlugin from "../base.js";
+import { PluginOptions } from "./types.js";
+
+
+
+export default class AuditLogPlugin extends AdminForthPlugin {
+ 
+  options: PluginOptions;
+  adminforth: AdminForthClass;
+
+  constructor(options: PluginOptions) {
+    super(options, import.meta.url);
+    this.options = options;
+  }
+
+  static defaultError = 'Sorry, you do not have access to this resource.'
+
+
+  modifyResourceConfig(adminforth: AdminForthClass, resourceConfig: AdminForthResource) {
+    super.modifyResourceConfig(adminforth, resourceConfig);
+    this.adminforth = adminforth;
+
+  }
+}

package/plugins/AuditLog/types.ts

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

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.