From 2fbbfab597f0910ad6b15f51ebfc41bc00936a90 Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@gmail.com>
Date: Tue, 25 Jan 2022 15:41:53 +0700
Subject: [PATCH] Hide archived spaces from dialogs

Closes #858
Closes #865

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 packages/presentation/src/components/Card.svelte         | 5 +++--
 packages/presentation/src/components/SpaceSelect.svelte  | 9 +++++----
 packages/presentation/src/components/SpacesPopup.svelte  | 5 +++--
 .../src/components/CreateApplication.svelte              | 1 +
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/presentation/src/components/Card.svelte b/packages/presentation/src/components/Card.svelte
index db362b4f59..0fa060cc43 100644
--- a/packages/presentation/src/components/Card.svelte
+++ b/packages/presentation/src/components/Card.svelte
@@ -18,7 +18,7 @@
   import type { IntlString } from '@anticrm/platform'
 
   import { createEventDispatcher } from 'svelte'
-  import type { Ref, Class, Space } from '@anticrm/core'
+  import type { Ref, Class, Space, DocumentQuery } from '@anticrm/core'
 
   import { Button, Label } from '@anticrm/ui'
   import SpaceSelect from './SpaceSelect.svelte'
@@ -26,6 +26,7 @@
 
   export let spaceClass: Ref<Class<Space>> | undefined = undefined
   export let space: Ref<Space>
+  export let spaceQuery: DocumentQuery<Space> | undefined = { archived: false }
   export let spaceLabel: IntlString | undefined = undefined
   export let spacePlaceholder: IntlString | undefined = undefined
   export let label: IntlString
@@ -52,7 +53,7 @@
   {#if spaceClass && spaceLabel && spacePlaceholder}
     <div class="flex-col pool">
       <div class="separator" />
-      <SpaceSelect _class={spaceClass} label={spaceLabel} placeholder={spacePlaceholder} bind:value={space} />
+      <SpaceSelect _class={spaceClass} spaceQuery={spaceQuery} label={spaceLabel} placeholder={spacePlaceholder} bind:value={space} />
     </div>
   {/if}
   <div class="footer">
diff --git a/packages/presentation/src/components/SpaceSelect.svelte b/packages/presentation/src/components/SpaceSelect.svelte
index 9a1ee5ec3e..64f4d15a2b 100644
--- a/packages/presentation/src/components/SpaceSelect.svelte
+++ b/packages/presentation/src/components/SpaceSelect.svelte
@@ -20,9 +20,10 @@
   import { Label, showPopup, IconFolder } from '@anticrm/ui'
   import SpacesPopup from './SpacesPopup.svelte'
 
-  import type { Ref, Class, Space } from '@anticrm/core'
+  import type { Ref, Class, Space, DocumentQuery } from '@anticrm/core'
 
   export let _class: Ref<Class<Space>>
+  export let spaceQuery: DocumentQuery<Space> | undefined = { archived: false }
   export let label: IntlString
   export let placeholder: IntlString
   export let value: Ref<Space>
@@ -33,8 +34,8 @@
 
   const client = getClient()
 
-  async function updateSelected(value: Ref<Space>) {
-    selected = await client.findOne(_class, { _id: value })
+  async function updateSelected (value: Ref<Space>) {
+    selected = await client.findOne(_class, { ...(spaceQuery ?? {}), _id: value })
   }
 
   $: updateSelected(value)
@@ -50,7 +51,7 @@
 <div class="flex-col cursor-pointer"
   bind:this={btn}
   on:click|preventDefault={() => {
-    showPopup(SpacesPopup, { _class }, btn, (result) => {
+    showPopup(SpacesPopup, { _class, spaceQuery }, btn, (result) => {
       if (result) {
         value = result._id
       }
diff --git a/packages/presentation/src/components/SpacesPopup.svelte b/packages/presentation/src/components/SpacesPopup.svelte
index e03a44b2bc..8f14019eda 100644
--- a/packages/presentation/src/components/SpacesPopup.svelte
+++ b/packages/presentation/src/components/SpacesPopup.svelte
@@ -18,17 +18,18 @@
   import ui, { Label, EditWithIcon, IconSearch } from '@anticrm/ui'
   import SpaceInfo from './SpaceInfo.svelte'
 
-  import type { Ref, Class, Space } from '@anticrm/core'
+  import type { Ref, Class, Space, DocumentQuery } from '@anticrm/core'
   import { createQuery } from '../utils'
 
   export let _class: Ref<Class<Space>>
+  export let spaceQuery: DocumentQuery<Space> | undefined
 
   let search: string = ''
   let objects: Space[] = []
 
   const dispatch = createEventDispatcher()
   const query = createQuery()
-  $: query.query(_class, {}, result => { objects = result })
+  $: query.query(_class, { ...(spaceQuery ?? {}) }, result => { objects = result })
   afterUpdate(() => { dispatch('update', Date.now()) })
 </script>
 
diff --git a/plugins/recruit-resources/src/components/CreateApplication.svelte b/plugins/recruit-resources/src/components/CreateApplication.svelte
index 53c928ad28..23d755e3f8 100644
--- a/plugins/recruit-resources/src/components/CreateApplication.svelte
+++ b/plugins/recruit-resources/src/components/CreateApplication.svelte
@@ -122,6 +122,7 @@
   okAction={createApplication}
   canSave={status.severity === Severity.OK}
   spaceClass={recruit.class.Vacancy}
+  spaceQuery={{ archived: false }}
   spaceLabel={recruit.string.Vacancy}
   spacePlaceholder={recruit.string.SelectVacancy}
   bind:space={doc.space}