Skip to content

A free open source IT asset/license management system

Create and use saved report template select

Marcus Moored234c29ef3f0
diff --git a/app/Http/Controllers/ReportTemplatesController.php b/app/Http/Controllers/ReportTemplatesController.php
index ea05446691..db51070798 100644
--- a/app/Http/Controllers/ReportTemplatesController.php
+++ b/app/Http/Controllers/ReportTemplatesController.php
@@ -35,7 +35,6 @@ class ReportTemplatesController extends Controller
$this->authorize('reports.view');
$customfields = CustomField::get();
- $report_templates = ReportTemplate::orderBy('name')->get();
try {
$view = $reportTemplate->getViewPath();
@@ -47,7 +46,6 @@ class ReportTemplatesController extends Controller
return view($view, [
'customfields' => $customfields,
- 'report_templates' => $report_templates,
'template' => $reportTemplate,
]);
}
diff --git a/app/Livewire/ReportTemplateSelect.php b/app/Livewire/ReportTemplateSelect.php
new file mode 100644
index 0000000000..2952106495
--- /dev/null
+++ b/app/Livewire/ReportTemplateSelect.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Livewire;
+
+use App\Models\ReportTemplate;
+use Illuminate\Validation\Rule;
+use Livewire\Attributes\Computed;
+use Livewire\Component;
+
+class ReportTemplateSelect extends Component
+{
+ public $type;
+
+ public function render()
+ {
+ return view('livewire.report-template-select');
+ }
+
+ #[Computed]
+ public function templates()
+ {
+ return ReportTemplate::query()
+ ->when($this->type, fn ($query) => $query->where('type', $this->type))
+ ->orderBy('name')
+ ->get();
+ }
+
+ protected function rules()
+ {
+ return [
+ 'type' => Rule::in(['asset', 'component']),
+ ];
+ }
+}
diff --git a/resources/views/livewire/report-template-select.blade.php b/resources/views/livewire/report-template-select.blade.php
new file mode 100644
index 0000000000..74c163fd01
--- /dev/null
+++ b/resources/views/livewire/report-template-select.blade.php
@@ -0,0 +1,19 @@
+<div class="form-group">
+ <label for="saved_report_select">{{ trans('admin/reports/general.open_saved_template') }}</label>
+ <select
+ id="saved_report_select"
+ class="form-control select2"
+ data-placeholder="{{ trans('admin/reports/general.select_a_template') }}"
+ >
+ <option></option>
+ @foreach($this->templates as $template)
+ <option
+ value="{{ $template->id }}"
+ data-route="{{ route('report-templates.show', $template->id) }}"
+ @selected($template->is(request()->route()->parameter('reportTemplate')))
+ >
+ {{ $template->name }}
+ </option>
+ @endforeach
+ </select>
+</div>
diff --git a/resources/views/reports/custom/asset.blade.php b/resources/views/reports/custom/asset.blade.php
index 8edde51e7d..9ca64f9d9a 100644
--- a/resources/views/reports/custom/asset.blade.php
+++ b/resources/views/reports/custom/asset.blade.php
@@ -723,26 +723,7 @@
<!-- Saved Reports right column -->
<div class="col-md-3">
@if (! request()->routeIs('report-templates.edit'))
- <div class="form-group">
- <label for="saved_report_select">{{ trans('admin/reports/general.open_saved_template') }}</label>
- <select
- id="saved_report_select"
- class="form-control select2"
- data-placeholder="{{ trans('admin/reports/general.select_a_template') }}"
- >
- <option></option>
- @foreach($report_templates as $savedTemplate)
- <option
- value="{{ $savedTemplate->id }}"
- data-route="{{ route('report-templates.show', $savedTemplate->id) }}"
- @selected($savedTemplate->is(request()->route()->parameter('reportTemplate')))
- >
- {{ $savedTemplate->name }}
- </option>
- @endforeach
- </select>
- </div>
-
+ <livewire:report-template-select type="asset" />
<div class="row">
<div class="col-md-12">
diff --git a/resources/views/reports/custom/component.blade.php b/resources/views/reports/custom/component.blade.php
index 1d85e22fff..8d6d4f31e1 100644
--- a/resources/views/reports/custom/component.blade.php
+++ b/resources/views/reports/custom/component.blade.php
@@ -476,25 +476,7 @@
<!-- Saved Reports right column -->
<div class="col-md-3">
@if (! request()->routeIs('report-templates.edit'))
- <div class="form-group">
- <label for="saved_report_select">{{ trans('admin/reports/general.open_saved_template') }}</label>
- <select
- id="saved_report_select"
- class="form-control select2"
- data-placeholder="{{ trans('admin/reports/general.select_a_template') }}"
- >
- <option></option>
- @foreach($report_templates as $savedTemplate)
- <option
- value="{{ $savedTemplate->id }}"
- data-route="{{ route('report-templates.show', $savedTemplate->id) }}"
- @selected($savedTemplate->is(request()->route()->parameter('reportTemplate')))
- >
- {{ $savedTemplate->name }}
- </option>
- @endforeach
- </select>
- </div>
+ <livewire:report-template-select type="component" />
<div class="row">
<div class="col-md-12">
diff --git a/tests/Feature/Livewire/ReportTemplateSelectTest.php b/tests/Feature/Livewire/ReportTemplateSelectTest.php
new file mode 100644
index 0000000000..82b2393c66
--- /dev/null
+++ b/tests/Feature/Livewire/ReportTemplateSelectTest.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Tests\Feature\Livewire;
+
+use App\Livewire\ReportTemplateSelect;
+use App\Models\ReportTemplate;
+use App\Models\User;
+use Livewire\Livewire;
+use Tests\TestCase;
+
+class ReportTemplateSelectTest extends TestCase
+{
+ public function test_the_component_can_render()
+ {
+ Livewire::test(ReportTemplateSelect::class)->assertStatus(200);
+ }
+
+ public function test_scopes_to_user()
+ {
+ User::factory()
+ ->has(ReportTemplate::factory(['type' => 'asset', 'name' => 'Another User: Asset']))
+ ->has(ReportTemplate::factory(['type' => 'component', 'name' => 'Another User: Component']))
+ ->create();
+
+ $actor = User::factory()->canViewReports()
+ ->has(ReportTemplate::factory(['type' => 'asset', 'name' => 'User: Asset']))
+ ->has(ReportTemplate::factory(['type' => 'component', 'name' => 'User: Component']))
+ ->create();
+
+ Livewire::actingAs($actor)->test(ReportTemplateSelect::class)
+ ->assertSet('templates', fn ($templates) => count($templates) === 2)
+ ->assertDontSee('Another User');
+ }
+
+ public function test_scopes_to_provided_type()
+ {
+ $actor = User::factory()->canViewReports()
+ ->has(ReportTemplate::factory(['type' => 'asset', 'name' => 'User Saved Asset Template']))
+ ->has(ReportTemplate::factory(['type' => 'component', 'name' => 'User Saved Component Template']))
+ ->create();
+
+ Livewire::actingAs($actor)->test(ReportTemplateSelect::class, ['type' => 'asset'])
+ ->assertSet('templates', fn ($templates) => count($templates) === 1)
+ ->assertSee('User Saved Asset Template')
+ ->assertDontSee('User Saved Component Template');
+ }
+
+ public function test_includes_shared()
+ {
+ $template = ReportTemplate::factory()->shared()->create(['type' => 'asset', 'name' => 'Shared Asset Template']);
+
+ Livewire::actingAs(User::factory()->canViewReports()->create())
+ ->test(ReportTemplateSelect::class, ['type' => 'asset'])
+ ->assertSet('templates', fn ($templates) => $templates->contains($template));
+ }
+}
diff --git a/tests/Feature/Reporting/Custom/CustomAssetReportTest.php b/tests/Feature/Reporting/Custom/CustomAssetReportTest.php
index c0373ff6e6..edc8f9cff2 100644
--- a/tests/Feature/Reporting/Custom/CustomAssetReportTest.php
+++ b/tests/Feature/Reporting/Custom/CustomAssetReportTest.php
@@ -44,29 +44,6 @@ class CustomAssetReportTest extends TestCase
]);
}
- public function test_saved_templates_on_page_are_scoped_to_the_user_and_type()
- {
- // Given there are saved templates for one user
- ReportTemplate::factory()->create(['type' => 'asset', 'name' => 'Another User: Asset']);
- ReportTemplate::factory()->create(['type' => 'component', 'name' => 'Another User: Component']);
-
- // When loading reports/custom while acting as another user that also has saved templates
- $user = User::factory()->canViewReports()
- ->has(ReportTemplate::factory(['type' => 'asset', 'name' => 'User: Asset']))
- ->has(ReportTemplate::factory(['type' => 'component', 'name' => 'User: Component']))
- ->create();
-
- $response = $this->actingAs($user)->get(route('reports/custom'));
-
- $viewTemplateNames = $response->viewData('report_templates')->pluck('name');
-
- // The user should only see their asset template
- $this->assertTrue($viewTemplateNames->contains('User: Asset'));
- $this->assertTrue($viewTemplateNames->doesntContain('User: Component'));
- $this->assertTrue($viewTemplateNames->doesntContain('Another User: Asset'));
- $this->assertTrue($viewTemplateNames->doesntContain('Another User: Component'));
- }
-
public function test_custom_asset_report()
{
Asset::factory()->create(['name' => 'Asset A']);
diff --git a/tests/Feature/Reporting/Custom/CustomComponentReportTest.php b/tests/Feature/Reporting/Custom/CustomComponentReportTest.php
index c631a82a7d..c7c16adc6e 100644
--- a/tests/Feature/Reporting/Custom/CustomComponentReportTest.php
+++ b/tests/Feature/Reporting/Custom/CustomComponentReportTest.php
@@ -9,7 +9,6 @@ use App\Models\Company;
use App\Models\Component;
use App\Models\Location;
use App\Models\Manufacturer;
-use App\Models\ReportTemplate;
use App\Models\Supplier;
use App\Models\User;
use Illuminate\Database\Eloquent\Model;
@@ -55,33 +54,6 @@ class CustomComponentReportTest extends TestCase
->assertOk();
}
- public function test_saved_templates_on_page_are_scoped_to_the_user_and_type()
- {
- // Given there are saved templates for one user
- ReportTemplate::factory()->create(['type' => 'asset', 'name' => 'Another User: Asset']);
- ReportTemplate::factory()->create(['type' => 'accessory', 'name' => 'Another User: Accessory']);
- ReportTemplate::factory()->create(['type' => 'component', 'name' => 'Another User: Component']);
-
- // When loading reports.custom.component while acting as another user that also has saved templates
- $user = User::factory()->canViewReports()
- ->has(ReportTemplate::factory(['type' => 'asset', 'name' => 'User: Asset']))
- ->has(ReportTemplate::factory(['type' => 'accessory', 'name' => 'User: Accessory']))
- ->has(ReportTemplate::factory(['type' => 'component', 'name' => 'User: Component']))
- ->create();
-
- $response = $this->actingAs($user)->get(route('reports.custom.component'));
-
- $viewTemplateNames = $response->viewData('report_templates')->pluck('name');
-
- // The user should only see their component template
- $this->assertTrue($viewTemplateNames->contains('User: Component'));
- $this->assertTrue($viewTemplateNames->doesntContain('User: Accessory'));
- $this->assertTrue($viewTemplateNames->doesntContain('User: Asset'));
- $this->assertTrue($viewTemplateNames->doesntContain('Another User: Asset'));
- $this->assertTrue($viewTemplateNames->doesntContain('Another User: Accessory'));
- $this->assertTrue($viewTemplateNames->doesntContain('Another User: Component'));
- }
-
public function test_custom_component_report_validation()
{
$this->markTestIncomplete();