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.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
feat: support contact email list (#4391)
Bogdan Chadkin4945c8ba8d85
diff --git a/apps/builder/app/builder/features/project-settings/section-general.tsx b/apps/builder/app/builder/features/project-settings/section-general.tsxindex 58561a62e3..f44cdda137 100644--- a/apps/builder/app/builder/features/project-settings/section-general.tsx+++ b/apps/builder/app/builder/features/project-settings/section-general.tsx@@ -14,6 +14,7 @@ import {Tooltip,InputErrorsTooltip,ProBadge,+ TextArea,} from "@webstudio-is/design-system";import { InfoCircleIcon } from "@webstudio-is/icons";import { ImageControl } from "./image-control";@@ -44,38 +45,61 @@ const defaultMetaSettings: ProjectMeta = {const Email = z.string().email();+const validateContactEmail = (+ contactEmail: string,+ maxContactEmails: number+) => {+ contactEmail = contactEmail.trim();+ if (contactEmail.length === 0) {+ return;+ }+ const emails = contactEmail.split(/\s*,\s*/);+ if (emails.length > maxContactEmails) {+ return `Only ${maxContactEmails} emails are allowed.`;+ }+ if (emails.every((email) => Email.safeParse(email).success) === false) {+ return "Contact email is invalid.";+ }+};++const saveSetting = <Name extends keyof ProjectMeta>(+ name: keyof ProjectMeta,+ value: ProjectMeta[Name]+) => {+ serverSyncStore.createTransaction([$pages], (pages) => {+ if (pages === undefined) {+ return;+ }+ if (pages.meta === undefined) {+ pages.meta = {};+ }+ pages.meta[name] = value;+ });+};+export const SectionGeneral = () => {- const { allowContactEmail } = useStore($userPlanFeatures);+ const { maxContactEmails } = useStore($userPlanFeatures);+ const allowContactEmail = maxContactEmails > 0;const [meta, setMeta] = useState(() => $pages.get()?.meta ?? defaultMetaSettings);const siteNameId = useId();const contactEmailId = useId();- const contactEmailError =- (meta.contactEmail ?? "").trim().length === 0 ||- Email.safeParse(meta.contactEmail).success- ? undefined- : "Contact email is invalid.";+ const contactEmailError = validateContactEmail(+ meta.contactEmail ?? "",+ maxContactEmails+ );const assets = useStore($assets);const asset = assets.get(meta.faviconAssetId ?? "");const favIconUrl = asset ? `${asset.name}` : undefined;const imageLoader = useStore($imageLoader);- const handleSave = <Setting extends keyof ProjectMeta>(setting: Setting) => {- return (value: ProjectMeta[Setting]) => {- setMeta({- ...meta,- [setting]: value,- });- serverSyncStore.createTransaction([$pages], (pages) => {- if (pages === undefined) {- return;- }- if (pages.meta === undefined) {- pages.meta = {};- }- pages.meta[setting] = value;- });+ const handleSave = <Name extends keyof ProjectMeta>(+ name: keyof ProjectMeta+ ) => {+ return (value: ProjectMeta[Name]) => {+ setMeta({ ...meta, [name]: value });+ saveSetting(name, value);};};@@ -120,14 +144,19 @@ export const SectionGeneral = () => {<InputErrorsTooltiperrors={contactEmailError ? [contactEmailError] : undefined}>- <InputField+ <TextAreaid={contactEmailId}color={contactEmailError ? "error" : undefined}- placeholder="[email protected]"+ placeholder="[email protected], [email protected]"disabled={allowContactEmail === false}+ autoGrow={true}+ rows={1}value={meta.contactEmail ?? ""}- onChange={(event) => {- handleSave("contactEmail")(event.target.value);+ onChange={(value) => {+ setMeta({ ...meta, contactEmail: value });+ if (validateContactEmail(value, maxContactEmails) === undefined) {+ saveSetting("contactEmail", value);+ }}}/></InputErrorsTooltip>diff --git a/apps/builder/app/builder/shared/nano-states/index.ts b/apps/builder/app/builder/shared/nano-states/index.tsindex 2ace57ff4e..809d6b10d5 100644--- a/apps/builder/app/builder/shared/nano-states/index.ts+++ b/apps/builder/app/builder/shared/nano-states/index.ts@@ -41,7 +41,7 @@ export const $activeInspectorPanel = atom<"style" | "settings">("style");export const $userPlanFeatures = atom<UserPlanFeatures>({allowShareAdminLinks: false,allowDynamicData: false,- allowContactEmail: false,+ maxContactEmails: 0,maxDomainsAllowedPerUser: 1,hasSubscription: false,hasProPlan: false,diff --git a/apps/builder/app/dashboard/dashboard.stories.tsx b/apps/builder/app/dashboard/dashboard.stories.tsxindex 492f517371..df934b783d 100644--- a/apps/builder/app/dashboard/dashboard.stories.tsx+++ b/apps/builder/app/dashboard/dashboard.stories.tsx@@ -33,7 +33,7 @@ const userPlanFeatures: UserPlanFeatures = {hasSubscription: false,allowShareAdminLinks: false,allowDynamicData: false,- allowContactEmail: false,+ maxContactEmails: 0,maxDomainsAllowedPerUser: 1,};diff --git a/apps/builder/app/shared/db/user-plan-features.server.ts b/apps/builder/app/shared/db/user-plan-features.server.tsindex a671dc29f7..f1dad96091 100644--- a/apps/builder/app/shared/db/user-plan-features.server.ts+++ b/apps/builder/app/shared/db/user-plan-features.server.ts@@ -44,7 +44,7 @@ export const getUserPlanFeatures = async (return {allowShareAdminLinks: true,allowDynamicData: true,- allowContactEmail: true,+ maxContactEmails: 5,maxDomainsAllowedPerUser: Number.MAX_SAFE_INTEGER,hasSubscription,hasProPlan: true,@@ -56,7 +56,7 @@ export const getUserPlanFeatures = async (return {allowShareAdminLinks: true,allowDynamicData: true,- allowContactEmail: true,+ maxContactEmails: 5,maxDomainsAllowedPerUser: Number.MAX_SAFE_INTEGER,hasSubscription: true,hasProPlan: true,@@ -67,7 +67,7 @@ export const getUserPlanFeatures = async (return {allowShareAdminLinks: false,allowDynamicData: false,- allowContactEmail: false,+ maxContactEmails: 0,maxDomainsAllowedPerUser: 1,hasSubscription: false,hasProPlan: false,diff --git a/packages/trpc-interface/src/context/context.server.ts b/packages/trpc-interface/src/context/context.server.tsindex 87ea1915a6..efcc8c8a58 100644--- a/packages/trpc-interface/src/context/context.server.ts+++ b/packages/trpc-interface/src/context/context.server.ts@@ -66,7 +66,7 @@ type DeploymentContext = {type UserPlanFeatures = {allowShareAdminLinks: boolean;allowDynamicData: boolean;- allowContactEmail: boolean;+ maxContactEmails: number;maxDomainsAllowedPerUser: number;hasSubscription: boolean;} & (