@lightdash/common 0.2092.0 → 0.2092.1

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 (28) hide show
  1. package/dist/cjs/ee/AiAgent/chartConfig/slack/runQueryTool/viz/bar.js +1 -7
  2. package/dist/cjs/ee/AiAgent/chartConfig/slack/runQueryTool/viz/bar.js.map +1 -1
  3. package/dist/cjs/ee/AiAgent/chartConfig/slack/runQueryTool/viz/horizontalBar.js +1 -7
  4. package/dist/cjs/ee/AiAgent/chartConfig/slack/runQueryTool/viz/horizontalBar.js.map +1 -1
  5. package/dist/cjs/ee/AiAgent/chartConfig/slack/runQueryTool/viz/line.js +1 -7
  6. package/dist/cjs/ee/AiAgent/chartConfig/slack/runQueryTool/viz/line.js.map +1 -1
  7. package/dist/cjs/ee/AiAgent/chartConfig/slack/runQueryTool/viz/scatter.js +1 -7
  8. package/dist/cjs/ee/AiAgent/chartConfig/slack/runQueryTool/viz/scatter.js.map +1 -1
  9. package/dist/cjs/ee/AiAgent/chartConfig/slack/shared/getCommonEChartsConfig.d.ts +1 -1
  10. package/dist/cjs/ee/AiAgent/chartConfig/slack/shared/getCommonEChartsConfig.d.ts.map +1 -1
  11. package/dist/cjs/ee/AiAgent/chartConfig/slack/shared/getCommonEChartsConfig.js +82 -42
  12. package/dist/cjs/ee/AiAgent/chartConfig/slack/shared/getCommonEChartsConfig.js.map +1 -1
  13. package/dist/esm/ee/AiAgent/chartConfig/slack/runQueryTool/viz/bar.js +1 -7
  14. package/dist/esm/ee/AiAgent/chartConfig/slack/runQueryTool/viz/bar.js.map +1 -1
  15. package/dist/esm/ee/AiAgent/chartConfig/slack/runQueryTool/viz/horizontalBar.js +1 -7
  16. package/dist/esm/ee/AiAgent/chartConfig/slack/runQueryTool/viz/horizontalBar.js.map +1 -1
  17. package/dist/esm/ee/AiAgent/chartConfig/slack/runQueryTool/viz/line.js +1 -7
  18. package/dist/esm/ee/AiAgent/chartConfig/slack/runQueryTool/viz/line.js.map +1 -1
  19. package/dist/esm/ee/AiAgent/chartConfig/slack/runQueryTool/viz/scatter.js +1 -7
  20. package/dist/esm/ee/AiAgent/chartConfig/slack/runQueryTool/viz/scatter.js.map +1 -1
  21. package/dist/esm/ee/AiAgent/chartConfig/slack/shared/getCommonEChartsConfig.d.ts +1 -1
  22. package/dist/esm/ee/AiAgent/chartConfig/slack/shared/getCommonEChartsConfig.d.ts.map +1 -1
  23. package/dist/esm/ee/AiAgent/chartConfig/slack/shared/getCommonEChartsConfig.js +82 -42
  24. package/dist/esm/ee/AiAgent/chartConfig/slack/shared/getCommonEChartsConfig.js.map +1 -1
  25. package/dist/tsconfig.types.tsbuildinfo +1 -1
  26. package/dist/types/ee/AiAgent/chartConfig/slack/shared/getCommonEChartsConfig.d.ts +1 -1
  27. package/dist/types/ee/AiAgent/chartConfig/slack/shared/getCommonEChartsConfig.d.ts.map +1 -1
  28. package/package.json +1 -1
