Fix form builder sort bugs

pubpub · Feb 26, 2025 · ee6700e · ee6700e
1 parent 6437e39
commit ee6700e
Show file tree

Hide file tree

Showing 4 changed files with 153 additions and 112 deletions.
diff --git a/core/app/components/FormBuilder/FormBuilder.tsx b/core/app/components/FormBuilder/FormBuilder.tsx
@@ -265,29 +265,35 @@ export function FormBuilder({ pubForm, id, stages }: Props) {
 																	activeIndex !== undefined &&
 																	overIndex !== undefined
 																) {
+																	const isMovedEarlier =
+																		activeIndex > overIndex;
 																	const activeElem =
 																		elements[activeIndex];
 																	const aboveRank =
-																		elements[overIndex + 1]
-																			?.rank ?? "";
+																		elements[
+																			isMovedEarlier
+																				? overIndex
+																				: overIndex + 1
+																		]?.rank ?? "";
 																	const belowRank =
-																		elements[overIndex - 1]
-																			?.rank ?? "";
+																		elements[
+																			isMovedEarlier
+																				? overIndex - 1
+																				: overIndex
+																		]?.rank ?? "";
 																	const [rank] =
 																		mudder.base62.mudder(
 																			belowRank,
 																			aboveRank,
 																			1
 																		);
-																	form.setValue(
-																		`elements.${activeIndex}`,
-																		{
-																			...activeElem,
-																			rank,
-																			updated: true,
-																		}
-																	);
+
 																	move(activeIndex, overIndex);
+																	update(overIndex, {
+																		...activeElem,
+																		rank,
+																		updated: true,
+																	});
 																}
 															}
 														}}

diff --git a/core/lib/server/form.ts b/core/lib/server/form.ts
@@ -66,7 +66,8 @@ export const getForm = (
 							"pub_fields.isRelation",
 						])
 						.$narrowType<FormElements>()
-						.orderBy("form_elements.rank")
+						// Use "C" collation order to ensure uppercase letters sort before lowercase to match mudder
+						.orderBy(sql`"rank" collate "C"`)
 				).as("elements")
 			)
 	);

diff --git a/core/package.json b/core/package.json
@@ -101,7 +101,7 @@
 		"jsonpath-plus": "^10.2.0",
 		"jsonwebtoken": "^9.0.0",
 		"katex": "^0.16.18",
-		"kysely": "^0.27.3",
+		"kysely": "^0.27.5",
 		"lodash.partition": "^4.6.0",
 		"logger": "workspace:*",
 		"lucia": "^3.2.2",