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

package/dist/spa/src/afcl/Select.vue

@@ -119,7 +119,7 @@ import { ref, computed, onMounted, onUnmounted, watch, nextTick,type PropType, t
 import { IconCaretDownSolid } from '@iconify-prerendered/vue-flowbite';
 import { useElementSize } from '@vueuse/core'
 
-type ISingleSelectModelValue = string | number;
+type ISingleSelectModelValue = string | number | boolean;
 
 const props = defineProps({
   options: Array,
@@ -159,6 +159,10 @@ const props = defineProps({
     type: String,
     default: '',
   },
+  disableTogleOfSelectedItem: {
+    type: Boolean,
+    default: false,
+  }
 });
 
 const emit = defineEmits(['update:modelValue', 'scroll-near-end', 'search']);
@@ -283,6 +287,7 @@ onMounted(() => {
   // Add scroll listeners if teleportToBody is true
   if (props.teleportToBody) {
     window.addEventListener('scroll', handleScroll, true);
+    window.addEventListener('resize', handleScroll);
   }
 });
 
@@ -314,7 +319,7 @@ const removeClickListener = () => {
 };
 
 const toogleItem = (item: any) => {
-  if (selectedItems.value.includes(item)) {
+  if (selectedItems.value.includes(item) && !props.disableTogleOfSelectedItem) {
     selectedItems.value = selectedItems.value.filter(i => i.value !== item.value);
   } else {
     if (!props.multiple) {
@@ -345,6 +350,7 @@ onUnmounted(() => {
   // Remove scroll listeners if teleportToBody is true
   if (props.teleportToBody) {
     window.removeEventListener('scroll', handleScroll, true);
+    window.removeEventListener('resize', handleScroll);
   }
   if (searchDebounceHandle) {
     clearTimeout(searchDebounceHandle);

package/dist/spa/src/afcl/Skeleton.vue

@@ -14,6 +14,11 @@
     <svg v-else-if="type === 'avatar'" class="me-3 animate-pulse text-lightSkeletonIconColor dark:text-darkSkeletonBackgroundColor" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
         <path d="M10 0a10 10 0 1 0 10 10A10.011 10.011 0 0 0 10 0Zm0 5a3 3 0 1 1 0 6 3 3 0 0 1 0-6Zm0 13a8.949 8.949 0 0 1-4.951-1.488A3.987 3.987 0 0 1 9 13h2a3.987 3.987 0 0 1 3.951 3.512A8.949 8.949 0 0 1 10 18Z"/>
     </svg>
+    <div 
+        v-else-if="type === 'input'" 
+        role="input" 
+        :class="['animate-pulse bg-gray-100 dark:bg-gray-700 border border-gray-200 dark:border-gray-600 rounded', $attrs.class]"
+    ></div>
     <div v-else role="status" class="flex items-center justify-center animate-pulse bg-lightSkeletonIconColor rounded-full dark:bg-darkSkeletonBackgroundColor">
         <span class="sr-only">Loading...</span>
     </div>

package/dist/spa/src/afcl/Spinner.vue

@@ -4,6 +4,6 @@
             <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>
+        <span class="sr-only">{{ $t('Loading...') }}</span>
     </div>
 </template>

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

@@ -1,5 +1,5 @@
 <template>
-  <div @click="onClick" class="flex items-center justify-center">
+  <div @click="onClick" class="flex items-center cursor-pointer">
     <slot />
   </div>
 </template>

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

@@ -20,7 +20,7 @@
       ref="input"
       :key="`select-${column.name}-${source}-${column.foreignResource?.name || column.foreignResource?.table || ''}`"
       class="w-full min-w-24"
-      :options="columnOptions[column.name] || []"
+      :options="formatSelectOptions(columnOptions[column.name] || [], column)"
       :searchDisabled="!column.foreignResource.searchableFields"
       @scroll-near-end="loadMoreOptions && loadMoreOptions(column.name)"
       @search="(searchTerm) => {
@@ -33,6 +33,7 @@
       :modelValue="value"
       :readonly="(column.editReadonly && source === 'edit') || readonly"
       @update:modelValue="$emit('update:modelValue', $event)"
+      disableTogleOfSelectedItem
     >
       <template #extra-item v-if="columnLoadingState && columnLoadingState[column.name]?.loading">
         <div class="text-center text-gray-400 dark:text-gray-300 py-2 flex items-center justify-center gap-2">
@@ -45,11 +46,12 @@
       v-else-if="column.enum"
       ref="input"
       class="w-full min-w-24"
-      :options="column.enum"
+      :options="formatSelectOptions(column.enum, column)"
       teleportToBody
       :modelValue="value"
       :readonly="(column.editReadonly && source === 'edit') || readonly"
       @update:modelValue="$emit('update:modelValue', $event)"
+      disableTogleOfSelectedItem
     />
     <Select
       v-else-if="(type || column.type) === 'boolean'"
@@ -60,6 +62,7 @@
       :modelValue="value"
       :readonly="(column.editReadonly && source === 'edit') || readonly"
       @update:modelValue="$emit('update:modelValue', $event)"
+      disableTogleOfSelectedItem
     />
     <Input
       v-else-if="['integer'].includes(type || column.type)"
@@ -188,7 +191,7 @@
       type?: string,
       value: any,
       currentValues: any,
-      mode: string,
+      mode: 'create' | 'edit',
       columnOptions: any,
       unmasked: any,
       deletable?: boolean,
@@ -218,6 +221,16 @@ const input = ref<HTMLInputElement | null>(null);
     return options;
   };
 
+  const formatSelectOptions = (options: any, column: any) => {
+    const optionsToReturn = options;
+    if (!column.required[props.mode] && !column.isArray?.enabled) {
+      if (!optionsToReturn.some((option: any) => option.value === null)) {
+        optionsToReturn.push({ label: t('Unset'), value: null });
+      }
+    }
+    return optionsToReturn;
+  };
+
   function onFocusHandler(event:FocusEvent, column:any, source:string, ) {
     const focusedInput = event.target as HTMLInputElement; 
     if(!focusedInput) return;  

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

@@ -53,23 +53,46 @@
     @update:inValidity="$emit('update:inValidity', { name: column.name, value: $event })"
     @update:emptiness="$emit('update:emptiness', { name: column.name, value: $event })"
   />
+  <div v-if="columnsWithErrors && columnsWithErrors[column.name] && validatingMode && !isValidating" class="af-invalid-field-message mt-1 text-xs text-lightInputErrorColor dark:text-darkInputErrorColor">{{ columnsWithErrors[column.name] }}</div>
+  <Spinner v-if="shouldWeShowSpinner" class="w-4 mt-1"/>
+  <div v-if="column.editingNote && column.editingNote[mode]" class="mt-1 text-xs text-lightFormFieldTextColor dark:text-darkFormFieldTextColor">{{ column.editingNote[mode] }}</div>
 </template>
   
 <script setup lang="ts">
   import { IconPlusOutline } from '@iconify-prerendered/vue-flowbite';
   import ColumnValueInput from "./ColumnValueInput.vue";
-  import { ref, nextTick } from 'vue';
+  import { ref, watch, nextTick } from 'vue';
+  import { Spinner } from '@/afcl';
   
   const props = defineProps<{
     source: 'create' | 'edit',
     column: any,
     currentValues: any,
-    mode: string,
+    mode: 'create' | 'edit',
     columnOptions: any,
     unmasked: any,
     setCurrentValue: Function,
     readonly?: boolean,
+    columnsWithErrors: Record<string, string>,
+    isValidating: boolean,
+    validatingMode: boolean,
   }>();
+
+  const shouldWeShowSpinner = ref(false);
+
+
+  watch(() => props.currentValues[props.column.name], async (newVal) => {
+    await nextTick();
+    if (props.isValidating) {
+      shouldWeShowSpinner.value = true;
+    }
+  });
+
+  watch(() => [props.isValidating], () => {
+    if (!props.isValidating) {
+      shouldWeShowSpinner.value = false;
+    }
+  });
   
   const emit = defineEmits(['update:unmasked', 'update:inValidity', 'update:emptiness', 'focus-last-input']);
   

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

@@ -35,16 +35,12 @@ import {computed, onMounted, ref, watch} from "vue";
 import debounce from 'debounce'
 import RangePicker from './RangePicker.vue';
 
-const props = defineProps({
-  valueStart: {
-    default: '',
-  },
-  valueEnd: {
-    default: '',
-  },
-  min: {},
-  max: {},
-});
+const props = defineProps<{
+  valueStart: number | null,
+  valueEnd: number | null,
+  min: number,
+  max: number,
+}>()
 
 const emit = defineEmits(['update:valueStart', 'update:valueEnd']);
 
@@ -52,8 +48,8 @@ const minFormatted = computed(() => Math.floor(<number>props.min));
 const maxFormatted = computed(() => Math.ceil(<number>props.max));
 
 
-const start = ref<string | number>(props.valueStart);
-const end = ref<string | number>(props.valueEnd);
+const start = ref<number | null>(props.valueStart);
+const end = ref<number | null>(props.valueEnd);
 
 const sliderValue = ref<[number, number]>([minFormatted.value, maxFormatted.value]);
 
@@ -71,8 +67,8 @@ watch([start, end], () => {
 
 const updateFromSlider =
     debounce((value: [number, number]) => {
-      start.value = value[0] === minFormatted.value ? '': value[0];
-      end.value = value[1] === maxFormatted.value ? '': value[1];
+      start.value = value[0] === minFormatted.value ? null : value[0];
+      end.value = value[1] === maxFormatted.value ? null : value[1];
     }, 500);
 
 onMounted(() => {
@@ -89,11 +85,17 @@ onMounted(() => {
 })
 
 function updateStartFromProps() {
+  if (props.valueStart == start.value) {
+    return;
+  }
   start.value = props.valueStart;
   setSliderValues(start.value, end.value)
 }
 
 function updateEndFromProps() {
+  if (props.valueEnd == end.value) {
+    return;
+  }
   end.value = props.valueEnd;
   setSliderValues(start.value, end.value)
 }

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="onFilterInput[c.name]({ column: c, operator: 'gte', value: ($event !== '' && $event !== null) ? (c.type === 'decimal' ? String($event) : $event) : undefined })"
-                :valueEnd="getFilterItem({ column: c, operator: 'lte' })"
-                @update:valueEnd="onFilterInput[c.name]({ column: c, operator: 'lte', value: ($event !== '' && $event !== null) ? (c.type === 'decimal' ? String($event) : $event) : undefined })"
+                :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 }) => {
@@ -275,6 +286,27 @@ 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<Record<string, { gte: number | null; lte: number | null }>>({});
+
+const updateRange = (column: AdminForthResourceColumnCommon) => {
+  debounce(() => {
+    const { gte, lte } = rangeState[column.name];
+
+    setFilterItem({ column, operator: AFFO.GTE, value: gte });
+    setFilterItem({ column, operator: AFFO.LTE, value: lte });
+  }, column?.filterOptions?.debounceTimeMs || 10)();
+}
+
+function rangeChangeHandler(value: number | null, column: AdminForthResourceColumnCommon, operator: 'gte' | 'lte') {
+  if (!rangeState[column.name]) {
+    rangeState[column.name] = { gte: null, lte: null };
+  }
+  rangeState[column.name][operator] = value;
+  updateRange(column);
+}
+
 const onSearchInput = computed(() => {
   return createSearchInputHandlers(
     props.columns,
@@ -283,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/GroupsTable.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="rounded-lg shadow-resourseFormShadow dark:shadow-darkResourseFormShadow dark:shadow-2xl">
+  <div class="rounded-lg shadow-resourseFormShadow dark:shadow-darkResourseFormShadow dark:shadow-2xl border dark:border-darkFormBorder">
     <div v-if="group.groupName && !group.noTitle" class="text-md font-semibold px-6 py-3 flex flex-1 items-center dark:border-darkFormBorder text-lightListTableHeadingText bg-lightFormHeading dark:bg-darkFormHeading dark:text-darkListTableHeadingText rounded-t-lg">
       {{ group.groupName }}
     </div>
@@ -30,7 +30,7 @@
                 <Tooltip v-if="column.required[mode]">
 
                   <IconExclamationCircleSolid v-if="column.required[mode]" class="w-4 h-4" 
-                    :class="(columnError(column) && validating) ? 'text-lightInputErrorColor dark:text-darkInputErrorColor' : 'text-lightRequiredIconColor dark:text-darkRequiredIconColor'"
+                    :class="(columnsWithErrors[column.name] && validatingMode && !isValidating) ? 'text-lightInputErrorColor dark:text-darkInputErrorColor' : 'text-lightRequiredIconColor dark:text-darkRequiredIconColor'"
                   />
 
                   <template #tooltip>
@@ -56,9 +56,10 @@
               @update:inValidity="customComponentsInValidity[$event.name] = $event.value"
               @update:emptiness="customComponentsEmptiness[$event.name] = $event.value"
               :readonly="readonlyColumns?.includes(column.name)"
+              :columnsWithErrors="columnsWithErrors"
+              :isValidating="isValidating"
+              :validatingMode="validatingMode"
             />
-            <div v-if="columnError(column) && validating" class="af-invalid-field-message mt-1 text-xs text-lightInputErrorColor dark:text-darkInputErrorColor">{{ columnError(column) }}</div>
-            <div v-if="column.editingNote && column.editingNote[mode]" class="mt-1 text-xs text-lightFormFieldTextColor dark:text-darkFormFieldTextColor">{{ column.editingNote[mode] }}</div>
           </td>
         </tr>
       </tbody>
@@ -79,14 +80,16 @@
   const props = defineProps<{
     source: 'create' | 'edit',
     group: any,
-    mode: string,
-    validating: boolean,
+    mode: 'create' | 'edit',
+    validatingMode: boolean,
     currentValues: any,
     unmasked: any,
     columnError: (column: any) => string,
     setCurrentValue: (columnName: string, value: any) => void,
     columnOptions: any,
     readonlyColumns?: string[],
+    columnsWithErrors: Record<string, string>,
+    isValidating: boolean
   }>();
 
   const customComponentsInValidity: Ref<Record<string, boolean>> = ref({});