From 2c3ffba68195833f386c4c19e8ac2e603543e7ab Mon Sep 17 00:00:00 2001 From: Denis Bykhov Date: Wed, 8 May 2024 22:20:00 +0500 Subject: [PATCH] Fix select workspace when open workspace in new tab (#5545) Signed-off-by: Denis Bykhov --- plugins/login-resources/src/utils.ts | 2 +- plugins/workbench-resources/src/connect.ts | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/login-resources/src/utils.ts b/plugins/login-resources/src/utils.ts index 76dc085ddf..0f531a72b6 100644 --- a/plugins/login-resources/src/utils.ts +++ b/plugins/login-resources/src/utils.ts @@ -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) { const loc = getCurrentLocation() loc.path[0] = 'login' diff --git a/plugins/workbench-resources/src/connect.ts b/plugins/workbench-resources/src/connect.ts index 90a5126321..aba655ba0a 100644 --- a/plugins/workbench-resources/src/connect.ts +++ b/plugins/workbench-resources/src/connect.ts @@ -67,7 +67,11 @@ export async function connect (title: string): Promise { const tokens: Record = fetchMetadataLocalStorage(login.metadata.LoginTokens) ?? {} 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 loginInfo = await ctx.with('select-workspace', {}, async () => (await selectWorkspace(ws))[1]) if (loginInfo !== undefined) {