@lightdash/common 2.610.0 → 2.610.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (97) hide show
  1. package/dist/cjs/.tsbuildinfo +1 -1
  2. package/dist/cjs/ee/AiAgent/chartConfig/slack/getWarehousePivotedResults.d.ts +13 -0
  3. package/dist/cjs/ee/AiAgent/chartConfig/slack/getWarehousePivotedResults.d.ts.map +1 -0
  4. package/dist/cjs/ee/AiAgent/chartConfig/slack/getWarehousePivotedResults.js +43 -0
  5. package/dist/cjs/ee/AiAgent/chartConfig/slack/getWarehousePivotedResults.js.map +1 -0
  6. package/dist/cjs/ee/AiAgent/chartConfig/slack/index.d.ts +2 -0
  7. package/dist/cjs/ee/AiAgent/chartConfig/slack/index.d.ts.map +1 -1
  8. package/dist/cjs/ee/AiAgent/chartConfig/slack/index.js +5 -1
  9. package/dist/cjs/ee/AiAgent/chartConfig/slack/index.js.map +1 -1
  10. package/dist/cjs/ee/AiAgent/chartConfig/slack/runQueryTool/viz/bar.d.ts.map +1 -1
  11. package/dist/cjs/ee/AiAgent/chartConfig/slack/runQueryTool/viz/bar.js +18 -19
  12. package/dist/cjs/ee/AiAgent/chartConfig/slack/runQueryTool/viz/bar.js.map +1 -1
  13. package/dist/cjs/ee/AiAgent/chartConfig/slack/runQueryTool/viz/horizontalBar.js +4 -5
  14. package/dist/cjs/ee/AiAgent/chartConfig/slack/runQueryTool/viz/horizontalBar.js.map +1 -1
  15. package/dist/cjs/ee/AiAgent/chartConfig/slack/runQueryTool/viz/line.d.ts.map +1 -1
  16. package/dist/cjs/ee/AiAgent/chartConfig/slack/runQueryTool/viz/line.js +21 -22
  17. package/dist/cjs/ee/AiAgent/chartConfig/slack/runQueryTool/viz/line.js.map +1 -1
  18. package/dist/cjs/ee/AiAgent/chartConfig/slack/runQueryTool/viz/scatter.js +4 -5
  19. package/dist/cjs/ee/AiAgent/chartConfig/slack/runQueryTool/viz/scatter.js.map +1 -1
  20. package/dist/cjs/ee/AiAgent/chartConfig/slack/types.d.ts +5 -1
  21. package/dist/cjs/ee/AiAgent/chartConfig/slack/types.d.ts.map +1 -1
  22. package/dist/cjs/ee/AiAgent/chartConfig/web/getWebAiChartConfig.d.ts +7 -7
  23. package/dist/cjs/ee/AiAgent/schemas/tools/toolQueryResultSchemas.d.ts +13 -2
  24. package/dist/cjs/ee/AiAgent/schemas/tools/toolQueryResultSchemas.d.ts.map +1 -1
  25. package/dist/cjs/ee/AiAgent/schemas/tools/toolQueryResultSchemas.js +15 -2
  26. package/dist/cjs/ee/AiAgent/schemas/tools/toolQueryResultSchemas.js.map +1 -1
  27. package/dist/cjs/ee/AiAgent/schemas/tools/toolRunQueryArgs.d.ts +1 -1
  28. package/dist/cjs/ee/AiAgent/schemas/tools/toolRunQueryArgs.d.ts.map +1 -1
  29. package/dist/cjs/ee/AiAgent/schemas/tools/toolRunQueryArgs.js +1 -1
  30. package/dist/cjs/ee/AiAgent/utils.d.ts +29 -29
  31. package/dist/cjs/schemas/chartAsCodeSchema.d.ts +11 -11
  32. package/dist/cjs/schemas/json/mcp-tools-1.0.json +70 -28
  33. package/dist/esm/.tsbuildinfo +1 -1
  34. package/dist/esm/ee/AiAgent/chartConfig/slack/getWarehousePivotedResults.d.ts +13 -0
  35. package/dist/esm/ee/AiAgent/chartConfig/slack/getWarehousePivotedResults.d.ts.map +1 -0
  36. package/dist/esm/ee/AiAgent/chartConfig/slack/getWarehousePivotedResults.js +39 -0
  37. package/dist/esm/ee/AiAgent/chartConfig/slack/getWarehousePivotedResults.js.map +1 -0
  38. package/dist/esm/ee/AiAgent/chartConfig/slack/index.d.ts +2 -0
  39. package/dist/esm/ee/AiAgent/chartConfig/slack/index.d.ts.map +1 -1
  40. package/dist/esm/ee/AiAgent/chartConfig/slack/index.js +2 -0
  41. package/dist/esm/ee/AiAgent/chartConfig/slack/index.js.map +1 -1
  42. package/dist/esm/ee/AiAgent/chartConfig/slack/runQueryTool/viz/bar.d.ts.map +1 -1
  43. package/dist/esm/ee/AiAgent/chartConfig/slack/runQueryTool/viz/bar.js +18 -19
  44. package/dist/esm/ee/AiAgent/chartConfig/slack/runQueryTool/viz/bar.js.map +1 -1
  45. package/dist/esm/ee/AiAgent/chartConfig/slack/runQueryTool/viz/horizontalBar.js +4 -5
  46. package/dist/esm/ee/AiAgent/chartConfig/slack/runQueryTool/viz/horizontalBar.js.map +1 -1
  47. package/dist/esm/ee/AiAgent/chartConfig/slack/runQueryTool/viz/line.d.ts.map +1 -1
  48. package/dist/esm/ee/AiAgent/chartConfig/slack/runQueryTool/viz/line.js +21 -22
  49. package/dist/esm/ee/AiAgent/chartConfig/slack/runQueryTool/viz/line.js.map +1 -1
  50. package/dist/esm/ee/AiAgent/chartConfig/slack/runQueryTool/viz/scatter.js +4 -5
  51. package/dist/esm/ee/AiAgent/chartConfig/slack/runQueryTool/viz/scatter.js.map +1 -1
  52. package/dist/esm/ee/AiAgent/chartConfig/slack/types.d.ts +5 -1
  53. package/dist/esm/ee/AiAgent/chartConfig/slack/types.d.ts.map +1 -1
  54. package/dist/esm/ee/AiAgent/chartConfig/web/getWebAiChartConfig.d.ts +29 -29
  55. package/dist/esm/ee/AiAgent/schemas/tools/toolQueryResultSchemas.d.ts +13 -2
  56. package/dist/esm/ee/AiAgent/schemas/tools/toolQueryResultSchemas.d.ts.map +1 -1
  57. package/dist/esm/ee/AiAgent/schemas/tools/toolQueryResultSchemas.js +14 -1
  58. package/dist/esm/ee/AiAgent/schemas/tools/toolQueryResultSchemas.js.map +1 -1
  59. package/dist/esm/ee/AiAgent/schemas/tools/toolRunQueryArgs.d.ts +1 -1
  60. package/dist/esm/ee/AiAgent/schemas/tools/toolRunQueryArgs.d.ts.map +1 -1
  61. package/dist/esm/ee/AiAgent/schemas/tools/toolRunQueryArgs.js +1 -1
  62. package/dist/esm/ee/AiAgent/utils.d.ts +7 -7
  63. package/dist/esm/schemas/chartAsCodeSchema.d.ts +11 -11
  64. package/dist/esm/schemas/json/mcp-tools-1.0.json +70 -28
  65. package/dist/types/.tsbuildinfo +1 -1
  66. package/dist/types/ee/AiAgent/chartConfig/slack/getWarehousePivotedResults.d.ts +13 -0
  67. package/dist/types/ee/AiAgent/chartConfig/slack/getWarehousePivotedResults.d.ts.map +1 -0
  68. package/dist/types/ee/AiAgent/chartConfig/slack/getWarehousePivotedResults.js +39 -0
  69. package/dist/types/ee/AiAgent/chartConfig/slack/getWarehousePivotedResults.js.map +1 -0
  70. package/dist/types/ee/AiAgent/chartConfig/slack/index.d.ts +2 -0
  71. package/dist/types/ee/AiAgent/chartConfig/slack/index.d.ts.map +1 -1
  72. package/dist/types/ee/AiAgent/chartConfig/slack/index.js +2 -0
  73. package/dist/types/ee/AiAgent/chartConfig/slack/index.js.map +1 -1
  74. package/dist/types/ee/AiAgent/chartConfig/slack/runQueryTool/viz/bar.d.ts.map +1 -1
  75. package/dist/types/ee/AiAgent/chartConfig/slack/runQueryTool/viz/bar.js +18 -19
  76. package/dist/types/ee/AiAgent/chartConfig/slack/runQueryTool/viz/bar.js.map +1 -1
  77. package/dist/types/ee/AiAgent/chartConfig/slack/runQueryTool/viz/horizontalBar.js +4 -5
  78. package/dist/types/ee/AiAgent/chartConfig/slack/runQueryTool/viz/horizontalBar.js.map +1 -1
  79. package/dist/types/ee/AiAgent/chartConfig/slack/runQueryTool/viz/line.d.ts.map +1 -1
  80. package/dist/types/ee/AiAgent/chartConfig/slack/runQueryTool/viz/line.js +21 -22
  81. package/dist/types/ee/AiAgent/chartConfig/slack/runQueryTool/viz/line.js.map +1 -1
  82. package/dist/types/ee/AiAgent/chartConfig/slack/runQueryTool/viz/scatter.js +4 -5
  83. package/dist/types/ee/AiAgent/chartConfig/slack/runQueryTool/viz/scatter.js.map +1 -1
  84. package/dist/types/ee/AiAgent/chartConfig/slack/types.d.ts +5 -1
  85. package/dist/types/ee/AiAgent/chartConfig/slack/types.d.ts.map +1 -1
  86. package/dist/types/ee/AiAgent/chartConfig/web/getWebAiChartConfig.d.ts +29 -29
  87. package/dist/types/ee/AiAgent/schemas/tools/toolQueryResultSchemas.d.ts +13 -2
  88. package/dist/types/ee/AiAgent/schemas/tools/toolQueryResultSchemas.d.ts.map +1 -1
  89. package/dist/types/ee/AiAgent/schemas/tools/toolQueryResultSchemas.js +14 -1
  90. package/dist/types/ee/AiAgent/schemas/tools/toolQueryResultSchemas.js.map +1 -1
  91. package/dist/types/ee/AiAgent/schemas/tools/toolRunQueryArgs.d.ts +1 -1
  92. package/dist/types/ee/AiAgent/schemas/tools/toolRunQueryArgs.d.ts.map +1 -1
  93. package/dist/types/ee/AiAgent/schemas/tools/toolRunQueryArgs.js +1 -1
  94. package/dist/types/ee/AiAgent/utils.d.ts +7 -7
  95. package/dist/types/schemas/chartAsCodeSchema.d.ts +11 -11
  96. package/dist/types/schemas/json/mcp-tools-1.0.json +70 -28
  97. package/package.json +1 -1
