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): resolve fresh Site catalogs at navigation boundaries

HoshinoSuzumiBotb7bda7764b7e
diff --git a/apps/cloud/app/middleware/platform.global.ts b/apps/cloud/app/middleware/platform.global.ts
index a9de182e..f71a3ae9 100644
--- a/apps/cloud/app/middleware/platform.global.ts
+++ b/apps/cloud/app/middleware/platform.global.ts
@@ -1,7 +1,16 @@
+import type {
+ EntrySiteCatalog,
+ EntrySiteSummary,
+} from '@chronoframe/contracts/entry'
export default defineNuxtRouteMiddleware(async (to) => {
const path = to.path.toLowerCase()
const context = useEntryContext()
context.value = null
+ const catalog = useState<EntrySiteCatalog | null>(
+ 'platform-site-catalog',
+ () => null,
+ )
+ catalog.value = null
if (path === '/' && useRequestURL().hostname === 'app.chronoframe.art')
return navigateTo('/sites', { redirectCode: 302 })
if (path === '/dashboard' || path.startsWith('/dashboard/'))
@@ -20,6 +29,10 @@ export default defineNuxtRouteMiddleware(async (to) => {
session.user?.id ?? null
if (!session.authenticated)
return navigateTo('/signin', { redirectCode: 302 })
+ if (path === '/sites') {
+ const result = await fetcher<{ sites: EntrySiteSummary[] }>('/api/sites')
+ catalog.value = { userId: session.user!.id, sites: result.sites }
+ }
if (path !== '/sites') {
const match = /^\/sites\/([1-9][0-9]*)$/.exec(path)
if (!match)
diff --git a/apps/cloud/app/pages/account.vue b/apps/cloud/app/pages/account.vue
index 6f8d303a..4ff1be2f 100644
--- a/apps/cloud/app/pages/account.vue
+++ b/apps/cloud/app/pages/account.vue
@@ -6,6 +6,8 @@ async function signOut() {
await $fetch('/api/auth/logout', { method: 'POST' })
clearNuxtData()
useEntryContext().value = null
+ useState('platform-site-catalog').value = null
+ useState('platform-user-id').value = null
useSettingsStore().$reset()
await navigateTo('/signin')
}
diff --git a/apps/cloud/app/pages/sites/index.vue b/apps/cloud/app/pages/sites/index.vue
index 9fc75c11..bd633485 100644
--- a/apps/cloud/app/pages/sites/index.vue
+++ b/apps/cloud/app/pages/sites/index.vue
@@ -1,30 +1,24 @@
<script setup lang="ts">
+import type { EntrySiteCatalog } from '@chronoframe/contracts/entry'
useSeoMeta({ title: 'Your sites — ChronoFrame', robots: 'noindex' })
const userId = useState<number | null>('platform-user-id', () => null)
-const { data, error, refresh } = await useFetch('/api/sites', {
- key: computed(() => `platform-sites:${userId.value}`),
- getCachedData: () => undefined,
- immediate: false,
- cache: 'no-store',
-})
-// Nuxt can retain a live AsyncData ref even when payload cache reuse is disabled.
-// Always finish a fresh membership query before rendering the catalog.
-await refresh({ dedupe: 'cancel' })
-if (error.value)
- throw createError({
- statusCode: error.value.statusCode ?? 503,
- statusMessage: 'Unable to load sites',
- })
+const catalog = useState<EntrySiteCatalog | null>(
+ 'platform-site-catalog',
+ () => null,
+)
+const sites = computed(() =>
+ catalog.value?.userId === userId.value ? catalog.value.sites : [],
+)
</script>
<template>
<main class="cloud-message">
<h1>Your sites</h1>
<ul
- v-if="data?.sites.length"
+ v-if="sites.length"
class="space-y-4"
>
<li
- v-for="site in data.sites"
+ v-for="site in sites"
:key="site.siteId"
>
<NuxtLink :to="`/sites/${site.siteId}`">{{ site.name }}</NuxtLink>
diff --git a/packages/contracts/src/entry.ts b/packages/contracts/src/entry.ts
index 63b7da11..a3fd584f 100644
--- a/packages/contracts/src/entry.ts
+++ b/packages/contracts/src/entry.ts
@@ -63,3 +63,15 @@ export function entryRequestPath(
: '/api/public'
return prefix + path.slice(4)
}
+
+export interface EntrySiteSummary {
+ siteId: number
+ workspaceId: number
+ name: string
+ published: boolean
+ role: 'admin' | 'member'
+}
+export interface EntrySiteCatalog {
+ userId: number
+ sites: EntrySiteSummary[]
+}
diff --git a/scripts/smoke-edge-entry.mjs b/scripts/smoke-edge-entry.mjs
index 6461bd53..2dd42df9 100644
--- a/scripts/smoke-edge-entry.mjs
+++ b/scripts/smoke-edge-entry.mjs
@@ -82,10 +82,9 @@ try {
)
const html = await home.text()
if (!portalOrigin)
- assert.ok(
- html.includes(
- entry === 'cloud' ? 'A home for the moments' : 'Service unavailable',
- ),
+ assert.match(
+ html,
+ entry === 'cloud' ? /A home for the moments/ : /service unavailable/i,
)
if (entry === 'cloud') {
assert.equal((await fetch(base + '/signin')).status, 200)