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.

experimental: show page variables for editing page (#2995)

Bogdan Chadkinc5cdbc66b0a0
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.test.ts b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.test.ts
index a3c5353bb9..f83cdebb90 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.test.ts
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.test.ts
@@ -13,12 +13,17 @@ import {
filterSelfAndChildren,
getExistingRoutePaths,
duplicatePage,
+ $editingPagesItemId,
+ $pageRootScope,
} from "./page-utils";
import {
+ $dataSourceVariables,
$dataSources,
$instances,
$pages,
$project,
+ $resourceValues,
+ $selectedPageId,
} from "~/shared/nano-states";
import { registerContainers } from "~/shared/sync";
import { encodeDataSourceVariable } from "@webstudio-is/react-sdk";
@@ -789,3 +794,90 @@ describe("duplicate page", () => {
});
});
});
+
+test("page root scope should rely on editing page", () => {
+ const pages = createDefaultPages({
+ rootInstanceId: "homeRootId",
+ homePageId: "homePageId",
+ });
+ pages.pages.push({
+ id: "pageId",
+ rootInstanceId: "pageRootId",
+ name: "My Name",
+ path: "/",
+ title: `"My Title"`,
+ meta: {},
+ });
+ $pages.set(pages);
+ $selectedPageId.set("homePageId");
+ $editingPagesItemId.set("pageId");
+ $dataSources.set(
+ toMap([
+ {
+ id: "1",
+ scopeInstanceId: "homeRootId",
+ name: "home variable",
+ type: "variable",
+ value: { type: "string", value: "" },
+ },
+ {
+ id: "2",
+ scopeInstanceId: "pageRootId",
+ name: "page variable",
+ type: "variable",
+ value: { type: "string", value: "" },
+ },
+ ])
+ );
+ expect($pageRootScope.get()).toEqual({
+ aliases: new Map([["$ws$dataSource$2", "page variable"]]),
+ scope: { $ws$dataSource$2: "" },
+ variableValues: new Map([["2", ""]]),
+ });
+});
+
+test("page root scope should use variable and resource values", () => {
+ $pages.set(
+ createDefaultPages({
+ rootInstanceId: "homeRootId",
+ homePageId: "homePageId",
+ })
+ );
+ $editingPagesItemId.set("homePageId");
+ $dataSources.set(
+ toMap([
+ {
+ id: "valueVariableId",
+ scopeInstanceId: "homeRootId",
+ name: "value variable",
+ type: "variable",
+ value: { type: "string", value: "" },
+ },
+ {
+ id: "resourceVariableId",
+ scopeInstanceId: "homeRootId",
+ name: "resource variable",
+ type: "resource",
+ resourceId: "resourceId",
+ },
+ ])
+ );
+ $dataSourceVariables.set(
+ new Map([["valueVariableId", "value variable value"]])
+ );
+ $resourceValues.set(new Map([["resourceId", "resource variable value"]]));
+ expect($pageRootScope.get()).toEqual({
+ aliases: new Map([
+ ["$ws$dataSource$valueVariableId", "value variable"],
+ ["$ws$dataSource$resourceVariableId", "resource variable"],
+ ]),
+ scope: {
+ $ws$dataSource$resourceVariableId: "resource variable value",
+ $ws$dataSource$valueVariableId: "value variable value",
+ },
+ variableValues: new Map([
+ ["valueVariableId", "value variable value"],
+ ["resourceVariableId", "resource variable value"],
+ ]),
+ });
+});
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts
index f1bd115375..e8f5e5e53b 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts
@@ -26,11 +26,12 @@ import {
updateWebstudioData,
} from "~/shared/instance-utils";
import {
+ $dataSourceVariables,
$dataSources,
$pages,
+ $resourceValues,
$selectedInstanceSelector,
$selectedPageId,
- $variableValuesByInstanceSelector,
} from "~/shared/nano-states";
type TreePage = {
@@ -308,30 +309,53 @@ const $editingPage = computed(
}
);
+const $pageRootVariableValues = computed(
+ [$editingPage, $dataSources, $dataSourceVariables, $resourceValues],
+ (page, dataSources, dataSourceVariables, resourceValues) => {
+ const variableValues = new Map<string, unknown>();
+ if (page === undefined) {
+ return variableValues;
+ }
+ for (const variable of dataSources.values()) {
+ if (variable.scopeInstanceId !== page.rootInstanceId) {
+ continue;
+ }
+ if (variable.type === "variable") {
+ const value = dataSourceVariables.get(variable.id);
+ variableValues.set(variable.id, value ?? variable.value.value);
+ }
+ if (variable.type === "parameter") {
+ const value = dataSourceVariables.get(variable.id);
+ variableValues.set(variable.id, value);
+ }
+ if (variable.type === "resource") {
+ const value = resourceValues.get(variable.resourceId);
+ variableValues.set(variable.id, value);
+ }
+ }
+ return variableValues;
+ }
+);
+
export const $pageRootScope = computed(
- [$editingPage, $variableValuesByInstanceSelector, $dataSources],
- (editingPage, variableValuesByInstanceSelector, dataSources) => {
+ [$editingPage, $pageRootVariableValues, $dataSources],
+ (editingPage, pageRootVariableValues, dataSources) => {
const scope: Record<string, unknown> = {};
const aliases = new Map<string, string>();
const defaultValues = new Map<string, unknown>();
if (editingPage === undefined) {
return { variableValues: defaultValues, scope, aliases };
}
- const values = variableValuesByInstanceSelector.get(
- JSON.stringify([editingPage.rootInstanceId])
- );
- if (values) {
- for (const [dataSourceId, value] of values) {
- const dataSource = dataSources.get(dataSourceId);
- if (dataSource === undefined) {
- continue;
- }
- const name = encodeDataSourceVariable(dataSourceId);
- scope[name] = value;
- aliases.set(name, dataSource.name);
+ for (const [dataSourceId, value] of pageRootVariableValues) {
+ const dataSource = dataSources.get(dataSourceId);
+ if (dataSource === undefined) {
+ continue;
}
+ const name = encodeDataSourceVariable(dataSourceId);
+ scope[name] = value;
+ aliases.set(name, dataSource.name);
}
- return { variableValues: values ?? defaultValues, scope, aliases };
+ return { variableValues: pageRootVariableValues, scope, aliases };
}
);