Merge branch 'next' of github.com:devforth/adminforth into next

Author: ivictbor

adminforth/documentation/blog/2025-11-04-k3s-ec2-deployment/index.md

@@ -62,3 +62,8 @@ helm:
   label: Helm
   permalink: /helm
   description: The package manager for Kubernetes
+
+ansible:
+  label: Ansible
+  permalink: /ansible
+  description: Ansible is an open-source automation tool used for configuration management, application deployment, and task automation.

adminforth/documentation/blog/tags.yml

@@ -242,7 +242,7 @@ options: {
       name: 'Auto submit',
       icon: 'flowbite:play-solid',
       allowed: () => true,
-      action: async ({ recordId, adminUser, adminforth, extra, cookies }) => {
+      action: async ({ recordId, adminUser, adminforth, extra }) => {
         //diff-add
         const verificationResult = extra?.verificationResult
         //diff-add
@@ -260,7 +260,7 @@ options: {
         //diff-add
           userPk: adminUser.pk,
         //diff-add
-          cookies: cookies
+          cookies: extra.cookies
         //diff-add
         });
 

adminforth/documentation/docs/tutorial/07-Plugins/02-TwoFactorsAuth.md

@@ -1481,15 +1481,10 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
         }
     })
 
-    // setup endpoints for all plugins
-    this.adminforth.activatedPlugins.forEach((plugin) => {
-      plugin.setupEndpoints(server);
-    });
-
     server.endpoint({
       method: 'POST',
       path: '/start_custom_action',
-      handler: async ({ body, adminUser, tr }) => {
+      handler: async ({ body, adminUser, tr, cookies }) => {
         const { resourceId, actionId, recordId, extra } = body;
         const resource = this.adminforth.config.resources.find((res) => res.resourceId == resourceId);
         if (!resource) {
@@ -1521,7 +1516,7 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
             redirectUrl: action.url
           }
         }
-        const response = await action.action({ recordId, adminUser, resource, tr, adminforth: this.adminforth, extra });
+        const response = await action.action({ recordId, adminUser, resource, tr, adminforth: this.adminforth, extra: {...extra, cookies: cookies} });
 
         return {
           actionId,
@@ -1531,5 +1526,11 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
         }
       }
     });
+
+    // setup endpoints for all plugins
+    this.adminforth.activatedPlugins.forEach((plugin) => {
+      plugin.setupEndpoints(server);
+    });
+    
   }
 }

adminforth/modules/restApi.ts

@@ -194,7 +194,7 @@
                       :row="row"
                       :resource="resource"
                       :adminUser="adminUser"
-                      @callAction="(payload? : Object) => startCustomAction(action.id, payload ?? row)"
+                      @callAction="(payload? : Object) => startCustomAction(action.id, row, payload)"
                     >
                       <button
                         type="button"
@@ -561,7 +561,7 @@ async function deleteRecord(row: any) {
 
 const actionLoadingStates = ref<Record<string | number, boolean>>({});
 
-async function startCustomAction(actionId: string, row: any) {
+async function startCustomAction(actionId: string, row: any, extraData: Record<string, any> = {}) {
   console.log('Starting custom action', actionId, row);
   actionLoadingStates.value[actionId] = true;
 
@@ -571,7 +571,8 @@ async function startCustomAction(actionId: string, row: any) {
     body: {
       resourceId: props.resource?.resourceId,
       actionId: actionId,
-      recordId: row._primaryKeyValue
+      recordId: row._primaryKeyValue,
+      extra: extraData,
     }
   });
   

adminforth/spa/src/components/ResourceListTable.vue

@@ -208,7 +208,7 @@
                       :row="row"
                       :resource="resource"
                       :adminUser="adminUser"
-                      @callAction="(payload? : Object) => startCustomAction(action.id, payload ?? row)"
+                      @callAction="(payload? : Object) => startCustomAction(action.id, row, payload )"
                     >
                       <button
                         type="button"
@@ -586,7 +586,7 @@ async function deleteRecord(row: any) {
 
 const actionLoadingStates = ref<Record<string | number, boolean>>({});
 
-async function startCustomAction(actionId: string, row: any) {
+async function startCustomAction(actionId: string, row: any, extraData: Record<string, any> = {}) {
   actionLoadingStates.value[actionId] = true;
 
   const data = await callAdminForthApi({
@@ -595,7 +595,8 @@ async function startCustomAction(actionId: string, row: any) {
     body: {
       resourceId: props.resource?.resourceId,
       actionId: actionId,
-      recordId: row._primaryKeyValue
+      recordId: row._primaryKeyValue,
+      extra: extraData
     }
   });
   

adminforth/spa/src/components/ResourceListTableVirtual.vue

@@ -1066,9 +1066,15 @@ export interface AdminForthInputConfig {
        * If rememberMeDuration is set, then users who check "Remember Me" will be staying logged in for this amount of time.
        * Format: "1s" (seconds), "1m" (minutes), "1h" (hours), or "1d" (days).
        * Example: "30d" for 30 days, "7d" for 7 days, "24h" for 24 hours.
-       */
+       */ 
       rememberMeDuration?: string,
 
+      /**
+       * Old variable for remember me duration. Use rememberMeDuration instead.
+       * @deprecated Use rememberMeDuration instead.
+       */ 
+      rememberMeDays?: number,
+
 
       /**
        * Can be used to limit user access when subscribing from frontend to websocket topics.

adminforth/types/Back.ts

@@ -40,7 +40,7 @@ new AdminForth({
     // brandLogo: '@@/logo.svg',
     // favicon: '@@/favicon.png',
     announcementBadge: (adminUser: AdminUser) => {
-      return { 
+      return {
         html: `
 <svg xmlns="http://www.w3.org/2000/svg" style="display:inline; margin-top: -4px" width="16" height="16" viewBox="0 0 24 24"><path d="M12 .587l3.668 7.568 8.332 1.151-6.064 5.828 1.48 8.279-7.416-3.967-7.417 3.967 1.481-8.279-6.064-5.828 8.332-1.151z"/></svg> 
 <a href="https://github.com/devforth/adminforth" style="font-weight: bold; text-decoration: underline" target="_blank">Star us on GitHub</a> to support a project!`,

live-demo/app/index.ts

@@ -19,7 +19,7 @@
     "@adminforth/audit-log": "^1.7.3",
     "@adminforth/bulk-ai-flow": "^1.17.4",
     "@adminforth/chat-gpt": "^1.0.20",
-    "@adminforth/clone-row": "^1.1.1",
+    "@adminforth/clone-row": "^1.1.2",
     "@adminforth/completion-adapter-open-ai-chat-gpt": "^1.0.2",
     "@adminforth/email-password-reset": "^1.3.5",
     "@adminforth/foreign-inline-list": "^1.9.2",