package/dist/cjs/ee/AiAgent/chartConfig/slack/runQueryTool/viz/bar.js CHANGED
@@ -23,13 +23,10 @@ const getBarChartEchartsConfig = async (queryTool, rows, fieldsMap, getPivotedRe
23
23
  const primarySort = sorts?.[0];
24
24
  const shouldInverseXAxis = primarySort?.fieldId === xDimension && primarySort?.descending === true;
25
25
  return {
26
- ...(0, getCommonEChartsConfig_1.getCommonEChartsConfig)(queryTool.title, metrics.length, chartData),
26
+ ...(0, getCommonEChartsConfig_1.getCommonEChartsConfig)(queryTool.title, metrics.length, chartData, chartConfig?.xAxisLabel, chartConfig?.yAxisLabel),
27
27
  xAxis: [
28
28
  {
29
29
  type: chartConfig?.xAxisType ?? 'category',
30
- ...(chartConfig?.xAxisLabel
31
- ? { name: chartConfig.xAxisLabel }
32
- : {}),
33
30
  ...(0, getCartesianAxisFormatterConfig_1.getCartesianAxisFormatterConfig)({
34
31
  axisItem: xAxisField,
35
32
  show: true,
@@ -40,9 +37,6 @@ const getBarChartEchartsConfig = async (queryTool, rows, fieldsMap, getPivotedRe
40
37
  yAxis: [
41
38
  {
42
39
  type: 'value',
43
- ...(chartConfig?.yAxisLabel
44
- ? { name: chartConfig.yAxisLabel }
45
- : {}),
46
40
  ...(0, getCartesianAxisFormatterConfig_1.getCartesianAxisFormatterConfig)({
47
41
  axisItem: yAxisField,
48
42
  show: true,
package/dist/cjs/ee/AiAgent/chartConfig/slack/runQueryTool/viz/bar.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"bar.js","sourceRoot":"","sources":["../../../../../../../../src/ee/AiAgent/chartConfig/slack/runQueryTool/viz/bar.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bar.js","sourceRoot":"","sources":["../../../../../../../../src/ee/AiAgent/chartConfig/slack/runQueryTool/viz/bar.ts"],"names":[],"mappings":";;;AAGA,8HAA2H;AAE3H,uEAAoE;AACpE,gFAA6E;AAG7E;;GAEG;AACI,MAAM,wBAAwB,GAAG,KAAK,EACzC,SAAsC,EACtC,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,UAAU,CAAC,CAAC,CAAC,CAAC;IACjC,IAAI,OAAO,GAAa,YAAY,CAAC;IACrC,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,YAAY,EACZ,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,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAE5E,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,IAAA,+CAAsB,EACrB,SAAS,CAAC,KAAK,EACf,OAAO,CAAC,MAAM,EACd,SAAS,EACT,WAAW,EAAE,UAAU,EACvB,WAAW,EAAE,UAAU,CAC1B;QACD,KAAK,EAAE;YACH;gBACI,IAAI,EAAE,WAAW,EAAE,SAAS,IAAK,UAAoB;gBACrD,GAAG,IAAA,iEAA+B,EAAC;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;YACH;gBACI,IAAI,EAAE,OAAO;gBACb,GAAG,IAAA,iEAA+B,EAAC;oBAC/B,QAAQ,EAAE,UAAU;oBACpB,IAAI,EAAE,IAAI;iBACb,CAAC;aACL;SACJ;QACD,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAC7B,IAAI,EAAE,KAAK;YACX,gHAAgH;YAChH,IAAI,EAAE,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC/B,CAAC,CAAC,IAAA,mCAAgB,EAAC,MAAM,EAAE,SAAS,CAAC;gBACrC,CAAC,CAAC,MAAM;YACZ,MAAM,EAAE;gBACJ,CAAC,EAAE,UAAU;gBACb,CAAC,EAAE,MAAM;aACZ;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;AAvEW,QAAA,wBAAwB,4BAuEnC"}
package/dist/cjs/ee/AiAgent/chartConfig/slack/runQueryTool/viz/horizontalBar.js CHANGED
@@ -24,13 +24,10 @@ const getHorizontalBarChartEchartsConfig = async (queryTool, rows, fieldsMap, ge
24
24
  const primarySort = sorts?.[0];
25
25
  const shouldInverseYAxis = primarySort?.fieldId === xDimension && primarySort?.descending === true;
26
26
  return {
27
- ...(0, getCommonEChartsConfig_1.getCommonEChartsConfig)(queryTool.title, metrics.length, chartData),
27
+ ...(0, getCommonEChartsConfig_1.getCommonEChartsConfig)(queryTool.title, metrics.length, chartData, chartConfig?.xAxisLabel, chartConfig?.yAxisLabel),
28
28
  xAxis: [
29
29
  {
30
30
  type: 'value',
31
- ...(chartConfig?.xAxisLabel
32
- ? { name: chartConfig.xAxisLabel }
33
- : {}),
34
31
  ...(0, getCartesianAxisFormatterConfig_1.getCartesianAxisFormatterConfig)({
35
32
  axisItem: xAxisField,
36
33
  show: true,
@@ -40,9 +37,6 @@ const getHorizontalBarChartEchartsConfig = async (queryTool, rows, fieldsMap, ge
40
37
  yAxis: [
41
38
  {
42
39
  type: chartConfig?.xAxisType ?? 'category',
43
- ...(chartConfig?.yAxisLabel
44
- ? { name: chartConfig.yAxisLabel }
45
- : {}),
46
40
  ...(0, getCartesianAxisFormatterConfig_1.getCartesianAxisFormatterConfig)({
47
41
  axisItem: yAxisField,
48
42
  show: true,
package/dist/cjs/ee/AiAgent/chartConfig/slack/runQueryTool/viz/horizontalBar.js.map CHANGED
@@ -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,8HAA2H;AAE3H,uEAAoE;AACpE,gFAA6E;AAG7E;;GAEG;AACI,MAAM,kCAAkC,GAAG,KAAK,EACnD,SAAsC,EACtC,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,UAAU,CAAC,CAAC,CAAC,CAAC;IACjC,IAAI,OAAO,GAAa,YAAY,CAAC;IACrC,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,YAAY,EACZ,KAAoB,CACvB,CAAC;QACF,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;QAC5B,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAC9B,CAAC;IAED,oFAAoF;IACpF,MAAM,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,gBAAgB;IAC1D,MAAM,UAAU,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,aAAa;IAE1F,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,IAAA,+CAAsB,EACrB,SAAS,CAAC,KAAK,EACf,OAAO,CAAC,MAAM,EACd,SAAS,EACT,WAAW,EAAE,UAAU,EACvB,WAAW,EAAE,UAAU,CAC1B;QACD,KAAK,EAAE;YACH;gBACI,IAAI,EAAE,OAAO;gBACb,GAAG,IAAA,iEAA+B,EAAC;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,IAAA,iEAA+B,EAAC;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,gHAAgH;YAChH,IAAI,EAAE,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC/B,CAAC,CAAC,IAAA,mCAAgB,EAAC,MAAM,EAAE,SAAS,CAAC;gBACrC,CAAC,CAAC,MAAM;YACZ,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;AAxEW,QAAA,kCAAkC,sCAwE7C"}
package/dist/cjs/ee/AiAgent/chartConfig/slack/runQueryTool/viz/line.js CHANGED
@@ -23,13 +23,10 @@ const getLineChartEchartsConfig = async (queryTool, rows, fieldsMap, getPivotedR
23
23
  const primarySort = sorts?.[0];
24
24
  const shouldInverseXAxis = primarySort?.fieldId === xDimension && primarySort?.descending === true;
25
25
  return {
26
- ...(0, getCommonEChartsConfig_1.getCommonEChartsConfig)(queryTool.title, metrics.length, chartData),
26
+ ...(0, getCommonEChartsConfig_1.getCommonEChartsConfig)(queryTool.title, metrics.length, chartData, chartConfig?.xAxisLabel, chartConfig?.yAxisLabel),
27
27
  xAxis: [
28
28
  {
29
29
  type: chartConfig?.xAxisType ?? 'time',
30
- ...(chartConfig?.xAxisLabel
31
- ? { name: chartConfig.xAxisLabel }
32
- : {}),
33
30
  ...(0, getCartesianAxisFormatterConfig_1.getCartesianAxisFormatterConfig)({
34
31
  axisItem: xAxisField,
35
32
  show: true,
@@ -40,9 +37,6 @@ const getLineChartEchartsConfig = async (queryTool, rows, fieldsMap, getPivotedR
40
37
  yAxis: [
41
38
  {
42
39
  type: 'value',
43
- ...(chartConfig?.yAxisLabel
44
- ? { name: chartConfig.yAxisLabel }
45
- : {}),
46
40
  ...(0, getCartesianAxisFormatterConfig_1.getCartesianAxisFormatterConfig)({
47
41
  axisItem: yAxisField,
48
42
  show: true,
package/dist/cjs/ee/AiAgent/chartConfig/slack/runQueryTool/viz/line.js.map CHANGED
@@ -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":";;;AAGA,8HAA2H;AAE3H,uEAAoE;AACpE,gFAA6E;AAG7E;;GAEG;AACI,MAAM,yBAAyB,GAAG,KAAK,EAC1C,SAAsC,EACtC,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,UAAU,CAAC,CAAC,CAAC,CAAC;IACjC,IAAI,OAAO,GAAa,YAAY,CAAC;IACrC,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,YAAY,EACZ,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,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAE5E,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,IAAA,+CAAsB,EACrB,SAAS,CAAC,KAAK,EACf,OAAO,CAAC,MAAM,EACd,SAAS,EACT,WAAW,EAAE,UAAU,EACvB,WAAW,EAAE,UAAU,CAC1B;QACD,KAAK,EAAE;YACH;gBACI,IAAI,EAAE,WAAW,EAAE,SAAS,IAAI,MAAM;gBACtC,GAAG,IAAA,iEAA+B,EAAC;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;YACH;gBACI,IAAI,EAAE,OAAO;gBACb,GAAG,IAAA,iEAA+B,EAAC;oBAC/B,QAAQ,EAAE,UAAU;oBACpB,IAAI,EAAE,IAAI;iBACb,CAAC;aACL;SACJ;QACD,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAC7B,IAAI,EAAE,MAAM;YACZ,gHAAgH;YAChH,IAAI,EAAE,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC/B,CAAC,CAAC,IAAA,mCAAgB,EAAC,MAAM,EAAE,SAAS,CAAC;gBACrC,CAAC,CAAC,MAAM;YACZ,MAAM,EAAE;gBACJ,CAAC,EAAE,UAAU;gBACb,CAAC,EAAE,MAAM;aACZ;YACD,GAAG,CAAC,WAAW,EAAE,QAAQ,KAAK,MAAM,IAAI;gBACpC,SAAS,EAAE,EAAE;aAChB,CAAC;YACF,UAAU,EAAE,IAAI;SACnB,CAAC,CAAC;KACN,CAAC;AACN,CAAC,CAAC;AA1EW,QAAA,yBAAyB,6BA0EpC"}
package/dist/cjs/ee/AiAgent/chartConfig/slack/runQueryTool/viz/scatter.js CHANGED
@@ -25,13 +25,10 @@ const getScatterChartEchartsConfig = async (queryTool, rows, fieldsMap, getPivot
25
25
  const primarySort = sorts?.[0];
26
26
  const shouldInverseXAxis = primarySort?.fieldId === xDimension && primarySort?.descending === true;
27
27
  return {
28
- ...(0, getCommonEChartsConfig_1.getCommonEChartsConfig)(queryTool.title, metrics.length, chartData),
28
+ ...(0, getCommonEChartsConfig_1.getCommonEChartsConfig)(queryTool.title, metrics.length, chartData, chartConfig?.xAxisLabel, chartConfig?.yAxisLabel),
29
29
  xAxis: [
30
30
  {
31
31
  type: chartConfig?.xAxisType ?? 'category',
32
- ...(chartConfig?.xAxisLabel
33
- ? { name: chartConfig.xAxisLabel }
34
- : {}),
35
32
  ...(0, getCartesianAxisFormatterConfig_1.getCartesianAxisFormatterConfig)({
36
33
  axisItem: xAxisField,
37
34
  show: true,
@@ -42,9 +39,6 @@ const getScatterChartEchartsConfig = async (queryTool, rows, fieldsMap, getPivot
42
39
  yAxis: [
43
40
  {
44
41
  type: 'value',
45
- ...(chartConfig?.yAxisLabel
46
- ? { name: chartConfig.yAxisLabel }
47
- : {}),
48
42
  ...(0, getCartesianAxisFormatterConfig_1.getCartesianAxisFormatterConfig)({
49
43
  axisItem: yAxisField,
50
44
  show: true,
package/dist/cjs/ee/AiAgent/chartConfig/slack/runQueryTool/viz/scatter.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"scatter.js","sourceRoot":"","sources":["../../../../../../../../src/ee/AiAgent/chartConfig/slack/runQueryTool/viz/scatter.ts"],"names":[],"mappings":";;;AAGA,8HAA2H;AAE3H,uEAAoE;AACpE,gFAA6E;AAG7E;;GAEG;AACI,MAAM,4BAA4B,GAAG,KAAK,EAC7C,SAAsC,EACtC,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,UAAU,CAAC,CAAC,CAAC,CAAC;IACjC,IAAI,OAAO,GAAa,YAAY,CAAC;IACrC,IAAI,SAAS,GAAG,IAAI,CAAC;IAErB,oEAAoE;IACpE,IAAI,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAC/B,MAAM,OAAO,GAAG,MAAM,iBAAiB,CACnC,IAAI,EACJ,SAAS,EACT,WAAW,CAAC,OAAO,EACnB,YAAY,EACZ,KAAoB,CACvB,CAAC;QACF,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;QAC5B,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAC9B,CAAC;IAED,sCAAsC;IACtC,MAAM,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;IACzC,MAAM,UAAU,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAE5E,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,IAAA,+CAAsB,EAAC,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC;QACrE,KAAK,EAAE;YACH;gBACI,IAAI,EAAE,WAAW,EAAE,SAAS,IAAK,UAAoB;gBACrD,GAAG,CAAC,WAAW,EAAE,UAAU;oBACvB,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,UAAU,EAAE;oBAClC,CAAC,CAAC,EAAE,CAAC;gBACT,GAAG,IAAA,iEAA+B,EAAC;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;YACH;gBACI,IAAI,EAAE,OAAO;gBACb,GAAG,CAAC,WAAW,EAAE,UAAU;oBACvB,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,UAAU,EAAE;oBAClC,CAAC,CAAC,EAAE,CAAC;gBACT,GAAG,IAAA,iEAA+B,EAAC;oBAC/B,QAAQ,EAAE,UAAU;oBACpB,IAAI,EAAE,IAAI;iBACb,CAAC;aACL;SACJ;QACD,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAC7B,IAAI,EAAE,SAAS;YACf,gHAAgH;YAChH,IAAI,EAAE,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC/B,CAAC,CAAC,IAAA,mCAAgB,EAAC,MAAM,EAAE,SAAS,CAAC;gBACrC,CAAC,CAAC,MAAM;YACZ,MAAM,EAAE;gBACJ,CAAC,EAAE,UAAU;gBACb,CAAC,EAAE,MAAM;aACZ;YACD,UAAU,EAAE,IAAI;SACnB,CAAC,CAAC;KACN,CAAC;AACN,CAAC,CAAC;AAzEW,QAAA,4BAA4B,gCAyEvC"}
1
+ {"version":3,"file":"scatter.js","sourceRoot":"","sources":["../../../../../../../../src/ee/AiAgent/chartConfig/slack/runQueryTool/viz/scatter.ts"],"names":[],"mappings":";;;AAGA,8HAA2H;AAE3H,uEAAoE;AACpE,gFAA6E;AAG7E;;GAEG;AACI,MAAM,4BAA4B,GAAG,KAAK,EAC7C,SAAsC,EACtC,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,UAAU,CAAC,CAAC,CAAC,CAAC;IACjC,IAAI,OAAO,GAAa,YAAY,CAAC;IACrC,IAAI,SAAS,GAAG,IAAI,CAAC;IAErB,oEAAoE;IACpE,IAAI,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAC/B,MAAM,OAAO,GAAG,MAAM,iBAAiB,CACnC,IAAI,EACJ,SAAS,EACT,WAAW,CAAC,OAAO,EACnB,YAAY,EACZ,KAAoB,CACvB,CAAC;QACF,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;QAC5B,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAC9B,CAAC;IAED,sCAAsC;IACtC,MAAM,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;IACzC,MAAM,UAAU,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAE5E,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,IAAA,+CAAsB,EACrB,SAAS,CAAC,KAAK,EACf,OAAO,CAAC,MAAM,EACd,SAAS,EACT,WAAW,EAAE,UAAU,EACvB,WAAW,EAAE,UAAU,CAC1B;QACD,KAAK,EAAE;YACH;gBACI,IAAI,EAAE,WAAW,EAAE,SAAS,IAAK,UAAoB;gBACrD,GAAG,IAAA,iEAA+B,EAAC;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;YACH;gBACI,IAAI,EAAE,OAAO;gBACb,GAAG,IAAA,iEAA+B,EAAC;oBAC/B,QAAQ,EAAE,UAAU;oBACpB,IAAI,EAAE,IAAI;iBACb,CAAC;aACL;SACJ;QACD,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAC7B,IAAI,EAAE,SAAS;YACf,gHAAgH;YAChH,IAAI,EAAE,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC/B,CAAC,CAAC,IAAA,mCAAgB,EAAC,MAAM,EAAE,SAAS,CAAC;gBACrC,CAAC,CAAC,MAAM;YACZ,MAAM,EAAE;gBACJ,CAAC,EAAE,UAAU;gBACb,CAAC,EAAE,MAAM;aACZ;YACD,UAAU,EAAE,IAAI;SACnB,CAAC,CAAC;KACN,CAAC;AACN,CAAC,CAAC;AAzEW,QAAA,4BAA4B,gCAyEvC"}
package/dist/cjs/ee/AiAgent/chartConfig/slack/shared/getCommonEChartsConfig.d.ts CHANGED
@@ -2,5 +2,5 @@ import { type EChartsOption } from 'echarts';
2
2
  /**
3
3
  * Generates common echarts config for all chart types
4
4
  */
5
- export declare const getCommonEChartsConfig: (title: string | undefined, metricsCount: number, chartData: Record<string, unknown>[]) => Pick<EChartsOption, "title" | "legend" | "grid" | "animation" | "backgroundColor" | "dataset">;
5
+ export declare const getCommonEChartsConfig: (title: string | undefined, metricsCount: number, chartData: Record<string, unknown>[], xAxisLabel?: string | null, yAxisLabel?: string | null) => Pick<EChartsOption, "title" | "legend" | "grid" | "animation" | "backgroundColor" | "dataset" | "graphic">;
6
6
  //# sourceMappingURL=getCommonEChartsConfig.d.ts.map
package/dist/cjs/ee/AiAgent/chartConfig/slack/shared/getCommonEChartsConfig.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getCommonEChartsConfig.d.ts","sourceRoot":"","sources":["../../../../../../../src/ee/AiAgent/chartConfig/slack/shared/getCommonEChartsConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,SAAS,CAAC;AAE7C;;GAEG;AACH,eAAO,MAAM,sBAAsB,UACxB,MAAM,GAAG,SAAS,gBACX,MAAM,aACT,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KACrC,IAAI,CACH,aAAa,EACb,OAAO,GAAG,QAAQ,GAAG,MAAM,GAAG,WAAW,GAAG,iBAAiB,GAAG,SAAS,CA8C3E,CAAC"}
1
+ {"version":3,"file":"getCommonEChartsConfig.d.ts","sourceRoot":"","sources":["../../../../../../../src/ee/AiAgent/chartConfig/slack/shared/getCommonEChartsConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,SAAS,CAAC;AAE7C;;GAEG;AACH,eAAO,MAAM,sBAAsB,UACxB,MAAM,GAAG,SAAS,gBACX,MAAM,aACT,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,eACvB,MAAM,GAAG,IAAI,eACb,MAAM,GAAG,IAAI,KAC3B,IAAI,CACH,aAAa,EACX,OAAO,GACP,QAAQ,GACR,MAAM,GACN,WAAW,GACX,iBAAiB,GACjB,SAAS,GACT,SAAS,CAsFd,CAAC"}
package/dist/cjs/ee/AiAgent/chartConfig/slack/shared/getCommonEChartsConfig.js CHANGED
@@ -4,51 +4,91 @@ exports.getCommonEChartsConfig = void 0;
4
4
  /**
5
5
  * Generates common echarts config for all chart types
6
6
  */
7
- const getCommonEChartsConfig = (title, metricsCount, chartData) => ({
8
- ...(title
9
- ? {
10
- title: {
11
- text: title,
12
- left: 'center',
13
- top: 10,
14
- textStyle: {
15
- fontSize: 16,
16
- fontWeight: 'bold',
7
+ const getCommonEChartsConfig = (title, metricsCount, chartData, xAxisLabel, yAxisLabel) => {
8
+ const graphicElements = [];
9
+ // Add X-axis label at bottom center
10
+ if (xAxisLabel) {
11
+ graphicElements.push({
12
+ type: 'text',
13
+ left: 'center',
14
+ bottom: 10,
15
+ style: {
16
+ text: xAxisLabel,
17
+ fontSize: 12,
18
+ fontWeight: 500,
19
+ },
20
+ });
21
+ }
22
+ // Add Y-axis label on left side, vertically centered and rotated
23
+ if (yAxisLabel) {
24
+ graphicElements.push({
25
+ type: 'text',
26
+ left: 10,
27
+ top: 'center',
28
+ rotation: Math.PI / 2,
29
+ style: {
30
+ text: yAxisLabel,
31
+ fontSize: 12,
32
+ fontWeight: 500,
33
+ },
34
+ });
35
+ }
36
+ return {
37
+ ...(title
38
+ ? {
39
+ title: {
40
+ text: title,
41
+ left: 'center',
42
+ top: 10,
43
+ textStyle: {
44
+ fontSize: 16,
45
+ fontWeight: 'bold',
46
+ },
17
47
  },
48
+ }
49
+ : {}),
50
+ legend: {
51
+ show: metricsCount > 1,
52
+ type: 'scroll',
53
+ orient: 'horizontal',
54
+ top: title ? 40 : 10, // Position below title if exists, otherwise at top
55
+ left: 'center',
56
+ padding: [5, 10],
57
+ itemGap: 15,
58
+ itemWidth: 25,
59
+ itemHeight: 14,
60
+ textStyle: {
61
+ fontSize: 11,
18
62
  },
19
- }
20
- : {}),
21
- legend: {
22
- show: metricsCount > 1,
23
- type: 'scroll',
24
- orient: 'horizontal',
25
- bottom: 10,
26
- left: 'center',
27
- padding: [5, 10],
28
- itemGap: 15,
29
- itemWidth: 25,
30
- itemHeight: 14,
31
- textStyle: {
32
- fontSize: 11,
63
+ pageIconSize: 12,
64
+ pageTextStyle: {
65
+ fontSize: 11,
66
+ },
67
+ },
68
+ grid: {
69
+ containLabel: true, // Ensures labels are within grid bounds to prevent cutoff
70
+ left: '5%', // Increased from 3% to give more space for Y-axis labels
71
+ right: '5%', // Increased from 3% to give more space for labels on right
72
+ // Account for title + legend at top
73
+ top: (() => {
74
+ if (title && metricsCount > 1)
75
+ return 90; // Title + legend both present
76
+ if (title)
77
+ return 60; // Only title
78
+ if (metricsCount > 1)
79
+ return 50; // Only legend
80
+ return 30; // Neither
81
+ })(),
82
+ bottom: 60, // Fixed bottom spacing for x-axis labels
33
83
  },
34
- pageIconSize: 12,
35
- pageTextStyle: {
36
- fontSize: 11,
84
+ animation: false,
85
+ backgroundColor: '#fff',
86
+ dataset: {
87
+ source: chartData,
88
+ dimensions: Object.keys(chartData[0] || {}),
37
89
  },
38
- },
39
- grid: {
40
- containLabel: true,
41
- left: '3%',
42
- right: '3%',
43
- top: title ? 50 : 20,
44
- bottom: metricsCount > 1 ? 70 : 50,
45
- },
46
- animation: false,
47
- backgroundColor: '#fff',
48
- dataset: {
49
- source: chartData,
50
- dimensions: Object.keys(chartData[0] || {}),
51
- },
52
- });
90
+ ...(graphicElements.length > 0 ? { graphic: graphicElements } : {}),
91
+ };
92
+ };
53
93
  exports.getCommonEChartsConfig = getCommonEChartsConfig;
54
94
  //# sourceMappingURL=getCommonEChartsConfig.js.map
package/dist/cjs/ee/AiAgent/chartConfig/slack/shared/getCommonEChartsConfig.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getCommonEChartsConfig.js","sourceRoot":"","sources":["../../../../../../../src/ee/AiAgent/chartConfig/slack/shared/getCommonEChartsConfig.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACI,MAAM,sBAAsB,GAAG,CAClC,KAAyB,EACzB,YAAoB,EACpB,SAAoC,EAItC,EAAE,CAAC,CAAC;IACF,GAAG,CAAC,KAAK;QACL,CAAC,CAAC;YACI,KAAK,EAAE;gBACH,IAAI,EAAE,KAAK;gBACX,IAAI,EAAE,QAAQ;gBACd,GAAG,EAAE,EAAE;gBACP,SAAS,EAAE;oBACP,QAAQ,EAAE,EAAE;oBACZ,UAAU,EAAE,MAAe;iBAC9B;aACJ;SACJ;QACH,CAAC,CAAC,EAAE,CAAC;IACT,MAAM,EAAE;QACJ,IAAI,EAAE,YAAY,GAAG,CAAC;QACtB,IAAI,EAAE,QAAiB;QACvB,MAAM,EAAE,YAAqB;QAC7B,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,QAAiB;QACvB,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;QAChB,OAAO,EAAE,EAAE;QACX,SAAS,EAAE,EAAE;QACb,UAAU,EAAE,EAAE;QACd,SAAS,EAAE;YACP,QAAQ,EAAE,EAAE;SACf;QACD,YAAY,EAAE,EAAE;QAChB,aAAa,EAAE;YACX,QAAQ,EAAE,EAAE;SACf;KACJ;IACD,IAAI,EAAE;QACF,YAAY,EAAE,IAAI;QAClB,IAAI,EAAE,IAAI;QACV,KAAK,EAAE,IAAI;QACX,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;QACpB,MAAM,EAAE,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;KACrC;IACD,SAAS,EAAE,KAAK;IAChB,eAAe,EAAE,MAAM;IACvB,OAAO,EAAE;QACL,MAAM,EAAE,SAAS;QACjB,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;KAC9C;CACJ,CAAC,CAAC;AApDU,QAAA,sBAAsB,0BAoDhC"}
1
+ {"version":3,"file":"getCommonEChartsConfig.js","sourceRoot":"","sources":["../../../../../../../src/ee/AiAgent/chartConfig/slack/shared/getCommonEChartsConfig.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACI,MAAM,sBAAsB,GAAG,CAClC,KAAyB,EACzB,YAAoB,EACpB,SAAoC,EACpC,UAA0B,EAC1B,UAA0B,EAU5B,EAAE;IACA,MAAM,eAAe,GAAG,EAAE,CAAC;IAE3B,oCAAoC;IACpC,IAAI,UAAU,EAAE,CAAC;QACb,eAAe,CAAC,IAAI,CAAC;YACjB,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,EAAE;YACV,KAAK,EAAE;gBACH,IAAI,EAAE,UAAU;gBAChB,QAAQ,EAAE,EAAE;gBACZ,UAAU,EAAE,GAAG;aAClB;SACJ,CAAC,CAAC;IACP,CAAC;IAED,iEAAiE;IACjE,IAAI,UAAU,EAAE,CAAC;QACb,eAAe,CAAC,IAAI,CAAC;YACjB,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,EAAE;YACR,GAAG,EAAE,QAAQ;YACb,QAAQ,EAAE,IAAI,CAAC,EAAE,GAAG,CAAC;YACrB,KAAK,EAAE;gBACH,IAAI,EAAE,UAAU;gBAChB,QAAQ,EAAE,EAAE;gBACZ,UAAU,EAAE,GAAG;aAClB;SACJ,CAAC,CAAC;IACP,CAAC;IAED,OAAO;QACH,GAAG,CAAC,KAAK;YACL,CAAC,CAAC;gBACI,KAAK,EAAE;oBACH,IAAI,EAAE,KAAK;oBACX,IAAI,EAAE,QAAQ;oBACd,GAAG,EAAE,EAAE;oBACP,SAAS,EAAE;wBACP,QAAQ,EAAE,EAAE;wBACZ,UAAU,EAAE,MAAe;qBAC9B;iBACJ;aACJ;YACH,CAAC,CAAC,EAAE,CAAC;QACT,MAAM,EAAE;YACJ,IAAI,EAAE,YAAY,GAAG,CAAC;YACtB,IAAI,EAAE,QAAiB;YACvB,MAAM,EAAE,YAAqB;YAC7B,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,mDAAmD;YACzE,IAAI,EAAE,QAAiB;YACvB,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;YAChB,OAAO,EAAE,EAAE;YACX,SAAS,EAAE,EAAE;YACb,UAAU,EAAE,EAAE;YACd,SAAS,EAAE;gBACP,QAAQ,EAAE,EAAE;aACf;YACD,YAAY,EAAE,EAAE;YAChB,aAAa,EAAE;gBACX,QAAQ,EAAE,EAAE;aACf;SACJ;QACD,IAAI,EAAE;YACF,YAAY,EAAE,IAAI,EAAE,0DAA0D;YAC9E,IAAI,EAAE,IAAI,EAAE,yDAAyD;YACrE,KAAK,EAAE,IAAI,EAAE,2DAA2D;YACxE,oCAAoC;YACpC,GAAG,EAAE,CAAC,GAAG,EAAE;gBACP,IAAI,KAAK,IAAI,YAAY,GAAG,CAAC;oBAAE,OAAO,EAAE,CAAC,CAAC,8BAA8B;gBACxE,IAAI,KAAK;oBAAE,OAAO,EAAE,CAAC,CAAC,aAAa;gBACnC,IAAI,YAAY,GAAG,CAAC;oBAAE,OAAO,EAAE,CAAC,CAAC,cAAc;gBAC/C,OAAO,EAAE,CAAC,CAAC,UAAU;YACzB,CAAC,CAAC,EAAE;YACJ,MAAM,EAAE,EAAE,EAAE,yCAAyC;SACxD;QACD,SAAS,EAAE,KAAK;QAChB,eAAe,EAAE,MAAM;QACvB,OAAO,EAAE;YACL,MAAM,EAAE,SAAS;YACjB,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SAC9C;QACD,GAAG,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACtE,CAAC;AACN,CAAC,CAAC;AApGW,QAAA,sBAAsB,0BAoGjC"}
package/dist/esm/ee/AiAgent/chartConfig/slack/runQueryTool/viz/bar.js CHANGED
@@ -20,13 +20,10 @@ export const getBarChartEchartsConfig = async (queryTool, rows, fieldsMap, getPi
20
20
  const primarySort = sorts?.[0];
21
21
  const shouldInverseXAxis = primarySort?.fieldId === xDimension && primarySort?.descending === true;
22
22
  return {
23
- ...getCommonEChartsConfig(queryTool.title, metrics.length, chartData),
23
+ ...getCommonEChartsConfig(queryTool.title, metrics.length, chartData, chartConfig?.xAxisLabel, chartConfig?.yAxisLabel),
24
24
  xAxis: [
25
25
  {
26
26
  type: chartConfig?.xAxisType ?? 'category',
27
- ...(chartConfig?.xAxisLabel
28
- ? { name: chartConfig.xAxisLabel }
29
- : {}),
30
27
  ...getCartesianAxisFormatterConfig({
31
28
  axisItem: xAxisField,
32
29
  show: true,
@@ -37,9 +34,6 @@ export const getBarChartEchartsConfig = async (queryTool, rows, fieldsMap, getPi
37
34
  yAxis: [
38
35
  {
39
36
  type: 'value',
40
- ...(chartConfig?.yAxisLabel
41
- ? { name: chartConfig.yAxisLabel }
42
- : {}),
43
37
  ...getCartesianAxisFormatterConfig({
44
38
  axisItem: yAxisField,
45
39
  show: true,
package/dist/esm/ee/AiAgent/chartConfig/slack/runQueryTool/viz/bar.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"bar.js","sourceRoot":"","sources":["../../../../../../../../src/ee/AiAgent/chartConfig/slack/runQueryTool/viz/bar.ts"],"names":[],"mappings":"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"}
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,SAAsC,EACtC,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,UAAU,CAAC,CAAC,CAAC,CAAC;IACjC,IAAI,OAAO,GAAa,YAAY,CAAC;IACrC,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,YAAY,EACZ,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,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAE5E,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,CACrB,SAAS,CAAC,KAAK,EACf,OAAO,CAAC,MAAM,EACd,SAAS,EACT,WAAW,EAAE,UAAU,EACvB,WAAW,EAAE,UAAU,CAC1B;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,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,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAC7B,IAAI,EAAE,KAAK;YACX,gHAAgH;YAChH,IAAI,EAAE,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC/B,CAAC,CAAC,gBAAgB,CAAC,MAAM,EAAE,SAAS,CAAC;gBACrC,CAAC,CAAC,MAAM;YACZ,MAAM,EAAE;gBACJ,CAAC,EAAE,UAAU;gBACb,CAAC,EAAE,MAAM;aACZ;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"}
package/dist/esm/ee/AiAgent/chartConfig/slack/runQueryTool/viz/horizontalBar.js CHANGED
@@ -21,13 +21,10 @@ export const getHorizontalBarChartEchartsConfig = async (queryTool, rows, fields
21
21
  const primarySort = sorts?.[0];
22
22
  const shouldInverseYAxis = primarySort?.fieldId === xDimension && primarySort?.descending === true;
23
23
  return {
24
- ...getCommonEChartsConfig(queryTool.title, metrics.length, chartData),
24
+ ...getCommonEChartsConfig(queryTool.title, metrics.length, chartData, chartConfig?.xAxisLabel, chartConfig?.yAxisLabel),
25
25
  xAxis: [
26
26
  {
27
27
  type: 'value',
28
- ...(chartConfig?.xAxisLabel
29
- ? { name: chartConfig.xAxisLabel }
30
- : {}),
31
28
  ...getCartesianAxisFormatterConfig({
32
29
  axisItem: xAxisField,
33
30
  show: true,
@@ -37,9 +34,6 @@ export const getHorizontalBarChartEchartsConfig = async (queryTool, rows, fields
37
34
  yAxis: [
38
35
  {
39
36
  type: chartConfig?.xAxisType ?? 'category',
40
- ...(chartConfig?.yAxisLabel
41
- ? { name: chartConfig.yAxisLabel }
42
- : {}),
43
37
  ...getCartesianAxisFormatterConfig({
44
38
  axisItem: yAxisField,
45
39
  show: true,
package/dist/esm/ee/AiAgent/chartConfig/slack/runQueryTool/viz/horizontalBar.js.map CHANGED
@@ -1 +1 @@
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,SAAsC,EACtC,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,UAAU,CAAC,CAAC,CAAC,CAAC;IACjC,IAAI,OAAO,GAAa,YAAY,CAAC;IACrC,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,YAAY,EACZ,KAAoB,CACvB,CAAC;QACF,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;QAC5B,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAC9B,CAAC;IAED,oFAAoF;IACpF,MAAM,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,gBAAgB;IAC1D,MAAM,UAAU,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,aAAa;IAE1F,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,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC;QACrE,KAAK,EAAE;YACH;gBACI,IAAI,EAAE,OAAO;gBACb,GAAG,CAAC,WAAW,EAAE,UAAU;oBACvB,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,UAAU,EAAE;oBAClC,CAAC,CAAC,EAAE,CAAC;gBACT,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,CAAC,WAAW,EAAE,UAAU;oBACvB,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,UAAU,EAAE;oBAClC,CAAC,CAAC,EAAE,CAAC;gBACT,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,gHAAgH;YAChH,IAAI,EAAE,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC/B,CAAC,CAAC,gBAAgB,CAAC,MAAM,EAAE,SAAS,CAAC;gBACrC,CAAC,CAAC,MAAM;YACZ,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
+ {"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,SAAsC,EACtC,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,UAAU,CAAC,CAAC,CAAC,CAAC;IACjC,IAAI,OAAO,GAAa,YAAY,CAAC;IACrC,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,YAAY,EACZ,KAAoB,CACvB,CAAC;QACF,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;QAC5B,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAC9B,CAAC;IAED,oFAAoF;IACpF,MAAM,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,gBAAgB;IAC1D,MAAM,UAAU,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,aAAa;IAE1F,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,CACrB,SAAS,CAAC,KAAK,EACf,OAAO,CAAC,MAAM,EACd,SAAS,EACT,WAAW,EAAE,UAAU,EACvB,WAAW,EAAE,UAAU,CAC1B;QACD,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,gHAAgH;YAChH,IAAI,EAAE,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC/B,CAAC,CAAC,gBAAgB,CAAC,MAAM,EAAE,SAAS,CAAC;gBACrC,CAAC,CAAC,MAAM;YACZ,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"}
package/dist/esm/ee/AiAgent/chartConfig/slack/runQueryTool/viz/line.js CHANGED
@@ -20,13 +20,10 @@ export const getLineChartEchartsConfig = async (queryTool, rows, fieldsMap, getP
20
20
  const primarySort = sorts?.[0];
21
21
  const shouldInverseXAxis = primarySort?.fieldId === xDimension && primarySort?.descending === true;
22
22
  return {
23
- ...getCommonEChartsConfig(queryTool.title, metrics.length, chartData),
23
+ ...getCommonEChartsConfig(queryTool.title, metrics.length, chartData, chartConfig?.xAxisLabel, chartConfig?.yAxisLabel),
24
24
  xAxis: [
25
25
  {
26
26
  type: chartConfig?.xAxisType ?? 'time',
27
- ...(chartConfig?.xAxisLabel
28
- ? { name: chartConfig.xAxisLabel }
29
- : {}),
30
27
  ...getCartesianAxisFormatterConfig({
31
28
  axisItem: xAxisField,
32
29
  show: true,
@@ -37,9 +34,6 @@ export const getLineChartEchartsConfig = async (queryTool, rows, fieldsMap, getP
37
34
  yAxis: [
38
35
  {
39
36
  type: 'value',
40
- ...(chartConfig?.yAxisLabel
41
- ? { name: chartConfig.yAxisLabel }
42
- : {}),
43
37
  ...getCartesianAxisFormatterConfig({
44
38
  axisItem: yAxisField,
45
39
  show: true,
package/dist/esm/ee/AiAgent/chartConfig/slack/runQueryTool/viz/line.js.map CHANGED
@@ -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":"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,yBAAyB,GAAG,KAAK,EAC1C,SAAsC,EACtC,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,UAAU,CAAC,CAAC,CAAC,CAAC;IACjC,IAAI,OAAO,GAAa,YAAY,CAAC;IACrC,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,YAAY,EACZ,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,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAE5E,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,CACrB,SAAS,CAAC,KAAK,EACf,OAAO,CAAC,MAAM,EACd,SAAS,EACT,WAAW,EAAE,UAAU,EACvB,WAAW,EAAE,UAAU,CAC1B;QACD,KAAK,EAAE;YACH;gBACI,IAAI,EAAE,WAAW,EAAE,SAAS,IAAI,MAAM;gBACtC,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;YACH;gBACI,IAAI,EAAE,OAAO;gBACb,GAAG,+BAA+B,CAAC;oBAC/B,QAAQ,EAAE,UAAU;oBACpB,IAAI,EAAE,IAAI;iBACb,CAAC;aACL;SACJ;QACD,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAC7B,IAAI,EAAE,MAAM;YACZ,gHAAgH;YAChH,IAAI,EAAE,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC/B,CAAC,CAAC,gBAAgB,CAAC,MAAM,EAAE,SAAS,CAAC;gBACrC,CAAC,CAAC,MAAM;YACZ,MAAM,EAAE;gBACJ,CAAC,EAAE,UAAU;gBACb,CAAC,EAAE,MAAM;aACZ;YACD,GAAG,CAAC,WAAW,EAAE,QAAQ,KAAK,MAAM,IAAI;gBACpC,SAAS,EAAE,EAAE;aAChB,CAAC;YACF,UAAU,EAAE,IAAI;SACnB,CAAC,CAAC;KACN,CAAC;AACN,CAAC,CAAC"}
package/dist/esm/ee/AiAgent/chartConfig/slack/runQueryTool/viz/scatter.js CHANGED
@@ -22,13 +22,10 @@ export const getScatterChartEchartsConfig = async (queryTool, rows, fieldsMap, g
22
22
  const primarySort = sorts?.[0];
23
23
  const shouldInverseXAxis = primarySort?.fieldId === xDimension && primarySort?.descending === true;
24
24
  return {
25
- ...getCommonEChartsConfig(queryTool.title, metrics.length, chartData),
25
+ ...getCommonEChartsConfig(queryTool.title, metrics.length, chartData, chartConfig?.xAxisLabel, chartConfig?.yAxisLabel),
26
26
  xAxis: [
27
27
  {
28
28
  type: chartConfig?.xAxisType ?? 'category',
29
- ...(chartConfig?.xAxisLabel
30
- ? { name: chartConfig.xAxisLabel }
31
- : {}),
32
29
  ...getCartesianAxisFormatterConfig({
33
30
  axisItem: xAxisField,
34
31
  show: true,
@@ -39,9 +36,6 @@ export const getScatterChartEchartsConfig = async (queryTool, rows, fieldsMap, g
39
36
  yAxis: [
40
37
  {
41
38
  type: 'value',
42
- ...(chartConfig?.yAxisLabel
43
- ? { name: chartConfig.yAxisLabel }
44
- : {}),
45
39
  ...getCartesianAxisFormatterConfig({
46
40
  axisItem: yAxisField,
47
41
  show: true,
package/dist/esm/ee/AiAgent/chartConfig/slack/runQueryTool/viz/scatter.js.map CHANGED
@@ -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":"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,4BAA4B,GAAG,KAAK,EAC7C,SAAsC,EACtC,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,UAAU,CAAC,CAAC,CAAC,CAAC;IACjC,IAAI,OAAO,GAAa,YAAY,CAAC;IACrC,IAAI,SAAS,GAAG,IAAI,CAAC;IAErB,oEAAoE;IACpE,IAAI,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAC/B,MAAM,OAAO,GAAG,MAAM,iBAAiB,CACnC,IAAI,EACJ,SAAS,EACT,WAAW,CAAC,OAAO,EACnB,YAAY,EACZ,KAAoB,CACvB,CAAC;QACF,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;QAC5B,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAC9B,CAAC;IAED,sCAAsC;IACtC,MAAM,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;IACzC,MAAM,UAAU,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAE5E,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,CACrB,SAAS,CAAC,KAAK,EACf,OAAO,CAAC,MAAM,EACd,SAAS,EACT,WAAW,EAAE,UAAU,EACvB,WAAW,EAAE,UAAU,CAC1B;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,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,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAC7B,IAAI,EAAE,SAAS;YACf,gHAAgH;YAChH,IAAI,EAAE,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC/B,CAAC,CAAC,gBAAgB,CAAC,MAAM,EAAE,SAAS,CAAC;gBACrC,CAAC,CAAC,MAAM;YACZ,MAAM,EAAE;gBACJ,CAAC,EAAE,UAAU;gBACb,CAAC,EAAE,MAAM;aACZ;YACD,UAAU,EAAE,IAAI;SACnB,CAAC,CAAC;KACN,CAAC;AACN,CAAC,CAAC"}
package/dist/esm/ee/AiAgent/chartConfig/slack/shared/getCommonEChartsConfig.d.ts CHANGED
@@ -2,5 +2,5 @@ import { type EChartsOption } from 'echarts';
2
2
  /**
3
3
  * Generates common echarts config for all chart types
4
4
  */
5
- export declare const getCommonEChartsConfig: (title: string | undefined, metricsCount: number, chartData: Record<string, unknown>[]) => Pick<EChartsOption, "title" | "legend" | "grid" | "animation" | "backgroundColor" | "dataset">;
5
+ export declare const getCommonEChartsConfig: (title: string | undefined, metricsCount: number, chartData: Record<string, unknown>[], xAxisLabel?: string | null, yAxisLabel?: string | null) => Pick<EChartsOption, "title" | "legend" | "grid" | "animation" | "backgroundColor" | "dataset" | "graphic">;
6
6
  //# sourceMappingURL=getCommonEChartsConfig.d.ts.map
package/dist/esm/ee/AiAgent/chartConfig/slack/shared/getCommonEChartsConfig.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getCommonEChartsConfig.d.ts","sourceRoot":"","sources":["../../../../../../../src/ee/AiAgent/chartConfig/slack/shared/getCommonEChartsConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,SAAS,CAAC;AAE7C;;GAEG;AACH,eAAO,MAAM,sBAAsB,UACxB,MAAM,GAAG,SAAS,gBACX,MAAM,aACT,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KACrC,IAAI,CACH,aAAa,EACb,OAAO,GAAG,QAAQ,GAAG,MAAM,GAAG,WAAW,GAAG,iBAAiB,GAAG,SAAS,CA8C3E,CAAC"}
1
+ {"version":3,"file":"getCommonEChartsConfig.d.ts","sourceRoot":"","sources":["../../../../../../../src/ee/AiAgent/chartConfig/slack/shared/getCommonEChartsConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,SAAS,CAAC;AAE7C;;GAEG;AACH,eAAO,MAAM,sBAAsB,UACxB,MAAM,GAAG,SAAS,gBACX,MAAM,aACT,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,eACvB,MAAM,GAAG,IAAI,eACb,MAAM,GAAG,IAAI,KAC3B,IAAI,CACH,aAAa,EACX,OAAO,GACP,QAAQ,GACR,MAAM,GACN,WAAW,GACX,iBAAiB,GACjB,SAAS,GACT,SAAS,CAsFd,CAAC"}