adminforth 2.2.0-next.8 → 2.2.0

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

@@ -162,7 +162,7 @@ const columnOptions = computedAsync(async () => {
           body: {
             resourceId: router.currentRoute.value.params.resourceId,
             column: column.name,
-            limit: 10000,
+            limit: 1000,
             offset: 0,
           },
         });

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

@@ -84,7 +84,7 @@
           </td>
         </tr>
 
-        <tr @click="onClick($event,row)" 
+        <tr @mousedown="onClick($event,row)" 
           v-else v-for="(row, rowI) in rows" :key="`row_${row._primaryKeyValue}`"
           ref="rowRefs"
           class="bg-lightListTable dark:bg-darkListTable border-lightListBorder dark:border-gray-700 hover:bg-lightListTableRowHover dark:hover:bg-darkListTableRowHover"
@@ -457,48 +457,50 @@ function onSortButtonClick(event, field) {
 
 const clickTarget = ref(null);
 
-async function onClick(e,row) {
-  if(clickTarget.value === e.target) return;
+async function onClick(e, row) {
+  if (clickTarget.value === e.target) return;
   clickTarget.value = e.target;
   await new Promise((resolve) => setTimeout(resolve, 100));
   if (window.getSelection().toString()) return;
-  else {
-    if (row._clickUrl === null) {
-      // user asked to nothing on click
-      return;
-    }
-    if (e.ctrlKey || e.metaKey || row._clickUrl?.includes('target=_blank')) {
-      
-      if (row._clickUrl) {
-        window.open(row._clickUrl, '_blank');
-      } else {
-        window.open(
-          router.resolve({
-            name: 'resource-show',
-            params: {
-              resourceId: props.resource.resourceId,
-              primaryKey: row._primaryKeyValue,
-            },
-          }).href,
-          '_blank'
-        );
-      }
+  if (e.button === 2) {
+    return; // right click, do nothing
+  }
+  const openInNewTab =
+    e.ctrlKey ||
+    e.metaKey ||
+    e.button === 1 ||
+    (row._clickUrl?.includes('target=_blank'));
+
+  if (openInNewTab) {
+    if (row._clickUrl) {
+      window.open(row._clickUrl, '_blank');
     } else {
-      if (row._clickUrl) {
-        if (row._clickUrl.startsWith('http')) {
-          document.location.href = row._clickUrl;
-        } else {
-          router.push(row._clickUrl);
-        }
-      } else {
-        router.push({
+      window.open(
+        router.resolve({
           name: 'resource-show',
           params: {
             resourceId: props.resource.resourceId,
             primaryKey: row._primaryKeyValue,
           },
-        });
+        }).href,
+        '_blank'
+      );
+    }
+  } 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,
+        },
+      });
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "2.2.0-next.8",
+  "version": "2.2.0",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -20,7 +20,7 @@
     "rollout-doc": "cd documentation && npm run build && npm run deploy",
     "docs": "typedoc",
     "--comment_postinstall": "postinstall executed after package installed in other project package and when we do npm ci in the package",
-    "postinstall": "echo 'Running postinstall'; node ./commands/postinstall.js"
+    "postinstall": "if test -d ./dist/spa/; then cd ./dist/spa/ && npm ci && echo 'installed spa dependencies'; fi"
   },
   "release": {
     "plugins": [

package/commands/postinstall.js

@@ -1,15 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-
-import { execSync } from 'child_process'; 
-const spaPath = path.join(import.meta.dirname, 'dist', 'spa');
-
-
-if (fs.existsSync(spaPath)){ 
-    console.log('Installing SPA dependencies...');
-    execSync('npm ci', { cwd: spaPath, stdio: 'inherit' });
-    console.log('Installed spa dependencies');
-} else {
-    console.log('SPA dependencies not found');
-    console.log('current directory', import.meta.dirname);
-}