@live-change/frontend-auto-form 0.9.199 → 0.9.200

package/front/src/components/crud/AutoObjectIdentification.vue

@@ -98,7 +98,7 @@
       params: {
         serviceName: service.value,
         modelName: model.value,
-        id: objectData.value?.to ?? objectData.value?.id
+        id: objectData.value?.to ?? objectData.value?.id ?? object.value
       }
     }
   })

package/front/src/components/crud/InjectedObjectIndentification.vue

@@ -115,7 +115,7 @@
       params: {
         serviceName: service.value,
         modelName: model.value,
-        id: objectData.value?.to ?? objectData.value?.id
+        id: objectData.value?.to ?? objectData.value?.id ?? object.value
       }
     }
   })

package/front/src/components/crud/ObjectPath.vue

@@ -6,7 +6,7 @@
     <pre>selectedPaths = {{ selectedPaths }}</pre>
     <pre>selectedPathWithElements = {{ selectedPathWithElements }}</pre> -->
     <div v-for="path in selectedPathsWithElements" :key="path">
-      <Breadcrumb :model="more ? [...path, 'dupa'] : path"
+      <Breadcrumb :model="more ? [...path, ...pathObjects, 'placeholder'] : [...path, ...pathObjects]"
        :pt="{      
         list: {
           class: 'text-sm flex flex-row flex-wrap gap-2 first:negative-margin-left pl-[1.5rem]'
@@ -46,9 +46,13 @@
     more: {
       type: Boolean,
       default: false
+    },
+    pathObjects: {
+      type: Array,
+      default: () => []
     }
   })
-  const { objectType, object, more } = toRefs(props)
+  const { objectType, object, more, pathObjects } = toRefs(props)
 
   import { usePath, live } from '@live-change/vue3-ssr'
   const path = usePath()
@@ -87,7 +91,7 @@
       } else {
         elements.push({ objectType, object, propertyFrom: propertyName })
       }
-    }   
+    }
     return elements
   }
 
@@ -114,13 +118,13 @@
     live(pathsPath)
   ])
 
-  const selectedPaths = computed(() => {
-    return objectPathConfig.scopeSelector(paths.value)
-  })
+  const selectedPaths = computed(() => objectPathConfig.scopeSelector(paths.value))
 
-  const selectedPathsWithElements = computed(
-    () => selectedPaths.value.map(scopePath => objectPathConfig.pathElements(scopePath))
-  )
+  const selectedPathsWithElements = computed(() => {
+    const result = selectedPaths.value.map(scopePath => objectPathConfig.pathElements(scopePath))
+    if(result.length == 0) return [[{objectType: objectType.value, object: object.value}]]
+    return result
+  })
 
 
 

package/front/src/logic/actionData.js

