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.

feat: restore system params from history first entry (#3388)

Bogdan Chadkinb0923cdaca93
diff --git a/apps/builder/app/builder/features/address-bar.tsx b/apps/builder/app/builder/features/address-bar.tsx
index 3ea4318a36..e33113e2ec 100644
--- a/apps/builder/app/builder/features/address-bar.tsx
+++ b/apps/builder/app/builder/features/address-bar.tsx
@@ -38,6 +38,7 @@ import {
$pages,
$publishedOrigin,
$selectedPage,
+ $selectedPageDefaultSystem,
updateSystem,
} from "~/shared/nano-states";
import {
@@ -62,15 +63,15 @@ const $selectedPagePath = computed([$selectedPage, $pages], (page, pages) => {
});
const $selectedPagePathParams = computed(
- [$selectedPage, $dataSourceVariables],
- (selectedPage, dataSourceVariables) => {
+ [$selectedPageDefaultSystem, $selectedPage, $dataSourceVariables],
+ (defaultSystem, selectedPage, dataSourceVariables) => {
if (selectedPage === undefined) {
- return {};
+ return defaultSystem.params;
}
const system = dataSourceVariables.get(selectedPage.systemDataSourceId) as
| undefined
| System;
- return system?.params;
+ return system?.params ?? defaultSystem.params;
}
);
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 8295f391a1..aaa8f29778 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
@@ -351,9 +351,11 @@ const $editingPage = computed(
const $editingPagePath = computed($editingPage, (page) => page?.path);
+const $editingPageHistory = computed($editingPage, (page) => page?.history);
+
const $editingPageDefaultSystem = computed(
- [$publishedOrigin, $editingPagePath],
- (origin, path) => getPageDefaultSystem({ origin, path })
+ [$publishedOrigin, $editingPagePath, $editingPageHistory],
+ (origin, path, history) => getPageDefaultSystem({ origin, path, history })
);
const $pageRootVariableValues = computed(
diff --git a/apps/builder/app/shared/nano-states/variables.ts b/apps/builder/app/shared/nano-states/variables.ts
index fc205c5bae..e4f2fa0f9c 100644
--- a/apps/builder/app/shared/nano-states/variables.ts
+++ b/apps/builder/app/shared/nano-states/variables.ts
@@ -1,6 +1,9 @@
import { atom, computed } from "nanostores";
import type { DataSource, Page, Resource, System } from "@webstudio-is/sdk";
-import { tokenizePathnamePattern } from "~/builder/shared/url-pattern";
+import {
+ matchPathnamePattern,
+ tokenizePathnamePattern,
+} from "~/builder/shared/url-pattern";
import { $publishedOrigin } from "./nano-states";
import { $selectedPage } from "./pages";
@@ -13,9 +16,11 @@ export const $resourceValues = atom(new Map<Resource["id"], unknown>());
export const getPageDefaultSystem = ({
origin,
path,
+ history,
}: {
origin: string;
path?: string;
+ history?: string[];
}) => {
const defaultSystem: System = {
params: {},
@@ -24,9 +29,16 @@ export const getPageDefaultSystem = ({
};
if (path) {
const tokens = tokenizePathnamePattern(path);
+ // try to match the first item in history to let user
+ // see the page without manually entering params
+ // or selecting them in address bar
+ const matchedParams = history
+ ? matchPathnamePattern(path, history[0])
+ : undefined;
for (const token of tokens) {
if (token.type === "param") {
- defaultSystem.params[token.name] = undefined;
+ defaultSystem.params[token.name] =
+ matchedParams?.[token.name] ?? undefined;
}
}
}
@@ -35,9 +47,11 @@ export const getPageDefaultSystem = ({
const $selectedPagePath = computed($selectedPage, (page) => page?.path);
+const $selectedPageHistory = computed($selectedPage, (page) => page?.history);
+
export const $selectedPageDefaultSystem = computed(
- [$publishedOrigin, $selectedPagePath],
- (origin, path) => getPageDefaultSystem({ origin, path })
+ [$publishedOrigin, $selectedPagePath, $selectedPageHistory],
+ (origin, path, history) => getPageDefaultSystem({ origin, path, history })
);
export const mergeSystem = (left: System, right?: System): System => {