@ditojs/admin 2.75.2 → 2.77.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/admin",
-  "version": "2.75.2",
+  "version": "2.77.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",
@@ -42,8 +42,8 @@
     "not ie_mob > 0"
   ],
   "dependencies": {
-    "@ditojs/ui": "^2.75.0",
-    "@ditojs/utils": "^2.75.0",
+    "@ditojs/ui": "^2.77.0",
+    "@ditojs/utils": "^2.77.0",
     "@kyvg/vue3-notification": "^3.4.2",
     "@lk77/vue3-color": "^3.0.6",
     "@tiptap/core": "^3.15.3",
@@ -89,9 +89,9 @@
     "vue-upload-component": "^3.1.17"
   },
   "devDependencies": {
-    "@ditojs/build": "^2.75.0",
+    "@ditojs/build": "^2.77.0",
     "typescript": "^5.9.3",
     "vite": "^7.3.1"
   },
-  "gitHead": "70ff8a3042925a27c2b2a792505db04038f92493"
+  "gitHead": "d2cff77924d989aad5ab601cf08433a4e683ac6d"
 }

package/src/DitoContext.js

@@ -260,10 +260,9 @@ export default class DitoContext {
     return get(this, 'open', undefined)
   }
 
-  // TODO: Rename this to `searchTerm` or `searchQuery`, to perhaps free `query`
-  // for the actual `resourceComponent.query` object?
-  get query() {
-    return get(this, 'query', undefined)
+  // For search term in selects:
+  get searchTerm() {
+    return get(this, 'searchTerm', undefined)
   }
 
   // The error field is only populated in the context of buttons that send
@@ -284,6 +283,10 @@ export default class DitoContext {
     set(this, 'isRunning', value)
   }
 
+  get query() {
+    return this.component.$route.query
+  }
+
   // Helper Methods
 
   get request() {

package/src/components/DitoCreateButton.vue

@@ -105,9 +105,14 @@ export default DitoComponent.component('DitoCreateButton', {
         if (this.isInlined) {
           this.sourceComponent.createItem(form, type)
         } else {
+          const { creatable } = this.schema
+          const query = {
+            ...(type && { type }),
+            ...creatable?.query?.(this.context)
+          }
           this.$router.push({
             path: `${this.path}/create`,
-            query: { type }
+            query
           })
         }
       } else {

package/src/components/DitoRoot.vue

@@ -231,8 +231,8 @@ export default DitoComponent.component('DitoRoot', {
       })
     },
 
-    notify({ type = 'info', title, text, error } = {}) {
-      this.notifications.notify({ type, title, text, error })
+    notify({ type = 'info', title, text, error, duration } = {}) {
+      this.notifications.notify({ type, title, text, error, duration })
     },
 
     closeNotifications() {

package/src/components/DitoSchema.vue

@@ -396,7 +396,10 @@ export default DitoComponent.component('DitoSchema', {
         const tab = this.shouldRenderSchema(this.tabs[newTab])
           ? newTab
           : this.defaultTab
-        this.$router.replace({ hash: tab ? `#${tab}` : null })
+        this.$router.replace({
+          query: this.$route.query,
+          hash: tab ? `#${tab}` : null
+        })
       }
       if (this.hasErrors) {
         this.repositionErrors()

package/src/mixins/SourceMixin.js

@@ -13,6 +13,7 @@ import {
   hasFormSchema,
   getFormSchemas,
   getViewSchema,
+  getViewPath,
   isCompact,
   isInlined,
   isObjectSource,
@@ -187,13 +188,16 @@ export default {
         // the route query parameters to override them.
         const {
           scope = this.defaultScope?.name,
-          page = this.schema.page
+          page = this.schema.page,
+          type
         } = this.query
-        // Preserve / merge currently stored values.
+        // Preserve / merge currently stored values, including any custom query
+        // parameters added by creatable.query
         query = {
           ...this.query,
           ...(scope != null && { scope }),
           ...(page != null && { page }),
+          ...(type != null && { type }),
           ...query
         }
         if (!equals(query, this.$route.query)) {
@@ -337,7 +341,17 @@ export default {
     maxDepth: getSchemaAccessor('maxDepth', {
       type: Number,
       default: 1
-    })
+    }),
+
+    createPath() {
+      if (this.creatable) {
+        return (
+          getViewPath(this.schema, this.context) ||
+          this.path
+        )
+      }
+      return null
+    }
   },
 
   watch: {

package/src/types/DitoTypeList.vue

@@ -107,6 +107,7 @@
           v-if="hasCellEditButtons"
         )
           DitoEditButtons(
+            nested
             :schema="getItemFormSchema(schema, item, context)"
             :dataPath="getDataPath(index)"
             :data="item"
@@ -132,10 +133,9 @@
             :data="listData"
             :meta="meta"
             :store="store"
-            :nested="nested"
             :disabled="disabled || isLoading"
             :creatable="creatable"
-            :createPath="path"
+            :createPath="createPath"
           )
   //- Render create buttons outside table when in a single component view:
   DitoEditButtons.dito-buttons--large.dito-buttons--main.dito-buttons--sticky(
@@ -148,7 +148,7 @@
     :store="store"
     :disabled="disabled || isLoading"
     :creatable="creatable"
-    :createPath="path"
+    :createPath="createPath"
   )
 </template>
 

package/src/types/DitoTypeMultiselect.vue

@@ -222,14 +222,14 @@ export default DitoTypeComponent.register('multiselect', {
       }
     },
 
-    async onSearchChange(query) {
+    async onSearchChange(searchTerm) {
       if (this.searchFilter) {
-        if (query) {
+        if (searchTerm) {
           // Set `searchedOptions` to an empty array, before it will be
           // populated asynchronously with the actual results.
           this.searchedOptions = []
           this.searchedOptions = await this.resolveData(
-            () => this.searchFilter(new DitoContext(this, { query }))
+            () => this.searchFilter(new DitoContext(this, { searchTerm }))
           )
         } else {
           // Clear `searchedOptions` when the query is cleared.

package/src/types/DitoTypeObject.vue

@@ -51,7 +51,7 @@
     :store="store"
     :disabled="disabled || isLoading"
     :creatable="creatable"
-    :createPath="path"
+    :createPath="createPath"
   )
 </template>
 

package/src/types/DitoTypeTreeList.vue

@@ -15,7 +15,7 @@
       @update:data="data => (value = data)"
     )
     .dito-tree-form-container(
-      v-if="hasEditableForms"
+      v-if="editPath && hasEditableForms"
     )
       //- Include a router-view for the optional DitoFormInlined
       RouterView
@@ -52,7 +52,8 @@ export default DitoTypeComponent.register(
 
       editPath() {
         // Accessed from DitoTreeItem through `container.editPath`:
-        return this.$route.path.slice(this.path?.length)
+        const path = this.$route.path.slice(this.path?.length)
+        return path.startsWith(`/${this.schema.path}`) ? path : ''
       },
 
       treeData() {

package/src/utils/schema.js

@@ -491,17 +491,21 @@ export function hasViewSchema(schema, context) {
   return !!getViewSchema(schema, context)
 }
 
-export function getViewEditPath(schema, id, context) {
+export function getViewPath(schema, context) {
   const view = getViewSchema(schema, context)
   if (view) {
-    const path = isSingleComponentView(view)
+    return isSingleComponentView(view)
       ? view.fullPath
       : `${view.fullPath}/${view.path}`
-    return `${path}/${id}`
   }
   return null
 }
 
+export function getViewEditPath(schema, id, context) {
+  const path = getViewPath(schema, context)
+  return path ? `${path}/${id}` : null
+}
+
 export function getFormSchemas(schema, context, modifyForm) {
   const viewSchema = context && getViewFormSchema(schema, context)
   if (viewSchema) {