mirror of
				https://github.com/paperless-ngx/paperless-ngx.git
				synced 2025-10-30 03:56:23 -05:00 
			
		
		
		
	Change: rename redo OCR to reprocess (#6866)
This commit is contained in:
		| @@ -2257,18 +2257,10 @@ | ||||
|           <context context-type="sourcefile">src/app/components/admin/users-groups/users-groups.component.ts</context> | ||||
|           <context context-type="linenumber">166</context> | ||||
|         </context-group> | ||||
|         <context-group purpose="location"> | ||||
|           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> | ||||
|           <context context-type="linenumber">821</context> | ||||
|         </context-group> | ||||
|         <context-group purpose="location"> | ||||
|           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context> | ||||
|           <context context-type="linenumber">714</context> | ||||
|         </context-group> | ||||
|         <context-group purpose="location"> | ||||
|           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context> | ||||
|           <context context-type="linenumber">753</context> | ||||
|         </context-group> | ||||
|         <context-group purpose="location"> | ||||
|           <context context-type="sourcefile">src/app/components/manage/custom-fields/custom-fields.component.ts</context> | ||||
|           <context context-type="linenumber">73</context> | ||||
| @@ -5428,8 +5420,8 @@ | ||||
|           <context context-type="linenumber">36</context> | ||||
|         </context-group> | ||||
|       </trans-unit> | ||||
|       <trans-unit id="8312409092917397847" datatype="html"> | ||||
|         <source>Redo OCR</source> | ||||
|       <trans-unit id="2696010339872056565" datatype="html"> | ||||
|         <source>Reprocess</source> | ||||
|         <context-group purpose="location"> | ||||
|           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context> | ||||
|           <context context-type="linenumber">49</context> | ||||
| @@ -5901,8 +5893,8 @@ | ||||
|           <context context-type="linenumber">799</context> | ||||
|         </context-group> | ||||
|       </trans-unit> | ||||
|       <trans-unit id="7362691899087997122" datatype="html"> | ||||
|         <source>Redo OCR confirm</source> | ||||
|       <trans-unit id="619486176823357521" datatype="html"> | ||||
|         <source>Reprocess confirm</source> | ||||
|         <context-group purpose="location"> | ||||
|           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> | ||||
|           <context context-type="linenumber">819</context> | ||||
| @@ -5912,15 +5904,22 @@ | ||||
|           <context context-type="linenumber">751</context> | ||||
|         </context-group> | ||||
|       </trans-unit> | ||||
|       <trans-unit id="9197453786953646058" datatype="html"> | ||||
|         <source>This operation will permanently redo OCR for this document.</source> | ||||
|       <trans-unit id="2951161989614003846" datatype="html"> | ||||
|         <source>This operation will permanently recreate the archive file for this document.</source> | ||||
|         <context-group purpose="location"> | ||||
|           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> | ||||
|           <context context-type="linenumber">820</context> | ||||
|         </context-group> | ||||
|       </trans-unit> | ||||
|       <trans-unit id="5729001209753056399" datatype="html"> | ||||
|         <source>Redo OCR operation will begin in the background. Close and re-open or reload this document after the operation has completed to see new content.</source> | ||||
|       <trans-unit id="302054111564709516" datatype="html"> | ||||
|         <source>The archive file will be re-generated with the current settings.</source> | ||||
|         <context-group purpose="location"> | ||||
|           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> | ||||
|           <context context-type="linenumber">821</context> | ||||
|         </context-group> | ||||
|       </trans-unit> | ||||
|       <trans-unit id="1192507664585066165" datatype="html"> | ||||
|         <source>Reprocess operation will begin in the background. Close and re-open or reload this document after the operation has completed to see new content.</source> | ||||
|         <context-group purpose="location"> | ||||
|           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> | ||||
|           <context context-type="linenumber">831</context> | ||||
| @@ -6372,13 +6371,20 @@ | ||||
|           <context context-type="linenumber">716</context> | ||||
|         </context-group> | ||||
|       </trans-unit> | ||||
|       <trans-unit id="8968869182645922415" datatype="html"> | ||||
|         <source>This operation will permanently redo OCR for <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source> | ||||
|       <trans-unit id="8585195717323764335" datatype="html"> | ||||
|         <source>This operation will permanently recreate the archive files for <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source> | ||||
|         <context-group purpose="location"> | ||||
|           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context> | ||||
|           <context context-type="linenumber">752</context> | ||||
|         </context-group> | ||||
|       </trans-unit> | ||||
|       <trans-unit id="7366623494074776040" datatype="html"> | ||||
|         <source>The archive files will be re-generated with the current settings.</source> | ||||
|         <context-group purpose="location"> | ||||
|           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context> | ||||
|           <context context-type="linenumber">753</context> | ||||
|         </context-group> | ||||
|       </trans-unit> | ||||
|       <trans-unit id="6390006284731990222" datatype="html"> | ||||
|         <source>This operation will permanently rotate the original version of <x id="PH" equiv-text="this.list.selected.size"/> document(s).</source> | ||||
|         <context-group purpose="location"> | ||||
|   | ||||
| @@ -45,8 +45,8 @@ | ||||
|       <div class="d-none d-sm-inline"> <ng-container i18n>Actions</ng-container></div> | ||||
|     </button> | ||||
|     <div ngbDropdownMenu aria-labelledby="actionsDropdown" class="shadow"> | ||||
|       <button ngbDropdownItem (click)="redoOcr()" [disabled]="!userCanEdit"> | ||||
|         <i-bs width="1em" height="1em" name="arrow-counterclockwise"></i-bs> <span i18n>Redo OCR</span> | ||||
|       <button ngbDropdownItem (click)="reprocess()" [disabled]="!userCanEdit"> | ||||
|         <i-bs width="1em" height="1em" name="arrow-counterclockwise"></i-bs> <span i18n>Reprocess</span> | ||||
|       </button> | ||||
|  | ||||
|       <button ngbDropdownItem (click)="moreLike()"> | ||||
|   | ||||
| @@ -652,7 +652,7 @@ describe('DocumentDetailComponent', () => { | ||||
|     ]) | ||||
|   }) | ||||
|  | ||||
|   it('should support redo ocr, confirm and close modal after started', () => { | ||||
|   it('should support reprocess, confirm and close modal after started', () => { | ||||
|     initNormally() | ||||
|     const bulkEditSpy = jest.spyOn(documentService, 'bulkEdit') | ||||
|     bulkEditSpy.mockReturnValue(of(true)) | ||||
| @@ -660,10 +660,10 @@ describe('DocumentDetailComponent', () => { | ||||
|     modalService.activeInstances.subscribe((modal) => (openModal = modal[0])) | ||||
|     const modalSpy = jest.spyOn(modalService, 'open') | ||||
|     const toastSpy = jest.spyOn(toastService, 'showInfo') | ||||
|     component.redoOcr() | ||||
|     component.reprocess() | ||||
|     const modalCloseSpy = jest.spyOn(openModal, 'close') | ||||
|     openModal.componentInstance.confirmClicked.next() | ||||
|     expect(bulkEditSpy).toHaveBeenCalledWith([doc.id], 'redo_ocr', {}) | ||||
|     expect(bulkEditSpy).toHaveBeenCalledWith([doc.id], 'reprocess', {}) | ||||
|     expect(modalSpy).toHaveBeenCalled() | ||||
|     expect(toastSpy).toHaveBeenCalled() | ||||
|     expect(modalCloseSpy).toHaveBeenCalled() | ||||
| @@ -675,7 +675,7 @@ describe('DocumentDetailComponent', () => { | ||||
|     let openModal: NgbModalRef | ||||
|     modalService.activeInstances.subscribe((modal) => (openModal = modal[0])) | ||||
|     const toastSpy = jest.spyOn(toastService, 'showError') | ||||
|     component.redoOcr() | ||||
|     component.reprocess() | ||||
|     const modalCloseSpy = jest.spyOn(openModal, 'close') | ||||
|     bulkEditSpy.mockReturnValue(throwError(() => new Error('error occurred'))) | ||||
|     openModal.componentInstance.confirmClicked.next() | ||||
|   | ||||
| @@ -812,23 +812,23 @@ export class DocumentDetailComponent | ||||
|     ]) | ||||
|   } | ||||
|  | ||||
|   redoOcr() { | ||||
|   reprocess() { | ||||
|     let modal = this.modalService.open(ConfirmDialogComponent, { | ||||
|       backdrop: 'static', | ||||
|     }) | ||||
|     modal.componentInstance.title = $localize`Redo OCR confirm` | ||||
|     modal.componentInstance.messageBold = $localize`This operation will permanently redo OCR for this document.` | ||||
|     modal.componentInstance.message = $localize`This operation cannot be undone.` | ||||
|     modal.componentInstance.title = $localize`Reprocess confirm` | ||||
|     modal.componentInstance.messageBold = $localize`This operation will permanently recreate the archive file for this document.` | ||||
|     modal.componentInstance.message = $localize`The archive file will be re-generated with the current settings.` | ||||
|     modal.componentInstance.btnClass = 'btn-danger' | ||||
|     modal.componentInstance.btnCaption = $localize`Proceed` | ||||
|     modal.componentInstance.confirmClicked.subscribe(() => { | ||||
|       modal.componentInstance.buttonsEnabled = false | ||||
|       this.documentsService | ||||
|         .bulkEdit([this.document.id], 'redo_ocr', {}) | ||||
|         .bulkEdit([this.document.id], 'reprocess', {}) | ||||
|         .subscribe({ | ||||
|           next: () => { | ||||
|             this.toastService.showInfo( | ||||
|               $localize`Redo OCR operation will begin in the background. Close and re-open or reload this document after the operation has completed to see new content.` | ||||
|               $localize`Reprocess operation will begin in the background. Close and re-open or reload this document after the operation has completed to see new content.` | ||||
|             ) | ||||
|             if (modal) { | ||||
|               modal.close() | ||||
|   | ||||
| @@ -107,8 +107,8 @@ | ||||
|                 <div class="d-none d-sm-inline"> <ng-container i18n>Actions</ng-container></div> | ||||
|               </button> | ||||
|               <div ngbDropdownMenu aria-labelledby="dropdownSelect" class="shadow"> | ||||
|                 <button ngbDropdownItem (click)="redoOcrSelected()" [disabled]="!userCanEditAll"> | ||||
|                   <i-bs name="body-text"></i-bs> <ng-container i18n>Redo OCR</ng-container> | ||||
|                 <button ngbDropdownItem (click)="reprocessSelected()" [disabled]="!userCanEditAll"> | ||||
|                   <i-bs name="body-text"></i-bs> <ng-container i18n>Reprocess</ng-container> | ||||
|                 </button> | ||||
|                 <button ngbDropdownItem (click)="rotateSelected()" [disabled]="!userOwnsAll"> | ||||
|                   <i-bs name="arrow-clockwise"></i-bs> <ng-container i18n>Rotate</ng-container> | ||||
|   | ||||
| @@ -961,7 +961,7 @@ describe('BulkEditorComponent', () => { | ||||
|       .mockReturnValue(true) | ||||
|     component.showConfirmationDialogs = true | ||||
|     fixture.detectChanges() | ||||
|     component.redoOcrSelected() | ||||
|     component.reprocessSelected() | ||||
|     expect(modal).not.toBeUndefined() | ||||
|     modal.componentInstance.confirm() | ||||
|     let req = httpTestingController.expectOne( | ||||
| @@ -970,7 +970,7 @@ describe('BulkEditorComponent', () => { | ||||
|     req.flush(true) | ||||
|     expect(req.request.body).toEqual({ | ||||
|       documents: [3, 4], | ||||
|       method: 'redo_ocr', | ||||
|       method: 'reprocess', | ||||
|       parameters: {}, | ||||
|     }) | ||||
|     httpTestingController.match( | ||||
|   | ||||
| @@ -744,20 +744,20 @@ export class BulkEditorComponent | ||||
|       }) | ||||
|   } | ||||
|  | ||||
|   redoOcrSelected() { | ||||
|   reprocessSelected() { | ||||
|     let modal = this.modalService.open(ConfirmDialogComponent, { | ||||
|       backdrop: 'static', | ||||
|     }) | ||||
|     modal.componentInstance.title = $localize`Redo OCR confirm` | ||||
|     modal.componentInstance.messageBold = $localize`This operation will permanently redo OCR for ${this.list.selected.size} selected document(s).` | ||||
|     modal.componentInstance.message = $localize`This operation cannot be undone.` | ||||
|     modal.componentInstance.title = $localize`Reprocess confirm` | ||||
|     modal.componentInstance.messageBold = $localize`This operation will permanently recreate the archive files for ${this.list.selected.size} selected document(s).` | ||||
|     modal.componentInstance.message = $localize`The archive files will be re-generated with the current settings.` | ||||
|     modal.componentInstance.btnClass = 'btn-danger' | ||||
|     modal.componentInstance.btnCaption = $localize`Proceed` | ||||
|     modal.componentInstance.confirmClicked | ||||
|       .pipe(takeUntil(this.unsubscribeNotifier)) | ||||
|       .subscribe(() => { | ||||
|         modal.componentInstance.buttonsEnabled = false | ||||
|         this.executeBulkOperation(modal, 'redo_ocr', {}) | ||||
|         this.executeBulkOperation(modal, 'reprocess', {}) | ||||
|       }) | ||||
|   } | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 shamoon
					shamoon