move multiselect field to filterOption

Author: Astaldos

adminforth/modules/configValidator.ts

@@ -454,6 +454,9 @@ export default class ConfigValidator implements IConfigValidator {
             debounceTimeMs: 10,
             substringSearch: true,
           };
+          if (col.enum || col.foreignResource) {
+            col.filterOptions.multiselect = true;
+          }
         } else {
           if (col.filterOptions.debounceTimeMs !== undefined) {
             if (typeof col.filterOptions.debounceTimeMs !== 'number') {
@@ -470,6 +473,18 @@ export default class ConfigValidator implements IConfigValidator {
           } else {
             col.filterOptions.substringSearch = true;
           }
+
+          if (col.filterOptions.multiselect !== undefined) {
+            if (typeof col.filterOptions.multiselect !== 'boolean') {
+              errors.push(`Resource "${res.resourceId}" column "${col.name}" has multiselectFilter in filterOptions that is not boolean`);
+            }
+
+            if (!col.enum && !col.foreignResource) {
+              errors.push(`Resource "${res.resourceId}" column "${col.name}" multiselectFilter in filterOptions should be set only for enum or foreign resource columns`);
+            }
+          } else if (col.enum || col.foreignResource) {
+            col.filterOptions.multiselect = true;
+          }
         }
 
         col.showIn = this.validateAndNormalizeShowIn(resInput, inCol, errors, warnings);
@@ -664,18 +679,6 @@ export default class ConfigValidator implements IConfigValidator {
           }
         }
 
-        if (col.multiselectFilter !== undefined) {
-          if (typeof col.multiselectFilter !== 'boolean') {
-            errors.push(`Resource "${res.resourceId}" column "${col.name}" has multiselectFilter that is not boolean`);
-          }
-
-          if (!col.enum && !col.foreignResource) {
-            errors.push(`Resource "${res.resourceId}" column "${col.name}" multiselectFilter should be set only for enum or foreign resource columns`);
-          }
-        } else if (col.enum || col.foreignResource) {
-          col.multiselectFilter = true;
-        }
-
         if (inCol.inputPrefix || inCol.inputSuffix) {
           if (![AdminForthDataTypes.DECIMAL, AdminForthDataTypes.FLOAT, AdminForthDataTypes.INTEGER, AdminForthDataTypes.STRING, undefined].includes(col.type)) {
             if (inCol.type === AdminForthDataTypes.JSON) {

adminforth/spa/src/components/Filters.vue

@@ -24,11 +24,11 @@
 
             <Select
               v-if="c.foreignResource"
-              :multiple="c.multiselectFilter"
+              :multiple="c.filterOptions.multiselect"
               class="w-full"
               :options="columnOptions[c.name] || []"
-              @update:modelValue="onFilterInput[c.name]({ column: c, operator: c.multiselectFilter ? 'in' : 'eq', value: c.multiselectFilter ? ($event.length ? $event : undefined) : $event || undefined })"
-              :modelValue="filtersStore.filters.find(f => f.field === c.name && f.operator === (c.multiselectFilter ? 'in' : 'eq'))?.value || []"
+              @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 || []"
             />
             <Select
               multiple
@@ -45,12 +45,12 @@
             />
 
             <Select
-              :multiple="c.multiselectFilter"
+              :multiple="c.filterOptions.multiselect"
               class="w-full"
               v-else-if="c.enum"
               :options="c.enum"
-              @update:modelValue="onFilterInput[c.name]({ column: c, operator: c.multiselectFilter ? 'in' : 'eq', value: c.multiselectFilter ? ($event.length ? $event : undefined) : $event || undefined })"
-              :modelValue="filtersStore.filters.find(f => f.field === c.name && f.operator === (c.multiselectFilter ? 'in' : 'eq'))?.value || []"
+              @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 || []"
             />
 
             <Input
@@ -165,7 +165,7 @@ const columnOptions = computedAsync(async () => {
           },
         });
         ret[column.name] = list.items;
-        if (!column.multiselectFilter) {
+        if (!column.filterOptions.multiselect) {
           ret[column.name].push({
             label: t('Unset'),
             value: '',

adminforth/types/Common.ts

@@ -803,11 +803,6 @@ export interface AdminForthResourceColumnInputCommon {
    */
   foreignResource?: AdminForthForeignResourceCommon,
 
-  /**
-   * Boolean value that determines what select input type to display on filter page.
-   */
-  multiselectFilter?: boolean,
-
   sortable?: boolean,
 
 
@@ -820,6 +815,10 @@ export interface AdminForthResourceColumnInputCommon {
      * If false - will force EQ operator for filter instead of ILIKE.
      */
     substringSearch?: boolean,
+    /**
+     * Boolean value that determines what select input type to display on filter page.
+     */
+    multiselect?: boolean,
   },
 
   /**