adminforth 1.0.26 → 1.0.27

package/dataConnectors/postgres.ts

@@ -126,15 +126,14 @@ class PostgresConnector {
             return null;
           }
           if (field._underlineType == 'timestamp' || field._underlineType == 'int') {
-            return dayjs.unix(+value).toISOString();
+            return dayjs(value).toISOString();
           } else if (field._underlineType == 'varchar') {
-            return dayjs.unix(+value).toISOString();
+            return dayjs(value).toISOString();
           } else {
             throw new Error(`AdminForth does not support row type: ${field._underlineType} for timestamps, use VARCHAR (with iso strings) or TIMESTAMP/INT (with unix timestamps)`);
           }
         }
 
-
         return value;
       }
 
@@ -167,10 +166,8 @@ class PostgresConnector {
             return null;
           }
           if (field._underlineType == 'timestamp' || field._underlineType == 'int') {
-            // value is iso string now, convert to unix timestamp
-            return dayjs(value).unix();
+            return dayjs(value);
           } else if (field._underlineType == 'varchar') {
-            // value is iso string now, convert to unix timestamp
             return dayjs(value).toISOString();
           }
         } else if (field.type == AdminForthTypes.BOOLEAN) {

package/dist/dataConnectors/postgres.js

@@ -127,10 +127,10 @@ class PostgresConnector {
                 return null;
             }
             if (field._underlineType == 'timestamp' || field._underlineType == 'int') {
-                return dayjs.unix(+value).toISOString();
+                return dayjs(value).toISOString();
             }
             else if (field._underlineType == 'varchar') {
-                return dayjs.unix(+value).toISOString();
+                return dayjs(value).toISOString();
             }
             else {
                 throw new Error(`AdminForth does not support row type: ${field._underlineType} for timestamps, use VARCHAR (with iso strings) or TIMESTAMP/INT (with unix timestamps)`);
@@ -167,11 +167,9 @@ class PostgresConnector {
                 return null;
             }
             if (field._underlineType == 'timestamp' || field._underlineType == 'int') {
-                // value is iso string now, convert to unix timestamp
-                return dayjs(value).unix();
+                return dayjs(value);
             }
             else if (field._underlineType == 'varchar') {
-                // value is iso string now, convert to unix timestamp
                 return dayjs(value).toISOString();
             }
         }

package/dist/index.js

@@ -24,6 +24,7 @@ import { v1 as uuid } from 'uuid';
 import fs from 'fs';
 import { AdminForthFilterOperators, AdminForthTypes } from './types.js';
 const AVAILABLE_SHOW_IN = ['list', 'edit', 'create', 'filter', 'show'];
+const DEFAULT_ALLOWED_ACTIONS = { create: true, edit: true, show: true, delete: true };
 class AdminForth {
     constructor(config) {
         _AdminForth_defaultConfig.set(this, {
@@ -130,6 +131,9 @@ class AdminForth {
                     }
                     col.showIn = ((_b = col.showIn) === null || _b === void 0 ? void 0 : _b.map(c => c.toLowerCase())) || AVAILABLE_SHOW_IN;
                 });
+                if (!res.options) {
+                    res.options = { bulkActions: [], allowedActions: {} };
+                }
                 //check if resource has bulkActions
                 if ((_b = res.options) === null || _b === void 0 ? void 0 : _b.bulkActions) {
                     let bulkActions = res.options.bulkActions;
@@ -155,6 +159,18 @@ class AdminForth {
                     });
                     bulkActions = newBulkActions;
                 }
+                //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;
+                }
             });
             if (!this.config.menu) {
                 errors.push('No config.menu defined');

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

@@ -42,7 +42,7 @@
         {{ `${action.label} (${checkboxes.length})` }}
       </button>
 
-      <RouterLink
+      <RouterLink v-if="allowedActions.create"
         :to="{ name: 'resource-create', params: { resourceId: $route.params.resourceId } }"
         class="flex items-center py-1 px-3  mb-2 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
       >
@@ -217,7 +217,7 @@
               <div class="tooltip-arrow" data-popper-arrow></div>
             </div>
 
-            <RouterLink
+            <RouterLink v-if="allowedActions.edit"
               :to="{ name: 'resource-edit', params: { resourceId: $route.params.resourceId, primaryKey: row._primaryKeyValue } }"
               class="font-medium text-blue-600 dark:text-blue-500 hover:underline ms-3"
               :data-tooltip-target="`tooltip-edit-${rowI}`"
@@ -232,7 +232,7 @@
               <div class="tooltip-arrow" data-popper-arrow></div>
             </div>
 
-            <button v-if="allowDelete"
+            <button v-if="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)"
@@ -355,7 +355,8 @@ const fetchStatus = ref({pending: false, error: null, success: false});
 const rows = ref(null);
 const totalRows = ref(0);
 const allCheckedActions = ref([]);
-const allowDelete = ref(false);
+const allowedActions = ref({});
+
 
 const DEFAULT_PAGE_SIZE = 10;
 
@@ -432,8 +433,8 @@ async function getList() {
   });
   totalRows.value = data.total;
   allCheckedActions.value = data.options?.bulkActions || [];
