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): isolate reload errors and reject stale upload targets

Timothy Yinc3241d36b1aa
diff --git a/apps/cloud/app/components/CloudSiteWorkspace.vue b/apps/cloud/app/components/CloudSiteWorkspace.vue
index 9be298fa..bfff1d50 100644
--- a/apps/cloud/app/components/CloudSiteWorkspace.vue
+++ b/apps/cloud/app/components/CloudSiteWorkspace.vue
@@ -21,12 +21,12 @@ const status = computed(() => (loading.value ? 'pending' : 'success'))
:status="status"
>
<CloudAlert
- v-if="message"
- :tone="failed ? 'error' : 'info'"
+ class="mb-4"
+ v-if="loadError"
+ tone="error"
>
- {{ message
+ {{ loadError
}}<CloudButton
- v-if="loadError"
size="sm"
variant="secondary"
:loading="loading"
@@ -34,6 +34,12 @@ const status = computed(() => (loading.value ? 'pending' : 'success'))
>{{ $t('cloud.messages.retry') }}</CloudButton
>
</CloudAlert>
+ <CloudAlert
+ class="mb-4"
+ v-if="message && message !== loadError"
+ :tone="failed ? 'error' : 'info'"
+ >{{ message }}</CloudAlert
+ >
<slot /><CloudUploadDrawer
/></PhotosProvider>
</template>
diff --git a/apps/cloud/app/composables/useCloudSiteMedia.ts b/apps/cloud/app/composables/useCloudSiteMedia.ts
index 8b6ed5fa..8026c7ba 100644
--- a/apps/cloud/app/composables/useCloudSiteMedia.ts
+++ b/apps/cloud/app/composables/useCloudSiteMedia.ts
@@ -136,16 +136,13 @@ export function useCloudMediaWorkspace(props: {
message.value = ''
}
loadError.value = ''
- if (
- !connectionId.value ||
- connections.value.find((c) => c.id === connectionId.value)
- ?.uploads_enabled === 0 ||
- (!u.byosLimits?.byos &&
- !s.connections.find((c) => c.id === connectionId.value)?.pool_id)
+ canPoll.value = true
+ const uploadTargets = s.connections.filter(
+ (c) => c.uploads_enabled !== 0 && (c.pool_id || u.byosLimits?.byos),
)
+ if (!uploadTargets.some((c) => c.id === connectionId.value))
connectionId.value =
- s.connections.find((c) => c.pool_id && c.uploads_enabled !== 0)?.id ??
- (u.byosLimits?.byos ? (s.connections[0]?.id ?? '') : '')
+ uploadTargets.find((c) => c.pool_id)?.id ?? uploadTargets[0]?.id ?? ''
} catch (error) {
if (
generation !== reloadGeneration ||
diff --git a/apps/cloud/app/utils/quota-gate.ts b/apps/cloud/app/utils/quota-gate.ts
index f8adf222..94348be0 100644
--- a/apps/cloud/app/utils/quota-gate.ts
+++ b/apps/cloud/app/utils/quota-gate.ts
@@ -46,6 +46,8 @@ export function uploadQuotaGate(
const candidates = connections
.filter((c) => c.uploads_enabled !== 0)
.sort((a, b) => Number(b.id === selected) - Number(a.id === selected))
+ if (selected && !candidates.length)
+ return { allowed: false, reason: 'storage', connectionId: '' }
const targets = candidates.length
? candidates
: [{ id: '', pool_id: 'platform' }]
diff --git a/apps/cloud/i18n/locales/en.json b/apps/cloud/i18n/locales/en.json
index 4d80b7db..bc41bbeb 100644
--- a/apps/cloud/i18n/locales/en.json
+++ b/apps/cloud/i18n/locales/en.json
@@ -748,7 +748,8 @@
"processingHealthy": "Media processing is up to date",
"storagePending": "Storage not connected",
"publicationHelp": "Publishing does not require photographs or a storage connection.",
- "actions": "Actions"
+ "actions": "Actions",
+ "quota_storage": "No upload-enabled storage connection is available. Review your site’s storage settings."
}
}
}
diff --git a/apps/cloud/i18n/locales/zh-Hans.json b/apps/cloud/i18n/locales/zh-Hans.json
index ae73b074..fec566d5 100644
--- a/apps/cloud/i18n/locales/zh-Hans.json
+++ b/apps/cloud/i18n/locales/zh-Hans.json
@@ -748,7 +748,8 @@
"processingHealthy": "媒体处理状态正常",
"storagePending": "尚未连接存储",
"publicationHelp": "无需先上传照片或配置存储,即可发布站点。",
- "actions": "操作"
+ "actions": "操作",
+ "quota_storage": "暂无可用于上传的存储连接,请检查站点的存储设置。"
}
}
}
diff --git a/tests/console-quota.test.ts b/tests/console-quota.test.ts
index fc40b83a..f8616b6c 100644
--- a/tests/console-quota.test.ts
+++ b/tests/console-quota.test.ts
@@ -85,3 +85,25 @@ test('Upload preflight finds an eligible alternative without trapping users on a
delete connections[1]!.uploads_enabled
assert.equal(uploadQuotaGate(data, connections, 'pool').allowed, false)
})
+
+test('Upload preflight denies stale or disabled explicit targets while retaining unconfigured storage guidance', () => {
+ const data = {
+ workspace: { role: 'admin' },
+ plan: {
+ limits: {
+ photos: 10,
+ storageBytes: 100,
+ monthlyBytes: 100,
+ fileBytes: 10,
+ },
+ },
+ usage: {},
+ }
+ assert.equal(uploadQuotaGate(data, [], 'removed-target').allowed, false)
+ assert.equal(
+ uploadQuotaGate(data, [{ id: 'disabled', uploads_enabled: 0 }], 'disabled')
+ .reason,
+ 'storage',
+ )
+ assert.equal(uploadQuotaGate(data, []).allowed, true)
+})