TSK-1311: add editors for String and Number (#3056)

Signed-off-by: Vyacheslav Tumanov <me@slavatumanov.me>
This commit is contained in:
Vyacheslav Tumanov 2023-04-25 21:14:25 +05:00 committed by GitHub
parent 46933f1bd7
commit 8e389c2cb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 41 additions and 19 deletions

View File

@ -16,14 +16,20 @@
<script lang="ts"> <script lang="ts">
import { BooleanIcon, Label } from '@hcengineering/ui' import { BooleanIcon, Label } from '@hcengineering/ui'
import { getBooleanLabel } from '../utils' import { getBooleanLabel } from '../utils'
import BooleanEditor from './BooleanEditor.svelte'
export let value: any export let value: any
export let inline: boolean = false export let inline: boolean = false
export let onChange: ((value: any) => void) | undefined = undefined
</script> </script>
<div class="{inline ? 'inline-presenter' : 'flex-presenter'} yesno-container"> <div class="{inline ? 'inline-presenter' : 'flex-presenter'} yesno-container">
{#if onChange !== undefined}
<BooleanEditor {onChange} {value} />
{:else}
<div class="icon small-gap"><BooleanIcon {value} /></div> <div class="icon small-gap"><BooleanIcon {value} /></div>
<span><Label label={getBooleanLabel(value)} /></span> <span><Label label={getBooleanLabel(value)} /></span>
{/if}
</div> </div>
<style lang="scss"> <style lang="scss">

View File

@ -22,7 +22,7 @@
// export let label: IntlString // export let label: IntlString
export let placeholder: IntlString export let placeholder: IntlString
export let value: number | undefined export let value: number | undefined
export let focus: boolean export let focus: boolean = false
// export let maxWidth: string = '10rem' // export let maxWidth: string = '10rem'
export let onChange: (value: number | undefined) => void export let onChange: (value: number | undefined) => void
export let kind: 'no-border' | 'link' | 'button' = 'no-border' export let kind: 'no-border' | 'link' | 'button' = 'no-border'

View File

@ -14,7 +14,17 @@
// limitations under the License. // limitations under the License.
--> -->
<script lang="ts"> <script lang="ts">
import NumberEditor from './NumberEditor.svelte'
import { getEmbeddedLabel, IntlString } from '@hcengineering/platform'
export let value: number | undefined export let value: number | undefined
export let onChange: ((value: number | undefined) => void) | undefined = undefined
export let placeholder: IntlString = getEmbeddedLabel(' ')
export let kind: 'no-border' | 'link' | 'button' = 'link'
</script> </script>
{#if onChange !== undefined}
<NumberEditor {onChange} {value} {placeholder} {kind} />
{:else}
<span>{value || ''}</span> <span>{value || ''}</span>
{/if}

View File

@ -14,10 +14,13 @@
// limitations under the License. // limitations under the License.
--> -->
<script lang="ts"> <script lang="ts">
import { getEmbeddedLabel } from '@hcengineering/platform' import { getEmbeddedLabel, IntlString } from '@hcengineering/platform'
import { LabelAndProps, tooltip } from '@hcengineering/ui' import { LabelAndProps, tooltip } from '@hcengineering/ui'
import StringEditor from './StringEditor.svelte'
export let value: string | string[] | undefined export let value: string | string[] | undefined
export let onChange: ((value: string) => void) | undefined = undefined
export let placeholder: IntlString = getEmbeddedLabel('')
$: tooltipParams = getTooltip(value) $: tooltipParams = getTooltip(value)
@ -40,7 +43,9 @@
{#each value as str, i} {#each value as str, i}
<span class:ml-1={i !== 0}>{str}</span> <span class:ml-1={i !== 0}>{str}</span>
{/each} {/each}
{:else} {:else if onChange === undefined}
{value ?? ''} {value ?? ''}
{:else}
<StringEditor {onChange} value={value ?? ''} {placeholder} />
{/if} {/if}
</span> </span>

View File

@ -49,11 +49,12 @@ test.describe('recruit tests', () => {
await page.click(`text="${last} ${first}"`) 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') 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"]').scrollIntoViewIfNeeded()
await panel.locator('[id="gmail\\:string\\:Email"]').click() await panel.locator('[id="gmail\\:string\\:Email"]').click()
expect(await page.locator('.cover-channel >> input').inputValue()).toEqual(email) expect(await page.locator('.cover-channel >> input').inputValue()).toEqual(email)