Skip to content

Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.

fix(cloud): restore inline domain retry and fix toast dedupe

Timothy Yinc1f5d801af7f
diff --git a/apps/cloud/app/components/CloudSitePublication.vue b/apps/cloud/app/components/CloudSitePublication.vue
index e513dc40..5b2e18bb 100644
--- a/apps/cloud/app/components/CloudSitePublication.vue
+++ b/apps/cloud/app/components/CloudSitePublication.vue
@@ -60,20 +60,6 @@ async function copyAddress() {
})
}
}
-watch(
- domainError,
- (err) => {
- if (err)
- toast.add({
- title: t('cloud.domains.loadFailed'),
- color: 'error',
- actions: [
- { label: t('cloud.messages.retry'), onClick: () => refreshDomains() },
- ],
- })
- },
- { immediate: true },
-)
async function unpublish() {
await publish(false)
if (!context.value?.published) unpublishOpen.value = false
@@ -128,6 +114,19 @@ async function unpublish() {
>
{{ $t('cloud.domains.routingPending') }}
</p>
+ <CfAlert
+ v-if="domainError"
+ tone="error"
+ >{{ $t('cloud.domains.loadFailed')
+ }}<template #actions
+ ><CfButton
+ size="sm"
+ variant="secondary"
+ @click="refreshDomains()"
+ >{{ $t('cloud.messages.retry') }}</CfButton
+ ></template
+ ></CfAlert
+ >
<div class="cf-site-address-block">
<div
v-if="address"
diff --git a/apps/cloud/app/composables/useCloudSiteMedia.ts b/apps/cloud/app/composables/useCloudSiteMedia.ts
index 02896c4b..6abcf8d9 100644
--- a/apps/cloud/app/composables/useCloudSiteMedia.ts
+++ b/apps/cloud/app/composables/useCloudSiteMedia.ts
@@ -174,13 +174,14 @@ export function useCloudMediaWorkspace(props: {
)
return
failed.value = true
- message.value =
+ const text =
(error as { statusCode?: number }).statusCode === 503
? t(
'cloud.messages.mediaServicesNeedDeploymentConfigurationYourExistingSiteSettings',
)
: t('cloud.messages.couldNotRefreshMediaCheckYourAccessAndRetry')
- loadError.value = message.value
+ loadError.value = text
+ message.value = text
canPoll.value = false
} finally {
if (generation === reloadGeneration) loading.value = false
@@ -397,6 +398,7 @@ export function useCloudMediaWorkspace(props: {
)
if (unavailable && hasNewFiles) {
failed.value = true
+ message.value = ''
message.value = t('cloud.transfer.albumsUnavailable')
input.value = ''
return
@@ -404,6 +406,7 @@ export function useCloudMediaWorkspace(props: {
}
} catch {
failed.value = true
+ message.value = ''
message.value = t('cloud.transfer.albumsCheckFailed')
input.value = ''
return