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

UBERF-5561 (#4666)

Browse Source 
Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
Denis Bykhov 2024-02-16 16:22:31 +06:00 committed by GitHub
parent 3ee35da99e
commit e3e7856b02
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/view-resources/src/middleware.ts
View File

@ -280,6 +280,7 @@ export class AnalyticsMiddleware extends BasePresentationMiddleware implements P
if (this.client.getHierarchy().isDerived(etx._class, core.class.TxCUD)) { if (this.client.getHierarchy().isDerived(etx._class, core.class.TxCUD)) {
const cud = etx as TxCUD<Doc> const cud = etx as TxCUD<Doc>
const _class = this.client.getHierarchy().getClass(cud.objectClass) const _class = this.client.getHierarchy().getClass(cud.objectClass)
if (_class.label !== undefined) {
const label = await translate(_class.label, {}, 'en') const label = await translate(_class.label, {}, 'en')
if (cud._class === core.class.TxCreateDoc) { if (cud._class === core.class.TxCreateDoc) {
Analytics.handleEvent(`Create ${label}`) Analytics.handleEvent(`Create ${label}`)
@ -290,4 +291,5 @@ export class AnalyticsMiddleware extends BasePresentationMiddleware implements P
} }
} }
} }
}
} }

29
plugins/workbench-resources/src/components/SelectWorkspaceMenu.svelte
View File

@ -40,26 +40,6 @@
}) })
}) })
$: void doLogin($workspacesStore)
async function doLogin (ws: Workspace[]): Promise<void> {
const tokens: Record<string, string> = fetchMetadataLocalStorage(login.metadata.LoginTokens) ?? {}
await Promise.all(
ws.map(async (p) => {
const ws = p.workspace
const token = tokens[ws]
if (!token) {
const selectWorkspace = await getResource(login.function.SelectWorkspace)
const loginInfo = (await selectWorkspace(ws))[1]
if (loginInfo !== undefined) {
tokens[ws] = loginInfo?.token
}
}
})
)
setMetadataLocalStorage(login.metadata.LoginTokens, tokens)
}
function getWorkspaceLink (ws: Workspace): string { function getWorkspaceLink (ws: Workspace): string {
const loc: Location = { const loc: Location = {
path: [workbenchId, ws.workspace] path: [workbenchId, ws.workspace]
@ -73,6 +53,15 @@
closePopup() closePopup()
closePopup() closePopup()
if (ws !== getCurrentLocation().path[1]) { if (ws !== getCurrentLocation().path[1]) {
const tokens: Record<string, string> = fetchMetadataLocalStorage(login.metadata.LoginTokens) ?? {}
const token = tokens[ws]
if (!token) {
const selectWorkspace = await getResource(login.function.SelectWorkspace)
const loginInfo = (await selectWorkspace(ws))[1]
if (loginInfo !== undefined) {
tokens[ws] = loginInfo?.token
}
}
const last = localStorage.getItem(`${locationStorageKeyId}_${ws}`) const last = localStorage.getItem(`${locationStorageKeyId}_${ws}`)
if (last !== null) { if (last !== null) {
navigate(JSON.parse(last)) navigate(JSON.parse(last))