@meshmakers/octo-meshboard 3.4.290 → 3.4.310

package/fesm2022/meshmakers-octo-meshboard.mjs

@@ -2884,6 +2884,36 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.2", ngImpor
                 }]
         }], ctorParameters: () => [{ type: i1.Apollo }] });
 
+const ResolveSeriesQueryDocumentDto = gql `
+    query resolveSeriesQuery($input: ResolveSeriesQueryInput!) {
+  streamData {
+    resolveSeriesQuery(input: $input) {
+      archiveRtId
+      effectiveBucketMs
+      points
+      reducingFunction
+      signal
+      actualPoints
+      diagnostic
+    }
+  }
+}
+    `;
+class ResolveSeriesQueryDtoGQL extends i1.Query {
+    document = ResolveSeriesQueryDocumentDto;
+    constructor(apollo) {
+        super(apollo);
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.2", ngImport: i0, type: ResolveSeriesQueryDtoGQL, deps: [{ token: i1.Apollo }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.0.2", ngImport: i0, type: ResolveSeriesQueryDtoGQL, providedIn: 'root' });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.2", ngImport: i0, type: ResolveSeriesQueryDtoGQL, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: () => [{ type: i1.Apollo }] });
+
 const EMPTY_RESULT_BASE = Object.freeze({
     queryRtId: null,
     associatedCkTypeId: null,
@@ -2905,6 +2935,7 @@ class QueryExecutorService {
     runtimeGql = inject(ExecuteRuntimeQueryDtoGQL);
     streamDataGql = inject(ExecuteStreamDataQueryDtoGQL);
     persistentQueriesGql = inject(GetSystemPersistentQueriesDtoGQL);
+    resolveSeriesGql = inject(ResolveSeriesQueryDtoGQL);
     /**
      * Cache of resolved query families, keyed by query rtId. Filled lazily for
      * legacy widget configs that pre-date the `queryFamily` field — saves a
@@ -3006,6 +3037,29 @@ class QueryExecutorService {
             };
         }));
     }
+    /**
+     * Resolution-aware series routing (AB#4290): asks the backend which archive/rollup to
+     * query for a base archive family, time window and target point count — so a widget can
+     * render ~`targetPoints` points without knowing which physical archive holds the data at a
+     * usable grain. The caller then runs {@link executeStreamData} (downsampling) against the
+     * returned `archiveRtId` with `limit = points`. Returns null when StreamData is not enabled.
+     */
+    async resolveSeriesQuery(input) {
+        const result = await firstValueFrom(this.resolveSeriesGql.fetch({ variables: { input }, fetchPolicy: 'network-only' }));
+        const decision = result.data?.streamData?.resolveSeriesQuery;
+        if (!decision) {
+            return null;
+        }
+        return {
+            archiveRtId: String(decision.archiveRtId),
+            effectiveBucketMs: Number(decision.effectiveBucketMs),
+            points: decision.points,
+            reducingFunction: decision.reducingFunction,
+            signal: decision.signal,
+            actualPoints: decision.actualPoints ?? null,
+            diagnostic: decision.diagnostic ?? null
+        };
+    }
     buildStreamDataArg(args) {
         // Skip the entire `arg` field when the caller has nothing to override —
         // the persisted query then runs with its intrinsic from/to/limit and the
@@ -4847,6 +4901,36 @@ function matchesAttributePath(cellPath, configField) {
     const cellBase = stripAggregationFunctionSuffix(cellPath);
     return toCanonicalAttributeKey(cellBase) === toCanonicalAttributeKey(configField);
 }
+/**
+ * Finds the single cell in a row that a config field refers to, preferring an
+ * exact `sanitizeFieldName` match over the loose canonical fallback of
+ * {@link matchesAttributePath}.
+ *
+ * This disambiguation matters for grouping-aggregation results, where a group-by
+ * cell (`state`) coexists with an aggregation cell over the same attribute
+ * (`state_count`). A bare category config (`state`) loose-matches BOTH via the
+ * canonical fallback; iterating cells and assigning on every match let the later
+ * `state_count` cell overwrite the category with the raw count, so the pie/bar
+ * legend showed the count instead of the enum label (AB#4293). Resolving each
+ * field to its best cell — exact wins — keeps the group-by and aggregation cells
+ * on their intended fields while still honouring the loose fallback for legacy
+ * configs whose only matching cell is the wire-form aggregation column.
+ */
+function findCellForField(cells, configField) {
+    if (!configField)
+        return undefined;
+    let looseMatch;
+    for (const cell of cells) {
+        if (!cell?.attributePath)
+            continue;
+        if (sanitizeFieldName(cell.attributePath) === configField)
+            return cell; // exact wins
+        if (looseMatch === undefined && matchesAttributePath(cell.attributePath, configField)) {
+            looseMatch = cell;
+        }
+    }
+    return looseMatch;
+}
 /**
  * Parses a value to a number.
  * Returns 0 for NaN or non-numeric values.
@@ -4876,12 +4960,9 @@ function extractAggregationValue(queryResult, valueField) {
     const cells = firstRow.cells?.items ?? [];
     // Find the value field if specified
     if (valueField) {
-        for (const cell of cells) {
-            if (!cell?.attributePath)
-                continue;
-            if (matchesAttributePath(cell.attributePath, valueField)) {
-                return parseNumericValue(cell.value);
-            }
+        const cell = findCellForField(cells, valueField);
+        if (cell) {
+            return parseNumericValue(cell.value);
         }
     }
     // Fallback: return first cell value
@@ -4908,20 +4989,10 @@ function extractGroupedAggregationValue(queryResult, categoryField, categoryValu
         if (!row || !SUPPORTED_ROW_TYPES$1.includes(row.__typename ?? ''))
             continue;
         const cells = row.cells?.items ?? [];
-        let categoryMatch = false;
-        let value = 0;
-        for (const cell of cells) {
-            if (!cell?.attributePath)
-                continue;
-            if (matchesAttributePath(cell.attributePath, categoryField) && String(cell.value) === categoryValue) {
-                categoryMatch = true;
-            }
-            if (matchesAttributePath(cell.attributePath, valueField)) {
-                value = parseNumericValue(cell.value);
-            }
-        }
-        if (categoryMatch) {
-            return value;
+        const categoryCell = findCellForField(cells, categoryField);
+        if (categoryCell && String(categoryCell.value) === categoryValue) {
+            const valueCell = findCellForField(cells, valueField);
+            return valueCell ? parseNumericValue(valueCell.value) : 0;
         }
     }
     return 0;
@@ -4945,19 +5016,13 @@ function processStaticSeriesData(rows, categoryField, seriesConfigs) {
         if (!SUPPORTED_ROW_TYPES$1.includes(row.__typename ?? ''))
             continue;
         const cells = row.cells?.items ?? [];
-        let categoryValue = '';
+        const categoryCell = findCellForField(cells, categoryField);
+        const categoryValue = categoryCell ? String(categoryCell.value ?? '') : '';
         const rowValues = new Map();
-        for (const cell of cells) {
-            if (!cell?.attributePath)
-                continue;
-            if (matchesAttributePath(cell.attributePath, categoryField)) {
-                categoryValue = String(cell.value ?? '');
-            }
-            // Check if this cell is one of our series fields
-            for (const seriesConfig of seriesConfigs) {
-                if (matchesAttributePath(cell.attributePath, seriesConfig.field)) {
-                    rowValues.set(seriesConfig.field, parseNumericValue(cell.value));
-                }
+        for (const seriesConfig of seriesConfigs) {
+            const seriesCell = findCellForField(cells, seriesConfig.field);
+            if (seriesCell) {
+                rowValues.set(seriesConfig.field, parseNumericValue(seriesCell.value));
             }
         }
         if (categoryValue !== '') {
@@ -4995,22 +5060,12 @@ function processDynamicSeriesData(rows, categoryField, seriesGroupField, valueFi
         if (!SUPPORTED_ROW_TYPES$1.includes(row.__typename ?? ''))
             continue;
         const cells = row.cells?.items ?? [];
-        let categoryValue = '';
-        let seriesGroupValue = '';
-        let numericValue = 0;
-        for (const cell of cells) {
-            if (!cell?.attributePath)
-                continue;
-            if (matchesAttributePath(cell.attributePath, categoryField)) {
-                categoryValue = String(cell.value ?? '');
-            }
-            else if (matchesAttributePath(cell.attributePath, seriesGroupField)) {
-                seriesGroupValue = String(cell.value ?? '');
-            }
-            else if (matchesAttributePath(cell.attributePath, valueField)) {
-                numericValue = parseNumericValue(cell.value);
-            }
-        }
+        const categoryCell = findCellForField(cells, categoryField);
+        const seriesGroupCell = findCellForField(cells, seriesGroupField);
+        const valueCell = findCellForField(cells, valueField);
+        const categoryValue = categoryCell ? String(categoryCell.value ?? '') : '';
+        const seriesGroupValue = seriesGroupCell ? String(seriesGroupCell.value ?? '') : '';
+        const numericValue = valueCell ? parseNumericValue(valueCell.value) : 0;
         if (categoryValue && seriesGroupValue) {
             allCategories.add(categoryValue);
             allSeriesGroups.add(seriesGroupValue);
@@ -5048,18 +5103,10 @@ function processPieChartData(rows, categoryField, valueField) {
         if (!SUPPORTED_ROW_TYPES$1.includes(row.__typename ?? ''))
             continue;
         const cells = row.cells?.items ?? [];
-        let categoryValue = '';
-        let numericValue = 0;
-        for (const cell of cells) {
-            if (!cell?.attributePath)
-                continue;
-            if (matchesAttributePath(cell.attributePath, categoryField)) {
-                categoryValue = String(cell.value ?? '');
-            }
-            else if (matchesAttributePath(cell.attributePath, valueField)) {
-                numericValue = parseNumericValue(cell.value);
-            }
-        }
+        const categoryCell = findCellForField(cells, categoryField);
+        const valueCell = findCellForField(cells, valueField);
+        const categoryValue = categoryCell ? String(categoryCell.value ?? '') : '';
+        const numericValue = valueCell ? parseNumericValue(valueCell.value) : 0;
         if (categoryValue) {
             result.push({
                 category: categoryValue,
@@ -12001,16 +12048,16 @@ class PieChartWidgetComponent {
         const chartData = result.rows
             .filter(row => PieChartWidgetComponent.SUPPORTED_ROW_TYPES.has(row.__typename ?? ''))
             .map(row => {
-            let category = '';
+            // Resolve each field to its best cell (exact match wins over the loose
+            // aggregation-suffix fallback) so a `state` category is not overwritten
+            // by the `state_count` aggregation cell — AB#4293.
+            const categoryCell = findCellForField(row.cells, this.config.categoryField);
+            const valueCell = findCellForField(row.cells, this.config.valueField);
+            const category = categoryCell ? String(categoryCell.value ?? '') : '';
             let value = 0;
-            for (const cell of row.cells) {
-                if (matchesAttributePath(cell.attributePath, this.config.categoryField)) {
-                    category = String(cell.value ?? '');
-                }
-                if (matchesAttributePath(cell.attributePath, this.config.valueField)) {
-                    const numValue = typeof cell.value === 'number' ? cell.value : parseFloat(String(cell.value));
-                    value = isNaN(numValue) ? 0 : numValue;
-                }
+            if (valueCell) {
+                const numValue = typeof valueCell.value === 'number' ? valueCell.value : parseFloat(String(valueCell.value));
+                value = isNaN(numValue) ? 0 : numValue;
             }
             return { category, value };
         })
@@ -13063,18 +13110,17 @@ class BarChartWidgetComponent {
             seriesMap.set(seriesConfig.field, []);
         }
         for (const row of filteredRows) {
-            let categoryValue = '';
+            // Exact match wins over the loose aggregation-suffix fallback so a group-by
+            // category is not overwritten by an aggregation cell over the same attribute
+            // (e.g. `state` vs `state_count`) — AB#4293.
+            const categoryCell = findCellForField(row.cells, this.config.categoryField);
+            const categoryValue = categoryCell ? this.formatCategoryValue(categoryCell.value) : '';
             const rowValues = new Map();
-            for (const cell of row.cells) {
-                if (matchesAttributePath(cell.attributePath, this.config.categoryField)) {
-                    categoryValue = this.formatCategoryValue(cell.value);
-                }
-                // Check if this cell is one of our series fields
-                for (const seriesConfig of (this.config.series ?? [])) {
-                    if (matchesAttributePath(cell.attributePath, seriesConfig.field)) {
-                        const numValue = typeof cell.value === 'number' ? cell.value : parseFloat(String(cell.value));
-                        rowValues.set(seriesConfig.field, isNaN(numValue) ? 0 : numValue);
-                    }
+            for (const seriesConfig of (this.config.series ?? [])) {
+                const seriesCell = findCellForField(row.cells, seriesConfig.field);
+                if (seriesCell) {
+                    const numValue = typeof seriesCell.value === 'number' ? seriesCell.value : parseFloat(String(seriesCell.value));
+                    rowValues.set(seriesConfig.field, isNaN(numValue) ? 0 : numValue);
                 }
             }
             if (categoryValue !== '') {
@@ -13122,22 +13168,18 @@ class BarChartWidgetComponent {
         const allCategories = new Set();
         const allSeriesGroups = new Set();
         for (const row of filteredRows) {
-            let categoryValue = '';
-            let seriesGroupValue = '';
+            // Exact match wins over the loose aggregation-suffix fallback (AB#4293).
+            const categoryCell = findCellForField(row.cells, categoryField);
+            const seriesGroupCell = findCellForField(row.cells, seriesGroupField);
+            const valueCell = findCellForField(row.cells, valueField);
+            const categoryValue = categoryCell ? this.formatCategoryValue(categoryCell.value) : '';
+            const seriesGroupValue = seriesGroupCell ? String(seriesGroupCell.value ?? '') : '';
             let numericValue = 0;
-            for (const cell of row.cells) {
-                if (matchesAttributePath(cell.attributePath, categoryField)) {
-                    categoryValue = this.formatCategoryValue(cell.value);
-                }
-                else if (matchesAttributePath(cell.attributePath, seriesGroupField)) {
-                    seriesGroupValue = String(cell.value ?? '');
-                }
-                else if (matchesAttributePath(cell.attributePath, valueField)) {
-                    const val = cell.value;
-                    numericValue = typeof val === 'number' ? val : parseFloat(String(val));
-                    if (isNaN(numericValue))
-                        numericValue = 0;
-                }
+            if (valueCell) {
+                const val = valueCell.value;
+                numericValue = typeof val === 'number' ? val : parseFloat(String(val));
+                if (isNaN(numericValue))
+                    numericValue = 0;
             }
             if (categoryValue && seriesGroupValue) {
                 allCategories.add(categoryValue);
@@ -17012,10 +17054,9 @@ function extractAggregation(result, valueField) {
     if (!firstRow)
         return 0;
     if (valueField) {
-        for (const cell of firstRow.cells) {
-            if (matchesAttributePath(cell.attributePath, valueField)) {
-                return parseNumericValue(cell.value);
-            }
+        const cell = findCellForField(firstRow.cells, valueField);
+        if (cell) {
+            return parseNumericValue(cell.value);
         }
     }
     // Fallback: first cell value when no specific field is configured.
@@ -17027,18 +17068,11 @@ function extractGroupedAggregation(result, categoryField, categoryValue, valueFi
     for (const row of result.rows) {
         if (!SUPPORTED_ROW_TYPES.has(row.__typename ?? ''))
             continue;
-        let categoryMatch = false;
-        let value = 0;
-        for (const cell of row.cells) {
-            if (matchesAttributePath(cell.attributePath, categoryField) && String(cell.value) === categoryValue) {
-                categoryMatch = true;
-            }
-            if (matchesAttributePath(cell.attributePath, valueField)) {
-                value = parseNumericValue(cell.value);
-            }
+        const categoryCell = findCellForField(row.cells, categoryField);
+        if (categoryCell && String(categoryCell.value) === categoryValue) {
+            const valueCell = findCellForField(row.cells, valueField);
+            return valueCell ? parseNumericValue(valueCell.value) : 0;
         }
-        if (categoryMatch)
-            return value;
     }
     return 0;
 }