Merge branch 'next' of github.com:devforth/adminforth into next

Author: ivictbor

adminforth/modules/configValidator.ts

@@ -458,7 +458,7 @@ export default class ConfigValidator implements IConfigValidator {
             debounceTimeMs: 10,
             substringSearch: true,
           };
-          if (col.enum || col.foreignResource) {
+          if (col.enum || col.foreignResource || col.type === AdminForthDataTypes.BOOLEAN) {
             col.filterOptions.multiselect = true;
           }
         } else {
@@ -483,8 +483,8 @@ export default class ConfigValidator implements IConfigValidator {
               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`);
+            if (!col.enum && !col.foreignResource && col.type !== AdminForthDataTypes.BOOLEAN) {
+              errors.push(`Resource "${res.resourceId}" column "${col.name}" multiselectFilter in filterOptions should be set only for enum, foreign resource or boolean columns`);
             }
           } else if (col.enum || col.foreignResource) {
             col.filterOptions.multiselect = true;

adminforth/spa/src/components/Filters.vue

@@ -28,10 +28,10 @@
               class="w-full"
               :options="columnOptions[c.name] || []"
               @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 || []"
+              :modelValue="filtersStore.filters.find(f => f.field === c.name && f.operator === (c.filterOptions.multiselect ? 'in' : 'eq'))?.value || (c.filterOptions.multiselect ? [] : '')"
             />
             <Select
-              multiple
+              :multiple="c.filterOptions.multiselect"
               class="w-full"
               v-else-if="c.type === 'boolean'"
               :options="[
@@ -40,8 +40,10 @@
                 // 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: 'in', value: $event.length ? $event : undefined  })"
-              :modelValue="filtersStore.filters.find(f => f.field === c.name && f.operator === 'in')?.value || []"
+              @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 ? [] : '')"
             />
 
             <Select
@@ -50,7 +52,7 @@
               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 || []"
+              :modelValue="filtersStore.filters.find(f => f.field === c.name && f.operator === (c.filterOptions.multiselect ? 'in' : 'eq'))?.value || (c.filterOptions.multiselect ? [] : '')"
             />
 
             <Input
@@ -165,12 +167,6 @@ const columnOptions = computedAsync(async () => {
           },
         });
         ret[column.name] = list.items;
-        if (!column.filterOptions.multiselect) {
-          ret[column.name].push({
-            label: t('Unset'),
-            value: '',
-          });
-        }
       }
     })
   );

adminforth/spa/src/components/ResourceListTable.vue

@@ -59,7 +59,7 @@
             {{ $t('Actions') }}
           </td>
         </tr>
-        <tr v-for="c in tableBodyStartInjection" :key="c.id" class="align-top border-b border-lightListBorder dark:border-darkListTableBorder">
+        <tr v-for="c in tableBodyStartInjection" :key="c.id" class="align-top border-b border-lightListBorder dark:border-darkListBorder dark:bg-darkListTable">
           <component :is="getCustomComponent(c)" :meta="c.meta" :resource="resource" :adminUser="coreStore.adminUser" />
         </tr>
         <!-- table header end -->

adminforth/spa/src/views/ListView.vue

@@ -178,9 +178,13 @@ const DEFAULT_PAGE_SIZE = 10;
 
 const pageSize = computed(() => coreStore.resource?.options?.listPageSize || DEFAULT_PAGE_SIZE);
 
+const isPageLoaded = ref(false);
 
 async function getList() {
   rows.value = null;
+  if (!isPageLoaded.value) {
+    return; 
+  }
   const data = await callAdminForthApi({
     path: '/get_resource_data',
     method: 'POST',
@@ -434,9 +438,6 @@ watch([page], async () => {
   setQuery({ page: page.value });
 });
 
-
-
-
 watch([sort], async () => {
   if (!sort.value.length) {
     setQuery({ sort: undefined });
@@ -445,5 +446,8 @@ watch([sort], async () => {
   setQuery({ sort: SortQuerySerializer.serialize(sort.value) });
 });
 
+watch(() => coreStore.resource, () => {
+  isPageLoaded.value = true;
+});
 
 </script>

dev-demo/resources/apartments.ts

@@ -9,6 +9,7 @@ import TextCompletePlugin from "../../plugins/adminforth-text-complete";
 import UploadPlugin from "../../plugins/adminforth-upload";
 import ImportExportPlugin from "../../plugins/adminforth-import-export/index.js";
 import { v1 as uuid } from "uuid";
+import { admin } from '../index.js';
 import RichEditorPlugin from "../../plugins/adminforth-rich-editor";
 import { AdminForthResourceInput } from "../../adminforth";
 import CompletionAdapterOpenAIChatGPT from "../../adapters/adminforth-completion-adapter-open-ai-chat-gpt/index.js";
@@ -388,7 +389,7 @@ export default {
         confirm:
           "Are you sure you want to mark all selected apartments as listed?",
         action: async function ({ selectedIds, adminUser }: any) {
-          const stmt = db.prepare(
+          const stmt = admin.resource('aparts').dataConnector.client.prepare(
             `UPDATE apartments SET listed = 1 WHERE id IN (${selectedIds
               .map(() => "?")
               .join(",")})`