adminforth 1.3.31 → 1.3.32

package/dist/modules/restApi.js

@@ -263,6 +263,9 @@ export default class AdminForthRestAPI {
                             allowedBulkActions.push(action);
                         }
                     }
+                    else {
+                        allowedBulkActions.push(action);
+                    }
                 })));
                 // exclude "plugins" key
                 return {
@@ -369,9 +372,10 @@ export default class AdminForthRestAPI {
                             delete item[key];
                         }
                     });
-                });
-                data.data.forEach((item) => {
                     item._label = resource.recordLabel(item);
+                    if (resource.options.listTableClickUrl) {
+                        item._clickUrl = resource.options.listTableClickUrl(item, adminUser);
+                    }
                 });
                 // only after adminforth made all post processing, give user ability to edit it
                 for (const hook of listify((_v = (_u = resource.hooks) === null || _u === void 0 ? void 0 : _u[source]) === null || _v === void 0 ? void 0 : _v.afterDatasourceResponse)) {

package/modules/restApi.ts

@@ -306,6 +306,8 @@ export default class AdminForthRestAPI {
               if (res) {
                 allowedBulkActions.push(action);
               }
+            } else {
+              allowedBulkActions.push(action);
             }
           })
         );
@@ -435,10 +437,12 @@ export default class AdminForthRestAPI {
               delete item[key];
             }
           })
-        });
-
-        data.data.forEach((item) => {
+    
           item._label = resource.recordLabel(item);
+
+          if (resource.options.listTableClickUrl) {
+            item._clickUrl = resource.options.listTableClickUrl(item, adminUser);
+          }
         });
 
         // only after adminforth made all post processing, give user ability to edit it

package/package.json

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

package/spa/src/components/Dropdown.vue

