Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,13 @@ export function getAvailableInventoryQuantity(
return edges.find((edge) => edge?.node?.type === 'AVAILABLE')?.node?.quantity ?? 0;
}

// The catalog API still returns `PHOTO` for media created before the `IMAGE` type.
const imageMediaTypes: ReadonlySet<string> = new Set(['IMAGE', 'PHOTO']);

export function getImageUrls(item: MediaObjectContainer | null | undefined): string[] {
return (
item?.mediaObjects?.edges
?.filter((edge) => edge?.node?.type === 'IMAGE' && edge.node.url)
?.filter((edge) => imageMediaTypes.has(edge?.node?.type ?? '') && edge?.node?.url)
.map((edge) => edge?.node?.url)
.filter((url): url is string => Boolean(url)) ?? []
);
Expand Down
16 changes: 16 additions & 0 deletions packages/commerce-storefront/src/catalog-model.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { describe, expect, it } from 'vitest';
import {
getAvailableInventoryQuantity,
getImageUrls,
getLabeledSkuOptions,
getSingleMatchedSku,
type SKU,
Expand Down Expand Up @@ -47,4 +48,19 @@ describe('safe SKU selection', () => {
}),
).toBe(2);
});
it('treats legacy PHOTO media as images and skips other media', () => {
expect(
getImageUrls({
mediaObjects: {
edges: [
{ node: { type: 'PHOTO', url: '/legacy.jpg' } },
{ node: { type: 'VIDEO', url: '/clip.mp4' } },
{ node: { type: 'IMAGE', url: '/current.jpg' } },
{ node: { type: 'IMAGE', url: '' } },
null,
],
},
}),
).toEqual(['/legacy.jpg', '/current.jpg']);
});
});
5 changes: 4 additions & 1 deletion packages/commerce-storefront/src/catalog-model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,13 @@ export function getAvailableInventoryQuantity(
return edges.find((edge) => edge?.node?.type === 'AVAILABLE')?.node?.quantity ?? 0;
}

// The catalog API still returns `PHOTO` for media created before the `IMAGE` type.
const imageMediaTypes: ReadonlySet<string> = new Set(['IMAGE', 'PHOTO']);

export function getImageUrls(item: MediaObjectContainer | null | undefined): string[] {
return (
item?.mediaObjects?.edges
?.filter((edge) => edge?.node?.type === 'IMAGE' && edge.node.url)
?.filter((edge) => imageMediaTypes.has(edge?.node?.type ?? '') && edge?.node?.url)
.map((edge) => edge?.node?.url)
.filter((url): url is string => Boolean(url)) ?? []
);
Expand Down
Loading