@ditojs/admin 2.27.2 → 2.28.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/admin",
-  "version": "2.27.2",
+  "version": "2.28.0",
   "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",
@@ -33,8 +33,8 @@
     "not ie_mob > 0"
   ],
   "dependencies": {
-    "@ditojs/ui": "^2.27.0",
-    "@ditojs/utils": "^2.27.0",
+    "@ditojs/ui": "^2.28.0",
+    "@ditojs/utils": "^2.28.0",
     "@kyvg/vue3-notification": "^3.2.1",
     "@lk77/vue3-color": "^3.0.6",
     "@tiptap/core": "^2.3.0",
@@ -70,20 +70,20 @@
     "type-fest": "^4.15.0",
     "vue": "3.4.10",
     "vue-multiselect": "^3.0.0",
-    "vue-router": "^4.3.0",
+    "vue-router": "^4.3.2",
     "vue-upload-component": "^3.1.15"
   },
   "devDependencies": {
-    "@ditojs/build": "^2.27.0",
+    "@ditojs/build": "^2.28.0",
     "@vitejs/plugin-vue": "^5.0.4",
-    "@vue/compiler-sfc": "3.4.21",
+    "@vue/compiler-sfc": "3.4.23",
     "pug": "^3.0.2",
     "sass": "1.75.0",
     "typescript": "^5.4.5",
-    "vite": "^5.2.8"
+    "vite": "^5.2.10"
   },
   "types": "types",
-  "gitHead": "d15a80e1ecdf916fd087ad7c5b21eee0b2ee9daf",
+  "gitHead": "2bb631b6048da2d1dcb850d89796c87a4787b258",
   "scripts": {
     "build": "vite build",
     "watch": "yarn build --mode 'development' --watch",

package/src/components/DitoForm.vue

@@ -322,8 +322,8 @@ export default DitoComponent.component('DitoForm', {
     },
 
     // @override ResourceMixin.getResource()
-    getResource(defaults) {
-      const resource = ResourceMixin.methods.getResource.call(this, defaults)
+    getResource(method = 'get') {
+      const resource = ResourceMixin.methods.getResource.call(this, method)
       return getMemberResource(this.itemId, resource) || resource
     },
 
@@ -404,7 +404,7 @@ export default DitoComponent.component('DitoForm', {
 
       // Allow buttons to override both method and resource path to submit to:
       let { method } = this
-      let resource = this.getResource({ method })
+      let resource = this.getResource(method)
       const buttonResource = getResource(button.schema.resource, {
         parent: resource
       })

package/src/mixins/DitoMixin.js

@@ -314,7 +314,7 @@ export default {
       resource = getResource(resource, {
         // Resources without a parent inherit the one from `dataComponent`
         // automatically.
-        parent: this.dataComponent?.resource ?? null
+        parent: this.dataComponent?.getResource(resource?.method) ?? null
       })
       return this.api.resources.any(resource)
     },

package/src/mixins/ResourceMixin.js

@@ -124,13 +124,13 @@ export default {
   },
 
   methods: {
-    getResource(defaults = { method: 'get' }) {
+    getResource(method = 'get') {
       // Returns the resource object representing the resource for the
       // associated source schema.
       return getResource(this.sourceSchema?.resource, {
         type: 'collection',
-        parent: this.parentResourceComponent?.resource ?? null,
-        ...defaults
+        method,
+        parent: this.parentResourceComponent?.getResource(method) ?? null
       })
     },
 
@@ -229,7 +229,7 @@ export default {
     async handleRequest(
       {
         method,
-        resource = this.getResource({ method }),
+        resource = this.getResource(method),
         query,
         data
       },
@@ -286,7 +286,7 @@ export default {
 
     async submit(button) {
       const resource = getResource(button.schema.resource, {
-        parent: this.resource
+        parent: this.getResource(button.schema.resource?.method)
       })
       if (resource) {
         const { method } = resource

package/src/mixins/SourceMixin.js

@@ -498,7 +498,7 @@ export default {
           const method = 'delete'
           const resource = getMemberResource(
             itemId,
-            this.getResource({ method })
+            this.getResource(method)
           )
           if (resource) {
             this.handleRequest({ method, resource }, err => {

package/src/types/DitoTypeMarkup.vue

@@ -208,7 +208,15 @@ export default DitoTypeComponent.register('markup', {
 
     const onFocus = () => this.onFocus()
 
-    const onBlur = () => {
+    const onBlur = ({ editor }) => {
+      // This change handling code on blur is only needed to make e2e testing
+      // through puppeteer work, since we couldn't figure out how to trigger
+      // tiptap's update events programmatically from the outside.
+      const value = editor.getHTML()
+      if (value !== this.value) {
+        this.value = value
+        changed = true
+      }
       this.onBlur()
       onChange()
     }

package/src/types/DitoTypeUpload.vue

@@ -259,6 +259,7 @@ export default DitoTypeComponent.register('upload', {
     uploadPath() {
       return this.getResourceUrl({
         type: 'upload',
+        method: 'post',
         path: this.api.normalizePath(this.dataPath)
       })
     }