cjones/immich
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

format and fix tests on web

Browse Source
This commit is contained in:
mgabor
2024-04-17 13:16:30 +02:00
parent abb9f7a747
commit 3ece5769f1
3 changed files with 61 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/lib/components/album-page/share-info-modal.svelte
+7 -3
View File
@@ -4,8 +4,9 @@
removeUserFromAlbum, removeUserFromAlbum,
type AlbumResponseDto, type AlbumResponseDto,
type UserResponseDto, type UserResponseDto,
updateAlbumUser, AlbumUserRole, updateAlbumUser,
} from '@immich/sdk' AlbumUserRole,
} from '@immich/sdk';
import { mdiDotsVertical } from '@mdi/js'; import { mdiDotsVertical } from '@mdi/js';
import { createEventDispatcher, onMount } from 'svelte'; import { createEventDispatcher, onMount } from 'svelte';
import { getContextMenuPosition } from '../../utils/context-menu'; import { getContextMenuPosition } from '../../utils/context-menu';
@@ -139,7 +140,10 @@
{#if role === AlbumUserRole.Viewer} {#if role === AlbumUserRole.Viewer}
<MenuOption on:click={() => handleSetReadonly(user, AlbumUserRole.Editor)} text="Allow edits" /> <MenuOption on:click={() => handleSetReadonly(user, AlbumUserRole.Editor)} text="Allow edits" />
{:else} {:else}
<MenuOption on:click={() => handleSetReadonly(user, AlbumUserRole.Viewer)} text="Disallow edits" /> <MenuOption
on:click={() => handleSetReadonly(user, AlbumUserRole.Viewer)}
text="Disallow edits"
/>
{/if} {/if}
<MenuOption on:click={handleMenuRemove} text="Remove" /> <MenuOption on:click={handleMenuRemove} text="Remove" />
</ContextMenu> </ContextMenu>
web/src/routes/(user)/albums/[albumId]/+page.svelte
+53 -51
View File
@@ -1,51 +1,53 @@
<script lang="ts"> <script lang="ts">
import {afterNavigate, goto} from '$app/navigation' import { afterNavigate, goto } from '$app/navigation';
import AlbumDescription from '$lib/components/album-page/album-description.svelte' import AlbumDescription from '$lib/components/album-page/album-description.svelte';
import AlbumOptions from '$lib/components/album-page/album-options.svelte' import AlbumOptions from '$lib/components/album-page/album-options.svelte';
import AlbumSummary from '$lib/components/album-page/album-summary.svelte' import AlbumSummary from '$lib/components/album-page/album-summary.svelte';
import AlbumTitle from '$lib/components/album-page/album-title.svelte' import AlbumTitle from '$lib/components/album-page/album-title.svelte';
import ShareInfoModal from '$lib/components/album-page/share-info-modal.svelte' import ShareInfoModal from '$lib/components/album-page/share-info-modal.svelte';
import UserSelectionModal from '$lib/components/album-page/user-selection-modal.svelte' import UserSelectionModal from '$lib/components/album-page/user-selection-modal.svelte';
import ActivityStatus from '$lib/components/asset-viewer/activity-status.svelte' import ActivityStatus from '$lib/components/asset-viewer/activity-status.svelte';
import ActivityViewer from '$lib/components/asset-viewer/activity-viewer.svelte' import ActivityViewer from '$lib/components/asset-viewer/activity-viewer.svelte';
import Button from '$lib/components/elements/buttons/button.svelte' import Button from '$lib/components/elements/buttons/button.svelte';
import CircleIconButton from '$lib/components/elements/buttons/circle-icon-button.svelte' import CircleIconButton from '$lib/components/elements/buttons/circle-icon-button.svelte';
import Icon from '$lib/components/elements/icon.svelte' import Icon from '$lib/components/elements/icon.svelte';
import AddToAlbum from '$lib/components/photos-page/actions/add-to-album.svelte' import AddToAlbum from '$lib/components/photos-page/actions/add-to-album.svelte';
import ArchiveAction from '$lib/components/photos-page/actions/archive-action.svelte' import ArchiveAction from '$lib/components/photos-page/actions/archive-action.svelte';
import ChangeDate from '$lib/components/photos-page/actions/change-date-action.svelte' import ChangeDate from '$lib/components/photos-page/actions/change-date-action.svelte';
import ChangeLocation from '$lib/components/photos-page/actions/change-location-action.svelte' import ChangeLocation from '$lib/components/photos-page/actions/change-location-action.svelte';
import CreateSharedLink from '$lib/components/photos-page/actions/create-shared-link.svelte' import CreateSharedLink from '$lib/components/photos-page/actions/create-shared-link.svelte';
import DeleteAssets from '$lib/components/photos-page/actions/delete-assets.svelte' import DeleteAssets from '$lib/components/photos-page/actions/delete-assets.svelte';
import DownloadAction from '$lib/components/photos-page/actions/download-action.svelte' import DownloadAction from '$lib/components/photos-page/actions/download-action.svelte';
import FavoriteAction from '$lib/components/photos-page/actions/favorite-action.svelte' import FavoriteAction from '$lib/components/photos-page/actions/favorite-action.svelte';
import RemoveFromAlbum from '$lib/components/photos-page/actions/remove-from-album.svelte' import RemoveFromAlbum from '$lib/components/photos-page/actions/remove-from-album.svelte';
import SelectAllAssets from '$lib/components/photos-page/actions/select-all-assets.svelte' import SelectAllAssets from '$lib/components/photos-page/actions/select-all-assets.svelte';
import AssetGrid from '$lib/components/photos-page/asset-grid.svelte' import AssetGrid from '$lib/components/photos-page/asset-grid.svelte';
import AssetSelectContextMenu from '$lib/components/photos-page/asset-select-context-menu.svelte' import AssetSelectContextMenu from '$lib/components/photos-page/asset-select-context-menu.svelte';
import AssetSelectControlBar from '$lib/components/photos-page/asset-select-control-bar.svelte' import AssetSelectControlBar from '$lib/components/photos-page/asset-select-control-bar.svelte';
import ConfirmDialogue from '$lib/components/shared-components/confirm-dialogue.svelte' import ConfirmDialogue from '$lib/components/shared-components/confirm-dialogue.svelte';
import ContextMenu from '$lib/components/shared-components/context-menu/context-menu.svelte' import ContextMenu from '$lib/components/shared-components/context-menu/context-menu.svelte';
import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte' import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
import ControlAppBar from '$lib/components/shared-components/control-app-bar.svelte' import ControlAppBar from '$lib/components/shared-components/control-app-bar.svelte';
import CreateSharedLinkModal import CreateSharedLinkModal from '$lib/components/shared-components/create-share-link-modal/create-shared-link-modal.svelte';
from '$lib/components/shared-components/create-share-link-modal/create-shared-link-modal.svelte' import {
import {notificationController, NotificationType,} from '$lib/components/shared-components/notification/notification' notificationController,
import UserAvatar from '$lib/components/shared-components/user-avatar.svelte' NotificationType,
import {AppRoute} from '$lib/constants' } from '$lib/components/shared-components/notification/notification';
import {numberOfComments, setNumberOfComments, updateNumberOfComments} from '$lib/stores/activity.store' import UserAvatar from '$lib/components/shared-components/user-avatar.svelte';
import {createAssetInteractionStore} from '$lib/stores/asset-interaction.store' import { AppRoute } from '$lib/constants';
import {assetViewingStore} from '$lib/stores/asset-viewing.store' import { numberOfComments, setNumberOfComments, updateNumberOfComments } from '$lib/stores/activity.store';
import {AssetStore} from '$lib/stores/assets.store' import { createAssetInteractionStore } from '$lib/stores/asset-interaction.store';
import {locale} from '$lib/stores/preferences.store' import { assetViewingStore } from '$lib/stores/asset-viewing.store';
import {SlideshowNavigation, SlideshowState, slideshowStore} from '$lib/stores/slideshow.store' import { AssetStore } from '$lib/stores/assets.store';
import {user} from '$lib/stores/user.store' import { locale } from '$lib/stores/preferences.store';
import {handlePromiseError} from '$lib/utils' import { SlideshowNavigation, SlideshowState, slideshowStore } from '$lib/stores/slideshow.store';
import {downloadAlbum} from '$lib/utils/asset-utils' import { user } from '$lib/stores/user.store';
import {clickOutside} from '$lib/utils/click-outside' import { handlePromiseError } from '$lib/utils';
import {getContextMenuPosition} from '$lib/utils/context-menu' import { downloadAlbum } from '$lib/utils/asset-utils';
import {openFileUploadDialog} from '$lib/utils/file-uploader' import { clickOutside } from '$lib/utils/click-outside';
import {handleError} from '$lib/utils/handle-error' import { getContextMenuPosition } from '$lib/utils/context-menu';
import { openFileUploadDialog } from '$lib/utils/file-uploader';
import { handleError } from '$lib/utils/handle-error';
import { import {
type ActivityResponseDto, type ActivityResponseDto,
addAssetsToAlbum, addAssetsToAlbum,
@@ -62,7 +64,7 @@
ReactionType, ReactionType,
updateAlbumInfo, updateAlbumInfo,
type UserResponseDto, type UserResponseDto,
} from '@immich/sdk' } from '@immich/sdk';
import { import {
mdiArrowLeft, mdiArrowLeft,
mdiCogOutline, mdiCogOutline,
@@ -75,9 +77,9 @@
mdiPlus, mdiPlus,
mdiPresentationPlay, mdiPresentationPlay,
mdiShareVariantOutline, mdiShareVariantOutline,
} from '@mdi/js' } from '@mdi/js';
import {fly} from 'svelte/transition' import { fly } from 'svelte/transition';
import type {PageData} from './$types' import type { PageData } from './$types';
export let data: PageData; export let data: PageData;
web/src/test-data/factories/album-factory.ts
+1
View File
@@ -16,6 +16,7 @@ export const albumFactory = Sync.makeFactory<AlbumResponseDto>({
owner: userFactory.build(), owner: userFactory.build(),
shared: false, shared: false,
sharedUsers: [], sharedUsers: [],
sharedUsersV2: [],
hasSharedLink: false, hasSharedLink: false,
isActivityEnabled: true, isActivityEnabled: true,
order: AssetOrder.Desc, order: AssetOrder.Desc,