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.

fix: Load unbound resource previews in the variable dialog (#6432)

Oleg Isonencd64a6627e3f
diff --git a/apps/builder/app/builder/features/settings-panel/asset-query-form.tsx b/apps/builder/app/builder/features/settings-panel/asset-query-form.tsx
index 347a43cc5e..9f9966079c 100644
--- a/apps/builder/app/builder/features/settings-panel/asset-query-form.tsx
+++ b/apps/builder/app/builder/features/settings-panel/asset-query-form.tsx
@@ -318,6 +318,7 @@ export const AssetQueryForm = ({
aliases,
sourceContainer,
fetchDescription = builderFetch,
+ onChange,
onPendingChange,
}: {
resource?: Resource;
@@ -325,6 +326,7 @@ export const AssetQueryForm = ({
aliases: Map<string, string>;
sourceContainer?: Element | null;
fetchDescription?: typeof globalThis.fetch;
+ onChange?: () => void;
onPendingChange?: (pending: boolean) => void;
}) => {
const assets = useStore($assets);
@@ -463,6 +465,7 @@ export const AssetQueryForm = ({
sourceContainer={sourceContainer}
sectionPaddingInline={theme.panel.paddingInline}
onChange={(value) => {
+ onChange?.();
setStoredConfigurationError(undefined);
setConfiguration(
configuration.result === "many" && value.result !== "many"
diff --git a/apps/builder/app/builder/features/settings-panel/resource-panel.test.ts b/apps/builder/app/builder/features/settings-panel/resource-panel.test.ts
index 46da7845a9..02871fd363 100644
--- a/apps/builder/app/builder/features/settings-panel/resource-panel.test.ts
+++ b/apps/builder/app/builder/features/settings-panel/resource-panel.test.ts
@@ -1,6 +1,28 @@
-import { expect, test } from "vitest";
-import { encodeDataVariableId, type DataSources } from "@webstudio-is/sdk";
-import { getResourceScopeForInstance } from "./resource-panel";
+import { createElement } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { act } from "react-dom/test-utils";
+import { afterEach, expect, test, vi } from "vitest";
+import {
+ encodeDataVariableId,
+ type DataSources,
+ type Resource,
+} from "@webstudio-is/sdk";
+import { TooltipProvider } from "@webstudio-is/design-system";
+import { $resources } from "~/shared/sync/data-stores";
+import { getResourceScopeForInstance, ResourceForm } from "./resource-panel";
+
+(
+ globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }
+).IS_REACT_ACT_ENVIRONMENT = true;
+
+let root: Root | undefined;
+const initialResources = $resources.get();
+afterEach(() => {
+ act(() => root?.unmount());
+ root = undefined;
+ $resources.set(initialResources);
+ document.body.innerHTML = "";
+});
test("includes resource documents when building another resource expression", () => {
const dataSources: DataSources = new Map([
@@ -28,3 +50,73 @@ test("includes resource documents when building another resource expression", ()
expect(scope[encodeDataVariableId("resourceDataSource")]).toBe(document);
expect(variableValues.get("resourceDataSource")).toBe(document);
});
+
+test("notifies the preview when a resource field changes", () => {
+ const container = document.createElement("div");
+ document.body.appendChild(container);
+ root = createRoot(container);
+ const onChange = vi.fn();
+ act(() => {
+ root?.render(
+ createElement(
+ TooltipProvider,
+ undefined,
+ createElement(ResourceForm, { onChange })
+ )
+ );
+ });
+
+ const addSearchParam = container.querySelector<HTMLButtonElement>(
+ '[aria-label="Add another search param"]'
+ );
+ expect(addSearchParam).not.toBeNull();
+ act(() => addSearchParam?.click());
+ expect(onChange).toHaveBeenCalledOnce();
+});
+
+test("invalidates the preview as soon as a body edit starts", () => {
+ const resource: Resource = {
+ id: "request",
+ name: "Request",
+ method: "post",
+ url: '"https://example.com"',
+ headers: [{ name: "Content-Type", value: '"text/plain"' }],
+ body: '"original"',
+ };
+ $resources.set(new Map([[resource.id, resource]]));
+ const container = document.createElement("div");
+ document.body.appendChild(container);
+ root = createRoot(container);
+ const onChange = vi.fn();
+ act(() => {
+ root?.render(
+ createElement(
+ TooltipProvider,
+ undefined,
+ createElement(ResourceForm, {
+ variable: {
+ type: "resource",
+ id: "request-variable",
+ name: "Request",
+ resourceId: resource.id,
+ },
+ onChange,
+ })
+ )
+ );
+ });
+
+ const body = container.querySelector<HTMLTextAreaElement>(
+ "textarea:not([name])"
+ );
+ expect(body).not.toBeNull();
+ act(() => {
+ const setValue = Object.getOwnPropertyDescriptor(
+ HTMLTextAreaElement.prototype,
+ "value"
+ )?.set;
+ setValue?.call(body, "changed");
+ body?.dispatchEvent(new Event("input", { bubbles: true }));
+ expect(onChange).toHaveBeenCalledOnce();
+ });
+});
diff --git a/apps/builder/app/builder/features/settings-panel/resource-panel.tsx b/apps/builder/app/builder/features/settings-panel/resource-panel.tsx
index 169e8d514b..5cb97c24e1 100644
--- a/apps/builder/app/builder/features/settings-panel/resource-panel.tsx
+++ b/apps/builder/app/builder/features/settings-panel/resource-panel.tsx
@@ -561,12 +561,14 @@ const BodyField = ({
aliases,
bodyType,
value,
+ onChangeStart,
onChange,
}: {
aliases: Map<string, string>;
scope: Record<string, unknown>;
bodyType: BodyType;
value: string;
+ onChangeStart?: () => void;
onChange: (value: string, bodyType: BodyType) => void;
}) => {
const [isBodyLiteral, setIsBodyLiteral] = useState(
@@ -588,6 +590,7 @@ const BodyField = ({
undefined
);
const updateBody = async (newBody: string) => {
+ onChangeStart?.();
const evaluatedValue = await evaluateExpressionWithinScope(newBody, scope);
// automatically add Content-Type: application/json header
// when value is object
@@ -611,6 +614,7 @@ const BodyField = ({
options={["text", "json"]}
onChange={(newBodyType) => {
if (newBodyType) {
+ onChangeStart?.();
onChange(value, newBodyType);
}
}}
@@ -723,8 +727,8 @@ const parseHeaders = (headers: Resource["headers"]) => {
export const ResourceForm = forwardRef<
undefined | PanelApi,
- { variable?: DataSource }
->(({ variable }, ref) => {
+ { variable?: DataSource; onChange?: () => void }
+>(({ variable, onChange }, ref) => {
const { scope, aliases } = useResourceScope({ variable });
const resources = useStore($resources);
@@ -773,7 +777,13 @@ export const ResourceForm = forwardRef<
return (
<>
<Row>
- <MethodField value={method} onChange={setMethod} />
+ <MethodField
+ value={method}
+ onChange={(value) => {
+ onChange?.();
+ setMethod(value);
+ }}
+ />
</Row>
<Row>
<UrlField
@@ -781,12 +791,14 @@ export const ResourceForm = forwardRef<
aliases={aliases}
value={url}
onChange={(urlExpression, searchParams) => {
+ onChange?.();
setUrl(urlExpression);
if (searchParams) {
setSearchParams((prev) => [...prev, ...searchParams]);
}
}}
onCurlPaste={(curl) => {
+ onChange?.();
// update all feilds when curl is paste into url field
setMethod(curl.method);
setUrl(JSON.stringify(curl.url));
@@ -814,13 +826,17 @@ export const ResourceForm = forwardRef<
scope={scope}
aliases={aliases}
searchParams={searchParams}
- onChange={setSearchParams}
+ onChange={(value) => {
+ onChange?.();
+ setSearchParams(value);
+ }}
/>
</Row>
<Row>
<CacheMaxAge
value={maxAge}
onChange={(newMaxAge) => {
+ onChange?.();
setMaxAge(newMaxAge);
// reset header
setHeaders((headers) =>
@@ -835,6 +851,7 @@ export const ResourceForm = forwardRef<
aliases={aliases}
headers={headers}
onChange={(newHeaders) => {
+ onChange?.();
// reset dedicated fields
if (newHeaders.some(({ name }) => isCacheControl(name))) {
setMaxAge(undefined);
@@ -853,6 +870,7 @@ export const ResourceForm = forwardRef<
aliases={aliases}
value={body ?? ""}
bodyType={bodyType}
+ onChangeStart={onChange}
onChange={(newBody, newBodyType) => {
setBodyType(newBodyType);
// reset header
@@ -873,6 +891,7 @@ ResourceForm.displayName = "ResourceForm";
type SystemResourceFormProps = {
variable?: DataSource;
+ onChange?: () => void;
querySourceContainer?: Element | null;
onQueryActiveChange?: (active: boolean) => void;
onQueryPendingChange?: (pending: boolean) => void;
@@ -896,6 +915,7 @@ export const SystemResourceForm = forwardRef<
>((props, ref) => {
const {
variable,
+ onChange,
querySourceContainer,
onQueryActiveChange,
onQueryPendingChange,
@@ -1015,7 +1035,10 @@ export const SystemResourceForm = forwardRef<
);
}}
value={localResource}
- onChange={setLocalResource}
+ onChange={(value) => {
+ onChange?.();
+ setLocalResource(value);
+ }}
/>
</Grid>
</Row>
@@ -1031,6 +1054,7 @@ export const SystemResourceForm = forwardRef<
aliases={aliases}
sourceContainer={querySourceContainer}
onPendingChange={onQueryPendingChange}
+ onChange={onChange}
/>
</Suspense>
)}
@@ -1046,8 +1070,8 @@ const zGraphqlBody = z.object({
export const GraphqlResourceForm = forwardRef<
undefined | PanelApi,
- { variable?: DataSource }
->(({ variable }, ref) => {
+ { variable?: DataSource; onChange?: () => void }
+>(({ variable, onChange }, ref) => {
const { scope, aliases } = useResourceScope({ variable });
const resources = useStore($resources);
@@ -1144,8 +1168,12 @@ export const GraphqlResourceForm = forwardRef<
scope={scope}
aliases={aliases}
value={url}
- onChange={setUrl}
+ onChange={(value) => {
+ onChange?.();
+ setUrl(value);
+ }}
onCurlPaste={(curl) => {
+ onChange?.();
// update all feilds when curl is paste into url field
setUrl(JSON.stringify(curl.url));
const parsedHeaders = parseHeaders(
@@ -1176,12 +1204,22 @@ export const GraphqlResourceForm = forwardRef<
maxRows={10}
autoGrow={true}
value={query}
- onChange={setQuery}
+ onChange={(value) => {
+ onChange?.();
+ setQuery(value);
+ }}
/>
<EditorDialog
title="GraphQL query"
content={
- <TextArea grow={true} value={query} onChange={setQuery} />
+ <TextArea
+ grow={true}
+ value={query}
+ onChange={(value) => {
+ onChange?.();
+ setQuery(value);
+ }}
+ />
}
>
<EditorDialogButton />
@@ -1217,12 +1255,17 @@ export const GraphqlResourceForm = forwardRef<
bound={isVariablesLiteral === false}
scope={scope}
aliases={aliases}
- onChangeValue={setVariables}
+ onChangeValue={(value) => {
+ onChange?.();
+ setVariables(value);
+ }}
onChangeExpression={(value) => {
+ onChange?.();
setVariables(value);
setIsVariablesLiteral(isLiteralExpression(value));
}}
onRemove={(value) => {
+ onChange?.();
setVariables(JSON.stringify(value));
setIsVariablesLiteral(true);
}}
@@ -1252,6 +1295,7 @@ export const GraphqlResourceForm = forwardRef<
<CacheMaxAge
value={maxAge}
onChange={(newMaxAge) => {
+ onChange?.();
setMaxAge(newMaxAge);
setHeaders((headers) =>
headers.filter(({ name }) => !isCacheControl(name))
@@ -1266,6 +1310,7 @@ export const GraphqlResourceForm = forwardRef<
aliases={aliases}
headers={headers}
onChange={(newHeaders) => {
+ onChange?.();
// reset dedicated fields
if (newHeaders.some(({ name }) => isCacheControl(name))) {
setMaxAge(undefined);
diff --git a/apps/builder/app/builder/features/settings-panel/variable-popover-preview.test.tsx b/apps/builder/app/builder/features/settings-panel/variable-popover-preview.test.tsx
new file mode 100644
index 0000000000..5f5c1b148e
--- /dev/null
+++ b/apps/builder/app/builder/features/settings-panel/variable-popover-preview.test.tsx
@@ -0,0 +1,140 @@
+import { createRoot, type Root } from "react-dom/client";
+import { act } from "react-dom/test-utils";
+import { userEvent } from "@vitest/browser/context";
+import { TooltipProvider } from "@webstudio-is/design-system";
+import type { ResourceRequest } from "@webstudio-is/sdk";
+import { afterEach, expect, test, vi } from "vitest";
+
+(
+ globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }
+).IS_REACT_ACT_ENVIRONMENT = true;
+
+let root: Root | undefined;
+let resetResources: (() => void) | undefined;
+
+afterEach(() => {
+ act(() => root?.unmount());
+ root = undefined;
+ resetResources?.();
+ resetResources = undefined;
+ document.body.innerHTML = "";
+ vi.unstubAllGlobals();
+});
+
+test("loads an unsaved system resource while an unrelated page request is pending", async () => {
+ const nativeFetch = globalThis.fetch;
+ let respond: (response: Response) => void = () => {};
+ const loaderCalls: RequestInit[] = [];
+ const backend: typeof globalThis.fetch = (input, init) => {
+ if (String(input).startsWith("/rest/resources-loader")) {
+ loaderCalls.push(init ?? {});
+ return new Promise<Response>((resolve, reject) => {
+ const onAbort = () => reject(new DOMException("Aborted", "AbortError"));
+ init?.signal?.addEventListener("abort", onAbort, { once: true });
+ respond = (response) => {
+ init?.signal?.removeEventListener("abort", onAbort);
+ resolve(response);
+ };
+ });
+ }
+ return nativeFetch(input, init);
+ };
+ // fetch.client captures fetch at import time, so install the test backend
+ // before importing the dialog and resource loader.
+ vi.stubGlobal("fetch", backend);
+ const [
+ { VariablePopoverTrigger },
+ { __testing__, getResourceKey },
+ { updateCsrfToken },
+ ] = await Promise.all([
+ import("./variable-popover"),
+ import("~/shared/resources"),
+ import("~/shared/csrf.client"),
+ ]);
+ const { queueResources, reset } = __testing__;
+ resetResources = reset;
+ updateCsrfToken("test-token");
+ const unrelated: ResourceRequest = {
+ name: "Slow page request",
+ method: "get",
+ url: "https://example.com/slow",
+ searchParams: [],
+ headers: [],
+ };
+ queueResources([unrelated]);
+
+ const container = document.createElement("div");
+ document.body.appendChild(container);
+ root = createRoot(container);
+ await act(async () => {
+ root?.render(
+ <TooltipProvider>
+ <div data-floating-panel-container>
+ <VariablePopoverTrigger>
+ <button type="button">Open new variable</button>
+ </VariablePopoverTrigger>
+ </div>
+ </TooltipProvider>
+ );
+ });
+ await act(async () => {
+ await userEvent.click(container.querySelector("button")!);
+ });
+ const dialog = await vi.waitFor(() => {
+ const dialog = document.querySelector<HTMLElement>('[role="dialog"]');
+ expect(dialog).not.toBeNull();
+ return dialog!;
+ });
+ const selectOption = async (triggerText: string, optionText: string) => {
+ const trigger = Array.from(
+ dialog.querySelectorAll<HTMLElement>('[role="combobox"]')
+ ).find((element) => element.textContent?.includes(triggerText));
+ expect(trigger).toBeDefined();
+ await act(async () => userEvent.click(trigger!));
+ const option = Array.from(
+ document.querySelectorAll<HTMLElement>('[role="option"]')
+ ).find((element) => element.textContent?.includes(optionText));
+ expect(option).toBeDefined();
+ await act(async () => userEvent.click(option!));
+ };
+ await selectOption("String", "System resource");
+ await selectOption("Sitemap", "Current date");
+
+ const loadButton = Array.from(
+ dialog.querySelectorAll<HTMLButtonElement>("button")
+ ).find((button) => button.textContent === "Load data");
+ expect(loadButton).toBeDefined();
+ expect(loadButton?.disabled).toBe(false);
+ const refreshButton = dialog.querySelector<HTMLButtonElement>(
+ '[aria-label="Refresh resource data"]'
+ );
+ expect(refreshButton?.disabled).toBe(false);
+ await act(async () => {
+ await userEvent.click(loadButton!);
+ });
+ await vi.waitFor(() => expect(loaderCalls).toHaveLength(1));
+ const requests = JSON.parse(String(loaderCalls[0].body)) as ResourceRequest[];
+ const preview = requests.find(
+ (request) => request.url === "/$resources/current-date"
+ );
+ if (preview === undefined) {
+ throw new Error("Current date preview was not requested");
+ }
+ expect(requests).toContainEqual(unrelated);
+
+ queueResources([]);
+ respond(Response.json([[getResourceKey(preview), { data: "2026-09-23" }]]));
+ await vi.waitFor(() => {
+ expect(document.querySelector('[role="dialog"]')?.textContent).toContain(
+ "2026-09-23"
+ );
+ });
+
+ await selectOption("System resource", "GraphQL");
+ expect(dialog.textContent).not.toContain("2026-09-23");
+ expect(
+ Array.from(dialog.querySelectorAll("button")).some(
+ (button) => button.textContent === "Load data"
+ )
+ ).toBe(true);
+});
diff --git a/apps/builder/app/builder/features/settings-panel/variable-popover.tsx b/apps/builder/app/builder/features/settings-panel/variable-popover.tsx
index 9c330741e0..b928ce65ae 100644
--- a/apps/builder/app/builder/features/settings-panel/variable-popover.tsx
+++ b/apps/builder/app/builder/features/settings-panel/variable-popover.tsx
@@ -85,7 +85,6 @@ import {
} from "./resource-panel";
import { generateCurl } from "./curl";
import {
- $hasPendingResources,
$pendingResourceKeys,
$resourceDiagnosticsCache,
$resourceDiagnosticsErrorCache,
@@ -93,7 +92,7 @@ import {
$resourcesCache,
computeResourceRequest,
getResourceKey,
- invalidateResource,
+ loadResourcePreview,
loadResourceDiagnostics,
} from "~/shared/resources";
import { Row } from "./shared";
@@ -546,6 +545,7 @@ const VariablePanelForm = forwardRef<
onVariableTypeChange: (variableType: VariableType) => void;
value: unknown;
onValueChange: (value: unknown) => void;
+ onResourceChange: () => void;
querySourceContainer: Element | null;
onQueryActiveChange: (active: boolean) => void;
onQueryPendingChange: (pending: boolean) => void;
@@ -558,6 +558,7 @@ const VariablePanelForm = forwardRef<
onVariableTypeChange,
value,
onValueChange,
+ onResourceChange,
querySourceContainer,
onQueryActiveChange,
onQueryPendingChange,
@@ -629,15 +630,24 @@ const VariablePanelForm = forwardRef<
</Row>
)}
{variableType === "resource" && (
- <ResourceForm ref={ref} variable={variable} />
+ <ResourceForm
+ ref={ref}
+ variable={variable}
+ onChange={onResourceChange}
+ />
)}
{variableType === "graphql-resource" && (
- <GraphqlResourceForm ref={ref} variable={variable} />
+ <GraphqlResourceForm
+ ref={ref}
+ variable={variable}
+ onChange={onResourceChange}
+ />
)}
{variableType === "system-resource" && (
<SystemResourceForm
ref={ref}
variable={variable}
+ onChange={onResourceChange}
querySourceContainer={querySourceContainer}
onQueryActiveChange={onQueryActiveChange}
onQueryPendingChange={onQueryPendingChange}
@@ -661,6 +671,8 @@ const VariablePreview = ({
variable,
variableType,
variableValue,
+ showSavedResourceRequest,
+ isComputingRequest,
onLoadData,
queryActive,
queryPending,
@@ -669,6 +681,8 @@ const VariablePreview = ({
variable?: DataSource;
variableType: VariableType;
variableValue: unknown;
+ showSavedResourceRequest: boolean;
+ isComputingRequest: boolean;
onLoadData: () => void;
queryActive: boolean;
queryPending: boolean;
@@ -679,7 +693,6 @@ const VariablePreview = ({
variableType === "resource" ||
variableType === "graphql-resource" ||
variableType === "system-resource";
- const hasPendingResources = useStore($hasPendingResources);
const pendingResourceKeys = useStore($pendingResourceKeys);
const resources = useStore($resources);
const variableValues = useStore($instanceVariableValues);
@@ -699,7 +712,7 @@ const VariablePreview = ({
setResolvedResourceRequest(parsedResourceRequest);
return;
}
- if (variable?.type !== "resource") {
+ if (variable?.type !== "resource" || !showSavedResourceRequest) {
setResolvedResourceRequest(undefined);
return;
}
@@ -724,11 +737,23 @@ const VariablePreview = ({
return () => {
active = false;
};
- }, [resources, resourceScope.variableValues, variable, variableValue]);
+ }, [
+ resources,
+ resourceScope.variableValues,
+ variable,
+ variableValue,
+ showSavedResourceRequest,
+ ]);
const parsedResourceRequest = resourceRequest.safeParse(variableValue).data;
const computedResourceRequest =
parsedResourceRequest ??
- (variable?.type === "resource" ? resolvedResourceRequest : undefined);
+ (variable?.type === "resource" && showSavedResourceRequest
+ ? resolvedResourceRequest
+ : undefined);
+ const previewPending =
+ isComputingRequest ||
+ (computedResourceRequest !== undefined &&
+ pendingResourceKeys.has(getResourceKey(computedResourceRequest)));
let computedValue: unknown;
let resourceDiagnostics: AssetQueryPreviewDiagnostics | undefined;
let resourcePerformance: ResourcePerformance | undefined;
@@ -785,12 +810,8 @@ const VariablePreview = ({
align="center"
css={{ position: "absolute", inset: 0 }}
>
- <Button
- type="button"
- disabled={hasPendingResources}
- onClick={onLoadData}
- >
- {hasPendingResources ? "Loading..." : "Load data"}
+ <Button type="button" disabled={previewPending} onClick={onLoadData}>
+ {previewPending ? "Loading..." : "Load data"}
</Button>
</Flex>
)}
@@ -814,10 +835,7 @@ const VariablePreview = ({
queryContainerRef={queryActive ? queryContainerRef : undefined}
preview={preview}
queryPending={queryPending}
- previewPending={
- computedResourceKey !== undefined &&
- pendingResourceKeys.has(computedResourceKey)
- }
+ previewPending={previewPending}
onDiagnosticsOpen={
computedResourceRequest !== undefined &&
isAssetsResourceRequest(computedResourceRequest) &&
@@ -850,13 +868,14 @@ const VariablePreview = ({
const VariablePopoverContent = ({
formRef,
variable,
+ isOpen,
onClose,
}: {
formRef: RefObject<HTMLFormElement>;
variable?: DataSource;
+ isOpen: boolean;
onClose: () => void;
}) => {
- const hasPendingResources = useStore($hasPendingResources);
const panelRef = useRef<undefined | PanelApi>(undefined);
const [queryActive, setQueryActive] = useState(false);
const [queryPending, setQueryPending] = useState(false);
@@ -867,6 +886,11 @@ const VariablePopoverContent = ({
[]
);
const isSystemVariable = variable?.id === SYSTEM_VARIABLE_ID;
+ const previewReleaseRef = useRef<(() => void) | undefined>(undefined);
+ const previewRevisionRef = useRef(0);
+ const [showSavedResourceRequest, setShowSavedResourceRequest] =
+ useState(true);
+ const [isComputingRequest, setIsComputingRequest] = useState(false);
const [value, setValue] = useState<unknown>(() => {
if (variable?.type === "variable") {
if (variable.value.type === "json") {
@@ -901,9 +925,41 @@ const VariablePopoverContent = ({
return "string";
});
+ const cancelPreview = () => {
+ previewRevisionRef.current += 1;
+ previewReleaseRef.current?.();
+ previewReleaseRef.current = undefined;
+ setIsComputingRequest(false);
+ };
+
+ const onResourceChange = () => {
+ cancelPreview();
+ setShowSavedResourceRequest(false);
+ setValue(undefined);
+ };
+
+ useEffect(() => {
+ if (isOpen) {
+ return () => {
+ previewRevisionRef.current += 1;
+ previewReleaseRef.current?.();
+ previewReleaseRef.current = undefined;
+ };
+ }
+ }, [isOpen]);
+
const updateVariableType = (variableType: VariableType) => {
+ cancelPreview();
+ setShowSavedResourceRequest(false);
setVariableType(variableType);
setValue((prev: unknown) => {
+ if (
+ variableType === "resource" ||
+ variableType === "graphql-resource" ||
+ variableType === "system-resource"
+ ) {
+ return;
+ }
if (variableType === "string" && typeof prev !== "string") {
return "";
}
@@ -924,20 +980,38 @@ const VariablePopoverContent = ({
const resourceScope = useResourceScope({ variable });
const reloadData = async () => {
+ cancelPreview();
+ const revision = previewRevisionRef.current;
+ setShowSavedResourceRequest(false);
+ setValue(undefined);
const formData = getReloadableResourceFormData(formRef.current);
if (formData === undefined) {
return;
}
- const resource = createResourceValueFromFormData({
- id: variable?.id ?? "new",
- formData,
- });
- const resourceRequest = await computeResourceRequest(
- resource,
- resourceScope.variableValues
- );
- invalidateResource(resourceRequest);
- setValue(resourceRequest);
+ setIsComputingRequest(true);
+ try {
+ const resource = createResourceValueFromFormData({
+ id: variable?.id ?? "new",
+ formData,
+ });
+ const resourceRequest = await computeResourceRequest(
+ resource,
+ resourceScope.variableValues
+ );
+ if (revision !== previewRevisionRef.current) {
+ return;
+ }
+ previewReleaseRef.current = loadResourcePreview(resourceRequest);
+ setValue(resourceRequest);
+ } catch {
+ if (revision === previewRevisionRef.current) {
+ console.error("Unable to load resource preview");
+ }
+ } finally {
+ if (revision === previewRevisionRef.current) {
+ setIsComputingRequest(false);
+ }
+ }
};
const copyAsCurl = async () => {
@@ -1007,6 +1081,7 @@ const VariablePopoverContent = ({
onVariableTypeChange={updateVariableType}
value={value}
onValueChange={setValue}
+ onResourceChange={onResourceChange}
querySourceContainer={querySourceContainer}
onQueryActiveChange={setQueryActive}
onQueryPendingChange={setQueryPending}
@@ -1020,6 +1095,8 @@ const VariablePopoverContent = ({
variable={variable}
variableType={variableType}
variableValue={value}
+ showSavedResourceRequest={showSavedResourceRequest}
+ isComputingRequest={isComputingRequest}
onLoadData={reloadData}
queryActive={queryActive}
queryPending={queryPending}
@@ -1053,7 +1130,7 @@ const VariablePopoverContent = ({
aria-label="Refresh resource data"
prefix={<RefreshIcon />}
color="ghost"
- disabled={hasPendingResources}
+ disabled={isComputingRequest}
onClick={reloadData}
/>
</Tooltip>
@@ -1129,6 +1206,7 @@ export const VariablePopoverTrigger = ({
<VariablePopoverContent
formRef={formRef}
variable={variable}
+ isOpen={isOpen}
onClose={() => setOpen(false)}
/>
}
diff --git a/apps/builder/app/shared/resources.test.ts b/apps/builder/app/shared/resources.test.ts
index 4a87df84c3..026e26252c 100644
--- a/apps/builder/app/shared/resources.test.ts
+++ b/apps/builder/app/shared/resources.test.ts
@@ -19,6 +19,7 @@ import {
computeResourceRequestPlan,
getResourceKey,
invalidateAssets,
+ loadResourcePreview,
loadResourceDiagnostics,
preloadResources,
} from "./resources";
@@ -37,6 +38,22 @@ afterEach(() => {
vi.useRealTimers();
});
+const previewRequest = (name: string, url: string): ResourceRequest => ({
+ name,
+ method: "get",
+ url,
+ searchParams: [],
+ headers: [],
+});
+
+const deferredResponse = () => {
+ let respond: (response: Response) => void = () => {};
+ const promise = new Promise<Response>((resolve) => {
+ respond = resolve;
+ });
+ return { promise, respond };
+};
+
test("removes obsolete queued requests but keeps cached results", () => {
vi.useFakeTimers();
const request: ResourceRequest = {
@@ -65,6 +82,181 @@ test("removes obsolete queued requests but keeps cached results", () => {
unlisten();
});
+test("keeps an explicitly loaded unbound resource through page-plan recalculation", async () => {
+ const request = previewRequest("Current date", "/$resources/current-date");
+ const key = getResourceKey(request);
+ const response = deferredResponse();
+ const requestFetch = vi.fn<typeof globalThis.fetch>(() => response.promise);
+
+ const release = loadResourcePreview(request, requestFetch);
+ // Cache updates trigger this page-plan recalculation, which does not include
+ // the unsaved resource.
+ queueResources([]);
+ response.respond(Response.json([[key, { data: "2026-09-23" }]]));
+ await vi.waitFor(() => {
+ expect($resourcesCache.get().get(key)).toEqual({ data: "2026-09-23" });
+ });
+ release();
+});
+
+test.each([
+ ["Sitemap", "/$resources/sitemap.xml"],
+ ["HTTP", "https://example.com/posts"],
+ ["Existing unbound", "https://example.com/existing"],
+])(
+ "loads an unbound %s preview without making it a page dependency",
+ async (name, url) => {
+ const request = previewRequest(name, url);
+ const key = getResourceKey(request);
+ const requestFetch = vi.fn<typeof globalThis.fetch>(
+ async (_input, init) => {
+ expect(JSON.parse(String(init?.body))).toEqual([request]);
+ return Response.json([[key, { data: name }]]);
+ }
+ );
+
+ queueResources([]);
+ const release = loadResourcePreview(request, requestFetch);
+ queueResources([]);
+ await vi.waitFor(() => {
+ expect($resourcesCache.get().get(key)).toEqual({ data: name });
+ });
+ expect(requestFetch).toHaveBeenCalledOnce();
+ release();
+ expect($pendingResourceKeys.get()).toEqual(new Set());
+ }
+);
+
+test("replaces a preview when its inputs change and ignores the old response", async () => {
+ const oldRequest = previewRequest(
+ "Posts",
+ "https://example.com/posts?page=1"
+ );
+ const newRequest = { ...oldRequest, url: "https://example.com/posts?page=2" };
+ const oldKey = getResourceKey(oldRequest);
+ const newKey = getResourceKey(newRequest);
+ const oldResponse = deferredResponse();
+ const newResponse = deferredResponse();
+ const requestFetch = vi
+ .fn<typeof globalThis.fetch>()
+ .mockImplementationOnce(() => oldResponse.promise)
+ .mockImplementationOnce(() => newResponse.promise);
+
+ const releaseOld = loadResourcePreview(oldRequest, requestFetch);
+ releaseOld();
+ expect(requestFetch.mock.calls[0][1]?.signal?.aborted).toBe(true);
+ const releaseNew = loadResourcePreview(newRequest, requestFetch);
+ queueResources([]);
+ oldResponse.respond(Response.json([[oldKey, { data: "old" }]]));
+ newResponse.respond(Response.json([[newKey, { data: "new" }]]));
+
+ await vi.waitFor(() => {
+ expect($resourcesCache.get().get(newKey)).toEqual({ data: "new" });
+ });
+ expect($resourcesCache.get().has(oldKey)).toBe(false);
+ releaseNew();
+});
+
+test("releasing a closed preview cancels it but keeps page requests alive", async () => {
+ const preview = previewRequest("Preview", "https://example.com/preview");
+ const page = previewRequest("Page", "https://example.com/page");
+ const previewKey = getResourceKey(preview);
+ const pageKey = getResourceKey(page);
+ const response = deferredResponse();
+ const requestFetch = vi.fn<typeof globalThis.fetch>(() => response.promise);
+
+ queueResources([page]);
+ const release = loadResourcePreview(preview, requestFetch);
+ // Both requests share a batch, so releasing the preview must not abort the
+ // page's request or accept the preview's late result.
+ release();
+ expect(requestFetch.mock.calls[0][1]?.signal?.aborted).toBe(false);
+ response.respond(
+ Response.json([
+ [previewKey, { data: "late preview" }],
+ [pageKey, { data: "page" }],
+ ])
+ );
+ await vi.waitFor(() => {
+ expect($resourcesCache.get().get(pageKey)).toEqual({ data: "page" });
+ });
+ expect($resourcesCache.get().has(previewKey)).toBe(false);
+});
+
+test("closing an unbound preview aborts its request and rejects a late response", async () => {
+ const request = previewRequest(
+ "Preview",
+ "https://example.com/close-preview"
+ );
+ const key = getResourceKey(request);
+ const response = deferredResponse();
+ const requestFetch = vi.fn<typeof globalThis.fetch>(() => response.promise);
+
+ const release = loadResourcePreview(request, requestFetch);
+ release();
+ release();
+ expect(requestFetch.mock.calls[0][1]?.signal?.aborted).toBe(true);
+ response.respond(Response.json([[key, { data: "late" }]]));
+ await vi.waitFor(() => {
+ expect($pendingResourceKeys.get()).toEqual(new Set());
+ });
+ expect($resourcesCache.get().has(key)).toBe(false);
+});
+
+test("releasing one of two previews for the same request keeps the other active", async () => {
+ const request = previewRequest(
+ "Shared",
+ "https://example.com/shared-preview"
+ );
+ const key = getResourceKey(request);
+ const firstResponse = deferredResponse();
+ const secondResponse = deferredResponse();
+ const requestFetch = vi
+ .fn<typeof globalThis.fetch>()
+ .mockImplementationOnce(() => firstResponse.promise)
+ .mockImplementationOnce(() => secondResponse.promise);
+
+ const releaseFirst = loadResourcePreview(request, requestFetch);
+ const releaseSecond = loadResourcePreview(request, requestFetch);
+ releaseFirst();
+ queueResources([]);
+ secondResponse.respond(Response.json([[key, { data: "shared" }]]));
+ await vi.waitFor(() => {
+ expect($resourcesCache.get().get(key)).toEqual({ data: "shared" });
+ });
+ releaseSecond();
+});
+
+test("an old preview release cannot cancel a new load after reset", async () => {
+ const request = previewRequest("Date", "/$resources/current-date");
+ const key = getResourceKey(request);
+ const newResponse = deferredResponse();
+ const requestFetch = vi
+ .fn<typeof globalThis.fetch>()
+ .mockImplementationOnce(
+ (_input, init) =>
+ new Promise((_resolve, reject) => {
+ init?.signal?.addEventListener(
+ "abort",
+ () => reject(new DOMException("Aborted", "AbortError")),
+ { once: true }
+ );
+ })
+ )
+ .mockImplementationOnce(() => newResponse.promise);
+
+ const releaseOld = loadResourcePreview(request, requestFetch);
+ reset();
+ const releaseNew = loadResourcePreview(request, requestFetch);
+ releaseOld();
+ queueResources([]);
+ newResponse.respond(Response.json([[key, { data: "new" }]]));
+ await vi.waitFor(() => {
+ expect($resourcesCache.get().get(key)).toEqual({ data: "new" });
+ });
+ releaseNew();
+});
+
test("unlocks reachable resource requests as dependency documents are cached", async () => {
const authorVariable = encodeDataSourceVariable("authorDataSource");
const resources: Resources = new Map([
diff --git a/apps/builder/app/shared/resources.ts b/apps/builder/app/shared/resources.ts
index 8372aaa8b0..a51276be09 100644
--- a/apps/builder/app/shared/resources.ts
+++ b/apps/builder/app/shared/resources.ts
@@ -45,6 +45,8 @@ const diagnosticsErrorCache = new Map<string, unknown>();
const performanceCache = new Map<string, ResourcePerformance>();
const pendingDiagnostics = new Map<string, InFlightResourceDiagnostics>();
const knownRequests = new Map<string, ResourceRequest>();
+const pageRequestKeys = new Set<string>();
+const previewRequests = new Map<string, Set<symbol>>();
const resourceVersions = new Map<string, number>();
const inFlightBatches = new Set<InFlightResourceBatch>();
@@ -233,18 +235,18 @@ const invalidateRequestState = (key: string) => {
resourceVersions.set(key, (resourceVersions.get(key) ?? 0) + 1);
};
-const queueResources = (resources: readonly ResourceRequest[]) => {
- const currentKeys = new Set(resources.map(getResourceKey));
+const removeObsoleteRequests = () => {
let pendingChanged = false;
let diagnosticsChanged = false;
for (const key of knownRequests.keys()) {
- if (currentKeys.has(key) === false) {
- knownRequests.delete(key);
- invalidateRequestState(key);
- diagnosticsChanged = true;
- pendingChanged = queue.delete(key) || pendingChanged;
- pendingChanged = pending.delete(key) || pendingChanged;
+ if (pageRequestKeys.has(key) || previewRequests.has(key)) {
+ continue;
}
+ knownRequests.delete(key);
+ invalidateRequestState(key);
+ diagnosticsChanged = true;
+ pendingChanged = queue.delete(key) || pendingChanged;
+ pendingChanged = pending.delete(key) || pendingChanged;
}
abortObsoleteBatches();
if (diagnosticsChanged) {
@@ -253,6 +255,14 @@ const queueResources = (resources: readonly ResourceRequest[]) => {
if (pendingChanged) {
updatePending();
}
+};
+
+const queueResources = (resources: readonly ResourceRequest[]) => {
+ pageRequestKeys.clear();
+ for (const resource of resources) {
+ pageRequestKeys.add(getResourceKey(resource));
+ }
+ removeObsoleteRequests();
for (const resource of resources) {
preloadResource(resource);
}
@@ -285,9 +295,28 @@ const queueInvalidatedResource = (resource: ResourceRequest) => {
updatePending();
};
-export const invalidateResource = (resource: ResourceRequest) => {
+/** Keep an explicitly requested preview alive until its dialog releases it. */
+export const loadResourcePreview = (
+ resource: ResourceRequest,
+ requestFetch: typeof fetch = fetch
+) => {
+ const key = getResourceKey(resource);
+ const lease = Symbol();
+ const leases = previewRequests.get(key) ?? new Set<symbol>();
+ leases.add(lease);
+ previewRequests.set(key, leases);
queueInvalidatedResource(resource);
- startLoading();
+ startLoading(requestFetch);
+ return () => {
+ const activeLeases = previewRequests.get(key);
+ if (activeLeases?.delete(lease) !== true) {
+ return;
+ }
+ if (activeLeases.size === 0) {
+ previewRequests.delete(key);
+ removeObsoleteRequests();
+ }
+ };
};
/**
@@ -603,6 +632,8 @@ const reset = () => {
}
pendingDiagnostics.clear();
knownRequests.clear();
+ pageRequestKeys.clear();
+ previewRequests.clear();
resourceVersions.clear();
updateCache();
updatePending();