Skip to content

fix: bug#2432 Filter options sorted alphabetically #2538

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

Merged
chronark merged 3 commits into from
Nov 13, 2024
Merged

fix: bug#2432 Filter options sorted alphabetically #2538

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
debfbfc
fixed bug#2432 Filter options sorted alphabetically
Arslan-Muhammad Oct 22, 2024
2bb4d3e
[autofix.ci] apply automated fixes
autofix-ci[bot] Oct 28, 2024
81aaa53
languages sorted alphabetically
Arslan-Muhammad Nov 7, 2024
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
80 changes: 42 additions & 38 deletions apps/www/app/templates/client.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,9 @@ export function TemplatesClient() {

<AccordionContent>
<Separator className="my-4 " orientation="horizontal" />
{Object.entries(languages).map(([language, occurences]) => (
{Object.entries(languages)
.sort((a, b) => a[0].localeCompare(b[0]))
.map(([language, occurences]) => (
<FormField
key={language}
control={form.control}
Expand Down Expand Up @@ -276,43 +278,45 @@ export function TemplatesClient() {

<AccordionContent>
<Separator className="mt-4 mb-4" orientation="horizontal" />
{Object.entries(frameworks).map(([framework, occurences]) => (
<FormField
key={framework}
control={form.control}
name="frameworks"
render={({ field }) => {
return (
<FormItem
key={framework}
className="flex flex-row items-center px-2 py-1 space-x-3 h-10 space-y-0 duration-150 rounded-md bg-[rgba(255,255,255,0.05)] group hover:bg-[rgba(255,255,255,0.15)] mb-2"
>
<FormControl>
<Checkbox
aria-label={`Checkbox for ${framework}`}
checked={field.value?.includes(framework)}
onCheckedChange={(checked) => {
return checked
? field.onChange([...field.value, framework])
: field.onChange(
field.value?.filter(
(value: string) => value !== framework,
),
);
}}
/>
</FormControl>
<FormLabel className="flex items-center justify-between w-full">
<span className="text-sm font-normal">{framework}</span>
<span className="px-2 py-1 text-xs duration-150 rounded-md text-white/70 bg-white/20 group-hover:text-white/80">
{occurences}
</span>
</FormLabel>
</FormItem>
);
}}
/>
))}
{Object.entries(frameworks)
.sort((a, b) => a[0].localeCompare(b[0]))
.map(([framework, occurences]) => (
<FormField
key={framework}
control={form.control}
name="frameworks"
render={({ field }) => {
return (
<FormItem
key={framework}
className="flex flex-row items-center px-2 py-1 space-x-3 h-10 space-y-0 duration-150 rounded-md bg-[rgba(255,255,255,0.05)] group hover:bg-[rgba(255,255,255,0.15)] mb-2"
>
<FormControl>
<Checkbox
aria-label={`Checkbox for ${framework}`}
checked={field.value?.includes(framework)}
onCheckedChange={(checked) => {
return checked
? field.onChange([...field.value, framework])
: field.onChange(
field.value?.filter(
(value: string) => value !== framework,
),
);
}}
/>
</FormControl>
<FormLabel className="flex items-center justify-between w-full">
<span className="text-sm font-normal">{framework}</span>
<span className="px-2 py-1 text-xs duration-150 rounded-md text-white/70 bg-white/20 group-hover:text-white/80">
{occurences}
</span>
</FormLabel>
</FormItem>
);
}}
/>
))}
<FormMessage />
</AccordionContent>
</AccordionItem>
Expand Down