-  allowDelete.value = data.options?.allowDelete;
-
+  allowedActions.value = data.options?.allowedActions;
+  
 
   setTimeout(() => {
     initFlowbite();

package/index.ts

@@ -13,6 +13,7 @@ import fs from 'fs';
 import { AdminForthFilterOperators, AdminForthTypes, AdminForthTypesValues } from './types.js';
 
 const AVAILABLE_SHOW_IN = ['list', 'edit', 'create', 'filter', 'show'];
+const DEFAULT_ALLOWED_ACTIONS = {create: true, edit: true, show: true, delete: true};
 
 type AdminForthConfigMenuItem = {
   label: string,
@@ -24,6 +25,7 @@ type AdminForthConfigMenuItem = {
   children?: Array<AdminForthConfigMenuItem>,
 }
 
+
 type AdminForthResourceColumn = {
   name: string,
   label?: string,
@@ -67,7 +69,8 @@ type AdminForthResource = {
       icon: string,
       action: Function,
     }>,
-    allowDelete?: boolean,
+    allowedActions?: AllowedActions,
+    
   },
 }
 
@@ -102,6 +105,13 @@ type AdminForthConfig = {
   deleteConfirmation?: boolean,
 }
 
+type AllowedActions = {
+  create: boolean,
+  edit: boolean,
+  show: boolean,
+  delete: boolean,
+}
+
 class AdminForth {
   static Types = AdminForthTypes;
 
@@ -248,6 +258,10 @@ class AdminForth {
           col.showIn = col.showIn?.map(c => c.toLowerCase()) || AVAILABLE_SHOW_IN;
         })
 
+        if (!res.options) {
+          res.options = {bulkActions: [], allowedActions: {}};
+        }
+
 
         //check if resource has bulkActions
         if(res.options?.bulkActions){
@@ -276,7 +290,22 @@ class AdminForth {
           });
           bulkActions = newBulkActions;
         }
-      });
+
+          //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;
+          }
+        })
+
+    
+
 
       if (!this.config.menu) {
         errors.push('No config.menu defined');

package/package.json

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

package/spa/src/views/ListView.vue

@@ -42,7 +42,7 @@
         {{ `${action.label} (${checkboxes.length})` }}
       </button>
 
-      <RouterLink
+      <RouterLink v-if="allowedActions.create"
         :to="{ name: 'resource-create', params: { resourceId: $route.params.resourceId } }"
         class="flex items-center py-1 px-3  mb-2 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
       >
@@ -217,7 +217,7 @@
               <div class="tooltip-arrow" data-popper-arrow></div>
             </div>
 
-            <RouterLink
+            <RouterLink v-if="allowedActions.edit"
               :to="{ name: 'resource-edit', params: { resourceId: $route.params.resourceId, primaryKey: row._primaryKeyValue } }"
               class="font-medium text-blue-600 dark:text-blue-500 hover:underline ms-3"
               :data-tooltip-target="`tooltip-edit-${rowI}`"
@@ -232,7 +232,7 @@
               <div class="tooltip-arrow" data-popper-arrow></div>
             </div>
 
-            <button v-if="allowDelete"
+            <button v-if="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)"
@@ -355,7 +355,8 @@ const fetchStatus = ref({pending: false, error: null, success: false});
 const rows = ref(null);
 const totalRows = ref(0);
 const allCheckedActions = ref([]);
-const allowDelete = ref(false);
+const allowedActions = ref({});
+
 
 const DEFAULT_PAGE_SIZE = 10;
 
@@ -432,8 +433,8 @@ async function getList() {
   });
   totalRows.value = data.total;
   allCheckedActions.value = data.options?.bulkActions || [];
-  allowDelete.value = data.options?.allowDelete;
-
+  allowedActions.value = data.options?.allowedActions;
+  
 
   setTimeout(() => {
     initFlowbite();