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
feat: support resource in webhook form (#5006)
Bogdan Chadkinf099837dfff1
diff --git a/apps/builder/app/builder/features/settings-panel/controls/resource-control.tsx b/apps/builder/app/builder/features/settings-panel/controls/resource-control.tsxindex 056b495246..269ab91030 100644--- a/apps/builder/app/builder/features/settings-panel/controls/resource-control.tsx+++ b/apps/builder/app/builder/features/settings-panel/controls/resource-control.tsx@@ -1,89 +1,249 @@import { nanoid } from "nanoid";-import { useId } from "react";+import { computed } from "nanostores";+import {+ forwardRef,+ useId,+ useMemo,+ useRef,+ useState,+ type ComponentProps,+} from "react";import { useStore } from "@nanostores/react";-import { InputField } from "@webstudio-is/design-system";+import { isFeatureEnabled } from "@webstudio-is/feature-flags";+import { GearIcon } from "@webstudio-is/icons";+import {+ EnhancedTooltip,+ Flex,+ FloatingPanel,+ InputField,+ NestedInputButton,+ theme,+} from "@webstudio-is/design-system";import { isLiteralExpression, Resource, type Prop } from "@webstudio-is/sdk";import {BindingControl,BindingPopover,type BindingVariant,} from "~/builder/shared/binding-popover";-import {- type ControlProps,- useLocalValue,- humanizeAttribute,- VerticalLayout,-} from "../shared";-import { $resources } from "~/shared/nano-states";-import { $selectedInstanceResourceScope } from "../resource-panel";+import { $props, $resources } from "~/shared/nano-states";import { computeExpression } from "~/shared/data-variables";import { updateWebstudioData } from "~/shared/instance-utils";+import { $selectedInstance } from "~/shared/awareness";+import {+ $selectedInstanceResourceScope,+ UrlField,+ MethodField,+ Headers,+ parseResource,+} from "../resource-panel";+import { type ControlProps, useLocalValue, VerticalLayout } from "../shared";import { PropertyLabel } from "../property-label";-export const ResourceControl = ({- meta,- prop,+// dirty, dirty hack+const areAllFormErrorsVisible = (form: null | HTMLFormElement) => {+ if (form === null) {+ return false;+ }+ // check all errors in form fields are visible+ for (const element of form.elements) {+ if (+ element instanceof HTMLInputElement ||+ element instanceof HTMLTextAreaElement+ ) {+ // field is invalid and the error is not visible+ if (+ element.validity.valid === false &&+ // rely on data-color=error convention in webstudio design system+ element.getAttribute("data-color") !== "error"+ ) {+ return false;+ }+ }+ }+ return true;+};++const ResourceButton = forwardRef<+ HTMLButtonElement,+ ComponentProps<typeof NestedInputButton>+>((props, ref) => {+ return (+ <EnhancedTooltip content="Edit Resource">+ <NestedInputButton {...props} ref={ref} aria-label="Edit Resource">+ <GearIcon />+ </NestedInputButton>+ </EnhancedTooltip>+ );+});+ResourceButton.displayName = "ResourceButton";++const ResourceForm = ({ resource }: { resource: Resource }) => {+ const { scope, aliases } = useStore($selectedInstanceResourceScope);+ const [url, setUrl] = useState(resource.url);+ const [method, setMethod] = useState<Resource["method"]>(resource.method);+ const [headers, setHeaders] = useState<Resource["headers"]>(resource.headers);+ return (+ <Flex+ direction="column"+ css={{+ width: theme.spacing[30],+ overflow: "hidden",+ gap: theme.spacing[9],+ p: theme.spacing[9],+ }}+ >+ <UrlField+ scope={scope}+ aliases={aliases}+ value={url}+ onChange={setUrl}+ onCurlPaste={(curl) => {+ // update all feilds when curl is paste into url field+ setUrl(JSON.stringify(curl.url));+ setMethod(curl.method);+ setHeaders(+ curl.headers.map((header) => ({+ name: header.name,+ value: JSON.stringify(header.value),+ }))+ );+ }}+ />+ <MethodField value={method} onChange={setMethod} />+ <Headers+ scope={scope}+ aliases={aliases}+ headers={headers}+ onChange={setHeaders}+ />+ </Flex>+ );+};++const ResourceControlPanel = ({+ resource,propName,+ onChange,+}: {+ resource: Resource;+ propName: string;+ onChange: (resource: Resource) => void;+}) => {+ const [isResourceOpen, setIsResourceOpen] = useState(false);+ const form = useRef<HTMLFormElement>(null);+ return (+ <FloatingPanel+ title="Edit Resource"+ open={isResourceOpen}+ onOpenChange={(isOpen) => {+ if (isOpen) {+ setIsResourceOpen(true);+ return;+ }+ // attempt to save form on close+ if (areAllFormErrorsVisible(form.current)) {+ form.current?.requestSubmit();+ setIsResourceOpen(false);+ } else {+ form.current?.checkValidity();+ // prevent closing when not all errors are shown to user+ }+ }}+ content={+ <form+ ref={form}+ // ref={formRef}+ noValidate={true}+ // exclude from the flow+ style={{ display: "contents" }}+ onSubmit={(event) => {+ event.preventDefault();+ if (event.currentTarget.checkValidity()) {+ const formData = new FormData(event.currentTarget);+ const newResource = parseResource({+ id: resource?.id ?? nanoid(),+ name: resource?.name ?? propName,+ formData,+ });+ onChange(newResource);+ }+ }}+ >+ {/* submit is not triggered when press enter on input without submit button */}+ <button hidden></button>+ <ResourceForm resource={resource} />+ </form>+ }+ >+ <ResourceButton />+ </FloatingPanel>+ );+};++const $methodPropValue = computed(+ [$selectedInstance, $props],+ (instance, props): Resource["method"] => {+ for (const prop of props.values()) {+ if (+ prop.instanceId === instance?.id &&+ prop.type === "string" &&+ prop.name === "method"+ ) {+ const value = prop.value.toLowerCase();+ if (+ value === "get" ||+ value === "post" ||+ value === "put" ||+ value === "delete"+ ) {+ return value;+ }+ break;+ }+ }+ return "post";+ }+);++export const ResourceControl = ({instanceId,+ propName,+ prop,}: ControlProps<"resource">) => {const resources = useStore($resources);const { variableValues, scope, aliases } = useStore($selectedInstanceResourceScope);-- let computedValue: unknown;- let expression: string = JSON.stringify("");+ const methodPropValue = useStore($methodPropValue);+ let resource: undefined | Resource;+ let urlExpression: string = JSON.stringify("");if (prop?.type === "string") {- expression = JSON.stringify(prop.value);- computedValue = prop.value;+ urlExpression = JSON.stringify(prop.value);}if (prop?.type === "expression") {- expression = prop.value;- computedValue = computeExpression(prop.value, variableValues);+ urlExpression = prop.value;}if (prop?.type === "resource") {- const resource = resources.get(prop.value);+ resource = resources.get(prop.value);if (resource) {- expression = resource.url;- computedValue = computeExpression(resource.url, variableValues);+ urlExpression = resource.url;}}+ // create temporary resource+ const resourceId = useMemo(() => resource?.id ?? nanoid(), [resource]);+ resource ??= {+ id: resourceId,+ name: propName,+ url: urlExpression,+ method: methodPropValue,+ headers: [{ name: "Content-Type", value: `"application/json"` }],+ };- const updateResourceUrl = (urlExpression: string) => {+ const updateResource = (newResource: Resource) => {updateWebstudioData((data) => {if (prop?.type === "resource") {- const resource = data.resources.get(prop.value);- if (resource) {- resource.url = urlExpression;- }+ data.resources.set(newResource.id, newResource);} else {- let method: Resource["method"] = "post";- for (const prop of data.props.values()) {- if (- prop.instanceId === instanceId &&- prop.type === "string" &&- prop.name === "method"- ) {- const value = prop.value.toLowerCase();- if (- value === "get" ||- value === "post" ||- value === "put" ||- value === "delete"- ) {- method = value;- }- break;- }- }-- const newResource: Resource = {- id: nanoid(),- name: propName,- url: urlExpression,- method,- headers: [{ name: "Content-Type", value: `"application/json"` }],- };const newProp: Prop = {id: prop?.id ?? nanoid(),instanceId,@@ -98,15 +258,15 @@ export const ResourceControl = ({};const id = useId();- const label = humanizeAttribute(meta.label || propName);let variant: BindingVariant = "bound";let readOnly = true;- if (isLiteralExpression(expression)) {+ if (isLiteralExpression(urlExpression)) {variant = "default";readOnly = false;}- const localValue = useLocalValue(String(computedValue ?? ""), (value) =>- updateResourceUrl(JSON.stringify(value))+ const localValue = useLocalValue(+ String(computeExpression(resource.url, variableValues) ?? ""),+ (value) => updateResource({ ...resource, url: JSON.stringify(value) }));return (@@ -121,20 +281,34 @@ export const ResourceControl = ({onChange={(event) => localValue.set(event.target.value)}onBlur={localValue.save}onSubmit={localValue.save}+ suffix={+ isFeatureEnabled("resourceProp") && (+ <ResourceControlPanel+ resource={resource}+ propName={propName}+ onChange={updateResource}+ />+ )+ }/><BindingPopoverscope={scope}aliases={aliases}validate={(value) => {if (value !== undefined && typeof value !== "string") {- return `${label} expects a string value`;+ return `Expected URL string value`;}}}variant={variant}- value={expression}- onChange={(newExpression) => updateResourceUrl(newExpression)}+ value={urlExpression}+ onChange={(newExpression) =>+ updateResource({ ...resource, url: newExpression })+ }onRemove={(evaluatedValue) =>- updateResourceUrl(JSON.stringify(String(evaluatedValue)))+ updateResource({+ ...resource,+ url: JSON.stringify(String(evaluatedValue)),+ })}/></BindingControl>diff --git a/apps/builder/app/builder/features/settings-panel/resource-panel.tsx b/apps/builder/app/builder/features/settings-panel/resource-panel.tsxindex e24506ee92..de254a6688 100644--- a/apps/builder/app/builder/features/settings-panel/resource-panel.tsx+++ b/apps/builder/app/builder/features/settings-panel/resource-panel.tsx@@ -11,7 +11,7 @@ import {useState,} from "react";import { useStore } from "@nanostores/react";-import type { DataSource, Resource } from "@webstudio-is/sdk";+import { Resource, type DataSource } from "@webstudio-is/sdk";import {encodeDataVariableId,generateObjectExpression,@@ -62,6 +62,30 @@ import {import { updateWebstudioData } from "~/shared/instance-utils";import { rebindTreeVariablesMutable } from "~/shared/data-variables";+export const parseResource = ({+ id,+ name,+ formData,+}: {+ id: string;+ name: string;+ formData: FormData;+}) => {+ const headerNames = formData.getAll("header-name");+ const headerValues = formData.getAll("header-value");+ return Resource.parse({+ id,+ name,+ url: formData.get("url"),+ method: formData.get("method"),+ headers: headerNames.map((name, index) => {+ const value = headerValues[index];+ return { name, value };+ }),+ body: formData.get("body") ?? undefined,+ });+};+const validateUrl = (value: string, scope: Record<string, unknown>) => {const evaluatedValue = evaluateExpressionWithinScope(value, scope);if (typeof evaluatedValue !== "string") {@@ -78,7 +102,7 @@ const validateUrl = (value: string, scope: Record<string, unknown>) => {return "";};-const UrlField = ({+export const UrlField = ({scope,aliases,value,@@ -115,11 +139,12 @@ const UrlField = ({<InfoCircleIcon tabIndex={0} /></Tooltip></Label>+ <input hidden={true} readOnly={true} name="url" value={value} /><BindingControl><InputErrorsTooltip errors={error ? [error] : undefined}><TextArearef={ref}- name="url"+ name="url-validator"id={urlId}rows={1}grow={true}@@ -157,6 +182,27 @@ const UrlField = ({);};+export const MethodField = ({+ value,+ onChange,+}: {+ value: Resource["method"];+ onChange: (value: Resource["method"]) => void;+}) => {+ return (+ <Grid gap={1}>+ <Label>Method</Label>+ <Select<Resource["method"]>+ options={["get", "post", "put", "delete"]}+ getLabel={humanizeString}+ name="method"+ value={value}+ onChange={onChange}+ />+ </Grid>+ );+};+const validateHeaderName = (value: string) =>value.trim().length === 0 ? "Header name is required" : "";@@ -239,12 +285,13 @@ const HeaderPair = ({<Label htmlFor={valueId} css={{ gridArea: "value" }}>Value</Label>+ <input hidden={true} readOnly={true} name="header-value" value={value} /><Box css={{ gridArea: "value-input", position: "relative" }}><BindingControl><InputErrorsTooltip errors={valueError ? [valueError] : undefined}><InputFieldinputRef={valueRef}- name="header-value"+ name="header-value-validator"id={valueId}// expressions with variables cannot be editeddisabled={isLiteralExpression(value) === false}@@ -309,7 +356,7 @@ const HeaderPair = ({);};-const Headers = ({+export const Headers = ({scope,aliases,headers,@@ -593,14 +640,11 @@ export const ResourceForm = forwardRef<return;}const name = z.string().parse(formData.get("name"));- const newResource: Resource = {+ const newResource = parseResource({id: resource?.id ?? nanoid(),name,- url,- method,- headers,- body,- };+ formData,+ });const newVariable: DataSource = {id: variable?.id ?? nanoid(),// preserve existing instance scope when edit@@ -638,15 +682,7 @@ export const ResourceForm = forwardRef<setBody(JSON.stringify(curl.body));}}/>- <Grid gap={1}>- <Label>Method</Label>- <Select<Resource["method"]>- options={["get", "post", "put", "delete"]}- getLabel={humanizeString}- value={method}- onChange={(newValue) => setMethod(newValue)}- />- </Grid>+ <MethodField value={method} onChange={setMethod} /><Headersscope={scope}aliases={aliases}diff --git a/apps/builder/app/builder/features/style-panel/controls/font-family/font-family-control.tsx b/apps/builder/app/builder/features/style-panel/controls/font-family/font-family-control.tsxindex da4369bcce..99d911030a 100644--- a/apps/builder/app/builder/features/style-panel/controls/font-family/font-family-control.tsx+++ b/apps/builder/app/builder/features/style-panel/controls/font-family/font-family-control.tsx@@ -121,13 +121,11 @@ const FontsManagerButton = forwardRef<ComponentProps<typeof NestedInputButton>>((props, ref) => {return (- <Flex>- <EnhancedTooltip content="Open Font Manager">- <NestedInputButton {...props} ref={ref} tabIndex={-1}>- <UploadIcon />- </NestedInputButton>- </EnhancedTooltip>- </Flex>+ <EnhancedTooltip content="Open Font Manager">+ <NestedInputButton {...props} ref={ref} tabIndex={-1}>+ <UploadIcon />+ </NestedInputButton>+ </EnhancedTooltip>);});FontsManagerButton.displayName = "FontsManagerButton";diff --git a/packages/design-system/src/components/nested-input-button.tsx b/packages/design-system/src/components/nested-input-button.tsxindex 0284789f23..f546aaccc7 100644--- a/packages/design-system/src/components/nested-input-button.tsx+++ b/packages/design-system/src/components/nested-input-button.tsx@@ -17,7 +17,7 @@ const style = css({...textVariants.unit,color: theme.colors.foregroundSubtle,borderRadius: theme.borderRadius[2],- display: "inline-flex",+ display: "flex",alignItems: "center",justifyContent: "center",whiteSpace: "pre", // to make nestedSelectButtonUnitless work as expecteddiff --git a/packages/feature-flags/src/flags.ts b/packages/feature-flags/src/flags.tsindex 54f6483eb2..9f860f9155 100644--- a/packages/feature-flags/src/flags.ts+++ b/packages/feature-flags/src/flags.ts@@ -3,3 +3,4 @@ export const internalComponents = false;export const unsupportedBrowsers = false;export const aiRadixComponents = false;export const animation = false;+export const resourceProp = false;diff --git a/packages/sdk-components-react/src/webhook-form.ws.ts b/packages/sdk-components-react/src/webhook-form.ws.tsindex dd618060fe..4619b40fa7 100644--- a/packages/sdk-components-react/src/webhook-form.ws.ts+++ b/packages/sdk-components-react/src/webhook-form.ws.ts@@ -28,7 +28,7 @@ export const propsMeta: WsComponentPropsMeta = {control: "resource",description:"The URI of a program that processes the information submitted via the form.",- required: true,+ required: false,},},initialProps: ["id", "className", "state", "action"],