From 14bcb9e1e4398e8211adfe6c14348ef8f3f5fce4 Mon Sep 17 00:00:00 2001 From: yannfrendo Date: Wed, 29 Nov 2023 17:03:19 +0100 Subject: [PATCH] Remove everything related to websocket --- server/src/domain/job/job.service.ts | 6 --- .../components/album-page/album-viewer.svelte | 2 - .../asset-viewer/detail-panel.svelte | 22 +++++------ .../actions/change-date-action.svelte | 5 ++- .../actions/change-location-action.svelte | 5 ++- .../shared-components/update-panel.svelte | 38 ------------------- .../(user)/albums/[albumId]/+page.svelte | 3 -- web/src/routes/(user)/archive/+page.svelte | 2 - web/src/routes/(user)/favorites/+page.svelte | 2 - .../(user)/partners/[userId]/+page.svelte | 3 -- web/src/routes/(user)/photos/+page.svelte | 2 - web/src/routes/(user)/trash/+page.svelte | 2 - 12 files changed, 18 insertions(+), 74 deletions(-) delete mode 100644 web/src/lib/components/shared-components/update-panel.svelte diff --git a/server/src/domain/job/job.service.ts b/server/src/domain/job/job.service.ts index 4735eb6b59..c923b7af40 100644 --- a/server/src/domain/job/job.service.ts +++ b/server/src/domain/job/job.service.ts @@ -172,12 +172,6 @@ export class JobService { }); case JobName.METADATA_EXTRACTION: - if (item.data.source === 'sidecar-write') { - const [asset] = await this.assetRepository.getByIds([item.data.id]); - if (asset) { - this.communicationRepository.send(CommunicationEvent.ASSET_UPDATE, asset.ownerId, mapAsset(asset)); - } - } await this.jobRepository.queue({ name: JobName.LINK_LIVE_PHOTOS, data: item.data }); break; diff --git a/web/src/lib/components/album-page/album-viewer.svelte b/web/src/lib/components/album-page/album-viewer.svelte index ba71c396d8..5b10ab1e87 100644 --- a/web/src/lib/components/album-page/album-viewer.svelte +++ b/web/src/lib/components/album-page/album-viewer.svelte @@ -20,7 +20,6 @@ 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'; export let sharedLink: SharedLinkResponseDto; export let user: UserResponseDto | undefined = undefined; @@ -168,5 +167,4 @@

