adminforth 2.27.0-next.7 → 2.27.0-next.70

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

@@ -0,0 +1,74 @@
+<template>
+  <div class="w-full mt-[36px]">
+    <div class="w-full border dark:border-darkFormBorder border-gray-200 rounded-lg overflow-hidden shadow-resourseFormShadow dark:shadow-darkResourseFormShadow bg-white dark:bg-darkForm">
+      
+      <div class="flex px-6 items-center border-b border-gray-200 dark:border-darkFormBorder bg-lightFormHeading dark:bg-darkFormHeading" style="height: 40px;">
+        <div class="w-[208px] flex-shrink-0 pr-6 text-xs text-lightListTableHeadingText uppercase dark:text-darkListTableHeadingText font-bold">
+          {{ $t('Field') }}
+        </div>
+        <div class="flex-1 text-xs text-lightListTableHeadingText uppercase dark:text-darkListTableHeadingText font-bold">
+          {{ $t('Value') }}
+        </div>
+      </div>
+
+      <template v-for="column in visibleColumns" :key="column.name">
+        <div
+          class="flex items-center bg-lightForm dark:bg-darkForm border-b border-gray-100 dark:border-darkFormBorder"
+          :style="{ height: getFieldHeight(column) }"
+        >
+          <div class="w-[208px] flex-shrink-0 px-6 flex items-center">
+            <Skeleton class="w-24 h-[10px]" />
+          </div>
+
+          <div class="flex-1 px-6">
+            <Skeleton type="input" :class="getSkeletonInputClass(column)" />
+
+            <div v-if="hasEditingNote(column)" class="mt-1">
+              <Skeleton class="h-[12px] w-20" />
+            </div>
+          </div>
+        </div>
+
+      </template>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+import { Skeleton } from '@/afcl';
+
+interface Props {
+  resource?: any;
+  page?: string;}
+
+const props = withDefaults(defineProps<Props>(), {
+  page: 'edit'
+});
+
+const visibleColumns = computed(() => {
+  if (!props.resource?.columns) return [];
+
+  return props.resource.columns.filter((col: any) => {
+    if (col.virtual) return false;
+    if (col.primaryKey) return false;
+    if (col.backendOnly) return false;
+    if (col.showIn?.[props.page] === false) return false;
+    return true;
+  });
+});
+
+
+const hasEditingNote = (column: any) => !!column.editingNote;
+
+const getFieldHeight = (column: any) =>
+  hasEditingNote(column) ? '95px' : '75px';
+
+const getSkeletonInputClass = (column: any) => {
+  if (['integer', 'decimal', 'float'].includes(column.type)) {
+    return 'h-[42px] w-[160px]';
+  }
+  return 'h-[42px] w-full';
+};
+
+</script>

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>
@@ -44,7 +42,7 @@
       :adminUser="coreStore.adminUser"
     />
 
-    <SingleSkeletLoader v-if="loading"></SingleSkeletLoader>
+    <CreateEditSkeleton v-if="loading"></CreateEditSkeleton>
 
     
     <ResourceForm 
@@ -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,19 @@ 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'
+import CreateEditSkeleton from './CreateEditSkeleton.vue';
 
 const isValid = ref(false);
-const validating = ref(false);
+const validatingMode = ref(false);
 
 const loading = ref(true);
 const saving = ref(false);
@@ -195,28 +194,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 +247,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>
 
@@ -40,7 +41,7 @@
       :adminUser="coreStore.adminUser"
     />
 
-    <SingleSkeletLoader v-if="loading"></SingleSkeletLoader>
+    <CreateEditSkeleton :resource="coreStore.resource" v-if="loading"></CreateEditSkeleton>
  
     <ResourceForm 
       v-else-if="coreStore.resource"
@@ -50,7 +51,7 @@
       :adminUser="coreStore.adminUser"
       @update:record="onUpdateRecord"
       @update:isValid="isValid = $event"
-      :validating="validating"
+      :validatingMode="validatingMode"
       :source="'edit'"
     >
     </ResourceForm>
@@ -85,13 +86,16 @@ 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'
+import CreateEditSkeleton from './CreateEditSkeleton.vue';
 
 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();
