app/Form/Actions/FormStoreAction.php

@@ -36,7 +36,6 @@ class FormStoreAction
             'is_private' => 'boolean',
             'export' => 'nullable|array',
             'needs_prevention' => 'present|boolean',
-            'prevention_text' => 'array',
         ];
     }
 

app/Form/Actions/FormUpdateAction.php

@@ -35,7 +35,6 @@ class FormUpdateAction
             'is_private' => 'boolean',
             'export' => 'nullable|array',
             'needs_prevention' => 'present|boolean',
-            'prevention_text' => 'array',
         ];
     }
 

app/Form/Actions/PreventionRememberAction.php

@@ -28,8 +28,7 @@ class PreventionRememberAction
             }
 
             $body = app(PreventionSettings::class)->formmail
-                ->placeholder('formname', $participant->form->name)
+                ->placeholder('formname', $participant->form->name);
-                ->append($participant->form->prevention_text);
 
             if ($participant->getFields()->getMailRecipient() === null) {
                 continue;

app/Form/Models/Form.php

@@ -5,7 +5,6 @@ namespace App\Form\Models;
 use App\Form\Data\ExportData;
 use App\Form\Data\FieldCollection;
 use App\Form\Data\FormConfigData;
-use App\Lib\Editor\EditorData;
 use Cviebrock\EloquentSluggable\Sluggable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -38,7 +37,6 @@ class Form extends Model implements HasMedia
         'is_private' => 'boolean',
         'export' => ExportData::class,
         'needs_prevention' => 'boolean',
-        'prevention_text' => EditorData::class,
     ];
 
     /** @var array<int, string> */

app/Form/Resources/FormResource.php

@@ -11,7 +11,6 @@ use App\Form\Scopes\FormFilterScope;
 use App\Form\Models\Form;
 use App\Form\Models\Formtemplate;
 use App\Group;
-use App\Lib\Editor\EditorData;
 use App\Lib\HasMeta;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -95,7 +94,6 @@ class FormResource extends JsonResource
                 'config' => null,
                 'header_image' => null,
                 'mailattachments' => [],
-                'prevention_text' => EditorData::default(),
                 'id' => null,
                 'export' => ExportData::from([]),
             ],

app/Lib/Editor/EditorData.php

@@ -5,7 +5,7 @@ namespace App\Lib\Editor;
 use Spatie\LaravelData\Data;
 
 /** @todo replace blocks with actual block data classes */
-class EditorData extends Data implements Editorable
+class EditorData extends Data
 {
 
     public function __construct(
@@ -31,22 +31,6 @@ class EditorData extends Data implements Editorable
         return collect($wanted)->first(fn ($search) => !str(json_encode($this->blocks))->contains($search)) === null;
     }
 
-    public static function default(): self
-    {
-        return static::from([
-            'version' => '1.0',
-            'blocks' => [],
-            'time' => 0,
-        ]);
-    }
-
-    public function append(Editorable $editorable): self
-    {
-        $this->blocks = array_merge($this->blocks, $editorable->toEditorData()->blocks);
-
-        return $this;
-    }
-
     public function replaceWithList(string $blockContent, array $replacements): self
     {
         $this->blocks = collect($this->blocks)->map(function ($block) use ($blockContent, $replacements) {
@@ -72,11 +56,6 @@ class EditorData extends Data implements Editorable
         })->toArray();
 
 
-        return $this;
-    }
-
-    public function toEditorData(): EditorData
-    {
         return $this;
     }
 }

app/Lib/Editor/Editorable.php

@@ -1,8 +0,0 @@
-<?php
-
-namespace App\Lib\Editor;
-
-interface Editorable
-{
-    public function toEditorData(): EditorData;
-}

database/migrations/2024_07_06_144714_create_forms_prevention_text_column.php

@@ -1,33 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-use Tests\RequestFactories\EditorRequestFactory;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('forms', function (Blueprint $table) {
-            $table->json('prevention_text')->after('description')->default(json_encode(EditorRequestFactory::new()->empty()->create()));
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('forms', function (Blueprint $table) {
-            $table->dropColumn('prevention_text');
-        });
-    }
-};

resources/js/components/form/Editor.vue

@@ -8,14 +8,10 @@
             </div>
         </div>
 
-        <ui-popup
+        <ui-popup v-if="condition !== null" heading="Bedingungen" @close="
-            v-if="condition !== null"
-            heading="Bedingungen"
-            @close="
             condition.resolve(condition.data);
         condition = null;
-            "
+                        ">
-        >
             <slot name="conditions" :data="condition.data" :resolve="condition.resolve" :reject="condition.reject"></slot>
         </ui-popup>
     </div>

resources/js/views/form/Index.vue

@@ -116,16 +116,6 @@
                         <f-select id="to_group_field" v-model="single.export.to_group_field" :options="allFields" label="Nach Gruppe schreiben" name="to_group_field"></f-select>
                     </div>
                 </div>
-                <div v-show="active === 4" class="grid grid-cols-2 gap-3">
-                    <f-switch id="needs_prevention" v-model="single.needs_prevention" name="needs_prevention" label="Prävention"></f-switch>
-                    <f-editor
-                        id="prevention_text"
-                        v-model="single.prevention_text"
-                        hint="Wird an die Präventions-Email angehangen, die Teilnehmende dieser Veranstaltung erhalten"
-                        :rows="6"
-                        label="Präventions-Hinweis"
-                    ></f-editor>
-                </div>
             </div>
             <template #actions>
                 <a href="#" @click.prevent="submit">
