From 6c2d7adf7605e9134b0127b5cb56f68eac15f2e3 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 20 Apr 2026 16:35:42 -0700 Subject: [PATCH] Reorganize --- .../admin/tasks/tasks.component.html | 134 ++++++++++-------- .../admin/tasks/tasks.component.spec.ts | 77 ++++++++-- .../components/admin/tasks/tasks.component.ts | 6 +- 3 files changed, 144 insertions(+), 73 deletions(-) diff --git a/src-ui/src/app/components/admin/tasks/tasks.component.html b/src-ui/src/app/components/admin/tasks/tasks.component.html index 5529d600a..e20bf8483 100644 --- a/src-ui/src/app/components/admin/tasks/tasks.component.html +++ b/src-ui/src/app/components/admin/tasks/tasks.component.html @@ -5,56 +5,12 @@ i18n-info >
- @if (isFiltered) { - - } -
-
- Filter by -
- -
- @for (t of filterTargets; track t.id) { - - } -
-
- @if (filterText?.length) { - - } - -
-
-
- -
- - @for (option of taskTypeOptions; track option.value) { - - } -
-
-
- -
- - @for (option of triggerSourceOptions; track option.value) { - - } -
-
@@ -67,24 +23,80 @@ } -
- - @for (section of sections; track section) { - +
+ + @for (option of taskTypeOptions; track option.value) { + } +
+
+
+ +
+ + @for (option of triggerSourceOptions; track option.value) { + + } +
+
+ +
+
+ Filter by +
+ +
+ @for (t of filterTargets; track t.id) { + + } +
+
+ @if (filterText?.length) { + + } + +
+
+ + @if (isFiltered) { + }
diff --git a/src-ui/src/app/components/admin/tasks/tasks.component.spec.ts b/src-ui/src/app/components/admin/tasks/tasks.component.spec.ts index c09b54378..97751aadd 100644 --- a/src-ui/src/app/components/admin/tasks/tasks.component.spec.ts +++ b/src-ui/src/app/components/admin/tasks/tasks.component.spec.ts @@ -211,13 +211,15 @@ describe('TasksComponent', () => { expect(component.selectedTaskType).toBe(ALL_FILTER_VALUE) expect(component.selectedTriggerSource).toBe(ALL_FILTER_VALUE) - const buttons = fixture.debugElement.queryAll(By.css('.btn.btn-sm')) - const text = buttons.map((button) => button.nativeElement.textContent) + fixture.detectChanges() - expect(text.join(' ')).toContain('All') - expect(text.join(' ')).toContain('Needs attention2') - expect(text.join(' ')).toContain('In progress2') - expect(text.join(' ')).toContain('Recent completed2') + const viewScope = fixture.debugElement.query(By.css('.task-view-scope')) + const text = viewScope.nativeElement.textContent + + expect(text).toContain('All') + expect(text).toContain('Needs attention2') + expect(text).toContain('In progress2') + expect(text).toContain('Recent completed2') }) it('should filter visible sections by selected status', () => { @@ -260,13 +262,40 @@ describe('TasksComponent', () => { component.resetFilters() - expect(component.selectedSection).toBe(ALL_TASK_SECTIONS) + expect(component.selectedSection).toBe(TaskSection.InProgress) expect(component.selectedTaskType).toBe(ALL_FILTER_VALUE) expect(component.selectedTriggerSource).toBe(ALL_FILTER_VALUE) expect(component.filterText).toBe('') expect(component.isFiltered).toBe(false) }) + it('should keep header controls focused on actions and auto refresh', () => { + fixture.detectChanges() + + const header = fixture.debugElement.query(By.css('pngx-page-header')) + const headerText = header.nativeElement.textContent + + expect(headerText).toContain('Dismiss visible') + expect(headerText).toContain('Auto refresh') + expect(headerText).not.toContain('All types') + expect(headerText).not.toContain('All sources') + expect(headerText).not.toContain('Reset filters') + }) + + it('should render the view scope row above the filter bar', () => { + fixture.detectChanges() + + const controls = fixture.debugElement.query(By.css('.task-controls')) + const controlChildren = controls.children + + expect(controlChildren[0].nativeElement.className).toContain( + 'task-view-scope' + ) + expect(controlChildren[1].nativeElement.className).toContain( + 'task-filter-bar' + ) + }) + it('should expose stable task type options and disable empty ones', () => { expect(component.taskTypeOptions.map((option) => option.value)).toContain( PaperlessTaskType.TrainClassifier @@ -387,6 +416,22 @@ describe('TasksComponent', () => { expect(dismissSpy).toHaveBeenCalledWith(new Set([467, 466])) }) + it('should dismiss the currently visible scoped and filtered tasks', () => { + component.setSection(TaskSection.InProgress) + component.setTaskType(PaperlessTaskType.SanityCheck) + component.setTriggerSource(PaperlessTaskTriggerSource.System) + + let modal: NgbModalRef + modalService.activeInstances.subscribe((m) => (modal = m[m.length - 1])) + const dismissSpy = jest.spyOn(tasksService, 'dismissTasks') + + component.dismissTasks() + + expect(modal).not.toBeUndefined() + modal.componentInstance.confirmClicked.emit() + expect(dismissSpy).toHaveBeenCalledWith(new Set([461])) + }) + it('should support toggling a full section', () => { const toggleCheck = fixture.debugElement.query( By.css('#all-tasks-needs_attention') @@ -416,7 +461,7 @@ describe('TasksComponent', () => { it('should filter tasks by file name', () => { const input = fixture.debugElement.query( - By.css('pngx-page-header input[type=text]') + By.css('.task-filter-bar input[type=text]') ) input.nativeElement.value = '191092' input.nativeElement.dispatchEvent(new Event('input')) @@ -458,7 +503,7 @@ describe('TasksComponent', () => { component.setSection(TaskSection.NeedsAttention) component.filterTargetID = 1 const input = fixture.debugElement.query( - By.css('pngx-page-header input[type=text]') + By.css('.task-filter-bar input[type=text]') ) input.nativeElement.value = 'duplicate' input.nativeElement.dispatchEvent(new Event('input')) @@ -472,7 +517,7 @@ describe('TasksComponent', () => { it('should support keyboard events for filtering', () => { const input = fixture.debugElement.query( - By.css('pngx-page-header input[type=text]') + By.css('.task-filter-bar input[type=text]') ) input.nativeElement.value = '191092' input.nativeElement.dispatchEvent( @@ -484,4 +529,16 @@ describe('TasksComponent', () => { ) expect(component.filterText).toEqual('') }) + + it('should keep clearing selection independent from resetting filters', () => { + component.setTaskType(PaperlessTaskType.ConsumeFile) + component.toggleSelected(tasks[0]) + expect(component.selectedTasks.size).toBe(1) + + component.clearSelection() + + expect(component.selectedTasks.size).toBe(0) + expect(component.selectedTaskType).toBe(PaperlessTaskType.ConsumeFile) + expect(component.isFiltered).toBe(true) + }) }) diff --git a/src-ui/src/app/components/admin/tasks/tasks.component.ts b/src-ui/src/app/components/admin/tasks/tasks.component.ts index 14ecb1c17..daa333f05 100644 --- a/src-ui/src/app/components/admin/tasks/tasks.component.ts +++ b/src-ui/src/app/components/admin/tasks/tasks.component.ts @@ -217,13 +217,16 @@ export class TasksComponent get isFiltered(): boolean { return ( - this.selectedSection !== ALL_TASK_SECTIONS || this.selectedTaskType !== ALL_FILTER_VALUE || this.selectedTriggerSource !== ALL_FILTER_VALUE || this._filterText.length > 0 ) } + get hasScopedSectionView(): boolean { + return this.selectedSection !== ALL_TASK_SECTIONS + } + ngOnInit() { this.tasksService.reload() timer(5000, 5000) @@ -441,7 +444,6 @@ export class TasksComponent } public resetFilters() { - this.selectedSection = ALL_TASK_SECTIONS this.selectedTaskType = ALL_FILTER_VALUE this.selectedTriggerSource = ALL_FILTER_VALUE this.resetFilter()