synced/webstudio
1
0
Fork 0
mirror of https://github.com/webstudio-is/webstudio.git synced 2025-03-14 09:57:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: render nothing on website when collection is invalid (#4821)

Browse Source 
User got 500 on published site. Turned out collection got invalid data
(not array). We need to keep site working in such cases, missing piece
will be more intuitive than 500 on whole website.
This commit is contained in:
Bogdan Chadkin
2025-02-03 06:47:00 +04:00
committed by GitHub
parent b9f84e723c
commit c5f15d2a1c
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml]._index.tsx generated
View File

@ -35,7 +35,7 @@ const Page = ({ system: system }: { system: any }) => {
tag={"urlset"}
xmlns={"http://www.sitemaps.org/schemas/sitemap/0.9"}
>
{sitemapxml?.data?.map((url: any, index: number) => (
{sitemapxml?.data?.map?.((url: any, index: number) => (
<Fragment key={index}>
<XmlNode tag={"url"}>
<XmlNode tag={"loc"}>

2
fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx generated
View File

@ -33,7 +33,7 @@ const Page = ({}: { system: any }) => {
let list = useResource("list_1");
return (
<Body className={`w-body`}>
{list?.data?.map((collectionItem: any, index: number) => (
{list?.data?.map?.((collectionItem: any, index: number) => (
<Fragment key={index}>
<Box className={`w-box`}>
<HtmlEmbed code={collectionItem?.name} className={`w-html-embed`} />

2
fixtures/webstudio-remix-vercel/app/__generated__/[sitemap.xml]._index.tsx generated
View File

@ -45,7 +45,7 @@ const Page = ({ system: system }: { system: any }) => {
path: "/olegs-test",
lastModified: "2024-05-07",
},
]?.map((url: any, index: number) => (
]?.map?.((url: any, index: number) => (
<Fragment key={index}>
<XmlNode tag={"url"}>
<XmlNode tag={"loc"}>

6
packages/react-sdk/src/component-generator.test.tsx
View File

@ -458,7 +458,7 @@ test("generate collection component as map", () => {
).toEqual(
validateJSX(
clear(`
{data?.map((element: any, index: number) =>
{data?.map?.((element: any, index: number) =>
<Fragment key={index}>
<Label />
<Button
@ -636,7 +636,7 @@ test("avoid generating collection parameter variable as state", () => {
const Page = () => {
let [data, set$data] = useVariableState<any>(["apple","orange","mango"])
return <Body>
{data?.map((element: any, index: number) =>
{data?.map?.((element: any, index: number) =>
<Fragment key={index}>
</Fragment>
)}
@ -854,7 +854,7 @@ let [condition, set$condition] = useVariableState<any>(false)
return <Body>
{(condition) &&
<>
{[]?.map((collectionItem: any, index: number) =>
{[]?.map?.((collectionItem: any, index: number) =>
<Fragment key={index}>
</Fragment>
)}

5
packages/react-sdk/src/component-generator.ts
View File

@ -251,8 +251,9 @@ export const generateJsxElement = ({
return "";
}
const indexVariable = scope.getName(`${instance.id}-index`, "index");
// fix implicit any error
generatedElement += `{${collectionDataValue}?.map((${collectionItemValue}: any, ${indexVariable}: number) =>\n`;
// collection can be nullable or invalid type
// fix implicitly on published sites
generatedElement += `{${collectionDataValue}?.map?.((${collectionItemValue}: any, ${indexVariable}: number) =>\n`;
generatedElement += `<Fragment key={${indexVariable}}>\n`;
generatedElement += children;
generatedElement += `</Fragment>\n`;