feat: header context menu (#24374)

This commit is contained in:
Jason Rasmussen
2025-12-04 11:09:38 -05:00
committed by GitHub
parent ba6687dde9
commit 31f2c7b505
22 changed files with 208 additions and 230 deletions

View File

@@ -78,7 +78,6 @@
"exclusion_pattern_description": "Exclusion patterns lets you ignore files and folders when scanning your library. This is useful if you have folders that contain files you don't want to import, such as RAW files.", "exclusion_pattern_description": "Exclusion patterns lets you ignore files and folders when scanning your library. This is useful if you have folders that contain files you don't want to import, such as RAW files.",
"export_config_as_json_description": "Download the current system config as a JSON file", "export_config_as_json_description": "Download the current system config as a JSON file",
"external_libraries_page_description": "Admin external library page", "external_libraries_page_description": "Admin external library page",
"external_library_management": "External Library Management",
"face_detection": "Face detection", "face_detection": "Face detection",
"face_detection_description": "Detect the faces in assets using machine learning. For videos, only the thumbnail is considered. \"Refresh\" (re-)processes all assets. \"Reset\" additionally clears all current face data. \"Missing\" queues assets that haven't been processed yet. Detected faces will be queued for Facial Recognition after Face Detection is complete, grouping them into existing or new people.", "face_detection_description": "Detect the faces in assets using machine learning. For videos, only the thumbnail is considered. \"Refresh\" (re-)processes all assets. \"Reset\" additionally clears all current face data. \"Missing\" queues assets that haven't been processed yet. Detected faces will be queued for Facial Recognition after Face Detection is complete, grouping them into existing or new people.",
"facial_recognition_job_description": "Group detected faces into people. This step runs after Face Detection is complete. \"Reset\" (re-)clusters all faces. \"Missing\" queues faces that don't have a person assigned.", "facial_recognition_job_description": "Group detected faces into people. This step runs after Face Detection is complete. \"Reset\" (re-)clusters all faces. \"Missing\" queues faces that don't have a person assigned.",

10
pnpm-lock.yaml generated
View File

@@ -717,8 +717,8 @@ importers:
specifier: file:../open-api/typescript-sdk specifier: file:../open-api/typescript-sdk
version: link:../open-api/typescript-sdk version: link:../open-api/typescript-sdk
'@immich/ui': '@immich/ui':
specifier: ^0.49.2 specifier: ^0.50.0
version: 0.49.3(@sveltejs/kit@2.49.0(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.45.2)(vite@7.2.4(@types/node@24.10.1)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.2)))(svelte@5.45.2)(vite@7.2.4(@types/node@24.10.1)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.2)))(svelte@5.45.2) version: 0.50.0(@sveltejs/kit@2.49.0(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.45.2)(vite@7.2.4(@types/node@24.10.1)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.2)))(svelte@5.45.2)(vite@7.2.4(@types/node@24.10.1)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.2)))(svelte@5.45.2)
'@mapbox/mapbox-gl-rtl-text': '@mapbox/mapbox-gl-rtl-text':
specifier: 0.2.3 specifier: 0.2.3
version: 0.2.3(mapbox-gl@1.13.3) version: 0.2.3(mapbox-gl@1.13.3)
@@ -2989,8 +2989,8 @@ packages:
peerDependencies: peerDependencies:
svelte: ^5.0.0 svelte: ^5.0.0
'@immich/ui@0.49.3': '@immich/ui@0.50.0':
resolution: {integrity: sha512-joqT72Y6gmGK6z25Suzr2VhYANrLo43g20T4UHmbQenz/z/Ax6sl1Ao9SjIOwEkKMm9N3Txoh7WOOzmHVl04OA==} resolution: {integrity: sha512-7AW9SRZTAgal8xlkUAxm7o4+pSG7HcKb+Bh9JpWLaDRRdGyPCZMmsNa9CjZglOQ7wkAD07tQ9u4+zezBLe0dlQ==}
peerDependencies: peerDependencies:
svelte: ^5.0.0 svelte: ^5.0.0
@@ -14700,7 +14700,7 @@ snapshots:
dependencies: dependencies:
svelte: 5.45.2 svelte: 5.45.2
'@immich/ui@0.49.3(@sveltejs/kit@2.49.0(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.45.2)(vite@7.2.4(@types/node@24.10.1)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.2)))(svelte@5.45.2)(vite@7.2.4(@types/node@24.10.1)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.2)))(svelte@5.45.2)': '@immich/ui@0.50.0(@sveltejs/kit@2.49.0(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.45.2)(vite@7.2.4(@types/node@24.10.1)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.2)))(svelte@5.45.2)(vite@7.2.4(@types/node@24.10.1)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.2)))(svelte@5.45.2)':
dependencies: dependencies:
'@immich/svelte-markdown-preprocess': 0.1.0(svelte@5.45.2) '@immich/svelte-markdown-preprocess': 0.1.0(svelte@5.45.2)
'@internationalized/date': 3.10.0 '@internationalized/date': 3.10.0

View File

@@ -28,7 +28,7 @@
"@formatjs/icu-messageformat-parser": "^2.9.8", "@formatjs/icu-messageformat-parser": "^2.9.8",
"@immich/justified-layout-wasm": "^0.4.3", "@immich/justified-layout-wasm": "^0.4.3",
"@immich/sdk": "file:../open-api/typescript-sdk", "@immich/sdk": "file:../open-api/typescript-sdk",
"@immich/ui": "^0.49.2", "@immich/ui": "^0.50.0",
"@mapbox/mapbox-gl-rtl-text": "0.2.3", "@mapbox/mapbox-gl-rtl-text": "0.2.3",
"@mdi/js": "^7.4.47", "@mdi/js": "^7.4.47",
"@photo-sphere-viewer/core": "^5.14.0", "@photo-sphere-viewer/core": "^5.14.0",

View File

