Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
🚩 Feature flag billing (#1848)
Luke Vellabfc9516acc6d
diff --git a/apps/web/src/app/[locale]/(space)/account/billing/page.tsx b/apps/web/src/app/[locale]/(space)/account/billing/page.tsxindex 2abfb06ae..a39b6f0de 100644--- a/apps/web/src/app/[locale]/(space)/account/billing/page.tsx+++ b/apps/web/src/app/[locale]/(space)/account/billing/page.tsx@@ -31,8 +31,8 @@ import { PayWallDialog } from "@/components/pay-wall-dialog";import { Trans } from "@/components/trans";import { loadPaymentMethods, loadSubscription } from "@/features/spaces/data";import { getTranslation } from "@/i18n/server";+import { isFeatureEnabled } from "@/lib/feature-flags/server";import { FormattedDateTime } from "@/lib/timezone/client/formatted-date-time";-import { isSelfHosted } from "@/utils/constants";import {SettingsContent,SettingsSection,@@ -42,10 +42,6 @@ import { SubscriptionPrice } from "./components/subscription-price";import { SubscriptionStatus } from "./components/subscription-status";async function loadData() {- if (isSelfHosted) {- notFound();- }-const [user, subscription, paymentMethods] = await Promise.all([loadCurrentUser(),loadSubscription(),@@ -56,6 +52,10 @@ async function loadData() {}export default async function Page() {+ if (!isFeatureEnabled("billing")) {+ notFound();+ }+const { user, subscription, paymentMethods } = await loadData();return (diff --git a/apps/web/src/app/[locale]/layout.tsx b/apps/web/src/app/[locale]/layout.tsxindex f1fdcd909..b2c411226 100644--- a/apps/web/src/app/[locale]/layout.tsx+++ b/apps/web/src/app/[locale]/layout.tsx@@ -16,7 +16,7 @@ import { getUser } from "@/features/user/queries";import { I18nProvider } from "@/i18n/client";import { getLocale } from "@/i18n/server/get-locale";import { FeatureFlagsProvider } from "@/lib/feature-flags/client";-import { isStorageEnabled } from "@/lib/storage";+import { featureFlagConfig } from "@/lib/feature-flags/config";import { TimezoneProvider } from "@/lib/timezone/client/context";import { auth } from "@/next-auth";import { TRPCProvider } from "@/trpc/client/provider";@@ -68,7 +68,7 @@ export default async function Root({return (<html lang={locale} className={inter.className}><body>- <FeatureFlagsProvider value={{ storage: isStorageEnabled }}>+ <FeatureFlagsProvider value={featureFlagConfig}><Toaster /><I18nProvider locale={locale}><TRPCProvider>diff --git a/apps/web/src/lib/feature-flags/config.ts b/apps/web/src/lib/feature-flags/config.tsnew file mode 100644index 000000000..4c95ea2d6--- /dev/null+++ b/apps/web/src/lib/feature-flags/config.ts@@ -0,0 +1,8 @@+import type { FeatureFlagConfig } from "@/lib/feature-flags/types";+import { isStorageEnabled } from "@/lib/storage";+import { isSelfHosted } from "@/utils/constants";++export const featureFlagConfig: FeatureFlagConfig = {+ storage: isStorageEnabled,+ billing: !isSelfHosted,+};diff --git a/apps/web/src/lib/feature-flags/server.ts b/apps/web/src/lib/feature-flags/server.tsnew file mode 100644index 000000000..56b6c7ed4--- /dev/null+++ b/apps/web/src/lib/feature-flags/server.ts@@ -0,0 +1,7 @@+import "server-only";+import type { Feature } from "@/lib/feature-flags/types";+import { featureFlagConfig } from "./config";++export function isFeatureEnabled(feature: Feature) {+ return featureFlagConfig[feature];+}diff --git a/apps/web/src/lib/feature-flags/types.ts b/apps/web/src/lib/feature-flags/types.tsindex 83e7999ed..dbb6733c7 100644--- a/apps/web/src/lib/feature-flags/types.ts+++ b/apps/web/src/lib/feature-flags/types.ts@@ -1,5 +1,6 @@export interface FeatureFlagConfig {storage: boolean;+ billing: boolean;}export type Feature = keyof FeatureFlagConfig;