@simmalugnt-se/payload-editor-assistant 0.12.0 → 0.12.1

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.12.1
+
+- The review lists groups in the schema's order (a group's own position, blocks and rows by their
+  number) instead of alphabetically by path.
+
 ## 0.12.0
 
 - Proposals are grouped by block, row and named group, in document order, with collapsible sections

package/dist/components/copy.d.ts

@@ -158,8 +158,6 @@ export declare const BATCH_COPY: {
         readonly review: "Check the suggestions. Uncheck any you do not want, or change the wording before saving.";
         readonly savesDraft: "Saves as a draft; nothing is published.";
         readonly savesDirectly: "Saved directly: this collection has no drafts.";
-        readonly before: "Before";
-        readonly empty: "empty";
         readonly retry: "Try again";
         readonly retryWith: "What should be different? (optional)";
         readonly retrySend: "Ask again";
@@ -197,8 +195,6 @@ export declare const BATCH_COPY: {
         readonly review: "Granska förslagen. Kryssa ur dem du inte vill ha, eller ändra formuleringen innan du sparar.";
         readonly savesDraft: "Sparas som utkast; inget publiceras.";
         readonly savesDirectly: "Sparas direkt: den här samlingen har inga utkast.";
-        readonly before: "Före";
-        readonly empty: "tomt";
         readonly retry: "Försök igen";
         readonly retryWith: "Vad ska bli annorlunda? (valfritt)";
         readonly retrySend: "Fråga igen";

package/dist/components/copy.js

@@ -168,8 +168,6 @@ export const BATCH_COPY = {
         review: "Check the suggestions. Uncheck any you do not want, or change the wording before saving.",
         savesDraft: "Saves as a draft; nothing is published.",
         savesDirectly: "Saved directly: this collection has no drafts.",
-        before: "Before",
-        empty: "empty",
         retry: "Try again",
         retryWith: "What should be different? (optional)",
         retrySend: "Ask again",
@@ -207,8 +205,6 @@ export const BATCH_COPY = {
         review: "Granska förslagen. Kryssa ur dem du inte vill ha, eller ändra formuleringen innan du sparar.",
         savesDraft: "Sparas som utkast; inget publiceras.",
         savesDirectly: "Sparas direkt: den här samlingen har inga utkast.",
-        before: "Före",
-        empty: "tomt",
         retry: "Försök igen",
         retryWith: "Vad ska bli annorlunda? (valfritt)",
         retrySend: "Fråga igen",

package/dist/components/proposal-review.js

@@ -22,8 +22,8 @@ export function groupProposalLines(lines) {
             ? a.kind === "field"
                 ? -1
                 : 1
-            : a.kind === "group"
-                ? a.path.localeCompare(b.path, "en", { numeric: true })
+            : a.kind === "group" && b.kind === "group"
+                ? a.group.order - b.group.order || a.path.localeCompare(b.path, "en", { numeric: true })
                 : 0);
         for (const node of nodes)
             if (node.kind === "group")

package/dist/form/field-label.d.ts

@@ -4,6 +4,8 @@ export type FieldPathGroup = {
     label: string;
     kind: "container" | "block" | "row" | "group";
     position?: number;
+    /** Where the group sits among its siblings: the schema position, or the row's own position. */
+    order: number;
 };
 /** Schema labels and one-based row positions for a concrete form field path. */
 export declare function fieldPathLabels(fields: FieldNode[], path: string, data: unknown, language?: "en" | "sv"): {

package/dist/form/field-label.js

@@ -26,6 +26,7 @@ export function fieldPathInfo(fields, path, data, language = "en") {
                     label: name(block?.label ?? block?.slug ?? "block"),
                     kind: "block",
                     position,
+                    order: position,
                 });
                 scope = block?.fields ?? [];
             }
@@ -37,22 +38,28 @@ export function fieldPathInfo(fields, path, data, language = "en") {
                     label: `${name(row)} ${position}`,
                     kind: "row",
                     position,
+                    order: position,
                 });
             }
             continue;
         }
         schemaPath = schemaPath ? `${schemaPath}.${segment}` : segment;
-        field = scope.find((entry) => entry.path === schemaPath);
+        const at = scope.findIndex((entry) => entry.path === schemaPath);
+        field = at >= 0 ? scope[at] : undefined;
         parts.push(name(field?.label ?? segment));
         if (field?.type === "group" || field?.type === "blocks" || field?.type === "array") {
             groups.push({
                 path: concretePath,
                 label: name(field.label ?? segment),
                 kind: field.type === "group" ? "group" : "container",
+                order: at,
             });
         }
-        else if (!field && scope.some((entry) => entry.path.startsWith(`${schemaPath}.`))) {
-            groups.push({ path: concretePath, label: name(segment), kind: "group" });
+        else if (!field) {
+            const inside = scope.findIndex((entry) => entry.path.startsWith(`${schemaPath}.`));
+            if (inside >= 0) {
+                groups.push({ path: concretePath, label: name(segment), kind: "group", order: inside });
+            }
         }
         // Named tabs are flattened by walkFields, but their name remains in each child's path.
         if (field)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simmalugnt-se/payload-editor-assistant",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "Context-aware editor assistant plugin for Payload Admin",
   "keywords": [
     "payload",