@lightdash/common 0.2091.2 → 0.2092.1

package/dist/esm/ee/AiAgent/chartConfig/slack/shared/getCommonEChartsConfig.js

@@ -1,50 +1,90 @@
 /**
  * Generates common echarts config for all chart types
  */
-export const getCommonEChartsConfig = (title, metricsCount, chartData) => ({
-    ...(title
-        ? {
-            title: {
-                text: title,
-                left: 'center',
-                top: 10,
-                textStyle: {
-                    fontSize: 16,
-                    fontWeight: 'bold',
+export const getCommonEChartsConfig = (title, metricsCount, chartData, xAxisLabel, yAxisLabel) => {
+    const graphicElements = [];
+    // Add X-axis label at bottom center
+    if (xAxisLabel) {
+        graphicElements.push({
+            type: 'text',
+            left: 'center',
+            bottom: 10,
+            style: {
+                text: xAxisLabel,
+                fontSize: 12,
+                fontWeight: 500,
+            },
+        });
+    }
+    // Add Y-axis label on left side, vertically centered and rotated
+    if (yAxisLabel) {
+        graphicElements.push({
+            type: 'text',
+            left: 10,
+            top: 'center',
+            rotation: Math.PI / 2,
+            style: {
+                text: yAxisLabel,
+                fontSize: 12,
+                fontWeight: 500,
+            },
+        });
+    }
+    return {
+        ...(title
+            ? {
+                title: {
+                    text: title,
+                    left: 'center',
+                    top: 10,
+                    textStyle: {
+                        fontSize: 16,
+                        fontWeight: 'bold',
+                    },
                 },
+            }
+            : {}),
+        legend: {
+            show: metricsCount > 1,
+            type: 'scroll',
+            orient: 'horizontal',
+            top: title ? 40 : 10, // Position below title if exists, otherwise at top
+            left: 'center',
+            padding: [5, 10],
+            itemGap: 15,
+            itemWidth: 25,
+            itemHeight: 14,
+            textStyle: {
+                fontSize: 11,
             },
-        }
-        : {}),
-    legend: {
-        show: metricsCount > 1,
-        type: 'scroll',
-        orient: 'horizontal',
-        bottom: 10,
-        left: 'center',
-        padding: [5, 10],
-        itemGap: 15,
-        itemWidth: 25,
-        itemHeight: 14,
-        textStyle: {
-            fontSize: 11,
+            pageIconSize: 12,
+            pageTextStyle: {
+                fontSize: 11,
+            },
+        },
+        grid: {
+            containLabel: true, // Ensures labels are within grid bounds to prevent cutoff
+            left: '5%', // Increased from 3% to give more space for Y-axis labels
+            right: '5%', // Increased from 3% to give more space for labels on right
+            // Account for title + legend at top
+            top: (() => {
+                if (title && metricsCount > 1)
+                    return 90; // Title + legend both present
+                if (title)
+                    return 60; // Only title
+                if (metricsCount > 1)
+                    return 50; // Only legend
+                return 30; // Neither
+            })(),
+            bottom: 60, // Fixed bottom spacing for x-axis labels
         },
-        pageIconSize: 12,
-        pageTextStyle: {
-            fontSize: 11,
+        animation: false,
+        backgroundColor: '#fff',
+        dataset: {
+            source: chartData,
+            dimensions: Object.keys(chartData[0] || {}),
         },
-    },
-    grid: {
-        containLabel: true,
-        left: '3%',
-        right: '3%',
-        top: title ? 50 : 20,
-        bottom: metricsCount > 1 ? 70 : 50,
-    },
-    animation: false,
-    backgroundColor: '#fff',
-    dataset: {
-        source: chartData,
-        dimensions: Object.keys(chartData[0] || {}),
-    },
-});
+        ...(graphicElements.length > 0 ? { graphic: graphicElements } : {}),
+    };
+};
 //# sourceMappingURL=getCommonEChartsConfig.js.map

package/dist/esm/ee/AiAgent/chartConfig/slack/shared/getCommonEChartsConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"getCommonEChartsConfig.js","sourceRoot":"","sources":["../../../../../../../src/ee/AiAgent/chartConfig/slack/shared/getCommonEChartsConfig.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,CAAC,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"}
+{"version":3,"file":"getCommonEChartsConfig.js","sourceRoot":"","sources":["../../../../../../../src/ee/AiAgent/chartConfig/slack/shared/getCommonEChartsConfig.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,CAAC,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"}