From c3ff3db99f702ea34ed752a6a5539e498eca47d4 Mon Sep 17 00:00:00 2001 From: Andrey Sobolev Date: Sat, 19 Mar 2022 18:23:12 +0700 Subject: [PATCH] Show workspace name in tab title (#1176) Signed-off-by: Andrey Sobolev --- .../src/components/CreateWorkspaceForm.svelte | 1 + plugins/login-resources/src/components/Join.svelte | 1 + .../src/components/SelectWorkspace.svelte | 1 + plugins/login/src/index.ts | 13 +------------ .../src/components/Settings.svelte | 1 + .../src/components/AccountPopup.svelte | 1 + .../src/components/Workbench.svelte | 2 +- .../src/components/WorkbenchApp.svelte | 4 ++++ 8 files changed, 11 insertions(+), 13 deletions(-) diff --git a/plugins/login-resources/src/components/CreateWorkspaceForm.svelte b/plugins/login-resources/src/components/CreateWorkspaceForm.svelte index 36c003415d..4704bfa2c1 100644 --- a/plugins/login-resources/src/components/CreateWorkspaceForm.svelte +++ b/plugins/login-resources/src/components/CreateWorkspaceForm.svelte @@ -43,6 +43,7 @@ setMetadataLocalStorage(login.metadata.LoginToken, result.token) setMetadataLocalStorage(login.metadata.LoginEndpoint, result.endpoint) setMetadataLocalStorage(login.metadata.LoginEmail, result.email) + setMetadataLocalStorage(login.metadata.CurrentWorkspace, object.workspace) showPopup(InviteLink, {}, undefined, () => { navigate({ path: [workbench.component.WorkbenchApp] }) }) diff --git a/plugins/login-resources/src/components/Join.svelte b/plugins/login-resources/src/components/Join.svelte index 59cb2c1473..5e243d369c 100644 --- a/plugins/login-resources/src/components/Join.svelte +++ b/plugins/login-resources/src/components/Join.svelte @@ -77,6 +77,7 @@ setMetadataLocalStorage(login.metadata.LoginToken, result.token) setMetadataLocalStorage(login.metadata.LoginEndpoint, result.endpoint) setMetadataLocalStorage(login.metadata.LoginEmail, result.email) + setMetadataLocalStorage(login.metadata.CurrentWorkspace, location.query?.workspace ?? '') navigate({ path: [workbench.component.WorkbenchApp] }) } } diff --git a/plugins/login-resources/src/components/SelectWorkspace.svelte b/plugins/login-resources/src/components/SelectWorkspace.svelte index 83a59f4e82..30f99d35bf 100644 --- a/plugins/login-resources/src/components/SelectWorkspace.svelte +++ b/plugins/login-resources/src/components/SelectWorkspace.svelte @@ -35,6 +35,7 @@ setMetadataLocalStorage(login.metadata.LoginToken, result.token) setMetadataLocalStorage(login.metadata.LoginEndpoint, result.endpoint) setMetadataLocalStorage(login.metadata.LoginEmail, result.email) + setMetadataLocalStorage(login.metadata.CurrentWorkspace, workspace) if (navigateUrl !== undefined) { navigate(JSON.parse(decodeURIComponent(navigateUrl))) } else { diff --git a/plugins/login/src/index.ts b/plugins/login/src/index.ts index afff7b19ad..b6c783b208 100644 --- a/plugins/login/src/index.ts +++ b/plugins/login/src/index.ts @@ -17,18 +17,6 @@ import type { Plugin, Asset, Metadata } from '@anticrm/platform' import { plugin } from '@anticrm/platform' import type { AnyComponent } from '@anticrm/ui' -// /** -// * @public -// */ -// export interface LoginInfo { -// email: string -// workspace: string -// server: string -// port: string -// token: string -// secondFactorEnabled: boolean -// } - /** * @public */ @@ -44,6 +32,7 @@ export default plugin(loginId, { LoginToken: '' as Metadata, LoginEndpoint: '' as Metadata, LoginEmail: '' as Metadata, + CurrentWorkspace: '' as Metadata, OverrideLoginToken: '' as Metadata, // debug purposes OverrideEndpoint: '' as Metadata }, diff --git a/plugins/setting-resources/src/components/Settings.svelte b/plugins/setting-resources/src/components/Settings.svelte index a6773196fe..e190191ab4 100644 --- a/plugins/setting-resources/src/components/Settings.svelte +++ b/plugins/setting-resources/src/components/Settings.svelte @@ -37,6 +37,7 @@ setMetadataLocalStorage(login.metadata.LoginToken, null) setMetadataLocalStorage(login.metadata.LoginEndpoint, null) setMetadataLocalStorage(login.metadata.LoginEmail, null) + setMetadataLocalStorage(login.metadata.CurrentWorkspace, null) navigate({ path: [login.component.LoginApp] }) } function selectWorkspace (): void { diff --git a/plugins/workbench-resources/src/components/AccountPopup.svelte b/plugins/workbench-resources/src/components/AccountPopup.svelte index 1e5aff669f..b8d32ff3b9 100644 --- a/plugins/workbench-resources/src/components/AccountPopup.svelte +++ b/plugins/workbench-resources/src/components/AccountPopup.svelte @@ -56,6 +56,7 @@ setMetadataLocalStorage(login.metadata.LoginToken, null) setMetadataLocalStorage(login.metadata.LoginEndpoint, null) setMetadataLocalStorage(login.metadata.LoginEmail, null) + setMetadataLocalStorage(login.metadata.CurrentWorkspace, null) navigate({ path: [login.component.LoginApp] }) } diff --git a/plugins/workbench-resources/src/components/Workbench.svelte b/plugins/workbench-resources/src/components/Workbench.svelte index a47b330287..230cb63edd 100644 --- a/plugins/workbench-resources/src/components/Workbench.svelte +++ b/plugins/workbench-resources/src/components/Workbench.svelte @@ -18,7 +18,7 @@ import notification, { NotificationStatus } from '@anticrm/notification' import { NotificationClientImpl } from '@anticrm/notification-resources' import { IntlString } from '@anticrm/platform' - import { Avatar, createQuery, setClient } from '@anticrm/presentation' + import { Avatar, createQuery, getClient, setClient } from '@anticrm/presentation' import { AnyComponent, closePopup, closeTooltip, diff --git a/plugins/workbench-resources/src/components/WorkbenchApp.svelte b/plugins/workbench-resources/src/components/WorkbenchApp.svelte index f895cb2ddf..dac1afeb20 100644 --- a/plugins/workbench-resources/src/components/WorkbenchApp.svelte +++ b/plugins/workbench-resources/src/components/WorkbenchApp.svelte @@ -53,6 +53,7 @@ async function connect (): Promise { setMetadataLocalStorage(login.metadata.LoginToken, null) setMetadataLocalStorage(login.metadata.LoginEndpoint, null) setMetadataLocalStorage(login.metadata.LoginEmail, null) + setMetadataLocalStorage(login.metadata.CurrentWorkspace, null) navigate({ path: [login.component.LoginApp], query: { navigateUrl: encodeURIComponent(JSON.stringify(getCurrentLocation())) } }) return } @@ -82,6 +83,9 @@ async function connect (): Promise { } } + // Update window title + document.title = [(fetchMetadataLocalStorage(login.metadata.CurrentWorkspace)), 'Platform'].filter(it => it).join(' - ') + return instance }