From 56ae0212ea0f5a45f08c094b6dddea9aca601124 Mon Sep 17 00:00:00 2001
From: Vyacheslav Tumanov <me@slavatumanov.me>
Date: Tue, 25 Apr 2023 16:05:06 +0500
Subject: [PATCH 1/4] TSK-1311: change presenters to support editors

Signed-off-by: Vyacheslav Tumanov <me@slavatumanov.me>
---
 .../src/components/BooleanPresenter.svelte    | 16 ++++++++----
 .../src/components/NumberPresenter.svelte     | 17 ++++++++++---
 .../src/components/StringPresenter.svelte     | 25 ++++++++++++-------
 3 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/plugins/view-resources/src/components/BooleanPresenter.svelte b/plugins/view-resources/src/components/BooleanPresenter.svelte
index 595fe65abd2..505357dcbe7 100644
--- a/plugins/view-resources/src/components/BooleanPresenter.svelte
+++ b/plugins/view-resources/src/components/BooleanPresenter.svelte
@@ -1,29 +1,35 @@
 <!--
 // Copyright © 2020, 2021 Anticrm Platform Contributors.
 // Copyright © 2021 Hardcore Engineering Inc.
-// 
+//
 // Licensed under the Eclipse Public License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License. You may
 // obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// 
+//
 // See the License for the specific language governing permissions and
 // limitations under the License.
 -->
 <script lang="ts">
   import { BooleanIcon, Label } from '@hcengineering/ui'
   import { getBooleanLabel } from '../utils'
+  import BooleanEditor from './BooleanEditor.svelte'
 
   export let value: any
   export let inline: boolean = false
+  export let onChange: ((value: any) => void) | undefined = undefined
 </script>
 
 <div class="{inline ? 'inline-presenter' : 'flex-presenter'} yesno-container">
