adminforth 1.1.5 → 1.1.6

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

@@ -152,7 +152,7 @@ const router = useRouter();
 
 const props = defineProps({
   loading: Boolean,
-  resourceColumns: Object,
+  resource: Object,
   record: Object,
   validating: Boolean,
   customComponentsPerColumn: Object,
@@ -228,7 +228,7 @@ onMounted(() => {
 
 const columnOptions = computedAsync(async () => { 
   return (await Promise.all(
-    Object.values(props.resourceColumns).map(async (column) => {
+    Object.values(props.resource.columns).map(async (column) => {
       if (column.foreignResource) {
         const list = await callAdminForthApi({
           method: 'POST',
@@ -251,7 +251,7 @@ const coreStore = useCoreStore();
 
 const editableColumns = computed(() => {
   const mode = props.record ? 'edit' : 'create';
-  return props.resourceColumns?.filter(column => column.showIn.includes(mode));
+  return props.resource?.columns?.filter(column => column.showIn.includes(mode));
 });
 
 const isValid = computed(() => {

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

@@ -146,7 +146,13 @@
           <div class="flex">
           <RouterLink
             v-if="resource.options?.allowedActions.show"
-            :to="{ name: 'resource-show', params: { resourceId: $route.params.resourceId, primaryKey: row._primaryKeyValue } }"
+            :to="{ 
+              name: 'resource-show', 
+              params: { 
+                resourceId: resource.resourceId, 
+                primaryKey: row._primaryKeyValue,
+              }
+            }"
             class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
             :data-tooltip-target="`tooltip-show-${rowI}`"
           >
@@ -164,7 +170,7 @@
             :to="{
               name: 'resource-edit',
               params: { 
-                resourceId: resource.id,
+                resourceId: resource.resourceId,
                 primaryKey: row._primaryKeyValue 
               } 
             }"

package/dist/spa/spa/src/composables/useStores.ts

@@ -4,6 +4,7 @@ import { useModalStore } from '../stores/modal';
 import { useCoreStore } from '@/stores/core';
 import { useFiltersStore } from '@/stores/filters';
 import router from '@/router'
+import type { AdminForthResourceColumn } from '@/types/AdminForthConfig';
 
 
 
@@ -65,7 +66,7 @@ export class FrontendAPI implements FrontendAPIInterface {
     } else {
       if(!this.coreStore) this.coreStore = useCoreStore()
       console.log(this.coreStore.resourceColumnsWithFilters,'core store')
-      const filterField = this.coreStore.resourceColumnsWithFilters.find((col) => col.name === filter.field)
+      const filterField = this.coreStore.resourceColumnsWithFilters.find((col: AdminForthResourceColumn) => col.name === filter.field)
       if(!filterField){
           throw new Error(`Field ${filter.field} is not available for filtering`)
         }
@@ -97,7 +98,7 @@ export class FrontendAPI implements FrontendAPIInterface {
   updateListFilter(filter: FilterParams): void {
     if(this.listFilterValidation(filter)){
       this.filtersStore = useFiltersStore()
-      const index = this.filtersStore.filters.findIndex((f) => f.field === filter.field)
+      const index = this.filtersStore.filters.findIndex((f: FilterParams) => f.field === filter.field)
       if(index === -1) {
         this.filtersStore.setFilter(filter)
       } else {

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

@@ -1,19 +1,21 @@
 import { ref, computed } from 'vue'
 import { defineStore } from 'pinia'
 import { callAdminForthApi } from '@/utils';
+import type { AdminForthResource, AdminForthResourceColumn } from '@/types/AdminForthConfig';
+import type { Ref } from 'vue'
 
 export const useCoreStore = defineStore('core', () => {
-  const resourceById = ref([]);
+  const resourceById: Ref<Object> = ref({});
   const menu = ref([]);
   const config = ref({});
   const record = ref({});
-  const resourceColumns = ref(null);
-  const resource = ref(null);
+  const resource: Ref<AdminForthResource | null> = ref(null);
+
   const resourceColumnsWithFilters = computed(() => {
-    if (!resourceColumns.value) {
+    if (!resource.value) {
       return [];
     }
-    return resourceColumns.value.filter((col) => col.showIn.includes('filter'));
+    return resource.value.columns.filter((col: AdminForthResourceColumn) => col.showIn?.includes('filter'));
   })
 
   const resourceOptions = ref(null);
@@ -30,7 +32,7 @@ export const useCoreStore = defineStore('core', () => {
       return
     }
     menu.value = resp.menu;
-    resourceById.value = resp.resources.reduce((acc, resource) => {
+    resourceById.value = resp.resources.reduce((acc: Object, resource: AdminForthResource) => {
       acc[resource.resourceId] = resource;
       return acc;
     }, {});
@@ -42,7 +44,7 @@ export const useCoreStore = defineStore('core', () => {
   async function fetchRecord({ resourceId, primaryKey }) {
     record.value = null;
     
-    if (!resourceColumns.value) {
+    if (!resource.value) {
       throw new Error('Columns not fetched yet');
     }
 
@@ -54,7 +56,7 @@ export const useCoreStore = defineStore('core', () => {
         resourceId: resourceId,
         filters: [
           {
-            field: resourceColumns.value.find((col) => col.primaryKey).name,
+            field: resource.value.columns.find((col: AdminForthResourceColumn) => col.primaryKey).name,
             operator: 'eq',
             value: primaryKey
           }
@@ -70,13 +72,12 @@ export const useCoreStore = defineStore('core', () => {
     resourceOptions.value = respData.options;
   }
 
-  async function fetchResourceFull({ resourceId }) {
-    if (resourceColumnsId.value === resourceId && resourceColumns.value) {
+  async function fetchResourceFull({ resourceId }: { resourceId: string }) {
+    if (resourceColumnsId.value === resourceId && resource.value) {
       // already fetched
       return;
     }
     resourceColumnsId.value = resourceId;
-    resourceColumns.value = null;
     resourceColumnsError.value = '';
     const res = await callAdminForthApi({
       path: '/get_resource',
@@ -88,7 +89,6 @@ export const useCoreStore = defineStore('core', () => {
     if (res.error) {
       resourceColumnsError.value = res.error;
     } else {
-      resourceColumns.value = res.resource.columns;
       resourceById.value[resourceId] = res.resource;
       resource.value = res.resource;
       resourceOptions.value = res.resource.options;
@@ -131,7 +131,6 @@ export const useCoreStore = defineStore('core', () => {
     fetchMenuAndResource, 
     fetchRecord, 
     record, 
-    resourceColumns, 
     fetchResourceFull, 
     resourceColumnsError,
     resourceOptions,

package/dist/spa/spa/src/views/CreateView.vue

@@ -46,7 +46,7 @@
     <ResourceForm 
       v-else
       :record="initalValues"
-      :resourceColumns="coreStore.resourceColumns"
+      :resource="coreStore.resource"
       @update:record="onUpdateRecord"
       @update:isValid="isValid = $event"
       :validating="validating"
@@ -95,7 +95,10 @@ let createComponentsPerColumn = {};
 const coreStore = useCoreStore();
 
 const initalValues = computed(() => {
-  return route.query || {};
+  if (!route.query.values) {
+    return {};
+  }
+  return JSON.parse(decodeURIComponent(route.query.values));
 });
 
 async function onUpdateRecord(newRecord) {
@@ -108,7 +111,7 @@ onMounted(async () => {
   await coreStore.fetchResourceFull({
     resourceId: route.params.resourceId
   });
-  createComponentsPerColumn = coreStore.resourceColumns.reduce((acc, column) => {
+  createComponentsPerColumn = coreStore.resource.columns.reduce((acc, column) => {
       if (column.components?.create) {
           acc[column.name] = getCustomComponent(column.components.create);
       }
@@ -135,11 +138,17 @@ async function saveRecord() {
     },
   });
   saving.value = false;
-  router.push({ name: 'resource-show', params: { 
-    resourceId: route.params.resourceId, 
-    primaryKey: response.newRecordId
-  
-  } });
+  if (route.query.returnTo) {
+    router.push(route.query.returnTo);
+  } else {
+    router.push({ 
+      name: 'resource-show', 
+      params: { 
+        resourceId: route.params.resourceId, 
+        primaryKey: response.newRecordId
+      } 
+    });
+  }
 }
 
 

package/dist/spa/spa/src/views/EditView.vue

@@ -95,10 +95,10 @@ async function onUpdateRecord(newRecord) {
 
 const editableRecord = computed(() => {
   const newRecord = { ...coreStore.record };
-  if (!coreStore.resourceColumns) {
+  if (!coreStore.resource) {
     return {};
   }
-  coreStore.resourceColumns.forEach(column => {
+  coreStore.resource.columns.forEach(column => {
     if (column.foreignResource) {
       newRecord[column.name] = newRecord[column.name]?.pk
     }
@@ -119,7 +119,7 @@ onMounted(async () => {
   });
   checkAcessByAllowedActions(coreStore.resourceOptions.allowedActions,'edit');
 
-  editComponentsPerColumn = coreStore.resourceColumns.reduce((acc, column) => {
+  editComponentsPerColumn = coreStore.resource.columns.reduce((acc, column) => {
       if (column.components?.edit) {
           acc[column.name] = getCustomComponent(column.components.edit);
       }

package/dist/spa/spa/src/views/ListView.vue

@@ -2,7 +2,7 @@
   <div class="relative">
     <Teleport to="body">
       <Filters
-        :columns="coreStore.resourceColumns"
+        :columns="coreStore.resource.columns"
         :columnsMinMax="columnsMinMax" :show="filtersShow"
         @hide="filtersShow = false"
       />
@@ -159,6 +159,8 @@ watch([page], async () => {
 
 watch(()=>filtersStore.filters, async () => {
   page.value = 1;
+  checkboxes.value = [];
+
   await getList();
 }, {deep: true});
 
@@ -183,7 +185,7 @@ async function getList() {
   });
 
   rows.value = data.data?.map(row => {
-    row._primaryKeyValue = row[coreStore.resourceColumns.find(c => c.primaryKey).name];
+    row._primaryKeyValue = row[coreStore.resource.columns.find(c => c.primaryKey).name];
     return row;
   });
   totalRows.value = data.total;

package/dist/spa/spa/src/views/ShowView.vue

@@ -58,7 +58,7 @@
             </tr>
         </thead>
         <tbody>
-            <tr v-for="column in coreStore.resourceColumns?.filter(c => c.showIn.includes('show'))" :key="column.name"
+            <tr v-for="column in coreStore.resource?.columns.filter(c => c.showIn.includes('show'))" :key="column.name"
                 class="bg-form-view-bg odd:dark:bg-gray-900  even:dark:bg-gray-800 border-b  dark:border-gray-700"
             >
               <component
@@ -145,7 +145,7 @@ onMounted(async () => {
   });
   checkAcessByAllowedActions(coreStore.resourceOptions.allowedActions,'show');
 
-  showComponentsPerColumn = coreStore.resourceColumns.reduce((acc, column) => {
+  showComponentsPerColumn = coreStore.resource.columns.reduce((acc, column) => {
       if (column.components?.show) {
           acc[column.name] = getCustomComponent(column.components.show);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/plugins/ForeignInlineListPlugin/custom/InlineList.vue

@@ -3,13 +3,12 @@
     <!-- todo exclude foreign column-->
     <Filters
       v-if="listResource"
-      :columns="listResource.columns"  
+      :columns="listResource.columns.filter((c) => c.name !== listResourceRefColumn.name)"
       v-model:filters="filters"
       :columnsMinMax="columnsMinMax"
       :show="filtersShow"
       @hide="filtersShow = false"
     />
-    {{ listResource?.columns}}
   </Teleport>
     
   <td colspan="2">
@@ -56,23 +55,24 @@
           name: 'resource-create', 
           params: { resourceId: listResource.resourceId }, 
           query: { 
-            [listResourceRefColumn.name]: props.record[selfPrimaryKeyColumn.name]
-          }
+            values: encodeURIComponent(JSON.stringify({[listResourceRefColumn.name]: props.record[selfPrimaryKeyColumn.name]})),
+            returnTo: $route.fullPath,
+          },
        }"
-        class="flex items-center py-1 px-3  text-sm font-medium text-gray-900 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700 rounded-default"
+        class="flex items-center py-1 px-3 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700 rounded-default"
       >
         <IconPlusOutline class="w-4 h-4 me-2"/>
         Create
       </RouterLink>
 
       <button
-        class="flex gap-1 items-center py-1 px-3 me-2 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700 rounded-default"
+        class="flex gap-1 items-center py-1 px-3 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700 rounded-default"
         @click="()=>{filtersShow = !filtersShow}"
       >
         <IconFilterOutline class="w-4 h-4 me-2"/>
         Filter
         <span
-          class="bg-red-100 text-red-800 text-xs font-medium me-2 px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-red-400 border border-red-400"
+          class="bg-red-100 text-red-800 text-xs font-medium  px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-red-400 border border-red-400"
           v-if="filters.length">
             {{ filters.length }}
           </span>
@@ -88,6 +88,7 @@
       @update:checkboxes="checkboxes = $event"
       :pageSize="pageSize"
       :totalRows="totalRows"
+      :checkboxes="checkboxes"
     />
   </td>
 </template>
@@ -96,13 +97,15 @@
 import { callAdminForthApi } from '@/utils';
 import { ref, onMounted, watch, computed  } from 'vue';
 import ResourceListTable from '@/components/ResourceListTable.vue';
-
+import Filters from '@/components/Filters.vue';
 import {
   IconBanOutline,
   IconFilterOutline,
   IconPlusOutline,
 } from '@iconify-prerendered/vue-flowbite';
 
+import { getIcon } from '@/utils';
+
 const props = defineProps(['column', 'record', 'meta', 'resource', 'adminUser']);
 
 const listResource = ref(null);
@@ -118,6 +121,7 @@ const totalRows = ref(0);
 
 const filters = ref([]);
 const filtersShow = ref(false);
+const columnsMinMax = ref(null);
 
 const listResourceRefColumn = computed(() => {
   if (!listResource.value) {
@@ -164,6 +168,28 @@ watch([sort], async () => {
   await getList();
 }, {deep: true});
 
+watch([filters], async () => {
+  page.value = 1;
+  checkboxes.value = [];
+  await getList();
+}, {deep: true});
+
+
+async function startBulkAction(actionId) {
+  const data = await callAdminForthApi({
+    path: '/start_bulk_action',
+    method: 'POST',
+    body: {
+      resourceId: listResource.value.resourceId,
+      actionId: actionId,
+      recordIds: checkboxes.value
+    }
+  });
+  if (data?.status === 'success') {
+    checkboxes.value = [];
+  }
+  await getList();
+}
 
 async function getList() {
   rows.value = null;
@@ -188,7 +214,6 @@ async function getList() {
   totalRows.value = data.total;
 }
 
-
 onMounted( async () => {
   loading.value = true;
   const foreighResourceId = props.meta.foreignResourceId;
@@ -197,6 +222,13 @@ onMounted( async () => {
       method: 'POST',
       body: {},
   })).resource;
+  columnsMinMax.value = await callAdminForthApi({
+    path: '/get_min_max_for_columns',
+    method: 'POST',
+    body: {
+      resourceId: foreighResourceId,
+    }
+  });
   loading.value = false;
   await getList();
 });

package/spa/src/components/ResourceForm.vue

@@ -152,7 +152,7 @@ const router = useRouter();
 
 const props = defineProps({
   loading: Boolean,
-  resourceColumns: Object,
+  resource: Object,
   record: Object,
   validating: Boolean,
   customComponentsPerColumn: Object,
@@ -228,7 +228,7 @@ onMounted(() => {
 
 const columnOptions = computedAsync(async () => { 
   return (await Promise.all(
-    Object.values(props.resourceColumns).map(async (column) => {
+    Object.values(props.resource.columns).map(async (column) => {
       if (column.foreignResource) {
         const list = await callAdminForthApi({
           method: 'POST',
@@ -251,7 +251,7 @@ const coreStore = useCoreStore();
 
 const editableColumns = computed(() => {
   const mode = props.record ? 'edit' : 'create';
-  return props.resourceColumns?.filter(column => column.showIn.includes(mode));
+  return props.resource?.columns?.filter(column => column.showIn.includes(mode));
 });
 
 const isValid = computed(() => {

package/spa/src/components/ResourceListTable.vue

@@ -146,7 +146,13 @@
           <div class="flex">
           <RouterLink
             v-if="resource.options?.allowedActions.show"
-            :to="{ name: 'resource-show', params: { resourceId: $route.params.resourceId, primaryKey: row._primaryKeyValue } }"
+            :to="{ 
+              name: 'resource-show', 
+              params: { 
+                resourceId: resource.resourceId, 
+                primaryKey: row._primaryKeyValue,
+              }
+            }"
             class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
             :data-tooltip-target="`tooltip-show-${rowI}`"
           >
@@ -164,7 +170,7 @@
             :to="{
               name: 'resource-edit',
               params: { 
-                resourceId: resource.id,
+                resourceId: resource.resourceId,
                 primaryKey: row._primaryKeyValue 
               } 
             }"

package/spa/src/composables/useStores.ts

@@ -4,6 +4,7 @@ import { useModalStore } from '../stores/modal';
 import { useCoreStore } from '@/stores/core';
 import { useFiltersStore } from '@/stores/filters';
 import router from '@/router'
+import type { AdminForthResourceColumn } from '@/types/AdminForthConfig';
 
 
 
@@ -65,7 +66,7 @@ export class FrontendAPI implements FrontendAPIInterface {
     } else {
       if(!this.coreStore) this.coreStore = useCoreStore()
       console.log(this.coreStore.resourceColumnsWithFilters,'core store')
-      const filterField = this.coreStore.resourceColumnsWithFilters.find((col) => col.name === filter.field)
+      const filterField = this.coreStore.resourceColumnsWithFilters.find((col: AdminForthResourceColumn) => col.name === filter.field)
       if(!filterField){
           throw new Error(`Field ${filter.field} is not available for filtering`)
         }
@@ -97,7 +98,7 @@ export class FrontendAPI implements FrontendAPIInterface {
   updateListFilter(filter: FilterParams): void {
     if(this.listFilterValidation(filter)){
       this.filtersStore = useFiltersStore()
-      const index = this.filtersStore.filters.findIndex((f) => f.field === filter.field)
+      const index = this.filtersStore.filters.findIndex((f: FilterParams) => f.field === filter.field)
       if(index === -1) {
         this.filtersStore.setFilter(filter)
       } else {

package/spa/src/stores/core.ts

@@ -1,19 +1,21 @@
 import { ref, computed } from 'vue'
 import { defineStore } from 'pinia'
 import { callAdminForthApi } from '@/utils';
+import type { AdminForthResource, AdminForthResourceColumn } from '@/types/AdminForthConfig';
+import type { Ref } from 'vue'
 
 export const useCoreStore = defineStore('core', () => {
-  const resourceById = ref([]);
+  const resourceById: Ref<Object> = ref({});
   const menu = ref([]);
   const config = ref({});
   const record = ref({});
-  const resourceColumns = ref(null);
-  const resource = ref(null);
+  const resource: Ref<AdminForthResource | null> = ref(null);
+
   const resourceColumnsWithFilters = computed(() => {
-    if (!resourceColumns.value) {
+    if (!resource.value) {
       return [];
     }
-    return resourceColumns.value.filter((col) => col.showIn.includes('filter'));
+    return resource.value.columns.filter((col: AdminForthResourceColumn) => col.showIn?.includes('filter'));
   })
 
   const resourceOptions = ref(null);
@@ -30,7 +32,7 @@ export const useCoreStore = defineStore('core', () => {
       return
     }
     menu.value = resp.menu;
-    resourceById.value = resp.resources.reduce((acc, resource) => {
+    resourceById.value = resp.resources.reduce((acc: Object, resource: AdminForthResource) => {
       acc[resource.resourceId] = resource;
       return acc;
     }, {});
@@ -42,7 +44,7 @@ export const useCoreStore = defineStore('core', () => {
   async function fetchRecord({ resourceId, primaryKey }) {
     record.value = null;
     
-    if (!resourceColumns.value) {
+    if (!resource.value) {
       throw new Error('Columns not fetched yet');
     }
 
@@ -54,7 +56,7 @@ export const useCoreStore = defineStore('core', () => {
         resourceId: resourceId,
         filters: [
           {
-            field: resourceColumns.value.find((col) => col.primaryKey).name,
+            field: resource.value.columns.find((col: AdminForthResourceColumn) => col.primaryKey).name,
             operator: 'eq',
             value: primaryKey
           }
@@ -70,13 +72,12 @@ export const useCoreStore = defineStore('core', () => {
     resourceOptions.value = respData.options;
   }
 
-  async function fetchResourceFull({ resourceId }) {
-    if (resourceColumnsId.value === resourceId && resourceColumns.value) {
+  async function fetchResourceFull({ resourceId }: { resourceId: string }) {
+    if (resourceColumnsId.value === resourceId && resource.value) {
       // already fetched
       return;
     }
     resourceColumnsId.value = resourceId;
-    resourceColumns.value = null;
     resourceColumnsError.value = '';
     const res = await callAdminForthApi({
       path: '/get_resource',
@@ -88,7 +89,6 @@ export const useCoreStore = defineStore('core', () => {
     if (res.error) {
       resourceColumnsError.value = res.error;
     } else {
-      resourceColumns.value = res.resource.columns;
       resourceById.value[resourceId] = res.resource;
       resource.value = res.resource;
       resourceOptions.value = res.resource.options;
@@ -131,7 +131,6 @@ export const useCoreStore = defineStore('core', () => {
     fetchMenuAndResource, 
     fetchRecord, 
     record, 
-    resourceColumns, 
     fetchResourceFull, 
     resourceColumnsError,
     resourceOptions,

package/spa/src/views/CreateView.vue

@@ -46,7 +46,7 @@
     <ResourceForm 
       v-else
       :record="initalValues"
-      :resourceColumns="coreStore.resourceColumns"
+      :resource="coreStore.resource"
       @update:record="onUpdateRecord"
       @update:isValid="isValid = $event"
       :validating="validating"
@@ -95,7 +95,10 @@ let createComponentsPerColumn = {};
 const coreStore = useCoreStore();
 
 const initalValues = computed(() => {
-  return route.query || {};
+  if (!route.query.values) {
+    return {};
+  }
+  return JSON.parse(decodeURIComponent(route.query.values));
 });
 
 async function onUpdateRecord(newRecord) {
@@ -108,7 +111,7 @@ onMounted(async () => {
   await coreStore.fetchResourceFull({
     resourceId: route.params.resourceId
   });
-  createComponentsPerColumn = coreStore.resourceColumns.reduce((acc, column) => {
+  createComponentsPerColumn = coreStore.resource.columns.reduce((acc, column) => {
       if (column.components?.create) {
           acc[column.name] = getCustomComponent(column.components.create);
       }
@@ -135,11 +138,17 @@ async function saveRecord() {
     },
   });
   saving.value = false;
-  router.push({ name: 'resource-show', params: { 
-    resourceId: route.params.resourceId, 
-    primaryKey: response.newRecordId
-  
-  } });
+  if (route.query.returnTo) {
+    router.push(route.query.returnTo);
+  } else {
+    router.push({ 
+      name: 'resource-show', 
+      params: { 
+        resourceId: route.params.resourceId, 
+        primaryKey: response.newRecordId
+      } 
+    });
+  }
 }
 
 

package/spa/src/views/EditView.vue

@@ -95,10 +95,10 @@ async function onUpdateRecord(newRecord) {
 
 const editableRecord = computed(() => {
   const newRecord = { ...coreStore.record };
-  if (!coreStore.resourceColumns) {
+  if (!coreStore.resource) {
     return {};
   }
-  coreStore.resourceColumns.forEach(column => {
+  coreStore.resource.columns.forEach(column => {
     if (column.foreignResource) {
       newRecord[column.name] = newRecord[column.name]?.pk
     }
@@ -119,7 +119,7 @@ onMounted(async () => {
   });
   checkAcessByAllowedActions(coreStore.resourceOptions.allowedActions,'edit');
 
-  editComponentsPerColumn = coreStore.resourceColumns.reduce((acc, column) => {
+  editComponentsPerColumn = coreStore.resource.columns.reduce((acc, column) => {
       if (column.components?.edit) {
           acc[column.name] = getCustomComponent(column.components.edit);
       }

package/spa/src/views/ListView.vue

@@ -2,7 +2,7 @@
   <div class="relative">
     <Teleport to="body">
       <Filters
-        :columns="coreStore.resourceColumns"
+        :columns="coreStore.resource.columns"
         :columnsMinMax="columnsMinMax" :show="filtersShow"
         @hide="filtersShow = false"
       />
@@ -159,6 +159,8 @@ watch([page], async () => {
 
 watch(()=>filtersStore.filters, async () => {
   page.value = 1;
+  checkboxes.value = [];
+
   await getList();
 }, {deep: true});
 
@@ -183,7 +185,7 @@ async function getList() {
   });
 
   rows.value = data.data?.map(row => {
-    row._primaryKeyValue = row[coreStore.resourceColumns.find(c => c.primaryKey).name];
+    row._primaryKeyValue = row[coreStore.resource.columns.find(c => c.primaryKey).name];
     return row;
   });
   totalRows.value = data.total;

package/spa/src/views/ShowView.vue

@@ -58,7 +58,7 @@
             </tr>
         </thead>
         <tbody>
-            <tr v-for="column in coreStore.resourceColumns?.filter(c => c.showIn.includes('show'))" :key="column.name"
+            <tr v-for="column in coreStore.resource?.columns.filter(c => c.showIn.includes('show'))" :key="column.name"
                 class="bg-form-view-bg odd:dark:bg-gray-900  even:dark:bg-gray-800 border-b  dark:border-gray-700"
             >
               <component
@@ -145,7 +145,7 @@ onMounted(async () => {
   });
   checkAcessByAllowedActions(coreStore.resourceOptions.allowedActions,'show');
 
-  showComponentsPerColumn = coreStore.resourceColumns.reduce((acc, column) => {
+  showComponentsPerColumn = coreStore.resource.columns.reduce((acc, column) => {
       if (column.components?.show) {
           acc[column.name] = getCustomComponent(column.components.show);
       }