Fix workbench switcher (#2454)

Signed-off-by: Denis Maslennikov <denis.maslennikov@gmail.com>
This commit is contained in:
Denis Maslennikov 2022-12-21 13:04:22 +07:00 committed by GitHub
parent 9d3f3bd2a7
commit 8b6741bd21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions

View File

@ -16,7 +16,6 @@
import contact, { Employee, EmployeeAccount, formatName } from '@hcengineering/contact'
import { AccountRole, getCurrentAccount } from '@hcengineering/core'
import login from '@hcengineering/login'
import { getWorkspaces, Workspace } from '@hcengineering/login-resources'
import { setMetadata } from '@hcengineering/platform'
import { Avatar, createQuery } from '@hcengineering/presentation'
import setting, { settingId, SettingsCategory } from '@hcengineering/setting'
@ -34,15 +33,9 @@
import view from '@hcengineering/view'
import HelpAndSupport from './HelpAndSupport.svelte'
import workbench from '../plugin'
import { onMount } from 'svelte'
import SelectWorkspaceMenu from './SelectWorkspaceMenu.svelte'
let items: SettingsCategory[] = []
let workspaces: Workspace[] = []
onMount(() => {
getWorkspaces().then((ws: Workspace[]) => (workspaces = ws))
})
const settingsQuery = createQuery()
settingsQuery.query(
@ -152,7 +145,6 @@
label: setting.string.SelectWorkspace,
action: async () => {},
component: SelectWorkspaceMenu,
props: { workspaces },
group: 'end'
},
{

View File

@ -14,13 +14,26 @@
-->
<script lang="ts">
import login from '@hcengineering/login'
import { navigateToWorkspace, selectWorkspace, setLoginInfo, Workspace } from '@hcengineering/login-resources'
import {
getWorkspaces,
navigateToWorkspace,
selectWorkspace,
setLoginInfo,
Workspace
} from '@hcengineering/login-resources'
import { getEmbeddedLabel } from '@hcengineering/platform'
import { Loading, locationToUrl, Menu, navigate } from '@hcengineering/ui'
import { workbenchId } from '@hcengineering/workbench'
import { onMount } from 'svelte'
import workbench from '../plugin'
export let workspaces: Workspace[]
let workspaces: Workspace[] = []
onMount(() => {
getWorkspaces().then((ws: Workspace[]) => {
workspaces = ws
})
})
$: actions = [
...workspaces.map((w) => ({