Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
Drop instances checks from form server logic (#2264)
Bogdan Chadkin544db22b14b8
diff --git a/fixtures/webstudio-remix-vercel/app/routes/_index.tsx b/fixtures/webstudio-remix-vercel/app/routes/_index.tsxindex 70218710dd..a636b2902e 100644--- a/fixtures/webstudio-remix-vercel/app/routes/_index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/_index.tsx@@ -77,11 +77,7 @@ const getMethod = (value: string | undefined) => {export const action = async ({ request, context }: ActionArgs) => {const formData = await request.formData();- const formProperties = getFormProperties(- formData,- pageData.build.instances,- pageData.build.props- );+ const formProperties = getFormProperties(formData, pageData.build.props);if (formProperties === undefined) {// We're throwing rather than returning { success: false }diff --git a/packages/cli/src/__generated__/router.ts b/packages/cli/src/__generated__/router.tsindex d98b133b1b..d4f7bd28b9 100644--- a/packages/cli/src/__generated__/router.ts+++ b/packages/cli/src/__generated__/router.ts@@ -87,11 +87,7 @@ const getMethod = (value: string | undefined) => {export const action = async ({ request, context }: ActionArgs) => {const formData = await request.formData();- const formProperties = getFormProperties(- formData,- pageData.build.instances,- pageData.build.props- );+ const formProperties = getFormProperties(formData, pageData.build.props);if (formProperties === undefined) {// We're throwing rather than returning { success: false }diff --git a/packages/cli/templates/route-template.tsx b/packages/cli/templates/route-template.tsxindex 5de2214fba..ef53aa889a 100644--- a/packages/cli/templates/route-template.tsx+++ b/packages/cli/templates/route-template.tsx@@ -77,11 +77,7 @@ const getMethod = (value: string | undefined) => {export const action = async ({ request, context }: ActionArgs) => {const formData = await request.formData();- const formProperties = getFormProperties(- formData,- pageData.build.instances,- pageData.build.props- );+ const formProperties = getFormProperties(formData, pageData.build.props);if (formProperties === undefined) {// We're throwing rather than returning { success: false }diff --git a/packages/form-handlers/src/index.ts b/packages/form-handlers/src/index.tsindex 5d0dc3cccb..6eba579725 100644--- a/packages/form-handlers/src/index.ts+++ b/packages/form-handlers/src/index.ts@@ -3,7 +3,6 @@ export {formIdFieldName,formHiddenFieldPrefix,getFormId,- hasMatchingForm,getFormProperties,type EmailInfo,type FormInfo,diff --git a/packages/form-handlers/src/shared.ts b/packages/form-handlers/src/shared.tsindex 37dbb6d14d..a6633d747d 100644--- a/packages/form-handlers/src/shared.ts+++ b/packages/form-handlers/src/shared.ts@@ -1,4 +1,4 @@-import type { Instance, Prop } from "@webstudio-is/sdk";+import type { Prop } from "@webstudio-is/sdk";export const formHiddenFieldPrefix = "ws--form";export const formIdFieldName = `${formHiddenFieldPrefix}-id`;@@ -111,29 +111,8 @@ export const getErrors = (}};-/** Checks that `formData` corresponds to a form in the `instances` tree */-export const hasMatchingForm = (- formData: FormData,- instances: [Instance["id"], Instance][]-) => {- const formId = getFormId(formData);-- if (formId === undefined) {- return false;- }-- return instances.some(- ([, instance]) => instance.id === formId && instance.component === "Form"- );-- // @todo:- // We could also check that each entry in formData has a corresponding input control in the tree,- // but that seem like an overkill for now.-};-export const getFormProperties = (formData: FormData,- instances: [Instance["id"], Instance][],props: [Prop["id"], Prop][]) => {const formId = getFormId(formData);@@ -142,14 +121,6 @@ export const getFormProperties = (return undefined;}- const hasForm = instances.some(- ([, instance]) => instance.id === formId && instance.component === "Form"- );-- if (hasForm === false) {- return undefined;- }-const objectProps = Object.fromEntries(props.filter(([_, value]) => value.instanceId === formId)