@ditojs/admin 2.2.7-debug.0 → 2.2.7-debug.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/admin",
-  "version": "2.2.7-debug.0",
+  "version": "2.2.7-debug.1",
   "type": "module",
   "description": "Dito.js Admin is a schema based admin interface for Dito.js Server, featuring auto-generated views and forms and built with Vue.js",
   "repository": "https://github.com/ditojs/dito/tree/master/packages/admin",
@@ -82,7 +82,7 @@
     "vite": "^4.3.1"
   },
   "types": "types",
-  "gitHead": "3e466e0a94142eda903705f977712e4080b50ebb",
+  "gitHead": "e79299ffdc4c7d26653f609bff4eb6d5df0ab07e",
   "scripts": {
     "build": "vite build",
     "watch": "yarn build --mode 'development' --watch",

package/src/mixins/SourceMixin.js

@@ -3,7 +3,6 @@ import ResourceMixin from './ResourceMixin.js'
 import SchemaParentMixin from '../mixins/SchemaParentMixin.js'
 import { getSchemaAccessor, getStoreAccessor } from '../utils/accessor.js'
 import { getMemberResource } from '../utils/resource.js'
-import { replaceRoute } from '../utils/route.js'
 import {
   processRouteSchema,
   processForms,
@@ -44,6 +43,7 @@ export default {
   data() {
     return {
       wrappedPrimitives: null,
+      ignoreRouteChange: false,
       unwrappingPrimitives: false
     }
   },
@@ -177,9 +177,12 @@ export default {
           ...query
         }
         if (!equals(query, this.$route.query)) {
+          // Tell the `$route` watcher to ignore the changed triggered here:
+          this.ignoreRouteChange = true
+          this.$router.replace({ query, hash: this.$route.hash })
           // Change the route query parameters, but don't trigger a route
           // change, as that would cause the list to reload.
-          replaceRoute({ query })
+          // replaceRoute({ query })
         }
         return query // Let getStoreAccessor() do the actual setting
       }
@@ -314,6 +317,10 @@ export default {
 
   watch: {
     $route(to, from) {
+      if (this.ignoreRouteChange) {
+        this.ignoreRouteChange = false
+        return
+      }
       if (from.path === to.path && from.hash === to.hash) {
         // Paths and hashes remain the same, so only queries have changed.
         // Update filter and reload data without clearing.

package/src/types/DitoTypeList.vue

@@ -195,7 +195,7 @@ export default DitoTypeComponent.register('list', {
         },
         set query(query) {
           const component = getListComponent()
-          console.log('set query', query, !!component)
+          console.log('set query', !!component)
           if (component) {
             // Filter out undefined values for comparing with equals()
             const filter = obj => pickBy(obj, value => value !== undefined)

package/src/utils/filter.js

@@ -112,10 +112,8 @@ export function createFiltersPanel(api, filters, dataPath, proxy) {
         console.log(
           'applyFilters()',
           JSON.stringify({
-            ...proxy.query,
-            filter: this.filters,
-            // Clear pagination when applying or clearing filters:
-            page: undefined
+            data: this.data,
+            filters: this.filters
           })
         )
         proxy.query = {