@live-change/frontend-auto-form 0.9.169 → 0.9.173

package/front/src/logic/editorData.js

@@ -3,6 +3,8 @@ import { usePath, live, useApi } from '@live-change/vue3-ssr'
 import { ref, computed, inject, watch, getCurrentInstance } from 'vue'
 import { synchronized, defaultData } from '@live-change/vue3-components'
 
+import deepmerge from 'deepmerge';
+
 import { propertiesValidationErrors } from './validation.js'
 
 import { cyrb128 } from './utils.js'
@@ -37,7 +39,6 @@ export default function editorData(options) {
     onSaveError = () => {},
     onCreated = (createResult) => {},
 
-
     appContext = getCurrentInstance().appContext,
 
     toast = useToast(options.appContext || getCurrentInstance().appContext),
@@ -45,6 +46,7 @@ export default function editorData(options) {
     api = useApi(options.appContext || getCurrentInstance().appContext),
     workingZone = inject('workingZone'),
 
+    initialData = {},
   } = options
 
   if(!identifiers) throw new Error('identifiers must be defined')
@@ -55,7 +57,7 @@ export default function editorData(options) {
   const {
     crudMethods = model.crud,
     identifiersNames = model.identifiers,
-    editableProperties = model.editableProperties ?? Object.keys(model.properties)
+    editableProperties = model.editableProperties ?? Object.keys(model.properties),
   } = options
 
   if(!crudMethods) throw new Error('crud methods must be defined in model or options')
@@ -67,13 +69,17 @@ export default function editorData(options) {
   for(const identifier of identifiersNames) {
     if(typeof identifier === 'object') {
       if(identifier.field === 'id') idKey = identifier.name
-      draftIdParts.push('id')
+      draftIdParts.push(identifier.field)
     } else {
       draftIdParts.push(identifier)
     }
   }
-  let draftId = (idKey ? identifiers[idKey]
-    : draftIdParts.map(key => JSON.stringify(identifiers[key])).join('_')) ?? 'new'
+  let draftId = options.draftId || (
+    idKey 
+      ? (identifiers[idKey])
+      : (draftIdParts.map(key => JSON.stringify(identifiers[key])).join('_'))
+    )
+  if(!draftId) draftId = 'new'    
   if(draftId.length > 16) {
     draftId = cyrb128(draftId).slice(0, 16)
   }
@@ -111,7 +117,7 @@ export default function editorData(options) {
       editableProperties.map(prop => [prop, draftData.value.data[prop]])
         .concat([[timeField, draftData.value.data[timeField]]])
     ))
-    const source = computed(() => editableDraftData.value || editableSavedData.value || defaultData(model))
+    const source = computed(() => editableDraftData.value || editableSavedData.value || deepmerge(defaultData(model), initialData))
 
     const propertiesServerErrors = ref({})
     const lastUploadedData = ref(null)
@@ -214,7 +220,7 @@ export default function editorData(options) {
         if(workingZone)
           workingZone.addPromise('discardDraft:'+serviceName+':'+modelName, discardPromise)
         await discardPromise
-        synchronizedData.value.value = editableSavedData.value || defaultData(model)
+        synchronizedData.value.value = editableSavedData.value || deepmerge(defaultData(model), initialData)
         if(toast && discardedDraftToast) toast.add({ severity: 'info', summary: resetToast, life: 1500 })
         onReset()
       }
@@ -266,7 +272,7 @@ export default function editorData(options) {
          propertiesServerErrors.value, appContext))
 
       async function reset() {
-        synchronizedData.value.value = editableSavedData.value || defaultData(model)
+        synchronizedData.value.value = editableSavedData.value || deepmerge(defaultData(model), initialData)
         if(toast && discardedDraftToast) toast.add({ severity: 'info', summary: resetToast, life: 1500 })
         onReset()
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/frontend-auto-form",
-  "version": "0.9.169",
+  "version": "0.9.173",
   "scripts": {
     "memDev": "node server/start.js memDev --enableSessions --initScript ./init.js --dbAccess",
     "localDevInit": "rm tmp.db; lcli localDev --enableSessions --initScript ./init.js",
@@ -22,16 +22,16 @@
   "type": "module",
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.7.2",
-    "@live-change/cli": "^0.9.169",
-    "@live-change/dao": "^0.9.169",
-    "@live-change/dao-vue3": "^0.9.169",
-    "@live-change/dao-websocket": "^0.9.169",
-    "@live-change/framework": "^0.9.169",
-    "@live-change/image-frontend": "^0.9.169",
-    "@live-change/image-service": "^0.9.169",
-    "@live-change/session-service": "^0.9.169",
-    "@live-change/vue3-components": "^0.9.169",
-    "@live-change/vue3-ssr": "^0.9.169",
+    "@live-change/cli": "^0.9.173",
+    "@live-change/dao": "^0.9.173",
+    "@live-change/dao-vue3": "^0.9.173",
+    "@live-change/dao-websocket": "^0.9.173",
+    "@live-change/framework": "^0.9.173",
+    "@live-change/image-frontend": "^0.9.173",
+    "@live-change/image-service": "^0.9.173",
+    "@live-change/session-service": "^0.9.173",
+    "@live-change/vue3-components": "^0.9.173",
+    "@live-change/vue3-ssr": "^0.9.173",
     "@vueuse/core": "^12.3.0",
     "codeceptjs-assert": "^0.0.5",
     "compression": "^1.7.5",
@@ -52,7 +52,7 @@
     "vue3-scroll-border": "0.1.7"
   },
   "devDependencies": {
-    "@live-change/codeceptjs-helper": "^0.9.169",
+    "@live-change/codeceptjs-helper": "^0.9.173",
     "codeceptjs": "^3.6.10",
     "generate-password": "1.7.1",
     "playwright": "1.49.1",
@@ -63,5 +63,5 @@
   "author": "Michał Łaszczewski <michal@laszczewski.pl>",
   "license": "ISC",
   "description": "",
-  "gitHead": "6801ab3c35069e825eaef646ede6c6cfaf566bcf"
+  "gitHead": "1d70f7baf204d8f9848f53f5023db91016c6093f"
 }