adminforth 2.27.0-next.5 → 2.27.0-next.50

package/dist/spa/src/components/MenuLink.vue

@@ -35,7 +35,7 @@
     >
       {{ item.label }}
     </div>
-    <span class="absolute flex items-center justify-center right-1 top-1/2 -translate-y-1/2" v-if="item.badge && showExpandedBadge">
+    <span class="absolute flex items-center justify-center right-1 top-1/2 -translate-y-1/2" v-if="(item.badge || item.badge === 0) && showExpandedBadge ">
       <Tooltip v-if="item.badgeTooltip">
         <div class="af-badge inline-flex items-center justify-center h-3 py-2.5 px-1 ms-3 text-xs font-medium rounded-full bg-lightAnnouncementBG dark:bg-darkAnnouncementBG 
         fill-lightAnnouncementText dark:fill-darkAccent text-lightAnnouncementText dark:text-darkAccent min-w-[1.5rem] max-w-[3rem]">{{ item.badge }}</div>
@@ -48,7 +48,7 @@
         fill-lightAnnouncementText dark:fill-darkAccent text-lightAnnouncementText dark:text-darkAccent min-w-[1.5rem] max-w-[3rem]">{{ item.badge }}</div>
       </template>
     </span>
-    <div v-if="item.badge && isSidebarIconOnly && !isSidebarHovering"  class="af-badge absolute right-0.5 bottom-1 -translate-y-1/2 inline-flex items-center justify-center h-2 w-2 text-sm font-medium rounded-full bg-lightAnnouncementBG dark:bg-darkAnnouncementBG 
+    <div v-if="(item.badge || item.badge === 0) && isSidebarIconOnly && !isSidebarHovering"  class="af-badge absolute right-0.5 bottom-1 -translate-y-1/2 inline-flex items-center justify-center h-2 w-2 text-sm font-medium rounded-full bg-lightAnnouncementBG dark:bg-darkAnnouncementBG 
       fill-lightAnnouncementText dark:fill-darkAccent text-lightAnnouncementText dark:text-darkAccent">
     </div>
   </RouterLink>

package/dist/spa/src/components/ResourceForm.vue

@@ -13,11 +13,13 @@
         :mode="mode"
         :unmasked="unmasked"
         :columnOptions="columnOptions"
-        :validating="validating"
+        :validatingMode="validatingMode"
         :columnError="columnError"
         :setCurrentValue="setCurrentValue"
         @update:customComponentsInValidity="(data) => customComponentsInValidity = { ...customComponentsInValidity, ...data }"
         @update:customComponentsEmptiness="(data) => customComponentsEmptiness = { ...customComponentsEmptiness, ...data }"
+        :columnsWithErrors="columnsWithErrors"
+        :isValidating="isValidating"
         />
       </div>
       <div v-else class="flex flex-col gap-4">
@@ -31,11 +33,13 @@
           :mode="mode"
           :unmasked="unmasked"
           :columnOptions="columnOptions"
-          :validating="validating"
+          :validatingMode="validatingMode"
           :columnError="columnError"
           :setCurrentValue="setCurrentValue"
           @update:customComponentsInValidity="(data) => customComponentsInValidity = { ...customComponentsInValidity, ...data }"
           @update:customComponentsEmptiness="(data) => customComponentsEmptiness = { ...customComponentsEmptiness, ...data }"
+          :columnsWithErrors="columnsWithErrors"
+          :isValidating="isValidating"
           />
         </template>
         <div v-if="otherColumns?.length || 0 > 0">
@@ -48,11 +52,13 @@
           :mode="mode"
           :unmasked="unmasked"
           :columnOptions="columnOptions"
-          :validating="validating"
+          :validatingMode="validatingMode"
           :columnError="columnError"
           :setCurrentValue="setCurrentValue"
           @update:customComponentsInValidity="(data) => customComponentsInValidity = { ...customComponentsInValidity, ...data }"
           @update:customComponentsEmptiness="(data) => customComponentsEmptiness = { ...customComponentsEmptiness, ...data }"
+          :columnsWithErrors="columnsWithErrors"
+          :isValidating="isValidating"
           />
         </div>
       </div>
@@ -71,16 +77,20 @@ import { useCoreStore } from "@/stores/core";
 import GroupsTable from '@/components/GroupsTable.vue';
 import { useI18n } from 'vue-i18n';
 import { type AdminForthResourceColumnCommon, type AdminForthResourceCommon } from '@/types/Common';
