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: hide the CMS banner until released (#2937)

Oleg Isonenf56025616077
diff --git a/apps/builder/app/builder/features/project-settings/project-settings.tsx b/apps/builder/app/builder/features/project-settings/project-settings.tsx
index f52517d2dd..30dd8e783c 100644
--- a/apps/builder/app/builder/features/project-settings/project-settings.tsx
+++ b/apps/builder/app/builder/features/project-settings/project-settings.tsx
@@ -8,7 +8,6 @@ import {
Separator,
ScrollArea,
} from "@webstudio-is/design-system";
-import { isFeatureEnabled } from "@webstudio-is/feature-flags";
import { $isProjectSettingsOpen } from "~/shared/nano-states/seo";
import { MetaSection } from "./meta-section";
import { CompilerSection } from "./compiler-section";
@@ -37,12 +36,8 @@ const ProjectSettingsView = ({
<MetaSection />
<Separator />
<CompilerSection />
- {isFeatureEnabled("redirects") && (
- <>
- <Separator />
- <RedirectSection />
- </>
- )}
+ <Separator />
+ <RedirectSection />
<div />
</Grid>
</ScrollArea>
diff --git a/apps/builder/app/builder/features/settings-panel/settings-panel.tsx b/apps/builder/app/builder/features/settings-panel/settings-panel.tsx
index 64cb344776..0ba8fd7ca1 100644
--- a/apps/builder/app/builder/features/settings-panel/settings-panel.tsx
+++ b/apps/builder/app/builder/features/settings-panel/settings-panel.tsx
@@ -2,7 +2,6 @@ import type { Instance } from "@webstudio-is/sdk";
import { SettingsSection } from "./settings-section";
import { PropsSectionContainer } from "./props-section/props-section";
import { VariablesSection } from "./variables-section";
-import { isFeatureEnabled } from "@webstudio-is/feature-flags";
export const SettingsPanelContainer = ({
selectedInstance,
@@ -13,7 +12,7 @@ export const SettingsPanelContainer = ({
<>
<SettingsSection />
<PropsSectionContainer selectedInstance={selectedInstance} />
- {isFeatureEnabled("bindings") && <VariablesSection />}
+ <VariablesSection />
</>
);
};
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx b/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx
index 876596faf9..1461d5fd7a 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx
@@ -27,7 +27,6 @@ import { MetaIcon } from "~/builder/shared/meta-icon";
import { $registeredComponentMetas } from "~/shared/nano-states";
import { getMetaMaps } from "./get-meta-maps";
import { getInstanceLabel } from "~/shared/instance-utils";
-import { isFeatureEnabled } from "@webstudio-is/feature-flags";
export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {
const metaByComponentName = useStore($registeredComponentMetas);
@@ -80,10 +79,7 @@ export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {
if (component === undefined) {
return;
}
- if (
- component === collectionComponent &&
- isFeatureEnabled("bindings") === false
- ) {
+ if (component === collectionComponent) {
return;
}
return (
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx
index 3e8b329937..8623e1ac47 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx
@@ -544,6 +544,7 @@ const FormFields = ({
const fieldIds = useIds(fieldNames);
const assets = useStore($assets);
const pages = useStore($pages);
+ const { allowDynamicData } = useStore($userPlanFeatures);
const { variableValues, scope, aliases } = useStore($pageRootScope);
const pageUrl = usePageUrl(values, pathParamsDataSourceId);
@@ -622,7 +623,7 @@ const FormFields = ({
</Grid>
</Grid>
- {isFeatureEnabled("folders") && values.isHomePage === false && (
+ {values.isHomePage === false && (
<Grid gap={1}>
<Label htmlFor={fieldIds.parentFolderId}>Parent Folder</Label>
<Select
@@ -652,37 +653,37 @@ const FormFields = ({
)}
{isFeatureEnabled("cms") && (
- <StatusField
- errors={errors.status}
- value={values.status}
- onChange={(value) => onChange({ field: "status", value })}
- />
- )}
-
- {isFeatureEnabled("cms") && (
- <RedirectField
- errors={errors.redirect}
- value={values.redirect}
- onChange={(value) => onChange({ field: "redirect", value })}
- />
+ <>
+ <StatusField
+ errors={errors.status}
+ value={values.status}
+ onChange={(value) => onChange({ field: "status", value })}
+ />
+ <RedirectField
+ errors={errors.redirect}
+ value={values.redirect}
+ onChange={(value) => onChange({ field: "redirect", value })}
+ />
+ {allowDynamicData === false && (
+ <PanelBanner>
+ <Text>
+ Dynamic routing, redirect and status code are a part of the
+ CMS functionality.
+ </Text>
+ <Flex align="center" gap={1}>
+ <UploadIcon />
+ <Link
+ color="inherit"
+ target="_blank"
+ href="https://webstudio.is/pricing"
+ >
+ Upgrade to Pro
+ </Link>
+ </Flex>
+ </PanelBanner>
+ )}
+ </>
)}
-
- <PanelBanner>
- <Text>
- Dynamic routing, redirect and status code are a part of the CMS
- functionality.
- </Text>
- <Flex align="center" gap={1}>
- <UploadIcon />
- <Link
- color="inherit"
- target="_blank"
- href="https://webstudio.is/pricing"
- >
- Upgrade to Pro
- </Link>
- </Flex>
- </PanelBanner>
</Grid>
<Separator />
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx
index 7685ebf0a9..020f2d2f9c 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx
@@ -42,7 +42,6 @@ import {
NewFolderSettings,
newFolderId,
} from "./folder-settings";
-import { isFeatureEnabled } from "@webstudio-is/feature-flags";
import { serverSyncStore } from "~/shared/sync";
import { useMount } from "~/shared/hook-utils/use-mount";
import { ROOT_FOLDER_ID, type Folder } from "@webstudio-is/sdk";
@@ -249,16 +248,14 @@ const PagesPanel = ({
title="Pages"
suffix={
<>
- {isFeatureEnabled("folders") && (
- <Tooltip content="New folder" side="bottom">
- <Button
- onClick={() => onCreateNewFolder()}
- aria-label="New folder"
- prefix={<NewFolderIcon />}
- color="ghost"
- />
- </Tooltip>
- )}
+ <Tooltip content="New folder" side="bottom">
+ <Button
+ onClick={() => onCreateNewFolder()}
+ aria-label="New folder"
+ prefix={<NewFolderIcon />}
+ color="ghost"
+ />
+ </Tooltip>
<Tooltip content="New page" side="bottom">
<Button
onClick={() => onCreateNewPage()}
diff --git a/apps/builder/app/builder/features/style-panel/sections/layout/layout.tsx b/apps/builder/app/builder/features/style-panel/sections/layout/layout.tsx
index 8338229098..bcba9b1749 100644
--- a/apps/builder/app/builder/features/style-panel/sections/layout/layout.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/layout/layout.tsx
@@ -34,8 +34,8 @@ import {
CssValueInput,
} from "../../shared/css-value-input";
import { theme } from "@webstudio-is/design-system";
-import { isFeatureEnabled } from "@webstudio-is/feature-flags";
import { TooltipContent } from "../../../style-panel/shared/property-name";
+import { isFeatureEnabled } from "@webstudio-is/feature-flags";
const GapLinked = ({
isLinked,
@@ -454,6 +454,7 @@ const orderedDisplayValues = [
"inline",
"none",
];
+
if (isFeatureEnabled("displayContents")) {
orderedDisplayValues.push("contents");
}
diff --git a/apps/builder/app/builder/shared/binding-popover.tsx b/apps/builder/app/builder/shared/binding-popover.tsx
index b00cc3194d..91a29b0632 100644
--- a/apps/builder/app/builder/shared/binding-popover.tsx
+++ b/apps/builder/app/builder/shared/binding-popover.tsx
@@ -9,7 +9,6 @@ import {
useContext,
type ReactNode,
} from "react";
-import { isFeatureEnabled } from "@webstudio-is/feature-flags";
import {
DotIcon,
InfoCircleIcon,
@@ -396,9 +395,6 @@ export const BindingPopover = ({
const hasUnsavedChange = useRef<boolean>(false);
const preventedClosing = useRef<boolean>(false);
- if (isFeatureEnabled("bindings") === false) {
- return;
- }
const valueError = validate?.(evaluateExpressionWithinScope(value, scope));
return (
<FloatingPanelPopover
diff --git a/packages/feature-flags/src/flags.ts b/packages/feature-flags/src/flags.ts
index 163206b4ee..3f28a4c4b0 100644
--- a/packages/feature-flags/src/flags.ts
+++ b/packages/feature-flags/src/flags.ts
@@ -1,9 +1,6 @@
+// Only for development, is not supposed to be enabled at all.
+export const displayContents = false;
export const dark = false;
export const unsupportedBrowsers = false;
-export const displayContents = false;
-export const ai = true;
export const aiRadixComponents = false;
-export const bindings = false;
export const cms = false;
-export const folders = false;
-export const redirects = false;