adminforth 2.27.0-next.1 → 2.27.0-next.10

package/dist/spa/src/utils/utils.ts

@@ -101,11 +101,13 @@ export async function callAdminForthApi(
   }
 }
 
-export function formatComponent(component: AdminForthComponentDeclaration): AdminForthComponentDeclarationFull {
+export function formatComponent(component: AdminForthComponentDeclaration | undefined): AdminForthComponentDeclarationFull {
   if (typeof component === 'string') {
     return { file: component, meta: {} };
-  } else {
+  } else if (typeof component === 'object') {
     return { file: component.file, meta: component.meta };
+  } else {
+    return { file: '', meta: {} };
   }
 }
 
@@ -191,7 +193,8 @@ export function applyRegexValidation(value: any, validation: ValidationObject[]
   if ( validation?.length ) {
     const validationArray = validation;
     for (let i = 0; i < validationArray.length; i++) {
-      if (validationArray[i].regExp) {
+      const regExpPattern = validationArray[i].regExp;
+      if (regExpPattern) {
         let flags = '';
         if (validationArray[i].caseSensitive) {
           flags += 'i';
@@ -203,7 +206,7 @@ export function applyRegexValidation(value: any, validation: ValidationObject[]
           flags += 'g';
         }
 
-        const regExp = new RegExp(validationArray[i].regExp, flags);
+        const regExp = new RegExp(regExpPattern, flags);
         if (value === undefined || value === null) {
           value = '';
         }
@@ -690,4 +693,162 @@ export async function onBeforeRouteLeaveCreateEditViewGuard(initialValues: any,
       leaveGuardActive.setActive(false);
     }
   });
+}
+
+export async function executeCustomAction({
+  actionId,
+  resourceId,
+  recordId,
+  extra = {},
+  onSuccess,
+  onError,
+  setLoadingState,
+}: {
+  actionId: string | number | undefined,
+  resourceId: string,
+  recordId: string | number,
+  extra?: Record<string, any>,
+  onSuccess?: (data: any) => Promise<void>,
+  onError?: (error: string) => void,
+  setLoadingState?: (loading: boolean) => void,
+}): Promise<any> {
+  setLoadingState?.(true);
+
+  try {
+    const data = await callAdminForthApi({
+      path: '/start_custom_action',
+      method: 'POST',
+      body: {
+        resourceId,
+        actionId,
+        recordId,
+        extra: extra || {},
+      }
+    });
+
+    if (data?.redirectUrl) {
+      // Check if the URL should open in a new tab
+      if (data.redirectUrl.includes('target=_blank')) {
+        window.open(data.redirectUrl.replace('&target=_blank', '').replace('?target=_blank', ''), '_blank');
+      } else {
+        // Navigate within the app
+        if (data.redirectUrl.startsWith('http')) {
+          window.location.href = data.redirectUrl;
+        } else {
+          router.push(data.redirectUrl);
+        }
+      }
+      return data;
+    }
+
+    if (data?.ok) {
+      if (onSuccess) {
+        await onSuccess(data);
+      }
+      return data;
+    }
+
+    if (data?.error) {
+      if (onError) {
+        onError(data.error);
+      }
+    }
+
+    return data;
+  } finally {
+    setLoadingState?.(false);
+  }
+}
+
+export async function executeCustomBulkAction({
+  actionId,
+  resourceId,
+  recordIds,
+  extra = {},
+  onSuccess,
+  onError,
+  setLoadingState,
+  confirmMessage,
+}: {
+  actionId: string | number | undefined,
+  resourceId: string,
+  recordIds: (string | number)[],
+  extra?: Record<string, any>,
+  onSuccess?: (results: any[]) => Promise<void>,
+  onError?: (error: string) => void,
+  setLoadingState?: (loading: boolean) => void,
+  confirmMessage?: string,
+}): Promise<any> {
+  if (!recordIds || recordIds.length === 0) {
+    if (onError) {
+      onError('No records selected');
+    }
+    return { error: 'No records selected' };
+  }
+
+  if (confirmMessage) {
+    const { confirm } = useAdminforth();
+    const confirmed = await confirm({
+      message: confirmMessage,
+    });
+    if (!confirmed) {
+      return { cancelled: true };
+    }
+  }
+
+  setLoadingState?.(true);
+
+  try {
+    // Execute action for all records in parallel using Promise.all
+    const results = await Promise.all(
+      recordIds.map(recordId =>
+        callAdminForthApi({
+          path: '/start_custom_action',
+          method: 'POST',
+          body: {
+            resourceId,
+            actionId,
+            recordId,
+            extra: extra || {},
+          }
+        })
+      )
+    );
+
+    const lastResult = results[results.length - 1];
+    if (lastResult?.redirectUrl) {
+      if (lastResult.redirectUrl.includes('target=_blank')) {
+        window.open(lastResult.redirectUrl.replace('&target=_blank', '').replace('?target=_blank', ''), '_blank');
+      } else {
+        if (lastResult.redirectUrl.startsWith('http')) {
+          window.location.href = lastResult.redirectUrl;
+        } else {
+          router.push(lastResult.redirectUrl);
+        }
+      }
+      return lastResult;
+    }
+
+    const allSucceeded = results.every(r => r?.ok);
+    const hasErrors = results.some(r => r?.error);
+
+    if (allSucceeded) {
+      if (onSuccess) {
+        await onSuccess(results);
+      }
+      return { ok: true, results };
+    }
+
+    if (hasErrors) {
+      const errorMessages = results.filter(r => r?.error).map(r => r.error).join(', ');
+      if (onError) {
+        onError(errorMessages);
+      }
+      return { error: errorMessages, results };
+    }
+
+    return { results };
+  } finally {
+    setLoadingState?.(false);
+  }
 }

package/dist/spa/src/utils.ts

@@ -1,2 +1,3 @@
 export * from './utils/utils';
-export * from './utils/listUtils';
+export * from './utils/listUtils';
+export * from './utils/createEditUtils';

package/dist/spa/src/views/CreateView.vue

@@ -20,11 +20,9 @@
       <button  
         @click="() => saveRecord()"
         class="af-save-button h-[34px] af-button-shadow flex items-center py-1 px-3 text-sm font-medium rounded-default text-lightCreateViewSaveButtonText focus:outline-none bg-lightCreateViewButtonBackground rounded border border-lightCreateViewButtonBorder hover:bg-lightCreateViewButtonBackgroundHover hover:text-lightCreateViewSaveButtonTextHover focus:z-10 focus:ring-4 focus:ring-lightCreateViewButtonFocusRing dark:focus:ring-darkCreateViewButtonFocusRing dark:bg-darkCreateViewButtonBackground dark:text-darkCreateViewSaveButtonText dark:border-darkCreateViewButtonBorder dark:hover:text-darkCreateViewSaveButtonTextHover dark:hover:bg-darkCreateViewButtonBackgroundHover disabled:opacity-50 gap-1"
-        :disabled="saving || (validating && !isValid)"
+        :disabled="saving || (validatingMode && !isValid) || resourceFormRef?.isValidating"
       > 
-        <svg v-if="saving"
-         aria-hidden="true" class="w-4 h-4 mr-1 text-gray-200 animate-spin dark:text-gray-600 fill-lightCreateViewSaveButtonText" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/><path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/></svg>
-        
+        <Spinner v-if="saving || resourceFormRef?.isValidating" class="w-4 h-4" />
         <IconFloppyDiskSolid v-else class="w-4 h-4" />
         {{ $t('Save') }}
       </button>
@@ -54,7 +52,7 @@
       :resource="coreStore.resource!"
       @update:record="onUpdateRecord"
       @update:isValid="isValid = $event"
-      :validating="validating"
+      :validatingMode="validatingMode"
       :source="'create'"
       :readonlyColumns="readonlyColumns"
     >
@@ -81,18 +79,18 @@ import SingleSkeletLoader from '@/components/SingleSkeletLoader.vue';
 import { useCoreStore } from '@/stores/core';
 import { callAdminForthApi, getCustomComponent,checkAcessByAllowedActions, initThreeDotsDropdown, checkShowIf, compareOldAndNewRecord, onBeforeRouteLeaveCreateEditViewGuard, leaveGuardActiveClass, formatComponent } from '@/utils';
 import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
-import { onMounted, onBeforeMount, onBeforeUnmount, ref, watch, nextTick } from 'vue';
-import { useRoute, useRouter, onBeforeRouteLeave } from 'vue-router';
-import { computed } from 'vue';
+import { onMounted, onBeforeMount, onBeforeUnmount, ref  } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
 import { showErrorTost } from '@/composables/useFrontendApi';
 import ThreeDotsMenu from '@/components/ThreeDotsMenu.vue';
 import { useAdminforth } from '@/adminforth';
 import { useI18n } from 'vue-i18n';
 import { type AdminForthComponentDeclaration, type AdminForthComponentDeclarationFull } from '@/types/Common.js';
-import type { AdminForthResourceColumn } from '@/types/Back';
+import { saveRecordPreparations } from '@/utils';
+import { Spinner } from '@/afcl'
 
 const isValid = ref(false);
-const validating = ref(false);
+const validatingMode = ref(false);
 
 const loading = ref(true);
 const saving = ref(false);
@@ -195,28 +193,22 @@ onMounted(async () => {
 });
 
 async function saveRecord() {
-  if (!isValid.value) {
-    validating.value = true;
-    await nextTick();
-    scrollToInvalidField();
-    return;
-  } else {
-    validating.value = false;
-  }
+  const interceptorsResult = await saveRecordPreparations(
+    'create', 
+    validatingMode, 
+    resourceFormRef, 
+    isValid, 
+    t, 
+    saving, 
+    runSaveInterceptors, 
+    record, 
+    coreStore, 
+    route
+  );
+
   const requiredColumns = coreStore.resource?.columns.filter(c => c.required?.create === true) || [];
   const requiredColumnsToSkip = requiredColumns.filter(c => checkShowIf(c, record.value, coreStore.resource?.columns || []) === false);  
-  saving.value = true;
-  const interceptorsResult = await runSaveInterceptors({
-    action: 'create',
-    values: record.value,
-    resource: coreStore.resource,
-    resourceId: route.params.resourceId as string,
-  });
-  if (!interceptorsResult.ok) {
-    saving.value = false;
-    if (interceptorsResult.error) showErrorTost(interceptorsResult.error);
-    return;
-  }
+
   const interceptorConfirmationResult = (interceptorsResult.extra as Record<string, any>)?.confirmationResult;
   const response = await callAdminForthApi({
     method: 'POST',
@@ -254,23 +246,4 @@ async function saveRecord() {
   saving.value = false;
 }
 
-function scrollToInvalidField() {
-  let columnsWithErrors: {column: AdminForthResourceColumn, error: string}[] = [];
-  for (const column of resourceFormRef.value?.editableColumns || []) {
-    const error = resourceFormRef.value?.columnError(column);
-    if (error) {
-      columnsWithErrors.push({column, error});
-    }
-  }
-  const errorMessage = t('Failed to save. Please fix errors for the following fields:') + '<ul class="mt-2 list-disc list-inside">' + columnsWithErrors.map(c => `<li><strong>${c.column.label || c.column.name}</strong>: ${c.error}</li>`).join('') + '</ul>';
-  alert({
-    messageHtml: errorMessage,
-    variant: 'danger'
-  });
-  const firstInvalidElement = document.querySelector('.af-invalid-field-message');
-  if (firstInvalidElement) {
-    firstInvalidElement.scrollIntoView({ behavior: 'smooth', block: 'center' });
-  }
-}
-
 </script>

package/dist/spa/src/views/EditView.vue

@@ -19,9 +19,10 @@
       <button
         @click="() => saveRecord()"
         class="flex items-center h-[34px] af-button-shadow py-1 px-3 text-sm font-medium  rounded-default text-lightEditViewSaveButtonText focus:outline-none bg-lightEditViewButtonBackground rounded border border-lightEditViewButtonBorder hover:bg-lightEditViewButtonBackgroundHover hover:text-lightEditViewSaveButtonTextHover focus:z-10 focus:ring-4 focus:ring-lightEditViewButtonFocusRing dark:focus:ring-darkEditViewButtonFocusRing dark:bg-darkEditViewButtonBackground dark:text-darkEditViewSaveButtonText dark:border-darkEditViewButtonBorder dark:hover:text-darkEditViewSaveButtonTextHover dark:hover:bg-darkEditViewButtonBackgroundHover disabled:opacity-50 gap-1"
-        :disabled="saving || (validating && !isValid)"
+        :disabled="saving || (validatingMode && !isValid) || resourceFormRef?.isValidating"
       >
-        <IconFloppyDiskSolid class="w-4 h-4" />
+        <Spinner v-if="saving || resourceFormRef?.isValidating" class="w-4 h-4" />
+        <IconFloppyDiskSolid v-else class="w-4 h-4" />
         {{ $t('Save') }}
       </button>
 
@@ -50,7 +51,7 @@
       :adminUser="coreStore.adminUser"
       @update:record="onUpdateRecord"
       @update:isValid="isValid = $event"
-      :validating="validating"
+      :validatingMode="validatingMode"
       :source="'edit'"
     >
     </ResourceForm>
@@ -85,13 +86,15 @@ import { useI18n } from 'vue-i18n';
 import { formatComponent } from '@/utils';
 import { type AdminForthComponentDeclaration, type AdminForthComponentDeclarationFull } from '@/types/Common.js';
 import type { AdminForthResourceColumn } from '@/types/Back';
+import { scrollToInvalidField, saveRecordPreparations } from '@/utils';
+import { Spinner } from '@/afcl'
 
 const { t } = useI18n();
 const coreStore = useCoreStore();
 const { clearSaveInterceptors, runSaveInterceptors, alert, confirm } = useAdminforth();
 
 const isValid = ref(false);
-const validating = ref(false);
+const validatingMode = ref(false);
 
 const route = useRoute();
 const router = useRouter();
@@ -180,22 +183,20 @@ onMounted(async () => {
 });
 
 async function saveRecord() {
-  if (!isValid.value) {
-    validating.value = true;
-    await nextTick();
-    scrollToInvalidField();
-    return;
-  } else {
-    validating.value = false;
-  }
 
-  saving.value = true;
-  const interceptorsResult = await runSaveInterceptors({
-    action: 'edit',
-    values: record.value,
-    resource: coreStore.resource,
-    resourceId: route.params.resourceId as string,
-  });
+  const interceptorsResult = await saveRecordPreparations(
+    'edit', 
+    validatingMode, 
+    resourceFormRef, 
+    isValid, 
+    t, 
+    saving, 
+    runSaveInterceptors, 
+    record, 
+    coreStore, 
+    route
+  );
+
   if (!interceptorsResult.ok) {
     saving.value = false;
     if (interceptorsResult.error) showErrorTost(interceptorsResult.error);
@@ -256,23 +257,4 @@ async function saveRecord() {
   saving.value = false;
 }
 
-function scrollToInvalidField() {
-  let columnsWithErrors: {column: AdminForthResourceColumn, error: string}[] = [];
-  for (const column of resourceFormRef.value?.editableColumns || []) {
-    const error = resourceFormRef.value?.columnError(column);
-    if (error) {
-      columnsWithErrors.push({column, error});
-    }
-  }
-  const errorMessage = t('Failed to save. Please fix errors for the following fields:') + '<ul class="mt-2 list-disc list-inside">' + columnsWithErrors.map(c => `<li><strong>${c.column.label || c.column.name}</strong>: ${c.error}</li>`).join('') + '</ul>';
-  alert({
-    messageHtml: errorMessage,
-    variant: 'danger'
-  });
-  const firstInvalidElement = document.querySelector('.af-invalid-field-message');
-  if (firstInvalidElement) {
-    firstInvalidElement.scrollIntoView({ behavior: 'smooth', block: 'center' });
-  }
-}
-
 </script>

package/dist/spa/src/views/ListView.vue

@@ -48,7 +48,7 @@
           </Tooltip>
       </button>
 
-           <div 
+      <div 
         v-if="checkboxes.length"
         v-for="(action,i) in coreStore.resource?.options?.bulkActions" 
       >
@@ -91,6 +91,41 @@
           </div>
         </button>
       </div>
+      <div
+        v-if="checkboxes.length"
+        v-for="(action,i) in coreStore.resource?.options?.actions?.filter(a => a.showIn?.bulkButton)" 
+      >
+        <button
+          :key="action.id"
+          @click="startCustomBulkActionInner(action.id!)"
+          class="flex gap-1 items-center py-1 px-3 text-sm font-medium text-lightListViewButtonText
+            focus:outline-none bg-lightListViewButtonBackground rounded-default border h-[34px]
+            border-lightListViewButtonBorder hover:bg-lightListViewButtonBackgroundHover 
+            hover:text-lightListViewButtonTextHover focus:z-10 focus:ring-4 af-button-shadow
+            focus:ring-lightListViewButtonFocusRing dark:focus:ring-darkListViewButtonFocusRing 
+            dark:bg-darkListViewButtonBackground dark:text-darkListViewButtonText dark:border-darkListViewButtonBorder 
+            dark:hover:text-darkListViewButtonTextHover dark:hover:bg-darkListViewButtonBackgroundHover"
+        >
+          <component
+            v-if="action.icon && !customActionLoadingStates[action.id!]"
+            :is="getIcon(action.icon)"
+            class="w-5 h-5 transition duration-75 group-hover:text-gray-900 dark:group-hover:text-white"></component>
+            <div v-if="customActionLoadingStates[action.id!]">
+              <svg 
+                aria-hidden="true" 
+                class="w-5 h-5 animate-spin text-gray-200 dark:text-gray-500 fill-gray-500 dark:fill-gray-300" 
+                viewBox="0 0 100 101" 
+                fill="none" 
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
+                <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
+              </svg>
+              <span class="sr-only">Loading...</span>
+            </div>
+            {{ `${action.name} (${checkboxes.length})` }}
+        </button>
+      </div>
 
       <RouterLink v-if="coreStore.resource?.options?.allowedActions?.create"
         :to="{ name: 'resource-create', params: { resourceId: $route.params.resourceId } }"
@@ -199,7 +234,7 @@ import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
 import ResourceListTable from '@/components/ResourceListTable.vue';
 import { useCoreStore } from '@/stores/core';
 import { useFiltersStore } from '@/stores/filters';
-import { callAdminForthApi, currentQuery, getIcon, setQuery, formatComponent } from '@/utils';
+import { callAdminForthApi, currentQuery, getIcon, setQuery, formatComponent, executeCustomBulkAction } from '@/utils';
 import { computed, onMounted, onUnmounted, ref, watch, type Ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { getCustomComponent, initThreeDotsDropdown, getList, startBulkAction } from '@/utils';
@@ -218,7 +253,7 @@ import Filters from '@/components/Filters.vue';
 import { useAdminforth } from '@/adminforth';
 
 const filtersShow = ref(false);
-const { list } = useAdminforth();
+const { list, alert } = useAdminforth();
 const coreStore = useCoreStore();
 const filtersStore = useFiltersStore();
 
@@ -237,6 +272,7 @@ const rows: Ref<any[]|null> = ref(null);
 const totalRows = ref(0);
 const checkboxes = ref([]);
 const bulkActionLoadingStates = ref<{[key: string]: boolean}>({});
+const customActionLoadingStates = ref<{[key: string]: boolean}>({});
 
 const DEFAULT_PAGE_SIZE = 10;
 
@@ -306,6 +342,38 @@ async function startBulkActionInner(actionId: string) {
   await startBulkAction(actionId, coreStore.resource!, checkboxes, bulkActionLoadingStates, getListInner);
 }
 
+async function startCustomBulkActionInner(actionId: string | number) {
+  const action = coreStore.resource?.options?.actions?.find(a => a.id === actionId);
+  
+  await executeCustomBulkAction({
+    actionId,
+    resourceId: route.params.resourceId as string,
+    recordIds: checkboxes.value,
+    confirmMessage: action?.bulkConfirmationMessage,
+    setLoadingState: (loading: boolean) => {
+      customActionLoadingStates.value[actionId] = loading;
+    },
+    onSuccess: async (results: any[]) => {
+      checkboxes.value = [];
+      await getListInner();
+
+      const successResults = results.filter(r => r?.successMessage);
+      if (successResults.length > 0) {
+        alert({
+          message: action?.bulkSuccessMessage || `${successResults.length} out of ${results.length} items processed successfully`,
+          variant: 'success'
+        });
+      }
+    },
+    onError: (error: string) => {
+      alert({
+        message: error,
+        variant: 'danger'
+      });
+    }
+  });
+}
+
 async function getListInner() {
   rows.value = null; // to show loading state
   const result = await getList(coreStore.resource!, isPageLoaded.value, page.value, pageSize.value, sort.value, checkboxes, filtersStore.filters);
@@ -474,16 +542,7 @@ watch([sort], async () => {
 
 
   .af-button-shadow {
-    position: relative;
-    &::after {
-      content: '';
-      position: absolute;
-      left: 0;
-      right: 0;
-      height: 100%;
-      box-shadow: -0px 6px 6px rgb(0, 0, 0, 0.1);
-      border-radius: inherit;
-    }
+    box-shadow: -0px 6px 6px rgb(0, 0, 0, 0.1);
   }
   
 

package/dist/spa/src/views/ShowView.vue

@@ -25,10 +25,23 @@
               class="flex items-center af-button-shadow h-[34px] 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" 
+                v-if="action.icon && !actionLoadingStates[action.id!]" 
                 :is="getIcon(action.icon)" 
                 class="w-4 h-4 me-2 text-lightPrimary dark:text-darkPrimary"
               />
+              <div v-if="actionLoadingStates[action.id!]" class="me-2">
+                <svg 
+                  aria-hidden="true" 
+                  class="w-4 h-4 animate-spin text-gray-200 dark:text-gray-500 fill-gray-500 dark:fill-gray-300" 
+                  viewBox="0 0 100 101" 
+                  fill="none" 
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
+                  <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
+                </svg>
+                <span class="sr-only">Loading...</span>
+              </div>
               {{ action.name }}
             </button>
           </component>
@@ -137,7 +150,7 @@
 import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
 
 import { useCoreStore } from '@/stores/core';
-import { getCustomComponent, checkAcessByAllowedActions, initThreeDotsDropdown, formatComponent } from '@/utils';
+import { getCustomComponent, checkAcessByAllowedActions, initThreeDotsDropdown, formatComponent, executeCustomAction } from '@/utils';
 import { IconPenSolid, IconTrashBinSolid, IconPlusOutline } from '@iconify-prerendered/vue-flowbite';
 import { onMounted, ref, computed } from 'vue';
 import { useRoute,useRouter } from 'vue-router';
@@ -246,54 +259,47 @@ async function deleteRecord() {
 }
 
 async function startCustomAction(actionId: string, extra?: any) {  
-  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,
-      extra: extra,
-    }
-  });
-  
-  actionLoadingStates.value[actionId] = false;
-  
-  if (data?.redirectUrl) {
-    // Check if the URL should open in a new tab
-    if (data.redirectUrl.includes('target=_blank')) {
-      window.open(data.redirectUrl.replace('&target=_blank', '').replace('?target=_blank', ''), '_blank');
-    } else {
-      // Navigate within the app
-      if (data.redirectUrl.startsWith('http')) {
-        window.location.href = data.redirectUrl;
-      } else {
-        router.push(data.redirectUrl);
+  await executeCustomAction({
+    actionId,
+    resourceId: route.params.resourceId as string,
+    recordId: route.params.primaryKey as string,
+    extra,
+    setLoadingState: (loading: boolean) => {
+      actionLoadingStates.value[actionId] = loading;
+    },
+    onSuccess: async (data: any) => {
+      if (data?.redirectUrl) {
+        // Check if the URL should open in a new tab
+        if (data.redirectUrl.includes('target=_blank')) {
+          window.open(data.redirectUrl.replace('&target=_blank', '').replace('?target=_blank', ''), '_blank');
+        } else {
+          // Navigate within the app
+          if (data.redirectUrl.startsWith('http')) {
+            window.location.href = data.redirectUrl;
+          } else {
+            router.push(data.redirectUrl);
+          }
+        }
+        return;
       }
-    }
-    return;
-  }
-  
-  if (data?.ok) {
-    await coreStore.fetchRecord({
-      resourceId: route.params.resourceId as string, 
-      primaryKey: route.params.primaryKey as string,
-      source: 'show',
-    });
 
-    if (data.successMessage) {
-      alert({
-        message: data.successMessage,
-        variant: 'success'
+      await coreStore.fetchRecord({
+        resourceId: route.params.resourceId as string,
+        primaryKey: route.params.primaryKey as string,
+        source: 'show',
       });
+
+      if (data.successMessage) {
+        alert({
+          message: data.successMessage,
+          variant: 'success'
+        });
+      }
+    },
+    onError: (error: string) => {
+      showErrorTost(error);
     }
-  }
-  
-  if (data?.error) {
-    showErrorTost(data.error);
-  }
+  });
 }
 
 show.refresh = () => {