diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..08b19bdee --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,13 @@ +# Contributing + +If you feel that somethings is not working, please submit an issue. You can also ask questions on the issue tracker by tagging your question with the question tag. + +Pull requests are welcome, however, I will be a little bit more strict about what goes into the code and what does not. If you want to make a big change, please ask me about it first. + +* When making additions to the project, consider if the majority of users will benefit from your change. If not, you're probably better of forking the project. +* Also consider if your change will get in the way of other users. A good change is a change that enhances the experience of some users who want that change and does not affect users who do not care about the change. + +However: + +* Bug fixes and are always welcome. Docker makes things easier, however, I alone cannot ensure that this runs on all platforms. +* Improvements to the styling of the front-end are always welcome. I'm no expert in things UX, and simply copied one of the Bootstrap examples. I think it turned out rather good, but I just can't seem to get some things working properly. diff --git a/Dockerfile b/Dockerfile index 85eadc21e..3b58d3ff5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,5 @@ +LABEL maintainer="Jonas Winkler " + ############################################################################### ### Front end ### ############################################################################### diff --git a/README.md b/README.md index 6003090fa..a4edbb87b 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -[ en | [de](README-de.md) | [el](README-el.md) ] +[Paperless](https://github.com/the-paperless-project/paperless) is an application by Daniel Quinn and others that indexes your scanned documents and allows you to easily search for documents and store metadata alongside your documents. -![Paperless](https://raw.githubusercontent.com/jonaswinkler/paperless/master/src/paperless/static/paperless/img/logo-dark.png) +Paperless-ng is a fork of the original project, adding a new interface and many other changes under the hood. For a detailed list of changes, see below. -[Paperless](https://github.com/the-paperless-project/paperless) is an application by Daniel Quinn and others that indexes your scanned documents and allows you to easily search for documents and store metadata alongside your documents. This project extends on the project and modernizes many things. +This project is still in development and some things may not work as expected. This project is still under development. There also is no automatic way yet to migrate your current paperless setup to this version. I'm working on that. @@ -20,7 +20,9 @@ Here's what you get: ![The before and after](https://raw.githubusercontent.com/the-paperless-project/paperless/master/docs/_static/screenshot.png) -# What is different in this version of Paperless? +# Why Paperless-ng? + +I wanted to make big changes to the project that will impact the way it is used by its users greatly. Among the users who currently use paperless in production there are probably many that don't want these changes right away. I also wanted to have more control over what goes into the code and what does not. Therefore, paperless-ng was created. NG stands for both Angular (the framework used for the Frontend) and next-gen. Publishing this project under a different name also avoids confusion between paperless and paperless-ng. This is a list of changes that have been made to the original project. @@ -86,9 +88,13 @@ Please be aware that this uses a postgres database instead of sqlite. If you wan Alternatively, you can install the dependencies and setup apache and a database server yourself. Details for that will be available in the documentation. +# Migrating to paperless-ng + +Don't do it yet. The migrations are in place, but I have not verified yet that they work. + # Documentation -The documentation for Paperless is available on [ReadTheDocs](https://paperless.readthedocs.io/). Updated documentation for this project is not yet available. +The documentation for Paperless is available on [ReadTheDocs](https://paperless-ng.readthedocs.io/). Updated documentation for this project is not yet available. # Affiliated Projects @@ -99,11 +105,6 @@ Paperless has been around a while now, and people are starting to build stuff on * [ansible-role-paperless](https://github.com/ovv/ansible-role-paperless): An easy way to get Paperless running via Ansible. * [paperless-cli](https://github.com/stgarf/paperless-cli): A golang command line binary to interact with a Paperless instance. -# Similar Projects - -There's another project out there called [Mayan EDMS](https://www.mayan-edms.com/) that has a surprising amount of technical overlap with Paperless. Also based on Django and using a consumer model with Tesseract and Unpaper, Mayan EDMS is *much* more featureful and comes with a slick UI as well, but still in Python 2. It may be that Paperless consumes fewer resources, but to be honest, this is just a guess as I haven't tested this myself. One thing's for certain though, *Paperless* is a **way** better name. - - # Important Note Document scanners are typically used to scan sensitive documents. Things like your social insurance number, tax records, invoices, etc. Everything is stored in the clear without encryption by default (it needs to be searchable, so if someone has ideas on how to do that on encrypted data, I'm all ears). This means that Paperless should never be run on an untrusted host. Instead, I recommend that if you do want to use it, run it locally on a server in your own home. diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index dce6a9225..e10bdbd0c 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -38,6 +38,8 @@ import { SelectComponent } from './components/common/input/select/select.compone import { CheckComponent } from './components/common/input/check/check.component'; import { SaveViewConfigDialogComponent } from './components/document-list/save-view-config-dialog/save-view-config-dialog.component'; import { InfiniteScrollModule } from 'ngx-infinite-scroll'; +import { DateTimeComponent } from './components/common/input/date-time/date-time.component'; +import { TagsComponent } from './components/common/input/tags/tags.component'; @NgModule({ declarations: [ @@ -69,7 +71,9 @@ import { InfiniteScrollModule } from 'ngx-infinite-scroll'; TextComponent, SelectComponent, CheckComponent, - SaveViewConfigDialogComponent + SaveViewConfigDialogComponent, + DateTimeComponent, + TagsComponent ], imports: [ BrowserModule, diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.ts index 595da5b1d..fcd05f2fc 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.ts +++ b/src-ui/src/app/components/app-frame/app-frame.component.ts @@ -69,7 +69,7 @@ export class AppFrameComponent implements OnInit, OnDestroy { } ngOnInit() { - this.openDocumentsSubscription = this.openDocumentsService.getOpenDocuments().subscribe(docs => this.openDocuments = docs) + this.openDocuments = this.openDocumentsService.getOpenDocuments() } ngOnDestroy() { diff --git a/src-ui/src/app/components/common/input/date-time/date-time.component.css b/src-ui/src/app/components/common/input/date-time/date-time.component.css new file mode 100644 index 000000000..e69de29bb diff --git a/src-ui/src/app/components/common/input/date-time/date-time.component.html b/src-ui/src/app/components/common/input/date-time/date-time.component.html new file mode 100644 index 000000000..eaed0e185 --- /dev/null +++ b/src-ui/src/app/components/common/input/date-time/date-time.component.html @@ -0,0 +1,14 @@ +
+
+ + +
+
+ + +
+ +
+ + + \ No newline at end of file diff --git a/src-ui/src/app/components/common/input/date-time/date-time.component.spec.ts b/src-ui/src/app/components/common/input/date-time/date-time.component.spec.ts new file mode 100644 index 000000000..0657768bd --- /dev/null +++ b/src-ui/src/app/components/common/input/date-time/date-time.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { DateTimeComponent } from './date-time.component'; + +describe('DateTimeComponent', () => { + let component: DateTimeComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ DateTimeComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(DateTimeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src-ui/src/app/components/common/input/date-time/date-time.component.ts b/src-ui/src/app/components/common/input/date-time/date-time.component.ts new file mode 100644 index 000000000..f8b66133a --- /dev/null +++ b/src-ui/src/app/components/common/input/date-time/date-time.component.ts @@ -0,0 +1,62 @@ +import { formatDate } from '@angular/common'; +import { Component, forwardRef, Input, OnInit } from '@angular/core'; +import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; +import { AbstractInputComponent } from '../abstract-input'; + +@Component({ + providers: [{ + provide: NG_VALUE_ACCESSOR, + useExisting: forwardRef(() => DateTimeComponent), + multi: true + }], + selector: 'app-input-date-time', + templateUrl: './date-time.component.html', + styleUrls: ['./date-time.component.css'] +}) +export class DateTimeComponent implements OnInit,ControlValueAccessor { + + constructor() { + } + + onChange = (newValue: any) => {}; + + onTouched = () => {}; + + writeValue(newValue: any): void { + this.dateValue = formatDate(newValue, 'yyyy-MM-dd', "en-US") + this.timeValue = formatDate(newValue, 'HH:mm:ss', 'en-US') + } + registerOnChange(fn: any): void { + this.onChange = fn; + } + registerOnTouched(fn: any): void { + this.onTouched = fn; + } + setDisabledState?(isDisabled: boolean): void { + this.disabled = isDisabled; + } + + @Input() + titleDate: string = "Date" + + @Input() + titleTime: string = "Time" + + @Input() + disabled: boolean = false + + @Input() + hint: string + + timeValue + + dateValue + + ngOnInit(): void { + } + + dateOrTimeChanged() { + this.onChange(formatDate(this.dateValue + "T" + this.timeValue,"yyyy-MM-ddTHH:mm:ssZZZZZ", "en-us", "UTC")) + } + +} diff --git a/src-ui/src/app/components/common/input/tags/tags.component.css b/src-ui/src/app/components/common/input/tags/tags.component.css new file mode 100644 index 000000000..f2635b7f2 --- /dev/null +++ b/src-ui/src/app/components/common/input/tags/tags.component.css @@ -0,0 +1,10 @@ +.tags-form-control { + height: auto; +} + + +.scrollable-menu { + height: auto; + max-height: 300px; + overflow-x: hidden; +} \ No newline at end of file diff --git a/src-ui/src/app/components/common/input/tags/tags.component.html b/src-ui/src/app/components/common/input/tags/tags.component.html new file mode 100644 index 000000000..b2ad0944f --- /dev/null +++ b/src-ui/src/app/components/common/input/tags/tags.component.html @@ -0,0 +1,30 @@ +
+ + +
+
+ +
+ +
+ +
+ +
+
+ +
+ + +
+ +
+ {{hint}} + +
\ No newline at end of file diff --git a/src-ui/src/app/components/common/input/tags/tags.component.spec.ts b/src-ui/src/app/components/common/input/tags/tags.component.spec.ts new file mode 100644 index 000000000..582775da4 --- /dev/null +++ b/src-ui/src/app/components/common/input/tags/tags.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TagsComponent } from './tags.component'; + +describe('TagsComponent', () => { + let component: TagsComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ TagsComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(TagsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src-ui/src/app/components/common/input/tags/tags.component.ts b/src-ui/src/app/components/common/input/tags/tags.component.ts new file mode 100644 index 000000000..7b5a36e90 --- /dev/null +++ b/src-ui/src/app/components/common/input/tags/tags.component.ts @@ -0,0 +1,96 @@ +import { ThrowStmt } from '@angular/compiler'; +import { Component, forwardRef, Input, OnInit } from '@angular/core'; +import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { Observable } from 'rxjs'; +import { TagEditDialogComponent } from 'src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component'; +import { PaperlessTag } from 'src/app/data/paperless-tag'; +import { TagService } from 'src/app/services/rest/tag.service'; + +@Component({ + providers: [{ + provide: NG_VALUE_ACCESSOR, + useExisting: forwardRef(() => TagsComponent), + multi: true + }], + selector: 'app-input-tags', + templateUrl: './tags.component.html', + styleUrls: ['./tags.component.css'] +}) +export class TagsComponent implements OnInit, ControlValueAccessor { + + constructor(private tagService: TagService, private modalService: NgbModal) { } + + + onChange = (newValue: number[]) => {}; + + onTouched = () => {}; + + writeValue(newValue: number[]): void { + this.value = newValue + if (this.tags) { + this.displayValue = newValue + } + } + registerOnChange(fn: any): void { + this.onChange = fn; + } + registerOnTouched(fn: any): void { + this.onTouched = fn; + } + setDisabledState?(isDisabled: boolean): void { + this.disabled = isDisabled; + } + + ngOnInit(): void { + this.tagService.listAll().subscribe(result => { + this.tags = result.results + this.displayValue = this.value + }) + } + + @Input() + disabled = false + + @Input() + hint + + value: number[] + + displayValue: number[] = [] + + tags: PaperlessTag[] + + getTag(id) { + return this.tags.find(tag => tag.id == id) + } + + removeTag(id) { + let index = this.displayValue.indexOf(id) + if (index > -1) { + this.displayValue.splice(index, 1) + this.onChange(this.displayValue) + } + } + + addTag(id) { + let index = this.displayValue.indexOf(id) + if (index == -1) { + this.displayValue.push(id) + this.onChange(this.displayValue) + } + } + + + createTag() { + var modal = this.modalService.open(TagEditDialogComponent, {backdrop: 'static'}) + modal.componentInstance.dialogMode = 'create' + modal.componentInstance.success.subscribe(newTag => { + this.tagService.list().subscribe(tags => { + this.tags = tags.results + this.addTag(newTag.id) + }) + }) + } + +} diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html index f6bb4cebb..577b61a55 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.html +++ b/src-ui/src/app/components/document-detail/document-detail.component.html @@ -3,19 +3,19 @@ - Delete + Delete - Download + Download @@ -32,16 +32,7 @@ formControlName='archive_serial_number'> -
-
- - -
-
- - -
-
+
@@ -52,26 +43,9 @@ -
- + -
- - -
- -
- -
- Hold CTRL to (de)select multiple tags. - -
+       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 308e499a4..ad9a3ac07 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 @@ -33,13 +33,11 @@ export class DocumentDetailComponent implements OnInit { correspondents: PaperlessCorrespondent[] documentTypes: PaperlessDocumentType[] - tags: PaperlessTag[] documentForm: FormGroup = new FormGroup({ title: new FormControl(''), content: new FormControl(''), - created_date: new FormControl(), - created_time: new FormControl(), + created: new FormControl(), correspondent_id: new FormControl(), document_type_id: new FormControl(), archive_serial_number: new FormControl(), @@ -51,7 +49,6 @@ export class DocumentDetailComponent implements OnInit { private route: ActivatedRoute, private correspondentService: CorrespondentService, private documentTypeService: DocumentTypeService, - private tagService: TagService, private datePipe: DatePipe, private router: Router, private modalService: NgbModal, @@ -59,35 +56,33 @@ export class DocumentDetailComponent implements OnInit { private documentListViewService: DocumentListViewService) { } ngOnInit(): void { - this.correspondentService.list().subscribe(result => this.correspondents = result.results) - this.documentTypeService.list().subscribe(result => this.documentTypes = result.results) - this.tagService.list().subscribe(result => this.tags = result.results) + this.documentForm.valueChanges.subscribe(wow => { + Object.assign(this.document, this.documentForm.value) + }) + + this.correspondentService.listAll().subscribe(result => this.correspondents = result.results) + this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results) this.route.paramMap.subscribe(paramMap => { this.documentId = +paramMap.get('id') this.previewUrl = this.documentsService.getPreviewUrl(this.documentId) this.downloadUrl = this.documentsService.getDownloadUrl(this.documentId) - this.documentsService.get(this.documentId).subscribe(doc => { - this.openDocumentService.openDocument(doc) - this.document = doc - this.title = doc.title - this.documentForm.patchValue(doc) - this.documentForm.get('created_date').patchValue(this.datePipe.transform(doc.created, 'yyyy-MM-dd')) - this.documentForm.get('created_time').patchValue(this.datePipe.transform(doc.created, 'HH:mm:ss')) - }, error => {this.router.navigate(['404'])}) + if (this.openDocumentService.getOpenDocument(this.documentId)) { + this.updateComponent(this.openDocumentService.getOpenDocument(this.documentId)) + } else { + this.documentsService.get(this.documentId).subscribe(doc => { + this.openDocumentService.openDocument(doc) + this.updateComponent(doc) + }, error => {this.router.navigate(['404'])}) + } }) } - createTag() { - var modal = this.modalService.open(TagEditDialogComponent, {backdrop: 'static'}) - modal.componentInstance.dialogMode = 'create' - modal.componentInstance.success.subscribe(newTag => { - this.tagService.list().subscribe(tags => { - this.tags = tags.results - this.documentForm.get('tags_id').setValue(this.documentForm.get('tags_id').value.concat([newTag.id])) - }) - }) + updateComponent(doc: PaperlessDocument) { + this.document = doc + this.title = doc.title + this.documentForm.patchValue(doc) } createDocumentType() { @@ -112,50 +107,22 @@ export class DocumentDetailComponent implements OnInit { }) } - getTag(id: number): PaperlessTag { - return this.tags.find(tag => tag.id == id) + discard() { + this.documentsService.get(this.documentId).subscribe(doc => { + Object.assign(this.document, doc) + this.title = doc.title + this.documentForm.patchValue(doc) + }, error => {this.router.navigate(['404'])}) } - getColour(id: number) { - return TAG_COLOURS.find(c => c.id == this.getTag(id).colour) - } - - addTag(id: number) { - if (this.documentForm.value.tags.indexOf(id) == -1) { - this.documentForm.value.tags.push(id) - } - } - - removeTag(id: number) { - let index = this.documentForm.value.tags.indexOf(id) - if (index > -1) { - this.documentForm.value.tags.splice(index, 1) - } - } - - getDateCreated() { - let newDate = this.documentForm.value.created_date - let newTime = this.documentForm.value.created_time - return formatDate(newDate + "T" + newTime,"yyyy-MM-ddTHH:mm:ssZZZZZ", "en-us", "UTC") - - } - - save() { - let newDocument = Object.assign(Object.assign({}, this.document), this.documentForm.value) - - newDocument.created = this.getDateCreated() - - this.documentsService.update(newDocument).subscribe(result => { + save() { + this.documentsService.update(this.document).subscribe(result => { this.close() }) } saveEditNext() { - let newDocument = Object.assign(Object.assign({}, this.document), this.documentForm.value) - - newDocument.created = this.getDateCreated() - - this.documentsService.update(newDocument).subscribe(result => { + this.documentsService.update(this.document).subscribe(result => { this.documentListViewService.getNext(this.document.id).subscribe(nextDocId => { if (nextDocId) { this.openDocumentService.closeDocument(this.document) diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html index b66cfbfa0..1455cabbc 100644 --- a/src-ui/src/app/components/document-list/document-list.component.html +++ b/src-ui/src/app/components/document-list/document-list.component.html @@ -73,7 +73,7 @@
-
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.html b/src-ui/src/app/components/filter-editor/filter-editor.component.html index 1cca0fd7f..48780e950 100644 --- a/src-ui/src/app/components/filter-editor/filter-editor.component.html +++ b/src-ui/src/app/components/filter-editor/filter-editor.component.html @@ -1,8 +1,5 @@
- {{rule.type.name}}
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts index 8c47ceafb..dc23450c5 100644 --- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts +++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts @@ -52,9 +52,9 @@ export class FilterEditorComponent implements OnInit { } ngOnInit(): void { - this.correspondentService.list().subscribe(result => {this.correspondents = result.results}) - this.tagService.list().subscribe(result => this.tags = result.results) - this.documentTypeService.list().subscribe(result => this.documentTypes = result.results) + this.correspondentService.listAll().subscribe(result => {this.correspondents = result.results}) + this.tagService.listAll().subscribe(result => this.tags = result.results) + this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results) } getRuleTypes() { diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html index e8931ccdf..146d0c1be 100644 --- a/src-ui/src/app/components/manage/settings/settings.component.html +++ b/src-ui/src/app/components/manage/settings/settings.component.html @@ -3,37 +3,61 @@ -
    -
  • - Document List Settings - - -
    • -
  • - Saved views - +
    - - - - - - - - - - - - - - - - - -
    TitleShow in dashboardShow in sidebarActions
    {{ config.title }}{{ config.showInDashboard }}{{ config.showInSideBar }}
    + +

    Document list

    + +
    +
    + Items per page +
    +
    + + + +
    +
    -
    \ No newline at end of file + +
    • +
  • + Saved views + + + + + + + + + + + + + + + + + + + +
    TitleShow in dashboardShow in sidebarActions
    {{ config.title }}{{ config.showInDashboard }}{{ config.showInSideBar }}
    + +     +
    • +
+ +
+ + + \ No newline at end of file diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts index c56cd6a78..e14c2bd7b 100644 --- a/src-ui/src/app/components/manage/settings/settings.component.ts +++ b/src-ui/src/app/components/manage/settings/settings.component.ts @@ -1,5 +1,8 @@ import { Component, OnInit } from '@angular/core'; +import { FormControl, FormGroup } from '@angular/forms'; import { SavedViewConfig } from 'src/app/data/saved-view-config'; +import { GENERAL_SETTINGS } from 'src/app/data/storage-keys'; +import { DocumentListViewService } from 'src/app/services/document-list-view.service'; import { SavedViewConfigService } from 'src/app/services/saved-view-config.service'; @Component({ @@ -9,11 +12,14 @@ import { SavedViewConfigService } from 'src/app/services/saved-view-config.servi }) export class SettingsComponent implements OnInit { - constructor( - private savedViewConfigService: SavedViewConfigService - ) { } + settingsForm = new FormGroup({ + 'documentListItemPerPage': new FormControl(+localStorage.getItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE) || GENERAL_SETTINGS.DOCUMENT_LIST_SIZE_DEFAULT) + }) - active + constructor( + private savedViewConfigService: SavedViewConfigService, + private documentListViewService: DocumentListViewService + ) { } ngOnInit(): void { } @@ -22,4 +28,8 @@ export class SettingsComponent implements OnInit { this.savedViewConfigService.deleteConfig(config) } + saveSettings() { + localStorage.setItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE, this.settingsForm.value.documentListItemPerPage) + this.documentListViewService.updatePageSize() + } } diff --git a/src-ui/src/app/data/storage-keys.ts b/src-ui/src/app/data/storage-keys.ts new file mode 100644 index 000000000..cc4a05ec2 --- /dev/null +++ b/src-ui/src/app/data/storage-keys.ts @@ -0,0 +1,8 @@ +export const OPEN_DOCUMENT_SERVICE = { + DOCUMENTS: 'open-documents-service:openDocuments' +} + +export const GENERAL_SETTINGS = { + DOCUMENT_LIST_SIZE: 'general-settings:documentListSize', + DOCUMENT_LIST_SIZE_DEFAULT: 50 +} \ No newline at end of file diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts index 0ea509863..e554f2c8f 100644 --- a/src-ui/src/app/services/document-list-view.service.ts +++ b/src-ui/src/app/services/document-list-view.service.ts @@ -3,6 +3,7 @@ import { Observable } from 'rxjs'; import { cloneFilterRules, FilterRule } from '../data/filter-rule'; import { PaperlessDocument } from '../data/paperless-document'; import { SavedViewConfig } from '../data/saved-view-config'; +import { GENERAL_SETTINGS } from '../data/storage-keys'; import { DocumentService, SORT_DIRECTION_DESCENDING } from './rest/document.service'; @@ -15,6 +16,7 @@ export class DocumentListViewService { documents: PaperlessDocument[] = [] currentPage = 1 + currentPageSize: number = +localStorage.getItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE) || GENERAL_SETTINGS.DOCUMENT_LIST_SIZE_DEFAULT collectionSize: number currentFilterRules: FilterRule[] = [] @@ -39,7 +41,7 @@ export class DocumentListViewService { this.documentService.list( this.currentPage, - null, + this.currentPageSize, sortField, sortDirection, filterRules).subscribe( @@ -64,7 +66,7 @@ export class DocumentListViewService { } getLastPage(): number { - return Math.ceil(this.collectionSize / 25) + return Math.ceil(this.collectionSize / this.currentPageSize) } hasNext(doc: number) { @@ -98,5 +100,13 @@ export class DocumentListViewService { }) } + updatePageSize() { + let newPageSize = +localStorage.getItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE) || GENERAL_SETTINGS.DOCUMENT_LIST_SIZE_DEFAULT + if (newPageSize != this.currentPageSize) { + this.currentPageSize = newPageSize + //this.reload() + } + } + constructor(private documentService: DocumentService) { } } diff --git a/src-ui/src/app/services/open-documents.service.ts b/src-ui/src/app/services/open-documents.service.ts index bcf4166f9..009652103 100644 --- a/src-ui/src/app/services/open-documents.service.ts +++ b/src-ui/src/app/services/open-documents.service.ts @@ -1,26 +1,38 @@ import { Injectable } from '@angular/core'; import { Observable, Subject } from 'rxjs'; import { PaperlessDocument } from '../data/paperless-document'; +import { OPEN_DOCUMENT_SERVICE } from '../data/storage-keys'; @Injectable({ providedIn: 'root' }) export class OpenDocumentsService { - constructor() { } + constructor() { + if (sessionStorage.getItem(OPEN_DOCUMENT_SERVICE.DOCUMENTS)) { + try { + this.openDocuments = JSON.parse(sessionStorage.getItem(OPEN_DOCUMENT_SERVICE.DOCUMENTS)) + } catch (e) { + sessionStorage.removeItem(OPEN_DOCUMENT_SERVICE.DOCUMENTS) + this.openDocuments = [] + } + } + } private openDocuments: PaperlessDocument[] = [] - private openDocumentsSubject: Subject = new Subject() + getOpenDocuments(): PaperlessDocument[] { + return this.openDocuments + } - getOpenDocuments(): Observable { - return this.openDocumentsSubject + getOpenDocument(id: number): PaperlessDocument { + return this.openDocuments.find(d => d.id == id) } openDocument(doc: PaperlessDocument) { if (this.openDocuments.find(d => d.id == doc.id) == null) { this.openDocuments.push(doc) - this.openDocumentsSubject.next(this.openDocuments) + this.save() } } @@ -28,8 +40,12 @@ export class OpenDocumentsService { let index = this.openDocuments.findIndex(d => d.id == doc.id) if (index > -1) { this.openDocuments.splice(index, 1) - this.openDocumentsSubject.next(this.openDocuments) + this.save() } } + save() { + sessionStorage.setItem(OPEN_DOCUMENT_SERVICE.DOCUMENTS, JSON.stringify(this.openDocuments)) + } + } diff --git a/src-ui/src/app/services/rest/abstract-paperless-service.ts b/src-ui/src/app/services/rest/abstract-paperless-service.ts index c8459f080..cdf157aaa 100644 --- a/src-ui/src/app/services/rest/abstract-paperless-service.ts +++ b/src-ui/src/app/services/rest/abstract-paperless-service.ts @@ -40,6 +40,10 @@ export abstract class AbstractPaperlessService { return this.http.get>(this.getResourceUrl(), {params: httpParams}) } + listAll(ordering?: string, extraParams?): Observable> { + return this.list(1, 100000, ordering, extraParams) + } + get(id: number): Observable { return this.http.get(this.getResourceUrl(id)) } diff --git a/src/documents/views.py b/src/documents/views.py index f8050a459..6818551f0 100755 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -52,35 +52,35 @@ class IndexView(TemplateView): class CorrespondentViewSet(ModelViewSet): model = Correspondent - queryset = Correspondent.objects.annotate(document_count=Count('documents'), last_correspondence=Max('documents__created')) + queryset = Correspondent.objects.annotate(document_count=Count('documents'), last_correspondence=Max('documents__created')).order_by('name') serializer_class = CorrespondentSerializer pagination_class = StandardPagination permission_classes = (IsAuthenticated,) filter_backends = (DjangoFilterBackend, OrderingFilter) filter_class = CorrespondentFilterSet - ordering_fields = ("name", "document_count", "last_correspondence") + ordering_fields = ("name", "matching_algorithm", "match", "document_count", "last_correspondence") class TagViewSet(ModelViewSet): model = Tag - queryset = Tag.objects.annotate(document_count=Count('documents')) + queryset = Tag.objects.annotate(document_count=Count('documents')).order_by('name') serializer_class = TagSerializer pagination_class = StandardPagination permission_classes = (IsAuthenticated,) filter_backends = (DjangoFilterBackend, OrderingFilter) filter_class = TagFilterSet - ordering_fields = ("name", "document_count") + ordering_fields = ("name", "matching_algorithm", "match", "document_count") class DocumentTypeViewSet(ModelViewSet): model = DocumentType - queryset = DocumentType.objects.annotate(document_count=Count('documents')) + queryset = DocumentType.objects.annotate(document_count=Count('documents')).order_by('name') serializer_class = DocumentTypeSerializer pagination_class = StandardPagination permission_classes = (IsAuthenticated,) filter_backends = (DjangoFilterBackend, OrderingFilter) filter_class = DocumentTypeFilterSet - ordering_fields = ("name", "document_count") + ordering_fields = ("name", "matching_algorithm", "match", "document_count") class DocumentViewSet(RetrieveModelMixin, @@ -186,12 +186,10 @@ class SearchView(APIView): page = 1 with self.ix.searcher() as searcher: - query_parser = QueryParser("content", self.ix.schema, - termclass=terms.FuzzyTerm).parse(query) + query_parser = QueryParser("content", self.ix.schema).parse(query) result_page = searcher.search_page(query_parser, page) result_page.results.fragmenter = highlight.ContextFragmenter( surround=50) - result_page.results.fragmenter = highlight.PinpointFragmenter() result_page.results.formatter = index.JsonFormatter() return Response( diff --git a/src/paperless/settings.py b/src/paperless/settings.py index e6aa86217..bb71e4764 100644 --- a/src/paperless/settings.py +++ b/src/paperless/settings.py @@ -125,7 +125,12 @@ TEMPLATES = [ # NEVER RUN WITH DEBUG IN PRODUCTION. DEBUG = __get_boolean("PAPERLESS_DEBUG", "NO") -X_FRAME_OPTIONS = 'SAMEORIGIN' +if DEBUG: + X_FRAME_OPTIONS = '' + # this should really be 'allow-from uri' but its not supported in any mayor + # browser. +else: + X_FRAME_OPTIONS = 'SAMEORIGIN' # We allow CORS from localhost:8080 CORS_ORIGIN_WHITELIST = tuple(os.getenv("PAPERLESS_CORS_ALLOWED_HOSTS", "http://localhost:8080,https://localhost:8080").split(","))