wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-05-12 10:25:51 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

uberf-10321: fix onboard create workspace form (#8679)

Browse Source
This commit is contained in:
Alexey Zinoviev 2025-04-23 06:33:16 +04:00 committed by GitHub
parent b159c0610a
commit a3b79be14e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/onboard-resources/src/components/Form.svelte
View File

@ -141,7 +141,10 @@
{subtitle} {subtitle}
</div> </div>
{/if} {/if}
<div class="title"><Label label={caption} /></div> <div class="flex-row-center">
<div class="title"><Label label={caption} /></div>
<slot name="region-selector" />
</div>
<div class="form"> <div class="form">
{#each fields as field (field.name)} {#each fields as field (field.name)}
<div class={field.short && !($deviceInfo.docWidth <= 600) ? 'form-col' : 'form-row'}> <div class={field.short && !($deviceInfo.docWidth <= 600) ? 'form-col' : 'form-row'}>

38
plugins/onboard-resources/src/components/OnboardWorkspaceForm.svelte
View File

@ -13,10 +13,11 @@
// limitations under the License. // limitations under the License.
--> -->
<script lang="ts"> <script lang="ts">
import { LoginInfo } from '@hcengineering/login' import { LoginInfo, WorkspaceLoginInfo } from '@hcengineering/login'
import { createWorkspace, setLoginInfo } from '@hcengineering/login-resources' import { createWorkspace, getRegionInfo, RegionInfo, setLoginInfo } from '@hcengineering/login-resources'
import { Status, Severity, OK } from '@hcengineering/platform' import { Status, Severity, OK, getEmbeddedLabel } from '@hcengineering/platform'
import { createEventDispatcher } from 'svelte' import { ButtonMenu } from '@hcengineering/ui'
import { createEventDispatcher, onMount } from 'svelte'
import Form from './Form.svelte' import Form from './Form.svelte'
import onboard from '../plugin' import onboard from '../plugin'
@ -32,21 +33,44 @@
} }
let status: Status<any> = OK let status: Status<any> = OK
let regions: RegionInfo[] = []
let selectedRegion: string = ''
onMount(async () => {
regions = (await getRegionInfo())?.filter((it) => it.name.length > 0) ?? []
selectedRegion = regions[0]?.region
})
const action = { const action = {
i18n: onboard.string.CreateWorkspace, i18n: onboard.string.CreateWorkspace,
func: async () => { func: async () => {
status = new Status(Severity.INFO, onboard.status.ConnectingToServer, {}) status = new Status(Severity.INFO, onboard.status.ConnectingToServer, {})
const [loginStatus, result] = await createWorkspace(object.workspace) const [loginStatus, result] = await createWorkspace(object.workspace, selectedRegion)
status = loginStatus status = loginStatus
if (result !== undefined) { if (result !== undefined) {
setLoginInfo(result) setLoginInfo(result as WorkspaceLoginInfo)
dispatch('step', result) dispatch('step', result)
} }
} }
} }
</script> </script>
<Form caption={onboard.string.CreateWorkspace} subtitle={account.email} {status} {fields} {object} {action} /> <Form caption={onboard.string.CreateWorkspace} subtitle={account.email} {status} {fields} {object} {action}>
<svelte:fragment slot="region-selector">
{#if regions.length > 1}
<div class="flex flex-grow flex-reverse">
<ButtonMenu
bind:selected={selectedRegion}
autoSelectionIfOne
title={regions.find((it) => it.region === selectedRegion)?.name}
items={regions.map((it) => ({ id: it.region, label: getEmbeddedLabel(it.name) }))}
on:selected={(it) => {
selectedRegion = it.detail
}}
/>
</div>
{/if}
</svelte:fragment>
</Form>