@@ -194,6 +194,7 @@ export default async function actionData(options) {
       mergedInitialValue,
       editableProperties,
       value: synchronizedData.value,
+      data: synchronizedData.value,
       changed,
       submit,
       submitting,
@@ -231,6 +232,7 @@ export default async function actionData(options) {
       initialValue,
       editableProperties,
       value: formData,
+      data: formData,
       changed,
       submit,
       submitting,

package/front/src/logic/editorData.js

@@ -211,7 +211,7 @@ export default function editorData(options) {
 
       const propertiesErrors = computed(() => propertiesValidationErrors(
         synchronizedData.value.value, identifiers, model, lastUploadedData.value,
-         propertiesServerErrors.value, appContext))
+        propertiesServerErrors.value, appContext, editableProperties))
 
       async function save() {
         const saveResult = await saveData(synchronizedData.value.value)
@@ -242,6 +242,7 @@ export default function editorData(options) {
       return {
         identifiers,
         value: synchronizedData.value,
+        data: synchronizedData.value,
         changed,
         save,
         saving,
@@ -257,6 +258,8 @@ export default function editorData(options) {
         saved: savedData,
         savedPath: savedDataPath,
         editableSavedData,
+        editableDraftData,
+        defaultData: defaultData(model),
         draft: draftData,
         sourceChanged /// needed for draft discard on concurrent save
       }
@@ -283,7 +286,7 @@ export default function editorData(options) {
 
       const propertiesErrors = computed(() => propertiesValidationErrors(
         synchronizedData.value.value, identifiers, model, lastUploadedData.value,
-         propertiesServerErrors.value, appContext))
+         propertiesServerErrors.value, appContext, editableProperties))
 
       async function reset() {
         synchronizedData.value.value = editableSavedData.value || deepmerge(defaultData(model), initialData)
@@ -294,11 +297,15 @@ export default function editorData(options) {
       return {
         identifiers,
         value: synchronizedData.value,
+        data: synchronizedData.value,
         changed: synchronizedData.changed,
         save: synchronizedData.save,
         saving: synchronizedData.saving,
         saved: savedData,
         savedPath: savedDataPath,
+        editableProperties,
+        editableSavedData,
+        defaultData: defaultData(model),
         isNew,
         propertiesErrors,
         reset,

package/front/src/logic/validation.js

@@ -1,6 +1,6 @@
 import { validateData } from "@live-change/vue3-components"
 
-export function propertiesValidationErrors(rootValue, parameters, definition, lastData, propertiesServerErrors, appContext) {
+export function propertiesValidationErrors(rootValue, parameters, definition, lastData, propertiesServerErrors, appContext, validatedProperties) {  
   const currentValue = {
     ...parameters,
     ...rootValue,
@@ -10,10 +10,10 @@ export function propertiesValidationErrors(rootValue, parameters, definition, la
     lastData, propertiesServerErrors, appContext) */
 
   const validationResult = validateData(definition, currentValue, 'validation', appContext,
-    '', rootValue, true)
+    '', rootValue, true, validatedProperties)
 
   const softValidationResult = validateData(definition, currentValue, 'softValidation', appContext,
-    '', rootValue, true)
+    '', rootValue, true, validatedProperties)
 
   const serverValidationResult = {}
   if(propertiesServerErrors) {

package/front/src/logic/viewData.js

@@ -28,7 +28,9 @@ export default async function viewData(options) {
 
   const savedDataPath = path[serviceName][crudMethods.read]({ 
     [modelName[0].toLowerCase() + modelName.slice(1)]: id
-   })
+  })
+
+  console.log("SAVED DATA PATH", savedDataPath)
 
   let data
   let error

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/frontend-auto-form",
-  "version": "0.9.199",
+  "version": "0.9.200",
   "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.199",
-    "@live-change/dao": "^0.9.199",
-    "@live-change/dao-vue3": "^0.9.199",
-    "@live-change/dao-websocket": "^0.9.199",
-    "@live-change/framework": "^0.9.199",
-    "@live-change/image-frontend": "^0.9.199",
-    "@live-change/image-service": "^0.9.199",
-    "@live-change/session-service": "^0.9.199",
-    "@live-change/vue3-components": "^0.9.199",
-    "@live-change/vue3-ssr": "^0.9.199",
+    "@live-change/cli": "^0.9.200",
+    "@live-change/dao": "^0.9.200",
+    "@live-change/dao-vue3": "^0.9.200",
+    "@live-change/dao-websocket": "^0.9.200",
+    "@live-change/framework": "^0.9.200",
+    "@live-change/image-frontend": "^0.9.200",
+    "@live-change/image-service": "^0.9.200",
+    "@live-change/session-service": "^0.9.200",
+    "@live-change/vue3-components": "^0.9.200",
+    "@live-change/vue3-ssr": "^0.9.200",
     "@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.199",
+    "@live-change/codeceptjs-helper": "^0.9.200",
     "codeceptjs": "^3.7.6",
     "generate-password": "1.7.1",
     "playwright": "1.49.1",
@@ -63,5 +63,5 @@
   "author": "Michał Łaszczewski <michal@laszczewski.pl>",
   "license": "ISC",
   "description": "",
-  "gitHead": "1900043a10cf9ad49b9cc33a539fb973706de962"
+  "gitHead": "a509834e600a546297faa7d1534b6f52e66d2e66"
 }