Merge pull request #645 from devforth/next

Next

Author: yaroslav8765

adminforth/commands/createApp/templates/pnpm_templates/pnpm-workspace.yaml.hbs

@@ -1,2 +1,8 @@
+allowBuilds:
+  '@prisma/engines': true
+  adminforth: true
+  better-sqlite3: true
+  esbuild: true
+  prisma: true
 onlyBuiltDependencies:
   - better-sqlite3

adminforth/commands/createApp/utils.js

@@ -483,17 +483,17 @@ async function installDependenciesPnpm(ctx, cwd) {
   const isWindows = process.platform === 'win32';
 
   const nodeBinary = process.execPath; 
-  const npmPath = path.join(path.dirname(nodeBinary), isWindows ? 'pnpm.cmd' : 'pnpm');
+  const pnpmPath = path.join(path.dirname(nodeBinary), isWindows ? 'pnpm.cmd' : 'pnpm');
   const customDir = ctx.customDir;
   if (isWindows) {
     const res = await Promise.all([
-      await execAsync(`pnpm install`, { cwd, env: { PATH: process.env.PATH } }),
-      await execAsync(`pnpm install`, { cwd: customDir, env: { PATH: process.env.PATH } }),
+      execAsync(`pnpm install`, { cwd, env: { PATH: process.env.PATH } }),
+      execAsync(`pnpm install`, { cwd: customDir, env: { PATH: process.env.PATH } }),
     ]);
   } else {
     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 } }),
+      execAsync(`${nodeBinary} ${pnpmPath} install`, { cwd, env: { PATH: process.env.PATH } }),
+      execAsync(`${nodeBinary} ${pnpmPath} install`, { cwd: customDir, env: { PATH: process.env.PATH } }),
     ]);
   }
 }
@@ -506,13 +506,13 @@ async function installDependenciesNpm(ctx, cwd) {
   const customDir = ctx.customDir;
   if (isWindows) {
     const res = await Promise.all([
-      await execAsync(`npm install`, { cwd, env: { PATH: process.env.PATH } }),
-      await execAsync(`npm install`, { cwd: customDir, env: { PATH: process.env.PATH } }),
+      execAsync(`npm install`, { cwd, env: { PATH: process.env.PATH } }),
+      execAsync(`npm install`, { cwd: customDir, env: { PATH: process.env.PATH } }),
     ]);
   } else {
     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 } }),
+      execAsync(`${nodeBinary} ${npmPath} install`, { cwd, env: { PATH: process.env.PATH } }),
+      execAsync(`${nodeBinary} ${npmPath} install`, { cwd: customDir, env: { PATH: process.env.PATH } }),
     ]);
   }
 }

adminforth/documentation/docs/tutorial/03-Customization/09-Actions.md

