Merge branch 'main' into universal-films

This commit is contained in:
Sam Becker 2025-03-29 23:54:15 -05:00
commit 4441ab2b72
3 changed files with 5 additions and 5 deletions

View File

@ -15,7 +15,7 @@ export const generateStaticParams = staticallyGenerateCategoryIfConfigured(
'cameras',
'image',
getUniqueCameras,
cameras => cameras.map(({ camera }) => camera),
cameras => cameras.map(({ camera }) => formatCameraParams(camera)),
);
export async function GET(

View File

@ -1,5 +1,5 @@
import { Metadata } from 'next/types';
import { CameraProps } from '@/camera';
import { CameraProps, formatCameraParams } from '@/camera';
import { generateMetaForCamera } from '@/camera/meta';
import { INFINITE_SCROLL_GRID_INITIAL } from '@/photo';
import { getPhotosCameraDataCached } from '@/camera/data';
@ -21,7 +21,7 @@ export const generateStaticParams = staticallyGenerateCategoryIfConfigured(
'cameras',
'page',
getUniqueCameras,
cameras => cameras.map(({ camera }) => camera),
cameras => cameras.map(({ camera }) => formatCameraParams(camera)),
);
export async function generateMetadata({

View File

@ -51,8 +51,8 @@ export const safelyGenerateLensStaticParams = (
lenses: Lenses,
) =>
lenses.map(({ lens: { make, model } }) => ({
make: make ?? MISSING_FIELD,
model,
make: make ? parameterize(make) : MISSING_FIELD,
model: parameterize(model),
}));
// Support keys for make-only and model-only lens queries