Commit 6e8fd3c
authored
framework#3701 pinned down what an OBJECT-bound chart aggregate names its result
columns: the raw field names it was given — `groupBy` for the category, `field`
for the value, with no `sum_`-style decoration (unlike a dataset measure) — plus
the literal `count` when a `count` omits `field`, which is the alias the engine
projects COUNT(*) under.
Three of the four row builders honoured it. The odd one out was `count`, the one
function that may legitimately omit `field`, because every builder read
`params.field` directly: `aggregateRecords` and
`ObjectDataSource.aggregateClientSide` emitted a column literally named
`undefined`, and the legacy analytics path remapped the server's `count` measure
onto that key and deleted the original — throwing away the value the server had
returned.
All of them now resolve the column through one helper (`aggregateValueKey`), so
a fieldless count lands under `count`. The comparison-overlay column derives from
the same key (`count__comparison`, not `undefined__comparison`), and
`aggregate.field` is typed optional to match the spec's ChartAggregateSchema.
Charts that name a field are unchanged.
1 parent 9b4b952 commit 6e8fd3c
4 files changed
Lines changed: 168 additions & 25 deletions
File tree
- .changeset
- packages
- data-objectstack/src
- plugin-charts/src
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2603 | 2603 | | |
2604 | 2604 | | |
2605 | 2605 | | |
| 2606 | + | |
| 2607 | + | |
| 2608 | + | |
| 2609 | + | |
| 2610 | + | |
| 2611 | + | |
2606 | 2612 | | |
2607 | 2613 | | |
2608 | 2614 | | |
| |||
2634 | 2640 | | |
2635 | 2641 | | |
2636 | 2642 | | |
2637 | | - | |
| 2643 | + | |
2638 | 2644 | | |
2639 | 2645 | | |
2640 | 2646 | | |
| |||
2644 | 2650 | | |
2645 | 2651 | | |
2646 | 2652 | | |
2647 | | - | |
2648 | | - | |
2649 | | - | |
2650 | | - | |
| 2653 | + | |
| 2654 | + | |
| 2655 | + | |
| 2656 | + | |
| 2657 | + | |
2651 | 2658 | | |
2652 | 2659 | | |
2653 | | - | |
2654 | | - | |
| 2660 | + | |
| 2661 | + | |
2655 | 2662 | | |
2656 | 2663 | | |
2657 | 2664 | | |
| |||
2776 | 2783 | | |
2777 | 2784 | | |
2778 | 2785 | | |
2779 | | - | |
| 2786 | + | |
| 2787 | + | |
| 2788 | + | |
| 2789 | + | |
| 2790 | + | |
| 2791 | + | |
| 2792 | + | |
| 2793 | + | |
| 2794 | + | |
| 2795 | + | |
| 2796 | + | |
2780 | 2797 | | |
| 2798 | + | |
2781 | 2799 | | |
2782 | 2800 | | |
2783 | 2801 | | |
| |||
2787 | 2805 | | |
2788 | 2806 | | |
2789 | 2807 | | |
2790 | | - | |
| 2808 | + | |
2791 | 2809 | | |
2792 | 2810 | | |
2793 | 2811 | | |
| |||
2798 | 2816 | | |
2799 | 2817 | | |
2800 | 2818 | | |
2801 | | - | |
| 2819 | + | |
2802 | 2820 | | |
2803 | 2821 | | |
2804 | 2822 | | |
| |||
Lines changed: 67 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
18 | 35 | | |
19 | 36 | | |
20 | 37 | | |
21 | 38 | | |
22 | 39 | | |
23 | 40 | | |
24 | 41 | | |
25 | | - | |
| 42 | + | |
26 | 43 | | |
27 | 44 | | |
| 45 | + | |
28 | 46 | | |
29 | 47 | | |
30 | 48 | | |
| |||
34 | 52 | | |
35 | 53 | | |
36 | 54 | | |
37 | | - | |
| 55 | + | |
38 | 56 | | |
39 | 57 | | |
40 | 58 | | |
| |||
56 | 74 | | |
57 | 75 | | |
58 | 76 | | |
59 | | - | |
| 77 | + | |
60 | 78 | | |
61 | 79 | | |
62 | 80 | | |
| |||
369 | 387 | | |
370 | 388 | | |
371 | 389 | | |
372 | | - | |
373 | | - | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
374 | 393 | | |
375 | 394 | | |
376 | 395 | | |
| |||
479 | 498 | | |
480 | 499 | | |
481 | 500 | | |
| 501 | + | |
| 502 | + | |
| 503 | + | |
482 | 504 | | |
483 | 505 | | |
484 | | - | |
485 | | - | |
486 | | - | |
487 | | - | |
| 506 | + | |
| 507 | + | |
| 508 | + | |
| 509 | + | |
| 510 | + | |
| 511 | + | |
488 | 512 | | |
489 | 513 | | |
490 | 514 | | |
491 | 515 | | |
492 | | - | |
| 516 | + | |
493 | 517 | | |
494 | 518 | | |
495 | 519 | | |
| |||
601 | 625 | | |
602 | 626 | | |
603 | 627 | | |
| 628 | + | |
| 629 | + | |
| 630 | + | |
| 631 | + | |
604 | 632 | | |
605 | 633 | | |
606 | 634 | | |
607 | | - | |
608 | | - | |
| 635 | + | |
| 636 | + | |
609 | 637 | | |
610 | 638 | | |
611 | 639 | | |
612 | 640 | | |
613 | | - | |
| 641 | + | |
614 | 642 | | |
615 | 643 | | |
616 | 644 | | |
| |||
624 | 652 | | |
625 | 653 | | |
626 | 654 | | |
627 | | - | |
| 655 | + | |
628 | 656 | | |
629 | 657 | | |
630 | 658 | | |
631 | 659 | | |
632 | | - | |
| 660 | + | |
633 | 661 | | |
634 | 662 | | |
635 | 663 | | |
| |||
0 commit comments