Skip to content

fix: prevent 404 on lightbox bound to multi-image field #485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tristan-mouchet merged 1 commit into from
Aug 3, 2026
Merged

fix: prevent 404 on lightbox bound to multi-image field #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions lib/asset-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -899,12 +899,11 @@ export function collectLayerAssetIds(
const linkAssetId = layer.variables?.link?.asset?.id;
addAssetId(linkAssetId);

// Lightbox file assets
if (layer.settings?.lightbox?.files) {
// Lightbox file assets (addAssetId guards non-string/non-UUID values,
// so nested arrays or external URLs are safely ignored)
if (Array.isArray(layer.settings?.lightbox?.files)) {
for (const fileId of layer.settings.lightbox.files) {
if (fileId && !fileId.startsWith('http') && !fileId.startsWith('/')) {
addAssetId(fileId);
}
addAssetId(fileId);
}
}

Expand Down
12 changes: 5 additions & 7 deletions lib/page-fetcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1443,14 +1443,12 @@ async function injectCollectionData(
// Lightbox CMS field binding — resolve filesField to concrete asset IDs/URLs
const lightboxSettings = layer.settings?.lightbox;
if (lightboxSettings?.filesSource === 'cms' && lightboxSettings.filesField && isFieldVariable(lightboxSettings.filesField)) {
const resolvedValue = resolveFieldValueWithRelationships(lightboxSettings.filesField, enhancedValues, layerDataMap);
// Multi-image fields resolve to an array (or JSON-encoded array); single-image
// fields resolve to a plain asset ID/URL, optionally comma-separated.
const resolvedValue = resolveFieldValueWithRelationships(lightboxSettings.filesField, enhancedValues, layerDataMap) as string | string[] | undefined;
if (resolvedValue) {
// The value can be a single asset ID, a comma-separated list, or a JSON array
let resolvedFiles: string[];
try {
const parsed = JSON.parse(resolvedValue);
resolvedFiles = Array.isArray(parsed) ? parsed : [resolvedValue];
} catch {
let resolvedFiles = parseMultiAssetFieldValue(resolvedValue);
if (resolvedFiles.length === 0 && typeof resolvedValue === 'string') {
resolvedFiles = resolvedValue.includes(',')
? resolvedValue.split(',').map(s => s.trim()).filter(Boolean)
: [resolvedValue];
Expand Down