High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
chore: use context menu for user table (#25428)
Alex7cbfc12e0dc9
diff --git a/web/src/lib/services/user-admin.service.ts b/web/src/lib/services/user-admin.service.tsindex 71d20bd9ce..233eb88657 100644--- a/web/src/lib/services/user-admin.service.ts+++ b/web/src/lib/services/user-admin.service.ts@@ -23,6 +23,7 @@ import {import { modalManager, toastManager, type ActionItem } from '@immich/ui';import {mdiDeleteRestore,+ mdiInformationOutline,mdiLockReset,mdiLockSmart,mdiPencilOutline,@@ -46,6 +47,12 @@ export const getUserAdminsActions = ($t: MessageFormatter) => {};export const getUserAdminActions = ($t: MessageFormatter, user: UserAdminResponseDto) => {+ const Detail: ActionItem = {+ icon: mdiInformationOutline,+ title: $t('details'),+ onAction: () => goto(Route.viewUser(user)),+ };+const Update: ActionItem = {icon: mdiPencilOutline,title: $t('edit'),@@ -92,7 +99,7 @@ export const getUserAdminActions = ($t: MessageFormatter, user: UserAdminResponsonAction: () => handleResetPinCodeUserAdmin(user),};- return { Update, Delete, Restore, ResetPassword, ResetPinCode };+ return { Detail, Update, Delete, Restore, ResetPassword, ResetPinCode };};export const handleCreateUserAdmin = async (dto: UserAdminCreateDto) => {diff --git a/web/src/routes/admin/users/(list)/+layout.svelte b/web/src/routes/admin/users/(list)/+layout.svelteindex 368ce5ed18..b895e72de5 100644--- a/web/src/routes/admin/users/(list)/+layout.svelte+++ b/web/src/routes/admin/users/(list)/+layout.svelte@@ -1,15 +1,18 @@<script lang="ts">import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';import OnEvents from '$lib/components/OnEvents.svelte';- import { getUserAdminsActions, handleNavigateUserAdmin } from '$lib/services/user-admin.service';+ import { Route } from '$lib/route';+ import { getUserAdminActions, getUserAdminsActions } from '$lib/services/user-admin.service';import { locale } from '$lib/stores/preferences.store';import { getByteUnitString } from '$lib/utils/byte-units';import { searchUsersAdmin, type UserAdminResponseDto } from '@immich/sdk';import {- Button,CommandPaletteDefaultProvider,Container,+ ContextMenuButton,Icon,+ Link,+ MenuItemType,Table,TableBody,TableCell,@@ -46,11 +49,16 @@const { Create } = $derived(getUserAdminsActions($t));+ const getActionsForUser = (user: UserAdminResponseDto) => {+ const { Detail, Update, Delete, ResetPassword, ResetPinCode } = getUserAdminActions($t, user);+ return [Detail, Update, ResetPassword, ResetPinCode, MenuItemType.Divider, Delete];+ };+const classes = {- column1: 'w-8/12 sm:w-5/12 lg:w-6/12 xl:w-4/12 2xl:w-5/12',- column2: 'hidden sm:block w-3/12',- column3: 'hidden xl:block w-3/12 2xl:w-2/12',- column4: 'w-4/12 lg:w-3/12 xl:w-2/12',+ column1: 'w-8/12 md:w-5/12 lg:w-4/12',+ column2: 'hidden md:block md:w-5/12 lg:w-4/12',+ column3: 'hidden lg:block lg:w-2/12',+ column4: 'w-4/12 md:w-2/12 flex justify-end',};</script>@@ -68,16 +76,18 @@<Container center size="large"><Table class="mt-4" striped spacing="small" size="small"><TableHeader>- <TableHeading class={classes.column1}>{$t('email')}</TableHeading>- <TableHeading class={classes.column2}>{$t('name')}</TableHeading>+ <TableHeading class={classes.column1}>{$t('name')}</TableHeading>+ <TableHeading class={classes.column2}>{$t('email')}</TableHeading><TableHeading class={classes.column3}>{$t('has_quota')}</TableHeading></TableHeader><TableBody>{#each users as user (user.id)}<TableRow color={user.deletedAt ? 'danger' : undefined}>- <TableCell class={classes.column1}>{user.email}</TableCell>- <TableCell class={classes.column2}>{user.name}</TableCell>+ <TableCell class={classes.column1}>+ <Link href={Route.viewUser(user)}>{user.name}</Link>+ </TableCell>+ <TableCell class={classes.column2}>{user.email}</TableCell><TableCell class={classes.column3}><div class="container mx-auto flex flex-wrap justify-center">{#if user.quotaSizeInBytes !== null && user.quotaSizeInBytes >= 0}@@ -88,7 +98,7 @@</div></TableCell><TableCell class={classes.column4}>- <Button onclick={() => handleNavigateUserAdmin(user)}>{$t('view')}</Button>+ <ContextMenuButton color="primary" aria-label={$t('open')} items={getActionsForUser(user)} /></TableCell></TableRow>{/each}diff --git a/web/src/routes/admin/users/[id]/+layout.svelte b/web/src/routes/admin/users/[id]/+layout.svelteindex 92d29aa5e2..61fd184303 100644--- a/web/src/routes/admin/users/[id]/+layout.svelte+++ b/web/src/routes/admin/users/[id]/+layout.svelte@@ -198,8 +198,8 @@})}><p class="font-medium text-immich-dark-gray dark:text-white mb-2">{$t('storage')}</p>- <div class="mt-4 h-[7px] w-full rounded-full bg-gray-200 dark:bg-gray-700">- <div class="h-[7px] rounded-full {getUsageClass()}" style="width: {usedPercentage}%"></div>+ <div class="mt-4 h-1.75 w-full rounded-full bg-gray-200 dark:bg-gray-700">+ <div class="h-1.75 rounded-full {getUsageClass()}" style="width: {usedPercentage}%"></div></div></div>{/if}