@ditojs/admin 2.99.0 → 2.100.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/admin",
-  "version": "2.99.0",
+  "version": "2.100.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/main/packages/admin",
@@ -40,8 +40,8 @@
     "not ie_mob > 0"
   ],
   "dependencies": {
-    "@ditojs/ui": "^2.99.0",
-    "@ditojs/utils": "^2.99.0"
+    "@ditojs/ui": "^2.100.0",
+    "@ditojs/utils": "^2.100.0"
   },
   "peerDependencies": {
     "@kyvg/vue3-notification": "^3.4.2",
@@ -77,7 +77,7 @@
     "filesize": "^11.0.13",
     "filesize-parser": "^1.5.1",
     "focus-trap": "^8.0.0",
-    "nanoid": "^5.1.6",
+    "nanoid": "^6.0.1",
     "sortablejs": "^1.15.7",
     "tinycolor2": "^1.6.0",
     "tippy.js": "^6.3.7",
@@ -89,9 +89,9 @@
     "vue-upload-component": "^3.1.17"
   },
   "devDependencies": {
-    "@ditojs/build": "^2.99.0",
+    "@ditojs/build": "^2.100.0",
     "typescript": "^6.0.3",
-    "vite": "^8.0.10"
+    "vite": "^8.3.2"
   },
-  "gitHead": "ba1ce26d349a74e8143faa614488182b67416db1"
+  "gitHead": "c6fdbe03971188779fc9cf5f1b4202e08bc75a65"
 }

package/src/components/DitoForm.vue

@@ -66,12 +66,15 @@ export default DitoComponent.component('DitoForm', {
     return {
       createdData: null,
       clonedData: undefined,
-      sourceKey: null,
-      isForm: true
+      sourceKey: null
     }
   },
 
   computed: {
+    isForm() {
+      return true
+    },
+
     verbs() {
       // Add submit / submitted to the verbs returned by ResourceMixin
       // NOTE: These get passed on to children through:
@@ -359,14 +362,6 @@ export default DitoComponent.component('DitoForm', {
       this.setData(null)
     },
 
-    // @override ResourceMixin.shouldApplyLoadedData()
-    shouldApplyLoadedData() {
-      // Drop a GET response if the user has made local edits while the
-      // request was in flight — applying it would wholesale-replace
-      // `loadedData` and silently clobber those edits.
-      return !this.isDirty
-    },
-
     // @override ResourceMixin.setData()
     setData(data) {
       // setData() is called after submit when data has changed.

package/src/mixins/ResourceMixin.js

@@ -160,13 +160,6 @@ export default {
       this.loadedData = null
     },
 
-    // @overridable
-    // Subclasses override this to skip applying response data when local
-    // state would be overwritten — see DitoForm, which checks `isDirty`.
-    shouldApplyLoadedData() {
-      return true
-    },
-
     // @overridable
     setData(data) {
       this.loadedData = data
@@ -224,11 +217,11 @@ export default {
             }
           }
         } else {
-          // Skip applying response data when the consumer (e.g. a dirty
-          // DitoForm) reports it would overwrite local edits made while the
-          // GET was in flight. The 'load' event still fires — the GET *did*
-          // complete; we just chose not to apply it.
-          if (this.shouldApplyLoadedData()) {
+          // Skip applying response data on a dirty form: `setData` would
+          // wholesale-replace `loadedData` and clobber any local edits the
+          // user made while the GET was in flight. The `'load'` event still
+          // fires — the GET *did* complete; we just chose not to apply it.
+          if (!(this.isForm && this.isDirty)) {
             this.setData(response.data)
           }
           this.emitSchemaEvent('load')

package/src/mixins/RouteMixin.js

@@ -64,6 +64,10 @@ export default {
       return this.meta.nested
     },
 
+    isForm() {
+      return false
+    },
+
     isView() {
       return false
     },