@@ -144,7 +148,7 @@ const editableRecord = computed(() => {
   coreStore.resource.columns.forEach(column => {
     if (column.foreignResource) {
       if (column.isArray?.enabled) {
-        newRecord[column.name] = newRecord[column.name]?.map((fr: { pk: any }) => fr.pk);
+        newRecord[column.name] = newRecord[column.name]?.map((fr: { pk: any }) => fr?.pk);
       } else {
         newRecord[column.name] = newRecord[column.name]?.pk;
       }
@@ -180,22 +184,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 +258,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

@@ -2,10 +2,11 @@
   <div class="relative flex flex-col max-w-full w-full">
     <Teleport to="body">
       <Filters
-        :columns="coreStore.resource?.columns"
+        :columns="coreStore.resource?.columns as AdminForthResourceColumnCommon[] || []"
         :columnsMinMax="columnsMinMax" 
         :show="filtersShow"
         @hide="filtersShow = false"
+        :filtersStore="filtersStore"
       />
     </Teleport>
 
@@ -69,19 +70,10 @@
             v-if="action.icon && !bulkActionLoadingStates[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="bulkActionLoadingStates[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>
+            <Spinner
+              v-if="bulkActionLoadingStates[action.id!]"
+              class="w-5 h-5 text-gray-200 dark:text-gray-500 fill-gray-500 dark:fill-gray-300"
+            />
           {{ `${action.label} (${checkboxes.length})` }}
           <div v-if="action.badge" class="text-white bg-gradient-to-r from-purple-500 
           via-purple-600 to-purple-700 hover:bg-gradient-to-br focus:ring-4 focus:outline-none
@@ -98,25 +90,22 @@
         <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 border-lightListViewButtonBorder hover:bg-lightListViewButtonBackgroundHover hover:text-lightListViewButtonTextHover focus:z-10 focus:ring-4 focus:ring-lightListViewButtonFocusRing dark:focus:ring-darkListViewButtonFocusRing dark:bg-darkListViewButtonBackground dark:text-darkListViewButtonText dark:border-darkListViewButtonBorder dark:hover:text-darkListViewButtonTextHover dark:hover:bg-darkListViewButtonBackgroundHover"
+          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>
+            <Spinner
+              v-if="customActionLoadingStates[action.id!]"
+              class="w-5 h-5 text-gray-200 dark:text-gray-500 fill-gray-500 dark:fill-gray-300"
+            />
             {{ `${action.name} (${checkboxes.length})` }}
         </button>
       </div>
@@ -233,8 +222,8 @@ import { computed, onMounted, onUnmounted, ref, watch, type Ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { getCustomComponent, initThreeDotsDropdown, getList, startBulkAction } from '@/utils';
 import ThreeDotsMenu from '@/components/ThreeDotsMenu.vue';
-import { Tooltip } from '@/afcl'
-import type { AdminForthComponentDeclaration, AdminForthComponentDeclarationFull } from '@/types/Common';
+import { Tooltip, Spinner } from '@/afcl'
+import type { AdminForthComponentDeclaration, AdminForthComponentDeclarationFull, AdminForthFilterOperators, AdminForthResourceColumnCommon } from '@/types/Common';
 
 
 import {
@@ -344,6 +333,7 @@ async function startCustomBulkActionInner(actionId: string | number) {
     resourceId: route.params.resourceId as string,
     recordIds: checkboxes.value,
     confirmMessage: action?.bulkConfirmationMessage,
+    resource: coreStore.resource!,
     setLoadingState: (loading: boolean) => {
       customActionLoadingStates.value[actionId] = loading;
     },
@@ -354,7 +344,7 @@ async function startCustomBulkActionInner(actionId: string | number) {
       const successResults = results.filter(r => r?.successMessage);
       if (successResults.length > 0) {
         alert({
-          message: action?.bulkSuccessMessage || `${successResults.length} out of ${results.length} items processed successfully`,
+          message: action?.bulkSuccessMessage ? action.bulkSuccessMessage : action?.hasBulkHandler ? successResults[0].successMessage : `${successResults.length} out of ${results.length} items processed successfully`,
           variant: 'success'
         });
       }
@@ -413,7 +403,7 @@ async function init() {
     const [_, field, operator] = k.split('__');
     return {
       field,
-      operator,
+      operator: operator as AdminForthFilterOperators,
       value: JSON.parse((route.query[k] as string))
     }
   });

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

@@ -12,7 +12,7 @@
     <BreadcrumbsWithButtons>
       <template v-if="coreStore.resource?.options?.actions">
 
-        <template  v-for="action in coreStore.resource.options.actions.filter(a => a.showIn?.showButton)" :key="action.id">
+        <div class="flex gap-1" v-for="action in coreStore.resource.options.actions.filter(a => a.showIn?.showButton)" :key="action.id">
           <component
             :is="action?.customComponent ? getCustomComponent(formatComponent(action.customComponent)) : CallActionWrapper"
             :meta="action.customComponent ? formatComponent(action.customComponent).meta : undefined"
@@ -29,23 +29,14 @@
                 :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>
+              <Spinner
+                v-if="actionLoadingStates[action.id!]"
+                class="w-5 h-5 me-2 text-gray-200 dark:text-gray-500 fill-gray-500 dark:fill-gray-300"
+              />
               {{ action.name }}
             </button>
           </component>
-        </template>
+        </div>
       </template>
       <RouterLink v-if="coreStore.resource?.options?.allowedActions?.create"
         :to="{ name: 'resource-create', params: { resourceId: $route.params.resourceId } }"
@@ -85,14 +76,52 @@
       :adminUser="coreStore.adminUser"
     />
 
-    <div v-if="loading" role="status" class="max-w-sm animate-pulse">
-        <div class="h-2.5 bg-gray-200 rounded-full dark:bg-gray-700 w-48 mb-4"></div>
-        <div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 max-w-[360px] mb-2.5"></div>
-        <div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 mb-2.5"></div>
-        <div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 max-w-[330px] mb-2.5"></div>
-        <div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 max-w-[300px] mb-2.5"></div>
-        <div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 max-w-[360px]"></div>
-        <span class="sr-only">{{ $t('Loading...') }}</span>
+    <div 
+      v-if="loading" 
+      role="status" 
+      class="animate-pulse overflow-x-auto shadow-resourseFormShadow dark:shadow-darkResourseFormShadow rounded-lg overflow-hidden border border-lightShowTableBodyBorder dark:border-darkShowTableBodyBorder"
+    >
+      <div 
+        v-if="groups && groups.length > 0" 
+        class="text-md font-semibold px-6 py-3 flex flex-1 items-center bg-lightShowTableHeadingBackground dark:bg-darkShowTableHeadingBackground dark:text-darkShowTableHeadingText border-b border-lightShowTableBodyBorder dark:border-darkShowTableBodyBorder"
+      >
+        <div class="h-4 bg-gray-300 dark:bg-gray-600 rounded-full w-32"></div>
+      </div>
+
+      <table class="w-full text-sm text-left table-fixed border-collapse">
+        <thead class="bg-lightShowTableUnderHeadingBackground dark:bg-darkShowTableUnderHeadingBackground block md:table-row-group">
+          <tr class="block md:table-row">
+            <th scope="col" class="px-6 py-3 text-xs uppercase hidden md:w-52 md:table-cell text-lightShowTableUnderHeadingText dark:text-darkShowTableUnderHeadingText">
+              {{ $t('Field') }}
+            </th>
+            <th scope="col" class="px-6 py-3 text-xs uppercase hidden md:table-cell text-lightShowTableUnderHeadingText dark:text-darkShowTableUnderHeadingText">
+              {{ $t('Value') }}
+            </th>
+          </tr>
+        </thead>
+
+        <tbody>
+          <tr 
+            v-for="i in skeletonRowsCount" 
+            :key="i"
+            class="bg-lightShowTablesBodyBackground border-t border-lightShowTableBodyBorder dark:bg-darkShowTablesBodyBackground dark:border-darkShowTableBodyBorder block md:table-row"
+          >
+            <td class="px-6 py-[15.5px] relative block md:table-cell pb-0 md:pb-[15.5px]">
+              <div class="md:absolute md:inset-0 flex items-center px-6 py-[15.5px]">
+                <div class="h-2.5 bg-gray-200 dark:bg-gray-700 rounded-full w-24"></div>
+              </div>
+            </td>
+
+            <td class="px-6 py-[15.5px] whitespace-pre-wrap block md:table-cell">
+              <div class="flex items-center h-full min-h-[21px]">
+                <div class="h-2.5 bg-gray-200 dark:bg-gray-700 rounded-full w-full max-w-[280px]"></div>
+              </div>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+
+      <span class="sr-only">{{ $t('Loading...') }}</span>
     </div>
     <div 
       v-else-if="coreStore.record"
@@ -163,6 +192,7 @@ import { useI18n } from 'vue-i18n';
 import { getIcon } from '@/utils';
 import { type AdminForthComponentDeclarationFull, type AdminForthResourceColumnCommon, type FieldGroup } from '@/types/Common.js';
 import CallActionWrapper from '@/components/CallActionWrapper.vue'
+import { Spinner } from '@/afcl';
 
 const route = useRoute();
 const router = useRouter();
@@ -177,6 +207,18 @@ const customActions = computed(() => {
   return coreStore.resource?.options?.actions?.filter((a: any) => a.showIn?.showThreeDotsMenu) || [];
 });
 
+const skeletonRowsCount = computed(() => {
+  const allCols = coreStore.resource?.columns || [];
+
+  const isEnabledInConfig = (col: any) => {
+    return col.showIn?.list !== false;
+  };
+  
+  const finalCount = allCols.filter(isEnabledInConfig).length;
+
+  return finalCount > 0 ? finalCount : 10;
+});
+
 onMounted(async () => {
   loading.value = true;
   await coreStore.fetchResourceFull({
@@ -216,7 +258,7 @@ const groups = computed(() => {
 });
 
 const allColumns = computed(() => {
-  return coreStore.resource?.columns.filter(col => col.showIn?.show);
+  return coreStore.resource?.columns?.filter(col => col.showIn?.show);
 });
 
 const otherColumns = computed(() => {