Skip to content

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.

refactor: invoke default action resource from context (#3836)

Bogdan Chadkincaa16f2c4a80
diff --git a/fixtures/ssg/.webstudio/data.json b/fixtures/ssg/.webstudio/data.json
index f6dd4a99ba..d1161502fd 100644
--- a/fixtures/ssg/.webstudio/data.json
+++ b/fixtures/ssg/.webstudio/data.json
@@ -469,7 +469,7 @@
"size": 999,
"type": "image",
"format": "svg",
- "createdAt": "2024-07-26T13:39:48.678Z",
+ "createdAt": "2024-07-26T13:39:48.678",
"meta": {
"width": 14,
"height": 16
diff --git a/fixtures/webstudio-cloudflare-template/.webstudio/data.json b/fixtures/webstudio-cloudflare-template/.webstudio/data.json
index f6dd4a99ba..d1161502fd 100644
--- a/fixtures/webstudio-cloudflare-template/.webstudio/data.json
+++ b/fixtures/webstudio-cloudflare-template/.webstudio/data.json
@@ -469,7 +469,7 @@
"size": 999,
"type": "image",
"format": "svg",
- "createdAt": "2024-07-26T13:39:48.678Z",
+ "createdAt": "2024-07-26T13:39:48.678",
"meta": {
"width": 14,
"height": 16
diff --git a/fixtures/webstudio-cloudflare-template/app/extension.ts b/fixtures/webstudio-cloudflare-template/app/extension.ts
index 934b0437c1..6c57958b57 100644
--- a/fixtures/webstudio-cloudflare-template/app/extension.ts
+++ b/fixtures/webstudio-cloudflare-template/app/extension.ts
@@ -1,10 +1,18 @@
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
import { AppLoadContext } from "@remix-run/server-runtime";
+import { ResourceRequest } from "@webstudio-is/sdk";
declare module "@remix-run/server-runtime" {
interface AppLoadContext {
EXCLUDE_FROM_SEARCH: boolean;
+ // @todo remove n8n hook after saas implement default resource
N8N_FORM_EMAIL_HOOK: string;
+ getDefaultActionResource?: (options: {
+ url: URL;
+ projectId: string;
+ contactEmail: string;
+ formData: FormData;
+ }) => ResourceRequest;
}
}
diff --git a/fixtures/webstudio-cloudflare-template/app/routes/[another-page]._index.tsx b/fixtures/webstudio-cloudflare-template/app/routes/[another-page]._index.tsx
index 5616fa5b45..1c8046269c 100644
--- a/fixtures/webstudio-cloudflare-template/app/routes/[another-page]._index.tsx
+++ b/fixtures/webstudio-cloudflare-template/app/routes/[another-page]._index.tsx
@@ -249,19 +249,19 @@ export const action = async ({
{ success: true } | { success: false; errors: string[] }
> => {
try {
- const pageUrl = new URL(request.url);
- pageUrl.host = getRequestHost(request);
+ const url = new URL(request.url);
+ url.host = getRequestHost(request);
const formData = await request.formData();
const system = {
params: {},
search: {},
- origin: pageUrl.origin,
+ origin: url.origin,
};
const resourceName = formData.get(formIdFieldName);
- const resource =
+ let resource =
typeof resourceName === "string"
? getResources({ system }).action.get(resourceName)
: undefined;
@@ -288,16 +288,32 @@ export const action = async ({
formData.delete(formBotFieldName);
if (resource) {
- const { ok, statusText } = await loadResource(fetch, {
+ resource = {
...resource,
body: Object.fromEntries(formData),
+ };
+ } else {
+ if (contactEmail === undefined) {
+ throw new Error("Contact email not found");
+ }
+
+ resource = context.getDefaultActionResource?.({
+ url,
+ projectId,
+ contactEmail,
+ formData,
});
+ }
+
+ if (resource) {
+ const { ok, statusText } = await loadResource(fetch, resource);
if (ok) {
return { success: true };
}
return { success: false, errors: [statusText] };
}
+ // @todo remove n8n handler after saas implement default resource
if (contactEmail === undefined) {
throw new Error("Contact email not found");
}
@@ -306,9 +322,9 @@ export const action = async ({
formInfo: {
formId: projectId,
formData,
- pageUrl: pageUrl.toString(),
+ pageUrl: url.toString(),
toEmail: contactEmail,
- fromEmail: pageUrl.hostname + "@webstudio.email",
+ fromEmail: url.hostname + "@webstudio.email",
},
hookUrl: context.N8N_FORM_EMAIL_HOOK,
});
diff --git a/fixtures/webstudio-cloudflare-template/app/routes/_index.tsx b/fixtures/webstudio-cloudflare-template/app/routes/_index.tsx
index 471a41e9bd..fb1f6b9528 100644
--- a/fixtures/webstudio-cloudflare-template/app/routes/_index.tsx
+++ b/fixtures/webstudio-cloudflare-template/app/routes/_index.tsx
@@ -249,19 +249,19 @@ export const action = async ({
{ success: true } | { success: false; errors: string[] }
> => {
try {
- const pageUrl = new URL(request.url);
- pageUrl.host = getRequestHost(request);
+ const url = new URL(request.url);
+ url.host = getRequestHost(request);
const formData = await request.formData();
const system = {
params: {},
search: {},
- origin: pageUrl.origin,
+ origin: url.origin,
};
const resourceName = formData.get(formIdFieldName);
- const resource =
+ let resource =
typeof resourceName === "string"
? getResources({ system }).action.get(resourceName)
: undefined;
@@ -288,16 +288,32 @@ export const action = async ({
formData.delete(formBotFieldName);
if (resource) {
- const { ok, statusText } = await loadResource(fetch, {
+ resource = {
...resource,
body: Object.fromEntries(formData),
+ };
+ } else {
+ if (contactEmail === undefined) {
+ throw new Error("Contact email not found");
+ }
+
+ resource = context.getDefaultActionResource?.({
+ url,
+ projectId,
+ contactEmail,
+ formData,
});
+ }
+
+ if (resource) {
+ const { ok, statusText } = await loadResource(fetch, resource);
if (ok) {
return { success: true };
}
return { success: false, errors: [statusText] };
}
+ // @todo remove n8n handler after saas implement default resource
if (contactEmail === undefined) {
throw new Error("Contact email not found");
}
@@ -306,9 +322,9 @@ export const action = async ({
formInfo: {
formId: projectId,
formData,
- pageUrl: pageUrl.toString(),
+ pageUrl: url.toString(),
toEmail: contactEmail,
- fromEmail: pageUrl.hostname + "@webstudio.email",
+ fromEmail: url.hostname + "@webstudio.email",
},
hookUrl: context.N8N_FORM_EMAIL_HOOK,
});
diff --git a/fixtures/webstudio-custom-template/.webstudio/data.json b/fixtures/webstudio-custom-template/.webstudio/data.json
index 0421c96b56..8c9d216846 100644
--- a/fixtures/webstudio-custom-template/.webstudio/data.json
+++ b/fixtures/webstudio-custom-template/.webstudio/data.json
@@ -2285,17 +2285,17 @@
],
"assets": [
{
- "id": "ff546bd2-9bb1-4717-a180-1a1fc05565dd",
- "name": "_937084ed-a798-49fe-8664-df93a2af605e_1JqSy_0Wy9fY5mXNZSLJ0.jpeg",
+ "id": "cd1e9fad-8df1-45c6-800f-05fda2d2469f",
+ "name": "home_wsKvRSqvkajPPBeycZ-C8.svg",
"description": null,
"projectId": "0d856812-61d8-4014-a20a-82e01c0eb8ee",
- "size": 210614,
+ "size": 3350,
"type": "image",
- "format": "jpg",
- "createdAt": "2024-03-26T18:31:04.086Z",
+ "format": "svg",
+ "createdAt": "2023-10-30T20:35:47.113",
"meta": {
- "width": 1024,
- "height": 1024
+ "width": 16,
+ "height": 16
}
},
{
@@ -2305,7 +2305,7 @@
"projectId": "0d856812-61d8-4014-a20a-82e01c0eb8ee",
"size": 156212,
"type": "font",
- "createdAt": "2024-02-22T05:36:52.004Z",
+ "createdAt": "2024-02-22T05:36:52.004",
"format": "woff2",
"meta": {
"family": "Cormorant Garamond",
@@ -2314,17 +2314,17 @@
}
},
{
- "id": "cd1e9fad-8df1-45c6-800f-05fda2d2469f",
- "name": "home_wsKvRSqvkajPPBeycZ-C8.svg",
+ "id": "ff546bd2-9bb1-4717-a180-1a1fc05565dd",
+ "name": "_937084ed-a798-49fe-8664-df93a2af605e_1JqSy_0Wy9fY5mXNZSLJ0.jpeg",
"description": null,
"projectId": "0d856812-61d8-4014-a20a-82e01c0eb8ee",
- "size": 3350,
+ "size": 210614,
"type": "image",
- "format": "svg",
- "createdAt": "2023-10-30T20:35:47.113Z",
+ "format": "jpg",
+ "createdAt": "2024-03-26T18:31:04.086",
"meta": {
- "width": 16,
- "height": 16
+ "width": 1024,
+ "height": 1024
}
}
],
diff --git a/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.tsx b/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.tsx
index 02244847f8..7af9d4b4d2 100644
--- a/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.tsx
+++ b/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.tsx
@@ -23,7 +23,7 @@ export const favIconAsset: ImageAsset | undefined = {
size: 3350,
type: "image",
format: "svg",
- createdAt: "2023-10-30T20:35:47.113Z",
+ createdAt: "2023-10-30T20:35:47.113",
meta: { width: 16, height: 16 },
};
diff --git a/fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml]._index.tsx b/fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml]._index.tsx
index 3667dc7e70..48c250f57a 100644
--- a/fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml]._index.tsx
+++ b/fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml]._index.tsx
@@ -16,7 +16,7 @@ export const favIconAsset: ImageAsset | undefined = {
size: 3350,
type: "image",
format: "svg",
- createdAt: "2023-10-30T20:35:47.113Z",
+ createdAt: "2023-10-30T20:35:47.113",
meta: { width: 16, height: 16 },
};
diff --git a/fixtures/webstudio-custom-template/app/__generated__/[world]._index.tsx b/fixtures/webstudio-custom-template/app/__generated__/[world]._index.tsx
index f0b2ef8718..b54daed28d 100644
--- a/fixtures/webstudio-custom-template/app/__generated__/[world]._index.tsx
+++ b/fixtures/webstudio-custom-template/app/__generated__/[world]._index.tsx
@@ -17,7 +17,7 @@ export const favIconAsset: ImageAsset | undefined = {
size: 3350,
type: "image",
format: "svg",
- createdAt: "2023-10-30T20:35:47.113Z",
+ createdAt: "2023-10-30T20:35:47.113",
meta: { width: 16, height: 16 },
};
diff --git a/fixtures/webstudio-custom-template/app/__generated__/_index.tsx b/fixtures/webstudio-custom-template/app/__generated__/_index.tsx
index dbd9bfae0f..2d086ecdc5 100644
--- a/fixtures/webstudio-custom-template/app/__generated__/_index.tsx
+++ b/fixtures/webstudio-custom-template/app/__generated__/_index.tsx
@@ -29,7 +29,7 @@ export const favIconAsset: ImageAsset | undefined = {
size: 3350,
type: "image",
format: "svg",
- createdAt: "2023-10-30T20:35:47.113Z",
+ createdAt: "2023-10-30T20:35:47.113",
meta: { width: 16, height: 16 },
};
@@ -42,7 +42,7 @@ export const pageFontAssets: FontAsset[] = [
projectId: "0d856812-61d8-4014-a20a-82e01c0eb8ee",
size: 156212,
type: "font",
- createdAt: "2024-02-22T05:36:52.004Z",
+ createdAt: "2024-02-22T05:36:52.004",
format: "woff2",
meta: { family: "Cormorant Garamond", style: "normal", weight: 500 },
},
@@ -57,7 +57,7 @@ export const pageBackgroundImageAssets: ImageAsset[] = [
size: 3350,
type: "image",
format: "svg",
- createdAt: "2023-10-30T20:35:47.113Z",
+ createdAt: "2023-10-30T20:35:47.113",
meta: { width: 16, height: 16 },
},
];
diff --git a/fixtures/webstudio-custom-template/app/extension.ts b/fixtures/webstudio-custom-template/app/extension.ts
index 934b0437c1..6c57958b57 100644
--- a/fixtures/webstudio-custom-template/app/extension.ts
+++ b/fixtures/webstudio-custom-template/app/extension.ts
@@ -1,10 +1,18 @@
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
import { AppLoadContext } from "@remix-run/server-runtime";
+import { ResourceRequest } from "@webstudio-is/sdk";
declare module "@remix-run/server-runtime" {
interface AppLoadContext {
EXCLUDE_FROM_SEARCH: boolean;
+ // @todo remove n8n hook after saas implement default resource
N8N_FORM_EMAIL_HOOK: string;
+ getDefaultActionResource?: (options: {
+ url: URL;
+ projectId: string;
+ contactEmail: string;
+ formData: FormData;
+ }) => ResourceRequest;
}
}
diff --git a/fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsx b/fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsx
index ef72597e6f..b87e2b71b1 100644
--- a/fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsx
+++ b/fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsx
@@ -249,19 +249,19 @@ export const action = async ({
{ success: true } | { success: false; errors: string[] }
> => {
try {
- const pageUrl = new URL(request.url);
- pageUrl.host = getRequestHost(request);
+ const url = new URL(request.url);
+ url.host = getRequestHost(request);
const formData = await request.formData();
const system = {
params: {},
search: {},
- origin: pageUrl.origin,
+ origin: url.origin,
};
const resourceName = formData.get(formIdFieldName);
- const resource =
+ let resource =
typeof resourceName === "string"
? getResources({ system }).action.get(resourceName)
: undefined;
@@ -288,16 +288,32 @@ export const action = async ({
formData.delete(formBotFieldName);
if (resource) {
- const { ok, statusText } = await loadResource(fetch, {
+ resource = {
...resource,
body: Object.fromEntries(formData),
+ };
+ } else {
+ if (contactEmail === undefined) {
+ throw new Error("Contact email not found");
+ }
+
+ resource = context.getDefaultActionResource?.({
+ url,
+ projectId,
+ contactEmail,
+ formData,
});
+ }
+
+ if (resource) {
+ const { ok, statusText } = await loadResource(fetch, resource);
if (ok) {
return { success: true };
}
return { success: false, errors: [statusText] };
}
+ // @todo remove n8n handler after saas implement default resource
if (contactEmail === undefined) {
throw new Error("Contact email not found");
}
@@ -306,9 +322,9 @@ export const action = async ({
formInfo: {
formId: projectId,
formData,
- pageUrl: pageUrl.toString(),
+ pageUrl: url.toString(),
toEmail: contactEmail,
- fromEmail: pageUrl.hostname + "@webstudio.email",
+ fromEmail: url.hostname + "@webstudio.email",
},
hookUrl: context.N8N_FORM_EMAIL_HOOK,
});
diff --git a/fixtures/webstudio-custom-template/app/routes/[world]._index.tsx b/fixtures/webstudio-custom-template/app/routes/[world]._index.tsx
index 6a2aea5713..ac69c6b631 100644
--- a/fixtures/webstudio-custom-template/app/routes/[world]._index.tsx
+++ b/fixtures/webstudio-custom-template/app/routes/[world]._index.tsx
@@ -249,19 +249,19 @@ export const action = async ({
{ success: true } | { success: false; errors: string[] }
> => {
try {
- const pageUrl = new URL(request.url);
- pageUrl.host = getRequestHost(request);
+ const url = new URL(request.url);
+ url.host = getRequestHost(request);
const formData = await request.formData();
const system = {
params: {},
search: {},
- origin: pageUrl.origin,
+ origin: url.origin,
};
const resourceName = formData.get(formIdFieldName);
- const resource =
+ let resource =
typeof resourceName === "string"
? getResources({ system }).action.get(resourceName)
: undefined;
@@ -288,16 +288,32 @@ export const action = async ({
formData.delete(formBotFieldName);
if (resource) {
- const { ok, statusText } = await loadResource(fetch, {
+ resource = {
...resource,
body: Object.fromEntries(formData),
+ };
+ } else {
+ if (contactEmail === undefined) {
+ throw new Error("Contact email not found");
+ }
+
+ resource = context.getDefaultActionResource?.({
+ url,
+ projectId,
+ contactEmail,
+ formData,
});
+ }
+
+ if (resource) {
+ const { ok, statusText } = await loadResource(fetch, resource);
if (ok) {
return { success: true };
}
return { success: false, errors: [statusText] };
}
+ // @todo remove n8n handler after saas implement default resource
if (contactEmail === undefined) {
throw new Error("Contact email not found");
}
@@ -306,9 +322,9 @@ export const action = async ({
formInfo: {
formId: projectId,
formData,
- pageUrl: pageUrl.toString(),
+ pageUrl: url.toString(),
toEmail: contactEmail,
- fromEmail: pageUrl.hostname + "@webstudio.email",
+ fromEmail: url.hostname + "@webstudio.email",
},
hookUrl: context.N8N_FORM_EMAIL_HOOK,
});
diff --git a/fixtures/webstudio-custom-template/app/routes/_index.tsx b/fixtures/webstudio-custom-template/app/routes/_index.tsx
index 471a41e9bd..fb1f6b9528 100644
--- a/fixtures/webstudio-custom-template/app/routes/_index.tsx
+++ b/fixtures/webstudio-custom-template/app/routes/_index.tsx
@@ -249,19 +249,19 @@ export const action = async ({
{ success: true } | { success: false; errors: string[] }
> => {
try {
- const pageUrl = new URL(request.url);
- pageUrl.host = getRequestHost(request);
+ const url = new URL(request.url);
+ url.host = getRequestHost(request);
const formData = await request.formData();
const system = {
params: {},
search: {},
- origin: pageUrl.origin,
+ origin: url.origin,
};
const resourceName = formData.get(formIdFieldName);
- const resource =
+ let resource =
typeof resourceName === "string"
? getResources({ system }).action.get(resourceName)
: undefined;
@@ -288,16 +288,32 @@ export const action = async ({
formData.delete(formBotFieldName);
if (resource) {
- const { ok, statusText } = await loadResource(fetch, {
+ resource = {
...resource,
body: Object.fromEntries(formData),
+ };
+ } else {
+ if (contactEmail === undefined) {
+ throw new Error("Contact email not found");
+ }
+
+ resource = context.getDefaultActionResource?.({
+ url,
+ projectId,
+ contactEmail,
+ formData,
});
+ }
+
+ if (resource) {
+ const { ok, statusText } = await loadResource(fetch, resource);
if (ok) {
return { success: true };
}
return { success: false, errors: [statusText] };
}
+ // @todo remove n8n handler after saas implement default resource
if (contactEmail === undefined) {
throw new Error("Contact email not found");
}
@@ -306,9 +322,9 @@ export const action = async ({
formInfo: {
formId: projectId,
formData,
- pageUrl: pageUrl.toString(),
+ pageUrl: url.toString(),
toEmail: contactEmail,
- fromEmail: pageUrl.hostname + "@webstudio.email",
+ fromEmail: url.hostname + "@webstudio.email",
},
hookUrl: context.N8N_FORM_EMAIL_HOOK,
});
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/.webstudio/data.json b/fixtures/webstudio-remix-netlify-edge-functions/.webstudio/data.json
index f6dd4a99ba..d1161502fd 100644
--- a/fixtures/webstudio-remix-netlify-edge-functions/.webstudio/data.json
+++ b/fixtures/webstudio-remix-netlify-edge-functions/.webstudio/data.json
@@ -469,7 +469,7 @@
"size": 999,
"type": "image",
"format": "svg",
- "createdAt": "2024-07-26T13:39:48.678Z",
+ "createdAt": "2024-07-26T13:39:48.678",
"meta": {
"width": 14,
"height": 16
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/extension.ts b/fixtures/webstudio-remix-netlify-edge-functions/app/extension.ts
index 934b0437c1..6c57958b57 100644
--- a/fixtures/webstudio-remix-netlify-edge-functions/app/extension.ts
+++ b/fixtures/webstudio-remix-netlify-edge-functions/app/extension.ts
@@ -1,10 +1,18 @@
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
import { AppLoadContext } from "@remix-run/server-runtime";
+import { ResourceRequest } from "@webstudio-is/sdk";
declare module "@remix-run/server-runtime" {
interface AppLoadContext {
EXCLUDE_FROM_SEARCH: boolean;
+ // @todo remove n8n hook after saas implement default resource
N8N_FORM_EMAIL_HOOK: string;
+ getDefaultActionResource?: (options: {
+ url: URL;
+ projectId: string;
+ contactEmail: string;
+ formData: FormData;
+ }) => ResourceRequest;
}
}
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/[another-page]._index.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/routes/[another-page]._index.tsx
index 5616fa5b45..1c8046269c 100644
--- a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/[another-page]._index.tsx
+++ b/fixtures/webstudio-remix-netlify-edge-functions/app/routes/[another-page]._index.tsx
@@ -249,19 +249,19 @@ export const action = async ({
{ success: true } | { success: false; errors: string[] }
> => {
try {
- const pageUrl = new URL(request.url);
- pageUrl.host = getRequestHost(request);
+ const url = new URL(request.url);
+ url.host = getRequestHost(request);
const formData = await request.formData();
const system = {
params: {},
search: {},
- origin: pageUrl.origin,
+ origin: url.origin,
};
const resourceName = formData.get(formIdFieldName);
- const resource =
+ let resource =
typeof resourceName === "string"
? getResources({ system }).action.get(resourceName)
: undefined;
@@ -288,16 +288,32 @@ export const action = async ({
formData.delete(formBotFieldName);
if (resource) {
- const { ok, statusText } = await loadResource(fetch, {
+ resource = {
...resource,
body: Object.fromEntries(formData),
+ };
+ } else {
+ if (contactEmail === undefined) {
+ throw new Error("Contact email not found");
+ }
+
+ resource = context.getDefaultActionResource?.({
+ url,
+ projectId,
+ contactEmail,
+ formData,
});
+ }
+
+ if (resource) {
+ const { ok, statusText } = await loadResource(fetch, resource);
if (ok) {
return { success: true };
}
return { success: false, errors: [statusText] };
}
+ // @todo remove n8n handler after saas implement default resource
if (contactEmail === undefined) {
throw new Error("Contact email not found");
}
@@ -306,9 +322,9 @@ export const action = async ({
formInfo: {
formId: projectId,
formData,
- pageUrl: pageUrl.toString(),
+ pageUrl: url.toString(),
toEmail: contactEmail,
- fromEmail: pageUrl.hostname + "@webstudio.email",
+ fromEmail: url.hostname + "@webstudio.email",
},
hookUrl: context.N8N_FORM_EMAIL_HOOK,
});
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx
index 471a41e9bd..fb1f6b9528 100644
--- a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx
+++ b/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx
@@ -249,19 +249,19 @@ export const action = async ({
{ success: true } | { success: false; errors: string[] }
> => {
try {
- const pageUrl = new URL(request.url);
- pageUrl.host = getRequestHost(request);
+ const url = new URL(request.url);
+ url.host = getRequestHost(request);
const formData = await request.formData();
const system = {
params: {},
search: {},
- origin: pageUrl.origin,
+ origin: url.origin,
};
const resourceName = formData.get(formIdFieldName);
- const resource =
+ let resource =
typeof resourceName === "string"
? getResources({ system }).action.get(resourceName)
: undefined;
@@ -288,16 +288,32 @@ export const action = async ({
formData.delete(formBotFieldName);
if (resource) {
- const { ok, statusText } = await loadResource(fetch, {
+ resource = {
...resource,
body: Object.fromEntries(formData),
+ };
+ } else {
+ if (contactEmail === undefined) {
+ throw new Error("Contact email not found");
+ }
+
+ resource = context.getDefaultActionResource?.({
+ url,
+ projectId,
+ contactEmail,
+ formData,
});
+ }
+
+ if (resource) {
+ const { ok, statusText } = await loadResource(fetch, resource);
if (ok) {
return { success: true };
}
return { success: false, errors: [statusText] };
}
+ // @todo remove n8n handler after saas implement default resource
if (contactEmail === undefined) {
throw new Error("Contact email not found");
}
@@ -306,9 +322,9 @@ export const action = async ({
formInfo: {
formId: projectId,
formData,
- pageUrl: pageUrl.toString(),
+ pageUrl: url.toString(),
toEmail: contactEmail,
- fromEmail: pageUrl.hostname + "@webstudio.email",
+ fromEmail: url.hostname + "@webstudio.email",
},
hookUrl: context.N8N_FORM_EMAIL_HOOK,
});
diff --git a/fixtures/webstudio-remix-netlify-functions/.webstudio/data.json b/fixtures/webstudio-remix-netlify-functions/.webstudio/data.json
index f6dd4a99ba..d1161502fd 100644
--- a/fixtures/webstudio-remix-netlify-functions/.webstudio/data.json
+++ b/fixtures/webstudio-remix-netlify-functions/.webstudio/data.json
@@ -469,7 +469,7 @@
"size": 999,
"type": "image",
"format": "svg",
- "createdAt": "2024-07-26T13:39:48.678Z",
+ "createdAt": "2024-07-26T13:39:48.678",
"meta": {
"width": 14,
"height": 16
diff --git a/fixtures/webstudio-remix-netlify-functions/app/extension.ts b/fixtures/webstudio-remix-netlify-functions/app/extension.ts
index 934b0437c1..6c57958b57 100644
--- a/fixtures/webstudio-remix-netlify-functions/app/extension.ts
+++ b/fixtures/webstudio-remix-netlify-functions/app/extension.ts
@@ -1,10 +1,18 @@
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
import { AppLoadContext } from "@remix-run/server-runtime";
+import { ResourceRequest } from "@webstudio-is/sdk";
declare module "@remix-run/server-runtime" {
interface AppLoadContext {
EXCLUDE_FROM_SEARCH: boolean;
+ // @todo remove n8n hook after saas implement default resource
N8N_FORM_EMAIL_HOOK: string;
+ getDefaultActionResource?: (options: {
+ url: URL;
+ projectId: string;
+ contactEmail: string;
+ formData: FormData;
+ }) => ResourceRequest;
}
}
diff --git a/fixtures/webstudio-remix-netlify-functions/app/routes/[another-page]._index.tsx b/fixtures/webstudio-remix-netlify-functions/app/routes/[another-page]._index.tsx
index 5616fa5b45..1c8046269c 100644
--- a/fixtures/webstudio-remix-netlify-functions/app/routes/[another-page]._index.tsx
+++ b/fixtures/webstudio-remix-netlify-functions/app/routes/[another-page]._index.tsx
@@ -249,19 +249,19 @@ export const action = async ({
{ success: true } | { success: false; errors: string[] }
> => {
try {
- const pageUrl = new URL(request.url);
- pageUrl.host = getRequestHost(request);
+ const url = new URL(request.url);
+ url.host = getRequestHost(request);
const formData = await request.formData();
const system = {
params: {},
search: {},
- origin: pageUrl.origin,
+ origin: url.origin,
};
const resourceName = formData.get(formIdFieldName);
- const resource =
+ let resource =
typeof resourceName === "string"
? getResources({ system }).action.get(resourceName)
: undefined;
@@ -288,16 +288,32 @@ export const action = async ({
formData.delete(formBotFieldName);
if (resource) {
- const { ok, statusText } = await loadResource(fetch, {
+ resource = {
...resource,
body: Object.fromEntries(formData),
+ };
+ } else {
+ if (contactEmail === undefined) {
+ throw new Error("Contact email not found");
+ }
+
+ resource = context.getDefaultActionResource?.({
+ url,
+ projectId,
+ contactEmail,
+ formData,
});
+ }
+
+ if (resource) {
+ const { ok, statusText } = await loadResource(fetch, resource);
if (ok) {
return { success: true };
}
return { success: false, errors: [statusText] };
}
+ // @todo remove n8n handler after saas implement default resource
if (contactEmail === undefined) {
throw new Error("Contact email not found");
}
@@ -306,9 +322,9 @@ export const action = async ({
formInfo: {
formId: projectId,
formData,
- pageUrl: pageUrl.toString(),
+ pageUrl: url.toString(),
toEmail: contactEmail,
- fromEmail: pageUrl.hostname + "@webstudio.email",
+ fromEmail: url.hostname + "@webstudio.email",
},
hookUrl: context.N8N_FORM_EMAIL_HOOK,
});
diff --git a/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx b/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx
index 471a41e9bd..fb1f6b9528 100644
--- a/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx
+++ b/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx
@@ -249,19 +249,19 @@ export const action = async ({
{ success: true } | { success: false; errors: string[] }
> => {
try {
- const pageUrl = new URL(request.url);
- pageUrl.host = getRequestHost(request);
+ const url = new URL(request.url);
+ url.host = getRequestHost(request);
const formData = await request.formData();
const system = {
params: {},
search: {},
- origin: pageUrl.origin,
+ origin: url.origin,
};
const resourceName = formData.get(formIdFieldName);
- const resource =
+ let resource =
typeof resourceName === "string"
? getResources({ system }).action.get(resourceName)
: undefined;
@@ -288,16 +288,32 @@ export const action = async ({
formData.delete(formBotFieldName);
if (resource) {
- const { ok, statusText } = await loadResource(fetch, {
+ resource = {
...resource,
body: Object.fromEntries(formData),
+ };
+ } else {
+ if (contactEmail === undefined) {
+ throw new Error("Contact email not found");
+ }
+
+ resource = context.getDefaultActionResource?.({
+ url,
+ projectId,
+ contactEmail,
+ formData,
});
+ }
+
+ if (resource) {
+ const { ok, statusText } = await loadResource(fetch, resource);
if (ok) {
return { success: true };
}
return { success: false, errors: [statusText] };
}
+ // @todo remove n8n handler after saas implement default resource
if (contactEmail === undefined) {
throw new Error("Contact email not found");
}
@@ -306,9 +322,9 @@ export const action = async ({
formInfo: {
formId: projectId,
formData,
- pageUrl: pageUrl.toString(),
+ pageUrl: url.toString(),
toEmail: contactEmail,
- fromEmail: pageUrl.hostname + "@webstudio.email",
+ fromEmail: url.hostname + "@webstudio.email",
},
hookUrl: context.N8N_FORM_EMAIL_HOOK,
});
diff --git a/fixtures/webstudio-remix-vercel/.webstudio/data.json b/fixtures/webstudio-remix-vercel/.webstudio/data.json
index 686130916b..2f4ea0bb33 100644
--- a/fixtures/webstudio-remix-vercel/.webstudio/data.json
+++ b/fixtures/webstudio-remix-vercel/.webstudio/data.json
@@ -3473,17 +3473,17 @@
],
"assets": [
{
- "id": "88d5e2ff-b8f2-4899-aaf8-dde4ade6da10",
- "name": "DALL_E_2023-10-30_12.39.46_-_Photo_logo_with_a_bold_cat_silhouette_centered_on_a_contrasting_background_designed_for_clarity_at_small_32x32_favicon_resolution_00h6cEA8u2pJRvVJv7hRe.png",
+ "id": "cd939c56-bcdd-4e64-bd9c-567a9bccd3da",
+ "name": "_937084ed-a798-49fe-8664-df93a2af605e_uiBk3o6UWdqolyakMvQJ9.jpeg",
"description": null,
"projectId": "cddc1d44-af37-4cb6-a430-d300cf6f932d",
- "size": 268326,
+ "size": 210614,
"type": "image",
- "format": "png",
- "createdAt": "2023-10-30T13:51:08.416Z",
+ "format": "jpeg",
+ "createdAt": "2023-09-06T11:28:43.031",
"meta": {
- "width": 790,
- "height": 786
+ "width": 1024,
+ "height": 1024
}
},
{
@@ -3494,24 +3494,24 @@
"size": 2906,
"type": "image",
"format": "webp",
- "createdAt": "2023-09-12T09:44:22.120Z",
+ "createdAt": "2023-09-12T09:44:22.12",
"meta": {
"width": 100,
"height": 100
}
},
{
- "id": "cd939c56-bcdd-4e64-bd9c-567a9bccd3da",
- "name": "_937084ed-a798-49fe-8664-df93a2af605e_uiBk3o6UWdqolyakMvQJ9.jpeg",
+ "id": "88d5e2ff-b8f2-4899-aaf8-dde4ade6da10",
+ "name": "DALL_E_2023-10-30_12.39.46_-_Photo_logo_with_a_bold_cat_silhouette_centered_on_a_contrasting_background_designed_for_clarity_at_small_32x32_favicon_resolution_00h6cEA8u2pJRvVJv7hRe.png",
"description": null,
"projectId": "cddc1d44-af37-4cb6-a430-d300cf6f932d",
- "size": 210614,
+ "size": 268326,
"type": "image",
- "format": "jpeg",
- "createdAt": "2023-09-06T11:28:43.031Z",
+ "format": "png",
+ "createdAt": "2023-10-30T13:51:08.416",
"meta": {
- "width": 1024,
- "height": 1024
+ "width": 790,
+ "height": 786
}
}
],
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsx
index 071a9b6541..ada91882e9 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsx
@@ -17,7 +17,7 @@ export const favIconAsset: ImageAsset | undefined = {
size: 268326,
type: "image",
format: "png",
- createdAt: "2023-10-30T13:51:08.416Z",
+ createdAt: "2023-10-30T13:51:08.416",
meta: { width: 790, height: 786 },
};
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx
index 779eece0d2..250e72e1a4 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx
@@ -26,7 +26,7 @@ export const favIconAsset: ImageAsset | undefined = {
size: 268326,
type: "image",
format: "png",
- createdAt: "2023-10-30T13:51:08.416Z",
+ createdAt: "2023-10-30T13:51:08.416",
meta: { width: 790, height: 786 },
};
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsx
index 43e7b89229..0bc87108a9 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsx
@@ -17,7 +17,7 @@ export const favIconAsset: ImageAsset | undefined = {
size: 268326,
type: "image",
format: "png",
- createdAt: "2023-10-30T13:51:08.416Z",
+ createdAt: "2023-10-30T13:51:08.416",
meta: { width: 790, height: 786 },
};
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.tsx
index 55b16d0684..d1c2ea3bf3 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.tsx
@@ -17,7 +17,7 @@ export const favIconAsset: ImageAsset | undefined = {
size: 268326,
type: "image",
format: "png",
- createdAt: "2023-10-30T13:51:08.416Z",
+ createdAt: "2023-10-30T13:51:08.416",
meta: { width: 790, height: 786 },
};
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx
index 6e3ddda812..ca77e7945b 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx
@@ -28,7 +28,7 @@ export const favIconAsset: ImageAsset | undefined = {
size: 268326,
type: "image",
format: "png",
- createdAt: "2023-10-30T13:51:08.416Z",
+ createdAt: "2023-10-30T13:51:08.416",
meta: { width: 790, height: 786 },
};
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx
index 21d68ad292..c081f6266a 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx
@@ -20,7 +20,7 @@ export const favIconAsset: ImageAsset | undefined = {
size: 268326,
type: "image",
format: "png",
- createdAt: "2023-10-30T13:51:08.416Z",
+ createdAt: "2023-10-30T13:51:08.416",
meta: { width: 790, height: 786 },
};
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx
index 6806c6d98b..f5bfebfd30 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx
@@ -26,7 +26,7 @@ export const favIconAsset: ImageAsset | undefined = {
size: 268326,
type: "image",
format: "png",
- createdAt: "2023-10-30T13:51:08.416Z",
+ createdAt: "2023-10-30T13:51:08.416",
meta: { width: 790, height: 786 },
};
diff --git a/fixtures/webstudio-remix-vercel/app/extension.ts b/fixtures/webstudio-remix-vercel/app/extension.ts
index 934b0437c1..6c57958b57 100644
--- a/fixtures/webstudio-remix-vercel/app/extension.ts
+++ b/fixtures/webstudio-remix-vercel/app/extension.ts
@@ -1,10 +1,18 @@
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
import { AppLoadContext } from "@remix-run/server-runtime";
+import { ResourceRequest } from "@webstudio-is/sdk";
declare module "@remix-run/server-runtime" {
interface AppLoadContext {
EXCLUDE_FROM_SEARCH: boolean;
+ // @todo remove n8n hook after saas implement default resource
N8N_FORM_EMAIL_HOOK: string;
+ getDefaultActionResource?: (options: {
+ url: URL;
+ projectId: string;
+ contactEmail: string;
+ formData: FormData;
+ }) => ResourceRequest;
}
}
diff --git a/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsx
index 6f3f236e41..6a07c4fdee 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsx
@@ -249,19 +249,19 @@ export const action = async ({
{ success: true } | { success: false; errors: string[] }
> => {
try {
- const pageUrl = new URL(request.url);
- pageUrl.host = getRequestHost(request);
+ const url = new URL(request.url);
+ url.host = getRequestHost(request);
const formData = await request.formData();
const system = {
params: {},
search: {},
- origin: pageUrl.origin,
+ origin: url.origin,
};
const resourceName = formData.get(formIdFieldName);
- const resource =
+ let resource =
typeof resourceName === "string"
? getResources({ system }).action.get(resourceName)
: undefined;
@@ -288,16 +288,32 @@ export const action = async ({
formData.delete(formBotFieldName);
if (resource) {
- const { ok, statusText } = await loadResource(fetch, {
+ resource = {
...resource,
body: Object.fromEntries(formData),
+ };
+ } else {
+ if (contactEmail === undefined) {
+ throw new Error("Contact email not found");
+ }
+
+ resource = context.getDefaultActionResource?.({
+ url,
+ projectId,
+ contactEmail,
+ formData,
});
+ }
+
+ if (resource) {
+ const { ok, statusText } = await loadResource(fetch, resource);
if (ok) {
return { success: true };
}
return { success: false, errors: [statusText] };
}
+ // @todo remove n8n handler after saas implement default resource
if (contactEmail === undefined) {
throw new Error("Contact email not found");
}
@@ -306,9 +322,9 @@ export const action = async ({
formInfo: {
formId: projectId,
formData,
- pageUrl: pageUrl.toString(),
+ pageUrl: url.toString(),
toEmail: contactEmail,
- fromEmail: pageUrl.hostname + "@webstudio.email",
+ fromEmail: url.hostname + "@webstudio.email",
},
hookUrl: context.N8N_FORM_EMAIL_HOOK,
});
diff --git a/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx
index 1e3ef05bd8..b8ea369d4a 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx
@@ -249,19 +249,19 @@ export const action = async ({
{ success: true } | { success: false; errors: string[] }
> => {
try {
- const pageUrl = new URL(request.url);
- pageUrl.host = getRequestHost(request);
+ const url = new URL(request.url);
+ url.host = getRequestHost(request);
const formData = await request.formData();
const system = {
params: {},
search: {},
- origin: pageUrl.origin,
+ origin: url.origin,
};
const resourceName = formData.get(formIdFieldName);
- const resource =
+ let resource =
typeof resourceName === "string"
? getResources({ system }).action.get(resourceName)
: undefined;
@@ -288,16 +288,32 @@ export const action = async ({
formData.delete(formBotFieldName);
if (resource) {
- const { ok, statusText } = await loadResource(fetch, {
+ resource = {
...resource,
body: Object.fromEntries(formData),
+ };
+ } else {
+ if (contactEmail === undefined) {
+ throw new Error("Contact email not found");
+ }
+
+ resource = context.getDefaultActionResource?.({
+ url,
+ projectId,
+ contactEmail,
+ formData,
});
+ }
+
+ if (resource) {
+ const { ok, statusText } = await loadResource(fetch, resource);
if (ok) {
return { success: true };
}
return { success: false, errors: [statusText] };
}
+ // @todo remove n8n handler after saas implement default resource
if (contactEmail === undefined) {
throw new Error("Contact email not found");
}
@@ -306,9 +322,9 @@ export const action = async ({
formInfo: {
formId: projectId,
formData,
- pageUrl: pageUrl.toString(),
+ pageUrl: url.toString(),
toEmail: contactEmail,
- fromEmail: pageUrl.hostname + "@webstudio.email",
+ fromEmail: url.hostname + "@webstudio.email",
},
hookUrl: context.N8N_FORM_EMAIL_HOOK,
});
diff --git a/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsx
index f2c42210c6..84819516f5 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsx
@@ -249,19 +249,19 @@ export const action = async ({
{ success: true } | { success: false; errors: string[] }
> => {
try {
- const pageUrl = new URL(request.url);
- pageUrl.host = getRequestHost(request);
+ const url = new URL(request.url);
+ url.host = getRequestHost(request);
const formData = await request.formData();
const system = {
params: {},
search: {},
- origin: pageUrl.origin,
+ origin: url.origin,
};
const resourceName = formData.get(formIdFieldName);
- const resource =
+ let resource =
typeof resourceName === "string"
? getResources({ system }).action.get(resourceName)
: undefined;
@@ -288,16 +288,32 @@ export const action = async ({
formData.delete(formBotFieldName);
if (resource) {
- const { ok, statusText } = await loadResource(fetch, {
+ resource = {
...resource,
body: Object.fromEntries(formData),
+ };
+ } else {
+ if (contactEmail === undefined) {
+ throw new Error("Contact email not found");
+ }
+
+ resource = context.getDefaultActionResource?.({
+ url,
+ projectId,
+ contactEmail,
+ formData,
});
+ }
+
+ if (resource) {
+ const { ok, statusText } = await loadResource(fetch, resource);
if (ok) {
return { success: true };
}
return { success: false, errors: [statusText] };
}
+ // @todo remove n8n handler after saas implement default resource
if (contactEmail === undefined) {
throw new Error("Contact email not found");
}
@@ -306,9 +322,9 @@ export const action = async ({
formInfo: {
formId: projectId,
formData,
- pageUrl: pageUrl.toString(),
+ pageUrl: url.toString(),
toEmail: contactEmail,
- fromEmail: pageUrl.hostname + "@webstudio.email",
+ fromEmail: url.hostname + "@webstudio.email",
},
hookUrl: context.N8N_FORM_EMAIL_HOOK,
});
diff --git a/fixtures/webstudio-remix-vercel/app/routes/[nested].[nested-page]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[nested].[nested-page]._index.tsx
index 7f5e0ba6c4..047035a45b 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[nested].[nested-page]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[nested].[nested-page]._index.tsx
@@ -249,19 +249,19 @@ export const action = async ({
{ success: true } | { success: false; errors: string[] }
> => {
try {
- const pageUrl = new URL(request.url);
- pageUrl.host = getRequestHost(request);
+ const url = new URL(request.url);
+ url.host = getRequestHost(request);
const formData = await request.formData();
const system = {
params: {},
search: {},
- origin: pageUrl.origin,
+ origin: url.origin,
};
const resourceName = formData.get(formIdFieldName);
- const resource =
+ let resource =
typeof resourceName === "string"
? getResources({ system }).action.get(resourceName)
: undefined;
@@ -288,16 +288,32 @@ export const action = async ({
formData.delete(formBotFieldName);
if (resource) {
- const { ok, statusText } = await loadResource(fetch, {
+ resource = {
...resource,
body: Object.fromEntries(formData),
+ };
+ } else {
+ if (contactEmail === undefined) {
+ throw new Error("Contact email not found");
+ }
+
+ resource = context.getDefaultActionResource?.({
+ url,
+ projectId,
+ contactEmail,
+ formData,
});
+ }
+
+ if (resource) {
+ const { ok, statusText } = await loadResource(fetch, resource);
if (ok) {
return { success: true };
}
return { success: false, errors: [statusText] };
}
+ // @todo remove n8n handler after saas implement default resource
if (contactEmail === undefined) {
throw new Error("Contact email not found");
}
@@ -306,9 +322,9 @@ export const action = async ({
formInfo: {
formId: projectId,
formData,
- pageUrl: pageUrl.toString(),
+ pageUrl: url.toString(),
toEmail: contactEmail,
- fromEmail: pageUrl.hostname + "@webstudio.email",
+ fromEmail: url.hostname + "@webstudio.email",
},
hookUrl: context.N8N_FORM_EMAIL_HOOK,
});
diff --git a/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx
index 42bfb2f46c..90c922c31d 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx
@@ -249,19 +249,19 @@ export const action = async ({
{ success: true } | { success: false; errors: string[] }
> => {
try {
- const pageUrl = new URL(request.url);
- pageUrl.host = getRequestHost(request);
+ const url = new URL(request.url);
+ url.host = getRequestHost(request);
const formData = await request.formData();
const system = {
params: {},
search: {},
- origin: pageUrl.origin,
+ origin: url.origin,
};
const resourceName = formData.get(formIdFieldName);
- const resource =
+ let resource =
typeof resourceName === "string"
? getResources({ system }).action.get(resourceName)
: undefined;
@@ -288,16 +288,32 @@ export const action = async ({
formData.delete(formBotFieldName);
if (resource) {
- const { ok, statusText } = await loadResource(fetch, {
+ resource = {
...resource,
body: Object.fromEntries(formData),
+ };
+ } else {
+ if (contactEmail === undefined) {
+ throw new Error("Contact email not found");
+ }
+
+ resource = context.getDefaultActionResource?.({
+ url,
+ projectId,
+ contactEmail,
+ formData,
});
+ }
+
+ if (resource) {
+ const { ok, statusText } = await loadResource(fetch, resource);
if (ok) {
return { success: true };
}
return { success: false, errors: [statusText] };
}
+ // @todo remove n8n handler after saas implement default resource
if (contactEmail === undefined) {
throw new Error("Contact email not found");
}
@@ -306,9 +322,9 @@ export const action = async ({
formInfo: {
formId: projectId,
formData,
- pageUrl: pageUrl.toString(),
+ pageUrl: url.toString(),
toEmail: contactEmail,
- fromEmail: pageUrl.hostname + "@webstudio.email",
+ fromEmail: url.hostname + "@webstudio.email",
},
hookUrl: context.N8N_FORM_EMAIL_HOOK,
});
diff --git a/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsx
index 1884e1d8bd..974464abf3 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsx
@@ -249,19 +249,19 @@ export const action = async ({
{ success: true } | { success: false; errors: string[] }
> => {
try {
- const pageUrl = new URL(request.url);
- pageUrl.host = getRequestHost(request);
+ const url = new URL(request.url);
+ url.host = getRequestHost(request);
const formData = await request.formData();
const system = {
params: {},
search: {},
- origin: pageUrl.origin,
+ origin: url.origin,
};
const resourceName = formData.get(formIdFieldName);
- const resource =
+ let resource =
typeof resourceName === "string"
? getResources({ system }).action.get(resourceName)
: undefined;
@@ -288,16 +288,32 @@ export const action = async ({
formData.delete(formBotFieldName);
if (resource) {
- const { ok, statusText } = await loadResource(fetch, {
+ resource = {
...resource,
body: Object.fromEntries(formData),
+ };
+ } else {
+ if (contactEmail === undefined) {
+ throw new Error("Contact email not found");
+ }
+
+ resource = context.getDefaultActionResource?.({
+ url,
+ projectId,
+ contactEmail,
+ formData,
});
+ }
+
+ if (resource) {
+ const { ok, statusText } = await loadResource(fetch, resource);
if (ok) {
return { success: true };
}
return { success: false, errors: [statusText] };
}
+ // @todo remove n8n handler after saas implement default resource
if (contactEmail === undefined) {
throw new Error("Contact email not found");
}
@@ -306,9 +322,9 @@ export const action = async ({
formInfo: {
formId: projectId,
formData,
- pageUrl: pageUrl.toString(),
+ pageUrl: url.toString(),
toEmail: contactEmail,
- fromEmail: pageUrl.hostname + "@webstudio.email",
+ fromEmail: url.hostname + "@webstudio.email",
},
hookUrl: context.N8N_FORM_EMAIL_HOOK,
});
diff --git a/fixtures/webstudio-remix-vercel/app/routes/_index.tsx b/fixtures/webstudio-remix-vercel/app/routes/_index.tsx
index 471a41e9bd..fb1f6b9528 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/_index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/_index.tsx
@@ -249,19 +249,19 @@ export const action = async ({
{ success: true } | { success: false; errors: string[] }
> => {
try {
- const pageUrl = new URL(request.url);
- pageUrl.host = getRequestHost(request);
+ const url = new URL(request.url);
+ url.host = getRequestHost(request);
const formData = await request.formData();
const system = {
params: {},
search: {},
- origin: pageUrl.origin,
+ origin: url.origin,
};
const resourceName = formData.get(formIdFieldName);
- const resource =
+ let resource =
typeof resourceName === "string"
? getResources({ system }).action.get(resourceName)
: undefined;
@@ -288,16 +288,32 @@ export const action = async ({
formData.delete(formBotFieldName);
if (resource) {
- const { ok, statusText } = await loadResource(fetch, {
+ resource = {
...resource,
body: Object.fromEntries(formData),
+ };
+ } else {
+ if (contactEmail === undefined) {
+ throw new Error("Contact email not found");
+ }
+
+ resource = context.getDefaultActionResource?.({
+ url,
+ projectId,
+ contactEmail,
+ formData,
});
+ }
+
+ if (resource) {
+ const { ok, statusText } = await loadResource(fetch, resource);
if (ok) {
return { success: true };
}
return { success: false, errors: [statusText] };
}
+ // @todo remove n8n handler after saas implement default resource
if (contactEmail === undefined) {
throw new Error("Contact email not found");
}
@@ -306,9 +322,9 @@ export const action = async ({
formInfo: {
formId: projectId,
formData,
- pageUrl: pageUrl.toString(),
+ pageUrl: url.toString(),
toEmail: contactEmail,
- fromEmail: pageUrl.hostname + "@webstudio.email",
+ fromEmail: url.hostname + "@webstudio.email",
},
hookUrl: context.N8N_FORM_EMAIL_HOOK,
});
diff --git a/packages/cli/templates/defaults/app/extension.ts b/packages/cli/templates/defaults/app/extension.ts
index 934b0437c1..6c57958b57 100644
--- a/packages/cli/templates/defaults/app/extension.ts
+++ b/packages/cli/templates/defaults/app/extension.ts
@@ -1,10 +1,18 @@
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
import { AppLoadContext } from "@remix-run/server-runtime";
+import { ResourceRequest } from "@webstudio-is/sdk";
declare module "@remix-run/server-runtime" {
interface AppLoadContext {
EXCLUDE_FROM_SEARCH: boolean;
+ // @todo remove n8n hook after saas implement default resource
N8N_FORM_EMAIL_HOOK: string;
+ getDefaultActionResource?: (options: {
+ url: URL;
+ projectId: string;
+ contactEmail: string;
+ formData: FormData;
+ }) => ResourceRequest;
}
}
diff --git a/packages/cli/templates/defaults/app/route-templates/html.tsx b/packages/cli/templates/defaults/app/route-templates/html.tsx
index e25d181d6c..fc945c7ea9 100644
--- a/packages/cli/templates/defaults/app/route-templates/html.tsx
+++ b/packages/cli/templates/defaults/app/route-templates/html.tsx
@@ -249,19 +249,19 @@ export const action = async ({
{ success: true } | { success: false; errors: string[] }
> => {
try {
- const pageUrl = new URL(request.url);
- pageUrl.host = getRequestHost(request);
+ const url = new URL(request.url);
+ url.host = getRequestHost(request);
const formData = await request.formData();
const system = {
params: {},
search: {},
- origin: pageUrl.origin,
+ origin: url.origin,
};
const resourceName = formData.get(formIdFieldName);
- const resource =
+ let resource =
typeof resourceName === "string"
? getResources({ system }).action.get(resourceName)
: undefined;
@@ -288,16 +288,32 @@ export const action = async ({
formData.delete(formBotFieldName);
if (resource) {
- const { ok, statusText } = await loadResource(fetch, {
+ resource = {
...resource,
body: Object.fromEntries(formData),
+ };
+ } else {
+ if (contactEmail === undefined) {
+ throw new Error("Contact email not found");
+ }
+
+ resource = context.getDefaultActionResource?.({
+ url,
+ projectId,
+ contactEmail,
+ formData,
});
+ }
+
+ if (resource) {
+ const { ok, statusText } = await loadResource(fetch, resource);
if (ok) {
return { success: true };
}
return { success: false, errors: [statusText] };
}
+ // @todo remove n8n handler after saas implement default resource
if (contactEmail === undefined) {
throw new Error("Contact email not found");
}
@@ -306,9 +322,9 @@ export const action = async ({
formInfo: {
formId: projectId,
formData,
- pageUrl: pageUrl.toString(),
+ pageUrl: url.toString(),
toEmail: contactEmail,
- fromEmail: pageUrl.hostname + "@webstudio.email",
+ fromEmail: url.hostname + "@webstudio.email",
},
hookUrl: context.N8N_FORM_EMAIL_HOOK,
});