@ditojs/admin 2.11.1 → 2.11.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/admin",
-  "version": "2.11.1",
+  "version": "2.11.3",
   "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,7 +33,7 @@
     "not ie_mob > 0"
   ],
   "dependencies": {
-    "@ditojs/ui": "^2.11.1",
+    "@ditojs/ui": "^2.11.3",
     "@ditojs/utils": "^2.11.1",
     "@kyvg/vue3-notification": "^2.9.1",
     "@lk77/vue3-color": "^3.0.6",
@@ -58,7 +58,7 @@
     "@tiptap/extension-underline": "^2.0.4",
     "@tiptap/pm": "^2.0.4",
     "@tiptap/vue-3": "^2.0.4",
-    "@vueuse/integrations": "^10.2.1",
+    "@vueuse/integrations": "^10.3.0",
     "codeflask": "^1.4.1",
     "filesize": "^10.0.8",
     "filesize-parser": "^1.5.0",
@@ -67,7 +67,7 @@
     "sortablejs": "^1.15.0",
     "tinycolor2": "^1.6.0",
     "tippy.js": "^6.3.7",
-    "type-fest": "^4.0.0",
+    "type-fest": "^4.1.0",
     "vue": "^3.3.4",
     "vue-multiselect": "^3.0.0-beta.2",
     "vue-router": "^4.2.4",
@@ -78,12 +78,12 @@
     "@vitejs/plugin-vue": "^4.2.3",
     "@vue/compiler-sfc": "^3.3.4",
     "pug": "^3.0.2",
-    "sass": "1.64.1",
+    "sass": "1.64.2",
     "typescript": "^5.1.6",
-    "vite": "^4.4.7"
+    "vite": "^4.4.9"
   },
   "types": "types",
-  "gitHead": "fb1e7ce180f5c9ce8e058a7ef22465e0428cd758",
+  "gitHead": "9a5406b3ce9575128e9432dfbe6a6d3177d96c3d",
   "scripts": {
     "build": "vite build",
     "watch": "yarn build --mode 'development' --watch",

package/src/components/DitoClipboard.vue

@@ -29,9 +29,7 @@ export default DitoComponent.component('DitoClipboard', {
 
   props: {
     clipboard: { type: [Boolean, Object], required: true },
-    schema: { type: Object, required: true },
-    dataPath: { type: String, required: true },
-    data: { type: [Object, Array], default: null }
+    schema: { type: Object, required: true }
   },
 
   data() {

package/src/components/DitoForm.vue

@@ -318,12 +318,12 @@ export default DitoComponent.component('DitoForm', {
       return this.mainSchemaComponent.emitEvent(event, params)
     },
 
-    getDataPathFrom(route) {
+    getDataPathFrom(routeComponent) {
       // Get the data path by denormalizePath the relative route path
       return this.api.denormalizePath(
         this.path
           // DitoViews have nested routes, so don't remove their path.
-          .slice((route.isView ? 0 : route.path.length) + 1)
+          .slice((routeComponent.isView ? 0 : routeComponent.path.length) + 1)
       )
     },
 

package/src/components/DitoSchema.vue

@@ -42,8 +42,6 @@ slot(name="before")
         v-if="clipboard"
         :clipboard="clipboard"
         :schema="schema"
-        :dataPath="dataPath"
-        :data="data"
       )
       slot(name="edit-buttons")
   TransitionHeight(:enabled="inlined")
@@ -189,7 +187,7 @@ export default DitoComponent.component('DitoSchema', {
     },
 
     panelEntries() {
-      return getPanelEntries(this.schema.panels, '')
+      return getPanelEntries(this.schema.panels, this.dataPath)
     },
 
     tabs() {

package/src/mixins/ItemMixin.js

@@ -64,11 +64,11 @@ export default {
 
       let dataPath
       const getDataPath = () =>
-        (dataPath ||= this.getItemDataPath(sourceSchema, index))
+        (dataPath ??= this.getItemDataPath(sourceSchema, index))
 
       let formLabel
       const getFormLabel = () =>
-        (formLabel ||= this.getLabel(
+        (formLabel ??= this.getLabel(
           getItemFormSchema(sourceSchema, item, this.context)
         ))
 

package/src/mixins/ResourceMixin.js

@@ -252,18 +252,21 @@ export default {
         // exposed to further callbacks through DitoContext.
         callback(null, response)
       } catch (error) {
-        // If callback returns true, errors were already handled.
-        const { response } = error
-        if (!callback(error, response)) {
-          const data = response?.data
-          const title = isString(data?.type)
-            ? labelize(data.type)
-            : 'Error'
-          const text = data?.message ?? error
-          this.notify({ type: 'error', title, text })
+        if (error.name !== 'AbortError') {
+          // If callback returns true, errors were already handled.
+          const { response } = error
+          if (!callback(error, response)) {
+            const data = response?.data
+            const title = isString(data?.type)
+              ? labelize(data.type)
+              : 'Error'
+            const text = data?.message ?? error
+            this.notify({ type: 'error', title, text })
+          }
         }
       }
       if (this.abortController === controller) {
+        // Only clear the loading state if this is still the current request.
         this.abortController = null
         this.setLoading(false, loadingOptions)
       }

package/src/types/DitoTypeList.vue

@@ -205,7 +205,7 @@ export default DitoTypeComponent.register('list', {
 
   computed: {
     hasPagination() {
-      return this.paginate && this.total > this.paginate
+      return !!this.paginate
     },
 
     hasListButtons() {

package/src/types/DitoTypeMarkup.vue

@@ -229,7 +229,7 @@ export default DitoTypeComponent.register('markup', {
       if (ignoreWatch) {
         ignoreWatch = false
       } else {
-        this.editor.setContent(value, false, this.parseOptions)
+        this.editor.commands.setContent(value, false, this.parseOptions)
       }
     })
 

package/src/utils/schema.js

@@ -1007,7 +1007,7 @@ export function getPanelEntry(schema, dataPath = null, tabComponent = null) {
 
 export function getPanelEntries(
   panelSchemas,
-  dataPath = null,
+  dataPath,
   tabComponent = null,
   panelEntries = []
 ) {
@@ -1015,7 +1015,7 @@ export function getPanelEntries(
     for (const [key, schema] of Object.entries(panelSchemas)) {
       const entry = getPanelEntry(
         schema,
-        dataPath != null ? appendDataPath(dataPath, key) : null,
+        appendDataPath(dataPath, key),
         tabComponent
       )
       if (entry) {
@@ -1037,7 +1037,7 @@ export function getPanelSchemas(schema) {
 export function getAllPanelEntries(
   api,
   schema,
-  dataPath = null,
+  dataPath,
   component = null,
   tabComponent = null
 ) {