Fixed form creation

2023-12-20 16:10:32 +01:00
parent b598a16406
commit af5656ce81
34 changed files with 363 additions and 356 deletions
--- a/client/components/open/forms/components/form-components/AddFormBlock.vue
+++ b/client/components/open/forms/components/form-components/AddFormBlock.vue
@@ -73,7 +73,9 @@ export default {

  setup () {
    const workingFormStore = useWorkingFormStore()
+    const {content: form} = storeToRefs(workingFormStore)
    return {
+      form,
      workingFormStore,
      selectedFieldIndex : computed(() => workingFormStore.selectedFieldIndex)
    }
@@ -171,16 +173,6 @@ export default {
  },

  computed: {
-    form: {
-      get () {
-        return this.workingFormStore.content
-      },
-      /* We add a setter */
-      set (value) {
-        this.workingFormStore.set(value)
-      }
-    },
-
    defaultBlockNames () {
      return {
        text: 'Your name',
@@ -230,6 +222,7 @@ export default {
      }
      newBlock.help_position = 'below_input'
      if (this.selectedFieldIndex === null || this.selectedFieldIndex === undefined) {
+        console.log('------',this.form)
        const newFields = clonedeep(this.form.properties)
        newFields.push(newBlock)
        this.form.properties = newFields
--- a/client/components/open/forms/components/form-components/FormAboutSubmission.vue
+++ b/client/components/open/forms/components/form-components/FormAboutSubmission.vue
@@ -139,7 +139,9 @@ export default {
  props: {},
  setup () {
    const workingFormStore = useWorkingFormStore()
+    const {content: form} = storeToRefs(workingFormStore)
    return {
+      form,
      workingFormStore
    }
  },
--- a/client/components/open/forms/components/form-components/FormCustomCode.vue
+++ b/client/components/open/forms/components/form-components/FormCustomCode.vue
@@ -2,7 +2,9 @@
  <editor-options-panel name="Custom Code" :already-opened="false" :has-pro-tag="true">
    <template #icon>
      <svg class="h-5 w-5" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-        <path d="M14 2.26953V6.40007C14 6.96012 14 7.24015 14.109 7.45406C14.2049 7.64222 14.3578 7.7952 14.546 7.89108C14.7599 8.00007 15.0399 8.00007 15.6 8.00007H19.7305M14 17.5L16.5 15L14 12.5M10 12.5L7.5 15L10 17.5M20 9.98822V17.2C20 18.8802 20 19.7202 19.673 20.362C19.3854 20.9265 18.9265 21.3854 18.362 21.673C17.7202 22 16.8802 22 15.2 22H8.8C7.11984 22 6.27976 22 5.63803 21.673C5.07354 21.3854 4.6146 20.9265 4.32698 20.362C4 19.7202 4 18.8802 4 17.2V6.8C4 5.11984 4 4.27976 4.32698 3.63803C4.6146 3.07354 5.07354 2.6146 5.63803 2.32698C6.27976 2 7.11984 2 8.8 2H12.0118C12.7455 2 13.1124 2 13.4577 2.08289C13.7638 2.15638 14.0564 2.27759 14.3249 2.44208C14.6276 2.6276 14.887 2.88703 15.4059 3.40589L18.5941 6.59411C19.113 7.11297 19.3724 7.3724 19.5579 7.67515C19.7224 7.94356 19.8436 8.2362 19.9171 8.5423C20 8.88757 20 9.25445 20 9.98822Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+        <path
+          d="M14 2.26953V6.40007C14 6.96012 14 7.24015 14.109 7.45406C14.2049 7.64222 14.3578 7.7952 14.546 7.89108C14.7599 8.00007 15.0399 8.00007 15.6 8.00007H19.7305M14 17.5L16.5 15L14 12.5M10 12.5L7.5 15L10 17.5M20 9.98822V17.2C20 18.8802 20 19.7202 19.673 20.362C19.3854 20.9265 18.9265 21.3854 18.362 21.673C17.7202 22 16.8802 22 15.2 22H8.8C7.11984 22 6.27976 22 5.63803 21.673C5.07354 21.3854 4.6146 20.9265 4.32698 20.362C4 19.7202 4 18.8802 4 17.2V6.8C4 5.11984 4 4.27976 4.32698 3.63803C4.6146 3.07354 5.07354 2.6146 5.63803 2.32698C6.27976 2 7.11984 2 8.8 2H12.0118C12.7455 2 13.1124 2 13.4577 2.08289C13.7638 2.15638 14.0564 2.27759 14.3249 2.44208C14.6276 2.6276 14.887 2.88703 15.4059 3.40589L18.5941 6.59411C19.113 7.11297 19.3724 7.3724 19.5579 7.67515C19.7224 7.94356 19.8436 8.2362 19.9171 8.5423C20 8.88757 20 9.25445 20 9.98822Z"
+          stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
      </svg>
    </template>
    <p class="mt-4">
@@ -17,31 +19,30 @@
 </template>

 <script>
-import { useWorkingFormStore } from '../../../../../stores/working_form'
 import EditorOptionsPanel from '../../../editors/EditorOptionsPanel.vue'
-import CodeInput from '../../../../forms/CodeInput.vue'

 export default {
-  components: { EditorOptionsPanel, CodeInput },
+  components: {EditorOptionsPanel},
  props: {},
-  setup () {
+  setup() {
    const workingFormStore = useWorkingFormStore()
+    const {content: form} = storeToRefs(workingFormStore)
    return {
+      form,
      workingFormStore
    }
  },
-  data () {
-    return {
-    }
+  data() {
+    return {}
  },

  computed: {
    form: {
-      get () {
+      get() {
        return this.workingFormStore.content
      },
      /* We add a setter */
-      set (value) {
+      set(value) {
        this.workingFormStore.set(value)
      }
    }
--- a/client/components/open/forms/components/form-components/FormInformation.vue
+++ b/client/components/open/forms/components/form-components/FormInformation.vue
@@ -68,8 +68,6 @@
 <script>
 import { computed } from 'vue'
 import clonedeep from 'clone-deep'
-import { useFormsStore } from '../../../../../stores/forms'
-import { useWorkingFormStore } from '../../../../../stores/working_form'
 import EditorOptionsPanel from '../../../editors/EditorOptionsPanel.vue'
 import SelectInput from '../../../../forms/SelectInput.vue'

@@ -80,10 +78,11 @@ export default {
  setup () {
    const formsStore = useFormsStore()
    const workingFormStore = useWorkingFormStore()
+    const {getAll: forms} = storeToRefs(formsStore)
    return {
+      forms,
      formsStore,
      workingFormStore,
-      forms : computed(() => formsStore.content)
    }
  },

@@ -129,7 +128,7 @@ export default {
      }
    },
    allTagsOptions () {
-      return this.formsStore.getAllTags.map((tagname) => {
+      return this.formsStore.allTags.map((tagname) => {
        return {
          name: tagname,
          value: tagname
--- a/client/components/open/forms/components/form-components/FormNotifications.vue
+++ b/client/components/open/forms/components/form-components/FormNotifications.vue
@@ -44,8 +44,10 @@ export default {
  props: {},
  setup () {
    const workingFormStore = useWorkingFormStore()
+    const {content: form} = storeToRefs(workingFormStore)
    return {
-      workingFormStore
+      workingFormStore,
+      form
    }
  },
  data () {
@@ -54,16 +56,7 @@ export default {
  },

  computed: {
-    form: {
-      get () {
-        return this.workingFormStore.content
-      },
-      /* We add a setter */
-      set (value) {
-        this.workingFormStore.set(value)
-      }
-    },
-    zapierUrl: () => this.$config.links.zapier_integration
+    zapierUrl: () => useConfig().links.zapier_integration
  },

  watch: {
--- a/client/components/open/forms/components/form-components/components/FormNotificationsOption.vue
+++ b/client/components/open/forms/components/form-components/components/FormNotificationsOption.vue
@@ -50,15 +50,15 @@
 </template>

 <script>
-import { useWorkingFormStore } from '../../../../../../stores/working_form'
 import ProTag from '~/components/global/ProTag.vue'

 export default {
  components: { ProTag },
-  props: {},
  setup () {
    const workingFormStore = useWorkingFormStore()
+    const {content: form} = storeToRefs(workingFormStore)
    return {
+      form,
      workingFormStore
    }
  },
@@ -69,17 +69,8 @@ export default {
  },

  computed: {
-    form: {
-      get () {
-        return this.workingFormStore.content
-      },
-      /* We add a setter */
-      set (value) {
-        this.workingFormStore.set(value)
-      }
-    },
    replayToEmailField () {
-      const emailFields = this.form.properties.filter((field) => {
+      const emailFields = this.form.value.properties.filter((field) => {
        return field.type === 'email' && !field.hidden
      })
      if (emailFields.length === 1) return emailFields[0]