@@ -0,0 +1,13 @@
1
+ import { type ItemsMap } from '../../../../types/field';
2
+ import { type ParametersValuesMap } from '../../../../types/parameters';
3
+ import { type PivotValuesColumn } from '../../../../visualizations/types';
4
+ import { type GetPivotedResultsFn } from './types';
5
+ /** Feeds the chart builders rows the warehouse already pivoted. */
6
+ export declare const getWarehousePivotedResults: ({ rows, fieldsMap, valuesColumns, parameters, timezone, }: {
7
+ rows: Record<string, unknown>[];
8
+ fieldsMap: ItemsMap;
9
+ valuesColumns: PivotValuesColumn[];
10
+ parameters: ParametersValuesMap | null;
11
+ timezone: string | null;
12
+ }) => GetPivotedResultsFn;
13
+ //# sourceMappingURL=getWarehousePivotedResults.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"getWarehousePivotedResults.d.ts","sourceRoot":"","sources":["../../../../../../src/ee/AiAgent/chartConfig/slack/getWarehousePivotedResults.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAExE,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAE1E,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAkCnD,mEAAmE;AACnE,eAAO,MAAM,0BAA0B,8DAOhC;IACC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IAChC,SAAS,EAAE,QAAQ,CAAC;IACpB,aAAa,EAAE,iBAAiB,EAAE,CAAC;IACnC,UAAU,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACvC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B,KAAG,mBAmCH,CAAC"}
@@ -0,0 +1,39 @@
1
+ import { getFormattedValue } from '../../../../visualizations/helpers/valueFormatter';
2
+ import { formatFieldLabel } from '../shared/formatFieldLabel';
3
+ // Mirrors the app's pivoted series names: formatted pivot values, prefixed with the metric when the chart plots several.
4
+ const getSeriesLabel = ({ column, fieldsMap, parameters, timezone, isMultiMetric, }) => {
5
+ const pivotLabel = column.pivotValues
6
+ .map(({ referenceField, value }) => getFormattedValue(value, referenceField, fieldsMap, undefined, undefined, parameters ?? undefined, timezone ?? undefined))
7
+ .join(' - ');
8
+ return isMultiMetric
9
+ ? `[${pivotLabel}] ${formatFieldLabel(column.referenceField, fieldsMap)}`
10
+ : pivotLabel;
11
+ };
12
+ /** Feeds the chart builders rows the warehouse already pivoted. */
13
+ export const getWarehousePivotedResults = ({ rows, fieldsMap, valuesColumns, parameters, timezone, }) => async (_rows, _fieldsMap, _pivotFields, metrics, secondaryMetrics) => {
14
+ const getColumns = (references) => valuesColumns.filter(({ referenceField }) => references.includes(referenceField));
15
+ const columns = getColumns(metrics);
16
+ const secondaryColumns = getColumns(secondaryMetrics);
17
+ const isMultiMetric = metrics.length + secondaryMetrics.length > 1;
18
+ // ECharts reads dataset columns from the first row, and the warehouse omits empty pivot cells
19
+ const emptyRow = Object.fromEntries([...columns, ...secondaryColumns].map(({ pivotColumnName }) => [
20
+ pivotColumnName,
21
+ null,
22
+ ]));
23
+ return {
24
+ results: rows.map((row) => ({ ...emptyRow, ...row })),
25
+ metrics: columns.map(({ pivotColumnName }) => pivotColumnName),
26
+ secondaryMetrics: secondaryColumns.map(({ pivotColumnName }) => pivotColumnName),
27
+ labels: Object.fromEntries([...columns, ...secondaryColumns].map((column) => [
28
+ column.pivotColumnName,
29
+ getSeriesLabel({
30
+ column,
31
+ fieldsMap,
32
+ parameters,
33
+ timezone,
34
+ isMultiMetric,
35
+ }),
36
+ ])),
37
+ };
38
+ };
39
+ //# sourceMappingURL=getWarehousePivotedResults.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"getWarehousePivotedResults.js","sourceRoot":"","sources":["../../../../../../src/ee/AiAgent/chartConfig/slack/getWarehousePivotedResults.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mDAAmD,CAAC;AAEtF,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAG9D,yHAAyH;AACzH,MAAM,cAAc,GAAG,CAAC,EACpB,MAAM,EACN,SAAS,EACT,UAAU,EACV,QAAQ,EACR,aAAa,GAOhB,EAAU,EAAE;IACT,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW;SAChC,GAAG,CAAC,CAAC,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,EAAE,CAC/B,iBAAiB,CACb,KAAK,EACL,cAAc,EACd,SAAS,EACT,SAAS,EACT,SAAS,EACT,UAAU,IAAI,SAAS,EACvB,QAAQ,IAAI,SAAS,CACxB,CACJ;SACA,IAAI,CAAC,KAAK,CAAC,CAAC;IACjB,OAAO,aAAa;QAChB,CAAC,CAAC,IAAI,UAAU,KAAK,gBAAgB,CAAC,MAAM,CAAC,cAAc,EAAE,SAAS,CAAC,EAAE;QACzE,CAAC,CAAC,UAAU,CAAC;AACrB,CAAC,CAAC;AAEF,mEAAmE;AACnE,MAAM,CAAC,MAAM,0BAA0B,GACnC,CAAC,EACG,IAAI,EACJ,SAAS,EACT,aAAa,EACb,UAAU,EACV,QAAQ,GAOX,EAAuB,EAAE,CAC1B,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,OAAO,EAAE,gBAAgB,EAAE,EAAE;IACjE,MAAM,UAAU,GAAG,CAAC,UAAoB,EAAE,EAAE,CACxC,aAAa,CAAC,MAAM,CAAC,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,CACxC,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,CACtC,CAAC;IACN,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;IACpC,MAAM,gBAAgB,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAC;IACtD,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,GAAG,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC;IACnE,8FAA8F;IAC9F,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAC/B,CAAC,GAAG,OAAO,EAAE,GAAG,gBAAgB,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC;QAC3D,eAAe;QACf,IAAI;KACP,CAAC,CACL,CAAC;IACF,OAAO;QACH,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,QAAQ,EAAE,GAAG,GAAG,EAAE,CAAC,CAAC;QACrD,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC,eAAe,CAAC;QAC9D,gBAAgB,EAAE,gBAAgB,CAAC,GAAG,CAClC,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC,eAAe,CAC3C;QACD,MAAM,EAAE,MAAM,CAAC,WAAW,CACtB,CAAC,GAAG,OAAO,EAAE,GAAG,gBAAgB,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;YAC9C,MAAM,CAAC,eAAe;YACtB,cAAc,CAAC;gBACX,MAAM;gBACN,SAAS;gBACT,UAAU;gBACV,QAAQ;gBACR,aAAa;aAChB,CAAC;SACL,CAAC,CACL;KACJ,CAAC;AACN,CAAC,CAAC"}
@@ -1,3 +1,5 @@
1
+ export { formatFieldLabel } from '../shared/formatFieldLabel';
1
2
  export { getSlackAiEchartsConfig, type SlackAiToolArgs, } from './getSlackAiEchartsConfig';
