diff --git a/app/Livewire/Inspections/TemplateManager.php b/app/Livewire/Inspections/TemplateManager.php index ffa256b..ce5f194 100644 --- a/app/Livewire/Inspections/TemplateManager.php +++ b/app/Livewire/Inspections/TemplateManager.php @@ -3,6 +3,7 @@ namespace App\Livewire\Inspections; use Livewire\Component; +use Livewire\Attributes\On; use Livewire\WithFileUploads; use App\Models\InspectionTemplate; use App\Models\Project; @@ -36,12 +37,8 @@ class TemplateManager extends Component public $importTemplateName = ''; public $importError = ''; - // ── Importar desde otro proyecto ────────────────────────────────────── - public $showImportProjectModal = false; - public $availableProjects = []; - public $importProjectId = null; - public $importableTemplates = []; - public $selectedImportTemplateIds = []; + // ── Importar desde otro proyecto (tabla Rappasoft) ───────────────────── + public $showImportProjectModal = false; public $fieldTypes = [ 'text' => 'Texto corto', @@ -369,73 +366,16 @@ class TemplateManager extends Component public function openImportProjectModal() { - $user = Auth::user(); - $this->availableProjects = Project::accessibleBy($user) - ->where('id', '!=', $this->project->id) - ->orderBy('name') - ->get(); - - $this->importProjectId = null; - $this->importableTemplates = []; - $this->selectedImportTemplateIds = []; - $this->showImportProjectModal = true; + $this->showImportProjectModal = true; } - public function updatedImportProjectId() + /** La tabla Rappasoft embebida avisa cuando ha importado plantillas. */ + #[On('templates-imported')] + public function onTemplatesImported(int $count = 0): void { - $this->selectedImportTemplateIds = []; - if (!$this->importProjectId) { - $this->importableTemplates = []; - return; - } - // Solo mostrar templates de proyectos accesibles - $user = Auth::user(); - $allowed = Project::accessibleBy($user)->pluck('id'); - if (!$allowed->contains($this->importProjectId)) { - $this->importableTemplates = []; - return; - } - $this->importableTemplates = InspectionTemplate::where('project_id', $this->importProjectId)->get(); - } - - public function importFromProject() - { - if (empty($this->selectedImportTemplateIds)) { - $this->dispatch('notify', 'Selecciona al menos un template.'); - return; - } - - // Verificar que los templates pertenecen a un proyecto accesible - $user = Auth::user(); - $allowed = Project::accessibleBy($user)->pluck('id'); - - $imported = 0; - foreach ($this->selectedImportTemplateIds as $templateId) { - $source = InspectionTemplate::find($templateId); - if (!$source || !$allowed->contains($source->project_id)) continue; - - // Evitar duplicados por nombre - $name = $source->name; - if (InspectionTemplate::where('project_id', $this->project->id)->where('name', $name)->exists()) { - $name .= ' (copia)'; - } - - InspectionTemplate::create([ - 'name' => $name, - 'description' => $source->description, - 'project_id' => $this->project->id, - 'phase_id' => null, - 'fields' => $source->fields, - ]); - $imported++; - } - - $this->showImportProjectModal = false; - $this->importProjectId = null; - $this->importableTemplates = []; - $this->selectedImportTemplateIds = []; + $this->showImportProjectModal = false; $this->loadTemplates(); - $this->dispatch('notify', "$imported template(s) importado(s) desde otro proyecto"); + $this->dispatch('notify', "$count plantilla(s) importada(s) desde otro proyecto"); } public function render() diff --git a/app/Livewire/Projects/ImportTemplatesTable.php b/app/Livewire/Projects/ImportTemplatesTable.php new file mode 100644 index 0000000..0b65f14 --- /dev/null +++ b/app/Livewire/Projects/ImportTemplatesTable.php @@ -0,0 +1,121 @@ +setPrimaryKey('id') + ->setDefaultSort('inspection_templates.name', 'asc') + ->setSortingPillsEnabled(false) + ->setBulkActionsEnabled(true) + ->setAdditionalSelects([ + 'inspection_templates.id as id', + 'inspection_templates.project_id as project_id', + 'inspection_templates.phase_id as phase_id', + ]); + } + + /** Sólo plantillas de proyectos accesibles, distintos del proyecto destino. */ + private function accessibleProjectIds() + { + return Project::accessibleBy(Auth::user())->pluck('id'); + } + + public function builder(): Builder + { + return InspectionTemplate::query() + ->whereIn('inspection_templates.project_id', $this->accessibleProjectIds()) + ->where('inspection_templates.project_id', '!=', $this->projectId) + ->with(['project', 'phase']); + } + + public function columns(): array + { + return [ + Column::make('Plantilla', 'name') + ->sortable()->searchable() + ->secondaryHeaderFilter('name') + ->format(fn ($value) => '' . e($value) . '') + ->html(), + + Column::make('Proyecto') + ->secondaryHeaderFilter('project') + ->label(fn ($row) => e($row->project?->name ?? '—')), + + Column::make('Fase') + ->label(fn ($row) => e($row->phase?->name ?? '—')), + + Column::make('Campos') + ->label(fn ($row) => '' . count($row->fields ?? []) . '') + ->html(), + ]; + } + + public function filters(): array + { + $projects = Project::whereIn('id', InspectionTemplate::query() + ->whereIn('project_id', $this->accessibleProjectIds()) + ->where('project_id', '!=', $this->projectId) + ->distinct()->pluck('project_id')) + ->orderBy('name')->pluck('name', 'id')->toArray(); + + return [ + TextFilter::make('Plantilla', 'name') + ->config(['placeholder' => 'Buscar nombre…']) + ->filter(fn (Builder $q, string $v) => $q->where('inspection_templates.name', 'like', '%' . $v . '%')), + + SelectFilter::make('Proyecto', 'project') + ->options(['' => 'Todos'] + $projects) + ->filter(fn (Builder $q, string $v) => $q->where('inspection_templates.project_id', $v)), + ]; + } + + public function bulkActions(): array + { + return ['importSelected' => 'Importar seleccionadas']; + } + + public function importSelected() + { + $allowed = $this->accessibleProjectIds(); + $imported = 0; + + foreach (InspectionTemplate::whereIn('id', $this->getSelected())->get() as $source) { + if (! $allowed->contains($source->project_id) || $source->project_id === $this->projectId) { + continue; + } + + $name = $source->name; + if (InspectionTemplate::where('project_id', $this->projectId)->where('name', $name)->exists()) { + $name .= ' (copia)'; + } + + InspectionTemplate::create([ + 'name' => $name, + 'description' => $source->description, + 'project_id' => $this->projectId, + 'phase_id' => null, + 'fields' => $source->fields, + ]); + $imported++; + } + + $this->clearSelected(); + $this->dispatch('templates-imported', count: $imported); + } +} diff --git a/resources/views/livewire/inspections/template-manager.blade.php b/resources/views/livewire/inspections/template-manager.blade.php index 73a5b3c..7085938 100644 --- a/resources/views/livewire/inspections/template-manager.blade.php +++ b/resources/views/livewire/inspections/template-manager.blade.php @@ -281,45 +281,18 @@ @if($showImportProjectModal)
-
+
-

