@live-change/frontend-auto-form 0.9.105 → 0.9.107

package/front/src/components/view/AutoView.vue

@@ -39,7 +39,7 @@
     }
   })
 
-  const { value, definition, propName, rootValue, visibleProperties } = toRefs(props)
+  const { value, definition, propName, rootValue, visibleProperties, i18n } = toRefs(props)
 
   const definitionIf = computed(() => {
     if(definition.value?.if) {

package/front/src/components/view/AutoViewField.vue

@@ -45,7 +45,7 @@
     }
   })
 
-  const { value, definition, propName, rootValue, label, name } = toRefs(props)
+  const { value, definition, propName, rootValue, label, name, i18n } = toRefs(props)
 
   const definitionIf = computed(() => {
     if(definition.value?.if) {

package/front/src/logic/editorData.js

@@ -43,7 +43,7 @@ export default function editorData(options) {
     toast = useToast(options.appContext || getCurrentInstance().appContext),
     path = usePath(options.appContext || getCurrentInstance().appContext),
     api = useApi(options.appContext || getCurrentInstance().appContext),
-    workingZone = inject('workingZone', options.appContext || getCurrentInstance().appContext),
+    workingZone = inject('workingZone'),
 
   } = options
 
@@ -72,7 +72,6 @@ export default function editorData(options) {
       draftIdParts.push(identifier)
     }
   }
-  const isNew = (idKey ? (!identifiers[idKey]) : (!draftIdParts.every(key => identifiers[key])))
   let draftId = (idKey ? identifiers[idKey]
     : draftIdParts.map(key => JSON.stringify(identifiers[key])).join('_')) ?? 'new'
   if(draftId.length > 16) {
@@ -82,7 +81,7 @@ export default function editorData(options) {
     actionType: serviceName, action: crudMethods.read, targetType: modelName, target: draftId
   }
 
-  const savedDataPath = isNew ? null : path[serviceName][crudMethods.read](identifiers)
+  const savedDataPath = Object.keys(identifiers).length > 0 ? path[serviceName][crudMethods.read](identifiers) : null
   const draftDataPath = (draft && path.draft.myDraft(draftIdentifiers)) || null
 
   const updateAction = api.actions[serviceName][crudMethods.update]
@@ -90,8 +89,6 @@ export default function editorData(options) {
   if(!updateAction && !createOrUpdateAction)
     throw new Error('update or createOrUpdate action must be defined in model or options')
   const createAction = api.actions[serviceName][crudMethods.create]
-  if(isNew && !createAction && !createOrUpdateAction)
-    throw new Error('create action must be defined in model or options')
   const createOrUpdateDraftAction = draft && api.actions.draft.setOrUpdateMyDraft
   const removeDraftAction = draft && api.actions.draft.resetMyDraft
 
@@ -99,6 +96,13 @@ export default function editorData(options) {
     live(savedDataPath), live(draftDataPath)
   ]).then(([savedData, draftData]) => {
 
+    const isNew = computed(() => !savedData.value)
+    watch(isNew, (newVal) => {
+      console.log("IS NEW", newVal)
+      if(newVal && !createAction && !createOrUpdateAction)
+        console.error('create action must be defined in model or options')
+    })
+
     const editableSavedData = computed(() => savedData.value && Object.fromEntries(
       editableProperties.map(prop => [prop, savedData.value[prop]])
         .concat([[timeField, savedData.value[timeField]]])
@@ -177,11 +181,11 @@ export default function editorData(options) {
         }
       })
       const changed = computed(() =>
-        JSON.stringify(editableSavedData.value ?? {})
+        JSON.stringify({ ...(editableSavedData.value ?? {}), [timeField]: undefined })
            !== JSON.stringify({ ...synchronizedData.value.value, [timeField]: undefined })
       )
       const sourceChanged = computed(() =>
-        JSON.stringify(draftData.value.from) 
+        JSON.stringify({ ...(draftData.value.from ?? {}), [timeField]: undefined })
           !== JSON.stringify({ ...synchronizedData.value.value, [timeField]: undefined })
       )
 
@@ -226,11 +230,13 @@ export default function editorData(options) {
         model,
         isNew,
         propertiesErrors,
+        source,
         draftChanged: synchronizedData.changed,
         saveDraft: synchronizedData.save,
         savingDraft: synchronizedData.saving,
         saved: savedData,
         savedPath: savedDataPath,
+        editableSavedData,
         draft: draftData,
         sourceChanged /// needed for draft discard on concurrent save
       }
@@ -273,6 +279,7 @@ export default function editorData(options) {
         saving: synchronizedData.saving,
         saved: savedData,
         savedPath: savedDataPath,
+        isNew,
         propertiesErrors,
         reset,
         model,

package/front/src/logic/schema.js

@@ -26,6 +26,7 @@ function addSchema(schemas, schema) {
 }
 
 export function schemaFromDefinition(definition, data, type, appContext = getCurrentInstance().appContext) {
+  if(!definition) throw new Error("Definition is required")
   if(!type) type = definition.type
   if(type === 'Object') {
     const properties = Object.fromEntries(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/frontend-auto-form",
-  "version": "0.9.105",
+  "version": "0.9.107",
   "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.105",
-    "@live-change/dao": "^0.9.105",
-    "@live-change/dao-vue3": "^0.9.105",
-    "@live-change/dao-websocket": "^0.9.105",
-    "@live-change/framework": "^0.9.105",
-    "@live-change/image-frontend": "^0.9.105",
-    "@live-change/image-service": "^0.9.105",
-    "@live-change/session-service": "^0.9.105",
-    "@live-change/vue3-components": "^0.9.105",
-    "@live-change/vue3-ssr": "^0.9.105",
+    "@live-change/cli": "^0.9.107",
+    "@live-change/dao": "^0.9.107",
+    "@live-change/dao-vue3": "^0.9.107",
+    "@live-change/dao-websocket": "^0.9.107",
+    "@live-change/framework": "^0.9.107",
+    "@live-change/image-frontend": "^0.9.107",
+    "@live-change/image-service": "^0.9.107",
+    "@live-change/session-service": "^0.9.107",
+    "@live-change/vue3-components": "^0.9.107",
+    "@live-change/vue3-ssr": "^0.9.107",
     "@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.105",
+    "@live-change/codeceptjs-helper": "^0.9.107",
     "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": "e96d52126ea0b5af39ecf6d4ea5120c0ec58346d"
+  "gitHead": "c546be0c12841aa8eca060d4c53d6d89bac2d088"
 }