3
+ export { getWarehousePivotedResults } from './getWarehousePivotedResults';
2
4
  export type { GetPivotedResultsFn, PivotedResults } from './types';
3
5
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/ee/AiAgent/chartConfig/slack/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,uBAAuB,EACvB,KAAK,eAAe,GACvB,MAAM,2BAA2B,CAAC;AACnC,YAAY,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/ee/AiAgent/chartConfig/slack/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EACH,uBAAuB,EACvB,KAAK,eAAe,GACvB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,YAAY,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC"}
@@ -1,2 +1,4 @@
1
+ export { formatFieldLabel } from '../shared/formatFieldLabel';
1
2
  export { getSlackAiEchartsConfig, } from './getSlackAiEchartsConfig';
3
+ export { getWarehousePivotedResults } from './getWarehousePivotedResults';
2
4
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/ee/AiAgent/chartConfig/slack/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,uBAAuB,GAE1B,MAAM,2BAA2B,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/ee/AiAgent/chartConfig/slack/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EACH,uBAAuB,GAE1B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"bar.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ee/AiAgent/chartConfig/slack/runQueryTool/viz/bar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAG9D,OAAO,EAAE,KAAK,uCAAuC,EAAE,MAAM,qBAAqB,CAAC;AAGnF,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAEvD;;GAEG;AACH,eAAO,MAAM,wBAAwB,cACtB,uCAAuC,QAC5C,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,aACpB,QAAQ,qBACA,mBAAmB,KACvC,OAAO,CAAC,aAAa,CAyGvB,CAAC"}
1
+ {"version":3,"file":"bar.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ee/AiAgent/chartConfig/slack/runQueryTool/viz/bar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAG9D,OAAO,EAAE,KAAK,uCAAuC,EAAE,MAAM,qBAAqB,CAAC;AAGnF,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAEvD;;GAEG;AACH,eAAO,MAAM,wBAAwB,cACtB,uCAAuC,QAC5C,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,aACpB,QAAQ,qBACA,mBAAmB,KACvC,OAAO,CAAC,aAAa,CAsGvB,CAAC"}
@@ -11,11 +11,17 @@ export const getBarChartEchartsConfig = async (queryTool, rows, fieldsMap, getPi
11
11
  const yMetrics = chartConfig?.yAxisMetrics || queryMetrics;
12
12
  const secondaryYAxisMetric = chartConfig?.secondaryYAxisMetric;
13
13
  let metrics = yMetrics;
14
+ let secondaryMetrics = secondaryYAxisMetric
15
+ ? [secondaryYAxisMetric]
16
+ : [];
17
+ let getSeriesName = (key) => formatFieldLabel(key, fieldsMap);
14
18
  let chartData = rows;
15
19
  if (chartConfig?.groupBy?.length) {
16
- const pivoted = await getPivotedResults(rows, fieldsMap, chartConfig.groupBy, yMetrics, sorts);
20
+ const pivoted = await getPivotedResults(rows, fieldsMap, chartConfig.groupBy, yMetrics, secondaryMetrics, sorts);
17
21
  chartData = pivoted.results;
18
22
  metrics = pivoted.metrics;
23
+ secondaryMetrics = pivoted.secondaryMetrics;
24
+ getSeriesName = (key) => pivoted.labels[key];
19
25
  }
20
26
  const xAxisField = fieldsMap[xDimension];
21
27
  const yAxisField = yMetrics[0] ? fieldsMap[yMetrics[0]] : undefined;
@@ -68,30 +74,23 @@ export const getBarChartEchartsConfig = async (queryTool, rows, fieldsMap, getPi
68
74
  ...metrics.map((metric) => ({
69
75
  type: 'bar',
70
76
  yAxisIndex: 0,
71
- // Use formatted label for non-pivoted metrics, otherwise use the metric name as-is (already formatted by pivot)
72
- name: yMetrics.includes(metric)
73
- ? formatFieldLabel(metric, fieldsMap)
74
- : metric,
77
+ name: getSeriesName(metric),
78
+ encode: {
79
+ x: xDimension,
80
+ y: metric,
81
+ },
82
+ ...(chartConfig?.stackBars ? { stack: 'stack' } : {}),
83
+ })),
84
+ ...secondaryMetrics.map((metric) => ({
85
+ type: 'bar',
86
+ yAxisIndex: 1,
87
+ name: getSeriesName(metric),
75
88
  encode: {
76
89
  x: xDimension,
77
90
  y: metric,
78
91
  },
79
92
  ...(chartConfig?.stackBars ? { stack: 'stack' } : {}),
80
93
  })),
81
- ...(secondaryYAxisMetric
82
- ? [
83
- {
84
- type: 'bar',
85
- yAxisIndex: 1,
86
- name: formatFieldLabel(secondaryYAxisMetric, fieldsMap),
87
- encode: {
88
- x: xDimension,
89
- y: secondaryYAxisMetric,
90
- },
91
- ...(chartConfig?.stackBars ? { stack: 'stack' } : {}),
92
- },
93
- ]
94
- : []),
95
94
  ],
96
95
  };
