lookup --> query

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

@@ -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"]]]',
       },
     ]

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

@@ -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]),
       })
     }

src-ui/src/app/data/filter-rule-type.ts

@@ -55,7 +55,7 @@ export const FILTER_HAS_CUSTOM_FIELDS_ANY = 39
 export const FILTER_DOES_NOT_HAVE_CUSTOM_FIELDS = 40
 export const FILTER_HAS_ANY_CUSTOM_FIELDS = 41
 
-export const FILTER_CUSTOM_FIELDS_LOOKUP = 42
+export const FILTER_CUSTOM_FIELDS_QUERY = 42
 
 export const FILTER_RULE_TYPES: FilterRuleType[] = [
   {
@@ -320,8 +320,8 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [
     default: true,
   },
   {
-    id: FILTER_CUSTOM_FIELDS_LOOKUP,
-    filtervar: 'custom_field_lookup',
+    id: FILTER_CUSTOM_FIELDS_QUERY,
+    filtervar: 'custom_field_query',
     datatype: 'string',
     multi: false,
   },

src-ui/src/app/utils/query-params.spec.ts

@@ -2,7 +2,7 @@ import { convertToParamMap } from '@angular/router'
 import { FilterRule } from '../data/filter-rule'
 import {
   FILTER_CORRESPONDENT,
-  FILTER_CUSTOM_FIELDS_LOOKUP,
+  FILTER_CUSTOM_FIELDS_QUERY,
   FILTER_HAS_ANY_TAG,
   FILTER_HAS_CUSTOM_FIELDS_ALL,
   FILTER_HAS_CUSTOM_FIELDS_ANY,
@@ -214,7 +214,7 @@ describe('QueryParams Utils', () => {
 
     expect(transformedFilterRules).toEqual([
       {
-        rule_type: FILTER_CUSTOM_FIELDS_LOOKUP,
+        rule_type: FILTER_CUSTOM_FIELDS_QUERY,
         value: JSON.stringify([
           CustomFieldQueryLogicalOperator.Or,
           [
@@ -240,7 +240,7 @@ describe('QueryParams Utils', () => {
 
     expect(transformedFilterRules).toEqual([
       {
-        rule_type: FILTER_CUSTOM_FIELDS_LOOKUP,
+        rule_type: FILTER_CUSTOM_FIELDS_QUERY,
         value: JSON.stringify([
           CustomFieldQueryLogicalOperator.And,
           [

src-ui/src/app/utils/query-params.ts

@@ -4,7 +4,7 @@ import {
   FilterRuleType,
   FILTER_RULE_TYPES,
   FILTER_HAS_CUSTOM_FIELDS_ANY,
-  FILTER_CUSTOM_FIELDS_LOOKUP,
+  FILTER_CUSTOM_FIELDS_QUERY,
   FILTER_HAS_CUSTOM_FIELDS_ALL,
 } from '../data/filter-rule-type'
 import { ListViewState } from '../services/document-list-view.service'
@@ -83,7 +83,7 @@ export function transformLegacyFilterRules(
       ],
     ]
     filterRules.push({
-      rule_type: FILTER_CUSTOM_FIELDS_LOOKUP,
+      rule_type: FILTER_CUSTOM_FIELDS_QUERY,
       value: JSON.stringify(customFieldQueryExpression),
     })
   }