diff --git a/web/src/app.html b/web/src/app.html index 5f31df3336..f35409429e 100644 --- a/web/src/app.html +++ b/web/src/app.html @@ -1,4 +1,4 @@ - + diff --git a/web/src/lib/components/album-page/album-viewer.svelte b/web/src/lib/components/album-page/album-viewer.svelte index cfcfc8425c..ba71c396d8 100644 --- a/web/src/lib/components/album-page/album-viewer.svelte +++ b/web/src/lib/components/album-page/album-viewer.svelte @@ -20,7 +20,7 @@ import ThemeButton from '../shared-components/theme-button.svelte'; import { shouldIgnoreShortcut } from '$lib/utils/shortcut'; import { mdiFileImagePlusOutline, mdiFolderDownloadOutline } from '@mdi/js'; - import UpdatePanel from '../shared-components/update-panel.svelte'; + import UpdatePanel from '../shared-components/update-panel.svelte'; export let sharedLink: SharedLinkResponseDto; export let user: UserResponseDto | undefined = undefined; @@ -169,5 +169,4 @@ - diff --git a/web/src/lib/components/asset-viewer/detail-panel.svelte b/web/src/lib/components/asset-viewer/detail-panel.svelte index 6ef51a5e2a..8e085fc471 100644 --- a/web/src/lib/components/asset-viewer/detail-panel.svelte +++ b/web/src/lib/components/asset-viewer/detail-panel.svelte @@ -5,7 +5,7 @@ import { getAssetFilename } from '$lib/utils/asset-utils'; import { AlbumResponseDto, AssetResponseDto, ThumbnailFormat, api } from '@api'; import { DateTime } from 'luxon'; - import { createEventDispatcher } from 'svelte'; + import { createEventDispatcher, onDestroy } from 'svelte'; import { slide } from 'svelte/transition'; import { asByteUnitString } from '../../utils/byte-units'; import ImageThumbnail from '../assets/thumbnail/image-thumbnail.svelte'; @@ -57,10 +57,14 @@ $: people = asset.people || []; - const subscribe = websocketStore.onAssetUpdate.subscribe(assetUpdate => { + const unsubscribe = websocketStore.onAssetUpdate.subscribe((assetUpdate) => { if (assetUpdate && assetUpdate.id === asset.id) { asset = assetUpdate; - } + } + }); + + onDestroy(() => { + unsubscribe(); }); const dispatch = createEventDispatcher(); diff --git a/web/src/lib/components/memory-page/memory-viewer.svelte b/web/src/lib/components/memory-page/memory-viewer.svelte index d90efe7127..e30b5967c5 100644 --- a/web/src/lib/components/memory-page/memory-viewer.svelte +++ b/web/src/lib/components/memory-page/memory-viewer.svelte @@ -275,8 +275,6 @@ diff --git a/web/src/lib/components/photos-page/actions/change-location-action.svelte b/web/src/lib/components/photos-page/actions/change-location-action.svelte index 057f16720e..7c4b4449be 100644 --- a/web/src/lib/components/photos-page/actions/change-location-action.svelte +++ b/web/src/lib/components/photos-page/actions/change-location-action.svelte @@ -21,7 +21,6 @@ .map((a) => a.id); try { - await api.assetApi.updateAssets({ assetBulkUpdateDto: { ids, diff --git a/web/src/lib/components/photos-page/asset-grid.svelte b/web/src/lib/components/photos-page/asset-grid.svelte index 2fbd7d01c6..1e5304e8e8 100644 --- a/web/src/lib/components/photos-page/asset-grid.svelte +++ b/web/src/lib/components/photos-page/asset-grid.svelte @@ -413,7 +413,6 @@ {/if} - diff --git a/web/src/lib/components/shared-components/change-location.svelte b/web/src/lib/components/shared-components/change-location.svelte index 8ee3fc2690..cfabe78657 100644 --- a/web/src/lib/components/shared-components/change-location.svelte +++ b/web/src/lib/components/shared-components/change-location.svelte @@ -29,6 +29,7 @@ }; const handleConfirm = () => { + if (!point) return; dispatch('confirm', point); }; @@ -37,8 +38,6 @@ confirmColor="primary" cancelColor="secondary" title="Change Location" - prompt="Please select a new location:" - disabled={!point} on:confirm={handleConfirm} on:cancel={handleCancel} > diff --git a/web/src/lib/components/shared-components/update-panel.svelte b/web/src/lib/components/shared-components/update-panel.svelte index b3ed1122b8..d43f43e24b 100644 --- a/web/src/lib/components/shared-components/update-panel.svelte +++ b/web/src/lib/components/shared-components/update-panel.svelte @@ -3,26 +3,24 @@ import type { AssetStore } from '$lib/stores/assets.store'; import { notificationController, NotificationType } from './notification/notification'; - export let assetStore: AssetStore | null; let assetUpdateCount = 0; let lastAssetName: string; let timeoutId: string | number | NodeJS.Timeout | undefined; - websocketStore.onAssetUpdate.subscribe(asset => { + websocketStore.onAssetUpdate.subscribe((asset) => { if (asset && asset.originalFileName && assetStore) { lastAssetName = asset.originalFileName; assetUpdateCount++; - assetStore.updateAsset(asset,true); + assetStore.updateAsset(asset, true); assetStore.removeAsset(asset.id); // Update timeline assetStore.addAsset(asset); - clearTimeout(timeoutId); + clearTimeout(timeoutId); timeoutId = setTimeout(() => { if (assetUpdateCount === 1) { - notificationController.show({ message: `Asset updated: ${lastAssetName}.`, type: NotificationType.Info, @@ -37,5 +35,4 @@ }, 500); } }); - - \ No newline at end of file + diff --git a/web/src/lib/stores/assets.store.ts b/web/src/lib/stores/assets.store.ts index add61979d7..635d6e7aae 100644 --- a/web/src/lib/stores/assets.store.ts +++ b/web/src/lib/stores/assets.store.ts @@ -73,10 +73,7 @@ export class AssetStore { assets: AssetResponseDto[] = []; albumAssets: Set = new Set(); - constructor( - options: AssetStoreOptions, - private albumId?: string, - ) { + constructor(options: AssetStoreOptions, private albumId?: string) { this.options = { ...options, size: TimeBucketSize.Month }; this.store$.set(this); } diff --git a/web/src/routes/(user)/photos/+page.svelte b/web/src/routes/(user)/photos/+page.svelte index f2b6a1bdec..e74a109b92 100644 --- a/web/src/routes/(user)/photos/+page.svelte +++ b/web/src/routes/(user)/photos/+page.svelte @@ -98,4 +98,4 @@ /> - \ No newline at end of file + diff --git a/web/src/routes/+layout.svelte b/web/src/routes/+layout.svelte index 041ccde046..928164bb67 100644 --- a/web/src/routes/+layout.svelte +++ b/web/src/routes/+layout.svelte @@ -5,7 +5,6 @@ import NavigationLoadingBar from '$lib/components/shared-components/navigation-loading-bar.svelte'; import DownloadPanel from '$lib/components/asset-viewer/download-panel.svelte'; import UploadPanel from '$lib/components/shared-components/upload-panel.svelte'; - import UpdatePanel from '$lib/components/shared-components/update-panel.svelte'; import NotificationList from '$lib/components/shared-components/notification/notification-list.svelte'; import VersionAnnouncementBox from '$lib/components/shared-components/version-announcement-box.svelte'; import type { LayoutData } from './$types'; diff --git a/web/src/routes/admin/user-management/+page.svelte b/web/src/routes/admin/user-management/+page.svelte index ee266289aa..09b3db7f78 100644 --- a/web/src/routes/admin/user-management/+page.svelte +++ b/web/src/routes/admin/user-management/+page.svelte @@ -181,8 +181,8 @@ isDeleted(user) ? 'bg-red-300 dark:bg-red-900' : i % 2 == 0 - ? 'bg-immich-gray dark:bg-immich-dark-gray/75' - : 'bg-immich-bg dark:bg-immich-dark-gray/50' + ? 'bg-immich-gray dark:bg-immich-dark-gray/75' + : 'bg-immich-bg dark:bg-immich-dark-gray/50' }`} > {user.email} @@ -247,8 +247,8 @@ isDeleted(user) ? 'bg-red-300 dark:bg-red-900' : i % 2 == 0 - ? 'bg-immich-gray dark:bg-immich-dark-gray/75' - : 'bg-immich-bg dark:bg-immich-dark-gray/50' + ? 'bg-immich-gray dark:bg-immich-dark-gray/75' + : 'bg-immich-bg dark:bg-immich-dark-gray/50' }`} > {user.name}