Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 8 additions & 4 deletions src/app/components/generator/GeneratorList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ import { GeneratorCard, TextInput, VersionSwitcher } from '../index.js'
interface Props {
path?: string,
predicate?: (gen: ConfigGenerator) => boolean | undefined,
compare?: (first: ConfigGenerator, second: ConfigGenerator) => number,
}
export function GeneratorList({ predicate }: Props) {
export function GeneratorList({ predicate , compare }: Props) {
const { locale } = useLocale()
const { version, changeVersion } = useVersion()

Expand All @@ -28,7 +29,7 @@ export function GeneratorList({ predicate }: Props) {
const filteredGenerators = useMemo(() => {
const results = versionedGenerators
.map(g => ({ ...g, name: locale(`generator.${g.id}`).toLowerCase() }))
return searchGenerators(results, search)
return searchGenerators(results, search, compare)
}, [versionedGenerators, search, locale])

return <div class="generator-list">
Expand All @@ -46,15 +47,18 @@ export function GeneratorList({ predicate }: Props) {
</div>
}

export function searchGenerators(generators: (ConfigGenerator & { name: string})[], search?: string) {
export function searchGenerators(generators: (ConfigGenerator & { name: string})[], search?: string, compare?: (first: ConfigGenerator, second: ConfigGenerator) => number) {
if (search) {
const parts = search.split(' ').map(q => q.trim().toLowerCase()).filter(q => q.length > 0)
generators = generators.filter(g => parts.some(p => g.name.includes(p))
|| parts.some(p => g.path?.includes(p) ?? false)
|| parts.some(p => g.tags?.some(t => t.includes(p)) ?? false)
|| parts.some(p => g.aliases?.some(a => a.includes(p)) ?? false))
}
generators.sort((a, b) => a.name.localeCompare(b.name))
generators.sort((a, b) => {
const compared = compare ? compare(a, b) : 0
return compared == 0 ? a.name.localeCompare(b.name) : compared
})
if (search) {
generators.sort((a, b) => (b.name.startsWith(search) ? 1 : 0) - (a.name.startsWith(search) ? 1 : 0))
}
Expand Down
5 changes: 4 additions & 1 deletion src/app/pages/Partners.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ export function Partners({}: Props) {

return <main>
<div class="legacy-container">
<GeneratorList predicate={gen => gen.tags?.includes('partners')} />
<GeneratorList predicate={gen => gen.tags?.includes('partners')} compare={(f, s) => {
// Compares by dependency but missing dependency will be treated last
return (s.dependency ?? "").localeCompare(f.dependency ?? "") * -1
}}/>
</div>
<Footer donate={false} />
</main>
Expand Down