diff --git a/app/Form/Resources/FormResource.php b/app/Form/Resources/FormResource.php index 423f211e..ed556c23 100644 --- a/app/Form/Resources/FormResource.php +++ b/app/Form/Resources/FormResource.php @@ -3,6 +3,7 @@ namespace App\Form\Resources; use App\Form\Enums\NamiType; +use App\Form\Enums\SpecialType; use App\Form\Fields\Field; use App\Form\Scopes\FormFilterScope; use App\Form\Models\Form; @@ -66,6 +67,7 @@ class FormResource extends JsonResource ], 'templates' => FormtemplateResource::collection(Formtemplate::get()), 'namiTypes' => NamiType::forSelect(), + 'specialTypes' => SpecialType::forSelect(), 'default' => [ 'description' => [], 'name' => '', diff --git a/app/Form/Resources/FormtemplateResource.php b/app/Form/Resources/FormtemplateResource.php index ee439177..f89ed835 100644 --- a/app/Form/Resources/FormtemplateResource.php +++ b/app/Form/Resources/FormtemplateResource.php @@ -3,6 +3,7 @@ namespace App\Form\Resources; use App\Form\Enums\NamiType; +use App\Form\Enums\SpecialType; use App\Form\Fields\Field; use App\Form\Models\Formtemplate; use App\Group; @@ -44,6 +45,7 @@ class FormtemplateResource extends JsonResource 'groups' => Group::forSelect(), 'fields' => Field::asMeta(), 'namiTypes' => NamiType::forSelect(), + 'specialTypes' => SpecialType::forSelect(), 'links' => [ 'store' => route('formtemplate.store'), 'form_index' => route('form.index'), diff --git a/resources/js/views/formtemplate/FormBuilder.vue b/resources/js/views/formtemplate/FormBuilder.vue index cc75fddb..96bf18a9 100644 --- a/resources/js/views/formtemplate/FormBuilder.vue +++ b/resources/js/views/formtemplate/FormBuilder.vue @@ -23,6 +23,7 @@ + assertInertiaPath('data.meta.default.config', null) ->assertInertiaPath('data.meta.base_url', url('')) ->assertInertiaPath('data.meta.namiTypes.0', ['id' => 'Vorname', 'name' => 'Vorname']) + ->assertInertiaPath('data.meta.specialTypes.0', ['id' => 'Vorname', 'name' => 'Vorname']) ->assertInertiaPath('data.meta.section_default.name', ''); } diff --git a/tests/Feature/Form/FormtemplateIndexActionTest.php b/tests/Feature/Form/FormtemplateIndexActionTest.php index ce47f874..fe09c959 100644 --- a/tests/Feature/Form/FormtemplateIndexActionTest.php +++ b/tests/Feature/Form/FormtemplateIndexActionTest.php @@ -82,6 +82,8 @@ class FormtemplateIndexActionTest extends TestCase ]) ->assertInertiaPath('data.meta.links.store', route('formtemplate.store')) ->assertInertiaPath('data.meta.links.form_index', route('form.index')) + ->assertInertiaPath('data.meta.namiTypes.0', ['id' => 'Vorname', 'name' => 'Vorname']) + ->assertInertiaPath('data.meta.specialTypes.0', ['id' => 'Vorname', 'name' => 'Vorname']) ->assertInertiaPath('data.meta.section_default', [ 'name' => '', 'intro' => '',