@@ -114,6 +114,53 @@ If your operation can be expressed more efficiently as a single batched query (e
 | `bulkConfirmationMessage` | `string` | Confirmation dialog text shown before the bulk action executes. |
 | `bulkSuccessMessage` | `string` | Success message shown after the bulk operation. Defaults to `"N out of M items processed successfully"`. |
 
+## Standalone Bulk Actions
+
+For operations that only apply to multiple selected records, use `options.bulkActions`. The built-in **Delete checked** action is a good reference.
+
+```ts title="./resources/apartments.ts"
+{
+  resourceId: 'aparts',
+  options: {
+    bulkActions: [
+      {
+        label: 'Send Invitation',
+        icon: 'flowbite:envelope-solid',
+        confirm: 'Are you sure you want to send invitation emails?',
+        allowed: async ({ adminUser }) => adminUser.dbUser.role === 'superadmin',
+        action: async ({ selectedIds }) => {
+          await sendBulkInvitations(selectedIds);
+          return { ok: true, successMessage: `Sent to ${selectedIds.length} users` };
+        },
+      },
+    ],
+  },
+}
+```
+
+### Confirmation dialog
+
+Pass `confirm` to show a dialog before the action runs.
+
+**String** — shown as the dialog title, no secondary message:
+
+```ts
+confirm: 'Are you sure you want to send invitation emails?',
+```
+
+**Object** — full control over the dialog. `{count}` in `message` is replaced with the number of selected records; `|` separates singular and plural forms:
+
+```ts
+confirm: {
+  title: 'Are you sure you want to archive the selected items?',
+  message: 'Archiving {count} item. This process is irreversible. | Archiving {count} items. This process is irreversible.',
+  yes: 'Archive',
+  no: 'Cancel',
+},
+```
+
+Omit `confirm` entirely to skip the dialog and run the action immediately.
+
 ### Access Control
 
 You can control who can use an action through the `allowed` function. This function receives:

adminforth/modules/configValidator.ts

@@ -250,7 +250,11 @@ export default class ConfigValidator implements IConfigValidator {
     bulkActions.push({
       label: `Delete checked`,
       icon: 'flowbite:trash-bin-outline',
-      confirm: 'Are you sure you want to delete selected items?',
+      confirm: {
+        title: 'Are you sure you want to delete selected items?',
+        message: 'Deleting {count} item. This process is irreversible. | Deleting {count} items. This process is irreversible.',
+      },
+      dangerous: true,
       allowed: async ({ resource, adminUser, allowedActions }) => { return allowedActions.delete },
       action: async ({ selectedIds, adminUser, response }) => {
         const connector = this.adminforth.connectors[res.dataSource];

adminforth/modules/restApi.ts

@@ -1116,7 +1116,15 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
             translateRoutines[`bulkAction${i}`] = tr(action.label, `resource.${resource.resourceId}`);
           }
           if (action.confirm) {
-            translateRoutines[`bulkActionConfirm${i}`] = tr(action.confirm, `resource.${resource.resourceId}`);
+            if (typeof action.confirm === 'string') {
+              translateRoutines[`bulkActionConfirm${i}`] = tr(action.confirm, `resource.${resource.resourceId}`);
+            } else {
+              Object.entries(action.confirm).forEach(([key, value]: [string, string]) => {
+                if (value) {
+                  translateRoutines[`bulkActionConfirm${i}_${key}`] = tr(value, `resource.${resource.resourceId}`);
+                }
+              });
+            }
           }
         });
 
@@ -1217,7 +1225,16 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
                 (action, i) => ({
                   ...action,
                   label: action.label ? translated[`bulkAction${i}`] : action.label,
-                  confirm: action.confirm ? translated[`bulkActionConfirm${i}`] : action.confirm,
+                  confirm: !action.confirm ? action.confirm : (
+                    typeof action.confirm === 'string'
+                      ? translated[`bulkActionConfirm${i}`]
+                      : Object.fromEntries(
+                          Object.entries(action.confirm).map(([key, value]) => [
+                            key,
+                            value ? translated[`bulkActionConfirm${i}_${key}`] : value,
+                          ])
+                        )
+                  ),
                 })
               ),
               actions: allowedCustomActions.map(({ bulkHandler, action: actionFn, ...rest }) => ({

adminforth/package-lock.json

@@ -2,11 +2,6 @@
   "name": "adminforth",
   "version": "1.6.2",
   "description": "OpenSource Agent-Native forth-generation admin panel",
-  "pnpm": {
-    "overrides": {
-      "shell-quote": "^1.8.4"
-    }
-  },
   "keywords": [
     "adminforth",
     "agent",

adminforth/package.json

@@ -1,10 +1,8 @@
 packages:
   - spa
 
-ignoredBuiltDependencies:
-  - '@parcel/watcher'
-  - esbuild
-  - vue-demi
-
-onlyBuiltDependencies:
-  - better-sqlite3
+allowBuilds:
+  '@parcel/watcher': true
+  better-sqlite3: true
+  esbuild: true
+  vue-demi: true

adminforth/pnpm-lock.yaml

@@ -12,11 +12,6 @@
     "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
     "i18n:extract": "echo {} > i18n-empty.json && vue-i18n-extract report --vueFiles \"./src/**/*.{js,vue,ts}\" --output ./i18n-messages.json --languageFiles \"i18n-empty.json\" --add"
   },
-  "pnpm": {
-    "overrides": {
-      "shell-quote": "^1.8.4"
-    }
-  },
   "dependencies": {
     "@iconify-prerendered/vue-flag": "^0.28.1748584105",
     "@iconify-prerendered/vue-flowbite": "^0.28.1754899090",