@@ -147,10 +147,10 @@ const toogleItem = (item) => {
 
   
   const list = selectedItems.value.map(item => item.value);
-  const updValue = list.length ? list : undefined;
+  const updValue = list.length ? list : null;
   let emitValue;
   if (props.single) {
-    emitValue = updValue ? updValue[0] : undefined;
+    emitValue = updValue ? updValue[0] : null;
   } else {
     emitValue = updValue;
   }

package/spa/src/components/ResourceListTable.vue

@@ -76,8 +76,9 @@
           </td>
         </tr>
 
-        <tr @click="onClick($event,row)"   v-else v-for="(row, rowI) in rows" :key="`row_${row._primaryKeyValue}`"
-            class="bg-lightListTable dark:bg-darkListTable border-lightListBorder dark:border-gray-700 hover:bg-lightListTableRowHover dark:hover:bg-darkListTableRowHover cursor-pointer"
+        <tr @click="onClick($event,row)" 
+          v-else v-for="(row, rowI) in rows" :key="`row_${row._primaryKeyValue}`"
+          class="bg-lightListTable dark:bg-darkListTable border-lightListBorder dark:border-gray-700 hover:bg-lightListTableRowHover dark:hover:bg-darkListTableRowHover cursor-pointer"
           :class="{'border-b': rowI !== rows.length - 1}"
         >
           <td class="w-4 p-4 cursor-default" @click="(e)=>{e.stopPropagation()}">
@@ -105,64 +106,73 @@
           </td>
           <td class=" items-center px-6 py-4 cursor-default" @click="(e)=>{e.stopPropagation()}">
             <div class="flex">
-            <RouterLink
-              v-if="resource.options?.allowedActions.show"
-              :to="{ 
-                name: 'resource-show', 
-                params: { 
-                  resourceId: resource.resourceId, 
-                  primaryKey: row._primaryKeyValue,
-                }
-              }"
-              class="font-medium text-lightPrimary dark:text-darkPrimary hover:underline"
-              :data-tooltip-target="`tooltip-show-${rowI}`"
-            >
-              <IconEyeSolid class="w-5 h-5 me-2"/>
-            </RouterLink>
-
-            <div :id="`tooltip-show-${rowI}`"
-                role="tooltip"
-                class="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-white transition-opacity duration-300 bg-gray-900 rounded-lg shadow-sm opacity-0 tooltip dark:bg-gray-700">
-              Show item
-              <div class="tooltip-arrow" data-popper-arrow></div>
+              <RouterLink
+                v-if="resource.options?.allowedActions.show"
+                :to="{ 
+                  name: 'resource-show', 
+                  params: { 
+                    resourceId: resource.resourceId, 
+                    primaryKey: row._primaryKeyValue,
+                  }
+                }"
+                class="font-medium text-lightPrimary dark:text-darkPrimary hover:underline"
+                :data-tooltip-target="`tooltip-show-${rowI}`"
+              >
+                <IconEyeSolid class="w-5 h-5 me-2"/>
+              </RouterLink>
+
+              <div :id="`tooltip-show-${rowI}`"
+                  role="tooltip"
+                  class="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-white transition-opacity duration-300 bg-gray-900 rounded-lg shadow-sm opacity-0 tooltip dark:bg-gray-700">
+                Show item
+                <div class="tooltip-arrow" data-popper-arrow></div>
+              </div>
+
+              <RouterLink v-if="resource.options?.allowedActions.edit"
+                :to="{
+                  name: 'resource-edit',
+                  params: { 
+                    resourceId: resource.resourceId,
+                    primaryKey: row._primaryKeyValue 
+                  } 
+                }"
+                class="font-medium text-lightPrimary dark:text-darkPrimary hover:underline ms-3"
+                :data-tooltip-target="`tooltip-edit-${rowI}`"
+              >
+                <IconPenSolid class="w-5 h-5 me-2"/>
+              </RouterLink>
+
+              <div :id="`tooltip-edit-${rowI}`"
+                  role="tooltip"
+                  class="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-white transition-opacity duration-300 bg-gray-900 rounded-lg shadow-sm opacity-0 tooltip dark:bg-gray-700">
+                Edit
+                <div class="tooltip-arrow" data-popper-arrow></div>
+              </div>
+
+              <button v-if="resource.options?.allowedActions.delete"
+                      class="font-medium text-lightPrimary dark:text-darkPrimary hover:underline ms-3"
+                      :data-tooltip-target="`tooltip-delete-${rowI}`"
+                      @click="deleteRecord(row)"
+              >
+                <IconTrashBinSolid class="w-5 h-5 me-2"/>
+              </button>
+
+              <div :id="`tooltip-delete-${rowI}`"
+                  role="tooltip"
+                  class="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-white transition-opacity duration-300 bg-gray-900 rounded-lg shadow-sm opacity-0 tooltip dark:bg-gray-700">
+                Delete
+                <div class="tooltip-arrow" data-popper-arrow></div>
+              </div>
+
+              <component 
+                v-if="coreStore.resourceOptions?.pageInjections?.edit?.customActionIcons"
+                :is="getCustomComponent(coreStore.resourceOptions?.pageInjections?.edit?.customActionIcons)" 
+                :meta="coreStore.resourceOptions?.pageInjections?.edit?.customActionIcons.meta"
+                :resource="coreStore.resource" 
+                :adminUser="coreStore.adminUser"
+                :record="row"
+              />
             </div>
-
-            <RouterLink v-if="resource.options?.allowedActions.edit"
-              :to="{
-                name: 'resource-edit',
-                params: { 
-                  resourceId: resource.resourceId,
-                  primaryKey: row._primaryKeyValue 
-                } 
-              }"
-              class="font-medium text-lightPrimary dark:text-darkPrimary hover:underline ms-3"
-              :data-tooltip-target="`tooltip-edit-${rowI}`"
-            >
-              <IconPenSolid class="w-5 h-5 me-2"/>
-            </RouterLink>
-
-            <div :id="`tooltip-edit-${rowI}`"
-                role="tooltip"
-                class="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-white transition-opacity duration-300 bg-gray-900 rounded-lg shadow-sm opacity-0 tooltip dark:bg-gray-700">
-              Edit
-              <div class="tooltip-arrow" data-popper-arrow></div>
-            </div>
-
-            <button v-if="resource.options?.allowedActions.delete"
-                    class="font-medium text-lightPrimary dark:text-darkPrimary hover:underline ms-3"
-                    :data-tooltip-target="`tooltip-delete-${rowI}`"
-                    @click="deleteRecord(row)"
-            >
-              <IconTrashBinSolid class="w-5 h-5 me-2"/>
-            </button>
-
-            <div :id="`tooltip-delete-${rowI}`"
-                role="tooltip"
-                class="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-white transition-opacity duration-300 bg-gray-900 rounded-lg shadow-sm opacity-0 tooltip dark:bg-gray-700">
-              Delete
-              <div class="tooltip-arrow" data-popper-arrow></div>
-            </div>
-          </div>
           </td>
         </tr>
       </tbody>
