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

Author: SerVitasik

adminforth/commands/createApp/templates/index.ts.hbs

@@ -77,7 +77,6 @@ if (import.meta.url === `file://${process.argv[1]}`) {
   });
 
   admin.express.listen(port, () => {
-    console.log(`Example app listening at http://localhost:${port}`);
     console.log(`\n⚡ AdminForth is available at http://localhost:${port}${ADMIN_BASE_URL}\n`);
   });
 }

adminforth/dataConnectors/mysql.ts

@@ -8,7 +8,12 @@ class MysqlConnector extends AdminForthBaseConnector implements IAdminForthDataS
 
   async setupClient(url): Promise<void> {
     try {
-      this.client = await mysql.createConnection(url);
+      this.client = mysql.createPool({
+        uri: url,
+        waitForConnections: true,
+        connectionLimit: 10,  // Adjust based on your needs
+        queueLimit: 0
+      });
     } catch (e) {
       console.error(`Failed to connect to MySQL: ${e}`);
     }
@@ -33,7 +38,7 @@ class MysqlConnector extends AdminForthBaseConnector implements IAdminForthDataS
   };
 
   async discoverFields(resource) {
-    const [results] = await this.client.query("SHOW COLUMNS FROM " + resource.table);
+    const [results] = await this.client.execute("SHOW COLUMNS FROM " + resource.table);
     const fieldTypes = {};
     results.forEach((row) => {
       const field: any = {};
@@ -231,7 +236,7 @@ class MysqlConnector extends AdminForthBaseConnector implements IAdminForthDataS
     if (process.env.HEAVY_DEBUG_QUERY) {
       console.log('🪲📜 MySQL Q:', q, 'values:', filterValues);
     }
-    const [results] = await this.client.query(q, filterValues);
+    const [results] = await this.client.execute(q, filterValues);
     return +results[0]["COUNT(*)"];
   }
 
@@ -243,7 +248,7 @@ class MysqlConnector extends AdminForthBaseConnector implements IAdminForthDataS
       if (process.env.HEAVY_DEBUG_QUERY) {
         console.log('🪲📜 MySQL Q:', q);
       }
-      const [results] = await this.client.query(q);
+      const [results] = await this.client.execute(q);
       const { min, max } = results[0];
       result[col.name] = {
         min, max,

adminforth/modules/codeInjector.ts

@@ -363,6 +363,14 @@ class CodeInjector implements ICodeInjector {
           }
         });
       }
+
+      if (resource.options?.actions) {
+        resource.options.actions.forEach((action) => {
+          if (action.icon) {
+            icons.push(action.icon);
+          }
+        });
+      }
     });
 
     const uniqueIcons = Array.from(new Set(icons));

adminforth/modules/configValidator.ts

@@ -330,6 +330,31 @@ export default class ConfigValidator implements IConfigValidator {
     return showInTransformedToObject as ShowIn;
   }
 
+  validateAndNormalizeCustomActions(resInput: AdminForthResourceInput, res: Partial<AdminForthResource>, errors: string[]): any[] {
+    if (!resInput.options?.actions) {
+      return [];
+    }
+
+    const actions = [...resInput.options.actions];
+
+    actions.forEach((action) => {
+      if (!action.name) {
+        errors.push(`Resource "${res.resourceId}" has action without name`);
+      }
+  
+      if (!action.action) {
+        errors.push(`Resource "${res.resourceId}" action "${action.name}" must have action function`);
+      }
+  
+      // Generate ID if not present
+      if (!action.id) {
+        action.id = md5hash(action.name);
+      }
+    });
+
+    return actions;
+  }
+
   validateAndNormalizeResources(errors: string[], warnings: string[]): AdminForthResource[] {
     if (!this.inputConfig.resources) {
       errors.push('No resources defined, at least one resource must be defined');
@@ -644,6 +669,7 @@ export default class ConfigValidator implements IConfigValidator {
       }
 
       options.bulkActions = this.validateAndNormalizeBulkActions(resInput, res, errors);
+      options.actions = this.validateAndNormalizeCustomActions(resInput, res, errors);
 
       // if pageInjection is a string, make array with one element. Also check file exists
       const possibleInjections = ['beforeBreadcrumbs', 'afterBreadcrumbs', 'bottom', 'threeDotsDropdownItems', 'customActionIcons'];

adminforth/modules/restApi.ts

@@ -1213,5 +1213,31 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
     this.adminforth.activatedPlugins.forEach((plugin) => {
       plugin.setupEndpoints(server);
     });
+
+    server.endpoint({
+      method: 'POST',
+      path: '/start_custom_action',
+      handler: async ({ body, adminUser, tr }) => {
+        const { resourceId, actionId, recordId } = body;
+        const resource = this.adminforth.config.resources.find((res) => res.resourceId == resourceId);
+        if (!resource) {
+          return { error: await tr(`Resource {resourceId} not found`, 'errors', { resourceId }) };
+        }
+        console.log("resource", actionId);
+        const action = resource.options.actions.find((act) => act.id == actionId);
+        if (!action) {
+          return { error: await tr(`Action {actionId} not found`, 'errors', { actionId }) };
+        }
+        
+        const response = await action.action({ recordId, adminUser, resource, tr, adminforth: this.adminforth });
+        
+        return {
+          actionId,
+          recordId,
+          resourceId,
+          ...response
+        }
+      }
+    });
   }
 }

