From 3a2579b20510001d9a41a77e1ae337df887fe9fa Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 27 Feb 2025 13:08:02 -0800 Subject: [PATCH 1/6] WIP: replace Form::checkbox --- resources/views/livewire/category-edit-form.blade.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/resources/views/livewire/category-edit-form.blade.php b/resources/views/livewire/category-edit-form.blade.php index 82dbf57e85..3e29bb3ddc 100644 --- a/resources/views/livewire/category-edit-form.blade.php +++ b/resources/views/livewire/category-edit-form.blade.php @@ -23,7 +23,14 @@
@if ($defaultEulaText!='') @else From 014f3b76527822af08d37fc77b742b026ee6def9 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 27 Feb 2025 13:12:01 -0800 Subject: [PATCH 2/6] Cast to boolean --- app/Livewire/CategoryEditForm.php | 2 +- resources/views/categories/edit.blade.php | 2 +- resources/views/livewire/category-edit-form.blade.php | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/Livewire/CategoryEditForm.php b/app/Livewire/CategoryEditForm.php index 28a06657c1..c471dcd84d 100644 --- a/app/Livewire/CategoryEditForm.php +++ b/app/Livewire/CategoryEditForm.php @@ -16,7 +16,7 @@ class CategoryEditForm extends Component public $sendCheckInEmail; - public $useDefaultEula; + public bool $useDefaultEula; public function mount() { diff --git a/resources/views/categories/edit.blade.php b/resources/views/categories/edit.blade.php index 96ef8e08a8..85c7d0e8e7 100755 --- a/resources/views/categories/edit.blade.php +++ b/resources/views/categories/edit.blade.php @@ -28,7 +28,7 @@ :eula-text="old('eula_text', $item->eula_text)" :require-acceptance="old('require_acceptance', $item->require_acceptance)" :send-check-in-email="old('checkin_email', $item->checkin_email)" - :use-default-eula="old('use_default_eula', $item->use_default_eula)" + :use-default-eula="(bool) old('use_default_eula', $item->use_default_eula)" /> @include ('partials.forms.edit.image-upload', ['image_path' => app('categories_upload_path')]) diff --git a/resources/views/livewire/category-edit-form.blade.php b/resources/views/livewire/category-edit-form.blade.php index 3e29bb3ddc..a05fd17cdb 100644 --- a/resources/views/livewire/category-edit-form.blade.php +++ b/resources/views/livewire/category-edit-form.blade.php @@ -29,7 +29,6 @@ value="1" wire:model.live="useDefaultEula" aria-label="use_default_eula" - @checked($useDefaultEula) /> {!! trans('admin/categories/general.use_default_eula') !!} From 8755c54edc53f8a798cf8cb044cd21dc92866193 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 27 Feb 2025 13:13:39 -0800 Subject: [PATCH 3/6] Replace Form::checkbox --- resources/views/livewire/category-edit-form.blade.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/resources/views/livewire/category-edit-form.blade.php b/resources/views/livewire/category-edit-form.blade.php index a05fd17cdb..fc45cfb06a 100644 --- a/resources/views/livewire/category-edit-form.blade.php +++ b/resources/views/livewire/category-edit-form.blade.php @@ -34,7 +34,14 @@ @else @endif From 5876259893858256003970f850cfd8a26c45c7c6 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 27 Feb 2025 13:19:26 -0800 Subject: [PATCH 4/6] Replace another Form::checkbox --- app/Livewire/CategoryEditForm.php | 2 +- resources/views/categories/edit.blade.php | 2 +- resources/views/livewire/category-edit-form.blade.php | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/Livewire/CategoryEditForm.php b/app/Livewire/CategoryEditForm.php index c471dcd84d..97cce4b334 100644 --- a/app/Livewire/CategoryEditForm.php +++ b/app/Livewire/CategoryEditForm.php @@ -12,7 +12,7 @@ class CategoryEditForm extends Component public $originalSendCheckInEmailValue; - public $requireAcceptance; + public bool $requireAcceptance; public $sendCheckInEmail; diff --git a/resources/views/categories/edit.blade.php b/resources/views/categories/edit.blade.php index 85c7d0e8e7..e6664de553 100755 --- a/resources/views/categories/edit.blade.php +++ b/resources/views/categories/edit.blade.php @@ -26,7 +26,7 @@ diff --git a/resources/views/livewire/category-edit-form.blade.php b/resources/views/livewire/category-edit-form.blade.php index fc45cfb06a..e65d05a434 100644 --- a/resources/views/livewire/category-edit-form.blade.php +++ b/resources/views/livewire/category-edit-form.blade.php @@ -52,7 +52,13 @@
From 7a9b5d61b03cda0b8d4929d55243cfc28686bd5d Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 27 Feb 2025 13:25:32 -0800 Subject: [PATCH 5/6] Replace another Form::checkbox --- app/Livewire/CategoryEditForm.php | 2 +- resources/views/categories/edit.blade.php | 2 +- resources/views/livewire/category-edit-form.blade.php | 9 ++++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/Livewire/CategoryEditForm.php b/app/Livewire/CategoryEditForm.php index 97cce4b334..fd8bef6489 100644 --- a/app/Livewire/CategoryEditForm.php +++ b/app/Livewire/CategoryEditForm.php @@ -14,7 +14,7 @@ class CategoryEditForm extends Component public bool $requireAcceptance; - public $sendCheckInEmail; + public bool $sendCheckInEmail; public bool $useDefaultEula; diff --git a/resources/views/categories/edit.blade.php b/resources/views/categories/edit.blade.php index e6664de553..ddf1b1cf76 100755 --- a/resources/views/categories/edit.blade.php +++ b/resources/views/categories/edit.blade.php @@ -27,7 +27,7 @@ :default-eula-text="$snipeSettings->default_eula_text" :eula-text="old('eula_text', $item->eula_text)" :require-acceptance="(bool) old('require_acceptance', $item->require_acceptance)" - :send-check-in-email="old('checkin_email', $item->checkin_email)" + :send-check-in-email="(bool) old('checkin_email', $item->checkin_email)" :use-default-eula="(bool) old('use_default_eula', $item->use_default_eula)" /> diff --git a/resources/views/livewire/category-edit-form.blade.php b/resources/views/livewire/category-edit-form.blade.php index e65d05a434..91cb26da51 100644 --- a/resources/views/livewire/category-edit-form.blade.php +++ b/resources/views/livewire/category-edit-form.blade.php @@ -68,7 +68,14 @@
@if ($this->shouldDisplayEmailMessage) From 70332696c631a001aeb7bd9747ac3ee9f7df501d Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 27 Feb 2025 15:23:17 -0800 Subject: [PATCH 6/6] Fix test by passing in required properties --- tests/Feature/Livewire/CategoryEditFormTest.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/Feature/Livewire/CategoryEditFormTest.php b/tests/Feature/Livewire/CategoryEditFormTest.php index a439f544ac..4596af120a 100644 --- a/tests/Feature/Livewire/CategoryEditFormTest.php +++ b/tests/Feature/Livewire/CategoryEditFormTest.php @@ -10,7 +10,10 @@ class CategoryEditFormTest extends TestCase { public function testTheComponentCanRender() { - Livewire::test(CategoryEditForm::class)->assertStatus(200); + Livewire::test(CategoryEditForm::class, [ + 'sendCheckInEmail' => true, + 'useDefaultEula' => true, + ])->assertStatus(200); } public function testSendEmailCheckboxIsCheckedOnLoadWhenSendEmailIsExistingSetting()