adminforth 1.1.36 → 1.1.38

package/dist/index.js

@@ -645,25 +645,27 @@ class AdminForth {
         function interpretResource(adminUser, resource, meta, source) {
             return __awaiter(this, void 0, void 0, function* () {
                 var _b;
-                const newResource = JSON.parse(JSON.stringify(resource));
                 if (process.env.HEAVY_DEBUG) {
                     console.log('🪲Interpreting resource', resource.resourceId, source);
                 }
+                const allowedActions = {};
                 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 (process.env.HEAVY_DEBUG) {
                         console.log('🪲checking for allowed call', key, 'value:', value, 'typeof', typeof value);
                     }
                     // if callable then call
                     if (typeof value === 'function') {
-                        resource.options.allowedActions[key] = yield value({ adminUser, resource, meta, source });
+                        allowedActions[key] = yield value({ adminUser, resource, meta, source });
+                    }
+                    else {
+                        allowedActions[key] = value;
                     }
                 })));
-                return newResource;
+                return { allowedActions };
             });
         }
-        function checkAccess(action, resource) {
-            var _b;
-            const allowed = (_b = resource.options) === null || _b === void 0 ? void 0 : _b.allowedActions[action];
+        function checkAccess(action, allowedActions) {
+            const allowed = allowedActions[action];
             if (allowed !== true) {
                 return { error: typeof allowed === 'string' ? allowed : 'Action is not allowed', allowed: false };
             }
@@ -680,13 +682,15 @@ class AdminForth {
                 if (this.statuses.dbDiscover !== 'done') {
                     return { error: 'Database discovery is still in progress, please try later' };
                 }
-                const configResource = this.config.resources.find((res) => res.resourceId == resourceId);
-                if (!configResource) {
+                const resource = this.config.resources.find((res) => res.resourceId == resourceId);
+                if (!resource) {
                     return { error: `Resource ${resourceId} not found` };
                 }
-                const resource = yield interpretResource(adminUser, configResource, {}, ActionCheckSource.DisplayButtons);
+                const { allowedActions } = yield interpretResource(adminUser, resource, {}, ActionCheckSource.DisplayButtons);
                 // exclude "plugins" key
-                return { resource: Object.assign(Object.assign({}, resource), { plugins: undefined }) };
+                return {
+                    resource: Object.assign(Object.assign({}, resource), { plugins: undefined, options: Object.assign(Object.assign({}, resource.options), { allowedActions }) })
+                };
             }),
         });
         server.endpoint({
@@ -704,12 +708,12 @@ class AdminForth {
                 if (this.statuses.dbDiscover !== 'done') {
                     return { error: 'Database discovery is still in progress, please try later' };
                 }
-                const configResource = this.config.resources.find((res) => res.resourceId == resourceId);
-                if (!configResource) {
+                const resource = this.config.resources.find((res) => res.resourceId == resourceId);
+                if (!resource) {
                     return { error: `Resource ${resourceId} not found` };
                 }
-                const resource = yield interpretResource(adminUser, configResource, { requestBody: body }, ActionCheckSource.DisplayButtons);
-                const { allowed, error } = checkAccess(source, resource);
+                const { allowedActions } = yield interpretResource(adminUser, resource, { requestBody: body }, ActionCheckSource.DisplayButtons);
+                const { allowed, error } = checkAccess(source, allowedActions);
                 if (!allowed) {
                     return { error };
                 }
@@ -903,12 +907,12 @@ class AdminForth {
             path: '/create_record',
             handler: (_y) => __awaiter(this, [_y], void 0, function* ({ body, adminUser }) {
                 var _z, _0, _1, _2, _3;
-                const configResource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
-                if (!configResource) {
+                const resource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
+                if (!resource) {
                     return { error: `Resource '${body['resourceId']}' not found` };
                 }
-                const resource = yield interpretResource(adminUser, configResource, { requestBody: body }, ActionCheckSource.CreateRequest);
-                const { allowed, error } = checkAccess(AllowedActionsEnum.create, resource);
+                const { allowedActions } = yield interpretResource(adminUser, resource, { requestBody: body }, ActionCheckSource.CreateRequest);
+                const { allowed, error } = checkAccess(AllowedActionsEnum.create, allowedActions);
                 if (!allowed) {
                     return { error };
                 }
@@ -975,20 +979,20 @@ class AdminForth {
             path: '/update_record',
             handler: (_4) => __awaiter(this, [_4], void 0, function* ({ body, adminUser }) {
                 var _5, _6, _7, _8;
-                const configResource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
-                if (!configResource) {
+                const resource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
+                if (!resource) {
                     return { error: `Resource '${body['resourceId']}' not found` };
                 }
                 const recordId = body['recordId'];
-                const connector = this.connectors[configResource.dataSource];
-                const oldRecord = yield connector.getRecordByPrimaryKey(configResource, recordId);
+                const connector = this.connectors[resource.dataSource];
+                const oldRecord = yield connector.getRecordByPrimaryKey(resource, recordId);
                 if (!oldRecord) {
-                    const primaryKeyColumn = configResource.columns.find((col) => col.primaryKey);
+                    const primaryKeyColumn = resource.columns.find((col) => col.primaryKey);
                     return { error: `Record with ${primaryKeyColumn.name} ${recordId} not found` };
                 }
                 const record = body['record'];
-                const resource = yield interpretResource(adminUser, configResource, { requestBody: body, record, oldRecord }, ActionCheckSource.EditRequest);
-                const { allowed, error } = checkAccess(AllowedActionsEnum.edit, resource);
+                const { allowedActions } = yield interpretResource(adminUser, resource, { requestBody: body, record, oldRecord }, ActionCheckSource.EditRequest);
+                const { allowed, error } = checkAccess(AllowedActionsEnum.edit, allowedActions);
                 if (!allowed) {
                     return { error };
                 }
@@ -1040,19 +1044,19 @@ class AdminForth {
             path: '/delete_record',
             handler: (_9) => __awaiter(this, [_9], void 0, function* ({ body, adminUser }) {
                 var _10, _11, _12, _13;
-                const configResource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
-                const record = yield this.connectors[configResource.dataSource].getRecordByPrimaryKey(configResource, body['primaryKey']);
-                if (!configResource) {
+                const resource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
+                const record = yield this.connectors[resource.dataSource].getRecordByPrimaryKey(resource, body['primaryKey']);
+                if (!resource) {
                     return { error: `Resource '${body['resourceId']}' not found` };
                 }
                 if (!record) {
                     return { error: `Record with ${body['primaryKey']} not found` };
                 }
-                if (configResource.options.allowedActions.delete === false) {
-                    return { error: `Resource '${configResource.resourceId}' does not allow delete action` };
+                if (resource.options.allowedActions.delete === false) {
+                    return { error: `Resource '${resource.resourceId}' does not allow delete action` };
                 }
-                const resource = yield interpretResource(adminUser, configResource, { requestBody: body }, ActionCheckSource.DeleteRequest);
-                const { allowed, error } = checkAccess(AllowedActionsEnum.delete, resource);
+                const { allowedActions } = yield interpretResource(adminUser, resource, { requestBody: body }, ActionCheckSource.DeleteRequest);
+                const { allowed, error } = checkAccess(AllowedActionsEnum.delete, allowedActions);
                 if (!allowed) {
                     return { error };
                 }

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

@@ -28,7 +28,7 @@
       <tr>
         <th scope="col" class="p-4">
           <div v-if="rows && rows.length" class="flex items-center">
-            <input id="checkbox-all-search" type="checkbox" :checked="allFromThisPageChecked" @change="selectAll()"
+            <input id="checkbox-all-search" type="checkbox" :checked="allFromThisPageChecked" @change="selectAll()" 
                   class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 dark:focus:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
             <label for="checkbox-all-search" class="sr-only">checkbox</label>
           </div>
@@ -118,11 +118,12 @@
         </td>
       </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">
+      <tr @click="onClick($event,row)"   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 cursor-pointer">
         <td class="w-4 p-4">
           <div class="flex items center">
             <input
+              @click="(e)=>{e.stopPropagation()}"
               id="checkbox-table-search-1"
               type="checkbox"
               :checked="checkboxesInternal.includes(row.id)"
@@ -142,7 +143,7 @@
             :resource="resource"
           />
         </td>
-        <td class=" items-center px-6 py-4">
+        <td class=" items-center px-6 py-4" @click="(e)=>{e.stopPropagation()}">
           <div class="flex">
           <RouterLink
             v-if="resource.options?.allowedActions.show"
@@ -291,6 +292,7 @@ IconFilterOutline,
 IconPenSolid,
 IconTrashBinSolid
 } from '@iconify-prerendered/vue-flowbite';
+import router from '@/router';
 
 const coreStore = useCoreStore();
 
@@ -385,6 +387,31 @@ function onSortButtonClick(field) {
   }
 }
 
+
+const clickTarget = ref(null);
+async function onClick(e,row) {
+  console.log(e,row)
+  if(clickTarget.value === e.target) return;
+  clickTarget.value = e.target;
+  await new Promise((resolve) => setTimeout(resolve, 500));
+  if (window.getSelection().toString()) return;
+  else {router.push({
+    name: 'resource-show',
+    params: {
+      resourceId: props.resource.resourceId,
+      primaryKey: row._primaryKeyValue,
+    },
+  })}
+}
+  
+
+
+
+
+
+
+
+
 async function deleteRecord(row) {
   const data = await window.adminforth.confirm({
     message: 'Are you sure you want to delete this item?',

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     
-    <span v-if="column.foreignResource">
+    <span @click="(e)=>{e.stopPropagation()}" v-if="column.foreignResource">
       <RouterLink v-if="record[column.name]" class="font-medium text-blue-600 dark:text-blue-500 hover:brightness-110"
         :to="{ name: 'resource-show', params: { resourceId: column.foreignResource.resourceId, primaryKey: record[column.name].pk } }">
         {{ record[column.name].label }}

package/index.ts

@@ -17,6 +17,7 @@ import { AdminForthConfig, AdminForthClass, AdminForthComponentDeclaration, Admi
   AfterDataSourceResponseFunction, AllowedActionValue, AdminUser,
   AdminForthResource,
   AllowedActionsEnum,
+  AllowedActions,
   ActionCheckSource
 } from './types/AdminForthConfig.js';
 import path from 'path';
@@ -732,11 +733,11 @@ class AdminForth implements AdminForthClass {
       },
     });
 
-    async function interpretResource(adminUser: AdminUser, resource: AdminForthResource, meta: any, source: ActionCheckSource): Promise<AdminForthResource> {
-      const newResource = JSON.parse(JSON.stringify(resource));
+    async function interpretResource(adminUser: AdminUser, resource: AdminForthResource, meta: any, source: ActionCheckSource): Promise<{allowedActions: AllowedActions}> {
       if (process.env.HEAVY_DEBUG) {
         console.log('🪲Interpreting resource', resource.resourceId, source);
       }
+      const allowedActions = {};
 
       await Promise.all(
         Object.entries(resource.options?.allowedActions || {}).map(
@@ -747,15 +748,18 @@ class AdminForth implements AdminForthClass {
           
             // if callable then call
             if (typeof value === 'function') {
-              resource.options.allowedActions[key] = await value({ adminUser, resource, meta, source });
+              allowedActions[key] = await value({ adminUser, resource, meta, source });
+            } else {
+              allowedActions[key] = value;
             }
           })
       );
-      return newResource;
+
+      return { allowedActions };
     }
 
-    function checkAccess(action: AllowedActionsEnum, resource: AdminForthResource): { allowed: boolean, error?: string } {
-      const allowed = (resource.options?.allowedActions[action] as boolean | string | undefined);
+    function checkAccess(action: AllowedActionsEnum, allowedActions: AllowedActions): { allowed: boolean, error?: string } {
+      const allowed = (allowedActions[action] as boolean | string | undefined);
         if (allowed !== true) {
           return { error: typeof allowed === 'string' ? allowed : 'Action is not allowed', allowed: false };
         }
@@ -774,15 +778,24 @@ class AdminForth implements AdminForthClass {
         if (this.statuses.dbDiscover !== 'done') {
           return { error : 'Database discovery is still in progress, please try later' };
         }
-        const configResource = this.config.resources.find((res) => res.resourceId == resourceId);
-        if (!configResource) {
+        const resource = this.config.resources.find((res) => res.resourceId == resourceId);
+        if (!resource) {
           return { error: `Resource ${resourceId} not found` };
         }
 
-        const resource = await interpretResource(adminUser, configResource, {}, ActionCheckSource.DisplayButtons);
+        const { allowedActions } = await interpretResource(adminUser, resource, {}, ActionCheckSource.DisplayButtons);
 
         // exclude "plugins" key
-        return { resource: { ...resource, plugins: undefined } };
+        return { 
+          resource: { 
+            ...resource, 
+            plugins: undefined, 
+            options: {
+              ...resource.options,
+              allowedActions,
+            } 
+          }
+        };
       },
     });
     server.endpoint({
@@ -799,14 +812,14 @@ class AdminForth implements AdminForthClass {
         if (this.statuses.dbDiscover !== 'done') {
           return { error : 'Database discovery is still in progress, please try later' };
         }
-        const configResource = this.config.resources.find((res) => res.resourceId == resourceId);
-        if (!configResource) {
+        const resource = this.config.resources.find((res) => res.resourceId == resourceId);
+        if (!resource) {
           return { error: `Resource ${resourceId} not found` };
         }
 
-        const resource = await interpretResource(adminUser, configResource, { requestBody: body }, ActionCheckSource.DisplayButtons);
+        const { allowedActions } = await interpretResource(adminUser, resource, { requestBody: body }, ActionCheckSource.DisplayButtons);
 
-        const { allowed, error } = checkAccess(source as AllowedActionsEnum, resource);
+        const { allowed, error } = checkAccess(source as AllowedActionsEnum, allowedActions);
         if (!allowed) {
           return { error };
         }
@@ -1024,13 +1037,13 @@ class AdminForth implements AdminForthClass {
         method: 'POST',
         path: '/create_record',
         handler: async ({ body, adminUser }) => {
-            const configResource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
-            if (!configResource) {
+            const resource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
+            if (!resource) {
                 return { error: `Resource '${body['resourceId']}' not found` };
             }
-            const resource = await interpretResource(adminUser, configResource, { requestBody: body}, ActionCheckSource.CreateRequest);
+            const { allowedActions } = await interpretResource(adminUser, resource, { requestBody: body}, ActionCheckSource.CreateRequest);
 
-            const { allowed, error } = checkAccess(AllowedActionsEnum.create, resource);
+            const { allowed, error } = checkAccess(AllowedActionsEnum.create, allowedActions);
             if (!allowed) {
               return { error };
             }
@@ -1105,23 +1118,23 @@ class AdminForth implements AdminForthClass {
         method: 'POST',
         path: '/update_record',
         handler: async ({ body, adminUser }) => {
-            const configResource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
-            if (!configResource) {
+            const resource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
+            if (!resource) {
                 return { error: `Resource '${body['resourceId']}' not found` };
             }
             
             const recordId = body['recordId'];
-            const connector = this.connectors[configResource.dataSource];
-            const oldRecord = await connector.getRecordByPrimaryKey(configResource, recordId)
+            const connector = this.connectors[resource.dataSource];
+            const oldRecord = await connector.getRecordByPrimaryKey(resource, recordId)
             if (!oldRecord) {
-                const primaryKeyColumn = configResource.columns.find((col) => col.primaryKey);
+                const primaryKeyColumn = resource.columns.find((col) => col.primaryKey);
                 return { error: `Record with ${primaryKeyColumn.name} ${recordId} not found` };
             }
             const record = body['record'];
 
-            const resource = await interpretResource(adminUser, configResource, { requestBody: body, record, oldRecord}, ActionCheckSource.EditRequest);
+            const { allowedActions } = await interpretResource(adminUser, resource, { requestBody: body, record, oldRecord}, ActionCheckSource.EditRequest);
 
-            const { allowed, error } = checkAccess(AllowedActionsEnum.edit, resource);
+            const { allowed, error } = checkAccess(AllowedActionsEnum.edit, allowedActions);
             if (!allowed) {
               return { error };
             }
@@ -1178,21 +1191,21 @@ class AdminForth implements AdminForthClass {
         method: 'POST',
         path: '/delete_record',
         handler: async ({ body, adminUser }) => {
-            const configResource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
-            const record = await this.connectors[configResource.dataSource].getRecordByPrimaryKey(configResource, body['primaryKey']);
-            if (!configResource) {
+            const resource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
+            const record = await this.connectors[resource.dataSource].getRecordByPrimaryKey(resource, body['primaryKey']);
+            if (!resource) {
                 return { error: `Resource '${body['resourceId']}' not found` };
             }
             if (!record){
                 return { error: `Record with ${body['primaryKey']} not found` };
             }
-            if (configResource.options.allowedActions.delete === false) {
-                return { error: `Resource '${configResource.resourceId}' does not allow delete action` };
+            if (resource.options.allowedActions.delete === false) {
+                return { error: `Resource '${resource.resourceId}' does not allow delete action` };
             }
 
-            const resource = await interpretResource(adminUser, configResource, { requestBody: body }, ActionCheckSource.DeleteRequest);
+            const { allowedActions } = await interpretResource(adminUser, resource, { requestBody: body }, ActionCheckSource.DeleteRequest);
 
-            const { allowed, error } = checkAccess(AllowedActionsEnum.delete, resource);
+            const { allowed, error } = checkAccess(AllowedActionsEnum.delete, allowedActions);
             if (!allowed) {
               return { error };
             }

package/package.json

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

package/spa/src/components/ResourceListTable.vue

@@ -28,7 +28,7 @@
       <tr>
         <th scope="col" class="p-4">
           <div v-if="rows && rows.length" class="flex items-center">
-            <input id="checkbox-all-search" type="checkbox" :checked="allFromThisPageChecked" @change="selectAll()"
+            <input id="checkbox-all-search" type="checkbox" :checked="allFromThisPageChecked" @change="selectAll()" 
                   class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 dark:focus:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
             <label for="checkbox-all-search" class="sr-only">checkbox</label>
           </div>
@@ -118,11 +118,12 @@
         </td>
       </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">
+      <tr @click="onClick($event,row)"   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 cursor-pointer">
         <td class="w-4 p-4">
           <div class="flex items center">
             <input
+              @click="(e)=>{e.stopPropagation()}"
               id="checkbox-table-search-1"
               type="checkbox"
               :checked="checkboxesInternal.includes(row.id)"
@@ -142,7 +143,7 @@
             :resource="resource"
           />
         </td>
-        <td class=" items-center px-6 py-4">
+        <td class=" items-center px-6 py-4" @click="(e)=>{e.stopPropagation()}">
           <div class="flex">
           <RouterLink
             v-if="resource.options?.allowedActions.show"
@@ -291,6 +292,7 @@ IconFilterOutline,
 IconPenSolid,
 IconTrashBinSolid
 } from '@iconify-prerendered/vue-flowbite';
+import router from '@/router';
 
 const coreStore = useCoreStore();
 
@@ -385,6 +387,31 @@ function onSortButtonClick(field) {
   }
 }
 
+
+const clickTarget = ref(null);
+async function onClick(e,row) {
+  console.log(e,row)
+  if(clickTarget.value === e.target) return;
+  clickTarget.value = e.target;
+  await new Promise((resolve) => setTimeout(resolve, 500));
+  if (window.getSelection().toString()) return;
+  else {router.push({
+    name: 'resource-show',
+    params: {
+      resourceId: props.resource.resourceId,
+      primaryKey: row._primaryKeyValue,
+    },
+  })}
+}
+  
+
+
+
+
+
+
+
+
 async function deleteRecord(row) {
   const data = await window.adminforth.confirm({
     message: 'Are you sure you want to delete this item?',

package/spa/src/components/ValueRenderer.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     
-    <span v-if="column.foreignResource">
+    <span @click="(e)=>{e.stopPropagation()}" v-if="column.foreignResource">
       <RouterLink v-if="record[column.name]" class="font-medium text-blue-600 dark:text-blue-500 hover:brightness-110"
         :to="{ name: 'resource-show', params: { resourceId: column.foreignResource.resourceId, primaryKey: record[column.name].pk } }">
         {{ record[column.name].label }}