Skip to content

feat: implement feature flag folders for organization #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bimakw wants to merge 2 commits into from
Closed

feat: implement feature flag folders for organization #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6332b1
feat: implement feature flag folders for organization
bimakw Jan 17, 2026
12287bb
fix: remove unused PlusIcon import
bimakw Jan 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions apps/dashboard/app/(main)/websites/[id]/flags/_components/flag-sheet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import { orpc } from "@/lib/orpc";
import { cn } from "@/lib/utils";
import { GroupSelector } from "../groups/_components/group-selector";
import { DependencySelector } from "./dependency-selector";
import { FolderSelector } from "./folder-selector";
import type { Flag, FlagSheetProps, TargetGroup } from "./types";
import { UserRulesBuilder } from "./user-rules-builder";
import { VariantEditor } from "./variant-editor";
Expand Down Expand Up @@ -157,6 +158,7 @@ export function FlagSheet({
dependencies: [],
environment: undefined,
targetGroupIds: [],
folder: null,
},
schedule: undefined,
},
Expand Down Expand Up @@ -199,6 +201,7 @@ export function FlagSheet({
dependencies: flag.dependencies ?? [],
environment: flag.environment || undefined,
targetGroupIds: extractTargetGroupIds(),
folder: flag.folder ?? null,
},
schedule: undefined,
});
Expand All @@ -220,6 +223,7 @@ export function FlagSheet({
variants: template.type === "multivariant" ? template.variants : [],
dependencies: [],
targetGroupIds: [],
folder: null,
},
schedule: undefined,
});
Expand All @@ -241,6 +245,7 @@ export function FlagSheet({
variants: [],
dependencies: [],
targetGroupIds: [],
folder: null,
},
schedule: undefined,
});
Expand Down Expand Up @@ -309,6 +314,7 @@ export function FlagSheet({
rolloutPercentage: data.rolloutPercentage ?? 0,
rolloutBy: data.rolloutBy || undefined,
targetGroupIds: data.targetGroupIds || [],
folder: data.folder || null,
};
await updateMutation.mutateAsync(updateData);
} else {
Expand All @@ -327,6 +333,7 @@ export function FlagSheet({
rolloutPercentage: data.rolloutPercentage ?? 0,
rolloutBy: data.rolloutBy || undefined,
targetGroupIds: data.targetGroupIds || [],
folder: data.folder || null,
};
await createMutation.mutateAsync(createData);
}
Expand Down Expand Up @@ -458,6 +465,31 @@ export function FlagSheet({
</FormItem>
)}
/>

{/* Folder */}
<FormField
control={form.control}
name="flag.folder"
render={({ field }) => (
<FormItem>
<FormLabel className="text-muted-foreground">
Folder (optional)
</FormLabel>
<FormControl>
<FolderSelector
existingFolders={
flagsList
?.map((f) => f.folder)
.filter((f): f is string => f !== null && f !== undefined) ?? []
}
onChange={(folder) => field.onChange(folder)}
value={field.value}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
</div>

{/* Separator */}
Expand Down
128 changes: 121 additions & 7 deletions apps/dashboard/app/(main)/websites/[id]/flags/_components/flags-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,19 @@

import {
ArchiveIcon,
CaretDownIcon,
DotsThreeIcon,
FlagIcon,
FlaskIcon,
FolderIcon,
GaugeIcon,
LinkIcon,
PencilSimpleIcon,
ShareNetworkIcon,
TrashIcon,
} from "@phosphor-icons/react";
import { useMutation, useQueryClient } from "@tanstack/react-query";
import { useMemo } from "react";
import { useMemo, useState } from "react";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import {
Expand Down Expand Up @@ -404,6 +406,73 @@ function FlagRow({
);
}

interface FolderSectionProps {
folderPath: string | null;
flags: Flag[];
groups: Map<string, TargetGroup[]>;
flagMap: Map<string, Flag>;
dependentsMap: Map<string, Flag[]>;
onEdit: (flag: Flag) => void;
onDelete: (flagId: string) => void;
defaultExpanded?: boolean;
}

function FolderSection({
folderPath,
flags,
groups,
flagMap,
dependentsMap,
onEdit,
onDelete,
defaultExpanded = true,
}: FolderSectionProps) {
const [isExpanded, setIsExpanded] = useState(defaultExpanded);
const folderName = folderPath ? folderPath.split("/").pop() : "Uncategorized";
const depth = folderPath ? folderPath.split("/").length - 1 : 0;

return (
<div className="border-b last:border-b-0">
<button
className="flex w-full items-center gap-2 bg-muted/30 px-4 py-2 text-left transition-colors hover:bg-muted/50"
onClick={() => setIsExpanded(!isExpanded)}
style={{ paddingLeft: `${depth * 16 + 16}px` }}
type="button"
>
<CaretDownIcon
className={cn(
"size-4 text-muted-foreground transition-transform",
!isExpanded && "-rotate-90"
)}
/>
<FolderIcon
className="size-4 text-amber-500"
weight="duotone"
/>
<span className="font-medium text-sm">{folderName}</span>
<span className="text-muted-foreground text-xs">
({flags.length} {flags.length === 1 ? "flag" : "flags"})
</span>
</button>
{isExpanded && (
<div>
{flags.map((flag) => (
<FlagRow
dependents={dependentsMap.get(flag.key) ?? []}
flag={flag}
flagMap={flagMap}
groups={groups.get(flag.id) ?? []}
key={flag.id}
onDelete={onDelete}
onEdit={onEdit}
/>
))}
</div>
)}
</div>
);
}

export function FlagsList({ flags, groups, onEdit, onDelete }: FlagsListProps) {
const flagMap = useMemo(() => {
const map = new Map<string, Flag>();
Expand All @@ -427,15 +496,60 @@ export function FlagsList({ flags, groups, onEdit, onDelete }: FlagsListProps) {
return map;
}, [flags]);

// Group flags by folder
const groupedFlags = useMemo(() => {
const folderMap = new Map<string | null, Flag[]>();

for (const flag of flags) {
const folder = flag.folder ?? null;
const existing = folderMap.get(folder) || [];
existing.push(flag);
folderMap.set(folder, existing);
}

// Sort folders alphabetically, with uncategorized first
const sortedFolders = Array.from(folderMap.entries()).sort(([a], [b]) => {
if (a === null) return -1;
if (b === null) return 1;
return a.localeCompare(b);
});

return sortedFolders;
}, [flags]);

// Check if any flags have folders
const hasFolders = groupedFlags.some(([folder]) => folder !== null);

// If no folders, render flat list
if (!hasFolders) {
return (
<div className="w-full overflow-x-auto">
{flags.map((flag) => (
<FlagRow
dependents={dependentsMap.get(flag.key) ?? []}
flag={flag}
flagMap={flagMap}
groups={groups.get(flag.id) ?? []}
key={flag.id}
onDelete={onDelete}
onEdit={onEdit}
/>
))}
</div>
);
}

// Render grouped list
return (
<div className="w-full overflow-x-auto">
{flags.map((flag) => (
<FlagRow
dependents={dependentsMap.get(flag.key) ?? []}
flag={flag}
{groupedFlags.map(([folder, folderFlags]) => (
<FolderSection
dependentsMap={dependentsMap}
flagMap={flagMap}
groups={groups.get(flag.id) ?? []}
key={flag.id}
flags={folderFlags}
folderPath={folder}
groups={groups}
key={folder ?? "uncategorized"}
onDelete={onDelete}
onEdit={onEdit}
/>
Expand Down
Loading