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): distinguish disabled storage from unconfigured storage

Timothy Yinede1f3b7e3a4
diff --git a/apps/cloud/app/components/CloudUploadDrawer.vue b/apps/cloud/app/components/CloudUploadDrawer.vue
index 49459e97..3b72833b 100644
--- a/apps/cloud/app/components/CloudUploadDrawer.vue
+++ b/apps/cloud/app/components/CloudUploadDrawer.vue
@@ -22,7 +22,9 @@ const quota = useCloudQuota(context?.workspaceId)
const selectedAdmission = computed(() =>
uploadQuotaGate(
quota.data.value,
- connections.value.filter((c) => c.id === connectionId.value),
+ connectionId.value
+ ? connections.value.filter((c) => c.id === connectionId.value)
+ : connections.value,
connectionId.value,
),
)
@@ -109,9 +111,7 @@ async function dropFiles(event: DragEvent) {
{{ $t('cloud.storageAllowance.unavailable') }}
</p>
<CloudQuotaNotice
- v-if="
- connectionId && (!selectedAdmission.allowed || quota.error.value)
- "
+ v-if="!selectedAdmission.allowed || quota.error.value"
:reason="selectedAdmission.reason"
:error="!!quota.error.value"
@retry="quota.refresh()"
diff --git a/apps/cloud/app/utils/quota-gate.ts b/apps/cloud/app/utils/quota-gate.ts
index 94348be0..47f1d2fc 100644
--- a/apps/cloud/app/utils/quota-gate.ts
+++ b/apps/cloud/app/utils/quota-gate.ts
@@ -46,7 +46,7 @@ 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)
+ if ((selected || connections.length) && !candidates.length)
return { allowed: false, reason: 'storage', connectionId: '' }
const targets = candidates.length
? candidates
diff --git a/tests/console-quota.test.ts b/tests/console-quota.test.ts
index f8616b6c..377f2586 100644
--- a/tests/console-quota.test.ts
+++ b/tests/console-quota.test.ts
@@ -105,5 +105,9 @@ test('Upload preflight denies stale or disabled explicit targets while retaining
.reason,
'storage',
)
+ assert.equal(
+ uploadQuotaGate(data, [{ id: 'disabled', uploads_enabled: 0 }]).reason,
+ 'storage',
+ )
assert.equal(uploadQuotaGate(data, []).allowed, true)
})