lgcosta/paperless-ngx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some clearing stuff

Browse Source
This commit is contained in:
shamoon 2024-09-09 13:04:29 -07:00
parent 03fec3fa3e
commit bddca47924
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.ts
View File

@ -35,6 +35,13 @@ export class CustomFieldQueriesModel {
)
}
public isEmpty(): boolean {
return (
this.queries.length === 0 ||
(this.queries.length === 1 && this.queries[0].value.length === 0)
)
}
private validateAtom(atom: CustomFieldQueryAtom) {
let valid: boolean = !!(atom.field && atom.operator && atom.value)
return valid
@ -112,6 +119,9 @@ export class CustomFieldQueriesModel {
return
}
foundComponent.changed.complete()
if (this.isEmpty()) {
this.clear()
}
this.changed.next(this)
}
}
@ -161,7 +171,7 @@ export class CustomFieldsQueryDropdownComponent {
if (this._selectionModel) {
this._selectionModel.changed.complete()
}
model.changed.subscribe((updatedModel) => {
model.changed.subscribe(() => {
this.onModelChange()
})
this._selectionModel = model
@ -172,7 +182,7 @@ export class CustomFieldsQueryDropdownComponent {
}
private onModelChange() {
if (this.selectionModel.isValid()) {
if (this.selectionModel.isEmpty() || this.selectionModel.isValid()) {
this.selectionModelChange.next(this.selectionModel)
}
}

2
src-ui/src/app/data/custom-field-query.ts
View File

@ -268,7 +268,7 @@ export class CustomFieldQueryExpression extends CustomFieldQueryElement {
super(CustomFieldQueryElementType.Expression)
let values
;[this._operator, values] = expressionArray
if (!values) {
if (!values || values.length === 0) {
this._value = []
} else if (values?.length > 0 && values[0] instanceof Array) {
this._value = values.map((value) => {