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 system variable in resource (#3092)

Bogdan Chadkin3b65b1cdbe74
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 9103829dd2..f94e37ee79 100644
--- a/apps/builder/app/builder/features/settings-panel/resource-panel.tsx
+++ b/apps/builder/app/builder/features/settings-panel/resource-panel.tsx
@@ -27,13 +27,14 @@ import {
theme,
} from "@webstudio-is/design-system";
import { DeleteIcon, PlusIcon } from "@webstudio-is/icons";
+import { isFeatureEnabled } from "@webstudio-is/feature-flags";
import { humanizeString } from "~/shared/string-utils";
import { serverSyncStore } from "~/shared/sync";
import {
$dataSources,
- $pages,
$resources,
$selectedInstanceSelector,
+ $selectedPage,
$variableValuesByInstanceSelector,
} from "~/shared/nano-states";
import {
@@ -248,8 +249,8 @@ const Headers = ({
};
const $hiddenDataSourceIds = computed(
- [$dataSources, $pages],
- (dataSources, pages) => {
+ [$dataSources, $selectedPage],
+ (dataSources, page) => {
const dataSourceIds = new Set<DataSource["id"]>();
for (const dataSource of dataSources.values()) {
// hide collection item and component parameters from resources
@@ -262,12 +263,8 @@ const $hiddenDataSourceIds = computed(
dataSourceIds.add(dataSource.id);
}
}
- if (pages) {
- for (const page of pages.pages) {
- if (page.systemDataSourceId) {
- dataSourceIds.delete(page.systemDataSourceId);
- }
- }
+ if (page?.systemDataSourceId && isFeatureEnabled("filters")) {
+ dataSourceIds.delete(page.systemDataSourceId);
}
return dataSourceIds;
}
diff --git a/apps/builder/app/shared/nano-states/props.ts b/apps/builder/app/shared/nano-states/props.ts
index 878d24245e..fe36a7a844 100644
--- a/apps/builder/app/shared/nano-states/props.ts
+++ b/apps/builder/app/shared/nano-states/props.ts
@@ -346,7 +346,7 @@ export const $variableValuesByInstanceSelector = computed(
for (const variable of variables) {
if (
variable.id === page.systemDataSourceId &&
- isFeatureEnabled("cms") === false
+ isFeatureEnabled("filters") === false
) {
continue;
}