From 4e608c4be6fc736c61d3e3432efac56852185783 Mon Sep 17 00:00:00 2001
From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com>
Date: Fri, 3 Apr 2026 17:24:05 -0500
Subject: [PATCH] add ability to order subfields with dot notation

---
 web/src/lib/config-schema/transformer.ts | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/web/src/lib/config-schema/transformer.ts b/web/src/lib/config-schema/transformer.ts
index eb57d4c946..797b07ee58 100644
--- a/web/src/lib/config-schema/transformer.ts
+++ b/web/src/lib/config-schema/transformer.ts
@@ -483,9 +483,20 @@ function generateUiSchema(
 
   const schemaObj = schema as Record<string, unknown>;
 
-  // Set field ordering
+  // Set field ordering — supports dot notation (e.g. "genai.enabled")
   if (fieldOrder && fieldOrder.length > 0) {
-    uiSchema["ui:order"] = [...fieldOrder, "*"];
+    const depth = currentPath.length;
+    const localOrder = fieldOrder
+      .map((f) => f.split("."))
+      .filter((segments) => {
+        if (segments.length !== depth + 1) return false;
+        return currentPath.every((p, i) => segments[i] === p);
+      })
+      .map((segments) => segments[depth]);
+
+    if (localOrder.length > 0) {
+      uiSchema["ui:order"] = [...localOrder, "*"];
+    }
   }
 
   if (!isSchemaObject(schemaObj.properties)) {