adminforth/spa/src/components/ResourceListTable.vue

@@ -172,6 +172,19 @@
                   :record="row"
                 />
               </template>
+
+              <template v-if="resource.options?.actions">
+                <Tooltip v-for="action in resource.options.actions.filter(a => a.showIn?.list)" :key="action.id">
+                  <button
+                    @click="startCustomAction(action.id, row)"
+                  >
+                    <component v-if="action.icon" :is="getIcon(action.icon)" class="w-5 h-5 text-lightPrimary dark:text-darkPrimary"></component>
+                  </button>
+                  <template v-slot:tooltip>
+                    {{ action.name }}
+                  </template>
+                </Tooltip>
+              </template>
             </div>
           </td>
         </tr>
@@ -280,7 +293,7 @@ import { getCustomComponent } from '@/utils';
 import { useCoreStore } from '@/stores/core';
 import { showSuccesTost, showErrorTost } from '@/composables/useFrontendApi';
 import SkeleteLoader from '@/components/SkeleteLoader.vue';
-
+import { getIcon } from '@/utils';
 import {
   IconInboxOutline,
 } from '@iconify-prerendered/vue-flowbite';
@@ -505,4 +518,39 @@ async function deleteRecord(row) {
     };
   }
 }
+
+const actionLoadingStates = ref({});
+
+async function startCustomAction(actionId, row) {
+  actionLoadingStates.value[actionId] = true;
+
+  const data = await callAdminForthApi({
+    path: '/start_custom_action',
+    method: 'POST',
+    body: {
+      resourceId: props.resource.resourceId,
+      actionId: actionId,
+      recordId: row._primaryKeyValue
+    }
+  });
+  
+  actionLoadingStates.value[actionId] = false;
+  
+  if (data?.ok) {
+    emits('update:records', true);
+
+    if (data.successMessage) {
+      adminforth.alert({
+        message: data.successMessage,
+        variant: 'success'
+      });
+    }
+  }
+  
+  if (data?.error) {
+    showErrorTost(data.error);
+  }
+}
+
+
 </script>

adminforth/spa/src/components/ThreeDotsMenu.vue

@@ -1,5 +1,5 @@
 <template >
-  <template v-if="threeDotsDropdownItems?.length">
+  <template v-if="threeDotsDropdownItems?.length || customActions?.length">
     <button 
       data-dropdown-toggle="listThreeDotsDropdown" 
       class="flex items-center py-2 px-2 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-lightPrimary focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700 rounded-default"
@@ -23,21 +23,73 @@
               />
             </a>
           </li>
+          <li v-for="action in customActions" :key="action.id">
+            <a href="#" @click.prevent="handleActionClick(action)" class="block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white">
+              <div class="flex items-center gap-2">
+                <component 
+                  v-if="action.icon" 
+                  :is="getIcon(action.icon)" 
+                  class="w-4 h-4 text-lightPrimary dark:text-darkPrimary"
+                />
+                {{ action.name }}
+              </div>
+            </a>
+          </li>
         </ul>
     </div>
   </template>
 </template>
 
 
 <script setup lang="ts">
+import { getCustomComponent, getIcon } from '@/utils';
+import { useCoreStore } from '@/stores/core';
+import adminforth from '@/adminforth';
+import { callAdminForthApi } from '@/utils';
+import { useRoute } from 'vue-router';
 