97
96
  };
@@ -1 +1 @@
1
- {"version":3,"file":"bar.js","sourceRoot":"","sources":["../../../../../../../../src/ee/AiAgent/chartConfig/slack/runQueryTool/viz/bar.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,+BAA+B,EAAE,MAAM,0EAA0E,CAAC;AAE3H,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAG7E;;GAEG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,EACzC,SAAkD,EAClD,IAA+B,EAC/B,SAAmB,EACnB,iBAAsC,EAChB,EAAE;IACxB,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC,WAAW,CAAC;IAC3E,MAAM,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC;IAClC,MAAM,UAAU,GAAG,WAAW,EAAE,cAAc,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC;IAChE,MAAM,QAAQ,GAAG,WAAW,EAAE,YAAY,IAAI,YAAY,CAAC;IAC3D,MAAM,oBAAoB,GAAG,WAAW,EAAE,oBAAoB,CAAC;IAC/D,IAAI,OAAO,GAAa,QAAQ,CAAC;IACjC,IAAI,SAAS,GAAG,IAAI,CAAC;IAErB,IAAI,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAC/B,MAAM,OAAO,GAAG,MAAM,iBAAiB,CACnC,IAAI,EACJ,SAAS,EACT,WAAW,CAAC,OAAO,EACnB,QAAQ,EACR,KAAoB,CACvB,CAAC;QACF,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;QAC5B,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAC9B,CAAC;IAED,MAAM,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;IACzC,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACpE,MAAM,mBAAmB,GAAG,oBAAoB;QAC5C,CAAC,CAAC,SAAS,CAAC,oBAAoB,CAAC;QACjC,CAAC,CAAC,SAAS,CAAC;IAEhB,MAAM,WAAW,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;IAC/B,MAAM,kBAAkB,GACpB,WAAW,EAAE,OAAO,KAAK,UAAU,IAAI,WAAW,EAAE,UAAU,KAAK,IAAI,CAAC;IAE5E,MAAM,WAAW,GAAG;QAChB;YACI,IAAI,EAAE,OAAgB;YACtB,GAAG,+BAA+B,CAAC;gBAC/B,QAAQ,EAAE,UAAU;gBACpB,IAAI,EAAE,IAAI;aACb,CAAC;SACL;QACD,GAAG,CAAC,mBAAmB;YACnB,CAAC,CAAC;gBACI;oBACI,IAAI,EAAE,OAAgB;oBACtB,GAAG,+BAA+B,CAAC;wBAC/B,QAAQ,EAAE,mBAAmB;wBAC7B,IAAI,EAAE,IAAI;qBACb,CAAC;iBACL;aACJ;YACH,CAAC,CAAC,EAAE,CAAC;KACZ,CAAC;IAEF,OAAO;QACH,GAAG,sBAAsB,CAAC;YACtB,KAAK,EAAE,SAAS,CAAC,KAAK;YACtB,UAAU,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC;YAC9B,SAAS;YACT,UAAU,EAAE,WAAW,EAAE,UAAU;YACnC,UAAU,EAAE,WAAW,EAAE,UAAU;YACnC,mBAAmB,EAAE,WAAW,EAAE,mBAAmB;SACxD,CAAC;QACF,KAAK,EAAE;YACH;gBACI,IAAI,EAAE,WAAW,EAAE,SAAS,IAAK,UAAoB;gBACrD,GAAG,+BAA+B,CAAC;oBAC/B,QAAQ,EAAE,UAAU;oBACpB,IAAI,EAAE,IAAI;iBACb,CAAC;gBACF,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACnD;SACJ;QACD,KAAK,EAAE,WAAW;QAClB,MAAM,EAAE;YACJ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBACxB,IAAI,EAAE,KAAc;gBACpB,UAAU,EAAE,CAAC;gBACb,gHAAgH;gBAChH,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC;oBAC3B,CAAC,CAAC,gBAAgB,CAAC,MAAM,EAAE,SAAS,CAAC;oBACrC,CAAC,CAAC,MAAM;gBACZ,MAAM,EAAE;oBACJ,CAAC,EAAE,UAAU;oBACb,CAAC,EAAE,MAAM;iBACZ;gBACD,GAAG,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACxD,CAAC,CAAC;YACH,GAAG,CAAC,oBAAoB;gBACpB,CAAC,CAAC;oBACI;wBACI,IAAI,EAAE,KAAc;wBACpB,UAAU,EAAE,CAAC;wBACb,IAAI,EAAE,gBAAgB,CAClB,oBAAoB,EACpB,SAAS,CACZ;wBACD,MAAM,EAAE;4BACJ,CAAC,EAAE,UAAU;4BACb,CAAC,EAAE,oBAAoB;yBAC1B;wBACD,GAAG,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;qBACxD;iBACJ;gBACH,CAAC,CAAC,EAAE,CAAC;SACZ;KACJ,CAAC;AACN,CAAC,CAAC"}
1
+ {"version":3,"file":"bar.js","sourceRoot":"","sources":["../../../../../../../../src/ee/AiAgent/chartConfig/slack/runQueryTool/viz/bar.ts"],"names":[],"mappings":"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"}
@@ -10,11 +10,13 @@ export const getHorizontalBarChartEchartsConfig = async (queryTool, rows, fields
10
10
  const xDimension = chartConfig?.xAxisDimension || dimensions[0];
11
11
  const yMetrics = chartConfig?.yAxisMetrics || queryMetrics;
12
12
  let metrics = yMetrics;
13
+ let getSeriesName = (key) => formatFieldLabel(key, fieldsMap);
13
14
  let chartData = rows;
14
15
  if (chartConfig?.groupBy?.length) {
15
- const pivoted = await getPivotedResults(rows, fieldsMap, chartConfig.groupBy, yMetrics, sorts);
16
+ const pivoted = await getPivotedResults(rows, fieldsMap, chartConfig.groupBy, yMetrics, [], sorts);
16
17
  chartData = pivoted.results;
17
18
  metrics = pivoted.metrics;
19
+ getSeriesName = (key) => pivoted.labels[key];
18
20
  }
19
21
  // Get axis field items for formatting (note: x/y are flipped for horizontal charts)
20
22
  const yAxisField = fieldsMap[xDimension]; // Category axis
@@ -50,10 +52,7 @@ export const getHorizontalBarChartEchartsConfig = async (queryTool, rows, fields
50
52
  ],
51
53
  series: metrics.map((metric) => ({
52
54
  type: 'bar',
53
- // Use formatted label for non-pivoted metrics, otherwise use the metric name as-is (already formatted by pivot)
54
- name: yMetrics.includes(metric)
55
- ? formatFieldLabel(metric, fieldsMap)
56
- : metric,
55
+ name: getSeriesName(metric),
57
56
  encode: {
58
57
  x: metric,
59
58
  y: xDimension,
@@ -1 +1 @@
1
- {"version":3,"file":"horizontalBar.js","sourceRoot":"","sources":["../../../../../../../../src/ee/AiAgent/chartConfig/slack/runQueryTool/viz/horizontalBar.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"horizontalBar.js","sourceRoot":"","sources":["../../../../../../../../src/ee/AiAgent/chartConfig/slack/runQueryTool/viz/horizontalBar.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,+BAA+B,EAAE,MAAM,0EAA0E,CAAC;AAE3H,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAG7E;;GAEG;AACH,MAAM,CAAC,MAAM,kCAAkC,GAAG,KAAK,EACnD,SAAkD,EAClD,IAA+B,EAC/B,SAAmB,EACnB,iBAAsC,EAChB,EAAE;IACxB,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC,WAAW,CAAC;IAC3E,MAAM,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC;IAClC,MAAM,UAAU,GAAG,WAAW,EAAE,cAAc,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC;IAChE,MAAM,QAAQ,GAAG,WAAW,EAAE,YAAY,IAAI,YAAY,CAAC;IAC3D,IAAI,OAAO,GAAa,QAAQ,CAAC;IACjC,IAAI,aAAa,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IACtE,IAAI,SAAS,GAAG,IAAI,CAAC;IAErB,IAAI,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAC/B,MAAM,OAAO,GAAG,MAAM,iBAAiB,CACnC,IAAI,EACJ,SAAS,EACT,WAAW,CAAC,OAAO,EACnB,QAAQ,EACR,EAAE,EACF,KAAoB,CACvB,CAAC;QACF,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;QAC5B,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC1B,aAAa,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACzD,CAAC;IAED,oFAAoF;IACpF,MAAM,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,gBAAgB;IAC1D,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,aAAa;IAElF,MAAM,WAAW,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;IAC/B,MAAM,kBAAkB,GACpB,WAAW,EAAE,OAAO,KAAK,UAAU,IAAI,WAAW,EAAE,UAAU,KAAK,IAAI,CAAC;IAE5E,OAAO;QACH,GAAG,sBAAsB,CAAC;YACtB,KAAK,EAAE,SAAS,CAAC,KAAK;YACtB,UAAU,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC;YAC9B,SAAS;YACT,UAAU,EAAE,WAAW,EAAE,UAAU;YACnC,UAAU,EAAE,WAAW,EAAE,UAAU;SACtC,CAAC;QACF,KAAK,EAAE;YACH;gBACI,IAAI,EAAE,OAAO;gBACb,GAAG,+BAA+B,CAAC;oBAC/B,QAAQ,EAAE,UAAU;oBACpB,IAAI,EAAE,IAAI;iBACb,CAAC;aACL;SACJ;QACD,KAAK,EAAE;YACH;gBACI,IAAI,EAAE,WAAW,EAAE,SAAS,IAAK,UAAoB;gBACrD,GAAG,+BAA+B,CAAC;oBAC/B,QAAQ,EAAE,UAAU;oBACpB,IAAI,EAAE,IAAI;iBACb,CAAC;gBACF,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACnD;SACJ;QACD,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAC7B,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC;YAC3B,MAAM,EAAE;gBACJ,CAAC,EAAE,MAAM;gBACT,CAAC,EAAE,UAAU;aAChB;YACD,GAAG,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACxD,CAAC,CAAC;KACN,CAAC;AACN,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"line.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ee/AiAgent/chartConfig/slack/runQueryTool/viz/line.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAG9D,OAAO,EAAE,KAAK,uCAAuC,EAAE,MAAM,qBAAqB,CAAC;AAGnF,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAEvD;;GAEG;AACH,eAAO,MAAM,yBAAyB,cACvB,uCAAuC,QAC5C,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,aACpB,QAAQ,qBACA,mBAAmB,KACvC,OAAO,CAAC,aAAa,CAiHvB,CAAC"}
1
+ {"version":3,"file":"line.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ee/AiAgent/chartConfig/slack/runQueryTool/viz/line.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAG9D,OAAO,EAAE,KAAK,uCAAuC,EAAE,MAAM,qBAAqB,CAAC;AAGnF,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAEvD;;GAEG;AACH,eAAO,MAAM,yBAAyB,cACvB,uCAAuC,QAC5C,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,aACpB,QAAQ,qBACA,mBAAmB,KACvC,OAAO,CAAC,aAAa,CA8GvB,CAAC"}
@@ -11,11 +11,17 @@ export const getLineChartEchartsConfig = async (queryTool, rows, fieldsMap, getP
11
11
  const yMetrics = chartConfig?.yAxisMetrics || queryMetrics;
12
12
  const secondaryYAxisMetric = chartConfig?.secondaryYAxisMetric;
13
13
  let metrics = yMetrics;
14
+ let secondaryMetrics = secondaryYAxisMetric
15
+ ? [secondaryYAxisMetric]
16
+ : [];
17
+ let getSeriesName = (key) => formatFieldLabel(key, fieldsMap);
14
18
  let chartData = rows;
15
19
  if (chartConfig?.groupBy?.length) {
16
- const pivoted = await getPivotedResults(rows, fieldsMap, chartConfig.groupBy, yMetrics, sorts);
20
+ const pivoted = await getPivotedResults(rows, fieldsMap, chartConfig.groupBy, yMetrics, secondaryMetrics, sorts);
17
21
  chartData = pivoted.results;
18
22
  metrics = pivoted.metrics;
23
+ secondaryMetrics = pivoted.secondaryMetrics;
24
+ getSeriesName = (key) => pivoted.labels[key];
19
25
  }
20
26
  const xAxisField = fieldsMap[xDimension];
21
27
  const yAxisField = yMetrics[0] ? fieldsMap[yMetrics[0]] : undefined;
@@ -70,10 +76,20 @@ export const getLineChartEchartsConfig = async (queryTool, rows, fieldsMap, getP
70
76
  ...metrics.map((metric) => ({
71
77
  type: 'line',
72
78
  yAxisIndex: 0,
73
- // Use formatted label for non-pivoted metrics, otherwise use the metric name as-is (already formatted by pivot)
74
- name: yMetrics.includes(metric)
75
- ? formatFieldLabel(metric, fieldsMap)
76
- : metric,
79
+ name: getSeriesName(metric),
80
+ encode: {
81
+ x: xDimension,
82
+ y: metric,
83
+ },
84
+ ...(chartConfig?.lineType === 'area' && {
85
+ areaStyle: {},
86
+ }),
87
+ showSymbol: true,
88
+ })),
89
+ ...secondaryMetrics.map((metric) => ({
90
+ type: 'line',
91
+ yAxisIndex: 1,
92
+ name: getSeriesName(metric),
77
93
  encode: {
78
94
  x: xDimension,
79
95
  y: metric,
@@ -83,23 +99,6 @@ export const getLineChartEchartsConfig = async (queryTool, rows, fieldsMap, getP
83
99
  }),
84
100
  showSymbol: true,
85
101
  })),
86
- ...(secondaryYAxisMetric
87
- ? [
88
- {
89
- type: 'line',
90
- yAxisIndex: 1,
91
- name: formatFieldLabel(secondaryYAxisMetric, fieldsMap),
92
- encode: {
93
- x: xDimension,
94
- y: secondaryYAxisMetric,
95
- },
96
- ...(chartConfig?.lineType === 'area' && {
97
- areaStyle: {},
98
- }),
99
- showSymbol: true,
100
- },
101
- ]
102
- : []),
103
102
  ],
104
103
  };
105
104
  };
@@ -1 +1 @@
1
- {"version":3,"file":"line.js","sourceRoot":"","sources":["../../../../../../../../src/ee/AiAgent/chartConfig/slack/runQueryTool/viz/line.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"line.js","sourceRoot":"","sources":["../../../../../../../../src/ee/AiAgent/chartConfig/slack/runQueryTool/viz/line.ts"],"names":[],"mappings":"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"}
@@ -10,12 +10,14 @@ export const getScatterChartEchartsConfig = async (queryTool, rows, fieldsMap, g
10
10
  const xDimension = chartConfig?.xAxisDimension || dimensions[0];
11
11
  const yMetrics = chartConfig?.yAxisMetrics || queryMetrics;
12
12
  let metrics = yMetrics;
13
+ let getSeriesName = (key) => formatFieldLabel(key, fieldsMap);
13
14
  let chartData = rows;
14
15
  // If we should pivot and have a breakdown dimension, pivot the data
15
16
  if (chartConfig?.groupBy?.length) {
16
- const pivoted = await getPivotedResults(rows, fieldsMap, chartConfig.groupBy, yMetrics, sorts);
17
+ const pivoted = await getPivotedResults(rows, fieldsMap, chartConfig.groupBy, yMetrics, [], sorts);
17
18
  chartData = pivoted.results;
18
19
  metrics = pivoted.metrics;
20
+ getSeriesName = (key) => pivoted.labels[key];
19
21
  }
20
22
  // Get axis field items for formatting
21
23
  const xAxisField = fieldsMap[xDimension];
@@ -52,10 +54,7 @@ export const getScatterChartEchartsConfig = async (queryTool, rows, fieldsMap, g
52
54
  ],
53
55
  series: metrics.map((metric) => ({
54
56
  type: 'scatter',
55
- // Use formatted label for non-pivoted metrics, otherwise use the metric name as-is (already formatted by pivot)
56
- name: yMetrics.includes(metric)
57
- ? formatFieldLabel(metric, fieldsMap)
58
- : metric,
57
+ name: getSeriesName(metric),
59
58
  encode: {
60
59
  x: xDimension,
61
60
  y: metric,
@@ -1 +1 @@
1
- {"version":3,"file":"scatter.js","sourceRoot":"","sources":["../../../../../../../../src/ee/AiAgent/chartConfig/slack/runQueryTool/viz/scatter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"scatter.js","sourceRoot":"","sources":["../../../../../../../../src/ee/AiAgent/chartConfig/slack/runQueryTool/viz/scatter.ts"],"names":[],"mappings":"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"}
@@ -3,8 +3,12 @@ import { type SortField } from '../../../../types/metricQuery';
3
3
  export type PivotedResults = {
4
4
  results: Record<string, unknown>[];
5
5
  metrics: string[];
6
+ /** Result keys of the secondary Y axis metric, one series each. */
7
+ secondaryMetrics: string[];
8
+ /** Series label per metric and secondary metric key. */
9
+ labels: Record<string, string>;
6
10
  };
7
- export type GetPivotedResultsFn = (rows: Record<string, unknown>[], fieldsMap: Record<string, unknown>, pivotFields: string[], metrics: string[], sorts: SortField[]) => Promise<PivotedResults>;
11
+ export type GetPivotedResultsFn = (rows: Record<string, unknown>[], fieldsMap: ItemsMap, pivotFields: string[], metrics: string[], secondaryMetrics: string[], sorts: SortField[]) => Promise<PivotedResults>;
8
12
  export type QueryResults = {
9
13
  rows: Record<string, unknown>[];
10
14
  fields: ItemsMap;
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/ee/AiAgent/chartConfig/slack/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE/D,MAAM,MAAM,cAAc,GAAG;IACzB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IACnC,OAAO,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,CAC9B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAC/B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,WAAW,EAAE,MAAM,EAAE,EACrB,OAAO,EAAE,MAAM,EAAE,EACjB,KAAK,EAAE,SAAS,EAAE,KACjB,OAAO,CAAC,cAAc,CAAC,CAAC;AAE7B,MAAM,MAAM,YAAY,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IAChC,MAAM,EAAE,QAAQ,CAAC;CACpB,CAAC"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/ee/AiAgent/chartConfig/slack/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE/D,MAAM,MAAM,cAAc,GAAG;IACzB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IACnC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,mEAAmE;IACnE,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,wDAAwD;IACxD,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,CAC9B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAC/B,SAAS,EAAE,QAAQ,EACnB,WAAW,EAAE,MAAM,EAAE,EACrB,OAAO,EAAE,MAAM,EAAE,EACjB,gBAAgB,EAAE,MAAM,EAAE,EAC1B,KAAK,EAAE,SAAS,EAAE,KACjB,OAAO,CAAC,cAAc,CAAC,CAAC;AAE7B,MAAM,MAAM,YAAY,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IAChC,MAAM,EAAE,QAAQ,CAAC;CACpB,CAAC"}
@@ -25,17 +25,40 @@ export declare const getWebAiChartConfig: ({ vizConfig, metricQuery, maxQueryLim
25
25
  parameters: Record<string, string | number | string[] | number[]> | null;
26
26
  customMetrics: import("../..").TransformedCustomMetric[] | null;
27
27
  tableCalculations: ({
28
+ name: string;
29
+ displayName: string;
30
+ type: "percent_of_column_total";
31
+ fieldId: string;
32
+ partitionBy: string[] | null;
33
+ } | {
34
+ name: string;
35
+ displayName: string;
36
+ type: "window_function";
37
+ windowFunction: import("../../../..").WindowFunctionType;
38
+ fieldId: string | null;
39
+ orderBy: {
40
+ fieldId: string;
41
+ order: "asc" | "desc" | null;
42
+ }[] | null;
43
+ partitionBy: string[] | null;
44
+ frame: {
45
+ frameType: "range" | "rows";
46
+ start: {
47
+ type: "current_row" | "following" | "preceding" | "unbounded_following" | "unbounded_preceding";
48
+ offset: number | null;
49
+ } | null;
50
+ end: {
51
+ type: "current_row" | "following" | "preceding" | "unbounded_following" | "unbounded_preceding";
52
+ offset: number | null;
53
+ };
54
+ } | null;
55
+ } | {
28
56
  name: string;
29
57
  displayName: string;
30
58
  type: "formula";
31
59
  formula: string;
32
60
  format: "number" | "percent" | null;
33
61
  resultType: "boolean" | "date" | "number" | "string" | "timestamp" | null;
34
- } | {
35
- name: string;
36
- displayName: string;
37
- type: "rank_in_column";
38
- fieldId: string;
39
62
  } | {
40
63
  name: string;
41
64
  displayName: string;
@@ -59,36 +82,13 @@ export declare const getWebAiChartConfig: ({ vizConfig, metricQuery, maxQueryLim
59
82
  } | {
60
83
  name: string;
61
84
  displayName: string;
62
- type: "percent_of_column_total";
85
+ type: "rank_in_column";
63
86
  fieldId: string;
64
- partitionBy: string[] | null;
65
87
  } | {
66
88
  name: string;
67
89
  displayName: string;
68
90
  type: "running_total";
69
91
  fieldId: string;
70
- } | {
71
- name: string;
72
- displayName: string;
73
- type: "window_function";
74
- windowFunction: import("../../../..").WindowFunctionType;
75
- fieldId: string | null;
76
- orderBy: {
77
- fieldId: string;
78
- order: "asc" | "desc" | null;
79
- }[] | null;
80
- partitionBy: string[] | null;
81
- frame: {
82
- frameType: "range" | "rows";
83
- start: {
84
- type: "current_row" | "following" | "preceding" | "unbounded_following" | "unbounded_preceding";
85
- offset: number | null;
86
- } | null;
87
- end: {
88
- type: "current_row" | "following" | "preceding" | "unbounded_following" | "unbounded_preceding";
89
- offset: number | null;
90
- };
91
- } | null;
92
92
  })[] | null;
93
93
  filters: import("../../../..").Filters;
94
94
  };
@@ -129,13 +129,24 @@ export declare const mcpGetQueryResultStructuredOutputSchema: z.ZodObject<{
129
129
  error: z.ZodNullable<z.ZodString>;
130
130
  }, z.core.$strip>]>;
131
131
  }, z.core.$strip>;
132
+ export declare const mcpRenderChartRunningResultSchema: z.ZodObject<{
133
+ status: z.ZodLiteral<"running">;
134
+ queryUuid: z.ZodString;
135
+ nextPollAfterMs: z.ZodNumber;
136
+ heartbeatAt: z.ZodString;
137
+ }, z.core.$strip>;
132
138
  export declare const mcpRenderChartStructuredOutputSchema: z.ZodObject<{
133
- result: z.ZodObject<{
139
+ result: z.ZodUnion<readonly [z.ZodObject<{
134
140
  status: z.ZodLiteral<"done">;
135
141
  queryUuid: z.ZodString;
136
142
  exploreUrl: z.ZodNullable<z.ZodString>;
137
143
  echartsOption: z.ZodOptional<z.ZodNullable<z.ZodUnknown>>;
138
- }, z.core.$strip>;
144
+ }, z.core.$strip>, z.ZodObject<{
145
+ status: z.ZodLiteral<"running">;
146
+ queryUuid: z.ZodString;
147
+ nextPollAfterMs: z.ZodNumber;
148
+ heartbeatAt: z.ZodString;
149
+ }, z.core.$strip>]>;
139
150
  }, z.core.$strip>;
140
151
  export declare const warehouseExecutionStatsSchema: z.ZodObject<{
141
152
  jobId: z.ZodNullable<z.ZodString>;
@@ -1 +1 @@
1
- {"version":3,"file":"toolQueryResultSchemas.d.ts","sourceRoot":"","sources":["../../../../../../src/ee/AiAgent/schemas/tools/toolQueryResultSchemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,eAAO,MAAM,uBAAuB,aAAkC,CAAC;AAEvE,eAAO,MAAM,wBAAwB,aAA8B,CAAC;AAEpE,eAAO,MAAM,oBAAoB,aAI5B,CAAC;AAEN,eAAO,MAAM,2BAA2B;;;;;iBAatC,CAAC;AAEH,eAAO,MAAM,4BAA4B;;;;iBAkBvC,CAAC;AAEH,eAAO,MAAM,gCAAgC;;;;;;iBAIvC,CAAC;AAEP,eAAO,MAAM,oCAAoC;;;iBAG/C,CAAC;AAEH,eAAO,MAAM,mCAAmC;;;;;;iBAK1C,CAAC;AAEP,eAAO,MAAM,0BAA0B;;;;;iBAOsB,CAAC;AAE9D,eAAO,MAAM,iCAAiC;;;;;;;iBAK5C,CAAC;AAEH,eAAO,MAAM,yCAAyC;;;;;;iBAKpD,CAAC;AAEH,eAAO,MAAM,kCAAkC;;;;;;;;iBAI7C,CAAC;AAEH,eAAO,MAAM,+BAA+B,GAAI,OAAO,SAAS,CAAC,CAAC,OAAO,UAC7D,OAAO;;iBAIb,CAAC;AAEP,eAAO,MAAM,4CAA4C,GACrD,gBAAgB,SAAS,CAAC,CAAC,OAAO,mBAEjB,gBAAgB;;;;;;;iBAIhC,CAAC;AAEN,eAAO,MAAM,+BAA+B;;;;;;;;;;;;;iBAGvC,CAAC;AAEN,eAAO,MAAM,uCAAuC;;;;;;;;;;;;;iBAG/C,CAAC;AAEN,eAAO,MAAM,uCAAuC;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAQ/C,CAAC;AAEN,eAAO,MAAM,oCAAoC;;;;;;;iBACc,CAAC;AAEhE,eAAO,MAAM,6BAA6B;;;;;;iBAUQ,CAAC;AAGnD,eAAO,MAAM,2BAA2B;;;;;;mBAKnC,CAAC"}
1
+ {"version":3,"file":"toolQueryResultSchemas.d.ts","sourceRoot":"","sources":["../../../../../../src/ee/AiAgent/schemas/tools/toolQueryResultSchemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,eAAO,MAAM,uBAAuB,aAAkC,CAAC;AAEvE,eAAO,MAAM,wBAAwB,aAA8B,CAAC;AAEpE,eAAO,MAAM,oBAAoB,aAI5B,CAAC;AAEN,eAAO,MAAM,2BAA2B;;;;;iBAatC,CAAC;AAEH,eAAO,MAAM,4BAA4B;;;;iBAkBvC,CAAC;AAEH,eAAO,MAAM,gCAAgC;;;;;;iBAIvC,CAAC;AAEP,eAAO,MAAM,oCAAoC;;;iBAG/C,CAAC;AAEH,eAAO,MAAM,mCAAmC;;;;;;iBAK1C,CAAC;AAEP,eAAO,MAAM,0BAA0B;;;;;iBAOsB,CAAC;AAE9D,eAAO,MAAM,iCAAiC;;;;;;;iBAK5C,CAAC;AAEH,eAAO,MAAM,yCAAyC;;;;;;iBAKpD,CAAC;AAEH,eAAO,MAAM,kCAAkC;;;;;;;;iBAI7C,CAAC;AAEH,eAAO,MAAM,+BAA+B,GAAI,OAAO,SAAS,CAAC,CAAC,OAAO,UAC7D,OAAO;;iBAIb,CAAC;AAEP,eAAO,MAAM,4CAA4C,GACrD,gBAAgB,SAAS,CAAC,CAAC,OAAO,mBAEjB,gBAAgB;;;;;;;iBAIhC,CAAC;AAEN,eAAO,MAAM,+BAA+B;;;;;;;;;;;;;iBAGvC,CAAC;AAEN,eAAO,MAAM,uCAAuC;;;;;;;;;;;;;iBAG/C,CAAC;AAEN,eAAO,MAAM,uCAAuC;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAQ/C,CAAC;AAEN,eAAO,MAAM,iCAAiC;;;;;iBAiBzC,CAAC;AAEN,eAAO,MAAM,oCAAoC;;;;;;;;;;;;iBAM5C,CAAC;AAEN,eAAO,MAAM,6BAA6B;;;;;;iBAUQ,CAAC;AAGnD,eAAO,MAAM,2BAA2B;;;;;;mBAKnC,CAAC"}
@@ -76,7 +76,20 @@ export const mcpGetQueryResultStructuredOutputSchema = createMcpStructuredOutput
76
76
  mcpQueryResultDoneMetricQueryResultSchema,
77
77
  mcpQueryResultTerminalResultSchema,
78
78
  ]));
79
- export const mcpRenderChartStructuredOutputSchema = createMcpStructuredOutputSchema(mcpRenderChartResultSchema);
79
+ export const mcpRenderChartRunningResultSchema = z
80
+ .object({
81
+ status: z
82
+ .literal('running')
83
+ .describe('Present while the grouped query for the chart is still running. Call render_chart again with the same arguments.'),
84
+ queryUuid: createMcpAsyncQueryUuidSchema().describe('The queryUuid render_chart was called with.'),
85
+ nextPollAfterMs: mcpNextPollAfterMsSchema.describe('Suggested delay before calling render_chart again.'),
86
+ heartbeatAt: mcpHeartbeatAtSchema,
87
+ })
88
+ .describe('The chart is not drawn yet because its grouped query is running.');
89
+ export const mcpRenderChartStructuredOutputSchema = createMcpStructuredOutputSchema(z.union([
90
+ mcpRenderChartResultSchema,
91
+ mcpRenderChartRunningResultSchema,
92
+ ]));
80
93
  export const warehouseExecutionStatsSchema = z
81
94
  .object({
82
95
  jobId: z.string().nullable(),
@@ -1 +1 @@
1
- {"version":3,"file":"toolQueryResultSchemas.js","sourceRoot":"","sources":["../../../../../../src/ee/AiAgent/schemas/tools/toolQueryResultSchemas.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"toolQueryResultSchemas.js","sourceRoot":"","sources":["../../../../../../src/ee/AiAgent/schemas/tools/toolQueryResultSchemas.ts"],"names":[],"mappings":"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"}
@@ -10915,7 +10915,7 @@ export type ToolRunQueryArgsTransformedBuiltinChart = Omit<ToolRunQueryArgsTrans
10915
10915
  export declare const isRunQueryArgsV1: (args: ToolRunQueryArgsV1 | ToolRunQueryArgsV2 | ToolRunQueryArgsV3) => args is ToolRunQueryArgsV1;
10916
10916
  export declare const migrateRunQueryArgsV1ToV2: (v1: ToolRunQueryArgsV1) => ToolRunQueryArgsV2;
10917
10917
  export declare const parsePersistedRunQueryArgs: (raw: unknown) => ToolRunQueryArgsTransformed | null;
10918
- export declare const TOOL_RENDER_CHART_DESCRIPTION = "Render a completed run_metric_query result in Lightdash's built-in chart app in MCP App-capable clients.\n\nUse when the user wants a visual. If the query is running, call get_query_result first. This tool does not start, poll or rerun queries.\nPass the exact queryUuid returned for this query by run_metric_query or get_query_result (also available in the `queryUuid: <id>` text block). Never invent an ID or reuse one from another query or session. SQL Runner/run_sql results are not supported.\n\nSupported types: table, bar, horizontal_bar, line, scatter, pie, funnel.\n- For time series: use `line` with `xAxisType: 'time'`.\n- For categorical comparisons: use `bar` or `horizontal_bar`.\n- For single values or detailed data: use `table`.\n- Always provide axis labels.\n\nThe full chart payload is app metadata, drawn only by MCP App-capable clients. In structuredContent, `echartsOption: {}` is a placeholder for that payload, not a failed render. If your client cannot display MCP Apps, the user has not seen the chart: build the visual from the query rows. Custom artifacts should build visuals from query data instead.\n\nWhen building an HTML/React artifact that calls MCP, load the mcp-artifact-integration skill (read_skill with name: \"mcp-artifact-integration\") for response parsing, polling, errors and chart data. This is not needed for ordinary chat or the built-in chart app.";
10918
+ export declare const TOOL_RENDER_CHART_DESCRIPTION = "Render a completed run_metric_query result in Lightdash's built-in chart app in MCP App-capable clients.\n\nUse when the user wants a visual. If the query is running, call get_query_result first. For a grouped bar, horizontal_bar, line or scatter chart (chartConfig.groupBy), this tool runs the grouped query for the chart itself. While that query runs it returns status \"running\", not an error: wait nextPollAfterMs, then call render_chart again with the same arguments. Otherwise it does not start, poll or rerun queries.\nPass the exact queryUuid returned for this query by run_metric_query or get_query_result (also available in the `queryUuid: <id>` text block). Never invent an ID or reuse one from another query or session. SQL Runner/run_sql results are not supported.\n\nSupported types: table, bar, horizontal_bar, line, scatter, pie, funnel.\n- For time series: use `line` with `xAxisType: 'time'`.\n- For categorical comparisons: use `bar` or `horizontal_bar`.\n- For single values or detailed data: use `table`.\n- Always provide axis labels.\n\nThe full chart payload is app metadata, drawn only by MCP App-capable clients. In structuredContent, `echartsOption: {}` is a placeholder for that payload, not a failed render. If your client cannot display MCP Apps, the user has not seen the chart: build the visual from the query rows. Custom artifacts should build visuals from query data instead.\n\nWhen building an HTML/React artifact that calls MCP, load the mcp-artifact-integration skill (read_skill with name: \"mcp-artifact-integration\") for response parsing, polling, errors and chart data. This is not needed for ordinary chat or the built-in chart app.";
10919
10919
  export declare const toolRenderChartArgsSchema: z.ZodObject<{
10920
10920
  queryUuid: z.ZodString;
10921
10921
  chartConfig: z.ZodNullable<z.ZodObject<{