@adcops/autocore-react 3.3.115 → 3.3.116

package/src/components/tis-editor/validation.ts

@@ -10,7 +10,9 @@ import type {
     TestField, TestMethod, ChartAxis, ChartSeries,
 } from './types';
 
-const FIELD_ARRAY_KEYS = ['project_fields', 'config_fields', 'cycle_fields', 'results_fields'] as const;
+const FIELD_ARRAY_KEYS = [
+    'project_fields', 'config_fields', 'cycle_config_fields', 'cycle_fields', 'results_fields',
+] as const;
 
 export interface ValidationError {
     /** Dotted path: "<arrayKey>.<index>.<sub>" or "views.<viewId>.x" etc. */
@@ -49,7 +51,7 @@ export function validateMethod(methodId: string, m: TestMethod): ValidationError
     const resultTypes = new Map<string, string>(
         ((m.results_fields as TestField[] | undefined) ?? []).map((f) => [f.name, String(f.type)])
     );
-    for (const key of ['project_fields', 'config_fields', 'cycle_fields'] as const) {
+    for (const key of ['project_fields', 'config_fields', 'cycle_config_fields', 'cycle_fields'] as const) {
         ((m[key] as TestField[] | undefined) ?? []).forEach((f, i) => {
             if (f.aggregate) {
                 errs.push({ path: `${key}.${i}.aggregate`, message: `${methodId}.${key}.${f.name}: aggregate is only valid on results_fields` });
@@ -74,6 +76,22 @@ export function validateMethod(methodId: string, m: TestMethod): ValidationError
         }
     });
 
+    // A cycle_config_field and a cycle_field share one row namespace in
+    // cycles.jsonl — the same name in both means the operator's annotation
+    // and a measured value would fight over one column. Mirrors the
+    // server-side check in validate_method.
+    const cycleFieldNames = new Set<string>(
+        ((m.cycle_fields as TestField[] | undefined) ?? []).map(f => f.name).filter(Boolean),
+    );
+    ((m.cycle_config_fields as TestField[] | undefined) ?? []).forEach((f, i) => {
+        if (f.name && cycleFieldNames.has(f.name)) {
+            errs.push({
+                path: `cycle_config_fields.${i}.name`,
+                message: `${methodId}: "${f.name}" is declared as both a cycle_config_field and a cycle_field. They share one row namespace; rename one.`,
+            });
+        }
+    });
+
     // Build sets for axis-reference resolution.
     const knownFields = new Set<string>();
     for (const key of FIELD_ARRAY_KEYS) {