{{ __('Import from another project') }}

+
+

{{ __('Import from another project') }}

+

{{ __('Mark the templates and use "Import selected".') }}

+
-
-
- - -
- - @if($importProjectId) - @if(count($importableTemplates)) -
- @foreach($importableTemplates as $t) - - @endforeach -
- @else -

{{ __('This project has no templates.') }}

- @endif - @endif -
-
- - +
+
diff --git a/tests/Feature/TemplateImportTest.php b/tests/Feature/TemplateImportTest.php index e18b66b..3c620d8 100644 --- a/tests/Feature/TemplateImportTest.php +++ b/tests/Feature/TemplateImportTest.php @@ -3,6 +3,7 @@ namespace Tests\Feature; use App\Livewire\Inspections\TemplateManager; +use App\Livewire\Projects\ImportTemplatesTable; use App\Models\InspectionTemplate; use App\Models\Project; use App\Models\User; @@ -38,19 +39,30 @@ class TemplateImportTest extends TestCase 'fields' => [['name' => 'ok', 'label' => 'OK', 'type' => 'boolean']], ]); + // Tabla Rappasoft: lista plantillas de otros proyectos, selección con checkbox. Livewire::actingAs($user) - ->test(TemplateManager::class, ['project' => $target]) - ->call('openImportProjectModal') - ->set('importProjectId', $source->id) - ->set('selectedImportTemplateIds', [$tpl->id]) - ->call('importFromProject') - ->assertHasNoErrors(); + ->test(ImportTemplatesTable::class, ['projectId' => $target->id]) + ->assertSee('Recepción acero') + ->set('selected', [(string) $tpl->id]) + ->call('importSelected') + ->assertDispatched('templates-imported'); $this->assertDatabaseHas('inspection_templates', [ 'project_id' => $target->id, 'name' => 'Recepción acero', ]); } + public function test_import_table_excludes_target_project_templates(): void + { + $user = User::factory()->create(); + $target = $this->project($user, 'DST2'); + InspectionTemplate::create(['project_id' => $target->id, 'name' => 'Propia del destino', 'fields' => []]); + + Livewire::actingAs($user) + ->test(ImportTemplatesTable::class, ['projectId' => $target->id]) + ->assertDontSee('Propia del destino'); + } + public function test_import_template_from_csv(): void { $user = User::factory()->create();