@@ -202,7 +192,7 @@ const deleting = ref(null);
 const showing = ref(null);
 const fileSettingPopup = ref(null);
 
-const tabs = [{ title: 'Allgemeines' }, { title: 'Formular' }, { title: 'Bestätigungs-E-Mail' }, { title: 'Export' }, { title: 'Prävention' }];
+const tabs = [{ title: 'Allgemeines' }, { title: 'Formular' }, { title: 'Bestätigungs-E-Mail' }, { title: 'Export' }];
 const mailTabs = [{ title: 'vor Daten' }, { title: 'nach Daten' }];
 
 const allFields = computed(() => {

tests/EndToEnd/Form/FormIndexActionTest.php

@@ -61,7 +61,6 @@ class FormIndexActionTest extends FormTestCase
             ->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_text.version', '1.0')
             ->assertInertiaPath('data.meta.default.description', [])
             ->assertInertiaPath('data.meta.default.excerpt', '')
             ->assertInertiaPath('data.meta.default.is_active', true)

tests/Feature/Form/FormRequest.php

@@ -50,7 +50,6 @@ class FormRequest extends RequestFactory
             'mailattachments' => [],
             'export' => ExportData::from([])->toArray(),
             'needs_prevention' => $this->faker->boolean(),
-            'prevention_text' => EditorRequestFactory::new()->create(),
         ];
     }
 

tests/Feature/Form/FormStoreActionTest.php

@@ -26,7 +26,6 @@ class FormStoreActionTest extends FormTestCase
             ->name('formname')
             ->description($description)
             ->excerpt('avff')
-            ->preventionText(EditorRequestFactory::new()->paragraphs(['lorem ipsum']))
             ->registrationFrom('2023-05-04 01:00:00')->registrationUntil('2023-07-07 01:00:00')->from('2023-07-07')->to('2023-07-08')
             ->mailTop(EditorRequestFactory::new()->text(11, 'lala'))
             ->mailBottom(EditorRequestFactory::new()->text(12, 'lalab'))
@@ -39,7 +38,6 @@ class FormStoreActionTest extends FormTestCase
         $form = Form::latest()->first();
         $this->assertEquals('sname', $form->config->sections->get(0)->name);
         $this->assertEquals('formname', $form->name);
-        $this->assertEquals('lorem ipsum', $form->prevention_text->blocks[0]['data']['text']);
         $this->assertEquals('avff', $form->excerpt);
         $this->assertEquals($description->paragraphBlock(10, 'Lorem'), $form->description);
         $this->assertEquals(json_decode('{"time":1,"blocks":[{"id":11,"type":"paragraph","data":{"text":"lala"},"tunes":{"condition":{"mode":"all","ifs":[]}}}],"version":"1.0"}', true), $form->mail_top);
@@ -90,7 +88,6 @@ class FormStoreActionTest extends FormTestCase
         yield [FormRequest::new()->state(['header_image' => null]), ['header_image' => 'Bild ist erforderlich']];
     }
 
-
     /**
      * @dataProvider validationDataProvider
      * @param array<string, string> $messages

tests/Feature/Form/FormUpdateActionTest.php

@@ -5,9 +5,7 @@ namespace Tests\Feature\Form;
 use App\Fileshare\Data\FileshareResourceData;
 use App\Form\Data\ExportData;
 use App\Form\Models\Form;
-use App\Lib\Editor\EditorData;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Tests\RequestFactories\EditorRequestFactory;
 
 class FormUpdateActionTest extends FormTestCase
 {
@@ -130,13 +128,9 @@ class FormUpdateActionTest extends FormTestCase
     {
         $this->login()->loginNami()->withoutExceptionHandling();
         $form = Form::factory()->create();
-        $payload = FormRequest::new()
+        $payload = FormRequest::new()->state(['needs_prevention' => true])->create();
-            ->preventionText(EditorRequestFactory::new()->text(10, 'lorem ipsum')->create())
-            ->state(['needs_prevention' => true])
-            ->create();
 
         $this->patchJson(route('form.update', ['form' => $form]), $payload);
         $this->assertTrue($form->fresh()->needs_prevention);
-        $this->assertEquals('lorem ipsum', $form->fresh()->prevention_text->blocks[0]['data']['text']);
     }
 }

tests/Feature/Member/PreventionTest.php

@@ -200,23 +200,6 @@ class PreventionTest extends TestCase
         ]));
     }
 
-    public function testItAppendsTextOfForm(): void
-    {
-        Mail::fake();
-        app(PreventionSettings::class)->fake([
-            'formmail' => EditorRequestFactory::new()->paragraphs(["::first::"])->toData()
-        ])->save();
-        $form = $this->createForm();
-        $form->update(['prevention_text' => EditorRequestFactory::new()->paragraphs(['event'])->toData()]);
-        $this->createParticipant($form);
-
-        PreventionRememberAction::run();
-
-        Mail::assertSent(PreventionRememberMail::class, fn ($mail) => $mail->bodyText->hasAll([
-            'event'
-        ]));
-    }
-
     public function testItDisplaysBodyTextInMail(): void
     {
         $form = $this->createForm();

tests/RequestFactories/EditorRequestFactory.php

@@ -21,11 +21,6 @@ class EditorRequestFactory extends RequestFactory
         ];
     }
 
-    public function empty(): self
-    {
-        return $this->state(['blocks' => []]);
-    }
-
     /**
      * @param array<string, mixed> $conditions
      */