Skip to content

High performance self-hosted photo and video management solution.

feat: modal routes (#24726)

Jason Rasmussen165f9e15ee17
diff --git a/web/src/lib/constants.ts b/web/src/lib/constants.ts
index 38933aea85..6f7c0d8e1e 100644
--- a/web/src/lib/constants.ts
+++ b/web/src/lib/constants.ts
@@ -1,3 +1,5 @@
+export const UUID_REGEX = /^[\dA-Fa-f]{8}(?:\b-[\dA-Fa-f]{4}){3}\b-[\dA-Fa-f]{12}$/;
+
export enum AssetAction {
ARCHIVE = 'archive',
UNARCHIVE = 'unarchive',
@@ -20,7 +22,9 @@ export enum AssetAction {
export enum AppRoute {
ADMIN_USERS = '/admin/users',
- ADMIN_LIBRARY_MANAGEMENT = '/admin/library-management',
+ ADMIN_USERS_NEW = '/admin/users/new',
+ ADMIN_LIBRARIES = '/admin/library-management',
+ ADMIN_LIBRARIES_NEW = '/admin/library-management/new',
ADMIN_SETTINGS = '/admin/system-settings',
ADMIN_STATS = '/admin/server-status',
ADMIN_QUEUES = '/admin/queues',
diff --git a/web/src/lib/modals/LibraryRenameModal.svelte b/web/src/lib/modals/LibraryRenameModal.svelte
deleted file mode 100644
index 0a7d675b11..0000000000
--- a/web/src/lib/modals/LibraryRenameModal.svelte
+++ /dev/null
@@ -1,41 +0,0 @@
-<script lang="ts">
- import { handleRenameLibrary } from '$lib/services/library.service';
- import type { LibraryResponseDto } from '@immich/sdk';
- import { Button, Field, HStack, Input, Modal, ModalBody, ModalFooter } from '@immich/ui';
- import { mdiRenameOutline } from '@mdi/js';
- import { t } from 'svelte-i18n';
-
- type Props = {
- library: LibraryResponseDto;
- onClose: () => void;
- };
-
- let { library, onClose }: Props = $props();
-
- let newName = $state(library.name);
-
- const onsubmit = async () => {
- const success = await handleRenameLibrary(library, newName);
-
- if (success) {
- onClose();
- }
- };
-</script>
-
-<Modal icon={mdiRenameOutline} title={$t('rename')} {onClose} size="small">
- <ModalBody>
- <form {onsubmit} autocomplete="off" id="rename-library-form">
- <Field label={$t('name')}>
- <Input bind:value={newName} />
- </Field>
- </form>
- </ModalBody>
-
- <ModalFooter>
- <HStack fullWidth>
- <Button shape="round" fullWidth color="secondary" onclick={() => onClose()}>{$t('cancel')}</Button>
- <Button shape="round" fullWidth type="submit" form="rename-library-form">{$t('save')}</Button>
- </HStack>
- </ModalFooter>
-</Modal>
diff --git a/web/src/lib/services/library.service.ts b/web/src/lib/services/library.service.ts
index a7f2ba25e7..62371e2512 100644
--- a/web/src/lib/services/library.service.ts
+++ b/web/src/lib/services/library.service.ts
@@ -1,12 +1,10 @@
import { goto } from '$app/navigation';
import { AppRoute } from '$lib/constants';
import { eventManager } from '$lib/managers/event-manager.svelte';
-import LibraryCreateModal from '$lib/modals/LibraryCreateModal.svelte';
import LibraryExclusionPatternAddModal from '$lib/modals/LibraryExclusionPatternAddModal.svelte';
import LibraryExclusionPatternEditModal from '$lib/modals/LibraryExclusionPatternEditModal.svelte';
import LibraryFolderAddModal from '$lib/modals/LibraryFolderAddModal.svelte';
import LibraryFolderEditModal from '$lib/modals/LibraryFolderEditModal.svelte';
-import LibraryRenameModal from '$lib/modals/LibraryRenameModal.svelte';
import { handleError } from '$lib/utils/handle-error';
import { getFormatter } from '$lib/utils/i18n';
import {
@@ -19,6 +17,7 @@ import {
updateLibrary,
type CreateLibraryDto,
type LibraryResponseDto,
+ type UpdateLibraryDto,
} from '@immich/sdk';
import { modalManager, toastManager, type ActionItem } from '@immich/ui';
import { mdiPencilOutline, mdiPlusBoxOutline, mdiSync, mdiTrashCanOutline } from '@mdi/js';
@@ -38,7 +37,7 @@ export const getLibrariesActions = ($t: MessageFormatter, libraries: LibraryResp
title: $t('create_library'),
type: $t('command'),
icon: mdiPlusBoxOutline,
- onAction: () => handleShowLibraryCreateModal(),
+ onAction: () => goto(AppRoute.ADMIN_LIBRARIES_NEW),
shortcuts: { shift: true, key: 'n' },
};
@@ -46,11 +45,11 @@ export const getLibrariesActions = ($t: MessageFormatter, libraries: LibraryResp
};
export const getLibraryActions = ($t: MessageFormatter, library: LibraryResponseDto) => {
- const Rename: ActionItem = {
+ const Edit: ActionItem = {
icon: mdiPencilOutline,
type: $t('command'),
- title: $t('rename'),
- onAction: () => modalManager.show(LibraryRenameModal, { library }),
+ title: $t('edit'),
+ onAction: () => goto(`${AppRoute.ADMIN_LIBRARIES}/${library.id}/edit`),
shortcuts: { key: 'r' },
};
@@ -85,7 +84,7 @@ export const getLibraryActions = ($t: MessageFormatter, library: LibraryResponse
shortcuts: { shift: true, key: 'r' },
};
- return { Rename, Delete, AddFolder, AddExclusionPattern, Scan };
+ return { Edit, Delete, AddFolder, AddExclusionPattern, Scan };
};
export const getLibraryFolderActions = ($t: MessageFormatter, library: LibraryResponseDto, folder: string) => {
@@ -150,7 +149,7 @@ const handleScanLibrary = async (library: LibraryResponseDto) => {
};
export const handleViewLibrary = async (library: LibraryResponseDto) => {
- await goto(`${AppRoute.ADMIN_LIBRARY_MANAGEMENT}/${library.id}`);
+ await goto(`${AppRoute.ADMIN_LIBRARIES}/${library.id}`);
};
export const handleCreateLibrary = async (dto: CreateLibraryDto) => {
@@ -160,33 +159,24 @@ export const handleCreateLibrary = async (dto: CreateLibraryDto) => {
const library = await createLibrary({ createLibraryDto: dto });
eventManager.emit('LibraryCreate', library);
toastManager.success($t('admin.library_created', { values: { library: library.name } }));
- return true;
+ return library;
} catch (error) {
handleError(error, $t('errors.unable_to_create_library'));
- return false;
}
};
-export const handleRenameLibrary = async (library: { id: string }, name?: string) => {
+export const handleUpdateLibrary = async (library: LibraryResponseDto, dto: UpdateLibraryDto) => {
const $t = await getFormatter();
- if (!name) {
- return false;
- }
-
try {
- const updatedLibrary = await updateLibrary({
- id: library.id,
- updateLibraryDto: { name },
- });
+ const updatedLibrary = await updateLibrary({ id: library.id, updateLibraryDto: dto });
eventManager.emit('LibraryUpdate', updatedLibrary);
toastManager.success($t('admin.library_updated'));
+ return true;
} catch (error) {
handleError(error, $t('errors.unable_to_update_library'));
return false;
}
-
- return true;
};
const handleDeleteLibrary = async (library: LibraryResponseDto) => {
@@ -357,7 +347,3 @@ const handleDeleteExclusionPattern = async (library: LibraryResponseDto, exclusi
handleError(error, $t('errors.unable_to_update_library'));
}
};
-
-export const handleShowLibraryCreateModal = async () => {
- await modalManager.show(LibraryCreateModal, {});
-};
diff --git a/web/src/lib/services/user-admin.service.ts b/web/src/lib/services/user-admin.service.ts
index 997a43fc7f..5fd4ff99fd 100644
--- a/web/src/lib/services/user-admin.service.ts
+++ b/web/src/lib/services/user-admin.service.ts
@@ -1,10 +1,9 @@
import { goto } from '$app/navigation';
+import { AppRoute } from '$lib/constants';
import { eventManager } from '$lib/managers/event-manager.svelte';
import { serverConfigManager } from '$lib/managers/server-config-manager.svelte';
import PasswordResetSuccessModal from '$lib/modals/PasswordResetSuccessModal.svelte';
-import UserCreateModal from '$lib/modals/UserCreateModal.svelte';
import UserDeleteConfirmModal from '$lib/modals/UserDeleteConfirmModal.svelte';
-import UserEditModal from '$lib/modals/UserEditModal.svelte';
import UserRestoreConfirmModal from '$lib/modals/UserRestoreConfirmModal.svelte';
import { user as authUser } from '$lib/stores/user.store';
import type { HeaderButtonActionItem } from '$lib/types';
@@ -39,7 +38,7 @@ export const getUserAdminsActions = ($t: MessageFormatter) => {
title: $t('create_user'),
type: $t('command'),
icon: mdiPlusBoxOutline,
- onAction: () => modalManager.show(UserCreateModal, {}),
+ onAction: () => goto(AppRoute.ADMIN_USERS_NEW),
shortcuts: { shift: true, key: 'n' },
};
@@ -50,7 +49,7 @@ export const getUserAdminActions = ($t: MessageFormatter, user: UserAdminRespons
const Update: ActionItem = {
icon: mdiPencilOutline,
title: $t('edit'),
- onAction: () => modalManager.show(UserEditModal, { user }),
+ onAction: () => goto(`${AppRoute.ADMIN_USERS}/${user.id}/edit`),
};
const Delete: ActionItem = {
@@ -103,7 +102,7 @@ export const handleCreateUserAdmin = async (dto: UserAdminCreateDto) => {
const response = await createUserAdmin({ userAdminCreateDto: dto });
eventManager.emit('UserAdminCreate', response);
toastManager.success();
- return true;
+ return response;
} catch (error) {
handleError(error, $t('errors.unable_to_create_user'));
}
diff --git a/web/src/lib/sidebars/AdminSidebar.svelte b/web/src/lib/sidebars/AdminSidebar.svelte
index 919c072527..fa660d7e2f 100644
--- a/web/src/lib/sidebars/AdminSidebar.svelte
+++ b/web/src/lib/sidebars/AdminSidebar.svelte
@@ -9,7 +9,7 @@
<div class="h-full flex flex-col justify-between gap-2">
<div class="flex flex-col pt-8 pe-4 gap-1">
<NavbarItem title={$t('users')} href={AppRoute.ADMIN_USERS} icon={mdiAccountMultipleOutline} />
- <NavbarItem title={$t('external_libraries')} href={AppRoute.ADMIN_LIBRARY_MANAGEMENT} icon={mdiBookshelf} />
+ <NavbarItem title={$t('external_libraries')} href={AppRoute.ADMIN_LIBRARIES} icon={mdiBookshelf} />
<NavbarItem title={$t('admin.queues')} href={AppRoute.ADMIN_QUEUES} icon={mdiTrayFull} />
<NavbarItem title={$t('settings')} href={AppRoute.ADMIN_SETTINGS} icon={mdiCog} />
<NavbarItem title={$t('server_stats')} href={AppRoute.ADMIN_STATS} icon={mdiServer} />
diff --git a/web/src/params/id.ts b/web/src/params/id.ts
index 6b16a651d1..b7e93be6ae 100644
--- a/web/src/params/id.ts
+++ b/web/src/params/id.ts
@@ -1,6 +1,7 @@
+import { UUID_REGEX } from '$lib/constants';
import type { ParamMatcher } from '@sveltejs/kit';
/* Returns true if the given param matches UUID format */
export const match: ParamMatcher = (param: string) => {
- return /^[\dA-Fa-f]{8}(?:\b-[\dA-Fa-f]{4}){3}\b-[\dA-Fa-f]{12}$/.test(param);
+ return UUID_REGEX.test(param);
};
diff --git a/web/src/routes/+layout.svelte b/web/src/routes/+layout.svelte
index 77a3d402b2..3a1d4f49f9 100644
--- a/web/src/routes/+layout.svelte
+++ b/web/src/routes/+layout.svelte
@@ -166,7 +166,7 @@
title: $t('external_libraries'),
description: $t('admin.external_libraries_page_description'),
icon: mdiBookshelf,
- onAction: () => goto(AppRoute.ADMIN_LIBRARY_MANAGEMENT),
+ onAction: () => goto(AppRoute.ADMIN_LIBRARIES),
},
{
title: $t('server_stats'),
diff --git a/web/src/routes/admin/library-management/+page.svelte b/web/src/routes/admin/library-management/(list)/+layout.svelte
similarity index 90%
rename from web/src/routes/admin/library-management/+page.svelte
rename to web/src/routes/admin/library-management/(list)/+layout.svelte
index e61b4433be..e741dbd610 100644
--- a/web/src/routes/admin/library-management/+page.svelte
+++ b/web/src/routes/admin/library-management/(list)/+layout.svelte
@@ -4,27 +4,29 @@
import OnEvents from '$lib/components/OnEvents.svelte';
import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte';
import { AppRoute } from '$lib/constants';
- import { getLibrariesActions, handleShowLibraryCreateModal, handleViewLibrary } from '$lib/services/library.service';
+ import { getLibrariesActions, handleViewLibrary } from '$lib/services/library.service';
import { locale } from '$lib/stores/preferences.store';
import { getBytesWithUnit } from '$lib/utils/byte-units';
import { getLibrary, getLibraryStatistics, type LibraryResponseDto } from '@immich/sdk';
import { Button, CommandPaletteContext } from '@immich/ui';
+ import type { Snippet } from 'svelte';
import { t } from 'svelte-i18n';
import { fade } from 'svelte/transition';
- import type { PageData } from './$types';
+ import type { LayoutData } from './$types';
type Props = {
- data: PageData;
+ children?: Snippet;
+ data: LayoutData;
};
- let { data }: Props = $props();
+ let { children, data }: Props = $props();
let libraries = $state(data.libraries);
let statistics = $state(data.statistics);
let owners = $state(data.owners);
const onLibraryCreate = async (library: LibraryResponseDto) => {
- await goto(`${AppRoute.ADMIN_LIBRARY_MANAGEMENT}/${library.id}`);
+ await goto(`${AppRoute.ADMIN_LIBRARIES}/${library.id}`);
};
const onLibraryUpdate = async (library: LibraryResponseDto) => {
@@ -100,10 +102,12 @@
{:else}
<EmptyPlaceholder
text={$t('no_libraries_message')}
- onClick={handleShowLibraryCreateModal}
+ onClick={() => goto(AppRoute.ADMIN_LIBRARIES_NEW)}
class="mt-10 mx-auto"
/>
{/if}
+
+ {@render children?.()}
</div>
</section>
</AdminPageLayout>
diff --git a/web/src/routes/admin/library-management/+page.ts b/web/src/routes/admin/library-management/(list)/+layout.ts
similarity index 93%
rename from web/src/routes/admin/library-management/+page.ts
rename to web/src/routes/admin/library-management/(list)/+layout.ts
index aa892f81ed..aee777a9e8 100644
--- a/web/src/routes/admin/library-management/+page.ts
+++ b/web/src/routes/admin/library-management/(list)/+layout.ts
@@ -1,7 +1,7 @@
import { authenticate, requestServerInfo } from '$lib/utils/auth';
import { getFormatter } from '$lib/utils/i18n';
import { getAllLibraries, getLibraryStatistics, getUserAdmin, searchUsersAdmin } from '@immich/sdk';
-import type { PageLoad } from './$types';
+import type { LayoutLoad } from './$types';
export const load = (async ({ url }) => {
await authenticate(url, { admin: true });
@@ -26,4 +26,4 @@ export const load = (async ({ url }) => {
title: $t('external_libraries'),
},
};
-}) satisfies PageLoad;
+}) satisfies LayoutLoad;
diff --git a/web/src/routes/admin/library-management/(list)/+page.svelte b/web/src/routes/admin/library-management/(list)/+page.svelte
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/web/src/lib/modals/LibraryCreateModal.svelte b/web/src/routes/admin/library-management/(list)/new/+page.svelte
similarity index 77%
rename from web/src/lib/modals/LibraryCreateModal.svelte
rename to web/src/routes/admin/library-management/(list)/new/+page.svelte
index d2d7f62c02..b236b83ce8 100644
--- a/web/src/lib/modals/LibraryCreateModal.svelte
+++ b/web/src/routes/admin/library-management/(list)/new/+page.svelte
@@ -1,5 +1,7 @@
<script lang="ts">
+ import { goto } from '$app/navigation';
import SettingSelect from '$lib/components/shared-components/settings/setting-select.svelte';
+ import { AppRoute } from '$lib/constants';
import { handleCreateLibrary } from '$lib/services/library.service';
import { user } from '$lib/stores/user.store';
import { searchUsersAdmin } from '@immich/sdk';
@@ -8,12 +10,6 @@
import { onMount } from 'svelte';
import { t } from 'svelte-i18n';
- type Props = {
- onClose: () => void;
- };
-
- let { onClose }: Props = $props();
-
let ownerId: string = $state($user.id);
let userOptions: { value: string; text: string }[] = $state([]);
@@ -23,10 +19,14 @@
userOptions = users.map((user) => ({ value: user.id, text: user.name }));
});
+ const onClose = async () => {
+ await goto(AppRoute.ADMIN_LIBRARIES);
+ };
+
const onSubmit = async () => {
- const success = await handleCreateLibrary({ ownerId });
- if (success) {
- onClose();
+ const library = await handleCreateLibrary({ ownerId });
+ if (library) {
+ await goto(`${AppRoute.ADMIN_LIBRARIES}/${library.id}`, { replaceState: true });
}
};
</script>
diff --git a/web/src/routes/admin/library-management/(list)/new/+page.ts b/web/src/routes/admin/library-management/(list)/new/+page.ts
new file mode 100644
index 0000000000..da3756bcf6
--- /dev/null
+++ b/web/src/routes/admin/library-management/(list)/new/+page.ts
@@ -0,0 +1,14 @@
+import { authenticate } from '$lib/utils/auth';
+import { getFormatter } from '$lib/utils/i18n';
+import type { PageLoad } from './$types';
+
+export const load = (async ({ url }) => {
+ await authenticate(url, { admin: true });
+ const $t = await getFormatter();
+
+ return {
+ meta: {
+ title: $t('external_libraries'),
+ },
+ };
+}) satisfies PageLoad;
diff --git a/web/src/routes/admin/library-management/[id]/+layout.svelte b/web/src/routes/admin/library-management/[id]/+layout.svelte
new file mode 100644
index 0000000000..62b4891459
--- /dev/null
+++ b/web/src/routes/admin/library-management/[id]/+layout.svelte
@@ -0,0 +1,118 @@
+<script lang="ts">
+ import { goto } from '$app/navigation';
+ import emptyFoldersUrl from '$lib/assets/empty-folders.svg';
+ import AdminCard from '$lib/components/AdminCard.svelte';
+ import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';
+ import OnEvents from '$lib/components/OnEvents.svelte';
+ import ServerStatisticsCard from '$lib/components/server-statistics/ServerStatisticsCard.svelte';
+ import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte';
+ import TableButton from '$lib/components/TableButton.svelte';
+ import { AppRoute } from '$lib/constants';
+ import LibraryFolderAddModal from '$lib/modals/LibraryFolderAddModal.svelte';
+ import {
+ getLibraryActions,
+ getLibraryExclusionPatternActions,
+ getLibraryFolderActions,
+ } from '$lib/services/library.service';
+ import { getBytesWithUnit } from '$lib/utils/byte-units';
+ import type { LibraryResponseDto } from '@immich/sdk';
+ import { Code, CommandPaletteContext, Container, Heading, modalManager } from '@immich/ui';
+ import { mdiCameraIris, mdiChartPie, mdiFilterMinusOutline, mdiFolderOutline, mdiPlayCircle } from '@mdi/js';
+ import type { Snippet } from 'svelte';
+ import { t } from 'svelte-i18n';
+ import type { LayoutData } from './$types';
+
+ type Props = {
+ children?: Snippet;
+ data: LayoutData;
+ };
+
+ const { children, data }: Props = $props();
+
+ const statistics = data.statistics;
+ const [storageUsage, unit] = getBytesWithUnit(statistics.usage);
+
+ let library = $state(data.library);
+
+ const onLibraryUpdate = (newLibrary: LibraryResponseDto) => {
+ if (newLibrary.id === library.id) {
+ library = newLibrary;
+ }
+ };
+
+ const onLibraryDelete = async ({ id }: { id: string }) => {
+ if (id === library.id) {
+ await goto(AppRoute.ADMIN_LIBRARIES);
+ }
+ };
+
+ const { Edit, Delete, AddFolder, AddExclusionPattern, Scan } = $derived(getLibraryActions($t, library));
+</script>
+
+<OnEvents {onLibraryUpdate} {onLibraryDelete} />
+
+<CommandPaletteContext commands={[Edit, Delete, AddFolder, AddExclusionPattern, Scan]} />
+
+<AdminPageLayout
+ breadcrumbs={[{ title: $t('external_libraries'), href: AppRoute.ADMIN_LIBRARIES }, { title: library.name }]}
+ actions={[Scan, Edit, Delete]}
+>
+ <Container size="large" center>
+ <div class="grid gap-4 grid-cols-1 lg:grid-cols-2 w-full">
+ <Heading tag="h1" size="large" class="col-span-full my-4">{library.name}</Heading>
+ <div class="flex flex-col lg:flex-row gap-4 col-span-full">
+ <ServerStatisticsCard icon={mdiCameraIris} title={$t('photos')} value={statistics.photos} />
+ <ServerStatisticsCard icon={mdiPlayCircle} title={$t('videos')} value={statistics.videos} />
+ <ServerStatisticsCard icon={mdiChartPie} title={$t('usage')} value={storageUsage} {unit} />
+ </div>
+
+ <AdminCard icon={mdiFolderOutline} title={$t('folders')} headerAction={AddFolder}>
+ {#if library.importPaths.length === 0}
+ <EmptyPlaceholder
+ src={emptyFoldersUrl}
+ text={$t('admin.library_folder_description')}
+ fullWidth
+ onClick={() => modalManager.show(LibraryFolderAddModal, { library })}
+ />
+ {:else}
+ <table class="w-full">
+ <tbody>
+ {#each library.importPaths as folder (folder)}
+ {@const { Edit, Delete } = getLibraryFolderActions($t, library, folder)}
+ <tr class="h-12">
+ <td>
+ <Code>{folder}</Code>
+ </td>
+ <td class="flex gap-2 justify-end">
+ <TableButton action={Edit} />
+ <TableButton action={Delete} />
+ </td>
+ </tr>
+ {/each}
+ </tbody>
+ </table>
+ {/if}
+ </AdminCard>
+
+ <AdminCard icon={mdiFilterMinusOutline} title={$t('exclusion_pattern')} headerAction={AddExclusionPattern}>
+ <table class="w-full">
+ <tbody>
+ {#each library.exclusionPatterns as exclusionPattern (exclusionPattern)}
+ {@const { Edit, Delete } = getLibraryExclusionPatternActions($t, library, exclusionPattern)}
+ <tr class="h-12">
+ <td>
+ <Code>{exclusionPattern}</Code>
+ </td>
+ <td class="flex gap-2 justify-end">
+ <TableButton action={Edit} />
+ <TableButton action={Delete} />
+ </td>
+ </tr>
+ {/each}
+ </tbody>
+ </table>
+ </AdminCard>
+ </div>
+ {@render children?.()}
+ </Container>
+</AdminPageLayout>
diff --git a/web/src/routes/admin/library-management/[id]/+layout.ts b/web/src/routes/admin/library-management/[id]/+layout.ts
new file mode 100644
index 0000000000..d465d92c45
--- /dev/null
+++ b/web/src/routes/admin/library-management/[id]/+layout.ts
@@ -0,0 +1,29 @@
+import { AppRoute } from '$lib/constants';
+import { authenticate } from '$lib/utils/auth';
+import { getFormatter } from '$lib/utils/i18n';
+import { getLibrary, getLibraryStatistics, type LibraryResponseDto } from '@immich/sdk';
+import { redirect } from '@sveltejs/kit';
+import type { LayoutLoad } from './$types';
+
+export const load = (async ({ params: { id }, url }) => {
+ await authenticate(url, { admin: true });
+
+ let library: LibraryResponseDto;
+
+ try {
+ library = await getLibrary({ id });
+ } catch {
+ redirect(302, AppRoute.ADMIN_LIBRARIES);
+ }
+
+ const statistics = await getLibraryStatistics({ id });
+ const $t = await getFormatter();
+
+ return {
+ library,
+ statistics,
+ meta: {
+ title: $t('admin.library_details'),
+ },
+ };
+}) satisfies LayoutLoad;
diff --git a/web/src/routes/admin/library-management/[id]/+page.svelte b/web/src/routes/admin/library-management/[id]/+page.svelte
index 6bffbe39aa..e69de29bb2 100644
--- a/web/src/routes/admin/library-management/[id]/+page.svelte
+++ b/web/src/routes/admin/library-management/[id]/+page.svelte
@@ -1,105 +0,0 @@
-<script lang="ts">
- import { goto } from '$app/navigation';
- import emptyFoldersUrl from '$lib/assets/empty-folders.svg';
- import AdminCard from '$lib/components/AdminCard.svelte';
- import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';
- import OnEvents from '$lib/components/OnEvents.svelte';
- import ServerStatisticsCard from '$lib/components/server-statistics/ServerStatisticsCard.svelte';
- import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte';
- import TableButton from '$lib/components/TableButton.svelte';
- import { AppRoute } from '$lib/constants';
- import LibraryFolderAddModal from '$lib/modals/LibraryFolderAddModal.svelte';
- import {
- getLibraryActions,
- getLibraryExclusionPatternActions,
- getLibraryFolderActions,
- } from '$lib/services/library.service';
- import { getBytesWithUnit } from '$lib/utils/byte-units';
- import { Code, CommandPaletteContext, Container, Heading, modalManager } from '@immich/ui';
- import { mdiCameraIris, mdiChartPie, mdiFilterMinusOutline, mdiFolderOutline, mdiPlayCircle } from '@mdi/js';
- import { t } from 'svelte-i18n';
- import type { PageData } from './$types';
-
- type Props = {
- data: PageData;
- };
-
- const { data }: Props = $props();
-
- const statistics = data.statistics;
- const [storageUsage, unit] = getBytesWithUnit(statistics.usage);
-
- let library = $derived(data.library);
-
- const { Rename, Delete, AddFolder, AddExclusionPattern, Scan } = $derived(getLibraryActions($t, library));
-</script>
-
-<OnEvents
- onLibraryUpdate={(newLibrary) => (library = newLibrary)}
- onLibraryDelete={({ id }) => id === library.id && goto(AppRoute.ADMIN_LIBRARY_MANAGEMENT)}
-/>
-
-<CommandPaletteContext commands={[Rename, Delete, AddFolder, AddExclusionPattern, Scan]} />
-
-<AdminPageLayout
- breadcrumbs={[{ title: $t('external_libraries'), href: AppRoute.ADMIN_LIBRARY_MANAGEMENT }, { title: library.name }]}
- actions={[Scan, Rename, Delete]}
->
- <Container size="large" center>
- <div class="grid gap-4 grid-cols-1 lg:grid-cols-2 w-full">
- <Heading tag="h1" size="large" class="col-span-full my-4">{library.name}</Heading>
- <div class="flex flex-col lg:flex-row gap-4 col-span-full">
- <ServerStatisticsCard icon={mdiCameraIris} title={$t('photos')} value={statistics.photos} />
- <ServerStatisticsCard icon={mdiPlayCircle} title={$t('videos')} value={statistics.videos} />
- <ServerStatisticsCard icon={mdiChartPie} title={$t('usage')} value={storageUsage} {unit} />
- </div>
-
- <AdminCard icon={mdiFolderOutline} title={$t('folders')} headerAction={AddFolder}>
- {#if library.importPaths.length === 0}
- <EmptyPlaceholder
- src={emptyFoldersUrl}
- text={$t('admin.library_folder_description')}
- fullWidth
- onClick={() => modalManager.show(LibraryFolderAddModal, { library })}
- />
- {:else}
- <table class="w-full">
- <tbody>
- {#each library.importPaths as folder (folder)}
- {@const { Edit, Delete } = getLibraryFolderActions($t, library, folder)}
- <tr class="h-12">
- <td>
- <Code>{folder}</Code>
- </td>
- <td class="flex gap-2 justify-end">
- <TableButton action={Edit} />
- <TableButton action={Delete} />
- </td>
- </tr>
- {/each}
- </tbody>
- </table>
- {/if}
- </AdminCard>
-
- <AdminCard icon={mdiFilterMinusOutline} title={$t('exclusion_pattern')} headerAction={AddExclusionPattern}>
- <table class="w-full">
- <tbody>
- {#each library.exclusionPatterns as exclusionPattern (exclusionPattern)}
- {@const { Edit, Delete } = getLibraryExclusionPatternActions($t, library, exclusionPattern)}
- <tr class="h-12">
- <td>
- <Code>{exclusionPattern}</Code>
- </td>
- <td class="flex gap-2 justify-end">
- <TableButton action={Edit} />
- <TableButton action={Delete} />
- </td>
- </tr>
- {/each}
- </tbody>
- </table>
- </AdminCard>
- </div>
- </Container>
-</AdminPageLayout>
diff --git a/web/src/routes/admin/library-management/[id]/+page.ts b/web/src/routes/admin/library-management/[id]/+page.ts
index 77ce1eb1c8..10f0f33e11 100644
--- a/web/src/routes/admin/library-management/[id]/+page.ts
+++ b/web/src/routes/admin/library-management/[id]/+page.ts
@@ -1,26 +1,13 @@
-import { AppRoute } from '$lib/constants';
import { authenticate } from '$lib/utils/auth';
import { getFormatter } from '$lib/utils/i18n';
-import { getLibrary, getLibraryStatistics, type LibraryResponseDto } from '@immich/sdk';
-import { redirect } from '@sveltejs/kit';
import type { PageLoad } from './$types';
-export const load = (async ({ params: { id }, url }) => {
+export const load = (async ({ url }) => {
await authenticate(url, { admin: true });
- let library: LibraryResponseDto;
- try {
- library = await getLibrary({ id });
- } catch {
- redirect(302, AppRoute.ADMIN_LIBRARY_MANAGEMENT);
- }
-
- const statistics = await getLibraryStatistics({ id });
const $t = await getFormatter();
return {
- library,
- statistics,
meta: {
title: $t('admin.library_details'),
},
diff --git a/web/src/routes/admin/library-management/[id]/edit/+page.svelte b/web/src/routes/admin/library-management/[id]/edit/+page.svelte
new file mode 100644
index 0000000000..06e0af13e6
--- /dev/null
+++ b/web/src/routes/admin/library-management/[id]/edit/+page.svelte
@@ -0,0 +1,35 @@
+<script lang="ts">
+ import { goto } from '$app/navigation';
+ import { AppRoute } from '$lib/constants';
+ import { handleUpdateLibrary } from '$lib/services/library.service';
+ import { Field, FormModal, Input } from '@immich/ui';
+ import { mdiRenameOutline } from '@mdi/js';
+ import { t } from 'svelte-i18n';
+ import type { PageData } from '../$types';
+
+ type Props = {
+ data: PageData;
+ };
+
+ let { data }: Props = $props();
+
+ const library = $state(data.library);
+ let name = $state(library.name);
+
+ const onClose = async () => {
+ await goto(`${AppRoute.ADMIN_LIBRARIES}/${library.id}`);
+ };
+
+ const onSubmit = async () => {
+ const success = await handleUpdateLibrary(library, { name });
+ if (success) {
+ await onClose();
+ }
+ };
+</script>
+
+<FormModal icon={mdiRenameOutline} title={$t('edit')} {onSubmit} {onClose} size="small">
+ <Field label={$t('name')}>
+ <Input bind:value={name} />
+ </Field>
+</FormModal>
diff --git a/web/src/routes/admin/library-management/[id]/edit/+page.ts b/web/src/routes/admin/library-management/[id]/edit/+page.ts
new file mode 100644
index 0000000000..10f0f33e11
--- /dev/null
+++ b/web/src/routes/admin/library-management/[id]/edit/+page.ts
@@ -0,0 +1,15 @@
+import { authenticate } from '$lib/utils/auth';
+import { getFormatter } from '$lib/utils/i18n';
+import type { PageLoad } from './$types';
+
+export const load = (async ({ url }) => {
+ await authenticate(url, { admin: true });
+
+ const $t = await getFormatter();
+
+ return {
+ meta: {
+ title: $t('admin.library_details'),
+ },
+ };
+}) satisfies PageLoad;
diff --git a/web/src/routes/admin/users/(list)/+layout.svelte b/web/src/routes/admin/users/(list)/+layout.svelte
new file mode 100644
index 0000000000..a8c281690d
--- /dev/null
+++ b/web/src/routes/admin/users/(list)/+layout.svelte
@@ -0,0 +1,93 @@
+<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 { locale } from '$lib/stores/preferences.store';
+ import { getByteUnitString } from '$lib/utils/byte-units';
+ import { searchUsersAdmin, type UserAdminResponseDto } from '@immich/sdk';
+ import { Button, CommandPaletteContext, Container, Icon } from '@immich/ui';
+ import { mdiInfinity } from '@mdi/js';
+ import type { Snippet } from 'svelte';
+ import { t } from 'svelte-i18n';
+ import type { LayoutData } from './$types';
+
+ type Props = {
+ children?: Snippet;
+ data: LayoutData;
+ };
+
+ let { children, data }: Props = $props();
+
+ let users: UserAdminResponseDto[] = $state(data.users);
+
+ const onUpdate = async (user: UserAdminResponseDto) => {
+ const index = users.findIndex(({ id }) => id === user.id);
+ if (index === -1) {
+ users = await searchUsersAdmin({ withDeleted: true });
+ } else {
+ users[index] = user;
+ }
+ };
+
+ const onUserAdminDeleted = ({ id: userId }: { id: string }) => {
+ users = users.filter(({ id }) => id !== userId);
+ };
+
+ const { Create } = $derived(getUserAdminsActions($t));
+</script>
+
+<OnEvents
+ onUserAdminCreate={onUpdate}
+ onUserAdminUpdate={onUpdate}
+ onUserAdminDelete={onUpdate}
+ onUserAdminRestore={onUpdate}
+ {onUserAdminDeleted}
+/>
+
+<CommandPaletteContext commands={[Create]} />
+
+<AdminPageLayout breadcrumbs={[{ title: data.meta.title }]} actions={[Create]}>
+ <Container center size="large">
+ <table class="my-5 w-full text-start">
+ <thead
+ class="mb-4 flex h-12 w-full rounded-md border bg-gray-50 text-primary dark:border-immich-dark-gray dark:bg-immich-dark-gray"
+ >
+ <tr class="flex w-full place-items-center">
+ <th class="w-8/12 sm:w-5/12 lg:w-6/12 xl:w-4/12 2xl:w-5/12 text-center text-sm font-medium">{$t('email')}</th>
+ <th class="hidden sm:block w-3/12 text-center text-sm font-medium">{$t('name')}</th>
+ <th class="hidden xl:block w-3/12 2xl:w-2/12 text-center text-sm font-medium">{$t('has_quota')}</th>
+ </tr>
+ </thead>
+ <tbody class="block w-full overflow-y-auto rounded-md border dark:border-immich-dark-gray">
+ {#each users as user (user.id)}
+ <tr
+ class="flex h-20 overflow-hidden w-full place-items-center text-center dark:text-immich-dark-fg {user.deletedAt
+ ? 'bg-red-300 dark:bg-red-900'
+ : 'even:bg-subtle/20 odd:bg-subtle/80'}"
+ >
+ <td class="w-8/12 sm:w-5/12 lg:w-6/12 xl:w-4/12 2xl:w-5/12 text-ellipsis break-all px-2 text-sm">
+ {user.email}
+ </td>
+ <td class="hidden sm:block w-3/12 text-ellipsis break-all px-2 text-sm">{user.name}</td>
+ <td class="hidden xl:block w-3/12 2xl:w-2/12 text-ellipsis break-all px-2 text-sm">
+ <div class="container mx-auto flex flex-wrap justify-center">
+ {#if user.quotaSizeInBytes !== null && user.quotaSizeInBytes >= 0}
+ {getByteUnitString(user.quotaSizeInBytes, $locale)}
+ {:else}
+ <Icon icon={mdiInfinity} size="16" />
+ {/if}
+ </div>
+ </td>
+ <td
+ class="flex flex-row flex-wrap justify-center gap-x-2 gap-y-1 w-4/12 lg:w-3/12 xl:w-2/12 text-ellipsis break-all text-sm"
+ >
+ <Button onclick={() => handleNavigateUserAdmin(user)}>{$t('view')}</Button>
+ </td>
+ </tr>
+ {/each}
+ </tbody>
+ </table>
+
+ {@render children?.()}
+ </Container>
+</AdminPageLayout>
diff --git a/web/src/routes/admin/users/+page.ts b/web/src/routes/admin/users/(list)/+layout.ts
similarity index 72%
rename from web/src/routes/admin/users/+page.ts
rename to web/src/routes/admin/users/(list)/+layout.ts
index 521f8573e1..cccc7e647a 100644
--- a/web/src/routes/admin/users/+page.ts
+++ b/web/src/routes/admin/users/(list)/+layout.ts
@@ -1,18 +1,18 @@
import { authenticate, requestServerInfo } from '$lib/utils/auth';
import { getFormatter } from '$lib/utils/i18n';
import { searchUsersAdmin } from '@immich/sdk';
-import type { PageLoad } from './$types';
+import type { LayoutLoad } from './$types';
export const load = (async ({ url }) => {
await authenticate(url, { admin: true });
await requestServerInfo();
- const allUsers = await searchUsersAdmin({ withDeleted: true });
+ const users = await searchUsersAdmin({ withDeleted: true });
const $t = await getFormatter();
return {
- allUsers,
+ users,
meta: {
title: $t('admin.user_management'),
},
};
-}) satisfies PageLoad;
+}) satisfies LayoutLoad;
diff --git a/web/src/routes/admin/users/(list)/+page.svelte b/web/src/routes/admin/users/(list)/+page.svelte
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/web/src/lib/modals/UserCreateModal.svelte b/web/src/routes/admin/users/(list)/new/+page.svelte
similarity index 92%
rename from web/src/lib/modals/UserCreateModal.svelte
rename to web/src/routes/admin/users/(list)/new/+page.svelte
index 7dd0449119..d4f753197a 100644
--- a/web/src/lib/modals/UserCreateModal.svelte
+++ b/web/src/routes/admin/users/(list)/new/+page.svelte
@@ -1,4 +1,6 @@
<script lang="ts">
+ import { goto } from '$app/navigation';
+ import { AppRoute } from '$lib/constants';
import { featureFlagsManager } from '$lib/managers/feature-flags-manager.svelte';
import { handleCreateUserAdmin } from '$lib/services/user-admin.service';
import { userInteraction } from '$lib/stores/user.svelte';
@@ -18,12 +20,6 @@
} from '@immich/ui';
import { t } from 'svelte-i18n';
- type Props = {
- onClose: () => void;
- };
-
- let { onClose }: Props = $props();
-
let success = $state(false);
let email = $state('');
@@ -46,6 +42,10 @@
const passwordMismatchMessage = $derived(passwordMismatch ? $t('password_does_not_match') : '');
const valid = $derived(!passwordMismatch && !isCreatingUser);
+ const onClose = async () => {
+ await goto(AppRoute.ADMIN_USERS);
+ };
+
const onSubmit = async (event: Event) => {
event.preventDefault();
@@ -55,7 +55,7 @@
isCreatingUser = true;
- const success = await handleCreateUserAdmin({
+ const user = await handleCreateUserAdmin({
email,
password,
shouldChangePassword,
@@ -65,8 +65,8 @@
isAdmin,
});
- if (success) {
- onClose();
+ if (user) {
+ await goto(`${AppRoute.ADMIN_USERS}/${user.id}`, { replaceState: true });
}
isCreatingUser = false;
diff --git a/web/src/routes/admin/users/(list)/new/+page.ts b/web/src/routes/admin/users/(list)/new/+page.ts
new file mode 100644
index 0000000000..99626bced6
--- /dev/null
+++ b/web/src/routes/admin/users/(list)/new/+page.ts
@@ -0,0 +1,14 @@
+import { authenticate } from '$lib/utils/auth';
+import { getFormatter } from '$lib/utils/i18n';
+import type { PageLoad } from './$types';
+
+export const load = (async ({ url }) => {
+ await authenticate(url, { admin: true });
+ const $t = await getFormatter();
+
+ return {
+ meta: {
+ title: $t('admin.user_management'),
+ },
+ };
+}) satisfies PageLoad;
diff --git a/web/src/routes/admin/users/+page.svelte b/web/src/routes/admin/users/+page.svelte
deleted file mode 100644
index 53d810ba21..0000000000
--- a/web/src/routes/admin/users/+page.svelte
+++ /dev/null
@@ -1,93 +0,0 @@
-<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 { locale } from '$lib/stores/preferences.store';
- import { getByteUnitString } from '$lib/utils/byte-units';
- import { searchUsersAdmin, type UserAdminResponseDto } from '@immich/sdk';
- import { Button, CommandPaletteContext, Icon } from '@immich/ui';
- import { mdiInfinity } from '@mdi/js';
- import { t } from 'svelte-i18n';
- import type { PageData } from './$types';
-
- type Props = {
- data: PageData;
- };
-
- let { data }: Props = $props();
-
- let allUsers: UserAdminResponseDto[] = $state(data.allUsers);
-
- const onUpdate = async (user: UserAdminResponseDto) => {
- const index = allUsers.findIndex(({ id }) => id === user.id);
- if (index === -1) {
- allUsers = await searchUsersAdmin({ withDeleted: true });
- } else {
- allUsers[index] = user;
- }
- };
-
- const onUserAdminDeleted = ({ id: userId }: { id: string }) => {
- allUsers = allUsers.filter(({ id }) => id !== userId);
- };
-
- const { Create } = $derived(getUserAdminsActions($t));
-</script>
-
-<OnEvents
- onUserAdminCreate={onUpdate}
- onUserAdminUpdate={onUpdate}
- onUserAdminDelete={onUpdate}
- onUserAdminRestore={onUpdate}
- {onUserAdminDeleted}
-/>
-
-<CommandPaletteContext commands={[Create]} />
-
-<AdminPageLayout breadcrumbs={[{ title: data.meta.title }]} actions={[Create]}>
- <section id="setting-content" class="flex place-content-center sm:mx-4">
- <section class="w-full pb-28 lg:w-212.5">
- <table class="my-5 w-full text-start">
- <thead
- class="mb-4 flex h-12 w-full rounded-md border bg-gray-50 text-primary dark:border-immich-dark-gray dark:bg-immich-dark-gray"
- >
- <tr class="flex w-full place-items-center">
- <th class="w-8/12 sm:w-5/12 lg:w-6/12 xl:w-4/12 2xl:w-5/12 text-center text-sm font-medium"
- >{$t('email')}</th
- >
- <th class="hidden sm:block w-3/12 text-center text-sm font-medium">{$t('name')}</th>
- <th class="hidden xl:block w-3/12 2xl:w-2/12 text-center text-sm font-medium">{$t('has_quota')}</th>
- </tr>
- </thead>
- <tbody class="block w-full overflow-y-auto rounded-md border dark:border-immich-dark-gray">
- {#each allUsers as user (user.id)}
- <tr
- class="flex h-20 overflow-hidden w-full place-items-center text-center dark:text-immich-dark-fg {user.deletedAt
- ? 'bg-red-300 dark:bg-red-900'
- : 'even:bg-subtle/20 odd:bg-subtle/80'}"
- >
- <td class="w-8/12 sm:w-5/12 lg:w-6/12 xl:w-4/12 2xl:w-5/12 text-ellipsis break-all px-2 text-sm">
- {user.email}
- </td>
- <td class="hidden sm:block w-3/12 text-ellipsis break-all px-2 text-sm">{user.name}</td>
- <td class="hidden xl:block w-3/12 2xl:w-2/12 text-ellipsis break-all px-2 text-sm">
- <div class="container mx-auto flex flex-wrap justify-center">
- {#if user.quotaSizeInBytes !== null && user.quotaSizeInBytes >= 0}
- {getByteUnitString(user.quotaSizeInBytes, $locale)}
- {:else}
- <Icon icon={mdiInfinity} size="16" />
- {/if}
- </div>
- </td>
- <td
- class="flex flex-row flex-wrap justify-center gap-x-2 gap-y-1 w-4/12 lg:w-3/12 xl:w-2/12 text-ellipsis break-all text-sm"
- >
- <Button onclick={() => handleNavigateUserAdmin(user)}>{$t('view')}</Button>
- </td>
- </tr>
- {/each}
- </tbody>
- </table>
- </section>
- </section>
-</AdminPageLayout>
diff --git a/web/src/routes/admin/users/[id]/+layout.svelte b/web/src/routes/admin/users/[id]/+layout.svelte
new file mode 100644
index 0000000000..d3fe5fdcaf
--- /dev/null
+++ b/web/src/routes/admin/users/[id]/+layout.svelte
@@ -0,0 +1,222 @@
+<script lang="ts">
+ import { goto } from '$app/navigation';
+ import AdminCard from '$lib/components/AdminCard.svelte';
+ import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';
+ import OnEvents from '$lib/components/OnEvents.svelte';
+ import ServerStatisticsCard from '$lib/components/server-statistics/ServerStatisticsCard.svelte';
+ import UserAvatar from '$lib/components/shared-components/user-avatar.svelte';
+ import DeviceCard from '$lib/components/user-settings-page/device-card.svelte';
+ import FeatureSetting from '$lib/components/users/FeatureSetting.svelte';
+ import { AppRoute } from '$lib/constants';
+ import { getUserAdminActions } from '$lib/services/user-admin.service';
+ import { locale } from '$lib/stores/preferences.store';
+ import { createDateFormatter, findLocale } from '$lib/utils';
+ import { getBytesWithUnit } from '$lib/utils/byte-units';
+ import { type UserAdminResponseDto } from '@immich/sdk';
+ import {
+ Alert,
+ Badge,
+ Code,
+ CommandPaletteContext,
+ Container,
+ getByteUnitString,
+ Heading,
+ Icon,
+ MenuItemType,
+ Stack,
+ Text,
+ } from '@immich/ui';
+ import {
+ mdiAccountOutline,
+ mdiCameraIris,
+ mdiChartPie,
+ mdiChartPieOutline,
+ mdiCheckCircle,
+ mdiDevices,
+ mdiFeatureSearchOutline,
+ mdiPlayCircle,
+ mdiTrashCanOutline,
+ } from '@mdi/js';
+ import type { Snippet } from 'svelte';
+ import { t } from 'svelte-i18n';
+ import type { LayoutData } from './$types';
+
+ type Props = {
+ children?: Snippet;
+ data: LayoutData;
+ };
+
+ const { children, data }: Props = $props();
+
+ let user = $state(data.user);
+ const userPreferences = $state(data.userPreferences);
+ const userStatistics = $state(data.userStatistics);
+ const userSessions = $state(data.userSessions);
+ const TiB = 1024 ** 4;
+ const usage = $derived(user.quotaUsageInBytes ?? 0);
+ let [statsUsage, statsUsageUnit] = $derived(getBytesWithUnit(usage, usage > TiB ? 2 : 0));
+ const usedBytes = $derived(user.quotaUsageInBytes ?? 0);
+ const availableBytes = $derived(user.quotaSizeInBytes ?? 1);
+ let usedPercentage = $derived(Math.min(Math.round((usedBytes / availableBytes) * 100), 100));
+
+ let editedLocale = $derived(findLocale($locale).code);
+ let createAtDate: Date = $derived(new Date(user.createdAt));
+ let updatedAtDate: Date = $derived(new Date(user.updatedAt));
+ let userCreatedAtDateAndTime: string = $derived(createDateFormatter(editedLocale).formatDateTime(createAtDate));
+ let userUpdatedAtDateAndTime: string = $derived(createDateFormatter(editedLocale).formatDateTime(updatedAtDate));
+
+ const getUsageClass = () => {
+ if (usedPercentage >= 95) {
+ return 'bg-red-500';
+ }
+
+ if (usedPercentage > 80) {
+ return 'bg-yellow-500';
+ }
+
+ return 'bg-primary';
+ };
+
+ const { ResetPassword, ResetPinCode, Update, Delete, Restore } = $derived(getUserAdminActions($t, user));
+
+ const onUpdate = (update: UserAdminResponseDto) => {
+ if (update.id === user.id) {
+ user = update;
+ }
+ };
+
+ const onUserAdminDeleted = async ({ id }: { id: string }) => {
+ if (id === user.id) {
+ await goto(AppRoute.ADMIN_USERS);
+ }
+ };
+</script>
+
+<OnEvents
+ onUserAdminUpdate={onUpdate}
+ onUserAdminDelete={onUpdate}
+ onUserAdminRestore={onUpdate}
+ {onUserAdminDeleted}
+/>
+
+<CommandPaletteContext commands={[ResetPassword, ResetPinCode, Update, Delete, Restore]} />
+
+<AdminPageLayout
+ breadcrumbs={[{ title: $t('admin.user_management'), href: AppRoute.ADMIN_USERS }, { title: user.name }]}
+ actions={[ResetPassword, ResetPinCode, Update, Restore, MenuItemType.Divider, Delete]}
+>
+ <div>
+ <Container size="large" center>
+ {#if user.deletedAt}
+ <Alert color="danger" class="my-4" title={$t('user_has_been_deleted')} icon={mdiTrashCanOutline} />
+ {/if}
+
+ <div class="grid gap-4 grid-cols-1 lg:grid-cols-2 w-full">
+ <div class="col-span-full flex flex-col gap-4 my-4">
+ <div class="flex items-center gap-4">
+ <UserAvatar {user} size="md" />
+ <Heading tag="h1" size="large">{user.name}</Heading>
+ </div>
+ {#if user.isAdmin}
+ <div>
+ <Badge color="primary" size="small">{$t('admin.admin_user')}</Badge>
+ </div>
+ {/if}
+ </div>
+ <div class="col-span-full">
+ <div class="flex flex-col lg:flex-row gap-4 w-full">
+ <ServerStatisticsCard icon={mdiCameraIris} title={$t('photos')} value={userStatistics.images} />
+ <ServerStatisticsCard icon={mdiPlayCircle} title={$t('videos')} value={userStatistics.videos} />
+ <ServerStatisticsCard icon={mdiChartPie} title={$t('storage')} value={statsUsage} unit={statsUsageUnit} />
+ </div>
+ </div>
+
+ <AdminCard icon={mdiAccountOutline} title={$t('profile')}>
+ <Stack gap={2}>
+ <div>
+ <Heading tag="h3" size="tiny">{$t('name')}</Heading>
+ <Text>{user.name}</Text>
+ </div>
+ <div>
+ <Heading tag="h3" size="tiny">{$t('email')}</Heading>
+ <Text>{user.email}</Text>
+ </div>
+ <div>
+ <Heading tag="h3" size="tiny">{$t('created_at')}</Heading>
+ <Text>{userCreatedAtDateAndTime}</Text>
+ </div>
+ <div>
+ <Heading tag="h3" size="tiny">{$t('updated_at')}</Heading>
+ <Text>{userUpdatedAtDateAndTime}</Text>
+ </div>
+ <div>
+ <Heading tag="h3" size="tiny">{$t('id')}</Heading>
+ <Code>{user.id}</Code>
+ </div>
+ </Stack>
+ </AdminCard>
+
+ <AdminCard icon={mdiFeatureSearchOutline} title={$t('features')}>
+ <Stack gap={3}>
+ <FeatureSetting title={$t('email_notifications')} state={userPreferences.emailNotifications.enabled} />
+ <FeatureSetting title={$t('folders')} state={userPreferences.folders.enabled} />
+ <FeatureSetting title={$t('memories')} state={userPreferences.memories.enabled} />
+ <FeatureSetting title={$t('people')} state={userPreferences.people.enabled} />
+ <FeatureSetting title={$t('rating')} state={userPreferences.ratings.enabled} />
+ <FeatureSetting title={$t('shared_links')} state={userPreferences.sharedLinks.enabled} />
+ <FeatureSetting title={$t('show_supporter_badge')} state={userPreferences.purchase.showSupportBadge} />
+ <FeatureSetting title={$t('tags')} state={userPreferences.tags.enabled} />
+ <FeatureSetting title={$t('gcast_enabled')} state={userPreferences.cast.gCastEnabled} />
+ </Stack>
+ </AdminCard>
+
+ <AdminCard icon={mdiChartPieOutline} title={$t('storage_quota')}>
+ {#if user.quotaSizeInBytes !== null && user.quotaSizeInBytes >= 0}
+ <Text>
+ {$t('storage_usage', {
+ values: {
+ used: getByteUnitString(usedBytes, $locale, 3),
+ available: getByteUnitString(availableBytes, $locale, 3),
+ },
+ })}
+ </Text>
+ {:else}
+ <Text class="flex items-center gap-1">
+ <Icon icon={mdiCheckCircle} size="1.25rem" class="text-success" />
+ {$t('unlimited')}
+ </Text>
+ {/if}
+
+ {#if user.quotaSizeInBytes !== null && user.quotaSizeInBytes >= 0}
+ <div
+ class="storage-status p-4 mt-4 bg-gray-100 dark:bg-immich-dark-primary/10 rounded-lg text-sm w-full"
+ title={$t('storage_usage', {
+ values: {
+ used: getByteUnitString(usedBytes, $locale, 3),
+ available: getByteUnitString(availableBytes, $locale, 3),
+ },
+ })}
+ >
+ <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>
+ </div>
+ {/if}
+ </AdminCard>
+
+ <AdminCard icon={mdiDevices} title={$t('authorized_devices')}>
+ <Stack gap={3}>
+ {#each userSessions as session (session.id)}
+ <DeviceCard {session} />
+ {:else}
+ <span class="text-dark">{$t('no_devices')}</span>
+ {/each}
+ </Stack>
+ </AdminCard>
+ </div>
+
+ {@render children?.()}
+ </Container>
+ </div>
+</AdminPageLayout>
diff --git a/web/src/routes/admin/users/[id]/+layout.ts b/web/src/routes/admin/users/[id]/+layout.ts
new file mode 100644
index 0000000000..32c41b0aca
--- /dev/null
+++ b/web/src/routes/admin/users/[id]/+layout.ts
@@ -0,0 +1,38 @@
+import { AppRoute, UUID_REGEX } from '$lib/constants';
+import { authenticate, requestServerInfo } from '$lib/utils/auth';
+import { getFormatter } from '$lib/utils/i18n';
+import { getUserPreferencesAdmin, getUserSessionsAdmin, getUserStatisticsAdmin, searchUsersAdmin } from '@immich/sdk';
+import { redirect } from '@sveltejs/kit';
+import type { LayoutLoad } from './$types';
+
+export const load = (async ({ params, url }) => {
+ await authenticate(url, { admin: true });
+ await requestServerInfo();
+
+ if (!UUID_REGEX.test(params.id)) {
+ redirect(302, AppRoute.ADMIN_USERS);
+ }
+
+ const [user] = await searchUsersAdmin({ id: params.id, withDeleted: true }).catch(() => []);
+ if (!user) {
+ redirect(302, AppRoute.ADMIN_USERS);
+ }
+
+ const [userPreferences, userStatistics, userSessions] = await Promise.all([
+ getUserPreferencesAdmin({ id: user.id }),
+ getUserStatisticsAdmin({ id: user.id }),
+ getUserSessionsAdmin({ id: user.id }),
+ ]);
+
+ const $t = await getFormatter();
+
+ return {
+ user,
+ userPreferences,
+ userStatistics,
+ userSessions,
+ meta: {
+ title: $t('admin.user_details'),
+ },
+ };
+}) satisfies LayoutLoad;
diff --git a/web/src/routes/admin/users/[id]/+page.svelte b/web/src/routes/admin/users/[id]/+page.svelte
index c41afba97c..e69de29bb2 100644
--- a/web/src/routes/admin/users/[id]/+page.svelte
+++ b/web/src/routes/admin/users/[id]/+page.svelte
@@ -1,218 +0,0 @@
-<script lang="ts">
- import { goto } from '$app/navigation';
- import AdminCard from '$lib/components/AdminCard.svelte';
- import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';
- import OnEvents from '$lib/components/OnEvents.svelte';
- import ServerStatisticsCard from '$lib/components/server-statistics/ServerStatisticsCard.svelte';
- import UserAvatar from '$lib/components/shared-components/user-avatar.svelte';
- import DeviceCard from '$lib/components/user-settings-page/device-card.svelte';
- import FeatureSetting from '$lib/components/users/FeatureSetting.svelte';
- import { AppRoute } from '$lib/constants';
- import { getUserAdminActions } from '$lib/services/user-admin.service';
- import { locale } from '$lib/stores/preferences.store';
- import { createDateFormatter, findLocale } from '$lib/utils';
- import { getBytesWithUnit } from '$lib/utils/byte-units';
- import { type UserAdminResponseDto } from '@immich/sdk';
- import {
- Alert,
- Badge,
- Code,
- CommandPaletteContext,
- Container,
- getByteUnitString,
- Heading,
- Icon,
- MenuItemType,
- Stack,
- Text,
- } from '@immich/ui';
- import {
- mdiAccountOutline,
- mdiCameraIris,
- mdiChartPie,
- mdiChartPieOutline,
- mdiCheckCircle,
- mdiDevices,
- mdiFeatureSearchOutline,
- mdiPlayCircle,
- mdiTrashCanOutline,
- } from '@mdi/js';
- import { t } from 'svelte-i18n';
- import type { PageData } from './$types';
-
- type Props = {
- data: PageData;
- };
-
- const { data }: Props = $props();
-
- let user = $derived(data.user);
- const userPreferences = $derived(data.userPreferences);
- const userStatistics = $derived(data.userStatistics);
- const userSessions = $derived(data.userSessions);
- const TiB = 1024 ** 4;
- const usage = $derived(user.quotaUsageInBytes ?? 0);
- let [statsUsage, statsUsageUnit] = $derived(getBytesWithUnit(usage, usage > TiB ? 2 : 0));
- const usedBytes = $derived(user.quotaUsageInBytes ?? 0);
- const availableBytes = $derived(user.quotaSizeInBytes ?? 1);
- let usedPercentage = $derived(Math.min(Math.round((usedBytes / availableBytes) * 100), 100));
-
- let editedLocale = $derived(findLocale($locale).code);
- let createAtDate: Date = $derived(new Date(user.createdAt));
- let updatedAtDate: Date = $derived(new Date(user.updatedAt));
- let userCreatedAtDateAndTime: string = $derived(createDateFormatter(editedLocale).formatDateTime(createAtDate));
- let userUpdatedAtDateAndTime: string = $derived(createDateFormatter(editedLocale).formatDateTime(updatedAtDate));
-
- const getUsageClass = () => {
- if (usedPercentage >= 95) {
- return 'bg-red-500';
- }
-
- if (usedPercentage > 80) {
- return 'bg-yellow-500';
- }
-
- return 'bg-primary';
- };
-
- const { ResetPassword, ResetPinCode, Update, Delete, Restore } = $derived(getUserAdminActions($t, user));
-
- const onUpdate = (update: UserAdminResponseDto) => {
- if (update.id === user.id) {
- user = update;
- }
- };
-
- const onUserAdminDeleted = async ({ id }: { id: string }) => {
- if (id === user.id) {
- await goto(AppRoute.ADMIN_USERS);
- }
- };
-</script>
-
-<OnEvents
- onUserAdminUpdate={onUpdate}
- onUserAdminDelete={onUpdate}
- onUserAdminRestore={onUpdate}
- {onUserAdminDeleted}
-/>
-
-<CommandPaletteContext commands={[ResetPassword, ResetPinCode, Update, Delete, Restore]} />
-
-<AdminPageLayout
- breadcrumbs={[{ title: $t('admin.user_management'), href: AppRoute.ADMIN_USERS }, { title: user.name }]}
- actions={[ResetPassword, ResetPinCode, Update, Restore, MenuItemType.Divider, Delete]}
->
- <div>
- <Container size="large" center>
- {#if user.deletedAt}
- <Alert color="danger" class="my-4" title={$t('user_has_been_deleted')} icon={mdiTrashCanOutline} />
- {/if}
-
- <div class="grid gap-4 grid-cols-1 lg:grid-cols-2 w-full">
- <div class="col-span-full flex flex-col gap-4 my-4">
- <div class="flex items-center gap-4">
- <UserAvatar {user} size="md" />
- <Heading tag="h1" size="large">{user.name}</Heading>
- </div>
- {#if user.isAdmin}
- <div>
- <Badge color="primary" size="small">{$t('admin.admin_user')}</Badge>
- </div>
- {/if}
- </div>
- <div class="col-span-full">
- <div class="flex flex-col lg:flex-row gap-4 w-full">
- <ServerStatisticsCard icon={mdiCameraIris} title={$t('photos')} value={userStatistics.images} />
- <ServerStatisticsCard icon={mdiPlayCircle} title={$t('videos')} value={userStatistics.videos} />
- <ServerStatisticsCard icon={mdiChartPie} title={$t('storage')} value={statsUsage} unit={statsUsageUnit} />
- </div>
- </div>
-
- <AdminCard icon={mdiAccountOutline} title={$t('profile')}>
- <Stack gap={2}>
- <div>
- <Heading tag="h3" size="tiny">{$t('name')}</Heading>
- <Text>{user.name}</Text>
- </div>
- <div>
- <Heading tag="h3" size="tiny">{$t('email')}</Heading>
- <Text>{user.email}</Text>
- </div>
- <div>
- <Heading tag="h3" size="tiny">{$t('created_at')}</Heading>
- <Text>{userCreatedAtDateAndTime}</Text>
- </div>
- <div>
- <Heading tag="h3" size="tiny">{$t('updated_at')}</Heading>
- <Text>{userUpdatedAtDateAndTime}</Text>
- </div>
- <div>
- <Heading tag="h3" size="tiny">{$t('id')}</Heading>
- <Code>{user.id}</Code>
- </div>
- </Stack>
- </AdminCard>
-
- <AdminCard icon={mdiFeatureSearchOutline} title={$t('features')}>
- <Stack gap={3}>
- <FeatureSetting title={$t('email_notifications')} state={userPreferences.emailNotifications.enabled} />
- <FeatureSetting title={$t('folders')} state={userPreferences.folders.enabled} />
- <FeatureSetting title={$t('memories')} state={userPreferences.memories.enabled} />
- <FeatureSetting title={$t('people')} state={userPreferences.people.enabled} />
- <FeatureSetting title={$t('rating')} state={userPreferences.ratings.enabled} />
- <FeatureSetting title={$t('shared_links')} state={userPreferences.sharedLinks.enabled} />
- <FeatureSetting title={$t('show_supporter_badge')} state={userPreferences.purchase.showSupportBadge} />
- <FeatureSetting title={$t('tags')} state={userPreferences.tags.enabled} />
- <FeatureSetting title={$t('gcast_enabled')} state={userPreferences.cast.gCastEnabled} />
- </Stack>
- </AdminCard>
-
- <AdminCard icon={mdiChartPieOutline} title={$t('storage_quota')}>
- {#if user.quotaSizeInBytes !== null && user.quotaSizeInBytes >= 0}
- <Text>
- {$t('storage_usage', {
- values: {
- used: getByteUnitString(usedBytes, $locale, 3),
- available: getByteUnitString(availableBytes, $locale, 3),
- },
- })}
- </Text>
- {:else}
- <Text class="flex items-center gap-1">
- <Icon icon={mdiCheckCircle} size="1.25rem" class="text-success" />
- {$t('unlimited')}
- </Text>
- {/if}
-
- {#if user.quotaSizeInBytes !== null && user.quotaSizeInBytes >= 0}
- <div
- class="storage-status p-4 mt-4 bg-gray-100 dark:bg-immich-dark-primary/10 rounded-lg text-sm w-full"
- title={$t('storage_usage', {
- values: {
- used: getByteUnitString(usedBytes, $locale, 3),
- available: getByteUnitString(availableBytes, $locale, 3),
- },
- })}
- >
- <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>
- </div>
- {/if}
- </AdminCard>
-
- <AdminCard icon={mdiDevices} title={$t('authorized_devices')}>
- <Stack gap={3}>
- {#each userSessions as session (session.id)}
- <DeviceCard {session} />
- {:else}
- <span class="text-dark">{$t('no_devices')}</span>
- {/each}
- </Stack>
- </AdminCard>
- </div>
- </Container>
- </div>
-</AdminPageLayout>
diff --git a/web/src/routes/admin/users/[id]/+page.ts b/web/src/routes/admin/users/[id]/+page.ts
index bfc5bcefa9..775f9662d2 100644
--- a/web/src/routes/admin/users/[id]/+page.ts
+++ b/web/src/routes/admin/users/[id]/+page.ts
@@ -1,31 +1,12 @@
-import { AppRoute } from '$lib/constants';
-import { authenticate, requestServerInfo } from '$lib/utils/auth';
+import { authenticate } from '$lib/utils/auth';
import { getFormatter } from '$lib/utils/i18n';
-import { getUserPreferencesAdmin, getUserSessionsAdmin, getUserStatisticsAdmin, searchUsersAdmin } from '@immich/sdk';
-import { redirect } from '@sveltejs/kit';
import type { PageLoad } from './$types';
-export const load = (async ({ params, url }) => {
+export const load = (async ({ url }) => {
await authenticate(url, { admin: true });
- await requestServerInfo();
- const [user] = await searchUsersAdmin({ id: params.id, withDeleted: true }).catch(() => []);
- if (!user) {
- redirect(302, AppRoute.ADMIN_USERS);
- }
-
- const [userPreferences, userStatistics, userSessions] = await Promise.all([
- getUserPreferencesAdmin({ id: user.id }),
- getUserStatisticsAdmin({ id: user.id }),
- getUserSessionsAdmin({ id: user.id }),
- ]);
-
const $t = await getFormatter();
return {
- user,
- userPreferences,
- userStatistics,
- userSessions,
meta: {
title: $t('admin.user_details'),
},
diff --git a/web/src/lib/modals/UserEditModal.svelte b/web/src/routes/admin/users/[id]/edit/+page.svelte
similarity index 84%
rename from web/src/lib/modals/UserEditModal.svelte
rename to web/src/routes/admin/users/[id]/edit/+page.svelte
index 4b4878e46d..ea3bd827df 100644
--- a/web/src/lib/modals/UserEditModal.svelte
+++ b/web/src/routes/admin/users/[id]/edit/+page.svelte
@@ -1,10 +1,10 @@
<script lang="ts">
+ import { goto } from '$app/navigation';
import { AppRoute } from '$lib/constants';
import { handleUpdateUserAdmin } from '$lib/services/user-admin.service';
import { user as authUser } from '$lib/stores/user.store';
import { userInteraction } from '$lib/stores/user.svelte';
import { ByteUnit, convertFromBytes, convertToBytes } from '$lib/utils/byte-units';
- import { type UserAdminResponseDto } from '@immich/sdk';
import {
Button,
Field,
@@ -20,22 +20,22 @@
} from '@immich/ui';
import { mdiAccountEditOutline } from '@mdi/js';
import { t } from 'svelte-i18n';
+ import type { PageData } from './$types';
- interface Props {
- user: UserAdminResponseDto;
- onClose: () => void;
- }
-
- let { user, onClose }: Props = $props();
+ type Props = {
+ data: PageData;
+ };
- let isAdmin = $derived(user.isAdmin);
- let name = $derived(user.name);
- let email = $derived(user.email);
- let storageLabel = $derived(user.storageLabel || '');
+ let { data }: Props = $props();
- const previousQuota = user.quotaSizeInBytes;
+ const user = $state(data.user);
+ let isAdmin = $state(user.isAdmin);
+ let name = $state(user.name);
+ let email = $state(user.email);
+ let storageLabel = $state(user.storageLabel || '');
+ const previousQuota = $state(user.quotaSizeInBytes);
- let quotaSize = $state(
+ let quotaSize = $derived(
typeof user.quotaSizeInBytes === 'number' ? convertFromBytes(user.quotaSizeInBytes, ByteUnit.GiB) : undefined,
);
@@ -48,6 +48,10 @@
quotaSizeBytes > userInteraction.serverInfo.diskSizeRaw,
);
+ const onClose = async () => {
+ await goto(`${AppRoute.ADMIN_USERS}/${user.id}`);
+ };
+
const onSubmit = async (event: Event) => {
event.preventDefault();
@@ -60,7 +64,7 @@
});
if (success) {
- onClose();
+ await onClose();
}
};
</script>
diff --git a/web/src/routes/admin/users/[id]/edit/+page.ts b/web/src/routes/admin/users/[id]/edit/+page.ts
new file mode 100644
index 0000000000..64420e91da
--- /dev/null
+++ b/web/src/routes/admin/users/[id]/edit/+page.ts
@@ -0,0 +1,15 @@
+import { authenticate } from '$lib/utils/auth';
+import { getFormatter } from '$lib/utils/i18n';
+import type { PageLoad } from './$types';
+
+export const load = (async ({ url }) => {
+ await authenticate(url, { admin: true });
+
+ const $t = await getFormatter();
+
+ return {
+ meta: {
+ title: $t('admin.user_details'),
+ },
+ };
+}) satisfies PageLoad;