adminforth 2.2.0-next.1 → 2.2.0-next.11

package/commands/createApp/utils.js

@@ -284,13 +284,13 @@ async function writeTemplateFiles(dirname, cwd, options) {
 }
 
 async function installDependencies(ctx, cwd) {
-  const nodeBinary = process.execPath; // Path to the Node.js binary running this script
-  const npmPath = path.join(path.dirname(nodeBinary), 'npm'); // Path to the npm executable
-
+  const isWindows = process.platform === 'win32';
+  const npmCmd = isWindows ? 'npm.cmd' : 'npm';
+  
   const customDir = ctx.customDir;
   const res = await Promise.all([
-    await execAsync(`${nodeBinary} ${npmPath} install`, { cwd, env: { PATH: process.env.PATH } }),
-    await execAsync(`${nodeBinary} ${npmPath} install`, { cwd: customDir, env: { PATH: process.env.PATH } }),
+    await execAsync(`${npmCmd} install`, { cwd, env: { PATH: process.env.PATH } }),
+    await execAsync(`${npmCmd} install`, { cwd: customDir, env: { PATH: process.env.PATH } }),
   ]);
   // console.log(chalk.dim(`Dependencies installed in ${cwd} and ${customDir}: \n${res[0].stdout}${res[1].stdout}`));
 }

package/commands/postinstall.js

@@ -0,0 +1,15 @@
+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);
+}

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: 1000,
+            limit: 10000,
             offset: 0,
           },
         });

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

@@ -84,7 +84,7 @@
           </td>
         </tr>
 
-        <tr @mousedown="onClick($event,row)" 
+        <tr @click="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,50 +457,48 @@ 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;
-  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 === 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'
+        );
+      }
     } else {
-      window.open(
-        router.resolve({
+      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,
           },
-        }).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.1",
+  "version": "2.2.0-next.11",
   "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": "if test -d ./dist/spa/; then cd ./dist/spa/ && npm ci && echo 'installed spa dependencies'; fi"
+    "postinstall": "node -e \"const fs=require('fs');const path=require('path');const spaPath=path.join(__dirname,'dist','spa');if(fs.existsSync(spaPath)){process.chdir(spaPath);require('child_process').execSync('npm ci',{stdio:'inherit'});console.log('installed spa dependencies');}\""
   },
   "release": {
     "plugins": [
@@ -56,7 +56,7 @@
   "license": "ISC",
   "type": "module",
   "dependencies": {
-    "@babel/parser": "^7.27.0",
+    "@babel/parser": "^7.27.5",
     "@clickhouse/client": "^1.4.0",
     "@faker-js/faker": "^9.0.3",
     "@inquirer/prompts": "^7.4.1",