From 897f6a9e5a9dc37f8f48a172517a46b0de9f752a Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 13 Nov 2026 10:14:23 -0800 Subject: [PATCH] Tweak: alter wording, force default for single manual wf dialog (#14760) --- docs/usage.md | 7 ++++--- ...run-workflow-confirm-dialog.component.html | 9 ++++++-- ...-workflow-confirm-dialog.component.spec.ts | 21 +++++++++++++++++++ .../run-workflow-confirm-dialog.component.ts | 2 ++ .../document-detail.component.spec.ts | 20 +++++++++++++++++- .../document-detail.component.ts | 2 ++ .../bulk-editor/bulk-editor.component.spec.ts | 2 ++ 7 files changed, 57 insertions(+), 6 deletions(-) diff --git a/docs/usage.md b/docs/usage.md index 541e37c1f6..0cc10269b9 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -587,9 +587,10 @@ documents from the web UI: - From the document list, select one or more documents and choose **Run workflow** from the "Actions" menu. - From an individual document, choose **Run workflow** from the "Actions" menu. -You will be asked which workflow to run. By default the workflow's trigger filters still apply, so documents that do -not match are skipped. You can instead choose to **run on all selected documents**, which ignores the trigger filters -and runs the workflow's actions on every selected document. +You will be asked which workflow to run. From the document list, the workflow's trigger filters apply by default, so +documents that do not match are skipped. You can choose to **run on all selected documents** to ignore the filters. +From an individual document, the option to ignore trigger filters is selected by default. Clear it to run the workflow +only if the document matches its trigger filters. Manual runs happen in the background. As with scheduled workflows, the document list is not refreshed automatically when they finish, so you may need to reload the list to see the results. diff --git a/src-ui/src/app/components/common/confirm-dialog/run-workflow-confirm-dialog/run-workflow-confirm-dialog.component.html b/src-ui/src/app/components/common/confirm-dialog/run-workflow-confirm-dialog/run-workflow-confirm-dialog.component.html index e46d3454be..e6cf5e7109 100644 --- a/src-ui/src/app/components/common/confirm-dialog/run-workflow-confirm-dialog/run-workflow-confirm-dialog.component.html +++ b/src-ui/src/app/components/common/confirm-dialog/run-workflow-confirm-dialog/run-workflow-confirm-dialog.component.html @@ -18,8 +18,13 @@
- -
Ignore the workflow's trigger filters and run on every selected document.
+ @if (singleDocument) { + +
Ignore the workflow's trigger filters for this document.
+ } @else { + +
Ignore the workflow's trigger filters and run on every selected document.
+ }
diff --git a/src-ui/src/app/components/common/confirm-dialog/run-workflow-confirm-dialog/run-workflow-confirm-dialog.component.spec.ts b/src-ui/src/app/components/common/confirm-dialog/run-workflow-confirm-dialog/run-workflow-confirm-dialog.component.spec.ts index 0468cf64b3..6f44973732 100644 --- a/src-ui/src/app/components/common/confirm-dialog/run-workflow-confirm-dialog/run-workflow-confirm-dialog.component.spec.ts +++ b/src-ui/src/app/components/common/confirm-dialog/run-workflow-confirm-dialog/run-workflow-confirm-dialog.component.spec.ts @@ -39,4 +39,25 @@ describe('RunWorkflowConfirmDialogComponent', () => { expect(options).toHaveLength(2) expect(options[1].textContent).toContain('Manual workflow') }) + + it('should describe the checkbox for a selection or a single document', async () => { + const checkbox = fixture.nativeElement.querySelector('#runWorkflowForce') + expect(checkbox.checked).toBe(false) + expect(fixture.nativeElement.textContent).toContain( + 'Run on all selected documents' + ) + + component.singleDocument = true + component.force = true + fixture.detectChanges() + await fixture.whenStable() + fixture.detectChanges() + expect(checkbox.checked).toBe(true) + expect(fixture.nativeElement.textContent).toContain( + 'Run on this document regardless of trigger filters' + ) + expect(fixture.nativeElement.textContent).not.toContain( + 'Run on all selected documents' + ) + }) }) diff --git a/src-ui/src/app/components/common/confirm-dialog/run-workflow-confirm-dialog/run-workflow-confirm-dialog.component.ts b/src-ui/src/app/components/common/confirm-dialog/run-workflow-confirm-dialog/run-workflow-confirm-dialog.component.ts index 12915141e8..b6aae8b8d4 100644 --- a/src-ui/src/app/components/common/confirm-dialog/run-workflow-confirm-dialog/run-workflow-confirm-dialog.component.ts +++ b/src-ui/src/app/components/common/confirm-dialog/run-workflow-confirm-dialog/run-workflow-confirm-dialog.component.ts @@ -13,6 +13,8 @@ export class RunWorkflowConfirmDialogComponent extends ConfirmDialogComponent { public workflowId: number = null + public singleDocument: boolean = false + // i.e. ignore the workflow's trigger filters public force: boolean = false diff --git a/src-ui/src/app/components/document-detail/document-detail.component.spec.ts b/src-ui/src/app/components/document-detail/document-detail.component.spec.ts index 4c766077a5..ae10532131 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.spec.ts +++ b/src-ui/src/app/components/document-detail/document-detail.component.spec.ts @@ -1038,9 +1038,10 @@ describe('DocumentDetailComponent', () => { modalService.activeInstances.subscribe((modal) => (openModal = modal[0])) const toastSpy = jest.spyOn(toastService, 'showInfo') component.runWorkflow() + expect(openModal.componentInstance.singleDocument).toBe(true) + expect(openModal.componentInstance.force).toBe(true) const modalCloseSpy = jest.spyOn(openModal, 'close') openModal.componentInstance.workflowId = 5 - openModal.componentInstance.force = true openModal.componentInstance.confirmClicked.next() expect(bulkEditSpy).toHaveBeenCalledWith( { documents: [doc.id] }, @@ -1051,6 +1052,23 @@ describe('DocumentDetailComponent', () => { expect(modalCloseSpy).toHaveBeenCalled() }) + it('should apply workflow filters when the single-document checkbox is cleared', () => { + initNormally() + const bulkEditSpy = jest.spyOn(documentService, 'bulkEdit') + bulkEditSpy.mockReturnValue(of(true)) + let openModal: NgbModalRef + modalService.activeInstances.subscribe((modal) => (openModal = modal[0])) + component.runWorkflow() + openModal.componentInstance.workflowId = 5 + openModal.componentInstance.force = false + openModal.componentInstance.confirmClicked.next() + expect(bulkEditSpy).toHaveBeenCalledWith( + { documents: [doc.id] }, + 'run_workflow', + { workflow: 5, filter_documents: true } + ) + }) + it('should pass remote OCR choice when reprocessing', () => { initNormally() const reprocessSpy = jest.spyOn(documentService, 'reprocessDocuments') diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts index e3516f4cad..22fb2a3076 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.ts +++ b/src-ui/src/app/components/document-detail/document-detail.component.ts @@ -1587,6 +1587,8 @@ export class DocumentDetailComponent modal.componentInstance.message = $localize`Run a workflow on "${this.document().title}".` modal.componentInstance.btnCaption = $localize`Run` modal.componentInstance.workflows = this.manualWorkflows() + modal.componentInstance.singleDocument = true + modal.componentInstance.force = true modal.componentInstance.confirmClicked.subscribe(() => { modal.componentInstance.buttonsEnabled.set(false) this.documentsService diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts index e78545bb80..5296c7f0ae 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts @@ -699,6 +699,8 @@ describe('BulkEditorComponent', () => { component.runWorkflowSelected() expect(modal).not.toBeUndefined() expect(modal.componentInstance.workflows).toEqual(component.manualWorkflows) + expect(modal.componentInstance.singleDocument).toBe(false) + expect(modal.componentInstance.force).toBe(false) modal.componentInstance.workflowId = 5 modal.componentInstance.force = true modal.componentInstance.confirm()