From 57566f30e21a536a1613e563e8ff78c7bd885192 Mon Sep 17 00:00:00 2001
From: Denis Bykhov <80476319+BykhovDenis@users.noreply.github.com>
Date: Mon, 23 May 2022 17:11:55 +0600
Subject: [PATCH] 1835 fix (#1838)

Signed-off-by: Denis Bykhov <80476319+BykhovDenis@users.noreply.github.com>
---
 .../src/components/filter/FilterBar.svelte         |  2 --
 .../src/components/filter/FilterSection.svelte     |  4 +---
 .../src/components/filter/FilterTypePopup.svelte   | 14 +-------------
 .../src/components/filter/ObjectFilter.svelte      |  5 ++---
 .../src/components/filter/ValueFilter.svelte       |  8 +++-----
 5 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/plugins/view-resources/src/components/filter/FilterBar.svelte b/plugins/view-resources/src/components/filter/FilterBar.svelte
index f19eee6436..3192ef1898 100644
--- a/plugins/view-resources/src/components/filter/FilterBar.svelte
+++ b/plugins/view-resources/src/components/filter/FilterBar.svelte
@@ -50,7 +50,6 @@
       FilterTypePopup,
       {
         _class,
-        query,
         target,
         index: ++maxIndex,
         onChange
@@ -124,7 +123,6 @@
     {#each filters as filter, i}
       <FilterSection
         {_class}
-        {query}
         {filter}
         on:change={() => {
           makeQuery(query, filters)
diff --git a/plugins/view-resources/src/components/filter/FilterSection.svelte b/plugins/view-resources/src/components/filter/FilterSection.svelte
index bf8248bc2b..d8a76d10fd 100644
--- a/plugins/view-resources/src/components/filter/FilterSection.svelte
+++ b/plugins/view-resources/src/components/filter/FilterSection.svelte
@@ -13,14 +13,13 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Class, Doc, DocumentQuery, Ref } from '@anticrm/core'
+  import { Class, Doc, Ref } from '@anticrm/core'
   import { Button, eventToHTMLElement, IconClose, showPopup } from '@anticrm/ui'
   import { Filter } from '@anticrm/view'
   import { createEventDispatcher } from 'svelte'
   import view from '../../plugin'
 
   export let _class: Ref<Class<Doc>>
-  export let query: DocumentQuery<Doc>
   export let filter: Filter
   let current = 0
 
@@ -56,7 +55,6 @@
           filter.key.component,
           {
             _class,
-            query,
             filter,
             onChange
           },
diff --git a/plugins/view-resources/src/components/filter/FilterTypePopup.svelte b/plugins/view-resources/src/components/filter/FilterTypePopup.svelte
index 1c11d02821..6c986d010c 100644
--- a/plugins/view-resources/src/components/filter/FilterTypePopup.svelte
+++ b/plugins/view-resources/src/components/filter/FilterTypePopup.svelte
@@ -13,17 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import core, {
-    AnyAttribute,
-    ArrOf,
-    AttachedDoc,
-    Class,
-    Collection,
-    Doc,
-    DocumentQuery,
-    Ref,
-    Type
-  } from '@anticrm/core'
+  import core, { AnyAttribute, ArrOf, AttachedDoc, Class, Collection, Doc, Ref, Type } from '@anticrm/core'
   import { getClient } from '@anticrm/presentation'
   import { Icon, Label, showPopup } from '@anticrm/ui'
   import { Filter, KeyFilter } from '@anticrm/view'
@@ -31,7 +21,6 @@
   import view from '../../plugin'
 
   export let _class: Ref<Class<Doc>>
-  export let query: DocumentQuery<Doc>
   export let target: HTMLElement
   export let index: number
   export let onChange: (e: Filter) => void
@@ -121,7 +110,6 @@
       type.component,
       {
         _class,
-        query,
         filter: {
           key: type,
           value: [],
diff --git a/plugins/view-resources/src/components/filter/ObjectFilter.svelte b/plugins/view-resources/src/components/filter/ObjectFilter.svelte
index 0b27ee655c..400f1d9743 100644
--- a/plugins/view-resources/src/components/filter/ObjectFilter.svelte
+++ b/plugins/view-resources/src/components/filter/ObjectFilter.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Class, Doc, DocumentQuery, FindResult, getObjectValue, Ref, RefTo, SortingOrder } from '@anticrm/core'
+  import { Class, Doc, FindResult, getObjectValue, Ref, RefTo, SortingOrder } from '@anticrm/core'
   import { translate } from '@anticrm/platform'
   import presentation, { getClient } from '@anticrm/presentation'
   import ui, { Button, CheckBox, Label, Loading } from '@anticrm/ui'
@@ -24,7 +24,6 @@
   import { createEventDispatcher } from 'svelte'
 
   export let _class: Ref<Class<Doc>>
-  export let query: DocumentQuery<Doc>
   export let filter: Filter
   export let onChange: (e: Filter) => void
 
@@ -67,7 +66,7 @@
       await objectsPromise
     }
     targets.clear()
-    const baseObjects = await client.findAll(_class, query, { projection: { [filter.key.key]: 1 } })
+    const baseObjects = await client.findAll(_class, {}, { projection: { [filter.key.key]: 1 } })
     for (const object of baseObjects) {
       const value = getObjectValue(filter.key.key, object) ?? undefined
       targets.set(value, (targets.get(value) ?? 0) + 1)
diff --git a/plugins/view-resources/src/components/filter/ValueFilter.svelte b/plugins/view-resources/src/components/filter/ValueFilter.svelte
index 5cec127214..638acabf45 100644
--- a/plugins/view-resources/src/components/filter/ValueFilter.svelte
+++ b/plugins/view-resources/src/components/filter/ValueFilter.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Class, Doc, DocumentQuery, FindResult, getObjectValue, Ref, SortingOrder } from '@anticrm/core'
+  import { Class, Doc, FindResult, getObjectValue, Ref, SortingOrder } from '@anticrm/core'
   import { translate } from '@anticrm/platform'
   import presentation, { getClient } from '@anticrm/presentation'
   import ui, { Button, CheckBox, Label, Loading } from '@anticrm/ui'
@@ -24,7 +24,6 @@
   import { createEventDispatcher } from 'svelte'
 
   export let _class: Ref<Class<Doc>>
-  export let query: DocumentQuery<Doc>
   export let filter: Filter
   export let onChange: (e: Filter) => void
 
@@ -71,10 +70,9 @@
     const resultQuery =
       search !== ''
         ? {
-            [filter.key.key]: { $like: '%' + search + '%' },
-            ...query
+            [filter.key.key]: { $like: '%' + search + '%' }
           }
-        : query
+        : {}
     let prefix = ''
 
     const attr = client.getHierarchy().getAttribute(_class, filter.key.key)