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

lookup --> query

Browse Source
This commit is contained in:
shamoon
2024-09-23 13:35:36 -07:00
parent 9c09719dbd
commit 7a6d0c5b12
9 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,7 @@ import {
FILTER_HAS_ANY_CUSTOM_FIELDS,
FILTER_DOES_NOT_HAVE_CUSTOM_FIELDS,
FILTER_HAS_CUSTOM_FIELDS_ALL,
FILTER_CUSTOM_FIELDS_LOOKUP,
FILTER_CUSTOM_FIELDS_QUERY,
} from 'src/app/data/filter-rule-type'
import { Correspondent } from 'src/app/data/correspondent'
import { DocumentType } from 'src/app/data/document-type'
@@ -887,11 +887,11 @@ describe('FilterEditorComponent', () => {
).toEqual(['42', CustomFieldQueryOperator.Exists, 'true'])
}))
it('should ingest filter rules for custom field lookup', fakeAsync(() => {
it('should ingest filter rules for custom field queries', fakeAsync(() => {
expect(component.customFieldQueriesModel.isEmpty()).toBeTruthy()
component.filterRules = [
{
rule_type: FILTER_CUSTOM_FIELDS_LOOKUP,
rule_type: FILTER_CUSTOM_FIELDS_QUERY,
value: '["AND", [[42, "exists", "true"],[43, "exists", "true"]]]',
},
]
@@ -909,7 +909,7 @@ describe('FilterEditorComponent', () => {
// atom
component.filterRules = [
{
rule_type: FILTER_CUSTOM_FIELDS_LOOKUP,
rule_type: FILTER_CUSTOM_FIELDS_QUERY,
value: '[42, "exists", "true"]',
},
]
@@ -1459,7 +1459,7 @@ describe('FilterEditorComponent', () => {
expect(component.customFieldQueriesModel.queries[0].value.length).toEqual(1)
expect(component.filterRules).toEqual([
{
rule_type: FILTER_CUSTOM_FIELDS_LOOKUP,
rule_type: FILTER_CUSTOM_FIELDS_QUERY,
value: JSON.stringify([
CustomFieldQueryLogicalOperator.Or,
[[custom_fields[0].id, 'exists', 'true']],
@@ -1876,7 +1876,7 @@ describe('FilterEditorComponent', () => {
component.filterRules = [
{
rule_type: FILTER_CUSTOM_FIELDS_LOOKUP,
rule_type: FILTER_CUSTOM_FIELDS_QUERY,
value: '["AND",[["42","exists","true"],["43","exists","true"]]]',
},
]

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

@@ -62,7 +62,7 @@ import {
FILTER_HAS_CUSTOM_FIELDS_ANY,
FILTER_HAS_CUSTOM_FIELDS_ALL,
FILTER_HAS_ANY_CUSTOM_FIELDS,
FILTER_CUSTOM_FIELDS_LOOKUP,
FILTER_CUSTOM_FIELDS_QUERY,
} from 'src/app/data/filter-rule-type'
import {
FilterableDropdownSelectionModel,
@@ -234,7 +234,7 @@ export class FilterEditorComponent
return $localize`Without any tag`
}
case FILTER_CUSTOM_FIELDS_LOOKUP:
case FILTER_CUSTOM_FIELDS_QUERY:
return $localize`Custom fields query`
case FILTER_TITLE:
@@ -525,7 +525,7 @@ export class FilterEditorComponent
false
)
break
case FILTER_CUSTOM_FIELDS_LOOKUP:
case FILTER_CUSTOM_FIELDS_QUERY:
try {
const query = JSON.parse(rule.value)
if (Array.isArray(query)) {
@@ -786,7 +786,7 @@ export class FilterEditorComponent
)
if (queries.length > 0) {
filterRules.push({
rule_type: FILTER_CUSTOM_FIELDS_LOOKUP,
rule_type: FILTER_CUSTOM_FIELDS_QUERY,
value: JSON.stringify(queries[0]),
})
}