-  <div class="icon small-gap"><BooleanIcon {value} /></div>
-  <span><Label label={getBooleanLabel(value)} /></span>
+  {#if onChange !== undefined}
+    <BooleanEditor {onChange} {value}/>
+  {:else}
+    <div class="icon small-gap"><BooleanIcon {value} /></div>
+    <span><Label label={getBooleanLabel(value)} /></span>
+  {/if}
 </div>
 
 <style lang="scss">
diff --git a/plugins/view-resources/src/components/NumberPresenter.svelte b/plugins/view-resources/src/components/NumberPresenter.svelte
index 1c4f597b175..72c758ac5f7 100644
--- a/plugins/view-resources/src/components/NumberPresenter.svelte
+++ b/plugins/view-resources/src/components/NumberPresenter.svelte
@@ -1,20 +1,29 @@
 <!--
 // Copyright © 2020, 2021 Anticrm Platform Contributors.
 // Copyright © 2021 Hardcore Engineering Inc.
-// 
+//
 // Licensed under the Eclipse Public License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License. You may
 // obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// 
+//
 // See the License for the specific language governing permissions and
 // limitations under the License.
 -->
 <script lang="ts">
+  import NumberEditor from './NumberEditor.svelte'
+  import { getEmbeddedLabel, IntlString } from '@hcengineering/platform'
+
   export let value: number | undefined
+  export let onChange: ((value: number) => void) | undefined = undefined
+  export let placeholder: IntlString = getEmbeddedLabel(' ')
 </script>
 
-<span>{value || ''}</span>
+{#if onChange !== undefined}
+  <NumberEditor {onChange} {value} {placeholder}/>
+{:else}
+  <span>{value || ''}</span>
+{/if}
diff --git a/plugins/view-resources/src/components/StringPresenter.svelte b/plugins/view-resources/src/components/StringPresenter.svelte
index dd8d93ce229..2b933718515 100644
--- a/plugins/view-resources/src/components/StringPresenter.svelte
+++ b/plugins/view-resources/src/components/StringPresenter.svelte
@@ -1,23 +1,26 @@
 <!--
 // Copyright © 2020, 2021 Anticrm Platform Contributors.
 // Copyright © 2021 Hardcore Engineering Inc.
-// 
+//
 // Licensed under the Eclipse Public License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License. You may
 // obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// 
+//
 // See the License for the specific language governing permissions and
 // limitations under the License.
 -->
 <script lang="ts">
-  import { getEmbeddedLabel } from '@hcengineering/platform'
+  import { getEmbeddedLabel, IntlString } from '@hcengineering/platform'
   import { LabelAndProps, tooltip } from '@hcengineering/ui'
+  import StringEditor from './StringEditor.svelte'
 
   export let value: string | string[] | undefined
+  export let onChange: ((value: string | string[] | undefined) => void) | undefined = undefined
+  export let placeholder: IntlString
 
   $: tooltipParams = getTooltip(value)
 
@@ -36,11 +39,15 @@
 </script>
 
 <span class="lines-limit-2 select-text" use:tooltip={tooltipParams}>
-  {#if Array.isArray(value)}
-    {#each value as str, i}
-      <span class:ml-1={i !== 0}>{str}</span>
-    {/each}
+  {#if onChange === undefined}
+    {#if Array.isArray(value)}
+      {#each value as str, i}
+        <span class:ml-1={i !== 0}>{str}</span>
+      {/each}
+    {:else}
+      {value ?? ''}
+    {/if}
   {:else}
-    {value ?? ''}
+    <StringEditor {onChange} {value} {placeholder}/>
   {/if}
 </span>

From 740200bda5b3f7dcbf6b8703aa56a772138227a1 Mon Sep 17 00:00:00 2001
From: Vyacheslav Tumanov <me@slavatumanov.me>
Date: Tue, 25 Apr 2023 16:28:20 +0500
Subject: [PATCH 2/4] TSK-1311: change kind for editor

Signed-off-by: Vyacheslav Tumanov <me@slavatumanov.me>
---
 plugins/view-resources/src/components/NumberPresenter.svelte | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/view-resources/src/components/NumberPresenter.svelte b/plugins/view-resources/src/components/NumberPresenter.svelte
index 72c758ac5f7..c852c4cc062 100644
--- a/plugins/view-resources/src/components/NumberPresenter.svelte
+++ b/plugins/view-resources/src/components/NumberPresenter.svelte
@@ -20,10 +20,11 @@
   export let value: number | undefined
   export let onChange: ((value: number) => void) | undefined = undefined
   export let placeholder: IntlString = getEmbeddedLabel(' ')
+  export let kind: 'no-border' | 'link' | 'button' = 'link'
 </script>
 
 {#if onChange !== undefined}
-  <NumberEditor {onChange} {value} {placeholder}/>
+  <NumberEditor {onChange} {value} {placeholder} {kind}/>
 {:else}
   <span>{value || ''}</span>
 {/if}

From 773f15b46c06470cb92e176c1b2aa3e7ca8a9225 Mon Sep 17 00:00:00 2001
From: Vyacheslav Tumanov <me@slavatumanov.me>
Date: Tue, 25 Apr 2023 16:53:41 +0500
Subject: [PATCH 3/4] TSK-1311: svelte-check & formatting

Signed-off-by: Vyacheslav Tumanov <me@slavatumanov.me>
---
 .../src/components/BooleanPresenter.svelte    |  2 +-
 .../src/components/NumberEditor.svelte        |  2 +-
 .../src/components/NumberPresenter.svelte     |  4 ++--
 .../src/components/StringPresenter.svelte     | 20 +++++++++----------
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/plugins/view-resources/src/components/BooleanPresenter.svelte b/plugins/view-resources/src/components/BooleanPresenter.svelte
index 505357dcbe7..08f176a39a9 100644
--- a/plugins/view-resources/src/components/BooleanPresenter.svelte
+++ b/plugins/view-resources/src/components/BooleanPresenter.svelte
@@ -25,7 +25,7 @@
 
 <div class="{inline ? 'inline-presenter' : 'flex-presenter'} yesno-container">
   {#if onChange !== undefined}
-    <BooleanEditor {onChange} {value}/>
+    <BooleanEditor {onChange} {value} />
   {:else}
     <div class="icon small-gap"><BooleanIcon {value} /></div>
     <span><Label label={getBooleanLabel(value)} /></span>
diff --git a/plugins/view-resources/src/components/NumberEditor.svelte b/plugins/view-resources/src/components/NumberEditor.svelte
index 992fda5d94a..2f403e58ca7 100644
--- a/plugins/view-resources/src/components/NumberEditor.svelte
+++ b/plugins/view-resources/src/components/NumberEditor.svelte
@@ -22,7 +22,7 @@
   // export let label: IntlString
   export let placeholder: IntlString
   export let value: number | undefined
-  export let focus: boolean
+  export let focus: boolean = false
   // export let maxWidth: string = '10rem'
   export let onChange: (value: number | undefined) => void
   export let kind: 'no-border' | 'link' | 'button' = 'no-border'
diff --git a/plugins/view-resources/src/components/NumberPresenter.svelte b/plugins/view-resources/src/components/NumberPresenter.svelte
index c852c4cc062..d36de7514ff 100644
--- a/plugins/view-resources/src/components/NumberPresenter.svelte
+++ b/plugins/view-resources/src/components/NumberPresenter.svelte
@@ -18,13 +18,13 @@
   import { getEmbeddedLabel, IntlString } from '@hcengineering/platform'
 
   export let value: number | undefined
-  export let onChange: ((value: number) => void) | undefined = undefined
+  export let onChange: ((value: number | undefined) => void) | undefined = undefined
   export let placeholder: IntlString = getEmbeddedLabel(' ')
   export let kind: 'no-border' | 'link' | 'button' = 'link'
 </script>
 
 {#if onChange !== undefined}
-  <NumberEditor {onChange} {value} {placeholder} {kind}/>
+  <NumberEditor {onChange} {value} {placeholder} {kind} />
 {:else}
   <span>{value || ''}</span>
 {/if}
diff --git a/plugins/view-resources/src/components/StringPresenter.svelte b/plugins/view-resources/src/components/StringPresenter.svelte
index 2b933718515..2f602e4d1cc 100644
--- a/plugins/view-resources/src/components/StringPresenter.svelte
+++ b/plugins/view-resources/src/components/StringPresenter.svelte
@@ -19,8 +19,8 @@
   import StringEditor from './StringEditor.svelte'
 
   export let value: string | string[] | undefined
-  export let onChange: ((value: string | string[] | undefined) => void) | undefined = undefined
-  export let placeholder: IntlString
+  export let onChange: ((value: string) => void) | undefined = undefined
+  export let placeholder: IntlString = getEmbeddedLabel('')
 
   $: tooltipParams = getTooltip(value)
 
@@ -39,15 +39,13 @@
 </script>
 
 <span class="lines-limit-2 select-text" use:tooltip={tooltipParams}>
-  {#if onChange === undefined}
-    {#if Array.isArray(value)}
-      {#each value as str, i}
-        <span class:ml-1={i !== 0}>{str}</span>
-      {/each}
-    {:else}
-      {value ?? ''}
-    {/if}
+  {#if Array.isArray(value)}
+    {#each value as str, i}
+      <span class:ml-1={i !== 0}>{str}</span>
+    {/each}
+  {:else if onChange === undefined}
+    {value ?? ''}
   {:else}
-    <StringEditor {onChange} {value} {placeholder}/>
+    <StringEditor {onChange} value={value ?? ''} {placeholder} />
   {/if}
 </span>

From b594f599fbbc6921a2c39e7f9b6624c4f2d608f9 Mon Sep 17 00:00:00 2001
From: Vyacheslav Tumanov <me@slavatumanov.me>
Date: Tue, 25 Apr 2023 19:58:49 +0500
Subject: [PATCH 4/4] TSK-1311: fix uitest

Signed-off-by: Vyacheslav Tumanov <me@slavatumanov.me>
---
 tests/sanity/tests/recruit.spec.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/sanity/tests/recruit.spec.ts b/tests/sanity/tests/recruit.spec.ts
index 48916f5ea11..ccc82c738b1 100644
--- a/tests/sanity/tests/recruit.spec.ts
+++ b/tests/sanity/tests/recruit.spec.ts
@@ -49,11 +49,12 @@ test.describe('recruit tests', () => {
 
     await page.click(`text="${last} ${first}"`)
 
-    await expect(page.locator(`text=${first}`).first()).toBeVisible()
-    await expect(page.locator(`text=${last}`).first()).toBeVisible()
-    await expect(page.locator(`text=${loc}`).first()).toBeVisible()
-
     const panel = page.locator('.popupPanel')
+
+    expect(await panel.locator('[placeholder="First name"]').inputValue()).toEqual(first)
+    expect(await panel.locator('[placeholder="Last name"]').inputValue()).toEqual(last)
+    expect(await panel.locator('[placeholder="Location"]').inputValue()).toEqual(loc)
+
     await panel.locator('[id="gmail\\:string\\:Email"]').scrollIntoViewIfNeeded()
     await panel.locator('[id="gmail\\:string\\:Email"]').click()
     expect(await page.locator('.cover-channel >> input').inputValue()).toEqual(email)