@ditojs/admin 2.2.7-debug.3 → 2.2.7-debug.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/admin",
-  "version": "2.2.7-debug.3",
+  "version": "2.2.7-debug.5",
   "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": "1008cb90f8bee745e2c80c39bddba3cdf9f1b4e9",
+  "gitHead": "a7d0c07bd2b065bbd103e9bcd73ecaa91a1f58e8",
   "scripts": {
     "build": "vite build",
     "watch": "yarn build --mode 'development' --watch",

package/src/components/DitoSchema.vue

@@ -330,6 +330,16 @@ export default DitoComponent.component('DitoSchema', {
     }
   },
 
+  watch: {
+    schema() {
+      console.log('DitoSchema: schema changed', this.dataPath)
+    },
+
+    data() {
+      console.log('DitoSchema: data changed', this.dataPath)
+    }
+  },
+
   created() {
     this._register(true)
     this.setupSchemaFields()

package/src/mixins/SourceMixin.js

@@ -25,6 +25,7 @@ import {
   parseDataPath,
   normalizeDataPath
 } from '@ditojs/utils'
+import { replaceRoute } from '../utils/route.js'
 
 // @vue/component
 export default {
@@ -178,11 +179,11 @@ export default {
         }
         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 })
+          // 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
       }

package/src/utils/filter.js

@@ -67,6 +67,7 @@ export const filterComponents = {
 }
 
 export function createFiltersPanel(api, filters, dataPath, proxy) {
+  console.log('createFiltersPanel()', dataPath)
   const { sticky, ...filterSchemas } = filters
   const panel = {
     type: 'panel',
@@ -112,8 +113,8 @@ export function createFiltersPanel(api, filters, dataPath, proxy) {
         console.log(
           'applyFilters()',
           JSON.stringify({
-            data: this.data,
-            filters: this.filters
+            filters: this.filters,
+            data: this.data
           })
         )
         proxy.query = {
@@ -213,10 +214,10 @@ function getComponentsForFilter(schema, name) {
 function formatFiltersData(schema, data) {
   console.log(
     'formatFiltersData()',
-    {
-      data: JSON.stringify(data),
-      schema: JSON.stringify(Object.keys(schema?.components || {}))
-    }
+    JSON.stringify({
+      data: data ?? null,
+      schema: schema ? Object.keys(schema.components) : null
+    })
   )
   const filters = []
   for (const name in data) {
@@ -232,6 +233,7 @@ function formatFiltersData(schema, data) {
       }
     }
   }
+  console.log('formatFiltersData() =>', filters)
   return filters
 }