From cd91d46f18d7a9fa69855edd892d678f1b42884e Mon Sep 17 00:00:00 2001
From: Sergei Ogorelkov <sergei.ogorelkov@icloud.com>
Date: Fri, 12 May 2023 07:11:13 +0400
Subject: [PATCH] [TSK-1368] Remove "Apply" button from filters (#3165)

Signed-off-by: Sergei Ogorelkov <sergei.ogorelkov@icloud.com>
---
 .../src/components/TagsFilter.svelte           | 17 +++++------------
 .../src/components/filter/ObjectFilter.svelte  | 11 ++---------
 .../src/components/filter/ValueFilter.svelte   | 18 ++++++------------
 3 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/plugins/tags-resources/src/components/TagsFilter.svelte b/plugins/tags-resources/src/components/TagsFilter.svelte
index 153dd959f1..5813734b83 100644
--- a/plugins/tags-resources/src/components/TagsFilter.svelte
+++ b/plugins/tags-resources/src/components/TagsFilter.svelte
@@ -30,7 +30,6 @@
   } from '@hcengineering/ui'
   import { Filter } from '@hcengineering/view'
   import { FilterQuery } from '@hcengineering/view-resources'
-  import view from '@hcengineering/view-resources/src/plugin'
   import { createEventDispatcher, onMount } from 'svelte'
   import tags from '../plugin'
   import { tagLevel } from '../utils'
@@ -109,6 +108,11 @@
     }
     objects = objects
     categories = categories
+
+    filter.value = [...selected]
+    // Replace last one with value with level
+    filter.props = { level }
+    onChange(filter)
   }
 
   $: schema = filter.key.attribute.schema ?? '0'
@@ -209,17 +213,6 @@
       {/if}
     </div>
   </div>
-  <Button
-    shape={'round'}
-    label={view.string.Apply}
-    on:click={async () => {
-      filter.value = [...selected]
-      // Replace last one with value with level
-      filter.props = { level }
-      onChange(filter)
-      dispatch('close')
-    }}
-  />
 </div>
 
 <style>
diff --git a/plugins/view-resources/src/components/filter/ObjectFilter.svelte b/plugins/view-resources/src/components/filter/ObjectFilter.svelte
index bc0264d12a..c6883c351d 100644
--- a/plugins/view-resources/src/components/filter/ObjectFilter.svelte
+++ b/plugins/view-resources/src/components/filter/ObjectFilter.svelte
@@ -18,7 +18,6 @@
   import presentation, { getClient } from '@hcengineering/presentation'
   import ui, {
     addNotification,
-    Button,
     Icon,
     IconCheck,
     deviceOptionsStore,
@@ -140,6 +139,8 @@
         filter.value = [...filter.value, undefined]
       }
     }
+
+    onChange(filter)
   }
 
   let search: string = ''
@@ -216,12 +217,4 @@
       {/await}
     </div>
   </div>
-  <Button
-    shape={'filter'}
-    label={view.string.Apply}
-    on:click={() => {
-      onChange(filter)
-      dispatch('close')
-    }}
-  />
 </div>
diff --git a/plugins/view-resources/src/components/filter/ValueFilter.svelte b/plugins/view-resources/src/components/filter/ValueFilter.svelte
index f7a0689b3c..e8d344adf1 100644
--- a/plugins/view-resources/src/components/filter/ValueFilter.svelte
+++ b/plugins/view-resources/src/components/filter/ValueFilter.svelte
@@ -16,7 +16,7 @@
   import core, { Class, Doc, FindResult, getObjectValue, Ref, SortingOrder, Space } from '@hcengineering/core'
   import { translate } from '@hcengineering/platform'
   import presentation, { getClient } from '@hcengineering/presentation'
-  import ui, { Button, Icon, IconCheck, Label, Loading, resizeObserver, deviceOptionsStore } from '@hcengineering/ui'
+  import ui, { Icon, IconCheck, Label, Loading, resizeObserver, deviceOptionsStore } from '@hcengineering/ui'
   import { Filter } from '@hcengineering/view'
   import { onMount } from 'svelte'
   import { getPresenter } from '../../utils'
@@ -112,6 +112,11 @@
       selectedValues.add(value)
     }
     selectedValues = selectedValues
+    filter.value = [...selectedValues.values()].map((v) => {
+      return [v, [...(realValues.get(v) ?? [])]]
+    })
+
+    onChange(filter)
   }
 
   let search: string = ''
@@ -185,15 +190,4 @@
       {/await}
     </div>
   </div>
-  <Button
-    shape={'filter'}
-    label={view.string.Apply}
-    on:click={() => {
-      filter.value = Array.from(selectedValues.values()).map((p) => {
-        return [p, Array.from(realValues.get(p) ?? [])]
-      })
-      onChange(filter)
-      dispatch('close')
-    }}
-  />
 </div>