Fix expandables (#7655)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
This commit is contained in:
Andrey Sobolev 2025-01-13 22:26:17 +07:00 committed by GitHub
parent 0f84f4c19e
commit ef8f2f5b80
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 136 additions and 91 deletions

View File

@ -26,6 +26,9 @@
export let expandable = true
export let contentColor = false
export let showChevron = true
let wasExpanded = expanded
$: if (expanded) wasExpanded = true
</script>
<div class="flex-col">
@ -56,7 +59,9 @@
{/if}
</div>
<ExpandCollapse isExpanded={expanded}>
<slot />
{#if wasExpanded}
<slot />
{/if}
</ExpandCollapse>
</div>

View File

@ -5,7 +5,7 @@
import presentation, { createQuery, isAdminUser, type OverviewStatistics } from '@hcengineering/presentation'
import { Button, CheckBox, ticker } from '@hcengineering/ui'
import Expandable from '@hcengineering/ui/src/components/Expandable.svelte'
import { ObjectPresenter } from '@hcengineering/view-resources'
import { FixedColumn, ObjectPresenter } from '@hcengineering/view-resources'
import { workspacesStore } from '../utils'
const token: string = getMetadata(presentation.metadata.Token) ?? ''
@ -36,8 +36,14 @@
employees = emp
})
let realUsers: boolean
let showActive5: boolean
$: byService = groupByArray(data?.workspaces ?? [], (it) => it.service)
$: byService = groupByArray(
(data?.workspaces ?? []).filter((it) => !showActive5 || it.sessions.some((sit) => sit.current.tx > 0)),
(it) => it.service
)
const isSystemAccount = (it: string): boolean => it === systemAccountEmail || it === 'huly.ai.bot@hc.engineering'
</script>
<div class="p-6">
@ -48,102 +54,136 @@
<CheckBox bind:checked={realUsers} />
<div class="ml-1">Show only users</div>
</div>
<div class="flex-row-center">
<CheckBox bind:checked={showActive5} />
<div class="ml-1">Show active in 5mins</div>
</div>
</div>
<div class="flex-column p-3 h-full" style:overflow="auto">
{#each byService.keys() as s}
Service: {s}
{#each byService.get(s) ?? [] as act}
{@const wsInstance = $workspacesStore.find((it) => it.workspaceId === act.wsId)}
{@const totalFind = act.sessions.reduce((it, itm) => itm.total.find + it, 0)}
{@const totalTx = act.sessions.reduce((it, itm) => itm.total.tx + it, 0)}
{@const ss = byService.get(s) ?? []}
<Expandable bordered expandable showChevron>
<svelte:fragment slot="title">
<div class="flex-row-center p-1">
<FixedColumn key="service">
<span class="p-1">
Service: {s}
</span>
</FixedColumn>
<span class="p-1">
Workspaces: {ss.length}
</span>
{@const currentFind = act.sessions.reduce((it, itm) => itm.current.find + it, 0)}
{@const currentTx = act.sessions.reduce((it, itm) => itm.current.tx + it, 0)}
{@const employeeGroups = Array.from(new Set(act.sessions.map((it) => it.userId))).filter(
(it) => systemAccountEmail !== it || !realUsers
)}
{@const realGroup = Array.from(new Set(act.sessions.map((it) => it.userId))).filter(
(it) => systemAccountEmail !== it
)}
{#if employeeGroups.length > 0}
<span class="flex-col">
<Expandable contentColor expanded={false} expandable={true} bordered>
<svelte:fragment slot="title">
<div class="flex flex-row-center flex-between flex-grow p-1">
<div class="fs-title" class:greyed={realGroup.length === 0}>
Workspace: {wsInstance?.workspaceName ?? act.wsId}: {employeeGroups.length} current 5 mins => {currentFind}/{currentTx},
total => {totalFind}/{totalTx}
</div>
{#if isAdminUser()}
<Button
label={getEmbeddedLabel('Force close')}
size={'small'}
kind={'ghost'}
on:click={() => {
void fetch(endpoint + `/api/v1/manage?token=${token}&operation=force-close&wsId=${act.wsId}`, {
method: 'PUT'
})
}}
/>
{/if}
</div>
</svelte:fragment>
<div class="flex-col">
{#each employeeGroups as employeeId}
{@const employee = employees.get(employeeId)}
{@const connections = act.sessions.filter((it) => it.userId === employeeId)}
<span class="p-1">
Connections: {ss.reduce((it, itm) => it + itm.sessions.length, 0)}
</span>
<span class="p-1">
Users: {ss.reduce((it, itm) => it + itm.sessions.filter((it) => !isSystemAccount(it.userId)).length, 0)}
</span>
<span class="p-1">
Active {ss.reduce((it, itm) => it + itm.sessions.filter((it) => it.current.tx > 0).length, 0)} /
{ss.reduce((it, itm) => it + itm.sessions.filter((it) => it.mins5.tx > 0 || it.current.tx > 0).length, 0)}
</span>
</div>
</svelte:fragment>
<div class="p-1">
{#each ss as act}
{@const wsInstance = $workspacesStore.find((it) => it.workspaceId === act.wsId)}
{@const totalFind = act.sessions.reduce((it, itm) => itm.total.find + it, 0)}
{@const totalTx = act.sessions.reduce((it, itm) => itm.total.tx + it, 0)}
{@const find = connections.reduce((it, itm) => itm.current.find + it, 0)}
{@const txes = connections.reduce((it, itm) => itm.current.tx + it, 0)}
<div class="p-1 flex-col ml-4">
<Expandable>
<svelte:fragment slot="title">
<div class="flex-row-center p-1">
{#if employee}
<ObjectPresenter
_class={contact.mixin.Employee}
objectId={employee.person}
props={{ shouldShowAvatar: true, disabled: true }}
/>
{:else}
{employeeId}
{/if}
: {connections.length}
<div class="ml-4">
<div class="ml-1">{find} rx/{txes} tx</div>
</div>
</div>
</svelte:fragment>
{#each connections as user, i}
<div class="flex-row-center ml-10">
#{i}
{user.userId}
<div class="p-1">
Total: {user.total.find} rx/{user.total.tx} tx
</div>
<div class="p-1">
Previous 5 mins: {user.mins5.find} rx/{user.mins5.tx} tx
</div>
<div class="p-1">
Current 5 mins: {user.current.find} tx/{user.current.tx} tx
</div>
</div>
<div class="p-1 flex-col ml-10">
{#each Object.entries(user.data ?? {}) as [k, v]}
<div class="p-1">
{k}: {JSON.stringify(v)}
{@const currentFind = act.sessions.reduce((it, itm) => itm.current.find + it, 0)}
{@const currentTx = act.sessions.reduce((it, itm) => itm.current.tx + it, 0)}
{@const employeeGroups = Array.from(
new Set(act.sessions.filter((it) => !showActive5 || it.current.tx > 0).map((it) => it.userId))
).filter((it) => !isSystemAccount(it) || !realUsers)}
{@const realGroup = Array.from(new Set(act.sessions.map((it) => it.userId))).filter(
(it) => !isSystemAccount(it)
)}
{#if employeeGroups.length > 0}
<span class="flex-col">
<Expandable contentColor expanded={false} expandable={true} bordered>
<svelte:fragment slot="title">
<div class="flex flex-row-center flex-between flex-grow p-1">
<div class="fs-title" class:greyed={realGroup.length === 0}>
Workspace: {wsInstance?.workspaceName ?? act.wsId}: {employeeGroups.length} current 5 mins => {currentFind}/{currentTx},
total => {totalFind}/{totalTx}
</div>
{#if isAdminUser()}
<Button
label={getEmbeddedLabel('Force close')}
size={'small'}
kind={'ghost'}
on:click={() => {
void fetch(
endpoint + `/api/v1/manage?token=${token}&operation=force-close&wsId=${act.wsId}`,
{
method: 'PUT'
}
)
}}
/>
{/if}
</div>
</svelte:fragment>
<div class="flex-col">
{#each employeeGroups as employeeId}
{@const employee = employees.get(employeeId)}
{@const connections = act.sessions.filter((it) => it.userId === employeeId)}
{@const find = connections.reduce((it, itm) => itm.current.find + it, 0)}
{@const txes = connections.reduce((it, itm) => itm.current.tx + it, 0)}
<div class="p-1 flex-col ml-4">
<Expandable>
<svelte:fragment slot="title">
<div class="flex-row-center p-1">
{#if employee}
<ObjectPresenter
_class={contact.mixin.Employee}
objectId={employee.person}
props={{ shouldShowAvatar: true, disabled: true }}
/>
{:else}
{employeeId}
{/if}
: {connections.length}
<div class="ml-4">
<div class="ml-1">{find} rx/{txes} tx</div>
</div>
</div>
</svelte:fragment>
{#each connections as user, i}
<div class="flex-row-center ml-10">
#{i}
{user.userId}
<div class="p-1">
Total: {user.total.find} rx/{user.total.tx} tx
</div>
<div class="p-1">
Previous 5 mins: {user.mins5.find} rx/{user.mins5.tx} tx
</div>
<div class="p-1">
Current 5 mins: {user.current.find} tx/{user.current.tx} tx
</div>
</div>
<div class="p-1 flex-col ml-10">
{#each Object.entries(user.data ?? {}) as [k, v]}
<div class="p-1">
{k}: {JSON.stringify(v)}
</div>
{/each}
</div>
{/each}
</div>
{/each}
</Expandable>
</Expandable>
</div>
{/each}
</div>
{/each}
</div>
</Expandable>
</span>
{/if}
{/each}
</Expandable>
</span>
{/if}
{/each}
</div>
</Expandable>
{/each}
</div>