@@ -0,0 +1,24 @@
<script lang="ts">
import type { HeaderButtonActionItem } from '$lib/types';
import { Button } from '@immich/ui';
type Props = {
action: HeaderButtonActionItem;
};
const { action }: Props = $props();
const { title, icon, color = 'secondary', onAction } = $derived(action);
</script>
{#if action.$if?.() ?? true}
<Button
variant="ghost"
size="small"
{color}
leadingIcon={icon}
onclick={() => onAction(action)}
title={action.data?.title}
>
{title}
</Button>
{/if}

View File

@@ -1,17 +0,0 @@
<script lang="ts">
import { type ActionItem, Button, Text } from '@immich/ui';
type Props = {
action: ActionItem;
title?: string;
};
const { action, title: titleAttr }: Props = $props();
const { title, icon, color = 'secondary', onAction } = $derived(action);
</script>
{#if action.$if?.() ?? true}
<Button variant="ghost" size="small" {color} leadingIcon={icon} onclick={() => onAction(action)} title={titleAttr}>
<Text class="hidden md:block">{title}</Text>
</Button>
{/if}

View File

@@ -1,19 +1,33 @@
<script lang="ts"> <script lang="ts">
import PageContent from '$lib/components/layouts/PageContent.svelte'; import PageContent from '$lib/components/layouts/PageContent.svelte';
import TitleLayout from '$lib/components/layouts/TitleLayout.svelte';
import NavigationBar from '$lib/components/shared-components/navigation-bar/navigation-bar.svelte'; import NavigationBar from '$lib/components/shared-components/navigation-bar/navigation-bar.svelte';
import AdminSidebar from '$lib/sidebars/AdminSidebar.svelte'; import AdminSidebar from '$lib/sidebars/AdminSidebar.svelte';
import { sidebarStore } from '$lib/stores/sidebar.svelte'; import { sidebarStore } from '$lib/stores/sidebar.svelte';
import { AppShell, AppShellHeader, AppShellSidebar, Scrollable, type BreadcrumbItem } from '@immich/ui'; import type { HeaderButtonActionItem } from '$lib/types';
import {
AppShell,
AppShellHeader,
AppShellSidebar,
Breadcrumbs,
Button,
ContextMenuButton,
HStack,
MenuItemType,
Scrollable,
isMenuItemType,
type BreadcrumbItem,
} from '@immich/ui';
import { mdiSlashForward } from '@mdi/js';
import type { Snippet } from 'svelte'; import type { Snippet } from 'svelte';
import { t } from 'svelte-i18n';
type Props = { type Props = {
breadcrumbs: BreadcrumbItem[]; breadcrumbs: BreadcrumbItem[];
buttons?: Snippet; actions?: Array<HeaderButtonActionItem | MenuItemType>;
children?: Snippet; children?: Snippet;
}; };
let { breadcrumbs, buttons, children }: Props = $props(); let { breadcrumbs, actions = [], children }: Props = $props();
</script> </script>
<AppShell> <AppShell>
@@ -24,11 +38,37 @@
<AdminSidebar /> <AdminSidebar />
</AppShellSidebar> </AppShellSidebar>
<TitleLayout {breadcrumbs} {buttons}> <div class="h-full flex flex-col">
<div class="flex h-16 w-full justify-between items-center border-b py-2 px-4 md:px-2">
<Breadcrumbs items={breadcrumbs} separator={mdiSlashForward} />
{#if actions.length > 0}
<div class="hidden md:block">
<HStack gap={0}>
{#each actions as action, i (i)}
{#if !isMenuItemType(action) && (action.$if?.() ?? true)}
<Button
variant="ghost"
size="small"
color={action.color ?? 'secondary'}
leadingIcon={action.icon}
onclick={() => action.onAction(action)}
title={action.data?.title}
>
{action.title}
</Button>
{/if}
{/each}
</HStack>
</div>
<ContextMenuButton aria-label={$t('open')} items={actions} class="md:hidden" />
{/if}
</div>
<Scrollable class="grow"> <Scrollable class="grow">
<PageContent> <PageContent>
{@render children?.()} {@render children?.()}
</PageContent> </PageContent>
</Scrollable> </Scrollable>
</TitleLayout> </div>
</AppShell> </AppShell>

View File

@@ -1,21 +0,0 @@
<script lang="ts">
import { Breadcrumbs, type BreadcrumbItem } from '@immich/ui';
import { mdiSlashForward } from '@mdi/js';
import type { Snippet } from 'svelte';
type Props = {
breadcrumbs: BreadcrumbItem[];
buttons?: Snippet;
children?: Snippet;
};
let { breadcrumbs, buttons, children }: Props = $props();
</script>
<div class="h-full flex flex-col">
<div class="flex h-16 w-full place-items-center justify-between border-b p-2">
<Breadcrumbs items={breadcrumbs} separator={mdiSlashForward} />
{@render buttons?.()}
</div>
{@render children?.()}
</div>

View File

@@ -28,7 +28,7 @@ export const getLibrariesActions = ($t: MessageFormatter, libraries: LibraryResp
title: $t('scan_all_libraries'), title: $t('scan_all_libraries'),
type: $t('command'), type: $t('command'),
icon: mdiSync, icon: mdiSync,
onAction: () => void handleScanAllLibraries(), onAction: () => handleScanAllLibraries(),
shortcuts: { shift: true, key: 'r' }, shortcuts: { shift: true, key: 'r' },
$if: () => libraries.length > 0, $if: () => libraries.length > 0,
}; };
@@ -37,7 +37,7 @@ export const getLibrariesActions = ($t: MessageFormatter, libraries: LibraryResp
title: $t('create_library'), title: $t('create_library'),
type: $t('command'), type: $t('command'),
icon: mdiPlusBoxOutline, icon: mdiPlusBoxOutline,
onAction: () => void handleCreateLibrary(), onAction: () => handleCreateLibrary(),
shortcuts: { shift: true, key: 'n' }, shortcuts: { shift: true, key: 'n' },
}; };
@@ -49,7 +49,7 @@ export const getLibraryActions = ($t: MessageFormatter, library: LibraryResponse
icon: mdiPencilOutline, icon: mdiPencilOutline,
type: $t('command'), type: $t('command'),
title: $t('rename'), title: $t('rename'),
onAction: () => void modalManager.show(LibraryRenameModal, { library }), onAction: () => modalManager.show(LibraryRenameModal, { library }),
shortcuts: { key: 'r' }, shortcuts: { key: 'r' },
}; };
@@ -58,7 +58,7 @@ export const getLibraryActions = ($t: MessageFormatter, library: LibraryResponse
type: $t('command'), type: $t('command'),
title: $t('delete'), title: $t('delete'),
color: 'danger', color: 'danger',
onAction: () => void handleDeleteLibrary(library), onAction: () => handleDeleteLibrary(library),
shortcuts: { key: 'Backspace' }, shortcuts: { key: 'Backspace' },
}; };
@@ -66,21 +66,21 @@ export const getLibraryActions = ($t: MessageFormatter, library: LibraryResponse
icon: mdiPlusBoxOutline, icon: mdiPlusBoxOutline,
type: $t('command'), type: $t('command'),
title: $t('add'), title: $t('add'),
onAction: () => void modalManager.show(LibraryFolderAddModal, { library }), onAction: () => modalManager.show(LibraryFolderAddModal, { library }),
}; };
const AddExclusionPattern: ActionItem = { const AddExclusionPattern: ActionItem = {
icon: mdiPlusBoxOutline, icon: mdiPlusBoxOutline,
type: $t('command'), type: $t('command'),
title: $t('add'), title: $t('add'),
onAction: () => void modalManager.show(LibraryExclusionPatternAddModal, { library }), onAction: () => modalManager.show(LibraryExclusionPatternAddModal, { library }),
}; };
const Scan: ActionItem = { const Scan: ActionItem = {
icon: mdiSync, icon: mdiSync,
type: $t('command'), type: $t('command'),
title: $t('scan_library'), title: $t('scan_library'),
onAction: () => void handleScanLibrary(library), onAction: () => handleScanLibrary(library),
shortcuts: { shift: true, key: 'r' }, shortcuts: { shift: true, key: 'r' },
}; };
@@ -92,14 +92,14 @@ export const getLibraryFolderActions = ($t: MessageFormatter, library: LibraryRe
icon: mdiPencilOutline, icon: mdiPencilOutline,
type: $t('command'), type: $t('command'),
title: $t('edit'), title: $t('edit'),
onAction: () => void modalManager.show(LibraryFolderEditModal, { folder, library }), onAction: () => modalManager.show(LibraryFolderEditModal, { folder, library }),
}; };
const Delete: ActionItem = { const Delete: ActionItem = {
icon: mdiTrashCanOutline, icon: mdiTrashCanOutline,
type: $t('command'), type: $t('command'),
title: $t('delete'), title: $t('delete'),
onAction: () => void handleDeleteLibraryFolder(library, folder), onAction: () => handleDeleteLibraryFolder(library, folder),
}; };
return { Edit, Delete }; return { Edit, Delete };
@@ -114,14 +114,14 @@ export const getLibraryExclusionPatternActions = (
icon: mdiPencilOutline, icon: mdiPencilOutline,
type: $t('command'), type: $t('command'),
title: $t('edit'), title: $t('edit'),
onAction: () => void modalManager.show(LibraryExclusionPatternEditModal, { exclusionPattern, library }), onAction: () => modalManager.show(LibraryExclusionPatternEditModal, { exclusionPattern, library }),
}; };
const Delete: ActionItem = { const Delete: ActionItem = {
icon: mdiTrashCanOutline, icon: mdiTrashCanOutline,
type: $t('command'), type: $t('command'),
title: $t('delete'), title: $t('delete'),
onAction: () => void handleDeleteExclusionPattern(library, exclusionPattern), onAction: () => handleDeleteExclusionPattern(library, exclusionPattern),
}; };
return { Edit, Delete }; return { Edit, Delete };
@@ -273,7 +273,7 @@ const handleDeleteLibraryFolder = async (library: LibraryResponseDto, folder: st
}); });
if (!confirmed) { if (!confirmed) {
return false; return;
} }
try { try {
@@ -285,10 +285,7 @@ const handleDeleteLibraryFolder = async (library: LibraryResponseDto, folder: st
toastManager.success($t('admin.library_updated')); toastManager.success($t('admin.library_updated'));
} catch (error) { } catch (error) {
handleError(error, $t('errors.unable_to_update_library')); handleError(error, $t('errors.unable_to_update_library'));
return false;
} }
return true;
}; };
export const handleAddLibraryExclusionPattern = async (library: LibraryResponseDto, exclusionPattern: string) => { export const handleAddLibraryExclusionPattern = async (library: LibraryResponseDto, exclusionPattern: string) => {
@@ -345,9 +342,8 @@ const handleDeleteExclusionPattern = async (library: LibraryResponseDto, exclusi
const $t = await getFormatter(); const $t = await getFormatter();
const confirmed = await modalManager.showDialog({ prompt: $t('admin.library_remove_exclusion_pattern_prompt') }); const confirmed = await modalManager.showDialog({ prompt: $t('admin.library_remove_exclusion_pattern_prompt') });
if (!confirmed) { if (!confirmed) {
return false; return;
} }
try { try {
@@ -361,8 +357,5 @@ const handleDeleteExclusionPattern = async (library: LibraryResponseDto, exclusi
toastManager.success($t('admin.library_updated')); toastManager.success($t('admin.library_updated'));
} catch (error) { } catch (error) {
handleError(error, $t('errors.unable_to_update_library')); handleError(error, $t('errors.unable_to_update_library'));
return false;
} }
return true;
}; };

View File

@@ -1,11 +1,20 @@
import { goto } from '$app/navigation'; import { goto } from '$app/navigation';
import { AppRoute } from '$lib/constants'; import { AppRoute } from '$lib/constants';
import { eventManager } from '$lib/managers/event-manager.svelte'; import { eventManager } from '$lib/managers/event-manager.svelte';
import { queueManager } from '$lib/managers/queue-manager.svelte';
import JobCreateModal from '$lib/modals/JobCreateModal.svelte'; import JobCreateModal from '$lib/modals/JobCreateModal.svelte';
import { user } from '$lib/stores/user.store'; import type { HeaderButtonActionItem } from '$lib/types';
import { handleError } from '$lib/utils/handle-error'; import { handleError } from '$lib/utils/handle-error';
import { getFormatter } from '$lib/utils/i18n'; import { getFormatter } from '$lib/utils/i18n';
import { emptyQueue, getQueue, QueueName, updateQueue, type QueueResponseDto } from '@immich/sdk'; import {
emptyQueue,
getQueue,
QueueCommand,
QueueName,
runQueueCommandLegacy,
updateQueue,
type QueueResponseDto,
} from '@immich/sdk';
import { modalManager, toastManager, type ActionItem, type IconLike } from '@immich/ui'; import { modalManager, toastManager, type ActionItem, type IconLike } from '@immich/ui';
import { import {
mdiClose, mdiClose,
@@ -23,7 +32,6 @@ import {
mdiPlay, mdiPlay,
mdiPlus, mdiPlus,
mdiStateMachine, mdiStateMachine,
mdiSync,
mdiTable, mdiTable,
mdiTagFaces, mdiTagFaces,
mdiTrashCanOutline, mdiTrashCanOutline,
@@ -31,7 +39,6 @@ import {
mdiVideo, mdiVideo,
} from '@mdi/js'; } from '@mdi/js';
import type { MessageFormatter } from 'svelte-i18n'; import type { MessageFormatter } from 'svelte-i18n';
import { get } from 'svelte/store';
type QueueItem = { type QueueItem = {
icon: IconLike; icon: IconLike;
@@ -39,15 +46,17 @@ type QueueItem = {
subtitle?: string; subtitle?: string;
}; };
export const getQueuesActions = ($t: MessageFormatter) => { export const getQueuesActions = ($t: MessageFormatter, queues: QueueResponseDto[] | undefined) => {
const ViewQueues: ActionItem = { const pausedQueues = (queues ?? []).filter(({ isPaused }) => isPaused).map(({ name }) => name);
title: $t('admin.queues'),
description: $t('admin.queues_page_description'), const ResumePaused: HeaderButtonActionItem = {
icon: mdiSync, title: $t('resume_paused_jobs', { values: { count: pausedQueues.length } }),
type: $t('page'), $if: () => pausedQueues.length > 0,
isGlobal: true, icon: mdiPlay,
$if: () => get(user)?.isAdmin, onAction: () => handleResumePausedJobs(pausedQueues),
onAction: () => goto(AppRoute.ADMIN_QUEUES), data: {
title: pausedQueues.join(', '),
},
}; };
const CreateJob: ActionItem = { const CreateJob: ActionItem = {
@@ -68,7 +77,7 @@ export const getQueuesActions = ($t: MessageFormatter) => {
onAction: () => goto(`${AppRoute.ADMIN_SETTINGS}?isOpen=job`), onAction: () => goto(`${AppRoute.ADMIN_SETTINGS}?isOpen=job`),
}; };
return { ViewQueues, ManageConcurrency, CreateJob }; return { ResumePaused, ManageConcurrency, CreateJob };
}; };
export const getQueueActions = ($t: MessageFormatter, queue: QueueResponseDto) => { export const getQueueActions = ($t: MessageFormatter, queue: QueueResponseDto) => {
@@ -126,6 +135,19 @@ export const handleEmptyQueue = async (queue: QueueResponseDto) => {
} }
}; };
const handleResumePausedJobs = async (queues: QueueName[]) => {
const $t = await getFormatter();
try {
for (const name of queues) {
await runQueueCommandLegacy({ name, queueCommandDto: { command: QueueCommand.Resume, force: false } });
}
await queueManager.refresh();
} catch (error) {
handleError(error, $t('admin.failed_job_command', { values: { command: 'resume', job: 'paused jobs' } }));
}
};
const handleRemoveFailedJobs = async (queue: QueueResponseDto) => { const handleRemoveFailedJobs = async (queue: QueueResponseDto) => {
const $t = await getFormatter(); const $t = await getFormatter();

View File

@@ -24,26 +24,26 @@ export const getSharedLinkActions = ($t: MessageFormatter, sharedLink: SharedLin
const Edit: ActionItem = { const Edit: ActionItem = {
title: $t('edit_link'), title: $t('edit_link'),
icon: mdiPencilOutline, icon: mdiPencilOutline,
onAction: () => void goto(`${AppRoute.SHARED_LINKS}/${sharedLink.id}`), onAction: () => goto(`${AppRoute.SHARED_LINKS}/${sharedLink.id}`),
}; };
const Delete: ActionItem = { const Delete: ActionItem = {
title: $t('delete_link'), title: $t('delete_link'),
icon: mdiTrashCanOutline, icon: mdiTrashCanOutline,
color: 'danger', color: 'danger',
onAction: () => void handleDeleteSharedLink(sharedLink), onAction: () => handleDeleteSharedLink(sharedLink),
}; };
const Copy: ActionItem = { const Copy: ActionItem = {
title: $t('copy_link'), title: $t('copy_link'),
icon: mdiContentCopy, icon: mdiContentCopy,
onAction: () => void copyToClipboard(asUrl(sharedLink)), onAction: () => copyToClipboard(asUrl(sharedLink)),
}; };
const ViewQrCode: ActionItem = { const ViewQrCode: ActionItem = {
title: $t('view_qr_code'), title: $t('view_qr_code'),
icon: mdiQrcode, icon: mdiQrcode,
onAction: () => void handleShowSharedLinkQrCode(sharedLink), onAction: () => handleShowSharedLinkQrCode(sharedLink),
}; };
return { Edit, Delete, Copy, ViewQrCode }; return { Edit, Delete, Copy, ViewQrCode };
@@ -88,7 +88,7 @@ export const handleUpdateSharedLink = async (sharedLink: SharedLinkResponseDto,
} }
}; };
export const handleDeleteSharedLink = async (sharedLink: SharedLinkResponseDto): Promise<boolean> => { const handleDeleteSharedLink = async (sharedLink: SharedLinkResponseDto) => {
const $t = await getFormatter(); const $t = await getFormatter();
const success = await modalManager.showDialog({ const success = await modalManager.showDialog({
title: $t('delete_shared_link'), title: $t('delete_shared_link'),
@@ -96,17 +96,15 @@ export const handleDeleteSharedLink = async (sharedLink: SharedLinkResponseDto):
confirmText: $t('delete'), confirmText: $t('delete'),
}); });
if (!success) { if (!success) {
return false; return;
} }
try { try {
await removeSharedLink({ id: sharedLink.id }); await removeSharedLink({ id: sharedLink.id });
eventManager.emit('SharedLinkDelete', sharedLink); eventManager.emit('SharedLinkDelete', sharedLink);
toastManager.success($t('deleted_shared_link')); toastManager.success($t('deleted_shared_link'));
return true;
} catch (error) { } catch (error) {
handleError(error, $t('errors.unable_to_delete_shared_link')); handleError(error, $t('errors.unable_to_delete_shared_link'));
return false;
} }
}; };

View File

@@ -20,7 +20,7 @@ export const getSystemConfigActions = (
description: $t('admin.copy_config_to_clipboard_description'), description: $t('admin.copy_config_to_clipboard_description'),
type: $t('command'), type: $t('command'),
icon: mdiContentCopy, icon: mdiContentCopy,
onAction: () => void handleCopyToClipboard(config), onAction: () => handleCopyToClipboard(config),
shortcuts: { shift: true, key: 'c' }, shortcuts: { shift: true, key: 'c' },
}; };

View File

@@ -1,11 +1,13 @@
import { goto } from '$app/navigation'; import { goto } from '$app/navigation';
import { eventManager } from '$lib/managers/event-manager.svelte'; 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 PasswordResetSuccessModal from '$lib/modals/PasswordResetSuccessModal.svelte';
import UserCreateModal from '$lib/modals/UserCreateModal.svelte'; import UserCreateModal from '$lib/modals/UserCreateModal.svelte';
import UserDeleteConfirmModal from '$lib/modals/UserDeleteConfirmModal.svelte'; import UserDeleteConfirmModal from '$lib/modals/UserDeleteConfirmModal.svelte';
import UserEditModal from '$lib/modals/UserEditModal.svelte'; import UserEditModal from '$lib/modals/UserEditModal.svelte';
import UserRestoreConfirmModal from '$lib/modals/UserRestoreConfirmModal.svelte'; import UserRestoreConfirmModal from '$lib/modals/UserRestoreConfirmModal.svelte';
import { user as authUser } from '$lib/stores/user.store'; import { user as authUser } from '$lib/stores/user.store';
import type { HeaderButtonActionItem } from '$lib/types';
import { handleError } from '$lib/utils/handle-error'; import { handleError } from '$lib/utils/handle-error';
import { getFormatter } from '$lib/utils/i18n'; import { getFormatter } from '$lib/utils/i18n';
import { import {
@@ -28,6 +30,7 @@ import {
mdiPlusBoxOutline, mdiPlusBoxOutline,
mdiTrashCanOutline, mdiTrashCanOutline,
} from '@mdi/js'; } from '@mdi/js';
import { DateTime } from 'luxon';
import type { MessageFormatter } from 'svelte-i18n'; import type { MessageFormatter } from 'svelte-i18n';
import { get } from 'svelte/store'; import { get } from 'svelte/store';
@@ -36,7 +39,7 @@ export const getUserAdminsActions = ($t: MessageFormatter) => {
title: $t('create_user'), title: $t('create_user'),
type: $t('command'), type: $t('command'),
icon: mdiPlusBoxOutline, icon: mdiPlusBoxOutline,
onAction: () => void modalManager.show(UserCreateModal, {}), onAction: () => modalManager.show(UserCreateModal, {}),
shortcuts: { shift: true, key: 'n' }, shortcuts: { shift: true, key: 'n' },
}; };
@@ -60,11 +63,17 @@ export const getUserAdminActions = ($t: MessageFormatter, user: UserAdminRespons
shortcuts: { key: 'Backspace' }, shortcuts: { key: 'Backspace' },
}; };
const Restore: ActionItem = { const getDeleteDate = (deletedAt: string): Date =>
DateTime.fromISO(deletedAt).plus({ days: serverConfigManager.value.userDeleteDelay }).toJSDate();
const Restore: HeaderButtonActionItem = {
icon: mdiDeleteRestore, icon: mdiDeleteRestore,
title: $t('restore'), title: $t('restore'),
type: $t('command'), type: $t('command'),
color: 'primary', color: 'primary',
data: {
title: $t('admin.user_restore_scheduled_removal', { values: { date: getDeleteDate(user.deletedAt!) } }),
},
$if: () => !!user.deletedAt && user.status === UserStatus.Deleted, $if: () => !!user.deletedAt && user.status === UserStatus.Deleted,
onAction: () => modalManager.show(UserRestoreConfirmModal, { user }), onAction: () => modalManager.show(UserRestoreConfirmModal, { user }),
}; };
@@ -74,14 +83,14 @@ export const getUserAdminActions = ($t: MessageFormatter, user: UserAdminRespons
title: $t('reset_password'), title: $t('reset_password'),
type: $t('command'), type: $t('command'),
$if: () => get(authUser).id !== user.id, $if: () => get(authUser).id !== user.id,
onAction: () => void handleResetPasswordUserAdmin(user), onAction: () => handleResetPasswordUserAdmin(user),
}; };
const ResetPinCode: ActionItem = { const ResetPinCode: ActionItem = {
icon: mdiLockSmart, icon: mdiLockSmart,
type: $t('command'), type: $t('command'),
title: $t('reset_pin_code'), title: $t('reset_pin_code'),
onAction: () => void handleResetPinCodeUserAdmin(user), onAction: () => handleResetPinCodeUserAdmin(user),
}; };
return { Update, Delete, Restore, ResetPassword, ResetPinCode }; return { Update, Delete, Restore, ResetPassword, ResetPinCode };
@@ -162,12 +171,12 @@ const generatePassword = (length: number = 16) => {
return generatedPassword; return generatedPassword;
}; };
export const handleResetPasswordUserAdmin = async (user: UserAdminResponseDto) => { const handleResetPasswordUserAdmin = async (user: UserAdminResponseDto) => {
const $t = await getFormatter(); const $t = await getFormatter();
const prompt = $t('admin.confirm_user_password_reset', { values: { user: user.name } }); const prompt = $t('admin.confirm_user_password_reset', { values: { user: user.name } });
const success = await modalManager.showDialog({ prompt }); const success = await modalManager.showDialog({ prompt });
if (!success) { if (!success) {
return false; return;
} }
try { try {
@@ -176,28 +185,24 @@ export const handleResetPasswordUserAdmin = async (user: UserAdminResponseDto) =
eventManager.emit('UserAdminUpdate', response); eventManager.emit('UserAdminUpdate', response);
toastManager.success(); toastManager.success();
await modalManager.show(PasswordResetSuccessModal, { newPassword: dto.password }); await modalManager.show(PasswordResetSuccessModal, { newPassword: dto.password });
return true;
} catch (error) { } catch (error) {
handleError(error, $t('errors.unable_to_reset_password')); handleError(error, $t('errors.unable_to_reset_password'));
return false;
} }
}; };
export const handleResetPinCodeUserAdmin = async (user: UserAdminResponseDto) => { const handleResetPinCodeUserAdmin = async (user: UserAdminResponseDto) => {
const $t = await getFormatter(); const $t = await getFormatter();
const prompt = $t('admin.confirm_user_pin_code_reset', { values: { user: user.name } }); const prompt = $t('admin.confirm_user_pin_code_reset', { values: { user: user.name } });
const success = await modalManager.showDialog({ prompt }); const success = await modalManager.showDialog({ prompt });
if (!success) { if (!success) {
return false; return;
} }
try { try {
const response = await updateUserAdmin({ id: user.id, userAdminUpdateDto: { pinCode: null } }); const response = await updateUserAdmin({ id: user.id, userAdminUpdateDto: { pinCode: null } });
eventManager.emit('UserAdminUpdate', response); eventManager.emit('UserAdminUpdate', response);
toastManager.success($t('pin_code_reset_successfully')); toastManager.success($t('pin_code_reset_successfully'));
return true;
} catch (error) { } catch (error) {
handleError(error, $t('errors.unable_to_reset_pin_code')); handleError(error, $t('errors.unable_to_reset_pin_code'));
return false;
} }
}; };

View File

@@ -1,4 +1,5 @@
import type { QueueResponseDto, ServerVersionResponseDto } from '@immich/sdk'; import type { QueueResponseDto, ServerVersionResponseDto } from '@immich/sdk';
import type { ActionItem } from '@immich/ui';
export interface ReleaseEvent { export interface ReleaseEvent {
isAvailable: boolean; isAvailable: boolean;
@@ -9,3 +10,5 @@ export interface ReleaseEvent {
} }
export type QueueSnapshot = { timestamp: number; snapshot?: QueueResponseDto[] }; export type QueueSnapshot = { timestamp: number; snapshot?: QueueResponseDto[] };
export type HeaderButtonActionItem = ActionItem & { data?: { title?: string } };

View File

@@ -14,15 +14,15 @@
import { themeManager } from '$lib/managers/theme-manager.svelte'; import { themeManager } from '$lib/managers/theme-manager.svelte';
import ServerRestartingModal from '$lib/modals/ServerRestartingModal.svelte'; import ServerRestartingModal from '$lib/modals/ServerRestartingModal.svelte';
import VersionAnnouncementModal from '$lib/modals/VersionAnnouncementModal.svelte'; import VersionAnnouncementModal from '$lib/modals/VersionAnnouncementModal.svelte';
import { getQueuesActions } from '$lib/services/queue.service'; import { sidebarStore } from '$lib/stores/sidebar.svelte';
import { user } from '$lib/stores/user.store'; import { user } from '$lib/stores/user.store';
import { closeWebsocketConnection, openWebsocketConnection, websocketStore } from '$lib/stores/websocket'; import { closeWebsocketConnection, openWebsocketConnection, websocketStore } from '$lib/stores/websocket';
import type { ReleaseEvent } from '$lib/types'; import type { ReleaseEvent } from '$lib/types';
import { copyToClipboard, getReleaseType, semverToName } from '$lib/utils'; import { copyToClipboard, getReleaseType, semverToName } from '$lib/utils';
import { maintenanceShouldRedirect } from '$lib/utils/maintenance'; import { maintenanceShouldRedirect } from '$lib/utils/maintenance';
import { isAssetViewerRoute } from '$lib/utils/navigation'; import { isAssetViewerRoute } from '$lib/utils/navigation';
import { CommandPaletteContext, modalManager, setTranslations, type ActionItem } from '@immich/ui'; import { CommandPaletteContext, modalManager, setTranslations, toastManager, type ActionItem } from '@immich/ui';
import { mdiAccountMultipleOutline, mdiBookshelf, mdiCog, mdiServer, mdiThemeLightDark } from '@mdi/js'; import { mdiAccountMultipleOutline, mdiBookshelf, mdiCog, mdiServer, mdiSync, mdiThemeLightDark } from '@mdi/js';
import { onMount, type Snippet } from 'svelte'; import { onMount, type Snippet } from 'svelte';
import { t } from 'svelte-i18n'; import { t } from 'svelte-i18n';
import '../app.css'; import '../app.css';
@@ -53,6 +53,8 @@
return new URL(page.url.pathname + page.url.search, 'https://my.immich.app'); return new URL(page.url.pathname + page.url.search, 'https://my.immich.app');
}; };
toastManager.setOptions({ class: 'top-16' });
onMount(() => { onMount(() => {
const element = document.querySelector('#stencil'); const element = document.querySelector('#stencil');
element?.remove(); element?.remove();
@@ -62,6 +64,10 @@
eventManager.emit('AppInit'); eventManager.emit('AppInit');
beforeNavigate(({ from, to }) => { beforeNavigate(({ from, to }) => {
if (sidebarStore.isOpen) {
sidebarStore.reset();
}
if (isAssetViewerRoute(from) && isAssetViewerRoute(to)) { if (isAssetViewerRoute(from) && isAssetViewerRoute(to)) {
return; return;
} }
@@ -149,6 +155,13 @@
icon: mdiCog, icon: mdiCog,
onAction: () => goto(AppRoute.ADMIN_SETTINGS), onAction: () => goto(AppRoute.ADMIN_SETTINGS),
}, },
{
title: $t('admin.queues'),
description: $t('admin.queues_page_description'),
icon: mdiSync,
type: $t('page'),
onAction: () => goto(AppRoute.ADMIN_QUEUES),
},
{ {
title: $t('external_libraries'), title: $t('external_libraries'),
description: $t('admin.external_libraries_page_description'), description: $t('admin.external_libraries_page_description'),
@@ -163,7 +176,7 @@
}, },
].map((route) => ({ ...route, type: $t('page'), isGlobal: true, $if: () => $user?.isAdmin })); ].map((route) => ({ ...route, type: $t('page'), isGlobal: true, $if: () => $user?.isAdmin }));
const commands = $derived([...userCommands, ...adminCommands, ...Object.values(getQueuesActions($t))]); const commands = $derived([...userCommands, ...adminCommands]);
</script> </script>
<OnEvents {onReleaseEvent} /> <OnEvents {onReleaseEvent} />

View File

@@ -1,6 +1,5 @@
<script lang="ts"> <script lang="ts">
import { goto } from '$app/navigation'; import { goto } from '$app/navigation';
import HeaderButton from '$lib/components/HeaderButton.svelte';
import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte'; import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';
import OnEvents from '$lib/components/OnEvents.svelte'; import OnEvents from '$lib/components/OnEvents.svelte';
import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte'; import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte';
@@ -60,17 +59,11 @@
<CommandPaletteContext commands={[Create, ScanAll]} /> <CommandPaletteContext commands={[Create, ScanAll]} />
<AdminPageLayout breadcrumbs={[{ title: data.meta.title }]}> <AdminPageLayout breadcrumbs={[{ title: data.meta.title }]} actions={[ScanAll, Create]}>
{#snippet buttons()}
<div class="flex justify-end gap-2">
<HeaderButton action={ScanAll} />
<HeaderButton action={Create} />
</div>
{/snippet}
<section class="my-4"> <section class="my-4">
<div class="flex flex-col items-center gap-2" in:fade={{ duration: 500 }}> <div class="flex flex-col items-center gap-2" in:fade={{ duration: 500 }}>
{#if libraries.length > 0} {#if libraries.length > 0}
<table class="w-3/4 text-start"> <table class="text-start">
<thead <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" 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"
> >

View File

@@ -23,7 +23,7 @@ export const load = (async ({ url }) => {
statistics: Object.fromEntries(statistics), statistics: Object.fromEntries(statistics),
owners: Object.fromEntries(owners), owners: Object.fromEntries(owners),
meta: { meta: {
title: $t('admin.external_library_management'), title: $t('external_libraries'),
}, },
}; };
}) satisfies PageLoad; }) satisfies PageLoad;

View File

@@ -1,7 +1,7 @@
<script lang="ts"> <script lang="ts">
import { goto } from '$app/navigation'; import { goto } from '$app/navigation';
import emptyFoldersUrl from '$lib/assets/empty-folders.svg'; import emptyFoldersUrl from '$lib/assets/empty-folders.svg';
import HeaderButton from '$lib/components/HeaderButton.svelte'; import HeaderActionButton from '$lib/components/HeaderActionButton.svelte';
import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte'; import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';
import OnEvents from '$lib/components/OnEvents.svelte'; import OnEvents from '$lib/components/OnEvents.svelte';
import ServerStatisticsCard from '$lib/components/server-statistics/ServerStatisticsCard.svelte'; import ServerStatisticsCard from '$lib/components/server-statistics/ServerStatisticsCard.svelte';
@@ -53,18 +53,9 @@
<CommandPaletteContext commands={[Rename, Delete, AddFolder, AddExclusionPattern, Scan]} /> <CommandPaletteContext commands={[Rename, Delete, AddFolder, AddExclusionPattern, Scan]} />
<AdminPageLayout <AdminPageLayout
breadcrumbs={[ breadcrumbs={[{ title: $t('external_libraries'), href: AppRoute.ADMIN_LIBRARY_MANAGEMENT }, { title: library.name }]}
{ title: $t('admin.external_library_management'), href: AppRoute.ADMIN_LIBRARY_MANAGEMENT }, actions={[Scan, Rename, Delete]}
{ title: library.name },
]}
> >
{#snippet buttons()}
<div class="flex justify-end gap-2">
<HeaderButton action={Scan} />
<HeaderButton action={Rename} />
<HeaderButton action={Delete} />
</div>
{/snippet}
<Container size="large" center> <Container size="large" center>
<div class="grid gap-4 grid-cols-1 lg:grid-cols-2 w-full"> <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> <Heading tag="h1" size="large" class="col-span-full my-4">{library.name}</Heading>
@@ -80,7 +71,7 @@
<Icon icon={mdiFolderOutline} size="1.5rem" /> <Icon icon={mdiFolderOutline} size="1.5rem" />
<CardTitle>{$t('folders')}</CardTitle> <CardTitle>{$t('folders')}</CardTitle>
</div> </div>
<HeaderButton action={AddFolder} /> <HeaderActionButton action={AddFolder} />
</div> </div>
</CardHeader> </CardHeader>
<CardBody> <CardBody>
@@ -120,7 +111,7 @@
<Icon icon={mdiFilterMinusOutline} size="1.5rem" /> <Icon icon={mdiFilterMinusOutline} size="1.5rem" />
<CardTitle>{$t('exclusion_pattern')}</CardTitle> <CardTitle>{$t('exclusion_pattern')}</CardTitle>
</div> </div>
<HeaderButton action={AddExclusionPattern} /> <HeaderActionButton action={AddExclusionPattern} />
</div> </div>
</CardHeader> </CardHeader>
<CardBody> <CardBody>

View File

@@ -1,14 +1,11 @@
<script lang="ts"> <script lang="ts">
import HeaderButton from '$lib/components/HeaderButton.svelte';
import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte'; import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';
import OnEvents from '$lib/components/OnEvents.svelte'; import OnEvents from '$lib/components/OnEvents.svelte';
import JobsPanel from '$lib/components/QueuePanel.svelte'; import JobsPanel from '$lib/components/QueuePanel.svelte';
import { queueManager } from '$lib/managers/queue-manager.svelte'; import { queueManager } from '$lib/managers/queue-manager.svelte';
import { getQueuesActions } from '$lib/services/queue.service'; import { getQueuesActions } from '$lib/services/queue.service';
import { handleError } from '$lib/utils/handle-error'; import { type QueueResponseDto } from '@immich/sdk';
import { QueueCommand, runQueueCommandLegacy, type QueueResponseDto } from '@immich/sdk'; import { CommandPaletteContext, type ActionItem } from '@immich/ui';
import { Button, CommandPaletteContext, HStack, Text, type ActionItem } from '@immich/ui';
import { mdiPlay } from '@mdi/js';
import { onMount } from 'svelte'; import { onMount } from 'svelte';
import { t } from 'svelte-i18n'; import { t } from 'svelte-i18n';
import type { PageData } from './$types'; import type { PageData } from './$types';
@@ -22,20 +19,8 @@
onMount(() => queueManager.listen()); onMount(() => queueManager.listen());
let queues = $derived<QueueResponseDto[]>(queueManager.queues); let queues = $derived<QueueResponseDto[]>(queueManager.queues);
const pausedQueues = $derived(queues.filter(({ isPaused }) => isPaused).map(({ name }) => name));
const handleResumePausedJobs = async () => { const { ResumePaused, CreateJob, ManageConcurrency } = $derived(getQueuesActions($t, queueManager.queues));
try {
for (const name of pausedQueues) {
await runQueueCommandLegacy({ name, queueCommandDto: { command: QueueCommand.Resume, force: false } });
}
await queueManager.refresh();
} catch (error) {
handleError(error, $t('admin.failed_job_command', { values: { command: 'resume', job: 'paused jobs' } }));
}
};
const { CreateJob, ManageConcurrency } = $derived(getQueuesActions($t));
const commands: ActionItem[] = $derived([CreateJob, ManageConcurrency]); const commands: ActionItem[] = $derived([CreateJob, ManageConcurrency]);
const onQueueUpdate = (update: QueueResponseDto) => { const onQueueUpdate = (update: QueueResponseDto) => {
@@ -52,27 +37,7 @@
<OnEvents {onQueueUpdate} /> <OnEvents {onQueueUpdate} />
<AdminPageLayout breadcrumbs={[{ title: data.meta.title }]}> <AdminPageLayout breadcrumbs={[{ title: data.meta.title }]} actions={[ResumePaused, CreateJob, ManageConcurrency]}>
{#snippet buttons()}
<HStack gap={0}>
{#if pausedQueues.length > 0}
<Button
leadingIcon={mdiPlay}
onclick={handleResumePausedJobs}
size="small"
variant="ghost"
title={pausedQueues.join(', ')}
>
<Text class="hidden md:block">
{$t('resume_paused_jobs', { values: { count: pausedQueues.length } })}
</Text>
</Button>
{/if}
<HeaderButton action={CreateJob} />
<HeaderButton action={ManageConcurrency} />
</HStack>
{/snippet}
<section id="setting-content" class="flex place-content-center sm:mx-4"> <section id="setting-content" class="flex place-content-center sm:mx-4">
<section class="w-full pb-28 sm:w-5/6 md:w-212.5"> <section class="w-full pb-28 sm:w-5/6 md:w-212.5">
{#if queues} {#if queues}

View File

@@ -1,5 +1,4 @@
<script lang="ts"> <script lang="ts">
import HeaderButton from '$lib/components/HeaderButton.svelte';
import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte'; import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';
import OnEvents from '$lib/components/OnEvents.svelte'; import OnEvents from '$lib/components/OnEvents.svelte';
import QueueGraph from '$lib/components/QueueGraph.svelte'; import QueueGraph from '$lib/components/QueueGraph.svelte';
@@ -7,7 +6,18 @@
import { queueManager } from '$lib/managers/queue-manager.svelte'; import { queueManager } from '$lib/managers/queue-manager.svelte';
import { asQueueItem, getQueueActions } from '$lib/services/queue.service'; import { asQueueItem, getQueueActions } from '$lib/services/queue.service';
import { type QueueResponseDto } from '@immich/sdk'; import { type QueueResponseDto } from '@immich/sdk';
import { Badge, Card, CardBody, CardHeader, CardTitle, Container, Heading, HStack, Icon, Text } from '@immich/ui'; import {
Badge,
Card,
CardBody,
CardHeader,
CardTitle,
Container,
Heading,
Icon,
MenuItemType,
Text,
} from '@immich/ui';
import { mdiClockTimeTwoOutline } from '@mdi/js'; import { mdiClockTimeTwoOutline } from '@mdi/js';
import { onMount } from 'svelte'; import { onMount } from 'svelte';
import { t } from 'svelte-i18n'; import { t } from 'svelte-i18n';
@@ -35,15 +45,10 @@
<OnEvents {onQueueUpdate} /> <OnEvents {onQueueUpdate} />
<AdminPageLayout breadcrumbs={[{ title: $t('admin.queues'), href: AppRoute.ADMIN_QUEUES }, { title: item.title }]}> <AdminPageLayout
{#snippet buttons()} breadcrumbs={[{ title: $t('admin.queues'), href: AppRoute.ADMIN_QUEUES }, { title: item.title }]}
<HStack gap={0}> actions={[Pause, Resume, Empty, MenuItemType.Divider, RemoveFailedJobs]}
<HeaderButton action={Pause} /> >
<HeaderButton action={Resume} />
<HeaderButton action={Empty} />
<HeaderButton action={RemoveFailedJobs} />
</HStack>
{/snippet}
<div> <div>
<Container size="large" center> <Container size="large" center>
<div class="mb-1 mt-4 flex items-center gap-2"> <div class="mb-1 mt-4 flex items-center gap-2">

View File

@@ -18,7 +18,6 @@
import ThemeSettings from '$lib/components/admin-settings/ThemeSettings.svelte'; import ThemeSettings from '$lib/components/admin-settings/ThemeSettings.svelte';
import TrashSettings from '$lib/components/admin-settings/TrashSettings.svelte'; import TrashSettings from '$lib/components/admin-settings/TrashSettings.svelte';
import UserSettings from '$lib/components/admin-settings/UserSettings.svelte'; import UserSettings from '$lib/components/admin-settings/UserSettings.svelte';
import HeaderButton from '$lib/components/HeaderButton.svelte';
import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte'; import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';
import SettingAccordionState from '$lib/components/shared-components/settings/setting-accordion-state.svelte'; import SettingAccordionState from '$lib/components/shared-components/settings/setting-accordion-state.svelte';
import SettingAccordion from '$lib/components/shared-components/settings/setting-accordion.svelte'; import SettingAccordion from '$lib/components/shared-components/settings/setting-accordion.svelte';
@@ -27,7 +26,7 @@
import { featureFlagsManager } from '$lib/managers/feature-flags-manager.svelte'; import { featureFlagsManager } from '$lib/managers/feature-flags-manager.svelte';
import { systemConfigManager } from '$lib/managers/system-config-manager.svelte'; import { systemConfigManager } from '$lib/managers/system-config-manager.svelte';
import { getSystemConfigActions } from '$lib/services/system-config.service'; import { getSystemConfigActions } from '$lib/services/system-config.service';
import { Alert, CommandPaletteContext, HStack } from '@immich/ui'; import { Alert, CommandPaletteContext } from '@immich/ui';
import { import {
mdiAccountOutline, mdiAccountOutline,
mdiBackupRestore, mdiBackupRestore,
@@ -217,24 +216,13 @@
<CommandPaletteContext commands={[CopyToClipboard, Upload, Download]} /> <CommandPaletteContext commands={[CopyToClipboard, Upload, Download]} />
<AdminPageLayout breadcrumbs={[{ title: data.meta.title }]}> <AdminPageLayout breadcrumbs={[{ title: data.meta.title }]} actions={[CopyToClipboard, Download, Upload]}>
{#snippet buttons()} <section id="setting-content" class="flex place-content-center sm:mx-4 mt-4">
<HStack gap={1}>
<div class="hidden lg:block">
<SearchBar placeholder={$t('search_settings')} bind:name={searchQuery} showLoadingSpinner={false} />
</div>
<HeaderButton action={CopyToClipboard} />
<HeaderButton action={Download} />
<HeaderButton action={Upload} />
</HStack>
{/snippet}
<section id="setting-content" class="flex place-content-center sm:mx-4">
<section class="w-full pb-28 sm:w-5/6 md:w-4xl"> <section class="w-full pb-28 sm:w-5/6 md:w-4xl">
{#if featureFlagsManager.value.configFile} {#if featureFlagsManager.value.configFile}
<Alert color="warning" class="text-dark my-4" title={$t('admin.config_set_by_file')} /> <Alert color="warning" class="text-dark my-4" title={$t('admin.config_set_by_file')} />
{/if} {/if}
<div class="block lg:hidden"> <div>
<SearchBar placeholder={$t('search_settings')} bind:name={searchQuery} showLoadingSpinner={false} /> <SearchBar placeholder={$t('search_settings')} bind:name={searchQuery} showLoadingSpinner={false} />
</div> </div>
<SettingAccordionState queryParam={QueryParameter.IS_OPEN}> <SettingAccordionState queryParam={QueryParameter.IS_OPEN}>

View File

@@ -1,12 +1,11 @@
<script lang="ts"> <script lang="ts">
import HeaderButton from '$lib/components/HeaderButton.svelte';
import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte'; import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';
import OnEvents from '$lib/components/OnEvents.svelte'; import OnEvents from '$lib/components/OnEvents.svelte';
import { getUserAdminsActions, handleNavigateUserAdmin } from '$lib/services/user-admin.service'; import { getUserAdminsActions, handleNavigateUserAdmin } from '$lib/services/user-admin.service';
import { locale } from '$lib/stores/preferences.store'; import { locale } from '$lib/stores/preferences.store';
import { getByteUnitString } from '$lib/utils/byte-units'; import { getByteUnitString } from '$lib/utils/byte-units';
import { searchUsersAdmin, type UserAdminResponseDto } from '@immich/sdk'; import { searchUsersAdmin, type UserAdminResponseDto } from '@immich/sdk';
import { Button, CommandPaletteContext, HStack, Icon } from '@immich/ui'; import { Button, CommandPaletteContext, Icon } from '@immich/ui';
import { mdiInfinity } from '@mdi/js'; import { mdiInfinity } from '@mdi/js';
import { t } from 'svelte-i18n'; import { t } from 'svelte-i18n';
import type { PageData } from './$types'; import type { PageData } from './$types';
@@ -45,12 +44,7 @@
<CommandPaletteContext commands={[Create]} /> <CommandPaletteContext commands={[Create]} />
<AdminPageLayout breadcrumbs={[{ title: data.meta.title }]}> <AdminPageLayout breadcrumbs={[{ title: data.meta.title }]} actions={[Create]}>
{#snippet buttons()}
<HStack gap={1}>
<HeaderButton action={Create} />
</HStack>
{/snippet}
<section id="setting-content" class="flex place-content-center sm:mx-4"> <section id="setting-content" class="flex place-content-center sm:mx-4">
<section class="w-full pb-28 lg:w-212.5"> <section class="w-full pb-28 lg:w-212.5">
<table class="my-5 w-full text-start"> <table class="my-5 w-full text-start">

View File

@@ -1,6 +1,5 @@
<script lang="ts"> <script lang="ts">
import { goto } from '$app/navigation'; import { goto } from '$app/navigation';
import HeaderButton from '$lib/components/HeaderButton.svelte';
import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte'; import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';
import OnEvents from '$lib/components/OnEvents.svelte'; import OnEvents from '$lib/components/OnEvents.svelte';
import ServerStatisticsCard from '$lib/components/server-statistics/ServerStatisticsCard.svelte'; import ServerStatisticsCard from '$lib/components/server-statistics/ServerStatisticsCard.svelte';
@@ -8,7 +7,6 @@
import DeviceCard from '$lib/components/user-settings-page/device-card.svelte'; import DeviceCard from '$lib/components/user-settings-page/device-card.svelte';
import FeatureSetting from '$lib/components/users/FeatureSetting.svelte'; import FeatureSetting from '$lib/components/users/FeatureSetting.svelte';
import { AppRoute } from '$lib/constants'; import { AppRoute } from '$lib/constants';
import { serverConfigManager } from '$lib/managers/server-config-manager.svelte';
import { getUserAdminActions } from '$lib/services/user-admin.service'; import { getUserAdminActions } from '$lib/services/user-admin.service';
import { locale } from '$lib/stores/preferences.store'; import { locale } from '$lib/stores/preferences.store';
import { createDateFormatter, findLocale } from '$lib/utils'; import { createDateFormatter, findLocale } from '$lib/utils';
@@ -26,8 +24,8 @@
Container, Container,
getByteUnitString, getByteUnitString,
Heading, Heading,
HStack,
Icon, Icon,
MenuItemType,
Stack, Stack,
Text, Text,
} from '@immich/ui'; } from '@immich/ui';
@@ -42,15 +40,14 @@
mdiPlayCircle, mdiPlayCircle,
mdiTrashCanOutline, mdiTrashCanOutline,
} from '@mdi/js'; } from '@mdi/js';
import { DateTime } from 'luxon';
import { t } from 'svelte-i18n'; import { t } from 'svelte-i18n';
import type { PageData } from './$types'; import type { PageData } from './$types';
interface Props { type Props = {
data: PageData; data: PageData;
} };
let { data }: Props = $props(); const { data }: Props = $props();
let user = $derived(data.user); let user = $derived(data.user);
const userPreferences = $derived(data.userPreferences); const userPreferences = $derived(data.userPreferences);
@@ -94,9 +91,6 @@
await goto(AppRoute.ADMIN_USERS); await goto(AppRoute.ADMIN_USERS);
} }
}; };
const getDeleteDate = (deletedAt: string): Date =>
DateTime.fromISO(deletedAt).plus({ days: serverConfigManager.value.userDeleteDelay }).toJSDate();
</script> </script>
<OnEvents <OnEvents
@@ -110,19 +104,8 @@
<AdminPageLayout <AdminPageLayout
breadcrumbs={[{ title: $t('admin.user_management'), href: AppRoute.ADMIN_USERS }, { title: user.name }]} breadcrumbs={[{ title: $t('admin.user_management'), href: AppRoute.ADMIN_USERS }, { title: user.name }]}
actions={[ResetPassword, ResetPinCode, Update, Restore, MenuItemType.Divider, Delete]}
> >
{#snippet buttons()}
<HStack gap={0}>
<HeaderButton action={ResetPassword} />
<HeaderButton action={ResetPinCode} />
<HeaderButton action={Update} />
<HeaderButton
action={Restore}
title={$t('admin.user_restore_scheduled_removal', { values: { date: getDeleteDate(user.deletedAt!) } })}
/>
<HeaderButton action={Delete} />
</HStack>
{/snippet}
<div> <div>
<Container size="large" center> <Container size="large" center>
{#if user.deletedAt} {#if user.deletedAt}