paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-11-03 03:16:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

ASN 'is null' from frontend

Browse Source
This commit is contained in:
Michael Shamoon
2022-05-10 21:21:57 -07:00
parent f51ef87b54
commit 751e46c44f
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
View File

@@ -8,7 +8,13 @@
<button *ngFor="let t of textFilterTargets" ngbDropdownItem [class.active]="textFilterTarget == t.id" (click)="changeTextFilterTarget(t.id)">{{t.name}}</button> <button *ngFor="let t of textFilterTargets" ngbDropdownItem [class.active]="textFilterTarget == t.id" (click)="changeTextFilterTarget(t.id)">{{t.name}}</button>
</div> </div>
</div> </div>
<input #textFilterInput class="form-control form-control-sm" type="text" [(ngModel)]="textFilter" (keyup.enter)="textFilterEnter()" [readonly]="textFilterTarget == 'fulltext-morelike'"> <div *ngIf="textFilterTarget == 'asn'" class="input-group-text py-0">
<div class="form-check form-switch m-0">
<input class="form-check-input" type="checkbox" role="switch" [(ngModel)]="textFilterTargetIsNull" (change)="updateRules()">
<label class="form-check-label" [class.text-muted]="!textFilterTargetIsNull" i18n>Is empty</label>
</div>
</div>
<input #textFilterInput class="form-control form-control-sm" type="text" [disabled]="textFilterTargetIsNull" [(ngModel)]="textFilter" (keyup.enter)="textFilterEnter()" [readonly]="textFilterTarget == 'fulltext-morelike'">
</div> </div>
</div> </div>
</div> </div>

18
src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
View File

@@ -33,6 +33,7 @@ import {
FILTER_DOES_NOT_HAVE_TAG, FILTER_DOES_NOT_HAVE_TAG,
FILTER_TITLE, FILTER_TITLE,
FILTER_TITLE_CONTENT, FILTER_TITLE_CONTENT,
FILTER_ASN_ISNULL,
} from 'src/app/data/filter-rule-type' } from 'src/app/data/filter-rule-type'
import { FilterableDropdownSelectionModel } from '../../common/filterable-dropdown/filterable-dropdown.component' import { FilterableDropdownSelectionModel } from '../../common/filterable-dropdown/filterable-dropdown.component'
import { ToggleableItemState } from '../../common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component' import { ToggleableItemState } from '../../common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component'
@@ -135,6 +136,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
} }
textFilterTarget = TEXT_FILTER_TARGET_TITLE_CONTENT textFilterTarget = TEXT_FILTER_TARGET_TITLE_CONTENT
textFilterTargetIsNull: boolean = false
get textFilterTargetName() { get textFilterTargetName() {
return this.textFilterTargets.find((t) => t.id == this.textFilterTarget) return this.textFilterTargets.find((t) => t.id == this.textFilterTarget)
@@ -176,6 +178,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
this.dateAddedAfter = null this.dateAddedAfter = null
this.dateCreatedBefore = null this.dateCreatedBefore = null
this.dateCreatedAfter = null this.dateCreatedAfter = null
this.textFilterTargetIsNull = false
value.forEach((rule) => { value.forEach((rule) => {
switch (rule.rule_type) { switch (rule.rule_type) {
@@ -254,6 +257,10 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
false false
) )
break break
case FILTER_ASN_ISNULL:
this.textFilterTarget = TEXT_FILTER_TARGET_ASN
this.textFilterTargetIsNull = rule.value == 'true'
break
} }
}) })
this.checkIfRulesHaveChanged() this.checkIfRulesHaveChanged()
@@ -273,8 +280,15 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
if (this._textFilter && this.textFilterTarget == TEXT_FILTER_TARGET_TITLE) { if (this._textFilter && this.textFilterTarget == TEXT_FILTER_TARGET_TITLE) {
filterRules.push({ rule_type: FILTER_TITLE, value: this._textFilter }) filterRules.push({ rule_type: FILTER_TITLE, value: this._textFilter })
} }
if (this._textFilter && this.textFilterTarget == TEXT_FILTER_TARGET_ASN) { if (this.textFilterTarget == TEXT_FILTER_TARGET_ASN) {
if (this.textFilter?.length && !this.textFilterTargetIsNull) {
filterRules.push({ rule_type: FILTER_ASN, value: this._textFilter }) filterRules.push({ rule_type: FILTER_ASN, value: this._textFilter })
} else if (!this.textFilter?.length) {
filterRules.push({
rule_type: FILTER_ASN_ISNULL,
value: this.textFilterTargetIsNull.toString(),
})
}
} }
if ( if (
this._textFilter && this._textFilter &&
@@ -398,7 +412,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
} }
get textFilter() { get textFilter() {
return this._textFilter return this.textFilterTargetIsNull ? '' : this._textFilter
} }
set textFilter(value) { set textFilter(value) {