simplify new env var logic

Author: carderne

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables.new/route.tsx

@@ -220,12 +220,12 @@ export default function Page() {
   const [selectedEnvironmentIds, setSelectedEnvironmentIds] = useState<Set<string>>(new Set());
   const [selectedBranchId, setSelectedBranchId] = useState<string | undefined>(undefined);
 
-  const branchEnvironments = environments.filter((env) => env.parentEnvironmentId !== null);
+  // TODO for no we only support branch-specific env vars for Preview environments
+  // Mostly to keep the UX for setting consistent env-vars across Dev/Staging/Prod easier
+  const previewBranches = environments.filter((env) => env.type === "PREVIEW" && env.parentEnvironmentId !== null);
   const nonBranchEnvironments = environments.filter((env) => env.parentEnvironmentId === null);
   const selectedEnvironments = environments.filter((env) => selectedEnvironmentIds.has(env.id));
-  const previewIsSelected = selectedEnvironments.some(
-    (env) => env.parentEnvironmentId !== null || env.type === "PREVIEW"
-  );
+  const previewIsSelected = selectedEnvironments.some((env) => env.type === "PREVIEW");
 
   const isLoading = navigation.state !== "idle" && navigation.formMethod === "post";
 
@@ -406,15 +406,15 @@ export default function Page() {
                     value={selectedBranchId ?? "all"}
                     setValue={handleBranchChange}
                     placeholder="All branches"
-                    items={[{ id: "all", branchName: "All branches" }, ...branchEnvironments]}
+                    items={[{ id: "all", branchName: "All branches" }, ...previewBranches]}
                     className="w-fit min-w-52"
                     filter={{
                       keys: [
                         (item) => item.branchName?.replace(/\//g, " ").replace(/_/g, " ") ?? "",
                       ],
                     }}
                     text={(val) =>
-                      val ? branchEnvironments.find((b) => b.id === val)?.branchName : null
+                      val ? previewBranches.find((b) => b.id === val)?.branchName : null
                     }
                     dropdownIcon
                   >