fix(icon-picker): keep URL visible in edit mode, add SVG-first ordering
Three UX bugs in the icon picker: 1. Skeleton-forever on edit screens. The input was pre-filled with the full CDN URL, the search query fired with that URL, and the DB only stores bare filenames, so the response was always empty -> 15 skeletons, forever. Decouple the input display from the query: initialize search to the committed value and only fire the query when the user has actually typed something different. 2. Loading / error / no-results all looked identical (15 skeletons). Split the render into four explicit branches: isError (with retry), isLoading (skeletons, only on cold first load), results, no-results. 3. No relevance ranking and no SVG-first ordering. Add orderBy in the icons router: relevance tier (exact > prefix > substring) -> SVG first -> alphabetical. Patterns are bound as JS strings so the SQL works across sqlite / postgresql / mysql without concat operator differences. Also add placeholderData: keepPreviousData so refetching during typing doesn't flash the dropdown to skeletons, fix the upload pre-fill that was leaking a local media URL into the search, drop the no-op updateSelectedOptionIndex, and mark the file as a client component so Next.js can render it from server-component routes. Add common.iconPicker headerLoading / noResults / error keys to en.json (other locales fall back to en until the next sync). No ternaries in the changed files. Intended simplifications are marked with ponytail: comments.
This commit is contained in:
1 parent
55fb227305
commit
e29ecf748a
3 files changed
+107
-72
No files matched your search
@@ -15,20 +15,36 @@ export const iconsRouter = createTRPCRouter({
|
||||
})
|
||||
.input(iconsFindSchema)
|
||||
.query(async ({ ctx, input }) => {
|
||||
const term = input.searchText?.toLowerCase().trim() ?? "";
|
||||
const keywords = (input.searchText ?? "").split(" ").filter((keyword) => keyword.length > 0);
|
||||
|
||||
let whereCondition = undefined;
|
||||
if (term.length > 0) {
|
||||
whereCondition = and(...keywords.map((keyword) => like(icons.name, `%${keyword}%`)));
|
||||
}
|
||||
|
||||
return {
|
||||
icons: await ctx.db.query.iconRepositories.findMany({
|
||||
with: {
|
||||
icons: {
|
||||
columns: {
|
||||
id: true,
|
||||
name: true,
|
||||
url: true,
|
||||
columns: { id: true, name: true, url: true },
|
||||
where: whereCondition,
|
||||
orderBy: (table, { asc, sql }) => {
|
||||
// ponytail: SVG first, then alphabetical; with a search term,
|
||||
// prepend a relevance tier (exact > prefix > substring).
|
||||
const svgFirst = sql`CASE WHEN ${table.name} LIKE '%.svg' THEN 0 ELSE 1 END`;
|
||||
const nameAsc = asc(table.name);
|
||||
if (term.length === 0) {
|
||||
return [svgFirst, nameAsc];
|
||||
}
|
||||
const tier = sql`CASE
|
||||
WHEN LOWER(${table.name}) = ${term} THEN 0
|
||||
WHEN LOWER(${table.name}) LIKE ${term + "%"} THEN 1
|
||||
WHEN LOWER(${table.name}) LIKE ${`%${term}%`} THEN 2
|
||||
ELSE 3
|
||||
END`;
|
||||
return [tier, svgFirst, nameAsc];
|
||||
},
|
||||
where:
|
||||
(input.searchText?.length ?? 0) > 0
|
||||
? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
||||
and(...input.searchText!.split(" ").map((keyword) => like(icons.name, `%${keyword}%`)))
|
||||
: undefined,
|
||||
limit: input.limitPerGroup,
|
||||
},
|
||||
},
|
||||
|
||||
Reference in new issue
Block a user