+import { Mutex } from 'async-mutex';
+import debounce from 'lodash.debounce';
 
 const { t } = useI18n();
 
+const mutex = new Mutex();
+
 const coreStore = useCoreStore();
 const router = useRouter();
 const route = useRoute();
 const props = defineProps<{
   resource: AdminForthResourceCommon,
   record: any,
-  validating: boolean,
+  validatingMode: boolean,
   source: 'create' | 'edit',
   readonlyColumns?: string[],
 }>();
@@ -99,6 +109,11 @@ const columnOptions = ref<Record<string, any[]>>({});
 const columnLoadingState = reactive<Record<string, { loading: boolean; hasMore: boolean }>>({});
 const columnOffsets = reactive<Record<string, number>>({});
 const columnEmptyResultsCount = reactive<Record<string, number>>({});
+const columnsWithErrors = ref<Record<string, string>>({});
+const isValidating = ref(false);
+const blockSettingIsValidating = ref(false);
+const isValid = ref(true);
+const doesUserHaveCustomValidation = computed(() => props.resource.columns.some(column => column.validation && column.validation.some((val) => val.validator)));
 
 const columnError = (column: AdminForthResourceColumnCommon) => {
   const val = computed(() => {
@@ -147,7 +162,7 @@ const columnError = (column: AdminForthResourceColumnCommon) => {
       return currentValues.value[column.name] && currentValues.value[column.name].reduce((error: any, item: any) => {
         if (column.isArray) {
           return error || validateValue(column.isArray.itemType, item, column) ||
-            (item === null || !item.toString() ? t('Array cannot contain empty items') : null);
+            (item === null || (!item || item.toString() === '') ? t('Array cannot contain empty items') : null);
         } else {
           return error; 
         }
@@ -329,10 +344,48 @@ const editableColumns = computed(() => {
   return props.resource?.columns?.filter(column => column.showIn?.[mode.value] && (currentValues.value ? checkShowIf(column, currentValues.value, props.resource.columns) : true));
 });
 
-const isValid = computed(() => {
-  return editableColumns.value?.every(column => !columnError(column));
+function checkIfColumnHasError(column: AdminForthResourceColumnCommon) {
+  const error = columnError(column);
+  if (error) {
+    columnsWithErrors.value[column.name] = error;
+  } else {
+    delete columnsWithErrors.value[column.name];
+  }
+}
+
+const checkIfAnyColumnHasErrors = () => {
+  return Object.keys(columnsWithErrors.value).length > 0 ? false : true;
+}
+
+const debouncedValidation = debounce(async (columns: AdminForthResourceColumnCommon[]) => {
+  await mutex.runExclusive(async () => {
+    await validateUsingUserValidationFunction(columns);
+  });
+  setIsValidatingValue(false);
+  isValid.value = checkIfAnyColumnHasErrors();
+}, 500);
+
+watch(() => [editableColumns.value, props.validatingMode], async () => {
+  setIsValidatingValue(true);
+  
+  editableColumns.value?.forEach(column => {
+    checkIfColumnHasError(column);
+  });
+
+  if (props.validatingMode && doesUserHaveCustomValidation.value) {
+    debouncedValidation(editableColumns.value);
+  } else {
+    setIsValidatingValue(false);
+    isValid.value = checkIfAnyColumnHasErrors();
+  }
 });
 
+const setIsValidatingValue = (value: boolean) => {
+  if (!blockSettingIsValidating.value) {
+    isValidating.value = value;
+  }
+}
+
 
 const groups = computed(() => {
   let fieldGroupType;
@@ -381,9 +434,50 @@ watch(() => isValid.value, (value) => {
   emit('update:isValid', value);
 });
 
+async function validateUsingUserValidationFunction(editableColumnsInner: AdminForthResourceColumnCommon[]): Promise<void> {
+  if (doesUserHaveCustomValidation.value) {
+    try {
+      blockSettingIsValidating.value = true;
+      const res = await callAdminForthApi({
+        method: 'POST',
+        path: '/validate_columns',
+        body: {
+          resourceId: props.resource.resourceId,
+          editableColumns: editableColumnsInner.map(col => {return {name: col.name, value: currentValues.value?.[col.name]} }),
+          record: currentValues.value,
+        }
+      })
+      if (res.validationResults && Object.keys(res.validationResults).length > 0) {
+        for (const [columnName, validationResult] of Object.entries(res.validationResults) as [string, any][]) {
+          if (!validationResult.isValid) {
+            columnsWithErrors.value[columnName] = validationResult.message || 'Invalid value';
+          } else {
+            delete columnsWithErrors.value[columnName];
+          }
+        }
+        const columnsToProcess = editableColumns.value.filter(col => res.validationResults[col.name] === undefined);
+        columnsToProcess.forEach(column => {
+          checkIfColumnHasError(column);
+        });
+      } else {
+        editableColumnsInner.forEach(column => {
+          checkIfColumnHasError(column);
+        });
+      }
+      blockSettingIsValidating.value = false;
+    } catch (e) {
+      console.error('Error during custom validation', e);
+      blockSettingIsValidating.value = false;
+    }
+  }
+}
+
 defineExpose({
   columnError,
   editableColumns,
+  columnsWithErrors,
+  isValidating,
+  validateUsingUserValidationFunction
 })
 
 </script>

package/dist/spa/src/components/ResourceListTable.vue

@@ -200,7 +200,7 @@
                   :key="action.id"
                 >
                     <component
-                      v-if="action.customComponent"
+                      v-if="action"
                       :is="action.customComponent ? getCustomComponent(formatComponent(action.customComponent)) : CallActionWrapper"
                       :meta="formatComponent(action.customComponent).meta"
                       :row="row"
@@ -211,12 +211,18 @@
                       <button
                         type="button"
                         class="border border-gray-300 dark:border-gray-700 dark:border-opacity-0 border-opacity-0 hover:border-opacity-100 dark:hover:border-opacity-100 rounded-md hover:bg-gray-100 dark:hover:bg-gray-800 cursor-pointer"
+                        :disabled="!!actionLoadingStates[`${action.id}_${row._primaryKeyValue}`]"
                       >
                         <component
-                          v-if="action.icon"
+                          v-if="action.icon && !actionLoadingStates[`${action.id}_${row._primaryKeyValue}`]"
                           :is="getIcon(action.icon)"
                           class="w-6 h-6 text-lightPrimary dark:text-darkPrimary"
                         />
+                        <Spinner
+                          v-if="actionLoadingStates[`${action.id}_${row._primaryKeyValue}`]"
+                          class="w-5 h-5 text-gray-200 dark:text-gray-500 fill-gray-500 dark:fill-gray-300"
+                        />
+                        <span v-if="actionLoadingStates[`${action.id}_${row._primaryKeyValue}`]" class="sr-only">Loading...</span>
                       </button>
                     </component>
 
@@ -356,7 +362,7 @@ import {
   IconInboxOutline
 } from '@iconify-prerendered/vue-flowbite';
 import router from '@/router';
-import { Tooltip } from '@/afcl';
+import { Tooltip, Spinner } from '@/afcl';
 import type { AdminForthResourceCommon, AdminForthResourceColumnCommon, AdminForthComponentDeclarationFull, AdminForthComponentDeclaration } from '@/types/Common';
 import { useAdminforth } from '@/adminforth';
 import Checkbox from '@/afcl/Checkbox.vue';
@@ -613,7 +619,7 @@ async function startCustomAction(actionId: string | number, row: any, extraData:
     recordId: row._primaryKeyValue,
     extra: extraData,
     setLoadingState: (loading: boolean) => {
-      actionLoadingStates.value[actionId] = loading;
+      actionLoadingStates.value[`${actionId}_${row._primaryKeyValue}`] = loading;
     },
     onSuccess: async (data: any) => {
       emits('update:records', true);
@@ -638,10 +644,10 @@ function validatePageInput() {
   pageInput.value = validPage.toString();
 }
 /*
-*___________________________________________________________________
-*                                                                   |
-*                 Virtual Scroll Implementation                     |
-*___________________________________________________________________|
+* ___________________________________________________________________
+*|                                                                   |
+*|                 Virtual Scroll Implementation                     |
+*|___________________________________________________________________|
 */
 // Add throttle utility
 const throttle = (fn: Function, delay: number) => { 

package/dist/spa/src/components/ShowTable.vue

@@ -1,5 +1,5 @@
 <template>
-      <div class="overflow-x-auto shadow-resourseFormShadow dark:shadow-darkResourseFormShadow"
+      <div class="overflow-x-auto shadow-resourseFormShadow dark:shadow-darkResourseFormShadow border dark:border-gray-700"
         :class="{'rounded-default' : isRounded}"
       >
         <div v-if="groupName && !noTitle"  class="text-md font-semibold px-6 py-3 flex flex-1 items-center text-lightShowTableHeadingText bg-lightShowTableHeadingBackground dark:bg-darkShowTableHeadingBackground  dark:text-darkShowTableHeadingText rounded-t-lg">

package/dist/spa/src/components/Sidebar.vue

@@ -71,7 +71,7 @@
             >
               <component v-if="item.icon" :is="getIcon(item.icon)" class="w-5 h-5 text-lightSidebarIcons group-hover:text-lightSidebarIconsHover transition duration-75 dark:group-hover:text-darkSidebarIconsHover dark:text-darkSidebarIcons" ></component>
               <span class="overflow-hidden flex-1 ms-3 text-left rtl:text-right whitespace-nowrap">{{ item.label }}
-                <span v-if="item.badge" class="inline-flex items-center justify-center w-3 h-3 p-3 ms-3 text-sm font-medium rounded-full bg-lightAnnouncementBG dark:bg-darkAnnouncementBG 
+                <span v-if="item.badge || item.badge === 0" class="inline-flex items-center justify-center w-3 h-3 p-3 ms-3 text-sm font-medium rounded-full bg-lightAnnouncementBG dark:bg-darkAnnouncementBG 
                   fill-lightAnnouncementText dark:fill-darkAccent text-lightAnnouncementText dark:text-darkAccent">
                   <Tooltip v-if="item.badgeTooltip">
                     {{ item.badge }}
@@ -90,13 +90,15 @@
               </svg>
             </button>
 
-            <ul :id="`dropdown-example${i}`" role="none" class="af-sidebar-dropdown pt-1 space-y-1" :class="{ 'hidden': !opened.includes(i) }">
-              <template v-for="(child, j) in item.children" :key="`menu-${i}-${j}`">
-                <li class="af-sidebar-menu-link">
-                    <MenuLink :item="child" isChild="true" @click="$emit('hideSidebar')"/>
+            <transition name="slow-drop">
+              <ul v-show="opened.includes(i)" :id="`dropdown-example${i}`" role="none" class="af-sidebar-dropdown pt-1 space-y-1 overflow-hidden">              
+                <template v-for="(child, j) in item.children" :key="`menu-${i}-${j}`">
+                  <li class="af-sidebar-menu-link">
+                      <MenuLink :item="child" isChild="true" @click="$emit('hideSidebar')"/>
                   </li>
-              </template>
-          </ul>
+                </template>
+              </ul>
+            </transition>
       </li>
       <li v-else class="af-sidebar-menu-link">
         <MenuLink :item="item" @click="$emit('hideSidebar')"/>
@@ -129,7 +131,7 @@
                       } : {}"
                     >{{ item.label }}
 
-                        <span v-if="item.badge" class="inline-flex items-center justify-center w-3 h-3 p-3 ms-3 text-sm font-medium rounded-full bg-lightAnnouncementBG dark:bg-darkAnnouncementBG 
+                        <span v-if="item.badge || item.badge === 0" class="inline-flex items-center justify-center w-3 h-3 p-3 ms-3 text-sm font-medium rounded-full bg-lightAnnouncementBG dark:bg-darkAnnouncementBG 
                         fill-lightAnnouncementText dark:fill-darkAccent text-lightAnnouncementText dark:text-darkAccent">
                         <Tooltip v-if="item.badgeTooltip">
                             {{ item.badge }}
@@ -292,6 +294,25 @@
     background-color: rgba(75, 85, 99, 0.4);
   }
 
+  /* Custom animation for dropdown */
+  .slow-drop-enter-active,
+  .slow-drop-leave-active {
+    overflow: hidden;
+    transition: opacity 0.2s ease, transform 0.2s ease;
+  }
+
+  .slow-drop-enter-from,
+  .slow-drop-leave-to {
+    opacity: 0;
+    transform: translateY(-4px);
+  }
+
+  .slow-drop-enter-to,
+  .slow-drop-leave-from {
+    opacity: 1;
+    transform: translateY(0);
+  }
+
   /* For browsers that support overlay scrollbars natively */
   @supports (overflow: overlay) {
     .sidebar-scroll {

package/dist/spa/src/components/ThreeDotsMenu.vue

@@ -43,21 +43,28 @@
               </div>
             </div>
           </li>
-          <li v-for="action in customActions" :key="action.id">
-            <div class="wrapper"> 
+          <li v-for="(action, i) in customActions" :key="action.id">
+            <div 
+              class="wrapper"                 
+              @click="injectedComponentClick(threeDotsDropdownItems ? threeDotsDropdownItems.length + i : i)"
+            > 
               <component
-                v-if="action.customComponent"
+                :ref="(el: any) => setComponentRef(el, threeDotsDropdownItems ? threeDotsDropdownItems.length + i : i)"
                 :is="(action.customComponent && getCustomComponent(formatComponent(action.customComponent))) || CallActionWrapper"
                 :meta="formatComponent(action.customComponent).meta"
                 @callAction="(payload? : Object) => handleActionClick(action, payload)"
-              >
-                <a @click.prevent class="block px-4 py-2 hover:text-lightThreeDotsMenuBodyTextHover hover:bg-lightThreeDotsMenuBodyBackgroundHover dark:hover:bg-darkThreeDotsMenuBodyBackgroundHover dark:hover:text-darkThreeDotsMenuBodyTextHover">
-                  <div class="flex items-center gap-2">
+]              >
+                <a @click.prevent class="block">
+                  <div class="flex items-center gap-2 hover:text-lightThreeDotsMenuBodyTextHover hover:bg-lightThreeDotsMenuBodyBackgroundHover dark:hover:bg-darkThreeDotsMenuBodyBackgroundHover dark:hover:text-darkThreeDotsMenuBodyTextHover">
                     <component 
-                      v-if="action.icon" 
+                      v-if="action.icon && !actionLoadingStates[action.id!]" 
                       :is="getIcon(action.icon)" 
                       class="w-4 h-4 text-lightPrimary dark:text-darkPrimary"
                     />
+                    <Spinner
+                      v-if="actionLoadingStates[action.id!]"
+                      class="w-5 h-5 text-gray-200 dark:text-gray-500 fill-gray-500 dark:fill-gray-300"
+                    />
                     {{ action.name }}
                   </div>
                 </a>
@@ -92,12 +99,12 @@
 import { getCustomComponent, getIcon, formatComponent, executeCustomAction } from '@/utils';
 import { useCoreStore } from '@/stores/core';
 import { useAdminforth } from '@/adminforth';
-import { callAdminForthApi } from '@/utils';
 import { useRoute, useRouter } from 'vue-router';
 import CallActionWrapper from '@/components/CallActionWrapper.vue'
 import { ref, type ComponentPublicInstance, onMounted, onUnmounted } from 'vue';
 import type { AdminForthActionFront, AdminForthBulkActionFront, AdminForthComponentDeclarationFull } from '@/types/Common';
 import type { AdminForthActionInput } from '@/types/Back';
+import { Spinner } from '@/afcl';
 
 const { list, alert} = useAdminforth();
 const route = useRoute();
@@ -105,6 +112,7 @@ const coreStore = useCoreStore();
 const router = useRouter();
 const threeDotsDropdownItemsRefs = ref<Array<ComponentPublicInstance | null>>([]);
 const showDropdown = ref(false);
+const actionLoadingStates = ref<Record<string, boolean>>({});
 const dropdownRef = ref<HTMLElement | null>(null);
 const buttonTriggerRef = ref<HTMLElement | null>(null);
 
@@ -136,6 +144,9 @@ async function handleActionClick(action: AdminForthActionInput, payload: any) {
     resourceId: route.params.resourceId as string,
     recordId: route.params.primaryKey as string,
     extra: payload || {},
+    setLoadingState: (loading: boolean) => {
+      actionLoadingStates.value[action.id!] = loading;
+    },
     onSuccess: async (data: any) => {
       await coreStore.fetchRecord({
         resourceId: route.params.resourceId as string,
@@ -166,6 +177,7 @@ function startBulkAction(actionId: string) {
 }
 
 async function injectedComponentClick(index: number) {
+  console.log('Injected component click triggered for index:', index);
   const componentRef = threeDotsDropdownItemsRefs.value[index];
   if (componentRef && 'click' in componentRef) {
     (componentRef as any).click?.();
@@ -196,8 +208,11 @@ onUnmounted(() => {
 </script>
 
 <style lang="scss" scoped>
-  .wrapper > * {
-    @apply px-4 py-2;
+  .wrapper {
+    @apply px-4 py-2 
+    hover:text-lightThreeDotsMenuBodyTextHover hover:bg-lightThreeDotsMenuBodyBackgroundHover 
+    dark:hover:bg-darkThreeDotsMenuBodyBackgroundHover dark:hover:text-darkThreeDotsMenuBodyTextHover
+    cursor-pointer;
   }
 </style>
 

package/dist/spa/src/components/ValueRenderer.vue

@@ -11,6 +11,7 @@
         class="rounded-md m-0.5 bg-lightAnnouncementBG dark:bg-darkAnnouncementBG text-lightAnnouncementText dark:text-darkAnnouncementText py-0.5 px-2.5 text-sm"
       >
         <RouterLink
+          v-if="foreignResource && foreignResource?.pk"
           class="font-medium text-lightSidebarText dark:text-darkSidebarText hover:brightness-110 whitespace-nowrap"
           :to="{
             name: 'resource-show',

package/dist/spa/src/spa_types/core.ts

@@ -1,4 +1,6 @@
 import type { AdminForthResource, AdminForthResourceColumn } from '../types/Back.js';
+import type { FilterParams } from '@/types/Common';
+import type { Ref, ComputedRef } from 'vue';
 
 export type resourceById = {
     [key: string]: AdminForthResource;
@@ -61,3 +63,33 @@ export type AllowedActions = {
     delete: boolean,
 }
 
+
+export type sortType = {
+  field: string, 
+  direction: 'ask' | 'desc'
+} | null;
+
+export type AdminforthFilterStore = {
+  filters: Ref<FilterParams[]>,
+
+  setSort: (sort: sortType) => void,
+  getSort: () => sortType,
+
+  setFilter: (filters: FilterParams) => void,
+  setFilters: (filters: FilterParams[]) => void,
+
+  getFilters: () => FilterParams[],
+
+  clearFilter: (fieldName: string) => void,
+  clearFilters: () => void,
+
+  shouldFilterBeHidden: (fieldName: string) => boolean,
+
+  visibleFiltersCount: ComputedRef<number>,
+}
+
+export interface AdminforthFilterStoreUnwrapped extends Omit<AdminforthFilterStore, 'filters' | 'visibleFiltersCount'> {
+    filters: FilterParams[],
+    visibleFiltersCount: number,
+}
+

package/dist/spa/src/stores/filters.ts

@@ -1,40 +1,42 @@
 import { ref, computed, type Ref } from 'vue';
 import { defineStore } from 'pinia';
 import { useCoreStore } from './core';
+import type { FilterParams } from '@/types/Common';
+import type { AdminforthFilterStore, sortType } from '../spa_types/core';
 
 export const useFiltersStore = defineStore('filters', () => {
-    const filters: Ref<any[]> = ref([]);
-    const sort: Ref<any> = ref({});
+    const filters: Ref<FilterParams[]> = ref([]);
+    const sort: Ref<sortType> = ref(null);
     const coreStore = useCoreStore();
 
-    const setSort = (s: any) => {
+    const setSort = (s: sortType): void => {
         sort.value = s;
     }
-    const getSort = () => {
+    const getSort = (): sortType => {
         return sort.value;
     }
-    const setFilter = (filter: any) => {
+    const setFilter = (filter: FilterParams) => {
         const index = filters.value.findIndex(f => f.field === filter.field);
-        if (filters.value[index] && filters.value[index].operator === filter.value.operator) {
+        if (filters.value[index] && filters.value[index].operator === filter.operator) {
             filters.value[index] = filter;
             return;
         }
         filters.value.push(filter);
     }
-    const setFilters = (f: any) => {
+    const setFilters = (f: FilterParams[]) => {
         filters.value = f;
     }
-    const getFilters = () => {
+    const getFilters = (): FilterParams[] => {
         return filters.value;
     }
-    const clearFilter = (fieldName: string) => {
+    const clearFilter = (fieldName: string): void => {
         filters.value = filters.value.filter(f => f.field !== fieldName);
     }
-    const clearFilters = () => {
+    const clearFilters = (): void => {
         filters.value = [];
     }
 
-    const shouldFilterBeHidden = (fieldName: string) => {
+    const shouldFilterBeHidden = (fieldName: string): boolean => {
         if (coreStore.resource?.columns) {
             const column = coreStore.resource.columns.find((col: any) => col.name === fieldName);
             if (column?.showIn?.filter !== true) {
@@ -48,7 +50,7 @@ export const useFiltersStore = defineStore('filters', () => {
         return filters.value.filter(f => !shouldFilterBeHidden(f.field)).length;
     });
 
-    return {
+    const store = {
         setFilter, 
         getFilters, 
         clearFilters, 
@@ -60,4 +62,6 @@ export const useFiltersStore = defineStore('filters', () => {
         shouldFilterBeHidden,
         clearFilter
     }
+
+    return store as AdminforthFilterStore;
 })