-import { getCustomComponent } from '@/utils';
-import { useCoreStore } from '@/stores/core'
+const route = useRoute();
+const coreStore = useCoreStore();
 
-const coreStore = useCoreStore()
+const props = defineProps({
+  threeDotsDropdownItems: Array,
+  customActions: Array
+});
 
-const props = defineProps<{
-  threeDotsDropdownItems: any[] | undefined
-}>()
+async function handleActionClick(action) {
+  adminforth.list.closeThreeDotsDropdown();
+  
+  const actionId = action.id;
+  const data = await callAdminForthApi({
+    path: '/start_custom_action',
+    method: 'POST',
+    body: {
+      resourceId: route.params.resourceId,
+      actionId: actionId,
+      recordId: route.params.primaryKey
+    }
+  });
+  
+  if (data?.ok) {
+    await coreStore.fetchRecord({
+      resourceId: route.params.resourceId, 
+      primaryKey: route.params.primaryKey,
+      source: 'show',
+    });
 
+    if (data.successMessage) {
+      adminforth.alert({
+        message: data.successMessage,
+        variant: 'success'
+      });
+    }
+  }
+  
+  if (data?.error) {
+    adminforth.alert({
+      message: data.error,
+      variant: 'danger'
+    });
+  }
+}
 </script>

adminforth/spa/src/views/ShowView.vue

@@ -10,6 +10,22 @@
       :adminUser="coreStore.adminUser"
     />
     <BreadcrumbsWithButtons>
+      <template v-if="coreStore.resource?.options?.actions">
+        <button 
+          v-for="action in coreStore.resource.options.actions.filter(a => a.showIn?.showButton)" 
+          :key="action.id"
+          @click="startCustomAction(action.id)"
+          :disabled="actionLoadingStates[action.id]"
+          class="flex items-center py-1 px-3 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded-default border border-gray-300 hover:bg-gray-100 hover:text-lightPrimary focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
+        >
+          <component 
+            v-if="action.icon" 
+            :is="getIcon(action.icon)" 
+            class="w-4 h-4 me-2 text-lightPrimary dark:text-darkPrimary"
+          />
+          {{ action.name }}
+        </button>
+      </template>
       <RouterLink v-if="coreStore.resource?.options?.allowedActions?.create"
         :to="{ name: 'resource-create', params: { resourceId: $route.params.resourceId } }"
         class="flex items-center py-1 px-3 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-lightPrimary focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700 rounded-default"
@@ -34,6 +50,7 @@
 
       <ThreeDotsMenu 
         :threeDotsDropdownItems="coreStore.resourceOptions?.pageInjections?.show?.threeDotsDropdownItems"
+        :customActions="customActions"
       ></ThreeDotsMenu>
     </BreadcrumbsWithButtons>
 
@@ -121,13 +138,20 @@ import ThreeDotsMenu from '@/components/ThreeDotsMenu.vue';
 import ShowTable from '@/components/ShowTable.vue';
 import adminforth from "@/adminforth";
 import { useI18n } from 'vue-i18n';
+import { getIcon } from '@/utils';
 
 const route = useRoute();
 const router = useRouter();
 const loading = ref(true);
 const { t } = useI18n();
 const coreStore = useCoreStore();
 
+const actionLoadingStates = ref({});
+
+const customActions = computed(() => {
+  return coreStore.resource?.options?.actions?.filter(a => a.showIn?.showThreeDotsMenu) || [];
+});
+
 onMounted(async () => {
   loading.value = true;
   await coreStore.fetchResourceFull({
@@ -206,4 +230,39 @@ async function deleteRecord(row) {
     
 }
 
+async function startCustomAction(actionId) {  
+  actionLoadingStates.value[actionId] = true;
+
+  const data = await callAdminForthApi({
+    path: '/start_custom_action',
+    method: 'POST',
+    body: {
+      resourceId: route.params.resourceId,
+      actionId: actionId,
+      recordId: route.params.primaryKey
+    }
+  });
+  
+  actionLoadingStates.value[actionId] = false;
+  
+  if (data?.ok) {
+    await coreStore.fetchRecord({
+      resourceId: route.params.resourceId, 
+      primaryKey: route.params.primaryKey,
+      source: 'show',
+    });
+
+    if (data.successMessage) {
+      adminforth.alert({
+        message: data.successMessage,
+        variant: 'success'
+      });
+    }
+  }
+  
+  if (data?.error) {
+    showErrorTost(data.error);
+  }
+}
+
 </script>