paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-02 13:45:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

More efficient rule equivalency checking

Browse Source
This commit is contained in:
Michael Shamoon 2021-01-06 11:12:43 -08:00
parent ac459b84c6
commit 858bca0f7d
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src-ui/src/app/components/document-list/document-list.component.ts
View File

@ -121,7 +121,7 @@ export class DocumentListComponent implements OnInit {
} }
resetFilters(): void { resetFilters(): void {
this.filterRulesModified = false; this.filterRulesModified = false
if (this.list.savedViewId) { if (this.list.savedViewId) {
this.savedViewService.getCached(this.list.savedViewId).subscribe(viewUntouched => { this.savedViewService.getCached(this.list.savedViewId).subscribe(viewUntouched => {
this.list.filterRules = viewUntouched.filter_rules this.list.filterRules = viewUntouched.filter_rules
@ -144,12 +144,16 @@ export class DocumentListComponent implements OnInit {
if (this.list.filterRules.length !== filterRulesInitial.length) modified = true if (this.list.filterRules.length !== filterRulesInitial.length) modified = true
else { else {
this.list.filterRules.forEach(rule => { modified = this.list.filterRules.some(rule => {
if (filterRulesInitial.find(fri => fri.rule_type == rule.rule_type && fri.value == rule.value) == undefined) modified = true return (filterRulesInitial.find(fri => fri.rule_type == rule.rule_type && fri.value == rule.value) == undefined)
})
filterRulesInitial.forEach(rule => {
if (this.list.filterRules.find(fr => fr.rule_type == rule.rule_type && fr.value == rule.value) == undefined) modified = true
}) })
if (!modified) {
// only check other direction if we havent already determined is modified
modified = filterRulesInitial.some(rule => {
this.list.filterRules.find(fr => fr.rule_type == rule.rule_type && fr.value == rule.value) == undefined
})
}
} }
}) })
} }