@@ -360,18 +370,45 @@ function onSortButtonClick(event, field) {
 
 
 const clickTarget = ref(null);
+
 async function onClick(e,row) {
   if(clickTarget.value === e.target) return;
   clickTarget.value = e.target;
-  await new Promise((resolve) => setTimeout(resolve, 300));
+  await new Promise((resolve) => setTimeout(resolve, 100));
   if (window.getSelection().toString()) return;
-  else {router.push({
-    name: 'resource-show',
-    params: {
-      resourceId: props.resource.resourceId,
-      primaryKey: row._primaryKeyValue,
-    },
-  })}
+  else {
+    if (e.ctrlKey || e.metaKey) {
+      if (row._clickUrl) {
+        window.open(row._clickUrl, '_blank');
+      } else {
+        router.push(
+          router.resolve({
+            name: 'resource-show',
+            params: {
+              resourceId: props.resource.resourceId,
+              primaryKey: row._primaryKeyValue,
+            },
+          })
+        );
+      }
+    } else {
+      if (row._clickUrl) {
+        if (row._clickUrl.startsWith('http')) {
+          document.location.href = row._clickUrl;
+        } else {
+          router.push(row._clickUrl);
+        }
+      } else {
+        router.push({
+          name: 'resource-show',
+          params: {
+            resourceId: props.resource.resourceId,
+            primaryKey: row._primaryKeyValue,
+          },
+        });
+      }
+    }
+  }
 }
 
 async function deleteRecord(row) {

package/spa/src/views/EditView.vue

@@ -138,7 +138,6 @@ async function saveRecord() {
   }
 
   saving.value = true;
-
   const updates = {};
   for (const key in record.value) {
     if (record.value[key] !== coreStore.record[key]) {
@@ -162,7 +161,6 @@ async function saveRecord() {
       message: 'Record updated successfully',
       variant: 'success',
       timeout: 400000
-
     });
   }
   saving.value = false;

package/types/AdminForthConfig.ts

@@ -1027,6 +1027,8 @@ export type AdminForthResource = {
        */
       listPageSize?: number,
 
+      listTableClickUrl?: (record: any, adminUser: AdminUser) => string,
+
       /** 
        * Custom components which can be injected into AdminForth CRUD pages.
        * Each injection is a path to a custom component which will be displayed in the admin panel.
@@ -1055,6 +1057,7 @@ export type AdminForthResource = {
           afterBreadcrumbs?: AdminForthComponentDeclaration | Array<AdminForthComponentDeclaration>,
           bottom?: AdminForthComponentDeclaration | Array<AdminForthComponentDeclaration>,
           threeDotsDropdownItems?: AdminForthComponentDeclaration | Array<AdminForthComponentDeclaration>,
+          customActionIcons?: AdminForthComponentDeclaration | Array<AdminForthComponentDeclaration>,
         },
 
         /**
@@ -1066,6 +1069,7 @@ export type AdminForthResource = {
           beforeBreadcrumbs?: AdminForthComponentDeclaration | Array<AdminForthComponentDeclaration>,
           afterBreadcrumbs?: AdminForthComponentDeclaration | Array<AdminForthComponentDeclaration>,
           bottom?: AdminForthComponentDeclaration | Array<AdminForthComponentDeclaration>,
+          threeDotsDropdownItems?: AdminForthComponentDeclaration | Array<AdminForthComponentDeclaration>,
         },
 
         /**
@@ -1077,6 +1081,7 @@ export type AdminForthResource = {
           beforeBreadcrumbs?: AdminForthComponentDeclaration | Array<AdminForthComponentDeclaration>,
           afterBreadcrumbs?: AdminForthComponentDeclaration | Array<AdminForthComponentDeclaration>,
           bottom?: AdminForthComponentDeclaration | Array<AdminForthComponentDeclaration>,
+          threeDotsDropdownItems?: AdminForthComponentDeclaration | Array<AdminForthComponentDeclaration>,
         },
 
         /**
@@ -1088,6 +1093,7 @@ export type AdminForthResource = {
           beforeBreadcrumbs?: AdminForthComponentDeclaration | Array<AdminForthComponentDeclaration>,
           afterBreadcrumbs?: AdminForthComponentDeclaration | Array<AdminForthComponentDeclaration>,
           bottom?: AdminForthComponentDeclaration | Array<AdminForthComponentDeclaration>,
+          threeDotsDropdownItems?: AdminForthComponentDeclaration | Array<AdminForthComponentDeclaration>,
         },
       }
     },