@resolveio/server-lib 20.14.5 → 20.14.7

package/methods/report-builder.js

@@ -1844,6 +1844,8 @@ function buildReportBuilderSystemPrompt(reportType) {
         'When available_fields spans multiple collections, choose collection_root first and then select fields whose collection_name matches collection_root or a join alias.',
         'Prefer exact field_path values from available_fields; never invent field paths.',
         'Translate the request into concrete layout_columns, groups_row, sort, totals, filters, and links whenever possible.',
+        'Every layout column must be complete: include a header plus at least one mapping with a valid field_path (or text mode with non-empty text). Do not return columns without mapped fields.',
+        'Unless the user explicitly asks for a different order, add sort entries for the primary grouping/identifier fields (groups_row or the first key layout_columns) using ascending order so results are alphabetical.',
         'If the request specifies a time grain (daily/weekly/monthly/etc), set date_interval and id_date_field to the best matching date field.',
         'If you need sample records to confirm field choices, you may return JSON with {"mongo_read": { "collection": "<collection>", "query": {}, "options": {"limit": 5} }, "notes": "why you need data"} .',
         'Only request mongo_read when necessary and only use collections from available_collections.',
@@ -2316,20 +2318,25 @@ function sanitizeReportBuilderPatch(raw, ctx) {
             return;
         }
         var header = normalizeOptionalString(col.header || col.title || col.name);
-        var fieldPath = resolveFieldPath(col.field_path || col.fieldPath, ctx);
+        var fieldPath = resolveFieldPath(col.field_path || col.fieldPath || col.field || col.field_name || col.fieldName || col.path, ctx);
+        if (!fieldPath && header) {
+            fieldPath = resolveFieldPath(header, ctx);
+        }
         var mappingsRaw = Array.isArray(col.mappings) ? col.mappings : [];
         var mappings = [];
         mappingsRaw.forEach(function (map) {
-            var mappedField = resolveFieldPath((map === null || map === void 0 ? void 0 : map.field_path) || (map === null || map === void 0 ? void 0 : map.fieldPath), ctx);
+            var mappedField = resolveFieldPath((map === null || map === void 0 ? void 0 : map.field_path) || (map === null || map === void 0 ? void 0 : map.fieldPath) || (map === null || map === void 0 ? void 0 : map.field) || (map === null || map === void 0 ? void 0 : map.field_name) || (map === null || map === void 0 ? void 0 : map.fieldName) || (map === null || map === void 0 ? void 0 : map.path) || (map === null || map === void 0 ? void 0 : map.name), ctx);
             var mode = normalizeLayoutMode(map === null || map === void 0 ? void 0 : map.mode);
             var text = normalizeOptionalString(map === null || map === void 0 ? void 0 : map.text);
             var collection = resolveCollectionName(map === null || map === void 0 ? void 0 : map.collection, ctx);
             if (mode === 'text') {
-                mappings.push({
-                    mode: mode,
-                    text: text,
-                    collection: collection
-                });
+                if (text) {
+                    mappings.push({
+                        mode: mode,
+                        text: text,
+                        collection: collection
+                    });
+                }
             }
             else if (mappedField) {
                 mappings.push({
@@ -2342,10 +2349,33 @@ function sanitizeReportBuilderPatch(raw, ctx) {
                 });
             }
         });
-        if (!mappings.length && fieldPath) {
-            mappings.push({ field_path: fieldPath, mode: normalizeLayoutMode(col.mode) });
+        if (!mappings.length) {
+            if (fieldPath) {
+                mappings.push({ field_path: fieldPath, mode: normalizeLayoutMode(col.mode) });
+            }
+            else {
+                var text = normalizeOptionalString(col.text);
+                var mode = normalizeLayoutMode(col.mode);
+                if ((mode === 'text' || text) && text) {
+                    mappings.push({
+                        mode: 'text',
+                        text: text,
+                        collection: resolveCollectionName(col.collection, ctx)
+                    });
+                }
+            }
+        }
+        if (!fieldPath) {
+            var firstMapped = mappings.find(function (mapping) { return !!(mapping === null || mapping === void 0 ? void 0 : mapping.field_path); });
+            if (firstMapped === null || firstMapped === void 0 ? void 0 : firstMapped.field_path) {
+                fieldPath = firstMapped.field_path;
+            }
+        }
+        if (!header && fieldPath) {
+            var meta = ctx.fieldIndex.get(normalizePathKey(fieldPath));
+            header = normalizeOptionalString(meta === null || meta === void 0 ? void 0 : meta.field_path_name);
         }
-        if (!header && !mappings.length) {
+        if (!mappings.length) {
             return;
         }
         layoutColumns.push({
@@ -2421,6 +2451,12 @@ function sanitizeReportBuilderPatch(raw, ctx) {
     if (sort.length) {
         patch.sort = sort;
     }
+    else {
+        var defaultSortFields = buildDefaultSortFields(groupsRow, layoutColumns);
+        if (defaultSortFields.length) {
+            patch.sort = defaultSortFields.map(function (field_path) { return ({ field_path: field_path, order: 'asc' }); });
+        }
+    }
     var totalsRaw = Array.isArray(raw.totals) ? raw.totals : [];
     var totals = [];
     totalsRaw.forEach(function (total) {
@@ -2462,6 +2498,48 @@ function sanitizeReportBuilderPatch(raw, ctx) {
     }
     return patch;
 }
+function buildDefaultSortFields(groupsRow, layoutColumns) {
+    var fields = [];
+    var addField = function (fieldPath) {
+        var normalized = normalizeOptionalString(fieldPath);
+        if (normalized && !fields.includes(normalized)) {
+            fields.push(normalized);
+        }
+    };
+    (groupsRow || []).forEach(addField);
+    if (fields.length) {
+        return fields;
+    }
+    (layoutColumns || []).forEach(function (col) {
+        var e_3, _a;
+        if (!col || typeof col !== 'object') {
+            return;
+        }
+        var fieldPath = '';
+        var mappings = Array.isArray(col.mappings) ? col.mappings : [];
+        try {
+            for (var mappings_1 = __values(mappings), mappings_1_1 = mappings_1.next(); !mappings_1_1.done; mappings_1_1 = mappings_1.next()) {
+                var mapping = mappings_1_1.value;
+                if (mapping === null || mapping === void 0 ? void 0 : mapping.field_path) {
+                    fieldPath = mapping.field_path;
+                    break;
+                }
+            }
+        }
+        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+        finally {
+            try {
+                if (mappings_1_1 && !mappings_1_1.done && (_a = mappings_1.return)) _a.call(mappings_1);
+            }
+            finally { if (e_3) throw e_3.error; }
+        }
+        if (!fieldPath && col.field_path) {
+            fieldPath = col.field_path;
+        }
+        addField(fieldPath);
+    });
+    return fields;
+}
 function buildPatchNotes(patch, meta) {
     var columns = Array.isArray(patch === null || patch === void 0 ? void 0 : patch.layout_columns) ? patch.layout_columns.length : 0;
     var groups = Array.isArray(patch === null || patch === void 0 ? void 0 : patch.groups_row) ? patch.groups_row.length : 0;
@@ -2644,7 +2722,7 @@ function safeJsonParse(value) {
     }
 }
 function evaluateReportBuilderGuardrails(message) {
-    var e_3, _a;
+    var e_4, _a;
     var normalized = String(message || '').toLowerCase();
     var patterns = [
         { pattern: /\b(source\s*code|full\s*code|entire\s*code|repo\s*dump|repository|git\s*clone)\b/i, reason: 'Code access is restricted.' },
@@ -2666,12 +2744,12 @@ function evaluateReportBuilderGuardrails(message) {
             }
         }
     }
-    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+    catch (e_4_1) { e_4 = { error: e_4_1 }; }
     finally {
         try {
             if (patterns_1_1 && !patterns_1_1.done && (_a = patterns_1.return)) _a.call(patterns_1);
         }
-        finally { if (e_3) throw e_3.error; }
+        finally { if (e_4) throw e_4.error; }
     }
     return null;
 }