adminforth 2.27.0-test.1 → 2.27.0

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

@@ -19,7 +19,7 @@
    
     <div class="py-4 ">
       <ul class="space-y-3 font-medium text-sm">
-         <li v-for="c in columnsWithFilter" :key="c">
+         <li v-for="c in columnsWithFilter" :key="c.name">
             <div class="flex flex-col">
               <div class="flex justify-between items-center">
                 <p class="dark:text-gray-400 my-1">{{ c.label }}</p>
@@ -38,15 +38,15 @@
               </div>
               <component
                 v-if="c.components?.filter"
-                :is="getCustomComponent(c.components.filter)"
-                :meta="c?.components?.list?.meta"
+                :is="getCustomComponent(formatComponent(c.components.filter))"
+                :meta="formatComponent(c.components.filter)?.meta"
                 :column="c"
                 class="w-full"
-                @update:modelValue="(filtersArray) => {
+                @update:modelValue="(filtersArray:FilterParams[] ) => {
                   filtersStore.filters = filtersStore.filters.filter(f => f.field !== c.name);
 
                   for (const f of filtersArray) {
-                    filtersStore.filters.push({ field: c.name, ...f });
+                    filtersStore.filters.push({ ...f, field: c.name });
                   }
                   console.log('filtersStore.filters', filtersStore.filters);
                   emits('update:filters', [...filtersStore.filters]);
@@ -55,18 +55,18 @@
               />
               <Select
                 v-else-if="c.foreignResource"
-                :multiple="c.filterOptions.multiselect"
+                :multiple="c?.filterOptions?.multiselect"
                 class="w-full"
                 :options="columnOptions[c.name] || []"
                 :searchDisabled="!c.foreignResource.searchableFields"
                 @scroll-near-end="loadMoreOptions(c.name)"
                 @search="(searchTerm) => {
-                  if (c.foreignResource.searchableFields && onSearchInput[c.name]) {
+                  if (c.foreignResource?.searchableFields && onSearchInput[c.name]) {
                     onSearchInput[c.name](searchTerm);
                   }
                 }"
-                @update:modelValue="onFilterInput[c.name]({ column: c, operator: c.filterOptions.multiselect ? 'in' : 'eq', value: c.filterOptions.multiselect ? ($event.length ? $event : undefined) : $event || undefined })"
-                :modelValue="filtersStore.filters.find(f => f.field === c.name && f.operator === (c.filterOptions.multiselect ? 'in' : 'eq'))?.value || (c.filterOptions.multiselect ? [] : '')"
+                @update:modelValue="onFilterInput[c.name]({ column: c, operator: c.filterOptions?.multiselect ? AFFO.IN : AFFO.EQ, value: c.filterOptions?.multiselect ? ($event.length ? $event : undefined) : $event || undefined })"
+                :modelValue="filtersStore.filters.find(f => f.field === c.name && f.operator === (c.filterOptions?.multiselect ? AFFO.IN : AFFO.EQ))?.value || (c.filterOptions?.multiselect ? [] : '')"
               >
                 <template #extra-item v-if="columnLoadingState[c.name]?.loading">
                   <div class="text-center text-gray-400 dark:text-gray-300 py-2 flex items-center justify-center gap-2">
@@ -76,7 +76,7 @@
                 </template>
               </Select>
               <Select
-                :multiple="c.filterOptions.multiselect"
+                :multiple="c.filterOptions?.multiselect"
                 class="w-full"
                 v-else-if="c.type === 'boolean'"
                 :options="[
@@ -85,63 +85,63 @@
                   // if field is not required, undefined might be there, and user might want to filter by it
                   ...(c.required ? [] : [ { label: $t('Unset'), value: undefined } ])
                 ]"
