diff --git a/src/lib/layout/activity.svelte b/src/lib/layout/activity.svelte index dce36d66f5..e7ce285a9c 100644 --- a/src/lib/layout/activity.svelte +++ b/src/lib/layout/activity.svelte @@ -3,7 +3,7 @@ import { Container } from '$lib/layout'; import { toLocaleDateTime } from '$lib/helpers/date'; import type { Models } from '@appwrite.io/console'; - import { Layout, Table, Card, Empty } from '@appwrite.io/pink-svelte'; + import { Layout, Table, Card, Empty, InteractiveText } from '@appwrite.io/pink-svelte'; import Button from '$lib/elements/forms/button.svelte'; import type { PinkColumn } from '$lib/helpers/types'; @@ -14,12 +14,32 @@ export let databasesScreen = false; export let useCreateLinkForPagination = true; + function getColumnWidth(columnId: string): Pick { + const widthConfig: Record< + string, + { insideSheet: number | { min: number }; default: number | { min: number } } + > = { + user: { insideSheet: 140, default: { min: 100 } }, + event: { insideSheet: 125, default: { min: 160 } }, + location: { insideSheet: 100, default: { min: 120 } }, + ip: { insideSheet: { min: 150 }, default: { min: 250 } }, + date: { insideSheet: { min: 200 }, default: { min: 180 } } + }; + + const config = widthConfig[columnId]; + if (!config) { + return {}; + } + + return { width: insideSideSheet ? config.insideSheet : config.default }; + } + const columns: PinkColumn[] = [ - { id: 'user', ...(insideSideSheet ? { width: 140 } : {}) }, - { id: 'event', ...(insideSideSheet ? { width: 125 } : {}) }, - { id: 'location', ...(insideSideSheet ? { width: 100 } : {}) }, - { id: 'ip', ...(insideSideSheet ? { width: { min: 150 } } : {}) }, - { id: 'date', ...(insideSideSheet ? { width: { min: 200 } } : {}) } + { id: 'user', ...getColumnWidth('user') }, + { id: 'event', ...getColumnWidth('event') }, + { id: 'location', ...getColumnWidth('location') }, + { id: 'ip', ...getColumnWidth('ip') }, + { id: 'date', ...getColumnWidth('date') } ]; @@ -29,55 +49,53 @@ expanded={databasesScreen && !insideSideSheet} slotSpacing={databasesScreen && !insideSideSheet}> {#if logs.total} -
- - - User - Event - Location - IP - Date - - {#each logs.logs as log} - - - - {#if log.userEmail} - {#if log.userName} - - {log.userName} - {:else} - - {log.userEmail} - {/if} + + + User + Event + Location + IP + Date + + {#each logs.logs as log} + + + + {#if log.userEmail} + {#if log.userName} + + {log.userName} {:else} -
- -
- {log.userName ?? 'Anonymous'} + + {log.userEmail} {/if} -
-
- - {log.event} - - - {#if log.countryCode !== '--'} - {log.countryName} {:else} - Unknown +
+ +
+ {log.userName ?? 'Anonymous'} {/if} -
- - {log.ip} - - - {toLocaleDateTime(log.time)} - -
- {/each} -
-
+ + + + {log.event} + + + {#if log.countryCode !== '--'} + {log.countryName} + {:else} + Unknown + {/if} + + + + + + {toLocaleDateTime(log.time)} + + + {/each} + @@ -146,7 +153,7 @@ {/if} - {session.ip} + diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/sessions/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/sessions/+page.svelte index b7def91384..77feda0fb5 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/sessions/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/sessions/+page.svelte @@ -1,6 +1,13 @@