database/migrations/2024_04_09_233540_add_hint_field.php

@@ -1,7 +1,10 @@
 <?php
 
+use App\Form\Models\Form;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {

database/migrations/2024_07_14_174642_create_formtemplates_mail_columns.php

@@ -14,6 +14,12 @@ return new class extends Migration
      */
     public function up()
     {
+        Schema::table('forms', function (Blueprint $table) {
+            $table->json('description')->default($this->default())->change();
+            $table->json('mail_top')->default($this->default())->nullable(false)->change();
+            $table->json('mail_bottom')->default($this->default())->nullable(false)->change();
+        });
+
         foreach (DB::table('forms')->get() as $form) {
             $mailTop = json_decode($form->mail_top, true);
             if (!$mailTop || !count($mailTop)) {
@@ -28,12 +34,6 @@ return new class extends Migration
                 DB::table('forms')->where('id', $form->id)->update(['description' => $this->default()]);
             }
         }
-
-        Schema::table('forms', function (Blueprint $table) {
-            $table->json('description')->default($this->default())->change();
-            $table->json('mail_top')->default($this->default())->nullable(false)->change();
-            $table->json('mail_bottom')->default($this->default())->nullable(false)->change();
-        });
     }
 
     /**

resources/js/views/form/Conditions.vue

@@ -53,8 +53,8 @@
     </div>
 </template>
 
-<script setup>
+<script lang="js" setup>
-import {ref, inject, computed} from 'vue';
+import { ref, inject, computed } from 'vue';
 const axios = inject('axios');
 const emit = defineEmits(['update:modelValue']);
 
@@ -70,19 +70,19 @@ const props = defineProps({
     id: {
         required: true,
         type: String,
-    },
+    }
 });
 
 const comparatorOptions = ref([
-    {id: 'isEqual', name: 'ist gleich', defaultValue: {DropdownField: null, RadioField: null, CheckboxField: false}},
+    { id: 'isEqual', name: 'ist gleich', defaultValue: { DropdownField: null, RadioField: null, CheckboxField: false } },
-    {id: 'isNotEqual', name: 'ist ungleich', defaultValue: {DropdownField: null, RadioField: null, CheckboxField: false}},
+    { id: 'isNotEqual', name: 'ist ungleich', defaultValue: { DropdownField: null, RadioField: null, CheckboxField: false } },
-    {id: 'isIn', name: 'ist in', defaultValue: {DropdownField: [], RadioField: [], CheckboxField: false}},
+    { id: 'isIn', name: 'ist in', defaultValue: { DropdownField: [], RadioField: [], CheckboxField: false } },
-    {id: 'isNotIn', name: 'ist nicht in', defaultValue: {DropdownField: [], RadioField: [], CheckboxField: false}},
+    { id: 'isNotIn', name: 'ist nicht in', defaultValue: { DropdownField: [], RadioField: [], CheckboxField: false } },
 ]);
 
 const modeOptions = ref([
-    {id: 'all', name: 'alle Bedingungen müssen zutreffen'},
+    { id: 'all', name: 'alle Bedingungen müssen zutreffen' },
-    {id: 'any', name: 'mindestens eine Bedingung muss zutreffen'},
+    { id: 'any', name: 'mindestens eine Bedingung muss zutreffen' },
 ]);
 
 const fields = computed(() => {
@@ -133,39 +133,34 @@ function getField(fieldName) {
 
 function getOptions(fieldName) {
     return getField(fieldName).options.map((o) => {
-        return {id: o, name: o};
+        return { id: o, name: o };
     });
 }
 
 const fieldOptions = computed(() =>
     fields.value.map((field) => {
-        return {id: field.key, name: field.name};
+        return { id: field.key, name: field.name };
     })
 );
 
 function addCondition() {
-    emit('update:modelValue', {
+    emit('update:modelValue', {...props.modelValue, ifs: [
-        ...props.modelValue,
+        ...props.modelValue.ifs,
-        ifs: [
+        {
-            ...props.modelValue.ifs,
+            field: null,
-            {
+            comparator: null,
-                field: null,
+            value: null,
-                comparator: null,
+        }
-                value: null,
+    ]});
-            },
-        ],
-    });
 }
 
 const locked = ref(false);
 
 async function checkIfDirty() {
-    const response = await axios.post(props.single.links.is_dirty, {config: props.single.config});
+    const response = await axios.post(props.single.links.is_dirty, { config: props.single.config });
 
     locked.value = response.data.result;
 }
 
-if (props.single.links && props.single.links.is_dirty) {
+checkIfDirty();
-    checkIfDirty();
-}
 </script>

resources/js/views/form/Index.vue

@@ -228,8 +228,6 @@ const allFields = computed(() => {
 function setTemplate(template) {
     active.value = 0;
     single.value.config = template.config;
-    single.value.mail_top = template.mail_top;
-    single.value.mail_bottom = template.mail_bottom;
 }
 
 async function saveFileConditions(conditions) {

tests/EndToEnd/Form/FormIndexActionTest.php

@@ -19,6 +19,7 @@ class FormIndexActionTest extends FormTestCase
     {
         Carbon::setTestNow(Carbon::parse('2023-03-03'));
         $this->login()->loginNami()->withoutExceptionHandling();
+        Formtemplate::factory()->name('tname')->sections([FormtemplateSectionRequest::new()->name('sname')])->create();
         $form = Form::factory()
             ->name('lala')
             ->excerpt('fff')
@@ -57,6 +58,8 @@ class FormIndexActionTest extends FormTestCase
             ->assertInertiaPath('data.data.0.links.export', route('form.export', ['form' => $form]))
             ->assertInertiaPath('data.meta.links.store', route('form.store'))
             ->assertInertiaPath('data.meta.links.formtemplate_index', route('formtemplate.index'))
+            ->assertInertiaPath('data.meta.templates.0.name', 'tname')
+            ->assertInertiaPath('data.meta.templates.0.config.sections.0.name', 'sname')
             ->assertInertiaPath('data.meta.default.name', '')
             ->assertInertiaPath('data.meta.default.prevention_conditions', ['mode' => 'all', 'ifs' => []])
             ->assertInertiaPath('data.meta.default.prevention_text.version', '1.0')
@@ -73,27 +76,6 @@ class FormIndexActionTest extends FormTestCase
             ->assertInertiaPath('data.meta.section_default.name', '');
     }
 
-    public function testFormtemplatesHaveData(): void
-    {
-        $this->login()->loginNami()->withoutExceptionHandling();
-        Formtemplate::factory()->name('tname')->sections([FormtemplateSectionRequest::new()->name('sname')->fields([
-            $this->textField('vorname')
-        ])])
-            ->mailTop(EditorRequestFactory::new()->text(10, 'lala'))
-            ->mailBottom(EditorRequestFactory::new()->text(10, 'lalb'))
-            ->create();
-
-        sleep(1);
-        $this->get(route('form.index'))
-            ->assertOk()
-            ->assertInertiaPath('data.meta.templates.0.name', 'tname')
-            ->assertInertiaPath('data.meta.templates.0.name', 'tname')
-            ->assertInertiaPath('data.meta.templates.0.config.sections.0.name', 'sname')
-            ->assertInertiaPath('data.meta.templates.0.config.sections.0.fields.0.key', 'vorname')
-            ->assertInertiaPath('data.meta.templates.0.mail_top.blocks.0.data.text', 'lala')
-            ->assertInertiaPath('data.meta.templates.0.mail_bottom.blocks.0.data.text', 'lalb');
-    }
-
     public function testItDisplaysExport(): void
     {
         $this->login()->loginNami()->withoutExceptionHandling();