-                @update:modelValue="onFilterInput[c.name]({ column: c, operator: c.filterOptions.multiselect ? 'in' : 'eq', value: c.filterOptions.multiselect ? ($event.length ? $event : undefined) : $event })"
-                :modelValue="filtersStore.filters.find(f => f.field === c.name && f.operator === (c.filterOptions.multiselect ? 'in' : 'eq'))?.value !== undefined
-                  ? filtersStore.filters.find(f => f.field === c.name && f.operator === (c.filterOptions.multiselect ? 'in' : 'eq'))?.value
-                  : (c.filterOptions.multiselect ? [] : '')"
+                @update:modelValue="onFilterInput[c.name]({ column: c, operator: c.filterOptions?.multiselect ? AFFO.IN : AFFO.EQ, value: c.filterOptions?.multiselect ? ($event.length ? $event : undefined) : $event })"
+                :modelValue="filtersStore.filters.find(f => f.field === c.name && f.operator === (c.filterOptions?.multiselect ? AFFO.IN : AFFO.EQ))?.value !== undefined
+                  ? filtersStore.filters.find(f => f.field === c.name && f.operator === (c.filterOptions?.multiselect ? AFFO.IN : AFFO.EQ))?.value
+                  : (c.filterOptions?.multiselect ? [] : '')"
               />
               
               <Select
-                :multiple="c.filterOptions.multiselect"
+                :multiple="c.filterOptions?.multiselect"
                 class="w-full"
                 v-else-if="c.enum"
                 :options="c.enum"
-                @update:modelValue="onFilterInput[c.name]({ column: c, operator: c.filterOptions.multiselect ? 'in' : 'eq', value: c.filterOptions.multiselect ? ($event.length ? $event : undefined) : $event || undefined })"
-                :modelValue="filtersStore.filters.find(f => f.field === c.name && f.operator === (c.filterOptions.multiselect ? 'in' : 'eq'))?.value || (c.filterOptions.multiselect ? [] : '')"
+                @update:modelValue="onFilterInput[c.name]({ column: c, operator: c.filterOptions?.multiselect ? AFFO.IN : AFFO.EQ, value: c.filterOptions?.multiselect ? ($event.length ? $event : undefined) : $event || undefined })"
+                :modelValue="filtersStore.filters.find(f => f.field === c.name && f.operator === (c.filterOptions?.multiselect ? AFFO.IN : AFFO.EQ))?.value || (c.filterOptions?.multiselect ? [] : '')"
               />
 
               <Input
-                v-else-if="['string', 'text', 'json', 'richtext', 'unknown'].includes(c.type)"
+                v-else-if="['string', 'text', 'json', 'richtext', 'unknown'].includes(c.type ?? '')"
                 type="text"
                 full-width
                 :placeholder="$t('Search')"
-                @update:modelValue="onFilterInput[c.name]({ column: c, operator: c.filterOptions?.substringSearch ? 'ilike' : 'eq', value: $event || undefined })"
-                :modelValue="getFilterItem({ column: c, operator: c.filterOptions?.substringSearch ? 'ilike' : 'eq' })"
+                @update:modelValue="onFilterInput[c.name]({ column: c, operator: c.filterOptions?.substringSearch ? AFFO.ILIKE : AFFO.EQ, value: $event || undefined })"
+                :modelValue="(getFilterItem({ column: c, operator: c.filterOptions?.substringSearch ? AFFO.ILIKE : AFFO.EQ }) as string | number)"
               />
 
               <CustomDateRangePicker
-                v-else-if="['datetime', 'date', 'time'].includes(c.type)"
+                v-else-if="['datetime', 'date', 'time'].includes(c.type ?? '')"
                 :column="c"
-                :valueStart="filtersStore.filters.find(f => f.field === c.name && f.operator === 'gte')?.value || undefined"
-                @update:valueStart="onFilterInput[c.name]({ column: c, operator: 'gte', value: $event || undefined })"
-                :valueEnd="filtersStore.filters.find(f => f.field === c.name && f.operator === 'lte')?.value || undefined"
-                @update:valueEnd="onFilterInput[c.name]({ column: c, operator: 'lte', value: $event || undefined })"
+                :valueStart="filtersStore.filters.find(f => f.field === c.name && f.operator === AFFO.GTE)?.value || undefined"
+                @update:valueStart="onFilterInput[c.name]({ column: c, operator: AFFO.GTE, value: $event || undefined })"
+                :valueEnd="filtersStore.filters.find(f => f.field === c.name && f.operator === AFFO.LTE)?.value || undefined"
+                @update:valueEnd="onFilterInput[c.name]({ column: c, operator: AFFO.LTE, value: $event || undefined })"
               />
 
               <CustomRangePicker
