feature flag

Author: carderne

apps/webapp/app/components/navigation/EnvironmentSelector.tsx

@@ -52,6 +52,7 @@ export function EnvironmentSelector({
   }, [navigation.location?.pathname]);
 
   const hasStaging = project.environments.some((env) => env.type === "STAGING");
+  const devBranchesEnabled = Boolean(organization.featureFlags?.devBranchesEnabled);
 
   return (
     <Popover onOpenChange={(open) => setIsMenuOpen(open)} open={isMenuOpen}>
@@ -108,7 +109,14 @@ export function EnvironmentSelector({
           {project.environments
             .filter((env) => env.parentEnvironmentId === null)
             .map((env) => {
-              if (isBranchableEnvironment(env)) {
+              // DEVELOPMENT is only branchable in the UI when the org has the
+              // multi-branch dev flag on. Without it, dev renders as a plain
+              // selector button (the original behavior). PREVIEW is unaffected.
+              const renderAsBranchable =
+                isBranchableEnvironment(env) &&
+                (env.type !== "DEVELOPMENT" || devBranchesEnabled);
+
+              if (renderAsBranchable) {
                 const branchEnvironments = project.environments.filter(
                   (e) => e.parentEnvironmentId === env.id
                 );

apps/webapp/app/v3/canAccessDevBranches.server.ts

@@ -0,0 +1,17 @@
+import { prisma } from "~/db.server";
+import { FEATURE_FLAG } from "~/v3/featureFlags";
+import { makeFlag } from "~/v3/featureFlags.server";
+
+export async function canAccessDevBranches(organizationId: string): Promise<boolean> {
+  const org = await prisma.organization.findFirst({
+    where: { id: organizationId },
+    select: { featureFlags: true },
+  });
+
+  const flag = makeFlag();
+  return flag({
+    key: FEATURE_FLAG.devBranchesEnabled,
+    defaultValue: false,
+    overrides: (org?.featureFlags as Record<string, unknown>) ?? {},
+  });
+}

apps/webapp/app/v3/featureFlags.ts

@@ -16,6 +16,7 @@ export const FEATURE_FLAG = {
   computeMigrationFreePercentage: "computeMigrationFreePercentage",
   computeMigrationPaidPercentage: "computeMigrationPaidPercentage",
   computeMigrationRequireTemplate: "computeMigrationRequireTemplate",
+  devBranchesEnabled: "devBranchesEnabled",
 } as const;
 
 export const FeatureFlagCatalog = {
@@ -43,6 +44,8 @@ export const FeatureFlagCatalog = {
   // When on, migrated orgs build their compute template in required mode at deploy
   // (fails the deploy on error) instead of shadow. Strict boolean (see above).
   [FEATURE_FLAG.computeMigrationRequireTemplate]: z.boolean(),
+  // Per-org access to development branches. Off unless enabled for the org.
+  [FEATURE_FLAG.devBranchesEnabled]: z.coerce.boolean(),
 };
 
 export type FeatureFlagKey = keyof typeof FeatureFlagCatalog;