@ditojs/admin 2.28.0 → 2.28.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/admin",
-  "version": "2.28.0",
+  "version": "2.28.2",
   "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",
@@ -83,7 +83,7 @@
     "vite": "^5.2.10"
   },
   "types": "types",
-  "gitHead": "2bb631b6048da2d1dcb850d89796c87a4787b258",
+  "gitHead": "a9db3666df01cb3ee66a0ec7525d9221e15c5655",
   "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(method = 'get') {
-      const resource = ResourceMixin.methods.getResource.call(this, method)
+    getResource(options) {
+      const resource = ResourceMixin.methods.getResource.call(this, options)
       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/components/DitoPanel.vue

@@ -8,6 +8,7 @@ component.dito-panel(
 )
   DitoSchema.dito-panel__schema(
     :schema="panelSchema"
+    :dataSchema="panelDataSchema"
     :dataPath="panelDataPath"
     :data="panelData"
     :meta="meta"
@@ -114,6 +115,10 @@ export default DitoComponent.component('DitoPanel', {
       return this.hasOwnData ? 'form' : 'div'
     },
 
+    panelDataSchema() {
+      return this.hasOwnData ? this.schema : this.schemaComponent.schema
+    },
+
     panelDataPath() {
       // If the panel provides its own data, then it needs to prefix all
       // components with its data-path, but if it shares data with the schema

package/src/components/DitoSchema.vue

@@ -145,6 +145,9 @@ export default DitoComponent.component('DitoSchema', {
 
   props: {
     schema: { type: Object, required: true },
+    // `dataSchema` is only provided for panels, where the panel schema
+    // is different from the data schema for panels without own data.
+    dataSchema: { type: Object, default: props => props.schema },
     dataPath: { type: String, default: '' },
     data: { type: Object, default: null },
     meta: { type: Object, default: () => ({}) },
@@ -675,7 +678,7 @@ export default DitoComponent.component('DitoSchema', {
       // We can't set `this.data = ...` because it's a property, but we can set
       // all known properties on it to the values returned by
       // `setDefaultValues()`, as they are all reactive already from the starts:
-      Object.assign(this.data, setDefaultValues(this.schema, {}, this))
+      Object.assign(this.data, setDefaultValues(this.dataSchema, {}, this))
       this.clearErrors()
     },
 
@@ -715,7 +718,7 @@ export default DitoComponent.component('DitoSchema', {
 
     processData({ target = 'clipboard', schemaOnly = true } = {}) {
       return processData(
-        this.schema,
+        this.dataSchema,
         this.sourceSchema,
         this.data,
         this.dataPath,

package/src/mixins/DitoMixin.js

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

package/src/mixins/ResourceMixin.js

@@ -124,13 +124,18 @@ export default {
   },
 
   methods: {
-    getResource(method = 'get') {
+    getResource({ method = 'get', child } = {}) {
       // Returns the resource object representing the resource for the
       // associated source schema.
-      return getResource(this.sourceSchema?.resource, {
+      const resource = this.sourceSchema?.resource
+      return getResource(resource, {
         type: 'collection',
         method,
-        parent: this.parentResourceComponent?.getResource(method) ?? null
+        parent: this.parentResourceComponent?.getResource({
+          method,
+          child: resource
+        }) ?? null,
+        child
       })
     },
 
@@ -229,7 +234,7 @@ export default {
     async handleRequest(
       {
         method,
-        resource = this.getResource(method),
+        resource = this.getResource({ method }),
         query,
         data
       },
@@ -285,8 +290,12 @@ export default {
     },
 
     async submit(button) {
-      const resource = getResource(button.schema.resource, {
-        parent: this.getResource(button.schema.resource?.method)
+      let { resource } = button.schema
+      resource = getResource(resource, {
+        parent: this.getResource({
+          method: resource?.method,
+          child: resource
+        })
       })
       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 => {