-                v-else-if="['integer', 'decimal', 'float'].includes(c.type) && c.allowMinMaxQuery"
+                v-else-if="['integer', 'decimal', 'float'].includes(c.type ?? '') && c.allowMinMaxQuery"
                 :min="getFilterMinValue(c.name)"
                 :max="getFilterMaxValue(c.name)"
-                :valueStart="getFilterItem({ column: c, operator: 'gte' })"
-                @update:valueStart="(val) => rangeChangeHandler((val !== '' && val !== null) ? (c.type === 'decimal' ? String(val) : val) : undefined, c, 'gte')"
-                :valueEnd="getFilterItem({ column: c, operator: 'lte' })"
-                @update:valueEnd="(val) => rangeChangeHandler((val !== '' && val !== null) ? (c.type === 'decimal' ? String(val) : val) : undefined, c, 'lte')"
+                :valueStart="(getFilterItem({ column: c, operator: AFFO.GTE }) as number)"
+                @update:valueStart="(val) => rangeChangeHandler((val !== '' && val !== null) ? (c.type === 'decimal' ? String(val) : val) : undefined, c, AFFO.GTE)"
+                :valueEnd="(getFilterItem({ column: c, operator: AFFO.LTE }) as number)"
+                @update:valueEnd="(val) => rangeChangeHandler((val !== '' && val !== null) ? (c.type === 'decimal' ? String(val) : val) : undefined, c, AFFO.LTE)"
               />
 
-              <div v-else-if="['integer', 'decimal', 'float'].includes(c.type)" class="flex gap-2">
+              <div v-else-if="['integer', 'decimal', 'float'].includes(c.type ?? '')" class="flex gap-2">
                 <Input
                   type="number"
                   aria-describedby="helper-text-explanation"
                   :placeholder="$t('From')"
-                  @update:modelValue="onFilterInput[c.name]({ column: c, operator: 'gte', value: ($event !== '' && $event !== null) ? (c.type === 'decimal' ? String($event) : $event) : undefined })"
-                  :modelValue="getFilterItem({ column: c, operator: 'gte' })"
+                  @update:modelValue="onFilterInput[c.name]({ column: c, operator: AFFO.GTE, value: ($event !== '' && $event !== null) ? (c.type === 'decimal' ? String($event) : $event) : undefined })"
+                  :modelValue="(getFilterItem({ column: c, operator: AFFO.GTE }) as number)"
                 />
                 <Input
                   type="number"
                   aria-describedby="helper-text-explanation"
                   :placeholder="$t('To')"
-                  @update:modelValue="onFilterInput[c.name]({ column: c, operator: 'lte', value: ($event !== '' && $event !== null) ? (c.type === 'decimal' ? String($event) : $event) : undefined })"
-                  :modelValue="getFilterItem({ column: c, operator: 'lte' })"
+                  @update:modelValue="onFilterInput[c.name]({ column: c, operator: AFFO.LTE, value: ($event !== '' && $event !== null) ? (c.type === 'decimal' ? String($event) : $event) : undefined })"
+                  :modelValue="(getFilterItem({ column: c, operator: AFFO.LTE }) as number)"
                 />
               </div>
             </div>
@@ -164,14 +164,13 @@
   </div>
 </template>
 
