From 305889f32bbf89969f1433662729ac3d471a6cb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Skyler=20M=C3=A4ntysaari?= Date: Sun, 27 Aug 2023 07:31:52 +0300 Subject: [PATCH] chore(web): Fixing up missing awaits (#3882) * chore(web): Fixing up some missing awaits. * chore(web/shared-viewer): Update import to shorted version. --- .../lib/components/asset-viewer/asset-viewer.svelte | 12 ++++++------ .../lib/components/asset-viewer/video-viewer.svelte | 4 ++-- .../components/forms/admin-registration-form.svelte | 2 +- web/src/lib/components/forms/login-form.svelte | 2 +- .../share-page/individual-shared-viewer.svelte | 4 ++-- .../routes/(user)/sharing/sharedlinks/+page.svelte | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/web/src/lib/components/asset-viewer/asset-viewer.svelte b/web/src/lib/components/asset-viewer/asset-viewer.svelte index 83a47b1ce..209eb999f 100644 --- a/web/src/lib/components/asset-viewer/asset-viewer.svelte +++ b/web/src/lib/components/asset-viewer/asset-viewer.svelte @@ -58,7 +58,7 @@ document.addEventListener('keydown', onKeyboardPress); if (!sharedLink) { - getAllAlbums(); + await getAllAlbums(); } // Import hack :( see https://github.com/vadimkorr/svelte-carousel/issues/27#issuecomment-851022295 @@ -136,7 +136,7 @@ if (hasNext) { progressBar.restart(true); } else { - handleStopSlideshow(); + await handleStopSlideshow(); } } @@ -165,7 +165,7 @@ }, }); - navigateAssetForward(); + await navigateAssetForward(); for (const asset of deletedAssets) { if (asset.status == 'SUCCESS') { @@ -201,7 +201,7 @@ message: asset.isFavorite ? `Added to favorites` : `Removed from favorites`, }); } catch (error) { - handleError(error, `Unable to ${asset.isFavorite ? `add asset to` : `remove asset from`} favorites`); + await handleError(error, `Unable to ${asset.isFavorite ? `add asset to` : `remove asset from`} favorites`); } }; @@ -258,7 +258,7 @@ message: asset.isArchived ? `Added to archive` : `Removed from archive`, }); } catch (error) { - handleError(error, `Unable to ${asset.isArchived ? `add asset to` : `remove asset from`} archive`); + await handleError(error, `Unable to ${asset.isArchived ? `add asset to` : `remove asset from`} archive`); } }; @@ -278,7 +278,7 @@ await api.assetApi.runAssetJobs({ assetJobsDto: { assetIds: [asset.id], name } }); notificationController.show({ type: NotificationType.Info, message: api.getAssetJobMessage(name) }); } catch (error) { - handleError(error, `Unable to submit job`); + await handleError(error, `Unable to submit job`); } }; diff --git a/web/src/lib/components/asset-viewer/video-viewer.svelte b/web/src/lib/components/asset-viewer/video-viewer.svelte index af58f6d82..95b7663d4 100644 --- a/web/src/lib/components/asset-viewer/video-viewer.svelte +++ b/web/src/lib/components/asset-viewer/video-viewer.svelte @@ -4,7 +4,7 @@ import { createEventDispatcher } from 'svelte'; import { videoViewerVolume } from '$lib/stores/preferences.store'; import LoadingSpinner from '../shared-components/loading-spinner.svelte'; - import { handleError } from '../../utils/handle-error'; + import { handleError } from '$lib/utils/handle-error'; export let assetId: string; @@ -19,7 +19,7 @@ video.muted = false; dispatch('onVideoStarted'); } catch (error) { - handleError(error, 'Unable to play video'); + await handleError(error, 'Unable to play video'); } finally { isVideoLoading = false; } diff --git a/web/src/lib/components/forms/admin-registration-form.svelte b/web/src/lib/components/forms/admin-registration-form.svelte index c18e2c8a8..6d3902a46 100644 --- a/web/src/lib/components/forms/admin-registration-form.svelte +++ b/web/src/lib/components/forms/admin-registration-form.svelte @@ -40,7 +40,7 @@ }); if (status === 201) { - goto(AppRoute.AUTH_LOGIN); + await goto(AppRoute.AUTH_LOGIN); return; } else { error = 'Error create admin account'; diff --git a/web/src/lib/components/forms/login-form.svelte b/web/src/lib/components/forms/login-form.svelte index d9b8dfa2f..8ededa6b7 100644 --- a/web/src/lib/components/forms/login-form.svelte +++ b/web/src/lib/components/forms/login-form.svelte @@ -45,7 +45,7 @@ } } catch (error) { authConfig.passwordLoginEnabled = true; - handleError(error, 'Unable to connect!'); + await handleError(error, 'Unable to connect!'); } oauthLoading = false; diff --git a/web/src/lib/components/share-page/individual-shared-viewer.svelte b/web/src/lib/components/share-page/individual-shared-viewer.svelte index d36203bbc..69a149da6 100644 --- a/web/src/lib/components/share-page/individual-shared-viewer.svelte +++ b/web/src/lib/components/share-page/individual-shared-viewer.svelte @@ -16,7 +16,7 @@ import SelectAll from 'svelte-material-icons/SelectAll.svelte'; import ImmichLogo from '../shared-components/immich-logo.svelte'; import { notificationController, NotificationType } from '../shared-components/notification/notification'; - import { handleError } from '../../utils/handle-error'; + import { handleError } from '$lib/utils/handle-error'; export let sharedLink: SharedLinkResponseDto; export let isOwned: boolean; @@ -60,7 +60,7 @@ type: NotificationType.Info, }); } catch (e) { - handleError(e, 'Unable to add assets to shared link'); + await handleError(e, 'Unable to add assets to shared link'); } }; diff --git a/web/src/routes/(user)/sharing/sharedlinks/+page.svelte b/web/src/routes/(user)/sharing/sharedlinks/+page.svelte index 8db99f2e5..942a9b0eb 100644 --- a/web/src/routes/(user)/sharing/sharedlinks/+page.svelte +++ b/web/src/routes/(user)/sharing/sharedlinks/+page.svelte @@ -37,14 +37,14 @@ await api.sharedLinkApi.removeSharedLink({ id: deleteLinkId }); notificationController.show({ message: 'Deleted shared link', type: NotificationType.Info }); deleteLinkId = null; - refresh(); + await refresh(); } catch (error) { - handleError(error, 'Unable to delete shared link'); + await handleError(error, 'Unable to delete shared link'); } }; const handleEditDone = async () => { - refresh(); + await refresh(); editSharedLink = null; };