- diff --git a/web/src/lib/components/asset-viewer/detail-panel.svelte b/web/src/lib/components/asset-viewer/detail-panel.svelte index 29b91a228b..2ac5c040a9 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, onDestroy } from 'svelte'; + import { createEventDispatcher } from 'svelte'; import { slide } from 'svelte/transition'; import { asByteUnitString } from '../../utils/byte-units'; import ImageThumbnail from '../assets/thumbnail/image-thumbnail.svelte'; @@ -22,10 +22,10 @@ } from '@mdi/js'; import Icon from '$lib/components/elements/icon.svelte'; import Map from '../shared-components/map/map.svelte'; - import { websocketStore } from '$lib/stores/websocket'; import { AppRoute } from '$lib/constants'; import ChangeLocation from '../shared-components/change-location.svelte'; import { handleError } from '../../utils/handle-error'; + import { notificationController, NotificationType } from '../shared-components/notification/notification'; export let asset: AssetResponseDto; export let albums: AlbumResponseDto[] = []; @@ -57,16 +57,6 @@ $: people = asset.people || []; - const unsubscribe = websocketStore.onAssetUpdate.subscribe((assetUpdate) => { - if (assetUpdate && assetUpdate.id === asset.id) { - asset = assetUpdate; - } - }); - - onDestroy(() => { - unsubscribe(); - }); - const dispatch = createEventDispatcher(); const getMegapixel = (width: number, height: number): number | undefined => { @@ -110,6 +100,10 @@ isShowChangeDate = false; try { await api.assetApi.updateAsset({ id: asset.id, updateAssetDto: { dateTimeOriginal } }); + notificationController.show({ + message: 'The date has been changed successfully, please reload to see the changes.', + type: NotificationType.Info, + }); } catch (error) { handleError(error, 'Unable to change date'); } @@ -128,6 +122,10 @@ longitude: gps.lng, }, }); + notificationController.show({ + message: 'The location has been changed successfully, please reload to see the changes.', + type: NotificationType.Info, + }); } catch (error) { handleError(error, 'Unable to change location'); } diff --git a/web/src/lib/components/photos-page/actions/change-date-action.svelte b/web/src/lib/components/photos-page/actions/change-date-action.svelte index df630ed430..76120a9141 100644 --- a/web/src/lib/components/photos-page/actions/change-date-action.svelte +++ b/web/src/lib/components/photos-page/actions/change-date-action.svelte @@ -24,7 +24,10 @@ await api.assetApi.updateAssets({ assetBulkUpdateDto: { ids, dateTimeOriginal }, }); - notificationController.show({ message: 'Updating date please wait', type: NotificationType.Info }); + notificationController.show({ + message: 'Updating date you can reload to see change', + type: NotificationType.Info, + }); } catch (error) { handleError(error, 'Unable to change date'); } 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 7c4b4449be..6dfc96d130 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 @@ -28,7 +28,10 @@ longitude: point.lng, }, }); - notificationController.show({ message: 'Updating location please wait', type: NotificationType.Info }); + notificationController.show({ + message: 'Updating location you can reload to see change', + type: NotificationType.Info, + }); } catch (error) { handleError(error, 'Unable to update location'); } diff --git a/web/src/lib/components/shared-components/update-panel.svelte b/web/src/lib/components/shared-components/update-panel.svelte deleted file mode 100644 index 47a5c36b6c..0000000000 --- a/web/src/lib/components/shared-components/update-panel.svelte +++ /dev/null @@ -1,38 +0,0 @@ - diff --git a/web/src/routes/(user)/albums/[albumId]/+page.svelte b/web/src/routes/(user)/albums/[albumId]/+page.svelte index a162164532..585de03e78 100644 --- a/web/src/routes/(user)/albums/[albumId]/+page.svelte +++ b/web/src/routes/(user)/albums/[albumId]/+page.svelte @@ -58,7 +58,6 @@ import ActivityStatus from '$lib/components/asset-viewer/activity-status.svelte'; import { numberOfComments, setNumberOfComments, updateNumberOfComments } from '$lib/stores/activity.store'; import AlbumOptions from '$lib/components/album-page/album-options.svelte'; - import UpdatePanel from '$lib/components/shared-components/update-panel.svelte'; export let data: PageData; @@ -755,5 +754,3 @@ on:save={({ detail: description }) => handleUpdateDescription(description)} /> {/if} - - diff --git a/web/src/routes/(user)/archive/+page.svelte b/web/src/routes/(user)/archive/+page.svelte index 08f081ebd0..845d36619c 100644 --- a/web/src/routes/(user)/archive/+page.svelte +++ b/web/src/routes/(user)/archive/+page.svelte @@ -16,7 +16,6 @@ import { AssetStore } from '$lib/stores/assets.store'; import type { PageData } from './$types'; import { mdiPlus, mdiDotsVertical } from '@mdi/js'; - import UpdatePanel from '$lib/components/shared-components/update-panel.svelte'; export let data: PageData; @@ -53,4 +52,3 @@ /> - diff --git a/web/src/routes/(user)/favorites/+page.svelte b/web/src/routes/(user)/favorites/+page.svelte index b586e985a8..d335fe67c6 100644 --- a/web/src/routes/(user)/favorites/+page.svelte +++ b/web/src/routes/(user)/favorites/+page.svelte @@ -18,7 +18,6 @@ import { AssetStore } from '$lib/stores/assets.store'; import type { PageData } from './$types'; import { mdiDotsVertical, mdiPlus } from '@mdi/js'; - import UpdatePanel from '$lib/components/shared-components/update-panel.svelte'; export let data: PageData; @@ -58,4 +57,3 @@ /> - diff --git a/web/src/routes/(user)/partners/[userId]/+page.svelte b/web/src/routes/(user)/partners/[userId]/+page.svelte index 9e645cb668..6c4a6e2984 100644 --- a/web/src/routes/(user)/partners/[userId]/+page.svelte +++ b/web/src/routes/(user)/partners/[userId]/+page.svelte @@ -13,8 +13,6 @@ import { onDestroy } from 'svelte'; import type { PageData } from './$types'; import { mdiPlus, mdiArrowLeft } from '@mdi/js'; - import UpdatePanel from '$lib/components/shared-components/update-panel.svelte'; - export let data: PageData; const assetStore = new AssetStore({ userId: data.partner.id, isArchived: false, withStacked: true }); @@ -46,5 +44,4 @@ {/if} - diff --git a/web/src/routes/(user)/photos/+page.svelte b/web/src/routes/(user)/photos/+page.svelte index e74a109b92..dace52cb86 100644 --- a/web/src/routes/(user)/photos/+page.svelte +++ b/web/src/routes/(user)/photos/+page.svelte @@ -23,7 +23,6 @@ import type { PageData } from './$types'; import { assetViewingStore } from '$lib/stores/asset-viewing.store'; import { mdiDotsVertical, mdiPlus } from '@mdi/js'; - import UpdatePanel from '$lib/components/shared-components/update-panel.svelte'; export let data: PageData; @@ -98,4 +97,3 @@ /> - diff --git a/web/src/routes/(user)/trash/+page.svelte b/web/src/routes/(user)/trash/+page.svelte index 848f2f76ea..5926f4b6a7 100644 --- a/web/src/routes/(user)/trash/+page.svelte +++ b/web/src/routes/(user)/trash/+page.svelte @@ -23,7 +23,6 @@ import empty3Url from '$lib/assets/empty-3.svg'; import ConfirmDialogue from '$lib/components/shared-components/confirm-dialogue.svelte'; import { mdiDeleteOutline, mdiHistory } from '@mdi/js'; - import UpdatePanel from '$lib/components/shared-components/update-panel.svelte'; export let data: PageData; @@ -114,4 +113,3 @@ {/if} -