Skip to content

High performance self-hosted photo and video management solution.

refactor: library service (#24725)

Jason Rasmussen5b8032332623
diff --git a/web/src/lib/modals/LibraryCreateModal.svelte b/web/src/lib/modals/LibraryCreateModal.svelte
new file mode 100644
index 0000000000..d2d7f62c02
--- /dev/null
+++ b/web/src/lib/modals/LibraryCreateModal.svelte
@@ -0,0 +1,44 @@
+<script lang="ts">
+ import SettingSelect from '$lib/components/shared-components/settings/setting-select.svelte';
+ import { handleCreateLibrary } from '$lib/services/library.service';
+ import { user } from '$lib/stores/user.store';
+ import { searchUsersAdmin } from '@immich/sdk';
+ import { FormModal, Text } from '@immich/ui';
+ import { mdiFolderSync } from '@mdi/js';
+ 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([]);
+
+ onMount(async () => {
+ const users = await searchUsersAdmin({});
+ userOptions = users.map((user) => ({ value: user.id, text: user.name }));
+ });
+
+ const onSubmit = async () => {
+ const success = await handleCreateLibrary({ ownerId });
+ if (success) {
+ onClose();
+ }
+ };
+</script>
+
+<FormModal
+ title={$t('create_library')}
+ icon={mdiFolderSync}
+ {onClose}
+ size="small"
+ {onSubmit}
+ submitText={$t('create')}
+>
+ <SettingSelect label={$t('owner')} bind:value={ownerId} options={userOptions} name="user" />
+ <Text color="warning" size="small">{$t('admin.note_cannot_be_changed_later')}</Text>
+</FormModal>
diff --git a/web/src/lib/modals/LibraryUserPickerModal.svelte b/web/src/lib/modals/LibraryUserPickerModal.svelte
deleted file mode 100644
index 2aa135a49c..0000000000
--- a/web/src/lib/modals/LibraryUserPickerModal.svelte
+++ /dev/null
@@ -1,46 +0,0 @@
-<script lang="ts">
- import SettingSelect from '$lib/components/shared-components/settings/setting-select.svelte';
- import { user } from '$lib/stores/user.store';
- import { searchUsersAdmin } from '@immich/sdk';
- import { Button, HStack, Modal, ModalBody, ModalFooter } from '@immich/ui';
- import { mdiFolderSync } from '@mdi/js';
- import { onMount } from 'svelte';
- import { t } from 'svelte-i18n';
-
- interface Props {
- onClose: (ownerId?: string) => void;
- }
-
- let { onClose }: Props = $props();
-
- let ownerId: string = $state($user.id);
-
- let userOptions: { value: string; text: string }[] = $state([]);
-
- onMount(async () => {
- const users = await searchUsersAdmin({});
- userOptions = users.map((user) => ({ value: user.id, text: user.name }));
- });
-
- const onsubmit = (event: Event) => {
- event.preventDefault();
- onClose(ownerId);
- };
-</script>
-
-<Modal title={$t('select_library_owner')} icon={mdiFolderSync} {onClose} size="small">
- <ModalBody>
- <form {onsubmit} autocomplete="off" id="select-library-owner-form">
- <p class="p-5 text-sm">{$t('admin.note_cannot_be_changed_later')}</p>
-
- <SettingSelect bind:value={ownerId} options={userOptions} name="user" />
- </form>
- </ModalBody>
-
- <ModalFooter>
- <HStack fullWidth>
- <Button shape="round" color="secondary" fullWidth onclick={() => onClose()}>{$t('cancel')}</Button>
- <Button shape="round" type="submit" fullWidth form="select-library-owner-form">{$t('create')}</Button>
- </HStack>
- </ModalFooter>
-</Modal>
diff --git a/web/src/lib/services/library.service.ts b/web/src/lib/services/library.service.ts
index d20eae6af6..a7f2ba25e7 100644
--- a/web/src/lib/services/library.service.ts
+++ b/web/src/lib/services/library.service.ts
@@ -1,12 +1,12 @@
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 LibraryUserPickerModal from '$lib/modals/LibraryUserPickerModal.svelte';
import { handleError } from '$lib/utils/handle-error';
import { getFormatter } from '$lib/utils/i18n';
import {
@@ -17,6 +17,7 @@ import {
runQueueCommandLegacy,
scanLibrary,
updateLibrary,
+ type CreateLibraryDto,
type LibraryResponseDto,
} from '@immich/sdk';
import { modalManager, toastManager, type ActionItem } from '@immich/ui';
@@ -37,7 +38,7 @@ export const getLibrariesActions = ($t: MessageFormatter, libraries: LibraryResp
title: $t('create_library'),
type: $t('command'),
icon: mdiPlusBoxOutline,
- onAction: () => handleCreateLibrary(),
+ onAction: () => handleShowLibraryCreateModal(),
shortcuts: { shift: true, key: 'n' },
};
@@ -152,20 +153,17 @@ export const handleViewLibrary = async (library: LibraryResponseDto) => {
await goto(`${AppRoute.ADMIN_LIBRARY_MANAGEMENT}/${library.id}`);
};
-export const handleCreateLibrary = async () => {
+export const handleCreateLibrary = async (dto: CreateLibraryDto) => {
const $t = await getFormatter();
- const ownerId = await modalManager.show(LibraryUserPickerModal, {});
- if (!ownerId) {
- return;
- }
-
try {
- const createdLibrary = await createLibrary({ createLibraryDto: { ownerId } });
- eventManager.emit('LibraryCreate', createdLibrary);
- toastManager.success($t('admin.library_created', { values: { library: createdLibrary.name } }));
+ const library = await createLibrary({ createLibraryDto: dto });
+ eventManager.emit('LibraryCreate', library);
+ toastManager.success($t('admin.library_created', { values: { library: library.name } }));
+ return true;
} catch (error) {
handleError(error, $t('errors.unable_to_create_library'));
+ return false;
}
};
@@ -359,3 +357,7 @@ 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/routes/admin/library-management/+page.svelte b/web/src/routes/admin/library-management/+page.svelte
index 9aa5af6481..e61b4433be 100644
--- a/web/src/routes/admin/library-management/+page.svelte
+++ b/web/src/routes/admin/library-management/+page.svelte
@@ -4,18 +4,18 @@
import OnEvents from '$lib/components/OnEvents.svelte';
import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte';
import { AppRoute } from '$lib/constants';
- import { getLibrariesActions, handleCreateLibrary, handleViewLibrary } from '$lib/services/library.service';
+ import { getLibrariesActions, handleShowLibraryCreateModal, handleViewLibrary } from '$lib/services/library.service';
import { locale } from '$lib/stores/preferences.store';
import { getBytesWithUnit } from '$lib/utils/byte-units';
- import { getLibrary, getLibraryStatistics, getUserAdmin, type LibraryResponseDto } from '@immich/sdk';
+ import { getLibrary, getLibraryStatistics, type LibraryResponseDto } from '@immich/sdk';
import { Button, CommandPaletteContext } from '@immich/ui';
import { t } from 'svelte-i18n';
import { fade } from 'svelte/transition';
import type { PageData } from './$types';
- interface Props {
+ type Props = {
data: PageData;
- }
+ };
let { data }: Props = $props();
@@ -23,15 +23,11 @@
let statistics = $state(data.statistics);
let owners = $state(data.owners);
- const handleLibraryAdd = async (library: LibraryResponseDto) => {
- statistics[library.id] = await getLibraryStatistics({ id: library.id });
- owners[library.id] = await getUserAdmin({ id: library.ownerId });
- libraries.push(library);
-
+ const onLibraryCreate = async (library: LibraryResponseDto) => {
await goto(`${AppRoute.ADMIN_LIBRARY_MANAGEMENT}/${library.id}`);
};
- const handleLibraryUpdate = async (library: LibraryResponseDto) => {
+ const onLibraryUpdate = async (library: LibraryResponseDto) => {
const index = libraries.findIndex(({ id }) => id === library.id);
if (index === -1) {
@@ -42,7 +38,7 @@
statistics[library.id] = await getLibraryStatistics({ id: library.id });
};
- const handleDeleteLibrary = ({ id }: { id: string }) => {
+ const onLibraryDelete = ({ id }: { id: string }) => {
libraries = libraries.filter((library) => library.id !== id);
delete statistics[id];
delete owners[id];
@@ -51,11 +47,7 @@
const { Create, ScanAll } = $derived(getLibrariesActions($t, libraries));
</script>
-<OnEvents
- onLibraryCreate={handleLibraryAdd}
- onLibraryUpdate={handleLibraryUpdate}
- onLibraryDelete={handleDeleteLibrary}
-/>
+<OnEvents {onLibraryCreate} {onLibraryUpdate} {onLibraryDelete} />
<CommandPaletteContext commands={[Create, ScanAll]} />
@@ -106,7 +98,11 @@
</tbody>
</table>
{:else}
- <EmptyPlaceholder text={$t('no_libraries_message')} onClick={handleCreateLibrary} class="mt-10 mx-auto" />
+ <EmptyPlaceholder
+ text={$t('no_libraries_message')}
+ onClick={handleShowLibraryCreateModal}
+ class="mt-10 mx-auto"
+ />
{/if}
</div>
</section>