-<script setup>
+<script setup lang="ts">
 import { watch, computed, ref, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import CustomDateRangePicker from '@/components/CustomDateRangePicker.vue';
-import { callAdminForthApi, loadMoreForeignOptions, searchForeignOptions, createSearchInputHandlers } from '@/utils';
+import { loadMoreForeignOptions, searchForeignOptions, createSearchInputHandlers, formatComponent } from '@/utils';
 import { useRouter } from 'vue-router';
 import CustomRangePicker from "@/components/CustomRangePicker.vue";
-import { useFiltersStore } from '@/stores/filters';
 import { getCustomComponent } from '@/utils';
 import Input from '@/afcl/Input.vue';
 import Select from '@/afcl/Select.vue';
@@ -179,27 +178,39 @@ import Spinner from '@/afcl/Spinner.vue';
 import debounce from 'debounce';
 import { Tooltip } from '@/afcl';
 import { IconCloseOutline } from '@iconify-prerendered/vue-flowbite';
+import type { AdminforthFilterStore, AdminforthFilterStoreUnwrapped } from '@/spa_types/core';
+import type { AdminForthResourceColumnCommon, FilterParams, ColumnMinMaxValue } from '@/types/Common';
+import { AdminForthFilterOperators } from '@/types/Common';
+
 
-const filtersStore = useFiltersStore();
 const { t } = useI18n();
 
+const AFFO = AdminForthFilterOperators;
 
 // props: columns
 // add support for v-model:filers
-const props = defineProps(['columns', 'filters', 'show', 'columnsMinMax']);
+// const props = defineProps(['columns', 'filters', 'show', 'columnsMinMax']);
+const props = defineProps<{
+  columns: AdminForthResourceColumnCommon[],
+  filters?: AdminforthFilterStore['filters'],
+  show: Boolean,
+  columnsMinMax: ColumnMinMaxValue,
+  filtersStore: AdminforthFilterStoreUnwrapped
+}>();
+
 const emits = defineEmits(['update:filters', 'hide']);
 
 const router = useRouter();
 
 
 const columnsWithFilter = computed(
-  () => props.columns?.filter(column => column.showIn.filter) || []
+  () => props.columns?.filter(column => column.showIn?.filter) || []
 );
 
-const columnOptions = ref({});
-const columnLoadingState = reactive({});
-const columnOffsets = reactive({});
-const columnEmptyResultsCount = reactive({});
+const columnOptions = ref<{[key: string]: Record<string, any>[]}>({});
+const columnLoadingState = reactive<Record<string, { loading: boolean; hasMore: boolean }>>({});
+const columnOffsets = reactive<Record<string, number>>({});
+const columnEmptyResultsCount = reactive<Record<string, number>>({});
 
 watch(() => props.columns, async (newColumns) => {
   if (!newColumns) return;
@@ -219,12 +230,12 @@ watch(() => props.columns, async (newColumns) => {
 }, { immediate: true });
 
 // Function to load more options for a specific column
-async function loadMoreOptions(columnName, searchTerm = '') {
+async function loadMoreOptions(columnName: string, searchTerm = '') {
   return loadMoreForeignOptions({
     columnName,
     searchTerm,
     columns: props.columns,
-    resourceId: router.currentRoute.value.params.resourceId,
+    resourceId: router.currentRoute.value.params.resourceId as string,
     columnOptions,
     columnLoadingState,
     columnOffsets,
@@ -232,12 +243,12 @@ async function loadMoreOptions(columnName, searchTerm = '') {
   });
 }
 
-async function searchOptions(columnName, searchTerm) {
+async function searchOptions(columnName: string, searchTerm: string) {
   return searchForeignOptions({
     columnName,
     searchTerm,
     columns: props.columns,
-    resourceId: router.currentRoute.value.params.resourceId,
+    resourceId: router.currentRoute.value.params.resourceId as string,
     columnOptions,
     columnLoadingState,
     columnOffsets,
@@ -263,9 +274,9 @@ watch(() => props.show, (show) => {
 // }
 
 const onFilterInput = computed(() => {
-  if (!props.columns) return {};
+  if (!props.columns) return {} as Record<string, any>;
 
-  return props.columns.reduce((acc, c) => {
+  return props.columns.reduce<Record<string, ReturnType<typeof debounce>>>((acc, c) => {
     return {
       ...acc,
       [c.name]: debounce(({ column, operator, value }) => {
@@ -277,18 +288,18 @@ const onFilterInput = computed(() => {
 
 // rangeState is used for cutom range picker, because if we change two values very quickly
 // in filters writes only the last one, because of debounce
-const rangeState = reactive({});
+const rangeState = reactive<Record<string, { gte: number | null; lte: number | null }>>({});
 
-const updateRange = (column) => {
+const updateRange = (column: AdminForthResourceColumnCommon) => {
   debounce(() => {
     const { gte, lte } = rangeState[column.name];
 
-    setFilterItem({ column, operator: 'gte', value: gte });
-    setFilterItem({ column, operator: 'lte', value: lte });
+    setFilterItem({ column, operator: AFFO.GTE, value: gte });
+    setFilterItem({ column, operator: AFFO.LTE, value: lte });
   }, column?.filterOptions?.debounceTimeMs || 10)();
 }
 
-function rangeChangeHandler(value, column, operator) {
+function rangeChangeHandler(value: number | null, column: AdminForthResourceColumnCommon, operator: 'gte' | 'lte') {
   if (!rangeState[column.name]) {
     rangeState[column.name] = { gte: null, lte: null };
   }
@@ -304,40 +315,40 @@ const onSearchInput = computed(() => {
   );
 });
 
-function setFilterItem({ column, operator, value }) {
+function setFilterItem({ column, operator, value }: { column: AdminForthResourceColumnCommon; operator: AdminForthFilterOperators; value: any }) {
 
-  const index = filtersStore.filters.findIndex(f => f.field === column.name && f.operator === operator);
+  const index = props.filtersStore.filters.findIndex(f => f.field === column.name && f.operator === operator);
   if (value === undefined || value === '' || value === null) {
     if (index !== -1) {
-      filtersStore.filters.splice(index, 1);
+      props.filtersStore.filters.splice(index, 1);
     }
   } else {
     if (index === -1) {
-      filtersStore.setFilter({ field: column.name, value, operator });
+      props.filtersStore.setFilter({ field: column.name, value, operator });
     } else {
-      filtersStore.setFilters([...filtersStore.filters.slice(0, index), { field: column.name, value, operator }, ...filtersStore.filters.slice(index + 1)])
+      props.filtersStore.setFilters([...props.filtersStore.filters.slice(0, index), { field: column.name, value, operator }, ...props.filtersStore.filters.slice(index + 1)])
     }
   }
-  emits('update:filters', [...filtersStore.filters]);
+  emits('update:filters', [...props.filtersStore.filters]);
 }
 
-function getFilterItem({ column, operator }) {
-  const filterValue = filtersStore.filters.find(f => f.field === column.name && f.operator === operator)?.value;
+function getFilterItem({ column, operator }: { column: AdminForthResourceColumnCommon; operator: AdminForthFilterOperators }) {
+  const filterValue = props.filtersStore.filters.find(f => f.field === column.name && f.operator === operator)?.value;
   return filterValue !== undefined ? filterValue : '';
 }
 
 async function clear() {
-  filtersStore.filters = [...filtersStore.filters.filter(f => filtersStore.shouldFilterBeHidden(f.field))];
-  emits('update:filters', [...filtersStore.filters]);
+  props.filtersStore.filters = [...props.filtersStore.filters.filter(f => props.filtersStore.shouldFilterBeHidden(f.field))];
+  emits('update:filters', [...props.filtersStore.filters]);
 }
 
-function getFilterMinValue(columnName) {
+function getFilterMinValue(columnName: string) {
   if(props.columnsMinMax && props.columnsMinMax[columnName]) {
     return props.columnsMinMax[columnName]?.min
   }
 }
 
-function getFilterMaxValue(columnName) {
+function getFilterMaxValue(columnName: string) {
   if(props.columnsMinMax && props.columnsMinMax[columnName]) {
     return props.columnsMinMax[columnName]?.max
   }

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/ResourceListTable.vue

@@ -218,17 +218,10 @@
                           :is="getIcon(action.icon)"
                           class="w-6 h-6 text-lightPrimary dark:text-darkPrimary"
                         />
-                        <svg
+                        <Spinner
                           v-if="actionLoadingStates[`${action.id}_${row._primaryKeyValue}`]"
-                          aria-hidden="true"
-                          class="w-6 h-6 p-1 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>
+                          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>
@@ -369,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';
@@ -651,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/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 }}
@@ -129,7 +129,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 }}

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

@@ -51,25 +51,16 @@
                 @callAction="(payload? : Object) => handleActionClick(action, payload)"
               >
                 <a @click.prevent class="block">
-                  <div class="flex items-center gap-2 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 hover:text-lightThreeDotsMenuBodyTextHover hover:bg-lightThreeDotsMenuBodyBackgroundHover dark:hover:bg-darkThreeDotsMenuBodyBackgroundHover dark:hover:text-darkThreeDotsMenuBodyTextHover">
                     <component 
                       v-if="action.icon && !actionLoadingStates[action.id!]" 
                       :is="getIcon(action.icon)" 
                       class="w-4 h-4 text-lightPrimary dark:text-darkPrimary"
                     />
-                    <div v-if="actionLoadingStates[action.id!]">
-                      <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 text-gray-200 dark:text-gray-500 fill-gray-500 dark:fill-gray-300"
+                    />
                     {{ action.name }}
                   </div>
                 </a>
@@ -104,12 +95,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();

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;
 })

package/dist/spa/src/types/Back.ts

@@ -13,6 +13,7 @@ import { ActionCheckSource, AdminForthFilterOperators, AdminForthSortDirections,
   type AdminForthConfigMenuItem,
   type AnnouncementBadgeResponse,
   type AdminForthResourceColumnInputCommon,
+  type ColumnMinMaxValue,
 } from './Common.js';
 
 export interface ICodeInjector {
@@ -256,7 +257,7 @@ export interface IAdminForthDataSourceConnector {
    * 
    * Internally should call {@link IAdminForthDataSourceConnector.getFieldValue} for both min and max values.
    */
-  getMinMaxForColumnsWithOriginalTypes({ resource, columns }: { resource: AdminForthResource, columns: AdminForthResourceColumn[] }): Promise<{ [key: string]: { min: any, max: any } }>;
+  getMinMaxForColumnsWithOriginalTypes({ resource, columns }: { resource: AdminForthResource, columns: AdminForthResourceColumn[] }): Promise<ColumnMinMaxValue>;
 
 
   /**
@@ -309,7 +310,7 @@ export interface IAdminForthDataSourceConnectorBase extends IAdminForthDataSourc
     newValues: any, 
   }): Promise<{ok: boolean, error?: string}>;
 
-  getMinMaxForColumns({ resource, columns }: { resource: AdminForthResource, columns: AdminForthResourceColumn[] }): Promise<{ [key: string]: { min: any, max: any } }>;
+  getMinMaxForColumns({ resource, columns }: { resource: AdminForthResource, columns: AdminForthResourceColumn[] }): Promise<ColumnMinMaxValue>;
 
   deleteMany?({resource, recordIds}:{resource: AdminForthResource, recordIds: any[]}): Promise<number>;
 }

package/dist/spa/src/types/Common.ts

@@ -1164,7 +1164,7 @@ export interface AdminForthConfigMenuItem {
    * Optional callback which will be called before rendering the menu for each item.
    * Result of callback if not null will be used as a small badge near the menu item.
    */
-  badge?: string | ((user: AdminUser) => Promise<string>),
+  badge?: string | number |  ((user: AdminUser) => Promise<string> | string | Promise<number> | number),
 
   /**
    * Tooltip shown on hover for badge
@@ -1257,4 +1257,8 @@ export interface GetBaseConfigResponse {
   config: AdminForthConfigForFrontend,
   adminUser: AdminUser,
   version: string,
+}
+
+export interface ColumnMinMaxValue { 
+  [key: string]: { min: any, max: any } 
 }