adminforth 1.1.67 → 1.1.68

package/dataConnectors/mongo.ts

@@ -34,8 +34,8 @@ class MongoConnector implements AdminForthDataSourceConnector {
     };
 
     SortDirectionsMap = {
-        [AdminForthSortDirections.ASC]: 1,
-        [AdminForthSortDirections.DESC]: -1,
+        [AdminForthSortDirections.asc]: 1,
+        [AdminForthSortDirections.desc]: -1,
     };
 
     async discoverFields(resource) {
@@ -68,13 +68,13 @@ class MongoConnector implements AdminForthDataSourceConnector {
         if (!value) {
         return null;
         }
-        return dayjs.unix(value).toISOString();
+        return dayjs(Date.parse(value)).toISOString();
 
         } else if (field.type == AdminForthDataTypes.DATE) {
             if (!value) {
                 return null;
             }
-            return dayjs(value).toISOString().split('T')[0];
+            return dayjs(Date.parse(value)).toISOString().split('T')[0];
 
         } else if (field.type == AdminForthDataTypes.BOOLEAN) {
           return !!value;

package/dataConnectors/postgres.ts

@@ -37,8 +37,8 @@ class PostgresConnector implements AdminForthDataSourceConnector {
       };
   
       SortDirectionsMap = {
-        [AdminForthSortDirections.ASC]: 'ASC',
-        [AdminForthSortDirections.DESC]: 'DESC',
+        [AdminForthSortDirections.asc]: 'ASC',
+        [AdminForthSortDirections.desc]: 'DESC',
       };
 
     async discoverFields(resource) {

package/dataConnectors/sqlite.ts

@@ -141,8 +141,8 @@ class SQLiteConnector implements AdminForthDataSourceConnector {
     };
 
     SortDirectionsMap = {
-      [AdminForthSortDirections.ASC]: 'ASC',
-      [AdminForthSortDirections.DESC]: 'DESC',
+      [AdminForthSortDirections.asc]: 'ASC',
+      [AdminForthSortDirections.desc]: 'DESC',
     };
     
 

package/dist/dataConnectors/mongo.js

@@ -25,8 +25,8 @@ class MongoConnector {
             [AdminForthFilterOperators.NIN]: (value) => ({ $nin: value }),
         };
         this.SortDirectionsMap = {
-            [AdminForthSortDirections.ASC]: 1,
-            [AdminForthSortDirections.DESC]: -1,
+            [AdminForthSortDirections.asc]: 1,
+            [AdminForthSortDirections.desc]: -1,
         };
         this.db = new MongoClient(url);
         (() => __awaiter(this, void 0, void 0, function* () {
@@ -71,13 +71,13 @@ class MongoConnector {
             if (!value) {
                 return null;
             }
-            return dayjs.unix(value).toISOString();
+            return dayjs(Date.parse(value)).toISOString();
         }
         else if (field.type == AdminForthDataTypes.DATE) {
             if (!value) {
                 return null;
             }
-            return dayjs(value).toISOString().split('T')[0];
+            return dayjs(Date.parse(value)).toISOString().split('T')[0];
         }
         else if (field.type == AdminForthDataTypes.BOOLEAN) {
             return !!value;

package/dist/dataConnectors/postgres.js

@@ -26,8 +26,8 @@ class PostgresConnector {
             [AdminForthFilterOperators.NIN]: 'NOT IN',
         };
         this.SortDirectionsMap = {
-            [AdminForthSortDirections.ASC]: 'ASC',
-            [AdminForthSortDirections.DESC]: 'DESC',
+            [AdminForthSortDirections.asc]: 'ASC',
+            [AdminForthSortDirections.desc]: 'DESC',
         };
         this.db = new Client({
             connectionString: url

package/dist/dataConnectors/sqlite.js

@@ -26,8 +26,8 @@ class SQLiteConnector {
             [AdminForthFilterOperators.NIN]: 'NOT IN',
         };
         this.SortDirectionsMap = {
-            [AdminForthSortDirections.ASC]: 'ASC',
-            [AdminForthSortDirections.DESC]: 'DESC',
+            [AdminForthSortDirections.asc]: 'ASC',
+            [AdminForthSortDirections.desc]: 'DESC',
         };
         this.db = betterSqlite3(url.replace('sqlite://', ''));
     }

package/dist/plugins/AuditLogPlugin/index.js

@@ -7,6 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { AllowedActionsEnum, AdminForthSortDirections } from "../../types/AdminForthConfig.js";
 import AdminForthPlugin from "../base.js";
 class AuditLogPlugin extends AdminForthPlugin {
     constructor(options) {
@@ -16,15 +17,41 @@ class AuditLogPlugin extends AdminForthPlugin {
             const recordIdFieldName = (_a = resource.columns.find((c) => c.primaryKey === true)) === null || _a === void 0 ? void 0 : _a.name;
             const recordId = (data === null || data === void 0 ? void 0 : data[recordIdFieldName]) || (oldRecord === null || oldRecord === void 0 ? void 0 : oldRecord[recordIdFieldName]);
             const connector = this.adminforth.connectors[resource.dataSource];
-            const newRecord = yield connector.getRecordByPrimaryKey(resource, recordId);
-            let newData = {
-                'oldRecord': oldRecord || {},
-                'newRecord': newRecord
-            };
+            const newRecord = action == AllowedActionsEnum.delete ? {} : (yield connector.getRecordByPrimaryKey(resource, recordId)) || {};
+            if (action !== AllowedActionsEnum.delete) {
+                oldRecord = oldRecord ? JSON.parse(JSON.stringify(oldRecord)) : {};
+            }
+            else {
+                oldRecord = data;
+            }
+            if (action !== AllowedActionsEnum.delete) {
+                const columnsNamesList = resource.columns.map((c) => c.name);
+                columnsNamesList.forEach((key) => {
+                    if (JSON.stringify(oldRecord[key]) == JSON.stringify(newRecord[key])) {
+                        delete oldRecord[key];
+                        delete newRecord[key];
+                    }
+                });
+            }
+            const backendOnlyColumns = resource.columns.filter((c) => c.backendOnly);
+            backendOnlyColumns.forEach((c) => {
+                if (JSON.stringify(oldRecord[c.name]) != JSON.stringify(newRecord[c.name])) {
+                    if (action !== AllowedActionsEnum.delete) {
+                        newRecord[c.name] = '<hidden value after>';
+                    }
+                    if (action !== AllowedActionsEnum.create) {
+                        oldRecord[c.name] = '<hidden value before>';
+                    }
+                }
+                else {
+                    delete oldRecord[c.name];
+                    delete newRecord[c.name];
+                }
+            });
             const record = {
                 [this.options.resourceColumns.resourceIdColumnName]: resource.resourceId,
                 [this.options.resourceColumns.resourceActionColumnName]: action,
-                [this.options.resourceColumns.resourceDataColumnName]: newData,
+                [this.options.resourceColumns.resourceDataColumnName]: { 'oldRecord': oldRecord || {}, 'newRecord': newRecord },
                 [this.options.resourceColumns.resourceUserIdColumnName]: user.pk,
                 [this.options.resourceColumns.resourceRecordIdColumnName]: recordId,
                 [this.options.resourceColumns.resourceCreatedColumnName]: new Date()
@@ -53,18 +80,23 @@ class AuditLogPlugin extends AdminForthPlugin {
                         // type: AdminForthDataTypes.STRING
                     };
                 }
+                diffColumn.showIn = ['show'];
                 diffColumn.components = {
                     show: {
                         file: this.componentPath('AuditLogView.vue'),
                         meta: Object.assign(Object.assign({}, this.options), { pluginInstanceId: this.pluginInstanceId })
                     }
                 };
+                resource.options.defaultSort = {
+                    columnName: this.options.resourceColumns.resourceCreatedColumnName,
+                    direction: AdminForthSortDirections.desc
+                };
                 return;
             }
             const defaultHooks = {
                 create: { afterSave: [] },
                 edit: { afterSave: [] },
-                delete: { afterSave: [] }
+                delete: { beforeSave: [] }
             };
             if (!resource.hooks) {
                 resource.hooks = defaultHooks;
@@ -73,10 +105,11 @@ class AuditLogPlugin extends AdminForthPlugin {
                 resource.hooks = Object.assign(Object.assign({}, defaultHooks), resource.hooks);
             }
             Object.keys(resource.hooks).forEach((hook) => {
-                if (!Array.isArray(resource.hooks[hook].afterSave)) {
-                    resource.hooks[hook].afterSave = [resource.hooks[hook].afterSave];
+                const hookToUse = hook == AllowedActionsEnum.delete ? 'beforeSave' : 'afterSave';
+                if (!Array.isArray(resource.hooks[hook][hookToUse])) {
+                    resource.hooks[hook][hookToUse] = [resource.hooks[hook][hookToUse]];
                 }
-                resource.hooks[hook].afterSave.push((_a) => __awaiter(this, [_a], void 0, function* ({ resource, record, adminUser, oldRecord }) {
+                resource.hooks[hook][hookToUse].push((_a) => __awaiter(this, [_a], void 0, function* ({ resource, record, adminUser, oldRecord }) {
                     return yield this.createLogRecord(resource, hook, record, adminUser, oldRecord);
                 }));
             });

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

@@ -252,7 +252,8 @@ const props = defineProps([
   'rows',
   'totalRows',
   'pageSize',
-  'checkboxes'
+  'checkboxes',
+  'sort'
 ])
 
 // emits, update page
@@ -288,6 +289,10 @@ watch(() => props.checkboxes, (newCheckboxes) => {
   checkboxesInternal.value = newCheckboxes;
 });
 
+watch(() => props.sort, (newSort) => {
+  sort.value = newSort;
+});
+
 function addToCheckedValues(id) {
   if (checkboxesInternal.value.includes(id)) {
     checkboxesInternal.value = checkboxesInternal.value.filter((item) => item !== id);

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

@@ -89,6 +89,7 @@
       @update:sort="sort = $event"
       @update:checkboxes="checkboxes = $event"
       @update:records="getList"
+      :sort="sort"
       :pageSize="pageSize"
       :totalRows="totalRows"
       :checkboxes="checkboxes"
@@ -229,6 +230,15 @@ async function init() {
     resourceId: route.params.resourceId
   });
 
+  if (coreStore.resource.options?.defaultSort) {
+    sort.value = [{
+        field: coreStore.resource.options.defaultSort.columnName,
+        direction: coreStore.resource.options.defaultSort.direction
+    }];
+  } else {
+    sort.value = [];
+  }
+
   await getList();
   columnsMinMax.value = await callAdminForthApi({
     path: '/get_min_max_for_columns',
@@ -250,7 +260,6 @@ onMounted(async () => {
 watch(() => route.params.resourceId, async () => {
   filtersStore.setFilters([]);
   checkboxes.value = [];
-  sort.value = [];
   await init();
 });
 

package/dist/types/AdminForthConfig.js

@@ -99,7 +99,7 @@ export var AdminForthFilterOperators;
 ;
 export var AdminForthSortDirections;
 (function (AdminForthSortDirections) {
-    AdminForthSortDirections["ASC"] = "asc";
-    AdminForthSortDirections["DESC"] = "desc";
+    AdminForthSortDirections["asc"] = "asc";
+    AdminForthSortDirections["desc"] = "desc";
 })(AdminForthSortDirections || (AdminForthSortDirections = {}));
 ;

package/package.json

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

package/plugins/AuditLogPlugin/index.ts

@@ -6,7 +6,8 @@ import {
   AdminUser,
   AdminForthDataTypes,
   AdminForthResourcePages,
-  AdminForthFilterOperators
+  AdminForthFilterOperators,
+  AdminForthSortDirections
 } from "../../types/AdminForthConfig.js";
 import AdminForthPlugin from "../base.js";
 import { PluginOptions } from "./types.js";
@@ -30,16 +31,43 @@ export default class AuditLogPlugin extends AdminForthPlugin {
     const recordIdFieldName = resource.columns.find((c) => c.primaryKey === true)?.name;
     const recordId = data?.[recordIdFieldName] || oldRecord?.[recordIdFieldName];
     const connector = this.adminforth.connectors[resource.dataSource];
-    const newRecord = await connector.getRecordByPrimaryKey(resource, recordId);
 
-    let newData = {
-        'oldRecord': oldRecord || {},
-        'newRecord': newRecord
+    const newRecord = action == AllowedActionsEnum.delete ? {} : (await connector.getRecordByPrimaryKey(resource, recordId)) || {};
+    if (action !== AllowedActionsEnum.delete) {
+        oldRecord = oldRecord ? JSON.parse(JSON.stringify(oldRecord)) : {};
+    } else {
+        oldRecord = data
     }
+
+    if (action !== AllowedActionsEnum.delete) {
+        const columnsNamesList = resource.columns.map((c) => c.name);
+        columnsNamesList.forEach((key) => {
+            if (JSON.stringify(oldRecord[key]) == JSON.stringify(newRecord[key])) {
+                delete oldRecord[key];
+                delete newRecord[key];
+            }
+        });
+    }
+
+    const backendOnlyColumns = resource.columns.filter((c) => c.backendOnly);
+    backendOnlyColumns.forEach((c) => {
+        if (JSON.stringify(oldRecord[c.name]) != JSON.stringify(newRecord[c.name])) {
+            if (action !== AllowedActionsEnum.delete) {
+                newRecord[c.name] = '<hidden value after>'
+            }
+            if (action !== AllowedActionsEnum.create) {
+                oldRecord[c.name] = '<hidden value before>'
+            }
+        } else {
+            delete oldRecord[c.name];
+            delete newRecord[c.name];
+        }
+    });
+
     const record = {
       [this.options.resourceColumns.resourceIdColumnName]: resource.resourceId,
       [this.options.resourceColumns.resourceActionColumnName]: action,
-      [this.options.resourceColumns.resourceDataColumnName]: newData,
+      [this.options.resourceColumns.resourceDataColumnName]: { 'oldRecord': oldRecord || {}, 'newRecord': newRecord },
       [this.options.resourceColumns.resourceUserIdColumnName]: user.pk,
       [this.options.resourceColumns.resourceRecordIdColumnName]: recordId,
       [this.options.resourceColumns.resourceCreatedColumnName]: new Date()
@@ -68,7 +96,8 @@ export default class AuditLogPlugin extends AdminForthPlugin {
             // type: AdminForthDataTypes.STRING
           }
         }
-
+     
+        diffColumn.showIn = ['show']
         diffColumn.components = {
           show: { 
             file: this.componentPath('AuditLogView.vue'),
@@ -78,13 +107,17 @@ export default class AuditLogPlugin extends AdminForthPlugin {
             }
           }
         }
+        resource.options.defaultSort = {
+            columnName: this.options.resourceColumns.resourceCreatedColumnName,
+            direction: AdminForthSortDirections.desc
+        }
         return;
       }
 
       const defaultHooks = {
         create: { afterSave: [] },
         edit: { afterSave: [] },
-        delete: { afterSave: [] }
+        delete: { beforeSave: [] }
       }
 
       if ( !resource.hooks ) {
@@ -94,10 +127,11 @@ export default class AuditLogPlugin extends AdminForthPlugin {
       }
 
       Object.keys(resource.hooks).forEach((hook) => {
-        if(!Array.isArray(resource.hooks[hook].afterSave)){
-          resource.hooks[hook].afterSave = [resource.hooks[hook].afterSave]
+        const hookToUse = hook == AllowedActionsEnum.delete ? 'beforeSave' : 'afterSave';
+        if(!Array.isArray(resource.hooks[hook][hookToUse])){
+          resource.hooks[hook][hookToUse] = [resource.hooks[hook][hookToUse]]
         }
-        resource.hooks[hook].afterSave.push(async ({resource, record, adminUser, oldRecord}) => {
+        resource.hooks[hook][hookToUse].push(async ({resource, record, adminUser, oldRecord}) => {
           return await this.createLogRecord(resource, hook as AllowedActionsEnum, record, adminUser, oldRecord)
         })
       })

package/spa/src/components/ResourceListTable.vue

@@ -252,7 +252,8 @@ const props = defineProps([
   'rows',
   'totalRows',
   'pageSize',
-  'checkboxes'
+  'checkboxes',
+  'sort'
 ])
 
 // emits, update page
@@ -288,6 +289,10 @@ watch(() => props.checkboxes, (newCheckboxes) => {
   checkboxesInternal.value = newCheckboxes;
 });
 
+watch(() => props.sort, (newSort) => {
+  sort.value = newSort;
+});
+
 function addToCheckedValues(id) {
   if (checkboxesInternal.value.includes(id)) {
     checkboxesInternal.value = checkboxesInternal.value.filter((item) => item !== id);

package/spa/src/views/ListView.vue

@@ -89,6 +89,7 @@
       @update:sort="sort = $event"
       @update:checkboxes="checkboxes = $event"
       @update:records="getList"
+      :sort="sort"
       :pageSize="pageSize"
       :totalRows="totalRows"
       :checkboxes="checkboxes"
@@ -229,6 +230,15 @@ async function init() {
     resourceId: route.params.resourceId
   });
 
+  if (coreStore.resource.options?.defaultSort) {
+    sort.value = [{
+        field: coreStore.resource.options.defaultSort.columnName,
+        direction: coreStore.resource.options.defaultSort.direction
+    }];
+  } else {
+    sort.value = [];
+  }
+
   await getList();
   columnsMinMax.value = await callAdminForthApi({
     path: '/get_min_max_for_columns',
@@ -250,7 +260,6 @@ onMounted(async () => {
 watch(() => route.params.resourceId, async () => {
   filtersStore.setFilters([]);
   checkboxes.value = [];
-  sort.value = [];
   await init();
 });
 

package/types/AdminForthConfig.ts

@@ -545,6 +545,10 @@ export type AdminForthResource = {
       },
     },
     options?: {
+      defaultSort?: {
+        columnName: string,
+        direction: AdminForthSortDirections | string,
+      }
       bulkActions?: Array<{
         id?: string,
         label: string,
@@ -1073,8 +1077,8 @@ export enum AdminForthFilterOperators {
 };
 
 export enum AdminForthSortDirections {
-  ASC = 'asc',
-  DESC = 'desc',
+  asc = 'asc',
+  desc = 'desc',
 };