wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-04-14 04:08:19 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix select workspace when open workspace in new tab (#5545)

Browse Source 
Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
Denis Bykhov 2024-05-08 22:20:00 +05:00 committed by GitHub
parent b27b88bc04
commit 2c3ffba681
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/login-resources/src/utils.ts
View File

@ -310,7 +310,7 @@ export async function selectWorkspace (workspace: string): Promise<[Status, Work
} }
} }
const token = getMetadata(presentation.metadata.Token) const token = getMetadata(presentation.metadata.Token) ?? fetchMetadataLocalStorage(login.metadata.LastToken)
if (token === undefined) { if (token === undefined) {
const loc = getCurrentLocation() const loc = getCurrentLocation()
loc.path[0] = 'login' loc.path[0] = 'login'

6
plugins/workbench-resources/src/connect.ts
View File

@ -67,7 +67,11 @@ export async function connect (title: string): Promise<Client | undefined> {
const tokens: Record<string, string> = fetchMetadataLocalStorage(login.metadata.LoginTokens) ?? {} const tokens: Record<string, string> = fetchMetadataLocalStorage(login.metadata.LoginTokens) ?? {}
let token = tokens[ws] let token = tokens[ws]
if (token === undefined && getMetadata(presentation.metadata.Token) !== undefined) { if (
token === undefined &&
(getMetadata(presentation.metadata.Token) !== undefined ||
fetchMetadataLocalStorage(login.metadata.LastToken) != null)
) {
const selectWorkspace = await getResource(login.function.SelectWorkspace) const selectWorkspace = await getResource(login.function.SelectWorkspace)
const loginInfo = await ctx.with('select-workspace', {}, async () => (await selectWorkspace(ws))[1]) const loginInfo = await ctx.with('select-workspace', {}, async () => (await selectWorkspace(ws))[1])
if (loginInfo !== undefined) { if (loginInfo !== undefined) {