@live-change/frontend-auto-form 0.8.122 → 0.8.124

package/front/src/components/form/ArrayInput.vue

@@ -66,7 +66,7 @@
   import Button from "primevue/button";
   import AutoInput from "./AutoInput.vue"
 
-  import { inputs, types } from '../config.js'
+  import { inputs, types } from '../../config.js'
   import { computed, getCurrentInstance, toRefs } from 'vue'
 
   const props = defineProps({

package/front/src/components/form/GroupField.vue

@@ -13,7 +13,7 @@
 
 <script setup>
   import AutoInput from "./AutoInput.vue"
-  import { inputs, types } from "../config.js";
+  import { inputs, types } from '../../config.js'
   import { computed, inject, toRefs, getCurrentInstance } from 'vue'
 
   import { useI18n } from 'vue-i18n'

package/front/src/logic/editorData.js

@@ -29,6 +29,7 @@ export default function editorData(options) {
     onDraftSaved = () => {},
     onDraftDiscarded = () => {},
     onSaveError = () => {},
+    onCreated = (createResult) => {},
 
     toast = useToast(),
     path = usePath(),
@@ -65,7 +66,7 @@ export default function editorData(options) {
     }
   }
   const draftId = idKey ? identifiers[idKey]
-    : identifiersNames.map(identifier => draftIdParts.map(key => JSON.stringify(identifier[key])).join('_'))
+    : draftIdParts.map(key => JSON.stringify(identifiers[key])).join('_')
 
   const draftIdentifiers = {
     actionType: serviceName, action: crudMethods.read, targetType: modelName, target: draftId
@@ -103,7 +104,9 @@ export default function editorData(options) {
           if(savedData.value) {
             return updateAction(data)
           } else {
-            return createAction(data)
+            const createResult = await createAction(data)
+            await onCreated(createResult)
+            return createResult
           }
         } finally {
           saving.value = false
@@ -149,6 +152,7 @@ export default function editorData(options) {
         await saveData()
         if(draftData.value) await removeDraftAction(draftIdentifiers)
         onSaved()
+        if(toast && savedToast) toast.add({ severity: 'success', summary: savedToast, life: 1500 })
       }
 
       async function discardDraft() {
@@ -183,7 +187,7 @@ export default function editorData(options) {
         debounce,
         onSave: () => {
           onSaved()
-          if(toast && savedDraftToast) toast.add({ severity: 'info', summary: savedDraftToast, life: 1500 })
+          if(toast && savedToast) toast.add({ severity: 'success', summary: savedToast, life: 1500 })
         },
         onSaveError(e) {
           console.error("SAVE ERROR", e)

package/front/src/pages/Editor.vue

@@ -0,0 +1,85 @@
+<template>
+  <div class="w-full lg:w-8 md:w-11">
+    <div class="surface-card p-3 shadow-1 border-round">
+      <div class="text-xl mb-2">
+        Service <strong>{{ serviceName }} model {{ modelName }}</strong>
+      </div>
+
+      <h4>identifiers as object</h4>
+      <pre>{{ identifiersObject }}</pre>
+
+      <h4>definition</h4>
+      <pre>{{ modelDefinition }}</pre>
+
+    </div>
+  </div>
+</template>
+
+<script setup>
+
+  import { ref, computed, onMounted, defineProps, toRefs } from 'vue'
+
+  const props = defineProps({
+    serviceName: {
+      type: String,
+      required: true,
+    },
+    modelName: {
+      type: String,
+      required: true,
+    },
+    identifiers: {
+      type: Array,
+      default: []
+    }
+  })
+  const { serviceName, modelName, identifiers } = toRefs(props)
+
+  import { useApi, usePath, live } from '@live-change/vue3-ssr'
+  const api = useApi()
+  const path = usePath()
+
+  const modelDefinition = computed(() => {
+    const service = api.services[serviceName.value]
+    if(!service) return null
+    const model = service.models[modelName.value]
+    if(!model) return null
+    return model
+  })
+
+  const identifiersObject = computed(() => {
+    const result = {}
+    for(const [i, identifier] of Object.entries(identifiers.value)) {
+      const identifierDefinition = modelDefinition.value.identifiers[i]
+      if(typeof identifierDefinition === 'string') {
+        result[identifierDefinition] = identifier
+      } else {
+        result[Object.keys(identifierDefinition)[0]] = identifier
+      }
+    }
+    return result
+  })
+
+
+  import { editorData } from "@live-change/frontend-auto-form"
+
+  /*const treeSettings = computedAsync(async () => {
+    const ed = await editorData({
+      service: serviceName,
+      model: modelName,
+      identifiers: { file: tree.value },
+      draft: true,
+      onCreated() {
+        console.log("CREATED")
+        // TODO: change route - add identifiers
+      },
+    })
+    console.log("ED", ed)
+    return ed
+  })*/
+
+</script>
+
+<style scoped>
+
+</style>

package/front/src/pages/List.vue

@@ -0,0 +1,40 @@
+<template>
+  <div class="w-full lg:w-8 md:w-11">
+    <div class="surface-card p-3 shadow-1 border-round">
+      List
+    </div>
+  </div>
+</template>
+
+<script setup>
+
+  import { ref, computed, onMounted, defineProps, toRefs } from 'vue'
+
+  const props = defineProps({
+    serviceName: {
+      type: String,
+      required: true,
+    },
+    modelName: {
+      type: String,
+      required: true,
+    },
+    identifiers: {
+      type: Array,
+      default: []
+    }
+  })
+  const { serviceName } = toRefs(props)
+
+  import { useApi, usePath, live } from '@live-change/vue3-ssr'
+  const api = useApi()
+  const path = usePath()
+
+
+
+
+</script>
+
+<style scoped>
+
+</style>

package/front/src/pages/Models.vue

@@ -18,13 +18,13 @@
           </div>
           <div>
             <Button icon="pi pi-list" severity="primary" label="List" class="mr-2" />
-            <Button icon="pi pi-plus" severity="warning" :label="'Create new '+model.name" />
+            <router-link :to="createRoute(serviceWithModels.name, model)" class="no-underline">
+              <Button icon="pi pi-plus" severity="warning" :label="'Create new '+model.name" />
+            </router-link>
           </div>
         </div>
       </div>
     </div>
-
-
   </div>
 </template>
 
@@ -69,6 +69,16 @@
     return results
   })
 
+  function createRoute(serviceName, model) {
+    return {
+      name: 'auto-form:editor',
+      params: {
+        serviceName,
+        modelName: model.name
+      }
+    }
+  }
+
 </script>
 
 <style scoped>

package/front/src/router.js

@@ -8,6 +8,12 @@ export function autoFormRoutes(config = {}) {
       props: true
     }),
 
+    route({
+      name: 'auto-form:editor', path: prefix + '/editor/:serviceName/:modelName/:identifiers*', meta: { },
+      component: () => import("./pages/Editor.vue"),
+      props: true
+    }),
+
   ]
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/frontend-auto-form",
-  "version": "0.8.122",
+  "version": "0.8.124",
   "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.5.2",
-    "@live-change/cli": "^0.8.122",
-    "@live-change/dao": "^0.8.122",
-    "@live-change/dao-vue3": "^0.8.122",
-    "@live-change/dao-websocket": "^0.8.122",
-    "@live-change/framework": "^0.8.122",
-    "@live-change/image-frontend": "^0.8.122",
-    "@live-change/image-service": "^0.8.122",
-    "@live-change/session-service": "^0.8.122",
-    "@live-change/vue3-components": "^0.8.122",
-    "@live-change/vue3-ssr": "^0.8.122",
+    "@live-change/cli": "^0.8.124",
+    "@live-change/dao": "^0.8.124",
+    "@live-change/dao-vue3": "^0.8.124",
+    "@live-change/dao-websocket": "^0.8.124",
+    "@live-change/framework": "^0.8.124",
+    "@live-change/image-frontend": "^0.8.124",
+    "@live-change/image-service": "^0.8.124",
+    "@live-change/session-service": "^0.8.124",
+    "@live-change/vue3-components": "^0.8.124",
+    "@live-change/vue3-ssr": "^0.8.124",
     "@vueuse/core": "^10.11.0",
     "codeceptjs-assert": "^0.0.5",
     "compression": "^1.7.4",
@@ -52,7 +52,7 @@
     "vue3-scroll-border": "0.1.6"
   },
   "devDependencies": {
-    "@live-change/codeceptjs-helper": "^0.8.122",
+    "@live-change/codeceptjs-helper": "^0.8.124",
     "codeceptjs": "^3.6.5",
     "generate-password": "1.7.1",
     "playwright": "^1.41.2",
@@ -63,5 +63,5 @@
   "author": "Michał Łaszczewski <michal@laszczewski.pl>",
   "license": "ISC",
   "description": "",
-  "gitHead": "3d1935bdc16579c96f009d49f1e9aa70a7697c71"
+  "gitHead": "837e7729f4cbd909d6c7ae32189c562b39cc3122"
 }